test: 💍 fix all tests

Author: streamich

src/common/rpc/__tests__/RpcMessageStreamProcessor.spec.ts

@@ -1,5 +1,5 @@
 import {RpcMessageStreamProcessor, RpcMessageStreamProcessorOptions} from '../RpcMessageStreamProcessor';
-import {RpcError, RpcErrorCodes} from '../caller';
+import {RpcError} from '../caller';
 import {of, from, Subject, Observable, Subscriber} from 'rxjs';
 import {map, switchMap, take} from 'rxjs/operators';
 import {ApiRpcCaller, ApiRpcCallerOptions} from '../caller/ApiRpcCaller';
@@ -12,9 +12,9 @@ import {
   ResponseErrorMessage,
   ResponseUnsubscribeMessage,
 } from '../../messages';
-import {until} from '../../../../__tests__/util';
+import {until} from 'thingies';
 import {RpcValue} from '../../messages/Value';
-import {t} from '../../../../json-type';
+import {t} from 'json-joy/lib/json-type';
 import {Defer} from '../../../util/Defer';
 
 const setup = (
@@ -728,8 +728,9 @@ describe('pre-call checks', () => {
         server.onMessage(new RequestDataMessage(1, 'test', val({a: '11'})), {foo: 'bar'});
         await new Promise((r) => setTimeout(r, 1));
         expect(send).toHaveBeenCalledTimes(1);
-        expect(send.mock.calls[0][0][0]).toBeInstanceOf(ResponseErrorMessage);
-        expect(send.mock.calls[0][0][0].value.data.message).toBe('BUFFER_OVERFLOW');
+        const errorValue = send.mock.calls[0][0][0];
+        expect(errorValue).toBeInstanceOf(ResponseErrorMessage);
+        expect(errorValue.value.data.message).toBe('BUFFER_OVERFLOW');
       });
 
       test('buffer size can be set to 5 for the whole server', async () => {

src/common/rpc/__tests__/RpcPersistentClient.spec.ts

@@ -1,12 +1,12 @@
+import {until} from 'thingies';
+import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {WebSocketChannel} from '../../channel';
 import {RpcPersistentClient} from '../RpcPersistentClient';
 import {createWebSocketMock} from '../../channel/mock';
 import {RequestCompleteMessage} from '../..';
-import {until} from '../../../../__tests__/util';
 import {RpcValue} from '../../messages/Value';
 import {RpcCodec} from '../../codec/RpcCodec';
-import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs';
-import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {RpcMessageCodecs} from '../../codec/RpcMessageCodecs';
 
 test('on remote method execution, sends message over WebSocket only once', async () => {

src/common/rpc/caller/RpcCaller.ts

@@ -1,9 +1,9 @@
 import {firstValueFrom, from, Observable, Subject} from 'rxjs';
 import {catchError, finalize, first, map, mergeWith, share, switchMap, take, tap} from 'rxjs/operators';
-import {BufferSubject} from 'json-joy/lib/util/rx/BufferSubject';
 import {RpcError, RpcErrorCodes, RpcErrorValue} from './error';
 import {RpcValue} from '../../messages/Value';
 import {StaticRpcMethod} from '../methods/StaticRpcMethod';
+import {BufferSubject} from '../../../util/rx/BufferSubject';
 import type {Call} from './types';
 import type {RpcMethod} from '../types';
 import type {StreamingRpcMethod} from '../methods/StreamingRpcMethod';

src/common/rpc/client/__tests__/StreamingRpcClient.spec.ts

@@ -10,7 +10,7 @@ import {
   ResponseErrorMessage,
 } from '../../../messages';
 import {firstValueFrom, Subject} from 'rxjs';
-import {until} from '../../../../../__tests__/util';
+import {until} from 'thingies';
 import {RpcValue} from '../../../messages/Value';
 
 test('can create client', async () => {

src/json-crdt-repo/__tests__/LocalHistoryCrud.spec.ts

@@ -2,8 +2,8 @@ import {memfs} from 'memfs';
 import {NodeCrud} from 'memfs/lib/node-to-crud';
 import {Locks} from 'thingies/es2020/Locks';
 import {LocalHistoryCrud} from '../LocalHistoryCrud';
-import {Log} from '../../json-crdt-server/log/Log';
-import {Model} from '../../json-crdt-server/model';
+import {Model} from 'json-joy/lib/json-crdt';
+import {Log} from 'json-joy/lib/json-crdt/log/Log';
 
 const setup = async () => {
   const {fs, vol} = memfs();

src/json-crdt-repo/remote/__tests__/RemoteHistoryServer.spec.ts

@@ -1,6 +1,6 @@
-import {Model} from '../../../json-crdt-server/model';
-import {buildE2eClient} from '../../../reactive-rpc/common/testing/buildE2eClient';
-import {createCaller} from '../../../server/routes/index';
+import {Model} from 'json-joy/lib/json-crdt';
+import {buildE2eClient} from '../../../common/testing/buildE2eClient';
+import {createCaller} from '../../../json-crdt-server/routes';
 import {RemoteHistoryDemoServer} from '../RemoteHistoryDemoServer';
 
 const setup = () => {

src/json-crdt-server/__bench__/ping.bench.ts

@@ -5,9 +5,7 @@
 import {Suite} from 'benchmark';
 import {RpcPersistentClient, WebSocketChannel} from '../../common';
 import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
-import {BinaryRpcMessageCodec} from '../../common/codec/binary';
 import {CompactRpcMessageCodec} from '../../common/codec/compact';
-import {CborJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/cbor';
 import {JsonJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/json';
 import {RpcCodec} from '../../common/codec/RpcCodec';
 import {WebSocket} from 'ws';

src/util/rx/BufferSubject.ts

@@ -0,0 +1,41 @@
+import {Subject, Subscription, Subscriber} from 'rxjs';
+import {RpcError, RpcErrorCodes} from '../../common/rpc/caller';
+
+export class BufferSubject<T> extends Subject<T> {
+  private buffer: T[] = [];
+  private isBuffering = true;
+
+  constructor(public readonly bufferSize: number) {
+    super();
+  }
+
+  protected _subscribe(subscriber: Subscriber<T>): Subscription {
+    // @ts-ignore
+    this._throwIfClosed();
+    // @ts-ignore
+    const subscription = this._innerSubscribe(subscriber);
+    const {buffer} = this;
+    for (let i = 0; i < buffer.length && !subscriber.closed; i += 1) {
+      subscriber.next(buffer[i] as T);
+    }
+    // @ts-ignore
+    this._checkFinalizedStatuses(subscriber);
+    return subscription;
+  }
+
+  public next(value: T): void {
+    if (this.isBuffering) {
+      if (this.buffer.length >= this.bufferSize) {
+        this.error(RpcError.fromCode(RpcErrorCodes.BUFFER_OVERFLOW));
+        return;
+      }
+      this.buffer.push(value);
+    }
+    super.next(value);
+  }
+
+  public flush(): void {
+    this.isBuffering = false;
+    this.buffer = [];
+  }
+}