@dxos/rpc 0.6.12-staging.e11e696 → 0.6.12

package/dist/types/src/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,eAAe,wBAAwB,KAAQ,CAAC,OAAO,EAAE,OAAO,CA2B7F,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,MAAM,KAAG,UAA2E,CAAC"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,eAAe,wBAAwB,KAAQ,CAAC,OAAO,EAAE,OAAO,CA2B7F,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/rpc",
-  "version": "0.6.12-staging.e11e696",
+  "version": "0.6.12",
   "description": "A lightweight, transport-agnostic RPC implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,8 +10,7 @@
     ".": {
       "browser": "./dist/lib/browser/index.mjs",
       "node": {
-        "require": "./dist/lib/node/index.cjs",
-        "default": "./dist/lib/node-esm/index.mjs"
+        "default": "./dist/lib/node/index.cjs"
       },
       "types": "./dist/types/src/index.d.ts"
     }
@@ -25,14 +24,18 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "0.6.12-staging.e11e696",
-    "@dxos/codec-protobuf": "0.6.12-staging.e11e696",
-    "@dxos/debug": "0.6.12-staging.e11e696",
-    "@dxos/invariant": "0.6.12-staging.e11e696",
-    "@dxos/log": "0.6.12-staging.e11e696",
-    "@dxos/util": "0.6.12-staging.e11e696",
-    "@dxos/protocols": "0.6.12-staging.e11e696",
-    "@dxos/node-std": "0.6.12-staging.e11e696"
+    "@dxos/async": "0.6.12",
+    "@dxos/debug": "0.6.12",
+    "@dxos/invariant": "0.6.12",
+    "@dxos/codec-protobuf": "0.6.12",
+    "@dxos/log": "0.6.12",
+    "@dxos/protocols": "0.6.12",
+    "@dxos/node-std": "0.6.12",
+    "@dxos/util": "0.6.12"
+  },
+  "devDependencies": {
+    "earljs": "~0.1.10",
+    "typescript": "^5.5.4"
   },
   "publishConfig": {
     "access": "public"

package/src/rpc.test.ts

@@ -2,21 +2,22 @@
 // Copyright 2021 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { expect } from 'earljs';
 
 import { Trigger, sleep } from '@dxos/async';
 import { type Any, Stream, type TaggedType } from '@dxos/codec-protobuf';
 import { log } from '@dxos/log';
 import { SystemError } from '@dxos/protocols';
 import { type TYPES } from '@dxos/protocols/proto';
+import { describe, test } from '@dxos/test';
 
 import { RpcPeer } from './rpc';
-import { createLinkedPorts, encodeMessage } from './testing';
+import { createLinkedPorts } from './testing';
 
 const createPayload = (value = ''): TaggedType<TYPES, 'google.protobuf.Any'> => ({
   '@type': 'google.protobuf.Any',
   type_url: 'dxos.test',
-  value: encodeMessage(value),
+  value: Buffer.from(value),
 });
 
 // TODO(dmaretskyi): Rename alice and bob to peer1 and peer2.
@@ -183,7 +184,7 @@ describe('RpcPeer', () => {
       const alice = new RpcPeer({
         callHandler: async (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value).toEqual(encodeMessage('request'));
+          expect(msg.value).toEqual(Buffer.from('request'));
           return createPayload('response');
         },
         port: alicePort,
@@ -201,7 +202,7 @@ describe('RpcPeer', () => {
       await Promise.all([alice.close(), bob.close()]);
     });
 
-    test.skip('can send multiple requests', async () => {
+    test('can send multiple requests', async () => {
       const [alicePort, bobPort] = createLinkedPorts();
 
       const alice: RpcPeer = new RpcPeer({
@@ -226,7 +227,7 @@ describe('RpcPeer', () => {
 
       await Promise.all([alice.open(), bob.open()]);
 
-      expect((await bob.call('method', createPayload('request'))).value).toEqual(encodeMessage('request'));
+      expect((await bob.call('method', createPayload('request'))).value).toEqual(Buffer.from('request'));
 
       const parallel1 = bob.call('method', createPayload('p1'));
       const parallel2 = bob.call('method', createPayload('p2'));
@@ -234,8 +235,8 @@ describe('RpcPeer', () => {
 
       await expect(await parallel1).toEqual(createPayload('p1'));
       await expect(await parallel2).toEqual(createPayload('p2'));
-      await expect(error).rejects.toBeInstanceOf(Error);
-    });
+      await expect(error).toBeRejected();
+    }).tag('flaky');
 
     test('errors get serialized', async () => {
       const [alicePort, bobPort] = createLinkedPorts();
@@ -266,7 +267,7 @@ describe('RpcPeer', () => {
         error = err;
       }
 
-      expect(error).toBeInstanceOf(SystemError);
+      expect(error).toBeA(SystemError);
       expect(error.message).toEqual('My error');
       expect(error.stack?.includes('handlerFn')).toEqual(true);
       expect(error.stack?.includes('RpcMethodName')).toEqual(true);
@@ -294,7 +295,7 @@ describe('RpcPeer', () => {
       const req = bob.call('method', createPayload('request'));
       await bob.close();
 
-      await expect(req).rejects.toBeInstanceOf(Error);
+      await expect(req).toBeRejected();
     });
 
     test('closing remote endpoint stops pending requests on timeout', async () => {
@@ -320,7 +321,7 @@ describe('RpcPeer', () => {
       await alice.close();
       const req = bob.call('method', createPayload('request'));
 
-      await expect(req).rejects.toBeInstanceOf(Error);
+      await expect(req).toBeRejected();
     });
 
     test('requests failing on timeout', async () => {
@@ -344,7 +345,7 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const req = bob.call('method', createPayload('request'));
-      await expect(req).rejects.toBeInstanceOf(Error);
+      await expect(req).toBeRejected();
     });
   });
 
@@ -356,7 +357,7 @@ describe('RpcPeer', () => {
         callHandler: async (msg) => createPayload(),
         streamHandler: (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value!).toEqual(encodeMessage('request'));
+          expect(msg.value!).toEqual(Buffer.from('request'));
           return new Stream<Any>(({ next, close }) => {
             next(createPayload('res1'));
             next(createPayload('res2'));
@@ -374,7 +375,7 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const stream = await bob.callStream('method', createPayload('request'));
-      expect(stream).toBeInstanceOf(Stream);
+      expect(stream).toBeA(Stream);
 
       expect(await Stream.consume(stream)).toEqual([
         { ready: true },
@@ -391,7 +392,7 @@ describe('RpcPeer', () => {
         callHandler: async (msg) => createPayload(),
         streamHandler: (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value).toEqual(encodeMessage('request'));
+          expect(msg.value).toEqual(Buffer.from('request'));
           return new Stream<Any>(({ next, close }) => {
             close(new Error('Test error'));
           });
@@ -407,12 +408,11 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const stream = await bob.callStream('method', createPayload('request'));
-      expect(stream).toBeInstanceOf(Stream);
+      expect(stream).toBeA(Stream);
 
       const msgs = await Stream.consume(stream);
-      expect(msgs.length).toEqual(1);
-      expect((msgs[0] as any).closed).toEqual(true);
-      expect((msgs[0] as any).error).toBeInstanceOf(Error);
+      expect(msgs).toEqual([{ closed: true, error: expect.a(Error) }]);
+
       expect((msgs[0] as any).error.message).toEqual('Test error');
     });
 
@@ -451,7 +451,7 @@ describe('RpcPeer', () => {
         callHandler: async (msg) => createPayload(),
         streamHandler: (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value!).toEqual(encodeMessage('request'));
+          expect(msg.value!).toEqual(Buffer.from('request'));
           return new Stream<Any>(({ ready, close }) => {
             ready();
             close();
@@ -468,7 +468,7 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const stream = await bob.callStream('method', createPayload('request'));
-      expect(stream).toBeInstanceOf(Stream);
+      expect(stream).toBeA(Stream);
 
       await stream.waitUntilReady();
 
@@ -494,12 +494,10 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const stream = await bob.callStream('method', createPayload('request'));
-      expect(stream).toBeInstanceOf(Stream);
+      expect(stream).toBeA(Stream);
 
       const msgs = await Stream.consume(stream);
-      expect(msgs.length).toEqual(1);
-      expect((msgs[0] as any).closed).toEqual(true);
-      expect((msgs[0] as any).error).toBeInstanceOf(Error);
+      expect(msgs).toEqual([{ closed: true, error: expect.a(Error) }]);
       expect((msgs[0] as any).error.message).toEqual('Test error');
     });
   });
@@ -523,7 +521,7 @@ describe('RpcPeer', () => {
       const alice = new RpcPeer({
         callHandler: async (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value).toEqual(encodeMessage('request'));
+          expect(msg.value).toEqual(Buffer.from('request'));
           return createPayload('response');
         },
         port: alicePort,

package/src/service.test.ts

@@ -2,7 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import { beforeEach, describe, expect, test } from 'vitest';
+import { expect } from 'earljs';
+import expectJest from 'expect';
 
 import { sleep, latch } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
@@ -13,9 +14,10 @@ import {
   type TestRpcResponse,
   type TestService,
 } from '@dxos/protocols/proto/example/testing/rpc';
+import { describe, test } from '@dxos/test';
 
 import { createProtoRpcPeer, type ProtoRpcPeer, createServiceBundle } from './service';
-import { createLinkedPorts, encodeMessage } from './testing';
+import { createLinkedPorts } from './testing';
 
 // TODO(dmaretskyi): Rename alice and bob to peer1 and peer2.
 
@@ -94,7 +96,7 @@ describe('Protobuf service', () => {
       error = err;
     }
 
-    expect(error).toBeInstanceOf(SystemError);
+    expect(error).toBeA(SystemError);
     expect(error.message).toEqual('TestError');
     expect(error.stack?.includes('handlerFn')).toEqual(true);
     expect(error.stack?.includes('TestCall')).toEqual(true);
@@ -447,7 +449,7 @@ describe('Protobuf service', () => {
       const stream = await client.rpc.TestStreamService.testCall({
         data: 'requestData',
       });
-      expect(await Stream.consume(stream)).toEqual([expect.objectContaining({ closed: true })]);
+      expect(await Stream.consume(stream)).toEqual([expect.objectWith({ closed: true })]);
     });
   });
 
@@ -508,11 +510,11 @@ describe('Protobuf service', () => {
             testCall: async (req) => {
               expect(req.payload['@type']).toEqual('google.protobuf.Any');
               expect(req.payload.type_url).toEqual('example.testing.Example');
-              expect(req.payload.value).toEqual(encodeMessage('hello'));
+              expect(req.payload.value).toEqual(Buffer.from('hello'));
               return {
                 payload: {
                   type_url: 'example.testing.Example',
-                  value: encodeMessage('world'),
+                  value: Buffer.from('world'),
                 },
               };
             },
@@ -539,12 +541,12 @@ describe('Protobuf service', () => {
       const response = await client.rpc.TestAnyService.testCall({
         payload: {
           type_url: 'example.testing.Example',
-          value: encodeMessage('hello'),
+          value: Buffer.from('hello'),
         },
       });
 
       expect(response.payload.type_url).toEqual('example.testing.Example');
-      expect(response.payload.value).toEqual(encodeMessage('world'));
+      expect(response.payload.value).toEqual(Buffer.from('world'));
     });
   });
 
@@ -583,6 +585,6 @@ describe('Protobuf service', () => {
       },
       { timeout: 1 },
     );
-    await expect(promise).rejects.toThrow(/Timeout/);
+    await expectJest(promise).rejects.toThrow(/Timeout/);
   });
 });

package/src/testing.ts

@@ -2,8 +2,6 @@
 // Copyright 2021 DXOS.org
 //
 
-import { isNode } from '@dxos/util';
-
 import { type RpcPort } from './rpc';
 
 export type CreateLinkedPortsOptions = {
@@ -41,5 +39,3 @@ export const createLinkedPorts = ({ delay }: CreateLinkedPortsOptions = {}): [Rp
 
   return [port1, port2];
 };
-
-export const encodeMessage = (msg: string): Uint8Array => (isNode() ? Buffer.from(msg) : new TextEncoder().encode(msg));