starpc 0.36.2 → 0.36.4

package/README.md

@@ -166,7 +166,7 @@ import { pushable } from 'it-pushable'
 const mux = createMux()
 const echoer = new EchoerServer()
 mux.register(createHandler(EchoerDefinition, echoer))
-const server = new Server(mux.lookupMethodFunc)
+const server = new Server(mux.lookupMethod)
 
 // Create the client connection to the server with an in-memory pipe.
 const clientConn = new Conn()

package/dist/srpc/common-rpc.js

@@ -148,7 +148,12 @@ export class CommonRPC {
         }
         this.closed = err ?? true;
         // note: this does nothing if _source is already ended.
-        await this.writeCallCancel();
+        if (err && err.message) {
+            await this.writeCallData(undefined, true, err.message);
+        }
+        else {
+            await this.writeCallCancel();
+        }
         this._source.end();
         this._rpcDataSource.end(err);
     }

package/dist/srpc/mux.d.ts

@@ -7,10 +7,10 @@ export declare function createMux(): StaticMux;
 export declare class StaticMux implements Mux {
     private services;
     private lookups;
-    get lookupMethodFunc(): LookupMethod;
+    get lookupMethod(): LookupMethod;
     register(handler: Handler): void;
     registerLookupMethod(lookupMethod: LookupMethod): void;
-    lookupMethod(serviceID: string, methodID: string): Promise<InvokeFn | null>;
+    private _lookupMethod;
     private lookupViaMap;
     private lookupViaLookups;
 }

package/dist/srpc/mux.js

@@ -10,9 +10,9 @@ export class StaticMux {
     // lookups is the list of lookup methods to call.
     // called if the method is not resolved by the services list.
     lookups = [];
-    // lookupMethodFunc implements the LookupMethod type.
-    get lookupMethodFunc() {
-        return this.lookupMethod.bind(this);
+    // lookupMethod implements the LookupMethod type.
+    get lookupMethod() {
+        return this._lookupMethod.bind(this);
     }
     register(handler) {
         const serviceID = handler?.getServiceID();
@@ -30,7 +30,7 @@ export class StaticMux {
     registerLookupMethod(lookupMethod) {
         this.lookups.push(lookupMethod);
     }
-    async lookupMethod(serviceID, methodID) {
+    async _lookupMethod(serviceID, methodID) {
         if (serviceID) {
             const invokeFn = await this.lookupViaMap(serviceID, methodID);
             if (invokeFn) {

package/dist/srpc/server.test.js

@@ -7,7 +7,7 @@ describe('srpc server', () => {
     let client;
     beforeEach(async () => {
         const mux = createMux();
-        const server = new Server(mux.lookupMethodFunc);
+        const server = new Server(mux.lookupMethod);
         const echoer = new EchoerServer(server);
         mux.register(createHandler(EchoerDefinition, echoer));
         // StreamConn is unnecessary since ChannelStream has packet framing.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.36.2",
+  "version": "0.36.4",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {

package/srpc/common-rpc.go

@@ -116,7 +116,7 @@ func (c *commonRPC) ReadOne() ([]byte, error) {
 
 // WriteCallData writes a call data packet.
 func (c *commonRPC) WriteCallData(data []byte, complete bool, err error) error {
-	outPkt := NewCallDataPacket(data, len(data) == 0, false, nil)
+	outPkt := NewCallDataPacket(data, len(data) == 0, complete, err)
 	return c.writer.WritePacket(outPkt)
 }
 

package/srpc/common-rpc.ts

@@ -176,7 +176,11 @@ export class CommonRPC {
     }
     this.closed = err ?? true
     // note: this does nothing if _source is already ended.
-    await this.writeCallCancel()
+    if (err && err.message) {
+      await this.writeCallData(undefined, true, err.message)
+    } else {
+      await this.writeCallCancel()
+    }
     this._source.end()
     this._rpcDataSource.end(err)
   }

package/srpc/mux.ts

@@ -30,9 +30,9 @@ export class StaticMux implements Mux {
   // called if the method is not resolved by the services list.
   private lookups: LookupMethod[] = []
 
-  // lookupMethodFunc implements the LookupMethod type.
-  public get lookupMethodFunc(): LookupMethod {
-    return this.lookupMethod.bind(this)
+  // lookupMethod implements the LookupMethod type.
+  public get lookupMethod(): LookupMethod {
+    return this._lookupMethod.bind(this)
   }
 
   public register(handler: Handler): void {
@@ -53,7 +53,7 @@ export class StaticMux implements Mux {
     this.lookups.push(lookupMethod)
   }
 
-  public async lookupMethod(
+  private async _lookupMethod(
     serviceID: string,
     methodID: string,
   ): Promise<InvokeFn | null> {

package/srpc/server.test.ts

@@ -21,7 +21,7 @@ describe('srpc server', () => {
 
   beforeEach(async () => {
     const mux = createMux()
-    const server = new Server(mux.lookupMethodFunc)
+    const server = new Server(mux.lookupMethod)
     const echoer = new EchoerServer(server)
     mux.register(createHandler(EchoerDefinition, echoer))