@vandenberghinc/volt 1.1.7 → 1.1.9

package/backend/src/server.ts

@@ -29,7 +29,7 @@ import { Endpoint, EndpointOptions } from "./endpoint.js";
 import { ImageEndpoint } from "./image_endpoint.js";
 import { Stream } from "./stream.js";
 import { Database, Collection, UIDCollection } from "./database.js";
-import { /*StaticFileWatcher,*/ FileWatcher } from "./file_watcher.js";
+// import { /*StaticFileWatcher,*/ FileWatcher } from "./file_watcher.js";
 import { Users } from "./users.js";
 import { Paddle } from "./payments/paddle.js";
 import { RateLimits, RateLimitServer, RateLimitClient } from "./rate_limit.js";
@@ -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;
@@ -794,7 +795,7 @@ export class Server {
     public additional_sitemap_endpoints: string[];
     public log_level: number;
     public tls?: TLSConfig;
-    public file_watcher?: FileWatcher;
+    // public file_watcher?: FileWatcher;
     // public admin: AdminConfig;
     // public ts: TypeScriptConfig;
     public lightweight: boolean;
@@ -820,7 +821,7 @@ export class Server {
     private _on_stop: Array<() => void | Promise<void>>;
     // public browser_preview?: BrowserPreview;
     // public static_file_watcher: StaticFileWatcher;
-    public is_file_watcher: boolean;
+    // public is_file_watcher: boolean;
     public daemon?: vlib.Daemon;
     private _stop_tscompiler_watcher?: () => void;
 
@@ -832,8 +833,8 @@ export class Server {
     public logger: typeof logger;
 
     constructor({
-        ip = "127.0.0.1",
-        port = 8000,
+        ip, // leave undefined for blank detection.
+        port, // leave undefined for blank detection.
         domain,
         is_primary = true,
         source,
@@ -878,10 +879,10 @@ export class Server {
         enable_account_activation = true,
         // honey_pot_key = null,
         production = false,
-        localhost = true,
+        // localhost = true,
         multiprocessing = true,
         processes = null,
-        file_watcher = false,
+        // file_watcher = false,
         offline = false,
         additional_sitemap_endpoints = [],
         log_level = 0,
@@ -920,10 +921,10 @@ 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;
+        // file_watcher?: FileWatcher | Record<string, any> | boolean;
         offline?: boolean;
         additional_sitemap_endpoints?: string[];
         log_level?: number;
@@ -1057,10 +1058,10 @@ 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},
+            // file_watcher: {type: ["null", "boolean", "object", FileWatcher], required: false},
             offline: {type: "boolean", default: false},
             additional_sitemap_endpoints: {type: "array", default: []},
             log_level: {type: "number", default: 0},
@@ -1085,8 +1086,14 @@ export class Server {
         }});
 
         // Assign attributes directly.
-        this.port = port;
-        this.ip = ip;
+        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);
         this.favicon = favicon;
@@ -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,10 +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));
-        }
+        // 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");
 
