socketon 1.31.2-rc → 1.51.17

package/lib/Utils/noise-handler.js

@@ -1,155 +1,144 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeNoiseHandler = void 0;
-const boom_1 = require("@hapi/boom");
-const WAProto_1 = require("../../WAProto");
-const Defaults_1 = require("../Defaults");
-const WABinary_1 = require("../WABinary");
-const crypto_1 = require("./crypto");
+//=======================================================//
+import { aesDecryptGCM, aesEncryptGCM, Curve, hkdf, sha256 } from "./crypto.js";
+import { NOISE_MODE, WA_CERT_DETAILS } from "../Defaults/index.js";
+import { decodeBinaryNode } from "../WABinary/index.js";
+import { proto } from "../../WAProto/index.js";
+import { Boom } from "@hapi/boom";
+//=======================================================//
 const generateIV = (counter) => {
-    const iv = new ArrayBuffer(12);
-    new DataView(iv).setUint32(8, counter);
-    return new Uint8Array(iv);
+  const iv = new ArrayBuffer(12);
+  new DataView(iv).setUint32(8, counter);
+  return new Uint8Array(iv);
 };
-const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }) => {
-    logger = logger.child({ class: 'ns' });
-    const authenticate = (data) => {
-        if (!isFinished) {
-            hash = (0, crypto_1.sha256)(Buffer.concat([hash, data]));
+//=======================================================//
+export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }) => {
+  logger = logger.child({ class: "ns" });
+  const authenticate = (data) => {
+    if (!isFinished) {
+      hash = sha256(Buffer.concat([hash, data]));
+    }
+  };
+  const encrypt = (plaintext) => {
+    const result = aesEncryptGCM(plaintext, encKey, generateIV(writeCounter), hash);
+    writeCounter += 1;
+    authenticate(result);
+    return result;
+  };
+  const decrypt = (ciphertext) => {
+    const iv = generateIV(isFinished ? readCounter : writeCounter);
+    const result = aesDecryptGCM(ciphertext, decKey, iv, hash);
+    if (isFinished) {
+      readCounter += 1;
+    }
+    else {
+      writeCounter += 1;
+    }
+    authenticate(ciphertext);
+    return result;
+  };
+  const localHKDF = async (data) => {
+    const key = await hkdf(Buffer.from(data), 64, { salt, info: "" });
+    return [key.slice(0, 32), key.slice(32)];
+  };
+  const mixIntoKey = async (data) => {
+    const [write, read] = await localHKDF(data);
+    salt = write;
+    encKey = read;
+    decKey = read;
+    readCounter = 0;
+    writeCounter = 0;
+  };
+  const finishInit = async () => {
+    const [write, read] = await localHKDF(new Uint8Array(0));
+    encKey = write;
+    decKey = read;
+    hash = Buffer.from([]);
+    readCounter = 0;
+    writeCounter = 0;
+    isFinished = true;
+  };
+  const data = Buffer.from(NOISE_MODE);
+  let hash = data.byteLength === 32 ? data : sha256(data);
+  let salt = hash;
+  let encKey = hash;
+  let decKey = hash;
+  let readCounter = 0;
+  let writeCounter = 0;
+  let isFinished = false;
+  let sentIntro = false;
+  let inBytes = Buffer.alloc(0);
+  authenticate(NOISE_HEADER);
+  authenticate(publicKey);
+  return {
+    encrypt,
+    decrypt,
+    authenticate,
+    mixIntoKey,
+    finishInit,
+    processHandshake: async ({ serverHello }, noiseKey) => {
+      authenticate(serverHello.ephemeral);
+      await mixIntoKey(Curve.sharedKey(privateKey, serverHello.ephemeral));
+      const decStaticContent = decrypt(serverHello.static);
+      await mixIntoKey(Curve.sharedKey(privateKey, decStaticContent));
+      const certDecoded = decrypt(serverHello.payload);
+      const { intermediate: certIntermediate } = proto.CertChain.decode(certDecoded);
+      const { issuerSerial } = proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
+      if (issuerSerial !== WA_CERT_DETAILS.SERIAL) {
+        throw new Boom("certification match failed", { statusCode: 400 });
+      }
+      const keyEnc = encrypt(noiseKey.public);
+      await mixIntoKey(Curve.sharedKey(noiseKey.private, serverHello.ephemeral));
+      return keyEnc;
+    },
+    encodeFrame: (data) => {
+      if (isFinished) {
+        data = encrypt(data);
+      }
+      let header;
+      if (routingInfo) {
+        header = Buffer.alloc(7);
+        header.write("ED", 0, "utf8");
+        header.writeUint8(0, 2);
+        header.writeUint8(1, 3);
+        header.writeUint8(routingInfo.byteLength >> 16, 4);
+        header.writeUint16BE(routingInfo.byteLength & 65535, 5);
+        header = Buffer.concat([header, routingInfo, NOISE_HEADER]);
+      }
+      else {
+        header = Buffer.from(NOISE_HEADER);
+      }
+      const introSize = sentIntro ? 0 : header.length;
+      const frame = Buffer.alloc(introSize + 3 + data.byteLength);
+      if (!sentIntro) {
+        frame.set(header);
+        sentIntro = true;
+      }
+      frame.writeUInt8(data.byteLength >> 16, introSize);
+      frame.writeUInt16BE(65535 & data.byteLength, introSize + 1);
+      frame.set(data, introSize + 3);
+      return frame;
+    },
+    decodeFrame: async (newData, onFrame) => {
+      const getBytesSize = () => {
+        if (inBytes.length >= 3) {
+          return (inBytes.readUInt8() << 16) | inBytes.readUInt16BE(1);
         }
-    };
-    const encrypt = (plaintext) => {
-        const result = (0, crypto_1.aesEncryptGCM)(plaintext, encKey, generateIV(writeCounter), hash);
-        writeCounter += 1;
-        authenticate(result);
-        return result;
-    };
-    const decrypt = (ciphertext) => {
-        // before the handshake is finished, we use the same counter
-        // after handshake, the counters are different
-        const iv = generateIV(isFinished ? readCounter : writeCounter);
-        const result = (0, crypto_1.aesDecryptGCM)(ciphertext, decKey, iv, hash);
+      };
+      inBytes = Buffer.concat([inBytes, newData]);
+      logger.trace(`recv ${newData.length} bytes, total recv ${inBytes.length} bytes`);
+      let size = getBytesSize();
+      while (size && inBytes.length >= size + 3) {
+        let frame = inBytes.slice(3, size + 3);
+        inBytes = inBytes.slice(size + 3);
         if (isFinished) {
-            readCounter += 1;
+          const result = decrypt(frame);
+          frame = await decodeBinaryNode(result);
         }
-        else {
-            writeCounter += 1;
-        }
-        authenticate(ciphertext);
-        return result;
-    };
-    const localHKDF = (data) => {
-        const key = (0, crypto_1.hkdf)(Buffer.from(data), 64, { salt, info: '' });
-        return [key.slice(0, 32), key.slice(32)];
-    };
-    const mixIntoKey = (data) => {
-        const [write, read] = localHKDF(data);
-        salt = write;
-        encKey = read;
-        decKey = read;
-        readCounter = 0;
-        writeCounter = 0;
-    };
-    const finishInit = () => {
-        const [write, read] = localHKDF(new Uint8Array(0));
-        encKey = write;
-        decKey = read;
-        hash = Buffer.from([]);
-        readCounter = 0;
-        writeCounter = 0;
-        isFinished = true;
-    };
-    const data = Buffer.from(Defaults_1.NOISE_MODE);
-    let hash = Buffer.from(data.byteLength === 32 ? data : (0, crypto_1.sha256)(data));
-    let salt = hash;
-    let encKey = hash;
-    let decKey = hash;
-    let readCounter = 0;
-    let writeCounter = 0;
-    let isFinished = false;
-    let sentIntro = false;
-    let inBytes = Buffer.alloc(0);
-    authenticate(NOISE_HEADER);
-    authenticate(publicKey);
-    return {
-        encrypt,
-        decrypt,
-        authenticate,
-        mixIntoKey,
-        finishInit,
-        processHandshake: ({ serverHello }, noiseKey) => {
-            authenticate(serverHello.ephemeral);
-            mixIntoKey(crypto_1.Curve.sharedKey(privateKey, serverHello.ephemeral));
-            const decStaticContent = decrypt(serverHello.static);
-            mixIntoKey(crypto_1.Curve.sharedKey(privateKey, decStaticContent));
-            const certDecoded = decrypt(serverHello.payload);
-            if (mobile) {
-                WAProto_1.proto.CertChain.NoiseCertificate.decode(certDecoded);
-            }
-            else {
-                const { intermediate: certIntermediate } = WAProto_1.proto.CertChain.decode(certDecoded);
-                const { issuerSerial } = WAProto_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
-                if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
-                    throw new boom_1.Boom('certification match failed', { statusCode: 400 });
-                }
-            }
-            const keyEnc = encrypt(noiseKey.public);
-            mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral));
-            return keyEnc;
-        },
-        encodeFrame: (data) => {
-            if (isFinished) {
-                data = encrypt(data);
-            }
-            let header;
-            if (routingInfo) {
-                header = Buffer.alloc(7);
-                header.write('ED', 0, 'utf8');
-                header.writeUint8(0, 2);
-                header.writeUint8(1, 3);
-                header.writeUint8(routingInfo.byteLength >> 16, 4);
-                header.writeUint16BE(routingInfo.byteLength & 65535, 5);
-                header = Buffer.concat([header, routingInfo, NOISE_HEADER]);
-            }
-            else {
-                header = Buffer.from(NOISE_HEADER);
-            }
-            const introSize = sentIntro ? 0 : header.length;
-            const frame = Buffer.alloc(introSize + 3 + data.byteLength);
-            if (!sentIntro) {
-                frame.set(header);
-                sentIntro = true;
-            }
-            frame.writeUInt8(data.byteLength >> 16, introSize);
-            frame.writeUInt16BE(65535 & data.byteLength, introSize + 1);
-            frame.set(data, introSize + 3);
-            return frame;
-        },
-        decodeFrame: (newData, onFrame) => {
-            var _a;
-            // the binary protocol uses its own framing mechanism
-            // on top of the WS frames
-            // so we get this data and separate out the frames
-            const getBytesSize = () => {
-                if (inBytes.length >= 3) {
-                    return (inBytes.readUInt8() << 16) | inBytes.readUInt16BE(1);
-                }
-            };
-            inBytes = Buffer.concat([inBytes, newData]);
-            logger.trace(`recv ${newData.length} bytes, total recv ${inBytes.length} bytes`);
-            let size = getBytesSize();
-            while (size && inBytes.length >= size + 3) {
-                let frame = inBytes.slice(3, size + 3);
-                inBytes = inBytes.slice(size + 3);
-                if (isFinished) {
-                    const result = decrypt(frame);
-                    frame = (0, WABinary_1.decodeBinaryNode)(result);
-                }
-                logger.trace({ msg: (_a = frame === null || frame === void 0 ? void 0 : frame.attrs) === null || _a === void 0 ? void 0 : _a.id }, 'recv frame');
-                onFrame(frame);
-                size = getBytesSize();
-            }
-        }
-    };
+        logger.trace({ msg: frame?.attrs?.id }, "recv frame");
+        onFrame(frame);
+        size = getBytesSize();
+      }
+    }
+  };
 };
