starpc 0.22.0 → 0.22.2

package/README.md

@@ -213,7 +213,6 @@ export PATH="/opt/homebrew/opt/findutils/libexec/gnubin:$PATH"
 export PATH="/opt/homebrew/opt/make/libexec/gnubin:$PATH"
 ```
 
-
 ## Support
 
 Please file a [GitHub issue] and/or [Join Discord] with any questions.

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

@@ -9,6 +9,7 @@ export declare class CommonRPC {
     private readonly _rpcDataSource;
     protected service?: string;
     protected method?: string;
+    private closed?;
     constructor();
     writeCallData(data?: Uint8Array, complete?: boolean, error?: string): Promise<void>;
     writeCallCancel(): Promise<void>;

package/dist/srpc/common-rpc.js

@@ -116,6 +116,10 @@ export class CommonRPC {
     }
     // close closes the call, optionally with an error.
     async close(err) {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
         try {
             await this.writeCallCancel();
         }
@@ -141,15 +145,11 @@ export class CommonRPC {
                         await this.handlePacket(msg);
                     }
                 }
+                this._rpcDataSource.end();
             }
             catch (err) {
-                const anyErr = err;
-                if (anyErr?.code !== 'ERR_STREAM_RESET' &&
-                    anyErr?.code !== 'ERR_STREAM_ABORT') {
-                    this.close(err);
-                }
+                this.close(err);
             }
-            this._rpcDataSource.end();
         };
     }
 }

package/dist/srpc/index.d.ts

@@ -1,8 +1,10 @@
-export type { PacketHandler, Stream, OpenStreamFunc } from './stream.js';
 export { ERR_RPC_ABORT, isAbortError, castToError } from './errors.js';
 export { Client } from './client.js';
 export { Server } from './server.js';
 export { Conn, ConnParams } from './conn.js';
+export { WebSocketConn } from './websocket.js';
+export { StreamConn } from './conn-stream.js';
+export type { PacketHandler, Stream, OpenStreamFunc } from './stream.js';
 export { Handler, InvokeFn, createHandler, createInvokeFn } from './handler.js';
 export { Packet, CallStart, CallData } from './rpcproto.pb.js';
 export { Mux, StaticMux, createMux } from './mux.js';

package/dist/srpc/index.js

@@ -2,6 +2,8 @@ export { ERR_RPC_ABORT, isAbortError, castToError } from './errors.js';
 export { Client } from './client.js';
 export { Server } from './server.js';
 export { Conn } from './conn.js';
+export { WebSocketConn } from './websocket.js';
+export { StreamConn } from './conn-stream.js';
 export { createHandler, createInvokeFn } from './handler.js';
 export { Packet, CallStart, CallData } from './rpcproto.pb.js';
 export { StaticMux, createMux } from './mux.js';

package/go.mod

@@ -4,12 +4,12 @@ go 1.19
 
 require (
 	github.com/pkg/errors v0.9.1 // latest
-	google.golang.org/protobuf v1.31.0 // latest
+	google.golang.org/protobuf v1.32.0 // latest
 	nhooyr.io/websocket v1.8.10 // master
 )
 
 require (
-	github.com/aperturerobotics/util v1.8.1 // latest
+	github.com/aperturerobotics/util v1.8.3 // latest
 	github.com/libp2p/go-libp2p v0.32.2 // latest
 	github.com/libp2p/go-yamux/v4 v4.0.1 // master
 	github.com/sirupsen/logrus v1.9.3 // latest

package/go.sum

@@ -1,13 +1,11 @@
-github.com/aperturerobotics/util v1.8.1 h1:xbr0THkzq2S5gVjZuSzw83GySiJY+/rTeQ8+pqWiBNw=
-github.com/aperturerobotics/util v1.8.1/go.mod h1:idhGuFuAatygqticAnPcSZhef8yV7TYufLUw1Qfj4Cg=
+github.com/aperturerobotics/util v1.8.3 h1:P+nU185SJKSzXXYTc1kdnzt6KNvxgV1ke0jbxltfwaI=
+github.com/aperturerobotics/util v1.8.3/go.mod h1:idhGuFuAatygqticAnPcSZhef8yV7TYufLUw1Qfj4Cg=
 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=
 github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
 github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
@@ -59,10 +57,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -61,7 +61,7 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@aperturerobotics/ts-common": "^0.6.6",
+    "@aperturerobotics/ts-common": "^0.8.0",
     "@typescript-eslint/eslint-plugin": "^6.15.0",
     "@typescript-eslint/parser": "^6.15.0",
     "bufferutil": "^4.0.7",

package/srpc/common-rpc.ts

@@ -28,6 +28,9 @@ export class CommonRPC {
   // method is the rpc method
   protected method?: string
 
+  // closed indicates this rpc has been closed already.
+  private closed?: boolean
+
   constructor() {
     this.sink = this._createSink()
     this.source = this._source
@@ -150,6 +153,10 @@ export class CommonRPC {
 
   // close closes the call, optionally with an error.
   public async close(err?: Error) {
+    if (this.closed) {
+      return
+    }
+    this.closed = true
     try {
       await this.writeCallCancel()
     } finally {
@@ -174,16 +181,10 @@ export class CommonRPC {
             await this.handlePacket(msg)
           }
         }
+        this._rpcDataSource.end()
       } catch (err) {
-        const anyErr = err as any
-        if (
-          anyErr?.code !== 'ERR_STREAM_RESET' &&
-          anyErr?.code !== 'ERR_STREAM_ABORT'
-        ) {
-          this.close(err as Error)
-        }
+        this.close(err as Error)
       }
-      this._rpcDataSource.end()
     }
   }
 }

package/srpc/index.ts

@@ -1,8 +1,10 @@
-export type { PacketHandler, Stream, OpenStreamFunc } from './stream.js'
 export { ERR_RPC_ABORT, isAbortError, castToError } from './errors.js'
 export { Client } from './client.js'
 export { Server } from './server.js'
 export { Conn, ConnParams } from './conn.js'
+export { WebSocketConn } from './websocket.js'
+export { StreamConn } from './conn-stream.js'
+export type { PacketHandler, Stream, OpenStreamFunc } from './stream.js'
 export { Handler, InvokeFn, createHandler, createInvokeFn } from './handler.js'
 export { Packet, CallStart, CallData } from './rpcproto.pb.js'
 export { Mux, StaticMux, createMux } from './mux.js'