@delight-rpc/electron 6.0.4 → 6.0.6

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.
Files changed (4) hide show
  1. package/lib/client.js +20 -20
  2. package/lib/client.js.map +1 -1
  3. package/package.json +3 -3
  4. package/src/client.ts +30 -33
package/lib/client.js CHANGED
@@ -2,17 +2,17 @@ import * as DelightRPC from 'delight-rpc';
2
2
  import { Deferred } from 'extra-promise';
3
3
  import { CustomError } from '@blackglory/errors';
4
4
  export function createClientInMain(port, { parameterValidators, expectedVersion, channel } = {}) {
5
- const pendings = {};
5
+ const pendings = new Map();
6
6
  port.addListener('message', handler);
7
7
  const client = DelightRPC.createClient(async function send(request) {
8
8
  const res = new Deferred();
9
- pendings[request.id] = res;
9
+ pendings.set(request.id, res);
10
10
  try {
11
11
  port.postMessage(request);
12
12
  return await res;
13
13
  }
14
14
  finally {
15
- delete pendings[request.id];
15
+ pendings.delete(request.id);
16
16
  }
17
17
  }, {
18
18
  parameterValidators,
@@ -24,29 +24,29 @@ export function createClientInMain(port, { parameterValidators, expectedVersion,
24
24
  port.removeListener('message', handler);
25
25
  for (const [key, deferred] of Object.entries(pendings)) {
26
26
  deferred.reject(new ClientClosed());
27
- delete pendings[key];
27
+ pendings.delete(key);
28
28
  }
29
29
  }
30
30
  function handler(event) {
31
31
  var _a;
32
32
  const res = event.data;
33
33
  if (DelightRPC.isResult(res) || DelightRPC.isError(res)) {
34
- (_a = pendings[res.id]) === null || _a === void 0 ? void 0 : _a.resolve(res);
34
+ (_a = pendings.get(res.id)) === null || _a === void 0 ? void 0 : _a.resolve(res);
35
35
  }
36
36
  }
37
37
  }
38
38
  export function createClientInRenderer(port, { parameterValidators, expectedVersion, channel } = {}) {
39
- const pendings = {};
39
+ const pendings = new Map();
40
40
  port.addEventListener('message', handler);
41
41
  const client = DelightRPC.createClient(async function send(request) {
42
42
  const res = new Deferred();
43
- pendings[request.id] = res;
43
+ pendings.set(request.id, res);
44
44
  try {
45
45
  port.postMessage(request);
46
46
  return await res;
47
47
  }
48
48
  finally {
49
- delete pendings[request.id];
49
+ pendings.delete(request.id);
50
50
  }
51
51
  }, {
52
52
  parameterValidators,
@@ -58,29 +58,29 @@ export function createClientInRenderer(port, { parameterValidators, expectedVers
58
58
  port.removeEventListener('message', handler);
59
59
  for (const [key, deferred] of Object.entries(pendings)) {
60
60
  deferred.reject(new ClientClosed());
61
- delete pendings[key];
61
+ pendings.delete(key);
62
62
  }
63
63
  }
64
64
  function handler(event) {
65
65
  var _a;
66
66
  const res = event.data;
67
67
  if (DelightRPC.isResult(res) || DelightRPC.isError(res)) {
68
- (_a = pendings[res.id]) === null || _a === void 0 ? void 0 : _a.resolve(res);
68
+ (_a = pendings.get(res.id)) === null || _a === void 0 ? void 0 : _a.resolve(res);
69
69
  }
70
70
  }
71
71
  }
72
72
  export function createBatchClientInMain(port, { expectedVersion, channel } = {}) {
73
- const pendings = {};
73
+ const pendings = new Map();
74
74
  port.addListener('message', handler);
75
75
  const client = new DelightRPC.BatchClient(async function send(request) {
76
76
  const res = new Deferred();
77
- pendings[request.id] = res;
77
+ pendings.set(request.id, res);
78
78
  try {
79
79
  port.postMessage(request);
80
80
  return await res;
81
81
  }
82
82
  finally {
83
- delete pendings[request.id];
83
+ pendings.delete(request.id);
84
84
  }
85
85
  }, {
86
86
  expectedVersion,
@@ -91,29 +91,29 @@ export function createBatchClientInMain(port, { expectedVersion, channel } = {})
91
91
  port.removeListener('message', handler);
92
92
  for (const [key, deferred] of Object.entries(pendings)) {
93
93
  deferred.reject(new ClientClosed());
94
- delete pendings[key];
94
+ pendings.delete(key);
95
95
  }
96
96
  }
97
97
  function handler(event) {
98
98
  var _a;
99
99
  const res = event.data;
100
100
  if (DelightRPC.isError(res) || DelightRPC.isBatchResponse(res)) {
101
- (_a = pendings[res.id]) === null || _a === void 0 ? void 0 : _a.resolve(res);
101
+ (_a = pendings.get(res.id)) === null || _a === void 0 ? void 0 : _a.resolve(res);
102
102
  }
103
103
  }
104
104
  }
105
105
  export function createBatchClientInRenderer(port, { expectedVersion, channel } = {}) {
106
- const pendings = {};
106
+ const pendings = new Map();
107
107
  port.addEventListener('message', handler);
108
108
  const client = new DelightRPC.BatchClient(async function send(request) {
109
109
  const res = new Deferred();
110
- pendings[request.id] = res;
110
+ pendings.set(request.id, res);
111
111
  try {
112
112
  port.postMessage(request);
113
113
  return await res;
114
114
  }
115
115
  finally {
116
- delete pendings[request.id];
116
+ pendings.delete(request.id);
117
117
  }
118
118
  }, {
119
119
  expectedVersion,
@@ -124,14 +124,14 @@ export function createBatchClientInRenderer(port, { expectedVersion, channel } =
124
124
  port.removeEventListener('message', handler);
125
125
  for (const [key, deferred] of Object.entries(pendings)) {
126
126
  deferred.reject(new ClientClosed());
127
- delete pendings[key];
127
+ pendings.delete(key);
128
128
  }
129
129
  }
130
130
  function handler(event) {
131
131
  var _a;
132
132
  const res = event.data;
133
133
  if (DelightRPC.isError(res) || DelightRPC.isBatchResponse(res)) {
134
- (_a = pendings[res.id]) === null || _a === void 0 ? void 0 : _a.resolve(res);
134
+ (_a = pendings.get(res.id)) === null || _a === void 0 ? void 0 : _a.resolve(res);
135
135
  }
136
136
  }
137
137
  }
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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@delight-rpc/electron",
3
- "version": "6.0.4",
3
+ "version": "6.0.6",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "files": [
@@ -43,7 +43,7 @@
43
43
  "@typescript-eslint/parser": "^5.55.0",
44
44
  "cross-env": "^7.0.3",
45
45
  "delight-rpc": "^6.0.0",
46
- "electron": "^30.0.2",
46
+ "electron": "^34.1.1",
47
47
  "eslint": "8.36.0",
48
48
  "husky": "4",
49
49
  "jest": "^29.5.0",
@@ -65,6 +65,6 @@
65
65
  },
66
66
  "peerDependencies": {
67
67
  "delight-rpc": "^5.0.0 || ^6.0.0",
68
- "electron": ">=16.0.1 <31"
68
+ "electron": ">=16.0.1 <35"
69
69
  }
70
70
  }
package/src/client.ts CHANGED
@@ -12,19 +12,19 @@ export function createClientInMain<IAPI extends object>(
12
12
  , channel?: string
13
13
  } = {}
14
14
  ): [client: DelightRPC.ClientProxy<IAPI>, close: () => void] {
15
- const pendings: Record<string, Deferred<IResponse<unknown>> | undefined> = {}
15
+ const pendings: Map<string, Deferred<IResponse<unknown>>> = new Map()
16
16
 
17
17
  port.addListener('message', handler)
18
18
 
19
19
  const client = DelightRPC.createClient<IAPI>(
20
20
  async function send(request) {
21
21
  const res = new Deferred<IResponse<unknown>>()
22
- pendings[request.id] = res
22
+ pendings.set(request.id, res)
23
23
  try {
24
24
  port.postMessage(request)
25
25
  return await res
26
26
  } finally {
27
- delete pendings[request.id]
27
+ pendings.delete(request.id)
28
28
  }
29
29
  }
30
30
  , {
@@ -40,15 +40,15 @@ export function createClientInMain<IAPI extends object>(
40
40
  port.removeListener('message', handler)
41
41
 
42
42
  for (const [key, deferred] of Object.entries(pendings)) {
43
- deferred!.reject(new ClientClosed())
44
- delete pendings[key]
43
+ deferred.reject(new ClientClosed())
44
+ pendings.delete(key)
45
45
  }
46
46
  }
47
47
 
48
48
  function handler(event: Electron.MessageEvent): void {
49
49
  const res = event.data
50
50
  if (DelightRPC.isResult(res) || DelightRPC.isError(res)) {
51
- pendings[res.id]?.resolve(res)
51
+ pendings.get(res.id)?.resolve(res)
52
52
  }
53
53
  }
54
54
  }
@@ -61,23 +61,22 @@ export function createClientInRenderer<IAPI extends object>(
61
61
  channel?: string
62
62
  } = {}
63
63
  ): [client: DelightRPC.ClientProxy<IAPI>, close: () => void] {
64
- const pendings: Record<
64
+ const pendings: Map<
65
65
  string
66
- , | Deferred<IResponse<unknown>>
67
- | undefined
68
- > = {}
66
+ , Deferred<IResponse<unknown>>
67
+ > = new Map()
69
68
 
70
69
  port.addEventListener('message', handler)
71
70
 
72
71
  const client = DelightRPC.createClient<IAPI>(
73
72
  async function send(request) {
74
73
  const res = new Deferred<IResponse<unknown>>()
75
- pendings[request.id] = res
74
+ pendings.set(request.id, res)
76
75
  try {
77
76
  port.postMessage(request)
78
77
  return await res
79
78
  } finally {
80
- delete pendings[request.id]
79
+ pendings.delete(request.id)
81
80
  }
82
81
  }
83
82
  , {
@@ -93,15 +92,15 @@ export function createClientInRenderer<IAPI extends object>(
93
92
  port.removeEventListener('message', handler)
94
93
 
95
94
  for (const [key, deferred] of Object.entries(pendings)) {
96
- deferred!.reject(new ClientClosed())
97
- delete pendings[key]
95
+ deferred.reject(new ClientClosed())
96
+ pendings.delete(key)
98
97
  }
99
98
  }
100
99
 
101
100
  function handler(event: MessageEvent): void {
102
101
  const res = event.data
103
102
  if (DelightRPC.isResult(res) || DelightRPC.isError(res)) {
104
- pendings[res.id]?.resolve(res)
103
+ pendings.get(res.id)?.resolve(res)
105
104
  }
106
105
  }
107
106
  }
@@ -113,11 +112,10 @@ export function createBatchClientInMain<DataType>(
113
112
  channel?: string
114
113
  } = {}
115
114
  ): [client: DelightRPC.BatchClient<DataType>, close: () => void] {
116
- const pendings: Record<
115
+ const pendings: Map<
117
116
  string
118
- , | Deferred<IError | IBatchResponse<unknown>>
119
- | undefined
120
- > = {}
117
+ , Deferred<IError | IBatchResponse<unknown>>
118
+ > = new Map()
121
119
 
122
120
  port.addListener('message', handler)
123
121
 
@@ -127,12 +125,12 @@ export function createBatchClientInMain<DataType>(
127
125
  | IError
128
126
  | IBatchResponse<unknown>
129
127
  >()
130
- pendings[request.id] = res
128
+ pendings.set(request.id, res)
131
129
  try {
132
130
  port.postMessage(request)
133
131
  return await res
134
132
  } finally {
135
- delete pendings[request.id]
133
+ pendings.delete(request.id)
136
134
  }
137
135
  }
138
136
  , {
@@ -147,15 +145,15 @@ export function createBatchClientInMain<DataType>(
147
145
  port.removeListener('message', handler)
148
146
 
149
147
  for (const [key, deferred] of Object.entries(pendings)) {
150
- deferred!.reject(new ClientClosed())
151
- delete pendings[key]
148
+ deferred.reject(new ClientClosed())
149
+ pendings.delete(key)
152
150
  }
153
151
  }
154
152
 
155
153
  function handler(event: Electron.MessageEvent): void {
156
154
  const res = event.data
157
155
  if (DelightRPC.isError(res) || DelightRPC.isBatchResponse(res)) {
158
- pendings[res.id]?.resolve(res)
156
+ pendings.get(res.id)?.resolve(res)
159
157
  }
160
158
  }
161
159
  }
@@ -167,11 +165,10 @@ export function createBatchClientInRenderer<DataType>(
167
165
  channel?: string
168
166
  } = {}
169
167
  ): [client: DelightRPC.BatchClient<DataType>, close: () => void] {
170
- const pendings: Record<
168
+ const pendings: Map<
171
169
  string
172
- , | Deferred<IError | IBatchResponse<unknown>>
173
- | undefined
174
- > = {}
170
+ , Deferred<IError | IBatchResponse<unknown>>
171
+ > = new Map()
175
172
 
176
173
  port.addEventListener('message', handler)
177
174
 
@@ -181,12 +178,12 @@ export function createBatchClientInRenderer<DataType>(
181
178
  | IError
182
179
  | IBatchResponse<unknown>
183
180
  >()
184
- pendings[request.id] = res
181
+ pendings.set(request.id, res)
185
182
  try {
186
183
  port.postMessage(request)
187
184
  return await res
188
185
  } finally {
189
- delete pendings[request.id]
186
+ pendings.delete(request.id)
190
187
  }
191
188
  }
192
189
  , {
@@ -201,15 +198,15 @@ export function createBatchClientInRenderer<DataType>(
201
198
  port.removeEventListener('message', handler)
202
199
 
203
200
  for (const [key, deferred] of Object.entries(pendings)) {
204
- deferred!.reject(new ClientClosed())
205
- delete pendings[key]
201
+ deferred.reject(new ClientClosed())
202
+ pendings.delete(key)
206
203
  }
207
204
  }
208
205
 
209
206
  function handler(event: MessageEvent): void {
210
207
  const res = event.data
211
208
  if (DelightRPC.isError(res) || DelightRPC.isBatchResponse(res)) {
212
- pendings[res.id]?.resolve(res)
209
+ pendings.get(res.id)?.resolve(res)
213
210
  }
214
211
  }
215
212
  }