[Fix] Common SDK fixes for Web and React Native

.changeset/beige-vans-hunt.md

@@ -0,0 +1,5 @@
+---
+'@journeyapps/powersync-sdk-react-native': patch
+---
+
+Fixed: `get`, `getAll` and `getOptional` should execute inside a readLock for concurrency

.changeset/five-turtles-dream.md

@@ -0,0 +1,6 @@
+---
+'@journeyapps/powersync-sdk-common': patch
+---
+
+- Removed `user-id` header from backend connector and remote headers
+- Mark PowerSync client as pending initialization before `init` has been called.

.changeset/rare-zoos-walk.md

@@ -0,0 +1,5 @@
+---
+'@journeyapps/powersync-react': patch
+---
+
+Fixed: Added correct typings for React hooks. Previously hooks would return `any`.

packages/powersync-attachments/package.json

@@ -20,11 +20,14 @@
   "dependencies": {
     "@journeyapps/powersync-sdk-common": "0.1.1"
   },
-  "repository": "https://github.com/journeyapps/powersync-react-native-sdk",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/powersync-ja/powersync-react-native-sdk.git"
+  },
   "author": "JOURNEYAPPS",
   "license": "Apache-2.0",
   "homepage": "https://docs.powersync.co/resources/api-reference",
   "bugs": {
-    "url": "https://github.com/journeyapps/powersync-react-native-sdk/issues"
+    "url": "https://github.com/powersync-ja/powersync-react-native-sdk/issues"
   }
 }

packages/powersync-react/package.json

@@ -16,21 +16,25 @@
     "clean": "rm -rf lib tsconfig.tsbuildinfo",
     "watch": "tsc -b -w"
   },
-  "repository": "https://github.com/journeyapps/powersync-react-native-sdk",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/powersync-ja/powersync-react-native-sdk.git"
+  },
   "author": "JOURNEYAPPS",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/journeyapps/powersync-react-native-sdk/issues"
+    "url": "https://github.com/powersync-ja/powersync-react-native-sdk/issues"
   },
   "homepage": "https://docs.powersync.co/resources/api-reference",
   "dependencies": {
-    "@journeyapps/powersync-sdk-common": "^0.1.0"
+    "@journeyapps/powersync-sdk-common": "0.1.1"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
+    "@types/react": "^18.2.34",
     "react": "18.2.0",
-    "typescript": "^4.1.3"
+    "typescript": "^5.1.3"
   }
 }

packages/powersync-sdk-common/package.json

@@ -13,9 +13,12 @@
   "files": [
     "lib"
   ],
