@elementspanel/epanel-plugin-instance 1.0.5 → 1.0.6

package/daemon/backend/index.cjs

@@ -226,9 +226,26 @@ function commandStringToArray(cmd) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ChildProcessAdapter = void 0;
+exports.instanceProcessHost = instanceProcessHost;
+exports.spawnInstanceProcess = spawnInstanceProcess;
 exports.waitForSpawn = waitForSpawn;
 const events_1 = __webpack_require__("events");
 const mcsmanager_common_1 = __webpack_require__("../common/src/index.ts");
+const INSTANCE_HOST = Symbol.for("elementspanel.instance-process-host");
+function instanceProcessHost() {
+    return globalThis[INSTANCE_HOST];
+}
+function spawnInstanceProcess(instance, fallback, file, args, options, metadata = {}) {
+    const host = instanceProcessHost();
+    return host
+        ? host.spawn(instance.instanceUuid, file, args, options, {
+            startTimestamp: instance.startTimestamp,
+            startCount: instance.startCount,
+            autoRestartCount: instance.autoRestartCount,
+            ...metadata
+        })
+        : fallback(file, args, options);
+}
 /** spawn() reports failures asynchronously, including a missing executable. */
 function waitForSpawn(process) {
     return new Promise((resolve, reject) => {
@@ -266,7 +283,9 @@ class ChildProcessAdapter extends events_1.EventEmitter {
         super();
         this.child = child;
         this.pid = child.pid;
-        child.once("close", () => { this.closed = true; });
+        child.once("close", () => {
+            this.closed = true;
+        });
         // close follows the final stdout/stderr data; exit can arrive before it.
         child.on("close", this.onExit);
         child.on("error", this.onError);
@@ -292,6 +311,9 @@ class ChildProcessAdapter extends events_1.EventEmitter {
         if (this.pid)
             return (0, mcsmanager_common_1.killProcess)(this.pid, this.child, signal);
     }
+    snapshot(metadata) {
+        this.child.setMetadata?.(metadata);
+    }
     destroy() {
         if (this.disposed)
             return;
@@ -326,6 +348,7 @@ class ChildProcessAdapter extends events_1.EventEmitter {
             this.child.stdin?.destroy();
             this.child.stdout?.destroy();
             this.child.stderr?.destroy();
+            this.child.release?.();
         }
     }
 }
@@ -1030,20 +1053,19 @@ class GeneralStartCommand extends start_1.default {
             instance.println("INFO", (0, i18n_1.$t)("TXT_CODE_ba09da46", { name: runAsConfig.runAsName }));
         }
         // create child process
-        const subProcess = (0, child_process_1.spawn)(commandExeFile, commandParameters, {
+        const subProcess = (0, process_adapter_1.spawnInstanceProcess)(instance, child_process_1.spawn, commandExeFile, commandParameters, {
             ...runAsConfig,
             cwd: instance.absoluteCwdPath(),
             stdio: "pipe",
             windowsHide: true,
             env: instance.generateEnv(),
-            // Do not detach the child process;
-            // otherwise, an abnormal exit of the parent process may cause the child process to continue running,
-            // leading to an abnormal instance state.
             detached: false
         });
         const processAdapter = new process_adapter_1.ChildProcessAdapter(subProcess);
         try {
             await (0, process_adapter_1.waitForSpawn)(subProcess);
+            processAdapter.pid = subProcess.pid;
+            subProcess.setMetadata?.({ pid: subProcess.pid });
             instance.started(processAdapter);
         }
         catch (error) {
@@ -1470,17 +1492,14 @@ class PtyStartCommand extends start_1.default {
         }
         instance.println("INFO", "> " + commandList.join(" "));
         // create pty child process
-        const subProcess = (0, child_process_1.spawn)(const_1.PTY_PATH, ptyParameter, {
+        const subProcess = (0, process_adapter_1.spawnInstanceProcess)(instance, child_process_1.spawn, const_1.PTY_PATH, ptyParameter, {
             ...runAsConfig,
             cwd: path_1.default.dirname(const_1.PTY_PATH),
             stdio: "pipe",
             windowsHide: true,
             env: instance.generateEnv(),
-            // Do not detach the child process;
-            // otherwise, an abnormal exit of the parent process may cause the child process to continue running,
-            // leading to an abnormal instance state.
             detached: false
-        });
+        }, { pipeName });
         const processAdapter = new GoPtyProcessAdapter(subProcess, subProcess.pid, pipeName);
         try {
             const [, config] = await Promise.all([
@@ -1488,6 +1507,7 @@ class PtyStartCommand extends start_1.default {
                 this.readPtySubProcessConfig(subProcess)
             ]);
             processAdapter.pid = config.pid;
+            subProcess.setMetadata?.({ pid: config.pid });
             if (subProcess.exitCode !== null || subProcess.signalCode !== null)
                 throw new StartupError((0, i18n_1.$t)("TXT_CODE_pty_start.instanceStartErr"));
             instance.started(processAdapter);
@@ -1547,6 +1567,17 @@ class AbsStartCommand extends command_1.default {
         // Claim the state before the first await so two starts cannot both proceed.
         instance.setLock(true);
         instance.status(instance_1.default.STATUS_STARTING);
+        const starting = this.start(instance);
+        instance.starting = starting;
+        try {
+            return await starting;
+        }
+        finally {
+            instance.starting = undefined;
+            instance.setLock(false);
+        }
+    }
+    async start(instance) {
         try {
             if (!fs_extra_1.default.existsSync(instance.absoluteCwdPath())) {
                 await fs_extra_1.default.mkdirs(instance.absoluteCwdPath());
@@ -1595,9 +1626,6 @@ class AbsStartCommand extends command_1.default {
             instance.startTimestamp = 0;
             instance.failure(error);
         }
-        finally {
-            instance.setLock(false);
-        }
     }
 }
 exports["default"] = AbsStartCommand;
@@ -2138,6 +2166,7 @@ class Instance extends events_1.EventEmitter {
     };
     watchers = new Map();
     process;
+    starting;
     outputLoopTask;
     outputBuffer;
     stopping;
@@ -2336,9 +2365,22 @@ class Instance extends events_1.EventEmitter {
     }
     // function that must be executed after the instance starts
     // Trigger the open event and bind the data and exit events, etc.
-    started(process) {
-        this.startTimestamp = this.config.lastDatetime = Date.now();
-        this.userRequestedStop = false;
+    started(process, previous) {
+        this.startTimestamp = this.config.lastDatetime = previous?.startTimestamp || Date.now();
+        if (previous) {
+            this.startCount = previous.startCount;
+            this.autoRestartCount = previous.autoRestartCount;
+        }
+        this.userRequestedStop = previous?.userRequestedStop ?? false;
+        if (this.userRequestedStop)
+            this.ignoreEventTaskOnce();
+        process.snapshot?.({
+            pid: Number(process.pid),
+            startTimestamp: this.startTimestamp,
+            startCount: this.startCount,
+            autoRestartCount: this.autoRestartCount,
+            userRequestedStop: this.userRequestedStop
+        });
         const outputCode = this.config.terminalOption.pty ? "utf-8" : this.config.oe;
         process.on("data", (text) => {
             this.pushOutput(iconv_lite_1.default.decode(text, outputCode));
@@ -2442,6 +2484,7 @@ class Instance extends events_1.EventEmitter {
         this.stopOutputLoop();
         this.reloading = true;
         this.watchers.clear();
+        await this.starting?.catch(() => { });
         await this.lifeCycleTaskManager.clearLifeCycleTask();
     }
     async resumeAfterReload(dispatcher) {
@@ -2479,6 +2522,7 @@ class Instance extends events_1.EventEmitter {
     }
     setUserRequestedStop(value) {
         this.userRequestedStop = value;
+        this.process?.snapshot?.({ userRequestedStop: value });
     }
     getUserRequestedStop() {
         return this.userRequestedStop;
@@ -2995,6 +3039,17 @@ function apply(ctx) {
     let preserving = false;
     let subsystem;
     let disposeSchedules;
+    let initializing;
+    ctx.on("process/starting", async () => {
+        if (!initializing)
+            throw new Error("Instance services failed to initialize.");
+        await initializing;
+        await subsystem?.waitForTakeover();
+    });
+    ctx.on("process/restarting", async () => {
+        disposeSchedules?.();
+        await subsystem?.prepareForRestart();
+    });
     ctx.on("plugins/reloading", async () => {
         const inventory = ctx.get("plugins")?.inventory();
         preserving = inventory?.some((plugin) => plugin.id === "instance" && plugin.enabled) ?? true;
@@ -3009,7 +3064,11 @@ function apply(ctx) {
     // are available on the next turn rather than synchronously in this function.
     // Restoring instances before that point makes the legacy dispatcher read
     // missing `presets` and `instanceLifecycle` services and emit warnings.
-    ctx.inject(["tasks", "instanceLifecycle", "presets", "schedules"], async (instanceCtx) => {
+    ctx.inject(["tasks", "instanceLifecycle", "presets", "schedules"], (instanceCtx) => {
+        initializing = initialize(instanceCtx);
+        return initializing;
+    });
+    async function initialize(instanceCtx) {
         // The modules are required only after the context has been set and the
         // instance registries are ready. Keeping these synchronous requires keeps
         // webpack's output self-contained and avoids a second copy of the context.
@@ -3063,7 +3122,12 @@ function apply(ctx) {
             await disposeInstanceEvents?.();
             InstanceControlSubsystem.dispose();
             router_1.routerApp.dispose();
-            if ((preserving || recovering) && !runtime.stopping && ctx.root.scope.isActive) {
+            if (runtime.restarting) {
+                // The launcher owns general/PTY processes; Docker is reattached at
+                // startup. Disposing adapters here would terminate those live owners.
+                await InstanceSubsystem.prepareForRestart();
+            }
+            else if ((preserving || recovering) && !runtime.stopping && ctx.root.scope.isActive) {
                 await InstanceSubsystem.suspendForReload();
                 retain();
             }
@@ -3161,7 +3225,7 @@ function apply(ctx) {
             // Also allow recovery by enabling/retrying only the instance plugin.
             instanceCtx.on("ready", resume);
         }
-    });
+    }
 }
 
 
@@ -5551,14 +5615,19 @@ function setPluginContext(value) {
             context: value,
             settings: value.settings,
             storage: value.storage,
-            stopping: false
+            stopping: false,
+            restarting: false
         };
         host[INSTANCE_RUNTIME] = runtime = state;
+        host.on("process/restarting", () => {
+            state.restarting = true;
+        });
         host.on("dispose", async () => {
             state.stopping = true;
             // A replacement may fail before it can claim the retained processes.
             // The daemon still owns them and must stop them during real shutdown.
-            await state.handover?.shutdown();
+            if (!state.restarting)
+                await state.handover?.shutdown();
             state.handover = undefined;
         });
     }
@@ -7356,6 +7425,7 @@ const sleep_1 = __webpack_require__("../../plugins/instance/daemon/src/backend/u
 const log_1 = __importDefault(__webpack_require__("../../plugins/instance/daemon/src/backend/service/log.ts"));
 const system_instance_control_1 = __importDefault(__webpack_require__("../../plugins/instance/daemon/src/backend/service/system_instance_control.ts"));
 const takeover_container_1 = __importDefault(__webpack_require__("../../plugins/instance/daemon/src/backend/service/takeover_container.ts"));
+const takeover_processes_1 = __importDefault(__webpack_require__("../../plugins/instance/daemon/src/backend/service/takeover_processes.ts"));
 class InstanceSubsystem extends events_1.default {
     GLOBAL_INSTANCE = "__MCSM_GLOBAL_INSTANCE__";
     GLOBAL_INSTANCE_UUID = "global0001";
@@ -7464,14 +7534,26 @@ class InstanceSubsystem extends events_1.default {
             processType: globalConfig.processType
         }, true, // allow persistence
         this.GLOBAL_INSTANCE_UUID);
-        this.takeover = (0, takeover_container_1.default)(() => !this.startupCancelled).catch((error) => {
-            const reason = error.message || error;
-            if (typeof reason == "string" && reason.includes("connect ENOENT")) {
-                return;
+        this.takeover = (async () => {
+            await (0, takeover_processes_1.default)(() => !this.startupCancelled);
+            try {
+                await (0, takeover_container_1.default)(() => !this.startupCancelled);
             }
-            log_1.default.error(`${(0, i18n_1.$t)("TXT_CODE_8d4c8f7e")}: ${reason}`);
-        });
-        void this.takeover.then(() => this.autoStart());
+            catch (error) {
+                const reason = error.message || error;
+                if (typeof reason == "string" && reason.includes("connect ENOENT"))
+                    return;
+                log_1.default.error(`${(0, i18n_1.$t)("TXT_CODE_8d4c8f7e")}: ${reason}`);
+            }
+        })();
+        void this.takeover
+            .then(() => {
+            // A worker replacement must also preserve intentionally stopped
+            // instances, even when their next full launcher startup is automatic.
+            if (process.env.EPANEL_RESTARTED !== "1")
+                return this.autoStart();
+        })
+            .catch((error) => log_1.default.error(error));
     }
     createInstance(cfg, persistence = true, uuid) {
         const newUuid = uuid || (0, uuid_1.v4)().replace(/-/gim, "");
@@ -7546,6 +7628,22 @@ class InstanceSubsystem extends events_1.default {
         await Promise.all([...this.instances.values()].map((instance) => instance.suspendForReload()));
         await this.takeover;
     }
+    async waitForTakeover() {
+        await this.takeover;
+    }
+    async prepareForRestart() {
+        await this.suspendForReload();
+        for (const instance of this.instances.values()) {
+            system_storage_1.default.store("InstanceConfig", instance.instanceUuid, instance.config);
+            instance.process?.snapshot?.({
+                pid: Number(instance.process.pid),
+                startTimestamp: instance.startTimestamp,
+                startCount: instance.startCount,
+                autoRestartCount: instance.autoRestartCount,
+                userRequestedStop: instance.getUserRequestedStop()
+            });
+        }
+    }
     /** Transfer the existing owners, including ordinary child/PTY/Docker handles. */
     adoptInstances(instances) {
         this.startupCancelled = true;
@@ -8131,6 +8229,46 @@ async function takeoverContainer(isActive = () => true) {
 }
 
 
+/***/ },
+
+/***/ "../../plugins/instance/daemon/src/backend/service/takeover_processes.ts"
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports["default"] = takeoverProcesses;
+const process_adapter_1 = __webpack_require__("../../plugins/instance/daemon/src/backend/entity/commands/base/process_adapter.ts");
+const pty_start_1 = __webpack_require__("../../plugins/instance/daemon/src/backend/entity/commands/pty/pty_start.ts");
+const system_instance_1 = __importDefault(__webpack_require__("../../plugins/instance/daemon/src/backend/service/system_instance.ts"));
+/** Reattach the launcher's live pipes; do not execute the instance start command. */
+async function takeoverProcesses(isActive = () => true) {
+    const host = (0, process_adapter_1.instanceProcessHost)();
+    if (!host)
+        return;
+    for (const snapshot of await host.list()) {
+        if (!isActive())
+            return;
+        const instance = system_instance_1.default.getInstance(snapshot.id);
+        const child = host.connect(snapshot);
+        const { pipeName, pid } = snapshot.metadata;
+        const adapter = pipeName
+            ? new pty_start_1.GoPtyProcessAdapter(child, pid, pipeName)
+            : new process_adapter_1.ChildProcessAdapter(child);
+        if (!instance || instance.process) {
+            await adapter.destroy();
+            continue;
+        }
+        instance.started(adapter, snapshot.metadata);
+        if (pipeName)
+            adapter.attachOutput();
+    }
+}
+
+
 /***/ },
 
 /***/ "../../plugins/instance/daemon/src/backend/service/version_adapter.ts"
@@ -8634,6 +8772,7 @@ Object.defineProperty(exports, "arrayUnique", ({ enumerable: true, get: function
 __exportStar(__webpack_require__("../common/src/plugin_contract.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_overrides.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_lifecycle.ts"), exports);
+__exportStar(__webpack_require__("../common/src/process_restart.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_revision.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_modules.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_watch.ts"), exports);
@@ -10267,6 +10406,50 @@ function watchNpmPlugins(ctx, side, reload, changed) {
 }
 
 
+/***/ },
+
+/***/ "../common/src/process_restart.ts"
+(__unused_webpack_module, exports) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isProcessRestartPending = isProcessRestartPending;
+exports.requestProcessRestart = requestProcessRestart;
+const RESTART = Symbol.for("elementspanel.process.restart");
+function isProcessRestartPending(ctx) {
+    return ctx.root[RESTART]?.pending === true;
+}
+/** The CLI retains instance processes and starts a fresh worker after this one exits. */
+function requestProcessRestart(ctx, settle, ready = async () => { }) {
+    if (isProcessRestartPending(ctx))
+        return true;
+    if (process.env.EPANEL_SUPERVISED !== "1" || !process.connected || !process.send)
+        return false;
+    const state = { pending: true };
+    ctx.root[RESTART] = state;
+    const retainProcesses = () => new Promise((resolve, reject) => process.send({ type: "elementspanel:prepare-restart" }, (error) => error ? reject(error) : resolve()));
+    setImmediate(() => {
+        void (async () => {
+            await ready();
+            // Detach output consumers before cleanup so output and exits during the
+            // restart are retained for the next daemon generation.
+            await retainProcesses();
+            await ctx.parallel("process/restarting");
+            // A pending start can finish while restart hooks are awaiting it.
+            await retainProcesses();
+            await ctx.stop();
+            await settle();
+            process.send({ type: "elementspanel:restart" }, (error) => process.exit(error ? 1 : 0));
+        })().catch((error) => {
+            ctx.logger.error("Failed to restart the process:", error);
+            process.exit(1);
+        });
+    });
+    return true;
+}
+
+
 /***/ },
 
 /***/ "../common/src/process_tools.ts"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementspanel/epanel-plugin-instance",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Application instance and Java runtime management.",
   "license": "Apache-2.0",
   "author": "Csituka_D <694428809@qq.com> (https://github.com/JessDaodao)",
@@ -50,8 +50,8 @@
     }
   },
   "peerDependencies": {
-    "@elementspanel/panel": "^1.0.2",
-    "@elementspanel/daemon": "^1.0.2"
+    "@elementspanel/panel": "^1.0.3",
+    "@elementspanel/daemon": "^1.0.3"
   },
   "peerDependenciesMeta": {
     "@elementspanel/panel": {

package/panel/backend/index.cjs

@@ -9468,6 +9468,7 @@ Object.defineProperty(exports, "arrayUnique", ({ enumerable: true, get: function
 __exportStar(__webpack_require__("../common/src/plugin_contract.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_overrides.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_lifecycle.ts"), exports);
+__exportStar(__webpack_require__("../common/src/process_restart.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_revision.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_modules.ts"), exports);
 __exportStar(__webpack_require__("../common/src/plugin_watch.ts"), exports);
@@ -11134,6 +11135,51 @@ function watchNpmPlugins(ctx, side, reload, changed) {
 }
 
 
+/***/ },
+
+/***/ "../common/src/process_restart.ts"
+(__unused_webpack_module, exports) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isProcessRestartPending = isProcessRestartPending;
+exports.requestProcessRestart = requestProcessRestart;
+const RESTART = Symbol.for("elementspanel.process.restart");
+function isProcessRestartPending(ctx) {
+    var _a;
+    return ((_a = ctx.root[RESTART]) === null || _a === void 0 ? void 0 : _a.pending) === true;
+}
+/** The CLI retains instance processes and starts a fresh worker after this one exits. */
+function requestProcessRestart(ctx, settle, ready = async () => { }) {
+    if (isProcessRestartPending(ctx))
+        return true;
+    if (process.env.EPANEL_SUPERVISED !== "1" || !process.connected || !process.send)
+        return false;
+    const state = { pending: true };
+    ctx.root[RESTART] = state;
+    const retainProcesses = () => new Promise((resolve, reject) => process.send({ type: "elementspanel:prepare-restart" }, (error) => error ? reject(error) : resolve()));
+    setImmediate(() => {
+        void (async () => {
+            await ready();
+            // Detach output consumers before cleanup so output and exits during the
+            // restart are retained for the next daemon generation.
+            await retainProcesses();
+            await ctx.parallel("process/restarting");
+            // A pending start can finish while restart hooks are awaiting it.
+            await retainProcesses();
+            await ctx.stop();
+            await settle();
+            process.send({ type: "elementspanel:restart" }, (error) => process.exit(error ? 1 : 0));
+        })().catch((error) => {
+            ctx.logger.error("Failed to restart the process:", error);
+            process.exit(1);
+        });
+    });
+    return true;
+}
+
+
 /***/ },
 
 /***/ "../common/src/process_tools.ts"