nostr-tools 2.3.0 → 2.3.2

package/lib/cjs/index.js

@@ -3,6 +3,7 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 
 // index.ts
 var nostr_tools_exports = {};
@@ -679,16 +684,19 @@ var AbstractRelay = class {
       this.ws.onerror = (ev) => {
         reject(ev.message);
         if (this._connected) {
+          this._connected = false;
+          this.connectionPromise = void 0;
           this.onclose?.();
           this.closeAllSubscriptions("relay connection errored");
-          this._connected = false;
         }
       };
       this.ws.onclose = async () => {
-        this.connectionPromise = void 0;
-        this.onclose?.();
-        this.closeAllSubscriptions("relay connection closed");
-        this._connected = false;
+        if (this._connected) {
+          this._connected = false;
+          this.connectionPromise = void 0;
+          this.onclose?.();
+          this.closeAllSubscriptions("relay connection closed");
+        }
       };
       this.ws.onmessage = this._onmessage.bind(this);
     });
@@ -881,7 +889,7 @@ var Subscription = class {
     this.oneose?.();
   }
   close(reason = "closed by caller") {
-    if (!this.closed) {
+    if (!this.closed && this.relay.connected) {
       this.relay.send('["CLOSE",' + JSON.stringify(this.id) + "]");
       this.closed = true;
     }
@@ -1866,26 +1874,23 @@ var import_sha2562 = require("@noble/hashes/sha256");
 var import_utils10 = require("@noble/hashes/utils");
 var import_base3 = require("@scure/base");
 var decoder = new TextDecoder();
-var u = {
-  minPlaintextSize: 1,
-  maxPlaintextSize: 65535,
-  utf8Encode: import_utils10.utf8ToBytes,
-  utf8Decode(bytes) {
+var _u = class {
+  static utf8Decode(bytes) {
     return decoder.decode(bytes);
-  },
-  getConversationKey(privkeyA, pubkeyB) {
+  }
+  static getConversationKey(privkeyA, pubkeyB) {
     const sharedX = import_secp256k13.secp256k1.getSharedSecret(privkeyA, "02" + pubkeyB).subarray(1, 33);
     return (0, import_hkdf.extract)(import_sha2562.sha256, sharedX, "nip44-v2");
-  },
-  getMessageKeys(conversationKey, nonce) {
+  }
+  static getMessageKeys(conversationKey, nonce) {
     const keys = (0, import_hkdf.expand)(import_sha2562.sha256, conversationKey, nonce, 76);
     return {
       chacha_key: keys.subarray(0, 32),
       chacha_nonce: keys.subarray(32, 44),
       hmac_key: keys.subarray(44, 76)
     };
-  },
-  calcPaddedLen(len) {
+  }
+  static calcPaddedLen(len) {
     if (!Number.isSafeInteger(len) || len < 1)
       throw new Error("expected positive integer");
     if (len <= 32)
@@ -1893,35 +1898,35 @@ var u = {
     const nextPower = 1 << Math.floor(Math.log2(len - 1)) + 1;
     const chunk = nextPower <= 256 ? 32 : nextPower / 8;
     return chunk * (Math.floor((len - 1) / chunk) + 1);
-  },
-  writeU16BE(num) {
-    if (!Number.isSafeInteger(num) || num < u.minPlaintextSize || num > u.maxPlaintextSize)
+  }
+  static writeU16BE(num) {
+    if (!Number.isSafeInteger(num) || num < _u.minPlaintextSize || num > _u.maxPlaintextSize)
       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;
-  },
-  pad(plaintext) {
-    const unpadded = u.utf8Encode(plaintext);
+  }
+  static pad(plaintext) {
+    const unpadded = _u.utf8Encode(plaintext);
     const unpaddedLen = unpadded.length;
-    const prefix = u.writeU16BE(unpaddedLen);
-    const suffix = new Uint8Array(u.calcPaddedLen(unpaddedLen) - unpaddedLen);
+    const prefix = _u.writeU16BE(unpaddedLen);
+    const suffix = new Uint8Array(_u.calcPaddedLen(unpaddedLen) - unpaddedLen);
     return (0, import_utils10.concatBytes)(prefix, unpadded, suffix);
-  },
-  unpad(padded) {
+  }
+  static unpad(padded) {
     const unpaddedLen = new DataView(padded.buffer).getUint16(0);
     const unpadded = padded.subarray(2, 2 + unpaddedLen);
-    if (unpaddedLen < u.minPlaintextSize || unpaddedLen > u.maxPlaintextSize || unpadded.length !== unpaddedLen || padded.length !== 2 + u.calcPaddedLen(unpaddedLen))
+    if (unpaddedLen < _u.minPlaintextSize || unpaddedLen > _u.maxPlaintextSize || unpadded.length !== unpaddedLen || padded.length !== 2 + _u.calcPaddedLen(unpaddedLen))
       throw new Error("invalid padding");
-    return u.utf8Decode(unpadded);
-  },
-  hmacAad(key, message, aad) {
+    return _u.utf8Decode(unpadded);
+  }
+  static hmacAad(key, message, aad) {
     if (aad.length !== 32)
       throw new Error("AAD associated data must be 32 bytes");
     const combined = (0, import_utils10.concatBytes)(aad, message);
     return (0, import_hmac.hmac)(import_sha2562.sha256, key, combined);
-  },
-  decodePayload(payload) {
+  }
+  static decodePayload(payload) {
     if (typeof payload !== "string")
       throw new Error("payload must be a valid string");
     const plen = payload.length;
@@ -1948,27 +1953,29 @@ var u = {
     };
   }
 };
-function encrypt2(plaintext, conversationKey, nonce = (0, import_utils10.randomBytes)(32)) {
-  const { chacha_key, chacha_nonce, hmac_key } = u.getMessageKeys(conversationKey, nonce);
-  const padded = u.pad(plaintext);
-  const ciphertext = (0, import_chacha.chacha20)(chacha_key, chacha_nonce, padded);
-  const mac = u.hmacAad(hmac_key, ciphertext, nonce);
-  return import_base3.base64.encode((0, import_utils10.concatBytes)(new Uint8Array([2]), nonce, ciphertext, mac));
-}
-function decrypt2(payload, conversationKey) {
-  const { nonce, ciphertext, mac } = u.decodePayload(payload);
-  const { chacha_key, chacha_nonce, hmac_key } = u.getMessageKeys(conversationKey, nonce);
-  const calculatedMac = u.hmacAad(hmac_key, ciphertext, nonce);
-  if (!(0, import_utils9.equalBytes)(calculatedMac, mac))
-    throw new Error("invalid MAC");
-  const padded = (0, import_chacha.chacha20)(chacha_key, chacha_nonce, ciphertext);
-  return u.unpad(padded);
-}
-var v2 = {
-  utils: u,
-  encrypt: encrypt2,
-  decrypt: decrypt2
+var u = _u;
+__publicField(u, "minPlaintextSize", 1);
+__publicField(u, "maxPlaintextSize", 65535);
+__publicField(u, "utf8Encode", import_utils10.utf8ToBytes);
+var v2 = class {
+  static encrypt(plaintext, conversationKey, nonce = (0, import_utils10.randomBytes)(32)) {
+    const { chacha_key, chacha_nonce, hmac_key } = u.getMessageKeys(conversationKey, nonce);
+    const padded = u.pad(plaintext);
+    const ciphertext = (0, import_chacha.chacha20)(chacha_key, chacha_nonce, padded);
+    const mac = u.hmacAad(hmac_key, ciphertext, nonce);
+    return import_base3.base64.encode((0, import_utils10.concatBytes)(new Uint8Array([2]), nonce, ciphertext, mac));
+  }
+  static decrypt(payload, conversationKey) {
+    const { nonce, ciphertext, mac } = u.decodePayload(payload);
+    const { chacha_key, chacha_nonce, hmac_key } = u.getMessageKeys(conversationKey, nonce);
+    const calculatedMac = u.hmacAad(hmac_key, ciphertext, nonce);
+    if (!(0, import_utils9.equalBytes)(calculatedMac, mac))
+      throw new Error("invalid MAC");
+    const padded = (0, import_chacha.chacha20)(chacha_key, chacha_nonce, ciphertext);
+    return u.unpad(padded);
+  }
 };
+__publicField(v2, "utils", u);
 var nip44_default = { v2 };
 
 // nip47.ts