beer-network 1.2.3 → 1.2.5

package/api.d.ts

@@ -36,6 +36,9 @@ export default class Fetch {
      * 请求地址.
      */
     private readonly pathPrefix;
+    private readonly isNode;
+    private isNextJS;
+    private nodeHeaders;
     constructor(pathPrefix?: string);
     private sendBody;
     private sendForm;
@@ -165,7 +168,15 @@ export default class Fetch {
     /**
      * 默认授权方式.
      */
-    authorization(): {};
+    authorization(): Promise<{}>;
+    /**
+     * 尝试获取头.
+     */
+    private tryAuthorization;
+    /**
+     * 默认请求头.
+     */
+    headers(): Promise<{}>;
     /**
      * 默认响应数据解析方式.
      * @param response 响应数据.

package/api.js

@@ -1,7 +1,10 @@
 import { Session } from './session';
 export default class Fetch {
     constructor(pathPrefix) {
+        this.isNextJS = undefined;
+        this.nodeHeaders = undefined;
         this.pathPrefix = pathPrefix || '';
+        this.isNode = typeof process !== 'undefined' && !!process.versions?.node;
     }
     async sendBody(method, path, params, body, header, option) {
         const paramQuery = new URLSearchParams();
@@ -12,7 +15,8 @@ export default class Fetch {
         const response = await fetch(this.getPathPrefix() + path + (paramQuery.toString() === '' ? '' : '?') + paramQuery.toString(), {
             method,
             headers: {
-                ...this.authorization(),
+                ...(await this.authorization()),
+                ...(await this.headers()),
                 ...(header || {}),
                 'Content-Type': 'application/json'
             },
@@ -50,7 +54,8 @@ export default class Fetch {
         const response = await fetch(this.getPathPrefix() + path + (paramQuery.toString() === '' ? '' : '?') + paramQuery.toString(), {
             method,
             headers: {
-                ...this.authorization(),
+                ...(await this.authorization()),
+                ...(await this.headers()),
                 ...(header || {}),
                 'Content-Type': 'application/x-www-form-urlencoded'
             },
@@ -69,7 +74,8 @@ export default class Fetch {
         const response = await fetch(this.getPathPrefix() + path + (paramQuery.toString() === '' ? '' : '?') + paramQuery.toString(), {
             method,
             headers: {
-                ...this.authorization(),
+                ...(await this.authorization()),
+                ...(await this.headers()),
                 ...(header || {})
             },
             body: formData,
@@ -87,7 +93,8 @@ export default class Fetch {
         const response = await fetch(this.getPathPrefix() + path + '?' + paramQuery.toString(), {
             method,
             headers: {
-                ...this.authorization(),
+                ...(await this.authorization()),
+                ...(await this.headers()),
                 ...(header || {})
             },
             signal: option?.signal || null,
@@ -263,13 +270,48 @@ export default class Fetch {
     /**
      * 默认授权方式.
      */
-    authorization() {
+    async authorization() {
+        if (this.isNode) {
+            // 非浏览器
+            const bearer = await this.tryAuthorization();
+            if (bearer === undefined || bearer === '') {
+                return {};
+            }
+            return { Authorization: 'Bearer ' + bearer };
+        }
+        // 浏览器
         const bearer = Session.getBearer();
         if (bearer === undefined || bearer === '') {
             return {};
         }
         return { Authorization: 'Bearer ' + bearer };
     }
+    /**
+     * 尝试获取头.
+     */
+    async tryAuthorization(index = 0) {
+        if (index > 2) {
+            return undefined;
+        }
+        if (this.isNextJS && this.nodeHeaders !== undefined) {
+            return this.nodeHeaders.get('AccessToken') ?? this.nodeHeaders.get('Authorization') ?? '';
+        }
+        try {
+            const nextModule = await import('next/headers');
+            this.isNextJS = true;
+            this.nodeHeaders = await nextModule.headers();
+        }
+        catch {
+            this.isNextJS = false;
+        }
+        return this.tryAuthorization(index + 1);
+    }
+    /**
+     * 默认请求头.
+     */
+    async headers() {
+        return {};
+    }
     /**
      * 默认响应数据解析方式.
      * @param response 响应数据.
@@ -301,11 +343,19 @@ export default class Fetch {
         };
     }
     async pageTable(response) {
+        if (response.success) {
+            return {
+                data: response.data.records || response.data,
+                page: response.data.currentPage || 1,
+                total: response.data.totalSize || response.data.length,
+                success: true
+            };
+        }
         return {
-            data: response.data.records || response.data,
-            page: response.data.currentPage || 1,
-            total: response.data.totalSize || response.data.length,
-            success: response.success
+            data: [],
+            page: 1,
+            total: 0,
+            success: true
         };
     }
     async sleep(value) {

package/package.json

@@ -1,15 +1,23 @@
 {
   "name": "beer-network",
   "private": false,
-  "version": "1.2.3",
+  "version": "1.2.5",
   "scripts": {
     "pub-w": "tsc && copy package.json .\\dist\\package.json && npm publish ./dist",
     "pub-m": "tsc && cp package.json ./dist/package.json && npm publish ./dist"
   },
   "dependencies": {
   },
+  "peerDependencies": {
+    "next": "*"
+  },
+  "peerDependenciesMeta": {
+    "next": {
+      "optional": true
+    }
+  },
   "devDependencies": {
-    "typescript": "^5.0.2",
+    "next": "^16.1.3",
     "@babel/eslint-parser": "^7.22.15",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
@@ -19,6 +27,7 @@
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.3"
+    "eslint-plugin-react-refresh": "^0.4.3",
+    "typescript": "^5.0.2"
   }
 }