fix: 🐛 call sub-clients, prevent recursion

Author: streamich

src/__tests__/e2e/json-crdt-server/clients.spec.ts

@@ -20,18 +20,19 @@ if (process.env.TEST_E2E) {
     }
   });
 
-  // describe('RpcPersistentClient', () => {
-  //   const {list} = setupCodecs();
-  //   for (const codec of list) {
-  //     const setup: ApiTestSetup = async () => setupFetchRpcClient(codec);
-  //     describe(`protocol: application/x.${codec.specifier()}`, () => {
-  //       runUtilTests(setup, {staticOnly: true});
-  //       runPubsubTests(setup, {staticOnly: true});
-  //       runPresenceTests(setup, {staticOnly: true});
-  //       runBlockTests(setup, {staticOnly: true});
-  //     });
-  //   }
-  // });
+  describe('RpcPersistentClient', () => {
+    const {list} = setupCodecs();
+    for (const codec of list) {
+      const setup: ApiTestSetup = async () => setupFetchRpcClient(codec);
+      describe(`protocol: application/x.${codec.specifier()}`, () => {
+        runUtilTests(setup, {staticOnly: true});
+        runPubsubTests(setup, {staticOnly: true});
+        runPresenceTests(setup, {staticOnly: true});
+        runBlockTests(setup, {staticOnly: true});
+      });
+      break;
+    }
+  });
 
   describe('FetchRpcClient', () => {
     const {list} = setupCodecs();

src/common/rpc/client/EncodedStaticRpcClient.ts

@@ -31,10 +31,10 @@ export class EncodedStaticRpcClient implements RpcClient {
   }
 
   public async call(method: string, request: unknown): Promise<unknown> {
-    return this.call(method, request);
+    return this.client.call(method, request);
   }
 
   public notify(method: string, data: undefined | unknown): void {
-    this.notify(method, data);
+    this.client.notify(method, data);
   }
 }

src/common/rpc/client/FetchRpcClient.ts

@@ -28,7 +28,7 @@ export class FetchRpcClient implements RpcClient {
     const {msgCodec, reqCodec, resCodec = reqCodec, url} = options;
     let contentType = `application/x.rpc.${msgCodec.id}.${reqCodec.id}`;
     if (reqCodec.id !== resCodec.id) contentType += `-${resCodec.id}`;
-    const myFetch = options.fetch || fetch;
+    const currentFetch = options.fetch || fetch;
     this.client = new EncodedStaticRpcClient({
       client: new StaticRpcClient({
         bufferSize: options.bufferSize,
@@ -38,7 +38,7 @@ export class FetchRpcClient implements RpcClient {
       reqCodec,
       resCodec,
       send: async (body) => {
-        const response = await myFetch(url, {
+        const response = await currentFetch(url, {
           method: 'POST',
           headers: {
             'Content-Type': contentType,
@@ -56,11 +56,11 @@ export class FetchRpcClient implements RpcClient {
   }
 
   public async call(method: string, request: unknown): Promise<unknown> {
-    return this.call(method, request);
+    return this.client.call(method, request);
   }
 
   public notify(method: string, data: undefined | unknown): void {
-    this.notify(method, data);
+    this.client.notify(method, data);
   }
 
   public stop() {}