ellm-proxy 0.0.10 → 0.0.12

package/dist/cli.js

@@ -35167,11 +35167,13 @@ import { existsSync as existsSync2, mkdirSync as mkdirSync3, readFileSync as rea
 import { spawn as spawn3 } from "node:child_process";
 import { homedir as homedir2, platform as platform8 } from "node:os";
 import { join as join6 } from "node:path";
+var AUTOSTART_VBS = "ellm-proxy-autostart.vbs";
 var AUTOSTART_CMD = "ellm-proxy-autostart.cmd";
 var PLIST_LABEL = "com.ellm-proxy.autostart";
 var LINUX_UNIT = "ellm-proxy.service";
 var OPT_OUT_FILE = "autostart.opt-out";
-var MARKER = "ellm-proxy-v2";
+var MARKER = "ellm-proxy-v3";
+var V2_MARKER = "ellm-proxy-v2";
 var ENV_WHITELIST_PREFIX = "ELLM_";
 var ENV_WHITELIST_KEYS = /* @__PURE__ */ new Set(["WEBUI_USERNAME", "WEBUI_PASSWORD"]);
 function collectAutostartEnv(env10 = process.env) {
@@ -35200,7 +35202,7 @@ function runExit(cmd, args) {
 function platformItemPath() {
   switch (platform8()) {
     case "win32":
-      return join6(windowsStartupDir(), AUTOSTART_CMD);
+      return join6(windowsStartupDir(), AUTOSTART_VBS);
     case "darwin":
       return join6(homedir2(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
     case "linux":
@@ -35210,15 +35212,26 @@ function platformItemPath() {
   }
 }
 function windowsBody(nodePath, target) {
+  const logPath = join6(target.appDir, "logs", "autostart.log");
   const lines = [
     "@echo off",
+    // echo 按 OEM 代码页（GBK）写重定向，node 按 UTF-8 写——不切页日志会两种编码混写必然一半乱码
+    "chcp 65001 >nul",
     `rem Auto-generated by "ellm-proxy autostart on" (${MARKER}). Disable with "ellm-proxy autostart off".`,
     ...Object.entries(target.env).map(([k, v]) => `set "${k}=${v}"`),
-    `"${nodePath}" "${target.serverJs}" >nul 2>&1`,
+    `>> "${logPath}" echo [%date% %time%] autostart launching.`,
+    `"${nodePath}" "${target.serverJs}" >> "${logPath}" 2>&1`,
     ""
   ];
   return lines.join("\r\n");
 }
+function windowsVbsBody(cmdPath) {
+  return [
+    `' Auto-generated by "ellm-proxy autostart on" (${MARKER}). Disable with "ellm-proxy autostart off".`,
+    `CreateObject("WScript.Shell").Run """${cmdPath}""", 0, False`,
+    ""
+  ].join("\r\n");
+}
 function darwinBody(nodePath, target) {
   const logPath = join6(target.appDir, "logs", "autostart.log");
   const envEntries = Object.entries(target.env).map(([k, v]) => `      <string>${k}</string>
@@ -35267,9 +35280,13 @@ function linuxBody(nodePath, target) {
   ].join("\n");
 }
 async function windowsOn(nodePath, target) {
-  const itemPath = join6(windowsStartupDir(), AUTOSTART_CMD);
-  writeFileSync3(itemPath, windowsBody(nodePath, target), "utf-8");
-  return itemPath;
+  const startupDir = windowsStartupDir();
+  mkdirSync3(join6(target.appDir, "logs"), { recursive: true });
+  const cmdPath = join6(target.appDir, AUTOSTART_CMD);
+  writeFileSync3(cmdPath, windowsBody(nodePath, target), "utf-8");
+  writeFileSync3(join6(startupDir, AUTOSTART_VBS), `\uFEFF${windowsVbsBody(cmdPath)}`, "utf16le");
+  rmSync2(join6(startupDir, AUTOSTART_CMD), { force: true });
+  return join6(startupDir, AUTOSTART_VBS);
 }
 async function darwinOn(nodePath, target) {
   const itemPath = join6(homedir2(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
@@ -35301,10 +35318,13 @@ async function linuxOn(nodePath, target) {
   return itemPath;
 }
 async function windowsOff() {
-  const itemPath = join6(windowsStartupDir(), AUTOSTART_CMD);
-  if (!existsSync2(itemPath)) return false;
-  rmSync2(itemPath, { force: true });
-  return true;
+  const startupDir = windowsStartupDir();
+  const vbsPath = join6(startupDir, AUTOSTART_VBS);
+  const legacyCmd = join6(startupDir, AUTOSTART_CMD);
+  const existed = existsSync2(vbsPath) || existsSync2(legacyCmd);
+  rmSync2(vbsPath, { force: true });
+  rmSync2(legacyCmd, { force: true });
+  return existed;
 }
 async function darwinOff() {
   const itemPath = join6(homedir2(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
@@ -35321,18 +35341,32 @@ async function linuxOff() {
   await runExit("systemctl", ["--user", "daemon-reload"]);
   return true;
 }
+function readTextDetectingBom(path7) {
+  const buf = readFileSync5(path7);
+  if (buf.length >= 2 && buf[0] === 255 && buf[1] === 254) return buf.toString("utf16le").slice(1);
+  return buf.toString("utf-8");
+}
 function autostartStatus(appDir) {
   const itemPath = platformItemPath();
   let enabled = false;
   let outdated = false;
   if (itemPath && existsSync2(itemPath)) {
     try {
-      const content = readFileSync5(itemPath, "utf-8");
-      if (content.includes(MARKER)) enabled = true;
+      if (readTextDetectingBom(itemPath).includes(MARKER)) enabled = true;
       else outdated = true;
     } catch {
     }
   }
+  if (platform8() === "win32" && !enabled) {
+    const legacyCmd = join6(windowsStartupDir(), AUTOSTART_CMD);
+    if (existsSync2(legacyCmd)) {
+      try {
+        if (readTextDetectingBom(legacyCmd).includes(MARKER) || readTextDetectingBom(legacyCmd).includes(V2_MARKER))
+          outdated = true;
+      } catch {
+      }
+    }
+  }
   return {
     platform: platform8(),
     enabled,
@@ -35370,7 +35404,7 @@ async function ensureAutostartOnStart(target) {
     if (status.enabled) return;
     if (status.optOut) return;
     const { itemPath } = await enableAutostart(target);
-    console.log(status.outdated ? `\u5DF2\u5C06\u5F00\u673A\u81EA\u542F\u9879\u8FC1\u79FB\u4E3A\u76F4\u542F\u6A21\u5F0F: ${itemPath}` : `\u5DF2\u81EA\u52A8\u6CE8\u518C\u5F00\u673A\u81EA\u542F: ${itemPath}`);
+    console.log(status.outdated ? `\u5DF2\u66F4\u65B0\u5F00\u673A\u81EA\u542F\u9879: ${itemPath}` : `\u5DF2\u81EA\u52A8\u6CE8\u518C\u5F00\u673A\u81EA\u542F: ${itemPath}`);
     console.log("\u7981\u7528\u65B9\u5F0F: ellm-proxy autostart off \u6216\u7BA1\u7406\u53F0\u8BBE\u7F6E\u9875\u3002");
   } catch (err) {
     console.warn(`\u5F00\u673A\u81EA\u542F\u6CE8\u518C\u5931\u8D25\uFF08\u4E0D\u5F71\u54CD\u672C\u6B21\u542F\u52A8\uFF09: ${err instanceof Error ? err.message : String(err)}`);
@@ -35678,7 +35712,7 @@ cli.command(
         nodePath: await resolveInterpreter()
       });
       console.log("\u5F00\u673A\u81EA\u542F\u5DF2\u5F00\u542F\uFF08\u767B\u5F55\u65F6\u89E6\u53D1\uFF09\uFF1A");
-      console.log(`  \u81EA\u542F\u9879 : ${itemPath}\uFF08\u76F4\u63A5\u542F\u52A8\u670D\u52A1\uFF09`);
+      console.log(`  \u81EA\u542F\u9879 : ${itemPath}\uFF08\u767B\u5F55\u65F6\u65E0\u7A97\u53E3\u540E\u53F0\u542F\u52A8\uFF09`);
       console.log("  \u7981\u7528\u65B9\u5F0F : ellm-proxy autostart off");
     } else {
       const { removed } = await disableAutostart({ appDir });

package/dist/server.js

@@ -20586,11 +20586,13 @@ import { existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as rea
 import { spawn as spawn2 } from "node:child_process";
 import { homedir, platform } from "node:os";
 import { join as join5 } from "node:path";
+var AUTOSTART_VBS = "ellm-proxy-autostart.vbs";
 var AUTOSTART_CMD = "ellm-proxy-autostart.cmd";
 var PLIST_LABEL = "com.ellm-proxy.autostart";
 var LINUX_UNIT = "ellm-proxy.service";
 var OPT_OUT_FILE = "autostart.opt-out";
-var MARKER = "ellm-proxy-v2";
+var MARKER = "ellm-proxy-v3";
+var V2_MARKER = "ellm-proxy-v2";
 var ENV_WHITELIST_PREFIX = "ELLM_";
 var ENV_WHITELIST_KEYS = /* @__PURE__ */ new Set(["WEBUI_USERNAME", "WEBUI_PASSWORD"]);
 function collectAutostartEnv(env = process.env) {
@@ -20619,7 +20621,7 @@ function runExit(cmd, args) {
 function platformItemPath() {
   switch (platform()) {
     case "win32":
-      return join5(windowsStartupDir(), AUTOSTART_CMD);
+      return join5(windowsStartupDir(), AUTOSTART_VBS);
     case "darwin":
       return join5(homedir(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
     case "linux":
@@ -20629,15 +20631,26 @@ function platformItemPath() {
   }
 }
 function windowsBody(nodePath, target) {
+  const logPath = join5(target.appDir, "logs", "autostart.log");
   const lines = [
     "@echo off",
+    // echo 按 OEM 代码页（GBK）写重定向，node 按 UTF-8 写——不切页日志会两种编码混写必然一半乱码
+    "chcp 65001 >nul",
     `rem Auto-generated by "ellm-proxy autostart on" (${MARKER}). Disable with "ellm-proxy autostart off".`,
     ...Object.entries(target.env).map(([k, v]) => `set "${k}=${v}"`),
-    `"${nodePath}" "${target.serverJs}" >nul 2>&1`,
+    `>> "${logPath}" echo [%date% %time%] autostart launching.`,
+    `"${nodePath}" "${target.serverJs}" >> "${logPath}" 2>&1`,
     ""
   ];
   return lines.join("\r\n");
 }
+function windowsVbsBody(cmdPath) {
+  return [
+    `' Auto-generated by "ellm-proxy autostart on" (${MARKER}). Disable with "ellm-proxy autostart off".`,
+    `CreateObject("WScript.Shell").Run """${cmdPath}""", 0, False`,
+    ""
+  ].join("\r\n");
+}
 function darwinBody(nodePath, target) {
   const logPath = join5(target.appDir, "logs", "autostart.log");
   const envEntries = Object.entries(target.env).map(([k, v]) => `      <string>${k}</string>
@@ -20686,9 +20699,13 @@ function linuxBody(nodePath, target) {
   ].join("\n");
 }
 async function windowsOn(nodePath, target) {
-  const itemPath = join5(windowsStartupDir(), AUTOSTART_CMD);
-  writeFileSync5(itemPath, windowsBody(nodePath, target), "utf-8");
-  return itemPath;
+  const startupDir = windowsStartupDir();
+  mkdirSync4(join5(target.appDir, "logs"), { recursive: true });
+  const cmdPath = join5(target.appDir, AUTOSTART_CMD);
+  writeFileSync5(cmdPath, windowsBody(nodePath, target), "utf-8");
+  writeFileSync5(join5(startupDir, AUTOSTART_VBS), `\uFEFF${windowsVbsBody(cmdPath)}`, "utf16le");
+  rmSync2(join5(startupDir, AUTOSTART_CMD), { force: true });
+  return join5(startupDir, AUTOSTART_VBS);
 }
 async function darwinOn(nodePath, target) {
   const itemPath = join5(homedir(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
@@ -20720,10 +20737,13 @@ async function linuxOn(nodePath, target) {
   return itemPath;
 }
 async function windowsOff() {
-  const itemPath = join5(windowsStartupDir(), AUTOSTART_CMD);
-  if (!existsSync7(itemPath)) return false;
-  rmSync2(itemPath, { force: true });
-  return true;
+  const startupDir = windowsStartupDir();
+  const vbsPath = join5(startupDir, AUTOSTART_VBS);
+  const legacyCmd = join5(startupDir, AUTOSTART_CMD);
+  const existed = existsSync7(vbsPath) || existsSync7(legacyCmd);
+  rmSync2(vbsPath, { force: true });
+  rmSync2(legacyCmd, { force: true });
+  return existed;
 }
 async function darwinOff() {
   const itemPath = join5(homedir(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
@@ -20740,18 +20760,32 @@ async function linuxOff() {
   await runExit("systemctl", ["--user", "daemon-reload"]);
   return true;
 }
+function readTextDetectingBom(path) {
+  const buf = readFileSync6(path);
+  if (buf.length >= 2 && buf[0] === 255 && buf[1] === 254) return buf.toString("utf16le").slice(1);
+  return buf.toString("utf-8");
+}
 function autostartStatus(appDir) {
   const itemPath = platformItemPath();
   let enabled = false;
   let outdated = false;
   if (itemPath && existsSync7(itemPath)) {
     try {
-      const content = readFileSync6(itemPath, "utf-8");
-      if (content.includes(MARKER)) enabled = true;
+      if (readTextDetectingBom(itemPath).includes(MARKER)) enabled = true;
       else outdated = true;
     } catch {
     }
   }
+  if (platform() === "win32" && !enabled) {
+    const legacyCmd = join5(windowsStartupDir(), AUTOSTART_CMD);
+    if (existsSync7(legacyCmd)) {
+      try {
+        if (readTextDetectingBom(legacyCmd).includes(MARKER) || readTextDetectingBom(legacyCmd).includes(V2_MARKER))
+          outdated = true;
+      } catch {
+      }
+    }
+  }
   return {
     platform: platform(),
     enabled,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ellm-proxy",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Self-hosted LLM gateway with admin web UI (single process, built-in process management)",
   "license": "MIT",
   "type": "module",