awesomerpc 0.1.0 → 0.2.0

package/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2026 Sam Vervaeck
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -10,6 +10,7 @@ First, you need to define a _contract_ for your API. A contract is kind of like
 a TypeScript interface: it defines what methods (and events) are allowed.
 
 ```ts
+import t from "reflect-types";
 import { contract } from "awesomerpc";
 
 // A client API that connects to the server in the browser via web sockets
@@ -30,7 +31,7 @@ Next, you need to implement this contract, like so:
 ```ts
 import { implement } from "awesomerpc";
 
-const petStoreClientImpl = implement(petStoreClient)
+const petStoreClientImpl = implement(petStoreClientContract, petStoreServerContract)
     .method('refresh', (_ctx) => {
         window.location.reload();
     })
@@ -57,3 +58,70 @@ console.log(`Available products: ${await rpc.callMethod('getProducts', [])}`);
 
 For more information, read the full example in the `example/` directory.
 
+## API
+
+### Transports
+
+#### `new WebSocketTransport(url)`
+
+Create a new transport that uses WebSocket to send and receive messages.
+
+### `Transport.open()`
+
+Connect to whatever was specified as the destination address during the
+construction of the transport.
+
+This method returns a promise object that may be awaited in order to ensure the
+connection is ready for use.
+
+### Top-level Functions
+
+#### `connect(impl, state, logger?)`
+
+```ts
+import pino from "pino";
+
+import { connect } from "awesomerpc";
+
+connect(petStoreClientImpl, {});
+```
+
+## FAQ
+
+### How do I enable logging?
+
+To enable logging, you need to create and object that satisfies the `Logger`
+interface. [Pino][pino] is one such logger that is compatible with this
+interface. You can install it using:
+
+```sh
+$ npm install pino
+```
+
+Next, you need to define the logger object. In this example, the log level is
+read from the environment variable `MYAPP_LOG_LEVEL` and defaults to `info`.
+
+**src/logging.ts**
+```ts
+import pino from "pino";
+
+export const logger = pino({
+  level: process.env.MYAPP_LOG_LEVEL || 'info',
+});
+```
+
+Pass this object in while creating a connection, like so:
+
+```ts
+import { connect } from "awesomerpc";
+
+import { logger } from "./logging";
+
+connect(petStoreClientImpl, {}, logger);
+```
+
+If no logger is specified, AwesomeRPC will simply not log anything.
+
+## License
+
+This project is licensed under the MIT license. See `LICENSE.txt` for more information.

package/lib/index.d.ts

@@ -1,5 +1,5 @@
-export { type Transport, WebSocketTransport, DummyTransport, RawTransport, createDuplex, } from "./transport.js";
-export { implement, contract } from "./types.js";
-export { RPC, type AnyMethods, type AnyEvents } from "./rpc.js";
+export { type Transport, WebSocketTransport, DummyTransport, RawTransport, createDuplex, TransportError } from "./transport.js";
+export { implement, contract, emptyContract, anyContract } from "./types.js";
+export { RPC, type AnyMethods, type AnyEvents, connect } from "./rpc.js";
 export { createProxy } from "./proxy.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":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,GAAI,MAAM,gBAAgB,CAAA;AACjH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAChD,OAAO,EAAE,GAAG,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAA;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/H,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAC5E,OAAO,EAAE,GAAG,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA"}

package/lib/index.js

@@ -1,5 +1,5 @@
-export { WebSocketTransport, DummyTransport, RawTransport, createDuplex, } from "./transport.js";
-export { implement, contract } from "./types.js";
-export { RPC } from "./rpc.js";
+export { WebSocketTransport, DummyTransport, RawTransport, createDuplex, TransportError } from "./transport.js";
+export { implement, contract, emptyContract, anyContract } from "./types.js";
+export { RPC, connect } from "./rpc.js";
 export { createProxy } from "./proxy.js";
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,kBAAkB,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,GAAI,MAAM,gBAAgB,CAAA;AACjH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAChD,OAAO,EAAE,GAAG,EAAmC,MAAM,UAAU,CAAA;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,kBAAkB,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/H,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAC5E,OAAO,EAAE,GAAG,EAAmC,OAAO,EAAE,MAAM,UAAU,CAAA;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA"}

package/lib/integration.test.js

@@ -1,10 +1,10 @@
 import { test, expect } from "bun:test";
