@seayoo-web/kms 3.0.2 → 3.1.1

package/dist/index.js

@@ -1,50 +1,38 @@
 var L = Object.defineProperty;
-var D = (t, r, i) => r in t ? L(t, r, { enumerable: !0, configurable: !0, writable: !0, value: i }) : t[r] = i;
-var w = (t, r, i) => D(t, typeof r != "symbol" ? r + "" : r, i);
-import { jsonp as k, jsonx as z } from "@seayoo-web/request";
-function y(t) {
-  const r = {}, { group: i, filter: a, filterLogic: s, range: l, created: j, updated: d, size: m, page: A, sort: e } = t, { sn: $, fields: o, dataFields: n, multi: h, combo: v, pure: g = "items", label: c, value: f, option: b } = t;
-  if ($ && (r.sn = $), i && (r.g = Array.isArray(i) ? i.join(",") : i), a) {
-    const q = s === "or" ? "|" : "+", x = Object.keys(a);
-    r.filter = x.map((p) => {
-      const u = a[p];
-      return Array.isArray(u) ? `${p}:${u.join(",")}` : `${p}:${u}`;
+var x = (t, r, i) => r in t ? L(t, r, { enumerable: !0, configurable: !0, writable: !0, value: i }) : t[r] = i;
+var b = (t, r, i) => x(t, typeof r != "symbol" ? r + "" : r, i);
+function D(t) {
+  const r = {}, { group: i, filter: e, filterLogic: c, range: l, created: p, updated: A, size: m, page: d, sort: s } = t, { sn: j, fields: a, dataFields: o, multi: v, combo: h, pure: g = "items", label: n, value: f, option: $ } = t;
+  if (j && (r.sn = j), i && (r.g = Array.isArray(i) ? i.join(",") : i), e) {
+    const q = c === "or" ? "|" : "+", w = Object.keys(e);
+    r.filter = w.map((y) => {
+      const u = e[y];
+      return Array.isArray(u) ? `${y}:${u.join(",")}` : `${y}:${u}`;
     }).join(q);
   }
-  return l && (r.r = l), j && (r.created = j.join("-")), d && (r.updated = d.join("-")), e && (r.sort = Array.isArray(e) ? e.join(",") : e), h === !1 && (r.m = "n"), m && (r.s = `${m}`), A && (r.p = `${A}`), o && (r.f = Array.isArray(o) ? o.join(",") : o), n && (r.df = Array.isArray(n) ? n.join(",") : n), v === !0 && (o ? r.c = "y" : console.warn("设置 combo:true 必须要同步设置 fields")), g && (r.pure = g === "items" ? "items" : "y"), c && (r.label = Array.isArray(c) ? c.join(",") : c), f && (r.value = Array.isArray(f) ? f.join(",") : f), b && (r.option = b), r;
+  return l && (r.r = l), p && (r.created = p.join("-")), A && (r.updated = A.join("-")), s && (r.sort = Array.isArray(s) ? s.join(",") : s), v === !1 && (r.m = "n"), m && (r.s = `${m}`), d && (r.p = `${d}`), a && (r.f = Array.isArray(a) ? a.join(",") : a), o && (r.df = Array.isArray(o) ? o.join(",") : o), h === !0 && (a ? r.c = "y" : console.warn("设置 combo:true 必须要同步设置 fields")), g && (r.pure = g === "items" ? "items" : "y"), n && (r.label = Array.isArray(n) ? n.join(",") : n), f && (r.value = Array.isArray(f) ? f.join(",") : f), $ && (r.option = $), r;
 }
-function C(t) {
+function R(t) {
   return t.replace(/(?:^https?:\/\/|\/*$)/gi, "").toLowerCase();
 }
-class K {
+class z {
   constructor(r, i) {
-    w(this, "req");
-    this.req = i({ baseURL: `https://${C(r)}`, timeout: 1e4 });
+    b(this, "req");
+    this.req = i({
+      baseURL: `https://${R(r)}`,
+      timeout: 1e4,
+      maxRetry: 3,
+      retryInterval: 150
+    });
   }
   /**
    * 查询 Dsi 数据接口并返回接口响应
    */
-  async query({ key: r, query: i, guard: a }) {
-    const { data: s } = await this.req.get(r, a, { params: y(i) });
-    return s;
-  }
-  /**
-   * 通过 jsonp 方式加载 dsi 数据
-   *
-   * ⚠️ 微信环境下不支持
-   */
-  async jsonp({ key: r, query: i, guard: a }) {
-    return await k(`${r}/jsonp`, a, y(i));
-  }
-  /**
-   * 通过 jsonx(script) 方式加载 dsi 数据
-   *
-   * ⚠️ 微信环境下不支持
-   */
-  async jsonx({ key: r, query: i, guard: a }) {
-    return await z(`${r}/script`, a, y(i));
+  async query({ key: r, query: i, guard: e }) {
+    const { data: c } = await this.req.get(r, e, { params: D(i) });
+    return c;
   }
 }
 export {
-  K as KMSDsi
+  z as KMSDsi
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/kms",
-  "version": "3.0.2",
+  "version": "3.1.1",
   "description": "agent for seayoo.kms",
   "type": "module",
   "source": "index.ts",
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@seayoo-web/request": "^3.0.4",
-    "@seayoo-web/scripts": "^2.1.0",
+    "@seayoo-web/scripts": "^2.4.1",
     "@seayoo-web/tsconfig": "^1.0.3"
   },
   "scripts": {

package/types/src/dsi.d.ts

@@ -1,4 +1,4 @@
-import { type NetRequestFactory } from "@seayoo-web/request";
+import type { NetRequestFactory } from "@seayoo-web/request";
 type BaseFieldType = string | number | null;
 type QuerySortBaseField = "start" | "end" | "created" | "order" | "updated" | `data.${string}`;
 type QuerySortField = QuerySortBaseField | `-${QuerySortBaseField}`;
@@ -27,11 +27,11 @@ export interface DsiQueryParam {
     /**
      * 可选有效期过滤参数，对配置的有效期进行过滤，可选值有五个：
      *
-     * - left 过滤所有已经失效的配置
-     * - center 过滤所有生效中的配置（默认值）
-     * - right 过滤所有尚未生效的配置
-     * - forward 过滤所有生效中以及待生效的配置
-     * - all 返回所有配置
+     * - `left` 过滤所有已经失效的配置
+     * - `center` 过滤所有生效中的配置（默认值）
+     * - `right` 过滤所有尚未生效的配置
+     * - `forward` 过滤所有生效中以及待生效的配置
+     * - `all` 返回所有配置
      */
     range?: "left" | "center" | "right" | "forward" | "all";
     /**
@@ -157,17 +157,5 @@ export declare class KMSDsi {
      * 查询 Dsi 数据接口并返回接口响应
      */
     query<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
-    /**
-     * 通过 jsonp 方式加载 dsi 数据
-     *
-     * ⚠️ 微信环境下不支持
-     */
-    jsonp<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
-    /**
-     * 通过 jsonx(script) 方式加载 dsi 数据
-     *
-     * ⚠️ 微信环境下不支持
-     */
-    jsonx<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
 }
 export {};