@delight-rpc/electron 3.1.1 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -197,8 +197,11 @@ window.ready()
197
197
  ```ts
198
198
  function createClientInMain<IAPI extends object>(
199
199
  port: Electron.MessagePortMain
200
- , parameterValidators?: DelightRPC.ParameterValidators<IAPI>
201
- , expectedVersion?: `${number}.${number}.${number}`
200
+ , options?: {
201
+ parameterValidators?: DelightRPC.ParameterValidators<IAPI>
202
+ expectedVersion?: `${number}.${number}.${number}`
203
+ channel?: string
204
+ }
202
205
  ): [client: DelightRPC.ClientProxy<IAPI>, close: () => void]
203
206
  ```
204
207
 
@@ -206,8 +209,11 @@ function createClientInMain<IAPI extends object>(
206
209
  ```ts
207
210
  function createClientInRenderer<IAPI extends object>(
208
211
  port: MessagePort
209
- , parameterValidators?: DelightRPC.ParameterValidators<IAPI>
210
- , expectedVersion?: `${number}.${number}.${number}`
212
+ , options?: {
213
+ parameterValidators?: DelightRPC.ParameterValidators<IAPI>
214
+ expectedVersion?: `${number}.${number}.${number}`
215
+ channel?: string
216
+ }
211
217
  ): [client: DelightRPC.ClientProxy<IAPI>, close: () => void]
212
218
  ```
213
219
 
@@ -215,7 +221,10 @@ function createClientInRenderer<IAPI extends object>(
215
221
  ```ts
216
222
  function createBatchClientInMain(
217
223
  port: Electron.MessagePortMain
218
- , expectedVersion?: `${number}.${number}.${number}`
224
+ , options?: {
225
+ expectedVersion?: `${number}.${number}.${number}`
226
+ channel?: string
227
+ }
219
228
  ): [client: DelightRPC.BatchClient, close: () => void]
220
229
  ```
221
230
 
@@ -223,7 +232,10 @@ function createBatchClientInMain(
223
232
  ```ts
224
233
  function createBatchClientInRenderer(
225
234
  port: MessagePort
226
- , expectedVersion?: `${number}.${number}.${number}`
235
+ , options?: {
236
+ expectedVersion?: `${number}.${number}.${number}`
237
+ channel?: string
238
+ }
227
239
  ): [client: DelightRPC.BatchClient, close: () => void]
228
240
  ```
229
241
 
@@ -231,9 +243,12 @@ function createBatchClientInRenderer(
231
243
  ```ts
232
244
  function createServerInMain<IAPI extends object>(
233
245
  api: DelightRPC.ImplementationOf<IAPI>
234
- , port: Electron.MessagePortMain
235
- , parameterValidators?: DelightRPC.ParameterValidators<IAPI>
236
- , version?: `${number}.${number}.${number}`
246
+ , options?: {
247
+ port: Electron.MessagePortMain
248
+ parameterValidators?: DelightRPC.ParameterValidators<IAPI>
249
+ version?: `${number}.${number}.${number}`
250
+ channel?: string
251
+ }
237
252
  ): () => void
238
253
  ```
239
254
 
@@ -242,7 +257,10 @@ function createServerInMain<IAPI extends object>(
242
257
  function createServerInRenderer<IAPI extends object>(
243
258
  api: DelightRPC.ImplementationOf<IAPI>
244
259
  , port: MessagePort
245
- , parameterValidators?: DelightRPC.ParameterValidators<IAPI>
246
- , version?: `${number}.${number}.${number}`
260
+ , options?: {
261
+ parameterValidators?: DelightRPC.ParameterValidators<IAPI>
262
+ version?: `${number}.${number}.${number}`
263
+ channel?: string
264
+ }
247
265
  ): () => void
248
266
  ```
package/lib/client.d.ts CHANGED
@@ -1,9 +1,23 @@
1
1
  import * as DelightRPC from 'delight-rpc';
2
2
  import Electron from 'electron';
3
3
  import { CustomError } from '@blackglory/errors';
4
- export declare function createClientInMain<IAPI extends object>(port: Electron.MessagePortMain, parameterValidators?: DelightRPC.ParameterValidators<IAPI>, expectedVersion?: `${number}.${number}.${number}`): [client: DelightRPC.ClientProxy<IAPI>, close: () => void];
5
- export declare function createClientInRenderer<IAPI extends object>(port: MessagePort, parameterValidators?: DelightRPC.ParameterValidators<IAPI>, expectedVersion?: `${number}.${number}.${number}`): [client: DelightRPC.ClientProxy<IAPI>, close: () => void];
6
- export declare function createBatchClientInMain(port: Electron.MessagePortMain, expectedVersion?: `${number}.${number}.${number}`): [client: DelightRPC.BatchClient, close: () => void];
7
- export declare function createBatchClientInRenderer(port: MessagePort, expectedVersion?: `${number}.${number}.${number}`): [client: DelightRPC.BatchClient, close: () => void];
4
+ export declare function createClientInMain<IAPI extends object>(port: Electron.MessagePortMain, { parameterValidators, expectedVersion, channel }?: {
5
+ parameterValidators?: DelightRPC.ParameterValidators<IAPI>;
6
+ expectedVersion?: `${number}.${number}.${number}`;
7
+ channel?: string;
8
+ }): [client: DelightRPC.ClientProxy<IAPI>, close: () => void];
9
+ export declare function createClientInRenderer<IAPI extends object>(port: MessagePort, { parameterValidators, expectedVersion, channel }?: {
10
+ parameterValidators?: DelightRPC.ParameterValidators<IAPI>;
11
+ expectedVersion?: `${number}.${number}.${number}`;
12
+ channel?: string;
13
+ }): [client: DelightRPC.ClientProxy<IAPI>, close: () => void];
14
+ export declare function createBatchClientInMain(port: Electron.MessagePortMain, { expectedVersion, channel }?: {
15
+ expectedVersion?: `${number}.${number}.${number}`;
16
+ channel?: string;
17
+ }): [client: DelightRPC.BatchClient, close: () => void];
18
+ export declare function createBatchClientInRenderer(port: MessagePort, { expectedVersion, channel }?: {
19
+ expectedVersion?: `${number}.${number}.${number}`;
20
+ channel?: string;
21
+ }): [client: DelightRPC.BatchClient, close: () => void];
8
22
  export declare class ClientClosed extends CustomError {
9
23
  }
package/lib/client.js CHANGED
@@ -27,7 +27,7 @@ exports.ClientClosed = exports.createBatchClientInRenderer = exports.createBatch
27
27
  const DelightRPC = __importStar(require("delight-rpc"));
28
28
  const extra_promise_1 = require("extra-promise");
29
29
  const errors_1 = require("@blackglory/errors");
30
- function createClientInMain(port, parameterValidators, expectedVersion) {
30
+ function createClientInMain(port, { parameterValidators, expectedVersion, channel } = {}) {
31
31
  const pendings = {};
32
32
  port.addListener('message', handler);
33
33
  const client = DelightRPC.createClient(async function send(request) {
@@ -40,7 +40,11 @@ function createClientInMain(port, parameterValidators, expectedVersion) {
40
40
  finally {
41
41
  delete pendings[request.id];
42
42
  }
43
- }, parameterValidators, expectedVersion);
43
+ }, {
44
+ parameterValidators,
45
+ expectedVersion,
46
+ channel
47
+ });
44
48
  return [client, close];
45
49
  function close() {
46
50
  port.removeListener('message', handler);
@@ -57,7 +61,7 @@ function createClientInMain(port, parameterValidators, expectedVersion) {
57
61
  }
58
62
  }
59
63
  exports.createClientInMain = createClientInMain;
60
- function createClientInRenderer(port, parameterValidators, expectedVersion) {
64
+ function createClientInRenderer(port, { parameterValidators, expectedVersion, channel } = {}) {
61
65
  const pendings = {};
62
66
  port.addEventListener('message', handler);
63
67
  const client = DelightRPC.createClient(async function send(request) {
@@ -70,7 +74,11 @@ function createClientInRenderer(port, parameterValidators, expectedVersion) {
70
74
  finally {
71
75
  delete pendings[request.id];
72
76
  }
73
- }, parameterValidators, expectedVersion);
77
+ }, {
78
+ parameterValidators,
79
+ expectedVersion,
80
+ channel
81
+ });
74
82
  return [client, close];
75
83
  function close() {
76
84
  port.removeEventListener('message', handler);
@@ -87,7 +95,7 @@ function createClientInRenderer(port, parameterValidators, expectedVersion) {
87
95
  }
88
96
  }
89
97
  exports.createClientInRenderer = createClientInRenderer;
90
- function createBatchClientInMain(port, expectedVersion) {
98
+ function createBatchClientInMain(port, { expectedVersion, channel } = {}) {
91
99
  const pendings = {};
92
100
  port.addListener('message', handler);
93
101
  const client = new DelightRPC.BatchClient(async function send(request) {
@@ -100,7 +108,10 @@ function createBatchClientInMain(port, expectedVersion) {
100
108
  finally {
101
109
  delete pendings[request.id];
102
110
  }
103
- }, expectedVersion);
111
+ }, {
112
+ expectedVersion,
113
+ channel
114
+ });
104
115
  return [client, close];
105
116
  function close() {
106
117
  port.removeListener('message', handler);
@@ -117,7 +128,7 @@ function createBatchClientInMain(port, expectedVersion) {
117
128
  }
118
129
  }
119
130
  exports.createBatchClientInMain = createBatchClientInMain;
120
- function createBatchClientInRenderer(port, expectedVersion) {
131
+ function createBatchClientInRenderer(port, { expectedVersion, channel } = {}) {
121
132
  const pendings = {};
122
133
  port.addEventListener('message', handler);
123
134
  const client = new DelightRPC.BatchClient(async function send(request) {
@@ -130,7 +141,10 @@ function createBatchClientInRenderer(port, expectedVersion) {
130
141
  finally {
131
142
  delete pendings[request.id];
132
143
  }
133
- }, expectedVersion);
144
+ }, {
145
+ expectedVersion,
146
+ channel
147
+ });
134
148
  return [client, close];
135
149
  function close() {
136
150
  port.removeEventListener('message', handler);
package/lib/client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
package/lib/server.d.ts CHANGED
@@ -1,4 +1,12 @@
1
1
  import * as DelightRPC from 'delight-rpc';
2
2
  import Electron from 'electron';
3
- export declare function createServerInMain<IAPI extends object>(api: DelightRPC.ImplementationOf<IAPI>, port: Electron.MessagePortMain, parameterValidators?: DelightRPC.ParameterValidators<IAPI>, version?: `${number}.${number}.${number}`): () => void;
4
- export declare function createServerInRenderer<IAPI extends object>(api: DelightRPC.ImplementationOf<IAPI>, port: MessagePort, parameterValidators?: DelightRPC.ParameterValidators<IAPI>, version?: `${number}.${number}.${number}`): () => void;
3
+ export declare function createServerInMain<IAPI extends object>(api: DelightRPC.ImplementationOf<IAPI>, port: Electron.MessagePortMain, { parameterValidators, version, channel }?: {
4
+ parameterValidators?: DelightRPC.ParameterValidators<IAPI>;
5
+ version?: `${number}.${number}.${number}`;
6
+ channel?: string;
7
+ }): () => void;
8
+ export declare function createServerInRenderer<IAPI extends object>(api: DelightRPC.ImplementationOf<IAPI>, port: MessagePort, { parameterValidators, version, channel }?: {
9
+ parameterValidators?: DelightRPC.ParameterValidators<IAPI>;
10
+ version?: `${number}.${number}.${number}`;
11
+ channel?: string;
12
+ }): () => void;
package/lib/server.js CHANGED
@@ -25,26 +25,39 @@ var __importStar = (this && this.__importStar) || function (mod) {
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.createServerInRenderer = exports.createServerInMain = void 0;
27
27
  const DelightRPC = __importStar(require("delight-rpc"));
28
- function createServerInMain(api, port, parameterValidators, version) {
28
+ const prelude_1 = require("@blackglory/prelude");
29
+ function createServerInMain(api, port, { parameterValidators, version, channel } = {}) {
29
30
  port.addListener('message', handler);
30
31
  return () => port.removeListener('message', handler);
31
32
  async function handler(event) {
32
33
  const req = event.data;
33
34
  if (DelightRPC.isRequest(req) || DelightRPC.isBatchRequest(req)) {
34
- const result = await DelightRPC.createResponse(api, req, parameterValidators, version);
35
- port.postMessage(result);
35
+ const result = await DelightRPC.createResponse(api, req, {
36
+ parameterValidators,
37
+ version,
38
+ channel
39
+ });
40
+ if ((0, prelude_1.isntNull)(result)) {
41
+ port.postMessage(result);
42
+ }
36
43
  }
37
44
  }
38
45
  }
39
46
  exports.createServerInMain = createServerInMain;
40
- function createServerInRenderer(api, port, parameterValidators, version) {
47
+ function createServerInRenderer(api, port, { parameterValidators, version, channel } = {}) {
41
48
  port.addEventListener('message', handler);
42
49
  return () => port.removeEventListener('message', handler);
43
50
  async function handler(event) {
44
51
  const req = event.data;
45
52
  if (DelightRPC.isRequest(req) || DelightRPC.isBatchRequest(req)) {
46
- const result = await DelightRPC.createResponse(api, req, parameterValidators, version);
47
- port.postMessage(result);
53
+ const result = await DelightRPC.createResponse(api, req, {
54
+ parameterValidators,
55
+ version,
56
+ channel
57
+ });
58
+ if ((0, prelude_1.isntNull)(result)) {
59
+ port.postMessage(result);
60
+ }
48
61
  }
49
62
  }
50
63
  }
package/lib/server.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AAGzC,SAAgB,kBAAkB,CAChC,GAAsC,EACtC,IAA8B,EAC9B,mBAA0D,EAC1D,OAAyC;IAEzC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACpC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAEpD,KAAK,UAAU,OAAO,CAAC,KAA4B;QACjD,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAA;QACtB,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,mBAAmB,EACnB,OAAO,CACR,CAAA;YAED,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;SACzB;IACH,CAAC;AACH,CAAC;AAtBD,gDAsBC;AAED,SAAgB,sBAAsB,CACpC,GAAsC,EACtC,IAAiB,EACjB,mBAA0D,EAC1D,OAAyC;IAEzC,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACzC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAEzD,KAAK,UAAU,OAAO,CAAC,KAAmB;QACxC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAA;QACtB,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,mBAAmB,EACnB,OAAO,CACR,CAAA;YAED,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;SACzB;IACH,CAAC;AACH,CAAC;AAtBD,wDAsBC"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AAEzC,iDAA8C;AAE9C,SAAgB,kBAAkB,CAChC,GAAsC,EACtC,IAA8B,EAC9B,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,KAInC,EAAE;IAEN,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACpC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAEpD,KAAK,UAAU,OAAO,CAAC,KAA4B;QACjD,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAA;QACtB,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,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;aACzB;SACF;IACH,CAAC;AACH,CAAC;AA9BD,gDA8BC;AAED,SAAgB,sBAAsB,CACpC,GAAsC,EACtC,IAAiB,EACjB,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,KAInC,EAAE;IAEN,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACzC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAEzD,KAAK,UAAU,OAAO,CAAC,KAAmB;QACxC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAA;QACtB,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,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;aACzB;SACF;IACH,CAAC;AACH,CAAC;AA9BD,wDA8BC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@delight-rpc/electron",
3
- "version": "3.1.1",
3
+ "version": "4.0.0",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "files": [
@@ -31,15 +31,15 @@
31
31
  },
32
32
  "devDependencies": {
33
33
  "@blackglory/jest-matchers": "^0.3.1",
34
- "@commitlint/cli": "^16.2.3",
35
- "@commitlint/config-conventional": "^16.2.1",
36
- "@types/jest": "^27.4.1",
37
- "@typescript-eslint/eslint-plugin": "^5.17.0",
38
- "@typescript-eslint/parser": "^5.17.0",
34
+ "@commitlint/cli": "^16.2.4",
35
+ "@commitlint/config-conventional": "^16.2.4",
36
+ "@types/jest": "^27.5.0",
37
+ "@typescript-eslint/eslint-plugin": "^5.22.0",
38
+ "@typescript-eslint/parser": "^5.22.0",
39
39
  "cross-env": "^7.0.3",
40
- "delight-rpc": "^2.1.1",
40
+ "delight-rpc": "^4.0.0",
41
41
  "electron": "^16.0.7",
42
- "eslint": "8.12.0",
42
+ "eslint": "8.15.0",
43
43
  "husky": "4",
44
44
  "jest": "^27.5.1",
45
45
  "npm-run-all": "^4.1.5",
@@ -47,14 +47,16 @@
47
47
  "standard-version": "^9.3.2",
48
48
  "ts-jest": "^27.1.4",
49
49
  "tscpaths": "^0.0.9",
50
- "typescript": "^4.6.3"
50
+ "typescript": "^4.6.4"
51
51
  },
52
52
  "dependencies": {
53
53
  "@blackglory/errors": "^2.2.1",
54
+ "@blackglory/prelude": "^0.1.1",
55
+ "@delight-rpc/protocol": "^2.2.0",
54
56
  "extra-promise": "^1.0.2"
55
57
  },
56
58
  "peerDependencies": {
57
- "delight-rpc": "^2.1.1",
59
+ "delight-rpc": "^4.0.0",
58
60
  "electron": "^16.0.1"
59
61
  }
60
62
  }