@covenant-rpc/client 0.2.0 → 0.4.0

package/dist/client.d.ts

@@ -0,0 +1,49 @@
+import type { ChannelMap, Covenant, ProcedureMap } from "@covenant-rpc/core";
+import type { InferChannelConnectionRequest, InferChannelParams, InferChannelServerMessage, InferChannelClientMessage } from "@covenant-rpc/core/channel";
+import type { ClientToServerConnection, ClientToSidekickConnection } from "@covenant-rpc/core/interfaces";
+import type { InferProcedureInputs, InferProcedureResult } from "@covenant-rpc/core/procedure";
+export type MutationKey<P extends ProcedureMap> = {
+    [k in keyof P]: P[k]["type"] extends "mutation" ? k : never;
+}[keyof P];
+export type QueryKey<P extends ProcedureMap> = {
+    [k in keyof P]: P[k]["type"] extends "query" ? k : never;
+}[keyof P];
+export type Listener<T> = (s: T) => void | Promise<void>;
+type ChannelConnectionResult<E> = {
+    success: true;
+    token: string;
+    error: null;
+} | {
+    success: false;
+    token: null;
+    error: E;
+};
+export declare class CovenantClient<P extends ProcedureMap, C extends ChannelMap> {
+    private covenant;
+    private serverConnection;
+    private sidekickConnection;
+    private listeners;
+    private remoteListenersCount;
+    private channelSubscriptions;
+    private pendingSendPromises;
+    private sendCounter;
+    constructor(covenant: Covenant<P, C>, { serverConnection, sidekickConnection }: {
+        serverConnection: ClientToServerConnection;
+        sidekickConnection: ClientToSidekickConnection;
+    });
+    private call;
+    private refetchResources;
+    query<K extends QueryKey<P>>(procedure: K, inputs: InferProcedureInputs<P[K]>): Promise<InferProcedureResult<P[K]>>;
+    mutate<K extends MutationKey<P>>(procedure: K, inputs: InferProcedureInputs<P[K]>): Promise<InferProcedureResult<P[K]>>;
+    connect<K extends keyof C>(channelName: K, params: InferChannelParams<C[K]>, data: InferChannelConnectionRequest<C[K]>): Promise<ChannelConnectionResult<any>>;
+    send<K extends keyof C>(channelName: K, params: InferChannelParams<C[K]>, token: string, data: InferChannelClientMessage<C[K]>): Promise<void>;
+    subscribe<K extends keyof C>(channelName: K, params: InferChannelParams<C[K]>, token: string, callback: Listener<InferChannelServerMessage<C[K]>>): Promise<() => void>;
+    listen<K extends QueryKey<P>>(procedure: K, inputs: InferProcedureInputs<P[K]>, callback: Listener<InferProcedureResult<P[K]>>, remote?: boolean): () => void;
+    private addListener;
+    private removeListener;
+    private increaseRemoteCount;
+    private decreateRemoteCount;
+    private cleanRemoteListeners;
+}
+export {};
+//# sourceMappingURL=client.d.ts.map

package/dist/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,KAAK,EAAiC,6BAA6B,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACzL,OAAO,KAAK,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC1G,OAAO,KAAK,EAAE,oBAAoB,EAAyB,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGtH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,YAAY,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,UAAU,GAAG,CAAC,GAAG,KAAK;CAAE,CAAC,MAAM,CAAC,CAAC,CAAA;AAC1H,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,YAAY,IAAI;KAC5C,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,OAAO,GAAG,CAAC,GAAG,KAAK;CACzD,CAAC,MAAM,CAAC,CAAC,CAAA;AAEV,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzD,KAAK,uBAAuB,CAAC,CAAC,IAC1B;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,IAAI,CAAA;CAAE,GAC7C;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC;AAU9C,qBAAa,cAAc,CACzB,CAAC,SAAS,YAAY,EACtB,CAAC,SAAS,UAAU;IAEpB,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,gBAAgB,CAA2B;IACnD,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,SAAS,CAAmD;IACpE,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,oBAAoB,CAA2C;IACvE,OAAO,CAAC,mBAAmB,CAAmF;IAC9G,OAAO,CAAC,WAAW,CAAa;gBAG9B,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EACxB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,EAAE;QACxC,gBAAgB,EAAE,wBAAwB,CAAC;QAC3C,kBAAkB,EAAE,0BAA0B,CAAA;KAC/C;YAgCW,IAAI;YA0CJ,gBAAgB;IAYxB,KAAK,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAI7E,MAAM,CAAC,CAAC,SAAS,WAAW,CAAC,CAAC,CAAC,EACnC,SAAS,EAAE,CAAC,EACZ,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAYhC,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,EAC7B,WAAW,EAAE,CAAC,EACd,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAChC,IAAI,EAAE,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACxC,OAAO,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAsBlC,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,EAC1B,WAAW,EAAE,CAAC,EACd,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAChC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IA0BV,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,EAC/B,WAAW,EAAE,CAAC,EACd,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAChC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAClD,OAAO,CAAC,MAAM,IAAI,CAAC;IAmCtB,MAAM,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAC1B,SAAS,EAAE,CAAC,EACZ,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAClC,QAAQ,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC9C,MAAM,GAAE,OAAe,GACtB,MAAM,IAAI;IA4Cb,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,oBAAoB;CAe7B"}

package/dist/client.js

