applesauce-wallet-connect 0.0.0-next-20251209200210 → 0.0.0-next-20251220152312

package/dist/helpers/notification.js

@@ -1,4 +1,4 @@
-import { isHiddenContentUnlocked, notifyEventUpdate, setHiddenContentEncryptionMethod, unlockHiddenContent, } from "applesauce-core/helpers";
+import { getHiddenContent, isHiddenContentUnlocked, notifyEventUpdate, setHiddenContentEncryptionMethod, unlockHiddenContent, } from "applesauce-core/helpers";
 export const WALLET_NOTIFICATION_KIND = 23197;
 export const WALLET_LEGACY_NOTIFICATION_KIND = 23196;
 /** A symbol used to cache the wallet notification on the event */
@@ -8,25 +8,38 @@ setHiddenContentEncryptionMethod(WALLET_NOTIFICATION_KIND, "nip44");
 setHiddenContentEncryptionMethod(WALLET_LEGACY_NOTIFICATION_KIND, "nip04");
 /** Checks if a kind 23196 or 23197 event is locked */
 export function isWalletNotificationUnlocked(notification) {
-    return isHiddenContentUnlocked(notification) && Reflect.has(notification, WalletNotificationSymbol) === true;
+    // Wrap in try catch to avoid throwing validation errors
+    try {
+        return (WalletNotificationSymbol in notification ||
+            (isHiddenContentUnlocked(notification) && getWalletNotification(notification) !== undefined));
+    }
+    catch { }
+    return false;
 }
 /** Unlocks a kind 23196 or 23197 event */
 export async function unlockWalletNotification(notification, signer) {
-    if (isWalletNotificationUnlocked(notification))
+    if (WalletNotificationSymbol in notification)
         return notification[WalletNotificationSymbol];
-    const content = await unlockHiddenContent(notification, signer);
-    const parsed = JSON.parse(content);
-    // Save the parsed content
-    Reflect.set(notification, WalletNotificationSymbol, parsed);
-    notifyEventUpdate(notification);
+    await unlockHiddenContent(notification, signer);
+    const parsed = getWalletNotification(notification);
+    if (!parsed)
+        throw new Error("Failed to unlock wallet notification");
     return parsed;
 }
 /** Gets the wallet notification from a kind 23196 or 23197 event */
 export function getWalletNotification(notification) {
-    if (isWalletNotificationUnlocked(notification))
+    if (WalletNotificationSymbol in notification)
         return notification[WalletNotificationSymbol];
-    else
+    // Get the encrypted content
+    const content = getHiddenContent(notification);
+    if (!content)
         return undefined;
+    // Parse the content as a wallet notification
+    const parsed = JSON.parse(content);
+    // Save the parsed content
+    Reflect.set(notification, WalletNotificationSymbol, parsed);
+    notifyEventUpdate(notification);
+    return parsed;
 }
 /** Checks if an event is a valid wallet notification event */
 export function isValidWalletNotification(notification) {

package/dist/helpers/request.js

@@ -1,7 +1,6 @@
 import { isNIP04Encrypted } from "applesauce-core/helpers/encryption";
-import { notifyEventUpdate } from "applesauce-core/helpers/event";
-import { getTagValue } from "applesauce-core/helpers/event";
-import { isHiddenContentUnlocked, setHiddenContentEncryptionMethod, unlockHiddenContent, } from "applesauce-core/helpers/hidden-content";
+import { getTagValue, notifyEventUpdate } from "applesauce-core/helpers/event";
+import { getHiddenContent, isHiddenContentUnlocked, setHiddenContentEncryptionMethod, unlockHiddenContent, } from "applesauce-core/helpers/hidden-content";
 import { unixNow } from "applesauce-core/helpers/time";
 export const WALLET_REQUEST_KIND = 23194;
 // Set the encryption method to use for request kind
@@ -10,25 +9,35 @@ setHiddenContentEncryptionMethod(WALLET_REQUEST_KIND, "nip44");
 export const WalletRequestSymbol = Symbol("wallet-request");
 /** Checks if a kind 23194 event is locked */
 export function isWalletRequestUnlocked(request) {
-    return isHiddenContentUnlocked(request) && Reflect.has(request, WalletRequestSymbol) === true;
+    // Wrap in try catch to avoid throwing validation errors
+    try {
+        return (WalletRequestSymbol in request || (isHiddenContentUnlocked(request) && getWalletRequest(request) !== undefined));
+    }
+    catch { }
+    return false;
 }
 /** Unlocks a kind 23194 event */
 export async function unlockWalletRequest(request, signer) {
-    if (isWalletRequestUnlocked(request))
+    if (WalletRequestSymbol in request)
         return request[WalletRequestSymbol];
-    const content = await unlockHiddenContent(request, signer);
-    const parsed = JSON.parse(content);
-    // Save the parsed content
-    Reflect.set(request, WalletRequestSymbol, parsed);
-    notifyEventUpdate(request);
+    await unlockHiddenContent(request, signer);
+    const parsed = getWalletRequest(request);
+    if (!parsed)
+        throw new Error("Failed to unlock wallet request");
     return parsed;
 }
 /** Gets the wallet request from a kind 23194 event */
 export function getWalletRequest(request) {
-    if (isWalletRequestUnlocked(request))
+    if (WalletRequestSymbol in request)
         return request[WalletRequestSymbol];
-    else
+    const content = getHiddenContent(request);
+    if (!content)
         return undefined;
+    const parsed = JSON.parse(content);
+    // Save the parsed content
+    Reflect.set(request, WalletRequestSymbol, parsed);
+    notifyEventUpdate(request);
+    return parsed;
 }
 export function getWalletRequestServicePubkey(request) {
     return getTagValue(request, "p");

package/dist/helpers/response.js

@@ -1,7 +1,6 @@
 import { isNIP04Encrypted } from "applesauce-core/helpers/encryption";
-import { notifyEventUpdate } from "applesauce-core/helpers/event";
-import { getTagValue } from "applesauce-core/helpers/event";
-import { isHiddenContentUnlocked, setHiddenContentEncryptionMethod, unlockHiddenContent, } from "applesauce-core/helpers/hidden-content";
+import { getTagValue, notifyEventUpdate } from "applesauce-core/helpers/event";
+import { getHiddenContent, isHiddenContentUnlocked, setHiddenContentEncryptionMethod, unlockHiddenContent, } from "applesauce-core/helpers/hidden-content";
 export const WALLET_RESPONSE_KIND = 23195;
 // Set the encryption method to use for response kind
 setHiddenContentEncryptionMethod(WALLET_RESPONSE_KIND, "nip04");
@@ -9,26 +8,39 @@ setHiddenContentEncryptionMethod(WALLET_RESPONSE_KIND, "nip04");
 export const WalletResponseSymbol = Symbol("wallet-response");
 /** Checks if a kind 23195 event is locked */
 export function isWalletResponseUnlocked(response) {
-    return isHiddenContentUnlocked(response) && Reflect.has(response, WalletResponseSymbol) === true;
+    // Wrap in try catch to avoid throwing validation errors
+    try {
+        return (WalletResponseSymbol in response ||
+            (isHiddenContentUnlocked(response) && getWalletResponse(response) !== undefined));
+    }
+    catch { }
+    return false;
 }
 /** Unlocks a kind 23195 event */
 export async function unlockWalletResponse(response, signer, override) {
-    if (isWalletResponseUnlocked(response))
+    if (WalletResponseSymbol in response)
         return response[WalletResponseSymbol];
+    // Unlock the hidden content
     const encryption = override ?? (!isNIP04Encrypted(response.content) ? "nip44" : "nip04");
-    const content = await unlockHiddenContent(response, signer, encryption);
-    const parsed = JSON.parse(content);
-    // Save the parsed content
-    Reflect.set(response, WalletResponseSymbol, parsed);
-    notifyEventUpdate(response);
+    await unlockHiddenContent(response, signer, encryption);
+    // Get the wallet response
+    const parsed = getWalletResponse(response);
+    if (!parsed)
+        throw new Error("Failed to unlock wallet response");
     return parsed;
 }
 /** Gets the wallet response from a kind 23195 event */
 export function getWalletResponse(response) {
-    if (isWalletResponseUnlocked(response))
+    if (WalletResponseSymbol in response)
         return response[WalletResponseSymbol];
-    else
+    const content = getHiddenContent(response);
+    if (!content)
         return undefined;
+    const parsed = JSON.parse(content);
+    // Save the parsed content
+    Reflect.set(response, WalletResponseSymbol, parsed);
+    notifyEventUpdate(response);
+    return parsed;
 }
 export function getWalletResponseClientPubkey(response) {
     return getTagValue(response, "p");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet-connect",
-  "version": "0.0.0-next-20251209200210",
+  "version": "0.0.0-next-20251220152312",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -59,13 +59,13 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-common": "0.0.0-next-20251209200210",
-    "applesauce-core": "0.0.0-next-20251209200210",
+    "applesauce-common": "0.0.0-next-20251220152312",
+    "applesauce-core": "0.0.0-next-20251220152312",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
-    "applesauce-signers": "0.0.0-next-20251209200210",
+    "applesauce-signers": "0.0.0-next-20251220152312",
     "@types/debug": "^4.1.12",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3",