@enkaku/client 0.1.1 → 0.2.1

package/lib/client.d.ts

@@ -0,0 +1,62 @@
+import type { AnyDefinitions, ChannelDefinition, ClientTransportOf, EventDefinition, RequestDefinition, StreamDefinition } from '@enkaku/protocol';
+import { type Disposer } from '@enkaku/util';
+export type InvokeReturn<Result> = {
+    abort: (reason?: any) => void;
+    id: string;
+    result: Promise<Result>;
+};
+export type InvokeStreamReturn<Receive, Result> = InvokeReturn<Result> & {
+    receive: ReadableStreamDefaultReader<Receive>;
+};
+export type InvokeChannelReturn<Send, Receive, Result> = InvokeStreamReturn<Receive, Result> & {
+    send: (value: Send) => Promise<void>;
+};
+export type EventDefinitionsType<Definitions extends AnyDefinitions, Commands extends keyof Definitions & string = keyof Definitions & string> = {
+    [Command in Commands]: Definitions[Command] extends EventDefinition<infer Data> ? {
+        Argument: Data extends undefined ? never : Data;
+        Return: undefined;
+    } : never;
+};
+export type RequestDefinitionsType<Definitions extends AnyDefinitions, Commands extends keyof Definitions & string = keyof Definitions & string> = {
+    [Command in Commands]: Definitions[Command] extends RequestDefinition<infer Params, infer Result> ? {
+        Argument: Params extends undefined ? never : Params;
+        Return: InvokeReturn<Result>;
+    } : never;
+};
+export type StreamDefinitionsType<Definitions extends AnyDefinitions, Commands extends keyof Definitions & string = keyof Definitions & string> = {
+    [Command in Commands]: Definitions[Command] extends StreamDefinition<infer Params, infer Receive, infer Result> ? {
+        Argument: Params extends undefined ? never : Params;
+        Receive: Receive;
+        Return: InvokeStreamReturn<Receive, Result>;
+    } : never;
+};
+export type ChannelDefinitionsType<Definitions extends AnyDefinitions, Commands extends keyof Definitions & string = keyof Definitions & string> = {
+    [Command in Commands]: Definitions[Command] extends ChannelDefinition<infer Params, infer Send, infer Receive, infer Result> ? {
+        Argument: Params extends undefined ? never : Params;
+        Receive: Receive;
+        Return: InvokeChannelReturn<Send, Receive, Result>;
+        Send: Send;
+    } : never;
+};
+export type ClientDefinitionsType<Definitions extends AnyDefinitions> = {
+    Channels: ChannelDefinitionsType<Definitions>;
+    Events: EventDefinitionsType<Definitions>;
+    Requests: RequestDefinitionsType<Definitions>;
+    Streams: StreamDefinitionsType<Definitions>;
+};
+export type InvokeArgumentType<Definitions extends AnyDefinitions, Name extends keyof Definitions & string = keyof Definitions & string> = Definitions[Name] extends EventDefinition<infer Data> ? Data : Definitions[Name] extends RequestDefinition<infer Params> ? Params : Definitions[Name] extends StreamDefinition<infer Params> ? Params : Definitions[Name] extends ChannelDefinition<infer Params> ? Params : never;
+export type InvokeReturnType<Definitions extends AnyDefinitions, Name extends keyof Definitions & string> = Definitions[Name] extends EventDefinition<infer Data> ? undefined : Definitions[Name] extends RequestDefinition<infer Params, infer Result> ? InvokeReturn<Result> : Definitions[Name] extends StreamDefinition<infer Params, infer Receive, infer Result> ? InvokeStreamReturn<Receive, Result> : Definitions[Name] extends ChannelDefinition<infer Params, infer Send, infer Receive, infer Result> ? InvokeChannelReturn<Send, Receive, Result> : never;
+export type ClientParams<Definitions extends AnyDefinitions> = {
+    transport: ClientTransportOf<Definitions>;
+};
+export declare class Client<Definitions extends AnyDefinitions, ClientDefinitions extends ClientDefinitionsType<Definitions> = ClientDefinitionsType<Definitions>> implements Disposer {
+    #private;
+    constructor(params: ClientParams<Definitions>);
+    get disposed(): Promise<void>;
+    dispose(): Promise<void>;
+    sendEvent<Command extends keyof ClientDefinitions['Events'] & string, T extends ClientDefinitions['Events'][Command] = ClientDefinitions['Events'][Command]>(command: Command, ...args: T['Argument'] extends never ? [] : [T['Argument']]): Promise<void>;
+    request<Command extends keyof ClientDefinitions['Requests'] & string, T extends ClientDefinitions['Requests'][Command] = ClientDefinitions['Requests'][Command]>(command: Command, ...args: T['Argument'] extends never ? [] : [T['Argument']]): Promise<InvokeReturn<T['Return']>>;
+    createStream<Command extends keyof ClientDefinitions['Streams'] & string, T extends ClientDefinitions['Streams'][Command] = ClientDefinitions['Streams'][Command]>(command: Command, ...args: T['Argument'] extends never ? [] : [T['Argument']]): Promise<InvokeStreamReturn<T['Receive'], T['Return']>>;
+    createChannel<Command extends keyof ClientDefinitions['Channels'] & string, T extends ClientDefinitions['Channels'][Command] = ClientDefinitions['Channels'][Command]>(command: Command, ...args: T['Argument'] extends never ? [] : [T['Argument']]): Promise<InvokeChannelReturn<T['Send'], T['Receive'], T['Return']>>;
+}
+//# sourceMappingURL=client.d.ts.map

