@kevisual/cli 0.0.85 → 0.0.87

package/dist/assistant-server.js

@@ -95523,32 +95523,38 @@ class AssistantInit extends AssistantConfig {
   "description": "assistant-app package pnpm, node pkgs projects",
   "type": "module",
   "scripts": {
-    "start": "pm2 start apps/root/code-center/app.mjs --name root/code-center",
-    "cnb": "ASSISTANT_CONFIG_DIR=/workspace asst server -s -p 7878"
+    "start": "pm2 start apps/code-center/dist/app.mjs --name code-center",
+    "proxy": "pm2 start apps/page-proxy/dist/app.mjs --name page-proxy",
+    "preview": "pnpm i && ASSISTANT_CONFIG_DIR=/workspace asst server -s -p 8686"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@aws-sdk/client-s3": "latest",
+    "@kevisual/oss": "latest",
+    "@kevisual/query": "latest",
     "@kevisual/router": "latest",
     "@kevisual/use-config": "latest",
-    "@kevisual/query": "latest",
+    "better-sqlite3": "latest",
+    "crypto-js": "latest",
+    "dayjs": "latest",
+    "dotenv": "latest",
+    "es-toolkit": "latest",
+    "eventemitter3": "latest",
     "ioredis": "latest",
     "minio": "latest",
+    "node-cron": "latest",
     "pg": "latest",
     "pm2": "latest",
     "sequelize": "latest",
-    "crypto-js": "latest",
-    "better-sqlite3": "latest",
-    "unstorage": "latest",
-    "dayjs": "latest",
-    "es-toolkit": "latest",
-    "node-cron": "latest",
-    "dotenv": "latest"
+    "unstorage": "latest"
   },
   "devDependencies": {
-    "@types/node": "latest",
-    "@types/crypto-js": "latest"
+    "@kevisual/types": "^0.0.11",
+    "@types/bun": "^1.3.6",
+    "@types/crypto-js": "latest",
+    "@types/node": "latest"
   }
 }
 `);
@@ -102190,7 +102196,7 @@ var authFilter = async (req, res) => {
   const share = auth.share || "protected";
   const noAdmin = !auth.username;
   if (noAdmin)
-    return false;
+    return { code: 500, message: "没有管理员" };
   const admin = auth.username;
   const admins = auth.admin || [];
   if (admin) {
@@ -102199,39 +102205,40 @@ var authFilter = async (req, res) => {
   const url3 = new URL(req.url, "http://localhost");
   const pathname = decodeURIComponent(url3.pathname);
   if (pathname === "/" || pathname === "/favicon.ico") {
-    return false;
+    return { code: 200, message: "允许访问根路径" };
   }
   if (pathname.startsWith("/root/home") || pathname === "/root/cli") {
-    return false;
+    return { code: 200, message: "允许访问首页" };
   }
-  const openApiPaths = ["/api", "/v1", "/client", "/serve"];
+  const openApiPaths = ["/api", "/v1", "/client", "/serve", "/proxy"];
   for (const openPath of openApiPaths) {
     if (pathname.startsWith(openPath)) {
-      return false;
+      return { code: 200, message: "允许访问API" };
     }
   }
   if (share === "public") {
-    return false;
+    return { code: 200, message: "公开模式允许访问" };
   }
   const { token } = await getToken(req);
   if (!token) {
     res.writeHead(302, { Location: `/root/home/` });
     res.end();
-    return false;
+    return { code: 500, message: "未登录" };
   }
   const tokenUser = await getTokenUserCache(token);
+  console.log("authFilter tokenUser", tokenUser, token);
   if (share === "protected" && tokenUser?.code === 200) {
-    return false;
+    return { code: 200, message: "受保护模式已登录允许访问" };
   }
   if (share === "private") {
     if (tokenUser?.code === 200) {
       const username = tokenUser?.data?.username;
       if (admins.includes(username)) {
-        return false;
+        return { code: 200, message: "私有模式管理员允许访问" };
       }
     }
   }
-  return true;
+  return { code: 500, message: "没有权限访问" };
 };
 var proxyRoute = async (req, res) => {
   const _assistantConfig = assistantConfig2.getCacheAssistantConfig();
@@ -102271,6 +102278,14 @@ var proxyRoute = async (req, res) => {
   const apiBackendProxy = allProxy.find((item) => pathname.startsWith(item.path));
   if (apiBackendProxy) {
     log.debug("apiBackendProxy", { apiBackendProxy, url: req.url });
+    if (apiBackendProxy.s3?.id) {
+      const storage = _assistantConfig?.storage || [];
+      const storageConfig = storage.find((item) => item.id === apiBackendProxy.s3?.id);
+      apiBackendProxy.s3 = {
+        ...storageConfig,
+        ...apiBackendProxy.s3
+      };
+    }
     return proxy(req, res, {
       path: apiBackendProxy.path,
       target: apiBackendProxy.target,
@@ -102319,7 +102334,8 @@ var proxyRoute = async (req, res) => {
     });
   }
   const filter2 = await authFilter(req, res);
-  if (filter2) {
+  if (filter2.code !== 200) {
+    console.log("auth filter deny", filter2);
     res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
     return res.end(renderNoAuthAndLogin("Not Authorized Proxy"));
   }

package/dist/assistant.js

@@ -55189,32 +55189,38 @@ class AssistantInit extends AssistantConfig {
   "description": "assistant-app package pnpm, node pkgs projects",
   "type": "module",
   "scripts": {
-    "start": "pm2 start apps/root/code-center/app.mjs --name root/code-center",
-    "cnb": "ASSISTANT_CONFIG_DIR=/workspace asst server -s -p 7878"
+    "start": "pm2 start apps/code-center/dist/app.mjs --name code-center",
+    "proxy": "pm2 start apps/page-proxy/dist/app.mjs --name page-proxy",
+    "preview": "pnpm i && ASSISTANT_CONFIG_DIR=/workspace asst server -s -p 8686"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@aws-sdk/client-s3": "latest",
+    "@kevisual/oss": "latest",
+    "@kevisual/query": "latest",
     "@kevisual/router": "latest",
     "@kevisual/use-config": "latest",
-    "@kevisual/query": "latest",
+    "better-sqlite3": "latest",
+    "crypto-js": "latest",
+    "dayjs": "latest",
+    "dotenv": "latest",
+    "es-toolkit": "latest",
+    "eventemitter3": "latest",
     "ioredis": "latest",
     "minio": "latest",
+    "node-cron": "latest",
     "pg": "latest",
     "pm2": "latest",
     "sequelize": "latest",
-    "crypto-js": "latest",
-    "better-sqlite3": "latest",
-    "unstorage": "latest",
-    "dayjs": "latest",
-    "es-toolkit": "latest",
-    "node-cron": "latest",
-    "dotenv": "latest"
+    "unstorage": "latest"
   },
   "devDependencies": {
-    "@types/node": "latest",
-    "@types/crypto-js": "latest"
+    "@kevisual/types": "^0.0.11",
+    "@types/bun": "^1.3.6",
+    "@types/crypto-js": "latest",
+    "@types/node": "latest"
   }
 }
 `);