-  "repository": "https://github.com/journeyapps/powersync-react-native-sdk",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/powersync-ja/powersync-react-native-sdk.git"
+  },
   "bugs": {
-    "url": "https://github.com/journeyapps/powersync-react-native-sdk/issues"
+    "url": "https://github.com/powersync-ja/powersync-react-native-sdk/issues"
   },
   "homepage": "https://docs.powersync.co/resources/api-reference",
   "scripts": {
@@ -27,7 +30,7 @@
     "@types/node": "^20.5.9",
     "@types/object-hash": "^3.0.4",
     "@types/uuid": "^3.0.0",
-    "typescript": "^4.1.3"
+    "typescript": "^5.1.3"
   },
   "dependencies": {
     "async-mutex": "^0.4.0",

packages/powersync-sdk-common/src/client/AbstractPowerSyncDatabase.ts

@@ -71,13 +71,28 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
   private syncStatusListenerDisposer?: () => void;
   protected initialized: Promise<void>;
 
+  /**
+   * Initializes PowerSync
+   */
+  public init: () => Promise<void>;
+
   constructor(protected options: PowerSyncDatabaseOptions) {
     super();
     this.currentStatus = null;
     this.closed = true;
     this.options = { ...DEFAULT_POWERSYNC_DB_OPTIONS, ...options };
     this.bucketStorageAdapter = this.generateBucketStorageAdapter();
     this.sdkVersion = '';
+    // This ensures the `initialized` promise is pending even before `init` is called
+    this.initialized = new Promise((resolve, reject) => {
+      this.init = async () => {
+        try {
+          resolve(await this.initFn());
+        } catch (ex) {
+          reject(ex);
+        }
+      };
+    });
   }
 
   get schema() {
@@ -99,15 +114,16 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
   protected abstract generateBucketStorageAdapter(): BucketStorageAdapter;
 
   abstract _init(): Promise<void>;
-  async init() {
-    this.initialized = (async () => {
-      await this._init();
-      await this.bucketStorageAdapter.init();
-      await this.database.execute('SELECT powersync_replace_schema(?)', [JSON.stringify(this.schema.toJSON())]);
-      const version = await this.options.database.execute('SELECT powersync_rs_version()');
-      this.sdkVersion = version.rows?.item(0)['powersync_rs_version()'] ?? '';
-    })();
-    await this.initialized;
+
+  /**
+   * This performs the total initialization process.
+   */
+  private async initFn() {
+    await this._init();
+    await this.bucketStorageAdapter.init();
+    await this.database.execute('SELECT powersync_replace_schema(?)', [JSON.stringify(this.schema.toJSON())]);
+    const version = await this.options.database.execute('SELECT powersync_rs_version()');
+    this.sdkVersion = version.rows?.item(0)['powersync_rs_version()'] ?? '';
   }
 
   /**

packages/powersync-sdk-common/src/client/connection/PowerSyncCredentials.ts

@@ -1,6 +1,5 @@
 export interface PowerSyncCredentials {
   endpoint: string;
   token: string;
-  userID?: string;
   expiresAt?: Date;
 }

packages/powersync-sdk-common/src/client/sync/bucket/SqliteBucketStorage.ts

@@ -163,10 +163,6 @@ export class SqliteBucketStorage implements BucketStorageAdapter {
    */
   private async updateObjectsFromBuckets(checkpoint: Checkpoint) {
     return this.writeTransaction(async (tx) => {
-      /**
-       * It's best to execute this on the same thread
-       * https://github.com/journeyapps/powersync-sqlite-core/blob/40554dc0e71864fe74a0cb00f1e8ca4e328ff411/crates/sqlite/sqlite/sqlite3.h#L2578
-       */
       const { insertId: result } = await tx.execute('INSERT INTO powersync_operations(op, data) VALUES(?, ?)', [
         'sync_local',
         ''

packages/powersync-sdk-common/src/client/sync/stream/AbstractRemote.ts

@@ -39,7 +39,6 @@ export abstract class AbstractRemote {
     const credentials = await this.getCredentials();
     return {
       'content-type': 'application/json',
-      'User-Id': credentials.userID ?? '',
       Authorization: `Token ${credentials.token}}`
     };
   }

packages/powersync-sdk-react-native/README.md

@@ -1,6 +1,6 @@
 # PowerSync SDK for React Native
 
-[PowerSync](https://powersync.co) is a service and set of SDKs that keeps Postgres databases in sync with on-device SQLite databases. See a summary of features [here](https://docs.powersync.co/resources/api-reference#react-native-and-expo).
+[PowerSync](https://powersync.co) is a service and set of SDKs that keeps Postgres databases in sync with on-device SQLite databases. See a summary of features [here](https://docs.powersync.co/client-sdk-references/react-native-and-expo).
 
 ## Beta Release
 This React Native SDK package is currently in a beta release.
@@ -178,5 +178,13 @@ Uncomment the following from
       //     });
       // client.addPlugin(networkFlipperPlugin);
 ```
+
+Disable the dev client network inspector
+`android/gradle.properties`
+```
+# Enable network inspector
+EX_DEV_CLIENT_NETWORK_INSPECTOR=false
+```
+
 ## iOS
 Testing offline mode on an iOS simulator by disabling the host machine's entire internet connection will cause the device to remain offline even after the internet connection has been restored. This issue seems to affect all network requests in an application.

packages/powersync-sdk-react-native/package.json

@@ -16,15 +16,18 @@
     "clean": "rm -rf lib tsconfig.tsbuildinfo",
     "watch": "tsc -b -w"
   },
-  "repository": "https://github.com/journeyapps/powersync-react-native-sdk",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/powersync-ja/powersync-react-native-sdk.git"
+  },
   "author": "JOURNEYAPPS",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/journeyapps/powersync-react-native-sdk/issues"
+    "url": "https://github.com/powersync-ja/powersync-react-native-sdk/issues"
   },
   "homepage": "https://docs.powersync.co/",
   "peerDependencies": {
-    "@journeyapps/react-native-quick-sqlite": "0.1.0",
+    "@journeyapps/react-native-quick-sqlite": "0.0.0-dev-20231103124824",
     "base-64": "^1.0.0",
     "react": "*",
     "react-native": "*",
@@ -41,11 +44,11 @@
     "async-lock": "^1.4.0"
   },
   "devDependencies": {
-    "@journeyapps/react-native-quick-sqlite": "0.1.0",
+    "@journeyapps/react-native-quick-sqlite": "0.0.0-dev-20231103124824",
     "@types/async-lock": "^1.4.0",
     "react-native": "0.72.4",
     "react": "18.2.0",
-    "typescript": "^4.1.3"
+    "typescript": "^5.1.3"
   },
   "keywords": [
     "data sync",

packages/powersync-sdk-react-native/src/db/adapters/react-native-quick-sqlite/RNQSDBAdapter.ts

@@ -25,7 +25,11 @@ export class RNQSDBAdapter extends BaseObserver<DBAdapterListener> implements DB
       this.iterateListeners((cb) => cb.tablesUpdated?.(update));
     });
 
-    const topLevelUtils = this.generateDBHelpers({ execute: this.baseDB.execute });
+    const topLevelUtils = this.generateDBHelpers({
+      // Arrow function binds `this` for use in readOnlyExecute
+      execute: (sql: string, params?: any[]) => this.readOnlyExecute(sql, params)
+    });
+    // Only assigning get helpers
     this.getAll = topLevelUtils.getAll;
     this.getOptional = topLevelUtils.getOptional;
     this.get = topLevelUtils.get;
@@ -55,6 +59,16 @@ export class RNQSDBAdapter extends BaseObserver<DBAdapterListener> implements DB
     return this.baseDB.execute(query, params);
   }
 
+  /**
+   * This provides a top-level read only execute method which is executed inside a read-lock.
+   * This is necessary since the high level `execute` method uses a write-lock under
+   * the hood. Helper methods such as `get`, `getAll` and `getOptional` are read only,
+   * and should use this method.
+   */
+  private readOnlyExecute(sql: string, params?: any[]) {
+    return this.baseDB.readLock((ctx) => ctx.execute(sql, params));
+  }
+
   /**
    * Adds DB get utils to lock contexts and transaction contexts
    * @param tx
@@ -68,23 +82,23 @@ export class RNQSDBAdapter extends BaseObserver<DBAdapterListener> implements DB
       /**
        *  Execute a read-only query and return results
        */
-      async getAll<T>(sql: string, parameters?: any[]): Promise<T[]> {
+      getAll: async <T>(sql: string, parameters?: any[]): Promise<T[]> => {
         const res = await tx.execute(sql, parameters);
         return res.rows?._array ?? [];
       },
 
       /**
        * Execute a read-only query and return the first result, or null if the ResultSet is empty.
        */
-      async getOptional<T>(sql: string, parameters?: any[]): Promise<T | null> {
+      getOptional: async <T>(sql: string, parameters?: any[]): Promise<T | null> => {
         const res = await tx.execute(sql, parameters);
         return res.rows?.item(0) ?? null;
       },
 
       /**
        * Execute a read-only query and return the first result, error if the ResultSet is empty.
        */
-      async get<T>(sql: string, parameters?: any[]): Promise<T> {
+      get: async <T>(sql: string, parameters?: any[]): Promise<T> => {
         const res = await tx.execute(sql, parameters);
         const first = res.rows?.item(0);
         if (!first) {