@kevisual/kv-login 0.1.15 → 0.1.17

package/dist/app.js

@@ -16,6 +16,184 @@ var __toESM = (mod, isNodeMode, target) => {
 };
 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_eventemitter32 = __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 EventEmitter4() {
+    this._events = new Events;
+    this._eventsCount = 0;
+  }
+  EventEmitter4.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;
+  };
+  EventEmitter4.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;
+  };
+  EventEmitter4.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;
+  };
+  EventEmitter4.prototype.emit = function emit2(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;
+  };
+  EventEmitter4.prototype.on = function on(event, fn, context) {
+    return addListener(this, event, fn, context, false);
+  };
+  EventEmitter4.prototype.once = function once(event, fn, context) {
+    return addListener(this, event, fn, context, true);
+  };
+  EventEmitter4.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;
+  };
+  EventEmitter4.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;
+  };
+  EventEmitter4.prototype.off = EventEmitter4.prototype.removeListener;
+  EventEmitter4.prototype.addListener = EventEmitter4.prototype.on;
+  EventEmitter4.prefixed = prefix;
+  EventEmitter4.EventEmitter = EventEmitter4;
+  if (typeof module !== "undefined") {
+    module.exports = EventEmitter4;
+  }
+});
+
 // node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/can-promise.js
 var require_can_promise = __commonJS((exports, module) => {
   module.exports = function() {
@@ -2972,7 +3150,7 @@ UnsafeHTMLDirective.directiveName = "unsafeHTML";
 UnsafeHTMLDirective.resultType = HTML_RESULT2;
 var unsafeHTML = directive(UnsafeHTMLDirective);
 
-// node_modules/.pnpm/@kevisual+query@0.0.49/node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/.pnpm/@kevisual+query@0.0.52/node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -3285,7 +3463,200 @@ class BaseQuery {
   }
 }
 
-// node_modules/.pnpm/@kevisual+api@0.0.59_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login.js
+// node_modules/.pnpm/@kevisual+api@0.0.62_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login.js
+var __create2 = Object.create;
+var __getProtoOf2 = Object.getPrototypeOf;
+var __defProp2 = Object.defineProperty;
+var __getOwnPropNames2 = Object.getOwnPropertyNames;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __toESM2 = (mod, isNodeMode, target) => {
+  target = mod != null ? __create2(__getProtoOf2(mod)) : {};
+  const to = isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target;
+  for (let key of __getOwnPropNames2(mod))
+    if (!__hasOwnProp2.call(to, key))
+      __defProp2(to, key, {
+        get: () => mod[key],
+        enumerable: true
+      });
+  return to;
+};
+var __commonJS2 = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var require_eventemitter3 = __commonJS2((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;
+  }
+});
 var isTextForContentType2 = (contentType) => {
   if (!contentType)
     return false;
@@ -3597,6 +3968,15 @@ class BaseQuery2 {
     return this.query.get(data, options);
   }
 }
