@delight-rpc/child-process 0.6.1 → 0.6.3

package/lib/client.js

@@ -2,17 +2,17 @@ import * as DelightRPC from 'delight-rpc';
 import { Deferred } from 'extra-promise';
 import { CustomError } from '@blackglory/errors';
 export function createClient(process, { parameterValidators, expectedVersion, channel } = {}) {
-    const pendings = {};
+    const pendings = new Map();
     process.on('message', handler);
     const client = DelightRPC.createClient(async function send(request) {
         const res = new Deferred();
-        pendings[request.id] = res;
+        pendings.set(request.id, res);
         try {
             process.send(request);
             return await res;
         }
         finally {
-            delete pendings[request.id];
+            pendings.delete(request.id);
         }
     }, {
         parameterValidators,
@@ -24,28 +24,28 @@ export function createClient(process, { parameterValidators, expectedVersion, ch
         process.off('message', handler);
         for (const [key, deferred] of Object.entries(pendings)) {
             deferred.reject(new ClientClosed());
-            delete pendings[key];
+            pendings.delete(key);
         }
     }
     function handler(res) {
         var _a;
         if (DelightRPC.isResult(res) || DelightRPC.isError(res)) {
-            (_a = pendings[res.id]) === null || _a === void 0 ? void 0 : _a.resolve(res);
+            (_a = pendings.get(res.id)) === null || _a === void 0 ? void 0 : _a.resolve(res);
         }
     }
 }
 export function createBatchClient(process, { expectedVersion, channel } = {}) {
-    const pendings = {};
+    const pendings = new Map();
     process.on('message', handler);
     const client = new DelightRPC.BatchClient(async function send(request) {
         const res = new Deferred();
-        pendings[request.id] = res;
+        pendings.set(request.id, res);
         try {
             process.send(request);
             return await res;
         }
         finally {
-            delete pendings[request.id];
+            pendings.delete(request.id);
         }
     }, {
         expectedVersion,
@@ -56,13 +56,13 @@ export function createBatchClient(process, { expectedVersion, channel } = {}) {
         process.off('message', handler);
         for (const [key, deferred] of Object.entries(pendings)) {
             deferred.reject(new ClientClosed());
-            delete pendings[key];
+            pendings.delete(key);
         }
     }
     function handler(res) {
         var _a;
         if (DelightRPC.isError(res) || DelightRPC.isBatchResponse(res)) {
-            (_a = pendings[res.id]) === null || _a === void 0 ? void 0 : _a.resolve(res);
+            (_a = pendings.get(res.id)) === null || _a === void 0 ? void 0 : _a.resolve(res);
         }
     }
 }

package/lib/client.js.map

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

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@delight-rpc/child-process",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "",
   "keywords": [],
   "files": [
-    "lib"
+    "lib",
+    "src"
   ],
   "type": "module",
   "main": "lib/index.js",
@@ -37,7 +38,7 @@
     "@commitlint/cli": "^17.4.4",
     "@commitlint/config-conventional": "^17.4.4",
     "@types/jest": "^29.5.0",
-    "@types/node": "14",
+    "@types/node": "16",
     "@typescript-eslint/eslint-plugin": "^5.55.0",
     "@typescript-eslint/parser": "^5.55.0",
     "cross-env": "^7.0.3",

package/src/client.ts

@@ -0,0 +1,107 @@
+import * as DelightRPC from 'delight-rpc'
+import { ChildProcess } from 'child_process'
+import { Deferred } from 'extra-promise'
+import { CustomError } from '@blackglory/errors'
+import { IRequest, IResponse, IError, IBatchRequest, IBatchResponse } from '@delight-rpc/protocol'
+
+export function createClient<IAPI extends object>(
+  process: ChildProcess | NodeJS.Process
+, { parameterValidators, expectedVersion, channel }: {
+    parameterValidators?: DelightRPC.ParameterValidators<IAPI>
+    expectedVersion?: string
+    channel?: string
+  } = {}
+): [client: DelightRPC.ClientProxy<IAPI>, close: () => void] {
+  const pendings: Map<string, Deferred<IResponse<unknown>>> = new Map()
+
+  process.on('message', handler)
+
+  const client = DelightRPC.createClient<IAPI>(
+    async function send(request: IRequest<unknown>) {
+      const res = new Deferred<IResponse<unknown>>()
+      pendings.set(request.id, res)
+      try {
+        process.send!(request)
+        return await res
+      } finally {
+        pendings.delete(request.id)
+      }
+    }
+  , {
+      parameterValidators
+    , expectedVersion
+    , channel
+    }
+  )
+
+  return [client, close]
+
+  function close() {
+    process.off('message', handler)
+
+    for (const [key, deferred] of Object.entries(pendings)) {
+      deferred.reject(new ClientClosed())
+      pendings.delete(key)
+    }
+  }
+
+  function handler(res: any): void {
+    if (DelightRPC.isResult(res) || DelightRPC.isError(res)) {
+      pendings.get(res.id)?.resolve(res)
+    }
+  }
+}
+
+export function createBatchClient<DataType>(
+  process: ChildProcess | NodeJS.Process
+, { expectedVersion, channel }: {
+    expectedVersion?: string
+    channel?: string
+  } = {}
+): [client: DelightRPC.BatchClient<DataType>, close: () => void] {
+  const pendings: Map<
+    string
+  , Deferred<IError | IBatchResponse<unknown>>
+  > = new Map()
+
+  process.on('message', handler)
+
+  const client = new DelightRPC.BatchClient(
+    async function send(request: IBatchRequest<unknown>) {
+      const res = new Deferred<
+      | IError
+      | IBatchResponse<unknown>
+      >()
+      pendings.set(request.id, res)
+      try {
+        process.send!(request)
+        return await res
+      } finally {
+        pendings.delete(request.id)
+      }
+    }
+  , {
+      expectedVersion
+    , channel
+    }
+  )
+
+  return [client, close]
+
+  function close() {
+    process.off('message', handler)
+
+    for (const [key, deferred] of Object.entries(pendings)) {
+      deferred.reject(new ClientClosed())
+      pendings.delete(key)
+    }
+  }
+
+  function handler(res: any): void {
+    if (DelightRPC.isError(res) || DelightRPC.isBatchResponse(res)) {
+      pendings.get(res.id)?.resolve(res)
+    }
+  }
+}
+
+export class ClientClosed extends CustomError {}

package/src/index.ts

@@ -0,0 +1,2 @@
+export * from './client.js'
+export * from './server.js'

package/src/server.ts

@@ -0,0 +1,36 @@
+import * as DelightRPC from 'delight-rpc'
+import { ChildProcess } from 'child_process'
+import { isntNull } from '@blackglory/prelude'
+
+export function createServer<IAPI extends object>(
+  api: DelightRPC.ImplementationOf<IAPI>
+, process: ChildProcess | NodeJS.Process
+, { parameterValidators, version, channel, ownPropsOnly }: {
+    parameterValidators?: DelightRPC.ParameterValidators<IAPI>
+    version?: `${number}.${number}.${number}`
+    channel?: string | RegExp | typeof DelightRPC.AnyChannel
+    ownPropsOnly?: boolean
+  } = {}
+): () => void {
+  process.on('message', handler)
+  return () => process.off('message', handler)
+
+  async function handler(req: any): Promise<void> {
+    if (DelightRPC.isRequest(req) || DelightRPC.isBatchRequest(req)) {
+      const result = await DelightRPC.createResponse(
+        api
+      , req
+      , {
+          parameterValidators
+        , version
+        , channel
+        , ownPropsOnly
+        }
+      )
+
+      if (isntNull(result)) {
+        process.send!(result)
+      }
+    }
+  }
+}