@delight-rpc/child-process 0.3.0 → 0.4.0

package/README.md

@@ -67,17 +67,34 @@ await client.echo('hello world')
 ```ts
 function createClient<IAPI extends object>(
   process: ChildProcess | NodeJS.Process
-, parameterValidators?: DelightRPC.ParameterValidators<IAPI>
-, expectedVersion?: `${number}.${number}.${number}`
+, options?: {
+    parameterValidators?: DelightRPC.ParameterValidators<IAPI>
+    expectedVersion?: `${number}.${number}.${number}`
+    channel?: string
+  }
 ): [client: DelightRPC.ClientProxy<IAPI>, close: () => void]
 ```
 
+### createBatchClient
+```ts
+function createBatchClient(
+  process: ChildProcess | NodeJS.Process
+, options?: {
+    expectedVersion?: `${number}.${number}.${number}`
+    channel?: string
+  }
+): [client: DelightRPC.BatchClient, close: () => void]
+```
+
 ### createServer
 ```ts
 function createServer<IAPI extends object>(
   api: DelightRPC.ImplementationOf<IAPI>
 , process: ChildProcess | NodeJS.Process
-, parameterValidators?: DelightRPC.ParameterValidators<IAPI>
-, version?: `${number}.${number}.${number}`
+, options?: {
+    parameterValidators?: DelightRPC.ParameterValidators<IAPI>
+    version?: `${number}.${number}.${number}`
+    channel?: string
+  }
 ): () => void
 ```

package/lib/client.d.ts

@@ -2,6 +2,14 @@
 import * as DelightRPC from 'delight-rpc';
 import { ChildProcess } from 'child_process';
 import { CustomError } from '@blackglory/errors';
-export declare function createClient<IAPI extends object>(process: ChildProcess | NodeJS.Process, parameterValidators?: DelightRPC.ParameterValidators<IAPI>, expectedVersion?: `${number}.${number}.${number}`): [client: DelightRPC.ClientProxy<IAPI>, close: () => void];
+export declare function createClient<IAPI extends object>(process: ChildProcess | NodeJS.Process, { parameterValidators, expectedVersion, channel }?: {
+    parameterValidators?: DelightRPC.ParameterValidators<IAPI>;
+    expectedVersion?: `${number}.${number}.${number}`;
+    channel?: string;
+}): [client: DelightRPC.ClientProxy<IAPI>, close: () => void];
+export declare function createBatchClient(process: ChildProcess | NodeJS.Process, { expectedVersion, channel }?: {
+    expectedVersion?: `${number}.${number}.${number}`;
+    channel?: string;
+}): [client: DelightRPC.BatchClient, close: () => void];
 export declare class ClientClosed extends CustomError {
 }

package/lib/client.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,11 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientClosed = exports.createClient = void 0;
+exports.ClientClosed = exports.createBatchClient = exports.createClient = void 0;
 const DelightRPC = __importStar(require("delight-rpc"));
 const extra_promise_1 = require("extra-promise");
 const errors_1 = require("@blackglory/errors");
