@kevisual/cli 0.1.7 → 0.1.8

package/dist/assistant-opencode.js

@@ -66013,7 +66013,7 @@ function filter(data, query) {
   return executor.execute(ast, data);
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.57_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
+// ../node_modules/.pnpm/@kevisual+api@0.0.58_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
 var initApi = async (opts) => {
   const router = opts?.router;
   const item = opts?.item;
@@ -80749,52 +80749,41 @@ class AssistantApp extends Manager2 {
     }
   }
   async checkLocalUser() {
-    const config4 = this.config.getConfig();
-    const auth = config4?.auth;
-    let checkCNB = false;
-    if (!auth?.username) {
-      checkCNB = true;
-    } else {
-      let temp = await assistantQuery.queryLogin.getToken();
-      if (temp) {
-        const isExpired = await assistantQuery.queryLogin.checkTokenValid();
-        console.log("Token 是否过期", isExpired);
-      }
-      logger.info("[assistant] 当前登录用户", auth.username, "token有效性检查结果", !!temp);
-    }
-    const cnbToken = useKey2("CNB_TOKEN");
-    if (!checkCNB && cnbToken) {
-      const res = await assistantQuery.query.post({
-        path: "user",
-        key: "cnb-login",
-        payload: {
-          data: {
-            cnbToken
-          }
-        }
+    return checkLocalUser({ assistantApp: this });
+  }
+}
+var checkLocalUser = async (opts) => {
+  const { assistantApp } = opts;
+  const config4 = assistantApp.config.getConfig();
+  const auth = config4?.auth;
+  let checkCNB = false;
+  if (!auth?.username) {
+    checkCNB = true;
+  } else {
+    let temp = await assistantQuery.getToken();
+    logger.info("[assistant] 当前登录用户", auth.username, "token有效性检查结果", !!temp);
+  }
+  const cnbToken = useKey2("CNB_TOKEN");
+  if (!checkCNB && cnbToken) {
+    const res = await assistantQuery.queryLogin.loginByCnb({ cnbToken });
+    if (res.code === 200) {
+      logger.info("CNB登录成功，用户信息已更新");
+      const userInfo = await assistantQuery.queryLogin.checkLocalUser();
+      auth.username = userInfo.username;
+      auth.share = "protected";
+      const app = config4?.app || {};
+      if (!app?.id) {
+        app.id = "dev-cnb";
+      }
+      assistantApp.config.setConfig({
+        auth,
+        app
       });
-      if (res.code === 200) {
-        logger.info("CNB登录成功，用户信息已更新");
-        const resUser = await assistantQuery.queryLogin.beforeSetLoginUser(res.data);
-        if (resUser.code === 200) {
-          const userInfo = resUser.data;
-          auth.username = userInfo.username;
-          auth.share = "protected";
-          const app = config4?.app || {};
-          if (!app?.id) {
-            app.id = "dev-cnb";
-          }
-          this.config.setConfig({
-            auth,
-            app
-          });
-        } else {
-          console.error("CNB登录失败，无法获取用户信息", resUser);
-        }
-      }
+    } else {
+      console.error("CNB登录失败，无法获取用户信息", res);
     }
   }
-}
+};
 // ../node_modules/.pnpm/@kevisual+query@0.0.49/node_modules/@kevisual/query/dist/query.js
 var isTextForContentType2 = (contentType) => {
   if (!contentType)
@@ -81083,7 +81072,7 @@ class Query2 {
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.57_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
+// ../node_modules/.pnpm/@kevisual+api@0.0.58_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
 import { homedir as homedir2 } from "node:os";
 import { join, dirname } from "node:path";
 import fs13 from "node:fs";
@@ -82042,6 +82031,21 @@ class QueryLogin extends BaseQuery {
     }
     return res;
   }
+  async loginByCnb(data) {
+    const res = await this.post({
+      path: "user",
+      key: "cnb-login",
+      payload: {
+        data
+      }
+    });
+    if (res.code === 200) {
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
+    }
+    return res;
+  }
   async checkWechat({ onSuccess, onError }) {
     const url4 = new URL(window.location.href);
     const code = url4.searchParams.get("code");
@@ -82081,8 +82085,17 @@ class QueryLogin extends BaseQuery {
       message: "登录失败"
     };
   }
+  async refreshLoginUser(refreshToken) {
+    const res = await this.queryRefreshToken(refreshToken);
+    if (res.code === 200) {
+      const { accessToken, refreshToken: refreshToken2, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken: refreshToken2, accessTokenExpiresIn, check401: false });
+    }
+    return res;
+  }
   async queryRefreshToken(refreshToken) {
-    const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
+    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
     let data = { refreshToken: _refreshToken };
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
@@ -82181,7 +82194,19 @@ class QueryLogin extends BaseQuery {
     return !!token;
   }
   async checkTokenValid() {
-    return this.cacheStore.getIsExpired();
+    const token = this.storage.getItem("token");
+    if (!token) {
+      return null;
+    }
+    const isExpired = await this.cacheStore.getIsExpired();
+    if (isExpired) {
+      const res = await this.refreshLoginUser();
+      if (res.code === 200) {
+        return res.data?.accessToken || null;
+      }
+      return null;
+    }
+    return token;
   }
   async getToken() {
     const token = this.storage.getItem("token");
@@ -82507,8 +82532,14 @@ class AssistantQuery {
   get(body, options) {
     return this.query.get(body, options);
   }
-  getToken() {
-    return this.queryLogin.getToken();
+  async getToken() {
+    const token = await this.queryLogin.getToken();
+    if (!token)
+      return "";
+    const isExpired = await this.queryLogin.checkTokenValid();
+    console.log("Token 是否过期", isExpired, token);
+    console.log("info", this.queryLogin.cacheStore.cacheData);
+    return token;
   }
 }
 // ../node_modules/.pnpm/chalk@5.6.2/node_modules/chalk/source/vendor/ansi-styles/index.js

package/dist/assistant-server.js

@@ -106007,7 +106007,7 @@ function filter(data, query) {
   return executor.execute(ast, data);
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.57_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
+// ../node_modules/.pnpm/@kevisual+api@0.0.58_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
 var initApi = async (opts) => {
   const router = opts?.router;
   const item = opts?.item;
@@ -120161,52 +120161,41 @@ class AssistantApp extends Manager2 {
     }
   }
   async checkLocalUser() {
-    const config4 = this.config.getConfig();
-    const auth = config4?.auth;
-    let checkCNB = false;
-    if (!auth?.username) {
-      checkCNB = true;
-    } else {
-      let temp = await assistantQuery.queryLogin.getToken();
-      if (temp) {
-        const isExpired = await assistantQuery.queryLogin.checkTokenValid();
-        console.log("Token 是否过期", isExpired);
-      }
-      logger.info("[assistant] 当前登录用户", auth.username, "token有效性检查结果", !!temp);
-    }
-    const cnbToken = useKey("CNB_TOKEN");
-    if (!checkCNB && cnbToken) {
-      const res = await assistantQuery.query.post({
-        path: "user",
-        key: "cnb-login",
-        payload: {
-          data: {
-            cnbToken
-          }
-        }
+    return checkLocalUser({ assistantApp: this });
+  }
+}
+var checkLocalUser = async (opts) => {
+  const { assistantApp } = opts;
+  const config4 = assistantApp.config.getConfig();
+  const auth = config4?.auth;
+  let checkCNB = false;
+  if (!auth?.username) {
+    checkCNB = true;
+  } else {
+    let temp = await assistantQuery.getToken();
+    logger.info("[assistant] 当前登录用户", auth.username, "token有效性检查结果", !!temp);
+  }
+  const cnbToken = useKey("CNB_TOKEN");
+  if (!checkCNB && cnbToken) {
+    const res = await assistantQuery.queryLogin.loginByCnb({ cnbToken });
+    if (res.code === 200) {
+      logger.info("CNB登录成功，用户信息已更新");
+      const userInfo = await assistantQuery.queryLogin.checkLocalUser();
+      auth.username = userInfo.username;
+      auth.share = "protected";
+      const app = config4?.app || {};
+      if (!app?.id) {
+        app.id = "dev-cnb";
+      }
+      assistantApp.config.setConfig({
+        auth,
+        app
       });
-      if (res.code === 200) {
-        logger.info("CNB登录成功，用户信息已更新");
-        const resUser = await assistantQuery.queryLogin.beforeSetLoginUser(res.data);
-        if (resUser.code === 200) {
-          const userInfo = resUser.data;
-          auth.username = userInfo.username;
-          auth.share = "protected";
-          const app = config4?.app || {};
-          if (!app?.id) {
-            app.id = "dev-cnb";
-          }
-          this.config.setConfig({
-            auth,
-            app
-          });
-        } else {
-          console.error("CNB登录失败，无法获取用户信息", resUser);
-        }
-      }
+    } else {
+      console.error("CNB登录失败，无法获取用户信息", res);
     }
   }
-}
+};
 // ../node_modules/.pnpm/@kevisual+query@0.0.49/node_modules/@kevisual/query/dist/query.js
 var isTextForContentType2 = (contentType) => {
   if (!contentType)
@@ -120495,7 +120484,7 @@ class Query2 {
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.57_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
+// ../node_modules/.pnpm/@kevisual+api@0.0.58_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
 import { homedir as homedir2 } from "node:os";
 import { join, dirname } from "node:path";
 import fs15 from "node:fs";
@@ -121454,6 +121443,21 @@ class QueryLogin extends BaseQuery {
     }
     return res;
   }
+  async loginByCnb(data) {
+    const res = await this.post({
+      path: "user",
+      key: "cnb-login",
+      payload: {
+        data
+      }
+    });
+    if (res.code === 200) {
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
+    }
+    return res;
+  }
   async checkWechat({ onSuccess, onError }) {
     const url4 = new URL(window.location.href);
     const code = url4.searchParams.get("code");
@@ -121493,8 +121497,17 @@ class QueryLogin extends BaseQuery {
       message: "登录失败"
     };
   }
+  async refreshLoginUser(refreshToken) {
+    const res = await this.queryRefreshToken(refreshToken);
+    if (res.code === 200) {
+      const { accessToken, refreshToken: refreshToken2, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken: refreshToken2, accessTokenExpiresIn, check401: false });
+    }
+    return res;
+  }
   async queryRefreshToken(refreshToken) {
-    const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
+    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
     let data = { refreshToken: _refreshToken };
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
@@ -121593,7 +121606,19 @@ class QueryLogin extends BaseQuery {
     return !!token;
   }
   async checkTokenValid() {
-    return this.cacheStore.getIsExpired();
+    const token = this.storage.getItem("token");
+    if (!token) {
+      return null;
+    }
+    const isExpired = await this.cacheStore.getIsExpired();
+    if (isExpired) {
+      const res = await this.refreshLoginUser();
+      if (res.code === 200) {
+        return res.data?.accessToken || null;
+      }
+      return null;
+    }
+    return token;
   }
   async getToken() {
     const token = this.storage.getItem("token");
@@ -121919,8 +121944,14 @@ class AssistantQuery {
   get(body, options) {
     return this.query.get(body, options);
   }
-  getToken() {
-    return this.queryLogin.getToken();
+  async getToken() {
+    const token = await this.queryLogin.getToken();
+    if (!token)
+      return "";
+    const isExpired = await this.queryLogin.checkTokenValid();
+    console.log("Token 是否过期", isExpired, token);
+    console.log("info", this.queryLogin.cacheStore.cacheData);
+    return token;
   }
 }
 // ../node_modules/.pnpm/chalk@5.6.2/node_modules/chalk/source/vendor/ansi-styles/index.js

package/dist/assistant.js

@@ -51106,7 +51106,7 @@ function filter(data, query) {
   return executor.execute(ast, data);
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.57_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
+// ../node_modules/.pnpm/@kevisual+api@0.0.58_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
 var initApi = async (opts) => {
   const router = opts?.router;
   const item = opts?.item;
@@ -71237,7 +71237,7 @@ ${line}`;
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.57_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
+// ../node_modules/.pnpm/@kevisual+api@0.0.58_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
 import { homedir as homedir2 } from "node:os";
 import { join, dirname } from "node:path";
 import fs12 from "node:fs";
@@ -72196,6 +72196,21 @@ class QueryLogin extends BaseQuery {
     }
     return res;
   }
+  async loginByCnb(data) {
+    const res = await this.post({
+      path: "user",
+      key: "cnb-login",
+      payload: {
+        data
+      }
+    });
+    if (res.code === 200) {
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
+    }
+    return res;
+  }
   async checkWechat({ onSuccess, onError }) {
     const url4 = new URL(window.location.href);
     const code = url4.searchParams.get("code");
@@ -72235,8 +72250,17 @@ class QueryLogin extends BaseQuery {
       message: "登录失败"
     };
   }
+  async refreshLoginUser(refreshToken) {
+    const res = await this.queryRefreshToken(refreshToken);
+    if (res.code === 200) {
+      const { accessToken, refreshToken: refreshToken2, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken: refreshToken2, accessTokenExpiresIn, check401: false });
+    }
+    return res;
+  }
   async queryRefreshToken(refreshToken) {
-    const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
+    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
     let data = { refreshToken: _refreshToken };
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
@@ -72335,7 +72359,19 @@ class QueryLogin extends BaseQuery {
     return !!token;
   }
   async checkTokenValid() {
-    return this.cacheStore.getIsExpired();
+    const token = this.storage.getItem("token");
+    if (!token) {
+      return null;
+    }
+    const isExpired = await this.cacheStore.getIsExpired();
+    if (isExpired) {
+      const res = await this.refreshLoginUser();
+      if (res.code === 200) {
+        return res.data?.accessToken || null;
+      }
+      return null;
+    }
+    return token;
   }
   async getToken() {
     const token = this.storage.getItem("token");
@@ -72661,8 +72697,14 @@ class AssistantQuery {
   get(body, options) {
     return this.query.get(body, options);
   }
-  getToken() {
-    return this.queryLogin.getToken();
+  async getToken() {
+    const token = await this.queryLogin.getToken();
+    if (!token)
+      return "";
+    const isExpired = await this.queryLogin.checkTokenValid();
+    console.log("Token 是否过期", isExpired, token);
+    console.log("info", this.queryLogin.cacheStore.cacheData);
+    return token;
   }
 }
 
@@ -87264,52 +87306,41 @@ class AssistantApp extends Manager2 {
     }
   }
   async checkLocalUser() {
-    const config5 = this.config.getConfig();
-    const auth = config5?.auth;
-    let checkCNB = false;
-    if (!auth?.username) {
-      checkCNB = true;
-    } else {
-      let temp = await assistantQuery.queryLogin.getToken();
-      if (temp) {
-        const isExpired = await assistantQuery.queryLogin.checkTokenValid();
-        console.log("Token 是否过期", isExpired);
-      }
-      logger.info("[assistant] 当前登录用户", auth.username, "token有效性检查结果", !!temp);
-    }
-    const cnbToken = useKey2("CNB_TOKEN");
-    if (!checkCNB && cnbToken) {
-      const res = await assistantQuery.query.post({
-        path: "user",
-        key: "cnb-login",
-        payload: {
-          data: {
-            cnbToken
-          }
-        }
+    return checkLocalUser({ assistantApp: this });
+  }
+}
+var checkLocalUser = async (opts) => {
+  const { assistantApp } = opts;
+  const config5 = assistantApp.config.getConfig();
+  const auth = config5?.auth;
+  let checkCNB = false;
+  if (!auth?.username) {
+    checkCNB = true;
+  } else {
+    let temp = await assistantQuery.getToken();
+    logger.info("[assistant] 当前登录用户", auth.username, "token有效性检查结果", !!temp);
+  }
+  const cnbToken = useKey2("CNB_TOKEN");
+  if (!checkCNB && cnbToken) {
+    const res = await assistantQuery.queryLogin.loginByCnb({ cnbToken });
+    if (res.code === 200) {
+      logger.info("CNB登录成功，用户信息已更新");
+      const userInfo = await assistantQuery.queryLogin.checkLocalUser();
+      auth.username = userInfo.username;
+      auth.share = "protected";
+      const app2 = config5?.app || {};
+      if (!app2?.id) {
+        app2.id = "dev-cnb";
+      }
+      assistantApp.config.setConfig({
+        auth,
+        app: app2
       });
-      if (res.code === 200) {
-        logger.info("CNB登录成功，用户信息已更新");
-        const resUser = await assistantQuery.queryLogin.beforeSetLoginUser(res.data);
-        if (resUser.code === 200) {
-          const userInfo = resUser.data;
-          auth.username = userInfo.username;
-          auth.share = "protected";
-          const app2 = config5?.app || {};
-          if (!app2?.id) {
-            app2.id = "dev-cnb";
-          }
-          this.config.setConfig({
-            auth,
-            app: app2
-          });
-        } else {
-          console.error("CNB登录失败，无法获取用户信息", resUser);
-        }
-      }
+    } else {
+      console.error("CNB登录失败，无法获取用户信息", res);
     }
   }
-}
+};
 // src/config.ts
 var _configDir2 = parseHomeArg(configDir).configDir;
 var configDir3 = AssistantConfig.detectConfigDir(_configDir2);
@@ -109221,7 +109252,7 @@ program.addCommand(pluginCommand);
 var me = new Command("me").description("查看当前用户信息").action(async () => {
   const aq = new AssistantQuery(assistantConfig3);
   await aq.init();
-  const info = await aq.queryLogin.checkLocalUser();
+  const info = await aq.getToken();
   logger.info(info);
 });
 program.addCommand(me);