package/lib/client.d.ts.map

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

package/lib/client.js

@@ -0,0 +1,174 @@
+import { createUnsignedToken } from '@enkaku/jwt';
+import { createPipe } from '@enkaku/stream';
+import { defer } from '@enkaku/util';
+import { ABORTED } from './constants.js';
+import { RequestError } from './error.js';
+export class Client {
+    #transport;
+    #controllers = {};
+    constructor(params){
+        this.#transport = params.transport;
+        // Abort all controllers on disconnect
+        this.#transport.disposed.then(()=>{
+            for (const controller of Object.values(this.#controllers)){
+                controller.abort();
+            }
+        });
+        // Start reading from transport
+        this.#read();
+    }
+    async #read() {
+        while(true){
+            const next = await this.#transport.read();
+            if (next.done) {
+                break;
+            }
+            const msg = next.value;
+            const controller = this.#controllers[msg.payload.rid];
+            if (controller == null) {
+                console.warn(`No controller for request ${msg.payload.rid}`);
+                continue;
+            }
+            switch(msg.payload.typ){
+                case 'error':
+                    void controller.receive?.close();
+                    controller.result.reject(RequestError.fromPayload(msg.payload));
+                    delete this.#controllers[msg.payload.rid];
+                    break;
+                case 'receive':
+                    void controller.receive?.write(msg.payload.val);
+                    break;
+                case 'result':
+                    void controller.receive?.close();
+                    controller.result.resolve(msg.payload.val);
+                    delete this.#controllers[msg.payload.rid];
+                    break;
+            }
+        }
+    }
+    async #write(payload) {
+        await this.#transport.write(createUnsignedToken(payload));
+    }
+    get disposed() {
+        return this.#transport.disposed;
+    }
+    async dispose() {
+        await this.#transport.dispose();
+    }
+    async sendEvent(command, ...args) {
+        const payload = args.length ? {
+            typ: 'event',
+            cmd: command,
+            data: args[0]
+        } : {
+            typ: 'event',
+            cmd: command
+        };
+        await this.#write(payload);
+    }
+    async request(command, ...args) {
+        const rid = globalThis.crypto.randomUUID();
+        const controller = Object.assign(new AbortController(), {
+            result: defer()
+        });
+        this.#controllers[rid] = controller;
+        controller.signal.addEventListener('abort', ()=>{
+            void this.#write({
+                typ: 'abort',
+                rid
+            });
+            controller.result.reject(ABORTED);
+        });
+        const payload = args.length ? {
+            typ: 'request',
+            rid,
+            cmd: command,
+            prm: args[0]
+        } : {
+            typ: 'request',
+            rid,
+            cmd: command
+        };
+        await this.#write(payload);
+        return {
+            abort: ()=>controller.abort(),
+            id: rid,
+            result: controller.result.promise
+        };
+    }
+    async createStream(command, ...args) {
+        const rid = globalThis.crypto.randomUUID();
+        const receive = createPipe();
+        const controller = Object.assign(new AbortController(), {
+            receive: receive.writable.getWriter(),
+            result: defer()
+        });
+        this.#controllers[rid] = controller;
+        controller.signal.addEventListener('abort', ()=>{
+            void this.#write({
+                typ: 'abort',
+                rid
+            });
+            controller.result.reject(ABORTED);
+        });
+        const action = args.length ? {
+            typ: 'stream',
+            rid,
+            cmd: command,
+            prm: args[0]
+        } : {
+            typ: 'stream',
+            rid,
+            cmd: command
+        };
+        await this.#write(action);
+        return {
+            abort: ()=>controller.abort(),
+            id: rid,
+            receive: receive.readable.getReader(),
+            result: controller.result.promise
+        };
+    }
+    async createChannel(command, ...args) {
+        const rid = globalThis.crypto.randomUUID();
+        const receive = createPipe();
+        const send = createPipe();
+        const controller = Object.assign(new AbortController(), {
+            receive: receive.writable.getWriter(),
+            result: defer(),
+            send: send.writable.getWriter()
+        });
+        this.#controllers[rid] = controller;
+        controller.signal.addEventListener('abort', ()=>{
+            void this.#write({
+                typ: 'abort',
+                rid
+            });
+            controller.result.reject(ABORTED);
+        });
+        const payload = args.length ? {
+            typ: 'channel',
+            rid,
+            cmd: command,
+            prm: args[0]
+        } : {
+            typ: 'channel',
+            rid,
+            cmd: command
+        };
+        await this.#write(payload);
+        return {
+            abort: ()=>controller.abort(),
+            id: rid,
+            receive: receive.readable.getReader(),
+            result: controller.result.promise,
+            send: async (val)=>{
+                await this.#write({
+                    typ: 'send',
+                    rid,
+                    val
+                });
+            }
+        };
+    }
+}

