@bbn/bbn 2.0.238 → 2.0.239

package/dist/db/classes/Center.d.ts

@@ -0,0 +1,10 @@
+export default class bbnDbCenter {
+    private queues;
+    handleMessage(event: MessageEvent): Promise<boolean>;
+    private execute;
+    private executeManager;
+    private executeObject;
+    private postSuccess;
+    private postError;
+    private serializeError;
+}

package/dist/db/classes/Center.js

@@ -0,0 +1,88 @@
+import bbnDb from './Object.js';
+export default class bbnDbCenter {
+    queues = {};
+    async handleMessage(event) {
+        const command = event.data;
+        const port = event.ports?.[0];
+        bbn.fn.log("Received DB command:", command, port, "END");
+        if (!port || !command?.method?.includes('.')) {
+            return false;
+        }
+        const [scope] = command.method.split('.');
+        if (scope !== 'manager' && scope !== 'object') {
+            return false;
+        }
+        if (!command.id || !command.database) {
+            this.postError(port, command?.id ?? 0, 'Invalid DB command');
+            return true;
+        }
+        const database = command.database;
+        this.queues[database] = (this.queues[database] || Promise.resolve())
+            .catch(() => undefined)
+            .then(async () => {
+            try {
+                const result = await this.execute(command);
+                this.postSuccess(port, command.id, result);
+            }
+            catch (error) {
+                this.postError(port, command.id, this.serializeError(error));
+            }
+        });
+        return true;
+    }
+    async execute(command) {
+        const [scope, action] = command.method.split('.');
+        if (!action) {
+            throw new Error(`Invalid DB method: ${command.method}`);
+        }
+        if (scope === 'manager') {
+            return this.executeManager(action, command.args || []);
+        }
+        if (scope === 'object') {
+            return this.executeObject(action, [command.database, ...(command.args || [])]);
+        }
+        throw new Error(`Unknown DB command scope: ${scope}`);
+    }
+    async executeManager(action, args) {
+        const fn = bbnDb[action];
+        if (typeof fn !== 'function') {
+            throw new Error(`Unknown DB manager method: ${action}`);
+        }
+        return fn.apply(bbnDb, args);
+    }
+    async executeObject(action, args) {
+        const [database, ...methodArgs] = args;
+        if (!database) {
+            throw new Error('Missing database name for object method');
+        }
+        bbn.fn.log(`Executing object method: ${action} on database: ${database}`);
+        const dbo = await bbnDb.open(database);
+        const fn = dbo[action];
+        if (typeof fn !== 'function') {
+            throw new Error(`Unknown DB object method: ${action}`);
+        }
+        return fn.apply(dbo, methodArgs);
+    }
+    postSuccess(port, id, result) {
+        port.postMessage({
+            id,
+            ok: true,
+            result
+        });
+        port.close();
+    }
+    postError(port, id, error) {
+        port.postMessage({
+            id,
+            ok: false,
+            error
+        });
+        port.close();
+    }
+    serializeError(error) {
+        if (error instanceof Error) {
+            return error.message;
+        }
+        return String(error);
+    }
+}

package/dist/db/classes/Object.d.ts

@@ -1,3 +1,3 @@
-import { DbManager } from '../types.js';
-declare const db: DbManager;
+import { DbManagerInternal } from '../types.js';
+declare const db: DbManagerInternal;
 export default db;

package/dist/db/classes/Object.js

@@ -9,17 +9,20 @@ import getPrimaryKey from '../functions/getPrimaryKey.js';
 import requestToPromise from '../functions/requestToPromise.js';
 import transformResult from '../functions/transformResult.js';
 import fieldsFromFilter from '../functions/fieldsFromFilter.js';
