starpc 0.21.6 → 0.22.0

package/dist/srpc/websocket.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="ws" />
 import { Direction } from '@libp2p/interface/connection';
-import type WebSocket from 'isomorphic-ws';
+import type WebSocket from '@aptre/it-ws/web-socket';
 import { Conn } from './conn.js';
 import { Server } from './server.js';
 export declare class WebSocketConn extends Conn {

package/dist/srpc/websocket.js

@@ -1,5 +1,5 @@
-import { duplex } from 'it-ws';
 import { pipe } from 'it-pipe';
+import duplex from '@aptre/it-ws/duplex';
 import { Conn } from './conn.js';
 // WebSocketConn implements a connection with a WebSocket and optional Server.
 export class WebSocketConn extends Conn {

package/echo/echo_srpc.pb.go

@@ -102,6 +102,9 @@ type srpcEchoer_EchoClientStreamClient struct {
 }
 
 func (x *srpcEchoer_EchoClientStreamClient) Send(m *EchoMsg) error {
+	if m == nil {
+		return nil
+	}
 	return x.MsgSend(m)
 }
 
@@ -144,6 +147,9 @@ type srpcEchoer_EchoBidiStreamClient struct {
 }
 
 func (x *srpcEchoer_EchoBidiStreamClient) Send(m *EchoMsg) error {
+	if m == nil {
+		return nil
+	}
 	return x.MsgSend(m)
 }
 
@@ -180,6 +186,9 @@ type srpcEchoer_RpcStreamClient struct {
 }
 
 func (x *srpcEchoer_RpcStreamClient) Send(m *rpcstream.RpcStreamPacket) error {
+	if m == nil {
+		return nil
+	}
 	return x.MsgSend(m)
 }
 
@@ -346,8 +355,10 @@ func (x *srpcEchoer_EchoServerStreamStream) Send(m *EchoMsg) error {
 }
 
 func (x *srpcEchoer_EchoServerStreamStream) SendAndClose(m *EchoMsg) error {
-	if err := x.MsgSend(m); err != nil {
-		return err
+	if m != nil {
+		if err := x.MsgSend(m); err != nil {
+			return err
+		}
 	}
 	return x.CloseSend()
 }
@@ -389,8 +400,10 @@ func (x *srpcEchoer_EchoBidiStreamStream) Send(m *EchoMsg) error {
 }
 
 func (x *srpcEchoer_EchoBidiStreamStream) SendAndClose(m *EchoMsg) error {
-	if err := x.MsgSend(m); err != nil {
-		return err
+	if m != nil {
+		if err := x.MsgSend(m); err != nil {
+			return err
+		}
 	}
 	return x.CloseSend()
 }
@@ -423,8 +436,10 @@ func (x *srpcEchoer_RpcStreamStream) Send(m *rpcstream.RpcStreamPacket) error {
 }
 
 func (x *srpcEchoer_RpcStreamStream) SendAndClose(m *rpcstream.RpcStreamPacket) error {
-	if err := x.MsgSend(m); err != nil {
-		return err
+	if m != nil {
+		if err := x.MsgSend(m); err != nil {
+			return err
+		}
 	}
 	return x.CloseSend()
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.21.6",
+  "version": "0.22.0",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -33,7 +33,8 @@
     "url": "git+ssh://git@github.com/aperturerobotics/starpc.git"
   },
   "scripts": {
-    "build": "rimraf ./dist && tsc --project tsconfig.build.json --outDir ./dist/",
+    "clean": "rimraf ./dist",
+    "build": "npm run clean && tsc --project tsconfig.build.json --outDir ./dist/",
     "check": "npm run typecheck",
     "typecheck": "tsc --noEmit",
     "deps": "depcheck --ignores 'bufferutil,utf-8-validate,ts-proto,rimraf,@aperturerobotics/ts-common'",
@@ -76,6 +77,7 @@
     "utf-8-validate": "^6.0.3"
   },
   "dependencies": {
+    "@aptre/it-ws": "^1.0.0",
     "@chainsafe/libp2p-yamux": "^5.0.0",
     "@libp2p/interface": "^0.1.2",
     "event-iterator": "^2.0.0",
@@ -86,7 +88,6 @@
     "it-pipe": "^3.0.1",
     "it-pushable": "^3.2.3",
     "it-stream-types": "^2.0.1",
-    "it-ws": "^6.1.1",
     "long": "^5.2.3",
     "memoize-one": "^6.0.0",
     "patch-package": "^8.0.0",

package/srpc/websocket.ts

@@ -1,7 +1,8 @@
-import { duplex } from 'it-ws'
 import { pipe } from 'it-pipe'
 import { Direction } from '@libp2p/interface/connection'
-import type WebSocket from 'isomorphic-ws'
+
+import duplex from '@aptre/it-ws/duplex'
+import type WebSocket from '@aptre/it-ws/web-socket'
 
 import { Conn } from './conn.js'
 import { Server } from './server.js'