+var defaultCacheData = {
+  loginUsers: [],
+  user: undefined,
+  id: undefined,
+  accessToken: undefined,
+  refreshToken: undefined,
+  accessTokenExpiresIn: undefined,
+  createdAt: undefined
+};
 
 class LoginCacheStore {
   cache;
@@ -3607,13 +3987,7 @@ class LoginCacheStore {
       throw new Error("cache is required");
     }
     this.cache = opts.cache;
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData };
     this.name = opts.name;
   }
   async setValue(value) {
@@ -3623,51 +3997,39 @@ class LoginCacheStore {
   }
   async delValue() {
     await this.cache.del();
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData };
   }
   getValue() {
     return this.cache.get(this.name);
   }
   async init() {
-    const defaultData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined,
-      accessTokenExpiresIn: undefined,
-      createdAt: undefined
-    };
-    if (this.cache.init) {
-      try {
-        const cacheData = await this.cache.init();
-        this.cacheData = cacheData || defaultData;
-      } catch (error) {
-        console.log("cacheInit error", error);
+    const defaultData = { ...this.cacheData };
+    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(user) {
-    const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
+  async setLoginUser(loginUser) {
+    const has = this.cacheData.loginUsers.find((u) => u.id === loginUser.id);
     if (has) {
-      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
-    }
-    this.cacheData.loginUsers.push(user);
-    this.cacheData.user = user.user;
-    this.cacheData.id = user.id;
-    this.cacheData.accessToken = user.accessToken;
-    this.cacheData.refreshToken = user.refreshToken;
-    this.cacheData.accessTokenExpiresIn = user.accessTokenExpiresIn;
-    this.cacheData.createdAt = user.createdAt;
+      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== loginUser.id);
+    }
+    this.cacheData.loginUsers.push(loginUser);
+    this.cacheData.user = loginUser.user;
+    this.cacheData.id = loginUser.id;
+    this.cacheData.accessToken = loginUser.accessToken;
+    this.cacheData.refreshToken = loginUser.refreshToken;
+    this.cacheData.accessTokenExpiresIn = loginUser.accessTokenExpiresIn;
+    this.cacheData.createdAt = loginUser.createdAt;
     await this.setValue(this.cacheData);
   }
   getCurrentUser() {
@@ -3703,22 +4065,22 @@ class LoginCacheStore {
     if (has) {
       this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
     }
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    const hasOther = this.cacheData.loginUsers.length > 0;
+    const current = this.cacheData.loginUsers[this.cacheData.loginUsers.length - 1];
+    if (hasOther && current) {
+      this.cacheData.user = current.user;
+      this.cacheData.id = current.id;
+      this.cacheData.accessToken = current.accessToken;
+      this.cacheData.refreshToken = current.refreshToken;
+      this.cacheData.accessTokenExpiresIn = current.accessTokenExpiresIn;
+      this.cacheData.createdAt = current.createdAt;
+    } else {
+      this.cacheData = { ...defaultCacheData };
+    }
     await this.setValue(this.cacheData);
   }
   async clearAll() {
-    this.cacheData.loginUsers = [];
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    this.cacheData = { ...defaultCacheData };
     await this.setValue(this.cacheData);
   }
 }
@@ -4170,13 +4532,16 @@ class BaseLoad {
     }
   }
 }
