@ningboyz/wxmp 1.0.8 → 1.0.10

package/es/client/wxClient.d.ts

@@ -12,4 +12,4 @@ declare class WxClient {
     login(params: IWxLoginParams): Promise<import('@ningboyz/types/src/response').IResponse<TCore.IUserResponse[]>>;
 }
 declare const createWxClient: (config: IWxConfig) => WxClient;
-export { type WxClient, createWxClient };
+export { WxClient, createWxClient };

package/es/client/wxClient.js

@@ -16,5 +16,6 @@ class t {
 }
 const c = (r) => t.create(r);
 export {
+  t as WxClient,
   c as createWxClient
 };

package/es/index.d.ts

@@ -1,4 +1,4 @@
 import { WxClient, createWxClient } from './client/wxClient';
 import { WxRequest, createWxRequest } from './request/wxRequest';
-import { IWxConfig, IWxInternalRequestConfig, IWxLoginParams, IWxQueryParams, IWxResponse, TWxConfig, TWxInterceptorsRequest, TWxInterceptorsResponse, TWxLoginParams } from './types';
-export { type WxClient, createWxClient, type WxRequest, createWxRequest, type IWxConfig, type IWxInternalRequestConfig, type IWxLoginParams, type IWxQueryParams, type IWxResponse, type TWxInterceptorsRequest, type TWxInterceptorsResponse, TWxConfig, TWxLoginParams };
+import { IWxConfig, IWxInternalRequestConfig, IWxLoginParams, IWxQueryParams, IWxRequestOptions, IWxResponse, TWxConfig, TWxHttpMethod, TWxInterceptorsRequest, TWxInterceptorsResponse, TWxLoginParams } from './types';
+export { type WxClient, createWxClient, type WxRequest, createWxRequest, type IWxConfig, type IWxInternalRequestConfig, type IWxLoginParams, type IWxQueryParams, type IWxRequestOptions, type IWxResponse, type TWxHttpMethod, type TWxInterceptorsRequest, type TWxInterceptorsResponse, TWxConfig, TWxLoginParams };

package/es/request/wxRequest.d.ts

@@ -1,5 +1,5 @@
 import { TResp } from '@ningboyz/types';
