@zqagent/core 0.2.6 → 0.2.8

package/dist/server/index.js

@@ -555,7 +555,7 @@ import "dotenv/config";
 
 // src/server/runtime.ts
 init_esm_shims();
-import * as fs28 from "fs";
+import * as fs29 from "fs";
 import * as path34 from "path";
 
 // src/server/store.ts
@@ -11396,7 +11396,7 @@ function buildNodeInfo(store, opts) {
     nodeId: opts.nodeId ?? ensureNodeId(store),
     platform: process.platform,
     mode: process.env.NODE_MODE ?? "standalone",
-    version: "0.2.6",
+    version: "0.2.8",
     admin: opts.admin,
     projects: opts.projects
   };
@@ -12389,7 +12389,7 @@ function buildNodeHost(store, manager, diskPath) {
     arch: process.arch,
     release: os6.release(),
     uptimeSec: Math.round(os6.uptime()),
-    version: "0.2.6",
+    version: "0.2.8",
     mode: process.env.NODE_MODE ?? "standalone",
     cpu: {
       count: cpus2.length,
@@ -13941,7 +13941,7 @@ function createApp(store, manager, opts = {}) {
       json(res, 200, {
         status: "ok",
         // 版本让运维/探针能确认线上跑的是哪个构建（更新与回滚据此判断）
-        version: "0.2.6",
+        version: "0.2.8",
         features: { mcp: hasServerMcpConfig() }
       });
       return;
@@ -15644,7 +15644,7 @@ var FleetNodeBridge = class {
       label: this.opts.deps.store.loadNodeLabel() ?? void 0,
       platform: process.platform,
       mode: process.env.NODE_MODE ?? "standalone",
-      version: "0.2.6",
+      version: "0.2.8",
       ip: primaryIp()
     };
   }
@@ -15699,7 +15699,7 @@ var FleetNodeBridge = class {
         label: this.opts.deps.store.loadNodeLabel() ?? void 0,
         platform: process.platform,
         mode: process.env.NODE_MODE ?? "standalone",
-        version: "0.2.6",
+        version: "0.2.8",
         ip: primaryIp(),
         projects,
         totals,
@@ -17162,7 +17162,7 @@ async function hubEnrollByAccount(baseUrl, input) {
 
 // src/update/controller.ts
 init_esm_shims();
-import * as fs27 from "fs";
+import * as fs28 from "fs";
 import * as path33 from "path";
 
 // src/update/downloader.ts
@@ -17415,10 +17415,12 @@ function selfCheck(binPath, expectedVersion) {
 
 // src/update/platform.ts
 init_esm_shims();
+import * as fs25 from "fs";
 import * as path30 from "path";
+import { spawnSync as spawnSync3 } from "child_process";
 import { createRequire as createRequire3 } from "module";
 function currentVersion() {
-  const injected = "0.2.6"?.trim();
+  const injected = "0.2.8"?.trim();
   if (injected) return injected;
   try {
     const req2 = createRequire3(import.meta.url);
@@ -17433,9 +17435,62 @@ function isSeaRuntime() {
   const base = path30.basename(process.execPath).toLowerCase().replace(/\.exe$/, "");
   return base !== "node" && base !== "nodejs";
 }
+var DEFAULT_SERVICE_NAME = "zqagent";
+function serviceManagerFromCgroup(cgroup, serviceName = DEFAULT_SERVICE_NAME) {
+  const unitName = `${serviceName}.service`;
+  for (const line of cgroup.split("\n")) {
+    const idx = line.lastIndexOf(":");
+    if (idx < 0) continue;
+    const unitPath = line.slice(idx + 1).trim();
+    if (unitPath.split("/").includes(unitName)) return "systemd";
+  }
+  return null;
+}
+function detectServiceManager() {
+  if (process.platform !== "linux") return null;
+  const serviceName = process.env.ZQAGENT_SERVICE_NAME?.trim() || DEFAULT_SERVICE_NAME;
+  try {
+    return serviceManagerFromCgroup(
+      fs25.readFileSync("/proc/self/cgroup", "utf8"),
+      serviceName
+    );
+  } catch {
+    return null;
+  }
+}
 function serviceManager() {
   const v = process.env.ZQAGENT_SERVICE_MANAGER?.trim().toLowerCase();
-  return v === "systemd" || v === "launchd" ? v : null;
+  if (v === "systemd" || v === "launchd") return v;
+  return detectServiceManager();
+}
+function parseServiceEnvironment(raw) {
+  const out = {};
+  for (const token of raw.trim().split(/\s+/)) {
+    const idx = token.indexOf("=");
+    if (idx > 0) out[token.slice(0, idx)] = token.slice(idx + 1);
+  }
+  return out;
+}
+var cachedServiceEnv = null;
+function readServiceEnvironment() {
+  const serviceName = process.env.ZQAGENT_SERVICE_NAME?.trim() || DEFAULT_SERVICE_NAME;
+  try {
+    const res = spawnSync3(
+      "systemctl",
+      ["show", serviceName, "--property=Environment", "--value", "--no-pager"],
+      { encoding: "utf8", timeout: 3e3 }
+    );
+    if (res.status !== 0 || !res.stdout) return {};
+    return parseServiceEnvironment(res.stdout);
+  } catch {
+    return {};
+  }
+}
+function serviceEnvValue(key) {
+  if (process.platform !== "linux") return void 0;
+  if (serviceManager() !== "systemd") return void 0;
+  cachedServiceEnv ??= readServiceEnvironment();
+  return cachedServiceEnv[key];
 }
 function selfUpdateCapability(hasPublicKey) {
   if (!isSeaRuntime()) {
@@ -17458,12 +17513,12 @@ function selfUpdateCapability(hasPublicKey) {
 
 // src/update/installer.ts
 init_esm_shims();
-import * as fs26 from "fs";
+import * as fs27 from "fs";
 import * as path32 from "path";
 
 // src/update/state.ts
 init_esm_shims();
-import * as fs25 from "fs";
+import * as fs26 from "fs";
 import * as path31 from "path";
 function updatesDir(dataDir) {
   return path31.join(dataDir, "updates");
@@ -17473,7 +17528,7 @@ function statePath(dataDir) {
 }
 function loadState(dataDir) {
   try {
-    const raw = fs25.readFileSync(statePath(dataDir), "utf-8");
+    const raw = fs26.readFileSync(statePath(dataDir), "utf-8");
     const parsed = JSON.parse(raw);
     if (typeof parsed === "object" && parsed !== null) return parsed;
   } catch {
@@ -17482,11 +17537,11 @@ function loadState(dataDir) {
 }
 function saveState(dataDir, state) {
   const dir = updatesDir(dataDir);
-  fs25.mkdirSync(dir, { recursive: true });
+  fs26.mkdirSync(dir, { recursive: true });
   const file = statePath(dataDir);
   const tmp = `${file}.tmp`;
-  fs25.writeFileSync(tmp, JSON.stringify(state, null, 2), "utf-8");
-  fs25.renameSync(tmp, file);
+  fs26.writeFileSync(tmp, JSON.stringify(state, null, 2), "utf-8");
+  fs26.renameSync(tmp, file);
 }
 function patchState(dataDir, patch) {
   const next = { ...loadState(dataDir), ...patch };
@@ -17500,32 +17555,32 @@ function backupDir(dataDir) {
 }
 function backupCurrent(dataDir, execPath, version) {
   const dir = backupDir(dataDir);
-  fs26.mkdirSync(dir, { recursive: true });
+  fs27.mkdirSync(dir, { recursive: true });
   const target = path32.join(dir, `zqagent-${version}${process.platform === "win32" ? ".exe" : ""}`);
-  fs26.copyFileSync(execPath, target);
-  fs26.chmodSync(target, 493);
+  fs27.copyFileSync(execPath, target);
+  fs27.chmodSync(target, 493);
   return target;
 }
 function replaceExecutable(execPath, stagedPath) {
   if (process.platform === "win32") {
     const oldPath = `${execPath}.old`;
-    fs26.rmSync(oldPath, { force: true });
-    fs26.renameSync(execPath, oldPath);
-    fs26.copyFileSync(stagedPath, execPath);
-    fs26.chmodSync(execPath, 493);
+    fs27.rmSync(oldPath, { force: true });
+    fs27.renameSync(execPath, oldPath);
+    fs27.copyFileSync(stagedPath, execPath);
+    fs27.chmodSync(execPath, 493);
     return;
   }
   const tmp = `${execPath}.new`;
-  fs26.rmSync(tmp, { force: true });
+  fs27.rmSync(tmp, { force: true });
   try {
-    fs26.copyFileSync(stagedPath, tmp);
-    fs26.chmodSync(tmp, 493);
-    fs26.renameSync(tmp, execPath);
+    fs27.copyFileSync(stagedPath, tmp);
+    fs27.chmodSync(tmp, 493);
+    fs27.renameSync(tmp, execPath);
   } catch (err) {
-    fs26.rmSync(tmp, { force: true });
+    fs27.rmSync(tmp, { force: true });
     throw err;
   }
-  fs26.rmSync(stagedPath, { force: true });
+  fs27.rmSync(stagedPath, { force: true });
 }
 function installStaged(opts) {
   const log = opts.log ?? (() => {
@@ -17552,18 +17607,18 @@ function rollback(dataDir, execPath, log = () => {
 }) {
   const state = readRollbackTarget(dataDir);
   if (!state?.backupPath || !state.backupVersion) return null;
-  if (!fs26.existsSync(state.backupPath)) return null;
+  if (!fs27.existsSync(state.backupPath)) return null;
   log(`\u6B63\u5728\u56DE\u6EDA\u5230 v${state.backupVersion}`);
   if (process.platform === "win32") {
-    fs26.rmSync(`${execPath}.old`, { force: true });
-    fs26.renameSync(execPath, `${execPath}.old`);
-    fs26.copyFileSync(state.backupPath, execPath);
-    fs26.chmodSync(execPath, 493);
+    fs27.rmSync(`${execPath}.old`, { force: true });
+    fs27.renameSync(execPath, `${execPath}.old`);
+    fs27.copyFileSync(state.backupPath, execPath);
+    fs27.chmodSync(execPath, 493);
   } else {
     const tmp = `${execPath}.rollback`;
-    fs26.copyFileSync(state.backupPath, tmp);
-    fs26.chmodSync(tmp, 493);
-    fs26.renameSync(tmp, execPath);
+    fs27.copyFileSync(state.backupPath, tmp);
+    fs27.chmodSync(tmp, 493);
+    fs27.renameSync(tmp, execPath);
   }
   patchState(dataDir, {
     pendingVersion: state.backupVersion,
@@ -17577,7 +17632,7 @@ function rollback(dataDir, execPath, log = () => {
 }
 function readRollbackTarget(dataDir) {
   try {
-    const raw = fs26.readFileSync(path32.join(updatesDir(dataDir), "state.json"), "utf-8");
+    const raw = fs27.readFileSync(path32.join(updatesDir(dataDir), "state.json"), "utf-8");
     const s = JSON.parse(raw);
     if (s.backupPath && s.backupVersion) return s;
   } catch {
@@ -17589,7 +17644,9 @@ function readRollbackTarget(dataDir) {
 var DEFAULT_BASE = "https://agent.cd-zq.com/downloads/zqagent";
 function env(key) {
   const v = process.env[key]?.trim();
-  return v ? v : void 0;
+  if (v) return v;
+  const fromService = serviceEnvValue(key)?.trim();
+  return fromService ? fromService : void 0;
 }
 function num(key, fallback) {
   const n = Number(env(key));
@@ -17626,7 +17683,7 @@ var UpdateController = class {
     return parsePublicKey(env("ZQAGENT_UPDATE_PUBKEY") ?? "");
   }
   get autoUpdateOff() {
-    return process.env.ZQAGENT_AUTO_UPDATE?.trim() === "0";
+    return env("ZQAGENT_AUTO_UPDATE") === "0";
   }
   get enabled() {
     return !this.autoUpdateOff && selfUpdateCapability(Boolean(this.publicKey)).ok;
@@ -17660,7 +17717,7 @@ var UpdateController = class {
   reconcile() {
     const state = loadState(this.opts.dataDir);
     const current = this.currentVersion;
-    if (state.stagedPath && !fs27.existsSync(state.stagedPath)) {
+    if (state.stagedPath && !fs28.existsSync(state.stagedPath)) {
       patchState(this.opts.dataDir, { stagedVersion: void 0, stagedPath: void 0 });
     }
     const patch = { runningVersion: current };
@@ -17675,7 +17732,7 @@ var UpdateController = class {
     }
     patchState(this.opts.dataDir, patch);
     if (process.platform === "win32") {
-      fs27.rmSync(`${process.execPath}.old`, { force: true });
+      fs28.rmSync(`${process.execPath}.old`, { force: true });
     }
   }
   schedule(delayMs) {
@@ -17751,7 +17808,7 @@ var UpdateController = class {
       const bin = manifest.binaries[platformKey()];
       if (!bin) return `\u6E05\u5355\u6CA1\u6709\u5F53\u524D\u5E73\u53F0\uFF08${platformKey()}\uFF09\u7684\u4EA7\u7269`;
       let stagedPath = state.stagedPath;
-      if (!(state.stagedVersion === manifest.version && stagedPath && fs27.existsSync(stagedPath))) {
+      if (!(state.stagedVersion === manifest.version && stagedPath && fs28.existsSync(stagedPath))) {
         stagedPath = path33.join(
           updatesDir(this.opts.dataDir),
           "staged",
@@ -17764,7 +17821,7 @@ var UpdateController = class {
         }
         const selfTest = selfCheck(stagedPath, manifest.version);
         if (!selfTest.ok) {
-          fs27.rmSync(stagedPath, { force: true });
+          fs28.rmSync(stagedPath, { force: true });
           this.recordFailure(manifest.version, selfTest.error ?? "\u81EA\u68C0\u5931\u8D25");
           return `\u5B89\u88C5\u5305\u81EA\u68C0\u5931\u8D25\uFF1A${selfTest.error}`;
         }
@@ -17905,7 +17962,7 @@ function pemFile(key) {
   const p = env2(key);
   if (!p) return void 0;
   try {
-    return fs28.readFileSync(p);
+    return fs29.readFileSync(p);
   } catch (e) {
     console.warn(`[tls] \u8BFB\u53D6 ${key}=${p} \u5931\u8D25: ${e instanceof Error ? e.message : e}`);
     return void 0;