package/lib/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const ABORTED: unique symbol;
+//# sourceMappingURL=constants.d.ts.map

package/lib/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,eAAwB,CAAA"}

package/lib/constants.js

@@ -0,0 +1 @@
+export const ABORTED = Symbol.for('aborted');

package/lib/error.d.ts

@@ -0,0 +1,10 @@
+import type { ErrorObject, ErrorReplyPayload } from '@enkaku/protocol';
+export type RequestErrorParams<Code extends string = string, Data extends Record<string, unknown> = Record<string, unknown>> = ErrorOptions & ErrorObject<Code, Data>;
+export declare class RequestError<Code extends string = string, Data extends Record<string, unknown> = Record<string, unknown>> extends Error implements ErrorObject<Code, Data> {
+    #private;
+    static fromPayload<Code extends string = string, Data extends Record<string, unknown> = Record<string, unknown>>(payload: ErrorReplyPayload<Code, Data>): RequestError<Code, Data>;
+    constructor(params: RequestErrorParams<Code, Data>);
+    get code(): Code;
+    get data(): Data;
+}
+//# sourceMappingURL=error.d.ts.map

package/lib/error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEtE,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,IAC5D,YAAY,GAAG,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAE1C,qBAAa,YAAY,CACrB,IAAI,SAAS,MAAM,GAAG,MAAM,EAC5B,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEhE,SAAQ,KACR,YAAW,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC;;IAElC,MAAM,CAAC,WAAW,CAChB,IAAI,SAAS,MAAM,GAAG,MAAM,EAC5B,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9D,OAAO,EAAE,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC;gBAWvD,MAAM,EAAE,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC;IAOlD,IAAI,IAAI,IAAI,IAAI,CAEf;IAED,IAAI,IAAI,IAAI,IAAI,CAEf;CACF"}

package/lib/error.js

