zapo-js 0.1.0 → 0.1.2

package/README.md

@@ -1,4 +1,4 @@
-# zapo
+<h1 align="center">zapo</h1>
 
 <p align="center">
   <strong>High-performance TypeScript implementation of the WhatsApp Web protocol.</strong><br />
@@ -6,10 +6,9 @@
 </p>
 
 <p align="center">
-  <a href="https://www.npmjs.com/package/zapo-js">
-    <img alt="npm version" src="https://img.shields.io/npm/v/zapo-js?color=CB3837" />
-  </a>
-  <img alt="npm package size" src="https://img.shields.io/npm/unpacked-size/zapo-js?label=package%20size&color=2F855A" />
+  <a href="https://www.npmjs.com/package/zapo-js"><img alt="npm version" src="https://img.shields.io/npm/v/zapo-js?color=CB3837" /></a>
+  <a href="https://www.npmjs.com/package/zapo-js"><img alt="npm package size" src="https://img.shields.io/npm/unpacked-size/zapo-js?label=package%20size&color=2F855A" /></a>
+  <a href="https://github.com/sponsors/vinikjkkj"><img alt="sponsor" src="https://img.shields.io/badge/sponsor-vinikjkkj-EA4AAA?logo=githubsponsors&logoColor=white" /></a>
   <img alt="node version" src="https://img.shields.io/badge/node-%3E%3D20.9.0-339933" />
   <img alt="language" src="https://img.shields.io/badge/language-TypeScript-3178C6" />
   <img alt="focus" src="https://img.shields.io/badge/focus-high--scale%20%2B%20multi--session-0A7EA4" />