@@ -58645,82 +58651,8 @@ commdands.forEach((name) => {
 });
 
 // src/command/run-scripts/index.ts
-import { spawnSync as spawnSync5 } from "node:child_process";
 import path11 from "node:path";
 import fs12 from "node:fs";
-var runScriptsCommand = new Command("run-scripts").alias("run").arguments("<cmd> [env]").option("-l --local", "使用当前文件夹的package.json中的scripts", false).description("运行脚本，在assistant.config.json中配置的脚本").action(async (cmd, env3, opts) => {
-  const useLocal = opts.local;
-  const showScripts = cmd === "show";
-  const showScriptFunc = (scripts2) => {
-    console.log("可用的本地脚本:");
-    let has = false;
-    Object.keys(scripts2).forEach((key) => {
-      console.log(`- ${key}: ${scripts2[key]}`);
-      has = true;
-    });
-    if (!has) {
-      console.log("当前未定义任何脚本。");
-    }
-  };
-  if (useLocal) {
-    const pkgPath = path11.join(process.cwd(), "package.json");
-    if (checkFileExists(pkgPath) === false) {
-      console.error("当前目录下未找到 package.json 文件。");
-      return;
-    }
-    const pkg = JSON.parse(fs12.readFileSync(pkgPath, "utf-8"));
-    const scripts2 = pkg.scripts || {};
-    if (showScripts) {
-      showScriptFunc(scripts2);
-      return;
-    }
-    const script = scripts2[cmd];
-    if (!script) {
-      console.error(`Script "${cmd}" not found in local package.json.`);
-      return;
-    }
-    const command2 = [script, ...env3 ? [env3] : []].join(" ");
-    const res = spawnSync5(command2, { shell: true, stdio: "inherit", cwd: assistantConfig2.configDir });
-    console.log(`执行 "[${command2}]"...`);
-    if (res.error) {
-      console.error(`执行失败 "${cmd}":`, res.error);
-      return;
-    }
-    if (res.status !== 0) {
-      console.error(`本地脚本 "${cmd}" 以代码 ${res.status} 退出`);
-      return;
-    }
-    return;
-  }
-  assistantConfig2.checkMounted();
-  const configs = assistantConfig2.getCacheAssistantConfig();
-  const scripts = configs?.scripts || {};
-  try {
-    const script = scripts[cmd];
-    if (showScripts) {
-      showScriptFunc(scripts);
-      return;
-    }
-    if (!script) {
-      console.error(`Script "${cmd}" not found.`);
-      return;
-    }
-    const command2 = [script, ...env3 ? [env3] : []].join(" ");
-    const res = spawnSync5(command2, { shell: true, stdio: "inherit", cwd: assistantConfig2.configDir });
-    if (res.error) {
-      console.error(`Error running script "${cmd}":`, res.error);
-      return;
-    }
-    if (res.status !== 0) {
-      console.error(`Script "${cmd}" exited with code ${res.status}`);
-      return;
-    }
-    console.log(`Script "${cmd}" run successfully.`);
-  } catch (error2) {
-    console.error(`Failed to run script "${cmd}":`, error2);
-  }
-});
-program.addCommand(runScriptsCommand);
 var createRandomApp = (opts) => {
   const { app, package: packageJson, pwd } = opts;
   if (!app.status) {