clawconnect-agent 0.2.13 → 0.2.15

package/dist/platform/windows-service-legacy-startup.js

@@ -0,0 +1,101 @@
+import { execFileSync } from "child_process";
+import { listProfileNames, normalizeProfileName } from "../config/profile.js";
+import { isProcessTimeoutError, killWindowsProcess, reportWindowsQueryTimeout, WINDOWS_READ_ONLY_QUERY_TIMEOUT_MS, } from "./windows-process-control.js";
+import { WINDOWS_SERVICE_BASE_NAME, windowsServiceName } from "./windows-service-paths.js";
+export const LEGACY_WINDOWS_RUN_KEY = "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
+function probeLegacyEntries(name, execFileSyncImpl, onQueryTimeout) {
+    const probe = { taskExists: false, runEntryExists: false, timedOut: false };
+    const run = (command, args, label) => {
+        try {
+            execFileSyncImpl(command, args, {
+                stdio: "pipe",
+                windowsHide: true,
+                timeout: WINDOWS_READ_ONLY_QUERY_TIMEOUT_MS,
+            });
+            return true;
+        }
+        catch (error) {
+            if (isProcessTimeoutError(error)) {
+                probe.timedOut = true;
+                onQueryTimeout(label);
+            }
+            return false;
+        }
+    };
+    probe.taskExists = run("schtasks", ["/query", "/tn", name], "scheduled task");
+    probe.runEntryExists = run("reg.exe", ["query", LEGACY_WINDOWS_RUN_KEY, "/v", name], "startup registry");
+    return probe;
+}
+function removeLegacyEntries(name, probe, execFileSyncImpl) {
+    let removed = true;
+    if (probe.taskExists) {
+        try {
+            execFileSyncImpl("schtasks", ["/end", "/tn", name], { stdio: "pipe", windowsHide: true });
+        }
+        catch {
+            // 任务可能处于未运行状态。
+        }
+        try {
+            execFileSyncImpl("schtasks", ["/delete", "/tn", name, "/f"], { stdio: "pipe", windowsHide: true });
+        }
+        catch {
+            removed = false;
+        }
+    }
+    if (probe.runEntryExists) {
+        try {
+            execFileSyncImpl("reg.exe", ["delete", LEGACY_WINDOWS_RUN_KEY, "/v", name, "/f"], {
+                stdio: "pipe",
+                windowsHide: true,
+            });
+        }
+        catch {
+            removed = false;
+        }
+    }
+    return removed;
+}
+/**
+ * 迁移到 Windows 服务后清理旧的"计划任务 / HKCU Run"自启动项。
+ *
+ * 必须清理干净：旧项下次登录会再拉起一个 Agent，与服务托管的实例同时连 Relay，
+ * Relay 会让后连的顶掉先连的，两边互相抢占，表现为网关反复掉线。
+ *
+ * 清理对象：
+ * 1. 该 profile 自己的同名任务与 Run 项（默认 profile 为无后缀名称）；
+ * 2. 具名 profile 且磁盘上没有已配置的 default profile 时，再清理遗留的无后缀名称。
+ *    存在 default profile 时，无后缀名称归 default 所有，必须保留。
+ *
+ * 任一项查询超时或删除失败都返回 false，调用方应中止安装而不是带着遗留项继续。
+ */
+export function removeLegacyWindowsStartup(profile, options = {}) {
+    const resolvedProfile = normalizeProfileName(profile);
+    const execFileSyncImpl = options.execFileSyncImpl ?? execFileSync;
+    const onQueryTimeout = options.onQueryTimeout ?? reportWindowsQueryTimeout;
+    const stopLegacyProcess = options.stopLegacyProcess ?? ((target) => { killWindowsProcess(target); });
+    const names = [windowsServiceName(resolvedProfile)];
+    if (resolvedProfile) {
+        const defaultProfileConfigured = options.defaultProfileConfigured
+            ?? listProfileNames().includes("default");
+        if (!defaultProfileConfigured) {
+            names.push(WINDOWS_SERVICE_BASE_NAME);
+        }
+    }
+    let migrated = true;
+    for (const name of names) {
+        const probe = probeLegacyEntries(name, execFileSyncImpl, onQueryTimeout);
+        if (probe.timedOut) {
+            return false;
+        }
+        if (!probe.taskExists && !probe.runEntryExists) {
+            continue;
+        }
+        if (!removeLegacyEntries(name, probe, execFileSyncImpl)) {
+            migrated = false;
+        }
+        // 无后缀名称对应没有 --profile 的 Agent 进程；具名名称对应该 profile 的进程。
+        stopLegacyProcess(name === WINDOWS_SERVICE_BASE_NAME ? undefined : resolvedProfile);
+    }
+    return migrated;
+}
+//# sourceMappingURL=windows-service-legacy-startup.js.map

