starpc 0.31.6 → 0.31.8

package/dist/srpc/rpcproto_pb.js

@@ -1,89 +1,11 @@
-// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/srpc/rpcproto.proto (package srpc, syntax proto3)
 /* eslint-disable */
-import { Message, proto3 } from '@bufbuild/protobuf';
-/**
- * Packet is a message sent over a srpc packet connection.
- *
- * @generated from message srpc.Packet
- */
-export class Packet extends Message {
-    /**
-     * Body is the packet body.
-     *
-     * @generated from oneof srpc.Packet.body
-     */
-    body = { case: undefined };
-    constructor(data) {
-        super();
-        proto3.util.initPartial(data, this);
-    }
-    static runtime = proto3;
-    static typeName = 'srpc.Packet';
-    static fields = proto3.util.newFieldList(() => [
-        { no: 1, name: 'call_start', kind: 'message', T: CallStart, oneof: 'body' },
-        { no: 2, name: 'call_data', kind: 'message', T: CallData, oneof: 'body' },
-        {
-            no: 3,
-            name: 'call_cancel',
-            kind: 'scalar',
-            T: 8 /* ScalarType.BOOL */,
-            oneof: 'body',
-        },
-    ]);
-    static fromBinary(bytes, options) {
-        return new Packet().fromBinary(bytes, options);
-    }
-    static fromJson(jsonValue, options) {
-        return new Packet().fromJson(jsonValue, options);
-    }
-    static fromJsonString(jsonString, options) {
-        return new Packet().fromJsonString(jsonString, options);
-    }
-    static equals(a, b) {
-        return proto3.util.equals(Packet, a, b);
-    }
-}
-/**
- * CallStart requests starting a new RPC call.
- *
- * @generated from message srpc.CallStart
- */
-export class CallStart extends Message {
-    /**
-     * RpcService is the service to contact.
-     * Must be set.
-     *
-     * @generated from field: string rpc_service = 1;
-     */
-    rpcService = '';
-    /**
-     * RpcMethod is the RPC method to call.
-     * Must be set.
-     *
-     * @generated from field: string rpc_method = 2;
-     */
-    rpcMethod = '';
-    /**
-     * Data contains the request or the first message in the stream.
-     * Optional if streaming.
-     *
-     * @generated from field: bytes data = 3;
-     */
-    data = new Uint8Array(0);
-    /**
-     * DataIsZero indicates Data is set with an empty message.
-     *
-     * @generated from field: bool data_is_zero = 4;
-     */
-    dataIsZero = false;
-    constructor(data) {
-        super();
-        proto3.util.initPartial(data, this);
-    }
-    static runtime = proto3;
-    static typeName = 'srpc.CallStart';
-    static fields = proto3.util.newFieldList(() => [
+import { createMessageType, } from '@aptre/protobuf-es-lite';
+export const protobufPackage = 'srpc';
+export const CallStart = createMessageType({
+    typeName: 'srpc.CallStart',
+    fields: [
         {
             no: 1,
             name: 'rpc_service',
@@ -93,73 +15,31 @@ export class CallStart extends Message {
         { no: 2, name: 'rpc_method', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
         { no: 3, name: 'data', kind: 'scalar', T: 12 /* ScalarType.BYTES */ },
         { no: 4, name: 'data_is_zero', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
-    ]);
-    static fromBinary(bytes, options) {
-        return new CallStart().fromBinary(bytes, options);
-    }
-    static fromJson(jsonValue, options) {
-        return new CallStart().fromJson(jsonValue, options);
-    }
-    static fromJsonString(jsonString, options) {
-        return new CallStart().fromJsonString(jsonString, options);
-    }
-    static equals(a, b) {
-        return proto3.util.equals(CallStart, a, b);
-    }
-}
-/**
- * CallData contains a message in a streaming RPC sequence.
- *
- * @generated from message srpc.CallData
- */
-export class CallData extends Message {
-    /**
-     * Data contains the packet in the sequence.
-     *
-     * @generated from field: bytes data = 1;
-     */
-    data = new Uint8Array(0);
-    /**
-     * DataIsZero indicates Data is set with an empty message.
-     *
-     * @generated from field: bool data_is_zero = 2;
-     */
-    dataIsZero = false;
-    /**
-     * Complete indicates the RPC call is completed.
-     *
-     * @generated from field: bool complete = 3;
-     */
-    complete = false;
-    /**
-     * Error contains any error that caused the RPC to fail.
-     * If set, implies complete=true.
-     *
-     * @generated from field: string error = 4;
-     */
-    error = '';
-    constructor(data) {
-        super();
-        proto3.util.initPartial(data, this);
-    }
-    static runtime = proto3;
-    static typeName = 'srpc.CallData';
-    static fields = proto3.util.newFieldList(() => [
+    ],
+    packedByDefault: true,
+});
+export const CallData = createMessageType({
+    typeName: 'srpc.CallData',
+    fields: [
         { no: 1, name: 'data', kind: 'scalar', T: 12 /* ScalarType.BYTES */ },
         { no: 2, name: 'data_is_zero', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
         { no: 3, name: 'complete', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
         { no: 4, name: 'error', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-    ]);
-    static fromBinary(bytes, options) {
-        return new CallData().fromBinary(bytes, options);
-    }
-    static fromJson(jsonValue, options) {
-        return new CallData().fromJson(jsonValue, options);
-    }
-    static fromJsonString(jsonString, options) {
-        return new CallData().fromJsonString(jsonString, options);
-    }
-    static equals(a, b) {
-        return proto3.util.equals(CallData, a, b);
-    }
-}
+    ],
+    packedByDefault: true,
+});
+export const Packet = createMessageType({
+    typeName: 'srpc.Packet',
+    fields: [
+        { no: 1, name: 'call_start', kind: 'message', T: CallStart, oneof: 'body' },
+        { no: 2, name: 'call_data', kind: 'message', T: CallData, oneof: 'body' },
+        {
+            no: 3,
+            name: 'call_cancel',
+            kind: 'scalar',
+            T: 8 /* ScalarType.BOOL */,
+            oneof: 'body',
+        },
+    ],
+    packedByDefault: true,
+});

package/e2e/mock/mock_pb.ts

@@ -1,64 +1,32 @@
-// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
 
-import type {
-  BinaryReadOptions,
-  FieldList,
-  JsonReadOptions,
-  JsonValue,
-  PartialMessage,
-  PlainMessage,
-} from '@bufbuild/protobuf'
-import { Message, proto3 } from '@bufbuild/protobuf'
+import {
+  createMessageType,
+  Message,
+  MessageType,
+  PartialFieldInfo,
+} from '@aptre/protobuf-es-lite'
+
+export const protobufPackage = 'e2e.mock'
 
 /**
  * MockMsg is the mock message body.
  *
  * @generated from message e2e.mock.MockMsg
  */
-export class MockMsg extends Message<MockMsg> {
+export interface MockMsg extends Message<MockMsg> {
   /**
    * @generated from field: string body = 1;
    */
-  body = ''
-
-  constructor(data?: PartialMessage<MockMsg>) {
-    super()
-    proto3.util.initPartial(data, this)
-  }
+  body?: string
+}
 
-  static readonly runtime: typeof proto3 = proto3
-  static readonly typeName = 'e2e.mock.MockMsg'
-  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+export const MockMsg: MessageType<MockMsg> = createMessageType({
+  typeName: 'e2e.mock.MockMsg',
+  fields: [
     { no: 1, name: 'body', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-  ])
-
-  static fromBinary(
-    bytes: Uint8Array,
-    options?: Partial<BinaryReadOptions>,
-  ): MockMsg {
-    return new MockMsg().fromBinary(bytes, options)
-  }
-
-  static fromJson(
-    jsonValue: JsonValue,
-    options?: Partial<JsonReadOptions>,
-  ): MockMsg {
-    return new MockMsg().fromJson(jsonValue, options)
-  }
-
-  static fromJsonString(
-    jsonString: string,
-    options?: Partial<JsonReadOptions>,
-  ): MockMsg {
-    return new MockMsg().fromJsonString(jsonString, options)
-  }
-
-  static equals(
-    a: MockMsg | PlainMessage<MockMsg> | undefined,
-    b: MockMsg | PlainMessage<MockMsg> | undefined,
-  ): boolean {
-    return proto3.util.equals(MockMsg, a, b)
-  }
-}
+  ] as readonly PartialFieldInfo[],
+  packedByDefault: true,
+})

package/e2e/mock/mock_srpc.pb.ts

@@ -3,8 +3,8 @@
 /* eslint-disable */
 
 import { MockMsg } from "./mock_pb.js";
-import type { PartialMessage } from "@bufbuild/protobuf";
 import { MethodKind } from "@bufbuild/protobuf";
+import { Message } from "@aptre/protobuf-es-lite";
 import { ProtoRpc } from "starpc";
 
 /**
@@ -41,9 +41,9 @@ export interface Mock {
    * @generated from rpc e2e.mock.Mock.MockRequest
    */
   MockRequest(
-request: PartialMessage<MockMsg>, abortSignal?: AbortSignal
+request: Message<MockMsg>, abortSignal?: AbortSignal
 ): 
-Promise<PartialMessage<MockMsg>>
+Promise<Message<MockMsg>>
 
 }
 
@@ -63,14 +63,14 @@ export class MockClient implements Mock {
    * @generated from rpc e2e.mock.Mock.MockRequest
    */
   async MockRequest(
-request: PartialMessage<MockMsg>, abortSignal?: AbortSignal
+request: Message<MockMsg>, abortSignal?: AbortSignal
 ): 
-Promise<PartialMessage<MockMsg>> {
-    const requestMsg = new MockMsg(request)
+Promise<Message<MockMsg>> {
+    const requestMsg = MockMsg.create(request)
     const result = await this.rpc.request(
       this.service,
       MockDefinition.methods.MockRequest.name,
-      requestMsg.toBinary(),
+      MockMsg.toBinary(requestMsg),
       abortSignal || undefined,
     )
     return MockMsg.fromBinary(result)

package/echo/client-test.ts

@@ -3,7 +3,7 @@ import { EchoMsg } from './echo_pb.js'
 import { EchoerClient } from './echo_srpc.pb.js'
 import { pushable } from 'it-pushable'
 import { buildRpcStreamOpenStream } from '../rpcstream/rpcstream.js'
-import { PartialMessage } from '@bufbuild/protobuf'
+import { Message } from '@aptre/protobuf-es-lite'
 
 export async function runClientTest(client: Client) {
   const demoServiceClient = new EchoerClient(client)
@@ -15,7 +15,7 @@ export async function runClientTest(client: Client) {
   console.log('success: output', result.body)
 
   // observable for client requests
-  const clientRequestStream = pushable<PartialMessage<EchoMsg>>({
+  const clientRequestStream = pushable<Message<EchoMsg>>({
     objectMode: true,
   })
   clientRequestStream.push({ body: 'Hello world from streaming request.' })

package/echo/echo_pb.ts

@@ -1,64 +1,32 @@
-// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
 
-import type {
-  BinaryReadOptions,
-  FieldList,
-  JsonReadOptions,
-  JsonValue,
-  PartialMessage,
-  PlainMessage,
-} from '@bufbuild/protobuf'
-import { Message, proto3 } from '@bufbuild/protobuf'
+import {
+  createMessageType,
+  Message,
+  MessageType,
+  PartialFieldInfo,
+} from '@aptre/protobuf-es-lite'
+
+export const protobufPackage = 'echo'
 
 /**
  * EchoMsg is the message body for Echo.
  *
  * @generated from message echo.EchoMsg
  */
-export class EchoMsg extends Message<EchoMsg> {
+export interface EchoMsg extends Message<EchoMsg> {
   /**
    * @generated from field: string body = 1;
    */
-  body = ''
-
-  constructor(data?: PartialMessage<EchoMsg>) {
-    super()
-    proto3.util.initPartial(data, this)
-  }
+  body?: string
+}
 
-  static readonly runtime: typeof proto3 = proto3
-  static readonly typeName = 'echo.EchoMsg'
-  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+export const EchoMsg: MessageType<EchoMsg> = createMessageType({
+  typeName: 'echo.EchoMsg',
+  fields: [
     { no: 1, name: 'body', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-  ])
-
-  static fromBinary(
-    bytes: Uint8Array,
-    options?: Partial<BinaryReadOptions>,
-  ): EchoMsg {
-    return new EchoMsg().fromBinary(bytes, options)
-  }
-
-  static fromJson(
-    jsonValue: JsonValue,
-    options?: Partial<JsonReadOptions>,
-  ): EchoMsg {
-    return new EchoMsg().fromJson(jsonValue, options)
-  }
-
-  static fromJsonString(
-    jsonString: string,
-    options?: Partial<JsonReadOptions>,
-  ): EchoMsg {
-    return new EchoMsg().fromJsonString(jsonString, options)
-  }
-
-  static equals(
-    a: EchoMsg | PlainMessage<EchoMsg> | undefined,
-    b: EchoMsg | PlainMessage<EchoMsg> | undefined,
-  ): boolean {
-    return proto3.util.equals(EchoMsg, a, b)
-  }
-}
+  ] as readonly PartialFieldInfo[],
+  packedByDefault: true,
+})

package/echo/echo_srpc.pb.ts

@@ -3,9 +3,9 @@
 /* eslint-disable */
 
 import { EchoMsg } from "./echo_pb.js";
-import type { PartialMessage } from "@bufbuild/protobuf";
 import { MethodKind } from "@bufbuild/protobuf";
 import { RpcStreamPacket } from "../rpcstream/rpcstream_pb.js";
+import { Message } from "@aptre/protobuf-es-lite";
 import { buildDecodeMessageTransform, buildEncodeMessageTransform, MessageStream, ProtoRpc } from "starpc";
 
 /**
@@ -86,9 +86,9 @@ export interface Echoer {
    * @generated from rpc echo.Echoer.Echo
    */
   Echo(
-request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal
+request: Message<EchoMsg>, abortSignal?: AbortSignal
 ): 
-Promise<PartialMessage<EchoMsg>>
+Promise<Message<EchoMsg>>
 
   /**
    * EchoServerStream is an example of a server -> client one-way stream.
@@ -96,7 +96,7 @@ Promise<PartialMessage<EchoMsg>>
    * @generated from rpc echo.Echoer.EchoServerStream
    */
   EchoServerStream(
-request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal
+request: Message<EchoMsg>, abortSignal?: AbortSignal
 ): 
 MessageStream<EchoMsg>
 
@@ -108,7 +108,7 @@ MessageStream<EchoMsg>
   EchoClientStream(
 request: MessageStream<EchoMsg>, abortSignal?: AbortSignal
 ): 
-Promise<PartialMessage<EchoMsg>>
+Promise<Message<EchoMsg>>
 
   /**
    * EchoBidiStream is an example of a two-way stream.
@@ -152,14 +152,14 @@ export class EchoerClient implements Echoer {
    * @generated from rpc echo.Echoer.Echo
    */
   async Echo(
-request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal
+request: Message<EchoMsg>, abortSignal?: AbortSignal
 ): 
-Promise<PartialMessage<EchoMsg>> {
-    const requestMsg = new EchoMsg(request)
+Promise<Message<EchoMsg>> {
+    const requestMsg = EchoMsg.create(request)
     const result = await this.rpc.request(
       this.service,
       EchoerDefinition.methods.Echo.name,
-      requestMsg.toBinary(),
+      EchoMsg.toBinary(requestMsg),
       abortSignal || undefined,
     )
     return EchoMsg.fromBinary(result)
@@ -171,14 +171,14 @@ Promise<PartialMessage<EchoMsg>> {
    * @generated from rpc echo.Echoer.EchoServerStream
    */
   EchoServerStream(
-request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal
+request: Message<EchoMsg>, abortSignal?: AbortSignal
 ): 
 MessageStream<EchoMsg> {
-    const requestMsg = new EchoMsg(request)
+    const requestMsg = EchoMsg.create(request)
     const result = this.rpc.serverStreamingRequest(
       this.service,
       EchoerDefinition.methods.EchoServerStream.name,
-      requestMsg.toBinary(),
+      EchoMsg.toBinary(requestMsg),
       abortSignal || undefined,
     )
     return buildDecodeMessageTransform(EchoMsg)(result)
@@ -192,7 +192,7 @@ MessageStream<EchoMsg> {
   async EchoClientStream(
 request: MessageStream<EchoMsg>, abortSignal?: AbortSignal
 ): 
-Promise<PartialMessage<EchoMsg>> {
+Promise<Message<EchoMsg>> {
     const result = await this.rpc.clientStreamingRequest(
       this.service,
       EchoerDefinition.methods.EchoClientStream.name,

package/echo/server.ts

@@ -1,4 +1,5 @@
 import first from 'it-first'
+import { Message } from '@aptre/protobuf-es-lite'
 import { EchoMsg } from './echo_pb.js'
 import { Server } from '../srpc/server.js'
 import { messagePushable, writeToPushable } from '../srpc/pushable.js'
@@ -6,7 +7,6 @@ import { RpcStreamPacket } from '../rpcstream/rpcstream_pb.js'
 import { MessageStream } from '../srpc/message.js'
 import { handleRpcStream, RpcStreamHandler } from '../rpcstream/rpcstream.js'
 import { Echoer } from './echo_srpc.pb.js'
-import { PartialMessage } from '@bufbuild/protobuf'
 
 // EchoServer implements the Echoer server.
 export class EchoerServer implements Echoer {
@@ -17,7 +17,7 @@ export class EchoerServer implements Echoer {
     this.proxyServer = proxyServer
   }
 
-  public async Echo(request: EchoMsg): Promise<PartialMessage<EchoMsg>> {
+  public async Echo(request: EchoMsg): Promise<Message<EchoMsg>> {
     return request
   }
 
@@ -30,7 +30,7 @@ export class EchoerServer implements Echoer {
 
   public async EchoClientStream(
     request: MessageStream<EchoMsg>,
-  ): Promise<PartialMessage<EchoMsg>> {
+  ): Promise<Message<EchoMsg>> {
     // return the first message sent by the client.
     const message = await first(request)
     if (!message) {

package/go.mod

@@ -4,7 +4,7 @@ go 1.22
 
 require (
 	github.com/aperturerobotics/protobuf-go-lite v0.6.0 // latest
-	github.com/aperturerobotics/util v1.20.1 // latest
+	github.com/aperturerobotics/util v1.20.3 // latest
 )
 
 require (

package/go.sum

@@ -4,6 +4,8 @@ github.com/aperturerobotics/protobuf-go-lite v0.6.0 h1:EE168e2oov6wmDv8AdSAlz2G1
 github.com/aperturerobotics/protobuf-go-lite v0.6.0/go.mod h1:6Bp+C+fI1uh0NmIKpxlxyHMkKtCP9Kb3PHkhOzxG4B8=
 github.com/aperturerobotics/util v1.20.1 h1:A4lcyULNtpID2pykIBLr7putGXFjjGi5EX0BpaVcdtY=
 github.com/aperturerobotics/util v1.20.1/go.mod h1:m6rsllH5ubGZvwFmdY3Tvm6LMgBtghqxPTynimEevl0=
+github.com/aperturerobotics/util v1.20.3 h1:HwPuHzOKLbZCw06AkVIDqrLAnMUJ4qxfWHJvS9gqZMQ=
+github.com/aperturerobotics/util v1.20.3/go.mod h1:4OxnbOvsS3jMZ9iLEUBaW79TQY/008nNWRrZfhe9ORg=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.31.6",
+  "version": "0.31.8",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -59,35 +59,49 @@
     "lint": "npm run lint:go && npm run lint:js",
     "lint:go": "make lint",
     "lint:js": "ESLINT_USE_FLAT_CONFIG=false eslint -c .eslintrc.cjs --ignore-pattern *.js --ignore-pattern *.d.ts ./",
+    "release:version": "npm version patch -m \"release: v%s\" --no-git-tag-version",
+    "release:commit": "git reset && git add package.json && git commit -s -m \"release: v$npm_package_version\" && git tag v$npm_package_version",
+    "release:publish": "git push && git push --tags && npm run build && npm publish",
+    "release": "npm run release:version && npm run release:commit",
     "prepare": "go mod vendor",
-    "precommit": "npm run format"
+    "precommit": "lint-staged"
+  },
+  "preferUnplugged": true,
+  "pre-commit": [
+    "precommit"
+  ],
+  "lint-staged": {
+    "package.json": "prettier --write",
+    "./{srpc,echo,e2e,integration,rpcstream,cmd}/**/(*.ts|*.tsx|*.html|*.css)": "prettier --write"
   },
   "prettier": {
     "semi": false,
     "singleQuote": true
   },
   "devDependencies": {
-    "@bufbuild/protoc-gen-es": "^1.9.0",
     "@typescript-eslint/eslint-plugin": "^7.7.1",
     "@typescript-eslint/parser": "^7.7.1",
     "depcheck": "^1.4.6",
     "esbuild": "^0.20.0",
     "eslint": "^9.1.1",
     "eslint-config-prettier": "^9.1.0",
+    "lint-staged": "^15.2.2",
+    "pre-commit": "^1.2.2",
     "prettier": "^3.2.4",
     "rimraf": "^5.0.1",
-    "tsx": "^4.7.2",
+    "tsx": "^4.7.3",
     "typescript": "^5.3.2"
   },
   "dependencies": {
     "@aptre/it-ws": "^1.0.0",
+    "@aptre/protobuf-es-lite": "^0.2.4",
     "@bufbuild/protoplugin": "^1.9.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
-    "@libp2p/interface": "^1.1.3",
-    "@libp2p/logger": "^4.0.6",
+    "@libp2p/interface": "^1.3.0",
+    "@libp2p/logger": "^4.0.11",
     "event-iterator": "^2.0.0",
     "isomorphic-ws": "^5.0.0",
-    "it-first": "^3.0.3",
+    "it-first": "^3.0.6",
     "it-pipe": "^3.0.1",
     "it-pushable": "^3.2.3",
     "it-stream-types": "^2.0.1",
@@ -96,6 +110,7 @@
     "ws": "^8.15.1"
   },
   "peerDependencies": {
+    "@aptre/protobuf-es-lite": "0.2.3",
     "@bufbuild/protobuf": "1.9.0"
   }
 }

package/srpc/client-rpc.ts

@@ -1,6 +1,6 @@
+import type { CompleteMessage } from '@aptre/protobuf-es-lite'
 import type { CallStart } from './rpcproto_pb.js'
 import { CommonRPC } from './common-rpc.js'
-import type { PartialMessage } from '@bufbuild/protobuf'
 
 // ClientRPC is an ongoing RPC from the client side.
 export class ClientRPC extends CommonRPC {
@@ -16,7 +16,7 @@ export class ClientRPC extends CommonRPC {
     if (!this.service || !this.method) {
       throw new Error('service and method must be set')
     }
-    const callStart: PartialMessage<CallStart> = {
+    const callStart: CompleteMessage<CallStart> = {
       rpcService: this.service,
       rpcMethod: this.method,
       data: data || new Uint8Array(0),
@@ -31,10 +31,10 @@ export class ClientRPC extends CommonRPC {
   }
 
   // handleCallStart handles a CallStart packet.
-  public override async handleCallStart(packet: Partial<CallStart>) {
+  public override async handleCallStart(packet: CallStart) {
     // we do not implement server -> client RPCs.
     throw new Error(
-      `unexpected server to client rpc: ${packet.rpcService}/${packet.rpcMethod}`,
+      `unexpected server to client rpc: ${packet.rpcService || '<empty>'}/${packet.rpcMethod || '<empty>'}`,
     )
   }
 }