@neelegirl/baileys 1.5.2 → 1.5.3

package/lib/Signal/WASignalGroup/sender_key_name.js

@@ -1,70 +1,70 @@
-function isNull(str) {
-  return str === null || str.value === '';
-}
-
-/**
- * java String hashCode 的实现
- * @param strKey
- * @return intValue
- */
-function intValue(num) {
-  const MAX_VALUE = 0x7fffffff;
-  const MIN_VALUE = -0x80000000;
-  if (num > MAX_VALUE || num < MIN_VALUE) {
-    // eslint-disable-next-line
-    return (num &= 0xffffffff);
-  }
-  return num;
-}
-
-function hashCode(strKey) {
-  let hash = 0;
-  if (!isNull(strKey)) {
-    for (let i = 0; i < strKey.length; i++) {
-      hash = hash * 31 + strKey.charCodeAt(i);
-      hash = intValue(hash);
-    }
-  }
-  return hash;
-}
-
-/**
- * 将js页面的number类型转换为java的int类型
- * @param num
- * @return intValue
- */
-
-class SenderKeyName {
-  constructor(groupId, sender) {
-    this.groupId = groupId;
-    this.sender = sender;
-  }
-
-  getGroupId() {
-    return this.groupId;
-  }
-
-  getSender() {
-    return this.sender;
-  }
-
-  serialize() {
-    return `${this.groupId}::${this.sender.id}::${this.sender.deviceId}`;
-  }
-
-  toString() {
-    return this.serialize();
-  }
-
-  equals(other) {
-    if (other === null) return false;
-    if (!(other instanceof SenderKeyName)) return false;
-    return this.groupId === other.groupId && this.sender.toString() === other.sender.toString();
-  }
-
-  hashCode() {
-    return hashCode(this.groupId) ^ hashCode(this.sender.toString());
-  }
-}
-
+function isNull(str) {
+  return str === null || str.value === '';
+}
+
+/**
+ * java String hashCode 的实现
+ * @param strKey
+ * @return intValue
+ */
+function intValue(num) {
+  const MAX_VALUE = 0x7fffffff;
+  const MIN_VALUE = -0x80000000;
+  if (num > MAX_VALUE || num < MIN_VALUE) {
+    // eslint-disable-next-line
+    return (num &= 0xffffffff);
+  }
+  return num;
+}
+
+function hashCode(strKey) {
+  let hash = 0;
+  if (!isNull(strKey)) {
+    for (let i = 0; i < strKey.length; i++) {
+      hash = hash * 31 + strKey.charCodeAt(i);
+      hash = intValue(hash);
+    }
+  }
+  return hash;
+}
+
+/**
+ * 将js页面的number类型转换为java的int类型
+ * @param num
+ * @return intValue
+ */
+
+class SenderKeyName {
+  constructor(groupId, sender) {
+    this.groupId = groupId;
+    this.sender = sender;
+  }
+
+  getGroupId() {
+    return this.groupId;
+  }
+
+  getSender() {
+    return this.sender;
+  }
+
+  serialize() {
+    return `${this.groupId}::${this.sender.id}::${this.sender.deviceId}`;
+  }
+
+  toString() {
+    return this.serialize();
+  }
+
+  equals(other) {
+    if (other === null) return false;
+    if (!(other instanceof SenderKeyName)) return false;
+    return this.groupId === other.groupId && this.sender.toString() === other.sender.toString();
+  }
+
+  hashCode() {
+    return hashCode(this.groupId) ^ hashCode(this.sender.toString());
+  }
+}
+
 module.exports = SenderKeyName;

package/lib/Signal/WASignalGroup/sender_key_record.js

