zapo-js 1.6.0 → 1.6.2

package/dist/transport/keepalive/WaKeepAlive.js

@@ -8,8 +8,13 @@ const KEEPALIVE_DEFAULT_MIN_JITTER_MS = 250;
 const KEEPALIVE_MAX_JITTER_RATIO = 0.5;
 /**
  * Periodically pings the server with a ping IQ to detect dead sockets and
- * measure clock skew. Skips when the orchestrator has other traffic in
- * flight; recovers a queued/dropped ping via the configured `getComms()`.
+ * measure clock skew. A ping is skipped while another ping is in flight, or
+ * while other queries are pending and the socket shows recent inbound
+ * activity. A socket silent past the dead-socket timeout is pinged even with
+ * queries pending: pending queries on a silent socket are evidence of a dead
+ * connection, so steady outbound traffic must not starve detection. On ping
+ * failure it rejects pending queries and resumes the socket via the
+ * configured `getComms()`.
  */
 class WaKeepAlive {
     constructor(options) {
@@ -71,14 +76,25 @@ class WaKeepAlive {
             this.schedule(generation);
             return;
         }
-        if (this.inFlight || this.nodeOrchestrator.hasPending()) {
-            this.logger.trace('keepalive skipped: in-flight or pending queries', {
-                inFlight: this.inFlight,
-                pendingQueries: this.nodeOrchestrator.hasPending()
-            });
+        if (this.inFlight) {
+            this.logger.trace('keepalive skipped: ping already in flight');
             this.schedule(generation);
             return;
         }
+        if (this.nodeOrchestrator.hasPending()) {
+            const inboundIdleMs = Date.now() - comms.getLastInboundAtMs();
+            if (inboundIdleMs < this.timeoutMs) {
+                this.logger.trace('keepalive skipped: pending queries with recent inbound', {
+                    inboundIdleMs
+                });
+                this.schedule(generation);
+                return;
+            }
+            this.logger.debug('keepalive pinging despite pending queries: inbound is silent', {
+                inboundIdleMs,
+                timeoutMs: this.timeoutMs
+            });
+        }
         this.inFlight = true;
         const startedAt = Date.now();
         try {
@@ -111,6 +127,7 @@ class WaKeepAlive {
             this.logger.warn('keepalive ping failed, reconnecting socket', {
                 message: (0, primitives_1.toError)(error).message
             });
+            this.nodeOrchestrator.clearPending(new Error('socket resume requested by keepalive ping failure'));
             try {
                 await comms.closeSocketAndResume();
             }

package/dist/transport/node/builders/privacy.d.ts

@@ -4,4 +4,29 @@ export declare function buildGetPrivacySettingsIq(): BinaryNode;
 export declare function buildSetPrivacyCategoryIq(category: WaPrivacyCategory, value: WaPrivacyValue): BinaryNode;
 export declare function buildGetPrivacyDisallowedListIq(category: WaPrivacyCategory): BinaryNode;
 export declare function buildGetBlocklistIq(): BinaryNode;
-export declare function buildBlocklistChangeIq(jid: string, action: 'block' | 'unblock'): BinaryNode;
+/**
+ * Blocklist target in both addressing forms. At least one side is always
+ * present: LID-migrated accounts carry `lidJid` (plus `pnJid` when known),
+ * non-migrated accounts carry only `pnJid`.
+ */
+export type WaBlocklistTarget = {
+    readonly lidJid: string;
+    readonly pnJid: string | null;
+} | {
+    readonly lidJid: null;
+    readonly pnJid: string;
+};
+/**
+ * Builds the blocklist `set` IQ for a block action. LID-migrated targets are
+ * addressed by the LID jid plus an identifier attribute: `pn_jid` when the
+ * phone jid is known, else `unknown_identifier="true"`. Non-migrated targets
+ * are addressed by the phone jid alone. The server rejects a block that
+ * addresses a migrated account by phone jid or omits the identifier
+ * (`400: bad-request`).
+ */
+export declare function buildBlocklistBlockIq(target: WaBlocklistTarget): BinaryNode;
+/**
+ * Builds the blocklist `set` IQ for an unblock action. The server keys
+ * migrated entries by LID, so `jid` must be the LID jid when one exists.
+ */
+export declare function buildBlocklistUnblockIq(jid: string): BinaryNode;

package/dist/transport/node/builders/privacy.js

@@ -4,7 +4,8 @@ exports.buildGetPrivacySettingsIq = buildGetPrivacySettingsIq;
 exports.buildSetPrivacyCategoryIq = buildSetPrivacyCategoryIq;
 exports.buildGetPrivacyDisallowedListIq = buildGetPrivacyDisallowedListIq;
 exports.buildGetBlocklistIq = buildGetBlocklistIq;
-exports.buildBlocklistChangeIq = buildBlocklistChangeIq;
+exports.buildBlocklistBlockIq = buildBlocklistBlockIq;
+exports.buildBlocklistUnblockIq = buildBlocklistUnblockIq;
 const defaults_1 = require("../../../protocol/defaults");
 const nodes_1 = require("../../../protocol/nodes");
 const privacy_1 = require("../../../protocol/privacy");
@@ -45,11 +46,41 @@ function buildGetPrivacyDisallowedListIq(category) {
 function buildGetBlocklistIq() {
     return (0, query_1.buildIqNode)(nodes_1.WA_IQ_TYPES.GET, defaults_1.WA_DEFAULTS.HOST_DOMAIN, nodes_1.WA_XMLNS.BLOCKLIST);
 }
-function buildBlocklistChangeIq(jid, action) {
+/**
+ * Builds the blocklist `set` IQ for a block action. LID-migrated targets are
+ * addressed by the LID jid plus an identifier attribute: `pn_jid` when the
+ * phone jid is known, else `unknown_identifier="true"`. Non-migrated targets
+ * are addressed by the phone jid alone. The server rejects a block that
+ * addresses a migrated account by phone jid or omits the identifier
+ * (`400: bad-request`).
+ */
+function buildBlocklistBlockIq(target) {
+    let attrs;
+    if (target.lidJid !== null) {
+        attrs =
+            target.pnJid !== null
+                ? { action: 'block', jid: target.lidJid, pn_jid: target.pnJid }
+                : { action: 'block', jid: target.lidJid, unknown_identifier: 'true' };
+    }
+    else {
+        attrs = { action: 'block', jid: target.pnJid };
+    }
     return (0, query_1.buildIqNode)(nodes_1.WA_IQ_TYPES.SET, defaults_1.WA_DEFAULTS.HOST_DOMAIN, nodes_1.WA_XMLNS.BLOCKLIST, [
         {
             tag: 'item',
-            attrs: { jid, action }
+            attrs
+        }
+    ]);
+}
+/**
+ * Builds the blocklist `set` IQ for an unblock action. The server keys
+ * migrated entries by LID, so `jid` must be the LID jid when one exists.
+ */
+function buildBlocklistUnblockIq(jid) {
+    return (0, query_1.buildIqNode)(nodes_1.WA_IQ_TYPES.SET, defaults_1.WA_DEFAULTS.HOST_DOMAIN, nodes_1.WA_XMLNS.BLOCKLIST, [
+        {
+            tag: 'item',
+            attrs: { jid, action: 'unblock' }
         }
     ]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "zapo-js",
-    "version": "1.6.0",
+    "version": "1.6.2",
     "description": "High-performance WhatsApp Web TypeScript library",
     "license": "MIT",
     "author": "vinikjkkj <contact@vinicius.email> (https://github.com/vinikjkkj)",