@@ -1239,47 +1249,47 @@ export class Server {
         // this.static_file_watcher = new StaticFileWatcher(this);
 
         // Initialize file watcher.
-        if (file_watcher !== false) {
-            console.warn("[Volt] Argument file_watcher is deprecated. This may be removed in future versions.");
-            if (file_watcher == null) {
-                // Null.
-                file_watcher = {};
-            }
-            if (!(file_watcher as Record<string, any>).source) {
-                // Source.
-                (file_watcher as Record<string, any>).source = this.source.str();
-            }
-            if (!(file_watcher instanceof FileWatcher)) {
-                // Initialize.
-                file_watcher = new FileWatcher(file_watcher as any);
-            }
-            this.file_watcher = file_watcher as FileWatcher;
-        }
-        else {
-            this.file_watcher = undefined;
-        }
+        // if (file_watcher !== false) {
+        //     console.warn("[Volt] Argument file_watcher is deprecated. This may be removed in future versions.");
+        //     if (file_watcher == null) {
+        //         // Null.
+        //         file_watcher = {};
+        //     }
+        //     if (!(file_watcher as Record<string, any>).source) {
+        //         // Source.
+        //         (file_watcher as Record<string, any>).source = this.source.str();
+        //     }
+        //     if (!(file_watcher instanceof FileWatcher)) {
+        //         // Initialize.
+        //         file_watcher = new FileWatcher(file_watcher as any);
+        //     }
+        //     this.file_watcher = file_watcher as FileWatcher;
+        // }
+        // else {
+        //     this.file_watcher = undefined;
+        // }
 
         // File watcher.
-        if (
-            process.env.VOLT_NO_FILE_WATCHER == null && 
-            !process.argv.includes("--no-file-watcher") && 
-            this.production === false && 
-            file_watcher !== false && 
-            process.env.VOLT_FILE_WATCHER !== '1'
-        ) {
-
-            // Disable primary for when users access is_primary.
-            this.is_primary = false;
-
-            // Enable file watcher.
-            this.is_file_watcher = true;
-        }
+        // if (
+        //     process.env.VOLT_NO_FILE_WATCHER == null && 
+        //     !process.argv.includes("--no-file-watcher") && 
+        //     this.production === false && 
+        //     // file_watcher !== false && 
+        //     process.env.VOLT_FILE_WATCHER !== '1'
+        // ) {
+
+        //     // Disable primary for when users access is_primary.
+        //     this.is_primary = false;
+
+        //     // Enable file watcher.
+        //     this.is_file_watcher = true;
+        // }
 
-        // No file watcher.
-        else {
+        // // No file watcher.
+        // else {
 
             // Disable file watcher.
-            this.is_file_watcher = false;
+            // this.is_file_watcher = false;
 
             // Set logger.
             logger.log_level = this.log_level;
@@ -1341,7 +1351,7 @@ export class Server {
             //     this.blacklist = new Blacklist({api_key: this.honey_pot_key});
             // }
 
-        }
+        // }
 
         // Other keys.
         this.keys = {};
@@ -1448,9 +1458,9 @@ export class Server {
     }
 
     // Create default endpoints.
-    private _create_default_endpoints(): string[] {
+    private _create_default_endpoints() {
         // Vars.
-        const additional_file_watcher_paths: string[] = [];
+        // const additional_file_watcher_paths: string[] = [];
 
         // Add favicon.
         if (this.favicon != null) {
@@ -1502,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.
@@ -1564,7 +1574,7 @@ export class Server {
         })
 
         // Handler.
-        return additional_file_watcher_paths;
+        // return additional_file_watcher_paths;
     }
 
     // Create the sitemap endpoint.
@@ -1967,55 +1977,51 @@ export class Server {
         /* @performance */ this.performance.start()
 
         // File watcher.
-        if (this.is_file_watcher) {
-            // Disable primary for when users access is_primary.
-            this.is_primary = false;
+        // if (this.is_file_watcher) {
+        //     // Disable primary for when users access is_primary.
+        //     this.is_primary = false;
             
-            // Create default endpoints for excluded static file watch paths.
-            this._create_default_endpoints();
-
-            // Exclude the typescript output directory from the file watcher.
-            // if (this.ts.output) {
-            //     this.file_watcher!.add_exclude(this.ts.output);
-            // }
-
-            // Add the volt backend source files to the additional files.
-            this.file_watcher!.add_path(__dirname);
-            this.file_watcher!.add_exclude(`${__dirname}/frontend_globals.js`);
-
-            // Excluded.
-            this.file_watcher!.add_exclude(this.source.join(".db"));
-            this.file_watcher!.add_exclude(this.source.join(".rate_limit"));
-            this.file_watcher!.add_exclude(this.source.join(".logs"));
-
-            // Exclude static files.
-            this.statics.forEach(item => {
-                if (typeof item === "string" || item instanceof vlib.Path) {
-                    this.file_watcher!.add_exclude(item);
-                }
-                else {
-                    this.file_watcher!.add_exclude(item.path)
-                }
-            })
-
-            if (!this.production) {
-                [
-                    `${process.env.PERSISTANCE}/private/dev/vinc/vlib/js/vlib.js`,
-                    `${process.env.PERSISTANCE}/private/dev/vinc/vhighlight/vhighlight.js`,
-                ].forEach(path => {
-                    const vpath = new vlib.Path(path);
-                    if (vpath.exists()) {
-                        this.file_watcher!.add_exclude(vpath.str());
-                    }
-                })
-            }
+        //     // Create default endpoints for excluded static file watch paths.
+        //     this._create_default_endpoints();
+
+        //     // Exclude the typescript output directory from the file watcher.
+        //     // if (this.ts.output) {
+        //     //     this.file_watcher!.add_exclude(this.ts.output);
+        //     // }
+
+        //     // Add the volt backend source files to the additional files.
+        //     this.file_watcher!.add_path(__dirname);
+        //     this.file_watcher!.add_exclude(`${__dirname}/frontend_globals.js`);
+
+        //     // Exclude static files.
+        //     this.statics.forEach(item => {
+        //         if (typeof item === "string" || item instanceof vlib.Path) {
+        //             this.file_watcher!.add_exclude(item);
+        //         }
+        //         else {
+        //             this.file_watcher!.add_exclude(item.path)
+        //         }
+        //     })
+
+        //     if (!this.production) {
+        //         [
+        //             `${process.env.PERSISTANCE}/private/dev/vinc/vlib/js/vlib.js`,
+        //             `${process.env.PERSISTANCE}/private/dev/vinc/vhighlight/vhighlight.js`,
+        //         ].forEach(path => {
+        //             const vpath = new vlib.Path(path);
+        //             if (vpath.exists()) {
+        //                 this.file_watcher!.add_exclude(vpath.str());
+        //             }
+        //         })
+        //     }
+
+        //     // Stop.
+        //     return;
+        // }
 
-            // Stop.
-            return;
-        }
+        // // No file watcher.
+        // else {
 
-        // No file watcher.
-        else {
             // Create HTTPS server.
             if (this.tls) {
                 this.https = http2.createSecureServer(
@@ -2057,10 +2063,8 @@ export class Server {
             }
 
             /* @performance */ this.performance.end("create-http-server");
-        }
-
-        // No file watcher.
-        const file_watcher_restart = process.argv.includes("--file-watcher-restart");
+        
+        // }
 
         // Start the database.
         if (this.db) {
@@ -2440,11 +2444,11 @@ export class Server {
         await this.initialize();
 
         // Inside file watcher process.
-        if (this.is_file_watcher) {
-            this.file_watcher!.start();
-            await this.file_watcher!.promise;
-            return ;
-        }
+        // if (this.is_file_watcher) {
+        //     this.file_watcher!.start();
+        //     await this.file_watcher!.promise;
+        //     return ;
+        // }
 
         // Start static file watcher.
         // if (!this.production && this.file_watcher) {
@@ -2540,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}.`);
                     }
                 }
             };
@@ -2581,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);
             }
 
@@ -2952,12 +2946,13 @@ export class Server {
 
             // Add endpoint.
             this.endpoints.set(`${endpoint.endpoint}:${endpoint.method}`, endpoint);
-            if (!this.production) {
-                if (endpoint._path && this.file_watcher?.add_exclude) {
-                    this.file_watcher!.add_exclude(endpoint._path);
-                }
-                // this.static_file_watcher.add(endpoint);
-            }
+
+            // if (!this.production) {
+            //     if (endpoint._path && this.file_watcher?.add_exclude) {
+            //         this.file_watcher!.add_exclude(endpoint._path);
+            //     }
+            //     // this.static_file_watcher.add(endpoint);
+            // }
         }
         return this;
     }

package/backend/src/volt.ts

@@ -18,7 +18,7 @@ export * from "./server.js"
 export * from "./database.js"
 export * from "./rate_limit.js"
 export * from "./logger.js"
-export * from "./file_watcher.js"
+// export * from "./file_watcher.js"
 export * as Mail from "./plugins/mail.js"
 // export * as PDF from "./plugins/pdf.js"
 export * as TypeScript from "./plugins/ts/compiler.js"

package/package.json

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