starpc 0.1.2 → 0.1.5

package/README.md

@@ -1,16 +1,15 @@
 # Stream RPC
 
-**starpc** is a fully-featured client and server for [Proto3 services] in both
-TypeScript and Go.
+**starpc** implements [Proto3 services] in both TypeScript and Go.
 
 [Proto3 services]: https://developers.google.com/protocol-buffers/docs/proto3#services
 
-One of the first libraries to support **client-to-server streaming** RPCs.
+Supports **client-to-server streaming** RPCs in the web browser, currently not
+supported by any of the major RPC libraries.
 
-The [rpcproto](./srpc/rpcproto.proto) file contains the entire protocol.
+The [rpcproto](./srpc/rpcproto.proto) file describes the protocol.
 
-Leverages the Stream multiplexing of the underlying transport; for example:
-HTTP/2 or [libp2p-mplex] over a WebSocket.
+Uses any Stream multiplexer: defaults to [libp2p-mplex] over a WebSocket.
 
 [libp2p-mplex]: https://github.com/libp2p/js-libp2p-mplex
 
@@ -27,7 +26,9 @@ TypeScript and Go code for them.
 
 See the [protobuf-project] template on the "starpc" branch.
 
-[protobuf-project]: https://github.com/aperturerobotics/protobuf-project
+The demo/boilerplate project implements the Echo example below.
+
+[protobuf-project]: https://github.com/aperturerobotics/protobuf-project/tree/starpc
 
 ## Protobuf
 
@@ -150,7 +151,7 @@ Community contributions and discussion are welcomed!
 
 Please open a [GitHub issue] with any questions / issues.
 
-[GitHub issue]: https://github.com/aperturerobotics/bifrost/issues/new
+[GitHub issue]: https://github.com/aperturerobotics/starpc/issues/new
 
 ... or feel free to reach out on [Matrix Chat] or [Discord].
 

package/dist/srpc/conn.d.ts

@@ -1,4 +1,4 @@
-import type { Stream } from '@libp2p/interfaces/connection';
+import type { Stream } from '@libp2p/interface-connection';
 import type { Duplex } from 'it-stream-types';
 import type { Stream as SRPCStream } from './stream';
 import { Client } from './client';

package/dist/srpc/conn.js

@@ -1,4 +1,4 @@
-import { Components } from '@libp2p/interfaces/components';
+import { Components } from '@libp2p/components';
 import { MplexStreamMuxer } from '@libp2p/mplex';
 import { Client } from './client';
 // Conn implements a generic connection with a two-way stream.

package/go.mod