-import { types as t } from "reflect-types";
+import t from "reflect-types";
 import { contract, implement } from "./types.js";
 import { createDuplex } from "./transport.js";
 import { connect } from "./rpc.js";
 import { FailedValidationError } from "./error.js";
-const local = contract({
+const leftContract = contract({
     methods: {
         getState: t.callable([], t.number()),
         setState: t.callable([t.number()], t.undefined()),
@@ -14,46 +14,49 @@ const local = contract({
         someevent: t.string(),
     }
 });
-const remote = contract({
+const rightContract = contract({
     methods: {
         getState: t.callable([], t.number()),
         setState: t.callable([t.number()], t.undefined()),
         getLength: t.callable([t.string()], t.number()),
     }
 });
-const leftImpl = implement(local)
+const leftImpl = implement(leftContract, rightContract)
     .state()
+    // .methods(stateHandlers())
     .methods({
-    getState(ctx) {
-        return ctx.foo;
+    getState({ state: { foo } }) {
+        return foo;
     },
-    setState(ctx, state) {
-        ctx.foo = state;
+    setState({ state, args: [newFoo] }) {
+        state.foo = newFoo;
     },
+})
+    .methods({
     // @ts-expect-error Wrong function return type on purpose
     returnInvalid() {
         return "a string";
     }
 })
     .finish();
-const rightImpl = implement(remote)
+const rightImpl = implement(rightContract, leftContract)
     .state()
     .methods({
-    getState(ctx) {
-        return ctx.foo;
+    getState({ state }) {
+        return state.foo;
     },
-    setState(ctx, state) {
-        ctx.foo = state;
+    setState({ state, args: [newState] }) {
+        state.foo = newState;
     },
-    getLength(_ctx, s) {
+    getLength({ args: [s] }) {
         return s.length;
     }
 })
     .finish();
 test('can call methods on both sides', async () => {
     const [leftTransport, rightTransport] = createDuplex();
-    const left = connect(leftImpl, remote, leftTransport, { foo: 42 });
-    const right = connect(rightImpl, local, rightTransport, { foo: 33 });
+    const left = connect(leftImpl, leftTransport, { foo: 42 });
+    const right = connect(rightImpl, rightTransport, { foo: 33 });
     expect(await left.callMethod('getLength', ["foobar"])).toStrictEqual(6);
     expect(await left.callMethod('getState', [])).toStrictEqual(33);
     expect(await right.callMethod('getState', [])).toStrictEqual(42);
@@ -62,8 +65,8 @@ test('can call methods on both sides', async () => {
 });
 test('throws an error on invalid param count', async () => {
     const [leftTransport, rightTransport] = createDuplex();
-    const left = connect(leftImpl, remote, leftTransport, { foo: 42 });
-    const right = connect(rightImpl, local, rightTransport, { foo: 33 });
+    const left = connect(leftImpl, leftTransport, { foo: 42 });
+    const right = connect(rightImpl, rightTransport, { foo: 33 });
     expect(left.callMethod('getLength', 
     // @ts-expect-error Deliberatly added a param
     ["foo", "bar"])).rejects.toBeInstanceOf(Error); // TODO be more specific
@@ -73,14 +76,14 @@ test('throws an error on invalid param count', async () => {
 });
 test('throws an error on invalid return', async () => {
     const [leftTransport, rightTransport] = createDuplex();
-    const left = connect(leftImpl, remote, leftTransport, { foo: 42 });
-    const right = connect(rightImpl, local, rightTransport, { foo: 33 });
+    const left = connect(leftImpl, leftTransport, { foo: 42 });
+    const right = connect(rightImpl, rightTransport, { foo: 33 });
     expect(right.callMethod('returnInvalid', [])).rejects.toBeInstanceOf(FailedValidationError);
 });
 test('can send events', done => {
     const [leftTransport, rightTransport] = createDuplex();
-    const left = connect(leftImpl, remote, leftTransport, { foo: 42 });
-    const right = connect(rightImpl, local, rightTransport, { foo: 33 });
+    const left = connect(leftImpl, leftTransport, { foo: 42 });
+    const right = connect(rightImpl, rightTransport, { foo: 33 });
     left.getEvent('someevent').subscribe(msg => {
         expect(msg).toStrictEqual('foo');
         done();

package/lib/integration.test.js.map

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

package/lib/logger.d.ts

@@ -0,0 +1,16 @@
+import type { JSONObject } from "./util.js";
+type LogFn = (obj: JSONObject) => void;
+/**
+ * Generic logging interface that is compatible with Pino.
+ */
+export interface Logger {
+    fatal: LogFn;
+    error: LogFn;
+    warn: LogFn;
+    info: LogFn;
+    debug: LogFn;
+    trace: LogFn;
+    silent: LogFn;
+}
+export {};
+//# sourceMappingURL=logger.d.ts.map

package/lib/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,KAAK,KAAK,GAAG,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,KAAK,CAAC;CACf"}

package/lib/logger.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=logger.js.map

package/lib/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":""}

package/lib/proxy.d.ts

@@ -1,13 +1,4 @@
-import type { Subject } from "rxjs";
 import type { RPC } from "./rpc.js";
-import type { Impl, Spec, MethodSpec, EventSpec } from "./types.js";
-import type { CallableType } from "reflect-types";
-type Promisify<T extends CallableType> = (...args: T['paramTypes']) => Promise<Awaited<T['returnType']>>;
-type Obj<M extends Record<string, MethodSpec>, E extends Record<string, EventSpec>> = {
-    [K in keyof M]: Promisify<M[K]>;
-} & {
-    [K in keyof E]: Subject<E[K]['ty']>;
-};
-export declare function createProxy<L extends Impl, R extends Spec>(rpc: RPC<L, R>): Obj<R["methods"], L["spec"]["events"]>;
-export {};
+import type { ClientObj, Contract } from "./types.js";
+export declare function createProxy<L extends Contract, R extends Contract, S extends object>(rpc: RPC<L, R, S>): ClientObj<L, R>;
 //# sourceMappingURL=proxy.d.ts.map

package/lib/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,KAAK,SAAS,CAAC,CAAC,SAAS,YAAY,IACjC,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAEpE,KAAK,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAC9E;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GACnC;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;CAAE,CAAC;AAE5C,wBAAgB,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,SAAS,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,0CAczE"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtD,wBAAgB,WAAW,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,mBAetG"}

package/lib/proxy.js

@@ -1,11 +1,12 @@
 export function createProxy(rpc) {
-    return new Proxy({}, {
+    // FIXME This `any` cast is a hack
+    return new Proxy(rpc, {
         get(target, p, receiver) {
             if (typeof (p) === 'string') {
-                if (rpc.remote.hasMethod(p)) {
+                if (rpc.impl.remote.hasMethod(p)) {
                     return (...args) => rpc.callMethod(p, args);
                 }
-                if (rpc.local.spec.hasEvent(p)) {
+                if (rpc.impl.local.hasEvent(p)) {
                     return rpc.getEvent(p);
                 }
             }

package/lib/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,WAAW,CAAiC,GAAc;IACxE,OAAO,IAAI,KAAK,CAAyC,EAAS,EAAE;QAClE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,QAAQ;YACrB,IAAI,OAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC3B,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5B,OAAO,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE,IAAW,CAAC,CAAC;gBAC5D,CAAC;gBACD,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/B,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC1C,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,WAAW,CAA2D,GAAiB;IACrG,kCAAkC;IAClC,OAAO,IAAI,KAAK,CAAkB,GAAU,EAAE;QAC5C,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,QAAQ;YACrB,IAAI,OAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC3B,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;oBACjC,OAAO,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE,IAAW,CAAC,CAAC;gBAC5D,CAAC;gBACD,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/B,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC1C,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/lib/rpc.d.ts

@@ -2,7 +2,8 @@ import { BehaviorSubject, Subject } from "rxjs";
 import { type Infer } from "reflect-types";
 import { type JSONValue } from "./util.js";
 import type { Transport } from "./transport.js";
-import type { Impl, Spec, InferTuple } from "./types.js";
+import type { Contract, Impl, InferTuple } from "./types.js";
+import type { Logger } from "./logger.js";
 export declare class Resource<T> {
     value: T;
     close: () => void;
@@ -14,11 +15,11 @@ export type MethodFn = (...args: any[]) => any;
 export type AnyEvents = Record<string, Subject<any>>;
 export type AnyMethods = Record<string, MethodFn>;
 export type RPCValue = JSONValue | AsyncIterable<any, any, any> | Resource<Subject<any>> | Resource<BehaviorSubject<any>>;
-export declare class RPC<L extends Impl, R extends Spec> {
+export declare class RPC<L extends Contract, R extends Contract, S extends object> {
     private transport;
-    local: L;
-    remote: R;
+    impl: Impl<L, R, S>;
     private state;
+    private logger?;
     private nextMessageId;
     private nextStreamId;
     private nextSubjectId;
@@ -28,8 +29,9 @@ export declare class RPC<L extends Impl, R extends Spec> {
     private asyncGenerators;
     private events;
     private readerSubscription;
-    constructor(transport: Transport, local: L, remote: R, state: L['state']);
-    getEvent<K extends keyof L['spec']['events'] & string>(name: K): Subject<Infer<L['spec']['events'][K]['ty']>>;
+    private client;
+    constructor(transport: Transport, impl: Impl<L, R, S>, state: S, logger?: Logger | undefined);
+    getEvent<K extends keyof L['events'] & string>(name: K): Subject<Infer<L['events'][K]['ty']>>;
     getEvent(name: string): undefined;
     notify<K extends keyof R['events']>(eventName: K, value: Infer<R['events'][K]['ty']>): Promise<void>;
     hasMethod(name: string): boolean;
@@ -39,5 +41,5 @@ export declare class RPC<L extends Impl, R extends Spec> {
     private processMessage;
     close(): void;
 }
-export declare function connect<L extends Impl, R extends Spec>(local: L, remote: R, transport: Transport, state?: L['state']): RPC<L, R>;
+export declare function connect<L extends Contract, R extends Contract, S extends object>(impl: Impl<L, R, S>, transport: Transport, state: S, logger?: Logger): RPC<L, R, S>;
 //# sourceMappingURL=rpc.d.ts.map

package/lib/rpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../src/rpc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../src/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAgB,MAAM,MAAM,CAAC;AAC9D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAA4C,KAAK,SAAS,EAAe,MAAM,WAAW,CAAC;AA4BlG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,qBAAa,QAAQ,CAAC,CAAC;IAGZ,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,MAAM,IAAI;gBADjB,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,MAAM,IAAI;CAK3B;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,QAAQ,CAAC,OAAO,CAAC,CAEjE;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;AAE/D,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AAE/C,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;AAEpD,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAElD,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1H,qBAAa,GAAG,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,MAAM;IAoBrE,OAAO,CAAC,SAAS;IACV,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1B,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM,CAAC;IApBjB,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,iBAAiB,CAAmC;IAG5D,OAAO,CAAC,YAAY,CAAmC;IACvD,OAAO,CAAC,OAAO,CAAqF;IACpG,OAAO,CAAC,eAAe,CAAkE;IACzF,OAAO,CAAC,MAAM,CAA2F;IAGzG,OAAO,CAAC,kBAAkB,CAAe;IAEzC,OAAO,CAAC,MAAM,CAAqB;gBAGzB,SAAS,EAAE,SAAS,EACrB,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAClB,KAAK,EAAE,CAAC,EACR,MAAM,CAAC,EAAE,MAAM,YAAA;IAgBlB,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7F,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS;IAY3B,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1G,SAAS,CAAC,IAAI,EAAE,MAAM;IAIhB,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IAUvK,OAAO,CAAC,MAAM;IAoEd,OAAO,CAAC,MAAM;IA0Fd,OAAO,CAAC,cAAc;IA6Jf,KAAK,IAAI,IAAI;CAIrB;AAED,wBAAgB,OAAO,CACrB,CAAC,SAAS,QAAQ,EAClB,CAAC,SAAS,QAAQ,EAClB,CAAC,SAAS,MAAM,EAChB,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAEpF"}

package/lib/rpc.js

@@ -1,9 +1,9 @@
 import { BehaviorSubject, Subject, Subscription } from "rxjs";
 import {} from "reflect-types";
-import { isPlainObject, Deferred } from "./util.js";
+import { isPlainObject, Deferred, isPrimitive } from "./util.js";
 import { decodeEvent, decodeObservableComplete, decodeObservableEvent, decodeRequest, decodeRespondError, decodeRespondOk, decodeStreamElement, decodeStreamFinish, MSGID_EVENT, MSGID_OBSERVABLE_CLOSE, MSGID_OBSERVABLE_COMPLETE, MSGID_OBSERVABLE_ERROR, MSGID_OBSERVABLE_EVENT, MSGID_REQUEST, MSGID_RESPOND_ERROR, MSGID_RESPOND_OK, MSGID_STREAM_ELEMENT, MSGID_STREAM_FINISH, TYPE_ARRAY, TYPE_ASYNC_GENERATOR, TYPE_BEHAVIORSUBJECT, TYPE_OBJECT, TYPE_PRIMITIVE, TYPE_SUBJECT, TYPE_UNDEFINED, } from "./protocol.js";
 import { EventNotFoundError, MethodNotFoundError, ProtocolError, RemoteError, RPCError, FailedValidationError } from "./error.js";
-import { which } from "bun";
+import { createProxy } from "./proxy.js";
 export class Resource {
     value;
     close;
@@ -15,17 +15,11 @@ export class Resource {
 export function isResource(value) {
     return value instanceof Resource;
 }
-function isPrimitive(value) {
-    return value == null
-        || typeof (value) === 'boolean'
-        || typeof (value) === 'number'
-        || typeof (value) === 'string';
-}
 export class RPC {
     transport;
-    local;
-    remote;
+    impl;
     state;
+    logger;
     // For sending data
     nextMessageId = 0;
     nextStreamId = 0;
@@ -38,11 +32,12 @@ export class RPC {
     events = Object.create(null);
     // Internal resources
     readerSubscription;
-    constructor(transport, local, remote, state) {
+    client = createProxy(this);
+    constructor(transport, impl, state, logger) {
         this.transport = transport;
-        this.local = local;
-        this.remote = remote;
+        this.impl = impl;
         this.state = state;
+        this.logger = logger;
         // Process incoming messages
         this.readerSubscription = transport.input.subscribe(data => {
             try {
@@ -59,7 +54,7 @@ export class RPC {
         });
     }
     getEvent(name) {
-        if (!this.local.spec.hasEvent(name)) {
+        if (!this.impl.local.hasEvent(name)) {
             return;
         }
         if (this.events[name] === undefined) {
@@ -71,11 +66,11 @@ export class RPC {
         await this.transport.write(JSON.stringify([MSGID_EVENT, eventName, this.encode(value)]));
     }
     hasMethod(name) {
-        return this.local.spec.hasMethod(name);
+        return this.impl.local.hasMethod(name);
     }
     async callMethod(name, args) {
         const id = this.nextMessageId++;
-        console.log(`send REQUEST ${id}`);
+        this.logger?.trace({ rpc: { direction: 'send', msgId: 'REQUEST', id, methodName: name } });
         const deferred = new Deferred();
         this.pending.set(id, { name, deferred });
         const encodedArgs = args.map(this.encode.bind(this));
@@ -250,28 +245,33 @@ export class RPC {
             case MSGID_EVENT:
                 {
                     const [name, rawValue] = decodeEvent(msg);
-                    console.log(`recv EVENT ${name}`);
+                    this.logger?.trace({ rpc: { direction: 'recv', msgId: 'EVENT', eventName: name } });
                     const subject = this.getEvent(name);
                     if (subject === undefined) {
                         throw new EventNotFoundError(name);
                     }
                     const value = this.decode(rawValue);
-                    const coerced = this.local.spec.validateEventValue(name, value);
+                    const coerced = this.impl.local.validateEventValue(name, value);
                     subject.next(coerced);
                     break;
                 }
             case MSGID_REQUEST:
                 {
                     const [id, name, encodedArgs] = decodeRequest(msg);
-                    console.log(`recv REQUEST ${id} (${name})`);
+                    this.logger?.trace({ rpc: { direction: 'recv', msgId: 'REQUEST', id, methodName: name } });
                     try {
                         const args = encodedArgs.map(this.decode.bind(this));
-                        const method = this.local.getHandler(name);
+                        const method = this.impl.getHandler(name);
                         if (method === undefined) {
                             throw new MethodNotFoundError(name);
                         }
-                        const validArgs = this.local.spec.validateArgs(name, args);
-                        Promise.resolve(method(this.state, ...validArgs))
+                        const validArgs = this.impl.local.validateArgs(name, args);
+                        Promise.resolve(method({
+                            client: this.client,
+                            state: this.state,
+                            // We force the compiler to treat `validArgs` as correctly typed
+                            args: validArgs
+                        }))
                             .then(value => this.transport.write(JSON.stringify([MSGID_RESPOND_OK, id, this.encode(value)])))
                             .catch(error => this.transport.write(JSON.stringify([MSGID_RESPOND_ERROR, id, error.message])));
                     }
@@ -287,6 +287,7 @@ export class RPC {
             case MSGID_STREAM_ELEMENT:
                 {
                     const [id, rawValue] = decodeStreamElement(msg);
+                    this.logger?.trace({ rpc: { direction: 'recv', msgId: 'STREAM_ELEMENT', id } });
                     const element = this.decode(rawValue);
                     const stream = this.asyncGenerators.get(id);
                     if (stream === undefined) {
@@ -299,6 +300,7 @@ export class RPC {
             case MSGID_STREAM_FINISH:
                 {
                     const [id, rawValue] = decodeStreamFinish(msg);
+                    this.logger?.trace({ rpc: { direction: 'recv', msgId: 'STREAM_FINISH', id } });
                     const generator = this.asyncGenerators.get(id);
                     if (generator === undefined) {
                         throw new RemoteError(`Async generator with ID ${id} not found.`);
@@ -311,7 +313,7 @@ export class RPC {
             case MSGID_OBSERVABLE_EVENT:
                 {
                     const [id, rawValue] = decodeObservableEvent(msg);
-                    console.log(`recv OBSERVABLE_EVENT ${id}`);
+                    this.logger?.trace({ rpc: { direction: 'recv', msgId: 'OBSERVABLE_EVENT', id } });
                     const sub = this.recvSubjects.get(id);
                     if (sub === undefined) {
                         throw new RemoteError(`Observable with ID ${id} not found.`);
@@ -322,7 +324,7 @@ export class RPC {
             case MSGID_OBSERVABLE_COMPLETE:
                 {
                     const [id] = decodeObservableComplete(msg);
-                    console.log(`recv OBSERVABLE_COMPLETE ${id}`);
+                    this.logger?.trace({ rpc: { direction: 'recv', msgId: 'OBSERVABLE_COMPLETE', id } });
                     const subscriber = this.recvSubjects.get(id);
                     if (subscriber === undefined) {
                         throw new Error(`Observable with ID ${id} not found.`);
@@ -334,7 +336,7 @@ export class RPC {
             case MSGID_OBSERVABLE_CLOSE:
                 {
                     const [id] = msg[1];
-                    console.log(`recv OBSERVABLE_CLOSE ${id}`);
+                    this.logger?.trace({ rpc: { direction: 'recv', msgId: 'OBSERVABLE_CLOSE', id } });
                     const sub = this.sendSubscriptions.get(id);
                     if (sub === undefined) {
                         throw new RemoteError(`Could not find subscription with ID ${id}`);
@@ -346,7 +348,7 @@ export class RPC {
             case MSGID_RESPOND_OK:
                 {
                     const [id, value] = decodeRespondOk(msg);
-                    console.log(`recv RESPOND_OK ${id}`);
+                    this.logger?.trace({ rpc: { direction: 'recv', msgId: 'RESPOND_OK', id } });
                     const result = this.pending.get(id);
                     if (result === undefined) {
                         throw new RemoteError(`Pending request with ID ${id} not found.`);
@@ -356,7 +358,7 @@ export class RPC {
                     const decoded = this.decode(value);
                     let coerced;
                     try {
-                        coerced = this.remote.validateReturns(name, decoded);
+                        coerced = this.impl.remote.validateReturns(name, decoded);
                     }
                     catch (error) {
                         if (error instanceof FailedValidationError) {
@@ -371,7 +373,7 @@ export class RPC {
             case MSGID_RESPOND_ERROR:
                 {
                     const [id, message] = decodeRespondError(msg);
-                    console.log(`recv RESPOND_ERROR ${id}`);
+                    this.logger?.trace({ rpc: { direction: 'recv', msgId: 'RESPOND_ERROR', id } });
                     const result = this.pending.get(id);
                     if (result === undefined) {
                         throw new RemoteError(`Pending request with ID ${id} not found for error response`);
@@ -389,7 +391,7 @@ export class RPC {
         this.readerSubscription.unsubscribe();
     }
 }
-export function connect(local, remote, transport, state) {
-    return new RPC(transport, local, remote, state);
+export function connect(impl, transport, state, logger) {
+    return new RPC(transport, impl, state, logger);
 }
 //# sourceMappingURL=rpc.js.map