package/dist/platform/windows-service-legacy-startup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"windows-service-legacy-startup.js","sourceRoot":"","sources":["../../src/platform/windows-service-legacy-startup.ts"],"names":[],"mappings":"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"}

package/dist/platform/windows-service-paths.d.ts

@@ -0,0 +1,15 @@
+export declare const WINDOWS_SERVICE_BASE_NAME = "ClawConnectAgent";
+export declare const WINDOWS_SERVICE_HOST_EXE_NAME = "clawconnect-service-host.exe";
+export declare const WINDOWS_SERVICE_HOST_SOURCE_NAME = "clawconnect-service-host.cs";
+export declare const WINDOWS_SERVICE_HOST_CONFIG_NAME = "clawconnect-service-host.conf";
+/** 旧版（计划任务时代）的 PowerShell runner，仅用于识别并清理遗留进程。 */
+export declare const LEGACY_WINDOWS_RUNNER_NAME = "clawconnect-service.ps1";
+/**
+ * Windows 服务名：默认 profile 为 ClawConnectAgent，具名 profile 追加 `-<profile>`，
+ * 与旧计划任务同名，便于迁移时一一对应。
+ */
+export declare function windowsServiceName(profile?: string): string;
+export declare function windowsServiceHostExePath(profile?: string): string;
+export declare function windowsServiceHostSourcePath(profile?: string): string;
+export declare function windowsServiceHostConfigPath(profile?: string): string;
+export declare function windowsServiceRunnerPath(profile?: string): string;

package/dist/platform/windows-service-paths.js

@@ -0,0 +1,30 @@
+import { join } from "path";
+import { getProfileLogDir } from "./service-manager-common.js";
+import { normalizeProfileName } from "../config/profile.js";
+export const WINDOWS_SERVICE_BASE_NAME = "ClawConnectAgent";
+export const WINDOWS_SERVICE_HOST_EXE_NAME = "clawconnect-service-host.exe";
+export const WINDOWS_SERVICE_HOST_SOURCE_NAME = "clawconnect-service-host.cs";
+export const WINDOWS_SERVICE_HOST_CONFIG_NAME = "clawconnect-service-host.conf";
+/** 旧版（计划任务时代）的 PowerShell runner，仅用于识别并清理遗留进程。 */
+export const LEGACY_WINDOWS_RUNNER_NAME = "clawconnect-service.ps1";
+/**
+ * Windows 服务名：默认 profile 为 ClawConnectAgent，具名 profile 追加 `-<profile>`，
+ * 与旧计划任务同名，便于迁移时一一对应。
+ */
+export function windowsServiceName(profile) {
+    const normalized = normalizeProfileName(profile);
+    return normalized ? `${WINDOWS_SERVICE_BASE_NAME}-${normalized}` : WINDOWS_SERVICE_BASE_NAME;
+}
+export function windowsServiceHostExePath(profile) {
+    return join(getProfileLogDir(profile), WINDOWS_SERVICE_HOST_EXE_NAME);
+}
+export function windowsServiceHostSourcePath(profile) {
+    return join(getProfileLogDir(profile), WINDOWS_SERVICE_HOST_SOURCE_NAME);
+}
+export function windowsServiceHostConfigPath(profile) {
+    return join(getProfileLogDir(profile), WINDOWS_SERVICE_HOST_CONFIG_NAME);
+}
+export function windowsServiceRunnerPath(profile) {
+    return join(getProfileLogDir(profile), LEGACY_WINDOWS_RUNNER_NAME);
+}
+//# sourceMappingURL=windows-service-paths.js.map

package/dist/platform/windows-service-paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"windows-service-paths.js","sourceRoot":"","sources":["../../src/platform/windows-service-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,CAAC,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;AAC5D,MAAM,CAAC,MAAM,6BAA6B,GAAG,8BAA8B,CAAC;AAC5E,MAAM,CAAC,MAAM,gCAAgC,GAAG,6BAA6B,CAAC;AAC9E,MAAM,CAAC,MAAM,gCAAgC,GAAG,+BAA+B,CAAC;AAChF,kDAAkD;AAClD,MAAM,CAAC,MAAM,0BAA0B,GAAG,yBAAyB,CAAC;AAEpE;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAgB;IACjD,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjD,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,yBAAyB,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAC;AAC/F,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,OAAgB;IACxD,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,6BAA6B,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,OAAgB;IAC3D,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,gCAAgC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,OAAgB;IAC3D,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,gCAAgC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAgB;IACvD,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,0BAA0B,CAAC,CAAC;AACrE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawconnect-agent",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "ClawConnect host agent for OpenClaw remote access",
   "license": "MIT",
   "type": "module",