@bsv/wallet-toolbox 1.3.11 → 1.3.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",

package/src/storage/WalletStorageManager.ts

@@ -564,8 +564,10 @@ export class WalletStorageManager implements sdk.WalletStorage {
     auth: sdk.AuthId,
     writer: sdk.WalletStorageProvider,
     activeSync?: sdk.WalletStorageSync,
-    log: string = ''
+    log: string = '',
+    progLog?: (s: string) => string
   ): Promise<{ inserts: number; updates: number; log: string }> {
+    progLog ||= s => s
     const identityKey = auth.identityKey
 
     const writerSettings = await writer.makeAvailable()
@@ -577,7 +579,7 @@ export class WalletStorageManager implements sdk.WalletStorage {
       const reader = sync
       const readerSettings = reader.getSettings()
 
-      log += `syncToWriter from ${readerSettings.storageName} to ${writerSettings.storageName}\n`
+      log += progLog(`syncToWriter from ${readerSettings.storageName} to ${writerSettings.storageName}\n`)
 
       let i = -1
       for (;;) {
@@ -589,22 +591,23 @@ export class WalletStorageManager implements sdk.WalletStorage {
         const r = await writer.processSyncChunk(args, chunk)
         inserts += r.inserts
         updates += r.updates
-        log += `chunk ${i} inserted ${r.inserts} updated ${r.updates} ${r.maxUpdated_at}\n`
+        log += progLog(`chunk ${i} inserted ${r.inserts} updated ${r.updates} ${r.maxUpdated_at}\n`)
         if (r.done) break
       }
-      log += `syncToWriter complete: ${inserts} inserts, ${updates} updates\n`
+      log += progLog(`syncToWriter complete: ${inserts} inserts, ${updates} updates\n`)
       return log
     }, activeSync)
 
     return { inserts, updates, log }
   }
 
-  async updateBackups(activeSync?: sdk.WalletStorageSync): Promise<string> {
+  async updateBackups(activeSync?: sdk.WalletStorageSync, progLog?: (s: string) => string): Promise<string> {
+    progLog ||= s => s
     const auth = await this.getAuth(true)
     return await this.runAsSync(async sync => {
-      let log = `BACKUP CURRENT ACTIVE TO ${this._backups!.length} STORES\n`
+      let log = progLog(`BACKUP CURRENT ACTIVE TO ${this._backups!.length} STORES\n`)
       for (const backup of this._backups!) {
-        const stwr = await this.syncToWriter(auth, backup.storage, sync)
+        const stwr = await this.syncToWriter(auth, backup.storage, sync, undefined, progLog)
         log += stwr.log
       }
       return log
@@ -618,7 +621,8 @@ export class WalletStorageManager implements sdk.WalletStorage {
    *
    * @param storageIdentityKey of current backup storage provider that is to become the new active provider.
    */
-  async setActive(storageIdentityKey: string): Promise<string> {
+  async setActive(storageIdentityKey: string, progLog?: (s: string) => string): Promise<string> {
+    progLog ||= s => s
     if (!this.isAvailable()) await this.makeAvailable()
 
     // Confirm a valid storageIdentityKey: must match one of the _stores.
@@ -632,13 +636,13 @@ export class WalletStorageManager implements sdk.WalletStorage {
     const identityKey = (await this.getAuth()).identityKey
     const newActive = this._stores[newActiveIndex]
 
-    let log = `setActive to ${newActive.settings!.storageName}`
+    let log = progLog(`setActive to ${newActive.settings!.storageName}`)
 
     if (storageIdentityKey === this.getActiveStore() && this.isActiveEnabled)
       /** Setting the current active as the new active is a permitted no-op. */
-      return log + ` unchanged\n`
+      return log + progLog(` unchanged\n`)
 
-    log += '\n'
+    log += progLog('\n')
 
     log += await this.runAsSync(async sync => {
       let log = ''
@@ -658,17 +662,19 @@ export class WalletStorageManager implements sdk.WalletStorage {
 
         // Merge state from conflicting actives into `newActive`.
         for (const conflict of this._conflictingActives) {
-          log += 'MERGING STATE FROM CONFLICTING ACTIVES:\n'
+          log += progLog('MERGING STATE FROM CONFLICTING ACTIVES:\n')
           const sfr = await this.syncToWriter(
             { identityKey, userId: newActive.user!.userId, isActive: false },
             newActive.storage,
-            conflict.storage
+            conflict.storage,
+            undefined,
+            progLog
           )
           log += sfr.log
         }
-        log += 'PROPAGATE MERGED ACTIVE STATE TO NON-ACTIVES\n'
+        log += progLog('PROPAGATE MERGED ACTIVE STATE TO NON-ACTIVES\n')
       } else {
-        log += 'BACKUP CURRENT ACTIVE STATE THEN SET NEW ACTIVE\n'
+        log += progLog('BACKUP CURRENT ACTIVE STATE THEN SET NEW ACTIVE\n')
       }
 
       // If there were conflicting actives,
@@ -690,7 +696,9 @@ export class WalletStorageManager implements sdk.WalletStorage {
           const stwr = await this.syncToWriter(
             { identityKey, userId: store.user!.userId, isActive: false },
             store.storage,
-            backupSource.storage
+            backupSource.storage,
+            undefined,
+            progLog
           )
           log += stwr.log
         }

package/src/storage/__test/StorageIdb.test.ts

@@ -1,3 +1,6 @@
+import { PrivateKey } from '@bsv/sdk'
+import { Setup } from '../../Setup'
+import { SetupClient } from '../../SetupClient'
 import { StorageIdb } from '../StorageIdb'
 import { StorageProvider, StorageProviderOptions } from '../StorageProvider'
 import 'fake-indexeddb/auto'
@@ -12,4 +15,21 @@ describe('StorageIdb tests', () => {
     const db = storage.db!
     expect(db).toBeTruthy()
   })
+
+  test('1', async () => {
+    if (Setup.noEnv('test')) return
+    const env = Setup.getEnv('test')
+    const wallet = await SetupClient.createWalletClientNoEnv({
+      chain: env.chain,
+      rootKeyHex: env.devKeys[env.identityKey]
+    })
+    const stores = wallet.storage.getStores()
+    const options = StorageIdb.createStorageBaseOptions(wallet.chain)
+    const store = new StorageIdb(options)
+    await store.migrate(store.dbName, PrivateKey.fromRandom().toHex())
+    await store.makeAvailable()
+    await wallet.storage.addWalletStorageProvider(store)
+    await wallet.storage.setActive(stores[0].storageIdentityKey, (s) => { console.log(s); return s })
+    await wallet.storage.updateBackups(undefined, (s) => { console.log(s); return s })
+  })
 })