starpc 0.47.1 → 0.48.0

package/dist/echo/index.d.ts

@@ -1,4 +1,5 @@
 export { EchoMsg } from './echo.pb.js';
-export { Echoer, EchoerClient, EchoerDefinition, EchoerServiceName, } from './echo_srpc.pb.js';
+export { EchoerClient, EchoerDefinition, EchoerServiceName, } from './echo_srpc.pb.js';
+export type { Echoer } from './echo_srpc.pb.js';
 export { EchoerServer } from './server.js';
 export { runClientTest } from './client-test.js';

package/dist/rpcstream/index.d.ts

@@ -1,2 +1,3 @@
-export { RpcStream, RpcStreamCaller, RpcStreamGetter, RpcStreamHandler, openRpcStream, handleRpcStream, buildRpcStreamOpenStream, } from './rpcstream.js';
+export { RpcStream, openRpcStream, handleRpcStream, buildRpcStreamOpenStream, } from './rpcstream.js';
+export type { RpcStreamCaller, RpcStreamGetter, RpcStreamHandler, } from './rpcstream.js';
 export { RpcStreamPacket, RpcStreamInit, RpcAck } from './rpcstream.pb.js';

package/dist/srpc/common-rpc.js

@@ -151,9 +151,6 @@ export class CommonRPC {
         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/index.d.ts

@@ -1,17 +1,23 @@
 export { ERR_RPC_ABORT, isAbortError, ERR_STREAM_IDLE, isStreamIdleError, castToError, } from './errors.js';
 export { Client } from './client.js';
 export { Server } from './server.js';
-export { StreamConn, StreamConnParams, StreamHandler } from './conn.js';
+export { StreamConn } from './conn.js';
+export type { StreamConnParams, StreamHandler } from './conn.js';
 export { WebSocketConn } from './websocket.js';
 export type { PacketHandler, OpenStreamFunc, HandleStreamFunc, PacketStream, streamToPacketStream, } from './stream.js';
-export { Handler, InvokeFn, MethodMap, StaticHandler, createHandler, } from './handler.js';
-export { MethodProto, createInvokeFn } from './invoker.js';
+export { StaticHandler, createHandler } from './handler.js';
+export type { Handler, InvokeFn, MethodMap } from './handler.js';
+export { createInvokeFn } from './invoker.js';
+export type { MethodProto } from './invoker.js';
 export { Packet, CallStart, CallData } from './rpcproto.pb.js';
-export { Mux, StaticMux, MultiMux, LookupMethod, createMux, createMultiMux, } from './mux.js';
-export { ChannelStreamMessage, ChannelPort, ChannelStream, ChannelStreamOpts, newBroadcastChannelStream, } from './channel.js';
+export { StaticMux, MultiMux, createMux, createMultiMux } from './mux.js';
+export type { Mux, LookupMethod } from './mux.js';
+export { ChannelStream, newBroadcastChannelStream } from './channel.js';
+export type { ChannelStreamMessage, ChannelPort, ChannelStreamOpts, } from './channel.js';
 export { BroadcastChannelDuplex, BroadcastChannelConn, newBroadcastChannelDuplex, } from './broadcast-channel.js';
 export { MessagePortDuplex, MessagePortConn, newMessagePortDuplex, } from './message-port.js';
-export { MessageStream, DecodeMessageTransform, buildDecodeMessageTransform, EncodeMessageTransform, buildEncodeMessageTransform, } from './message.js';
+export { buildDecodeMessageTransform, buildEncodeMessageTransform, } from './message.js';
+export type { MessageStream, DecodeMessageTransform, EncodeMessageTransform, } from './message.js';
 export { parseLengthPrefixTransform, prependLengthPrefixTransform, decodePacketSource, encodePacketSource, uint32LEDecode, uint32LEEncode, decodeUint32Le, encodeUint32Le, lengthPrefixDecode, lengthPrefixEncode, prependPacketLen, } from './packet.js';
 export { combineUint8ArrayListTransform } from './array-list.js';
 export { ValueCtr } from './value-ctr.js';
@@ -19,4 +25,4 @@ export { OpenStreamCtr } from './open-stream-ctr.js';
 export { HandleStreamCtr } from './handle-stream-ctr.js';
 export { writeToPushable, buildPushableSink, messagePushable, } from './pushable.js';
 export { Watchdog } from './watchdog.js';
-export { ProtoRpc } from './proto-rpc.js';
+export type { ProtoRpc } from './proto-rpc.js';

package/dist/srpc/index.js

@@ -3,11 +3,11 @@ export { Client } from './client.js';
 export { Server } from './server.js';
 export { StreamConn } from './conn.js';
 export { WebSocketConn } from './websocket.js';
-export { StaticHandler, createHandler, } from './handler.js';
+export { StaticHandler, createHandler } from './handler.js';
 export { createInvokeFn } from './invoker.js';
 export { Packet, CallStart, CallData } from './rpcproto.pb.js';
-export { StaticMux, MultiMux, createMux, createMultiMux, } from './mux.js';
-export { ChannelStream, newBroadcastChannelStream, } from './channel.js';
+export { StaticMux, MultiMux, createMux, createMultiMux } from './mux.js';
+export { ChannelStream, newBroadcastChannelStream } from './channel.js';
 export { BroadcastChannelDuplex, BroadcastChannelConn, newBroadcastChannelDuplex, } from './broadcast-channel.js';
 export { MessagePortDuplex, MessagePortConn, newMessagePortDuplex, } from './message-port.js';
 export { buildDecodeMessageTransform, buildEncodeMessageTransform, } from './message.js';

package/dist/srpc/server.d.ts

@@ -1,6 +1,6 @@
 import { LookupMethod } from './mux.js';
 import { ServerRPC } from './server-rpc.js';
-import { StreamHandler } from './conn.js';
+import type { StreamHandler } from './conn.js';
 import { PacketStream } from './stream.js';
 import { RpcStreamHandler } from '../rpcstream/rpcstream.js';
 export declare class Server implements StreamHandler {

package/echo/index.ts

@@ -1,9 +1,9 @@
 export { EchoMsg } from './echo.pb.js'
 export {
-  Echoer,
   EchoerClient,
   EchoerDefinition,
   EchoerServiceName,
 } from './echo_srpc.pb.js'
+export type { Echoer } from './echo_srpc.pb.js'
 export { EchoerServer } from './server.js'
 export { runClientTest } from './client-test.js'

package/go.mod

@@ -17,10 +17,10 @@ require (
 )
 
 require (
-	github.com/coder/websocket v1.8.14 // latest
+	github.com/aperturerobotics/go-websocket v1.8.15-0.20260228104546-35e37959349c // master
 	github.com/libp2p/go-yamux/v4 v4.0.2 // latest
 	github.com/pkg/errors v0.9.1 // latest
-	github.com/sirupsen/logrus v1.9.4 // latest
+	github.com/sirupsen/logrus v1.9.5-0.20260226151524-34027eac4204 // latest
 	google.golang.org/protobuf v1.36.11 // latest
 )
 

package/go.sum

@@ -8,6 +8,8 @@ github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260204215916-dc1f0fed8c
 github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260204215916-dc1f0fed8cfc/go.mod h1:OBb/beWmr/pDIZAUfi86j/4tBh2v5ctTxKMqSnh9c/4=
 github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260131050911-b5f94b044584 h1:ER8DYYL71cTg39uZ+Gi699tL/hZoscUWDOw4DbizqhI=
 github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260131050911-b5f94b044584/go.mod h1:vEq8i7EKb32+KXGtIEZjjhNns+BdsL2dUMw4uhy3578=
+github.com/aperturerobotics/go-websocket v1.8.15-0.20260228104546-35e37959349c h1:JATtwVM+rTNr0cwQhr9GtDRdi0EsLmfQ0dIT8SlhGMk=
+github.com/aperturerobotics/go-websocket v1.8.15-0.20260228104546-35e37959349c/go.mod h1:9KnSGuqxSXbdB/Oi0I6vvfPLkclfJwMGAQaDDGVgGow=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726 h1:4B1F0DzuqPzb6WqgCjWaqDD7JU9RDsevQG5OP0DFBgs=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726/go.mod h1:SvGGBv3OVxUyqO0ZxA/nvs6z3cg7NIbZ64TnbV2OISo=
 github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4 h1:4Dy3BAHh2kgVdHAqtlwcFsgY0kAwUe2m3rfFcaGwGQg=
@@ -16,8 +18,6 @@ github.com/aperturerobotics/protobuf-go-lite v0.12.2 h1:ujwTKgpIYAVsv8VljB6PPMY5
 github.com/aperturerobotics/protobuf-go-lite v0.12.2/go.mod h1:lGH3s5ArCTXKI4wJdlNpaybUtwSjfAG0vdWjxOfMcF8=
 github.com/aperturerobotics/util v1.32.4 h1:+f4rZuGC0AfgvA6bEwxSiW3Px9awyqr/CB2ltHyX4a8=
 github.com/aperturerobotics/util v1.32.4/go.mod h1:qfRZZUDn0sEfc43JRA6rKP8bwFxliqGqJZX+p1jeOnQ=
-github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
-github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
 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/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -30,8 +30,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
-github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
+github.com/sirupsen/logrus v1.9.5-0.20260226151524-34027eac4204 h1:YnveTg6h00DNa0rUaIImUk3icr3BIMedAbJparp1bVM=
+github.com/sirupsen/logrus v1.9.5-0.20260226151524-34027eac4204/go.mod h1:FXZFonkDAnFozmO+5hGAFvB0Yg9/j2SIhA/QuIkP180=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/tetratelabs/wazero v1.11.0 h1:+gKemEuKCTevU4d7ZTzlsvgd1uaToIDtlQlmNbwqYhA=

package/integration/integration.go

@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/aperturerobotics/go-websocket"
 	"github.com/aperturerobotics/starpc/echo"
 	"github.com/aperturerobotics/starpc/srpc"
-	"github.com/coder/websocket"
 	"github.com/sirupsen/logrus"
 )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.47.1",
+  "version": "0.48.0",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -108,22 +108,22 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.55.0",
-    "@typescript-eslint/parser": "^8.55.0",
+    "@typescript-eslint/eslint-plugin": "^8.56.1",
+    "@typescript-eslint/parser": "^8.56.1",
     "depcheck": "^1.4.6",
-    "esbuild": "^0.27.0",
-    "eslint": "^10.0.0",
+    "esbuild": "^0.27.3",
+    "eslint": "^10.0.2",
     "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-unused-imports": "^4.4.1",
     "globals": "^17.0.0",
-    "happy-dom": "^20.5.0",
+    "happy-dom": "^20.7.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
     "prettier": "^3.8.1",
-    "rimraf": "^6.1.2",
+    "rimraf": "^6.1.3",
     "tsx": "^4.20.4",
     "typescript": "^5.8.2",
-    "@typescript/native-preview": "^7.0.0-dev.20260202.1",
+    "@typescript/native-preview": "^7.0.0-dev.20260228.1",
     "vitest": "^4.0.18"
   },
   "dependencies": {

package/srpc/common-rpc.ts

@@ -178,8 +178,6 @@ export class CommonRPC {
     // note: this does nothing if _source is already ended.
     if (err && err.message) {
       await this.writeCallData(undefined, true, err.message)
-    } else {
-      await this.writeCallCancel()
     }
     this._source.end()
     this._rpcDataSource.end(err)

package/srpc/index.ts

@@ -7,7 +7,8 @@ export {
 } from './errors.js'
 export { Client } from './client.js'
 export { Server } from './server.js'
-export { StreamConn, StreamConnParams, StreamHandler } from './conn.js'
+export { StreamConn } from './conn.js'
+export type { StreamConnParams, StreamHandler } from './conn.js'
 export { WebSocketConn } from './websocket.js'
 export type {
   PacketHandler,
@@ -16,29 +17,18 @@ export type {
   PacketStream,
   streamToPacketStream,
 } from './stream.js'
-export {
-  Handler,
-  InvokeFn,
-  MethodMap,
-  StaticHandler,
-  createHandler,
-} from './handler.js'
-export { MethodProto, createInvokeFn } from './invoker.js'
+export { StaticHandler, createHandler } from './handler.js'
+export type { Handler, InvokeFn, MethodMap } from './handler.js'
+export { createInvokeFn } from './invoker.js'
+export type { MethodProto } from './invoker.js'
 export { Packet, CallStart, CallData } from './rpcproto.pb.js'
-export {
-  Mux,
-  StaticMux,
-  MultiMux,
-  LookupMethod,
-  createMux,
-  createMultiMux,
-} from './mux.js'
-export {
+export { StaticMux, MultiMux, createMux, createMultiMux } from './mux.js'
+export type { Mux, LookupMethod } from './mux.js'
+export { ChannelStream, newBroadcastChannelStream } from './channel.js'
+export type {
   ChannelStreamMessage,
   ChannelPort,
-  ChannelStream,
   ChannelStreamOpts,
-  newBroadcastChannelStream,
 } from './channel.js'
 export {
   BroadcastChannelDuplex,
@@ -51,11 +41,13 @@ export {
   newMessagePortDuplex,
 } from './message-port.js'
 export {
+  buildDecodeMessageTransform,
+  buildEncodeMessageTransform,
+} from './message.js'
+export type {
   MessageStream,
   DecodeMessageTransform,
-  buildDecodeMessageTransform,
   EncodeMessageTransform,
-  buildEncodeMessageTransform,
 } from './message.js'
 export {
   parseLengthPrefixTransform,
@@ -80,4 +72,4 @@ export {
   messagePushable,
 } from './pushable.js'
 export { Watchdog } from './watchdog.js'
-export { ProtoRpc } from './proto-rpc.js'
+export type { ProtoRpc } from './proto-rpc.js'

package/srpc/server-http.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/coder/websocket"
+	"github.com/aperturerobotics/go-websocket"
 )
 
 // HTTPServer implements the SRPC HTTP/WebSocket server.

package/srpc/server.ts

@@ -3,7 +3,7 @@ import { pipe } from 'it-pipe'
 import { LookupMethod } from './mux.js'
 import { ServerRPC } from './server-rpc.js'
 import { decodePacketSource, encodePacketSource } from './packet.js'
-import { StreamHandler } from './conn.js'
+import type { StreamHandler } from './conn.js'
 import { PacketStream } from './stream.js'
 import { RpcStreamHandler } from '../rpcstream/rpcstream.js'
 

package/srpc/websocket.go

@@ -3,7 +3,7 @@ package srpc
 import (
 	"context"
 
-	"github.com/coder/websocket"
+	"github.com/aperturerobotics/go-websocket"
 	"github.com/libp2p/go-yamux/v4"
 )