@@ -0,0 +1,273 @@
+import { issuesToString } from "@covenant-rpc/core/utils";
+function getChannelKey(channel, params) {
+    const paramStr = Object.keys(params)
+        .sort()
+        .map(k => `${k}:${params[k]}`)
+        .join(",");
+    return `${channel}/${paramStr}`;
+}
+export class CovenantClient {
+    covenant;
+    serverConnection;
+    sidekickConnection;
+    listeners = new Map();
+    remoteListenersCount = new Map();
+    channelSubscriptions = new Map();
+    pendingSendPromises = new Map();
+    sendCounter = 0;
+    constructor(covenant, { serverConnection, sidekickConnection }) {
+        this.covenant = covenant;
+        this.serverConnection = serverConnection;
+        this.sidekickConnection = sidekickConnection;
+        this.sidekickConnection.onMessage(async (message) => {
+            if (message.type === "message") {
+                // Route message to channel subscribers
+                const key = getChannelKey(message.channel, message.params);
+                const callbacks = this.channelSubscriptions.get(key) || [];
+                for (const callback of callbacks) {
+                    await callback(message.data);
+                }
+            }
+            else if (message.type === "updated") {
+                // Handle resource updates
+                await this.refetchResources([message.resource]);
+            }
+            else if (message.type === "error") {
+                // Handle errors - resolve any pending send promises with error
+                const pendingKeys = Array.from(this.pendingSendPromises.keys());
+                for (const key of pendingKeys) {
+                    const pending = this.pendingSendPromises.get(key);
+                    if (pending) {
+                        this.pendingSendPromises.delete(key);
+                        pending.reject(new Error(message.error.message));
+                    }
+                }
+            }
+        });
+    }
+    async call(procedure, inputs) {
+        const result = await this.serverConnection.runProcedure({
+            procedure: String(procedure),
+            inputs: inputs,
+        });
+        if (result.status === "ERR") {
+            return {
+                success: false,
+                data: null,
+                resources: null,
+                error: result.error,
+            };
+        }
+        const declaration = this.covenant.procedures[procedure];
+        const validation = await declaration.output["~standard"].validate(result.data);
+        if (validation.issues) {
+            return {
+                success: false,
+                data: null,
+                resources: null,
+                error: {
+                    code: 500,
+                    message: `Improper response from server from procedure ${String(procedure)}: ${issuesToString(validation.issues)}`,
+                }
+            };
+        }
+        return {
+            success: true,
+            error: null,
+            // typescript isn't smart enough here but we still love it
+            data: validation.value,
+            resources: result.resources,
+        };
+    }
+    async refetchResources(resources) {
+        const s = new Set(resources);
+        const neededListeners = this.listeners.keys().filter(k => s.has(k));
+        const functions = [];
+        for (const l of neededListeners) {
+            functions.push(...(this.listeners.get(l)));
+        }
+        await Promise.all(functions.map(f => f()));
+    }
+    async query(procedure, inputs) {
+        return await this.call(procedure, inputs);
+    }
+    async mutate(procedure, inputs) {
+        const result = await this.call(procedure, inputs);
+        if (result.success === false) {
+            return result;
+        }
+        await this.refetchResources(result.resources);
+        return result;
+    }
+    async connect(channelName, params, data) {
+        const response = await this.serverConnection.sendConnectionRequest({
+            channel: String(channelName),
+            params: params,
+            data,
+        });
+        if (response.result.type !== "OK") {
+            return {
+                success: false,
+                token: null,
+                error: response.result.error,
+            };
+        }
+        return {
+            success: true,
+            token: response.result.token,
+            error: null,
+        };
+    }
+    async send(channelName, params, token, data) {
+        const sendId = `send-${this.sendCounter++}`;
+        return new Promise((resolve, reject) => {
+            this.pendingSendPromises.set(sendId, { resolve, reject });
+            // Send the message
+            this.sidekickConnection.sendMessage({
+                type: "send",
+                token,
+                channel: String(channelName),
+                params: params,
+                data,
+            });
+            // Set a timeout to auto-resolve if no error comes back
+            setTimeout(() => {
+                const pending = this.pendingSendPromises.get(sendId);
+                if (pending) {
+                    this.pendingSendPromises.delete(sendId);
+                    resolve();
+                }
+            }, 100); // Wait 100ms for potential errors
+        });
+    }
+    async subscribe(channelName, params, token, callback) {
+        const key = getChannelKey(String(channelName), params);
+        // Add callback to subscriptions
+        if (!this.channelSubscriptions.has(key)) {
+            this.channelSubscriptions.set(key, []);
+        }
+        this.channelSubscriptions.get(key).push(callback);
+        // Subscribe to channel via sidekick
+        this.sidekickConnection.sendMessage({
+            type: "subscribe",
+            token,
+        });
+        // Return unsubscribe function
+        return () => {
+            const callbacks = this.channelSubscriptions.get(key) || [];
+            const index = callbacks.indexOf(callback);
+            if (index !== -1) {
+                callbacks.splice(index, 1);
+            }
+            if (callbacks.length === 0) {
+                this.channelSubscriptions.delete(key);
+            }
+            // Unsubscribe from channel via sidekick
+            this.sidekickConnection.sendMessage({
+                type: "unsubscribe",
+                token,
+            });
+        };
+    }
+    listen(procedure, inputs, callback, remote = false) {
+        const listener = async () => {
+            const res = await this.call(procedure, inputs);
+            callback(res);
+        };
+        const unsubscribe = () => {
+            const removed = this.removeListener(listener);
+            if (remote) {
+                for (const r of removed) {
+                    this.decreateRemoteCount(r);
+                }
+                this.cleanRemoteListeners();
+            }
+        };
+        // we call the promise "in the background" so that this can be
+        // a synchronous function
+        const p = async () => {
+            const res = await this.call(procedure, inputs);
+            callback(res);
+            // we only add the listener if it's a non-error response. It is
+            // up to the library user to ensure that errors are handled
+            if (res.error) {
+                return;
+            }
+            this.addListener(res.resources, listener);
+            if (remote) {
+                this.sidekickConnection.sendMessage({
+                    type: "listen",
+                    resources: res.resources,
+                });
+                for (const r of res.resources) {
+                    this.increaseRemoteCount(r);
+                }
+            }
+        };
+        p();
+        return unsubscribe;
+    }
+    addListener(resources, listener, isRemote = true) {
+        // TODO - remote listeners
+        for (const r of resources) {
+            if (this.listeners.has(r)) {
+                const newListeners = [...(this.listeners.get(r))];
+                newListeners.push(listener);
+                this.listeners.set(r, newListeners);
+            }
+            else {
+                this.listeners.set(r, [listener]);
+            }
+        }
+    }
+    // this is how we track which listeners are depending on a remote resource and which
+    removeListener(listener) {
+        const removed = [];
+        for (const r of this.listeners.keys()) {
+            const currentListeners = this.listeners.get(r);
+            // minor optimization?
+            if (currentListeners.find(l => l === listener) === undefined) {
+                continue;
+            }
+            removed.push(r);
+            const newListeners = currentListeners.filter(l => l !== listener);
+            this.listeners.set(r, newListeners);
+        }
+        return removed;
+    }
+    increaseRemoteCount(resource) {
+        if (this.remoteListenersCount.has(resource)) {
+            const c = this.remoteListenersCount.get(resource);
+            this.remoteListenersCount.set(resource, c + 1);
+        }
+        else {
+            this.remoteListenersCount.set(resource, 1);
+        }
+    }
+    decreateRemoteCount(resource) {
+        if (this.remoteListenersCount.has(resource)) {
+            const c = this.remoteListenersCount.get(resource);
+            if (c === 0) {
+                throw new Error("Internal covenant error (not your fault unless you are developing covenant): Tried to reduce count for resource already at 0. Please report a bug.");
+            }
+            this.remoteListenersCount.set(resource, c - 1);
+        }
+        else {
+            throw new Error("Internal covenant error (not your fault unless you are developing covenant): Tried to reduce count for resource with no remote subscriptions. Please report a bug.");
+        }
+    }
+    cleanRemoteListeners() {
+        const unlistenTo = [];
+        for (const k of this.remoteListenersCount.keys()) {
+            const c = this.remoteListenersCount.get(k);
+            if (c === 0) {
+                unlistenTo.push(k);
+            }
+        }
+        this.sidekickConnection.sendMessage({
+            type: "unlisten",
+            resources: unlistenTo,
+        });
+    }
+}
+//# sourceMappingURL=client.js.map

