refactor: ts sub projects

rustymotors · Nov 16, 2021 · bc65d62 · bc65d62
1 parent 5e5e73b
commit bc65d62
Show file tree

Hide file tree

Showing 90 changed files with 337 additions and 175 deletions.
diff --git a/package.json b/package.json
@@ -14,12 +14,12 @@
   "scripts": {
     "audit": "npm audit",
     "check:license": "npm licenses audit --summary --config=licenses.config.js",
-    "start": "ts-node packages/app.ts",
-    "build": "tsc -p ./packages/tsconfig.json",
+    "start": "node built/bin/app.js",
+    "build": "npx tsc -b src/tsconfig.json --verbose",
     "build:clean": "rm -rf built && npm run build",
-    "lint": "eslint packages/**/*.ts && prettier --write packages",
+    "lint": "eslint src/**/*.ts && prettier --write src",
     "test": "npm run lint && npm run test:only && npm run test:coverage",
-    "test:only": "tap --ts --reporter=spec --no-check-coverage packages/**/*.test.ts",
+    "test:only": "tap --ts --reporter=spec --no-check-coverage src/**/*.test.ts",
     "test:coverage": "tap  --coverage-report=html --coverage-report=lcov --no-check-coverage --no-browser"
   },
   "author": "Drazi Crendraven <drazisil@hey.com>",

diff --git a/packages/config/app.ts b/packages/config/app.ts
diff --git a/packages/database/app.ts b/packages/database/app.ts
diff --git a/packages/patch/app.ts b/packages/patch/app.ts
diff --git a/packages/router/app.ts b/packages/router/app.ts
diff --git a/packages/tsconfig.json b/packages/tsconfig.json
diff --git a/packages/admin/test/admin-server.test.ts → src/admin/admin-server.test.ts b/packages/admin/test/admin-server.test.ts → src/admin/admin-server.test.ts
diff --git a/packages/admin/src/index.ts → src/admin/index.ts b/packages/admin/src/index.ts → src/admin/index.ts
@@ -13,8 +13,8 @@ import {
   _sslOptions,
   AppConfiguration,
   ConfigurationManager,
-} from "../../config/src/index";
-import { IMCServer } from "../../types/src/index";
+} from "../config/index";
+import { IMCServer } from "../types/index";
 
 const log = P().child({ service: "mcoserver:AdminServer;" });
 log.level = process.env["LOG_LEVEL"] || "info";

diff --git a/src/admin/tsconfig.json b/src/admin/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig-noncomposite-base",
+  "compilerOptions": {
+    "outDir": "../../built",
+    "types": ["node"]
+  },
+  "files": ["index.ts"],
+  "references": []
+}
diff --git a/packages/auth/data/mcouniverse.cnf → src/auth/data/mcouniverse.cnf b/packages/auth/data/mcouniverse.cnf → src/auth/data/mcouniverse.cnf
diff --git a/packages/auth/data/mcouniverse.crt → src/auth/data/mcouniverse.crt b/packages/auth/data/mcouniverse.crt → src/auth/data/mcouniverse.crt
diff --git a/packages/auth/data/private_key.pem → src/auth/data/private_key.pem b/packages/auth/data/private_key.pem → src/auth/data/private_key.pem
diff --git a/packages/auth/data/pub.key → src/auth/data/pub.key b/packages/auth/data/pub.key → src/auth/data/pub.key
diff --git a/packages/auth/src/index.ts → src/auth/index.ts b/packages/auth/src/index.ts → src/auth/index.ts
@@ -6,14 +6,14 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import P from "pino";
-import { IncomingMessage, ServerResponse } from "http";
-import { Socket } from "net";
-import { SslOptions } from "../../types/src/index";
 import { readFileSync } from "fs";
-import { EServerConnectionName, RoutingMesh } from "../../router/src/index";
+import { IncomingMessage, ServerResponse } from "http";
 import { createServer, Server } from "https";
-import { AppConfiguration, ConfigurationManager } from "../../config/src/index";
+import { Socket } from "net";
+import P from "pino";
+import { AppConfiguration, ConfigurationManager } from "../config/index";
+import { EServerConnectionName, RoutingMesh } from "../router/index";
+import { SslOptions } from "../types/index";
 
 const log = P().child({ service: "MCOServer:Auth" });
 log.level = process.env["LOG_LEVEL"] || "info";