@@ -4,14 +4,14 @@ go 1.18
 
 require (
 	github.com/pkg/errors v0.9.1
-	google.golang.org/protobuf v1.26.0
-	nhooyr.io/websocket v1.8.7
+	google.golang.org/protobuf v1.27.1
+	nhooyr.io/websocket v1.8.8-0.20210410000328-8dee580a7f74
 )
 
 require (
 	github.com/libp2p/go-libp2p v0.20.1
-	github.com/sirupsen/logrus v1.8.1
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
+	github.com/libp2p/go-libp2p-core v0.16.1
+	github.com/sirupsen/logrus v1.8.2-0.20220112234510-85981c045988
 )
 
 require (
@@ -23,9 +23,8 @@ require (
 	github.com/ipfs/go-cid v0.1.0 // indirect
 	github.com/ipfs/go-log/v2 v2.5.1 // indirect
 	github.com/klauspost/compress v1.15.1 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.12 // indirect
 	github.com/libp2p/go-buffer-pool v0.0.2 // indirect
-	github.com/libp2p/go-libp2p-core v0.16.1 // indirect
 	github.com/libp2p/go-mplex v0.7.0 // indirect
 	github.com/libp2p/go-openssl v0.0.7 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
@@ -44,7 +43,7 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.1 // indirect
-	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
-	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
 	lukechampine.com/blake3 v1.1.6 // indirect
 )

package/go.sum

@@ -55,8 +55,9 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs
 github.com/klauspost/compress v1.15.1 h1:y9FcTHGyrebwfP0ZZqFiaxTaiDnUrGkJkI+f583BL1A=
 github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.0.12 h1:p9dKCg8i4gmOxtv35DvrYoWqYzQrvEVdjQ762Y0OqZE=
+github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -112,14 +113,13 @@ 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.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.8.2-0.20220112234510-85981c045988 h1:MF2lii450TvZhyAadvfiBGAr37d/U/ug5+N8eMvK89o=
+github.com/sirupsen/logrus v1.8.2-0.20220112234510-85981c045988/go.mod h1:x/wqQ2RFrvQZEw5sMa05JQ/UbAAIfbzwTyMeXz9S0YI=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
@@ -145,8 +145,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -173,14 +173,14 @@ golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -194,8 +194,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/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.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -206,5 +206,5 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 lukechampine.com/blake3 v1.1.6 h1:H3cROdztr7RCfoaTpGZFQsrqvweFLrqS73j7L7cmR5c=
 lukechampine.com/blake3 v1.1.6/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
-nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
-nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+nhooyr.io/websocket v1.8.8-0.20210410000328-8dee580a7f74 h1:V2XOYY4rGPHLTGQD4TiOMOfVwNd0zAuEPofzzEqiFWk=
+nhooyr.io/websocket v1.8.8-0.20210410000328-8dee580a7f74/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -45,7 +45,7 @@
     "lint": "npm run lint:go && npm run lint:js",
     "lint:go": "make lint",
     "lint:js": "eslint -c .eslintrc.js --ext .ts ./{srpc,echo}/**/*.ts",
-    "postinstall": "patch-package",
+    "prepare": "patch-package",
     "precommit": "npm run format"
   },
   "prettier": {
@@ -56,7 +56,7 @@
     "@types/varint": "^6.0.0",
     "@typescript-eslint/eslint-plugin": "^5.27.1",
     "@typescript-eslint/parser": "^5.27.1",
-    "esbuild": "^0.14.43",
+    "esbuild": "^0.14.44",
     "eslint": "^8.17.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard-with-typescript": "^21.0.1",
@@ -67,7 +67,9 @@
     "typescript": "^4.7.3"
   },
   "dependencies": {
-    "@libp2p/mplex": "^1.2.1",
+    "@libp2p/components": "^1.0.0",
+    "@libp2p/interface-connection": "^1.0.1",
+    "@libp2p/mplex": "^2.0.0",
     "event-iterator": "^2.0.0",
     "isomorphic-ws": "^4.0.1",
     "it-length-prefixed": "^7.0.1",
@@ -75,9 +77,10 @@
     "it-pushable": "^3.0.0",
     "it-stream-types": "^1.0.4",
     "it-ws": "^5.0.2",
-    "protobufjs": "^6.11.3",
     "patch-package": "^6.4.7",
+    "protobufjs": "^6.11.3",
     "rxjs": "^7.5.5",
+    "ts-poet": "^4.12.0",
     "ws": "^8.8.0"
   }
 }

package/patches/{@libp2p+mplex+1.2.1.patch → @libp2p+mplex+2.0.0.patch}

@@ -1,20 +1,21 @@
 diff --git a/node_modules/@libp2p/mplex/dist/src/index.d.ts b/node_modules/@libp2p/mplex/dist/src/index.d.ts
-index 9814d45..ada275f 100644
+index 14c5f6e..32d0ee0 100644
 --- a/node_modules/@libp2p/mplex/dist/src/index.d.ts
 +++ b/node_modules/@libp2p/mplex/dist/src/index.d.ts
 @@ -1,6 +1,7 @@