@@ -0,0 +1,23 @@
+export class RequestError extends Error {
+    static fromPayload(payload) {
+        return new RequestError({
+            code: payload.code,
+            data: payload.data,
+            message: payload.msg
+        });
+    }
+    #code;
+    #data;
+    constructor(params){
+        const { code, data, message, ...options } = params;
+        super(message, options);
+        this.#code = code;
+        this.#data = data;
+    }
+    get code() {
+        return this.#code;
+    }
+    get data() {
+        return this.#data;
+    }
+}

package/lib/index.d.ts

@@ -1,57 +1,3 @@
-import type { AnyActionDefinitions, ChannelActionDefinition, ClientTransportOf, EventActionDefinition, OptionalRecord, RequestActionDefinition, StreamActionDefinition } from '@enkaku/protocol';
-import { type Disposer } from '@enkaku/util';
-export type InvokeReturn<Result> = {
-    abort: (reason?: any) => void;
-    result: Promise<Result>;
-};
-export type InvokeStreamReturn<Receive, Result> = InvokeReturn<Result> & {
-    receive: AsyncIterable<Receive>;
-};
-export type InvokeChannelReturn<Send, Receive, Result> = InvokeStreamReturn<Receive, Result> & {
-    send: (value: Send) => Promise<void>;
-};
-export type EventDefinitionsType<Definitions extends AnyActionDefinitions, Names extends keyof Definitions & string = keyof Definitions & string> = {
-    [Name in Names]: Definitions[Name] extends EventActionDefinition<infer Data> ? {
-        Argument: Data extends undefined ? never : Data;
-        Return: undefined;
-    } : never;
-};
-export type RequestDefinitionsType<Definitions extends AnyActionDefinitions, Names extends keyof Definitions & string = keyof Definitions & string> = {
-    [Name in Names]: Definitions[Name] extends RequestActionDefinition<infer Params, infer Result> ? {
-        Argument: Params extends undefined ? never : Params;
-        Return: InvokeReturn<Result>;
-    } : never;
-};
-export type StreamDefinitionsType<Definitions extends AnyActionDefinitions, Names extends keyof Definitions & string = keyof Definitions & string> = {
-    [Name in Names]: Definitions[Name] extends StreamActionDefinition<infer Params, infer Receive, infer Result> ? {
-        Argument: Params extends undefined ? never : Params;
-        Return: InvokeStreamReturn<Receive, Result>;
-    } : never;
-};
-export type ChannelDefinitionsType<Definitions extends AnyActionDefinitions, Names extends keyof Definitions & string = keyof Definitions & string> = {
-    [Name in Names]: Definitions[Name] extends ChannelActionDefinition<infer Params, infer Send, infer Receive, infer Result> ? {
-        Argument: Params extends undefined ? never : Params;
-        Return: InvokeChannelReturn<Send, Receive, Result>;
-    } : never;
-};
-export type ClientDefinitionsType<Definitions extends AnyActionDefinitions> = {
-    Channels: ChannelDefinitionsType<Definitions>;
-    Events: EventDefinitionsType<Definitions>;
-    Requests: RequestDefinitionsType<Definitions>;
-    Streams: StreamDefinitionsType<Definitions>;
-};
-export type InvokeArgumentType<Definitions extends AnyActionDefinitions, Name extends keyof Definitions & string = keyof Definitions & string> = Definitions[Name] extends EventActionDefinition<infer Data> ? Data : Definitions[Name] extends RequestActionDefinition<infer Params> ? Params : Definitions[Name] extends StreamActionDefinition<infer Params> ? Params : Definitions[Name] extends ChannelActionDefinition<infer Params> ? Params : never;
-export type InvokeReturnType<Definitions extends AnyActionDefinitions, Name extends keyof Definitions & string> = Definitions[Name] extends EventActionDefinition<infer Data> ? undefined : Definitions[Name] extends RequestActionDefinition<infer Params, infer Result> ? InvokeReturn<Result> : Definitions[Name] extends StreamActionDefinition<infer Params, infer Receive, infer Result> ? InvokeStreamReturn<Receive, Result> : Definitions[Name] extends ChannelActionDefinition<infer Params, infer Send, infer Receive, infer Result> ? InvokeChannelReturn<Send, Receive, Result> : never;
-export type ClientParams<Definitions extends AnyActionDefinitions, Meta extends OptionalRecord = undefined> = {
-    transport: ClientTransportOf<Definitions, Meta>;
-    meta?: Meta;
-};
-export declare class Client<Definitions extends AnyActionDefinitions, Meta extends OptionalRecord, ClientDefinitions extends ClientDefinitionsType<Definitions> = ClientDefinitionsType<Definitions>> implements Disposer {
-    #private;
-    constructor(params: ClientParams<Definitions, Meta>);
-    get disposed(): Promise<void>;
-    dispose(): Promise<void>;
-    sendEvent<Name extends keyof ClientDefinitions['Events'] & string, T extends ClientDefinitions['Events'][Name] = ClientDefinitions['Events'][Name]>(name: Name, ...args: T['Argument'] extends never ? [] : [T['Argument']]): Promise<void>;
-    request<Name extends keyof ClientDefinitions['Requests'] & string, T extends ClientDefinitions['Requests'][Name] = ClientDefinitions['Requests'][Name]>(name: Name, ...args: T['Argument'] extends never ? [] : [T['Argument']]): Promise<T['Return']>;
-}
+export { Client, type ClientParams, type InvokeChannelReturn, type InvokeReturn, type InvokeStreamReturn, } from './client.js';
+export { ABORTED } from './constants.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":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,YAAY,EACjB,KAAK,kBAAkB,GACxB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA"}

