etherreq 1.0.1-0.1 → 1.0.1-0.10

package/.github/workflows/npm-publish.yml

@@ -0,0 +1,33 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
+
+name: Node.js Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: npm ci
+      - run: npm test
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}

package/README.md

@@ -0,0 +1,12 @@
+一个轻量级、无感知的 HTTP 请求库，基于 Axios 核心理念封装，支持自动 Token 注入、拦截器、TypeScript 类型定义等功能。
+
+
+
+安装
+
+```
+npm install etherreq
+# 或者
+yarn add etherreq
+```
+

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "etherreq",
-  "version": "1.0.10.1",
+  "version": "1.0.10.10",
   "description": "A lightweight custom HTTP request library.",
   "main": "src/index.js",
   "types": "src/types/etherreq.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "keywords": ["http", "request"],
+  "keywords": [
+    "http",
+    "request"
+  ],
   "author": "guochang2635@icloud.com",
   "license": "MIT"
-}
+}

package/src/index.js

@@ -1,16 +1,61 @@
 // src/index.js
-import { request } from './request';
+import { request, baseURL, setBaseURL } from './request';
 
-const createMethod = (method) => (url, options) =>
-  request(url, { ...options, method });
+// 设置全局 base URL
+setBaseURL('http://localhost:8081/api');
+
+// 示例封装方法
+const createMethod = (method) => (url, data, callback) => {
+  let options;
+
+  if (
+    data &&
+    typeof data === 'object' &&
+    !Array.isArray(data) &&
+    !(data instanceof FormData) &&
+    !data.method &&
+    !data.headers &&
+    !data.params &&
+    !data.baseURL
+  ) {
+    options = { body: data, method };
+  } else {
+    options = { ...data, method };
+  }
+
+  const promise = request(url, options);
+
+  if (typeof callback === 'function') {
+    promise.then(data => callback(null, data)).catch(err => callback(err, null));
+  } else {
+    return promise;
+  }
+};
 
 export const etherreq = Object.assign(
-  (url, options) => createMethod('GET')(url, options),
+  (url, options, callback) => createMethod('GET')(url, options, callback),
   {
     get: createMethod('GET'),
     post: createMethod('POST'),
     put: createMethod('PUT'),
     delete: createMethod('DELETE'),
     del: createMethod('DELETE'),
+    login: (url, data, callback) => {
+      const loginPromise = createMethod('POST')(url, data);
+
+      loginPromise.then(response => {
+        const token = response.data?.token;
+        if (token) {
+          localStorage.setItem('token', token); // 保存 token 到 localStorage
+        }
+        return response;
+      });
+
+      if (typeof callback === 'function') {
+        loginPromise.then(data => callback(null, data)).catch(err => callback(err, null));
+      } else {
+        return loginPromise;
+      }
+    },
   }
 );

package/src/request.js

@@ -1,26 +1,36 @@
 // src/request.js
 import { create } from './myaxios';
 
+// 创建一个带有默认配置的请求实例
 const instance = create({
-  baseURL: 'https://api.example.com',
+  baseURL: 'https://api.example.com', // 默认基础 URL
 });
 
-// 请求拦截器 - 自动注入 token
+// 请求拦截器：自动注入 token 和 Content-Type
 instance.interceptors.request.use((config) => {
   const token = localStorage.getItem('token');
+
+  // 构建最终 headers
+  const headers = {
+    ...(config.headers || {}), // 用户自定义 headers
+    Authorization: token ? `Bearer ${token}` : undefined,
+  };
+
+  // 如果是 POST/PUT 等非 GET 请求，并且没有指定 Content-Type，则默认为 application/json
+  if (config.method !== 'GET' && !headers['Content-Type']) {
+    headers['Content-Type'] = 'application/json';
+  }
+
   return {
     ...config,
-    headers: {
-      ...(config.headers || {}),
-      Authorization: token ? `Bearer ${token}` : undefined,
-    },
+    headers,
   };
 });
 
-// 响应拦截器 - 返回 data
+// 响应拦截器：自动提取 response.data
 instance.interceptors.response.use(
   (response) => {
-    return response.data; // 自动提取 data
+    return response.data; // 返回 data 字段作为结果
   },
   (error) => {
     console.error('请求异常:', error);
@@ -28,9 +38,27 @@ instance.interceptors.response.use(
   }
 );
 
-export const request = (url, options) => {
+let _baseURL = 'https://api.example.com'; // 内部变量用于保存 base URL
+
+/**
+ * 封装 request 函数，支持 baseURl 拼接等逻辑
+ * @param {string} url - 请求路径
+ * @param {Object} options - 请求配置
+ */
+export const request = (url, options = {}) => {
+  const baseURL = options.baseURL || _baseURL;
+  const finalURL = new URL(url, baseURL).toString();
+
   return instance({
     ...options,
-    url: options.baseURL + url,
+    url: finalURL,
   });
+};
+
+// 导出可读写的 baseURL 变量
+export { _baseURL as baseURL };
+
+// 允许外部设置 baseURL
+export const setBaseURL = (newBaseURL) => {
+  _baseURL = newBaseURL;
 };

package/src/types/etherreq.d.ts

@@ -1,5 +1,3 @@
-// src/types/etherreq.d.ts
-
 interface EtherRequestOptions {
   method?: 'GET' | 'POST' | 'PUT' | 'DELETE';
   headers?: Record<string, string | number | boolean>;
@@ -28,9 +26,16 @@ interface EtherreqStatic extends EtherRequestMethod {
   put: EtherRequestMethod;
   delete: EtherRequestMethod;
   del: EtherRequestMethod;
+  login: EtherRequestMethod; // 新增 login 类型
 }
 
 // 导出对象
 declare const etherreq: EtherreqStatic;
 
+declare module 'etherreq' {
+  export const etherreq: EtherreqStatic;
+  export let baseURL: string;
+  export function setBaseURL(url: string): void;
+}
+
 export { etherreq };