Remove uuid and react-native-get-random-values dependencies.

rkistner · rkistner · commit b0654fcc7310 · 2024-05-08T15:12:28.000+02:00
diff --git a/demos/angular-supabase-todolist/angular.json b/demos/angular-supabase-todolist/angular.json
@@ -24,7 +24,6 @@
               "object-hash",
               "event-iterator",
               "can-ndjson-stream",
-              "uuid",
               "lodash",
               "js-logger",
               "websocket"
diff --git a/demos/django-react-native-todolist/library/stores/AbstractStore.ts b/demos/django-react-native-todolist/library/stores/AbstractStore.ts
@@ -1,5 +1,3 @@
-// Needed to import early for uuids
-import 'react-native-get-random-values';
 import _ from 'lodash';
 import { action, makeObservable, observable } from 'mobx';
 import { AbstractModel } from '../models/AbstractModel';
diff --git a/demos/django-react-native-todolist/package.json b/demos/django-react-native-todolist/package.json
@@ -19,7 +19,6 @@
     "@react-navigation/drawer": "^6.6.15",
     "@react-navigation/native": "^6.1.17",
     "@supabase/supabase-js": "^2.42.4",
-    "@types/react-native-get-random-values": "^1.8.2",
     "base-64": "^1.0.0",
     "expo": "~50.0.15",
     "expo-constants": "~15.4.5",
@@ -39,7 +38,6 @@
     "react-native-encrypted-storage": "^4.0.3",
     "react-native-fetch-api": "^3.0.0",
     "react-native-gesture-handler": "~2.14.1",
-    "react-native-get-random-values": "~1.8.0",
     "react-native-polyfill-globals": "^3.1.0",
     "react-native-prompt-android": "^1.1.0",
     "react-native-reanimated": "~3.6.3",
@@ -52,7 +50,6 @@
     "react-navigation-stack": "^2.10.4",
     "text-encoding": "^0.7.0",
     "typed-async-storage": "^3.1.2",
