refactor: Use more standard TypeScript project structure, update snap…

…shots
pojntfx · Jan 10, 2024 · b97891d · b97891d
1 parent 92aac4e
commit b97891d
Show file tree

Hide file tree

Showing 14 changed files with 267 additions and 10 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/ts/ltsrpc-example-closures-callee.ts → ts/bin/ltsrpc-example-closures-callee.ts b/ts/ltsrpc-example-closures-callee.ts → ts/bin/ltsrpc-example-closures-callee.ts
@@ -3,7 +3,7 @@ import { env, exit } from "process";
 import { parse } from "url";
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Socket, createServer } from "net";
-import { ILocalContext, Registry, remoteClosure } from "./index";
+import { ILocalContext, Registry, remoteClosure } from "../index";
 
 class Local {
   // eslint-disable-next-line class-methods-use-this

diff --git a/ts/ltsrpc-example-closures-caller.ts → ts/bin/ltsrpc-example-closures-caller.ts b/ts/ltsrpc-example-closures-caller.ts → ts/bin/ltsrpc-example-closures-caller.ts
@@ -4,7 +4,7 @@ import { createInterface } from "readline/promises";
 import { parse } from "url";
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Socket, createServer } from "net";
-import { IRemoteContext, Registry } from "./index";
+import { IRemoteContext, Registry } from "../index";
 
 class Local {}
 

