@kevisual/api 0.0.61 → 0.0.63

package/dist/query-ai.js

@@ -1,4 +1,4 @@
-// node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/.pnpm/@kevisual+query@0.0.53/node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -201,6 +201,10 @@ class Query {
           });
         }
       }
+      const headers2 = req.headers || {};
+      if (options?.token && !headers2["Authorization"]) {
+        headers2["Authorization"] = `Bearer ${options.token}`;
+      }
     } catch (e) {
       console.error("request beforeFn error", e, req);
       return wrapperError({
@@ -261,20 +265,20 @@ class Query {
     this.afterResponse = fn;
   }
   async fetchText(urlOrOptions, options) {
-    let _options = { ...options };
+    let _options = { method: "GET", ...options };
     if (typeof urlOrOptions === "string" && !_options.url) {
       _options.url = urlOrOptions;
     }
     if (typeof urlOrOptions === "object") {
       _options = { ...urlOrOptions, ..._options };
     }
+    const headers = { ...this.headers, ..._options.headers };
+    if (options?.token && !headers["Authorization"] && _options.method !== "GET") {
+      headers["Authorization"] = `Bearer ${options.token}`;
+    }
     const res = await adapter({
-      method: "GET",
       ..._options,
-      headers: {
-        ...this.headers,
-        ..._options?.headers || {}
-      }
+      headers
     });
     if (res && !res.code) {
       return {
@@ -286,7 +290,7 @@ class Query {
   }
 }
 
-// node_modules/@kevisual/router/dist/router-define.js
+// node_modules/.pnpm/@kevisual+router@0.1.1/node_modules/@kevisual/router/dist/router-define.js
 class Chain {
   object;
   app;
@@ -420,7 +424,7 @@ var appDefine = QueryUtil.create({
   }
 });
 
-// node_modules/@kevisual/query/dist/query.js
+// node_modules/.pnpm/@kevisual+query@0.0.53/node_modules/@kevisual/query/dist/query.js
 class BaseQuery {
   query;
   queryDefine;

package/dist/query-app.js

@@ -1,4 +1,4 @@
-// node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/.pnpm/@kevisual+query@0.0.53/node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -201,6 +201,10 @@ class Query {
           });
         }
       }
+      const headers2 = req.headers || {};
+      if (options?.token && !headers2["Authorization"]) {
+        headers2["Authorization"] = `Bearer ${options.token}`;
+      }
     } catch (e) {
       console.error("request beforeFn error", e, req);
       return wrapperError({
@@ -261,20 +265,20 @@ class Query {
     this.afterResponse = fn;
   }
   async fetchText(urlOrOptions, options) {
-    let _options = { ...options };
+    let _options = { method: "GET", ...options };
     if (typeof urlOrOptions === "string" && !_options.url) {
       _options.url = urlOrOptions;
     }
     if (typeof urlOrOptions === "object") {
       _options = { ...urlOrOptions, ..._options };
     }
+    const headers = { ...this.headers, ..._options.headers };
+    if (options?.token && !headers["Authorization"] && _options.method !== "GET") {
+      headers["Authorization"] = `Bearer ${options.token}`;
+    }
     const res = await adapter({
-      method: "GET",
       ..._options,
-      headers: {
-        ...this.headers,
-        ..._options?.headers || {}
-      }
+      headers
     });
     if (res && !res.code) {
       return {
@@ -286,7 +290,7 @@ class Query {
   }
 }
 
-// node_modules/@kevisual/router/dist/router-define.js
+// node_modules/.pnpm/@kevisual+router@0.1.1/node_modules/@kevisual/router/dist/router-define.js
 class Chain {
   object;
   app;
@@ -494,7 +498,7 @@ var userAppDefine = QueryUtil.create({
   }
 });
 
-// node_modules/@kevisual/query/dist/query.js
+// node_modules/.pnpm/@kevisual+query@0.0.53/node_modules/@kevisual/query/dist/query.js
 class BaseQuery {
   query;
   queryDefine;

package/dist/query-config.js

@@ -1,4 +1,4 @@
-// node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/.pnpm/@kevisual+query@0.0.53/node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -201,6 +201,10 @@ class Query {
           });
         }
       }
+      const headers2 = req.headers || {};
+      if (options?.token && !headers2["Authorization"]) {
+        headers2["Authorization"] = `Bearer ${options.token}`;
+      }
     } catch (e) {
       console.error("request beforeFn error", e, req);
       return wrapperError({
@@ -261,20 +265,20 @@ class Query {
     this.afterResponse = fn;
   }
   async fetchText(urlOrOptions, options) {
-    let _options = { ...options };
+    let _options = { method: "GET", ...options };
     if (typeof urlOrOptions === "string" && !_options.url) {
       _options.url = urlOrOptions;
     }
     if (typeof urlOrOptions === "object") {
       _options = { ...urlOrOptions, ..._options };
     }
+    const headers = { ...this.headers, ..._options.headers };
+    if (options?.token && !headers["Authorization"] && _options.method !== "GET") {
+      headers["Authorization"] = `Bearer ${options.token}`;
+    }
     const res = await adapter({
-      method: "GET",
       ..._options,
-      headers: {
-        ...this.headers,
-        ..._options?.headers || {}
-      }
+      headers
     });
     if (res && !res.code) {
       return {

package/dist/query-login-node.d.ts

@@ -1,5 +1,6 @@
 import { BaseQuery, Query } from '@kevisual/query';
 import { DataOpts, Result } from '@kevisual/query/query';
+import { EventEmitter } from 'eventemitter3';
 
 interface Cache {
     /**
@@ -107,12 +108,14 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      */
     cacheStore: CacheStore<T>;
     isBrowser: boolean;
-    load?: boolean;
     storage: Storage;
+    load: boolean;
+    status: 'init' | 'logining' | 'loginSuccess' | 'loginError';
     onLoad?: () => void;
+    emitter: EventEmitter<string | symbol, any>;
     constructor(opts?: QueryLoginOpts<T>);
     setQuery(query: Query): void;
-    private init;
+    init(): Promise<unknown>;
     post<T = any>(data: any, opts?: DataOpts): Promise<any>;
     /**
      * 登录,

package/dist/query-login-node.js

@@ -1,4 +1,200 @@
-// node_modules/@kevisual/query/dist/query-browser.js
+var __create = Object.create;
+var __getProtoOf = Object.getPrototypeOf;
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __toESM = (mod, isNodeMode, target) => {
+  target = mod != null ? __create(__getProtoOf(mod)) : {};
+  const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
+  for (let key of __getOwnPropNames(mod))
+    if (!__hasOwnProp.call(to, key))
+      __defProp(to, key, {
+        get: () => mod[key],
+        enumerable: true
+      });
+  return to;
+};
+var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+
+// node_modules/.pnpm/eventemitter3@5.0.4/node_modules/eventemitter3/index.js
+var require_eventemitter3 = __commonJS((exports, module) => {
+  var has = Object.prototype.hasOwnProperty;
+  var prefix = "~";
+  function Events() {}
+  if (Object.create) {
+    Events.prototype = Object.create(null);
+    if (!new Events().__proto__)
+      prefix = false;
+  }
+  function EE(fn, context, once) {
+    this.fn = fn;
+    this.context = context;
+    this.once = once || false;
+  }
+  function addListener(emitter, event, fn, context, once) {
+    if (typeof fn !== "function") {
+      throw new TypeError("The listener must be a function");
+    }
+    var listener = new EE(fn, context || emitter, once), evt = prefix ? prefix + event : event;
+    if (!emitter._events[evt])
+      emitter._events[evt] = listener, emitter._eventsCount++;
+    else if (!emitter._events[evt].fn)
+      emitter._events[evt].push(listener);
+    else
+      emitter._events[evt] = [emitter._events[evt], listener];
+    return emitter;
+  }
+  function clearEvent(emitter, evt) {
+    if (--emitter._eventsCount === 0)
+      emitter._events = new Events;
+    else
+      delete emitter._events[evt];
+  }
+  function EventEmitter2() {
+    this._events = new Events;
+    this._eventsCount = 0;
+  }
+  EventEmitter2.prototype.eventNames = function eventNames() {
+    var names = [], events, name;
+    if (this._eventsCount === 0)
+      return names;
+    for (name in events = this._events) {
+      if (has.call(events, name))
+        names.push(prefix ? name.slice(1) : name);
+    }
+    if (Object.getOwnPropertySymbols) {
+      return names.concat(Object.getOwnPropertySymbols(events));
+    }
+    return names;
+  };
+  EventEmitter2.prototype.listeners = function listeners(event) {
+    var evt = prefix ? prefix + event : event, handlers = this._events[evt];
+    if (!handlers)
+      return [];
+    if (handlers.fn)
+      return [handlers.fn];
+    for (var i = 0, l = handlers.length, ee = new Array(l);i < l; i++) {
+      ee[i] = handlers[i].fn;
+    }
+    return ee;
+  };
+  EventEmitter2.prototype.listenerCount = function listenerCount(event) {
+    var evt = prefix ? prefix + event : event, listeners = this._events[evt];
+    if (!listeners)
+      return 0;
+    if (listeners.fn)
+      return 1;
+    return listeners.length;
+  };
+  EventEmitter2.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {
+    var evt = prefix ? prefix + event : event;
+    if (!this._events[evt])
+      return false;
+    var listeners = this._events[evt], len = arguments.length, args, i;
+    if (listeners.fn) {
+      if (listeners.once)
+        this.removeListener(event, listeners.fn, undefined, true);
+      switch (len) {
+        case 1:
+          return listeners.fn.call(listeners.context), true;
+        case 2:
+          return listeners.fn.call(listeners.context, a1), true;
+        case 3:
+          return listeners.fn.call(listeners.context, a1, a2), true;
+        case 4:
+          return listeners.fn.call(listeners.context, a1, a2, a3), true;
+        case 5:
+          return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;
+        case 6:
+          return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;
+      }
+      for (i = 1, args = new Array(len - 1);i < len; i++) {
+        args[i - 1] = arguments[i];
+      }
+      listeners.fn.apply(listeners.context, args);
+    } else {
+      var length = listeners.length, j;
+      for (i = 0;i < length; i++) {
+        if (listeners[i].once)
+          this.removeListener(event, listeners[i].fn, undefined, true);
+        switch (len) {
+          case 1:
+            listeners[i].fn.call(listeners[i].context);
+            break;
+          case 2:
+            listeners[i].fn.call(listeners[i].context, a1);
+            break;
+          case 3:
+            listeners[i].fn.call(listeners[i].context, a1, a2);
+            break;
+          case 4:
+            listeners[i].fn.call(listeners[i].context, a1, a2, a3);
+            break;
+          default:
+            if (!args)
+              for (j = 1, args = new Array(len - 1);j < len; j++) {
+                args[j - 1] = arguments[j];
+              }
+            listeners[i].fn.apply(listeners[i].context, args);
+        }
+      }
+    }
+    return true;
+  };
+  EventEmitter2.prototype.on = function on(event, fn, context) {
+    return addListener(this, event, fn, context, false);
+  };
+  EventEmitter2.prototype.once = function once(event, fn, context) {
+    return addListener(this, event, fn, context, true);
+  };
+  EventEmitter2.prototype.removeListener = function removeListener(event, fn, context, once) {
+    var evt = prefix ? prefix + event : event;
+    if (!this._events[evt])
+      return this;
+    if (!fn) {
+      clearEvent(this, evt);
+      return this;
+    }
+    var listeners = this._events[evt];
+    if (listeners.fn) {
+      if (listeners.fn === fn && (!once || listeners.once) && (!context || listeners.context === context)) {
+        clearEvent(this, evt);
+      }
+    } else {
+      for (var i = 0, events = [], length = listeners.length;i < length; i++) {
+        if (listeners[i].fn !== fn || once && !listeners[i].once || context && listeners[i].context !== context) {
+          events.push(listeners[i]);
+        }
+      }
+      if (events.length)
+        this._events[evt] = events.length === 1 ? events[0] : events;
+      else
+        clearEvent(this, evt);
+    }
+    return this;
+  };
+  EventEmitter2.prototype.removeAllListeners = function removeAllListeners(event) {
+    var evt;
+    if (event) {
+      evt = prefix ? prefix + event : event;
+      if (this._events[evt])
+        clearEvent(this, evt);
+    } else {
+      this._events = new Events;
+      this._eventsCount = 0;
+    }
+    return this;
+  };
+  EventEmitter2.prototype.off = EventEmitter2.prototype.removeListener;
+  EventEmitter2.prototype.addListener = EventEmitter2.prototype.on;
+  EventEmitter2.prefixed = prefix;
+  EventEmitter2.EventEmitter = EventEmitter2;
+  if (typeof module !== "undefined") {
+    module.exports = EventEmitter2;
+  }
+});
+
+// node_modules/.pnpm/@kevisual+query@0.0.53/node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -201,6 +397,10 @@ class Query {
           });
         }
       }
+      const headers2 = req.headers || {};
+      if (options?.token && !headers2["Authorization"]) {
+        headers2["Authorization"] = `Bearer ${options.token}`;
+      }
     } catch (e) {
       console.error("request beforeFn error", e, req);
       return wrapperError({
@@ -261,20 +461,20 @@ class Query {
     this.afterResponse = fn;
   }
   async fetchText(urlOrOptions, options) {
-    let _options = { ...options };
+    let _options = { method: "GET", ...options };
     if (typeof urlOrOptions === "string" && !_options.url) {
       _options.url = urlOrOptions;
     }
     if (typeof urlOrOptions === "object") {
       _options = { ...urlOrOptions, ..._options };
     }
+    const headers = { ...this.headers, ..._options.headers };
+    if (options?.token && !headers["Authorization"] && _options.method !== "GET") {
+      headers["Authorization"] = `Bearer ${options.token}`;
+    }
     const res = await adapter({
-      method: "GET",
       ..._options,
-      headers: {
-        ...this.headers,
-        ..._options?.headers || {}
-      }
+      headers
     });
     if (res && !res.code) {
       return {
@@ -348,17 +548,19 @@ class LoginCacheStore {
   }
   async init() {
     const defaultData = { ...this.cacheData };
-    if (this.cache.init) {
-      try {
-        const cacheData = await this.cache.init();
-        this.cacheData = cacheData || defaultData;
-      } catch (error) {
-        console.log("cacheInit error", error);
+    return new Promise(async (resolve) => {
+      if (this.cache.init) {
+        try {
+          const cacheData = await this.cache.init();
+          this.cacheData = cacheData || defaultData;
+        } catch (error) {
+          console.log("cacheInit error", error);
+        }
+      } else {
+        this.cacheData = await this.getValue() || defaultData;
       }
-    } else {
-      this.cacheData = await this.getValue() || defaultData;
-    }
-    return this.cacheData;
+      resolve(this.cacheData);
+    });
   }
   async setLoginUser(loginUser) {
     const has = this.cacheData.loginUsers.find((u) => u.id === loginUser.id);
@@ -877,13 +1079,18 @@ class BaseLoad {
   }
 }
 
+// node_modules/.pnpm/eventemitter3@5.0.4/node_modules/eventemitter3/index.mjs
+var import__ = __toESM(require_eventemitter3(), 1);
+
 // query/query-login/query-login.ts
 class QueryLogin extends BaseQuery {
   cacheStore;
   isBrowser;
-  load;
   storage;
+  load = false;
+  status = "init";
   onLoad;
+  emitter = new import__.default;
   constructor(opts) {
     super({
       query: opts?.query || new Query
@@ -896,14 +1103,29 @@ class QueryLogin extends BaseQuery {
     if (!this.storage) {
       throw new Error("storage is required");
     }
+    this.cacheStore.init().then(() => {
+      this.onLoad?.();
+      this.load = true;
+      this.emitter.emit("load");
+    });
   }
   setQuery(query) {
     this.query = query;
   }
   async init() {
-    await this.cacheStore.init();
-    this.load = true;
-    this.onLoad?.();
+    if (this.load) {
+      return this.cacheStore.cacheData;
+    }
+    return new Promise(async (resolve) => {
+      const timer = setTimeout(() => {
+        resolve(this.cacheStore.cacheData);
+      }, 1000 * 20);
+      const listener = () => {
+        clearTimeout(timer);
+        resolve(this.cacheStore.cacheData);
+      };
+      this.emitter.once("load", listener);
+    });
   }
   async post(data, opts) {
     try {

package/dist/query-login.d.ts

@@ -1,5 +1,6 @@
 import { BaseQuery, Query } from '@kevisual/query';
 import { DataOpts, Result } from '@kevisual/query/query';
+import { EventEmitter } from 'eventemitter3';
 
 interface Cache {
     /**
@@ -107,12 +108,14 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      */
     cacheStore: CacheStore<T>;
     isBrowser: boolean;
-    load?: boolean;
     storage: Storage;
+    load: boolean;
+    status: 'init' | 'logining' | 'loginSuccess' | 'loginError';
     onLoad?: () => void;
+    emitter: EventEmitter<string | symbol, any>;
     constructor(opts?: QueryLoginOpts<T>);
     setQuery(query: Query): void;
-    private init;
+    init(): Promise<unknown>;
     post<T = any>(data: any, opts?: DataOpts): Promise<any>;
     /**
      * 登录,