-    "uuid": "^9.0.1",
     "web-streams-polyfill": "^3.3.3"
   },
   "devDependencies": {
diff --git a/demos/example-electron/vite.renderer.config.ts b/demos/example-electron/vite.renderer.config.ts
@@ -26,7 +26,6 @@ export default defineConfig((env) => {
       // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673
       exclude: ['@journeyapps/wa-sqlite', '@powersync/web'],
       include: [
-        '@powersync/web > uuid',
         '@powersync/web > event-iterator',
         '@powersync/web > js-logger',
         '@powersync/web > lodash/throttle',
diff --git a/demos/example-nextjs/package.json b/demos/example-nextjs/package.json
@@ -33,15 +33,13 @@
     "react-dom": "^18.2.0",
     "remixicon": "^2.5.0",
     "shiki": "^0.10.1",
-    "simplify-js": "^1.2.4",
-    "uuid": "9.0.1"
+    "simplify-js": "^1.2.4"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.202",
     "@types/node": "^20.11.25",
     "@types/react": "^18.2.64",
     "@types/react-dom": "^18.2.21",
-    "@types/uuid": "9.0.8",
     "autoprefixer": "^10.4.18",
     "babel-loader": "^9.1.3",
     "css-loader": "^6.10.0",
diff --git a/demos/example-vite/vite.config.ts b/demos/example-vite/vite.config.ts
@@ -19,7 +19,6 @@ export default defineConfig({
     // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673
     exclude: ['@journeyapps/wa-sqlite', '@powersync/web'],
     include: [
-      '@powersync/web > uuid',
       '@powersync/web > event-iterator',
       '@powersync/web > js-logger',
       '@powersync/web > lodash/throttle',
diff --git a/demos/react-native-supabase-group-chat/package.json b/demos/react-native-supabase-group-chat/package.json
@@ -49,7 +49,6 @@
     "react-native": "0.73.4",
     "react-native-fetch-api": "^3.0.0",
     "react-native-gesture-handler": "~2.14.1",
-    "react-native-get-random-values": "~1.8.0",
     "react-native-pager-view": "6.2.3",
     "react-native-polyfill-globals": "^3.1.0",
     "react-native-reanimated": "~3.6.2",
diff --git a/demos/react-supabase-todolist/vite.config.mts b/demos/react-supabase-todolist/vite.config.mts
@@ -26,7 +26,6 @@ export default defineConfig({
     // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673
     exclude: ['@journeyapps/wa-sqlite', '@powersync/web'],
     include: [
-      '@powersync/web > uuid',
       '@powersync/web > event-iterator',
       '@powersync/web > js-logger',
       '@powersync/web > lodash/throttle',
diff --git a/demos/vue-supabase-todolist/package.json b/demos/vue-supabase-todolist/package.json
@@ -17,7 +17,6 @@
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
     "js-logger": "^1.6.1",
-    "uuid": "^9.0.1",
     "vue": "^3.4.21",
     "vue-router": "4",
     "vuetify": "^3.5.7"
diff --git a/demos/vue-supabase-todolist/vite.config.ts b/demos/vue-supabase-todolist/vite.config.ts
@@ -79,7 +79,6 @@ export default defineConfig({
     // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673
     exclude: ['@journeyapps/wa-sqlite', '@powersync/web'],
     include: [
-      '@powersync/web > uuid',
       '@powersync/web > event-iterator',
       '@powersync/web > js-logger',
       '@powersync/web > lodash/throttle',
diff --git a/demos/yjs-react-supabase-text-collab/package.json b/demos/yjs-react-supabase-text-collab/package.json
@@ -44,7 +44,7 @@
     "remixicon": "^2.5.0",
     "shiki": "^0.10.1",
     "simplify-js": "^1.2.4",
-    "uuid": "9.0.1",
+    "uuid": "^9.0.1",
     "y-prosemirror": "1.0.20",
     "y-protocols": "1.0.6",
     "yjs": "^13.6.14"
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -31,8 +31,7 @@
     "can-ndjson-stream": "^1.0.2",
     "event-iterator": "^2.0.0",
     "js-logger": "^1.6.1",
-    "lodash": "^4.17.21",
-    "uuid": "^9.0.1"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.197",
diff --git a/packages/common/src/client/sync/bucket/SqliteBucketStorage.ts b/packages/common/src/client/sync/bucket/SqliteBucketStorage.ts
@@ -1,4 +1,3 @@
-import { v4 as uuid } from 'uuid';
 import { Mutex } from 'async-mutex';
 import { DBAdapter, Transaction, extractTableUpdates } from '../../../db/DBAdapter';
 import {
@@ -108,10 +107,10 @@ export class SqliteBucketStorage extends BaseObserver<BucketStorageListener> imp
     // To achieve this, we rename the bucket to a new temp name, and change all ops to remove.
     // By itself, this new bucket would ensure that the previous objects are deleted if they contain no more references.
     // If the old bucket is re-added, this new bucket would have no effect.
-    const newName = `$delete_${bucket}_${uuid()}`;
-    this.logger.debug('Deleting bucket', bucket);
-    // This
     await this.writeTransaction(async (tx) => {
+      const { uuid } = await tx.get<{ uuid: string }>('select uuid() as uuid');
+      const newName = `$delete_${bucket}_${uuid}`;
+      this.logger.debug('Deleting bucket', bucket);
       await tx.execute(
         `UPDATE ps_oplog SET op=${OpTypeEnum.REMOVE}, data=NULL WHERE op=${OpTypeEnum.PUT} AND superseded=0 AND bucket=?`,
         [bucket]
diff --git a/packages/common/src/utils/BaseObserver.ts b/packages/common/src/utils/BaseObserver.ts
@@ -1,5 +1,3 @@
-import { v4 } from 'uuid';
-
 export interface Disposable {
   dispose: () => Promise<void>;
 }
@@ -13,26 +11,23 @@ export type BaseListener = {
 };
 
 export class BaseObserver<T extends BaseListener = BaseListener> implements BaseObserverInterface<T> {
-  protected listeners: { [id: string]: Partial<T> };
+  protected listeners = new Set<Partial<T>>();
 
-  constructor() {
-    this.listeners = {};
-  }
+  constructor() {}
 
   /**
    * Register a listener for updates to the PowerSync client.
    */
   registerListener(listener: Partial<T>): () => void {
-    const id = v4();
-    this.listeners[id] = listener;
+    this.listeners.add(listener);
     return () => {
-      delete this.listeners[id];
+      this.listeners.delete(listener);
     };
   }
 
   iterateListeners(cb: (listener: Partial<T>) => any) {
-    for (const i in this.listeners) {
-      cb(this.listeners[i]);
+    for (const listener of this.listeners) {
+      cb(listener);
     }
   }
 }
diff --git a/packages/react-native/README.md b/packages/react-native/README.md
@@ -43,7 +43,7 @@ This SDK requires HTTP streaming in order to function. The following `fetch` pol
 These are listed as peer dependencies and need to be added to the React Native project
 
 ```bash
-npx expo install react-native-fetch-api react-native-polyfill-globals react-native-url-polyfill text-encoding web-streams-polyfill@3.2.1 base-64 react-native-get-random-values@1.9.0
+npx expo install react-native-fetch-api react-native-polyfill-globals react-native-url-polyfill text-encoding web-streams-polyfill@3.2.1 base-64
 ```
 
 Enable the polyfills in React Native app with
diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -32,7 +32,6 @@
     "react": "*",
     "react-native": "*",
     "react-native-fetch-api": "^3.0.0",
-    "react-native-get-random-values": "^1.9.0",
     "react-native-polyfill-globals": "^3.1.0",
     "react-native-url-polyfill": "^2.0.0",
     "text-encoding": "^0.7.0",
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -42,7 +42,8 @@
     "vite-plugin-top-level-await": "^1.4.1",
     "vite-plugin-wasm": "^3.3.0",
     "vitest": "^1.3.1",
-    "webdriverio": "^8.32.3"
+    "webdriverio": "^8.32.3",
+    "uuid": "^9.0.1"
   },
   "peerDependencies": {
     "@journeyapps/wa-sqlite": "~0.2.0"
@@ -52,7 +53,6 @@
     "async-mutex": "^0.4.0",
     "comlink": "^4.4.1",
     "js-logger": "^1.6.1",
-    "lodash": "^4.17.21",
-    "uuid": "^9.0.1"
+    "lodash": "^4.17.21"
   }
 }
diff --git a/packages/web/src/worker/db/SharedWASQLiteDB.worker.ts b/packages/web/src/worker/db/SharedWASQLiteDB.worker.ts
@@ -1,7 +1,6 @@
 import '@journeyapps/wa-sqlite';
 
 import * as Comlink from 'comlink';
-import { v4 as uuid } from 'uuid';
 
 import { DBWorkerInterface, _openDB } from './open-db';
 
@@ -10,7 +9,7 @@ import { DBWorkerInterface, _openDB } from './open-db';
  * are using it.
  */
 type SharedDBWorkerConnection = {
-  clientIds: Set<string>;
+  clientIds: Set<number>;
   db: DBWorkerInterface;
 };
 
@@ -19,13 +18,15 @@ const _self: SharedWorkerGlobalScope = self as any;
 const DBMap = new Map<string, SharedDBWorkerConnection>();
 const OPEN_DB_LOCK = 'open-wasqlite-db';
 
+let nextClientId = 1;
+
 const openDB = async (dbFileName: string): Promise<DBWorkerInterface> => {
   // Prevent multiple simultaneous opens from causing race conditions
   return navigator.locks.request(OPEN_DB_LOCK, async () => {
-    const clientId = uuid();
+    const clientId = nextClientId++;
 
     if (!DBMap.has(dbFileName)) {
-      const clientIds = new Set<string>();
+      const clientIds = new Set<number>();
       const connection = await _openDB(dbFileName);
       DBMap.set(dbFileName, {
         clientIds,
diff --git a/packages/web/src/worker/db/open-db.ts b/packages/web/src/worker/db/open-db.ts
@@ -1,7 +1,6 @@
 import * as SQLite from '@journeyapps/wa-sqlite';
 import '@journeyapps/wa-sqlite';
 import * as Comlink from 'comlink';
-import { v4 as uuid } from 'uuid';
 import { QueryResult } from '@powersync/common';
 
 export type WASQLExecuteResult = Omit<QueryResult, 'rows'> & {
@@ -26,6 +25,8 @@ export type OpenDB = (dbFileName: string) => DBWorkerInterface;
 
 export type SQLBatchTuple = [string] | [string, Array<any> | Array<Array<any>>];
 
+let nextId = 1;
+
 export async function _openDB(dbFileName: string): Promise<DBWorkerInterface> {
   const { default: moduleFactory } = await import('@journeyapps/wa-sqlite/dist/wa-sqlite-async.mjs');
   const module = await moduleFactory();
@@ -40,14 +41,14 @@ export async function _openDB(dbFileName: string): Promise<DBWorkerInterface> {
   /**
    * Listeners are exclusive to the DB connection.
    */
-  const listeners = new Map<string, OnTableChangeCallback>();
+  const listeners = new Map<number, OnTableChangeCallback>();
 
   sqlite3.register_table_onchange_hook(db, (opType: number, tableName: string, rowId: number) => {
     Array.from(listeners.values()).forEach((l) => l(opType, tableName, rowId));
   });
 
   const registerOnTableChange = (callback: OnTableChangeCallback) => {
-    const id = uuid();
+    const id = nextId++;
     listeners.set(id, callback);
     return Comlink.proxy(() => {
       listeners.delete(id);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// Needed to import early for uuids`
`2`		`-import 'react-native-get-random-values';`
`3`	`1`	`import _ from 'lodash';`
`4`	`2`	`import { action, makeObservable, observable } from 'mobx';`
`5`	`3`	`import { AbstractModel } from '../models/AbstractModel';`