-function createClient(process, parameterValidators, expectedVersion) {
+function createClient(process, { parameterValidators, expectedVersion, channel } = {}) {
     const pendings = {};
     process.on('message', handler);
     const client = DelightRPC.createClient(async function send(request) {
@@ -36,7 +40,11 @@ function createClient(process, parameterValidators, expectedVersion) {
         finally {
             delete pendings[request.id];
         }
-    }, parameterValidators, expectedVersion);
+    }, {
+        parameterValidators,
+        expectedVersion,
+        channel
+    });
     return [client, close];
     function close() {
         process.off('message', handler);
@@ -52,6 +60,38 @@ function createClient(process, parameterValidators, expectedVersion) {
     }
 }
 exports.createClient = createClient;
+function createBatchClient(process, { expectedVersion, channel } = {}) {
+    const pendings = {};
+    process.on('message', handler);
+    const client = new DelightRPC.BatchClient(async function send(request) {
+        const res = new extra_promise_1.Deferred();
+        pendings[request.id] = res;
+        try {
+            process.send(request);
+            return await res;
+        }
+        finally {
+            delete pendings[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());
+            delete pendings[key];
+        }
+    }
+    function handler(res) {
+        if (DelightRPC.isError(res) || DelightRPC.isBatchResponse(res)) {
+            pendings[res.id].resolve(res);
+        }
+    }
+}
+exports.createBatchClient = createBatchClient;
 class ClientClosed extends errors_1.CustomError {
 }
 exports.ClientClosed = ClientClosed;

package/lib/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AAEzC,iDAAwC;AACxC,+CAAgD;AAEhD,SAAgB,YAAY,CAC1B,OAAsC,EACtC,mBAA0D,EAC1D,eAAiD;IAEjD,MAAM,QAAQ,GAA0D,EAAE,CAAA;IAE1E,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAE9B,MAAM,MAAM,GAAG,UAAU,CAAC,YAAY,CACpC,KAAK,UAAU,IAAI,CAAC,OAAO;QACzB,MAAM,GAAG,GAAG,IAAI,wBAAQ,EAA6B,CAAA;QACrD,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,GAAG,CAAA;QAC1B,IAAI;YACF,OAAO,CAAC,IAAK,CAAC,OAAO,CAAC,CAAA;YACtB,OAAO,MAAM,GAAG,CAAA;SACjB;gBAAS;YACR,OAAO,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;SAC5B;IACH,CAAC,EACD,mBAAmB,EACnB,eAAe,CAChB,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAEtB,SAAS,KAAK;QACZ,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAE/B,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACtD,QAAQ,CAAC,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC,CAAA;YACnC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAA;SACrB;IACH,CAAC;IAED,SAAS,OAAO,CAAC,GAAQ;QACvB,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACvD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;SAC9B;IACH,CAAC;AACH,CAAC;AAxCD,oCAwCC;AAED,MAAa,YAAa,SAAQ,oBAAW;CAAG;AAAhD,oCAAgD"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwB;AACxB,2CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,2CAAwB"}

package/lib/server.d.ts

@@ -1,4 +1,8 @@
 /// <reference types="node" />
 import * as DelightRPC from 'delight-rpc';
 import { ChildProcess } from 'child_process';
-export declare function createServer<IAPI extends object>(api: DelightRPC.ImplementationOf<IAPI>, process: ChildProcess | NodeJS.Process, parameterValidators?: DelightRPC.ParameterValidators<IAPI>, version?: `${number}.${number}.${number}`): () => void;
+export declare function createServer<IAPI extends object>(api: DelightRPC.ImplementationOf<IAPI>, process: ChildProcess | NodeJS.Process, { parameterValidators, version, channel }?: {
+    parameterValidators?: DelightRPC.ParameterValidators<IAPI>;
+    version?: `${number}.${number}.${number}`;
+    channel?: string;
+}): () => void;

package/lib/server.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -21,13 +25,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServer = void 0;
 const DelightRPC = __importStar(require("delight-rpc"));
-function createServer(api, process, parameterValidators, version) {
+const prelude_1 = require("@blackglory/prelude");
+function createServer(api, process, { parameterValidators, version, channel } = {}) {
     process.on('message', handler);
     return () => process.off('message', handler);
     async function handler(req) {
-        if (DelightRPC.isRequest(req)) {
-            const result = await DelightRPC.createResponse(api, req, parameterValidators, version);
-            process.send(result);
+        if (DelightRPC.isRequest(req) || DelightRPC.isBatchRequest(req)) {
+            const result = await DelightRPC.createResponse(api, req, {
+                parameterValidators,
+                version,
+                channel
+            });
+            if ((0, prelude_1.isntNull)(result)) {
+                process.send(result);
+            }
         }
     }
 }

package/lib/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AAGzC,SAAgB,YAAY,CAC1B,GAAsC,EACtC,OAAsC,EACtC,mBAA0D,EAC1D,OAAyC;IAEzC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAC9B,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAE5C,KAAK,UAAU,OAAO,CAAC,GAAQ;QAC7B,IAAI,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;YAC7B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,cAAc,CAC5C,GAAG,EACH,GAAG,EACH,mBAAmB,EACnB,OAAO,CACR,CAAA;YAED,OAAO,CAAC,IAAK,CAAC,MAAM,CAAC,CAAA;SACtB;IACH,CAAC;AACH,CAAC;AArBD,oCAqBC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AAEzC,iDAA8C;AAE9C,SAAgB,YAAY,CAC1B,GAAsC,EACtC,OAAsC,EACtC,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,KAInC,EAAE;IAEN,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAC9B,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAE5C,KAAK,UAAU,OAAO,CAAC,GAAQ;QAC7B,IAAI,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAC/D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,cAAc,CAC5C,GAAG,EACH,GAAG,EACH;gBACE,mBAAmB;gBACnB,OAAO;gBACP,OAAO;aACR,CACF,CAAA;YAED,IAAI,IAAA,kBAAQ,EAAC,MAAM,CAAC,EAAE;gBACpB,OAAO,CAAC,IAAK,CAAC,MAAM,CAAC,CAAA;aACtB;SACF;IACH,CAAC;AACH,CAAC;AA7BD,oCA6BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delight-rpc/child-process",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "",
   "keywords": [],
   "files": [
@@ -29,33 +29,35 @@
     }
   },
   "devDependencies": {
-    "@blackglory/jest-matchers": "^0.2.1",
-    "@commitlint/cli": "^16.1.0",
-    "@commitlint/config-conventional": "^16.0.0",
-    "@types/jest": "^27.4.0",
+    "@blackglory/jest-matchers": "^0.3.1",
+    "@commitlint/cli": "^16.2.4",
+    "@commitlint/config-conventional": "^16.2.4",
+    "@types/jest": "^27.5.0",
     "@types/node": "14",
-    "@typescript-eslint/eslint-plugin": "^5.11.0",
-    "@typescript-eslint/parser": "^5.11.0",
+    "@typescript-eslint/eslint-plugin": "^5.22.0",
+    "@typescript-eslint/parser": "^5.22.0",
     "cross-env": "^7.0.3",
-    "delight-rpc": "^2.0.0",
-    "eslint": "8.8.0",
+    "delight-rpc": "^4.0.0",
+    "eslint": "8.15.0",
     "husky": "4",
     "jest": "^27.5.1",
     "npm-run-all": "^4.1.5",
-    "return-style": "^0.12.6",
+    "return-style": "^1.0.0",
     "rimraf": "^3.0.2",
     "standard-version": "^9.3.2",
-    "ts-jest": "^27.1.3",
-    "ts-node": "^10.5.0",
+    "ts-jest": "^27.1.4",
+    "ts-node": "^10.7.0",
     "ts-patch": "^2.0.1",
-    "typescript": "^4.5.5",
+    "typescript": "^4.6.4",
     "typescript-transform-paths": "^3.3.1"
   },
   "dependencies": {
-    "@blackglory/errors": "^2.2.0",
-    "extra-promise": "^0.21.2"
+    "@blackglory/errors": "^2.2.1",
+    "@blackglory/prelude": "^0.1.1",
+    "@delight-rpc/protocol": "^2.2.0",
+    "extra-promise": "^1.0.2"
   },
   "peerDependencies": {
-    "delight-rpc": "^2.0.0"
+    "delight-rpc": "^2.1.1"
   }
 }