fix: 更新 @kevisual/api 依赖至 0.0.59，并优化本地用户检查逻辑

2026-02-22 00:07:01 +08:00
parent c00062d704
commit e377557587
9 changed files with 172 additions and 129 deletions
--- a/assistant/src/module/assistant/local-app-manager/assistant-app.ts
+++ b/assistant/src/module/assistant/local-app-manager/assistant-app.ts
@@ -37,6 +37,23 @@ export class AssistantApp extends Manager {
    this.config = config;
    this.resolver = new ModuleResolver(config.configPath.configDir);
  }
+  async init(opts?: { isServer?: boolean }) {
+    const manager = this;
+    await manager.load({ runtime: 'client' });
+    console.log('Assistant App Loaded');
+    await manager.checkLocalUser();
+    const token = await assistantQuery.getToken();
+    if (token) {
+      console.log('用户已登录，正在初始化远程应用连接...');
+      await manager.initRemoteApp({ token });
+      await manager.initRemoteApp();
+      await manager.initRouterProxyLightApp();
+    }
+    await manager.initRouterProxyApp();
+    if (opts?.isServer) {
+      await manager.initRoutes();
+    }
+  }
  async pageList() {
    const pages = await glob(['*/*/package.json'], {
      cwd: this.pagesPath,
@@ -99,7 +116,11 @@ export class AssistantApp extends Manager {
      }
      let token = opts?.token;
      if (!token) {
-        token = await assistantQuery.queryLogin.getToken();
+        token = await assistantQuery.getToken();
+      }
+      if (!token) {
+        logger.error('[remote-app] cli当前未登录，无法连接远程app');
+        return;
      }
      let shareUrl = share?.url;
      if (!shareUrl) {
@@ -161,11 +182,10 @@ export class AssistantApp extends Manager {
   * - lightcode: 轻代码模块配置
   * @returns 
   */
-  async initRouterApp() {
+  async initRouterProxyApp() {
    const config = this.config.getConfig();
-    const routerProxy = config?.router?.proxy || [];
+    let routerProxy = config?.router?.proxy || [];
    const base = config.router?.base ?? false;
-    const lightcode = config.router?.lightcode ?? true;
    if (base) {
      routerProxy.push({
        type: 'router',
@@ -174,42 +194,13 @@ export class AssistantApp extends Manager {
        }
      })
    }
-    if (lightcode) {
-      routerProxy.push({
-        type: 'lightcode',
-        lightcode: {
-          id: 'main',
-          sync: 'remote',
-          rootPath: path.join(this.config.configPath.appsDir, 'light-code', 'code'),
-        }
-      })
-    }
+    routerProxy = routerProxy.filter(item => item.type === 'router');
    if (routerProxy.length === 0) {
      return
    }
    for (const proxyInfo of routerProxy) {
-      if (proxyInfo.type !== 'router' && proxyInfo.type !== 'lightcode') {
-        console.warn('路由的type必须是"router", 或者lightcode');
-        continue;
-      }
-      if (proxyInfo.type === 'lightcode') {
-        const schema = z.object({
-          rootPath: z.string().describe('light-code 代码存放路径'),
-          sync: z.enum(['remote', 'local', 'both']).describe('同步方式，remote: 仅从远程拉取，local: 仅上传本地代码，both: 双向同步').default('remote'),
-        });
-        const parseRes = schema.safeParse(proxyInfo.lightcode);
-        if (!parseRes.success) {
-          console.warn('lightcode 配置错误', parseRes.error);
-          continue;
-        }
-        const lightcodeConfig = parseRes.data;
-
-        initLightCode({
-          router: this.mainApp,
-          config: this.config,
-          sync: lightcodeConfig.sync,
-          rootPath: lightcodeConfig.rootPath,
-        });
+      if (proxyInfo.type !== 'router') {
+        console.warn('路由的type必须是"router"');
        continue;
      }
      const url = proxyInfo.router!.url;
@@ -236,6 +227,49 @@ export class AssistantApp extends Manager {
      }
    }
  }
+
+  async initRouterProxyLightApp() {
+    const config = this.config.getConfig();
+    let routerProxy = config?.router?.proxy || [];
+    const lightcode = config.router?.lightcode ?? true;
+    if (lightcode) {
+      routerProxy.push({
+        type: 'lightcode',
+        lightcode: {
+          id: 'main',
+          sync: 'remote',
+          rootPath: path.join(this.config.configPath.appsDir, 'light-code', 'code'),
+        }
+      })
+    }
+    routerProxy = routerProxy.filter(item => item.type === 'lightcode');
+    if (routerProxy.length === 0) {
+      return
+    }
+    for (const proxyInfo of routerProxy) {
+      if (proxyInfo.type !== 'lightcode') {
+        console.warn('路由的type必须是"lightcode"');
+        continue;
+      }
+      const schema = z.object({
+        rootPath: z.string().describe('light-code 代码存放路径'),
+        sync: z.enum(['remote', 'local', 'both']).describe('同步方式，remote: 仅从远程拉取，local: 仅上传本地代码，both: 双向同步').default('remote'),
+      });
+      const parseRes = schema.safeParse(proxyInfo.lightcode);
+      if (!parseRes.success) {
+        console.warn('lightcode 配置错误', parseRes.error);
+        continue;
+      }
+      const lightcodeConfig = parseRes.data;
+
+      await initLightCode({
+        router: this.mainApp,
+        config: this.config,
+        sync: lightcodeConfig.sync,
+        rootPath: lightcodeConfig.rootPath,
+      });
+    }
+  }
  /**
   * 动态加载文件插件模块的应用模块
   * @info 不需要登录
@@ -265,34 +299,49 @@ export class AssistantApp extends Manager {
 const checkLocalUser = async (opts: { assistantApp: AssistantApp }) => {
  const { assistantApp } = opts;
  const config = assistantApp.config.getConfig();
-  const auth = config?.auth;
-  let checkCNB = false;
-  if (!auth?.username) {
-    checkCNB = true;
-    // 没有登录过，自动检测ci进行登录
-    // 检测条件1：环境变量中存在 CNB_TOKEN
-  } else {
-    let temp = await assistantQuery.getToken()
-    logger.info('[assistant] 当前登录用户', auth.username, 'token有效性检查结果', !!temp);
+  const auth = config?.auth || {};
+  const isLogin = await assistantQuery.queryLogin.getToken();
+  logger.log('[assistant] 正在检查本地用户登录状态...', auth, '是否已登录', !!isLogin);
+
+  const saveAuth = (auth: typeof config.auth, opts: { appId?: string, username: string; share: 'protected' | 'private' }) => {
+    auth.username = opts.username;
+    auth.share = opts.share;
+    const app = config?.app || {};
+    if (!app?.id) {
+      app.id = opts.appId || 'dev-cnb'
+    }
+    assistantApp.config.setConfig({
+      auth,
+      app
+    });
  }
-  const cnbToken = useKey('CNB_TOKEN');
-  if (!checkCNB && cnbToken) {
+  if (!auth?.username && isLogin) {
+    // 没有登录过，自动检测ci进行登录
+    // 检测条件1：环境变量中存在 CNB_API_KEY
+    // 检测条件2：本地没有登录过
+    const userInfo = await assistantQuery.queryLogin.checkLocalUser()
+    saveAuth(auth, { username: userInfo.username, share: 'protected' })
+    return;
+  }
+  if (isLogin) return;
+  // 没有登录，尝试根据环境变量进行登录
+
+  // 尝试使用 CNB_API_KEY 登录, 并设置管理员用户
+  const cnbToken = useKey('CNB_API_KEY');
+  if (cnbToken) {
+    logger.info('[cnb]检测到 CNB_API_KEY，正在尝试使用 CNB_API_KEY 登录...');
    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 = config?.app || {};
-      if (!app?.id) {
-        app.id = 'dev-cnb'
-      }
-      assistantApp.config.setConfig({
-        auth,
-        app
-      });
+      saveAuth(auth, { username: userInfo.username, share: 'protected' })
+      return
    } else {
-      console.error('CNB登录失败，无法获取用户信息', res);
+      logger.error('CNB登录失败，无法获取用户信息', res);
    }
  }
+  const kevisualToken = useKey('KEVISUAL_TOKEN');
+  if (kevisualToken) {
+    logger.info('[cnb]检测到 KEVISUAL_TOKEN，正在尝试使用 KEVISUAL_TOKEN 登录...');
+    const res = await assistantQuery.queryLogin.refreshLoginUser(kevisualToken)
+  }
 }
--- a/assistant/src/module/assistant/query/index.ts
+++ b/assistant/src/module/assistant/query/index.ts
@@ -37,10 +37,6 @@ export class AssistantQuery {
  }
  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;
  }
 }
--- a/assistant/src/module/light-code/index.ts
+++ b/assistant/src/module/light-code/index.ts
@@ -45,11 +45,15 @@ type LightCodeFile = {
  id?: string, code?: string, hash?: string, filepath: string
 }
 export const initLightCode = async (opts: Opts) => {
+  const token = await assistantQuery.getToken();
+  if (!token) {
+    console.error('[light-code] 当前未登录，无法初始化 light-code');
+    return;
+  }
  // 注册 light-code 路由
-  console.log('初始化 light-code 路由');
  const config = opts.config as AssistantInit;
  const app = opts.router;
-  const token = await assistantQuery.getToken();
+  console.log('初始化 light-code 路由');
  const query = config.query;
  const sync = opts.sync ?? 'remote';
  if (!config || !app) {
--- a/assistant/src/server.ts
+++ b/assistant/src/server.ts
@@ -48,14 +48,7 @@ export const runServer = async (port: number = 51515, listenPath = '127.0.0.1')
  ]);
  const manager = useContextKey('manager', new AssistantApp(assistantConfig, app));
  setTimeout(async () => {
-    await manager.load({ runtime: 'client' });
-    console.log('Assistant App Loaded');
-    await manager.checkLocalUser()
-    await manager.initRemoteApp();
-    await manager.initRouterApp();
-    if (runtime.isServer) {
-      await manager.initRoutes();
-    }
+    manager.init({ isServer: runtime.isServer });
  }, 1000);

  return {
--- a/assistant/src/test/cnb.ts
+++ b/assistant/src/test/cnb.ts
@@ -0,0 +1,40 @@
+import { CNB } from '@kevisual/cnb'
+import { useKey } from '@kevisual/context'
+import { QueryLoginNode } from '@kevisual/api/query-login-node'
+import { Query } from '@kevisual/query'
+const queryLogin = new QueryLoginNode({
+  query: new Query({ url: 'https://kevisual.cn/api/router' })
+})
+await queryLogin.cacheStore.init()
+const cnb = new CNB({
+  token: useKey('CNB_TOKEN'),
+})
+// export const cnbLogin = async () => {
+//   const userInfo = await cnb.user.getUser()
+//   console.log('CNB用户信息', userInfo);
+// }
+// cnbLogin()
+
+const testCnbLogin = async () => {
+  const res = await queryLogin.loginByCnb({
+    cnbToken: useKey('CNB_TOKEN') || '',
+  })
+  console.log('CNB登录结果', res);
+  if (res.code === 200) {
+    const userInfo = await queryLogin.checkLocalUser()
+    console.log('CNB登录成功，用户信息', userInfo);
+  } else {
+    console.log('CNB登录失败', res);
+  }
+}
+
+// testCnbLogin()
+
+const getCNBLocalUser = async () => {
+  const res = await queryLogin.checkLocalUser()
+  console.log('查询本地用户信息', res);
+  const token = await queryLogin.getToken()
+  console.log('检查token是否过期', token);
+}
+
+getCNBLocalUser()