starpc 0.32.13 → 0.32.15

package/dist/srpc/server.test.js

@@ -0,0 +1,42 @@
+import { describe, it, beforeEach } from 'vitest';
+import { pipe } from 'it-pipe';
+import { createHandler, createMux, Server, Client, StreamConn, ChannelStream, combineUint8ArrayListTransform, } from '../srpc/index.js';
+import { EchoerDefinition, EchoerServer, runClientTest } from '../echo/index.js';
+import { runAbortControllerTest, runRpcStreamTest, } from '../echo/client-test.js';
+describe('srpc server', () => {
+    let client;
+    beforeEach(async () => {
+        const mux = createMux();
+        const server = new Server(mux.lookupMethodFunc);
+        const echoer = new EchoerServer(server);
+        mux.register(createHandler(EchoerDefinition, echoer));
+        // StreamConn is unnecessary since ChannelStream has packet framing.
+        // Use it here to include yamux in this e2e test.
+        const clientConn = new StreamConn();
+        const serverConn = new StreamConn(server, { direction: 'inbound' });
+        // pipe clientConn -> messageStream -> serverConn -> messageStream -> clientConn
+        const { port1: clientPort, port2: serverPort } = new MessageChannel();
+        const opts = {}; // { idleTimeoutMs: 250, keepAliveMs: 100 }
+        const clientChannelStream = new ChannelStream('client', clientPort, opts);
+        const serverChannelStream = new ChannelStream('server', serverPort, opts);
+        // Pipe the client traffic via the client end of the MessageChannel.
+        pipe(clientChannelStream, clientConn, combineUint8ArrayListTransform(), clientChannelStream)
+            .catch((err) => clientConn.close(err))
+            .then(() => clientConn.close());
+        // Pipe the server traffic via the server end of the MessageChannel.
+        pipe(serverChannelStream, serverConn, combineUint8ArrayListTransform(), serverChannelStream)
+            .catch((err) => serverConn.close(err))
+            .then(() => serverConn.close());
+        // Build the client
+        client = new Client(clientConn.buildOpenStreamFunc());
+    });
+    it('should pass client tests', async () => {
+        await runClientTest(client);
+    });
+    it('should pass abort controller tests', async () => {
+        await runAbortControllerTest(client);
+    });
+    it('should pass rpc stream tests', async () => {
+        await runRpcStreamTest(client);
+    });
+});

package/dist/srpc/websocket.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="ws" />
 import { Direction } from '@libp2p/interface';
 import type WebSocket from '@aptre/it-ws/web-socket';
 import { StreamConn } from './conn.js';

package/go.mod

@@ -13,7 +13,7 @@ replace nhooyr.io/websocket => github.com/paralin/nhooyr-websocket v1.8.12-0.202
 
 require (
 	github.com/aperturerobotics/protobuf-go-lite v0.6.5 // latest
-	github.com/aperturerobotics/util v1.23.5 // latest
+	github.com/aperturerobotics/util v1.23.7 // latest
 )
 
 require (
@@ -42,7 +42,7 @@ require (
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	golang.org/x/crypto v0.19.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )

package/go.sum

@@ -6,6 +6,8 @@ github.com/aperturerobotics/protobuf-go-lite v0.6.5 h1:AuPPcZ7ZaJe9ZYYC4gF7/5/Xb
 github.com/aperturerobotics/protobuf-go-lite v0.6.5/go.mod h1:YTbfnUj3feSULhs8VgepAHFnF3wUc0CPj4jd2axy21I=
 github.com/aperturerobotics/util v1.23.5 h1:OkqrAI3fJGwNyMk7WNpYZD9CvkTemxSZinqb1RzFvHY=
 github.com/aperturerobotics/util v1.23.5/go.mod h1:SBLeMheuujF7z+CZM58iPV9yvEwDiHrPIWUjdf0vVFY=
+github.com/aperturerobotics/util v1.23.7 h1:DERV75zYLRn4BTS0vMFkitWJhUg7VGG5UyJq2Frf3iI=
+github.com/aperturerobotics/util v1.23.7/go.mod h1:wpjaPlljanWro3pyt7/9Ja0mvFH26XL6MKsJSzF8s2Q=
 github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
 github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -59,6 +61,8 @@ golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.32.13",
+  "version": "0.32.15",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -30,7 +30,7 @@
     "!**/*.tsbuildinfo",
     "Makefile",
     "dist",
-    "e2e",
+    "mock",
     "echo",
     "go.mod",
     "go.sum",
@@ -57,7 +57,7 @@
     "test": "npm run test:js && npm run test:go",
     "test:go": "make test",
     "build:e2e": "npm run build && cd e2e && esbuild e2e.ts --sourcemap --outfile=e2e.cjs --bundle --platform=node",
-    "test:js": "npm run build:e2e && cd e2e && node ./e2e.cjs",
+    "test:js": "vitest",
     "debug:js": "npm run build:e2e && cd e2e && node --inspect --inspect-brk ./e2e.cjs",
     "test:integration": "make integration",
     "integration": "npm run test:integration",
@@ -82,22 +82,23 @@
     "./{srpc,echo,e2e,integration,rpcstream,cmd}/**/(*.ts|*.tsx|*.html|*.css)": "prettier --config .prettierrc.yaml --write"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.9.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
     "depcheck": "^1.4.6",
-    "esbuild": "^0.21.3",
+    "esbuild": "^0.22.0",
     "eslint": "^9.1.1",
     "eslint-config-prettier": "^9.1.0",
     "lint-staged": "^15.2.2",
     "pre-commit": "^1.2.2",
     "prettier": "^3.2.4",
     "rimraf": "^5.0.7",
-    "tsx": "^4.10.2",
-    "typescript": "^5.3.2"
+    "tsx": "^4.15.7",
+    "typescript": "^5.5.2",
+    "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@aptre/it-ws": "^1.0.0",
-    "@aptre/protobuf-es-lite": "^0.4.5",
+    "@aptre/it-ws": "^1.0.1",
+    "@aptre/protobuf-es-lite": "^0.4.6",
     "@chainsafe/libp2p-yamux": "^6.0.2",
     "@libp2p/interface": "^1.3.1",
     "@libp2p/logger": "^4.0.12",
@@ -111,6 +112,6 @@
     "ws": "^8.17.0"
   },
   "resolutions": {
-    "@aptre/protobuf-es-lite": "0.4.5"
+    "@aptre/protobuf-es-lite": "0.4.6"
   }
 }

