@zym-test-zerog/apiclient 1.0.3 → 1.0.5

package/dist/index.d.ts

@@ -135,7 +135,6 @@ declare class SignGenerator {
     private filterParams;
     private buildSignString;
     private hash;
-    private md5;
     getSignHeaderName(): string;
 }
 
@@ -728,7 +727,8 @@ declare namespace index {
 declare function init(config?: ApiClientConfig): void;
 declare function updateConfig(config: Partial<ApiClientConfig>): void;
 declare function getApiClient(): ApiClient;
+declare function saveToken(token: string): void;
 declare function destroy(): void;
 
-export { ApiClient, ErrorHandlerManager, SignGenerator, TokenRefreshManager, index$1 as apiV1, index as apiV2, destroy, errorHandlerManager, getApiClient, init, logger, updateConfig };
+export { ApiClient, ErrorHandlerManager, SignGenerator, TokenRefreshManager, index$1 as apiV1, index as apiV2, destroy, errorHandlerManager, getApiClient, init, logger, saveToken, updateConfig };
 export type { ApiClientConfig, ApiError, ApiResponse, ErrorHandler, LogCallback, LogLevel, PaginationParams, PaginationResponse, RequestLog, ResponseLog, SignConfig, TokenRefreshConfig };

package/dist/index.js

@@ -117,6 +117,333 @@ class Logger {
 }
 const logger = new Logger();
 
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+
+var md5$1 = {exports: {}};
+
+var crypt = {exports: {}};
+
+(function() {
+  var base64map
+      = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
+
+  crypt$1 = {
+    // Bit-wise rotation left
+    rotl: function(n, b) {
+      return (n << b) | (n >>> (32 - b));
+    },
+
+    // Bit-wise rotation right
+    rotr: function(n, b) {
+      return (n << (32 - b)) | (n >>> b);
+    },
+
+    // Swap big-endian to little-endian and vice versa
+    endian: function(n) {
+      // If number given, swap endian
+      if (n.constructor == Number) {
+        return crypt$1.rotl(n, 8) & 0x00FF00FF | crypt$1.rotl(n, 24) & 0xFF00FF00;
+      }
+
+      // Else, assume array and swap all items
+      for (var i = 0; i < n.length; i++)
+        n[i] = crypt$1.endian(n[i]);
+      return n;
+    },
+
+    // Generate an array of any length of random bytes
+    randomBytes: function(n) {
+      for (var bytes = []; n > 0; n--)
+        bytes.push(Math.floor(Math.random() * 256));
+      return bytes;
+    },
+
+    // Convert a byte array to big-endian 32-bit words
+    bytesToWords: function(bytes) {
+      for (var words = [], i = 0, b = 0; i < bytes.length; i++, b += 8)
+        words[b >>> 5] |= bytes[i] << (24 - b % 32);
+      return words;
+    },
+
+    // Convert big-endian 32-bit words to a byte array
+    wordsToBytes: function(words) {
+      for (var bytes = [], b = 0; b < words.length * 32; b += 8)
+        bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
+      return bytes;
+    },
+
+    // Convert a byte array to a hex string
+    bytesToHex: function(bytes) {
+      for (var hex = [], i = 0; i < bytes.length; i++) {
+        hex.push((bytes[i] >>> 4).toString(16));
+        hex.push((bytes[i] & 0xF).toString(16));
+      }
+      return hex.join('');
+    },
+
+    // Convert a hex string to a byte array
+    hexToBytes: function(hex) {
+      for (var bytes = [], c = 0; c < hex.length; c += 2)
+        bytes.push(parseInt(hex.substr(c, 2), 16));
+      return bytes;
+    },
+
+    // Convert a byte array to a base-64 string
+    bytesToBase64: function(bytes) {
+      for (var base64 = [], i = 0; i < bytes.length; i += 3) {
+        var triplet = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
+        for (var j = 0; j < 4; j++)
+          if (i * 8 + j * 6 <= bytes.length * 8)
+            base64.push(base64map.charAt((triplet >>> 6 * (3 - j)) & 0x3F));
+          else
+            base64.push('=');
+      }
+      return base64.join('');
+    },
+
+    // Convert a base-64 string to a byte array
+    base64ToBytes: function(base64) {
+      // Remove non-base-64 characters
+      base64 = base64.replace(/[^A-Z0-9+\/]/ig, '');
+
+      for (var bytes = [], i = 0, imod4 = 0; i < base64.length;
+          imod4 = ++i % 4) {
+        if (imod4 == 0) continue;
+        bytes.push(((base64map.indexOf(base64.charAt(i - 1))
+            & (Math.pow(2, -2 * imod4 + 8) - 1)) << (imod4 * 2))
+            | (base64map.indexOf(base64.charAt(i)) >>> (6 - imod4 * 2)));
+      }
+      return bytes;
+    }
+  };
+
+  crypt.exports = crypt$1;
+})();
+
+var cryptExports = crypt.exports;
+
+var charenc = {
+  // UTF-8 encoding
+  utf8: {
+    // Convert a string to a byte array
+    stringToBytes: function(str) {
+      return charenc.bin.stringToBytes(unescape(encodeURIComponent(str)));
+    },
+
+    // Convert a byte array to a string
+    bytesToString: function(bytes) {
+      return decodeURIComponent(escape(charenc.bin.bytesToString(bytes)));
+    }
+  },
+
+  // Binary encoding
+  bin: {
+    // Convert a string to a byte array
+    stringToBytes: function(str) {
+      for (var bytes = [], i = 0; i < str.length; i++)
+        bytes.push(str.charCodeAt(i) & 0xFF);
+      return bytes;
+    },
+
+    // Convert a byte array to a string
+    bytesToString: function(bytes) {
+      for (var str = [], i = 0; i < bytes.length; i++)
+        str.push(String.fromCharCode(bytes[i]));
+      return str.join('');
+    }
+  }
+};
+
+var charenc_1 = charenc;
+
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+// The _isBuffer check is for Safari 5-7 support, because it's missing
+// Object.prototype.constructor. Remove this eventually
+var isBuffer_1 = function (obj) {
+  return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer)
+};
+
+function isBuffer (obj) {
+  return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj)
+}
+
+// For Node v0.10 support. Remove this eventually.
+function isSlowBuffer (obj) {
+  return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0))
+}
+
+(function(){
+  var crypt = cryptExports,
+      utf8 = charenc_1.utf8,
+      isBuffer = isBuffer_1,
+      bin = charenc_1.bin,
+
+  // The core
+  md5 = function (message, options) {
+    // Convert to byte array
+    if (message.constructor == String)
+      if (options && options.encoding === 'binary')
+        message = bin.stringToBytes(message);
+      else
+        message = utf8.stringToBytes(message);
+    else if (isBuffer(message))
+      message = Array.prototype.slice.call(message, 0);
+    else if (!Array.isArray(message) && message.constructor !== Uint8Array)
+      message = message.toString();
+    // else, assume byte array already
+
+    var m = crypt.bytesToWords(message),
+        l = message.length * 8,
+        a =  1732584193,
+        b = -271733879,
+        c = -1732584194,
+        d =  271733878;
+
+    // Swap endian
+    for (var i = 0; i < m.length; i++) {
+      m[i] = ((m[i] <<  8) | (m[i] >>> 24)) & 0x00FF00FF |
+             ((m[i] << 24) | (m[i] >>>  8)) & 0xFF00FF00;
+    }
+
+    // Padding
+    m[l >>> 5] |= 0x80 << (l % 32);
+    m[(((l + 64) >>> 9) << 4) + 14] = l;
+
+    // Method shortcuts
+    var FF = md5._ff,
+        GG = md5._gg,
+        HH = md5._hh,
+        II = md5._ii;
+
+    for (var i = 0; i < m.length; i += 16) {
+
+      var aa = a,
+          bb = b,
+          cc = c,
+          dd = d;
+
+      a = FF(a, b, c, d, m[i+ 0],  7, -680876936);
+      d = FF(d, a, b, c, m[i+ 1], 12, -389564586);
+      c = FF(c, d, a, b, m[i+ 2], 17,  606105819);
+      b = FF(b, c, d, a, m[i+ 3], 22, -1044525330);
+      a = FF(a, b, c, d, m[i+ 4],  7, -176418897);
+      d = FF(d, a, b, c, m[i+ 5], 12,  1200080426);
+      c = FF(c, d, a, b, m[i+ 6], 17, -1473231341);
+      b = FF(b, c, d, a, m[i+ 7], 22, -45705983);
+      a = FF(a, b, c, d, m[i+ 8],  7,  1770035416);
+      d = FF(d, a, b, c, m[i+ 9], 12, -1958414417);
+      c = FF(c, d, a, b, m[i+10], 17, -42063);
+      b = FF(b, c, d, a, m[i+11], 22, -1990404162);
+      a = FF(a, b, c, d, m[i+12],  7,  1804603682);
+      d = FF(d, a, b, c, m[i+13], 12, -40341101);
+      c = FF(c, d, a, b, m[i+14], 17, -1502002290);
+      b = FF(b, c, d, a, m[i+15], 22,  1236535329);
+
+      a = GG(a, b, c, d, m[i+ 1],  5, -165796510);
+      d = GG(d, a, b, c, m[i+ 6],  9, -1069501632);
+      c = GG(c, d, a, b, m[i+11], 14,  643717713);
+      b = GG(b, c, d, a, m[i+ 0], 20, -373897302);
+      a = GG(a, b, c, d, m[i+ 5],  5, -701558691);
+      d = GG(d, a, b, c, m[i+10],  9,  38016083);
+      c = GG(c, d, a, b, m[i+15], 14, -660478335);
+      b = GG(b, c, d, a, m[i+ 4], 20, -405537848);
+      a = GG(a, b, c, d, m[i+ 9],  5,  568446438);
+      d = GG(d, a, b, c, m[i+14],  9, -1019803690);
+      c = GG(c, d, a, b, m[i+ 3], 14, -187363961);
+      b = GG(b, c, d, a, m[i+ 8], 20,  1163531501);
+      a = GG(a, b, c, d, m[i+13],  5, -1444681467);
+      d = GG(d, a, b, c, m[i+ 2],  9, -51403784);
+      c = GG(c, d, a, b, m[i+ 7], 14,  1735328473);
+      b = GG(b, c, d, a, m[i+12], 20, -1926607734);
+
+      a = HH(a, b, c, d, m[i+ 5],  4, -378558);
+      d = HH(d, a, b, c, m[i+ 8], 11, -2022574463);
+      c = HH(c, d, a, b, m[i+11], 16,  1839030562);
+      b = HH(b, c, d, a, m[i+14], 23, -35309556);
+      a = HH(a, b, c, d, m[i+ 1],  4, -1530992060);
+      d = HH(d, a, b, c, m[i+ 4], 11,  1272893353);
+      c = HH(c, d, a, b, m[i+ 7], 16, -155497632);
+      b = HH(b, c, d, a, m[i+10], 23, -1094730640);
+      a = HH(a, b, c, d, m[i+13],  4,  681279174);
+      d = HH(d, a, b, c, m[i+ 0], 11, -358537222);
+      c = HH(c, d, a, b, m[i+ 3], 16, -722521979);
+      b = HH(b, c, d, a, m[i+ 6], 23,  76029189);
+      a = HH(a, b, c, d, m[i+ 9],  4, -640364487);
+      d = HH(d, a, b, c, m[i+12], 11, -421815835);
+      c = HH(c, d, a, b, m[i+15], 16,  530742520);
+      b = HH(b, c, d, a, m[i+ 2], 23, -995338651);
+
+      a = II(a, b, c, d, m[i+ 0],  6, -198630844);
+      d = II(d, a, b, c, m[i+ 7], 10,  1126891415);
+      c = II(c, d, a, b, m[i+14], 15, -1416354905);
+      b = II(b, c, d, a, m[i+ 5], 21, -57434055);
+      a = II(a, b, c, d, m[i+12],  6,  1700485571);
+      d = II(d, a, b, c, m[i+ 3], 10, -1894986606);
+      c = II(c, d, a, b, m[i+10], 15, -1051523);
+      b = II(b, c, d, a, m[i+ 1], 21, -2054922799);
+      a = II(a, b, c, d, m[i+ 8],  6,  1873313359);
+      d = II(d, a, b, c, m[i+15], 10, -30611744);
+      c = II(c, d, a, b, m[i+ 6], 15, -1560198380);
+      b = II(b, c, d, a, m[i+13], 21,  1309151649);
+      a = II(a, b, c, d, m[i+ 4],  6, -145523070);
+      d = II(d, a, b, c, m[i+11], 10, -1120210379);
+      c = II(c, d, a, b, m[i+ 2], 15,  718787259);
+      b = II(b, c, d, a, m[i+ 9], 21, -343485551);
+
+      a = (a + aa) >>> 0;
+      b = (b + bb) >>> 0;
+      c = (c + cc) >>> 0;
+      d = (d + dd) >>> 0;
+    }
+
+    return crypt.endian([a, b, c, d]);
+  };
+
+  // Auxiliary functions
+  md5._ff  = function (a, b, c, d, x, s, t) {
+    var n = a + (b & c | ~b & d) + (x >>> 0) + t;
+    return ((n << s) | (n >>> (32 - s))) + b;
+  };
+  md5._gg  = function (a, b, c, d, x, s, t) {
+    var n = a + (b & d | c & ~d) + (x >>> 0) + t;
+    return ((n << s) | (n >>> (32 - s))) + b;
+  };
+  md5._hh  = function (a, b, c, d, x, s, t) {
+    var n = a + (b ^ c ^ d) + (x >>> 0) + t;
+    return ((n << s) | (n >>> (32 - s))) + b;
+  };
+  md5._ii  = function (a, b, c, d, x, s, t) {
+    var n = a + (c ^ (b | ~d)) + (x >>> 0) + t;
+    return ((n << s) | (n >>> (32 - s))) + b;
+  };
+
+  // Package private blocksize
+  md5._blocksize = 16;
+  md5._digestsize = 16;
+
+  md5$1.exports = function (message, options) {
+    if (message === undefined || message === null)
+      throw new Error('Illegal argument ' + message);
+
+    var digestbytes = crypt.wordsToBytes(md5(message, options));
+    return options && options.asBytes ? digestbytes :
+        options && options.asString ? bin.bytesToString(digestbytes) :
+        crypt.bytesToHex(digestbytes);
+  };
+
+})();
+
+var md5Exports = md5$1.exports;
+var md5 = /*@__PURE__*/getDefaultExportFromCjs(md5Exports);
+
 class SignGenerator {
     constructor(config) {
         this.config = {
@@ -202,129 +529,9 @@ class SignGenerator {
         return signString.toLowerCase();
     }
     hash(str) {
-        // 使用纯JavaScript实现的MD5算法，支持浏览器和Node.js环境
+        // 使用第三方md5库生成MD5哈希，支持浏览器和Node.js环境
         const input = this.config.salt ? this.config.salt + str : str;
-        return this.md5(input);
-    }
-    // 纯JavaScript MD5实现
-    md5(message) {
-        // MD5常量
-        const K = [
-            0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
-            0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
-            0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
-            0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
-            0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
-            0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
-            0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
-            0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
-            0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
-            0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
-            0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05,
-            0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
-            0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
-            0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
-            0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
-            0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
-        ];
-        // 左旋转函数
-        const leftRotate = (x, c) => {
-            return (x << c) | (x >>> (32 - c));
-        };
-        // 将字符串转换为字节数组
-        const utf8Encode = (str) => {
-            const bytes = [];
-            for (let i = 0; i < str.length; i++) {
-                const charCode = str.charCodeAt(i);
-                if (charCode < 128) {
-                    bytes.push(charCode);
-                }
-                else if (charCode < 2048) {
-                    bytes.push((charCode >> 6) | 192);
-                    bytes.push((charCode & 63) | 128);
-                }
-                else if (charCode < 65536) {
-                    bytes.push((charCode >> 12) | 224);
-                    bytes.push(((charCode >> 6) & 63) | 128);
-                    bytes.push((charCode & 63) | 128);
-                }
-                else {
-                    bytes.push((charCode >> 18) | 240);
-                    bytes.push(((charCode >> 12) & 63) | 128);
-                    bytes.push(((charCode >> 6) & 63) | 128);
-                    bytes.push((charCode & 63) | 128);
-                }
-            }
-            return bytes;
-        };
-        // 初始化变量
-        let a0 = 0x67452301;
-        let b0 = 0xefcdab89;
-        let c0 = 0x98badcfe;
-        let d0 = 0x10325476;
-        // 处理输入
-        const bytes = utf8Encode(message);
-        const originalLength = bytes.length * 8;
-        // 添加填充
-        bytes.push(0x80);
-        while ((bytes.length * 8) % 512 !== 448) {
-            bytes.push(0x00);
-        }
-        // 添加长度
-        for (let i = 0; i < 8; i++) {
-            bytes.push((originalLength >>> (i * 8)) & 0xff);
-        }
-        // 处理512位块
-        for (let i = 0; i < bytes.length; i += 64) {
-            const w = [];
-            for (let j = 0; j < 16; j++) {
-                w[j] = ((bytes[i + j * 4] << 24) |
-                    (bytes[i + j * 4 + 1] << 16) |
-                    (bytes[i + j * 4 + 2] << 8) |
-                    bytes[i + j * 4 + 3]);
-            }
-            let a = a0;
-            let b = b0;
-            let c = c0;
-            let d = d0;
-            for (let j = 0; j < 64; j++) {
-                let f;
-                let g;
-                if (j < 16) {
-                    f = (b & c) | (~b & d);
-                    g = j;
-                }
-                else if (j < 32) {
-                    f = (d & b) | (~d & c);
-                    g = (5 * j + 1) % 16;
-                }
-                else if (j < 48) {
-                    f = b ^ c ^ d;
-                    g = (3 * j + 5) % 16;
-                }
-                else {
-                    f = c ^ (b | ~d);
-                    g = (7 * j) % 16;
-                }
-                const temp = d;
-                d = c;
-                c = b;
-                b = b + leftRotate((a + f + K[j] + w[g]), [7, 12, 17, 22][j / 16 | 0]);
-                a = temp;
-            }
-            a0 += a;
-            b0 += b;
-            c0 += c;
-            d0 += d;
-        }
-        // 将结果转换为十六进制字符串
-        const toHex = (n) => {
-            return ('00000000' + n.toString(16)).slice(-8);
-        };
-        return (toHex(a0) +
-            toHex(b0) +
-            toHex(c0) +
-            toHex(d0)).toLowerCase();
+        return md5(input);
     }
     getSignHeaderName() {
         return this.config.signHeaderName;
@@ -354,7 +561,7 @@ class TokenRefreshManager {
                             if (!updatedConfig.headers) {
                                 updatedConfig.headers = {};
                             }
-                            updatedConfig.headers.Authorization = `Bearer ${token}`;
+                            updatedConfig.headers.Authorization = `${token}`;
                             resolve(updatedConfig);
                         }
                         else {
@@ -632,7 +839,7 @@ class ApiClient {
         if (this.config.tokenRefreshConfig?.getToken) {
             const token = this.config.tokenRefreshConfig.getToken();
             if (token) {
-                config.headers.Authorization = `Bearer ${token}`;
+                config.headers.Authorization = `${token}`;
             }
         }
         const requestLog = {
@@ -670,6 +877,12 @@ class ApiClient {
             error instanceof Error && 'response' in error &&
             error.response?.status &&
             this.tokenRefreshManager.isTokenExpired(error.response.status)) {
+            // 检查是否是auth相关接口，如果是则跳过token刷新
+            const config = error.config;
+            const url = config?.url || '';
+            if (url.includes('/auth/')) {
+                return Promise.reject(errorHandlerManager.handleError(error));
+            }
             try {
                 const newConfig = await this.tokenRefreshManager.handleTokenExpired(this.axiosInstance, error.config);
                 return this.axiosInstance.request(newConfig);
@@ -763,7 +976,12 @@ class ApiClient {
 async function login(params) {
     const client = getApiClient();
     const response = await client.post('/auth/v1/login', params);
-    return response.data;
+    const loginResult = response.data;
+    // 保存token
+    if (loginResult.token) {
+        saveToken(loginResult.token);
+    }
+    return loginResult;
 }
 async function refreshToken() {
     const client = getApiClient();
@@ -1108,6 +1326,15 @@ function getApiClient() {
     }
     return apiClientInstance;
 }
+// 保存token的方法
+function saveToken(token) {
+    if (!apiClientInstance) {
+        throw new Error('ApiClient has not been initialized. Call init first.');
+    }
+    if (apiClientInstance['config']?.tokenRefreshConfig?.setToken) {
+        apiClientInstance['config'].tokenRefreshConfig.setToken(token);
+    }
+}
 function destroy() {
     if (apiClientInstance) {
         apiClientInstance.cancelAllRequests();
@@ -1126,5 +1353,6 @@ exports.errorHandlerManager = errorHandlerManager;
 exports.getApiClient = getApiClient;
 exports.init = init;
 exports.logger = logger;
+exports.saveToken = saveToken;
 exports.updateConfig = updateConfig;
 //# sourceMappingURL=index.js.map