@enkaku/server 0.1.1 → 0.2.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/error.d.ts +16 -0
- package/lib/error.d.ts.map +1 -0
- package/lib/error.js +37 -0
- package/lib/handlers/channel.d.ts +6 -0
- package/lib/handlers/channel.d.ts.map +1 -0
- package/lib/handlers/channel.js +39 -0
- package/lib/handlers/event.d.ts +3 -3
- package/lib/handlers/event.d.ts.map +1 -1
- package/lib/handlers/event.js +13 -13
- package/lib/handlers/request.d.ts +3 -3
- package/lib/handlers/request.d.ts.map +1 -1
- package/lib/handlers/request.js +10 -29
- package/lib/handlers/stream.d.ts +6 -0
- package/lib/handlers/stream.d.ts.map +1 -0
- package/lib/handlers/stream.js +31 -0
- package/lib/index.d.ts +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/rejections.d.ts +7 -5
- package/lib/rejections.d.ts.map +1 -1
- package/lib/rejections.js +10 -3
- package/lib/server.d.ts +10 -10
- package/lib/server.d.ts.map +1 -1
- package/lib/server.js +19 -11
- package/lib/types.d.ts +25 -22
- package/lib/types.d.ts.map +1 -1
- package/lib/utils.d.ts +11 -0
- package/lib/utils.d.ts.map +1 -0
- package/lib/utils.js +47 -0
- package/package.json +6 -5
package/lib/error.d.ts
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { ErrorReplyPayload } from '@enkaku/protocol';
|
|
2
|
+
import { ErrorRejection, type ErrorRejectionOptions } from './rejections.js';
|
|
3
|
+
export type HandlerErrorParams<Code extends string = string, Data extends Record<string, unknown> = Record<string, unknown>, Info extends Record<string, unknown> = Record<string, unknown>> = Partial<ErrorRejectionOptions<Info>> & {
|
|
4
|
+
code: Code;
|
|
5
|
+
data?: Data;
|
|
6
|
+
message?: string;
|
|
7
|
+
};
|
|
8
|
+
export declare class HandlerError<Code extends string, Data extends Record<string, unknown> = Record<string, unknown>, Info extends Record<string, unknown> = Record<string, unknown>> extends ErrorRejection<Info> {
|
|
9
|
+
#private;
|
|
10
|
+
static from<Code extends string, Data extends Record<string, unknown> = Record<string, unknown>, Info extends Record<string, unknown> = Record<string, unknown>>(cause: unknown, params: HandlerErrorParams<Code, Data, Info>): HandlerError<Code, Data, Info>;
|
|
11
|
+
constructor(params: HandlerErrorParams<Code, Data, Info>);
|
|
12
|
+
get code(): Code;
|
|
13
|
+
get data(): Data;
|
|
14
|
+
toPayload(rid: string): ErrorReplyPayload<Code, Data>;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=error.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEzD,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAE5E,MAAM,MAAM,kBAAkB,CAC5B,IAAI,SAAS,MAAM,GAAG,MAAM,EAC5B,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9D,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAC5D,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,GAAG;IACzC,IAAI,EAAE,IAAI,CAAA;IACV,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,qBAAa,YAAY,CACvB,IAAI,SAAS,MAAM,EACnB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9D,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAC9D,SAAQ,cAAc,CAAC,IAAI,CAAC;;IAC5B,MAAM,CAAC,IAAI,CACT,IAAI,SAAS,MAAM,EACnB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9D,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9D,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;gBAWnF,MAAM,EAAE,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IAOxD,IAAI,IAAI,IAAI,IAAI,CAEf;IAED,IAAI,IAAI,IAAI,IAAI,CAEf;IAED,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC;CAStD"}
|
package/lib/error.js
ADDED
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { ErrorRejection } from './rejections.js';
|
|
2
|
+
export class HandlerError extends ErrorRejection {
|
|
3
|
+
static from(cause, params) {
|
|
4
|
+
return cause instanceof HandlerError ? cause : cause instanceof Error ? new HandlerError({
|
|
5
|
+
message: cause.message,
|
|
6
|
+
...params,
|
|
7
|
+
cause
|
|
8
|
+
}) : new HandlerError({
|
|
9
|
+
message: 'Unknown error',
|
|
10
|
+
...params,
|
|
11
|
+
cause
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
|
+
#code;
|
|
15
|
+
#data;
|
|
16
|
+
constructor(params){
|
|
17
|
+
const { code, data, message, ...options } = params;
|
|
18
|
+
super(message ?? `Handler error code: ${code}`, options);
|
|
19
|
+
this.#code = code;
|
|
20
|
+
this.#data = data ?? {};
|
|
21
|
+
}
|
|
22
|
+
get code() {
|
|
23
|
+
return this.#code;
|
|
24
|
+
}
|
|
25
|
+
get data() {
|
|
26
|
+
return this.#data;
|
|
27
|
+
}
|
|
28
|
+
toPayload(rid) {
|
|
29
|
+
return {
|
|
30
|
+
typ: 'error',
|
|
31
|
+
rid,
|
|
32
|
+
code: this.#code,
|
|
33
|
+
data: this.#data,
|
|
34
|
+
msg: this.message
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { AnyDefinitions, ChannelPayloadOf, ClientMessage } from '@enkaku/protocol';
|
|
2
|
+
import { ErrorRejection } from '../rejections.js';
|
|
3
|
+
import type { HandlerContext } from '../types.js';
|
|
4
|
+
export type ChannelMessageOf<Definitions extends AnyDefinitions, Command extends keyof Definitions & string = keyof Definitions & string> = ClientMessage<ChannelPayloadOf<Command, Definitions[Command]>>;
|
|
5
|
+
export declare function handleChannel<Definitions extends AnyDefinitions, Command extends keyof Definitions & string>(ctx: HandlerContext<Definitions>, msg: ChannelMessageOf<Definitions, Command>): ErrorRejection | Promise<void>;
|
|
6
|
+
//# sourceMappingURL=channel.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/handlers/channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAEd,gBAAgB,EAChB,aAAa,EACd,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAGV,cAAc,EAKf,MAAM,aAAa,CAAA;AAGpB,MAAM,MAAM,gBAAgB,CAC1B,WAAW,SAAS,cAAc,EAClC,OAAO,SAAS,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,WAAW,GAAG,MAAM,IACrE,aAAa,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AAElE,wBAAgB,aAAa,CAC3B,WAAW,SAAS,cAAc,EAClC,OAAO,SAAS,MAAM,WAAW,GAAG,MAAM,EAE1C,GAAG,EAAE,cAAc,CAAC,WAAW,CAAC,EAChC,GAAG,EAAE,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,GAC1C,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA2ChC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { createPipe } from '@enkaku/stream';
|
|
2
|
+
import { ErrorRejection } from '../rejections.js';
|
|
3
|
+
import { consumeReader, executeHandler } from '../utils.js';
|
|
4
|
+
export function handleChannel(ctx, msg) {
|
|
5
|
+
const handler = ctx.handlers[msg.payload.cmd];
|
|
6
|
+
if (handler == null) {
|
|
7
|
+
return new ErrorRejection(`No handler for command: ${msg.payload.cmd}`, {
|
|
8
|
+
info: msg.payload
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
const sendStream = createPipe();
|
|
12
|
+
const controller = Object.assign(new AbortController(), {
|
|
13
|
+
writer: sendStream.writable.getWriter()
|
|
14
|
+
});
|
|
15
|
+
controller.signal.addEventListener('abort', ()=>{
|
|
16
|
+
controller.writer.close();
|
|
17
|
+
});
|
|
18
|
+
ctx.controllers[msg.payload.rid] = controller;
|
|
19
|
+
const receiveStream = createPipe();
|
|
20
|
+
consumeReader({
|
|
21
|
+
onValue: async (val)=>{
|
|
22
|
+
await ctx.send({
|
|
23
|
+
typ: 'receive',
|
|
24
|
+
rid: msg.payload.rid,
|
|
25
|
+
val
|
|
26
|
+
});
|
|
27
|
+
},
|
|
28
|
+
reader: receiveStream.readable.getReader(),
|
|
29
|
+
signal: controller.signal
|
|
30
|
+
});
|
|
31
|
+
const handlerContext = {
|
|
32
|
+
message: msg,
|
|
33
|
+
params: msg.payload.prm,
|
|
34
|
+
readable: sendStream.readable,
|
|
35
|
+
signal: controller.signal,
|
|
36
|
+
writable: receiveStream.writable
|
|
37
|
+
};
|
|
38
|
+
return executeHandler(ctx, msg.payload, ()=>handler(handlerContext));
|
|
39
|
+
}
|
package/lib/handlers/event.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AnyDefinitions, ClientMessage, EventPayloadOf } from '@enkaku/protocol';
|
|
2
2
|
import { ErrorRejection } from '../rejections.js';
|
|
3
3
|
import type { HandlerContext } from '../types.js';
|
|
4
|
-
export type EventMessageOf<Definitions extends
|
|
5
|
-
export declare function handleEvent<Definitions extends
|
|
4
|
+
export type EventMessageOf<Definitions extends AnyDefinitions, Command extends keyof Definitions & string = keyof Definitions & string> = ClientMessage<EventPayloadOf<Command, Definitions[Command]>>;
|
|
5
|
+
export declare function handleEvent<Definitions extends AnyDefinitions, Command extends keyof Definitions & string>(ctx: HandlerContext<Definitions>, msg: EventMessageOf<Definitions, Command>): ErrorRejection | Promise<void>;
|
|
6
6
|
//# sourceMappingURL=event.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/handlers/event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/handlers/event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAGrF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAAoD,cAAc,EAAE,MAAM,aAAa,CAAA;AAEnG,MAAM,MAAM,cAAc,CACxB,WAAW,SAAS,cAAc,EAClC,OAAO,SAAS,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,WAAW,GAAG,MAAM,IACrE,aAAa,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AAEhE,wBAAgB,WAAW,CACzB,WAAW,SAAS,cAAc,EAClC,OAAO,SAAS,MAAM,WAAW,GAAG,MAAM,EAE1C,GAAG,EAAE,cAAc,CAAC,WAAW,CAAC,EAChC,GAAG,EAAE,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,GACxC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBhC"}
|
package/lib/handlers/event.js
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
+
import { toPromise } from '@enkaku/util';
|
|
1
2
|
import { ErrorRejection } from '../rejections.js';
|
|
2
|
-
export function handleEvent(
|
|
3
|
-
const
|
|
4
|
-
const handler = context.handlers[action.name];
|
|
3
|
+
export function handleEvent(ctx, msg) {
|
|
4
|
+
const handler = ctx.handlers[msg.payload.cmd];
|
|
5
5
|
if (handler == null) {
|
|
6
|
-
return new ErrorRejection(`No handler for
|
|
7
|
-
info:
|
|
6
|
+
return new ErrorRejection(`No handler for command: ${msg.payload.cmd}`, {
|
|
7
|
+
info: msg.payload
|
|
8
8
|
});
|
|
9
9
|
}
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
data
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const err = new ErrorRejection(`Error handling ${
|
|
16
|
-
info:
|
|
10
|
+
const handlerContext = {
|
|
11
|
+
message: msg,
|
|
12
|
+
data: msg.payload.data
|
|
13
|
+
};
|
|
14
|
+
return toPromise(()=>handler(handlerContext)).catch((cause)=>{
|
|
15
|
+
const err = new ErrorRejection(`Error handling command: ${msg.payload.cmd}`, {
|
|
16
|
+
info: msg.payload,
|
|
17
17
|
cause
|
|
18
18
|
});
|
|
19
|
-
|
|
19
|
+
ctx.reject(err);
|
|
20
20
|
});
|
|
21
21
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AnyDefinitions, ClientMessage, RequestPayloadOf } from '@enkaku/protocol';
|
|
2
2
|
import { ErrorRejection } from '../rejections.js';
|
|
3
3
|
import type { HandlerContext } from '../types.js';
|
|
4
|
-
export type RequestMessageOf<Definitions extends
|
|
5
|
-
export declare function handleRequest<Definitions extends
|
|
4
|
+
export type RequestMessageOf<Definitions extends AnyDefinitions, Command extends keyof Definitions & string = keyof Definitions & string> = ClientMessage<RequestPayloadOf<Command, Definitions[Command]>>;
|
|
5
|
+
export declare function handleRequest<Definitions extends AnyDefinitions, Command extends keyof Definitions & string>(ctx: HandlerContext<Definitions>, msg: RequestMessageOf<Definitions, Command>): ErrorRejection | Promise<void>;
|
|
6
6
|
//# sourceMappingURL=request.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/handlers/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/handlers/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEvF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EACV,cAAc,EAKf,MAAM,aAAa,CAAA;AAGpB,MAAM,MAAM,gBAAgB,CAC1B,WAAW,SAAS,cAAc,EAClC,OAAO,SAAS,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,WAAW,GAAG,MAAM,IACrE,aAAa,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AAElE,wBAAgB,aAAa,CAC3B,WAAW,SAAS,cAAc,EAClC,OAAO,SAAS,MAAM,WAAW,GAAG,MAAM,EAE1C,GAAG,EAAE,cAAc,CAAC,WAAW,CAAC,EAChC,GAAG,EAAE,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,GAC1C,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBhC"}
|
package/lib/handlers/request.js
CHANGED
|
@@ -1,36 +1,17 @@
|
|
|
1
1
|
import { ErrorRejection } from '../rejections.js';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const handler =
|
|
2
|
+
import { executeHandler } from '../utils.js';
|
|
3
|
+
export function handleRequest(ctx, msg) {
|
|
4
|
+
const handler = ctx.handlers[msg.payload.cmd];
|
|
5
5
|
if (handler == null) {
|
|
6
|
-
return new ErrorRejection(`No handler for
|
|
7
|
-
info:
|
|
6
|
+
return new ErrorRejection(`No handler for command: ${msg.payload.cmd}`, {
|
|
7
|
+
info: msg.payload
|
|
8
8
|
});
|
|
9
9
|
}
|
|
10
10
|
const controller = new AbortController();
|
|
11
|
-
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
params,
|
|
15
|
-
meta,
|
|
11
|
+
ctx.controllers[msg.payload.rid] = controller;
|
|
12
|
+
const handlerContext = {
|
|
13
|
+
params: msg.payload.prm,
|
|
16
14
|
signal: controller.signal
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
return context.send({
|
|
20
|
-
action: {
|
|
21
|
-
type: 'result',
|
|
22
|
-
id: action.id,
|
|
23
|
-
value
|
|
24
|
-
}
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
}).catch((cause)=>{
|
|
28
|
-
const err = new ErrorRejection(`Error handling ${action.name}`, {
|
|
29
|
-
info: action,
|
|
30
|
-
cause
|
|
31
|
-
});
|
|
32
|
-
context.reject(err);
|
|
33
|
-
}).finally(()=>{
|
|
34
|
-
delete context.controllers[action.id];
|
|
35
|
-
});
|
|
15
|
+
};
|
|
16
|
+
return executeHandler(ctx, msg.payload, ()=>handler(handlerContext));
|
|
36
17
|
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { AnyDefinitions, ClientMessage, StreamPayloadOf } from '@enkaku/protocol';
|
|
2
|
+
import { ErrorRejection } from '../rejections.js';
|
|
3
|
+
import type { HandlerContext } from '../types.js';
|
|
4
|
+
export type StreamMessageOf<Definitions extends AnyDefinitions, Command extends keyof Definitions & string = keyof Definitions & string> = ClientMessage<StreamPayloadOf<Command, Definitions[Command]>>;
|
|
5
|
+
export declare function handleStream<Definitions extends AnyDefinitions, Command extends keyof Definitions & string>(ctx: HandlerContext<Definitions>, msg: StreamMessageOf<Definitions, Command>): ErrorRejection | Promise<void>;
|
|
6
|
+
//# sourceMappingURL=stream.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/handlers/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAEd,aAAa,EACb,eAAe,EAChB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EACV,cAAc,EAMf,MAAM,aAAa,CAAA;AAGpB,MAAM,MAAM,eAAe,CACzB,WAAW,SAAS,cAAc,EAClC,OAAO,SAAS,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,WAAW,GAAG,MAAM,IACrE,aAAa,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AAEjE,wBAAgB,YAAY,CAC1B,WAAW,SAAS,cAAc,EAClC,OAAO,SAAS,MAAM,WAAW,GAAG,MAAM,EAE1C,GAAG,EAAE,cAAc,CAAC,WAAW,CAAC,EAChC,GAAG,EAAE,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,GACzC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAsChC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { createPipe } from '@enkaku/stream';
|
|
2
|
+
import { ErrorRejection } from '../rejections.js';
|
|
3
|
+
import { consumeReader, executeHandler } from '../utils.js';
|
|
4
|
+
export function handleStream(ctx, msg) {
|
|
5
|
+
const handler = ctx.handlers[msg.payload.cmd];
|
|
6
|
+
if (handler == null) {
|
|
7
|
+
return new ErrorRejection(`No handler for command: ${msg.payload.cmd}`, {
|
|
8
|
+
info: msg.payload
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
const controller = new AbortController();
|
|
12
|
+
ctx.controllers[msg.payload.rid] = controller;
|
|
13
|
+
const receiveStream = createPipe();
|
|
14
|
+
consumeReader({
|
|
15
|
+
onValue: async (val)=>{
|
|
16
|
+
await ctx.send({
|
|
17
|
+
typ: 'receive',
|
|
18
|
+
rid: msg.payload.rid,
|
|
19
|
+
val
|
|
20
|
+
});
|
|
21
|
+
},
|
|
22
|
+
reader: receiveStream.readable.getReader(),
|
|
23
|
+
signal: controller.signal
|
|
24
|
+
});
|
|
25
|
+
const handlerContext = {
|
|
26
|
+
params: msg.payload.prm,
|
|
27
|
+
signal: controller.signal,
|
|
28
|
+
writable: receiveStream.writable
|
|
29
|
+
};
|
|
30
|
+
return executeHandler(ctx, msg.payload, ()=>handler(handlerContext));
|
|
31
|
+
}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export type { RejectionType } from './rejections.js';
|
|
2
2
|
export { type ServeParams, type Server, serve } from './server.js';
|
|
3
|
-
export type {
|
|
3
|
+
export type { ChannelHandler, ChannelHandlerContext, CommandHandlers, EventHandler, EventHandlerContext, HandlerReturn, RequestHandler, RequestHandlerContext, StreamHandler, StreamHandlerContext, } from './types.js';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAClE,YAAY,EACV,cAAc,EACd,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAClE,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,qBAAqB,EACrB,aAAa,EACb,oBAAoB,GACrB,MAAM,YAAY,CAAA"}
|
package/lib/rejections.d.ts
CHANGED
|
@@ -1,23 +1,25 @@
|
|
|
1
|
-
import type { OptionalRecord } from '@enkaku/protocol';
|
|
2
1
|
export declare enum RejectionReason {
|
|
3
2
|
ABORT = 1,
|
|
4
3
|
ERROR = 2,
|
|
5
4
|
TIMEOUT = 3
|
|
6
5
|
}
|
|
7
|
-
export type RejectionType<Reason extends RejectionReason = RejectionReason, Info extends
|
|
6
|
+
export type RejectionType<Reason extends RejectionReason = RejectionReason, Info extends Record<string, unknown> = Record<string, unknown>> = {
|
|
8
7
|
readonly reason: Reason;
|
|
9
8
|
readonly info: Info;
|
|
10
9
|
};
|
|
11
|
-
export declare class Rejection<Reason extends RejectionReason = RejectionReason, Info extends
|
|
10
|
+
export declare class Rejection<Reason extends RejectionReason = RejectionReason, Info extends Record<string, unknown> = Record<string, unknown>> implements RejectionType<Reason, Info> {
|
|
12
11
|
#private;
|
|
13
12
|
constructor(reason: Reason, info: Info);
|
|
14
13
|
get reason(): Reason;
|
|
15
14
|
get info(): Info;
|
|
16
15
|
}
|
|
17
|
-
export
|
|
16
|
+
export declare class AbortRejection<Info extends Record<string, unknown> = Record<string, unknown>> extends Rejection<RejectionReason.ABORT, Info> {
|
|
17
|
+
constructor(info: Info);
|
|
18
|
+
}
|
|
19
|
+
export type ErrorRejectionOptions<Info extends Record<string, unknown> = Record<string, unknown>> = ErrorOptions & {
|
|
18
20
|
info: Info;
|
|
19
21
|
};
|
|
20
|
-
export declare class ErrorRejection<Info extends
|
|
22
|
+
export declare class ErrorRejection<Info extends Record<string, unknown> = Record<string, unknown>> extends Error implements RejectionType<RejectionReason.ERROR, Info> {
|
|
21
23
|
#private;
|
|
22
24
|
constructor(message: string, options?: ErrorRejectionOptions<Info>);
|
|
23
25
|
get reason(): RejectionReason.ERROR;
|
package/lib/rejections.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rejections.d.ts","sourceRoot":"","sources":["../src/rejections.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"rejections.d.ts","sourceRoot":"","sources":["../src/rejections.ts"],"names":[],"mappings":"AAAA,oBAAY,eAAe;IACzB,KAAK,IAAI;IACT,KAAK,IAAI;IACT,OAAO,IAAI;CACZ;AAED,MAAM,MAAM,aAAa,CACvB,MAAM,SAAS,eAAe,GAAG,eAAe,EAChD,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAC5D;IACF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAA;CACpB,CAAA;AAED,qBAAa,SAAS,CACpB,MAAM,SAAS,eAAe,GAAG,eAAe,EAChD,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAC9D,YAAW,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC;;gBAK1B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI;IAKtC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,IAAI,IAAI,IAAI,CAEf;CACF;AAED,qBAAa,cAAc,CACzB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAC9D,SAAQ,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC;gBAClC,IAAI,EAAE,IAAI;CAGvB;AAED,MAAM,MAAM,qBAAqB,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAC9F,YAAY,GAAG;IACb,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAEH,qBAAa,cAAc,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACxF,SAAQ,KACR,YAAW,aAAa,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC;;gBAIzC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAS,qBAAqB,CAAC,IAAI,CAAC;IAKxE,IAAI,MAAM,IAAI,eAAe,CAAC,KAAK,CAElC;IAED,IAAI,IAAI,IAAI,IAAI,CAEf;CACF"}
|
package/lib/rejections.js
CHANGED
|
@@ -18,11 +18,18 @@ export class Rejection {
|
|
|
18
18
|
return this.#info;
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
+
export class AbortRejection extends Rejection {
|
|
22
|
+
constructor(info){
|
|
23
|
+
super(1, info);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
21
26
|
export class ErrorRejection extends Error {
|
|
22
27
|
#info;
|
|
23
|
-
constructor(message, options){
|
|
24
|
-
super(message
|
|
25
|
-
|
|
28
|
+
constructor(message, options = {}){
|
|
29
|
+
super(message, {
|
|
30
|
+
cause: options.cause
|
|
31
|
+
});
|
|
32
|
+
this.#info = options.info ?? {};
|
|
26
33
|
}
|
|
27
34
|
get reason() {
|
|
28
35
|
return 2;
|
package/lib/server.d.ts
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AnyDefinitions, ServerTransportOf } from '@enkaku/protocol';
|
|
2
2
|
import { type Disposer } from '@enkaku/util';
|
|
3
3
|
import { type RejectionType } from './rejections.js';
|
|
4
|
-
import type {
|
|
5
|
-
export type HandleMessagesParams<Definitions extends
|
|
6
|
-
controllers: Record<string,
|
|
7
|
-
handlers:
|
|
4
|
+
import type { CommandHandlers, HandlerController } from './types.js';
|
|
5
|
+
export type HandleMessagesParams<Definitions extends AnyDefinitions> = {
|
|
6
|
+
controllers: Record<string, HandlerController>;
|
|
7
|
+
handlers: CommandHandlers<Definitions>;
|
|
8
8
|
reject: (rejection: RejectionType) => void;
|
|
9
9
|
signal: AbortSignal;
|
|
10
|
-
transport: ServerTransportOf<Definitions
|
|
10
|
+
transport: ServerTransportOf<Definitions>;
|
|
11
11
|
};
|
|
12
|
-
export type ServeParams<Definitions extends
|
|
13
|
-
handlers:
|
|
12
|
+
export type ServeParams<Definitions extends AnyDefinitions> = {
|
|
13
|
+
handlers: CommandHandlers<Definitions>;
|
|
14
14
|
signal?: AbortSignal;
|
|
15
|
-
transport: ServerTransportOf<Definitions
|
|
15
|
+
transport: ServerTransportOf<Definitions>;
|
|
16
16
|
};
|
|
17
17
|
export type Server = Disposer & {
|
|
18
18
|
rejections: ReadableStream<RejectionType>;
|
|
19
19
|
};
|
|
20
|
-
export declare function serve<Definitions extends
|
|
20
|
+
export declare function serve<Definitions extends AnyDefinitions>(params: ServeParams<Definitions>): Server;
|
|
21
21
|
//# sourceMappingURL=server.d.ts.map
|
package/lib/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAsB,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAE7F,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,cAAc,CAAA;AAM5D,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpE,OAAO,KAAK,EAEV,eAAe,EAEf,iBAAiB,EAClB,MAAM,YAAY,CAAA;AAEnB,MAAM,MAAM,oBAAoB,CAAC,WAAW,SAAS,cAAc,IAAI;IACrE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;IAC9C,QAAQ,EAAE,eAAe,CAAC,WAAW,CAAC,CAAA;IACtC,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,KAAK,IAAI,CAAA;IAC1C,MAAM,EAAE,WAAW,CAAA;IACnB,SAAS,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAA;CAC1C,CAAA;AAkFD,MAAM,MAAM,WAAW,CAAC,WAAW,SAAS,cAAc,IAAI;IAC5D,QAAQ,EAAE,eAAe,CAAC,WAAW,CAAC,CAAA;IACtC,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,SAAS,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,QAAQ,GAAG;IAC9B,UAAU,EAAE,cAAc,CAAC,aAAa,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,KAAK,CAAC,WAAW,SAAS,cAAc,EACtD,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,GAC/B,MAAM,CA8BR"}
|
package/lib/server.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import { createUnsignedToken } from '@enkaku/jwt';
|
|
1
2
|
import { createPipe } from '@enkaku/stream';
|
|
2
3
|
import { createDisposer } from '@enkaku/util';
|
|
4
|
+
import { handleChannel } from './handlers/channel.js';
|
|
3
5
|
import { handleEvent } from './handlers/event.js';
|
|
4
6
|
import { handleRequest } from './handlers/request.js';
|
|
7
|
+
import { handleStream } from './handlers/stream.js';
|
|
5
8
|
import { ErrorRejection } from './rejections.js';
|
|
6
9
|
async function handleMessages(params) {
|
|
7
10
|
const { controllers, handlers, reject, signal, transport } = params;
|
|
@@ -9,7 +12,7 @@ async function handleMessages(params) {
|
|
|
9
12
|
controllers,
|
|
10
13
|
handlers,
|
|
11
14
|
reject,
|
|
12
|
-
send: (
|
|
15
|
+
send: (payload)=>transport.write(createUnsignedToken(payload))
|
|
13
16
|
};
|
|
14
17
|
const running = Object.create(null);
|
|
15
18
|
const disposer = createDisposer(async ()=>{
|
|
@@ -20,11 +23,11 @@ async function handleMessages(params) {
|
|
|
20
23
|
// Wait until all running handlers are done
|
|
21
24
|
await Promise.all(Object.values(running));
|
|
22
25
|
}, signal);
|
|
23
|
-
function process(
|
|
26
|
+
function process(payload, returned) {
|
|
24
27
|
if (returned instanceof ErrorRejection) {
|
|
25
28
|
reject(returned);
|
|
26
29
|
} else {
|
|
27
|
-
const id =
|
|
30
|
+
const id = payload.typ === 'event' ? Math.random().toString(36).slice(2) : payload.rid;
|
|
28
31
|
running[id] = returned;
|
|
29
32
|
returned.then(()=>{
|
|
30
33
|
delete running[id];
|
|
@@ -38,23 +41,28 @@ async function handleMessages(params) {
|
|
|
38
41
|
return;
|
|
39
42
|
}
|
|
40
43
|
const msg = next.value;
|
|
41
|
-
switch(msg.
|
|
44
|
+
switch(msg.payload.typ){
|
|
42
45
|
case 'abort':
|
|
43
|
-
controllers[msg.
|
|
46
|
+
controllers[msg.payload.rid]?.abort();
|
|
44
47
|
break;
|
|
45
48
|
case 'channel':
|
|
46
|
-
|
|
49
|
+
process(msg.payload, handleChannel(context, msg));
|
|
50
|
+
break;
|
|
47
51
|
case 'event':
|
|
48
|
-
process(msg.
|
|
52
|
+
process(msg.payload, handleEvent(context, msg));
|
|
49
53
|
break;
|
|
50
54
|
case 'request':
|
|
51
|
-
process(msg.
|
|
55
|
+
process(msg.payload, handleRequest(context, msg));
|
|
52
56
|
break;
|
|
53
57
|
case 'send':
|
|
54
|
-
|
|
55
|
-
|
|
58
|
+
{
|
|
59
|
+
const controller = controllers[msg.payload.rid];
|
|
60
|
+
controller?.writer.write(msg.payload.val);
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
56
63
|
case 'stream':
|
|
57
|
-
|
|
64
|
+
process(msg.payload, handleStream(context, msg));
|
|
65
|
+
break;
|
|
58
66
|
}
|
|
59
67
|
handleNext();
|
|
60
68
|
}
|
package/lib/types.d.ts
CHANGED
|
@@ -1,40 +1,43 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Token } from '@enkaku/jwt';
|
|
2
|
+
import type { AnyDefinition, AnyDefinitions, AnyServerPayloadOf, ChannelDefinition, EventCallPayload, EventDefinition, RequestCallPayload, RequestDefinition, RequestType, StreamDefinition } from '@enkaku/protocol';
|
|
2
3
|
import type { RejectionType } from './rejections.js';
|
|
3
4
|
export type RequestController = AbortController;
|
|
4
5
|
export type ChannelController<Send = unknown> = AbortController & {
|
|
5
|
-
|
|
6
|
+
writer: WritableStreamDefaultWriter<Send>;
|
|
6
7
|
};
|
|
7
|
-
export type
|
|
8
|
-
export type EventHandlerContext<
|
|
8
|
+
export type HandlerController<Send = unknown> = RequestController | ChannelController<Send>;
|
|
9
|
+
export type EventHandlerContext<Command extends string, Data extends Record<string, unknown> | undefined> = {
|
|
10
|
+
message: Token<EventCallPayload<Command, Data>>;
|
|
9
11
|
data: Data;
|
|
10
|
-
meta: Meta;
|
|
11
12
|
};
|
|
12
|
-
export type EventHandler<
|
|
13
|
-
export type RequestHandlerContext<
|
|
13
|
+
export type EventHandler<Command extends string, Data extends Record<string, unknown> | undefined> = (context: EventHandlerContext<Command, Data>) => void | Promise<void>;
|
|
14
|
+
export type RequestHandlerContext<Type extends RequestType, Command extends string, Params> = {
|
|
15
|
+
message: Token<RequestCallPayload<Type, Command, Params>>;
|
|
14
16
|
params: Params;
|
|
15
|
-
meta: Meta;
|
|
16
17
|
signal: AbortSignal;
|
|
17
18
|
};
|
|
18
19
|
export type HandlerReturn<Result> = Result | Promise<Result>;
|
|
19
|
-
export type RequestHandler<Params, Result
|
|
20
|
-
export type StreamHandlerContext<
|
|
20
|
+
export type RequestHandler<Command extends string, Params, Result> = (context: RequestHandlerContext<'request', Command, Params>) => HandlerReturn<Result>;
|
|
21
|
+
export type StreamHandlerContext<Type extends Exclude<RequestType, 'request'>, Command extends string, Params, Receive> = RequestHandlerContext<Type, Command, Params> & {
|
|
21
22
|
writable: WritableStream<Receive>;
|
|
22
23
|
};
|
|
23
|
-
export type StreamHandler<Params, Receive, Result
|
|
24
|
-
export type ChannelHandlerContext<Params, Sent, Receive
|
|
24
|
+
export type StreamHandler<Command extends string, Params, Receive, Result> = (context: StreamHandlerContext<'stream', Command, Params, Receive>) => HandlerReturn<Result>;
|
|
25
|
+
export type ChannelHandlerContext<Command extends string, Params, Sent, Receive> = StreamHandlerContext<'channel', Command, Params, Receive> & {
|
|
25
26
|
readable: ReadableStream<Sent>;
|
|
26
27
|
};
|
|
27
|
-
export type ChannelHandler<Params, Sent, Receive, Result
|
|
28
|
-
export type
|
|
29
|
-
[
|
|
28
|
+
export type ChannelHandler<Command extends string, Params, Sent, Receive, Result> = (context: ChannelHandlerContext<Command, Params, Sent, Receive>) => HandlerReturn<Result>;
|
|
29
|
+
export type CommandHandlers<Definitions> = Definitions extends Record<infer Commands extends string, AnyDefinition> ? {
|
|
30
|
+
[Command in Commands & string]: Definitions[Command] extends EventDefinition<infer Data> ? (context: EventHandlerContext<Command, Data>) => void : Definitions[Command] extends RequestDefinition<infer Params, infer Result> ? (context: RequestHandlerContext<'request', Command, Params>) => HandlerReturn<Result> : Definitions[Command] extends StreamDefinition<infer Params, infer Receive, infer Result> ? (context: StreamHandlerContext<'stream', Command, Params, Receive>) => HandlerReturn<Result> : Definitions[Command] extends ChannelDefinition<infer Params, infer Send, infer Receive, infer Result> ? (context: ChannelHandlerContext<Command, Params, Send, Receive>) => HandlerReturn<Result> : never;
|
|
30
31
|
} : Record<string, never>;
|
|
31
|
-
export type EventDataType<Definitions extends
|
|
32
|
-
export type
|
|
33
|
-
export type
|
|
34
|
-
export type
|
|
35
|
-
|
|
36
|
-
|
|
32
|
+
export type EventDataType<Definitions extends AnyDefinitions, Command extends keyof Definitions & string> = Definitions[Command] extends EventDefinition<infer Data> ? Data : never;
|
|
33
|
+
export type ParamsType<Definitions extends AnyDefinitions, Command extends keyof Definitions & string> = Definitions[Command] extends RequestDefinition<infer Params> ? Params : Definitions[Command] extends StreamDefinition<infer Params> ? Params : Definitions[Command] extends ChannelDefinition<infer Params> ? Params : never;
|
|
34
|
+
export type ReceiveType<Definitions extends Record<string, unknown>, Command extends keyof Definitions & string> = Definitions[Command] extends StreamDefinition<infer Params, infer Receive> ? Receive : Definitions[Command] extends ChannelDefinition<infer Params, infer Send, infer Receive> ? Receive : never;
|
|
35
|
+
export type ResultType<Definitions extends Record<string, unknown>, Command extends keyof Definitions & string> = Definitions[Command] extends RequestDefinition<infer Params, infer Result> ? Result : Definitions[Command] extends StreamDefinition<infer Params, infer Receive, infer Result> ? Result : Definitions[Command] extends ChannelDefinition<infer Params, infer Send, infer Receive, infer Result> ? Result : never;
|
|
36
|
+
export type SendType<Definitions extends Record<string, unknown>, Command extends keyof Definitions & string> = Definitions[Command] extends ChannelDefinition<infer Params, infer Send> ? Send : never;
|
|
37
|
+
export type HandlerContext<Definitions extends AnyDefinitions> = {
|
|
38
|
+
controllers: Record<string, HandlerController>;
|
|
39
|
+
handlers: CommandHandlers<Definitions>;
|
|
37
40
|
reject: (rejection: RejectionType) => void;
|
|
38
|
-
send: (
|
|
41
|
+
send: (payload: AnyServerPayloadOf<Definitions>) => Promise<void>;
|
|
39
42
|
};
|
|
40
43
|
//# sourceMappingURL=types.d.ts.map
|
package/lib/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.d.ts
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { AnyDefinitions, RequestCallPayload, RequestType } from '@enkaku/protocol';
|
|
2
|
+
import type { HandlerContext, ParamsType, ResultType } from './types.js';
|
|
3
|
+
export type ConsumeReaderParams<T> = {
|
|
4
|
+
onDone?: () => void;
|
|
5
|
+
onValue: (value: T) => Promise<void>;
|
|
6
|
+
reader: ReadableStreamDefaultReader<T>;
|
|
7
|
+
signal: AbortSignal;
|
|
8
|
+
};
|
|
9
|
+
export declare function consumeReader<T>(params: ConsumeReaderParams<T>): Promise<void>;
|
|
10
|
+
export declare function executeHandler<Definitions extends AnyDefinitions, Command extends keyof Definitions & string, Result extends ResultType<Definitions, Command> = ResultType<Definitions, Command>>(context: HandlerContext<Definitions>, payload: RequestCallPayload<RequestType, Command, ParamsType<Definitions, Command>>, execute: () => Result | Promise<Result>): Promise<void>;
|
|
11
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAEd,kBAAkB,EAClB,WAAW,EACZ,MAAM,kBAAkB,CAAA;AAKzB,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAExE,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IACnC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;IACnB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACpC,MAAM,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAA;IACtC,MAAM,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,wBAAsB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBpF;AAED,wBAAsB,cAAc,CAClC,WAAW,SAAS,cAAc,EAClC,OAAO,SAAS,MAAM,WAAW,GAAG,MAAM,EAC1C,MAAM,SAAS,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,EAElF,OAAO,EAAE,cAAc,CAAC,WAAW,CAAC,EACpC,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,EACnF,OAAO,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC,CA2Bf"}
|
package/lib/utils.js
ADDED
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { toPromise } from '@enkaku/util';
|
|
2
|
+
import { HandlerError } from './error.js';
|
|
3
|
+
import { ErrorRejection } from './rejections.js';
|
|
4
|
+
export async function consumeReader(params) {
|
|
5
|
+
async function handle() {
|
|
6
|
+
if (params.signal.aborted) {
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
9
|
+
const next = await params.reader.read();
|
|
10
|
+
if (next.done) {
|
|
11
|
+
params.onDone?.();
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
if (params.signal.aborted) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
await params.onValue(next.value);
|
|
18
|
+
handle();
|
|
19
|
+
}
|
|
20
|
+
handle();
|
|
21
|
+
}
|
|
22
|
+
export async function executeHandler(context, payload, execute) {
|
|
23
|
+
const controller = context.controllers[payload.rid];
|
|
24
|
+
try {
|
|
25
|
+
const val = await toPromise(execute);
|
|
26
|
+
if (!controller.signal.aborted) {
|
|
27
|
+
await context.send({
|
|
28
|
+
typ: 'result',
|
|
29
|
+
rid: payload.rid,
|
|
30
|
+
val
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
} catch (cause) {
|
|
34
|
+
if (!controller.signal.aborted) {
|
|
35
|
+
context.send(HandlerError.from(cause, {
|
|
36
|
+
code: 'EKK2000',
|
|
37
|
+
message: 'Error code EKK2000'
|
|
38
|
+
}).toPayload(payload.rid));
|
|
39
|
+
}
|
|
40
|
+
context.reject(new ErrorRejection(`Error handling command: ${payload.cmd}`, {
|
|
41
|
+
info: payload,
|
|
42
|
+
cause
|
|
43
|
+
}));
|
|
44
|
+
} finally{
|
|
45
|
+
delete context.controllers[payload.rid];
|
|
46
|
+
}
|
|
47
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@enkaku/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"type": "module",
|
|
@@ -14,12 +14,13 @@
|
|
|
14
14
|
],
|
|
15
15
|
"sideEffects": false,
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@enkaku/
|
|
18
|
-
"@enkaku/util": "^0.
|
|
17
|
+
"@enkaku/jwt": "^0.2.3",
|
|
18
|
+
"@enkaku/util": "^0.2.0",
|
|
19
|
+
"@enkaku/stream": "^0.2.1"
|
|
19
20
|
},
|
|
20
21
|
"devDependencies": {
|
|
21
|
-
"@enkaku/protocol": "^0.1
|
|
22
|
-
"@enkaku/transport": "^0.
|
|
22
|
+
"@enkaku/protocol": "^0.2.1",
|
|
23
|
+
"@enkaku/transport": "^0.2.0"
|
|
23
24
|
},
|
|
24
25
|
"scripts": {
|
|
25
26
|
"build:clean": "del lib",
|