package/dist/client.js.map

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

package/{lib/index.ts → dist/index.d.ts}

@@ -1,3 +1,4 @@
 export { CovenantClient, type MutationKey, type QueryKey } from "./client";
 export { httpClientToServer, httpClientToSidekick } from "./interfaces/http";
 export { emptyClientToServer, emptyClientToSidekick } from "./interfaces/empty";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/index.js

@@ -0,0 +1,4 @@
+export { CovenantClient } from "./client";
+export { httpClientToServer, httpClientToSidekick } from "./interfaces/http";
+export { emptyClientToServer, emptyClientToSidekick } from "./interfaces/empty";
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAmC,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/interfaces/empty.d.ts

@@ -0,0 +1,4 @@
+import type { ClientToServerConnection, ClientToSidekickConnection } from "@covenant-rpc/core/interfaces";
+export declare function emptyClientToSidekick(): ClientToSidekickConnection;
+export declare function emptyClientToServer(): ClientToServerConnection;
+//# sourceMappingURL=empty.d.ts.map

package/dist/interfaces/empty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"empty.d.ts","sourceRoot":"","sources":["../../interfaces/empty.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAE1G,wBAAgB,qBAAqB,IAAI,0BAA0B,CASlE;AAGD,wBAAgB,mBAAmB,IAAI,wBAAwB,CA4B9D"}

package/dist/interfaces/empty.js

@@ -0,0 +1,39 @@
+export function emptyClientToSidekick() {
+    return {
+        sendMessage() {
+        },
+        onMessage() {
+            return () => { };
+        },
+    };
+}
+export function emptyClientToServer() {
+    return {
+        async sendConnectionRequest(r) {
+            return {
+                channel: r.channel,
+                params: r.params,
+                result: {
+                    type: "ERROR",
+                    error: {
+                        params: r.params,
+                        channel: r.channel,
+                        fault: "client",
+                        message: "Empty connection always fails.",
+                    }
+                }
+            };
+        },
+        async runProcedure() {
+            return {
+                status: "ERR",
+                error: {
+                    code: 501,
+                    message: "Using an empty client to server connection",
+                },
+                resources: [],
+            };
+        }
+    };
+}
+//# sourceMappingURL=empty.js.map

