fix: Allow multiple independent instances of levelDB.

Signed-off-by: Francisco Javier Ribó Labrador <[email protected]>
trust0-project · Dec 19, 2023 · 6d04a91 · 6d04a91
1 parent 7b57229
commit 6d04a91
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 19 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -47,21 +47,10 @@
       "type": "node"
     },
     {
-      "cwd": "${workspaceFolder}/packages/database",
-      "type": "node",
+      "command": "npm run test",
+      "name": "Test2",
       "request": "launch",
-      "console": "integratedTerminal",
-      "name": "TEST",
-      "program": "${workspaceRoot}/node_modules/.bin/vitest",
-      "args": [
-        "--pool",
-        "threads",
-        "--poolOptions.threads.singleThread",
-      ],
-      "skipFiles": [
-        "${workspaceRoot}/../../node_modules/**/*",
-        "<node_internals>/**/*"
-      ]
+      "type": "node-terminal"
     }
   ]
 }
diff --git a/packages/leveldb/.gitignore b/packages/leveldb/.gitignore
@@ -0,0 +1,2 @@
+db*
+prism-db
diff --git a/packages/leveldb/src/index.ts b/packages/leveldb/src/index.ts
@@ -33,7 +33,6 @@ export type * from './leveldb/types';
 export type { MangoQuerySelectorAndIndex, CRDTSchemaOptions, RxQueryPlanKey, PrimaryKey, StringKeys, TopLevelProperty, MangoQuerySortDirection } from "rxdb/dist/types/types";
 export type { DefaultPreparedQuery, RxJsonSchema, FilledMangoQuery, CompressionMode, RxQueryPlan, MangoQuery, MangoQueryNoLimit, MangoQuerySortPart } from 'rxdb'
 export type { Level } from 'level'
-let internalInstance: LevelDBInternal<any>
 export const RX_STORAGE_NAME_LEVELDB = 'leveldb';
 
 async function preloadData<RxDocType>(constructorProps: LevelDBInternalConstructor<RxDocType>) {
@@ -46,6 +45,8 @@ async function preloadData<RxDocType>(constructorProps: LevelDBInternalConstruct
     }
 }
 
+let internalInstance: Map<string, LevelDBInternal<any>> = new Map()
+
 function getRxStorageLevel<RxDocType>(settings: LevelDBSettings): RxStorageLevelDBType<RxDocType> {
     const instance: RxStorageLevelDBType<any> = {
         name: RX_STORAGE_NAME_LEVELDB,
@@ -64,18 +65,25 @@ function getRxStorageLevel<RxDocType>(settings: LevelDBSettings): RxStorageLevel
                     schema: params.schema,
                 };
 
-            if (!internalInstance) {
-                internalInstance = await preloadData<RxDocType>(levelDBConstructorProps);
+            const databasePath = "level" in levelDBConstructorProps ?
+                levelDBConstructorProps.level.path :
+                levelDBConstructorProps.dbPath;
+
+            const existingInstance = internalInstance.get(databasePath);
+
+            if (!existingInstance) {
+                internalInstance.set(databasePath, await preloadData<RxDocType>(levelDBConstructorProps))
             } else {
-                internalInstance.refCount++
+                existingInstance.refCount++;
+                internalInstance.set(databasePath, existingInstance)
             }
 
             const rxStorageInstance = new RxStorageIntanceLevelDB<RxDocType>(
                 this,
                 params.databaseName,
                 params.collectionName,
                 params.schema,
-                internalInstance,
+                internalInstance.get(databasePath)!,
                 settings
             )
 

diff --git a/packages/leveldb/tests/init.test.ts b/packages/leveldb/tests/init.test.ts
@@ -45,4 +45,44 @@ describe("LevelDb init", () => {
 
     // await db.close()
   })
+
+  it('should be able to instanciate multiple databases in the same thread', async ({ expect }) => {
+
+    const db = await Database.createEncrypted(
+      {
+        name: databaseName,
+        encryptionKey: defaultPassword,
+        storage: createLevelDBStorage({
+          dbPath: "./db"
+        }),
+      }
+    );
+
+    await db.storeLinkSecret("first", "first")
+
+    const db2 = await Database.createEncrypted(
+      {
+        name: databaseName,
+        encryptionKey: defaultPassword,
+        storage: createLevelDBStorage({
+          dbPath: "./db2"
+        }),
+      }
+    );
+
+    await db2.storeLinkSecret("second", "second")
+
+    const firstLinkSecret = await db.getLinkSecret();
+
+    const secondLinkSecret = await db2.getLinkSecret();
+
+    expect(firstLinkSecret).toBe("first")
+    expect(secondLinkSecret).toBe("second")
+
+    await db.clear()
+    await db2.clear()
+
+
+
+  })
 })