@cjhyy/code-shell-server 0.9.20 → 0.9.21

package/dist/panels/runtime.js

@@ -447,6 +447,7 @@ export function createPanelRuntime(options) {
     }, 60_000);
     reaper.unref();
     const preparing = new Set();
+    const preparingTools = new Set();
     async function dispatchToolJobs(grant, method, params) {
         if (!grant.app.permissions.includes("process") || !grant.app.permissions.includes("resources"))
             error(403, "原生后台任务需要 process 和 resources 权限。");
@@ -466,21 +467,37 @@ export function createPanelRuntime(options) {
                 error(403, "你取消了后台工具执行。");
             if (!(await authorized(grant)))
                 error(410, "面板授权已失效。");
-            const job = await service.start(scope, {
-                entry: { name: input.entry, sha256: entry.sha256 },
-                input: input.input,
-                recovery: input.recovery ?? "manual",
-                requestKey: input.requestKey,
-            });
-            if (!jobOwners.has(job.id))
-                jobOwners.set(job.id, { owner: grant.owner, scope });
-            if (!(await authorized(grant))) {
-                if (jobOwners.get(job.id)?.owner === grant.owner)
-                    await service.cancel(scope, job.id);
-                error(410, "登录授权已撤销。");
+            const preparation = {
+                owner: grant.owner,
+                appId: scope.appId,
+                controller: new AbortController(),
+            };
+            preparingTools.add(preparation);
+            try {
+                const job = await service.start(scope, {
+                    entry: { name: input.entry, sha256: entry.sha256 },
+                    input: input.input,
+                    recovery: input.recovery ?? "manual",
+                    requestKey: input.requestKey,
+                }, preparation.controller.signal);
+                if (!jobOwners.has(job.id))
+                    jobOwners.set(job.id, { owner: grant.owner, scope });
+                if (!(await authorized(grant))) {
+                    if (jobOwners.get(job.id)?.owner === grant.owner)
+                        await service.cancel(scope, job.id);
+                    error(410, "登录授权已撤销。");
+                }
+                emitTaskEvent(await service.get(scope, job.id));
+                return job;
+            }
+            catch (cause) {
+                if (preparation.controller.signal.aborted)
+                    error(410, "登录授权已撤销，输入准备已取消。");
+                throw cause;
+            }
+            finally {
+                preparingTools.delete(preparation);
             }
-            emitTaskEvent(await service.get(scope, job.id));
-            return job;
         }
         if (method === "tasks.list") {
             const offset = input.offset ?? 0, limit = input.limit ?? 50;
@@ -743,6 +760,9 @@ export function createPanelRuntime(options) {
         };
     }
     function cancelOwner(owner) {
+        for (const preparation of preparingTools)
+            if (preparation.owner === owner)
+                preparation.controller.abort();
         for (const preparation of preparing)
             if (preparation.owner === owner)
                 preparation.cancelled = true;
@@ -1187,6 +1207,9 @@ export function createPanelRuntime(options) {
         cancelOwner,
         invalidate(appId) {
             generation++;
+            for (const preparation of preparingTools)
+                if (!appId || preparation.appId === appId)
+                    preparation.controller.abort();
             for (const grant of grants.values())
                 if (!appId || grant.app.id === appId)
                     remove(grant);
@@ -1199,6 +1222,8 @@ export function createPanelRuntime(options) {
         },
         async close() {
             closed = true;
+            for (const preparation of preparingTools)
+                preparation.controller.abort();
             clearInterval(reaper);
             for (const grant of grants.values())
                 remove(grant);

package/dist/panels/tool-jobs.d.ts

@@ -92,7 +92,7 @@ export declare class PanelToolJobService {
     get(rawScope: ToolJobScope, id: string): Promise<ToolJob & {
         readOnly: boolean;
     }>;
-    start(rawScope: ToolJobScope, request: ToolJobRequest): Promise<ToolJob>;
+    start(rawScope: ToolJobScope, request: ToolJobRequest, signal?: AbortSignal): Promise<ToolJob>;
     private schedule;
     private pump;
     private run;

package/dist/panels/tool-jobs.js

@@ -208,7 +208,8 @@ export class PanelToolJobService {
         const job = this.lookup(scope, id);
         return { ...publicJob(job), readOnly: job.scope.revision !== scope.revision };
     }
-    async start(rawScope, request) {
+    async start(rawScope, request, signal) {
+        signal?.throwIfAborted();
         const scope = scopeValue(rawScope);
         const entry = entryValue(request?.entry);
         if (!["manual", "retry"].includes(request.recovery))
@@ -232,6 +233,7 @@ export class PanelToolJobService {
         await this.authorize(scope);
         let done;
         const reservation = await this.exclusive(async () => {
+            signal?.throwIfAborted();
             if (this.stopping)
                 throw new Error("tool job service is shutting down");
             if (request.requestKey) {
@@ -268,8 +270,14 @@ export class PanelToolJobService {
         if (reservation.existing)
             return publicJob(reservation.existing);
         const { id, controller } = reservation;
+        const abort = () => controller.abort(signal?.reason);
+        signal?.addEventListener("abort", abort, { once: true });
+        if (signal?.aborted)
+            abort();
         try {
+            controller.signal.throwIfAborted();
             const workDir = await this.storage.directory(id, true, true);
+            controller.signal.throwIfAborted();
             const prepared = this.options.prepareInput
                 ? await this.options.prepareInput(scope, input, workDir, controller.signal)
                 : input;
@@ -296,6 +304,19 @@ export class PanelToolJobService {
                     [...this.jobs.values()].some((other) => sameScope(other.scope, scope) && other.requestKey === request.requestKey))
                     throw new Error("tool job request key is already being prepared");
                 await this.commit(job);
+                // Cancellation can arrive during the durable write. The serial fence
+                // prevents the scheduler from selecting this job before cancellation.
+                if (controller.signal.aborted) {
+                    job.status = "cancelled";
+                    job.completedAt = this.now();
+                    job.error = {
+                        code: "CANCELLED",
+                        message: "Task was cancelled before execution.",
+                        retryable: job.recovery === "retry",
+                    };
+                    await this.commit(job);
+                    controller.signal.throwIfAborted();
+                }
             });
             this.schedule();
             return publicJob(job);
@@ -307,6 +328,7 @@ export class PanelToolJobService {
             throw error;
         }
         finally {
+            signal?.removeEventListener("abort", abort);
             this.preparing.delete(id);
             done();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-server",
-  "version": "0.9.20",
+  "version": "0.9.21",
   "description": "CodeShell server transport layer — mobile remote HTTP/WS host, pairing, passcode gate, tunnel, rooms, uploads, and session/attachment services. Electron-free; precursor of the auth gateway.",
   "type": "module",
   "main": "./dist/index.js",
@@ -51,13 +51,13 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-capability-coding": "0.9.20",
-    "@cjhyy/code-shell-core": "0.9.20",
-    "@cjhyy/code-shell-web": "0.9.20",
+    "@cjhyy/code-shell-capability-coding": "0.9.21",
+    "@cjhyy/code-shell-core": "0.9.21",
+    "@cjhyy/code-shell-web": "0.9.21",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0",
-    "@cjhyy/code-shell-link": "0.9.20"
+    "@cjhyy/code-shell-link": "0.9.21"
   },
   "engines": {
     "node": ">=20.10"