@bsv/wallet-toolbox 1.3.9 → 1.3.11

package/package.json

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

package/src/sdk/WalletStorage.interfaces.ts

@@ -104,6 +104,7 @@ export interface WalletStorageInfo {
   storageIdentityKey: string
   storageName: string
   storageClass: string
+  endpointURL?: string
 }
 
 /**

package/src/storage/StorageIdb.ts

@@ -2195,7 +2195,7 @@ export class StorageIdb extends StorageProvider implements sdk.WalletStorageProv
       const val = entity[key]
       if (val === null) {
         entity[key] = undefined
-      } else if (Buffer.isBuffer(val) || val instanceof Uint8Array) {
+      } else if (val instanceof Uint8Array) {
         entity[key] = Array.from(val)
       }
     }
@@ -2223,7 +2223,7 @@ export class StorageIdb extends StorageProvider implements sdk.WalletStorageProv
     booleanFields?: string[]
   ): Partial<T> {
     if (!this.dbtype) throw new sdk.WERR_INTERNAL('must call verifyReadyForDatabaseAccess first')
-    const v: any = update
+    const v: any = { ...update }
     if (v.created_at) v.created_at = this.validateEntityDate(v.created_at)
     if (v.updated_at) v.updated_at = this.validateEntityDate(v.updated_at)
     if (!v.created_at) delete v.created_at
@@ -2241,10 +2241,10 @@ export class StorageIdb extends StorageProvider implements sdk.WalletStorageProv
     }
     for (const key of Object.keys(v)) {
       const val = v[key]
-      if (Array.isArray(val) && (val.length === 0 || typeof val[0] === 'number')) {
-        v[key] = Buffer.from(val)
-      } else if (val === undefined) {
-        v[key] = null
+      if (Array.isArray(val) && (val.length === 0 || Number.isInteger(val[0]))) {
+        v[key] = Uint8Array.from(val)
+      } else if (val === null) {
+        v[key] = undefined
       }
     }
     this.isDirty = true
@@ -2279,10 +2279,10 @@ export class StorageIdb extends StorageProvider implements sdk.WalletStorageProv
     }
     for (const key of Object.keys(v)) {
       const val = v[key]
-      if (Array.isArray(val) && (val.length === 0 || typeof val[0] === 'number')) {
-        v[key] = Buffer.from(val)
-      } else if (val === undefined) {
-        v[key] = null
+      if (Array.isArray(val) && (val.length === 0 || Number.isInteger(val[0]))) {
+        v[key] = Uint8Array.from(val)
+      } else if (val === null) {
+        v[key] = undefined
       }
     }
     this.isDirty = true

package/src/storage/WalletStorageManager.ts

@@ -22,6 +22,7 @@ import {
 } from '../storage/schema/tables'
 import { wait } from '../utility/utilityHelpers'
 import { StorageProvider } from './StorageProvider'
+import { StorageClient } from './remoting/StorageClient'
 
 class ManagedStorage {
   isAvailable: boolean
@@ -704,6 +705,11 @@ export class WalletStorageManager implements sdk.WalletStorage {
     return log
   }
 
+  getStoreEndpointURL(store: ManagedStorage): string | undefined {
+    if (store.storage.constructor.name === 'StorageClient') return (store.storage as StorageClient).endpointUrl
+    return undefined
+  }
+
   getStores(): sdk.WalletStorageInfo[] {
     const stores: sdk.WalletStorageInfo[] = []
     if (this._active) {
@@ -715,7 +721,8 @@ export class WalletStorageManager implements sdk.WalletStorage {
         userId: this._active.user!.userId,
         storageIdentityKey: this._active.settings!.storageIdentityKey,
         storageName: this._active.settings!.storageName,
-        storageClass: this._active.storage.constructor.name
+        storageClass: this._active.storage.constructor.name,
+        endpointURL: this.getStoreEndpointURL(this._active)
       })
     }
     for (const store of this._conflictingActives || []) {
@@ -727,7 +734,8 @@ export class WalletStorageManager implements sdk.WalletStorage {
         userId: store.user!.userId,
         storageIdentityKey: store.settings!.storageIdentityKey,
         storageName: store.settings!.storageName,
-        storageClass: store.storage.constructor.name
+        storageClass: store.storage.constructor.name,
+        endpointURL: this.getStoreEndpointURL(store)
       })
     }
     for (const store of this._backups || []) {
@@ -739,7 +747,8 @@ export class WalletStorageManager implements sdk.WalletStorage {
         userId: store.user!.userId,
         storageIdentityKey: store.settings!.storageIdentityKey,
         storageName: store.settings!.storageName,
-        storageClass: store.storage.constructor.name
+        storageClass: store.storage.constructor.name,
+        endpointURL: this.getStoreEndpointURL(store)
       })
     }
     return stores

package/src/storage/remoting/StorageClient.ts

@@ -38,7 +38,7 @@ import {
  * For details of the API implemented, follow the "See also" link for the `WalletStorageProvider` interface.
  */
 export class StorageClient implements sdk.WalletStorageProvider {
-  private readonly endpointUrl: string
+  readonly endpointUrl: string
   private readonly authClient: AuthFetch
   private nextId = 1
 
@@ -507,7 +507,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
       const val = entity[key]
       if (val === null) {
         entity[key] = undefined
-      } else if (Buffer.isBuffer(val)) {
+      } else if (val instanceof Uint8Array) {
         entity[key] = Array.from(val)
       }
     }