-import { IWxConfig, IWxQueryParams } from '../types';
+import { IWxConfig, IWxQueryParams, IWxRequestOptions } from '../types';
 declare class WxRequest {
     private config;
     private constructor();
@@ -13,6 +13,7 @@ declare class WxRequest {
      */
     postJson<T>(url: string, querys?: IWxQueryParams, params?: object, headers?: Record<string, string>): Promise<TResp.IResponse<T>>;
     get<T>(url: string, querys?: IWxQueryParams, headers?: Record<string, string>): Promise<TResp.IResponse<T>>;
+    request<T>(url: string, options: IWxRequestOptions): Promise<TResp.IResponse<T>>;
     private send;
     private handleSuccess;
     private tryHandleSessionExpired;

package/es/request/wxRequest.js

@@ -1,7 +1,7 @@
 import { TResp as f } from "@ningboyz/types";
-import s from "lodash";
-import { REQUEST_TIMEOUT_MILLISECONDS as p } from "../types.js";
-const T = 200, N = 300, m = "application/json", E = "application/x-www-form-urlencoded";
+import i from "lodash";
+import { REQUEST_TIMEOUT_MILLISECONDS as T } from "../types.js";
+const m = 200, N = 300, g = "application/json", E = "application/x-www-form-urlencoded";
 class u {
   config;
   constructor(e) {
@@ -13,97 +13,101 @@ class u {
   /**
    * 表单提交。body 字段名 params，值是 JSON 字符串，对应 apis 里的 post。
    */
-  post(e, i, t, r) {
-    const n = s.isNil(t) ? void 0 : { params: JSON.stringify(t) }, o = this.createHeader(s.isNil(t) ? void 0 : E, r);
-    return this.send("POST", e, i, n, o);
+  post(e, s, t, o) {
+    const n = i.isNil(t) ? void 0 : { params: JSON.stringify(t) }, r = this.createHeader(i.isNil(t) ? void 0 : E, o);
+    return this.send("POST", e, s, n, r);
   }
   /**
    * JSON 提交，对应 apis 里的 postJson。国密加密接口请走此方法。
    */
-  postJson(e, i, t, r) {
-    const n = this.createHeader(m, r);
-    return this.send("POST", e, i, t, n);
+  postJson(e, s, t, o) {
+    const n = this.createHeader(g, o);
+    return this.send("POST", e, s, t, n);
   }
-  get(e, i, t) {
-    const r = this.createHeader(void 0, t);
-    return this.send("GET", e, i, void 0, r);
+  get(e, s, t) {
+    const o = this.createHeader(void 0, t);
+    return this.send("GET", e, s, void 0, o);
   }
-  send(e, i, t, r, n) {
+  request(e, s) {
+    const t = s.contentType ?? (s.method === "GET" ? void 0 : g), o = this.createHeader(t, s.headers);
+    return this.send(s.method, e, s.querys, s.data, o);
+  }
+  send(e, s, t, o, n) {
     return (async () => {
-      let o = {
-        url: i,
+      let r = {
+        url: s,
         method: e,
         querys: t,
-        data: r,
+        data: o,
         header: n
       };
-      s.isNil(this.config.interceptorsRequest) || (o = await this.config.interceptorsRequest(o));
-      const a = this.createRequestUrl(o.url, o.querys), h = this.config.timeout ?? p;
+      i.isNil(this.config.interceptorsRequest) || (r = await this.config.interceptorsRequest(r));
+      const a = this.createRequestUrl(r.url, r.querys), h = this.config.timeout ?? T;
       return await new Promise((d) => {
         try {
           this.getMiniProgramWx().request({
             url: a,
-            method: o.method,
-            data: o.data,
-            header: o.header,
+            method: r.method,
+            data: r.data,
+            header: r.header,
             timeout: h,
             success: (c) => {
-              this.handleSuccess(c, o).then(d);
+              this.handleSuccess(c, r).then(d);
             },
             fail: (c) => {
               d(f.TResponse.toError(c.errMsg));
             }
           });
         } catch (c) {
-          const l = c instanceof Error ? c.message : "请求失败";
-          d(f.TResponse.toError(l));
+          const p = c instanceof Error ? c.message : "请求失败";
+          d(f.TResponse.toError(p));
         }
       });
     })();
   }
-  async handleSuccess(e, i) {
-    if (e.statusCode < T || e.statusCode >= N)
+  async handleSuccess(e, s) {
+    if (e.statusCode < m || e.statusCode >= N)
       return f.TResponse.toError(`请求失败，状态码 ${e.statusCode}`);
     let t = {
       data: e.data,
       statusCode: e.statusCode,
-      config: i
+      config: s
     };
-    return s.isNil(this.config.interceptorsResponse) || (t = await this.config.interceptorsResponse(t)), this.tryHandleSessionExpired(t.data), t.data;
+    return i.isNil(this.config.interceptorsResponse) || (t = await this.config.interceptorsResponse(t)), this.tryHandleSessionExpired(t.data), t.data;
   }
   tryHandleSessionExpired(e) {
-    if (s.isNil(this.config.loseTokenState) || s.isNil(this.config.sessionExpiredErrorKey) || s.isNil(e) || typeof e != "object")
+    if (i.isNil(this.config.loseTokenState) || i.isNil(this.config.sessionExpiredErrorKey) || i.isNil(e) || typeof e != "object")
       return;
     e.ERRORKEY === this.config.sessionExpiredErrorKey && this.config.loseTokenState();
   }
   getMiniProgramWx() {
     const e = globalThis.wx;
-    if (s.isNil(e))
+    if (i.isNil(e))
       throw new Error("当前环境不存在微信小程序 wx");
     return e;
   }
-  createRequestUrl(e, i) {
-    const t = this.config.baseURL.endsWith("/") ? this.config.baseURL.slice(0, -1) : this.config.baseURL, r = e.startsWith("/") ? e : `/${e}`, n = {
+  createRequestUrl(e, s) {
+    const t = this.config.baseURL.endsWith("/") ? this.config.baseURL.slice(0, -1) : this.config.baseURL, o = e.startsWith("/") ? e : `/${e}`, n = {
       r: Date.now(),
       ...this.createAuthQuerys(),
-      ...this.toLowerCase(i)
-    }, o = Object.entries(n).filter(([, a]) => !s.isNil(a)).map(([a, h]) => `${encodeURIComponent(a)}=${encodeURIComponent(String(h))}`).join("&");
-    return o.length === 0 ? `${t}${r}` : `${t}${r}?${o}`;
+      ...this.toLowerCase(s)
+    }, r = Object.entries(n).filter(([, a]) => !i.isNil(a)).map(([a, h]) => `${encodeURIComponent(a)}=${encodeURIComponent(String(h))}`).join("&");
+    return r.length === 0 ? `${t}${o}` : `${t}${o}?${r}`;
   }
   createAuthQuerys() {
     const e = {};
-    return !s.isNil(this.config.whobuild) && this.config.whobuild !== 0 && (e.whobuild = this.config.whobuild), !s.isNil(this.config.userIndx) && this.config.userIndx !== 0 && (e.userindx = this.config.userIndx), e;
+    return !i.isNil(this.config.whobuild) && this.config.whobuild !== 0 && (e.whobuild = this.config.whobuild), !i.isNil(this.config.userIndx) && this.config.userIndx !== 0 && (e.userindx = this.config.userIndx), e;
   }
-  createHeader(e, i) {
+  createHeader(e, s) {
     const t = {};
-    return s.isNil(e) || (t["content-type"] = e), !s.isNil(this.config.usrtoken) && this.config.usrtoken !== "" && (t.usrtoken = this.config.usrtoken), !s.isNil(this.config.dbConfig) && this.config.dbConfig !== "" && (t.dbconfig = this.config.dbConfig), s.isNil(i) || Object.assign(t, i), t;
+    return i.isNil(e) || (t["content-type"] = e), !i.isNil(this.config.usrtoken) && this.config.usrtoken !== "" && (t.usrtoken = this.config.usrtoken), !i.isNil(this.config.dbConfig) && this.config.dbConfig !== "" && (t.dbconfig = this.config.dbConfig), i.isNil(s) || Object.assign(t, s), t;
   }
   toLowerCase(e) {
-    return s.isNil(e) ? {} : s.mapKeys(e, (i, t) => t.toLowerCase());
+    return i.isNil(e) ? {} : i.mapKeys(e, (s, t) => t.toLowerCase());
   }
 }
-const C = (g) => u.create(g);
+const y = (l) => u.create(l);
 export {
   u as WxRequest,
-  C as createWxRequest
+  y as createWxRequest
 };

package/es/types.d.ts

@@ -1,4 +1,5 @@
 declare const REQUEST_TIMEOUT_MILLISECONDS = 60000;
+export type TWxHttpMethod = "GET" | "POST" | "PUT" | "DELETE";
 export interface IWxQueryParams {
     [key: string]: string | number | boolean | null | undefined;
 }
@@ -9,7 +10,7 @@ export interface IWxQueryParams {
 export interface IWxInternalRequestConfig {
     /** 业务 path，不含 baseURL / query */
     url: string;
-    method: "GET" | "POST";
+    method: TWxHttpMethod;
     querys?: IWxQueryParams;
     data?: object;
     header: Record<string, string>;
@@ -24,6 +25,13 @@ export interface IWxResponse<T = unknown> {
     statusCode: number;
     config: IWxInternalRequestConfig;
 }
+export interface IWxRequestOptions {
+    method: TWxHttpMethod;
+    querys?: IWxQueryParams;
+    data?: object;
+    headers?: Record<string, string>;
+    contentType?: string;
+}
 export type TWxInterceptorsRequest = (request: IWxInternalRequestConfig) => IWxInternalRequestConfig | Promise<IWxInternalRequestConfig>;
 export type TWxInterceptorsResponse = (response: IWxResponse) => IWxResponse | Promise<IWxResponse>;
 export interface IWxConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ningboyz/wxmp",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "private": false,
   "description": "宁波甬政微信小程序库",
   "author": "nbyt-syq",