@hlw-uni-mp/request 1.0.6 → 1.0.8

package/dist/index.mjs

@@ -91,15 +91,7 @@ function bytesToBase64(bytes) {
   return res;
 }
 function stringToUtf8(str) {
-  if (typeof TextEncoder !== "undefined") {
-    return new TextEncoder().encode(str);
-  }
-  const code = unescape(encodeURIComponent(str));
-  const bytes = new Uint8Array(code.length);
-  for (let i = 0; i < code.length; i++) {
-    bytes[i] = code.charCodeAt(i);
-  }
-  return bytes;
+  return new TextEncoder().encode(str);
 }
 function modPow(base, exp, mod) {
   let res = 1n;
@@ -262,40 +254,6 @@ function calculateSign(options) {
   return sha256(raw);
 }
 
-// src/oss.ts
-async function uploadOss(oss, source) {
-  const filePath = typeof source === "string" ? source : source.path || source.tempFilePath || "";
-  const name = oss.filename || filePath.split("/").pop() || "file";
-  const formData = {
-    key: oss.key || "",
-    success_action_status: oss.successActionStatus || "200"
-  };
-  if (oss.policy) formData.policy = oss.policy;
-  if (oss.OSSAccessKeyId) formData.OSSAccessKeyId = oss.OSSAccessKeyId;
-  if (oss.signature) formData.signature = oss.signature;
-  if (oss["x-oss-security-token"]) formData["x-oss-security-token"] = String(oss["x-oss-security-token"]);
-  const target2 = oss.host || "";
-  return new Promise((resolve, reject) => {
-    uni.uploadFile({
-      url: target2,
-      filePath,
-      name: "file",
-      formData,
-      header: {
-        "Content-Disposition": `inline;filename=${encodeURIComponent(name || "file")}`
-      },
-      success: (res) => {
-        if (res.statusCode === 200 || res.statusCode === 204) {
-          resolve(oss.url || "");
-        } else {
-          reject(new Error(`\u4E0A\u4F20\u963F\u91CC\u4E91\u5931\u8D25 (${res.statusCode}): ${res.data || ""}`));
-        }
-      },
-      fail: (error) => reject(new Error(error.errMsg || "\u4E0A\u4F20\u963F\u91CC\u4E91\u5931\u8D25"))
-    });
-  });
-}
-
 // src/upload.ts
 function getFileExt(filePath) {
   const ext = filePath.split("?")[0].split(".").pop()?.toLowerCase() || "";
@@ -387,249 +345,149 @@ var HttpError = class extends Error {
     this.config = options?.config;
   }
 };
-var InterceptorManager = class {
-  constructor() {
-    this.handlers = [];
-  }
-  use(fulfilled, rejected) {
-    this.handlers.push({ fulfilled, rejected });
-    return this.handlers.length - 1;
-  }
-  eject(id) {
-    if (this.handlers[id]) {
-      this.handlers[id] = null;
-    }
-  }
-  forEach(fn) {
-    for (const h of this.handlers) {
-      if (h !== null) fn(h);
-    }
-  }
-};
-var UniHttpClient = class {
-  constructor(options = {}) {
-    this.defaults = {
-      baseURL: "",
-      timeout: 15e3,
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json"
-      }
-    };
-    this.interceptors = {
-      request: new InterceptorManager(),
-      response: new InterceptorManager()
-    };
-    if (options.baseURL) this.defaults.baseURL = options.baseURL.replace(/\/+$/, "");
-    if (options.timeout) this.defaults.timeout = options.timeout;
-    if (options.headers) this.defaults.headers = { ...this.defaults.headers, ...options.headers };
-  }
-  async request(config) {
-    const cfg = {
-      method: "GET",
-      ...config,
-      baseURL: config.baseURL ?? this.defaults.baseURL,
-      headers: { ...this.defaults.headers, ...config.headers },
-      timeout: config.timeout ?? this.defaults.timeout
-    };
-    const requestChain = [];
-    this.interceptors.request.forEach((h) => {
-      requestChain.push(h.fulfilled, h.rejected);
-    });
-    let promise = Promise.resolve(cfg);
-    while (requestChain.length) {
-      promise = promise.then(requestChain.shift(), requestChain.shift());
-    }
-    let responsePromise = promise.then(async (finalConfig) => {
-      const fullUrl = this.resolveUrl(finalConfig.url, finalConfig.baseURL);
-      return this.send(fullUrl, finalConfig);
-    });
-    const responseChain = [];
-    this.interceptors.response.forEach((h) => {
-      responseChain.push(h.fulfilled, h.rejected);
-    });
-    while (responseChain.length) {
-      responsePromise = responsePromise.then(responseChain.shift(), responseChain.shift());
-    }
-    return responsePromise;
-  }
-  get(url, config) {
-    return this.request({ ...config, url, method: "GET" });
-  }
-  post(url, data, config) {
-    return this.request({ ...config, url, method: "POST", data });
-  }
-  put(url, data, config) {
-    return this.request({ ...config, url, method: "PUT", data });
-  }
-  delete(url, config) {
-    return this.request({ ...config, url, method: "DELETE" });
-  }
-  resolveUrl(url, baseURL) {
-    if (/^(https?:)?\/\//.test(url) || url.startsWith("file://")) return url;
-    const base = (baseURL || this.defaults.baseURL || "").replace(/\/+$/, "");
-    const path = url.startsWith("/") ? url : `/${url}`;
-    return base ? `${base}${path}` : path;
-  }
-  send(url, cfg) {
-    return new Promise((resolve, reject) => {
-      const isGet = (cfg.method || "GET").toUpperCase() === "GET";
-      const requestData = isGet ? cfg.params ?? cfg.data : cfg.data ?? cfg.params;
-      const method = cfg.method?.toUpperCase() || "GET";
-      uni.request({
-        url,
-        method,
-        data: requestData,
-        header: cfg.headers,
-        timeout: cfg.timeout,
-        success: (res) => {
-          const response = {
-            data: res.data,
-            status: res.statusCode,
-            statusText: String(res.statusCode),
-            headers: res.header || {},
-            config: cfg
-          };
-          if (res.statusCode >= 200 && res.statusCode < 300) {
-            resolve(response);
-          } else {
-            const body = res.data;
-            const msg = typeof body?.msg === "string" ? body.msg : `\u8BF7\u6C42\u5931\u8D25: ${res.statusCode}`;
-            reject(new HttpError(msg, { response, status: res.statusCode, config: cfg }));
-          }
-        },
-        fail: (errorResult) => {
-          reject(new HttpError(errorResult.errMsg || "\u7F51\u7EDC\u8BF7\u6C42\u5931\u8D25", { config: cfg }));
-        }
-      });
-    });
-  }
-};
-var target = null;
 var currentOptions = {};
 var lastToastTime = 0;
-function handleUnauthorized(message, callback) {
+function resolveUrl(url, baseURL) {
+  if (/^(https?:)?\/\//.test(url) || url.startsWith("file://")) {
+    return url;
+  }
+  const base = (baseURL || currentOptions.baseURL || "").replace(/\/+$/, "");
+  const path = url.startsWith("/") ? url : `/${url}`;
+  return base ? `${base}${path}` : path;
+}
+function handleUnauthorized(message) {
   const now = Date.now();
   if (now - lastToastTime > 3e3) {
     lastToastTime = now;
     uni.showToast({ title: message, icon: "none" });
   }
-  if (callback) {
-    callback(message);
-  }
+  currentOptions.onUnauthorized?.(message);
 }
-function getClient() {
-  if (target) {
-    if (currentOptions.baseURL && !target.defaults.baseURL) {
-      target.defaults.baseURL = currentOptions.baseURL;
-    }
-    return target;
-  }
-  const base = currentOptions.baseURL || "";
-  const inst = new UniHttpClient({
-    baseURL: base,
-    timeout: currentOptions.timeout || 15e3
+function buildSecurityHeaders(config) {
+  const devInfo = currentOptions.getDevice?.() || getDevice();
+  const token = currentOptions.getToken?.() || "";
+  const timestamp = Date.now();
+  const nonce = Math.random().toString(36).substring(2, 12);
+  const pubKey = currentOptions.publicKey || "";
+  const secret = currentOptions.secret || "";
+  const contextPayload = JSON.stringify({ ...devInfo, token });
+  const cipher = pubKey ? encryptRsa(contextPayload, pubKey) : encodeURIComponent(contextPayload);
+  const signData = config.data || config.params || {};
+  const sign = calculateSign({
+    timestamp,
+    nonce,
+    context: cipher,
+    secret,
+    data: signData
   });
-  inst.interceptors.request.use(
-    async (config) => {
-      const devInfo = currentOptions.getDevice?.() || getDevice();
-      const token = currentOptions.getToken?.() || "";
-      const time = Date.now();
-      const nonce = Math.random().toString(36).substring(2, 12);
-      const payload = {
-        ...devInfo,
-        token
-      };
-      const jsonStr = JSON.stringify(payload);
-      const pubKey = currentOptions.publicKey || "";
-      const secret = currentOptions.secret || "";
-      let cipher = "";
-      if (pubKey) {
-        cipher = encryptRsa(jsonStr, pubKey);
-      } else {
-        cipher = encodeURIComponent(jsonStr);
-      }
-      const signData = config.data || config.params || {};
-      const sign = calculateSign({
-        timestamp: time,
-        nonce,
-        context: cipher,
-        secret,
-        data: signData
-      });
-      config.headers = config.headers || {};
-      config.headers["X-Client-Timestamp"] = String(time);
-      config.headers["X-Client-Nonce"] = nonce;
-      config.headers["X-Client-Sign"] = sign;
-      config.headers["X-Client-Context"] = cipher;
-      if ("appid" in devInfo && devInfo.appid) {
-        config.headers["x-appid"] = String(devInfo.appid);
-      }
-      return config;
-    },
-    (error) => Promise.reject(error)
-  );
-  inst.interceptors.response.use(
-    async (response) => {
-      const res = response.data;
-      if (res && (res.code === 401 || res.code === 403)) {
-        const message = res.msg || "\u767B\u5F55\u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55";
-        handleUnauthorized(message, currentOptions.onUnauthorized);
-      }
-      return response;
-    },
-    (error) => {
-      const httpErr = error instanceof HttpError ? error : void 0;
-      const status = httpErr?.status ?? httpErr?.response?.status;
-      const body = httpErr?.response?.data;
-      const message = body?.msg || (error instanceof Error ? error.message : "\u7F51\u7EDC\u8FDE\u63A5\u5F02\u5E38");
-      if (status === 401 || status === 403) {
-        handleUnauthorized(message, currentOptions.onUnauthorized);
+  const headers = {
+    "Content-Type": "application/json",
+    Accept: "application/json",
+    ...config.headers,
+    "X-Client-Timestamp": String(timestamp),
+    "X-Client-Nonce": nonce,
+    "X-Client-Sign": sign,
+    "X-Client-Context": cipher
+  };
+  if ("appid" in devInfo && devInfo.appid) {
+    headers["x-appid"] = String(devInfo.appid);
+  }
+  return headers;
+}
+function sendRequest(url, config) {
+  return new Promise((resolve, reject) => {
+    const method = config.method?.toUpperCase() || "GET";
+    const isGet = method === "GET";
+    const requestData = isGet ? config.params ?? config.data : config.data ?? config.params;
+    uni.request({
+      url,
+      method,
+      data: requestData,
+      header: config.headers,
+      timeout: config.timeout ?? currentOptions.timeout ?? 15e3,
+      success: (res) => {
+        const response = {
+          data: res.data,
+          status: res.statusCode,
+          statusText: String(res.statusCode),
+          headers: res.header || {},
+          config
+        };
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          resolve(response);
+        } else {
+          const body = res.data;
+          const msg = typeof body?.msg === "string" ? body.msg : `\u8BF7\u6C42\u5931\u8D25: ${res.statusCode}`;
+          reject(new HttpError(msg, { response, status: res.statusCode, config }));
+        }
+      },
+      fail: (err) => {
+        reject(new HttpError(err.errMsg || "\u7F51\u7EDC\u8BF7\u6C42\u5931\u8D25", { config }));
       }
-      return Promise.reject(error);
-    }
-  );
-  target = inst;
-  return inst;
+    });
+  });
 }
-function setupHttp(options = {}) {
-  currentOptions = { ...currentOptions, ...options };
-  if (target && options.baseURL) {
-    target.defaults.baseURL = options.baseURL;
+async function request(config) {
+  const finalConfig = {
+    method: "GET",
+    ...config,
+    headers: buildSecurityHeaders(config)
+  };
+  const fullUrl = resolveUrl(finalConfig.url, finalConfig.baseURL);
+  try {
+    const response = await sendRequest(fullUrl, finalConfig);
+    const resData = response.data;
+    if (resData && (resData.code === 401 || resData.code === 403)) {
+      handleUnauthorized(resData.msg || "\u767B\u5F55\u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55");
+    }
+    return resData;
+  } catch (error) {
+    const httpErr = error instanceof HttpError ? error : void 0;
+    const status = httpErr?.status ?? httpErr?.response?.status;
+    const body = httpErr?.response?.data;
+    const message = body?.msg || (error instanceof Error ? error.message : "\u7F51\u7EDC\u8FDE\u63A5\u5F02\u5E38");
+    if (status === 401 || status === 403) {
+      handleUnauthorized(message);
+    }
+    return Promise.reject(error);
   }
-  return getClient();
 }
-function request(config) {
-  return getClient().request(config).then((res) => res.data);
+function get(url, params, config) {
+  return request({ ...config, url, method: "GET", params });
 }
-function get(url, params) {
-  return request({ url, method: "GET", params });
+function post(url, data, config) {
+  return request({ ...config, url, method: "POST", data });
 }
-function post(url, data) {
-  return request({ url, method: "POST", data });
+function put(url, data, config) {
+  return request({ ...config, url, method: "PUT", data });
 }
-function put(url, data) {
-  return request({ url, method: "PUT", data });
+function del(url, params, config) {
+  return request({ ...config, url, method: "DELETE", params });
+}
+var http = {
+  request,
+  get,
+  post,
+  put,
+  delete: del,
+  del,
+  setup: setupHttp,
+  getOptions: getHttpOptions
+};
+var client = http;
+function getClient() {
+  return http;
 }
-function del(url, params) {
-  return request({ url, method: "DELETE", params });
+function setupHttp(options = {}) {
+  currentOptions = { ...currentOptions, ...options };
+  return http;
 }
 function getHttpOptions() {
   return currentOptions;
 }
-var client = new Proxy({}, {
-  get(_, prop) {
-    const inst = getClient();
-    const val = Reflect.get(inst, prop);
-    return typeof val === "function" ? val.bind(inst) : val;
-  }
-});
-var http = client;
 var index_default = request;
 export {
   HttpError,
-  InterceptorManager,
-  UniHttpClient,
   calculateSign,
   client,
   index_default as default,
@@ -648,6 +506,5 @@ export {
   setupHttp,
   sha256,
   sortString,
-  uploadFile,
-  uploadOss
+  uploadFile
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hlw-uni-mp/request",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Universal Uni-App HTTP and upload client with RSA encryption & sign verification",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -16,11 +16,6 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "publish:npm": "pnpm build && npm publish --access public"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -42,5 +37,10 @@
     "@types/crypto-js": "^4.2.2",
     "tsup": "^8.5.1",
     "typescript": "^5.8.3"
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "publish:npm": "pnpm build && npm publish --access public"
   }
-}
+}