@vandenberghinc/volt 1.1.6 → 1.1.8

package/backend/dist/esm-dev/server.d.ts

@@ -7,7 +7,6 @@ import * as Mail from './plugins/mail.js';
 import { Status } from "./status.js";
 import { Endpoint, EndpointOptions } from "./endpoint.js";
 import { Database, Collection } from "./database.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";
@@ -121,7 +120,6 @@ export declare class Server {
     additional_sitemap_endpoints: string[];
     log_level: number;
     tls?: TLSConfig;
-    file_watcher?: FileWatcher;
     lightweight: boolean;
     performance: vlib.Performance;
     csp: Record<string, string>;
@@ -141,7 +139,6 @@ export declare class Server {
     keys: Record<string, string>;
     private _on_start;
     private _on_stop;
-    is_file_watcher: boolean;
     daemon?: vlib.Daemon;
     private _stop_tscompiler_watcher?;
     users: Users;
@@ -149,7 +146,8 @@ export declare class Server {
     status: typeof Status;
     rate_limits: typeof RateLimits;
     logger: typeof logger;
-    constructor({ ip, port, domain, is_primary, source, database, statics, favicon, company, meta, tls, smtp, mail_style, rate_limit, keys, payments, default_headers, google_tag, token_expiration, enable_2fa, enable_account_activation, production, localhost, multiprocessing, processes, file_watcher, offline, additional_sitemap_endpoints, log_level, daemon, lightweight, }: {
+    constructor({ ip, // leave undefined for blank detection.
+    port, domain, is_primary, source, database, statics, favicon, company, meta, tls, smtp, mail_style, rate_limit, keys, payments, default_headers, google_tag, token_expiration, enable_2fa, enable_account_activation, production, localhost, multiprocessing, processes, offline, additional_sitemap_endpoints, log_level, daemon, lightweight, }: {
         ip?: string;
         port?: number;
         domain: string;
@@ -178,7 +176,6 @@ export declare class Server {
         localhost?: boolean;
         multiprocessing?: boolean;
         processes?: number | null;
-        file_watcher?: FileWatcher | Record<string, any> | boolean;
         offline?: boolean;
         additional_sitemap_endpoints?: string[];
         log_level?: number;

package/backend/dist/esm-dev/server.js

@@ -23,7 +23,7 @@ import { Endpoint } from "./endpoint.js";
 import { ImageEndpoint } from "./image_endpoint.js";
 import { Stream } from "./stream.js";
 import { Database } 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";
@@ -680,7 +680,7 @@ export class Server {
     additional_sitemap_endpoints;
     log_level;
     tls;
-    file_watcher;
+    // public file_watcher?: FileWatcher;
     // public admin: AdminConfig;
     // public ts: TypeScriptConfig;
     lightweight;
@@ -704,7 +704,7 @@ export class Server {
     _on_stop;
     // public browser_preview?: BrowserPreview;
     // public static_file_watcher: StaticFileWatcher;
-    is_file_watcher;
+    // public is_file_watcher: boolean;
     daemon;
     _stop_tscompiler_watcher;
     users;
@@ -712,7 +712,8 @@ export class Server {
     status;
     rate_limits;
     logger;
-    constructor({ ip = "127.0.0.1", port = 8000, domain, is_primary = true, source, database = "mongodb://localhost:27017/main", statics = [], favicon = undefined, company, meta = new Meta(), tls = undefined, smtp = undefined, mail_style = {
+    constructor({ ip, // leave undefined for blank detection.
+    port = 8000, domain, is_primary = true, source, database = "mongodb://localhost:27017/main", statics = [], favicon = undefined, company, meta = new Meta(), tls = undefined, smtp = undefined, mail_style = {
         font: '"Helvetica", sans-serif',
         title_fg: "#121B23",
         subtitle_fg: "#121B23",
@@ -737,7 +738,9 @@ export class Server {
         },
     }, keys = [], payments = null, default_headers = null, google_tag = undefined, token_expiration = 86400, enable_2fa = false, enable_account_activation = true, 
     // honey_pot_key = null,
-    production = false, localhost = true, multiprocessing = true, processes = null, file_watcher = false, offline = false, additional_sitemap_endpoints = [], log_level = 0, daemon = {}, 
+    production = false, localhost = true, multiprocessing = true, processes = null, 
+    // file_watcher = false,
+    offline = false, additional_sitemap_endpoints = [], log_level = 0, daemon = {}, 
     // admin = {
     //     password: null,
     //     ips: [],
@@ -870,7 +873,7 @@ export class Server {
                 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 },
@@ -895,7 +898,7 @@ export class Server {
             } });
         // Assign attributes directly.
         this.port = port;
-        this.ip = ip;
+        this.ip = ip ?? "127.0.0.1";
         this.is_primary = is_primary && libcluster.isPrimary;
         this.source = new vlib.Path(source);
         this.favicon = favicon;
@@ -927,6 +930,10 @@ export class Server {
             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));
+        }
         /* @performance */ this.performance = new vlib.Performance("Server performance");
         // Assign objects to server so it is easy to access.
         this.status = Status;
@@ -1035,96 +1042,98 @@ export class Server {
         // Static file watcher.
         // 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.source) {
-                // Source.
-                file_watcher.source = this.source.str();
-            }
-            if (!(file_watcher instanceof FileWatcher)) {
-                // Initialize.
-                file_watcher = new FileWatcher(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;
+        // }
+        // 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;
+        // }
+        // // No file watcher.
+        // else {
+        // Disable file watcher.
+        // this.is_file_watcher = false;
+        // Set logger.
+        logger.log_level = this.log_level;
+        this.log = logger.log.bind(logger);
+        this.error = logger.error.bind(logger);
+        // Initialize the service daemon.
+        // Must be initialized before initializing the database.
+        if (daemon !== false) {
+            const log_source = this.source.join(".logs");
+            if (!log_source.exists()) {
+                log_source.mkdir_sync();
             }
-            this.file_watcher = file_watcher;
+            this.daemon = new vlib.Daemon({
+                name: this.domain.replaceAll(".", ""),
+                user: daemon.user || os.userInfo().username,
+                group: daemon.group || null,
+                command: "volt --service --start",
+                cwd: this.source.str(),
+                args: daemon.args || [],
+                env: daemon.env || {},
+                description: daemon.description || `Service daemon for website ${this.domain}.`,
+                auto_restart: true,
+                logs: daemon.logs || log_source.join("logs").str(),
+                errors: daemon.errors || log_source.join("errors").str(),
+            });
         }
-        else {
-            this.file_watcher = undefined;
+        // Initialize the database class.
+        if (typeof database === "string") {
+            this.db = new Database({ uri: database, _server: this });
         }
-        // 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;
-        }
-        // No file watcher.
-        else {
-            // Disable file watcher.
-            this.is_file_watcher = false;
-            // Set logger.
-            logger.log_level = this.log_level;
-            this.log = logger.log.bind(logger);
-            this.error = logger.error.bind(logger);
-            // Initialize the service daemon.
-            // Must be initialized before initializing the database.
-            if (daemon !== false) {
-                const log_source = this.source.join(".logs");
-                if (!log_source.exists()) {
-                    log_source.mkdir_sync();
-                }
-                this.daemon = new vlib.Daemon({
-                    name: this.domain.replaceAll(".", ""),
-                    user: daemon.user || os.userInfo().username,
-                    group: daemon.group || null,
-                    command: "volt --service --start",
-                    cwd: this.source.str(),
-                    args: daemon.args || [],
-                    env: daemon.env || {},
-                    description: daemon.description || `Service daemon for website ${this.domain}.`,
-                    auto_restart: true,
-                    logs: daemon.logs || log_source.join("logs").str(),
-                    errors: daemon.errors || log_source.join("errors").str(),
-                });
-            }
-            // Initialize the database class.
-            if (typeof database === "string") {
-                this.db = new Database({ uri: database, _server: this });
-            }
-            else if (database !== false) {
-                this.db = new Database({ ...database, _server: this });
-            }
-            // Initialize the users class.
-            this.users = new Users(this);
-            // The smtp instance.
-            if (smtp) {
-                this.smtp_sender = smtp.sender;
-                this.smtp = nodemailer.createTransport(smtp);
+        else if (database !== false) {
+            this.db = new Database({ ...database, _server: this });
+        }
+        // Initialize the users class.
+        this.users = new Users(this);
+        // The smtp instance.
+        if (smtp) {
+            this.smtp_sender = smtp.sender;
+            this.smtp = nodemailer.createTransport(smtp);
+        }
+        // The rate limit server/client.
+        if (rate_limit) {
+            if (this.is_primary) {
+                this.rate_limit = new RateLimitServer({ ...(rate_limit.server ?? {}), _server: this });
             }
-            // The rate limit server/client.
-            if (rate_limit) {
-                if (this.is_primary) {
-                    this.rate_limit = new RateLimitServer({ ...(rate_limit.server ?? {}), _server: this });
-                }
-                else {
-                    if (rate_limit.server?.https) {
-                        rate_limit.client.https = true;
-                    }
-                    this.rate_limit = new RateLimitClient({ ...(rate_limit.client ?? {}), _server: this });
+            else {
+                if (rate_limit.server?.https) {
+                    rate_limit.client.https = true;
                 }
+                this.rate_limit = new RateLimitClient({ ...(rate_limit.client ?? {}), _server: this });
             }
-            // Blacklist class.
-            // if (this.honey_pot_key) {
-            //     this.blacklist = new Blacklist({api_key: this.honey_pot_key});
-            // }
         }
+        // Blacklist class.
+        // if (this.honey_pot_key) {
+        //     this.blacklist = new Blacklist({api_key: this.honey_pot_key});
+        // }
+        // }
         // Other keys.
         this.keys = {};
         // Start callbacks.
@@ -1215,7 +1224,7 @@ export class Server {
     // Create default endpoints.
     _create_default_endpoints() {
         // Vars.
-        const additional_file_watcher_paths = [];
+        // const additional_file_watcher_paths: string[] = [];
         // Add favicon.
         if (this.favicon != null) {
             const favicon = new vlib.Path(this.favicon);
@@ -1323,7 +1332,7 @@ export class Server {
                 ._load_data_by_path(this));
         });
         // Handler.
-        return additional_file_watcher_paths;
+        // return additional_file_watcher_paths;
     }
     // Create the sitemap endpoint.
     _create_sitemap() {
@@ -1693,87 +1702,81 @@ export class Server {
         logger.log(1, log_source, "Initializing server.");
         /* @performance */ this.performance.start();
         // File watcher.
-        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.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`);
+        //     // 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;
+        // }
+        // // No file watcher.
+        // else {
+        // Create HTTPS server.
+        if (this.tls) {
+            this.https = http2.createSecureServer({
+                key: new vlib.Path(this.tls.key).load_sync({ encoding: 'utf8' }),
+                cert: new vlib.Path(this.tls.cert).load_sync({ encoding: 'utf8' }),
+                ca: this.tls.ca == null ? null : new vlib.Path(this.tls.ca).load_sync({ encoding: 'utf8' }),
+                passphrase: this.tls.passphrase,
+                allowHTTP1: true,
+            }, 
+            // Support for http1.
+            // Does not work, requests get triggered on the stream and on this callback.
+            (req, res) => {
+                if (req.httpVersion.charAt(0) !== "2") {
+                    this._serve(undefined, undefined, req, res);
                 }
             });
-            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;
+            this.https.on('stream', (stream, headers) => {
+                this._serve(stream, headers, undefined, undefined);
+            });
+        }
+        // Payments require HTTPS in production.
+        else if (this.production && this.payments) {
+            throw Error("Accepting payments in production mode requires HTTPS.");
+        }
+        // Redirect HTTP requests to HTTPS.
+        if (this.tls) {
+            this.http = http.createServer((request, response) => {
+                response.writeHead(301, { Location: `https://${request.headers.host}${request.url}` });
+                response.end();
+            });
         }
-        // No file watcher.
         else {
-            // Create HTTPS server.
-            if (this.tls) {
-                this.https = http2.createSecureServer({
-                    key: new vlib.Path(this.tls.key).load_sync({ encoding: 'utf8' }),
-                    cert: new vlib.Path(this.tls.cert).load_sync({ encoding: 'utf8' }),
-                    ca: this.tls.ca == null ? null : new vlib.Path(this.tls.ca).load_sync({ encoding: 'utf8' }),
-                    passphrase: this.tls.passphrase,
-                    allowHTTP1: true,
-                }, 
-                // Support for http1.
-                // Does not work, requests get triggered on the stream and on this callback.
-                (req, res) => {
-                    if (req.httpVersion.charAt(0) !== "2") {
-                        this._serve(undefined, undefined, req, res);
-                    }
-                });
-                this.https.on('stream', (stream, headers) => {
-                    this._serve(stream, headers, undefined, undefined);
-                });
-            }
-            // Payments require HTTPS in production.
-            else if (this.production && this.payments) {
-                throw Error("Accepting payments in production mode requires HTTPS.");
-            }
-            // Redirect HTTP requests to HTTPS.
-            if (this.tls) {
-                this.http = http.createServer((request, response) => {
-                    response.writeHead(301, { Location: `https://${request.headers.host}${request.url}` });
-                    response.end();
-                });
-            }
-            else {
-                this.http = http.createServer((req, res) => {
-                    this._serve(undefined, undefined, req, res);
-                });
-            }
-            /* @performance */ this.performance.end("create-http-server");
+            this.http = http.createServer((req, res) => {
+                this._serve(undefined, undefined, req, res);
+            });
         }
-        // No file watcher.
-        const file_watcher_restart = process.argv.includes("--file-watcher-restart");
+        /* @performance */ this.performance.end("create-http-server");
+        // }
         // Start the database.
         if (this.db) {
             await this.db.initialize();
@@ -2109,11 +2112,11 @@ export class Server {
         // Always initialize, even when forking.
         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) {
         //     this.static_file_watcher.start();
@@ -2566,12 +2569,12 @@ 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/dist/esm-dev/volt.d.ts

@@ -9,7 +9,6 @@ export * from "./server.js";
 export * from "./database.js";
 export * from "./rate_limit.js";
 export * from "./logger.js";
-export * from "./file_watcher.js";
 export * as Mail from "./plugins/mail.js";
 export * as TypeScript from "./plugins/ts/compiler.js";
 export * from "./plugins/css.js";

package/backend/dist/esm-dev/volt.js

@@ -16,7 +16,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";