package/dist/interfaces/empty.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"empty.js","sourceRoot":"","sources":["../../interfaces/empty.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qBAAqB;IACnC,OAAO;QACL,WAAW;QAEX,CAAC;QACD,SAAS;YACP,OAAO,GAAG,EAAE,GAAG,CAAC,CAAC;QACnB,CAAC;KACF,CAAA;AACH,CAAC;AAGD,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAC3B,OAAO;gBACL,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,MAAM,EAAE;oBACN,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,OAAO,EAAE,CAAC,CAAC,OAAO;wBAClB,KAAK,EAAE,QAAQ;wBACf,OAAO,EAAE,gCAAgC;qBAC1C;iBACF;aACF,CAAA;QACH,CAAC;QACD,KAAK,CAAC,YAAY;YAChB,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,4CAA4C;iBACtD;gBACD,SAAS,EAAE,EAAE;aACd,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/interfaces/http.d.ts

@@ -0,0 +1,4 @@
+import type { ClientToServerConnection, ClientToSidekickConnection } from "@covenant-rpc/core/interfaces";
+export declare function httpClientToSidekick(rootUrl: string): ClientToSidekickConnection;
+export declare function httpClientToServer(covenantUrl: string, extraHeaders: Record<string, string>): ClientToServerConnection;
+//# sourceMappingURL=http.d.ts.map

package/dist/interfaces/http.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../interfaces/http.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAS1G,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,0BAA0B,CAEhF;AAqHD,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,wBAAwB,CAuGtH"}

package/dist/interfaces/http.js

@@ -0,0 +1,202 @@
+import { procedureResponseSchema } from "@covenant-rpc/core/procedure";
+import { channelConnectionResponseSchema } from "@covenant-rpc/core/channel";
+import { sidekickOutgoingMessageSchema } from "@covenant-rpc/core/sidekick/protocol";
+import { isPromise } from "@covenant-rpc/core/utils";
+import { v } from "@covenant-rpc/core/validation";
+import ION from "@covenant-rpc/ion";
+export function httpClientToSidekick(rootUrl) {
+    return new HttpClientToSidekick(rootUrl);
+}
+class HttpClientToSidekick {
+    socketUrl;
+    listeners = [];
+    //@ts-expect-error we define this in the reconnectSocket method which is called by the constructor
+    socket;
+    ready = false;
+    sendQueue = [];
+    constructor(rootUrl) {
+        const url = new URL(rootUrl);
+        const protocol = url.protocol === "https:" ? "wss" : "ws";
+        this.socketUrl = `${protocol}://${url.host}/socket`;
+        this.reconnectSocket();
+    }
+    reconnectSocket() {
+        this.socket = new WebSocket(this.socketUrl);
+        this.ready = false;
+        this.socket.onmessage = async (m) => {
+            let data;
+            try {
+                data = typeof m.data === 'string' ? ION.parse(m.data) : m.data;
+            }
+            catch (e) {
+                await this.emitMessage({
+                    type: "error",
+                    error: {
+                        fault: "sidekick",
+                        message: "Error parsing JSON from sidekick message",
+                        channel: "unknown",
+                        params: {},
+                    }
+                });
+                return;
+            }
+            const message = v.parseSafe(data, sidekickOutgoingMessageSchema);
+            if (!message) {
+                await this.emitMessage({
+                    type: "error",
+                    error: {
+                        fault: "sidekick",
+                        message: "Error parsing incoming message from sidekick",
+                        channel: "unknown",
+                        params: {},
+                    }
+                });
+                return;
+            }
+            await this.emitMessage(message);
+        };
+        this.socket.onopen = () => {
+            this.ready = true;
+            for (const m of this.sendQueue) {
+                this.socket.send(ION.stringify(m));
+            }
+        };
+        this.socket.onclose = () => {
+            this.ready = false;
+        };
+        this.socket.onerror = async () => {
+            this.ready = false;
+            await this.emitMessage({
+                type: "error",
+                error: {
+                    fault: "client",
+                    message: "Unknown websocket error",
+                    channel: "unknown",
+                    params: {},
+                }
+            });
+        };
+    }
+    async emitMessage(m) {
+        const promises = [];
+        for (const l of this.listeners) {
+            const p = l(m);
+            if (isPromise(p)) {
+                promises.push(p);
+            }
+        }
+        await Promise.all(promises);
+    }
+    sendMessage(message) {
+        if (this.ready) {
+            const json = ION.stringify(message);
+            this.socket.send(json);
+        }
+        else {
+            this.sendQueue.push(message);
+        }
+    }
+    onMessage(handler) {
+        this.listeners.push(handler);
+        return () => {
+            const newListeners = this.listeners.filter(l => l !== handler);
+            this.listeners = newListeners;
+        };
+    }
+}
+export function httpClientToServer(covenantUrl, extraHeaders) {
+    const getHeaders = () => {
+        const h = new Headers();
+        h.set("Content-Type", "application/json");
+        for (const k in extraHeaders) {
+            h.set(k, extraHeaders[k]);
+        }
+        return h;
+    };
+    const getUrl = (type) => {
+        const url = new URL(covenantUrl);
+        url.searchParams.set("type", type);
+        return url.toString();
+    };
+    return {
+        async sendConnectionRequest(body) {
+            try {
+                const headers = getHeaders();
+                const url = getUrl("connect");
+                const response = await fetch(url, {
+                    method: "POST",
+                    headers,
+                    body: ION.stringify(body),
+                });
+                const responseText = await response.text();
+                const responseBody = ION.parse(responseText);
+                const connectionResponse = v.parseSafe(responseBody, channelConnectionResponseSchema);
+                if (connectionResponse === null) {
+                    return {
+                        channel: body.channel,
+                        params: body.params,
+                        result: {
+                            type: "ERROR",
+                            error: {
+                                channel: body.channel,
+                                params: body.params,
+                                fault: "server",
+                                message: `Bad response from server: ${JSON.stringify(responseBody)}`,
+                            },
+                        },
+                    };
+                }
+                return connectionResponse;
+            }
+            catch (e) {
+                return {
+                    channel: body.channel,
+                    params: body.params,
+                    result: {
+                        type: "ERROR",
+                        error: {
+                            channel: body.channel,
+                            params: body.params,
+                            fault: "server",
+                            message: `Unknown error connecting to channel: ${e}`,
+                        },
+                    },
+                };
+            }
+        },
+        async runProcedure(body) {
+            try {
+                const headers = getHeaders();
+                const url = getUrl("procedure");
+                const response = await fetch(url, {
+                    method: "POST",
+                    headers,
+                    body: ION.stringify(body),
+                });
+                const responseText = await response.text();
+                const responseBody = ION.parse(responseText);
+                const procedureResponse = v.parseSafe(responseBody, procedureResponseSchema);
+                if (procedureResponse === null) {
+                    return {
+                        status: "ERR",
+                        error: {
+                            code: 500,
+                            message: `Bad response from server: ${responseBody}`,
+                        }
+                    };
+                }
+                return procedureResponse;
+            }
+            catch (e) {
+                return {
+                    status: "ERR",
+                    error: {
+                        code: 400,
+                        message: `Unknown error fetching from the server: ${e}`,
+                    }
+                };
+            }
+        }
+    };
+}
+//# sourceMappingURL=http.js.map

package/dist/interfaces/http.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../interfaces/http.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAA8D,MAAM,sCAAsC,CAAC;AACjJ,OAAO,EAAE,SAAS,EAAqB,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,CAAC,EAAE,MAAM,+BAA+B,CAAC;AAClD,OAAO,GAAG,MAAM,mBAAmB,CAAC;AAEpC,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,oBAAoB;IACxB,SAAS,CAAQ;IACjB,SAAS,GAA2D,EAAE,CAAC;IAEvE,kGAAkG;IAClG,MAAM,CAAY;IAClB,KAAK,GAAY,KAAK,CAAC;IACvB,SAAS,GAA8B,EAAE,CAAA;IAEzC,YAAY,OAAe;QACzB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1D,IAAI,CAAC,SAAS,GAAG,GAAG,QAAQ,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC;QAEpD,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEO,eAAe;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;YAClC,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBACH,IAAI,GAAG,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACjE,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,CAAC,WAAW,CAAC;oBACrB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,KAAK,EAAE,UAAU;wBACjB,OAAO,EAAE,0CAA0C;wBACnD,OAAO,EAAE,SAAS;wBAClB,MAAM,EAAE,EAAE;qBACX;iBACF,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,6BAA6B,CAAC,CAAC;YAEjE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,CAAC,WAAW,CAAC;oBACrB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,KAAK,EAAE,UAAU;wBACjB,OAAO,EAAE,8CAA8C;wBACvD,OAAO,EAAE,SAAS;wBAClB,MAAM,EAAE,EAAE;qBACX;iBACF,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE;YACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAElB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC;QACH,CAAC,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE;YACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,CAAC,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,IAAI,EAAE;YAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YAEnB,MAAM,IAAI,CAAC,WAAW,CAAC;gBACrB,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACL,KAAK,EAAE,QAAQ;oBACf,OAAO,EAAE,yBAAyB;oBAClC,OAAO,EAAE,SAAS;oBAClB,MAAM,EAAE,EAAE;iBACX;aACF,CAAC,CAAA;QACJ,CAAC,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,CAA0B;QAClD,MAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACf,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,OAAgC;QAC1C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,SAAS,CAAC,OAA2D;QACnE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE7B,OAAO,GAAG,EAAE;YACV,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC;YAC/D,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC;QAChC,CAAC,CAAA;IACH,CAAC;CACF;AAGD,MAAM,UAAU,kBAAkB,CAAC,WAAmB,EAAE,YAAoC;IAC1F,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,MAAM,CAAC,GAAG,IAAI,OAAO,EAAE,CAAC;QACxB,CAAC,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAE1C,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;YAC7B,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAE,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAA;IAED,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;QAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;QACjC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACnC,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC,CAAA;IAED,OAAO;QACL,KAAK,CAAC,qBAAqB,CAAC,IAA8B;YACxD,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;gBAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;gBAE9B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;oBAChC,MAAM,EAAE,MAAM;oBACd,OAAO;oBACP,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;iBAC1B,CAAC,CAAC;gBAEH,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC3C,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAC7C,MAAM,kBAAkB,GAAG,CAAC,CAAC,SAAS,CAAC,YAAY,EAAE,+BAA+B,CAAC,CAAC;gBAEtF,IAAI,kBAAkB,KAAK,IAAI,EAAE,CAAC;oBAChC,OAAO;wBACL,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,MAAM,EAAE;4BACN,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE;gCACL,OAAO,EAAE,IAAI,CAAC,OAAO;gCACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gCACnB,KAAK,EAAE,QAAQ;gCACf,OAAO,EAAE,6BAA6B,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;6BACrE;yBACF;qBACF,CAAC;gBACJ,CAAC;gBAED,OAAO,kBAAkB,CAAC;YAC5B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO;oBACL,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,MAAM,EAAE;wBACN,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACL,OAAO,EAAE,IAAI,CAAC,OAAO;4BACrB,MAAM,EAAE,IAAI,CAAC,MAAM;4BACnB,KAAK,EAAE,QAAQ;4BACf,OAAO,EAAE,wCAAwC,CAAC,EAAE;yBACrD;qBACF;iBACF,CAAC;YACJ,CAAC;QACH,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,IAAI;YACrB,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;gBAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;gBAEhC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;oBAChC,MAAM,EAAE,MAAM;oBACd,OAAO;oBACP,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;iBAC1B,CAAC,CAAC;gBAEH,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC3C,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAC7C,MAAM,iBAAiB,GAAG,CAAC,CAAC,SAAS,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAA;gBAE5E,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;oBAC/B,OAAO;wBACL,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE;4BACL,IAAI,EAAE,GAAG;4BACT,OAAO,EAAE,6BAA6B,YAAY,EAAE;yBACrD;qBACF,CAAA;gBACH,CAAC;gBAED,OAAO,iBAAiB,CAAC;YAC3B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO;oBACL,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE;wBACL,IAAI,EAAE,GAAG;wBACT,OAAO,EAAE,2CAA2C,CAAC,EAAE;qBACxD;iBACF,CAAA;YACH,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}