+var import__ = __toESM2(require_eventemitter3(), 1);
 
 class QueryLogin extends BaseQuery2 {
   cacheStore;
   isBrowser;
-  load;
   storage;
+  load = false;
+  status = "init";
   onLoad;
+  emitter = new import__.default;
   constructor(opts) {
     super({
       query: opts?.query || new Query2
@@ -4189,14 +4554,29 @@ class QueryLogin extends BaseQuery2 {
     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 {
@@ -4306,7 +4686,7 @@ class QueryLogin extends BaseQuery2 {
   async queryRefreshToken(opts) {
     const refreshToken = opts?.refreshToken;
     let accessToken = opts?.accessToken;
-    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
+    const _refreshToken = refreshToken ?? await this.cacheStore.getRefreshToken();
     let data = {};
     if (accessToken) {
       data.accessToken = accessToken;
@@ -4417,6 +4797,7 @@ class QueryLogin extends BaseQuery2 {
     }
     const isExpired = await this.cacheStore.getIsExpired();
     if (isExpired) {
+      console.log("token过期，正在刷新token", this.cacheStore.cacheData);
       const res = await this.refreshLoginUser();
       if (res.code === 200) {
         return res.data?.accessToken || null;
@@ -4772,8 +5153,8 @@ class MyCache extends CacheStore2 {
     super(rest);
     this.key = key || "my-cache";
   }
-  async getData() {
-    return super.getCheckData(this.key);
+  async getData(key = this.key) {
+    return super.getCheckData(key);
   }
   async setData(data, opts) {
     super.setCheckData(this.key, data, opts);
@@ -5168,7 +5549,17 @@ class EventEmitter2 {
 var eventEmitter = new EventEmitter2;
 var emit = (event) => eventEmitter.emit(event);
 
-// node_modules/.pnpm/@kevisual+api@0.0.59_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-login/login-cache.ts
+// node_modules/.pnpm/@kevisual+api@0.0.62_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-login/login-cache.ts
+var defaultCacheData2 = {
+  loginUsers: [],
+  user: undefined,
+  id: undefined,
+  accessToken: undefined,
+  refreshToken: undefined,
+  accessTokenExpiresIn: undefined,
+  createdAt: undefined
+};
+
 class LoginCacheStore2 {
   cache;
   name;
@@ -5178,13 +5569,7 @@ class LoginCacheStore2 {
       throw new Error("cache is required");
     }
     this.cache = opts.cache;
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData2 };
     this.name = opts.name;
   }
   async setValue(value) {
@@ -5194,51 +5579,39 @@ class LoginCacheStore2 {
   }
   async delValue() {
     await this.cache.del();
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData2 };
   }
   getValue() {
     return this.cache.get(this.name);
   }
   async init() {
-    const defaultData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined,
-      accessTokenExpiresIn: undefined,
-      createdAt: undefined
-    };
-    if (this.cache.init) {
-      try {
-        const cacheData = await this.cache.init();
-        this.cacheData = cacheData || defaultData;
-      } catch (error) {
-        console.log("cacheInit error", error);
+    const defaultData = { ...this.cacheData };
+    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(user) {
-    const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
+  async setLoginUser(loginUser) {
+    const has = this.cacheData.loginUsers.find((u) => u.id === loginUser.id);
     if (has) {
-      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
-    }
-    this.cacheData.loginUsers.push(user);
-    this.cacheData.user = user.user;
-    this.cacheData.id = user.id;
-    this.cacheData.accessToken = user.accessToken;
-    this.cacheData.refreshToken = user.refreshToken;
-    this.cacheData.accessTokenExpiresIn = user.accessTokenExpiresIn;
-    this.cacheData.createdAt = user.createdAt;
+      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== loginUser.id);
+    }
+    this.cacheData.loginUsers.push(loginUser);
+    this.cacheData.user = loginUser.user;
+    this.cacheData.id = loginUser.id;
+    this.cacheData.accessToken = loginUser.accessToken;
+    this.cacheData.refreshToken = loginUser.refreshToken;
+    this.cacheData.accessTokenExpiresIn = loginUser.accessTokenExpiresIn;
+    this.cacheData.createdAt = loginUser.createdAt;
     await this.setValue(this.cacheData);
   }
   getCurrentUser() {
@@ -5274,22 +5647,22 @@ class LoginCacheStore2 {
     if (has) {
       this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
     }
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    const hasOther = this.cacheData.loginUsers.length > 0;
+    const current = this.cacheData.loginUsers[this.cacheData.loginUsers.length - 1];
+    if (hasOther && current) {
+      this.cacheData.user = current.user;
+      this.cacheData.id = current.id;
+      this.cacheData.accessToken = current.accessToken;
+      this.cacheData.refreshToken = current.refreshToken;
+      this.cacheData.accessTokenExpiresIn = current.accessTokenExpiresIn;
+      this.cacheData.createdAt = current.createdAt;
+    } else {
+      this.cacheData = { ...defaultCacheData2 };
+    }
     await this.setValue(this.cacheData);
   }
   async clearAll() {
-    this.cacheData.loginUsers = [];
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    this.cacheData = { ...defaultCacheData2 };
     await this.setValue(this.cacheData);
   }
 }
@@ -5744,13 +6117,18 @@ class BaseLoad2 {
   }
 }
 
-// node_modules/.pnpm/@kevisual+api@0.0.59_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-login/query-login.ts
+// node_modules/.pnpm/eventemitter3@5.0.4/node_modules/eventemitter3/index.mjs
+var import__2 = __toESM(require_eventemitter32(), 1);
+
+// node_modules/.pnpm/@kevisual+api@0.0.62_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-login/query-login.ts
 class QueryLogin2 extends BaseQuery {
   cacheStore;
   isBrowser;
-  load;
   storage;
+  load = false;
+  status = "init";
   onLoad;
+  emitter = new import__2.default;
   constructor(opts) {
     super({
       query: opts?.query || new Query
@@ -5763,14 +6141,29 @@ class QueryLogin2 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(query2) {
     this.query = query2;
   }
   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 {
@@ -5880,7 +6273,7 @@ class QueryLogin2 extends BaseQuery {
   async queryRefreshToken(opts) {
     const refreshToken = opts?.refreshToken;
     let accessToken = opts?.accessToken;
-    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
+    const _refreshToken = refreshToken ?? await this.cacheStore.getRefreshToken();
     let data = {};
     if (accessToken) {
       data.accessToken = accessToken;
@@ -5991,6 +6384,7 @@ class QueryLogin2 extends BaseQuery {
     }
     const isExpired = await this.cacheStore.getIsExpired();
     if (isExpired) {
+      console.log("token过期，正在刷新token", this.cacheStore.cacheData);
       const res = await this.refreshLoginUser();
       if (res.code === 200) {
         return res.data?.accessToken || null;
@@ -6135,7 +6529,7 @@ class QueryLogin2 extends BaseQuery {
   }
 }
 
-// node_modules/.pnpm/@kevisual+cache@0.0.5/node_modules/@kevisual/cache/dist/cache.js
+// node_modules/.pnpm/idb-keyval@6.2.2/node_modules/idb-keyval/dist/index.js
 function promisifyRequest2(request) {
   return new Promise((resolve, reject) => {
     request.oncomplete = request.onsuccess = () => resolve(request.result);
@@ -6252,6 +6646,7 @@ function entries2(customStore = defaultGetStore2()) {
   });
 }
 
+// node_modules/.pnpm/@kevisual+api@0.0.62_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-login/browser-cache/cache-store.ts
 class BaseCacheStore2 {
   store;
   constructor(opts) {
@@ -6340,7 +6735,7 @@ class CacheStore3 extends BaseCacheStore2 {
     return this.del(key);
   }
 }
-
+// node_modules/.pnpm/@kevisual+api@0.0.62_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-login/browser-cache/cache.ts
 class MyCache2 extends CacheStore3 {
   key;
   constructor(opts) {
@@ -6348,8 +6743,8 @@ class MyCache2 extends CacheStore3 {
     super(rest);
     this.key = key || "my-cache";
   }
-  async getData() {
-    return super.getCheckData(this.key);
+  async getData(key = this.key) {
+    return super.getCheckData(key);
   }
   async setData(data, opts) {
     super.setCheckData(this.key, data, opts);
@@ -6359,7 +6754,7 @@ class MyCache2 extends CacheStore3 {
   }
 }
 
-// node_modules/.pnpm/@kevisual+api@0.0.59_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-login/query-login-browser.ts
+// node_modules/.pnpm/@kevisual+api@0.0.62_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-login/query-login-browser.ts
 class QueryLoginBrowser2 extends QueryLogin2 {
   constructor(opts) {
     super({
@@ -6378,6 +6773,7 @@ var redirectHome = () => {
   if (redirect) {
     setTimeout(() => {
       const href2 = decodeURIComponent(redirect);
+      window.open(href2, "_self");
       console.log("重定向到:", href2);
     }, 2000);
     return;
@@ -6777,11 +7173,11 @@ function requireEventemitter33() {
       else
         delete emitter._events[evt];
     }
-    function EventEmitter4() {
+    function EventEmitter5() {
       this._events = new Events;
       this._eventsCount = 0;
     }
-    EventEmitter4.prototype.eventNames = function eventNames() {
+    EventEmitter5.prototype.eventNames = function eventNames() {
       var names = [], events, name;
       if (this._eventsCount === 0)
         return names;
@@ -6794,7 +7190,7 @@ function requireEventemitter33() {
       }
       return names;
     };
-    EventEmitter4.prototype.listeners = function listeners(event) {
+    EventEmitter5.prototype.listeners = function listeners(event) {
       var evt = prefix ? prefix + event : event, handlers = this._events[evt];
       if (!handlers)
         return [];
@@ -6805,7 +7201,7 @@ function requireEventemitter33() {
       }
       return ee;
     };
-    EventEmitter4.prototype.listenerCount = function listenerCount(event) {
+    EventEmitter5.prototype.listenerCount = function listenerCount(event) {
       var evt = prefix ? prefix + event : event, listeners = this._events[evt];
       if (!listeners)
         return 0;
@@ -6813,7 +7209,7 @@ function requireEventemitter33() {
         return 1;
       return listeners.length;
     };
-    EventEmitter4.prototype.emit = function emit2(event, a1, a2, a3, a4, a5) {
+    EventEmitter5.prototype.emit = function emit2(event, a1, a2, a3, a4, a5) {
       var evt = prefix ? prefix + event : event;
       if (!this._events[evt])
         return false;
@@ -6868,13 +7264,13 @@ function requireEventemitter33() {
       }
       return true;
     };
-    EventEmitter4.prototype.on = function on(event, fn, context) {
+    EventEmitter5.prototype.on = function on(event, fn, context) {
       return addListener(this, event, fn, context, false);
     };
-    EventEmitter4.prototype.once = function once(event, fn, context) {
+    EventEmitter5.prototype.once = function once(event, fn, context) {
       return addListener(this, event, fn, context, true);
     };
-    EventEmitter4.prototype.removeListener = function removeListener(event, fn, context, once) {
+    EventEmitter5.prototype.removeListener = function removeListener(event, fn, context, once) {
       var evt = prefix ? prefix + event : event;
       if (!this._events[evt])
         return this;
@@ -6900,7 +7296,7 @@ function requireEventemitter33() {
       }
       return this;
     };
-    EventEmitter4.prototype.removeAllListeners = function removeAllListeners(event) {
+    EventEmitter5.prototype.removeAllListeners = function removeAllListeners(event) {
       var evt;
       if (event) {
         evt = prefix ? prefix + event : event;
@@ -6912,18 +7308,18 @@ function requireEventemitter33() {
       }
       return this;
     };
-    EventEmitter4.prototype.off = EventEmitter4.prototype.removeListener;
-    EventEmitter4.prototype.addListener = EventEmitter4.prototype.on;
-    EventEmitter4.prefixed = prefix;
-    EventEmitter4.EventEmitter = EventEmitter4;
+    EventEmitter5.prototype.off = EventEmitter5.prototype.removeListener;
+    EventEmitter5.prototype.addListener = EventEmitter5.prototype.on;
+    EventEmitter5.prefixed = prefix;
+    EventEmitter5.EventEmitter = EventEmitter5;
     {
-      module.exports = EventEmitter4;
+      module.exports = EventEmitter5;
     }
   })(eventemitter33);
   return eventemitter33.exports;
 }
 var eventemitter3Exports3 = requireEventemitter33();
-var EventEmitter4 = /* @__PURE__ */ getDefaultExportFromCjs3(eventemitter3Exports3);
+var EventEmitter5 = /* @__PURE__ */ getDefaultExportFromCjs3(eventemitter3Exports3);
 var reRunFn3 = (promiseOpts) => {
   const timeout = promiseOpts.timeout || 5 * 60 * 1000;
   const interval = promiseOpts.interval || 1000;
@@ -6983,7 +7379,7 @@ class BaseLoad3 {
   static reRunFn = reRunFn3;
   timeout = 5 * 60 * 1000;
   constructor() {
-    this.event = new EventEmitter4;
+    this.event = new EventEmitter5;
     this.loading = false;
   }
   listenKey(key, listenOpts) {
@@ -7333,10 +7729,10 @@ var getLoginMethodByDomain = () => {
       methods = ["password", "wechat-mp-ticket", "wechat"];
       break;
     case "localhost":
-      methods = ["password", "web"];
+      methods = ["web", "password"];
       break;
     case "cnb.run":
-      methods = ["password", "web"];
+      methods = ["web", "password"];
       break;
     default:
       methods = ["password", "web", "phone", "wechat", "wechat-mp", "wechat-mp-ticket"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/kv-login",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "",
   "scripts": {
     "dev": "vite",
@@ -8,7 +8,7 @@
     "postbuild": "dts -i src/main.ts -o app.d.ts",
     "build:test": "vite build",
     "prepub": "rm -rf ./dist && pnpm run build:test",
-    "pub": "ev deploy ./dist -k login -v 0.1.15 -u -y yes"
+    "pub": "ev deploy ./dist -k login -v 0.1.17 -u -y yes"
   },
   "keywords": [],
   "files": [
@@ -29,12 +29,12 @@
   "devDependencies": {
     "@kevisual/cache": "^0.0.5",
     "@kevisual/context": "^0.0.8",
-    "@kevisual/query": "^0.0.49",
+    "@kevisual/query": "^0.0.52",
     "crypto-js": "^4.2.0",
     "lit-html": "^3.3.2",
     "qrcode": "^1.5.4",
-    "@kevisual/api": "^0.0.59",
-    "@types/bun": "^1.3.9",
+    "@kevisual/api": "^0.0.62",
+    "@types/bun": "^1.3.10",
     "vite": "^7.3.1"
   }
 }

package/src/modules/login-handle.ts

@@ -17,7 +17,7 @@ export const redirectHome = () => {
   if (redirect) {
     setTimeout(() => {
       const href = decodeURIComponent(redirect);
-      // window.open(href, '_self');
+      window.open(href, '_self');
       console.log('重定向到:', href);
     }, 2000);
     return;

package/src/pages/kv-login.ts

@@ -60,10 +60,10 @@ const getLoginMethodByDomain = (): LoginMethod[] => {
       methods = ['password', 'wechat-mp-ticket', 'wechat',]
       break;
     case 'localhost':
-      methods = ['password', 'web']
+      methods = ['web', 'password']
       break
     case 'cnb.run':
-      methods = ['password', 'web']
+      methods = ['web', 'password']
       break;
     default:
       methods = ['password', 'web', 'phone', 'wechat', 'wechat-mp', 'wechat-mp-ticket']