node-karin 0.12.2-5.pr.206.dad353f → 0.12.2-5.pr.206.e09f093

package/default/config/pm2.json

@@ -3,7 +3,7 @@
   "apps": [
     {
       "name": "karin",
-      "script": "index.js",
+      "script": "./node_modules/node-karin/dist/cli/pm2.js",
       "autorestart": true,
       "max_restarts": 60,
       "max_memory_restart": "1G",

package/dist/cli/index.cjs

@@ -2,11 +2,10 @@
 'use strict';
 
 var fs2 = require('fs');
+var url = require('url');
 var path2 = require('path');
 var child_process = require('child_process');
-var url = require('url');
 var dotenv = require('dotenv');
-var promises = require('fs/promises');
 var commander = require('commander');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
@@ -40,6 +39,12 @@ var start = () => {
     process.exit(1);
   }
   console.log("[pm2] \u542F\u52A8\u4E2D...");
+  const data = JSON.parse(fs2__default.default.readFileSync(pm2Dir, "utf-8"));
+  const script = "./node_modules/node-karin/dist/cli/pm2.js";
+  if (data.apps[0].script !== script) {
+    data.apps[0].script = script;
+    fs2__default.default.writeFileSync(pm2Dir, JSON.stringify(data, null, 2));
+  }
   const { error } = execSync(`pm2 start ${pm2Dir}`, { cwd: process.cwd() });
   if (error) {
     console.log("[pm2] \u542F\u52A8\u5931\u8D25");
@@ -63,7 +68,7 @@ var log = () => {
   const data = JSON.parse(fs2__default.default.readFileSync(pm2Dir, "utf-8"));
   try {
     const prefix = process.platform === "win32" ? "pm2.cmd" : "pm2";
-    child_process.spawn(prefix, ["logs", data.name, "--lines", data.lines || 1e3], { stdio: "inherit", shell: true });
+    child_process.spawn(prefix, ["logs", data.apps[0].name, "--lines", data.lines || 1e3], { stdio: "inherit", shell: true });
   } catch (error) {
     console.error("[pm2] \u53D1\u751F\u672A\u77E5\u9519\u8BEF: \u8BF7\u68C0\u67E5pm2\u662F\u5426\u5B89\u88C5 \u3010npm install -g pm2\u3011");
     console.error(error);
@@ -77,7 +82,7 @@ var stop = () => {
     process.exit(1);
   }
   const data = JSON.parse(fs2__default.default.readFileSync(pm2Dir, "utf-8"));
-  execSync(`pm2 stop ${data.name}`, { cwd: process.cwd() });
+  execSync(`pm2 stop ${data.apps[0].name}`, { cwd: process.cwd() });
   console.log("[pm2] \u505C\u6B62\u6210\u529F");
   process.exit(0);
 };
@@ -218,28 +223,6 @@ var createOrUpdateEnv = (dir2) => {
     fs2__default.default.appendFileSync(env, "\n" + newEntries.join("\n"));
   }
 };
-var createOrUpdateEnvDev = (dir2) => {
-  const envDevData = [
-    "# \u662F\u5426\u4E3A\u5F00\u53D1\u73AF\u5883",
-    "NODE_ENV=development",
-    "# \u8FD0\u884C\u5668",
-    "RUNTIME=tsx"
-  ];
-  const envDev = path2__default.default.join(dir2, ".env.dev");
-  if (!fs2__default.default.existsSync(envDev)) {
-    fs2__default.default.writeFileSync(envDev, envDevData.join("\n"));
-    return;
-  }
-  const value = fs2__default.default.readFileSync(envDev, "utf-8");
-  const newEntries = envDevData.filter((item) => {
-    if (item.includes("#")) return false;
-    const key = item.split("=")[0];
-    return !value.includes(key);
-  });
-  if (newEntries.length > 0) {
-    fs2__default.default.appendFileSync(envDev, "\n" + newEntries.join("\n"));
-  }
-};
 var createWorkspace = (dir2) => {
   const workspace = path2__default.default.join(dir2, "pnpm-workspace.yaml");
   if (fs2__default.default.existsSync(workspace)) return;
@@ -253,7 +236,6 @@ var createOtherFile = async () => {
     createOrUpdateNpmrc(dir);
   }
   createOrUpdateEnv(dir);
-  createOrUpdateEnvDev(dir);
 };
 var createConfig = () => {
   const defCfg = path2__default.default.join(pkgDir, "default", "config");
@@ -286,7 +268,10 @@ var modifyPackageJson = () => {
     "rs",
     "log",
     "up",
-    "init"
+    "init",
+    "dev",
+    "ts",
+    "watch"
   ];
   list.forEach((v) => {
     data.scripts[v] = `karin ${v}`;
@@ -314,7 +299,7 @@ var loadEnv = (env) => {
   files.forEach((file) => {
     if (!fs2__default.default.existsSync(`${dir2}/${file}`)) {
       if (file === ".env") {
-        console.error(`\u672A\u627E\u5230${file}\u6587\u4EF6\uFF0C\u8BF7\u4F7F\u7528 pnpm init \u8FDB\u884C\u521D\u59CB\u5316\u9879\u76EE`);
+        console.error(`\u672A\u627E\u5230${file}\u6587\u4EF6\uFF0C\u8BF7\u4F7F\u7528 npx karin init \u8FDB\u884C\u521D\u59CB\u5316\u9879\u76EE`);
       } else {
         console.error(`\u672A\u627E\u5230${file}\u6587\u4EF6\uFF0C\u8BF7\u5C06\u5176\u653E\u7F6E\u5728\u9879\u76EE\u6839\u76EE\u5F55`);
       }
@@ -343,21 +328,17 @@ var dev = async (env) => {
   const index = "../root.js";
   process.env.NODE_ENV = "development";
   const { karinMain } = await import(index);
-  await import(karinMain);
+  await import(url.pathToFileURL(karinMain).toString());
 };
 var tsStart = async (env) => {
   loadEnv(env);
+  process.env.RUNTIME = "tsx";
   process.env.NODE_ENV = "development";
   const index = "../root.js";
   const { karinMain } = await import(index);
-  const nodeOptions = process.env.NODE_OPTIONS ? `${process.env.NODE_OPTIONS} --import tsx` : "--import tsx";
-  const child = child_process.spawn("node", [karinMain], {
-    env: {
-      ...process.env,
-      NODE_OPTIONS: nodeOptions,
-      RUNTIME: "tsx"
-    },
-    stdio: "inherit"
+  const child = child_process.spawn("npx", ["tsx", karinMain], {
+    stdio: "inherit",
+    shell: true
   });
   child.on("exit", (code) => process.exit(code ?? 0));
 };
@@ -381,12 +362,11 @@ var tsWatch = async (options) => {
     args.push("--clear-screen=false");
   }
   args.push(karinMain);
+  process.env.RUNTIME = "tsx";
+  process.env.TSX_WATCH = "true";
   const child = child_process.spawn("npx", args, {
-    env: {
-      ...process.env,
-      RUNTIME: "tsx"
-    },
-    stdio: "inherit"
+    stdio: "inherit",
+    shell: true
   });
   child.on("exit", (code) => process.exit(code ?? 0));
 };
@@ -400,7 +380,7 @@ var checkGitInstalled = async () => {
 };
 var updateDependencies = async (packagePath) => {
   try {
-    const packageJson = JSON.parse(fs2.readFileSync(packagePath, "utf-8"));
+    const packageJson = JSON.parse(fs2__default.default.readFileSync(packagePath, "utf-8"));
     const dependencies = packageJson.dependencies || {};
     const packagesToUpdate = [];
     const checkVersionTasks = Object.entries(dependencies).map(async ([pkg, version]) => {
@@ -454,29 +434,29 @@ var updatePlugins = async (pluginsPath) => {
     console.error("[git] \u8BF7\u5148\u5B89\u88C5git");
     return;
   }
-  if (!fs2.existsSync(pluginsPath)) {
+  if (!fs2__default.default.existsSync(pluginsPath)) {
     console.error("[git] plugins\u76EE\u5F55\u4E0D\u5B58\u5728");
     return;
   }
-  const isDirectory = (await promises.stat(pluginsPath)).isDirectory();
+  const isDirectory = (await fs2__default.default.promises.stat(pluginsPath)).isDirectory();
   if (!isDirectory) {
     console.error("[git] plugins\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2A\u76EE\u5F55");
     return;
   }
-  const dirs = await promises.readdir(pluginsPath);
+  const dirs = await fs2__default.default.promises.readdir(pluginsPath);
   const updateTasks = dirs.map(async (dir2) => {
     const pluginPath = path2.join(pluginsPath, dir2);
     const gitPath = path2.join(pluginPath, ".git");
     const packageJsonPath = path2.join(pluginPath, "package.json");
-    if (!dir2.startsWith("karin-plugin-") || !(await promises.stat(pluginPath)).isDirectory()) {
+    if (!dir2.startsWith("karin-plugin-") || !(await fs2__default.default.promises.stat(pluginPath)).isDirectory()) {
       return;
     }
-    if (!fs2.existsSync(gitPath)) {
+    if (!fs2__default.default.existsSync(gitPath)) {
       console.log(`[git] ${dir2} \u4E0D\u662Fgit\u4ED3\u5E93\uFF0C\u8DF3\u8FC7`);
       return;
     }
     try {
-      const packageJson = JSON.parse(fs2.readFileSync(packageJsonPath, "utf-8"));
+      const packageJson = JSON.parse(fs2__default.default.readFileSync(packageJsonPath, "utf-8"));
       if (!packageJson.karin) {
         console.log(`[git] ${dir2} \u7684package.json\u4E2D\u6CA1\u6709karin\u5B57\u6BB5\uFF0C\u8DF3\u8FC7`);
         return;
@@ -506,18 +486,28 @@ if (!((_a = process.argv) == null ? undefined : _a[2])) process.argv.push("-h");
 var addEnvOption = (command) => {
   return command.option("-e, --env <files>", "\u6307\u5B9A\u73AF\u5883\u53D8\u91CF\u6587\u4EF6\uFF0C\u591A\u4E2A\u6587\u4EF6\u7528\u9017\u53F7\u5206\u9694");
 };
-commander.program.version(process.env.npm_package_version, "-v, --version", "\u663E\u793A\u7248\u672C\u53F7");
+var getVersion = () => {
+  try {
+    const file = url.fileURLToPath(new URL("../../package.json", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))));
+    const packageJson = JSON.parse(fs2__default.default.readFileSync(file, "utf-8"));
+    return packageJson.version;
+  } catch {
+    return "unknown";
+  }
+};
+commander.program.version(getVersion(), "-v, --version", "\u663E\u793A\u7248\u672C\u53F7");
 commander.program.command("pm2").description("\u540E\u53F0\u8FD0\u884C").action(pm2.start);
 commander.program.command("stop").description("\u505C\u6B62\u540E\u53F0\u8FD0\u884C").action(pm2.stop);
 commander.program.command("rs").description("\u91CD\u542Fpm2\u670D\u52A1").action(pm2.restart);
 commander.program.command("log").description("\u67E5\u770B\u65E5\u5FD7").action(pm2.log);
 commander.program.command("up").description("\u66F4\u65B0\u63D2\u4EF6").action(updateAll);
 commander.program.command("init").description("\u521D\u59CB\u5316\u9879\u76EE").action(init);
+addEnvOption(commander.program.command(".").description("\u524D\u53F0\u542F\u52A8")).action((options) => start2(options.env));
 addEnvOption(commander.program.command("app").description("\u524D\u53F0\u542F\u52A8")).action((options) => start2(options.env));
 addEnvOption(commander.program.command("start").description("\u524D\u53F0\u542F\u52A8")).action((options) => start2(options.env));
 addEnvOption(commander.program.command("dev").description("JavaScript\u5F00\u53D1\u6A21\u5F0F")).action((options) => dev(options.env));
 addEnvOption(
-  commander.program.command("ts").description("TypeScript\u5F00\u53D1\u6A21\u5F0F").option("-e, --env <files>", "\u6307\u5B9A\u73AF\u5883\u53D8\u91CF\u6587\u4EF6\uFF0C\u591A\u4E2A\u6587\u4EF6\u7528\u9017\u53F7\u5206\u9694\uFF0C\u4F8B\u5982\uFF1A.env.dev,.env.local").addHelpText("after", `
+  commander.program.command("ts").description("TypeScript\u5F00\u53D1\u6A21\u5F0F").addHelpText("after", `
 \u793A\u4F8B:
   $ karin ts                     # \u4F7F\u7528\u9ED8\u8BA4 .env \u6587\u4EF6\u542F\u52A8
   $ karin ts -e .env.dev        # \u4F7F\u7528\u6307\u5B9A\u7684\u73AF\u5883\u53D8\u91CF\u6587\u4EF6\u542F\u52A8

package/dist/cli/index.js

@@ -1,12 +1,9 @@
 #!/usr/bin/env node
 import fs2 from 'node:fs';
-import path2 from 'node:path';
+import { fileURLToPath, URL as URL$1, pathToFileURL } from 'node:url';
+import path2, { join } from 'node:path';
 import { fork, spawn, execSync as execSync$1, exec as exec$1 } from 'node:child_process';
-import { fileURLToPath, URL } from 'node:url';
 import dotenv from 'dotenv';
-import { join } from 'path';
-import { readFileSync, existsSync } from 'fs';
-import { stat, readdir } from 'fs/promises';
 import { program } from 'commander';
 
 var execSync = (cmd, options = {}) => {
@@ -33,6 +30,12 @@ var start = () => {
     process.exit(1);
   }
   console.log("[pm2] \u542F\u52A8\u4E2D...");
+  const data = JSON.parse(fs2.readFileSync(pm2Dir, "utf-8"));
+  const script = "./node_modules/node-karin/dist/cli/pm2.js";
+  if (data.apps[0].script !== script) {
+    data.apps[0].script = script;
+    fs2.writeFileSync(pm2Dir, JSON.stringify(data, null, 2));
+  }
   const { error } = execSync(`pm2 start ${pm2Dir}`, { cwd: process.cwd() });
   if (error) {
     console.log("[pm2] \u542F\u52A8\u5931\u8D25");
@@ -56,7 +59,7 @@ var log = () => {
   const data = JSON.parse(fs2.readFileSync(pm2Dir, "utf-8"));
   try {
     const prefix = process.platform === "win32" ? "pm2.cmd" : "pm2";
-    spawn(prefix, ["logs", data.name, "--lines", data.lines || 1e3], { stdio: "inherit", shell: true });
+    spawn(prefix, ["logs", data.apps[0].name, "--lines", data.lines || 1e3], { stdio: "inherit", shell: true });
   } catch (error) {
     console.error("[pm2] \u53D1\u751F\u672A\u77E5\u9519\u8BEF: \u8BF7\u68C0\u67E5pm2\u662F\u5426\u5B89\u88C5 \u3010npm install -g pm2\u3011");
     console.error(error);
@@ -70,7 +73,7 @@ var stop = () => {
     process.exit(1);
   }
   const data = JSON.parse(fs2.readFileSync(pm2Dir, "utf-8"));
-  execSync(`pm2 stop ${data.name}`, { cwd: process.cwd() });
+  execSync(`pm2 stop ${data.apps[0].name}`, { cwd: process.cwd() });
   console.log("[pm2] \u505C\u6B62\u6210\u529F");
   process.exit(0);
 };
@@ -88,7 +91,7 @@ var pm2 = {
   restart
 };
 var dir = process.env.INIT_CWD || process.cwd();
-var pkgDir = fileURLToPath(new URL("../..", import.meta.url));
+var pkgDir = fileURLToPath(new URL$1("../..", import.meta.url));
 var createDir = () => {
   const list = [
     path2.join(dir, "logs"),
@@ -211,28 +214,6 @@ var createOrUpdateEnv = (dir2) => {
     fs2.appendFileSync(env, "\n" + newEntries.join("\n"));
   }
 };
-var createOrUpdateEnvDev = (dir2) => {
-  const envDevData = [
-    "# \u662F\u5426\u4E3A\u5F00\u53D1\u73AF\u5883",
-    "NODE_ENV=development",
-    "# \u8FD0\u884C\u5668",
-    "RUNTIME=tsx"
-  ];
-  const envDev = path2.join(dir2, ".env.dev");
-  if (!fs2.existsSync(envDev)) {
-    fs2.writeFileSync(envDev, envDevData.join("\n"));
-    return;
-  }
-  const value = fs2.readFileSync(envDev, "utf-8");
-  const newEntries = envDevData.filter((item) => {
-    if (item.includes("#")) return false;
-    const key = item.split("=")[0];
-    return !value.includes(key);
-  });
-  if (newEntries.length > 0) {
-    fs2.appendFileSync(envDev, "\n" + newEntries.join("\n"));
-  }
-};
 var createWorkspace = (dir2) => {
   const workspace = path2.join(dir2, "pnpm-workspace.yaml");
   if (fs2.existsSync(workspace)) return;
@@ -246,7 +227,6 @@ var createOtherFile = async () => {
     createOrUpdateNpmrc(dir);
   }
   createOrUpdateEnv(dir);
-  createOrUpdateEnvDev(dir);
 };
 var createConfig = () => {
   const defCfg = path2.join(pkgDir, "default", "config");
@@ -279,7 +259,10 @@ var modifyPackageJson = () => {
     "rs",
     "log",
     "up",
-    "init"
+    "init",
+    "dev",
+    "ts",
+    "watch"
   ];
   list.forEach((v) => {
     data.scripts[v] = `karin ${v}`;
@@ -307,7 +290,7 @@ var loadEnv = (env) => {
   files.forEach((file) => {
     if (!fs2.existsSync(`${dir2}/${file}`)) {
       if (file === ".env") {
-        console.error(`\u672A\u627E\u5230${file}\u6587\u4EF6\uFF0C\u8BF7\u4F7F\u7528 pnpm init \u8FDB\u884C\u521D\u59CB\u5316\u9879\u76EE`);
+        console.error(`\u672A\u627E\u5230${file}\u6587\u4EF6\uFF0C\u8BF7\u4F7F\u7528 npx karin init \u8FDB\u884C\u521D\u59CB\u5316\u9879\u76EE`);
       } else {
         console.error(`\u672A\u627E\u5230${file}\u6587\u4EF6\uFF0C\u8BF7\u5C06\u5176\u653E\u7F6E\u5728\u9879\u76EE\u6839\u76EE\u5F55`);
       }
@@ -336,21 +319,17 @@ var dev = async (env) => {
   const index = "../root.js";
   process.env.NODE_ENV = "development";
   const { karinMain } = await import(index);
-  await import(karinMain);
+  await import(pathToFileURL(karinMain).toString());
 };
 var tsStart = async (env) => {
   loadEnv(env);
+  process.env.RUNTIME = "tsx";
   process.env.NODE_ENV = "development";
   const index = "../root.js";
   const { karinMain } = await import(index);
-  const nodeOptions = process.env.NODE_OPTIONS ? `${process.env.NODE_OPTIONS} --import tsx` : "--import tsx";
-  const child = spawn("node", [karinMain], {
-    env: {
-      ...process.env,
-      NODE_OPTIONS: nodeOptions,
-      RUNTIME: "tsx"
-    },
-    stdio: "inherit"
+  const child = spawn("npx", ["tsx", karinMain], {
+    stdio: "inherit",
+    shell: true
   });
   child.on("exit", (code) => process.exit(code ?? 0));
 };
@@ -374,12 +353,11 @@ var tsWatch = async (options) => {
     args.push("--clear-screen=false");
   }
   args.push(karinMain);
+  process.env.RUNTIME = "tsx";
+  process.env.TSX_WATCH = "true";
   const child = spawn("npx", args, {
-    env: {
-      ...process.env,
-      RUNTIME: "tsx"
-    },
-    stdio: "inherit"
+    stdio: "inherit",
+    shell: true
   });
   child.on("exit", (code) => process.exit(code ?? 0));
 };
@@ -393,7 +371,7 @@ var checkGitInstalled = async () => {
 };
 var updateDependencies = async (packagePath) => {
   try {
-    const packageJson = JSON.parse(readFileSync(packagePath, "utf-8"));
+    const packageJson = JSON.parse(fs2.readFileSync(packagePath, "utf-8"));
     const dependencies = packageJson.dependencies || {};
     const packagesToUpdate = [];
     const checkVersionTasks = Object.entries(dependencies).map(async ([pkg, version]) => {
@@ -447,29 +425,29 @@ var updatePlugins = async (pluginsPath) => {
     console.error("[git] \u8BF7\u5148\u5B89\u88C5git");
     return;
   }
-  if (!existsSync(pluginsPath)) {
+  if (!fs2.existsSync(pluginsPath)) {
     console.error("[git] plugins\u76EE\u5F55\u4E0D\u5B58\u5728");
     return;
   }
-  const isDirectory = (await stat(pluginsPath)).isDirectory();
+  const isDirectory = (await fs2.promises.stat(pluginsPath)).isDirectory();
   if (!isDirectory) {
     console.error("[git] plugins\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2A\u76EE\u5F55");
     return;
   }
-  const dirs = await readdir(pluginsPath);
+  const dirs = await fs2.promises.readdir(pluginsPath);
   const updateTasks = dirs.map(async (dir2) => {
     const pluginPath = join(pluginsPath, dir2);
     const gitPath = join(pluginPath, ".git");
     const packageJsonPath = join(pluginPath, "package.json");
-    if (!dir2.startsWith("karin-plugin-") || !(await stat(pluginPath)).isDirectory()) {
+    if (!dir2.startsWith("karin-plugin-") || !(await fs2.promises.stat(pluginPath)).isDirectory()) {
       return;
     }
-    if (!existsSync(gitPath)) {
+    if (!fs2.existsSync(gitPath)) {
       console.log(`[git] ${dir2} \u4E0D\u662Fgit\u4ED3\u5E93\uFF0C\u8DF3\u8FC7`);
       return;
     }
     try {
-      const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+      const packageJson = JSON.parse(fs2.readFileSync(packageJsonPath, "utf-8"));
       if (!packageJson.karin) {
         console.log(`[git] ${dir2} \u7684package.json\u4E2D\u6CA1\u6709karin\u5B57\u6BB5\uFF0C\u8DF3\u8FC7`);
         return;
@@ -499,18 +477,28 @@ if (!((_a = process.argv) == null ? undefined : _a[2])) process.argv.push("-h");
 var addEnvOption = (command) => {
   return command.option("-e, --env <files>", "\u6307\u5B9A\u73AF\u5883\u53D8\u91CF\u6587\u4EF6\uFF0C\u591A\u4E2A\u6587\u4EF6\u7528\u9017\u53F7\u5206\u9694");
 };
-program.version(process.env.npm_package_version, "-v, --version", "\u663E\u793A\u7248\u672C\u53F7");
+var getVersion = () => {
+  try {
+    const file = fileURLToPath(new URL("../../package.json", import.meta.url));
+    const packageJson = JSON.parse(fs2.readFileSync(file, "utf-8"));
+    return packageJson.version;
+  } catch {
+    return "unknown";
+  }
+};
+program.version(getVersion(), "-v, --version", "\u663E\u793A\u7248\u672C\u53F7");
 program.command("pm2").description("\u540E\u53F0\u8FD0\u884C").action(pm2.start);
 program.command("stop").description("\u505C\u6B62\u540E\u53F0\u8FD0\u884C").action(pm2.stop);
 program.command("rs").description("\u91CD\u542Fpm2\u670D\u52A1").action(pm2.restart);
 program.command("log").description("\u67E5\u770B\u65E5\u5FD7").action(pm2.log);
 program.command("up").description("\u66F4\u65B0\u63D2\u4EF6").action(updateAll);
 program.command("init").description("\u521D\u59CB\u5316\u9879\u76EE").action(init);
+addEnvOption(program.command(".").description("\u524D\u53F0\u542F\u52A8")).action((options) => start2(options.env));
 addEnvOption(program.command("app").description("\u524D\u53F0\u542F\u52A8")).action((options) => start2(options.env));
 addEnvOption(program.command("start").description("\u524D\u53F0\u542F\u52A8")).action((options) => start2(options.env));
 addEnvOption(program.command("dev").description("JavaScript\u5F00\u53D1\u6A21\u5F0F")).action((options) => dev(options.env));
 addEnvOption(
-  program.command("ts").description("TypeScript\u5F00\u53D1\u6A21\u5F0F").option("-e, --env <files>", "\u6307\u5B9A\u73AF\u5883\u53D8\u91CF\u6587\u4EF6\uFF0C\u591A\u4E2A\u6587\u4EF6\u7528\u9017\u53F7\u5206\u9694\uFF0C\u4F8B\u5982\uFF1A.env.dev,.env.local").addHelpText("after", `
+  program.command("ts").description("TypeScript\u5F00\u53D1\u6A21\u5F0F").addHelpText("after", `
 \u793A\u4F8B:
   $ karin ts                     # \u4F7F\u7528\u9ED8\u8BA4 .env \u6587\u4EF6\u542F\u52A8
   $ karin ts -e .env.dev        # \u4F7F\u7528\u6307\u5B9A\u7684\u73AF\u5883\u53D8\u91CF\u6587\u4EF6\u542F\u52A8

package/dist/cli/pm2.js

@@ -0,0 +1 @@
+import 'node-karin'

package/dist/index.js

@@ -408,8 +408,8 @@ var init_file = __esm({
     copyConfigSync = (defaulPath, userPath, suffixs = [], isThrow = false) => {
       try {
         const files = getFiles(defaulPath, suffixs);
-        fs4.mkdirSync(userPath);
-        fs4.mkdirSync(defaulPath);
+        fs4.mkdirSync(userPath, { recursive: true });
+        fs4.mkdirSync(defaulPath, { recursive: true });
         copyFilesSync(files, defaulPath, userPath);
         return true;
       } catch (error) {
@@ -2005,7 +2005,7 @@ var init_list = __esm({
           return;
         }
         if (type === "git" || type === "root") {
-          const file = path7.join(pluginDir, name);
+          const file = type === "root" ? process.cwd() : path7.join(pluginDir, name);
           await getGitInfo(info, file, name, ext);
           return;
         }
@@ -3844,6 +3844,7 @@ var init_process = __esm({
       listeners.on("error", (...args) => {
         logger.error(...args);
       });
+      if (process.env.pm_id) process.env.RUNTIME = "pm2";
     };
     checkProcess = async (port2) => {
       var _a, _b;
@@ -4072,6 +4073,7 @@ var loader_exports = {};
 __export(loader_exports, {
   LoaderPlugin: () => LoaderPlugin
 });
+import fs14 from "node:fs";
 import lodash5 from "lodash";
 import path11 from "node:path";
 import util2 from "node:util";
@@ -4126,11 +4128,15 @@ var init_loader = __esm({
           if (pkg3.type !== "app") {
             if (isTsx() && ((_c = (_b = pkg3 == null ? void 0 : pkg3.pkgData) == null ? void 0 : _b.karin) == null ? void 0 : _c.main)) {
               const file = path11.join(pkg3.dir, pkg3.pkgData.karin.main);
-              entryPromises.push(this.loaderMain(pkg3.name, file));
+              if (fs14.existsSync(file)) {
+                entryPromises.push(this.loaderMain(pkg3.name, file));
+              }
             }
             if ((_d = pkg3 == null ? void 0 : pkg3.pkgData) == null ? void 0 : _d.main) {
               const file = path11.join(pkg3.dir, pkg3.pkgData.main);
-              entryPromises.push(this.loaderMain(pkg3.name, file));
+              if (fs14.existsSync(file)) {
+                entryPromises.push(this.loaderMain(pkg3.name, file));
+              }
             }
           }
           if (pkg3.type !== "app" && ((_f = (_e = pkg3 == null ? void 0 : pkg3.pkgData) == null ? void 0 : _e.karin) == null ? void 0 : _f.static)) {
@@ -4453,9 +4459,9 @@ var init_router2 = __esm({
 });
 
 // src/server/app.ts
+import path12 from "node:path";
 import express2 from "express";
 import { createServer } from "node:http";
-import path12 from "path";
 var app, server, listen;
 var init_app = __esm({
   "src/server/app.ts"() {
@@ -4463,6 +4469,7 @@ var init_app = __esm({
     init_esm_shims();
     init_router();
     init_router2();
+    init_internal();
     app = express2();
     server = createServer(app);
     app.use("/web", express2.static(path12.join(process.cwd(), "web")));
@@ -4471,6 +4478,8 @@ var init_app = __esm({
     listen = (port2, host2) => {
       server.listen(port2, host2, () => {
         logger.info(`[server] express \u5DF2\u542F\u52A8 \u6B63\u5728\u76D1\u542C: http://${host2}:${port2}`);
+      });
+      listeners.once("online", () => {
         console.log(`[server] http\u9274\u6743token: ${logger.green(process.env.HTTP_AUTH_KEY)}`);
         console.log(`[server] ws\u9274\u6743token: ${logger.green(process.env.WS_SERVER_AUTH_KEY)}`);
       });
@@ -4550,7 +4559,7 @@ var init_ip = __esm({
 });
 
 // src/server/api/console.ts
-import fs14 from "node:fs";
+import fs15 from "node:fs";
 import path13 from "node:path";
 var consoleRouter;
 var init_console = __esm({
@@ -4591,11 +4600,11 @@ var init_console = __esm({
         }
       }
       const file = path13.join(consolePath, name);
-      if (!fs14.existsSync(file)) {
+      if (!fs15.existsSync(file)) {
         res.status(404).json({ error: "\u6587\u4EF6\u4E0D\u5B58\u5728", message: "\u6587\u4EF6\u4E0D\u5B58\u5728" });
         return;
       }
-      const data = fs14.readFileSync(file);
+      const data = fs15.readFileSync(file);
       if (!data) {
         res.status(500).json({ error: "\u5185\u90E8\u9519\u8BEF", message: "\u8BFB\u53D6\u5931\u8D25" });
         return;
@@ -6208,6 +6217,7 @@ var init_groups2 = __esm({
           App.next = () => {
             next = true;
           };
+          App.reply = App.e.reply.bind(App.e);
           const result = await App[plugin.file.method](App.e);
           if (next === false && result === false) next = true;
         }
@@ -6320,6 +6330,7 @@ var init_private = __esm({
           App.next = () => {
             next = true;
           };
+          App.reply = App.e.reply.bind(App.e);
           const result = await App[plugin.file.method](App.e);
           if (next === false && result === false) next = true;
         }
@@ -8503,7 +8514,7 @@ var init_event = __esm({
 });
 
 // src/adapter/input/index.ts
-import fs15 from "node:fs";
+import fs16 from "node:fs";
 import path14 from "node:path";
 var index2, botID, AdapterConsole, adapter2;
 var init_input = __esm({
@@ -8615,7 +8626,7 @@ var init_input = __esm({
         const cfg = adapter();
         const name = (++index2).toString();
         const file = path14.join(consolePath, `${name}${ext}`);
-        await fs15.promises.writeFile(file, await buffer(data));
+        await fs16.promises.writeFile(file, await buffer(data));
         if (cfg.console.isLocal) {
           return `http://127.0.0.1:${process.env.HTTP_PORT}/console/${name}${ext}`;
         }
@@ -8758,7 +8769,7 @@ var init_cache2 = __esm({
 });
 
 // src/adapter/render/admin/template.ts
-import fs16 from "node:fs";
+import fs17 from "node:fs";
 import path15 from "node:path";
 import chokidar3 from "chokidar";
 import template from "art-template";
@@ -8780,7 +8791,7 @@ var init_template = __esm({
         const tplData = getCacheData(file);
         const renderData = template.render(tplData, options.data);
         const outputPath = getOutputPath(options.file, renderData, options.name);
-        fs16.writeFileSync(outputPath, renderData);
+        fs17.writeFileSync(outputPath, renderData);
         delete options.data;
         delete options.name;
         options.file = `file://${outputPath}`;
@@ -8798,7 +8809,7 @@ var init_template = __esm({
       if (CachingData) {
         return CachingData;
       }
-      const tplData = fs16.readFileSync(file, "utf-8");
+      const tplData = fs17.readFileSync(file, "utf-8");
       watch2(file, tplData);
       return tplData;
     };
@@ -8808,7 +8819,7 @@ var init_template = __esm({
       const fileDir = path15.join(htmlPath, name || "render");
       const filePath = path15.join(fileDir, `${basename}-${Date.now()}${extname}`);
       existToMkdirSync(fileDir);
-      fs16.writeFileSync(filePath, data);
+      fs17.writeFileSync(filePath, data);
       return filePath;
     };
     watch2 = async (file, data) => {
@@ -8817,7 +8828,7 @@ var init_template = __esm({
       const watcher = chokidar3.watch(file);
       watcherCache.set(file, watcher);
       watcher.on("change", () => {
-        cache11.set(file, fs16.readFileSync(file, "utf-8"));
+        cache11.set(file, fs17.readFileSync(file, "utf-8"));
         logger.info(`[\u6587\u4EF6\u53D8\u52A8] html\u6A21\u677F\u53D1\u9001\u53D8\u52A8: ${file}`);
       });
       watcher.on("unlink", () => {
@@ -9768,7 +9779,7 @@ init_esm_shims();
 init_exec();
 init_require();
 init_list();
-import fs17 from "node:fs";
+import fs18 from "node:fs";
 var getPkg = (isForcibly = false) => {
   return requireFile("package.json", { force: isForcibly });
 };
@@ -9898,8 +9909,8 @@ var checkGitPluginUpdate = async (filePath, time2 = 120) => {
   var _a;
   const logger3 = (global == null ? void 0 : global.logger) || console;
   try {
-    if (!fs17.existsSync(filePath)) return { status: "error", data: new Error("\u8DEF\u5F84\u4E0D\u5B58\u5728") };
-    if (!fs17.existsSync(`${filePath}/.git`)) return { status: "error", data: new Error("\u8BE5\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2Agit\u4ED3\u5E93") };
+    if (!fs18.existsSync(filePath)) return { status: "error", data: new Error("\u8DEF\u5F84\u4E0D\u5B58\u5728") };
+    if (!fs18.existsSync(`${filePath}/.git`)) return { status: "error", data: new Error("\u8BE5\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2Agit\u4ED3\u5E93") };
     const timer = setTimeout(() => {
       return { status: "failed", data: "\u6267\u884C\u8D85\u65F6" };
     }, time2 * 1e3);
@@ -9950,8 +9961,8 @@ var getTime = async (filePath) => {
 var updateGitPlugin = async (filePath, cmd = "git pull", time2 = 120) => {
   const logger3 = (global == null ? void 0 : global.logger) || console;
   try {
-    if (!fs17.existsSync(filePath)) return { status: "failed", data: "\u8DEF\u5F84\u4E0D\u5B58\u5728" };
-    if (!fs17.existsSync(`${filePath}/.git`)) return { status: "failed", data: "\u8BE5\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2Agit\u4ED3\u5E93" };
+    if (!fs18.existsSync(filePath)) return { status: "failed", data: "\u8DEF\u5F84\u4E0D\u5B58\u5728" };
+    if (!fs18.existsSync(`${filePath}/.git`)) return { status: "failed", data: "\u8BE5\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2Agit\u4ED3\u5E93" };
     const timer = setTimeout(() => {
       return { status: "failed", data: "\u6267\u884C\u8D85\u65F6" };
     }, time2 * 1e3);
@@ -10212,7 +10223,7 @@ init_esm_shims();
 // src/adapter/onebot/core/convert.ts
 init_esm_shims();
 init_message2();
-import fs18 from "node:fs";
+import fs19 from "node:fs";
 var buildError = (selfId, action, request, error) => {
   if (error) {
     const err = JSON.stringify(error, null, 2).replace(/\\n/g, "\n");
@@ -10277,7 +10288,7 @@ var fileToBase64 = (file, url) => {
   if (!url || !file.startsWith("file://")) return file;
   const list4 = ["127.0.0.1", "localhost"];
   const link = new URL(url);
-  return list4.includes(link.hostname) ? file : `base64://${fs18.readFileSync(file.replace("file://", "")).toString("base64")}`;
+  return list4.includes(link.hostname) ? file : `base64://${fs19.readFileSync(file.replace("file://", "")).toString("base64")}`;
 };
 var KarinConvertAdapter = (data, onebot) => {
   var _a, _b, _c;
@@ -12390,7 +12401,6 @@ var Plugin = class {
     this.desc = options.desc || "\u65E0\u63CF\u8FF0";
     this.event = options.event || "message";
     this.priority = options.priority || 1e4;
-    this.reply = this.e.reply.bind(this.e);
   }
   /**
    * 快速回复合并转发

package/dist/module/express.cjs

@@ -10,86 +10,6 @@ var express__default = /*#__PURE__*/_interopDefault(express);
 
 
 
-Object.defineProperty(exports, "Application", {
-  enumerable: true,
-  get: function () { return express.Application; }
-});
-Object.defineProperty(exports, "CookieOptions", {
-  enumerable: true,
-  get: function () { return express.CookieOptions; }
-});
-Object.defineProperty(exports, "Errback", {
-  enumerable: true,
-  get: function () { return express.Errback; }
-});
-Object.defineProperty(exports, "ErrorRequestHandler", {
-  enumerable: true,
-  get: function () { return express.ErrorRequestHandler; }
-});
-Object.defineProperty(exports, "Express", {
-  enumerable: true,
-  get: function () { return express.Express; }
-});
-Object.defineProperty(exports, "Handler", {
-  enumerable: true,
-  get: function () { return express.Handler; }
-});
-Object.defineProperty(exports, "IRoute", {
-  enumerable: true,
-  get: function () { return express.IRoute; }
-});
-Object.defineProperty(exports, "IRouter", {
-  enumerable: true,
-  get: function () { return express.IRouter; }
-});
-Object.defineProperty(exports, "IRouterHandler", {
-  enumerable: true,
-  get: function () { return express.IRouterHandler; }
-});
-Object.defineProperty(exports, "IRouterMatcher", {
-  enumerable: true,
-  get: function () { return express.IRouterMatcher; }
-});
-Object.defineProperty(exports, "Locals", {
-  enumerable: true,
-  get: function () { return express.Locals; }
-});
-Object.defineProperty(exports, "MediaType", {
-  enumerable: true,
-  get: function () { return express.MediaType; }
-});
-Object.defineProperty(exports, "NextFunction", {
-  enumerable: true,
-  get: function () { return express.NextFunction; }
-});
-Object.defineProperty(exports, "Request", {
-  enumerable: true,
-  get: function () { return express.Request; }
-});
-Object.defineProperty(exports, "RequestHandler", {
-  enumerable: true,
-  get: function () { return express.RequestHandler; }
-});
-Object.defineProperty(exports, "RequestParamHandler", {
-  enumerable: true,
-  get: function () { return express.RequestParamHandler; }
-});
-Object.defineProperty(exports, "Response", {
-  enumerable: true,
-  get: function () { return express.Response; }
-});
-Object.defineProperty(exports, "Router", {
-  enumerable: true,
-  get: function () { return express.Router; }
-});
-Object.defineProperty(exports, "RouterOptions", {
-  enumerable: true,
-  get: function () { return express.RouterOptions; }
-});
-Object.defineProperty(exports, "Send", {
-  enumerable: true,
-  get: function () { return express.Send; }
-});
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function () { return express__default.default; }

package/dist/module/express.js

@@ -1 +1 @@
-export { Application, CookieOptions, Errback, ErrorRequestHandler, Express, Handler, IRoute, IRouter, IRouterHandler, IRouterMatcher, Locals, MediaType, NextFunction, Request, RequestHandler, RequestParamHandler, Response, Router, RouterOptions, Send, default, json, query, raw, text } from 'express';
+export { default, json, query, raw, text } from 'express';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.12.25.pr.206.dad353f",
+  "version": "0.12.25.pr.206.e09f093",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",