@@ -1,56 +1,56 @@
-const SenderKeyState = require('./sender_key_state');
-
-class SenderKeyRecord {
-    MAX_STATES = 5;
-  
-    constructor(serialized) {
-      this.senderKeyStates = [];
-  
-      if (serialized) {
-        const list = serialized;
-        for (let i = 0; i < list.length; i++) {
-          const structure = list[i];
-          this.senderKeyStates.push(
-            new SenderKeyState(null, null, null, null, null, null, structure)
-          );
-        }
-      }
-    }
-  
-    isEmpty() {
-      return this.senderKeyStates.length === 0;
-    }
-  
-    getSenderKeyState(keyId) {
-      if (!keyId && this.senderKeyStates.length) return this.senderKeyStates[this.senderKeyStates.length - 1];
-      for (let i = 0; i < this.senderKeyStates.length; i++) {
-        const state = this.senderKeyStates[i];
-        if (state.getKeyId() === keyId) {
-          return state;
-        }
-      }
-    }
-  
-    addSenderKeyState(id, iteration, chainKey, signatureKey) {
-      this.senderKeyStates.push(new SenderKeyState(id, iteration, chainKey, null, signatureKey));
-      if (this.senderKeyStates.length > 5) {
-        this.senderKeyStates.shift()
-      }
-    }
-  
-    setSenderKeyState(id, iteration, chainKey, keyPair) {
-      this.senderKeyStates.length = 0;
-      this.senderKeyStates.push(new SenderKeyState(id, iteration, chainKey, keyPair));
-    }
-  
-    serialize() {
-      const recordStructure = [];
-      for (let i = 0; i < this.senderKeyStates.length; i++) {
-        const senderKeyState = this.senderKeyStates[i];
-        recordStructure.push(senderKeyState.getStructure());
-      }
-      return recordStructure;
-    }
-  }
-  
+const SenderKeyState = require('./sender_key_state');
+
+class SenderKeyRecord {
+    MAX_STATES = 5;
+  
+    constructor(serialized) {
+      this.senderKeyStates = [];
+  
+      if (serialized) {
+        const list = serialized;
+        for (let i = 0; i < list.length; i++) {
+          const structure = list[i];
+          this.senderKeyStates.push(
+            new SenderKeyState(null, null, null, null, null, null, structure)
+          );
+        }
+      }
+    }
+  
+    isEmpty() {
+      return this.senderKeyStates.length === 0;
+    }
+  
+    getSenderKeyState(keyId) {
+      if (!keyId && this.senderKeyStates.length) return this.senderKeyStates[this.senderKeyStates.length - 1];
+      for (let i = 0; i < this.senderKeyStates.length; i++) {
+        const state = this.senderKeyStates[i];
+        if (state.getKeyId() === keyId) {
+          return state;
+        }
+      }
+    }
+  
+    addSenderKeyState(id, iteration, chainKey, signatureKey) {
+      this.senderKeyStates.push(new SenderKeyState(id, iteration, chainKey, null, signatureKey));
+      if (this.senderKeyStates.length > 5) {
+        this.senderKeyStates.shift()
+      }
+    }
+  
+    setSenderKeyState(id, iteration, chainKey, keyPair) {
+      this.senderKeyStates.length = 0;
+      this.senderKeyStates.push(new SenderKeyState(id, iteration, chainKey, keyPair));
+    }
+  
+    serialize() {
+      const recordStructure = [];
+      for (let i = 0; i < this.senderKeyStates.length; i++) {
+        const senderKeyState = this.senderKeyStates[i];
+        recordStructure.push(senderKeyState.getStructure());
+      }
+      return recordStructure;
+    }
+  }
+  
   module.exports = SenderKeyRecord;

package/lib/Signal/WASignalGroup/sender_key_state.js

