@tinycloud/sdk-services 2.2.0-beta.12 → 2.2.0-beta.13

package/dist/index.d.cts

@@ -1747,6 +1747,7 @@ declare class DataVaultService extends BaseService implements IDataVaultService
     private encryptionIdentity;
     private _isUnlocked;
     private vaultConfig;
+    private unlockInFlight;
     /**
      * Create a new DataVaultService instance.
      *

package/dist/index.d.ts

@@ -1747,6 +1747,7 @@ declare class DataVaultService extends BaseService implements IDataVaultService
     private encryptionIdentity;
     private _isUnlocked;
     private vaultConfig;
+    private unlockInFlight;
     /**
      * Create a new DataVaultService instance.
      *

package/dist/index.js

@@ -2937,6 +2937,9 @@ function base64Decode(str) {
   }
   return bytes;
 }
+function isUnlockSigner(signer) {
+  return typeof signer === "object" && signer !== null && typeof signer.signMessage === "function";
+}
 function defaultVaultMessage(input) {
   switch (input.code) {
     case "DECRYPTION_FAILED":
@@ -2974,6 +2977,7 @@ var DataVaultService = class extends BaseService {
     this.masterKey = null;
     this.encryptionIdentity = null;
     this._isUnlocked = false;
+    this.unlockInFlight = null;
     this.vaultConfig = config;
     this._config = config;
   }
@@ -3033,30 +3037,40 @@ var DataVaultService = class extends BaseService {
    *                 signatures exist (browser only).
    */
   async unlock(signer) {
-    return this.withTelemetry("unlock", void 0, async () => {
+    const unlockSigner = isUnlockSigner(signer) ? signer : void 0;
+    if (this._isUnlocked && this.masterKey && (this.encryptionIdentity || !unlockSigner)) {
+      return { ok: true, data: void 0 };
+    }
+    if (this.unlockInFlight) {
+      return this.unlockInFlight;
+    }
+    this.unlockInFlight = this.withTelemetry("unlock", void 0, async () => {
       const spaceId = this.vaultConfig.spaceId;
       const versionConfig = VaultVersionConfig[CURRENT_VAULT_VERSION];
       const masterCacheKey = `vault-master:${spaceId}`;
       const identityCacheKey = `vault-identity:${this.tc.address}`;
       try {
-        let masterSigBytes = await loadCachedSignature(masterCacheKey);
-        if (!masterSigBytes) {
-          if (!signer) {
-            return vaultError({
-              code: "VAULT_LOCKED",
-              message: "Signer is required when no cached master signature exists"
-            });
+        if (!this.masterKey) {
+          let masterSigBytes = await loadCachedSignature(masterCacheKey);
+          if (!masterSigBytes) {
+            if (!unlockSigner) {
+              return vaultError({
+                code: "VAULT_LOCKED",
+                message: "Signer is required when no cached master signature exists"
+              });
+            }
+            const sig = await unlockSigner.signMessage(
+              versionConfig.masterMessage(spaceId)
+            );
+            masterSigBytes = toBytes(sig);
+            await cacheSignature(masterCacheKey, masterSigBytes);
           }
-          const s = signer;
-          const sig = await s.signMessage(versionConfig.masterMessage(spaceId));
-          masterSigBytes = toBytes(sig);
-          await cacheSignature(masterCacheKey, masterSigBytes);
-        }
-        this.masterKey = this.crypto.deriveKey(
-          masterSigBytes,
-          this.crypto.sha256(toBytes(spaceId)),
-          toBytes("vault-master")
-        );
+          this.masterKey = this.crypto.deriveKey(
+            masterSigBytes,
+            this.crypto.sha256(toBytes(spaceId)),
+            toBytes("vault-master")
+          );
+        }
         const publicSpaceId = this.tc.makePublicSpaceId(this.tc.address, this.tc.chainId);
         let existingPubKey = null;
         try {
@@ -3079,13 +3093,14 @@ var DataVaultService = class extends BaseService {
         } else {
           let identitySigBytes = await loadCachedSignature(identityCacheKey);
           if (!identitySigBytes) {
-            if (!signer) {
+            if (!unlockSigner) {
               this.encryptionIdentity = null;
               this._isUnlocked = true;
               return ok(void 0);
             }
-            const s = signer;
-            const sig = await s.signMessage(versionConfig.identityMessage);
+            const sig = await unlockSigner.signMessage(
+              versionConfig.identityMessage
+            );
             identitySigBytes = toBytes(sig);
             await cacheSignature(identityCacheKey, identitySigBytes);
           }
@@ -3115,6 +3130,11 @@ var DataVaultService = class extends BaseService {
         });
       }
     });
+    try {
+      return await this.unlockInFlight;
+    } finally {
+      this.unlockInFlight = null;
+    }
   }
   /**
    * Clear the cached vault signatures.