@vandenberghinc/volt 1.1.34 → 1.1.35

package/backend/dist/esm/backend/src/database/collection.js

@@ -502,10 +502,12 @@ export class Collection {
      */
     async init() {
         if (this.initialized === false) {
+            this.db.server.log(3, "Initializing collection: ", this.name);
             // Initialize NON transaction based.
             if (!this.is_transaction) {
                 // Create collection.
                 if (this._col == null) {
+                    this.db.server.log(3, "Checking collection: ", this.name);
                     // Start connection in dev mode.
                     if (!this.db.server.production) {
                         await this.db.ensure_connection();
@@ -519,10 +521,13 @@ export class Collection {
                     }
                     // Check if the collection exists
                     if (this.db._listed_cols == null) {
+                        this.db.server.log(3, "Listing collections...");
                         this.db._listed_cols = await this.db._db.listCollections().toArray();
+                        this.db.server.log(3, "Listed collections: " + this.db._listed_cols.map(x => x.name).join(", "));
                     }
                     // Create collection with retry logic for race conditions
                     if (!this.db._listed_cols.find(x => x.name === this.name)) {
+                        this.db.server.log(3, "Creating collection: " + this.name);
                         let create_col_retries = 3;
                         let last_error = null;
                         let collection_created = false;
@@ -550,6 +555,7 @@ export class Collection {
                         }
                     }
                     // Create collection.
+                    this.db.server.log(3, "Initializing mongodb collection connection: " + this.name);
                     this._col = this.db._db.collection(this.name);
                 }
                 // Assign as initialized when the column is created.
@@ -557,11 +563,13 @@ export class Collection {
                 this.initialized = true;
                 // Create ttl index.
                 if (this.ttl_enabled) {
+                    this.db.server.log(3, "Setting up TTL index for collection: " + this.name);
                     await this._setup_ttl();
                 }
                 // Create indexes.
                 if (this._init_indexes?.length) {
                     for (const item of this._init_indexes) {
+                        this.db.server.log(3, "Creating index " + JSON.stringify(item) + " on collection: " + this.name);
                         await this.create_index(item);
                     }
                 }

package/backend/dist/esm/backend/src/database/database.d.ts

@@ -11,6 +11,8 @@ export declare namespace Database {
     interface Opts {
         /** The database URI. */
         uri: string;
+        /** The database name, if not provided it will the database name from the connection URI will be used. */
+        database?: string;
         /** The additional cient options. */
         client?: mongodb.MongoClientOptions;
     }
@@ -26,6 +28,10 @@ export declare class Database {
             type: string;
             default: null;
         };
+        database_name: {
+            type: string;
+            default: undefined;
+        };
         client: {
             type: string;
             default: {};
@@ -35,13 +41,14 @@ export declare class Database {
         };
     };
     uri: string;
+    database_name: undefined | string;
     client_opts?: mongodb.MongoClientOptions;
     server: Server;
     client?: MongoClient;
     _db?: Db;
     collections: Map<string, Collection<any>>;
     _listed_cols: any;
-    constructor({ uri, client, _server, }: Database.Opts & {
+    constructor({ uri, database, client, _server, }: Database.Opts & {
         _server: Server;
     });
     db(): Promise<Db>;

package/backend/dist/esm/backend/src/database/database.js

@@ -16,6 +16,7 @@ import { Collection } from "./collection.js";
 export class Database {
     static constructor_scheme = {
         uri: { type: "string", default: null },
+        database_name: { type: "string", default: undefined },
         client: { type: "object", default: {} },
         _server: { type: ["object", "undefined"] },
         // source: {type: "string", default: null},
@@ -27,6 +28,7 @@ export class Database {
     };
     // Attributes.
     uri;
+    database_name;
     client_opts;
     server;
     client;
@@ -34,8 +36,9 @@ export class Database {
     collections = new Map();
     // System.
     _listed_cols;
-    constructor({ uri, client, _server, }) {
+    constructor({ uri, database, client, _server, }) {
         this.uri = uri;
+        this.database_name = database;
         this.client_opts = client;
         this.server = _server;
         // DEPRECATED
@@ -94,26 +97,30 @@ export class Database {
     connect_promise;
     async connect() {
         if (this.connect_promise) {
-            return await this.connect_promise;
+            return this.connect_promise;
         }
         return this.connect_promise = new Promise(async (resolve, reject) => {
             try {
                 if (this.client == null) {
                     throw new Error('MongoDB client is not initialized.');
                 }
+                this.server.log(3, "Connecting to the database client.");
                 await this.client.connect();
-                this._db = this.client.db();
+                this.server.log(3, "Connecting to the database.");
+                this._db = this.client.db(this.database_name);
                 this.connected = true;
                 this.server.log(1, "Connected to the database.");
+                resolve();
             }
             catch (error) {
                 this.server.log.error(error);
-                throw new Error('Error connecting to the database');
+                reject(new Error('Error connecting to the database'));
             }
         });
     }
     /** Initialize. */
     async initialize() {
+        this.server.log(3, "Initializing the database.");
         // Initialize client (same as before)
         const opts = this.client_opts ?? {};
         opts.serverApi ??= {
@@ -130,18 +137,15 @@ export class Database {
         opts.serverSelectionTimeoutMS = 1000;
         opts.connectTimeoutMS = 1000;
         this.client = new MongoClient(this.uri, opts);
-        // In development we start the connection in the background so the server
-        // can finish booting immediately. In production we still block.
-        if (this.server.production === false) {
-            this.connect(); // don’t await
-        }
-        else {
+        // In production we instanlty connect and initialize all columns.
+        if (this.server.production) {
             await this.connect(); // block in prod
             // In production we also wanna initialize all collections right away.
             for (const col of this.collections.values()) {
                 await col.init();
             }
         }
+        this.server.log(3, "Database initialized.");
     }
     /** Ensure connection. */
     async ensure_connection() {

package/backend/dist/esm/backend/src/server.js

@@ -1545,24 +1545,17 @@ export class Server {
         // Create static endpoints.
         await this._initialize_statics();
         /* @performance */ this.performance.end("_initialize_statics()");
+        /**
+         * Initialize keys.
+         * Its required to await this in case no keys exist.
+         * If in this case a user would perform any key requiring operations inside an
+         * "initialize" callback, then it would not yet be created.
+         */
+        await this._initialize_keys();
+        /* @performance */ this.performance.end("load-keys");
         // Add promises using the database.
         const promises = [];
         /* @performance */ this.performance.start();
-        // Initialize keys,
-        // uses the database so dont await in non production,
-        // to speed up restarts.
-        if (this.production) {
-            promises.push(this._initialize_keys());
-        }
-        else {
-            this._initialize_keys().then(() => {
-                this.log(1, "Finished loading keys.");
-            }).catch((err) => {
-                this.log(0, `Error while loading keys.`);
-                this.log.error(err);
-            });
-        }
-        // /* @performance */ this.performance.end("load-keys");
         // Initialize users.
         promises.push(this.users._initialize());
         // /* @performance */ this.performance.end("users._initialize()");
@@ -1614,10 +1607,7 @@ export class Server {
         /* @performance */ this.performance.end("initialize-endpoints");
         // On initialize callbacks.
         for (const callback of this.events.get("initialize")) {
-            const res = callback();
-            if (res instanceof Promise) {
-                await res;
-            }
+            await callback();
         }
         /* @performance */ this.performance.end("on-initialize-callbacks");
         /* @performance */ this.performance.end("initialize()", initialize_start);

package/package.json

@@ -1,7 +1,7 @@
 {
     "author": "Daan van den Bergh",
     "name": "@vandenberghinc/volt",
-    "version": "1.1.34",
+    "version": "1.1.35",
     "description": "",
     "type": "module",
     "types": "./backend/dist/esm/volt.d.ts",
@@ -35,7 +35,7 @@
     },
     "dependencies": {
         "@vandenberghinc/vhighlight": "^1.3.15",
-        "@vandenberghinc/vlib": "^1.6.33",
+        "@vandenberghinc/vlib": "^1.6.34",
         "blob-stream": "^0.1.3",
         "clean-css": "^5.3.3",
         "esbuild": "^0.25.12",