@@ -1,129 +1,129 @@
-const SenderChainKey = require('./sender_chain_key');
-const SenderMessageKey = require('./sender_message_key');
-
-const protobufs = require('./protobufs');
-
-class SenderKeyState {
-    MAX_MESSAGE_KEYS = 2000;
-
-    constructor(
-        id = null,
-        iteration = null,
-        chainKey = null,
-        signatureKeyPair = null,
-        signatureKeyPublic = null,
-        signatureKeyPrivate = null,
-        senderKeyStateStructure = null
-    ) {
-        if (senderKeyStateStructure) {
-            this.senderKeyStateStructure = senderKeyStateStructure;
-        } else {
-            if (signatureKeyPair) {
-                signatureKeyPublic = signatureKeyPair.public;
-                signatureKeyPrivate = signatureKeyPair.private;
-            }
-
-            chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey;
-            this.senderKeyStateStructure = protobufs.SenderKeyStateStructure.create();
-            const senderChainKeyStructure = protobufs.SenderChainKey.create();
-            senderChainKeyStructure.iteration = iteration;
-            senderChainKeyStructure.seed = chainKey;
-            this.senderKeyStateStructure.senderChainKey = senderChainKeyStructure;
-
-            const signingKeyStructure = protobufs.SenderSigningKey.create();
-            signingKeyStructure.public =
-                typeof signatureKeyPublic === 'string' ?
-                Buffer.from(signatureKeyPublic, 'base64') :
-                signatureKeyPublic;
-            if (signatureKeyPrivate) {
-                signingKeyStructure.private =
-                    typeof signatureKeyPrivate === 'string' ?
-                    Buffer.from(signatureKeyPrivate, 'base64') :
-                    signatureKeyPrivate;
-            }
-            this.senderKeyStateStructure.senderKeyId = id;
-            this.senderChainKey = senderChainKeyStructure;
-            this.senderKeyStateStructure.senderSigningKey = signingKeyStructure;
-        }
-        this.senderKeyStateStructure.senderMessageKeys =
-            this.senderKeyStateStructure.senderMessageKeys || [];
-    }
-
-    SenderKeyState(senderKeyStateStructure) {
-        this.senderKeyStateStructure = senderKeyStateStructure;
-    }
-
-    getKeyId() {
-        return this.senderKeyStateStructure.senderKeyId;
-    }
-
-    getSenderChainKey() {
-        return new SenderChainKey(
-            this.senderKeyStateStructure.senderChainKey.iteration,
-            this.senderKeyStateStructure.senderChainKey.seed
-        );
-    }
-
-    setSenderChainKey(chainKey) {
-        const senderChainKeyStructure = protobufs.SenderChainKey.create({
-            iteration: chainKey.getIteration(),
-            seed: chainKey.getSeed(),
-        });
-        this.senderKeyStateStructure.senderChainKey = senderChainKeyStructure;
-    }
-
-    getSigningKeyPublic() {
-        return typeof this.senderKeyStateStructure.senderSigningKey.public === 'string' ?
-            Buffer.from(this.senderKeyStateStructure.senderSigningKey.public, 'base64') :
-            this.senderKeyStateStructure.senderSigningKey.public;
-    }
-
-    getSigningKeyPrivate() {
-        return typeof this.senderKeyStateStructure.senderSigningKey.private === 'string' ?
-            Buffer.from(this.senderKeyStateStructure.senderSigningKey.private, 'base64') :
-            this.senderKeyStateStructure.senderSigningKey.private;
-    }
-
-    hasSenderMessageKey(iteration) {
-        const list = this.senderKeyStateStructure.senderMessageKeys;
-        for (let o = 0; o < list.length; o++) {
-            const senderMessageKey = list[o];
-            if (senderMessageKey.iteration === iteration) return true;
-        }
-        return false;
-    }
-
-    addSenderMessageKey(senderMessageKey) {
-        const senderMessageKeyStructure = protobufs.SenderKeyStateStructure.create({
-            iteration: senderMessageKey.getIteration(),
-            seed: senderMessageKey.getSeed(),
-        });
-        this.senderKeyStateStructure.senderMessageKeys.push(senderMessageKeyStructure);
-
-        if (this.senderKeyStateStructure.senderMessageKeys.length > this.MAX_MESSAGE_KEYS) {
-            this.senderKeyStateStructure.senderMessageKeys.shift();
-        }
-    }
-
-    removeSenderMessageKey(iteration) {
-        let result = null;
-
-        this.senderKeyStateStructure.senderMessageKeys = this.senderKeyStateStructure.senderMessageKeys.filter(
-            senderMessageKey => {
-                if (senderMessageKey.iteration === iteration) result = senderMessageKey;
-                return senderMessageKey.iteration !== iteration;
-            }
-        );
-
-        if (result != null) {
-            return new SenderMessageKey(result.iteration, result.seed);
-        }
-        return null;
-    }
-
-    getStructure() {
-        return this.senderKeyStateStructure;
-    }
-}
-
+const SenderChainKey = require('./sender_chain_key');
+const SenderMessageKey = require('./sender_message_key');
+
+const protobufs = require('./protobufs');
+
+class SenderKeyState {
+    MAX_MESSAGE_KEYS = 2000;
+
+    constructor(
+        id = null,
+        iteration = null,
+        chainKey = null,
+        signatureKeyPair = null,
+        signatureKeyPublic = null,
+        signatureKeyPrivate = null,
+        senderKeyStateStructure = null
+    ) {
+        if (senderKeyStateStructure) {
+            this.senderKeyStateStructure = senderKeyStateStructure;
+        } else {
+            if (signatureKeyPair) {
+                signatureKeyPublic = signatureKeyPair.public;
+                signatureKeyPrivate = signatureKeyPair.private;
+            }
+
+            chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey;
+            this.senderKeyStateStructure = protobufs.SenderKeyStateStructure.create();
+            const senderChainKeyStructure = protobufs.SenderChainKey.create();
+            senderChainKeyStructure.iteration = iteration;
+            senderChainKeyStructure.seed = chainKey;
+            this.senderKeyStateStructure.senderChainKey = senderChainKeyStructure;
+
+            const signingKeyStructure = protobufs.SenderSigningKey.create();
+            signingKeyStructure.public =
+                typeof signatureKeyPublic === 'string' ?
+                Buffer.from(signatureKeyPublic, 'base64') :
+                signatureKeyPublic;
+            if (signatureKeyPrivate) {
+                signingKeyStructure.private =
+                    typeof signatureKeyPrivate === 'string' ?
+                    Buffer.from(signatureKeyPrivate, 'base64') :
+                    signatureKeyPrivate;
+            }
+            this.senderKeyStateStructure.senderKeyId = id;
+            this.senderChainKey = senderChainKeyStructure;
+            this.senderKeyStateStructure.senderSigningKey = signingKeyStructure;
+        }
+        this.senderKeyStateStructure.senderMessageKeys =
+            this.senderKeyStateStructure.senderMessageKeys || [];
+    }
+
+    SenderKeyState(senderKeyStateStructure) {
+        this.senderKeyStateStructure = senderKeyStateStructure;
+    }
+
+    getKeyId() {
+        return this.senderKeyStateStructure.senderKeyId;
+    }
+
+    getSenderChainKey() {
+        return new SenderChainKey(
+            this.senderKeyStateStructure.senderChainKey.iteration,
+            this.senderKeyStateStructure.senderChainKey.seed
+        );
+    }
+
+    setSenderChainKey(chainKey) {
+        const senderChainKeyStructure = protobufs.SenderChainKey.create({
+            iteration: chainKey.getIteration(),
+            seed: chainKey.getSeed(),
+        });
+        this.senderKeyStateStructure.senderChainKey = senderChainKeyStructure;
+    }
+
+    getSigningKeyPublic() {
+        return typeof this.senderKeyStateStructure.senderSigningKey.public === 'string' ?
+            Buffer.from(this.senderKeyStateStructure.senderSigningKey.public, 'base64') :
+            this.senderKeyStateStructure.senderSigningKey.public;
+    }
+
+    getSigningKeyPrivate() {
+        return typeof this.senderKeyStateStructure.senderSigningKey.private === 'string' ?
+            Buffer.from(this.senderKeyStateStructure.senderSigningKey.private, 'base64') :
+            this.senderKeyStateStructure.senderSigningKey.private;
+    }
+
+    hasSenderMessageKey(iteration) {
+        const list = this.senderKeyStateStructure.senderMessageKeys;
+        for (let o = 0; o < list.length; o++) {
+            const senderMessageKey = list[o];
+            if (senderMessageKey.iteration === iteration) return true;
+        }
+        return false;
+    }
+
+    addSenderMessageKey(senderMessageKey) {
+        const senderMessageKeyStructure = protobufs.SenderKeyStateStructure.create({
+            iteration: senderMessageKey.getIteration(),
+            seed: senderMessageKey.getSeed(),
+        });
+        this.senderKeyStateStructure.senderMessageKeys.push(senderMessageKeyStructure);
+
+        if (this.senderKeyStateStructure.senderMessageKeys.length > this.MAX_MESSAGE_KEYS) {
+            this.senderKeyStateStructure.senderMessageKeys.shift();
+        }
+    }
+
+    removeSenderMessageKey(iteration) {
+        let result = null;
+
+        this.senderKeyStateStructure.senderMessageKeys = this.senderKeyStateStructure.senderMessageKeys.filter(
+            senderMessageKey => {
+                if (senderMessageKey.iteration === iteration) result = senderMessageKey;
+                return senderMessageKey.iteration !== iteration;
+            }
+        );
+
+        if (result != null) {
+            return new SenderMessageKey(result.iteration, result.seed);
+        }
+        return null;
+    }
+
+    getStructure() {
+        return this.senderKeyStateStructure;
+    }
+}
+
 module.exports = SenderKeyState;