package/lib/index.js

@@ -1,87 +1,2 @@
-import { defer } from '@enkaku/util';
-export class Client {
-    #meta;
-    #transport;
-    #controllers = {};
-    constructor(params){
-        this.#meta = params.meta;
-        this.#transport = params.transport;
-        // Abort all controllers on disconnect
-        this.#transport.disposed.then(()=>{
-            for (const controller of Object.values(this.#controllers)){
-                controller.abort();
-            }
-        });
-        // Start reading from transport
-        this.#read();
-    }
-    async #read() {
-        while(true){
-            const next = await this.#transport.read();
-            if (next.done) {
-                break;
-            }
-            const msg = next.value;
-            const controller = this.#controllers[msg.action.id];
-            if (controller == null) {
-                console.warn(`No controller for action ${msg.action.id}`);
-                continue;
-            }
-            switch(msg.action.type){
-                case 'error':
-                    // TODO: cast to Error instance
-                    controller.result.reject(msg.action.error);
-                    delete this.#controllers[msg.action.id];
-                    break;
-                case 'receive':
-                    break;
-                case 'result':
-                    controller.result.resolve(msg.action.value);
-                    delete this.#controllers[msg.action.id];
-                    break;
-            }
-        }
-    }
-    async #write(action) {
-        await this.#transport.write({
-            action,
-            meta: this.#meta
-        });
-    }
-    get disposed() {
-        return this.#transport.disposed;
-    }
-    async dispose() {
-        await this.#transport.dispose();
-    }
-    async sendEvent(name, ...args) {
-        const action = args.length ? {
-            type: 'event',
-            name,
-            data: args[0]
-        } : {
-            type: 'event',
-            name
-        };
-        await this.#write(action);
-    }
-    async request(name, ...args) {
-        const id = globalThis.crypto.randomUUID();
-        const controller = Object.assign(new AbortController(), {
-            result: defer()
-        });
-        this.#controllers[id] = controller;
-        const action = args.length ? {
-            type: 'request',
-            id,
-            name,
-            params: args[0]
-        } : {
-            type: 'request',
-            id,
-            name
-        };
-        await this.#write(action);
-        return controller.result.promise;
-    }
-}
+export { Client } from './client.js';
+export { ABORTED } from './constants.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enkaku/client",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "license": "MIT",
   "keywords": [],
   "type": "module",
@@ -14,11 +14,13 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@enkaku/util": "^0.1.0"
+    "@enkaku/jwt": "^0.2.1",
+    "@enkaku/util": "^0.2.0",
+    "@enkaku/stream": "^0.2.1"
   },
   "devDependencies": {
-    "@enkaku/protocol": "^0.1.0",
-    "@enkaku/transport": "^0.1.0"
+    "@enkaku/protocol": "^0.2.1",
+    "@enkaku/transport": "^0.2.0"
   },
   "scripts": {
     "build:clean": "del lib",