feat: add multitenant support (#27)

Author: eveffer

cli/incloud.ts

@@ -1,7 +1,7 @@
 import { InLog } from "~/in-log/in-log.ts";
-import { RunManager } from "./src/run-manager.ts";
 import convertString from "~/utils/convert-string.ts";
 import { center } from "~/terminal/format-utils.ts";
+import { RunManager } from "#cli/run-manager.ts";
 
 const inLog = new InLog({
   consoleDefaultStyle: "full",

cli/src/config-types.ts

@@ -1,45 +1,5 @@
-export type ORMConfig = {
-  autoTypes: boolean;
-  autoMigrate: boolean;
-  embeddedDb: boolean;
-  embeddedDbPort: number;
-  ormDebugMode: boolean;
-  dbConnectionType: "tcp" | "socket";
-  dbSocketPath: string;
-  dbName: string;
-  dbHost: string;
-  dbPort: number;
-  dbUser: string;
-  dbPassword: string;
-  dbSchema: string;
-  dbAppName: string;
-  dbClientMode: "pool" | "single";
-  dbPoolSize: number;
-  dbMaxPoolSize: number;
-  dbIdleTimeout: number;
-};
-export type AuthConfig = {
-  allowAll: boolean;
-};
-
-export type CloudConfig = {
-  name: string;
-  cloudMode: "production" | "development";
-  logLevel: "info" | "debug" | "error" | "warn";
-  logTrace: boolean;
-  brokerPort: number;
-  queuePort: number;
-  hostName: string;
-  port: number;
-  autoConfig: boolean;
-  allowedOrigins: Set<string>;
-  publicRoot: string;
-  singlePageApp: boolean;
-  cacheStatic: boolean;
-};
+import type { CoreConfig } from "~/extension/core-config.ts";
 
 export interface BuiltInConfig {
-  cloud: CloudConfig;
-  orm: ORMConfig;
-  auth: AuthConfig;
+  core: CoreConfig;
 }

cli/src/multicore.ts

@@ -4,7 +4,11 @@
  * **Note:** This function is currently only implemented for Linux systems.
  * If you are using a different OS, it will return 1.
  */
-export async function getCoreCount(): Promise<number> {
+export async function getCoreCount(
+  config?: { single?: boolean },
+): Promise<number> {
+  const { single = false } = config || {};
+  if (single) return 1;
   if (Deno.build.os !== "linux") {
     return 1;
   }

cli/src/run-manager.ts

@@ -10,13 +10,13 @@ const inLogSmall = new InLog({
 });
 import { makeLogo } from "~/terminal/logo.ts";
 import { InLog } from "~/in-log/in-log.ts";
-import { getCoreCount } from "./multicore.ts";
-import { loadCloudConfigFile } from "./cloud-config.ts";
+import { getCoreCount } from "#cli/multicore.ts";
+import { loadCloudConfigFile } from "#cli/cloud-config.ts";
 import convertString from "~/utils/convert-string.ts";
 import { joinPath } from "~/utils/path-utils.ts";
 import { center } from "~/terminal/format-utils.ts";
 import ColorMe from "~/terminal/color-me.ts";
-import type { RunnerMode } from "./types.ts";
+import type { RunnerMode } from "#cli/types.ts";
 
 const logo = makeLogo({
   symbol: "alt2DownLeft",
@@ -53,7 +53,7 @@ export class RunManager {
     this.appName = Deno.env.get("APP_NAME") || "InSpatial";
   }
   async init(): Promise<void> {
-    this.coreCount = await getCoreCount();
+    this.coreCount = await getCoreCount({ single: true }); // skip multicore at the moment
     await this.spawnInit();
     const result = loadCloudConfigFile(this.rootPath);
     if (!result) {
@@ -65,14 +65,23 @@ export class RunManager {
     }
     const { config, env } = result;
     this.env = env;
-    const { hostName, port, brokerPort, queuePort, cloudMode, name } =
-      config.cloud;
+    const {
+      hostName,
+      port,
+      brokerPort,
+      queuePort,
+      cloudMode,
+      name,
+      embeddedDb,
+      embeddedDbPort,
+      autoTypes,
+      autoMigrate,
+    } = config.core;
     this.appName = name || this.appName;
     this.appTitle = convertString(this.appName, "title", true);
     if (cloudMode == "development") {
       this.watch = true;
     }
-    const { embeddedDb, embeddedDbPort, autoTypes, autoMigrate } = config.orm;
 
     this.autoMigrate = autoMigrate;
     this.autoTypes = autoTypes;
@@ -101,7 +110,7 @@ export class RunManager {
     }
     if (!embeddedDb) {
       dbConnectionString = makeDBConnectionString(
-        config.orm,
+        config.core,
       );
     }
     const rows = [
@@ -123,7 +132,6 @@ export class RunManager {
       );
       this.setupWatcher();
     }
-    // Terminal.showCursor();
   }
   async setupWatcher() {
     const dirs = Deno.readDirSync(this.rootPath);

cli/src/utils.ts

@@ -0,0 +1,17 @@
+export async function allowPortBinding() {
+  if (Deno.build.os !== "linux") {
+    throw new Error("This function is only supported on Linux");
+  }
+
+  const cmd = new Deno.Command("sudo", {
+    args: ["setcap", "cap_net_bind_service=+ep", Deno.execPath()],
+    stderr: "piped",
+  });
+  const child = cmd.spawn();
+  const output = await child.output();
+
+  if (output.code !== 0) {
+    throw new Error(new TextDecoder().decode(output.stderr));
+  }
+  return output.code;
+}

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",
@@ -26,6 +26,7 @@
   },
   "imports": {
     "~/": "./src/",
+    "#cli/": "./cli/src/",
     "#extensions/": "./extensions/",
     "#types/": "./src/types/",
     "#inLog": "./src/in-log/in-log.ts"