package/lib/Signal/WASignalGroup/sender_message_key.js

@@ -1,39 +1,39 @@
-const { deriveSecrets } = require('@neelegirl/libsignal/src/crypto');
-class SenderMessageKey {
-    iteration = 0;
-
-    iv = Buffer.alloc(0);
-
-    cipherKey = Buffer.alloc(0);
-
-    seed = Buffer.alloc(0);
-
-    constructor(iteration, seed) {
-        const derivative = deriveSecrets(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'));
-        const keys = new Uint8Array(32);
-        keys.set(new Uint8Array(derivative[0].slice(16)));
-        keys.set(new Uint8Array(derivative[1].slice(0, 16)), 16);
-        this.iv = Buffer.from(derivative[0].slice(0, 16));
-        this.cipherKey = Buffer.from(keys.buffer);
-
-        this.iteration = iteration;
-        this.seed = seed;
-    }
-
-    getIteration() {
-        return this.iteration;
-    }
-
-    getIv() {
-        return this.iv;
-    }
-
-    getCipherKey() {
-        return this.cipherKey;
-    }
-
-    getSeed() {
-        return this.seed;
-    }
-}
+const { deriveSecrets } = require('@neelegirl/libsignal/src/crypto');
+class SenderMessageKey {
+    iteration = 0;
+
+    iv = Buffer.alloc(0);
+
+    cipherKey = Buffer.alloc(0);
+
+    seed = Buffer.alloc(0);
+
+    constructor(iteration, seed) {
+        const derivative = deriveSecrets(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'));
+        const keys = new Uint8Array(32);
+        keys.set(new Uint8Array(derivative[0].slice(16)));
+        keys.set(new Uint8Array(derivative[1].slice(0, 16)), 16);
+        this.iv = Buffer.from(derivative[0].slice(0, 16));
+        this.cipherKey = Buffer.from(keys.buffer);
+
+        this.iteration = iteration;
+        this.seed = seed;
+    }
+
+    getIteration() {
+        return this.iteration;
+    }
+
+    getIv() {
+        return this.iv;
+    }
+
+    getCipherKey() {
+        return this.cipherKey;
+    }
+
+    getSeed() {
+        return this.seed;
+    }
+}
 module.exports = SenderMessageKey;

package/lib/Signal/libsignal.d.ts

@@ -1,4 +1,8 @@
 import { SignalAuthState } from '../Types'
 import { SignalRepository } from '../Types/Signal'
 
-export declare function makeLibSignalRepository(auth: SignalAuthState): SignalRepository
+export declare function makeLibSignalRepository(auth: SignalAuthState, onWhatsAppFunc?: (...jids: string[]) => Promise<{
+    jid: string
+    exists: boolean
+    lid: string
+}[] | undefined>): SignalRepository