enable table update hooks. using force!

Author: stevensJourney

packages/dev-adapter/src/SQLJSAdapter.ts

@@ -1,4 +1,5 @@
 import {
+  BaseListener,
   BaseObserver,
   BatchedUpdateNotification,
   DBAdapter,
@@ -30,10 +31,29 @@ export class SQLJSOpenFactory implements SQLOpenFactory {
   }
 }
 
+(globalThis as any).onSqliteUpdate = (
+  dbP: number,
+  operation: string,
+  database: string,
+  table: string,
+  rowId: number
+) => {
+  SQLJSDBAdapter.sharedObserver.iterateListeners((l) => l.tablesUpdated?.(dbP, operation, database, table, rowId));
+};
+
+interface TableObserverListener extends BaseListener {
+  tablesUpdated?: (dpP: number, operation: string, database: string, table: string, rowId: number) => void;
+}
+class TableObserver extends BaseObserver<TableObserverListener> {}
+
 export class SQLJSDBAdapter extends BaseObserver<DBAdapterListener> implements DBAdapter {
   protected initPromise: Promise<SQLJs.Database>;
   protected _db: SQLJs.Database | null;
   protected tableUpdateCache: Set<string>;
+  protected dbP: number | null;
+
+  static sharedObserver = new TableObserver();
+  protected disposeListener: () => void;
 
   protected mutex: Mutex;
 
@@ -51,14 +71,33 @@ export class SQLJSDBAdapter extends BaseObserver<DBAdapterListener> implements D
     this._db = null;
     this.tableUpdateCache = new Set<string>();
     this.mutex = new Mutex();
+    this.dbP = null;
+    this.disposeListener = SQLJSDBAdapter.sharedObserver.registerListener({
+      tablesUpdated: (dbP: number, operation: string, database: string, table: string, rowId: number) => {
+        if (this.dbP !== dbP) {
+          // Ignore updates from other databases.
+          return;
+        }
+        this.tableUpdateCache.add(table);
+      }
+    });
   }
 
   protected async init(): Promise<SQLJs.Database> {
     console.log('Initializing SQL.js database with options');
-    const SQL = await SQLJs({ locateFile: (filename: any) => `../dist/${filename}` });
+    const SQL = await SQLJs({
+      locateFile: (filename: any) => `../dist/${filename}`,
+      print: (text) => {
+        console.log('[stdout]', text);
+      },
+      printErr: (text) => {
+        console.warn('[stderr]', text);
+      }
+    });
     console.log('SQL.js loaded:');
     const existing = await this.options.persister.readFile();
     const db = new SQL.Database(existing);
+    this.dbP = db['db'];
     // debugger;
     // (db as any).updateHook(function (operation, database, table, rowId) {
     //   console.log(`Update Hook: ${operation} on ${table}`);
@@ -70,6 +109,7 @@ export class SQLJSDBAdapter extends BaseObserver<DBAdapterListener> implements D
 
   async close() {
     const db = await this.getDB();
+    this.disposeListener();
     db.close();
   }
 

packages/sqljs/patches/powersync-update.patch

@@ -1,31 +1,34 @@
 diff --git a/src/update.c b/src/update.c
 new file mode 100644
-index 0000000..a025f71
+index 0000000..c7e8a23
 --- /dev/null
 +++ b/src/update.c
-@@ -0,0 +1,24 @@
-+#include "sqlite3.h"
+@@ -0,0 +1,28 @@
++#include "sqlite3ext.h"
++SQLITE_EXTENSION_INIT1
++
 +#include <emscripten.h>
++#include <stdio.h>
++#include <stdint.h>
 +
-+// Declare a JS function to be callable from C
-+// JS hook only receives type, db name, and table name
-+EM_JS(void, call_js_update_hook, (int type, const char* db_name, const char* table_name), {
-+  console.log('update from sqlite hook');
++EM_JS(void, call_js_update_hook, (int db_p, int type, const char* db_name, const char* table_name), {
 +  if (typeof onSqliteUpdate === "function") {
-+    onSqliteUpdate(type, UTF8ToString(db_name), UTF8ToString(table_name));
++    onSqliteUpdate(db_p, type, UTF8ToString(db_name), UTF8ToString(table_name));
 +  } else {
 +    console.error("onSqliteUpdate is not defined");
 +  }
 +});
 +
-+void EMSCRIPTEN_KEEPALIVE sqlite_update_callback(void* pArg, int type, const char* db, const char* table, sqlite3_int64 rowid) {
-+  EM_ASM({ console.log("got an update"); });
-+  call_js_update_hook(type, db, table);
++static void sqlite_update_callback(void* pArg, int type, const char* db, const char* table, sqlite3_int64 rowid) {
++  call_js_update_hook((int)(intptr_t)pArg, type, db, table);
++}
++
++static int register_update_hook_on_open(sqlite3* db, const char** pzErrMsg, const sqlite3_api_routines* pApi) {
++  SQLITE_EXTENSION_INIT2(pApi);
++  sqlite3_update_hook(db, sqlite_update_callback, db);
++  return SQLITE_OK;
 +}
 +
-+// Attach this to a sqlite3* connection:
-+void EMSCRIPTEN_KEEPALIVE register_sqlite_update_hook(sqlite3* db) {
-+  EM_ASM({ console.log("register_sqlite_update_hook: OK"); });
-+  sqlite3_update_hook(db, sqlite_update_callback, NULL);
++void register_update_hook_extension(void) {
++  sqlite3_auto_extension((void(*)(void))register_update_hook_on_open);
 +}
-\ No newline at end of file

packages/sqljs/patches/powersync.patch

@@ -86,49 +86,29 @@ index 4530653..5ac01a0 100644
  clean:
  	rm -f out/* dist/* cache/*
 diff --git a/src/api.js b/src/api.js
-index c7f102b..df7e901 100644
+index c7f102b..4c20316 100644
 --- a/src/api.js
 +++ b/src/api.js
-@@ -72,6 +72,8 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
+@@ -72,6 +72,10 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
      var SQLITE_UPDATE = 23;
      var SQLITE_DELETE = 9;
      // var - cwrap function
 +    Module['ccall']('powersync_init_static', 'int', []);
++    Module['ccall']('register_update_hook_extension', 'void', []);
++
 +
      var sqlite3_open = cwrap("sqlite3_open", "number", ["string", "number"]);
      var sqlite3_close_v2 = cwrap("sqlite3_close_v2", "number", ["number"]);
      var sqlite3_exec = cwrap(
-@@ -122,6 +124,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
+@@ -122,6 +126,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
          "number",
          ["number", "string"]
      );
 +    var sqlite3_last_insert_rowid = cwrap("sqlite3_last_insert_rowid", "number", ["number"]);
      var sqlite3_step = cwrap("sqlite3_step", "number", ["number"]);
      var sqlite3_errmsg = cwrap("sqlite3_errmsg", "string", ["number"]);
      var sqlite3_column_count = cwrap(
-@@ -239,6 +242,12 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
-         ["number"]
-     );
- 
-+    var registerUpdateHook = cwrap(
-+        "register_sqlite_update_hook",
-+        "void",
-+        ["number"]
-+    );
-+
-     var sqlite3_update_hook = cwrap(
-         "sqlite3_update_hook",
-         "number",
-@@ -833,6 +842,8 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
-         }
-         this.handleError(sqlite3_open(this.filename, apiTemp));
-         this.db = getValue(apiTemp, "i32");
-+        registerUpdateHook(this.db)
-+        // Module['ccall']('register_sqlite_update_hook', 'void', ['number'], [apiTemp]);
-         registerExtensionFunctions(this.db);
-         // A list of all prepared statements of the database
-         this.statements = {};
-@@ -1155,6 +1166,13 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
+@@ -1155,6 +1160,13 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
          return sqlite3_changes(this.db);
      };
 
@@ -143,7 +123,7 @@ index c7f102b..df7e901 100644
          var size = sqlite3_value_bytes(ptr);
          var blob_ptr = sqlite3_value_blob(ptr);
 diff --git a/src/exported_functions.json b/src/exported_functions.json
-index 3be2595..d1c0037 100644
+index 3be2595..709bc5c 100644
 --- a/src/exported_functions.json
 +++ b/src/exported_functions.json
 @@ -1,47 +1,50 @@
@@ -240,7 +220,7 @@ index 3be2595..d1c0037 100644
 +  "_sqlite3_last_insert_rowid",
 +  "_sqlite3_update_hook",
 +  "_powersync_init_static",
-+  "_register_sqlite_update_hook"
++  "_register_update_hook_extension"
  ]
 diff --git a/src/exported_runtime_methods.json b/src/exported_runtime_methods.json
 index f099056..b1712fc 100644