package/srpc/server.test.ts

@@ -0,0 +1,74 @@
+import { describe, it, beforeEach } from 'vitest'
+import { pipe } from 'it-pipe'
+import {
+  createHandler,
+  createMux,
+  Server,
+  Client,
+  StreamConn,
+  ChannelStream,
+  combineUint8ArrayListTransform,
+  ChannelStreamOpts,
+} from '../srpc/index.js'
+import { EchoerDefinition, EchoerServer, runClientTest } from '../echo/index.js'
+import {
+  runAbortControllerTest,
+  runRpcStreamTest,
+} from '../echo/client-test.js'
+
+describe('srpc server', () => {
+  let client: Client
+
+  beforeEach(async () => {
+    const mux = createMux()
+    const server = new Server(mux.lookupMethodFunc)
+    const echoer = new EchoerServer(server)
+    mux.register(createHandler(EchoerDefinition, echoer))
+
+    // StreamConn is unnecessary since ChannelStream has packet framing.
+    // Use it here to include yamux in this e2e test.
+    const clientConn = new StreamConn()
+    const serverConn = new StreamConn(server, { direction: 'inbound' })
+
+    // pipe clientConn -> messageStream -> serverConn -> messageStream -> clientConn
+    const { port1: clientPort, port2: serverPort } = new MessageChannel()
+    const opts: ChannelStreamOpts = {} // { idleTimeoutMs: 250, keepAliveMs: 100 }
+    const clientChannelStream = new ChannelStream('client', clientPort, opts)
+    const serverChannelStream = new ChannelStream('server', serverPort, opts)
+
+    // Pipe the client traffic via the client end of the MessageChannel.
+    pipe(
+      clientChannelStream,
+      clientConn,
+      combineUint8ArrayListTransform(),
+      clientChannelStream,
+    )
+      .catch((err: Error) => clientConn.close(err))
+      .then(() => clientConn.close())
+
+    // Pipe the server traffic via the server end of the MessageChannel.
+    pipe(
+      serverChannelStream,
+      serverConn,
+      combineUint8ArrayListTransform(),
+      serverChannelStream,
+    )
+      .catch((err: Error) => serverConn.close(err))
+      .then(() => serverConn.close())
+
+    // Build the client
+    client = new Client(clientConn.buildOpenStreamFunc())
+  })
+
+  it('should pass client tests', async () => {
+    await runClientTest(client)
+  })
+
+  it('should pass abort controller tests', async () => {
+    await runAbortControllerTest(client)
+  })
+
+  it('should pass rpc stream tests', async () => {
+    await runRpcStreamTest(client)
+  })
+})

package/{e2e/e2e_test.go → srpc/server_test.go}