package/package.json

@@ -1,20 +1,23 @@
 {
   "name": "@covenant-rpc/client",
-  "module": "lib/index.ts",
-  "version": "0.2.0",
+  "module": "./dist/index.js",
+  "version": "0.4.0",
   "type": "module",
+  "scripts": {
+    "build": "bun ../../scripts/build-package.ts ."
+  },
   "publishConfig": {
     "access": "public"
   },
-  "exports": {
-    ".": "./lib/index.ts",
-    "./*": "./lib/*.ts"
-  },
   "peerDependencies": {
     "typescript": "^5"
   },
   "dependencies": {
-    "@covenant-rpc/core": "^0.2.0",
-    "@covenant-rpc/ion": "^1.0.4"
-  }
+    "@covenant-rpc/core": "^0.4.0",
+    "@covenant-rpc/ion": "^1.2.0"
+  },
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ]
 }

package/CHANGELOG.md

@@ -1,16 +0,0 @@
-# @covenant-rpc/client
-
-## 0.1.3
-
-### Patch Changes
-
-- 8061179: Initial publish
-- Updated dependencies [8061179]
-  - @covenant-rpc/core@0.1.3
-  - @covenant-rpc/ion@1.0.3
-
-## 0.1.2
-
-### Patch Changes
-
-- Fix all packages

package/lib/client.ts

