node-karin 1.9.0 → 1.9.2

package/dist/cli/index.mjs

@@ -223,20 +223,36 @@ const stop = async () => {
 };
 const restart = async (force) => {
   rotateLogs();
-  console.log("[pm2] 重启中...");
-  if (!fs.existsSync(pm2Dir) && !force) {
-    console.log(`[pm2] 配置文件不存在 请检查 ${pm2Dir} 是否存在`);
-    console.log("[pm2] 如果是新项目，请先前台启动生成配置文件: pnpm app");
-    process.exit(1);
-  }
-  const appName = force ? "karin" : readPm2Config()?.apps[0].name;
-  if (!appName) {
-    process.exit(1);
+  try {
+    const forceRestart = () => {
+      const appName2 = readPm2Config()?.apps?.[0]?.name || "karin";
+      execSync(`pm2 delete ${appName2}`, { cwd: process.cwd() });
+      execSync(`pm2 start ${pm2Dir}`, { cwd: process.cwd() });
+      console.log("[pm2] 重启成功");
+    };
+    console.log("[pm2] 重启中...");
+    if (!fs.existsSync(pm2Dir)) {
+      console.log(`[pm2] 配置文件不存在 请检查 ${pm2Dir} 是否存在`);
+      console.log("[pm2] 如果是新项目，请先前台启动生成配置文件: pnpm app");
+      process.exit(1);
+    }
+    if (force) {
+      forceRestart();
+      process.exit(0);
+    }
+    const appName = readPm2Config()?.apps?.[0]?.name || "karin";
+    if (!appName) ;
+    execSync(`pm2 restart ${appName}`, { cwd: process.cwd() });
+    console.log("[pm2] 重启成功");
+    process.exit(0);
+  } catch (error2) {
+    console.log("[pm2] 尝试直接重启失败 尝试删除服务并重新启动");
+    const appName = readPm2Config()?.apps?.[0]?.name || "karin";
+    execSync(`pm2 delete ${appName}`, { cwd: process.cwd() });
+    execSync(`pm2 start ${pm2Dir}`, { cwd: process.cwd() });
+    console.log("[pm2] 重启成功");
+    process.exit(0);
   }
-  execSync(`pm2 delete ${appName}`, { cwd: process.cwd() });
-  execSync(`pm2 start ${pm2Dir}`, { cwd: process.cwd() });
-  console.log("[pm2] 重启成功");
-  process.exit(0);
 };
 const pm2 = {
   start: start$1,

package/dist/index.d.ts

@@ -16,7 +16,6 @@ import { exec as exec$1, ExecException } from 'child_process';
 export { ExecException } from 'child_process';
 import { RedisClientOptions, RedisClientType } from 'redis';
 import * as http from 'http';
-import { KarinPluginType } from '@karinjs/plugins-list';
 import { WebSocket } from 'ws';
 
 declare const debug: {
@@ -7730,6 +7729,88 @@ interface SandboxSendApi {
     init: SandBoxAccountInfo;
 }
 
+/**
+ * TODO: 后续改为自动化
+ */
+/**
+ * 插件基础类型
+ */
+interface KarinPluginBase {
+    /** 插件包名 */
+    name: string;
+    /**
+     * 插件类型
+     * - npm: npm 插件
+     * - git: git 插件
+     * - app: 单应用插件
+     */
+    type: 'npm' | 'git' | 'app';
+    /** 插件描述 限制 50 长度 */
+    description: string;
+    /** 插件提交到仓库时间 */
+    time: string;
+    /** 插件主页 */
+    home: string;
+    /** 插件许可证 */
+    license: {
+        /** 许可证名称 */
+        name: string;
+        /** 许可证地址 */
+        url: string;
+    };
+    /** 插件作者 */
+    author: {
+        /** 名字 */
+        name: string;
+        /** 主页 */
+        home: string;
+        /** 头像 仅支持url 如果是github、gitee无需填写 */
+        avatar?: string;
+    }[];
+    /** 插件仓库 */
+    repo: {
+        /** 仓库类型 */
+        type: 'github' | 'gitee' | 'gitcode' | 'gitlab' | 'npm';
+        /** 仓库地址 */
+        url: string;
+        /** 默认分支 npm类型为空字符串 */
+        branch: string;
+    }[];
+}
+/**
+ * npm 插件类型
+ */
+interface KarinNpmPlugin extends KarinPluginBase {
+    type: 'npm';
+    /** 允许pnpm在安装期间执行脚本的包名列表 */
+    allowBuild?: string[];
+}
+/**
+ * git 插件类型
+ */
+interface KarinGitPlugin extends KarinPluginBase {
+    type: 'git';
+}
+/**
+ * 单应用插件类型
+ */
+interface KarinAppPlugin extends KarinPluginBase {
+    type: 'app';
+    /** app文件直链 */
+    files: {
+        /** app插件名称 */
+        name: string;
+        /** 文件直链 */
+        url: string;
+        /** 描述 */
+        description?: string;
+    }[];
+}
+/**
+ * 插件市场类型每个插件的类型
+ */
+type KarinPluginType = KarinNpmPlugin | KarinGitPlugin | KarinAppPlugin;
+
 /**
  * 基类
  */
@@ -10103,7 +10184,7 @@ declare const downloadFile: <T extends boolean = false>(fileUrl: string, savePat
  * @param savePath 保存路径
  * @param param axios参数
  */
-declare const downFile: (fileUrl: string, savePath: string, param?: AxiosRequestConfig) => Promise<boolean>;
+declare const downFile: (fileUrl: string, savePath: string, param?: AxiosRequestConfig) => Promise<DownloadFileResult<boolean>>;
 /**
  * 标准化文件路径 统一使用/分隔符
  * @param file - 路径

package/dist/index.mjs

@@ -692,8 +692,16 @@ var init_logger = __esm({
             process.stdout.write(`${prefixText} ${message2}
 `);
           }
-          state.fileWriter?.write(level, `[${timestamp}][${levelText}] ${message2}
+          if (state.fileWriter) {
+            try {
+              state.fileWriter.write(level, `[${timestamp}][${levelText}] ${message2}
+`);
+            } catch (err) {
+              const errorMessage = err instanceof Error ? err.message : String(err);
+              process.stdout.write(`${chalk2.red(`${state.config.prefix}[${timestamp}][ERROR]`)} \u6587\u4EF6\u5199\u5165\u5931\u8D25: ${errorMessage}
 `);
+            }
+          }
         };
       };
       setupWriters();
@@ -1371,8 +1379,12 @@ var init_file2 = __esm({
     createPluginDir = async (name, files) => {
       if (!Array.isArray(files)) files = ["config", "data", "resources"];
       if (files.length === 0) return;
-      const pluginPath = path5.join(karinPathBase, name);
-      if (!fs6.existsSync(pluginPath)) await fs6.promises.mkdir(pluginPath, { recursive: true });
+      const isOrgPkg = name.startsWith("@") && name.includes("/");
+      let pluginPath = isOrgPkg ? path5.join(karinPathBase, name.replace("/", "-")) : path5.join(karinPathBase, name);
+      if (isOrgPkg && !fs6.existsSync(pluginPath)) {
+        const [orgName, pkgName] = name.split("/");
+        pluginPath = path5.join(karinPathBase, orgName, pkgName);
+      }
       await Promise.all(files.map((file) => {
         const filePath = path5.join(pluginPath, file);
         if (!fs6.existsSync(filePath)) return fs6.promises.mkdir(filePath, { recursive: true });
@@ -11191,7 +11203,7 @@ var init_restart = __esm({
         }));
         return { status: "success", data: "\u5DF2\u53D1\u9001\u91CD\u542F\u4FE1\u53F7" };
       }
-      if (process.env.PM2_RESTART === "true") process.exit();
+      if (process.env.PM2_RESTART !== "true") process.exit();
       if (process.env.pm_id) {
         const { error: error2 } = await exec("npx karin rs");
         if (error2) return { status: "failed", data: error2 };
@@ -11213,12 +11225,14 @@ var init_restart = __esm({
         process.exit(0);
       }
       if (process.env.RUNTIME === "pm2") {
+        if (process.env.PM2_RESTART !== "true") process.exit();
         await exec("npx karin rs");
         return;
       }
       if (process.env.RUNTIME === "tsx") {
         throw new Error("tsx \u4E0D\u652F\u6301\u91CD\u542F");
       }
+      if (process.env.PM2_RESTART !== "true") process.exit();
       const { error } = await exec("npx karin pm2");
       if (error) throw error;
     };
@@ -19218,7 +19232,7 @@ var init_load = __esm({
       } else if (Array.isArray(pkg2.pkgData.karin?.files)) {
         files.push(...pkg2.pkgData.karin.files);
       }
-      await createPluginDir(pkg2.name.replace(/\//g, "-"), files);
+      await createPluginDir(pkg2.name, files);
       debug("debug: createPluginDir", pkg2.name, files);
       pkg2.apps.forEach((app4) => {
         const promise = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",
@@ -144,7 +144,7 @@
     "app": "node dist/start/index.mjs",
     "build": "pnpm build:main && pnpm build:module",
     "build:dev": "pnpm build:main",
-    "build:main": "tsc && tsup --config tsup.config.ts",
+    "build:main": "tsc && tsup",
     "build:module": "tsc && tsup --config tsup.config.module.ts",
     "build:types": "tsc && tsup --config tsup.config.types.ts",
     "app:bun": "bun dist/start/index.mjs",