@vandenberghinc/volt 1.1.8 → 1.1.9

package/backend/src/server.ts

@@ -769,6 +769,7 @@ export class Server {
     // Instance properties
     public ip: string;
     public port: number;
+    public https_port: number;
     public domain: string;
     public full_domain: string;
     public source: vlib.Path;  // vlib.Path type
@@ -781,7 +782,7 @@ export class Server {
     public token_expiration: number;
     public google_tag?: string;
     public production: boolean;
-    public localhost: boolean;
+    // public localhost: boolean;
     public multiprocessing: boolean;
     public processes: number;
     public company: CompanyInfo;
@@ -833,7 +834,7 @@ export class Server {
 
     constructor({
         ip, // leave undefined for blank detection.
-        port = 8000,
+        port, // leave undefined for blank detection.
         domain,
         is_primary = true,
         source,
@@ -878,7 +879,7 @@ export class Server {
         enable_account_activation = true,
         // honey_pot_key = null,
         production = false,
-        localhost = true,
+        // localhost = true,
         multiprocessing = true,
         processes = null,
         // file_watcher = false,
@@ -920,7 +921,7 @@ export class Server {
         enable_account_activation?: boolean;
         // honey_pot_key?: string | null;
         production?: boolean;
-        localhost?: boolean;
+        // localhost?: boolean;
         multiprocessing?: boolean;
         processes?: number | null;
         // file_watcher?: FileWatcher | Record<string, any> | boolean;
@@ -1057,7 +1058,7 @@ export class Server {
             enable_2fa: {type: "boolean", required: false},
             enable_account_activation: {type: "boolean", required: false},
             production: {type: "boolean", required: false},
-            localhost: { type: "boolean", required: false },
+            // localhost: { type: "boolean", required: false },
             multiprocessing: {type: "boolean", required: false, default: true},
             processes: {type: "number", required: false, default: null},
             // file_watcher: {type: ["null", "boolean", "object", FileWatcher], required: false},
@@ -1085,7 +1086,13 @@ export class Server {
         }});
 
         // Assign attributes directly.
-        this.port = port;
+        if (production || port == null) {
+            this.port = 80;
+            this.https_port = 443;
+        } else {
+            this.port = port;
+            this.https_port = port + 1;
+        }
         this.ip = ip ?? "127.0.0.1";
         this.is_primary = is_primary && libcluster.isPrimary;
         this.source = new vlib.Path(source);
@@ -1095,7 +1102,7 @@ export class Server {
         this.token_expiration = token_expiration;
         this.google_tag = google_tag;
         this.production = production;
-        this.localhost = localhost;
+        // this.localhost = localhost;
         this.lightweight = lightweight;
         this.multiprocessing = multiprocessing;
         this.processes = processes == null ? os.cpus().length : processes;
@@ -1115,13 +1122,13 @@ export class Server {
         this.err_endpoints = new Map();
 
         // Assign based on localhost.
-        if (localhost) {
-            this.ip = "127.0.0.1";
-            this.domain = this.ip + ":" + (port + (this.tls ? 1 : 0));
-        } else if (!localhost && ip == null)  { // use argument ip not attr since that already has a default.
-            this.ip = vlib.Network.private_ip();
-            this.domain = this.ip + ":" + (port + (this.tls ? 1 : 0));
-        }
+        // if (localhost) {
+        //     this.ip = "127.0.0.1";
+        //     this.domain = this.ip + ":" + (port + (this.tls ? 1 : 0));
+        // } else if (!production && !localhost && ip == null)  { // use argument ip not attr since that already has a default.
+        //     this.ip = vlib.Network.private_ip();
+        //     this.domain = this.ip + ":" + (port + (this.tls ? 1 : 0));
+        // }
 
         /* @performance */ this.performance = new vlib.Performance("Server performance");
 
@@ -1505,10 +1512,10 @@ export class Server {
                 const status: Record<string, any> = {};
                 status.ip = this.ip;
                 if (this.http) {
-                    status.http_port = this.port == null ? 80 : (this.port);
+                    status.http_port = this.port;
                 }
                 if (this.https) {
-                    status.https_port = this.port == null ? 443 : (this.port + 1);
+                    status.https_port = this.https_port;
                 }
 
                 // Load data.
@@ -2537,25 +2544,15 @@ export class Server {
             //     worker.start();
             // }
 
-            // Set default port.
-            let http_port: number, https_port: number;
-            if (this.port == null) {
-                http_port = 80;
-                https_port = 443;
-            } else {
-                http_port = this.port;
-                https_port = this.port + 1;
-            }
-
             // Callbacks.
             let is_running = false;
             const on_running = () => {
                 if (!is_running) {
                     is_running = true;
                     if (this.https !== undefined) {
-                        logger.log(0, log_source, `Running on http://${this.ip}:${http_port} and https://${this.ip}:${https_port}.`);
+                        logger.log(0, log_source, `Running on http://${this.ip}:${this.port} and https://${this.ip}:${this.https_port}.`);
                     } else {
-                        logger.log(0, log_source, `Running on http://${this.ip}:${http_port}.`);
+                        logger.log(0, log_source, `Running on http://${this.ip}:${this.port}.`);
                     }
                 }
             };
@@ -2578,10 +2575,10 @@ export class Server {
             };
 
             // Listen.
-            this.http.listen(http_port, this.ip, on_running);
+            this.http.listen(this.port, this.ip, on_running);
             this.http.on("error", on_error);
             if (this.https !== undefined) {
-                this.https.listen(https_port, this.ip, on_running);
+                this.https.listen(this.https_port, this.ip, on_running);
                 this.https.on("error", on_error);
             }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "author": "Daan van den Bergh",
     "name": "@vandenberghinc/volt",
-    "version": "1.1.8",
+    "version": "1.1.9",
     "description": "",
     "type": "module",
     "types": "./backend/dist/esm/volt.d.ts",