starpc 0.3.5 → 0.4.1

package/Makefile

@@ -1,13 +1,18 @@
+# https://github.com/aperturerobotics/protobuf-project
+
 PROTOWRAP=hack/bin/protowrap
 PROTOC_GEN_GO=hack/bin/protoc-gen-go
+PROTOC_GEN_GO_STARPC=hack/bin/protoc-gen-go-starpc
 PROTOC_GEN_VTPROTO=hack/bin/protoc-gen-go-vtproto
-PROTOC_GEN_STARPC=hack/bin/protoc-gen-go-starpc
 GOIMPORTS=hack/bin/goimports
 GOLANGCI_LINT=hack/bin/golangci-lint
 GO_MOD_OUTDATED=hack/bin/go-mod-outdated
-export GO111MODULE=on
 GOLIST=go list -f "{{ .Dir }}" -m
 
+export GO111MODULE=on
+undefine GOARCH
+undefine GOOS
+
 all:
 
 vendor:
@@ -17,19 +22,19 @@ $(PROTOC_GEN_GO):
 	cd ./hack; \
 	go build -v \
 		-o ./bin/protoc-gen-go \
-		github.com/golang/protobuf/protoc-gen-go
+		google.golang.org/protobuf/cmd/protoc-gen-go
 
-$(PROTOC_GEN_VTPROTO):
+$(PROTOC_GEN_GO_STARPC):
 	cd ./hack; \
 	go build -v \
-		-o ./bin/protoc-gen-go-vtproto \
-		github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto
+		-o ./bin/protoc-gen-go-starpc \
+		github.com/aperturerobotics/starpc/cmd/protoc-gen-go-starpc
 
-$(PROTOC_GEN_STARPC):
+$(PROTOC_GEN_VTPROTO):
 	cd ./hack; \
 	go build -v \
-		-o ./bin/protoc-gen-go-starpc \
-		github.com/aperturerobotics/starpc/cmd/protoc-gen-go-starpc
+		-o ./bin/protoc-gen-go-vtproto \
+		github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto
 
 $(GOIMPORTS):
 	cd ./hack; \
@@ -56,7 +61,7 @@ $(GO_MOD_OUTDATED):
 		github.com/psampaz/go-mod-outdated
 
 .PHONY: gengo
-gengo: $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTOC_GEN_VTPROTO) $(PROTOC_GEN_STARPC)
+gengo: $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_STARPC) $(PROTOC_GEN_VTPROTO)
 	go mod vendor
 	shopt -s globstar; \
 	set -eo pipefail; \
@@ -99,9 +104,10 @@ gents: $(PROTOWRAP) node_modules
 		-I $$(pwd)/vendor \
 		--plugin=./node_modules/.bin/protoc-gen-ts_proto \
 		--ts_proto_out=$$(pwd)/vendor \
+		--ts_proto_opt=esModuleInterop=true \
+		--ts_proto_opt=fileSuffix=.pb \
 		--ts_proto_opt=forceLong=long \
 		--ts_proto_opt=oneof=unions \
-		--ts_proto_opt=esModuleInterop=true \
 		--ts_proto_opt=outputServices=default,outputServices=generic-definitions \
 		--proto_path $$(pwd)/vendor \
 		--print_structure \
@@ -119,15 +125,19 @@ genproto: gengo gents
 .PHONY: gen
 gen: genproto
 
+.PHONY: outdated
 outdated: $(GO_MOD_OUTDATED)
 	go list -mod=mod -u -m -json all | $(GO_MOD_OUTDATED) -update -direct
 
+.PHONY: list
 list: $(GO_MOD_OUTDATED)
 	go list -mod=mod -u -m -json all | $(GO_MOD_OUTDATED)
 
+.PHONY: lint
 lint: $(GOLANGCI_LINT)
 	$(GOLANGCI_LINT) run
 
+.PHONY: fix
 fix: $(GOLANGCI_LINT)
 	$(GOLANGCI_LINT) run --fix
 