diff --git a/src/auth/tsconfig.json b/src/auth/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig-noncomposite-base",
+  "compilerOptions": {
+    "outDir": "../../built",
+    "types": ["node"]
+  },
+  "files": ["index.ts"],
+  "references": []
+}
diff --git a/packages/auth/test/web-server.test.ts → src/auth/web-server.test.ts b/packages/auth/test/web-server.test.ts → src/auth/web-server.test.ts
@@ -6,7 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import t from "tap";
-import { AuthLogin } from "../src/index";
+import { AuthLogin } from "./index";
 
 t.test("WebServer", (t) => {
   const _ = AuthLogin.getInstance();

diff --git a/packages/app.ts → src/bin/app.ts b/packages/app.ts → src/bin/app.ts
@@ -6,13 +6,13 @@
  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-import { RoutingServer } from "./router/src/index";
-import { PatchServer } from "./patch/src/index";
-import { AuthLogin } from "./auth/src/index";
-import { ShardServer } from "./shard/src/index";
-import { HTTPProxyServer } from "./proxy/src/index";
-import { MCServer } from "./core/src/index";
-import { AdminServer } from "./admin/src/index";
+import { RoutingServer } from "../router/index";
+import { PatchServer } from "../patch/index";
+import { AuthLogin } from "../auth/index";
+import { ShardServer } from "../shard/index";
+import { HTTPProxyServer } from "../proxy/index";
+import { MCServer } from "../core/index";
+import { AdminServer } from "../admin/index";
 
 // What servers do we need?
 // * Routing Server

diff --git a/src/bin/tsconfig.json b/src/bin/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig-noncomposite-base",
+  "compilerOptions": {
+    "outDir": "../../built",
+    "types": ["node"]
+  },
+  "files": ["app.ts"],
+  "references": []
+}
diff --git a/packages/config/src/config.ts → src/config/config.ts b/packages/config/src/config.ts → src/config/config.ts
@@ -1,4 +1,4 @@
-import { AppConfiguration } from ".";
+import { AppConfiguration } from "./index";
 
 const savedConfig: AppConfiguration = {
   certificate: {

diff --git a/packages/config/data/mcouniverse.cnf → src/config/data/mcouniverse.cnf b/packages/config/data/mcouniverse.cnf → src/config/data/mcouniverse.cnf
diff --git a/packages/config/data/mcouniverse.crt → src/config/data/mcouniverse.crt b/packages/config/data/mcouniverse.crt → src/config/data/mcouniverse.crt
diff --git a/packages/config/data/private_key.pem → src/config/data/private_key.pem b/packages/config/data/private_key.pem → src/config/data/private_key.pem
diff --git a/packages/config/data/pub.key → src/config/data/pub.key b/packages/config/data/pub.key → src/config/data/pub.key
diff --git a/packages/config/src/index.ts → src/config/index.ts b/packages/config/src/index.ts → src/config/index.ts
diff --git a/packages/config/test/ssl-options.test.ts → src/config/ssl-options.test.ts b/packages/config/test/ssl-options.test.ts → src/config/ssl-options.test.ts
@@ -6,7 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import t from "tap";
-import { _sslOptions } from "../src/ssl-options";
+import { _sslOptions } from "./ssl-options";
 
 const fakeConfig = {
   certificate: {

diff --git a/packages/config/src/ssl-options.ts → src/config/ssl-options.ts b/packages/config/src/ssl-options.ts → src/config/ssl-options.ts
@@ -8,8 +8,8 @@
 
 import { readFileSync } from "fs";
 import P from "pino";
-import { SslOptions } from "../../types/src/index";
-import { AppConfiguration } from ".";
+import { SslOptions } from "../types";
+import { AppConfiguration } from "./index";
 
 const log = P().child({ service: "mcoserver:AdminServer;" });
 log.level = process.env["LOG_LEVEL"] || "info";

diff --git a/src/config/tsconfig.json b/src/config/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig-noncomposite-base",
+  "compilerOptions": {
+    "outDir": "../../built",
+    "types": ["node"]
+  },
+  "files": ["index.ts"],
+  "references": []
+}
diff --git a/packages/core/src/connection-mgr.ts → src/core/connection-mgr.ts b/packages/core/src/connection-mgr.ts → src/core/connection-mgr.ts
@@ -5,17 +5,17 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import { DatabaseManager } from "../../database/src/index";
-import { MessageNode } from "../../message-types/src/index";
-import { TCPManager } from "../../transactions/src/index";
+import { DatabaseManager } from "../database/index";
+import { MessageNode } from "../message-types/index";
+import { TCPManager } from "../transactions/index";
 import {
   EMessageDirection,
   IConnectionManager,
   IDatabaseManager,
   ITCPConnection,
   NPS_COMMANDS,
   UnprocessedPacket,
-} from "../../types/src/index";
+} from "../types/index";
 import { Socket } from "net";
 import { EncryptionManager } from "./encryption-mgr";
 import { NPSPacketManager } from "./nps-packet-manager";

diff --git a/packages/core/test/connection-obj.test.ts → src/core/connection-obj.test.ts b/packages/core/test/connection-obj.test.ts → src/core/connection-obj.test.ts
@@ -6,11 +6,11 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import t from "tap";
-import { SocketFactory } from "./../../test-helpers/socket-factory";
-import { ConnectionManager } from "../src/connection-mgr";
-import { EncryptionManager } from "../src/encryption-mgr";
-import { TCPConnection } from "../src/tcpConnection";
-t.mock("../src/connection-mgr", {});
+import { SocketFactory } from "../socket-factory";
+import { ConnectionManager } from "./connection-mgr";
+import { EncryptionManager } from "./encryption-mgr";
+import { TCPConnection } from "./tcpConnection";
+t.mock("./connection-mgr", {});
 
 t.test("ConnectionObj", (t) => {
   const testConnection = new TCPConnection("abc", SocketFactory.createSocket());

diff --git a/packages/core/src/encryption-mgr.ts → src/core/encryption-mgr.ts b/packages/core/src/encryption-mgr.ts → src/core/encryption-mgr.ts
diff --git a/packages/core/src/index.ts → src/core/index.ts b/packages/core/src/index.ts → src/core/index.ts
@@ -6,13 +6,9 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import P from "pino";
-import {
-  IConnectionManager,
-  IMCServer,
-  ITCPConnection,
-} from "../../types/src/index";
+import { IConnectionManager, IMCServer, ITCPConnection } from "../types/index";
 import { ConnectionManager } from "./connection-mgr";
-import { AppConfiguration, ConfigurationManager } from "../../config/src/index";
+import { AppConfiguration, ConfigurationManager } from "../config/index";
 import { ListenerThread } from "./listener-thread";
 
 const log = P().child({ service: "mcoserver:MCServer" });

diff --git a/packages/core/test/listener-thread.test.ts → src/core/listener-thread.test.ts b/packages/core/test/listener-thread.test.ts → src/core/listener-thread.test.ts
@@ -7,9 +7,9 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import t from "tap";
-import { SocketFactory } from "./../../test-helpers/socket-factory";
-import { ConnectionManager } from "../src/connection-mgr";
-import { ListenerThread } from "../src/listener-thread";
+import { SocketFactory } from "../socket-factory";
+import { ConnectionManager } from "./connection-mgr";
+import { ListenerThread } from "./listener-thread";
 
 t.test("ListenerThread - _onData", async () => {
   const listenerThread = ListenerThread.getInstance();

diff --git a/packages/core/src/listener-thread.ts → src/core/listener-thread.ts b/packages/core/src/listener-thread.ts → src/core/listener-thread.ts
@@ -12,7 +12,7 @@ import {
   ITCPConnection,
   IConnectionManager,
   IListenerThread,
-} from "../../types/src/index";
+} from "../types/index";
 
 const log = P().child({ service: "mcoserver:ListenerThread" });
 log.level = process.env["LOG_LEVEL"] || "info";

diff --git a/...ages/core/test/nps-packet-manager.test.ts → src/core/nps-packet-manager.test.ts b/...ages/core/test/nps-packet-manager.test.ts → src/core/nps-packet-manager.test.ts
@@ -6,7 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import t from "tap";
-import { NPSPacketManager } from "../src/nps-packet-manager";
+import { NPSPacketManager } from "./nps-packet-manager";
 
 t.test("NPSPacketManager", (t) => {
   t.test("NPSPacketManger", async (t) => {

diff --git a/packages/core/src/nps-packet-manager.ts → src/core/nps-packet-manager.ts b/packages/core/src/nps-packet-manager.ts → src/core/nps-packet-manager.ts
@@ -6,11 +6,11 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import P from "pino";
-import { ITCPConnection, UnprocessedPacket } from "../../types/src/index";
-import { LobbyServer } from "../../lobby/src/index";
-import { LoginServer } from "../../login/src/index";
-import { PersonaServer } from "../../persona/src/index";
-import { DatabaseManager } from "../../database/src/index";
+import { ITCPConnection, UnprocessedPacket } from "../types/index";
+import { LobbyServer } from "../lobby/index";
+import { LoginServer } from "../login/index";
+import { PersonaServer } from "../persona/index";
+import { DatabaseManager } from "../database/index";
 
 const log = P().child({ service: "mcoserver:NPSPacketManager" });
 log.level = process.env["LOG_LEVEL"] || "info";

diff --git a/packages/core/src/tcpConnection.ts → src/core/tcpConnection.ts b/packages/core/src/tcpConnection.ts → src/core/tcpConnection.ts
@@ -12,7 +12,7 @@ import {
   ITCPConnection,
   UnprocessedPacket,
   LobbyCipers,
-} from "../../types/src/index";
+} from "../types/index";
 import { createCipheriv, createDecipheriv } from "crypto";
 import { Socket } from "net";
 import P from "pino";

diff --git a/src/core/tsconfig.json b/src/core/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig-noncomposite-base",
+  "compilerOptions": {
+    "outDir": "../../built",
+    "types": ["node"]
+  },
+  "files": ["index.ts"],
+  "references": []
+}
diff --git a/packages/database/test/empty.test.ts → src/database/empty.test.ts b/packages/database/test/empty.test.ts → src/database/empty.test.ts
diff --git a/packages/database/src/index.ts → src/database/index.ts b/packages/database/src/index.ts → src/database/index.ts
@@ -8,11 +8,11 @@
 
 import * as sqlite3 from "sqlite3";
 import { Database, open } from "sqlite";
-import { IDatabaseManager, SessionRecord } from "../../types/src/index";
+import { IDatabaseManager, SessionRecord } from "../types/index";
 import P from "pino";
-import { AppConfiguration, ConfigurationManager } from "../../config/src/index";
+import { AppConfiguration, ConfigurationManager } from "../config/index";
 import { createServer, IncomingMessage, Server, ServerResponse } from "http";
-import { EServerConnectionName, RoutingMesh } from "../../router/src/index";
+import { EServerConnectionName, RoutingMesh } from "../router/index";
 
 const log = P().child({ service: "mcoserver:DatabaseMgr" });
 log.level = process.env["LOG_LEVEL"] || "info";

diff --git a/src/database/tsconfig.json b/src/database/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig-noncomposite-base",
+  "compilerOptions": {
+    "outDir": "../../built",
+    "types": ["node"]
+  },
+  "files": ["index.ts"],
+  "references": []
+}
diff --git a/packages/lobby/src/index.ts → src/lobby/index.ts b/packages/lobby/src/index.ts → src/lobby/index.ts
@@ -7,14 +7,14 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import P from "pino";
-import { DatabaseManager } from "../../database/src/index";
+import { DatabaseManager } from "../database/index";
 import {
   EMessageDirection,
   ITCPConnection,
   UnprocessedPacket,
-} from "../../types/src/index";
-import { NPSMessage, NPSUserInfo } from "../../message-types/src/index";
-import { PersonaServer } from "../../persona/src/index";
+} from "../types/index";
+import { NPSMessage, NPSUserInfo } from "../message-types/index";
+import { PersonaServer } from "../persona/index";
 
 const log = P().child({ service: "mcoserver:LobbyServer" });
 log.level = process.env["LOG_LEVEL"] || "info";

diff --git a/packages/lobby/test/lobby-server.test.ts → src/lobby/lobby-server.test.ts b/packages/lobby/test/lobby-server.test.ts → src/lobby/lobby-server.test.ts
@@ -6,7 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import t from "tap";
-import { LobbyServer } from "../src/index";
+import { LobbyServer } from "./index";
 
 t.test("LobbyServer", (t) => {
   const lobbyServer = LobbyServer.getInstance();

diff --git a/src/lobby/tsconfig.json b/src/lobby/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig-noncomposite-base",
+  "compilerOptions": {
+    "outDir": "../../built",
+    "types": ["node"]
+  },
+  "files": ["index.ts"],
+  "references": []
+}