-import bbnDbProxy from './Proxy.js';
+import bbnDbObjectProxy from './ObjectProxy.js';
 const idb = globalThis.indexedDB ||
     globalThis.webkitIndexedDB ||
     globalThis.mozIndexedDB ||
     globalThis.OIndexedDB ||
     globalThis.msIndexedDB;
 class DbObject {
-    dbName;
+    _dbName;
     lastErr = null;
     constructor(dbName) {
-        this.dbName = dbName;
+        this._dbName = dbName;
+    }
+    get dbName() {
+        return this._dbName;
     }
     hasMissingStores(database, conn) {
         const structures = db._structures[database] || {};
@@ -29,6 +32,7 @@ class DbObject {
         let conn = db._connections[database || this.dbName];
         if (!conn) {
             debugger;
+            log("Opening connection through getConnection to database: " + (database || this.dbName));
             await db.open(database || this.dbName);
             if (!db._connections[database || this.dbName]) {
                 throw new Error(_('The database %s is not open', this.dbName));
@@ -47,6 +51,7 @@ class DbObject {
     async getStore(table, mode) {
         const connection = await this.getConnection();
         if (!this.structure[table]) {
+            log("No structure for table: " + table, this.structure, db._structures);
             throw new Error(_('Table %s is not defined in database structure %s', table, this.dbName));
         }
         if (!connection.objectStoreNames.contains(table)) {
@@ -75,11 +80,7 @@ class DbObject {
         return this.lastErr;
     }
     close() {
-        const conn = db._connections[this.dbName];
-        if (conn) {
-            conn.close();
-            delete db._connections[this.dbName];
-        }
+        return db.close(this.dbName);
     }
     async insert(table, data) {
         const rows = Array.isArray(data) ? data : [data];
@@ -266,12 +267,14 @@ const db = {
         if (conn) {
             conn.close();
             delete this._connections[database];
+            log("Closing connection to database: " + database);
         }
         if (this._objects[database]) {
             delete this._objects[database];
         }
     },
     updateStructure(storeName, structure, database) {
+        log("fn updateStructure, table: " + storeName + ", in SW? " + !globalThis.document);
         const primary = getPrimaryKey(structure);
         if (!database.objectStoreNames.contains(storeName)) {
             const store = database.createObjectStore(storeName, {
@@ -285,13 +288,13 @@ const db = {
         }
     },
     async importStructure(database, structure) {
+        log("fn importStructure");
         if (!this._structures[database]) {
             this._structures[database] = {};
         }
-        if (this._connections[database]) {
-            throw new Error(_('Database %s is already open. Close it before adding a new store.', database));
+        if (!this._connections[database]) {
+            await this.open(database);
         }
-        await this.open(database);
         const conn = this._connections[database];
         let upgrade = false;
         for (const storeName in structure) {
@@ -340,10 +343,11 @@ const db = {
         });
     },
     async reopenWithUpgrade(name) {
+        log("fn reopenWithUpgrade", this._structures);
         if (!this._structures[name]) {
             throw new Error(_('Impossible to find a structure for the database %s', name));
         }
-        const existingVersion = await this.getExistingVersion(name);
+        const existingVersion = await this.getExistingVersion(name) || 0;
         const nextVersion = existingVersion + 1;
         log(_('Going from version %s to version %s for database %s', existingVersion, nextVersion, name));
         if (this._connections[name]) {
@@ -352,11 +356,16 @@ const db = {
         return await this.open(name, nextVersion);
     },
     async open(database, version) {
+        log("fn open database " + database + " version " + version, this._structures);
+        if (database !== 'bbn') {
+            log("THERE SHOULD BE A DEBUGGER!!!!!!!");
+            debugger;
+        }
         if (!idb) {
             throw new Error(_('IndexedDB is not available'));
         }
         if (navigator.serviceWorker?.controller) {
-            return new Promise(resolve => resolve(new bbnDbProxy(database)));
+            return new Promise(resolve => resolve(new bbnDbObjectProxy(database)));
         }
         if (!this._structures[database]) {
             throw new Error(_('Impossible to find a structure for the database %s', database));
@@ -389,6 +398,7 @@ const db = {
         return this._objects[database];
     },
     async add(database, name, structure) {
+        log("fn add " + name);
         if (!structure?.keys?.PRIMARY || !structure?.fields) {
             log("Error on add", structure);
             throw new Error(_('The database structure for %s is not valid (missing keys, fields, or primary key)', name));
@@ -415,6 +425,7 @@ const db = {
         return true;
     },
     async remove(database, name) {
+        log("fn remove");
         const currentStructure = this._structures[database];
         if (!currentStructure?.[name]) {
             return;

package/dist/db/classes/ObjectProxy.d.ts

@@ -1,5 +1,5 @@
-import { IDbApi, OrderClause } from '../types.js';
-export default class bbnDbObjectProxy implements IDbApi {
+import { DbApi, OrderClause } from '../types.js';
+export default class bbnDbObjectProxy implements DbApi {
     private readonly _dbName;
     lastErr: any;
     constructor(dbName: string);

package/dist/db/classes/ObjectProxy.js

@@ -1,3 +1,4 @@
+import log from '../../fn/browser/log.js';
 let requestId = 0;
 function callServiceWorker(obj, method, args) {
     return new Promise((resolve, reject) => {
@@ -9,6 +10,7 @@ function callServiceWorker(obj, method, args) {
         const channel = new MessageChannel();
         channel.port1.onmessage = event => {
             const msg = event.data;
+            log(['SW response', msg]);
             if (msg?.id !== id) {
                 return;
             }
@@ -42,36 +44,36 @@ export default class bbnDbObjectProxy {
         return this._dbName;
     }
     insert(table, data) {
-        return callServiceWorker(this, 'insert', [table, data]);
+        return callServiceWorker(this, 'object.insert', [table, data]);
     }
     update(table, data, where, replace = false) {
-        return callServiceWorker(this, 'update', [table, data, where, replace]);
+        return callServiceWorker(this, 'object.update', [table, data, where, replace]);
     }
     delete(table, where) {
-        return callServiceWorker(this, 'delete', [table, where]);
+        return callServiceWorker(this, 'object.delete', [table, where]);
     }
     selectOne(table, field, where, order, start, limit) {
-        return callServiceWorker(this, 'selectOne', [table, field, where, order, start, limit]);
+        return callServiceWorker(this, 'object.selectOne', [table, field, where, order, start, limit]);
     }
     select(table, fields, where, order, start) {
-        return callServiceWorker(this, 'select', [table, fields, where, order, start]);
+        return callServiceWorker(this, 'object.select', [table, fields, where, order, start]);
     }
     selectAll(table, fields, where, order, start, limit) {
-        return callServiceWorker(this, 'selectAll', [table, fields, where, order, start, limit]);
+        return callServiceWorker(this, 'object.selectAll', [table, fields, where, order, start, limit]);
     }
     getColumnValues(table, field, where, order, start, limit) {
-        return callServiceWorker(this, 'getColumnValues', [table, field, where, order, start, limit]);
+        return callServiceWorker(this, 'object.getColumnValues', [table, field, where, order, start, limit]);
     }
     copyTable(target, table, fields, where, order, start, limit) {
-        return callServiceWorker(this, 'copyTable', [target, table, fields, where, order, start, limit]);
+        return callServiceWorker(this, 'object.copyTable', [target, table, fields, where, order, start, limit]);
     }
     deleteTable(table) {
-        return callServiceWorker(this, 'deleteTable', [table]);
+        return callServiceWorker(this, 'object.deleteTable', [table]);
     }
     close() {
-        void callServiceWorker(this, 'close', []);
+        void callServiceWorker(this, 'object.close', []);
     }
     lastError() {
-        return this.lastErr;
+        return callServiceWorker(this, 'object.lastError', [this.dbName]);
     }
 }

package/dist/db/classes/Proxy.d.ts

@@ -1,17 +1,10 @@
-import { IDbApi, DbStructure } from '../types.js';
+import { DbApi, DbStructure } from '../types.js';
 declare const bbnDbProxy: {
-    _structures: {};
-    _connections: {};
-    _objects: {};
-    _stores: {};
     ok: boolean;
-    open(database: string, version?: number): Promise<IDbApi>;
+    open(database: string, version?: number): Promise<DbApi>;
     add(database: string, name: string, structure: DbStructure): Promise<boolean>;
     remove(database: string, name: string): Promise<void>;
     importStructure(database: string, structure: Record<string, DbStructure>): Promise<void>;
-    reopenWithUpgrade(database: string): Promise<IDbApi>;
-    getExistingVersion(database: string): Promise<number>;
-    close(database: string): void;
-    updateStructure(): never;
+    close(database: string): Promise<void>;
 };
 export default bbnDbProxy;

package/dist/db/classes/Proxy.js

@@ -1,5 +1,5 @@
 import bbnDbObjectProxy from './ObjectProxy.js';
-let requestId = bbn.data.dbRequestId;
+let requestId = 0;
 function callServiceWorker(database, method, args) {
     return new Promise((resolve, reject) => {
         if (!navigator.serviceWorker?.controller) {
@@ -31,36 +31,22 @@ function callServiceWorker(database, method, args) {
     });
 }
 const bbnDbProxy = {
-    _structures: {},
-    _connections: {},
-    _objects: {},
-    _stores: {},
     ok: true,
     async open(database, version) {
         await callServiceWorker(database, 'manager.open', [database, version]);
         return new bbnDbObjectProxy(database);
     },
     async add(database, name, structure) {
-        return callServiceWorker(database, 'manager.add', [database, name, structure]);
+        return await callServiceWorker(database, 'manager.add', [database, name, structure]);
     },
     async remove(database, name) {
-        return callServiceWorker(database, 'manager.remove', [database, name]);
+        return await callServiceWorker(database, 'manager.remove', [database, name]);
     },
     async importStructure(database, structure) {
-        return callServiceWorker(database, 'manager.importStructure', [database, structure]);
+        return await callServiceWorker(database, 'manager.importStructure', [database, structure]);
     },
-    async reopenWithUpgrade(database) {
-        await callServiceWorker(database, 'manager.reopenWithUpgrade', [database]);
-        return new bbnDbObjectProxy(database);
-    },
-    async getExistingVersion(database) {
-        return callServiceWorker(database, 'manager.getExistingVersion', [database]);
-    },
-    close(database) {
-        void callServiceWorker(database, 'manager.close', [database]);
-    },
-    updateStructure() {
-        throw new Error('updateStructure cannot be called from the window proxy');
+    async close(database) {
+        return await callServiceWorker(database, 'manager.close', [database]);
     }
 };
 export default bbnDbProxy;

package/dist/db/types.d.ts

@@ -22,7 +22,7 @@ export type DbCommand = {
     method: string;
     args: unknown[];
 };
-export interface IDbApi {
+export interface DbApi {
     lastErr: any;
     get dbName(): string;
     lastError(): unknown;
@@ -38,17 +38,19 @@ export interface IDbApi {
     deleteTable(table: string): Promise<boolean>;
 }
 export interface DbManager {
-    _structures: DbStructures;
-    _connections: Record<string, IDBDatabase>;
-    _objects: Record<string, IDbApi>;
-    _stores: Record<string, unknown>;
     ok: boolean;
-    open(name: string, version?: number): Promise<IDbApi>;
+    open(name: string, version?: number): Promise<DbApi>;
     add(database: string, name: string, structure: DbStructure): Promise<boolean>;
     remove(database: string, name: string): Promise<void>;
-    updateStructure(storeName: string, structure: DbStructure, database: IDBDatabase): void;
     importStructure(database: string, structure: Record<string, DbStructure>): Promise<void>;
-    reopenWithUpgrade(name: string): Promise<IDbApi>;
-    getExistingVersion(name: string): Promise<number>;
     close(database: string): void;
 }
+export interface DbManagerInternal extends DbManager {
+    _structures: DbStructures;
+    _connections: Record<string, IDBDatabase>;
+    _objects: Record<string, DbApi>;
+    _stores: Record<string, unknown>;
+    updateStructure(storeName: string, structure: DbStructure, database: IDBDatabase): void;
+    reopenWithUpgrade(name: string): Promise<DbApi>;
+    getExistingVersion(name: string): Promise<number>;
+}

package/dist/db.d.ts

@@ -1,2 +1,3 @@
-import db from './db/classes/Object.js';
-export default db;
+import bbnDb from './db/classes/Object.js';
+import bbnDbProxy from './db/classes/Proxy.js';
+export { bbnDb, bbnDbProxy };

package/dist/db.js

@@ -1,2 +1,3 @@
-import db from './db/classes/Object.js';
-export default db;
+import bbnDb from './db/classes/Object.js';
+import bbnDbProxy from './db/classes/Proxy.js';
+export { bbnDb, bbnDbProxy };

package/dist/dt.js

@@ -9,7 +9,7 @@ import bbnDtDuration from './dt/classes/Duration.js';
 import _ from './_.js';
 import parse from './dt/functions/parse.js';
 import guessFormat from './dt/functions/guessFormat.js';
-import buildLocaleFromIntl from './dt/functions/buildLocaleFromIntl.js';
+import log from './fn/browser/log.js';
 const patterns = [
     // MariaDB DATETIME "YYYY-MM-DD HH:MM:SS"
     {
@@ -227,13 +227,12 @@ const dt = (value, inputFormat = null, cls = 'auto') => {
         return new bbnDtDuration(value);
     }
     else {
-        bbn.fn.log('Invalid date value', value);
+        log('Invalid date value', value);
         throw new Error(_('Invalid date value'));
     }
     //throw new Error(_('Invalid date value: %s', value));
 };
 dt.locales = Object.create(null);
-buildLocaleFromIntl();
 dt.parse = parse;
 dt.guessFormat = guessFormat;
 dt.time = () => { };

package/dist/fn/ajax/stream.js

@@ -3,6 +3,7 @@ import getLoader from './getLoader.js';
 import _deleteLoader from './_deleteLoader.js';
 import isFunction from '../type/isFunction.js';
 import _addLoader from './_addLoader.js';
+import log from '../browser/log.js';
 import defaultStartLoadingFunction from '../default/defaultStartLoadingFunction.js';
 import defaultEndLoadingFunction from '../default/defaultEndLoadingFunction.js';
 import defaultAjaxAbortFunction from '../default/defaultAjaxAbortFunction.js';
@@ -94,7 +95,7 @@ export default function stream(url, success, data, failure, abort, finished) {
                 }
                 if (isFn) {
                     json += arrayBuffer2String(value).trim();
-                    bbn.fn.log(["STREAM RESULT", json.length, json]);
+                    log(["STREAM RESULT", json.length, json]);
                     if (json) {
                         try {
                             treatJSON(json);
@@ -107,7 +108,7 @@ export default function stream(url, success, data, failure, abort, finished) {
                     }
                 }
                 else {
-                    bbn.fn.log(["STREAM SUCCESS IS FN? " + isFn]);
+                    log(["STREAM SUCCESS IS FN? " + isFn]);
                 }
                 // Read some more, and call this function again
                 return reader.read().then(pump);

package/dist/fn/browser/log.js

@@ -34,6 +34,9 @@ export default function log(...args) {
                 let t = typeof args[i];
                 let consoleArguments = [args[i]];
                 if (t === 'string' || t === 'number') {
+                    if (!globalThis.document) {
+                        consoleArguments[0] = `[SW] ${consoleArguments[0]}`;
+                    }
                     consoleArguments.unshift('%c %s ', cfg);
                 }
                 exec.apply(globalThis.console, consoleArguments);

package/dist/fn/object/_filter.js

@@ -1,5 +1,6 @@
 import isArray from '../type/isArray.js';
 import compareConditions from './compareConditions.js';
+import log from '../browser/log.js';
 /**
  * Returns a new array with only the data matching the given filter.
  *
@@ -53,7 +54,7 @@ export default function _filter(arr, prop, val = null, operator = '=', limit = 0
             arr = Array.from(arr);
         }
         catch {
-            bbn.fn.log("NOT ARRAY", arr);
+            log("NOT ARRAY", arr);
             throw new Error('Error in filter: The first argument must be an array');
         }
     }

package/dist/fn/object/filter.js

@@ -1,6 +1,7 @@
 import isArray from '../type/isArray.js';
 import { filterToConditions } from './filterToConditions.js';
 import compareConditions from './compareConditions.js';
+import log from '../browser/log.js';
 /**
  * Returns a new array with only the data matching the given filter.
  *
@@ -50,7 +51,7 @@ import compareConditions from './compareConditions.js';
  */
 export default function filter(arr, prop, val = null, operator = '=') {
     if (!isArray(arr)) {
-        bbn.fn.log("NOT ARRAY", arr);
+        log("NOT ARRAY", arr);
         throw new Error('Error in filter: The first argument must be an array');
     }
     let cfg = {};

package/dist/index-no-dep.js

@@ -4,9 +4,10 @@ import lng from './lng.js';
 import data from './data.js';
 import env from './env.js';
 import com from './com.js';
-import db from './db.js';
+import { bbnDb, bbnDbProxy } from './db.js';
 import fn from './fn.js';
 import dt from './dt.js';
+import buildLocaleFromIntl from './dt/functions/buildLocaleFromIntl.js';
 const bbn = {
     version: "1.0.1",
     opt: {
@@ -20,7 +21,12 @@ const bbn = {
     dt,
     com,
     env,
-    db,
+    get db() {
+        if (navigator.serviceWorker?.controller) {
+            return bbnDbProxy;
+        }
+        return bbnDb;
+    },
     fn,
     info: [
         {
@@ -91,4 +97,5 @@ const bbn = {
         }
     ]
 };
+buildLocaleFromIntl();
 export default bbn;

package/dist/index.js

@@ -5,9 +5,11 @@ import lng from './lng.js';
 import data from './data.js';
 import env from './env.js';
 import com from './com.js';
-import db from './db.js';
+import { bbnDb, bbnDbProxy } from './db.js';
+import bbnDbCenter from './db/classes/Center.js';
 import fn from './fn.js';
 import dt from './dt.js';
+import buildLocaleFromIntl from './dt/functions/buildLocaleFromIntl.js';
 const bbn = {
     version: "1.0.1",
     opt: {
@@ -21,7 +23,13 @@ const bbn = {
     dt,
     com,
     env,
-    db,
+    get db() {
+        if (navigator.serviceWorker?.controller) {
+            return bbnDbProxy;
+        }
+        return bbnDb;
+    },
+    dbCenter: () => new bbnDbCenter(),
     fn,
     info: [
         {
@@ -98,4 +106,5 @@ if ('undefined' !== typeof globalThis) {
         globalThis.Temporal = Temporal;
     }
 }
+buildLocaleFromIntl();
 export { bbn as default, bbn, Temporal };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "2.0.238",
+  "version": "2.0.239",
   "description": "Javascript toolkit",
   "main": "./dist/index.js",
   "module": "./dist/index.js",