-exports.makeNoiseHandler = makeNoiseHandler;
+//=======================================================//

package/lib/Utils/pre-key-manager.js

@@ -0,0 +1,85 @@
+//=======================================================//
+import PQueue from "p-queue";
+//=======================================================//
+export class PreKeyManager {
+  constructor(store, logger) {
+    this.store = store;
+    this.logger = logger;
+    this.queues = new Map();
+  }
+  getQueue(keyType) {
+    if (!this.queues.has(keyType)) {
+      this.queues.set(keyType, new PQueue({ concurrency: 1 }));
+    }
+    return this.queues.get(keyType);
+  }
+  async processOperations(data, keyType, transactionCache, mutations, isInTransaction) {
+    const keyData = data[keyType];
+    if (!keyData)
+      return;
+    return this.getQueue(keyType).add(async () => {
+      transactionCache[keyType] = transactionCache[keyType] || {};
+      mutations[keyType] = mutations[keyType] || {};
+      const deletions = [];
+      const updates = {};
+      for (const keyId in keyData) {
+        if (keyData[keyId] === null) {
+          deletions.push(keyId);
+        }
+        else {
+          updates[keyId] = keyData[keyId];
+        }
+      }
+      if (Object.keys(updates).length > 0) {
+        Object.assign(transactionCache[keyType], updates);
+        Object.assign(mutations[keyType], updates);
+      }
+      if (deletions.length > 0) {
+        await this.processDeletions(keyType, deletions, transactionCache, mutations, isInTransaction);
+      }
+    });
+  }
+  async processDeletions(keyType, ids, transactionCache, mutations, isInTransaction) {
+    if (isInTransaction) {
+      for (const keyId of ids) {
+        if (transactionCache[keyType]?.[keyId]) {
+          transactionCache[keyType][keyId] = null;
+          mutations[keyType][keyId] = null;
+        }
+        else {
+          this.logger.warn(`Skipping deletion of non-existent ${keyType} in transaction: ${keyId}`);
+        }
+      }
+    }
+    else {
+      const existingKeys = await this.store.get(keyType, ids);
+      for (const keyId of ids) {
+        if (existingKeys[keyId]) {
+          transactionCache[keyType][keyId] = null;
+          mutations[keyType][keyId] = null;
+        }
+        else {
+          this.logger.warn(`Skipping deletion of non-existent ${keyType}: ${keyId}`);
+        }
+      }
+    }
+  }
+  async validateDeletions(data, keyType) {
+    const keyData = data[keyType];
+    if (!keyData)
+      return;
+    return this.getQueue(keyType).add(async () => {
+      const deletionIds = Object.keys(keyData).filter(id => keyData[id] === null);
+      if (deletionIds.length === 0)
+        return;
+      const existingKeys = await this.store.get(keyType, deletionIds);
+      for (const keyId of deletionIds) {
+        if (!existingKeys[keyId]) {
+          this.logger.warn(`Skipping deletion of non-existent ${keyType}: ${keyId}`);
+          delete data[keyType][keyId];
+        }
+      }
+    });
+  }
+}
+//=======================================================//