@seayoo-web/kms 3.3.0 → 3.3.1

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/kms",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "agent for seayoo.kms",
   "type": "module",
   "source": "index.ts",
@@ -20,8 +20,8 @@
   },
   "devDependencies": {
     "@seayoo-web/request": "^3.4.0",
-    "@seayoo-web/scripts": "^3.1.2",
     "@seayoo-web/utils": "4.1.3",
+    "@seayoo-web/scripts": "^3.1.2",
     "@seayoo-web/tsconfig": "^1.0.5"
   },
   "peerDependencies": {

package/types/src/dsi.d.ts

@@ -4,7 +4,6 @@ type QuerySortBaseField = "start" | "end" | "created" | "order" | "updated" | `d
 type QuerySortField = QuerySortBaseField | `-${QuerySortBaseField}`;
 type QuerySortWithDefault = QuerySortField | `${QuerySortField}|${QuerySortField}`;
 type RecordRootField = "group" | "sn" | "start" | "end" | "order" | "data" | "created" | "updated";
-/** spell-checker:ignore Mddhh, Mddhhmm */
 export interface DsiQueryParam {
     /**
      * 指定获取某个配置，设定 sn 后，所有过滤以及分页参数均失效
@@ -149,20 +148,24 @@ export interface DsiQueryOption<T> {
     query: DsiQueryParam;
     /** 响应数据守卫函数 */
     guard: (data: unknown) => data is T;
-    /** 可选更多配置 */
-    option?: {
-        /** 开启自动缓存配置，开启后将缓存 dsi 数据，并在 dsi 接口错误时以缓存数据作为返回 */
-        cache?: boolean;
-    };
+    /** 开启自动缓存配置，开启后将缓存 dsi 数据，并在 dsi 接口错误时以缓存数据作为返回 */
+    cache?: boolean;
 }
 export declare class KMSDsi {
     req: ReturnType<NetRequestFactory>;
     private enabledCache;
     private cachePrefix;
+    /**
+     * 设置请求的 endpoint 和请求工具来初始化 KMS Dsi，第三个可选参数 enabledCache 来激活本地缓存数据
+     *
+     * 当启用本地缓存数据时，会将成功返回的数据缓存到本地，并在后续 dsi 接口出现问题时以缓存数据返回
+     *
+     * 本地缓存有效期最长为 24 小时
+     */
     constructor(endpoint: string, request: NetRequestFactory, enabledCache?: boolean);
     /**
      * 查询 Dsi 数据接口并返回接口响应，可设置是否启用本地缓存以应对网络错误的情况
      */
-    query<T = unknown>({ key, query, guard, option }: DsiQueryOption<T>): Promise<T | null>;
+    query<T = unknown>({ key, query, guard, cache }: DsiQueryOption<T>): Promise<T | null>;
 }
 export {};