@bbn/bbn 2.0.247 → 2.0.249

package/dist/db/classes/Object.js

@@ -520,7 +520,6 @@ const db = {
         }
     },
     async importStructure(database, structure) {
-        log("fn importStructure");
         if (!this._structures[database]) {
             this._structures[database] = {};
         }
@@ -563,15 +562,12 @@ const db = {
                 database.close();
                 resolve(version);
             };
-            req.onupgradeneeded = () => {
-                // Database did not exist before; this open created it temporarily.
-                // Version is therefore effectively 1.
-                const database = req.result;
-                const version = database.version;
-                database.close();
-                resolve(version);
+            req.onerror = () => {
+                reject(req.error);
+            };
+            req.onblocked = () => {
+                reject(new Error(_('Opening database %s to determine its version was blocked', name)));
             };
-            req.onerror = () => reject(req.error);
         });
     },
     async reopenWithUpgrade(name) {
@@ -585,19 +581,16 @@ const db = {
         if (this._connections[name]) {
             this.close(name);
         }
-        return await this.open(name, nextVersion);
+        const obj = await this.open(name, nextVersion);
+        return obj;
     },
     async open(database, version) {
         //log("Hello " + database)
-        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 bbnDbObjectProxy(database)));
+        if (bbn.worker) {
+            return new Promise(resolve => resolve(new bbnDbObjectProxy(bbn.worker, database)));
         }
         if (!this._structures[database]) {
             throw new Error(_('Impossible to find a structure for the database %s', database));
@@ -606,10 +599,11 @@ const db = {
             return this._objects[database];
         }
         await new Promise((resolve, reject) => {
-            const req = version ? idb.open(database, version) : idb.open(database);
-            req.onupgradeneeded = () => {
+            const req = version
+                ? idb.open(database, version)
+                : idb.open(database);
+            req.onupgradeneeded = event => {
                 const db = req.result;
-                this._connections[database] = req.result;
                 const dbStructure = this._structures[database] || {};
                 iterate(dbStructure, (structure, storeName) => {
                     if (!db.objectStoreNames.contains(storeName)) {
@@ -621,9 +615,11 @@ const db = {
                 this._connections[database] = req.result;
                 resolve(req.result);
             };
-            req.onerror = () => reject(req.error);
-            req.onblocked = (event) => {
-                reject(_('open: Upgrade blocked for database %s. Please close other connections to proceed.', database));
+            req.onerror = () => {
+                reject(req.error);
+            };
+            req.onblocked = event => {
+                reject(new Error(_('Upgrade blocked for database %s', database)));
             };
         });
         this._objects[database] = new DbObject(database);

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

@@ -1,8 +1,9 @@
 import { DbApi, OrderClause } from '../types.js';
 export default class bbnDbObjectProxy implements DbApi {
+    private readonly _worker;
     private readonly _dbName;
     lastErr: any;
-    constructor(dbName: string);
+    constructor(worker: bbnWorkerClient, dbName: string);
     get dbName(): string;
     insert(table: string, data: any): Promise<number>;
     update(table: string, data: any, where: any, replace?: boolean): Promise<number>;

package/dist/db/classes/ObjectProxy.js

@@ -1,10 +1,6 @@
 let requestId = 0;
-function callServiceWorker(obj, method, args) {
+function callWorker(worker, obj, method, args) {
     return new Promise((resolve, reject) => {
-        if (!navigator.serviceWorker?.controller) {
-            reject(new Error('No active service worker controller'));
-            return;
-        }
         const id = ++requestId;
         const channel = new MessageChannel();
         channel.port1.onmessage = event => {
@@ -20,7 +16,7 @@ function callServiceWorker(obj, method, args) {
                 resolve(msg.result);
             }
             else {
-                reject(new Error(msg.error || 'IndexedDB service worker error'));
+                reject(new Error(msg.error || 'IndexedDB worker error'));
             }
             channel.port1.close();
         };
@@ -30,52 +26,54 @@ function callServiceWorker(obj, method, args) {
             method,
             args
         };
-        navigator.serviceWorker.controller.postMessage(command, [channel.port2]);
+        worker.sendMessage(command, [channel.port2]);
     });
 }
 export default class bbnDbObjectProxy {
+    _worker;
     _dbName;
     lastErr = null;
-    constructor(dbName) {
+    constructor(worker, dbName) {
+        this._worker = worker;
         this._dbName = dbName;
     }
     get dbName() {
         return this._dbName;
     }
     insert(table, data) {
-        return callServiceWorker(this, 'object.insert', [table, data]);
+        return callWorker(this._worker, this, 'object.insert', [table, data]);
     }
     update(table, data, where, replace = false) {
-        return callServiceWorker(this, 'object.update', [table, data, where, replace]);
+        return callWorker(this._worker, this, 'object.update', [table, data, where, replace]);
     }
     delete(table, where) {
-        return callServiceWorker(this, 'object.delete', [table, where]);
+        return callWorker(this._worker, this, 'object.delete', [table, where]);
     }
     selectOne(table, field, where, order, start, limit) {
-        return callServiceWorker(this, 'object.selectOne', [table, field, where, order, start, limit]);
+        return callWorker(this._worker, this, 'object.selectOne', [table, field, where, order, start, limit]);
     }
     select(table, fields, where, order, start) {
-        return callServiceWorker(this, 'object.select', [table, fields, where, order, start]);
+        return callWorker(this._worker, this, 'object.select', [table, fields, where, order, start]);
     }
     selectAll(table, fields, where, order, start, limit) {
-        return callServiceWorker(this, 'object.selectAll', [table, fields, where, order, start, limit]);
+        return callWorker(this._worker, this, 'object.selectAll', [table, fields, where, order, start, limit]);
     }
     getColumnValues(table, field, where, order, start, limit) {
-        return callServiceWorker(this, 'object.getColumnValues', [table, field, where, order, start, limit]);
+        return callWorker(this._worker, this, 'object.getColumnValues', [table, field, where, order, start, limit]);
     }
     count(table, where) {
-        return callServiceWorker(this, 'object.count', [table, where]);
+        return callWorker(this._worker, this, 'object.count', [table, where]);
     }
     copyTable(target, table, fields, where, order, start, limit) {
-        return callServiceWorker(this, 'object.copyTable', [target, table, fields, where, order, start, limit]);
+        return callWorker(this._worker, this, 'object.copyTable', [target, table, fields, where, order, start, limit]);
     }
     deleteTable(table) {
-        return callServiceWorker(this, 'object.deleteTable', [table]);
+        return callWorker(this._worker, this, 'object.deleteTable', [table]);
     }
     close() {
-        void callServiceWorker(this, 'object.close', []);
+        void callWorker(this._worker, this, 'object.close', []);
     }
     lastError() {
-        return callServiceWorker(this, 'object.lastError', [this.dbName]);
+        return callWorker(this._worker, this, 'object.lastError', [this.dbName]);
     }
 }

package/dist/db/classes/Proxy.js

@@ -1,11 +1,7 @@
 import bbnDbObjectProxy from './ObjectProxy.js';
 let requestId = 0;
-function callServiceWorker(database, method, args) {
+function callWorker(database, method, args) {
     return new Promise((resolve, reject) => {
-        if (!navigator.serviceWorker?.controller) {
-            reject(new Error('No active service worker controller'));
-            return;
-        }
         const id = ++requestId;
         const channel = new MessageChannel();
         channel.port1.onmessage = event => {
@@ -17,7 +13,7 @@ function callServiceWorker(database, method, args) {
                 resolve(msg.result);
             }
             else {
-                reject(new Error(msg.error || 'IndexedDB service worker error'));
+                reject(new Error(msg.error || 'IndexedDB worker error'));
             }
             channel.port1.close();
         };
@@ -27,26 +23,31 @@ function callServiceWorker(database, method, args) {
             method,
             args
         };
-        navigator.serviceWorker.controller.postMessage(command, [channel.port2]);
+        if (!bbn.worker) {
+            reject(new Error('Worker is not available'));
+            return;
+        }
+        bbn.worker.sendMessage(command, [channel.port2]);
     });
 }
 const bbnDbProxy = {
     ok: true,
     async open(database, version) {
-        await callServiceWorker(database, 'manager.open', [database, version]);
-        return new bbnDbObjectProxy(database);
+        await callWorker(database, 'manager.open', [database, version]);
+        return new bbnDbObjectProxy(bbn.worker, database);
     },
     async add(database, name, structure) {
-        return await callServiceWorker(database, 'manager.add', [database, name, structure]);
+        const res = await callWorker(database, 'manager.add', [database, name, structure]);
+        return res;
     },
     async remove(database, name) {
-        return await callServiceWorker(database, 'manager.remove', [database, name]);
+        return await callWorker(database, 'manager.remove', [database, name]);
     },
     async importStructure(database, structure) {
-        return await callServiceWorker(database, 'manager.importStructure', [database, structure]);
+        return await callWorker(database, 'manager.importStructure', [database, structure]);
     },
     async close(database) {
-        return await callServiceWorker(database, 'manager.close', [database]);
+        return await callWorker(database, 'manager.close', [database]);
     }
 };
 export default bbnDbProxy;

package/dist/fn/browser/log.js

@@ -13,6 +13,7 @@ import isFunction from '../type/isFunction.js';
  * @returns
  */
 export default function log(...args) {
+    //debugger;
     if (globalThis.bbn?.env?.logging && (globalThis.console !== undefined)) {
         let cfg;
         let level = 5;

package/dist/fn/init.js

@@ -6,9 +6,9 @@ import resize from './style/resize.js';
 import isMobile from './browser/isMobile.js';
 import isTabletDevice from './browser/isTabletDevice.js';
 import isFunction from './type/isFunction.js';
-import log from './browser/log.js';
 import timestamp from './datetime/timestamp.js';
 import setupIntl from '../dt/functions/setupIntl.js';
+import bbnWorkerClient from '../worker/Client.js';
 const onFocus = () => {
     bbn.env.last_focus = bbn.dt().unix();
 };
@@ -37,7 +37,7 @@ const onActivity = (e) => {
         target.hasAttribute("href") &&
         !target.hasAttribute("target") &&
         !target.classList.contains("bbn-no")) {
-        log("Link clicked: " + target.getAttribute("href"));
+        //log("Link clicked: " + target.getAttribute("href"));
         link(target.getAttribute("href"), e);
     }
 };
@@ -123,6 +123,9 @@ export default function init(cfg, force) {
                     document.body.classList.add("bbn-tablet");
                 }
             }
+            if (bbn.env.worker) {
+                bbn.worker = new bbnWorkerClient(bbn.env.worker);
+            }
             if (window.history) {
                 window.onpopstate = function (e) {
                     let h = window.history;

package/dist/index-no-dep.js

@@ -22,7 +22,7 @@ const bbn = {
     com,
     env,
     get db() {
-        if (navigator.serviceWorker?.controller) {
+        if (bbn.worker) {
             return bbnDbProxy;
         }
         return bbnDb;

package/dist/index.d.ts

@@ -1,3 +1,5 @@
 import { Temporal } from 'temporal-polyfill';
+export { Temporal };
 declare const bbn: Bbn;
-export { bbn as default, bbn, Temporal };
+export { bbn };
+export default bbn;

package/dist/index.js

@@ -10,6 +10,7 @@ import bbnDbCenter from './db/classes/Center.js';
 import fn from './fn.js';
 import dt from './dt.js';
 import buildLocaleFromIntl from './dt/functions/buildLocaleFromIntl.js';
+export { Temporal };
 const bbn = {
     version: "1.0.1",
     opt: {
@@ -24,7 +25,7 @@ const bbn = {
     com,
     env,
     get db() {
-        if (navigator.serviceWorker?.controller) {
+        if (bbn.worker) {
             return bbnDbProxy;
         }
         return bbnDb;
@@ -107,4 +108,5 @@ if ('undefined' !== typeof globalThis) {
     }
 }
 buildLocaleFromIntl();
-export { bbn as default, bbn, Temporal };
+export { bbn };
+export default bbn;

package/dist/worker/Client.d.ts

@@ -0,0 +1,9 @@
+export default class bbnWorkerClient {
+    worker: SharedWorker;
+    listeners: Set<Function>;
+    hasError: boolean;
+    constructor(workerUrl: string);
+    sendMessage(message: object, ports?: any[]): boolean;
+    addEventListener(listener: Function): void;
+    removeEventListener(listener: Function): void;
+}

package/dist/worker/Client.js

@@ -0,0 +1,70 @@
+export default class bbnWorkerClient {
+    worker;
+    listeners;
+    hasError = false;
+    constructor(workerUrl) {
+        this.listeners = new Set();
+        const url = new URL(workerUrl);
+        const w = new SharedWorker(url, {
+            type: 'module'
+        });
+        console.log('SharedWorker client created:');
+        w.onerror = event => {
+            console.error('SharedWorker error');
+            this.hasError = true;
+            console.log('constructor:', event.constructor.name);
+            console.log('type:', event.type);
+            console.log('message' in event
+                ? event.message
+                : '(no message)');
+            console.log('filename' in event
+                ? event.filename
+                : '(no filename)');
+            console.log('lineno' in event
+                ? event.lineno
+                : '(no lineno)');
+            console.log('colno' in event
+                ? event.colno
+                : '(no colno)');
+            console.log('error' in event
+                ? event.error
+                : '(no error object)');
+            event.preventDefault();
+        };
+        w.port.start();
+        w.port.onmessage = event => {
+            console.log('Received message from SharedWorker: ' + JSON.stringify(event.data));
+            for (const listener of this.listeners) {
+                try {
+                    listener(event.data, event);
+                }
+                catch (e) {
+                    console.error('Error in SharedWorker message listener', e);
+                }
+            }
+        };
+        this.worker = w;
+    }
+    sendMessage(message, ports = []) {
+        if (!this.worker) {
+            throw new Error('SharedWorker is not initialized');
+        }
+        try {
+            this.worker.port.postMessage(message, ports);
+            if (!('database' in message)) {
+                console.log('Sent message to SharedWorker: ' + JSON.stringify(message));
+            }
+            return true;
+        }
+        catch (e) {
+            console.error('Unable to send message to SharedWorker', e);
+            return false;
+        }
+    }
+    addEventListener(listener) {
+        this.listeners.add(listener);
+    }
+    removeEventListener(listener) {
+        this.listeners.delete(listener);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "2.0.247",
+  "version": "2.0.249",
   "description": "Javascript toolkit",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -40,12 +40,13 @@
     "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.3.0",
+    "@rollup/plugin-commonjs": "^29.0.3",
     "@types/mocha": "^10.0.10",
     "chai": "^6.2.1",
     "jsdom": "^27.2.0",
     "jsdom-global": "^3.0.2",
     "mocha": "^11.7.5",
-    "rollup": "^4.53.2",
+    "rollup": "^4.60.3",
     "ts-loader": "^9.5.4",
     "tslib": "^2.8.1",
     "tsx": "^4.21.0",
@@ -72,5 +73,8 @@
     "@formatjs/intl-relativetimeformat": "^11.4.13",
     "cldr-core": "^48.0.0",
     "temporal-polyfill": "^0.3.0"
+  },
+  "allowScripts": {
+    "esbuild@0.27.7": true
   }
 }