package/test/storage/idb/idbSpeed.test.ts

@@ -30,5 +30,7 @@ describe('idbSpeed tests', () => {
       log += `${key},${value.count},${value.totalMsecs},${value.totalMsecs / value.count}\n`
     }
     logger(log)
+
+    await setup.wallet.destroy()
   })
 })

package/test/storage/idb/update.test.ts

@@ -207,14 +207,13 @@ describe('update tests', () => {
               expect(actualValue).toBe(value)
               continue
             }
-            if (typeof actualValue === 'object' && actualValue?.type === 'Buffer') {
-              const actualArray = actualValue.data || actualValue
-              const expectedArray =
-                Buffer.isBuffer(value) || Array.isArray(value) ? Array.from(value as ArrayLike<number>) : value
+            if (typeof actualValue === 'object' && Array.isArray(actualValue)) {
+              const actualArray = actualValue
+              const expectedArray = value
               expect(actualArray).toStrictEqual(expectedArray)
               continue
             }
-            expect(JSON.stringify({ type: 'Buffer', data: actualValue })).toStrictEqual(JSON.stringify(value))
+            expect(JSON.stringify(actualValue)).toStrictEqual(JSON.stringify(value))
           }
         } catch (error: any) {
           console.error(
@@ -556,8 +555,8 @@ describe('update tests', () => {
               expect(normalizedActual).toBe(normalizedExpected)
               continue
             }
-            if (Buffer.isBuffer(actualValue) || Array.isArray(actualValue)) {
-              expect(JSON.stringify({ type: 'Buffer', data: actualValue })).toStrictEqual(JSON.stringify(value))
+            if (Array.isArray(actualValue)) {
+              expect(actualValue).toStrictEqual(value)
               continue
             }
             expect(actualValue).toBe(value)
@@ -638,8 +637,8 @@ describe('update tests', () => {
               expect(normalizedActual).toBe(normalizedExpected)
               continue
             }
-            if (Buffer.isBuffer(actualValue) || Array.isArray(actualValue)) {
-              expect(JSON.stringify({ type: 'Buffer', data: actualValue })).toStrictEqual(JSON.stringify(value))
+            if (Array.isArray(actualValue)) {
+              expect(actualValue).toStrictEqual(value)
               continue
             }
             expect(actualValue).toBe(value)