@@ -1,362 +0,0 @@
-import type { ChannelMap, Covenant, ProcedureMap } from "@covenant-rpc/core";
-import type { InferChannelConnectionContext, InferChannelConnectionRequest, InferChannelParams, InferChannelServerMessage, InferChannelClientMessage } from "@covenant-rpc/core/channel";
-import type { ClientToServerConnection, ClientToSidekickConnection } from "@covenant-rpc/core/interfaces";
-import type { InferProcedureInputs, InferProcedureOutputs, InferProcedureResult } from "@covenant-rpc/core/procedure";
-import { issuesToString } from "@covenant-rpc/core/utils";
-
-export type MutationKey<P extends ProcedureMap> = { [k in keyof P]: P[k]["type"] extends "mutation" ? k : never }[keyof P]
-export type QueryKey<P extends ProcedureMap> = {
-  [k in keyof P]: P[k]["type"] extends "query" ? k : never
-}[keyof P]
-
-export type Listener<T> = (s: T) => void | Promise<void>;
-
-type ChannelConnectionResult<E> =
-  | { success: true; token: string; error: null }
-  | { success: false; token: null; error: E };
-
-function getChannelKey(channel: string, params: Record<string, string>): string {
-  const paramStr = Object.keys(params)
-    .sort()
-    .map(k => `${k}:${params[k]}`)
-    .join(",");
-  return `${channel}/${paramStr}`;
-}
-
-export class CovenantClient<
-  P extends ProcedureMap,
-  C extends ChannelMap,
-> {
-  private covenant: Covenant<P, C>;
-  private serverConnection: ClientToServerConnection;
-  private sidekickConnection: ClientToSidekickConnection;
-  private listeners: Map<string, (() => Promise<void>)[]> = new Map();
-  private remoteListenersCount: Map<string, number> = new Map();
-  private channelSubscriptions: Map<string, Listener<any>[]> = new Map();
-  private pendingSendPromises: Map<string, { resolve: () => void; reject: (error: Error) => void }> = new Map();
-  private sendCounter: number = 0;
-
-  constructor(
-    covenant: Covenant<P, C>,
-    { serverConnection, sidekickConnection }: {
-      serverConnection: ClientToServerConnection,
-      sidekickConnection: ClientToSidekickConnection
-    }
-  ) {
-    this.covenant = covenant;
-    this.serverConnection = serverConnection;
-    this.sidekickConnection = sidekickConnection;
-
-    this.sidekickConnection.onMessage(async (message) => {
-      if (message.type === "message") {
-        // Route message to channel subscribers
-        const key = getChannelKey(message.channel, message.params);
-        const callbacks = this.channelSubscriptions.get(key) || [];
-        for (const callback of callbacks) {
-          await callback(message.data);
-        }
-      } else if (message.type === "updated") {
-        // Handle resource updates
-        await this.refetchResources([message.resource]);
-      } else if (message.type === "error") {
-        // Handle errors - resolve any pending send promises with error
-        const pendingKeys = Array.from(this.pendingSendPromises.keys());
-        for (const key of pendingKeys) {
-          const pending = this.pendingSendPromises.get(key);
-          if (pending) {
-            this.pendingSendPromises.delete(key);
-            pending.reject(new Error(message.error.message));
-          }
-        }
-      }
-    })
-  }
-
-
-  private async call<K extends keyof P>(
-    procedure: K,
-    inputs: InferProcedureInputs<P[K]>
-  ): Promise<InferProcedureResult<P[K]>> {
-    const result = await this.serverConnection.runProcedure({
-      procedure: String(procedure),
-      inputs: inputs,
-    });
-
-    if (result.status === "ERR") {
-      return {
-        success: false,
-        data: null,
-        resources: null,
-        error: result.error,
-      }
-    }
-
-    const declaration = this.covenant.procedures[procedure]!;
-    const validation = await declaration.output["~standard"].validate(result.data);
-
-    if (validation.issues) {
-      return {
-        success: false,
-        data: null,
-        resources: null,
-        error: {
-          code: 500,
-          message: `Improper response from server from procedure ${String(procedure)}: ${issuesToString(validation.issues)}`,
-        }
-      }
-    }
-
-    return {
-      success: true,
-      error: null,
-      // typescript isn't smart enough here but we still love it
-      data: validation.value as InferProcedureOutputs<P[K]>,
-      resources: result.resources,
-    }
-  }
-
-  private async refetchResources(resources: string[]) {
-    const s = new Set(resources);
-    const neededListeners = this.listeners.keys().filter(k => s.has(k));
-    const functions: (() => Promise<void>)[] = [];
-
-    for (const l of neededListeners) {
-      functions.push(...(this.listeners.get(l)!));
-    }
-
-    await Promise.all(functions.map(f => f()));
-  }
-
-  async query<K extends QueryKey<P>>(procedure: K, inputs: InferProcedureInputs<P[K]>) {
-    return await this.call(procedure, inputs);
-  }
-
-  async mutate<K extends MutationKey<P>>(
-    procedure: K,
-    inputs: InferProcedureInputs<P[K]>
-  ): Promise<InferProcedureResult<P[K]>> {
-    const result = await this.call(procedure, inputs);
-
-    if (result.success === false) {
-      return result;
-    }
-
-    await this.refetchResources(result.resources);
-
-    return result;
-  }
-
-  async connect<K extends keyof C>(
-    channelName: K,
-    params: InferChannelParams<C[K]>,
-    data: InferChannelConnectionRequest<C[K]>
-  ): Promise<ChannelConnectionResult<any>> {
-    const response = await this.serverConnection.sendConnectionRequest({
-      channel: String(channelName),
-      params: params as Record<string, string>,
-      data,
-    });
-
-    if (response.result.type !== "OK") {
-      return {
-        success: false,
-        token: null,
-        error: response.result.error,
-      };
-    }
-
-    return {
-      success: true,
-      token: response.result.token,
-      error: null,
-    };
-  }
-
-  async send<K extends keyof C>(
-    channelName: K,
-    params: InferChannelParams<C[K]>,
-    token: string,
-    data: InferChannelClientMessage<C[K]>
-  ): Promise<void> {
-    const sendId = `send-${this.sendCounter++}`;
-
-    return new Promise<void>((resolve, reject) => {
-      this.pendingSendPromises.set(sendId, { resolve, reject });
-
-      // Send the message
-      this.sidekickConnection.sendMessage({
-        type: "send",
-        token,
-        channel: String(channelName),
-        params: params as Record<string, string>,
-        data,
-      });
-
-      // Set a timeout to auto-resolve if no error comes back
-      setTimeout(() => {
-        const pending = this.pendingSendPromises.get(sendId);
-        if (pending) {
-          this.pendingSendPromises.delete(sendId);
-          resolve();
-        }
-      }, 100); // Wait 100ms for potential errors
-    });
-  }
-
-  async subscribe<K extends keyof C>(
-    channelName: K,
-    params: InferChannelParams<C[K]>,
-    token: string,
-    callback: Listener<InferChannelServerMessage<C[K]>>
-  ): Promise<() => void> {
-    const key = getChannelKey(String(channelName), params as Record<string, string>);
-
-    // Add callback to subscriptions
-    if (!this.channelSubscriptions.has(key)) {
-      this.channelSubscriptions.set(key, []);
-    }
-    this.channelSubscriptions.get(key)!.push(callback);
-
-    // Subscribe to channel via sidekick
-    this.sidekickConnection.sendMessage({
-      type: "subscribe",
-      token,
-    });
-
-    // Return unsubscribe function
-    return () => {
-      const callbacks = this.channelSubscriptions.get(key) || [];
-      const index = callbacks.indexOf(callback);
-      if (index !== -1) {
-        callbacks.splice(index, 1);
-      }
-      if (callbacks.length === 0) {
-        this.channelSubscriptions.delete(key);
-      }
-
-      // Unsubscribe from channel via sidekick
-      this.sidekickConnection.sendMessage({
-        type: "unsubscribe",
-        token,
-      });
-    };
-  }
-
-
-  listen<K extends QueryKey<P>>(
-    procedure: K,
-    inputs: InferProcedureInputs<P[K]>,
-    callback: Listener<InferProcedureResult<P[K]>>,
-    remote: boolean = false,
-  ): () => void {
-    const listener = async () => {
-      const res = await this.call(procedure, inputs);
-      callback(res);
-    }
-
-    const unsubscribe = () => {
-      const removed = this.removeListener(listener);
-      if (remote) {
-        for (const r of removed) {
-          this.decreateRemoteCount(r);
-        }
-        this.cleanRemoteListeners();
-      }
-    }
-
-    // we call the promise "in the background" so that this can be
-    // a synchronous function
-    const p = async () => {
-      const res = await this.call(procedure, inputs);
-      callback(res);
-
-      // we only add the listener if it's a non-error response. It is
-      // up to the library user to ensure that errors are handled
-      if (res.error) {
-        return;
-      }
-
-      this.addListener(res.resources, listener);
-      if (remote) {
-        this.sidekickConnection.sendMessage({
-          type: "listen",
-          resources: res.resources,
-        });
-        for (const r of res.resources) {
-          this.increaseRemoteCount(r);
-        }
-      }
-    }
-    p();
-
-    return unsubscribe;
-  }
-
-  private addListener(resources: string[], listener: () => Promise<void>, isRemote: boolean = true) {
-    // TODO - remote listeners
-    for (const r of resources) {
-      if (this.listeners.has(r)) {
-        const newListeners = [...(this.listeners.get(r)!)];
-        newListeners.push(listener);
-        this.listeners.set(r, newListeners);
-      } else {
-        this.listeners.set(r, [listener]);
-      }
-    }
-  }
-
-
-  // this is how we track which listeners are depending on a remote resource and which
-  private removeListener(listener: () => Promise<void>): string[] {
-    const removed: string[] = [];
-    for (const r of this.listeners.keys()) {
-      const currentListeners = this.listeners.get(r)!;
-
-      // minor optimization?
-      if (currentListeners.find(l => l === listener) === undefined) {
-        continue;
-      }
-      removed.push(r);
-
-      const newListeners = currentListeners.filter(l => l !== listener);
-      this.listeners.set(r, newListeners);
-    }
-    return removed;
-  }
-
-  private increaseRemoteCount(resource: string) {
-    if (this.remoteListenersCount.has(resource)) {
-      const c = this.remoteListenersCount.get(resource)!;
-      this.remoteListenersCount.set(resource, c + 1)
-    } else {
-      this.remoteListenersCount.set(resource, 1);
-    }
-  }
-  private decreateRemoteCount(resource: string) {
-    if (this.remoteListenersCount.has(resource)) {
-      const c = this.remoteListenersCount.get(resource)!;
-      if (c === 0) {
-        throw new Error("Internal covenant error (not your fault unless you are developing covenant): Tried to reduce count for resource already at 0. Please report a bug.")
-      }
-      this.remoteListenersCount.set(resource, c - 1)
-    } else {
-      throw new Error("Internal covenant error (not your fault unless you are developing covenant): Tried to reduce count for resource with no remote subscriptions. Please report a bug.");
-    }
-  }
-
-  private cleanRemoteListeners() {
-    const unlistenTo: string[] = [];
-    for (const k of this.remoteListenersCount.keys()) {
-      const c = this.remoteListenersCount.get(k)!;
-
-      if (c === 0) {
-        unlistenTo.push(k);
-      }
-    }
-
-    this.sidekickConnection.sendMessage({
-      type: "unlisten",
-      resources: unlistenTo,
-    })
-  }
-}

