Merge pull request #4 from jsonjoy-com/improvements

Improvements

Author: streamich

.github/workflows/pr.yml

@@ -40,7 +40,7 @@ jobs:
       - run: yarn lint
       - run: yarn prettier:check
       - run: yarn typedoc
-  e2e-rx-rpc:
+  e2e-sample-api-http1:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -53,4 +53,46 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
       - run: yarn install --frozen-lockfile
-      - run: yarn test:e2e
+      - run: yarn test:e2e --server http1 --suite sample-api
+  e2e-sample-api-uws:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20.x]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: yarn
+      - run: yarn install --frozen-lockfile
+      - run: yarn test:e2e --server uws --suite sample-api
+  e2e-json-crdt-server-http1:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20.x]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: yarn
+      - run: yarn install --frozen-lockfile
+      - run: yarn test:e2e --server http1 --suite json-crdt-server
+  e2e-json-crdt-server-uws:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20.x]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: yarn
+      - run: yarn install --frozen-lockfile
+      - run: yarn test:e2e --server uws --suite json-crdt-server

.github/workflows/release.yml

@@ -23,7 +23,10 @@ jobs:
       - run: yarn prettier:check
       - run: yarn lint
       - run: yarn test:ci --ci
-      - run: yarn test:e2e
+      - run: yarn test:e2e --server http1 --suite sample-api
+      - run: yarn test:e2e --server uws --suite sample-api
+      - run: yarn test:e2e --server http1 --suite json-crdt-server
+      - run: yarn test:e2e --server uws --suite json-crdt-server
       - run: yarn build
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v4

package.json

@@ -49,8 +49,12 @@
     "test": "jest --maxWorkers 7",
     "test:ci": "yarn jest --maxWorkers 3 --no-cache",
     "test:e2e": "node -r ts-node/register/transpile-only src/__tests__/e2e/run.ts",
-    "test:e2e:jest": "TEST_E2E=1 jest --maxWorkers 1 --no-cache src/__tests__/e2e/",
-    "demo:e2e:server": "ts-node src/__demos__/server.ts",
+    "test:e2e:jest:sample-api": "TEST_E2E=1 jest --maxWorkers 1 --no-cache src/__tests__/e2e/sample-api/",
+    "test:e2e:jest:json-crdt-server": "TEST_E2E=1 jest --maxWorkers 1 --no-cache src/__tests__/e2e/json-crdt-server/",
+    "demo:e2e:sample-api:http1": "ts-node src/__demos__/sample-api/main-http1.ts",
+    "demo:e2e:sample-api:uws": "ts-node src/__demos__/sample-api/main-uws.ts",
+    "demo:e2e:json-crdt-server:http1": "ts-node src/__demos__/json-crdt-server/main-http1.ts",
+    "demo:e2e:json-crdt-server:uws": "ts-node src/__demos__/json-crdt-server/main-uws.ts",
     "coverage": "yarn test --collectCoverage",
     "typedoc": "typedoc",
     "build:pages": "rimraf gh-pages && mkdir -p gh-pages && cp -r typedocs/* gh-pages && cp -r coverage gh-pages/coverage",
@@ -71,7 +75,8 @@
     "@jsonjoy.com/json-pack": "^1.0.2",
     "@jsonjoy.com/util": "^1.0.0",
     "json-joy": "^14.2.0",
-    "memfs": "^4.8.1"
+    "memfs": "^4.8.1",
+    "sonic-forest": "^1.0.0"
   },
   "devDependencies": {
     "@types/benchmark": "^2.1.5",

…json-crdt-server/__bench__/ping.bench.ts …json-crdt-server/__bench__/ping.bench.tssrc/json-crdt-server/__bench__/ping.bench.ts renamed to src/__demos__/json-crdt-server/__bench__/ping.bench.ts src/json-crdt-server/__bench__/ping.bench.ts renamed to src/__demos__/json-crdt-server/__bench__/ping.bench.ts

@@ -3,11 +3,11 @@
 /* tslint:disable no-console */
 
 import {Suite} from 'benchmark';
-import {RpcPersistentClient, WebSocketChannel} from '../../common';
+import {RpcPersistentClient, WebSocketChannel} from '../../../common';
 import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
-import {CompactRpcMessageCodec} from '../../common/codec/compact';
+import {CompactRpcMessageCodec} from '../../../common/codec/compact';
 import {JsonJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/json';
-import {RpcCodec} from '../../common/codec/RpcCodec';
+import {RpcCodec} from '../../../common/codec/RpcCodec';
 import {WebSocket} from 'ws';
 
 const main = async () => {

src/__demos__/json-crdt-server/__tests__/block.spec.ts

@@ -0,0 +1,5 @@
+import {setup} from './setup';
+import {runBlockTests} from '../../../__tests__/json-crdt-server/block';
+import type {ApiTestSetup} from '../../../common/rpc/__tests__/runApiTests';
+
+runBlockTests(setup as ApiTestSetup);

src/__demos__/json-crdt-server/__tests__/presence.spec.ts

@@ -0,0 +1,5 @@
+import {runPresenceTests} from '../../../__tests__/json-crdt-server/presence';
+import {setup} from './setup';
+import type {ApiTestSetup} from '../../../common/rpc/__tests__/runApiTests';
+
+runPresenceTests(setup as ApiTestSetup);

src/__demos__/json-crdt-server/__tests__/pubsub.spec.ts

@@ -0,0 +1,5 @@
+import {runPubsubTests} from '../../../__tests__/json-crdt-server/pubsub';
+import {setup} from './setup';
+import type {ApiTestSetup} from '../../../common/rpc/__tests__/runApiTests';
+
+runPubsubTests(setup as ApiTestSetup);

src/json-crdt-server/__tests__/setup.ts …os__/json-crdt-server/__tests__/setup.tssrc/json-crdt-server/__tests__/setup.ts renamed to src/__demos__/json-crdt-server/__tests__/setup.ts src/json-crdt-server/__tests__/setup.ts renamed to src/__demos__/json-crdt-server/__tests__/setup.ts

@@ -1,8 +1,8 @@
-import {buildE2eClient} from '../../common/testing/buildE2eClient';
+import {buildE2eClient} from '../../../common/testing/buildE2eClient';
 import {createCaller} from '../routes';
 import {Services} from '../services/Services';
 
-export const setup = () => {
+export const setup = async () => {
   const services = new Services();
   const {caller} = createCaller(services);
   const {client} = buildE2eClient(caller, {
@@ -14,5 +14,8 @@ export const setup = () => {
   });
   const call = client.call.bind(client);
   const call$ = client.call$.bind(client);
-  return {services, caller, client, call, call$};
+  const stop = () => {};
+  return {call, call$, stop};
 };
+
+export type JsonCrdtTestSetup = typeof setup;

src/__demos__/json-crdt-server/__tests__/util.spec.ts

@@ -0,0 +1,5 @@
+import {runUtilTests} from '../../../__tests__/json-crdt-server/util';
+import {setup} from './setup';
+import type {ApiTestSetup} from '../../../common/rpc/__tests__/runApiTests';
+
+runUtilTests(setup as ApiTestSetup);

src/__demos__/json-crdt-server/index.ts

@@ -0,0 +1,4 @@
+import {createCaller} from './routes';
+
+export {createCaller} from './routes';
+export type JsonJoyDemoRpcCaller = ReturnType<typeof createCaller>['caller'];