@enkaku/client 0.12.4 → 0.13.1
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/lib/client.d.ts +2 -2
- package/lib/client.d.ts.map +1 -1
- package/lib/client.js +63 -31
- package/package.json +8 -8
package/lib/client.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Disposer } from '@enkaku/async';
|
|
2
2
|
import { type Logger } from '@enkaku/log';
|
|
3
3
|
import type { AnyProcedureDefinition, AnyRequestProcedureDefinition, ChannelProcedureDefinition, ClientTransportOf, DataOf, EventProcedureDefinition, ProtocolDefinition, RequestProcedureDefinition, RequestType, ReturnOf, StreamProcedureDefinition } from '@enkaku/protocol';
|
|
4
|
-
import { type
|
|
4
|
+
import { type Identity } from '@enkaku/token';
|
|
5
5
|
type FilterNever<T> = {
|
|
6
6
|
[K in keyof T as T[K] extends never ? never : K]: T[K];
|
|
7
7
|
};
|
|
@@ -71,7 +71,7 @@ export type ClientParams<Protocol extends ProtocolDefinition> = {
|
|
|
71
71
|
logger?: Logger;
|
|
72
72
|
transport: ClientTransportOf<Protocol>;
|
|
73
73
|
serverID?: string;
|
|
74
|
-
|
|
74
|
+
identity?: Identity | Promise<Identity>;
|
|
75
75
|
};
|
|
76
76
|
export declare class Client<Protocol extends ProtocolDefinition, ClientDefinitions extends ClientDefinitionsType<Protocol> = ClientDefinitionsType<Protocol>> extends Disposer {
|
|
77
77
|
#private;
|
package/lib/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAS,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAmB,KAAK,MAAM,EAAE,MAAM,aAAa,CAAA;AAC1D,OAAO,KAAK,EAGV,sBAAsB,EACtB,6BAA6B,EAE7B,0BAA0B,EAC1B,iBAAiB,EACjB,MAAM,EACN,wBAAwB,EACxB,kBAAkB,EAClB,0BAA0B,EAC1B,WAAW,EACX,QAAQ,EACR,yBAAyB,EAC1B,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAuB,KAAK,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/lib/client.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Disposer, defer } from '@enkaku/async';
|
|
2
2
|
import { getEnkakuLogger } from '@enkaku/log';
|
|
3
3
|
import { createPipe, writeTo } from '@enkaku/stream';
|
|
4
|
-
import { createUnsignedToken } from '@enkaku/token';
|
|
4
|
+
import { createUnsignedToken, isSigningIdentity } from '@enkaku/token';
|
|
5
5
|
import { RequestError } from './error.js';
|
|
6
6
|
function createController(params, onDone) {
|
|
7
7
|
const deferred = defer();
|
|
@@ -40,13 +40,18 @@ function createStream({ readable, ...requestParams }) {
|
|
|
40
40
|
readable
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
|
-
function getCreateMessage(
|
|
44
|
-
if (
|
|
43
|
+
function getCreateMessage(identity, aud) {
|
|
44
|
+
if (identity == null) {
|
|
45
45
|
return createUnsignedToken;
|
|
46
46
|
}
|
|
47
|
-
const
|
|
47
|
+
const identityPromise = Promise.resolve(identity);
|
|
48
48
|
const createToken = (payload, header)=>{
|
|
49
|
-
return
|
|
49
|
+
return identityPromise.then((id)=>{
|
|
50
|
+
if (!isSigningIdentity(id)) {
|
|
51
|
+
throw new Error('Identity does not support signing');
|
|
52
|
+
}
|
|
53
|
+
return id.signToken(payload, header);
|
|
54
|
+
});
|
|
50
55
|
};
|
|
51
56
|
return aud ? (payload, header)=>createToken({
|
|
52
57
|
aud,
|
|
@@ -74,7 +79,7 @@ export class Client extends Disposer {
|
|
|
74
79
|
this.#logger.debug('disposed');
|
|
75
80
|
}
|
|
76
81
|
});
|
|
77
|
-
this.#createMessage = getCreateMessage(params.
|
|
82
|
+
this.#createMessage = getCreateMessage(params.identity, params.serverID);
|
|
78
83
|
this.#getRandomID = params.getRandomID ?? defaultRandomID;
|
|
79
84
|
this.#handleTransportDisposed = params.handleTransportDisposed;
|
|
80
85
|
this.#handleTransportError = params.handleTransportError;
|
|
@@ -157,7 +162,7 @@ export class Client extends Disposer {
|
|
|
157
162
|
case 'error':
|
|
158
163
|
{
|
|
159
164
|
const error = RequestError.fromPayload(msg.payload);
|
|
160
|
-
this.#logger.debug('error reply for {type} {procedure} with ID {rid}', {
|
|
165
|
+
this.#logger.debug('error reply for {type} {procedure} with ID {rid}: {error}', {
|
|
161
166
|
type: controller.type,
|
|
162
167
|
procedure: controller.procedure,
|
|
163
168
|
rid: msg.payload.rid,
|
|
@@ -168,7 +173,7 @@ export class Client extends Disposer {
|
|
|
168
173
|
break;
|
|
169
174
|
}
|
|
170
175
|
case 'receive':
|
|
171
|
-
this.#logger.trace('receive reply for {type} {procedure} with ID {rid}', {
|
|
176
|
+
this.#logger.trace('receive reply for {type} {procedure} with ID {rid}: {receive}', {
|
|
172
177
|
type: controller.type,
|
|
173
178
|
procedure: controller.procedure,
|
|
174
179
|
rid: msg.payload.rid,
|
|
@@ -177,7 +182,7 @@ export class Client extends Disposer {
|
|
|
177
182
|
void controller.receive?.write(msg.payload.val);
|
|
178
183
|
break;
|
|
179
184
|
case 'result':
|
|
180
|
-
this.#logger.trace('result reply for {type} {procedure} with ID {rid}', {
|
|
185
|
+
this.#logger.trace('result reply for {type} {procedure} with ID {rid}: {result}', {
|
|
181
186
|
type: controller.type,
|
|
182
187
|
procedure: controller.procedure,
|
|
183
188
|
rid: msg.payload.rid,
|
|
@@ -205,7 +210,7 @@ export class Client extends Disposer {
|
|
|
205
210
|
]) : controller.signal;
|
|
206
211
|
signal.addEventListener('abort', ()=>{
|
|
207
212
|
const reason = signal.reason.name ?? signal.reason;
|
|
208
|
-
this.#logger.trace('abort {type} {procedure} with ID {rid}', {
|
|
213
|
+
this.#logger.trace('abort {type} {procedure} with ID {rid} and reason: {reason}', {
|
|
209
214
|
type: controller.type,
|
|
210
215
|
procedure: controller.procedure,
|
|
211
216
|
rid,
|
|
@@ -236,10 +241,16 @@ export class Client extends Disposer {
|
|
|
236
241
|
typ: 'event',
|
|
237
242
|
prc: procedure
|
|
238
243
|
};
|
|
239
|
-
|
|
240
|
-
procedure,
|
|
241
|
-
|
|
242
|
-
|
|
244
|
+
if (data == null) {
|
|
245
|
+
this.#logger.trace('send event {procedure} without data', {
|
|
246
|
+
procedure
|
|
247
|
+
});
|
|
248
|
+
} else {
|
|
249
|
+
this.#logger.trace('send event {procedure} with data: {data}', {
|
|
250
|
+
procedure,
|
|
251
|
+
data
|
|
252
|
+
});
|
|
253
|
+
}
|
|
243
254
|
await this.#write(payload, config.header);
|
|
244
255
|
}
|
|
245
256
|
request(procedure, ...args) {
|
|
@@ -252,7 +263,7 @@ export class Client extends Disposer {
|
|
|
252
263
|
const rid = config.id ?? this.#getRandomID();
|
|
253
264
|
const providedSignal = config.signal;
|
|
254
265
|
if (providedSignal?.aborted) {
|
|
255
|
-
this.#logger.debug('reject aborted request {procedure} with ID {
|
|
266
|
+
this.#logger.debug('reject aborted request {procedure} with ID {rid}', {
|
|
256
267
|
procedure,
|
|
257
268
|
rid
|
|
258
269
|
});
|
|
@@ -275,11 +286,18 @@ export class Client extends Disposer {
|
|
|
275
286
|
rid,
|
|
276
287
|
prc: procedure
|
|
277
288
|
};
|
|
278
|
-
|
|
279
|
-
procedure,
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
289
|
+
if (prm == null) {
|
|
290
|
+
this.#logger.trace('send request {procedure} with ID {rid}', {
|
|
291
|
+
procedure,
|
|
292
|
+
rid
|
|
293
|
+
});
|
|
294
|
+
} else {
|
|
295
|
+
this.#logger.trace('send request {procedure} with ID {rid} and param: {param}', {
|
|
296
|
+
procedure,
|
|
297
|
+
rid,
|
|
298
|
+
param: prm
|
|
299
|
+
});
|
|
300
|
+
}
|
|
283
301
|
const sent = this.#write(payload, config.header);
|
|
284
302
|
const signal = this.#handleSignal(rid, controller, providedSignal);
|
|
285
303
|
return createRequest({
|
|
@@ -327,11 +345,18 @@ export class Client extends Disposer {
|
|
|
327
345
|
rid,
|
|
328
346
|
prc: procedure
|
|
329
347
|
};
|
|
330
|
-
|
|
331
|
-
procedure,
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
348
|
+
if (prm == null) {
|
|
349
|
+
this.#logger.trace('create stream {procedure} with ID {rid}', {
|
|
350
|
+
procedure,
|
|
351
|
+
rid
|
|
352
|
+
});
|
|
353
|
+
} else {
|
|
354
|
+
this.#logger.trace('create stream {procedure} with ID {rid} and param: {param}', {
|
|
355
|
+
procedure,
|
|
356
|
+
rid,
|
|
357
|
+
param: prm
|
|
358
|
+
});
|
|
359
|
+
}
|
|
335
360
|
const sent = this.#write(payload, config.header);
|
|
336
361
|
const signal = this.#handleSignal(rid, controller, providedSignal);
|
|
337
362
|
return createStream({
|
|
@@ -385,15 +410,22 @@ export class Client extends Disposer {
|
|
|
385
410
|
rid,
|
|
386
411
|
prc: procedure
|
|
387
412
|
};
|
|
388
|
-
|
|
389
|
-
procedure,
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
413
|
+
if (prm == null) {
|
|
414
|
+
this.#logger.trace('create channel {procedure} with ID {rid}', {
|
|
415
|
+
procedure,
|
|
416
|
+
rid
|
|
417
|
+
});
|
|
418
|
+
} else {
|
|
419
|
+
this.#logger.trace('create channel {procedure} with ID {rid} and param: {param}', {
|
|
420
|
+
procedure,
|
|
421
|
+
rid,
|
|
422
|
+
param: prm
|
|
423
|
+
});
|
|
424
|
+
}
|
|
393
425
|
const sent = this.#write(payload, config.header);
|
|
394
426
|
const signal = this.#handleSignal(rid, controller, providedSignal);
|
|
395
427
|
const send = async (val)=>{
|
|
396
|
-
this.#logger.trace('send value to channel {procedure} with ID {rid}', {
|
|
428
|
+
this.#logger.trace('send value to channel {procedure} with ID {rid}: {value}', {
|
|
397
429
|
procedure,
|
|
398
430
|
rid,
|
|
399
431
|
value: val
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@enkaku/client",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.13.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"homepage": "https://enkaku.dev",
|
|
6
6
|
"description": "Enkaku RPC client",
|
|
@@ -26,15 +26,15 @@
|
|
|
26
26
|
],
|
|
27
27
|
"sideEffects": false,
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@enkaku/
|
|
30
|
-
"@enkaku/
|
|
31
|
-
"@enkaku/
|
|
32
|
-
"@enkaku/
|
|
33
|
-
"@enkaku/
|
|
29
|
+
"@enkaku/log": "^0.13.0",
|
|
30
|
+
"@enkaku/async": "^0.13.0",
|
|
31
|
+
"@enkaku/token": "^0.13.0",
|
|
32
|
+
"@enkaku/execution": "^0.13.0",
|
|
33
|
+
"@enkaku/stream": "^0.13.0"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@enkaku/protocol": "^0.
|
|
37
|
-
"@enkaku/transport": "^0.
|
|
36
|
+
"@enkaku/protocol": "^0.13.0",
|
|
37
|
+
"@enkaku/transport": "^0.13.1"
|
|
38
38
|
},
|
|
39
39
|
"scripts": {
|
|
40
40
|
"build:clean": "del lib",
|