package/lib/interfaces/empty.ts

@@ -1,43 +0,0 @@
-import type { ClientToServerConnection, ClientToSidekickConnection } from "@covenant-rpc/core/interfaces";
-
-export function emptyClientToSidekick(): ClientToSidekickConnection {
-  return {
-    sendMessage() {
-
-    },
-    onMessage() {
-      return () => { };
-    },
-  }
-}
-
-
-export function emptyClientToServer(): ClientToServerConnection {
-  return {
-    async sendConnectionRequest(r) {
-      return {
-        channel: r.channel,
-        params: r.params,
-        result: {
-          type: "ERROR",
-          error: {
-            params: r.params,
-            channel: r.channel,
-            fault: "client",
-            message: "Empty connection always fails.",
-          }
-        }
-      }
-    },
-    async runProcedure() {
-      return {
-        status: "ERR",
-        error: {
-          code: 501,
-          message: "Using an empty client to server connection",
-        },
-        resources: [],
-      }
-    }
-  }
-}

package/lib/interfaces/http.ts

@@ -1,232 +0,0 @@
-import type { ClientToServerConnection, ClientToSidekickConnection } from "@covenant-rpc/core/interfaces";
-import type { ChannelConnectionRequest, ChannelConnectionResponse } from "@covenant-rpc/core/channel";
-import { procedureResponseSchema } from "@covenant-rpc/core/procedure";
-import { channelConnectionResponseSchema } from "@covenant-rpc/core/channel";
-import { sidekickOutgoingMessageSchema, type SidekickIncomingMessage, type SidekickOutgoingMessage } from "@covenant-rpc/core/sidekick/protocol";
-import { isPromise, type MaybePromise } from "@covenant-rpc/core/utils";
-import { v } from "@covenant-rpc/core/validation";
-import ION from "@covenant-rpc/ion";
-
-export function httpClientToSidekick(rootUrl: string): ClientToSidekickConnection {
-  return new HttpClientToSidekick(rootUrl);
-}
-
-class HttpClientToSidekick implements ClientToSidekickConnection {
-  socketUrl: string
-  listeners: ((m: SidekickOutgoingMessage) => MaybePromise<void>)[] = [];
-
-  //@ts-expect-error we define this in the reconnectSocket method which is called by the constructor
-  socket: WebSocket;
-  ready: boolean = false;
-  sendQueue: SidekickIncomingMessage[] = []
-
-  constructor(rootUrl: string) {
-    const url = new URL(rootUrl);
-    const protocol = url.protocol === "https:" ? "wss" : "ws";
-    this.socketUrl = `${protocol}://${url.host}/socket`;
-
-    this.reconnectSocket();
-  }
-
-  private reconnectSocket() {
-    this.socket = new WebSocket(this.socketUrl);
-    this.ready = false;
-
-    this.socket.onmessage = async (m) => {
-      let data: unknown;
-      try {
-        data = typeof m.data === 'string' ? ION.parse(m.data) : m.data;
-      } catch (e) {
-        await this.emitMessage({
-          type: "error",
-          error: {
-            fault: "sidekick",
-            message: "Error parsing JSON from sidekick message",
-            channel: "unknown",
-            params: {},
-          }
-        });
-        return;
-      }
-
-      const message = v.parseSafe(data, sidekickOutgoingMessageSchema);
-
-      if (!message) {
-        await this.emitMessage({
-          type: "error",
-          error: {
-            fault: "sidekick",
-            message: "Error parsing incoming message from sidekick",
-            channel: "unknown",
-            params: {},
-          }
-        });
-        return;
-      }
-
-      await this.emitMessage(message);
-    }
-
-    this.socket.onopen = () => {
-      this.ready = true;
-
-      for (const m of this.sendQueue) {
-        this.socket.send(ION.stringify(m));
-      }
-    }
-
-    this.socket.onclose = () => {
-      this.ready = false;
-    }
-
-    this.socket.onerror = async () => {
-      this.ready = false;
-
-      await this.emitMessage({
-        type: "error",
-        error: {
-          fault: "client",
-          message: "Unknown websocket error",
-          channel: "unknown",
-          params: {},
-        }
-      })
-    }
-  }
-
-  private async emitMessage(m: SidekickOutgoingMessage) {
-    const promises: Promise<void>[] = [];
-    for (const l of this.listeners) {
-      const p = l(m);
-      if (isPromise(p)) {
-        promises.push(p);
-      }
-    }
-
-    await Promise.all(promises);
-  }
-
-  sendMessage(message: SidekickIncomingMessage): void {
-    if (this.ready) {
-      const json = ION.stringify(message);
-      this.socket.send(json);
-    } else {
-      this.sendQueue.push(message);
-    }
-  }
-
-  onMessage(handler: (m: SidekickOutgoingMessage) => MaybePromise<void>): () => void {
-    this.listeners.push(handler);
-
-    return () => {
-      const newListeners = this.listeners.filter(l => l !== handler);
-      this.listeners = newListeners;
-    }
-  }
-}
-
-
-export function httpClientToServer(covenantUrl: string, extraHeaders: Record<string, string>): ClientToServerConnection {
-  const getHeaders = () => {
-    const h = new Headers();
-    h.set("Content-Type", "application/json");
-
-    for (const k in extraHeaders) {
-      h.set(k, extraHeaders[k]!);
-    }
-    return h;
-  }
-
-  const getUrl = (type: string) => {
-    const url = new URL(covenantUrl);
-    url.searchParams.set("type", type);
-    return url.toString();
-  }
-
-  return {
-    async sendConnectionRequest(body: ChannelConnectionRequest): Promise<ChannelConnectionResponse> {
-      try {
-        const headers = getHeaders();
-        const url = getUrl("connect");
-
-        const response = await fetch(url, {
-          method: "POST",
-          headers,
-          body: ION.stringify(body),
-        });
-
-        const responseText = await response.text();
-        const responseBody = ION.parse(responseText);
-        const connectionResponse = v.parseSafe(responseBody, channelConnectionResponseSchema);
-
-        if (connectionResponse === null) {
-          return {
-            channel: body.channel,
-            params: body.params,
-            result: {
-              type: "ERROR",
-              error: {
-                channel: body.channel,
-                params: body.params,
-                fault: "server",
-                message: `Bad response from server: ${JSON.stringify(responseBody)}`,
-              },
-            },
-          };
-        }
-
-        return connectionResponse;
-      } catch (e) {
-        return {
-          channel: body.channel,
-          params: body.params,
-          result: {
-            type: "ERROR",
-            error: {
-              channel: body.channel,
-              params: body.params,
-              fault: "server",
-              message: `Unknown error connecting to channel: ${e}`,
-            },
-          },
-        };
-      }
-    },
-    async runProcedure(body) {
-      try {
-        const headers = getHeaders();
-        const url = getUrl("procedure");
-
-        const response = await fetch(url, {
-          method: "POST",
-          headers,
-          body: ION.stringify(body),
-        });
-
-        const responseText = await response.text();
-        const responseBody = ION.parse(responseText);
-        const procedureResponse = v.parseSafe(responseBody, procedureResponseSchema)
-
-        if (procedureResponse === null) {
-          return {
-            status: "ERR",
-            error: {
-              code: 500,
-              message: `Bad response from server: ${responseBody}`,
-            }
-          }
-        }
-
-        return procedureResponse;
-      } catch (e) {
-        return {
-          status: "ERR",
-          error: {
-            code: 400,
-            message: `Unknown error fetching from the server: ${e}`,
-          }
-        }
-      }
-    }
-  }
-}