@vanillaspa/sqlite-database 1.2.2 → 1.2.4

package/index.js

@@ -1,5 +1,5 @@
 import sqlite3InitModule from '@sqlite.org/sqlite-wasm';
-import { addEventListener, dispatchEvent } from '@vanillaspa/event-bus';
+import { dispatchEvent } from '@vanillaspa/event-bus';
 
 if (!window.Worker) throw new Error(`Your browser doesn't support web workers.`);
 export const name = "sqlite"; // module name
@@ -92,12 +92,12 @@ export function getWorkers() {
     return workers;
 }
 
-addEventListener('sqlite:download', (event) => {
-    const { blob, name } = event.detail;
-    const url = URL.createObjectURL(blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = `${name}.sqlite3`;
-    a.click();
-    URL.revokeObjectURL(url);
-});
+// addEventListener('sqlite:download', (event) => {
+//     const { blob, name } = event.detail;
+//     const url = URL.createObjectURL(blob);
+//     const a = document.createElement('a');
+//     a.href = url;
+//     a.download = `${name}.sqlite3`;
+//     a.click();
+//     URL.revokeObjectURL(url);
+// });

package/package.json

@@ -30,5 +30,5 @@
         "url": "git+https://github.com/vanillaspa/sqlite-database.git"
     },
     "type": "module",
-    "version": "1.2.2"
+    "version": "1.2.4"
 }

package/sqliteWorker.js

@@ -1,8 +1,8 @@
 import sqlite3InitModule from '@sqlite.org/sqlite-wasm';
-import { dispatchEvent } from '@vanillaspa/event-bus';
 
 let db = null;
 let sqlite3 = null;
+let port;
 
 async function getInstance() {
   if (!sqlite3) {
@@ -11,7 +11,7 @@ async function getInstance() {
   return sqlite3;
 }
 
-function reply(port, result) {
+function reply(result) {
   port.postMessage({ type: 'application/json', result });
   port.close();
 }
@@ -21,7 +21,7 @@ function replyError(message) {
   port.close();
 }
 
-function handleSQLiteError(port, sql, e) {
+function handleSQLiteError(sql, e) {
   if (e.message.includes('SQLITE_CANTOPEN')) {
     console.info("Info: No SQLite database available. Upload a new database or reload the page.");
   } else if (e.message.includes('SQLITE_CONSTRAINT_UNIQUE')) {
@@ -34,17 +34,26 @@ function handleSQLiteError(port, sql, e) {
 
 onmessage = async function ({ data, ports }) {
   const { action } = data;
-  const port = ports[0] ?? null;
+  port = ports[0] ?? null;
 
   switch (action) {
+    case 'closeDB': {
+      try {
+        closeDB();
+        reply(null);
+      } catch (e) {
+        replyError(e.message);
+      }
+      break;
+    }
     case 'createDB': {
       const { name } = data;
       try {
         const { newDB, message } = await createDatabase(name)
         db = newDB;
-        reply(port, message);
+        reply(message);
       } catch (e) {
-        replyError(port, e.message)
+        replyError(e.message)
       }
       break;
     }
@@ -52,20 +61,19 @@ onmessage = async function ({ data, ports }) {
       try {
         const byteArray = sqlite3.capi.sqlite3_js_db_export(db);
         const blob = new Blob([byteArray.buffer], { type: "application/vnd.sqlite3" });
-        reply(port, blob);
+        reply(blob);
       } catch (e) {
-        replyError(port, e.message);
+        replyError(e.message);
       }
       break;
     }
-
     case 'executeQuery': {
       const { sql } = data;
       try {
         const result = db.exec({ sql, returnValue: "resultRows" });
-        reply(port, result);
+        reply(result);
       } catch (e) {
-        handleSQLiteError(port, sql, e)
+        handleSQLiteError(sql, e)
       }
       break;
     }
@@ -81,9 +89,9 @@ onmessage = async function ({ data, ports }) {
           const row = stmt.get([]);
           result.push(Object.fromEntries(columns.map((columnName, index) => [columnName, row[index]])));
         }
-        reply(port, result);
+        reply(result);
       } catch (e) {
-        handleSQLiteError(port, sql, e);
+        handleSQLiteError(sql, e);
       } finally {
         stmt?.finalize();
       }
@@ -93,18 +101,9 @@ onmessage = async function ({ data, ports }) {
       const { name, arrayBuffer } = data;
       try {
         const message = await uploadDatabase(name, arrayBuffer)
-        reply(port, message);
-      } catch (e) {
-        replyError(port, e.message);
-      }
-      break;
-    }
-    case 'closeDB': {
-      try {
-        closeDB();
-        reply(port, null);
+        reply(message);
       } catch (e) {
-        replyError(port, e.message);
+        replyError(e.message);
       }
       break;
     }