diff --git a/ts/ltsrpc-example-tcp-client.ts → ts/bin/ltsrpc-example-tcp-client.ts b/ts/ltsrpc-example-tcp-client.ts → ts/bin/ltsrpc-example-tcp-client.ts
@@ -4,7 +4,7 @@ import { createInterface } from "readline/promises";
 import { parse } from "url";
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Socket, createServer } from "net";
-import { ILocalContext, IRemoteContext, Registry } from "./index";
+import { ILocalContext, IRemoteContext, Registry } from "../index";
 
 class Local {
   // eslint-disable-next-line class-methods-use-this

diff --git a/ts/ltsrpc-example-tcp-server.ts → ts/bin/ltsrpc-example-tcp-server.ts b/ts/ltsrpc-example-tcp-server.ts → ts/bin/ltsrpc-example-tcp-server.ts
@@ -4,7 +4,7 @@ import { createInterface } from "readline/promises";
 import { parse } from "url";
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Socket, createServer } from "net";
-import { ILocalContext, IRemoteContext, Registry } from "./index";
+import { ILocalContext, IRemoteContext, Registry } from "../index";
 
 class Local {
   private counter = 0;

diff --git a/ts/ltsrpc-example-websocket-client.ts → ts/bin/ltsrpc-example-websocket-client.ts b/ts/ltsrpc-example-websocket-client.ts → ts/bin/ltsrpc-example-websocket-client.ts
@@ -4,7 +4,7 @@ import { createInterface } from "readline/promises";
 import { parse } from "url";
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { WebSocketServer } from "ws";
-import { ILocalContext, IRemoteContext, Registry } from "./index";
+import { ILocalContext, IRemoteContext, Registry } from "../index";
 
 class Local {
   // eslint-disable-next-line class-methods-use-this

diff --git a/ts/ltsrpc-example-websocket-server.ts → ts/bin/ltsrpc-example-websocket-server.ts b/ts/ltsrpc-example-websocket-server.ts → ts/bin/ltsrpc-example-websocket-server.ts
@@ -4,7 +4,7 @@ import { createInterface } from "readline/promises";
 import { parse } from "url";
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { WebSocketServer } from "ws";
-import { ILocalContext, IRemoteContext, Registry } from "./index";
+import { ILocalContext, IRemoteContext, Registry } from "../index";
 
 class Local {
   private counter = 0;

diff --git a/ts/index.ts b/ts/index.ts
@@ -1,3 +1,3 @@
-export * from "./registry";
-export * from "./context";
-export { ErrorClosureDoesNotExist } from "./manager";
+export * from "./rpc/registry";
+export * from "./rpc/context";
+export { ErrorClosureDoesNotExist } from "./rpc/manager";
diff --git a/ts/context.ts → ts/rpc/context.ts b/ts/context.ts → ts/rpc/context.ts
diff --git a/ts/manager.ts → ts/rpc/manager.ts b/ts/manager.ts → ts/rpc/manager.ts
diff --git a/ts/registry.ts → ts/rpc/registry.ts b/ts/registry.ts → ts/rpc/registry.ts
@@ -9,7 +9,7 @@ import {
   unmarshalMessage,
   unmarshalRequest,
   unmarshalResponse,
-} from "./messages";
+} from "../utils/messages";
 import { ILocalContext, IRemoteContext } from "./context";
 import { ClosureManager, registerClosure } from "./manager";
 

diff --git a/ts/utils/__snapshots__/messages.test.ts.snap b/ts/utils/__snapshots__/messages.test.ts.snap
@@ -0,0 +1,257 @@
+// Bun Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Nested encoding Message can marshal a message with a request set 1`] = `"{"request":"eyJjYWxsIjoiMSIsImZ1bmN0aW9uIjoiUHJpbnRsbiIsImFyZ3MiOlsiSWtobGJHeHZMQ0IzYjNKc1pDRWkiXX0=","response":""}"`;
+
+exports[`Nested encoding Message can unmarshal a message with a request set 1`] = `
+{
+  "request": "eyJjYWxsIjoiMSIsImZ1bmN0aW9uIjoiUHJpbnRsbiIsImFyZ3MiOlsiSWtobGJHeHZMQ0IzYjNKc1pDRWkiXX0=",
+  "response": "",
+}
+`;
+
+exports[`Nested encoding Message can marshal a message with a response set 1`] = `"{"request":"","response":"eyJjYWxsIjoiMSIsInZhbHVlIjoiZEhKMVpRPT0iLCJlcnIiOiIifQ=="}"`;
+
+exports[`Nested encoding Message can unmarshal a message with a response set 1`] = `
+{
+  "request": "",
+  "response": "eyJjYWxsIjoiMSIsInZhbHVlIjoiZEhKMVpRPT0iLCJlcnIiOiIifQ==",
+}
+`;
+
+exports[`Nested encoding Request can marshal a simple request 1`] = `"eyJjYWxsIjoiMSIsImZ1bmN0aW9uIjoiUHJpbnRsbiIsImFyZ3MiOlsiSWtobGJHeHZMQ0IzYjNKc1pDRWkiXX0="`;
+
+exports[`Nested encoding Request can unmarshal a simple request 1`] = `
+{
+  "args": [
+    "Hello, world!",
+  ],
+  "call": "1",
+  "functionName": "Println",
+}
+`;
+
+exports[`Nested encoding Request can marshal a complex request 1`] = `"eyJjYWxsIjoiMS0yLTMiLCJmdW5jdGlvbiI6IkFkZCIsImFyZ3MiOlsiTVE9PSIsIk1nPT0iLCJleUpoYzJSbUlqb3hmUT09Il19"`;
+
+exports[`Nested encoding Request can unmarshal a complex request 1`] = `
+{
+  "args": [
+    1,
+    2,
+    {
+      "asdf": 1,
+    },
+  ],
+  "call": "1-2-3",
+  "functionName": "Add",
+}
+`;
+
+exports[`Nested encoding Response can marshal a simple response with no error 1`] = `"eyJjYWxsIjoiMSIsInZhbHVlIjoiZEhKMVpRPT0iLCJlcnIiOiIifQ=="`;
+
+exports[`Nested encoding Response can unmarshal a simple response with no error 1`] = `
+{
+  "call": "1",
+  "err": "",
+  "value": true,
+}
+`;
+
+exports[`Nested encoding Response can marshal a simple response with error 1`] = `"eyJjYWxsIjoiMSIsInZhbHVlIjoiZEhKMVpRPT0iLCJlcnIiOiJ0ZXN0IGVycm9yIn0="`;
+
+exports[`Nested encoding Response can unmarshal a simple response with error 1`] = `
+{
+  "call": "1",
+  "err": "test error",
+  "value": true,
+}
+`;
+
+exports[`Nested encoding Response can marshal a complex response with no error 1`] = `"eyJjYWxsIjoiMSIsInZhbHVlIjoiZXlKaElqb3hMQ0ppSWpwN0ltTWlPaUowWlhOMEluMTkiLCJlcnIiOiIifQ=="`;
+
+exports[`Nested encoding Response can unmarshal a complex response with no error 1`] = `
+{
+  "call": "1",
+  "err": "",
+  "value": {
+    "a": 1,
+    "b": {
+      "c": "test",
+    },
+  },
+}
+`;
+
+exports[`Nested encoding Response can marshal a complex response with error 1`] = `"eyJjYWxsIjoiMSIsInZhbHVlIjoiZXlKaElqb3hMQ0ppSWpwN0ltTWlPaUowWlhOMEluMTkiLCJlcnIiOiJ0ZXN0IGVycm9yIn0="`;
+
+exports[`Nested encoding Response can unmarshal a complex response with error 1`] = `
+{
+  "call": "1",
+  "err": "test error",
+  "value": {
+    "a": 1,
+    "b": {
+      "c": "test",
+    },
+  },
+}
+`;
+
+exports[`Flat encoding Message can marshal a message with a request set 1`] = `"{"request":{"call":"1","function":"Println","args":["Hello, world!"]},"response":""}"`;
+
+exports[`Flat encoding Message can unmarshal a message with a request set 1`] = `
+{
+  "request": {
+    "args": [
+      "Hello, world!",
+    ],
+    "call": "1",
+    "function": "Println",
+  },
+  "response": "",
+}
+`;
+
+exports[`Flat encoding Message can marshal a message with a response set 1`] = `"{"request":"","response":{"call":"1","value":true,"err":""}}"`;
+
+exports[`Flat encoding Message can unmarshal a message with a response set 1`] = `
+{
+  "request": "",
+  "response": {
+    "call": "1",
+    "err": "",
+    "value": true,
+  },
+}
+`;
+
+exports[`Flat encoding Request can marshal a simple request 1`] = `
+{
+  "args": [
+    "Hello, world!",
+  ],
+  "call": "1",
+  "function": "Println",
+}
+`;
+
+exports[`Flat encoding Request can unmarshal a simple request 1`] = `
+{
+  "args": [
+    "Hello, world!",
+  ],
+  "call": undefined,
+  "functionName": "Println",
+}
+`;
+
+exports[`Flat encoding Request can marshal a complex request 1`] = `
+{
+  "args": [
+    1,
+    2,
+    {
+      "asdf": 1,
+    },
+  ],
+  "call": "1-2-3",
+  "function": "Add",
+}
+`;
+
+exports[`Flat encoding Request can unmarshal a complex request 1`] = `
+{
+  "args": [
+    1,
+    2,
+    {
+      "asdf": 1,
+    },
+  ],
+  "call": undefined,
+  "functionName": "Add",
+}
+`;
+
+exports[`Flat encoding Response can marshal a simple response with no error 1`] = `
+{
+  "call": "1",
+  "err": "",
+  "value": true,
+}
+`;
+
+exports[`Flat encoding Response can unmarshal a simple response with no error 1`] = `
+{
+  "call": undefined,
+  "err": "",
+  "value": true,
+}
+`;
+
+exports[`Flat encoding Response can marshal a simple response with error 1`] = `
+{
+  "call": "1",
+  "err": "test error",
+  "value": true,
+}
+`;
+
+exports[`Flat encoding Response can unmarshal a simple response with error 1`] = `
+{
+  "call": undefined,
+  "err": "test error",
+  "value": true,
+}
+`;
+
+exports[`Flat encoding Response can marshal a complex response with no error 1`] = `
+{
+  "call": "1",
+  "err": "",
+  "value": {
+    "a": 1,
+    "b": {
+      "c": "test",
+    },
+  },
+}
+`;
+
+exports[`Flat encoding Response can unmarshal a complex response with no error 1`] = `
+{
+  "call": undefined,
+  "err": "",
+  "value": {
+    "a": 1,
+    "b": {
+      "c": "test",
+    },
+  },
+}
+`;
+
+exports[`Flat encoding Response can marshal a complex response with error 1`] = `
+{
+  "call": "1",
+  "err": "test error",
+  "value": {
+    "a": 1,
+    "b": {
+      "c": "test",
+    },
+  },
+}
+`;
+
+exports[`Flat encoding Response can unmarshal a complex response with error 1`] = `
+{
+  "call": undefined,
+  "err": "test error",
+  "value": {
+    "a": 1,
+    "b": {
+      "c": "test",
+    },
+  },
+}
+`;
diff --git a/ts/messages.test.ts → ts/utils/messages.test.ts b/ts/messages.test.ts → ts/utils/messages.test.ts
diff --git a/ts/messages.ts → ts/utils/messages.ts b/ts/messages.ts → ts/utils/messages.ts