@delight-rpc/piscina 0.5.6 → 0.6.0

package/README.md

@@ -22,7 +22,9 @@ const api: IAPI = {
   }
 }
 
-export default createServer(api)
+const [handler] = createServer(api)
+
+export default handler
 
 // main.ts
 import { createClient } from '@delight-rpc/piscina'
@@ -30,7 +32,7 @@ import { createClient } from '@delight-rpc/piscina'
 const piscina = new Piscina({
   filename: new URL('./worker.js', import.meta.url).href
 })
-const client = createClient<IAPI>(piscina)
+const [client] = createClient<IAPI>(piscina)
 
 await client.echo('hello world')
 ```
@@ -44,8 +46,9 @@ function createClient<IAPI extends object>(
     parameterValidators?: DelightRPC.ParameterValidators<IAPI>
     expectedVersion?: string
     channel?: string
+    timeout?: number
   }
-): DelightRPC.ClientProxy<IAPI>
+): [client: DelightRPC.ClientProxy<IAPI>, close: () => void]
 ```
 
 ### createBatchClient
@@ -55,8 +58,9 @@ function createBatchClient<DataType>(
 , options?: {
     expectedVersion?: string
     channel?: string
+    timeout?: number
   }
-): DelightRPC.BatchClient<DataType>
+): [client: DelightRPC.BatchClient<DataType>, close: () => void]
 ```
 
 ### createServer
@@ -70,5 +74,5 @@ function createServer<IAPI extends object>(
     ownPropsOnly?: boolean
     channel?: string | RegExp | AnyChannel
   }
-): (req: unknown) => Promise<unknown>
+): [handler: (message: unknown) => Promise<unknown>, close: () => void]
 ```

package/lib/client.d.ts

@@ -1,11 +1,13 @@
 import * as DelightRPC from 'delight-rpc';
-import Piscina from 'piscina';
-export declare function createClient<IAPI extends object>(piscina: Piscina, { parameterValidators, expectedVersion, channel }?: {
+import { Piscina } from 'piscina';
+export declare function createClient<IAPI extends object>(piscina: Piscina, { parameterValidators, expectedVersion, channel, timeout }?: {
     parameterValidators?: DelightRPC.ParameterValidators<IAPI>;
     expectedVersion?: string;
     channel?: string;
-}): DelightRPC.ClientProxy<IAPI>;
-export declare function createBatchClient<DataType>(piscina: Piscina, { expectedVersion, channel }?: {
+    timeout?: number;
+}): [client: DelightRPC.ClientProxy<IAPI>, close: () => void];
+export declare function createBatchClient<DataType>(piscina: Piscina, { expectedVersion, channel, timeout }?: {
     expectedVersion?: string;
     channel?: string;
-}): DelightRPC.BatchClient<DataType>;
+    timeout?: number;
+}): [client: DelightRPC.BatchClient<DataType>, close: () => void];

package/lib/client.js

@@ -1,20 +1,75 @@
 import * as DelightRPC from 'delight-rpc';