@@ -1,4 +1,4 @@
-package e2e
+package srpc_test
 
 import (
 	"context"
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	e2e_mock "github.com/aperturerobotics/starpc/e2e/mock"
 	"github.com/aperturerobotics/starpc/echo"
+	e2e_mock "github.com/aperturerobotics/starpc/mock"
 	"github.com/aperturerobotics/starpc/rpcstream"
 	"github.com/aperturerobotics/starpc/srpc"
 	"github.com/pkg/errors"

package/dist/e2e/e2e.js

@@ -1,49 +0,0 @@
-import { pipe } from 'it-pipe';
-import { createHandler, createMux, Server, Client, StreamConn, ChannelStream, combineUint8ArrayListTransform, } from '../srpc/index.js';
-import { EchoerDefinition, EchoerServer, runClientTest } from '../echo/index.js';
-import { runAbortControllerTest, runRpcStreamTest, } from '../echo/client-test.js';
-async function runRPC() {
-    const mux = createMux();
-    const server = new Server(mux.lookupMethodFunc);
-    const echoer = new EchoerServer(server);
-    mux.register(createHandler(EchoerDefinition, echoer));
-    // StreamConn is unnecessary since ChannelStream has packet framing.
-    // Use it here to include yamux in this e2e test.
-    const clientConn = new StreamConn();
-    const serverConn = new StreamConn(server, { direction: 'inbound' });
-    // pipe clientConn -> messageStream -> serverConn -> messageStream -> clientConn
-    const { port1: clientPort, port2: serverPort } = new MessageChannel();
-    const opts = {}; // { idleTimeoutMs: 250, keepAliveMs: 100 }
-    const clientChannelStream = new ChannelStream('client', clientPort, opts);
-    const serverChannelStream = new ChannelStream('server', serverPort, opts);
-    // Pipe the client traffic via the client end of the MessageChannel.
-    pipe(clientChannelStream, clientConn, combineUint8ArrayListTransform(), clientChannelStream)
-        .catch((err) => clientConn.close(err))
-        .then(() => clientConn.close());
-    // Pipe the server traffic via the server end of the MessageChannel.
-    pipe(serverChannelStream, serverConn, combineUint8ArrayListTransform(), serverChannelStream)
-        .catch((err) => serverConn.close(err))
-        .then(() => serverConn.close());
-    // Build the client
-    const client = new Client(clientConn.buildOpenStreamFunc());
-    // Run the tests
-    await runClientTest(client);
-    await runAbortControllerTest(client);
-    await runRpcStreamTest(client);
-    // Make sure we have no uncaught promises
-    await new Promise((resolve) => {
-        setTimeout(resolve, 500);
-    });
-    // Close cleanly
-    clientConn.close();
-    serverConn.close();
-}
-runRPC()
-    .then(() => {
-    console.log('finished successfully');
-    process.exit(0);
-})
-    .catch((err) => {
-    console.error('e2e tests failed', err);
-    process.exit(1);
-});

package/e2e/README.md

@@ -1,10 +0,0 @@
-# E2E
-
-E2E contains tests using the client and server written in the same language.
-
-For example:
-
- - Go Client calling Go server: "go test" or "yarn test:go"
- - TypeScript client calling TypeScript server: "yarn test:js"
-
-For cross-language tests, i.e. Ts <-> Go, see [integration](../integration).

package/e2e/e2e.go

@@ -1 +0,0 @@
-package e2e

package/e2e/e2e.ts

@@ -1,81 +0,0 @@
-import { pipe } from 'it-pipe'
-import {
-  createHandler,
-  createMux,
-  Server,
-  Client,
-  StreamConn,
-  ChannelStream,
-  combineUint8ArrayListTransform,
-  ChannelStreamOpts,
-} from '../srpc/index.js'
-import { EchoerDefinition, EchoerServer, runClientTest } from '../echo/index.js'
-import {
-  runAbortControllerTest,
-  runRpcStreamTest,
-} from '../echo/client-test.js'
-
-async function runRPC() {
-  const mux = createMux()
-  const server = new Server(mux.lookupMethodFunc)
-  const echoer = new EchoerServer(server)
-  mux.register(createHandler(EchoerDefinition, echoer))
-
-  // StreamConn is unnecessary since ChannelStream has packet framing.
-  // Use it here to include yamux in this e2e test.
-  const clientConn = new StreamConn()
-  const serverConn = new StreamConn(server, { direction: 'inbound' })
-
-  // pipe clientConn -> messageStream -> serverConn -> messageStream -> clientConn
-  const { port1: clientPort, port2: serverPort } = new MessageChannel()
-  const opts: ChannelStreamOpts = {} // { idleTimeoutMs: 250, keepAliveMs: 100 }
-  const clientChannelStream = new ChannelStream('client', clientPort, opts)
-  const serverChannelStream = new ChannelStream('server', serverPort, opts)
-
-  // Pipe the client traffic via the client end of the MessageChannel.
-  pipe(
-    clientChannelStream,
-    clientConn,
-    combineUint8ArrayListTransform(),
-    clientChannelStream,
-  )
-    .catch((err: Error) => clientConn.close(err))
-    .then(() => clientConn.close())
-
-  // Pipe the server traffic via the server end of the MessageChannel.
-  pipe(
-    serverChannelStream,
-    serverConn,
-    combineUint8ArrayListTransform(),
-    serverChannelStream,
-  )
-    .catch((err: Error) => serverConn.close(err))
-    .then(() => serverConn.close())
-
-  // Build the client
-  const client = new Client(clientConn.buildOpenStreamFunc())
-
-  // Run the tests
-  await runClientTest(client)
-  await runAbortControllerTest(client)
-  await runRpcStreamTest(client)
-
-  // Make sure we have no uncaught promises
-  await new Promise<void>((resolve) => {
-    setTimeout(resolve, 500)
-  })
-
-  // Close cleanly
-  clientConn.close()
-  serverConn.close()
-}
-
-runRPC()
-  .then(() => {
-    console.log('finished successfully')
-    process.exit(0)
-  })
-  .catch((err) => {
-    console.error('e2e tests failed', err)
-    process.exit(1)
-  })