@@ -28,6 +27,7 @@
 - [Versioning and Releases](#versioning-and-releases)
 - [GitHub Release Notes](#github-release-notes)
 - [Protobuf Generation](#protobuf-generation)
+- [Support the Project](#support-the-project)
 - [Contribution Notes](#contribution-notes)
 - [Disclaimer](#disclaimer)
 
@@ -82,7 +82,7 @@ These principles drive implementation decisions:
 
 Runtime dependencies:
 
-- Mandatory: `protobufjs`
+- Mandatory: none
 
 Optional peer dependencies:
 
@@ -218,6 +218,12 @@ If the tag contains `-` (example: `v0.2.0-rc.1`), the release is marked as prere
 - Generates and minifies `proto/index.js`
 - Regenerates compact typings at `proto/index.d.ts`
 
+## Support the Project
+
+If `zapo` is useful in your production or study setup, you can support ongoing development on GitHub Sponsors:
+
+- https://github.com/sponsors/vinikjkkj
+
 ## Contribution Notes
 
 Before opening a PR:
@@ -232,4 +238,3 @@ Before opening a PR:
 
 This project is an independent implementation for engineering and interoperability research.
 It is not affiliated with or endorsed by WhatsApp.
-

package/dist/appstate/WaAppStateCrypto.js

@@ -2,27 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WaAppStateCrypto = void 0;
 const constants_1 = require("./constants");
-const utils_1 = require("./utils");
 const hkdf_1 = require("../crypto/core/hkdf");
 const primitives_1 = require("../crypto/core/primitives");
 const random_1 = require("../crypto/core/random");
 const _proto_1 = require("../proto.js");
 const constants_2 = require("../protocol/constants");
-const base64_1 = require("../util/base64");
 const bytes_1 = require("../util/bytes");
+const bytes_2 = require("../util/bytes");
 const collections_1 = require("../util/collections");
+const primitives_2 = require("../util/primitives");
 const DEFAULT_DERIVED_KEYS_CACHE_MAX_SIZE = 256;
 class WaAppStateCrypto {
     constructor(derivedKeysCacheMaxSize = DEFAULT_DERIVED_KEYS_CACHE_MAX_SIZE) {
         this.derivedKeysCache = new Map();
-        this.derivedKeysCacheMaxSize =
-            this.normalizeDerivedKeysCacheMaxSize(derivedKeysCacheMaxSize);
+        this.derivedKeysCacheMaxSize = (0, primitives_2.normalizeNonNegativeInteger)(derivedKeysCacheMaxSize, DEFAULT_DERIVED_KEYS_CACHE_MAX_SIZE);
     }
     clearCache() {
         this.derivedKeysCache.clear();
     }
     async deriveKeys(keyData) {
-        const cacheKey = (0, base64_1.bytesToBase64)(keyData);
+        const cacheKey = (0, bytes_1.bytesToBase64)(keyData);
         const cached = this.derivedKeysCache.get(cacheKey);
         if (cached) {
             this.touchDerivedKeysCacheEntry(cacheKey, cached);
@@ -45,11 +44,11 @@ class WaAppStateCrypto {
     }
     async encryptMutation(args) {
         const derivedKeys = await this.deriveKeys(args.keyData);
-        const indexBytes = bytes_1.TEXT_ENCODER.encode(args.index);
+        const indexBytes = bytes_2.TEXT_ENCODER.encode(args.index);
         const encoded = _proto_1.proto.SyncActionData.encode({
             index: indexBytes,
             value: args.value ?? undefined,
-            padding: bytes_1.EMPTY_BYTES,
+            padding: bytes_2.EMPTY_BYTES,
             version: args.version
         }).finish();
         const iv = args.iv ?? (await (0, random_1.randomBytesAsync)(constants_1.APP_STATE_IV_LENGTH));
@@ -59,7 +58,7 @@ class WaAppStateCrypto {
         const indexMacPromise = this.generateIndexMac(derivedKeys.indexKey, indexBytes);
         const encryptionKey = await (0, primitives_1.importAesCbcKey)(derivedKeys.valueEncryptionKey);
         const cipherText = await (0, primitives_1.aesCbcEncrypt)(encryptionKey, iv, encoded);
-        const cipherWithIv = (0, bytes_1.concatBytes)([iv, cipherText]);
+        const cipherWithIv = (0, bytes_2.concatBytes)([iv, cipherText]);
         const associatedData = this.generateAssociatedData(args.operation, args.keyId);
         const [valueMac, indexMac] = await Promise.all([
             this.generateValueMac(derivedKeys.valueMacKey, associatedData, cipherWithIv),
@@ -67,7 +66,7 @@ class WaAppStateCrypto {
         ]);
         return {
             indexMac,
-            valueBlob: (0, bytes_1.concatBytes)([cipherWithIv, valueMac]),
+            valueBlob: (0, bytes_2.concatBytes)([cipherWithIv, valueMac]),
             valueMac
         };
     }
@@ -82,7 +81,7 @@ class WaAppStateCrypto {
         const cipherWithIv = args.valueBlob.subarray(0, args.valueBlob.byteLength - constants_1.APP_STATE_VALUE_MAC_LENGTH);
         const associatedData = this.generateAssociatedData(args.operation, args.keyId);
         const expectedMac = await this.generateValueMac(derivedKeys.valueMacKey, associatedData, cipherWithIv);
-        if (!(0, bytes_1.uint8Equal)(mac, expectedMac)) {
+        if (!(0, bytes_2.uint8Equal)(mac, expectedMac)) {
             throw new Error('mutation value MAC mismatch');
         }
         const decryptionKey = await (0, primitives_1.importAesCbcKey)(derivedKeys.valueEncryptionKey);
@@ -95,11 +94,11 @@ class WaAppStateCrypto {
             throw new Error('missing sync action version');
         }
         const generatedIndexMac = await this.generateIndexMac(derivedKeys.indexKey, syncActionData.index);
-        if (!(0, bytes_1.uint8Equal)(generatedIndexMac, args.indexMac)) {
+        if (!(0, bytes_2.uint8Equal)(generatedIndexMac, args.indexMac)) {
             throw new Error('mutation index MAC mismatch');
         }
         return {
-            index: bytes_1.TEXT_DECODER.decode(syncActionData.index),
+            index: bytes_2.TEXT_DECODER.decode(syncActionData.index),
             value: syncActionData.value ?? null,
             version: syncActionData.version,
             indexMac: args.indexMac,
@@ -108,21 +107,21 @@ class WaAppStateCrypto {
     }
     async generateSnapshotMac(keyData, ltHash, version, collectionName) {
         const derivedKeys = await this.deriveKeys(keyData);
-        const payload = (0, bytes_1.concatBytes)([
+        const payload = (0, bytes_2.concatBytes)([
             ltHash,
-            (0, utils_1.toNetworkOrder64)(version),
-            bytes_1.TEXT_ENCODER.encode(collectionName)
+            (0, bytes_2.intToBytes)(8, version),
+            bytes_2.TEXT_ENCODER.encode(collectionName)
         ]);
         const key = await (0, primitives_1.importHmacKey)(derivedKeys.snapshotMacKey);
         return (0, primitives_1.hmacSign)(key, payload);
     }
     async generatePatchMac(keyData, snapshotMac, valueMacs, version, collectionName) {
         const derivedKeys = await this.deriveKeys(keyData);
-        const payload = (0, bytes_1.concatBytes)([
+        const payload = (0, bytes_2.concatBytes)([
             snapshotMac,
             ...valueMacs,
-            (0, utils_1.toNetworkOrder64)(version),
-            bytes_1.TEXT_ENCODER.encode(collectionName)
+            (0, bytes_2.intToBytes)(8, version),
+            bytes_2.TEXT_ENCODER.encode(collectionName)
         ]);
         const key = await (0, primitives_1.importHmacKey)(derivedKeys.patchMacKey);
         return (0, primitives_1.hmacSign)(key, payload);
@@ -183,15 +182,9 @@ class WaAppStateCrypto {
         const octetLength = new Uint8Array(constants_1.APP_STATE_MAC_OCTET_LENGTH);
         octetLength[octetLength.length - 1] = associatedData.byteLength & 0xff;
         const key = await (0, primitives_1.importHmacSha512Key)(valueMacKey);
-        const full = await (0, primitives_1.hmacSign)(key, (0, bytes_1.concatBytes)([associatedData, cipherWithIv, octetLength]));
+        const full = await (0, primitives_1.hmacSign)(key, (0, bytes_2.concatBytes)([associatedData, cipherWithIv, octetLength]));
         return full.slice(0, constants_1.APP_STATE_VALUE_MAC_LENGTH);
     }
-    normalizeDerivedKeysCacheMaxSize(value) {
-        if (!Number.isFinite(value)) {
-            return DEFAULT_DERIVED_KEYS_CACHE_MAX_SIZE;
-        }
-        return Math.max(0, Math.trunc(value));
-    }
     touchDerivedKeysCacheEntry(cacheKey, keys) {
         if (this.derivedKeysCacheMaxSize <= 0) {
             return;