-export function createClient(piscina, { parameterValidators, expectedVersion, channel } = {}) {
-    const client = DelightRPC.createClient(createSend(piscina), {
+import { SyncDestructor } from 'extra-defer';
+import { AbortController, raceAbortSignals, timeoutSignal } from 'extra-abort';
+import { isntUndefined, pass } from '@blackglory/prelude';
+export function createClient(piscina, { parameterValidators, expectedVersion, channel, timeout } = {}) {
+    const destructor = new SyncDestructor();
+    const controller = new AbortController();
+    destructor.defer(abortAllPendings);
+    const client = DelightRPC.createClient(async function send(request, signal) {
+        const destructor = new SyncDestructor();
+        try {
+            const mergedSignal = raceAbortSignals([
+                isntUndefined(timeout) && timeoutSignal(timeout),
+                signal,
+                controller.signal
+            ]);
+            mergedSignal.addEventListener('abort', sendAbort);
+            destructor.defer(() => mergedSignal.removeEventListener('abort', sendAbort));
+            return await piscina.run(request, { signal: mergedSignal });
+        }
+        finally {
+            destructor.execute();
+        }
+        async function sendAbort() {
+            const abort = DelightRPC.createAbort(request.id, channel);
+            await piscina.run(abort).catch(pass);
+        }
+    }, {
         parameterValidators,
         expectedVersion,
         channel
     });
-    return client;
+    return [client, close];
+    function close() {
+        destructor.execute();
+    }
+    function abortAllPendings() {
+        controller.abort();
+    }
 }
-export function createBatchClient(piscina, { expectedVersion, channel } = {}) {
-    const client = new DelightRPC.BatchClient(createSend(piscina), {
+export function createBatchClient(piscina, { expectedVersion, channel, timeout } = {}) {
+    const destructor = new SyncDestructor();
+    const controller = new AbortController();
+    destructor.defer(abortAllPendings);
+    const client = new DelightRPC.BatchClient(async function send(request) {
+        const destructor = new SyncDestructor();
+        try {
+            const mergedSignal = raceAbortSignals([
+                isntUndefined(timeout) && timeoutSignal(timeout),
+                controller.signal
+            ]);
+            mergedSignal.addEventListener('abort', sendAbort);
+            destructor.defer(() => mergedSignal.removeEventListener('abort', sendAbort));
+            return await piscina.run(request, { signal: mergedSignal });
+        }
+        finally {
+            destructor.execute();
+        }
+        async function sendAbort() {
+            const abort = DelightRPC.createAbort(request.id, channel);
+            await piscina.run(abort).catch(pass);
+        }
+    }, {
         expectedVersion,
         channel
     });
-    return client;
-}
-function createSend(piscina) {
-    return async (request) => await piscina.run(request);
+    return [client, close];
+    function close() {
+        destructor.execute();
+    }
+    function abortAllPendings() {
+        controller.abort();
+    }
 }
 //# sourceMappingURL=client.js.map

package/lib/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAA;AAIzC,MAAM,UAAU,YAAY,CAC1B,OAAgB,EAChB,EAAE,mBAAmB,EAAE,eAAe,EAAE,OAAO,KAI3C,EAAE;IAEN,MAAM,MAAM,GAAG,UAAU,CAAC,YAAY,CACpC,UAAU,CAAC,OAAO,CAAC,EACnB;QACE,mBAAmB;QACnB,eAAe;QACf,OAAO;KACR,CACF,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,OAAgB,EAChB,EAAE,eAAe,EAAE,OAAO,KAGtB,EAAE;IAEN,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,CACvC,UAAU,CAAC,OAAO,CAAC,EACnB;QACE,eAAe;QACf,OAAO;KACR,CACF,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,UAAU,CACjB,OAAgB;IAEhB,OAAO,KAAK,EAAC,OAAO,EAAC,EAAE,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AACpD,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

package/lib/server.d.ts

@@ -4,4 +4,4 @@ export declare function createServer<IAPI extends object>(api: DelightRPC.Implem
     version?: `${number}.${number}.${number}`;
     channel?: string | RegExp | typeof DelightRPC.AnyChannel;
     ownPropsOnly?: boolean;
-}): (req: unknown) => Promise<unknown>;
+}): [handler: (req: unknown) => Promise<unknown>, close: () => void];

package/lib/server.js

@@ -1,18 +1,49 @@
 import * as DelightRPC from 'delight-rpc';
 import { isntNull } from '@blackglory/prelude';
+import { SyncDestructor } from 'extra-defer';
+import { HashMap } from '@blackglory/structures';
 export function createServer(api, { parameterValidators, version, channel, ownPropsOnly } = {}) {
-    return async function handler(req) {
-        if (DelightRPC.isRequest(req) || DelightRPC.isBatchRequest(req)) {
-            const response = await DelightRPC.createResponse(api, req, {
-                parameterValidators,
-                version,
-                channel,
-                ownPropsOnly
-            });
-            if (isntNull(response)) {
-                return response;
+    const destructor = new SyncDestructor();
+    const channelIdToController = new HashMap(({ channel, id }) => JSON.stringify([channel, id]));
+    destructor.defer(abortAllPendings);
+    return [handler, close];
+    function close() {
+        destructor.execute();
+    }
+    function abortAllPendings() {
+        for (const controller of channelIdToController.values()) {
+            controller.abort();
+        }
+        channelIdToController.clear();
+    }
+    async function handler(message) {
+        var _a;
+        if (DelightRPC.isRequest(message) || DelightRPC.isBatchRequest(message)) {
+            const destructor = new SyncDestructor();
+            const controller = new AbortController();
+            channelIdToController.set(message, controller);
+            destructor.defer(() => channelIdToController.delete(message));
+            try {
+                const response = await DelightRPC.createResponse(api, message, {
+                    parameterValidators,
+                    version,
+                    channel,
+                    ownPropsOnly
+                });
+                if (isntNull(response)) {
+                    return response;
+                }
+            }
+            finally {
+                destructor.execute();
+            }
+        }
+        else if (DelightRPC.isAbort(message)) {
+            if (DelightRPC.matchChannel(message, channel)) {
+                (_a = channelIdToController.get(message)) === null || _a === void 0 ? void 0 : _a.abort();
+                channelIdToController.delete(message);
             }
         }
-    };
+    }
 }
 //# sourceMappingURL=server.js.map

package/lib/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,MAAM,UAAU,YAAY,CAC1B,GAAsC,EACtC,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,KAKjD,EAAE;IAEN,OAAO,KAAK,UAAU,OAAO,CAAC,GAAY;QACxC,IAAI,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAC/D,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,cAAc,CAC9C,GAAG,EACH,GAAG,EACH;gBACE,mBAAmB;gBACnB,OAAO;gBACP,OAAO;gBACP,YAAY;aACb,CACF,CAAA;YAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACtB,OAAO,QAAQ,CAAA;aAChB;SACF;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAEhD,MAAM,UAAU,YAAY,CAC1B,GAAsC,EACtC,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,KAKjD,EAAE;IAEN,MAAM,UAAU,GAAG,IAAI,cAAc,EAAE,CAAA;IAEvC,MAAM,qBAAqB,GAMvB,IAAI,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IACnE,UAAU,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAElC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAEvB,SAAS,KAAK;QACZ,UAAU,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;IAED,SAAS,gBAAgB;QACvB,KAAK,MAAM,UAAU,IAAI,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC;YACxD,UAAU,CAAC,KAAK,EAAE,CAAA;QACpB,CAAC;QAED,qBAAqB,CAAC,KAAK,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,UAAU,OAAO,CAAC,OAAgB;;QACrC,IAAI,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;YACxE,MAAM,UAAU,GAAG,IAAI,cAAc,EAAE,CAAA;YAEvC,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;YACxC,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;YAC9C,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;YAE7D,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,cAAc,CAC9C,GAAG,EACH,OAAO,EACP;oBACE,mBAAmB;oBACnB,OAAO;oBACP,OAAO;oBACP,YAAY;iBACb,CACF,CAAA;gBAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACvB,OAAO,QAAQ,CAAA;gBACjB,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,UAAU,CAAC,OAAO,EAAE,CAAA;YACtB,CAAC;QACH,CAAC;aAAM,IAAI,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,IAAI,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;gBAC9C,MAAA,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,0CAAE,KAAK,EAAE,CAAA;gBAC3C,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACvC,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delight-rpc/piscina",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "description": "",
   "keywords": [],
   "files": [
@@ -12,7 +12,7 @@
   "types": "lib/index.d.ts",
   "sideEffects": false,
   "engines": {
-    "node": ">=16"
+    "node": ">=22"
   },
   "repository": "git@github.com:delight-rpc/piscina.git",
   "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
@@ -20,8 +20,7 @@
   "scripts": {
     "prepare": "ts-patch install -s",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
-    "test": "cross-env NODE_OPTIONS='--experimental-vm-modules --loader ts-node/esm' jest --runInBand --config jest.config.cjs",
-    "test:debug": "cross-env NODE_OPTIONS='--experimental-vm-modules --loader ts-node/esm' node --inspect-brk node_modules/.bin/jest --runInBand --config jest.config.cjs",
+    "test": "vitest run",
     "prepublishOnly": "run-s prepare clean build",
     "clean": "rimraf lib",
     "build": "tsc --project tsconfig.build.json",
@@ -34,37 +33,37 @@
     }
   },
   "devDependencies": {
-    "@blackglory/jest-resolver": "^0.3.0",
-    "@commitlint/cli": "^17.4.4",
-    "@commitlint/config-conventional": "^17.4.4",
-    "@types/jest": "^29.5.0",
-    "@types/node": "16",
-    "@typescript-eslint/eslint-plugin": "^5.55.0",
-    "@typescript-eslint/parser": "^5.55.0",
-    "cross-env": "^7.0.3",
-    "delight-rpc": "^6.0.0",
-    "eslint": "8.36.0",
+    "@commitlint/cli": "^20.4.2",
+    "@commitlint/config-conventional": "^20.4.2",
+    "@eslint/js": "^10.0.1",
+    "@types/node": "22",
+    "cross-env": "^10.1.0",
+    "delight-rpc": "^7.0.0",
+    "eslint": "10.0.2",
+    "extra-promise": "^7.1.1",
     "husky": "4",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
-    "jest-resolve": "^29.5.0",
     "npm-run-all": "^4.1.5",
     "piscina": "^4.2.0",
-    "return-style": "^3.0.0",
-    "rimraf": "^3.0.2",
+    "return-style": "^4.0.0",
+    "rimraf": "^6.1.3",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.0.5",
-    "ts-node": "^10.9.1",
-    "ts-patch": "^2.1.0",
-    "typescript": "^4.7.4",
-    "typescript-transform-paths": "^3.4.6"
+    "ts-patch": "^3.3.0",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.56.1",
+    "typescript-transform-paths": "^3.5.6",
+    "vite": "^7.3.1",
+    "vite-tsconfig-paths": "^6.1.1",
+    "vitest": "^4.0.18"
   },
   "dependencies": {
-    "@blackglory/prelude": "^0.3.1",
-    "@delight-rpc/protocol": "^4.0.0"
+    "@blackglory/prelude": "^0.4.0",
+    "@blackglory/structures": "^0.14.13",
+    "@delight-rpc/protocol": "^4.1.1",
+    "extra-abort": "^0.4.1",
+    "extra-defer": "^0.3.1"
   },
   "peerDependencies": {
-    "delight-rpc": "^5.0.0 || ^6.0.0",
+    "delight-rpc": "^5.0.0 || ^6.0.0 || ^7.0.0",
     "piscina": "^3.2.0 || ^4.0.0"
   }
 }

package/src/client.ts

@@ -1,17 +1,46 @@
 import * as DelightRPC from 'delight-rpc'
-import Piscina from 'piscina'
-import { IRequest, IBatchRequest } from '@delight-rpc/protocol'
+import { Piscina } from 'piscina'
+import { SyncDestructor } from 'extra-defer'
+import { AbortController, raceAbortSignals, timeoutSignal } from 'extra-abort'
+import { isntUndefined, pass } from '@blackglory/prelude'
 
 export function createClient<IAPI extends object>(
   piscina: Piscina
-, { parameterValidators, expectedVersion, channel }: {
+, { parameterValidators, expectedVersion, channel, timeout }: {
     parameterValidators?: DelightRPC.ParameterValidators<IAPI>
     expectedVersion?: string
     channel?: string
+    timeout?: number
   } = {}
-): DelightRPC.ClientProxy<IAPI> {
+): [client: DelightRPC.ClientProxy<IAPI>, close: () => void] {
+  const destructor = new SyncDestructor()
+
+  const controller = new AbortController()
+  destructor.defer(abortAllPendings)
+
   const client = DelightRPC.createClient<IAPI>(
-    createSend(piscina)
+    async function send(request, signal) {
+      const destructor = new SyncDestructor()
+
+      try {
+        const mergedSignal = raceAbortSignals([
+          isntUndefined(timeout) && timeoutSignal(timeout)
+        , signal
+        , controller.signal
+        ])
+        mergedSignal.addEventListener('abort', sendAbort)
+        destructor.defer(() => mergedSignal.removeEventListener('abort', sendAbort))
+
+        return await piscina.run(request, { signal: mergedSignal })
+      } finally {
+        destructor.execute()
+      }
+
+      async function sendAbort(): Promise<void> {
+        const abort = DelightRPC.createAbort(request.id, channel)
+        await piscina.run(abort).catch(pass)
+      }
+    }
   , {
       parameterValidators
     , expectedVersion
@@ -19,29 +48,65 @@ export function createClient<IAPI extends object>(
     }
   )
 
-  return client
+  return [client, close]
+
+  function close(): void {
+    destructor.execute()
+  }
+
+  function abortAllPendings(): void {
+    controller.abort()
+  }
 }
 
 export function createBatchClient<DataType>(
   piscina: Piscina
-, { expectedVersion, channel }: {
+, { expectedVersion, channel, timeout }: {
     expectedVersion?: string
     channel?: string
+    timeout?: number
   } = {}
-): DelightRPC.BatchClient<DataType> {
+): [client: DelightRPC.BatchClient<DataType>, close: () => void] {
+  const destructor = new SyncDestructor()
+
+  const controller = new AbortController()
+  destructor.defer(abortAllPendings)
+
   const client = new DelightRPC.BatchClient<DataType>(
-    createSend(piscina)
+    async function send(request) {
+      const destructor = new SyncDestructor()
+
+      try {
+        const mergedSignal = raceAbortSignals([
+          isntUndefined(timeout) && timeoutSignal(timeout)
+        , controller.signal
+        ])
+        mergedSignal.addEventListener('abort', sendAbort)
+        destructor.defer(() => mergedSignal.removeEventListener('abort', sendAbort))
+
+        return await piscina.run(request, { signal: mergedSignal })
+      } finally {
+        destructor.execute()
+      }
+
+      async function sendAbort(): Promise<void> {
+        const abort = DelightRPC.createAbort(request.id, channel)
+        await piscina.run(abort).catch(pass)
+      }
+    }
   , {
       expectedVersion
     , channel
     }
   )
 
-  return client
-}
+  return [client, close]
 
-function createSend<T>(
-  piscina: Piscina
-): (request: IRequest<unknown> | IBatchRequest<unknown>) => Promise<T> {
-  return async request => await piscina.run(request)
+  function close(): void {
+    destructor.execute()
+  }
+
+  function abortAllPendings(): void {
+    controller.abort()
+  }
 }

package/src/server.ts

@@ -1,5 +1,7 @@
 import * as DelightRPC from 'delight-rpc'
 import { isntNull } from '@blackglory/prelude'
+import { SyncDestructor } from 'extra-defer'
+import { HashMap } from '@blackglory/structures'
 
 export function createServer<IAPI extends object>(
   api: DelightRPC.ImplementationOf<IAPI>
@@ -9,22 +11,62 @@ export function createServer<IAPI extends object>(
     channel?: string | RegExp | typeof DelightRPC.AnyChannel
     ownPropsOnly?: boolean
   } = {}
-): (req: unknown) => Promise<unknown> {
-  return async function handler(req: unknown): Promise<unknown> {
-    if (DelightRPC.isRequest(req) || DelightRPC.isBatchRequest(req)) {
-      const response = await DelightRPC.createResponse(
-        api
-      , req
-      , {
-          parameterValidators
-        , version
-        , channel
-        , ownPropsOnly
-        }
-      )
+): [handler: (req: unknown) => Promise<unknown>, close: () => void] {
+  const destructor = new SyncDestructor()
+
+  const channelIdToController: HashMap<
+    {
+      channel?: string
+    , id: string
+    }
+  , AbortController
+  > = new HashMap(({ channel, id }) => JSON.stringify([channel, id]))
+  destructor.defer(abortAllPendings)
+
+  return [handler, close]
+
+  function close(): void {
+    destructor.execute()
+  }
+
+  function abortAllPendings(): void {
+    for (const controller of channelIdToController.values()) {
+      controller.abort()
+    }
 
-      if (isntNull(response)) {
-        return response
+    channelIdToController.clear()
+  }
+
+  async function handler(message: unknown): Promise<unknown> {
+    if (DelightRPC.isRequest(message) || DelightRPC.isBatchRequest(message)) {
+      const destructor = new SyncDestructor()
+
+      const controller = new AbortController()
+      channelIdToController.set(message, controller)
+      destructor.defer(() => channelIdToController.delete(message))
+
+      try {
+        const response = await DelightRPC.createResponse(
+          api
+        , message
+        , {
+            parameterValidators
+          , version
+          , channel
+          , ownPropsOnly
+          }
+        )
+
+        if (isntNull(response)) {
+          return response
+        }
+      } finally {
+        destructor.execute()
+      }
+    } else if (DelightRPC.isAbort(message)) {
+      if (DelightRPC.matchChannel(message, channel)) {
+        channelIdToController.get(message)?.abort()
+        channelIdToController.delete(message)
       }
     }
   }