@@ -137,5 +147,4 @@ test:
 
 .PHONY: integration
 integration: node_modules vendor
-	cd ./integration && \
-		bash ./integration.bash
+	cd ./integration && bash ./integration.bash

package/README.md

@@ -13,6 +13,10 @@ Can use any Stream multiplexer: defaults to [libp2p-mplex] over a WebSocket.
 
 [libp2p-mplex]: https://github.com/libp2p/js-libp2p-mplex
 
+[rpcstream] supports sub-streams for per-component sub-services.
+
+[rpcstream]: ./rpcstream
+
 # Usage
 
 Starting with the [protobuf-project] repository on the "starpc" branch.

package/dist/echo/client-test.js

@@ -1,4 +1,4 @@
-import { EchoerClientImpl } from './echo.js';
+import { EchoerClientImpl } from './echo.pb.js';
 import { Observable } from 'rxjs';
 export async function runClientTest(client) {
     const demoServiceClient = new EchoerClientImpl(client);

package/dist/echo/{echo.js → echo.pb.js}

@@ -47,7 +47,6 @@ export const EchoMsg = {
     },
 };
 export class EchoerClientImpl {
-    rpc;
     constructor(rpc) {
         this.rpc = rpc;
         this.Echo = this.Echo.bind(this);

package/dist/echo/index.d.ts

@@ -1,3 +1,3 @@
-export * from './echo.js';
+export * from './echo.pb.js';
 export * from './server.js';
 export { runClientTest } from './client-test.js';

package/dist/echo/index.js

@@ -1,3 +1,3 @@
-export * from './echo.js';
+export * from './echo.pb.js';
 export * from './server.js';
 export { runClientTest } from './client-test.js';

package/dist/echo/server.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { Echoer, EchoMsg } from './echo';
+import { Echoer, EchoMsg } from './echo.pb.js';
 export declare class EchoerServer implements Echoer {
     Echo(request: EchoMsg): Promise<EchoMsg>;
     EchoServerStream(request: EchoMsg): Observable<EchoMsg>;

package/dist/rpcstream/rpcstream.d.ts

@@ -0,0 +1,19 @@
+import { Observable } from 'rxjs';
+import { Packet } from './rpcstream.pb.js';
+import { Server } from '../srpc/server.js';
+import { OpenStreamFunc, Stream } from '../srpc/stream.js';
+import { Pushable } from 'it-pushable';
+import { Source, Sink } from 'it-stream-types';
+export declare type RpcStreamCaller = (request: Observable<Packet>) => Observable<Packet>;
+export declare function buildRpcStreamOpenStream(componentId: string, caller: RpcStreamCaller): OpenStreamFunc;
+export declare type RpcStreamGetter = (componentId: string) => Promise<Server>;
+export declare function handleRpcStream(stream: Observable<Packet>, getter: RpcStreamGetter): AsyncIterable<Packet>;
+export declare class RpcStream implements Stream {
+    readonly source: Source<Uint8Array>;
+    readonly sink: Sink<Uint8Array>;
+    private readonly _packetSink;
+    private readonly _source;
+    constructor(packetSink: Pushable<Packet>, packetSource: Observable<Packet>);
+    private _createSink;
+    private _subscribePacketSource;
+}

package/dist/rpcstream/rpcstream.js

@@ -0,0 +1,94 @@
+import { from as obsFrom } from 'rxjs';
+import { pushable } from 'it-pushable';
+// buildRpcStreamOpenStream builds a OpenStream func with a RpcStream.
+export function buildRpcStreamOpenStream(componentId, caller) {
+    return async () => {
+        const packetSink = pushable({ objectMode: true });
+        const packetObs = obsFrom(packetSink);
+        const packetSource = caller(packetObs);
+        // write the component id
+        packetSink.push({
+            body: {
+                $case: 'init',
+                init: { componentId },
+            }
+        });
+        // build & return the stream
+        return new RpcStream(packetSink, packetSource);
+    };
+}
+// handleRpcStream handles an incoming RPC stream (remote is the initiator).
+export async function* handleRpcStream(stream, getter) {
+    // read the component id
+    const initPromise = new Promise((resolve, reject) => {
+        const subscription = stream.subscribe({
+            next(value) {
+                resolve(value);
+                subscription.unsubscribe();
+            },
+            error(err) {
+                reject(err);
+            },
+            complete() {
+                reject(new Error('no packet received'));
+            },
+        });
+    });
+    // read the init packet
+    const initPacket = await initPromise;
+    if (initPacket?.body?.$case !== 'init') {
+        throw new Error('expected init packet');
+    }
+    // lookup the server for the component id.
+    const server = await getter(initPacket.body.init.componentId);
+    // build the outgoing packet sink & the packet source
+    const packetSink = pushable({ objectMode: true });
+    // handle the stream
+    const rpcStream = new RpcStream(packetSink, stream);
+    server.handleDuplex(rpcStream);
+    // return the outgoing packet sink
+    return packetSink;
+}
+// RpcStream implements the Stream on top of a RPC call.
+export class RpcStream {
+    constructor(packetSink, packetSource) {
+        this._packetSink = packetSink;
+        this.sink = this._createSink();
+        const source = pushable({ objectMode: true });
+        this.source = source;
+        this._source = source;
+        this._subscribePacketSource(packetSource);
+    }
+    // _createSink initializes the sink field.
+    _createSink() {
+        return async (source) => {
+            try {
+                for await (const msg of source) {
+                    this._packetSink.push({
+                        body: { $case: 'data', data: msg }
+                    });
+                }
+                this._packetSink.end();
+            }
+            catch (err) {
+                this._packetSink.end(err);
+            }
+        };
+    }
+    // _subscribePacketSource starts the subscription to the response data.
+    _subscribePacketSource(packetSource) {
+        packetSource.subscribe({
+            next: (value) => {
+                if (value?.body?.$case === 'data') {
+                    this._source.push(value.body.data);
+                }
+            },
+            error: (err) => {
+                this._source.end(err);
+            },
+            complete: () => {
+                this._source.end();
+            },
+        });
+    }
+}

package/dist/rpcstream/rpcstream.pb.d.ts

@@ -0,0 +1,85 @@
+import Long from 'long';
+import * as _m0 from 'protobufjs/minimal';
+export declare const protobufPackage = "rpcstream";
+/** Packet is a packet encapsulating data for a RPC stream. */
+export interface Packet {
+    body?: {
+        $case: 'init';
+        init: RpcStreamInit;
+    } | {
+        $case: 'data';
+        data: Uint8Array;
+    };
+}
+/** RpcStreamInit is the first message in a RPC stream. */
+export interface RpcStreamInit {
+    /** ComponentId is the identifier of the component making the request. */
+    componentId: string;
+}
+export declare const Packet: {
+    encode(message: Packet, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number): Packet;
+    fromJSON(object: any): Packet;
+    toJSON(message: Packet): unknown;
+    fromPartial<I extends {
+        body?: ({
+            init?: {
+                componentId?: string | undefined;
+            } | undefined;
+        } & {
+            $case: "init";
+        }) | ({
+            data?: Uint8Array | undefined;
+        } & {
+            $case: "data";
+        }) | undefined;
+    } & {
+        body?: ({
+            init?: {
+                componentId?: string | undefined;
+            } | undefined;
+        } & {
+            $case: "init";
+        } & {
+            init?: ({
+                componentId?: string | undefined;
+            } & {
+                componentId?: string | undefined;
+            } & Record<Exclude<keyof I["body"]["init"], "componentId">, never>) | undefined;
+            $case: "init";
+        } & Record<Exclude<keyof I["body"], "$case" | "init">, never>) | ({
+            data?: Uint8Array | undefined;
+        } & {
+            $case: "data";
+        } & {
+            data?: Uint8Array | undefined;
+            $case: "data";
+        } & Record<Exclude<keyof I["body"], "$case" | "data">, never>) | undefined;
+    } & Record<Exclude<keyof I, "body">, never>>(object: I): Packet;
+};
+export declare const RpcStreamInit: {
+    encode(message: RpcStreamInit, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number): RpcStreamInit;
+    fromJSON(object: any): RpcStreamInit;
+    toJSON(message: RpcStreamInit): unknown;
+    fromPartial<I extends {
+        componentId?: string | undefined;
+    } & {
+        componentId?: string | undefined;
+    } & Record<Exclude<keyof I, "componentId">, never>>(object: I): RpcStreamInit;
+};
+declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
+    $case: string;
+} ? {
+    [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]>;
+} & {
+    $case: T['$case'];
+} : T extends {} ? {
+    [K in keyof T]?: DeepPartial<T[K]>;
+} : Partial<T>;
+declare type KeysOfUnion<T> = T extends T ? keyof T : never;
+export declare type Exact<P, I extends P> = P extends Builtin ? P : P & {
+    [K in keyof P]: Exact<P[K], I[K]>;
+} & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
+export {};

package/dist/rpcstream/rpcstream.pb.js

@@ -0,0 +1,160 @@
+/* eslint-disable */
+import Long from 'long';
+import * as _m0 from 'protobufjs/minimal';
+export const protobufPackage = 'rpcstream';
+function createBasePacket() {
+    return { body: undefined };
+}
+export const Packet = {
+    encode(message, writer = _m0.Writer.create()) {
+        if (message.body?.$case === 'init') {
+            RpcStreamInit.encode(message.body.init, writer.uint32(10).fork()).ldelim();
+        }
+        if (message.body?.$case === 'data') {
+            writer.uint32(18).bytes(message.body.data);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBasePacket();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.body = {
+                        $case: 'init',
+                        init: RpcStreamInit.decode(reader, reader.uint32()),
+                    };
+                    break;
+                case 2:
+                    message.body = { $case: 'data', data: reader.bytes() };
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return {
+            body: isSet(object.init)
+                ? { $case: 'init', init: RpcStreamInit.fromJSON(object.init) }
+                : isSet(object.data)
+                    ? { $case: 'data', data: bytesFromBase64(object.data) }
+                    : undefined,
+        };
+    },
+    toJSON(message) {
+        const obj = {};
+        message.body?.$case === 'init' &&
+            (obj.init = message.body?.init
+                ? RpcStreamInit.toJSON(message.body?.init)
+                : undefined);
+        message.body?.$case === 'data' &&
+            (obj.data =
+                message.body?.data !== undefined
+                    ? base64FromBytes(message.body?.data)
+                    : undefined);
+        return obj;
+    },
+    fromPartial(object) {
+        const message = createBasePacket();
+        if (object.body?.$case === 'init' &&
+            object.body?.init !== undefined &&
+            object.body?.init !== null) {
+            message.body = {
+                $case: 'init',
+                init: RpcStreamInit.fromPartial(object.body.init),
+            };
+        }
+        if (object.body?.$case === 'data' &&
+            object.body?.data !== undefined &&
+            object.body?.data !== null) {
+            message.body = { $case: 'data', data: object.body.data };
+        }
+        return message;
+    },
+};
+function createBaseRpcStreamInit() {
+    return { componentId: '' };
+}
+export const RpcStreamInit = {
+    encode(message, writer = _m0.Writer.create()) {
+        if (message.componentId !== '') {
+            writer.uint32(10).string(message.componentId);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseRpcStreamInit();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.componentId = reader.string();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return {
+            componentId: isSet(object.componentId) ? String(object.componentId) : '',
+        };
+    },
+    toJSON(message) {
+        const obj = {};
+        message.componentId !== undefined && (obj.componentId = message.componentId);
+        return obj;
+    },
+    fromPartial(object) {
+        const message = createBaseRpcStreamInit();
+        message.componentId = object.componentId ?? '';
+        return message;
+    },
+};
+var globalThis = (() => {
+    if (typeof globalThis !== 'undefined')
+        return globalThis;
+    if (typeof self !== 'undefined')
+        return self;
+    if (typeof window !== 'undefined')
+        return window;
+    if (typeof global !== 'undefined')
+        return global;
+    throw 'Unable to locate global object';
+})();
+const atob = globalThis.atob ||
+    ((b64) => globalThis.Buffer.from(b64, 'base64').toString('binary'));
+function bytesFromBase64(b64) {
+    const bin = atob(b64);
+    const arr = new Uint8Array(bin.length);
+    for (let i = 0; i < bin.length; ++i) {
+        arr[i] = bin.charCodeAt(i);
+    }
+    return arr;
+}
+const btoa = globalThis.btoa ||
+    ((bin) => globalThis.Buffer.from(bin, 'binary').toString('base64'));
+function base64FromBytes(arr) {
+    const bin = [];
+    arr.forEach((byte) => {
+        bin.push(String.fromCharCode(byte));
+    });
+    return btoa(bin.join(''));
+}
+if (_m0.util.Long !== Long) {
+    _m0.util.Long = Long;
+    _m0.configure();
+}
+function isSet(value) {
+    return value !== null && value !== undefined;
+}

package/dist/srpc/broadcast-channel.js

@@ -2,14 +2,6 @@ import { EventIterator } from 'event-iterator';
 import { DuplexConn } from './conn-duplex.js';
 // BroadcastChannelIterable is a AsyncIterable wrapper for BroadcastChannel.
 export class BroadcastChannelIterable {
-    // readChannel is the incoming broadcast channel
-    readChannel;
-    // writeChannel is the outgoing broadcast channel
-    writeChannel;
-    // sink is the sink for incoming messages.
-    sink;
-    // source is the source for outgoing messages.
-    source;
     constructor(readChannel, writeChannel) {
         this.readChannel = readChannel;
         this.writeChannel = writeChannel;
@@ -52,8 +44,6 @@ export function newBroadcastChannelIterable(readName, writeName) {
 //
 // expects Uint8Array objects over the BroadcastChannel.
 export class BroadcastChannelConn extends DuplexConn {
-    // broadcastChannel is the broadcast channel iterable
-    broadcastChannel;
     constructor(readChannel, writeChannel, server, connParams) {
         const broadcastChannel = new BroadcastChannelIterable(readChannel, writeChannel);
         super(broadcastChannel, server, connParams);

package/dist/srpc/client-rpc.d.ts

@@ -1,4 +1,4 @@
-import type { CallStart } from './rpcproto.js';
+import type { CallStart } from './rpcproto.pb.js';
 import { CommonRPC } from './common-rpc.js';
 export declare class ClientRPC extends CommonRPC {
     constructor(service: string, method: string);

package/dist/srpc/client.d.ts

@@ -2,11 +2,11 @@ import { Observable } from 'rxjs';
 import type { TsProtoRpc } from './ts-proto-rpc.js';
 import type { OpenStreamFunc } from './stream.js';
 export declare class Client implements TsProtoRpc {
-    private openConnFn;
-    private _openConnFn?;
-    constructor(openConnFn?: OpenStreamFunc);
-    setOpenConnFn(openConnFn?: OpenStreamFunc): Promise<OpenStreamFunc>;
-    private initOpenConnFn;
+    private openStreamFn;
+    private _openStreamFn?;
+    constructor(openStreamFn?: OpenStreamFunc);
+    setOpenStreamFn(openStreamFn?: OpenStreamFunc): Promise<OpenStreamFunc>;
+    private initOpenStreamFn;
     request(service: string, method: string, data: Uint8Array): Promise<Uint8Array>;
     clientStreamingRequest(service: string, method: string, data: Observable<Uint8Array>): Promise<Uint8Array>;
     serverStreamingRequest(service: string, method: string, data: Uint8Array): Observable<Uint8Array>;

package/dist/srpc/client.js

@@ -19,35 +19,31 @@ function writeClientStream(call, data) {
 }
 // Client implements the ts-proto Rpc interface with the drpcproto protocol.
 export class Client {
-    // openConnFn is a promise which contains the OpenStreamFunc.
-    openConnFn;
-    // _openConnFn resolves openConnFn.
-    _openConnFn;
-    constructor(openConnFn) {
-        this.openConnFn = this.setOpenConnFn(openConnFn);
+    constructor(openStreamFn) {
+        this.openStreamFn = this.setOpenStreamFn(openStreamFn);
     }
-    // setOpenConnFn updates the openConnFn for the Client.
-    setOpenConnFn(openConnFn) {
-        if (this._openConnFn) {
-            if (openConnFn) {
-                this._openConnFn(openConnFn);
-                this._openConnFn = undefined;
+    // setOpenStreamFn updates the openStreamFn for the Client.
+    setOpenStreamFn(openStreamFn) {
+        if (this._openStreamFn) {
+            if (openStreamFn) {
+                this._openStreamFn(openStreamFn);
+                this._openStreamFn = undefined;
             }
         }
         else {
-            if (openConnFn) {
-                this.openConnFn = Promise.resolve(openConnFn);
+            if (openStreamFn) {
+                this.openStreamFn = Promise.resolve(openStreamFn);
             }
             else {
-                this.initOpenConnFn();
+                this.initOpenStreamFn();
             }
         }
-        return this.openConnFn;
+        return this.openStreamFn;
     }
-    // initOpenConnFn creates the empty Promise for openConnFn.
-    initOpenConnFn() {
+    // initOpenStreamFn creates the empty Promise for openStreamFn.
+    initOpenStreamFn() {
         const openPromise = new Promise((resolve, reject) => {
-            this._openConnFn = (conn, err) => {
+            this._openStreamFn = (conn, err) => {
                 if (err) {
                     reject(err);
                 }
@@ -56,8 +52,8 @@ export class Client {
                 }
             };
         });
-        this.openConnFn = openPromise;
-        return this.openConnFn;
+        this.openStreamFn = openPromise;
+        return this.openStreamFn;
     }
     // request starts a non-streaming request.
     async request(service, method, data) {
@@ -84,7 +80,7 @@ export class Client {
     }
     // serverStreamingRequest starts a server-side streaming request.
     serverStreamingRequest(service, method, data) {
-        const pushServerData = pushable();
+        const pushServerData = pushable({ objectMode: true });
         const serverData = observableFrom(pushServerData);
         this.startRpc(service, method, data)
             .then(async (call) => {
@@ -103,7 +99,7 @@ export class Client {
     }
     // bidirectionalStreamingRequest starts a two-way streaming request.
     bidirectionalStreamingRequest(service, method, data) {
-        const pushServerData = pushable();
+        const pushServerData = pushable({ objectMode: true });
         const serverData = observableFrom(pushServerData);
         this.startRpc(service, method, null)
             .then(async (call) => {
@@ -135,8 +131,8 @@ export class Client {
     // throws any error starting the rpc call
     // if data == null and data.length == 0, sends a separate data packet.
     async startRpc(rpcService, rpcMethod, data) {
-        const openConnFn = await this.openConnFn;
-        const conn = await openConnFn();
+        const openStreamFn = await this.openStreamFn;
+        const conn = await openStreamFn();
         const call = new ClientRPC(rpcService, rpcMethod);
         pipe(conn, parseLengthPrefixTransform(), decodePacketSource, call, encodePacketSource, prependLengthPrefixTransform(), conn);
         await call.writeCallStart(data || undefined);

package/dist/srpc/common-rpc.d.ts

@@ -1,6 +1,6 @@
 import type { Source, Sink } from 'it-stream-types';
-import type { CallData, CallStart } from './rpcproto.js';
-import { Packet } from './rpcproto.js';
+import type { CallData, CallStart } from './rpcproto.pb.js';
+import { Packet } from './rpcproto.pb.js';
 export declare class CommonRPC {
     sink: Sink<Packet>;
     source: AsyncIterable<Packet>;