add option to compress/uglify boot image. fix indexeddb reload race

bin/bundler.mjs

@@ -1,8 +1,10 @@
 import fs from 'fs';
 import path from 'path';
+import uglify from 'uglify-js';
 import { Buffer } from 'buffer';
 
 const cfg = JSON.parse(fs.readFileSync(process.argv[2] || './bundle.config.json', 'utf8'));
+const compress = process.env.UGLIFY ? true : false
 
 // --- recursive directory walker (follows symlinks safely) ---
 function* walk(dir, seen = new Set()) {
@@ -37,12 +39,36 @@ for (const input of cfg.inputs) {
 const dataParts = [];
 const entryMeta = [];
 let offset = 0;
+let cache = new Map();
 
 for (const { file, virt } of entries) {
-    const data = fs.readFileSync(file);
+    let record = cache.get(file);
-    entryMeta.push({ virt, offset, length: data.length });
+    if (record) {
-    dataParts.push(data);
+        // console.log({ dup: file });
-    offset += data.length;
+        entryMeta.push({ ...record, virt });
+    } else {
+        let data = fs.readFileSync(file);
+        if (compress && file.endsWith("js")) {
+            console.log('compress', file);
+            data = uglify.minify(data.toString(), {
+                compress: {
+                    merge_vars: false,
+                    unused: false
+                }
+            });
+            // console.log({ to: typeof(data), data });
+            if (!data.code) {
+                console.log({ skip: file });
+                continue;
+            }
+            data = Buffer.from(data.code);
+        }
+        record = { virt, offset, length: data.length };
+        cache.set(file, record);
+        entryMeta.push(record);
+        dataParts.push(data);
+        offset += data.length;
+    }
 }
 
 // temporary header without offsets to measure total size
@@ -66,7 +92,7 @@ for (const { virt, offset, length } of entryMeta) {
     const offb = Buffer.alloc(4); offb.writeUInt32LE(headerSize + offset);
     const lenb = Buffer.alloc(4); lenb.writeUInt32LE(length);
     headerParts.push(nlen, name, offb, lenb);
-    console.log(virt);
+    // console.log(virt);
 }
 
 const header = Buffer.concat([count, ...headerParts]);

src/data/index.js

@@ -168,7 +168,7 @@ SP.init = function(options = {}) {
         request = IDB.open(name, this.version);
 
         request.onupgradeneeded = function(event) {
-            let db = storage.db = request.result;
+            let db = request.result;
             let current = [...db.objectStoreNames];
             let stores = storage.stores;
             // add missing stores
@@ -184,16 +184,16 @@ SP.init = function(options = {}) {
             // remove obsolete stores
             for (let curr of current) {
                 if (stores.indexOf(curr) < 0) {
-                    storage.db.deleteObjectStore(curr);
+                    db.deleteObjectStore(curr);
                     console.log({index_dropped: curr});
                 }
             }
-            event.target.transaction.oncomplete = function(event) {
+            // allow transactions
-                storage.runQueue();
+            storage.db = db;
-            };
         };
 
         request.onsuccess = function(event) {
+            console.log('IDB open succeeded');
             storage.current = storage.stores[0];
             storage.db = request.result;
             storage.runQueue();
@@ -217,6 +217,7 @@ SP.runQueue = function() {
         let i = 0, q = this.queue, e;
         while (i < q.length) {
             e = q[i++];
+            // console.log('runQ', i, ...e);
             switch (e.shift()) {
                 case 'iterate': this.iterate(...e); break;
                 case 'keys': this.keys(...e); break;
@@ -252,7 +253,11 @@ SP.put = function(key, value, callback, store = this.current) {
             req.onerror = function(event) { callback(false) };
         }
     } catch (e) {
-        console.log(e);
+        if (e.name === 'InvalidStateError') {
+            console.log({ putRetry: key });
+            return this.queue.push(['put', key, value, callback, store]);
+        }
+        console.log(e.name, e);
         if (callback) callback(false);
     }
 };
@@ -275,6 +280,10 @@ SP.get = function(key, callback, store = this.current) {
             req.onerror = function(event) { callback(null) };
         }
     } catch (e) {
+        if (e.name === 'InvalidStateError') {
+            console.log({ getRetry: key });
+            return this.queue.push(['get', key, callback, store]);
+        }
         console.log(e);
         if (callback) callback(null);
     }