refactor: Switch from using objects with function keys to classes tha…

…t generate such a structure for TypeScript registry

ts/ltsrpc-example-closures-callee.ts

@@ -8,12 +8,13 @@ import { ILocalContext, Registry } from "./index";
 let clients = 0;
 
 const registry = new Registry(
-  {
-    Iterate: async (
+  new (class {
+    // eslint-disable-next-line class-methods-use-this
+    async Iterate(
       ctx: ILocalContext,
       length: number,
       onIteration: (i: number, b: string) => Promise<string>
-    ): Promise<number> => {
+    ): Promise<number> {
       for (let i = 0; i < length; i++) {
         // eslint-disable-next-line no-await-in-loop
         const rv = await onIteration(i, "This is from the callee");
@@ -22,9 +23,9 @@ const registry = new Registry(
       }
 
       return length;
-    },
-  },
-  {},
+    }
+  })(),
+  new (class {})(),
   {
     onClientConnect: () => {
       clients++;

ts/ltsrpc-example-closures-caller.ts

@@ -9,17 +9,20 @@ import { IRemoteContext, Registry } from "./index";
 let clients = 0;
 
 const registry = new Registry(
-  {},
-  {
-    Iterate: async (
+  new (class {})(),
+  new (class {
+    // eslint-disable-next-line class-methods-use-this
+    async Iterate(
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       ctx: IRemoteContext,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       length: number,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       onIteration: (i: number, b: string) => Promise<string>
-    ): Promise<number> => 0,
-  },
+    ): Promise<number> {
+      return 0;
+    }
+  })(),
   {
     onClientConnect: () => {
       clients++;

ts/ltsrpc-example-tcp-client.ts

@@ -9,17 +9,20 @@ import { ILocalContext, IRemoteContext, Registry } from "./index";
 let clients = 0;
 
 const registry = new Registry(
-  {
-    Println: async (ctx: ILocalContext, msg: string) => {
+  new (class {
+    // eslint-disable-next-line class-methods-use-this
+    async Println(ctx: ILocalContext, msg: string) {
       console.log("Printing message", msg, "for remote with ID", ctx.remoteID);
 
       console.log(msg);
-    },
-  },
-  {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    Increment: async (ctx: IRemoteContext, delta: number): Promise<number> => 0,
-  },
+    }
+  })(),
+  new (class {
+    // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars
+    async Increment(ctx: IRemoteContext, delta: number): Promise<number> {
+      return 0;
+    }
+  })(),
   {
     onClientConnect: () => {
       clients++;

ts/ltsrpc-example-tcp-server.ts

@@ -7,27 +7,28 @@ import { Socket, createServer } from "net";
 import { ILocalContext, IRemoteContext, Registry } from "./index";
 
 let clients = 0;
-let counter = 0;
 
 const registry = new Registry(
-  {
-    Increment: async (ctx: ILocalContext, delta: number): Promise<number> => {
+  new (class {
+    private counter = 0;
+
+    async Increment(ctx: ILocalContext, delta: number): Promise<number> {
       console.log(
         "Incrementing counter by",
         delta,
         "for remote with ID",
         ctx.remoteID
       );
 
-      counter += delta;
+      this.counter += delta;
 
-      return counter;
-    },
-  },
-  {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    Println: async (ctx: IRemoteContext, msg: string) => {},
-  },
+      return this.counter;
+    }
+  })(),
+  new (class {
+    // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
+    async Println(ctx: IRemoteContext, msg: string) {}
+  })(),
   {
     onClientConnect: () => {
       clients++;

ts/ltsrpc-example-websocket-client.ts

@@ -9,17 +9,20 @@ import { ILocalContext, IRemoteContext, Registry } from "./index";
 let clients = 0;
 
 const registry = new Registry(
-  {
-    Println: async (ctx: ILocalContext, msg: string) => {
+  new (class {
+    // eslint-disable-next-line class-methods-use-this
+    async Println(ctx: ILocalContext, msg: string) {
       console.log("Printing message", msg, "for remote with ID", ctx.remoteID);
 
       console.log(msg);
-    },
-  },
-  {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    Increment: async (ctx: IRemoteContext, delta: number): Promise<number> => 0,
-  },
+    }
+  })(),
+  new (class {
+    // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars
+    async Increment(ctx: IRemoteContext, delta: number): Promise<number> {
+      return 0;
+    }
+  })(),
   {
     onClientConnect: () => {
       clients++;

ts/ltsrpc-example-websocket-server.ts

@@ -7,27 +7,28 @@ import { WebSocketServer } from "ws";
 import { ILocalContext, IRemoteContext, Registry } from "./index";
 
 let clients = 0;
-let counter = 0;
 
 const registry = new Registry(
-  {
-    Increment: async (ctx: ILocalContext, delta: number): Promise<number> => {
+  new (class {
+    private counter = 0;
+
+    async Increment(ctx: ILocalContext, delta: number): Promise<number> {
       console.log(
         "Incrementing counter by",
         delta,
         "for remote with ID",
         ctx.remoteID
       );
 
-      counter += delta;
+      this.counter += delta;
 
-      return counter;
-    },
-  },
-  {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    Println: async (ctx: IRemoteContext, msg: string) => {},
-  },
+      return this.counter;
+    }
+  })(),
+  new (class {
+    // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
+    async Println(ctx: IRemoteContext, msg: string) {}
+  })(),
   {
     onClientConnect: () => {
       clients++;

ts/registry.ts

@@ -12,24 +12,18 @@ import {
 
 export const ErrorCallCancelled = "call timed out";
 
+const constructorFunctionName = "constructor";
+
 export interface ILocalContext {
   remoteID: string;
 }
 
-export interface ILocal {
-  [k: string]: (ctx: ILocalContext, ...rest: any) => Promise<any>;
-}
-
 export type IRemoteContext =
   | undefined
   | {
       signal?: AbortSignal;
     };
 
-export interface IRemote {
-  [k: string]: (ctx: IRemoteContext, ...rest: any) => Promise<any>;
-}
-
 interface ICallResponse {
   value?: any;
   err: string;
@@ -123,7 +117,7 @@ export interface IOptions {
   onClientDisconnect?: (remoteID: string) => void;
 }
 
-export class Registry<L extends ILocal, R extends IRemote> {
+export class Registry<L, R> {
   private local: L;
 
   private remotes: {
@@ -132,8 +126,15 @@ export class Registry<L extends ILocal, R extends IRemote> {
 
   constructor(local: L, private remote: R, private options?: IOptions) {
     const l: L = {} as L;
-    // eslint-disable-next-line no-restricted-syntax, guard-for-in
-    for (const functionName in local) {
+    // eslint-disable-next-line no-restricted-syntax
+    for (const functionName of Object.getOwnPropertyNames(
+      Object.getPrototypeOf(local)
+    )) {
+      if (functionName === constructorFunctionName) {
+        // eslint-disable-next-line no-continue
+        continue;
+      }
+
       (l as any)[functionName] = (...args: any[]) =>
         (local as any)[functionName](...args);
     }
@@ -161,9 +162,16 @@ export class Registry<L extends ILocal, R extends IRemote> {
   ) => {
     const broker = new EventEmitter();
 
-    const r = { ...this.remote };
-    // eslint-disable-next-line no-restricted-syntax, guard-for-in
-    for (const functionName in r) {
+    const r: R = {} as R;
+    // eslint-disable-next-line no-restricted-syntax
+    for (const functionName of Object.getOwnPropertyNames(
+      Object.getPrototypeOf(this.remote)
+    )) {
+      if (functionName === constructorFunctionName) {
+        // eslint-disable-next-line no-continue
+        continue;
+      }
+
       (r as any)[functionName] = async (ctx: IRemoteContext, ...rest: any[]) =>
         new Promise((res, rej) => {
           if (ctx?.signal?.aborted) {