@enkaku/server 0.6.4 → 0.8.0

package/lib/access-control.d.ts

@@ -1,12 +1,12 @@
 import type { SignedToken } from '@enkaku/token';
-export type CommandAccessRecord = Record<string, boolean | Array<string>>;
-export type CommandAccessPayload = {
+export type ProcedureAccessRecord = Record<string, boolean | Array<string>>;
+export type ProcedureAccessPayload = {
     iss: string;
     sub?: string;
     aud?: string;
-    cmd?: string;
+    prc?: string;
     exp?: number;
 };
-export declare function checkCommandAccess(serverID: string, record: CommandAccessRecord, token: SignedToken<CommandAccessPayload>, atTime?: number): Promise<void>;
-export declare function checkClientToken(serverID: string, record: CommandAccessRecord, token: SignedToken, atTime?: number): Promise<void>;
+export declare function checkProcedureAccess(serverID: string, record: ProcedureAccessRecord, token: SignedToken<ProcedureAccessPayload>, atTime?: number): Promise<void>;
+export declare function checkClientToken(serverID: string, record: ProcedureAccessRecord, token: SignedToken, atTime?: number): Promise<void>;
 //# sourceMappingURL=access-control.d.ts.map

package/lib/access-control.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"access-control.d.ts","sourceRoot":"","sources":["../src/access-control.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAEhD,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;AAEzE,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,WAAW,CAAC,oBAAoB,CAAC,EACxC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,WAAW,EAClB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CA4Bf"}
+{"version":3,"file":"access-control.d.ts","sourceRoot":"","sources":["../src/access-control.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAEhD,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;AAE3E,MAAM,MAAM,sBAAsB,GAAG;IACnC,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,qBAAqB,EAC7B,KAAK,EAAE,WAAW,CAAC,sBAAsB,CAAC,EAC1C,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,qBAAqB,EAC7B,KAAK,EAAE,WAAW,EAClB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CA4Bf"}

package/lib/access-control.js

@@ -1,13 +1,13 @@
 import { assertNonExpired, checkCapability, hasPartsMatch } from '@enkaku/capability';
-export async function checkCommandAccess(serverID, record, token, atTime) {
+export async function checkProcedureAccess(serverID, record, token, atTime) {
     const payload = token.payload;
-    if (payload.cmd == null) {
-        throw new Error('No command to check');
+    if (payload.prc == null) {
+        throw new Error('No procedure to check');
     }
-    for (const [command, access] of Object.entries(record)){
-        if (hasPartsMatch(payload.cmd, command)) {
+    for (const [procedure, access] of Object.entries(record)){
+        if (hasPartsMatch(payload.prc, procedure)) {
             if (access === true) {
-                // Command can be publicly accessed
+                // Procedure can be publicly accessed
                 return;
             }
             if (access === false) {
@@ -23,7 +23,7 @@ export async function checkCommandAccess(serverID, record, token, atTime) {
             try {
                 // Check delegation from subject
                 await checkCapability({
-                    act: payload.cmd,
+                    act: payload.prc,
                     res: serverID
                 }, payload, atTime);
                 return;
@@ -34,9 +34,9 @@ export async function checkCommandAccess(serverID, record, token, atTime) {
 }
 export async function checkClientToken(serverID, record, token, atTime) {
     const payload = token.payload;
-    const command = payload.cmd;
-    if (command == null) {
-        throw new Error('No command to check');
+    const procedure = payload.prc;
+    if (procedure == null) {
+        throw new Error('No procedure to check');
     }
     if (payload.iss === serverID) {
         // If issuer uses the server's signer, only check audience and expiration if provided
@@ -51,7 +51,7 @@ export async function checkClientToken(serverID, record, token, atTime) {
     if (payload.sub === serverID) {
         // If subject is the server, check capability directly
         await checkCapability({
-            act: command,
+            act: procedure,
             res: serverID
         }, payload, atTime);
         return;
@@ -59,5 +59,5 @@ export async function checkClientToken(serverID, record, token, atTime) {
     if (payload.aud !== serverID) {
         throw new Error('Invalid audience');
     }
-    await checkCommandAccess(serverID, record, token, atTime);
+    await checkProcedureAccess(serverID, record, token, atTime);
 }

package/lib/handlers/channel.d.ts

@@ -1,6 +1,6 @@
-import type { AnyDefinitions, ChannelPayloadOf, ClientMessage } from '@enkaku/protocol';
+import type { ChannelPayloadOf, ClientMessage, ProtocolDefinition } from '@enkaku/protocol';
 import { ErrorRejection } from '../rejections.js';
 import type { HandlerContext } from '../types.js';
-export type ChannelMessageOf<Definitions extends AnyDefinitions, Command extends keyof Definitions & string = keyof Definitions & string> = ClientMessage<ChannelPayloadOf<Command, Definitions[Command]>>;
-export declare function handleChannel<Definitions extends AnyDefinitions, Command extends keyof Definitions & string>(ctx: HandlerContext<Definitions>, msg: ChannelMessageOf<Definitions, Command>): ErrorRejection | Promise<void>;
+export type ChannelMessageOf<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string = keyof Protocol & string> = ClientMessage<ChannelPayloadOf<Procedure, Protocol[Procedure]>>;
+export declare function handleChannel<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string>(ctx: HandlerContext<Protocol>, msg: ChannelMessageOf<Protocol, Procedure>): ErrorRejection | Promise<void>;
 //# sourceMappingURL=channel.d.ts.map

package/lib/handlers/channel.d.ts.map

@@ -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"}
+{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/handlers/channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EACnB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAGV,cAAc,EAGf,MAAM,aAAa,CAAA;AAGpB,MAAM,MAAM,gBAAgB,CAC1B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAEnE,wBAAgB,aAAa,CAC3B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EAEzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC7B,GAAG,EAAE,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,GACzC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAwChC"}

package/lib/handlers/channel.js

@@ -2,9 +2,9 @@ import { createPipe } from '@enkaku/stream';
 import { ErrorRejection } from '../rejections.js';
 import { consumeReader, executeHandler } from '../utils.js';
 export function handleChannel(ctx, msg) {
-    const handler = ctx.handlers[msg.payload.cmd];
+    const handler = ctx.handlers[msg.payload.prc];
     if (handler == null) {
-        return new ErrorRejection(`No handler for command: ${msg.payload.cmd}`, {
+        return new ErrorRejection(`No handler for procedure: ${msg.payload.prc}`, {
             info: msg.payload
         });
     }
@@ -17,7 +17,9 @@ export function handleChannel(ctx, msg) {
     });
     ctx.controllers[msg.payload.rid] = controller;
     const receiveStream = createPipe();
+    // @ts-ignore type instantiation too deep
     consumeReader({
+        // @ts-ignore type instantiation too deep
         onValue: async (val)=>{
             await ctx.send({
                 typ: 'receive',
@@ -35,5 +37,6 @@ export function handleChannel(ctx, msg) {
         signal: controller.signal,
         writable: receiveStream.writable
     };
+    // @ts-ignore context and handler types
     return executeHandler(ctx, msg.payload, ()=>handler(handlerContext));
 }

package/lib/handlers/event.d.ts

@@ -1,6 +1,6 @@
-import type { AnyDefinitions, ClientMessage, EventPayloadOf } from '@enkaku/protocol';
+import type { ClientMessage, EventPayloadOf, ProtocolDefinition } from '@enkaku/protocol';
 import { ErrorRejection } from '../rejections.js';
 import type { HandlerContext } from '../types.js';
-export type EventMessageOf<Definitions extends AnyDefinitions, Command extends keyof Definitions & string = keyof Definitions & string> = ClientMessage<EventPayloadOf<Command, Definitions[Command]>>;
-export declare function handleEvent<Definitions extends AnyDefinitions, Command extends keyof Definitions & string>(ctx: HandlerContext<Definitions>, msg: EventMessageOf<Definitions, Command>): ErrorRejection | Promise<void>;
+export type EventMessageOf<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string = keyof Protocol & string> = ClientMessage<EventPayloadOf<Procedure, Protocol[Procedure]>>;
+export declare function handleEvent<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string>(ctx: HandlerContext<Protocol>, msg: EventMessageOf<Protocol, Procedure>): ErrorRejection | Promise<void>;
 //# sourceMappingURL=event.d.ts.map

package/lib/handlers/event.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/handlers/event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAGzF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAAqC,cAAc,EAAE,MAAM,aAAa,CAAA;AAEpF,MAAM,MAAM,cAAc,CACxB,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAEjE,wBAAgB,WAAW,CACzB,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EAEzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC7B,GAAG,EAAE,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,GACvC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhC"}

package/lib/handlers/event.js

@@ -1,9 +1,9 @@
 import { toPromise } from '@enkaku/util';
 import { ErrorRejection } from '../rejections.js';
 export function handleEvent(ctx, msg) {
-    const handler = ctx.handlers[msg.payload.cmd];
+    const handler = ctx.handlers[msg.payload.prc];
     if (handler == null) {
-        return new ErrorRejection(`No handler for command: ${msg.payload.cmd}`, {
+        return new ErrorRejection(`No handler for procedure: ${msg.payload.prc}`, {
             info: msg.payload
         });
     }
@@ -12,7 +12,7 @@ export function handleEvent(ctx, msg) {
         data: msg.payload.data
     };
     return toPromise(()=>handler(handlerContext)).catch((cause)=>{
-        const err = new ErrorRejection(`Error handling command: ${msg.payload.cmd}`, {
+        const err = new ErrorRejection(`Error handling procedure: ${msg.payload.prc}`, {
             info: msg.payload,
             cause
         });

package/lib/handlers/request.d.ts

@@ -1,6 +1,6 @@
-import type { AnyDefinitions, ClientMessage, RequestPayloadOf } from '@enkaku/protocol';
+import type { ClientMessage, ProtocolDefinition, RequestPayloadOf } from '@enkaku/protocol';
 import { ErrorRejection } from '../rejections.js';
 import type { HandlerContext } from '../types.js';
-export type RequestMessageOf<Definitions extends AnyDefinitions, Command extends keyof Definitions & string = keyof Definitions & string> = ClientMessage<RequestPayloadOf<Command, Definitions[Command]>>;
-export declare function handleRequest<Definitions extends AnyDefinitions, Command extends keyof Definitions & string>(ctx: HandlerContext<Definitions>, msg: RequestMessageOf<Definitions, Command>): ErrorRejection | Promise<void>;
+export type RequestMessageOf<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string = keyof Protocol & string> = ClientMessage<RequestPayloadOf<Procedure, Protocol[Procedure]>>;
+export declare function handleRequest<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string>(ctx: HandlerContext<Protocol>, msg: RequestMessageOf<Protocol, Procedure>): ErrorRejection | Promise<void>;
 //# sourceMappingURL=request.d.ts.map

package/lib/handlers/request.d.ts.map

@@ -1 +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,EAAE,cAAc,EAA0C,MAAM,aAAa,CAAA;AAGzF,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,CAmBhC"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/handlers/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE3F,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,aAAa,CAAA;AAGjE,MAAM,MAAM,gBAAgB,CAC1B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAEnE,wBAAgB,aAAa,CAC3B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EAEzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC7B,GAAG,EAAE,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,GACzC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhC"}

package/lib/handlers/request.js

@@ -1,9 +1,9 @@
 import { ErrorRejection } from '../rejections.js';
 import { executeHandler } from '../utils.js';
 export function handleRequest(ctx, msg) {
-    const handler = ctx.handlers[msg.payload.cmd];
+    const handler = ctx.handlers[msg.payload.prc];
     if (handler == null) {
-        return new ErrorRejection(`No handler for command: ${msg.payload.cmd}`, {
+        return new ErrorRejection(`No handler for procedure: ${msg.payload.prc}`, {
             info: msg.payload
         });
     }
@@ -14,5 +14,6 @@ export function handleRequest(ctx, msg) {
         params: msg.payload.prm,
         signal: controller.signal
     };
+    // @ts-ignore context and handler types
     return executeHandler(ctx, msg.payload, ()=>handler(handlerContext));
 }

package/lib/handlers/stream.d.ts

@@ -1,6 +1,6 @@
-import type { AnyDefinitions, ClientMessage, StreamPayloadOf } from '@enkaku/protocol';
+import type { ClientMessage, ProtocolDefinition, StreamPayloadOf } from '@enkaku/protocol';
 import { ErrorRejection } from '../rejections.js';
 import type { HandlerContext } from '../types.js';
-export type StreamMessageOf<Definitions extends AnyDefinitions, Command extends keyof Definitions & string = keyof Definitions & string> = ClientMessage<StreamPayloadOf<Command, Definitions[Command]>>;
-export declare function handleStream<Definitions extends AnyDefinitions, Command extends keyof Definitions & string>(ctx: HandlerContext<Definitions>, msg: StreamMessageOf<Definitions, Command>): ErrorRejection | Promise<void>;
+export type StreamMessageOf<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string = keyof Protocol & string> = ClientMessage<StreamPayloadOf<Procedure, Protocol[Procedure]>>;
+export declare function handleStream<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string>(ctx: HandlerContext<Protocol>, msg: StreamMessageOf<Protocol, Procedure>): ErrorRejection | Promise<void>;
 //# sourceMappingURL=stream.d.ts.map

package/lib/handlers/stream.d.ts.map

@@ -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,EAKf,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,CAkChC"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/handlers/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EACb,kBAAkB,EAClB,eAAe,EAChB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAAE,cAAc,EAA8B,MAAM,aAAa,CAAA;AAG7E,MAAM,MAAM,eAAe,CACzB,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAElE,wBAAgB,YAAY,CAC1B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EAEzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC7B,GAAG,EAAE,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC,GACxC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChC"}

package/lib/handlers/stream.js

@@ -2,16 +2,18 @@ import { createPipe } from '@enkaku/stream';
 import { ErrorRejection } from '../rejections.js';
 import { consumeReader, executeHandler } from '../utils.js';
 export function handleStream(ctx, msg) {
-    const handler = ctx.handlers[msg.payload.cmd];
+    const handler = ctx.handlers[msg.payload.prc];
     if (handler == null) {
-        return new ErrorRejection(`No handler for command: ${msg.payload.cmd}`, {
+        return new ErrorRejection(`No handler for procedure: ${msg.payload.prc}`, {
             info: msg.payload
         });
     }
     const controller = new AbortController();
     ctx.controllers[msg.payload.rid] = controller;
     const receiveStream = createPipe();
+    // @ts-ignore type instantiation too deep
     consumeReader({
+        // @ts-ignore type instantiation too deep
         onValue: async (val)=>{
             await ctx.send({
                 typ: 'receive',
@@ -28,5 +30,6 @@ export function handleStream(ctx, msg) {
         signal: controller.signal,
         writable: receiveStream.writable
     };
+    // @ts-ignore context and handler types
     return executeHandler(ctx, msg.payload, ()=>handler(handlerContext));
 }

package/lib/index.d.ts

@@ -9,8 +9,8 @@
  *
  * @module server
  */
-export type { CommandAccessRecord } from './access-control.js';
-export type { RejectionType } from './rejections.js';
-export { type ServeParams, type Server, serve } from './server.js';
-export type { ChannelHandler, ChannelHandlerContext, CommandHandlers, EventHandler, EventHandlerContext, HandlerReturn, RequestHandler, RequestHandlerContext, StreamHandler, StreamHandlerContext, } from './types.js';
+export type { ProcedureAccessRecord } from './access-control.js';
+export { AbortRejection, ErrorRejection, type RejectionType } from './rejections.js';
+export { type ServeParams, Server, type ServerParams, serve } from './server.js';
+export type { ChannelHandler, ChannelHandlerContext, ProcedureHandlers, EventHandler, EventHandlerContext, HandlerReturn, RequestHandler, RequestHandlerContext, StreamHandler, StreamHandlerContext, } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,YAAY,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAC9D,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,YAAY,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpF,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,EAAE,KAAK,YAAY,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAChF,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,EACZ,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,qBAAqB,EACrB,aAAa,EACb,oBAAoB,GACrB,MAAM,YAAY,CAAA"}

package/lib/index.js

@@ -8,4 +8,5 @@
  * ```
  *
  * @module server
- */ export { serve } from './server.js';
+ */ export { AbortRejection, ErrorRejection } from './rejections.js';
+export { Server, serve } from './server.js';

package/lib/server.d.ts

@@ -1,34 +1,48 @@
-import type { AnyDefinitions, ServerTransportOf } from '@enkaku/protocol';
+import { type AnyClientMessageOf, type ProtocolDefinition, type ServerTransportOf } from '@enkaku/protocol';
+import { type Validator } from '@enkaku/schema';
 import { type Disposer } from '@enkaku/util';
-import { type CommandAccessRecord } from './access-control.js';
+import { type ProcedureAccessRecord } from './access-control.js';
 import { type RejectionType } from './rejections.js';
-import type { CommandHandlers, HandlerController } from './types.js';
-export type HandleMessagesParams<Definitions extends AnyDefinitions> = {
-    controllers: Record<string, HandlerController>;
-    handlers: CommandHandlers<Definitions>;
-    reject: (rejection: RejectionType) => void;
-    signal: AbortSignal;
-    transport: ServerTransportOf<Definitions>;
-} & ({
-    insecure: true;
+import type { ProcedureHandlers } from './types.js';
+export type AccessControlParams = {
+    public: true;
+    serverID?: string;
+    access?: ProcedureAccessRecord;
 } | {
-    insecure: false;
+    public: false;
     serverID: string;
-    access: CommandAccessRecord;
-});
-export type ServeParams<Definitions extends AnyDefinitions> = {
-    handlers: CommandHandlers<Definitions>;
+    access: ProcedureAccessRecord;
+};
+export type HandleMessagesParams<Protocol extends ProtocolDefinition> = AccessControlParams & {
+    handlers: ProcedureHandlers<Protocol>;
+    reject: (rejection: RejectionType) => void;
+    signal: AbortSignal;
+    transport: ServerTransportOf<Protocol>;
+    validator?: Validator<AnyClientMessageOf<Protocol>>;
+};
+export type ServerParams<Protocol extends ProtocolDefinition> = {
+    access?: ProcedureAccessRecord;
+    handlers: ProcedureHandlers<Protocol>;
+    id?: string;
+    protocol?: Protocol;
+    public?: boolean;
     signal?: AbortSignal;
-    transport: ServerTransportOf<Definitions>;
-} & ({
-    insecure: true;
-} | {
-    insecure?: false;
-    id: string;
-    access?: CommandAccessRecord;
-});
-export type Server = Disposer & {
-    rejections: ReadableStream<RejectionType>;
+    transports?: Array<ServerTransportOf<Protocol>>;
+};
+export type HandleOptions = {
+    public?: boolean;
+    access?: ProcedureAccessRecord;
+};
+export declare class Server<Protocol extends ProtocolDefinition> implements Disposer {
+    #private;
+    constructor(params: ServerParams<Protocol>);
+    get disposed(): Promise<void>;
+    get rejections(): ReadableStream<RejectionType>;
+    dispose(): Promise<void>;
+    handle(transport: ServerTransportOf<Protocol>, options?: HandleOptions): Promise<void>;
+}
+export type ServeParams<Protocol extends ProtocolDefinition> = Omit<ServerParams<Protocol>, 'transports'> & {
+    transport: ServerTransportOf<Protocol>;
 };
-export declare function serve<Definitions extends AnyDefinitions>(params: ServeParams<Definitions>): Server;
+export declare function serve<Protocol extends ProtocolDefinition>(params: ServeParams<Protocol>): Server<Protocol>;
 //# sourceMappingURL=server.d.ts.map

package/lib/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAsB,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAG7F,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,cAAc,CAAA;AAE5D,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,qBAAqB,CAAA;AAKhF,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpE,OAAO,KAAK,EAEV,eAAe,EAEf,iBAAiB,EAClB,MAAM,YAAY,CAAA;AAQnB,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,GAAG,CAAC;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC,CAAA;AAwH7F,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,GAAG,CAAC;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,mBAAmB,CAAA;CAAE,CAAC,CAAA;AAEzF,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,CAiCR"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EAEvB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,gBAAgB,CAAA;AAGhE,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,cAAc,CAAA;AAE5D,OAAO,EAAE,KAAK,qBAAqB,EAAoB,MAAM,qBAAqB,CAAA;AAKlF,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpE,OAAO,KAAK,EAIV,iBAAiB,EAClB,MAAM,YAAY,CAAA;AAQnB,MAAM,MAAM,mBAAmB,GAC3B;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,qBAAqB,CAAA;CAAE,GACnE;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAA;CAAE,CAAA;AAEtE,MAAM,MAAM,oBAAoB,CAAC,QAAQ,SAAS,kBAAkB,IAAI,mBAAmB,GAAG;IAC5F,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IACrC,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,KAAK,IAAI,CAAA;IAC1C,MAAM,EAAE,WAAW,CAAA;IACnB,SAAS,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IACtC,SAAS,CAAC,EAAE,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;CACpD,CAAA;AA8ID,MAAM,MAAM,YAAY,CAAC,QAAQ,SAAS,kBAAkB,IAAI;IAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IACrC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAA;CAChD,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,qBAAqB,CAAA;CAAE,CAAA;AAEhF,qBAAa,MAAM,CAAC,QAAQ,SAAS,kBAAkB,CAAE,YAAW,QAAQ;;gBAU9D,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC;IAqD1C,IAAI,QAAQ,kBAEX;IAED,IAAI,UAAU,kCAEb;IAEK,OAAO;IAIb,MAAM,CAAC,SAAS,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;CA0B3F;AAED,MAAM,MAAM,WAAW,CAAC,QAAQ,SAAS,kBAAkB,IAAI,IAAI,CACjE,YAAY,CAAC,QAAQ,CAAC,EACtB,YAAY,CACb,GAAG;IACF,SAAS,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAA;CACvC,CAAA;AAED,wBAAgB,KAAK,CAAC,QAAQ,SAAS,kBAAkB,EACvD,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,GAC5B,MAAM,CAAC,QAAQ,CAAC,CAGlB"}

package/lib/server.js

@@ -1,3 +1,5 @@
+import { createClientMessageSchema } from '@enkaku/protocol';
+import { createValidator } from '@enkaku/schema';
 import { createPipe } from '@enkaku/stream';
 import { createUnsignedToken, isSignedToken } from '@enkaku/token';
 import { createDisposer } from '@enkaku/util';
@@ -8,7 +10,8 @@ import { handleRequest } from './handlers/request.js';
 import { handleStream } from './handlers/stream.js';
 import { ErrorRejection } from './rejections.js';
 async function handleMessages(params) {
-    const { controllers, handlers, reject, signal, transport } = params;
+    const { handlers, reject, signal, transport, validator } = params;
+    const controllers = Object.create(null);
     const context = {
         controllers,
         handlers,
@@ -24,6 +27,18 @@ async function handleMessages(params) {
         // Wait until all running handlers are done
         await Promise.all(Object.values(running));
     }, signal);
+    const processMessage = validator ? (message)=>{
+        const result = validator(message);
+        if (result.isError()) {
+            reject(new ErrorRejection('Invalid protocol message', {
+                cause: result.error,
+                info: {
+                    message
+                }
+            }));
+        }
+        return result.value;
+    } : (message)=>message;
     function processHandler(message, handle) {
         const returned = handle();
         if (returned instanceof ErrorRejection) {
@@ -36,9 +51,9 @@ async function handleMessages(params) {
             });
         }
     }
-    const process = params.insecure ? processHandler : async (message, handle)=>{
+    const process = params.public ? processHandler : async (message, handle)=>{
         try {
-            if (!params.insecure) {
+            if (!params.public) {
                 if (!isSignedToken(message)) {
                     throw new Error('Message is not signed');
                 }
@@ -69,81 +84,155 @@ async function handleMessages(params) {
             await disposer.dispose();
             return;
         }
-        const msg = next.value;
-        switch(msg.payload.typ){
-            case 'abort':
-                controllers[msg.payload.rid]?.abort();
-                break;
-            case 'channel':
-                {
-                    const message = msg;
-                    process(message, ()=>handleChannel(context, message));
-                    break;
-                }
-            case 'event':
-                {
-                    const message = msg;
-                    process(message, ()=>handleEvent(context, message));
-                    break;
-                }
-            case 'request':
-                {
-                    const message = msg;
-                    process(message, ()=>handleRequest(context, message));
-                    break;
-                }
-            case 'send':
-                {
-                    const controller = controllers[msg.payload.rid];
-                    controller?.writer.write(msg.payload.val);
+        const msg = processMessage(next.value);
+        if (msg != null) {
+            switch(msg.payload.typ){
+                case 'abort':
+                    controllers[msg.payload.rid]?.abort();
                     break;
-                }
-            case 'stream':
-                {
-                    const message = msg;
-                    process(message, ()=>handleStream(context, message));
-                    break;
-                }
+                case 'channel':
+                    {
+                        const message = msg;
+                        // @ts-ignore type instantiation too deep
+                        process(message, ()=>handleChannel(context, message));
+                        break;
+                    }
+                case 'event':
+                    {
+                        const message = msg;
+                        process(message, ()=>handleEvent(context, message));
+                        break;
+                    }
+                case 'request':
+                    {
+                        const message = msg;
+                        process(message, ()=>handleRequest(context, message));
+                        break;
+                    }
+                case 'send':
+                    {
+                        const controller = controllers[msg.payload.rid];
+                        controller?.writer.write(msg.payload.val);
+                        break;
+                    }
+                case 'stream':
+                    {
+                        const message = msg;
+                        process(message, ()=>handleStream(context, message));
+                        break;
+                    }
+            }
         }
         handleNext();
     }
     handleNext();
     return disposer.disposed;
 }
-export function serve(params) {
-    const abortController = new AbortController();
-    const controllers = Object.create(null);
-    const rejections = createPipe();
-    const rejectionsWriter = rejections.writable.getWriter();
-    function reject(rejection) {
-        void rejectionsWriter.write(rejection);
+export class Server {
+    #abortController;
+    #accessControl;
+    #disposer;
+    #handlers;
+    #handling = [];
+    #reject;
+    #rejections;
+    #validator;
+    constructor(params){
+        this.#abortController = new AbortController();
+        this.#handlers = params.handlers;
+        if (params.id == null) {
+            if (params.public) {
+                this.#accessControl = {
+                    public: true,
+                    access: params.access
+                };
+            } else {
+                throw new Error('Invalid server parameters: either the server "id" must be provided or the "public" parameter must be set to true');
+            }
+        } else {
+            this.#accessControl = {
+                public: !!params.public,
+                serverID: params.id,
+                access: params.access ?? {}
+            };
+        }
+        this.#disposer = createDisposer(async ()=>{
+            // Signal messages handler to stop execution and run cleanup logic
+            this.#abortController.abort();
+            // Dispose of all handling transports
+            await Promise.all(// @ts-ignore type instantiation too deep
+            this.#handling.map(async (handling)=>{
+                // Wait until all handlers are done - they might still need to flush messages to the transport
+                await handling.done;
+                // Dispose transport
+                await handling.transport.dispose();
+            }));
+            // Cleanup rejections writer
+            await rejectionsWriter.close();
+        }, params.signal);
+        const rejections = createPipe();
+        this.#rejections = rejections.readable;
+        const rejectionsWriter = rejections.writable.getWriter();
+        this.#reject = (rejection)=>{
+            void rejectionsWriter.write(rejection);
+        };
+        if (params.protocol != null) {
+            this.#validator = createValidator(createClientMessageSchema(params.protocol));
+        }
+        for (const transport of params.transports ?? []){
+            this.handle(transport);
+        }
     }
-    const handlersDone = handleMessages({
-        controllers,
-        handlers: params.handlers,
-        reject,
-        signal: abortController.signal,
-        transport: params.transport,
-        ...params.insecure ? {
-            insecure: true
-        } : {
-            insecure: false,
-            serverID: params.id,
-            access: params.access ?? {}
+    get disposed() {
+        return this.#disposer.disposed;
+    }
+    get rejections() {
+        return this.#rejections;
+    }
+    async dispose() {
+        return await this.#disposer.dispose();
+    }
+    handle(transport, options = {}) {
+        const publicAccess = options.public ?? this.#accessControl.public;
+        const access = options.access ?? this.#accessControl.access ?? {};
+        let accessControl;
+        if (publicAccess) {
+            accessControl = {
+                public: true,
+                access
+            };
+        } else {
+            const serverID = this.#accessControl.serverID;
+            if (serverID == null) {
+                return Promise.reject(new Error('Server ID is required to enable access control'));
+            }
+            accessControl = {
+                public: false,
+                serverID,
+                access
+            };
         }
+        const done = handleMessages({
+            handlers: this.#handlers,
+            reject: this.#reject,
+            signal: this.#abortController.signal,
+            transport,
+            validator: this.#validator,
+            ...accessControl
+        });
+        this.#handling.push({
+            done,
+            transport
+        });
+        return done;
+    }
+}
+export function serve(params) {
+    const { transport, ...rest } = params;
+    return new Server({
+        ...rest,
+        transports: [
+            transport
+        ]
     });
-    const disposer = createDisposer(async ()=>{
-        // Signal messages handler to stop execution and run cleanup logic
-        abortController.abort();
-        // Wait until all handlers are done - they might still need to flush messages to the transport
-        await handlersDone;
-        // Dispose transport
-        await params.transport.dispose();
-        // Cleanup rejections writer
-        await rejectionsWriter.close();
-    }, params.signal);
-    return {
-        ...disposer,
-        rejections: rejections.readable
-    };
 }

package/lib/types.d.ts

@@ -1,42 +1,42 @@
-import type { AnyDefinitions, AnyServerPayloadOf, ChannelDefinition, EventCallPayload, EventDefinition, Message, RequestCallPayload, RequestDefinition, RequestType, StreamDefinition } from '@enkaku/protocol';
+import type { AnyRequestProcedureDefinition, AnyServerPayloadOf, ChannelProcedureDefinition, DataOf, EventCallPayload, EventProcedureDefinition, Message, ProtocolDefinition, RequestCallPayload, RequestProcedureDefinition, StreamProcedureDefinition } from '@enkaku/protocol';
 import type { RejectionType } from './rejections.js';
 export type RequestController = AbortController;
 export type ChannelController<Send = unknown> = AbortController & {
     writer: WritableStreamDefaultWriter<Send>;
 };
 export type HandlerController<Send = unknown> = RequestController | ChannelController<Send>;
-export type EventHandlerContext<Command extends string, Data extends Record<string, unknown> | undefined> = {
-    message: Message<EventCallPayload<Command, Data>>;
-    data: Data;
-};
-export type EventHandler<Command extends string, Data extends Record<string, unknown> | undefined> = (context: EventHandlerContext<Command, Data>) => void | Promise<void>;
-export type RequestHandlerContext<Type extends RequestType, Command extends string, Params> = {
-    message: Message<RequestCallPayload<Type, Command, Params>>;
-    params: Params;
+export type EventHandlerContext<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends EventProcedureDefinition ? {
+    message: Message<EventCallPayload<Procedure, DataOf<Protocol[Procedure]['data']>>>;
+    data: DataOf<Protocol[Procedure]['data']>;
+} : never;
+export type EventHandler<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = (context: EventHandlerContext<Protocol, Procedure>) => void | Promise<void>;
+export type RequestHandlerContext<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends AnyRequestProcedureDefinition ? {
+    message: Message<RequestCallPayload<Protocol[Procedure]['type'], Procedure, DataOf<Protocol[Procedure]['params']>>>;
+    params: DataOf<Protocol[Procedure]['params']>;
     signal: AbortSignal;
+} : never;
+export type HandlerReturn<ResultSchema, Data = DataOf<ResultSchema>> = Data | Promise<Data>;
+export type RequestHandler<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends AnyRequestProcedureDefinition ? (context: RequestHandlerContext<Protocol, Procedure>) => HandlerReturn<Protocol[Procedure]['result']> : never;
+export type StreamHandlerContext<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends StreamProcedureDefinition | ChannelProcedureDefinition ? RequestHandlerContext<Protocol, Procedure> & {
+    writable: WritableStream<DataOf<Protocol[Procedure]['receive']>>;
+} : never;
+export type StreamHandler<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends StreamProcedureDefinition | ChannelProcedureDefinition ? (context: StreamHandlerContext<Protocol, Procedure>) => HandlerReturn<Protocol[Procedure]['result']> : never;
+export type ChannelHandlerContext<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends ChannelProcedureDefinition ? StreamHandlerContext<Protocol, Procedure> & {
+    readable: ReadableStream<DataOf<Protocol[Procedure]['send']>>;
+} : never;
+export type ChannelHandler<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends ChannelProcedureDefinition ? (context: ChannelHandlerContext<Protocol, Procedure>) => HandlerReturn<Protocol[Procedure]['result']> : never;
+export type ProcedureHandlers<Protocol extends ProtocolDefinition> = {
+    [Procedure in keyof Protocol & string]: Protocol[Procedure] extends EventProcedureDefinition ? (context: EventHandlerContext<Protocol, Procedure>) => void : Protocol[Procedure] extends RequestProcedureDefinition ? (context: RequestHandlerContext<Protocol, Procedure>) => HandlerReturn<Protocol[Procedure]['result']> : Protocol[Procedure] extends StreamProcedureDefinition ? (context: StreamHandlerContext<Protocol, Procedure>) => HandlerReturn<Protocol[Procedure]['result']> : Protocol[Procedure] extends ChannelProcedureDefinition ? (context: ChannelHandlerContext<Protocol, Procedure>) => HandlerReturn<Protocol[Procedure]['result']> : never;
 };
-export type HandlerReturn<Result> = Result | Promise<Result>;
-export type RequestHandler<Command extends string, Params, Result> = (context: RequestHandlerContext<'request', Command, Params>) => HandlerReturn<Result>;
-export type StreamHandlerContext<Type extends Exclude<RequestType, 'request'>, Command extends string, Params, Receive> = RequestHandlerContext<Type, Command, Params> & {
-    writable: WritableStream<Receive>;
-};
-export type StreamHandler<Command extends string, Params, Receive, Result> = (context: StreamHandlerContext<'stream', Command, Params, Receive>) => HandlerReturn<Result>;
-export type ChannelHandlerContext<Command extends string, Params, Sent, Receive> = StreamHandlerContext<'channel', Command, Params, Receive> & {
-    readable: ReadableStream<Sent>;
-};
-export type ChannelHandler<Command extends string, Params, Sent, Receive, Result> = (context: ChannelHandlerContext<Command, Params, Sent, Receive>) => HandlerReturn<Result>;
-export type CommandHandlers<Definitions extends AnyDefinitions> = {
-    [Command in keyof Definitions & 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;
-};
-export type EventDataType<Definitions extends AnyDefinitions, Command extends keyof Definitions & string> = Definitions[Command] extends EventDefinition<infer Data> ? Data : never;
-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;
-export type ReceiveType<Definitions extends AnyDefinitions, 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;
-export type ResultType<Definitions extends AnyDefinitions, 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;
-export type SendType<Definitions extends AnyDefinitions, Command extends keyof Definitions & string> = Definitions[Command] extends ChannelDefinition<infer Params, infer Send> ? Send : never;
-export type HandlerContext<Definitions extends AnyDefinitions> = {
+export type EventDataType<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends EventProcedureDefinition ? DataOf<Protocol[Procedure]['data']> : never;
+export type ParamsType<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends AnyRequestProcedureDefinition ? DataOf<Protocol[Procedure]['params']> : never;
+export type ReceiveType<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends StreamProcedureDefinition ? DataOf<Protocol[Procedure]['receive']> : Protocol[Procedure] extends ChannelProcedureDefinition ? DataOf<Protocol[Procedure]['receive']> : never;
+export type ResultType<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends AnyRequestProcedureDefinition ? DataOf<Protocol[Procedure]['result']> : never;
+export type SendType<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string> = Protocol[Procedure] extends ChannelProcedureDefinition ? DataOf<Protocol[Procedure]['send']> : never;
+export type HandlerContext<Protocol extends ProtocolDefinition> = {
     controllers: Record<string, HandlerController>;
-    handlers: CommandHandlers<Definitions>;
+    handlers: ProcedureHandlers<Protocol>;
     reject: (rejection: RejectionType) => void;
-    send: (payload: AnyServerPayloadOf<Definitions>) => Promise<void>;
+    send: (payload: AnyServerPayloadOf<Protocol>) => Promise<void>;
 };
 //# sourceMappingURL=types.d.ts.map

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/lib/utils.d.ts

@@ -1,5 +1,5 @@
-import type { AnyDefinitions, RequestCallPayload, RequestType } from '@enkaku/protocol';
-import type { HandlerContext, ParamsType, ResultType } from './types.js';
+import type { ProtocolDefinition, RequestPayloadOf } from '@enkaku/protocol';
+import type { HandlerContext, ResultType } from './types.js';
 export type ConsumeReaderParams<T> = {
     onDone?: () => void;
     onValue: (value: T) => Promise<void>;
@@ -7,5 +7,5 @@ export type ConsumeReaderParams<T> = {
     signal: AbortSignal;
 };
 export declare function consumeReader<T>(params: ConsumeReaderParams<T>): Promise<void>;
-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>;
+export declare function executeHandler<Protocol extends ProtocolDefinition, Procedure extends keyof Protocol & string, Result extends ResultType<Protocol, Procedure> = ResultType<Protocol, Procedure>>(context: HandlerContext<Protocol>, payload: RequestPayloadOf<Procedure, Protocol[Procedure]>, execute: () => Result | Promise<Result>): Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

package/lib/utils.d.ts.map

@@ -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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAKhG,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5D,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;AAGD,wBAAsB,cAAc,CAClC,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EACzC,MAAM,SAAS,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,EAEhF,OAAO,EAAE,cAAc,CAAC,QAAQ,CAAC,EACjC,OAAO,EAAE,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,EACzD,OAAO,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC,CA2Bf"}

package/lib/utils.js

@@ -19,6 +19,7 @@ export async function consumeReader(params) {
     }
     handle();
 }
+// @ts-ignore type instantiation too deep
 export async function executeHandler(context, payload, execute) {
     const controller = context.controllers[payload.rid];
     try {
@@ -37,7 +38,7 @@ export async function executeHandler(context, payload, execute) {
                 message: cause.message ?? 'Handler execution failed'
             }).toPayload(payload.rid));
         }
-        context.reject(new ErrorRejection(`Error handling command: ${payload.cmd}`, {
+        context.reject(new ErrorRejection(`Error handling procedure: ${payload.prc}`, {
             info: payload,
             cause
         }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enkaku/server",
-  "version": "0.6.4",
+  "version": "0.8.0",
   "license": "MIT",
   "homepage": "https://enkaku.dev",
   "description": "Server logic for Enkaku RPC",
@@ -25,20 +25,21 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@enkaku/token": "^0.6.4",
-    "@enkaku/capability": "^0.6.1",
-    "@enkaku/util": "^0.6.1",
-    "@enkaku/stream": "^0.6.1"
+    "@enkaku/capability": "^0.8.0",
+    "@enkaku/schema": "^0.8.0",
+    "@enkaku/stream": "^0.8.0",
+    "@enkaku/token": "^0.8.0",
+    "@enkaku/util": "^0.8.0",
+    "@enkaku/protocol": "^0.8.0"
   },
   "devDependencies": {
-    "@enkaku/transport": "^0.6.1",
-    "@enkaku/protocol": "^0.6.4"
+    "@enkaku/transport": "^0.8.0"
   },
   "scripts": {
     "build:clean": "del lib",
     "build:js": "swc src -d ./lib --config-file ../../swc.json --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --skipLibCheck",
-    "build:types:ci": "tsc --emitDeclarationOnly --declarationMap false",
+    "build:types:ci": "tsc --emitDeclarationOnly --skipLibCheck --declarationMap false",
     "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",
     "test:types": "tsc --noEmit --skipLibCheck",
     "test:unit": "node --experimental-vm-modules ../../node_modules/jest/bin/jest.js",