- import type { Components } from '@libp2p/interfaces/components';
- import type { StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interfaces/stream-muxer';
+ import { Components, Initializable } from '@libp2p/components';
+ import type { StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interface-stream-muxer';
  import { MplexStreamMuxer } from './mplex.js';
 +export { MplexStreamMuxer } from './mplex.js';
  export interface MplexInit {
      /**
       * The maximum size of message that can be sent in one go in bytes.
 diff --git a/node_modules/@libp2p/mplex/dist/src/index.js b/node_modules/@libp2p/mplex/dist/src/index.js
-index 2c4cf01..4359734 100644
+index 4d692df..7bf592c 100644
 --- a/node_modules/@libp2p/mplex/dist/src/index.js
 +++ b/node_modules/@libp2p/mplex/dist/src/index.js
-@@ -1,4 +1,5 @@
+@@ -1,5 +1,6 @@
+ import { Components } from '@libp2p/components';
  import { MplexStreamMuxer } from './mplex.js';
 +export { MplexStreamMuxer } from './mplex.js';
  export class Mplex {

package/patches/ts-poet+4.12.0.patch

@@ -0,0 +1,72 @@
+diff --git a/node_modules/ts-poet/build/Import.js b/node_modules/ts-poet/build/Import.js
+index 955a7eb..0ad3a67 100644
+--- a/node_modules/ts-poet/build/Import.js
++++ b/node_modules/ts-poet/build/Import.js
+@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.sameModule = exports.maybeRelativePath = exports.emitImports = exports.SideEffect = exports.Augmented = exports.ImportsAll = exports.ImportsDefault = exports.ImportsName = exports.Imported = exports.Implicit = exports.Import = exports.importType = void 0;
+ const lodash_1 = __importDefault(require("lodash"));
+ const path_1 = __importDefault(require("path"));
++const path = require("path");
+ const Node_1 = require("./Node");
+ const typeImportMarker = '(?:t:)?';
+ const fileNamePattern = '(?:[a-zA-Z0-9._-]+)';
+@@ -274,6 +275,15 @@ function emitImports(imports, ourModulePath, importMappings) {
+         return '';
+     }
+     let result = '';
++    const thisProject = process.env.PROJECT;
++    let ourModuleImportPath = path.normalize(ourModulePath);
++    // HACK: if this is an import from our project, set the path accordingly
++    // github.com/aperturerobotics/protobuf-project/example/example -> ./example/example
++    if (thisProject && ourModuleImportPath.startsWith(thisProject)) {
++        ourModuleImportPath = './' + ourModuleImportPath.substr(thisProject.length + 1);
++    }
++    // result += `// ourModulePath: ${ourModulePath}\n`;
++    // result += `// ourModuleImportPath: ${ourModuleImportPath}\n`;
+     const augmentImports = lodash_1.default.groupBy(filterInstances(imports, Augmented), (a) => a.augmented);
+     // Group the imports by source module they're imported from
+     const importsByModule = lodash_1.default.groupBy(imports.filter((it) => it.source !== undefined &&
+@@ -288,7 +298,16 @@ function emitImports(imports, ourModulePath, importMappings) {
+         if (modulePath in importMappings) {
+             modulePath = importMappings[modulePath];
+         }
+-        const importPath = maybeRelativePath(ourModulePath, modulePath);
++        // HACK: if this is an import from a different project, use vendor/ tree.
++        if (thisProject && modulePath.startsWith('./')) {
++            if (!modulePath.substr(2).startsWith(thisProject)) {
++                modulePath = './vendor/' + path.normalize(modulePath);
++            } else {
++                modulePath = './' + modulePath.substr(3 + thisProject.length);
++            }
++        }
++        // result += `// modulePath: ${modulePath}\n`;
++        const importPath = maybeRelativePath(ourModuleImportPath, modulePath);
+         // Output star imports individually
+         unique(filterInstances(imports, ImportsAll).map((i) => i.symbol)).forEach((symbol) => {
+             result += `import * as ${symbol} from '${importPath}';\n`;
+@@ -337,17 +356,15 @@ function maybeRelativePath(outputPath, importPath) {
+     if (!importPath.startsWith('./')) {
+         return importPath;
+     }
+-    // Drop the `./` prefix from the outputPath if it exists.
+-    const basePath = outputPath.replace(/^.\//, '');
+-    // Ideally we'd use a path library to do all this.
+-    const numberOfDirs = basePath.split('').filter((l) => l === '/').length;
+-    if (numberOfDirs === 0) {
+-        return importPath;
++    importPath = path.normalize(importPath);
++    outputPath = path.normalize(outputPath);
++    const outputPathDir = path.dirname(outputPath);
++    let relativePath = path.relative(outputPathDir, importPath);
++    if (!relativePath.startsWith('.')) {
++      // ensure the js compiler recognizes this is a relative path.
++      relativePath = './' + relativePath;
+     }
+-    // Make an array of `..` to get our importPath to the root directory.
+-    const a = new Array(numberOfDirs);
+-    const prefix = a.fill('..', 0, numberOfDirs).join('/');
+-    return prefix + importPath.substring(1);
++    return relativePath;
+ }
+ exports.maybeRelativePath = maybeRelativePath;
+ /** Checks if `path1 === path2` despite minor path differences like `./foo` and `foo`. */

package/srpc/conn.ts

@@ -1,6 +1,6 @@
-import type { Stream } from '@libp2p/interfaces/connection'
+import type { Stream } from '@libp2p/interface-connection'
 import type { Duplex } from 'it-stream-types'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { MplexStreamMuxer } from '@libp2p/mplex'
 import type { Stream as SRPCStream } from './stream'
 import { Client } from './client'