nostr-tools 2.23.3 → 2.23.4

package/lib/cjs/nip46.js

@@ -154,7 +154,8 @@ var import_sha22 = require("@noble/hashes/sha2.js");
 var import_utils5 = require("@noble/hashes/utils.js");
 var import_base = require("@scure/base");
 var minPlaintextSize = 1;
-var maxPlaintextSize = 65535;
+var maxPlaintextSize = 4294967295;
+var extendedPrefixThreshold = 65536;
 function getConversationKey(privkeyA, pubkeyB) {
   const sharedX = import_secp256k12.secp256k1.getSharedSecret(privkeyA, (0, import_utils5.hexToBytes)("02" + pubkeyB)).subarray(1, 33);
   return (0, import_hkdf.extract)(import_sha22.sha256, sharedX, utf8Encoder.encode("nip44-v2"));
@@ -172,28 +173,49 @@ function calcPaddedLen(len) {
     throw new Error("expected positive integer");
   if (len <= 32)
     return 32;
-  const nextPower = 1 << Math.floor(Math.log2(len - 1)) + 1;
+  const nextPower = 2 ** (Math.floor(Math.log2(len - 1)) + 1);
   const chunk = nextPower <= 256 ? 32 : nextPower / 8;
   return chunk * (Math.floor((len - 1) / chunk) + 1);
 }
 function writeU16BE(num) {
-  if (!Number.isSafeInteger(num) || num < minPlaintextSize || num > maxPlaintextSize)
+  if (!Number.isSafeInteger(num) || num < minPlaintextSize || num > 65535)
     throw new Error("invalid plaintext size: must be between 1 and 65535 bytes");
   const arr = new Uint8Array(2);
   new DataView(arr.buffer).setUint16(0, num, false);
   return arr;
 }
+function writeU32BE(num) {
+  if (!Number.isSafeInteger(num) || num < extendedPrefixThreshold || num > maxPlaintextSize)
+    throw new Error("invalid plaintext size: must be between 65536 and 4294967295 bytes");
+  const arr = new Uint8Array(4);
+  new DataView(arr.buffer).setUint32(0, num, false);
+  return arr;
+}
 function pad(plaintext) {
   const unpadded = utf8Encoder.encode(plaintext);
   const unpaddedLen = unpadded.length;
-  const prefix = writeU16BE(unpaddedLen);
+  if (unpaddedLen < minPlaintextSize || unpaddedLen > maxPlaintextSize)
+    throw new Error("invalid plaintext size: must be between 1 and 4294967295 bytes");
+  const prefix = unpaddedLen >= extendedPrefixThreshold ? (0, import_utils5.concatBytes)(new Uint8Array([0, 0]), writeU32BE(unpaddedLen)) : writeU16BE(unpaddedLen);
   const suffix = new Uint8Array(calcPaddedLen(unpaddedLen) - unpaddedLen);
   return (0, import_utils5.concatBytes)(prefix, unpadded, suffix);
 }
 function unpad(padded) {
-  const unpaddedLen = new DataView(padded.buffer).getUint16(0);
-  const unpadded = padded.subarray(2, 2 + unpaddedLen);
-  if (unpaddedLen < minPlaintextSize || unpaddedLen > maxPlaintextSize || unpadded.length !== unpaddedLen || padded.length !== 2 + calcPaddedLen(unpaddedLen))
+  const dv = new DataView(padded.buffer, padded.byteOffset, padded.byteLength);
+  const firstTwo = dv.getUint16(0);
+  let unpaddedLen;
+  let prefixLen;
+  if (firstTwo === 0) {
+    unpaddedLen = dv.getUint32(2);
+    if (unpaddedLen < extendedPrefixThreshold)
+      throw new Error("invalid padding");
+    prefixLen = 6;
+  } else {
+    unpaddedLen = firstTwo;
+    prefixLen = 2;
+  }
+  const unpadded = padded.subarray(prefixLen, prefixLen + unpaddedLen);
+  if (unpaddedLen < minPlaintextSize || unpaddedLen > maxPlaintextSize || unpadded.length !== unpaddedLen || padded.length !== prefixLen + calcPaddedLen(unpaddedLen))
     throw new Error("invalid padding");
   return utf8Decoder.decode(unpadded);
 }
@@ -207,7 +229,7 @@ function decodePayload(payload) {
   if (typeof payload !== "string")
     throw new Error("payload must be a valid string");
   const plen = payload.length;
-  if (plen < 132 || plen > 87472)
+  if (plen < 132)
     throw new Error("invalid payload length: " + plen);
   if (payload[0] === "#")
     throw new Error("unknown encryption version");
@@ -218,7 +240,7 @@ function decodePayload(payload) {
     throw new Error("invalid base64: " + error.message);
   }
   const dlen = data.length;
-  if (dlen < 99 || dlen > 65603)
+  if (dlen < 99)
     throw new Error("invalid data length: " + dlen);
   const vers = data[0];
   if (vers !== 2)
@@ -1234,7 +1256,9 @@ var BunkerSigner = class {
                 signer.conversationKey = getConversationKey(clientSecretKey, event.pubkey);
                 signer.setupSubscription();
                 success = true;
-                await Promise.race([new Promise((resolve2) => setTimeout(resolve2, 1e3)), signer.switchRelays()]);
+                if (!bunkerParams.skipSwitchRelays) {
+                  await Promise.race([new Promise((resolve2) => setTimeout(resolve2, 1e3)), signer.switchRelays()]);
+                }
                 resolve(signer);
               }
             } catch (e) {