@seayoo-web/kms 3.3.1 → 3.4.0

package/dist/index.js

@@ -1,39 +1,77 @@
-const h = typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : typeof window < "u" ? window : Function("return this")();
-function v(r) {
-  return typeof r == "function";
+const c = typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : typeof window < "u" ? window : Function("return this")();
+function j(t) {
+  return typeof t == "function";
 }
-function x(r) {
-  return typeof r == "object" && r !== null;
+function x(t) {
+  return typeof t == "object" && t !== null;
 }
-function C() {
-  return "localStorage" in h && x(h.localStorage) && "getItem" in h.localStorage && v(h.localStorage.getItem);
+function S() {
+  return "wx" in c && x(c.wx) && "getSystemInfo" in c.wx && j(c.wx.getSystemInfo);
 }
-function I(r, t) {
+function D() {
+  return "localStorage" in c && x(c.localStorage) && "getItem" in c.localStorage && j(c.localStorage.getItem);
+}
+function C(t, e) {
   try {
-    const e = JSON.parse(r);
-    return t ? t(e) ? e : null : e;
+    const r = JSON.parse(t);
+    return e ? e(r) ? r : null : r;
   } catch {
     return null;
   }
 }
-function P(r) {
-  const t = {}, { group: e, filter: n, filterLogic: o, range: i, created: a, updated: u, size: f, page: c, sort: s } = r, { sn: d, fields: l, dataFields: p, multi: S, combo: $, pure: A = "items", label: y, value: g, option: j } = r;
-  if (d && (t.sn = d), e && (t.g = Array.isArray(e) ? e.join(",") : e), n) {
-    const w = o === "or" ? "|" : "+", O = Object.keys(n);
-    t.filter = O.map((m) => {
+const P = {
+  get(t) {
+    return localStorage.getItem(t) || "";
+  },
+  set(t, e) {
+    localStorage.setItem(t, e);
+  },
+  remove(t) {
+    localStorage.removeItem(t);
+  }
+}, E = {
+  get(t) {
+    try {
+      if (S()) return wx.getStorageSync(t) || "";
+    } catch (e) {
+      console.error("getStorageSyncError", e);
+    }
+    return "";
+  },
+  set(t, e) {
+    try {
+      S() && wx.setStorageSync(t, e);
+    } catch (r) {
+      console.error("setStorageSyncError", r);
+    }
+  },
+  remove(t) {
+    try {
+      S() && wx.removeStorageSync(t);
+    } catch (e) {
+      console.error("removeStorageSync", e);
+    }
+  }
+};
+function J(t) {
+  const e = {}, { group: r, filter: n, filterLogic: i, range: o, created: s, updated: g, size: f, page: l, sort: a } = t, { sn: w, fields: u, dataFields: y, multi: v, combo: $, pure: A = "items", label: h, value: p, option: d } = t;
+  if (w && (e.sn = w), r && (e.g = Array.isArray(r) ? r.join(",") : r), n) {
+    const I = i === "or" ? "|" : "+", O = Object.keys(n);
+    e.filter = O.map((m) => {
       const b = n[m];
       return Array.isArray(b) ? `${m}:${b.join(",")}` : `${m}:${b}`;
-    }).join(w);
+    }).join(I);
   }
-  return i && (t.r = i), a && (t.created = a.join("-")), u && (t.updated = u.join("-")), s && (t.sort = Array.isArray(s) ? s.join(",") : s), S === !1 && (t.m = "n"), f && (t.s = `${f}`), c && (t.p = `${c}`), l && (t.f = Array.isArray(l) ? l.join(",") : l), p && (t.df = Array.isArray(p) ? p.join(",") : p), $ === !0 && (l ? t.c = "y" : console.warn("设置 combo:true 必须要同步设置 fields")), A && (t.pure = A === "items" ? "items" : "y"), y && (t.label = Array.isArray(y) ? y.join(",") : y), g && (t.value = Array.isArray(g) ? g.join(",") : g), j && (t.option = j), t._ = Math.random().toString(16).slice(-8), t;
+  return o && (e.r = o), s && (e.created = s.join("-")), g && (e.updated = g.join("-")), a && (e.sort = Array.isArray(a) ? a.join(",") : a), v === !1 && (e.m = "n"), f && (e.s = `${f}`), l && (e.p = `${l}`), u && (e.f = Array.isArray(u) ? u.join(",") : u), y && (e.df = Array.isArray(y) ? y.join(",") : y), $ === !0 && (u ? e.c = "y" : console.warn("设置 combo:true 必须要同步设置 fields")), A && (e.pure = A === "items" ? "items" : "y"), h && (e.label = Array.isArray(h) ? h.join(",") : h), p && (e.value = Array.isArray(p) ? p.join(",") : p), d && (e.option = d), e._ = Math.random().toString(16).slice(-8), e;
 }
-function D(r) {
-  return r.replace(/(?:^https?:\/\/|\/*$)/gi, "").toLowerCase();
+function N(t) {
+  return t.replace(/(?:^https?:\/\/|\/*$)/gi, "").toLowerCase();
 }
-class N {
+class L {
   req;
   enabledCache;
   cachePrefix;
+  storage;
   /**
    * 设置请求的 endpoint 和请求工具来初始化 KMS Dsi，第三个可选参数 enabledCache 来激活本地缓存数据
    *
@@ -41,37 +79,37 @@ class N {
    *
    * 本地缓存有效期最长为 24 小时
    */
-  constructor(t, e, n = !1) {
-    const o = `https://${D(t)}`;
-    this.enabledCache = n, this.cachePrefix = o.replace(/^https:\/\//i, "").replace(/[./]/g, "-") + ":", this.req = e({ baseURL: o, timeout: 6e3, maxRetry: 2, retryInterval: 150 });
+  constructor(e, r, n = !1) {
+    const i = `https://${N(e)}`;
+    this.storage = S() ? E : D() ? P : null, this.enabledCache = n, this.storage === null && n && console.warn("[KMSDsi] 缓存功能需要本地存储支持"), this.cachePrefix = i.replace(/^https:\/\//i, "").replace(/[./]/g, "-") + ":", this.req = r({ baseURL: i, timeout: 6e3, maxRetry: 2, retryInterval: 150 });
   }
   /**
    * 查询 Dsi 数据接口并返回接口响应，可设置是否启用本地缓存以应对网络错误的情况
    */
-  async query({ key: t, query: e, guard: n, cache: o }) {
-    const { data: i } = await this.req.get(t, n, { params: P(e) }), a = (o ?? this.enabledCache) && C(), u = this.cachePrefix + t + (e.page ? `:p${e.page}` : "");
-    if (i !== null)
-      return a && localStorage.setItem(u, JSON.stringify([Date.now(), e, i])), i;
-    if (!a)
-      return i;
-    const f = localStorage.getItem(`${this.cachePrefix}${t}`);
+  async query({ key: e, query: r, guard: n, cache: i }) {
+    const { data: o } = await this.req.get(e, n, { params: J(r) }), s = i ?? this.enabledCache, g = this.cachePrefix + e + (r.page ? `:p${r.page}` : "");
+    if (o !== null)
+      return s && this.storage?.set(g, JSON.stringify([Date.now(), r, o])), o;
+    if (!s)
+      return o;
+    const f = this.storage?.get(`${this.cachePrefix}${e}`);
     if (f) {
-      const c = I(f, function(s) {
-        return Array.isArray(s) && s.length === 2 && typeof s[0] == "number" && n(s[1]);
+      const l = C(f, function(a) {
+        return Array.isArray(a) && a.length === 3 && typeof a[0] == "number" && n(a[1]);
       });
-      if (c && J(e, c[1]) && c[0] + 24 * 3600 * 1e3 > Date.now())
-        return c[2];
+      if (l && K(r, l[1]) && l[0] + 24 * 3600 * 1e3 > Date.now())
+        return l[2];
     }
-    return i;
+    return o;
   }
 }
-function J(r, t) {
-  const e = Object.keys(r);
-  return e.length === Object.keys(t).length && e.every((n) => {
-    const o = r[n], i = t[n], a = typeof o;
-    return a === "string" || a === "number" || a === "boolean" || a === "bigint" ? o === i : JSON.stringify(o) === JSON.stringify(i);
+function K(t, e) {
+  const r = Object.keys(t);
+  return r.length === Object.keys(e).length && r.every((n) => {
+    const i = t[n], o = e[n], s = typeof i;
+    return s === "string" || s === "number" || s === "boolean" || s === "bigint" ? i === o : JSON.stringify(i) === JSON.stringify(o);
   });
 }
 export {
-  N as KMSDsi
+  L as KMSDsi
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/kms",
-  "version": "3.3.1",
+  "version": "3.4.0",
   "description": "agent for seayoo.kms",
   "type": "module",
   "source": "index.ts",
@@ -19,13 +19,13 @@
     "access": "public"
   },
   "devDependencies": {
-    "@seayoo-web/request": "^3.4.0",
-    "@seayoo-web/utils": "4.1.3",
-    "@seayoo-web/scripts": "^3.1.2",
+    "@seayoo-web/request": "^3.4.2",
+    "@seayoo-web/utils": "4.2.0",
+    "@seayoo-web/scripts": "^3.1.7",
     "@seayoo-web/tsconfig": "^1.0.5"
   },
   "peerDependencies": {
-    "@seayoo-web/request": "^3.4.0"
+    "@seayoo-web/request": "^3.4.2"
   },
   "scripts": {
     "prebuild": "pnpm --F request build",

package/types/src/dsi.d.ts

@@ -68,6 +68,8 @@ export interface DsiQueryParam {
     sort?: QuerySortWithDefault | QuerySortWithDefault[];
     /**
      * 是否返回所有符合要求的数据记录合集，默认 true
+     *
+     * 设置为 false 时，仅仅返回第一个符合要求的记录，如果没有任何符合要求的记录响应为 null
      */
     multi?: boolean;
     /**
@@ -155,6 +157,7 @@ export declare class KMSDsi {
     req: ReturnType<NetRequestFactory>;
     private enabledCache;
     private cachePrefix;
+    private storage;
     /**
      * 设置请求的 endpoint 和请求工具来初始化 KMS Dsi，第三个可选参数 enabledCache 来激活本地缓存数据
      *