@fhynella/baileys 2.0.5 → 2.1.7

package/lib/Defaults/connection.js

@@ -0,0 +1,51 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const { Browsers } = require("../Utils") 
+const { default: logger } = require("../Utils/logger")
+const { makeLibSignalRepository } = require("../Signal/libsignal")
+const { version } = require("./baileys-version.json")
+
+const DEFAULT_CONNECTION_CONFIG = {
+    version, 
+    browser: Browsers.windows('Chrome'),
+    waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
+    connectTimeoutMs: 20000,
+    keepAliveIntervalMs: 30000,
+    logger: logger.child({ class: 'baileys' }),
+    printQRInTerminal: false,
+    emitOwnEvents: true,
+    defaultQueryTimeoutMs: 60000,
+    customUploadHosts: [],
+    retryRequestDelayMs: 250,
+    maxMsgRetryCount: 5,
+    fireInitQueries: true,
+    auth: undefined,
+    markOnlineOnConnect: true,
+    syncFullHistory: false,
+    patchMessageBeforeSending: msg => msg,
+    shouldSyncHistoryMessage: () => true,
+    shouldIgnoreJid: () => false,
+    linkPreviewImageThumbnailWidth: 192,
+    transactionOpts: { 
+    	maxCommitRetries: 10, 
+    	delayBetweenTriesMs: 3000 
+    },
+    generateHighQualityLinkPreview: false,
+    enableAutoSessionRecreation: true, 
+    enableRecentMessageCache: true, 
+    options: {},
+    appStateMacVerification: {
+        patch: false,
+        snapshot: false,
+    },
+    countryCode: 'EN',
+    getMessage: async () => undefined,
+    cachedGroupMetadata: async () => undefined,
+    makeSignalRepository: makeLibSignalRepository
+}
+
+module.exports = {
+  DEFAULT_CONNECTION_CONFIG
+}

package/lib/Defaults/constants.js

@@ -0,0 +1,62 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const UNAUTHORIZED_CODES = [401, 403, 419]
+
+const PHONENUMBER_MCC = require("./phonenumber-mcc.json")
+
+const DEFAULT_ORIGIN = 'https://web.whatsapp.com'
+
+const PHONE_CONNECTION_CB = 'CB:Pong'
+
+const WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60
+
+const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0'
+
+const DICT_VERSION = 3
+
+const KEY_BUNDLE_TYPE = Buffer.from([5])
+
+const NOISE_WA_HEADER = Buffer.from([87, 65, 6, DICT_VERSION]) // last is "DICT_VERSION"
+
+/** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
+const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g
+
+const MIN_PREKEY_COUNT = 5
+
+const INITIAL_PREKEY_COUNT = 30
+
+const UPLOAD_TIMEOUT = 30000 // 30 seconds
+
+const MIN_UPLOAD_INTERVAL = 5000 // seconds minimum between uploads
+
+const WA_CERT_DETAILS = {
+    SERIAL: 0
+}
+
+const DEFAULT_CACHE_TTLS = {
+    SIGNAL_STORE: 5 * 60,
+    MSG_RETRY: 60 * 60,
+    CALL_OFFER: 5 * 60,
+    USER_DEVICES: 5 * 60, // 5 minutes
+}
+
+module.exports = {
+  UNAUTHORIZED_CODES, 
+  PHONENUMBER_MCC, 
+  DEFAULT_ORIGIN, 
+  PHONE_CONNECTION_CB, 
+  WA_DEFAULT_EPHEMERAL, 
+  NOISE_MODE, 
+  DICT_VERSION, 
+  KEY_BUNDLE_TYPE, 
+  NOISE_WA_HEADER, 
+  URL_REGEX, 
+  MIN_PREKEY_COUNT, 
+  MIN_UPLOAD_INTERVAL, 
+  INITIAL_PREKEY_COUNT, 
+  UPLOAD_TIMEOUT, 
+  WA_CERT_DETAILS, 
+  DEFAULT_CACHE_TTLS
+}

package/lib/Defaults/history.js

@@ -0,0 +1,17 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const { proto } = require("../../WAProto")
+
+const PROCESSABLE_HISTORY_TYPES = [
+    proto.Message.HistorySyncType.INITIAL_BOOTSTRAP,
+    proto.Message.HistorySyncType.PUSH_NAME,
+    proto.Message.HistorySyncType.RECENT,
+    proto.Message.HistorySyncType.FULL,
+    proto.Message.HistorySyncType.ON_DEMAND
+]
+
+module.exports = {
+  PROCESSABLE_HISTORY_TYPES
+}

package/lib/Defaults/index.js

@@ -1,147 +1,41 @@
 "use strict"
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+const __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k
+
+    let desc = Object.getOwnPropertyDescriptor(m, k)
+
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = {
+          enumerable: true, 
+          get: function() { 
+              return m[k] 
+          }
+       }
+    }
+
+    Object.defineProperty(o, k2, desc) 
+
+    }) : (function(o, m, k, k2) {
+        if (k2 === undefined) k2 = k
+        o[k2] = m[k]
+    }
+))
+
+const __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) {
+        if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) {
+            __createBinding(exports, m, p)
+       }
+   }
 }
 
-Object.defineProperty(exports, "__esModule", { value: true })
+Object.defineProperty(exports, "__esModule", { 
+    value: true 
+})
 
-exports.DEFAULT_CACHE_TTLS = exports.UPLOAD_TIMEOUT = exports.MIN_UPLOAD_INTERVAL = exports.INITIAL_PREKEY_COUNT = exports.MIN_PREKEY_COUNT = exports.MEDIA_KEYS = exports.MEDIA_HKDF_KEY_MAPPING = exports.MEDIA_PATH_MAP = exports.DEFAULT_CONNECTION_CONFIG = exports.PROCESSABLE_HISTORY_TYPES = exports.WA_CERT_DETAILS = exports.URL_REGEX = exports.NOISE_WA_HEADER = exports.KEY_BUNDLE_TYPE = exports.DICT_VERSION = exports.NOISE_MODE = exports.WA_DEFAULT_EPHEMERAL = exports.PHONE_CONNECTION_CB = exports.DEF_TAG_PREFIX = exports.DEF_CALLBACK_PREFIX = exports.CALL_AUDIO_PREFIX = exports.CALL_VIDEO_PREFIX = exports.DEFAULT_ORIGIN = exports.UNAUTHORIZED_CODES = null
-
-const WAProto_1 = require("../../WAProto");
-const libsignal_1 = require("../Signal/libsignal");
-const Utils_1 = require("../Utils");
-const logger_1 = __importDefault(require("../Utils/logger"));
-const baileys_version_json_1 = require("./baileys-version.json");
-const phonenumber_mcc_json_1 = __importDefault(require("./phonenumber-mcc.json"))
-
-exports.UNAUTHORIZED_CODES = [401, 403, 419]
-
-exports.PHONENUMBER_MCC = phonenumber_mcc_json_1.default
-
-exports.DEFAULT_ORIGIN = 'https://web.whatsapp.com'
-
-exports.CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/' 
-
-exports.CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/'
-
-exports.DEF_CALLBACK_PREFIX = 'CB:'
-
-exports.DEF_TAG_PREFIX = 'TAG:'
-
-exports.PHONE_CONNECTION_CB = 'CB:Pong'
-
-exports.WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60
-
-exports.NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0'
-
-exports.DICT_VERSION = 3
-
-exports.KEY_BUNDLE_TYPE = Buffer.from([5])
-
-exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]) // last is "DICT_VERSION"
-
-/** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
-exports.URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g
-
-exports.WA_CERT_DETAILS = {
-    SERIAL: 0,
-}
-
-exports.PROCESSABLE_HISTORY_TYPES = [
-    WAProto_1.proto.Message.HistorySyncType.INITIAL_BOOTSTRAP,
-    WAProto_1.proto.Message.HistorySyncType.PUSH_NAME,
-    WAProto_1.proto.Message.HistorySyncType.RECENT,
-    WAProto_1.proto.Message.HistorySyncType.FULL,
-    WAProto_1.proto.Message.HistorySyncType.ON_DEMAND
-]
-
-exports.DEFAULT_CONNECTION_CONFIG = {
-    version: baileys_version_json_1.version,
-    browser: Utils_1.Browsers.windows('Chrome'),
-    waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
-    connectTimeoutMs: 20000,
-    keepAliveIntervalMs: 30000,
-    logger: logger_1.default.child({ class: 'baileys' }),
-    printQRInTerminal: false,
-    emitOwnEvents: true,
-    defaultQueryTimeoutMs: 60000,
-    customUploadHosts: [],
-    retryRequestDelayMs: 250,
-    maxMsgRetryCount: 5,
-    fireInitQueries: true,
-    auth: undefined,
-    markOnlineOnConnect: true,
-    syncFullHistory: false,
-    patchMessageBeforeSending: msg => msg,
-    shouldSyncHistoryMessage: () => true,
-    shouldIgnoreJid: () => false,
-    linkPreviewImageThumbnailWidth: 192,
-    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
-    generateHighQualityLinkPreview: false,
-    enableAutoSessionRecreation: true, 
-    enableRecentMessageCache: true, 
-    options: {},
-    appStateMacVerification: {
-        patch: false,
-        snapshot: false,
-    },
-    countryCode: 'EN',
-    getMessage: async () => undefined,
-    cachedGroupMetadata: async () => undefined,
-    makeSignalRepository: libsignal_1.makeLibSignalRepository
-}
-
-exports.MEDIA_PATH_MAP = {
-    image: '/mms/image',
-    video: '/mms/video',
-    document: '/mms/document',
-    audio: '/mms/audio',
-    sticker: '/mms/image',
-    'sticker-pack': '/mms/sticker', 
-    'thumbnail-link': '/mms/image',
-    'product-catalog-image': '/product/image',
-    'md-app-state': '',
-    'md-msg-hist': '/mms/md-app-state',
-    'biz-cover-photo': '/pps/biz-cover-photo'
-}
-
-exports.MEDIA_HKDF_KEY_MAPPING = {
-    'audio': 'Audio',
-    'document': 'Document',
-    'gif': 'Video',
-    'image': 'Image',
-    'ppic': '',
-    'product': 'Image',
-    'ptt': 'Audio',
-    'video': 'Video', 
-    'sticker': 'Image',
-    'sticker-pack': 'Sticker Pack', 
-    'thumbnail-document': 'Document Thumbnail',
-    'thumbnail-image': 'Image Thumbnail',
-    'thumbnail-video': 'Video Thumbnail',
-    'thumbnail-link': 'Link Thumbnail',
-    'md-msg-hist': 'History',
-    'md-app-state': 'App State',
-    'product-catalog-image': '',
-    'payment-bg-image': 'Payment Background',
-    'ptv': 'Video', 
-    'biz-cover-photo': 'Image'
-}
-
-exports.MEDIA_KEYS = Object.keys(exports.MEDIA_PATH_MAP)
-
-exports.MIN_PREKEY_COUNT = 5
-
-exports.INITIAL_PREKEY_COUNT = 30
-
-exports.UPLOAD_TIMEOUT = 30000 // 30 seconds
-
-exports.MIN_UPLOAD_INTERVAL = 5000 // seconds minimum between uploads
-
-exports.DEFAULT_CACHE_TTLS = {
-    SIGNAL_STORE: 5 * 60,
-    MSG_RETRY: 60 * 60,
-    CALL_OFFER: 5 * 60,
-    USER_DEVICES: 5 * 60, // 5 minutes
-}
+__exportStar(require("./connection"), exports)
+__exportStar(require("./constants"), exports)
+__exportStar(require("./history"), exports)
+__exportStar(require("./media"), exports)
+__exportStar(require("./prefix"), exports) 

package/lib/Defaults/media.js

@@ -0,0 +1,48 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const MEDIA_PATH_MAP = {
+    image: '/mms/image',
+    video: '/mms/video',
+    document: '/mms/document',
+    audio: '/mms/audio',
+    sticker: '/mms/image',
+    'sticker-pack': '/mms/sticker', 
+    'thumbnail-link': '/mms/image',
+    'product-catalog-image': '/product/image',
+    'md-app-state': '',
+    'md-msg-hist': '/mms/md-app-state',
+    'biz-cover-photo': '/pps/biz-cover-photo'
+}
+
+const MEDIA_HKDF_KEY_MAPPING = {
+    'audio': 'Audio',
+    'document': 'Document',
+    'gif': 'Video',
+    'image': 'Image',
+    'ppic': '',
+    'product': 'Image',
+    'ptt': 'Audio',
+    'video': 'Video', 
+    'sticker': 'Image',
+    'sticker-pack': 'Sticker Pack', 
+    'thumbnail-document': 'Document Thumbnail',
+    'thumbnail-image': 'Image Thumbnail',
+    'thumbnail-video': 'Video Thumbnail',
+    'thumbnail-link': 'Link Thumbnail',
+    'md-msg-hist': 'History',
+    'md-app-state': 'App State',
+    'product-catalog-image': '',
+    'payment-bg-image': 'Payment Background',
+    'ptv': 'Video', 
+    'biz-cover-photo': 'Image'
+}
+
+const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP)
+
+module.exports = {
+  MEDIA_KEYS, 
+  MEDIA_PATH_MAP, 
+  MEDIA_HKDF_KEY_MAPPING
+}

package/lib/Defaults/prefix.js

@@ -0,0 +1,18 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const DEF_TAG_PREFIX = 'TAG:'
+
+const DEF_CALLBACK_PREFIX = 'CB:'
+
+const CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/' 
+
+const CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/'
+
+module.exports = {
+  DEF_TAG_PREFIX, 
+  DEF_CALLBACK_PREFIX, 
+  CALL_VIDEO_PREFIX, 
+  CALL_AUDIO_PREFIX
+}

package/lib/Signal/Group/group-session-builder.js

@@ -1,45 +1,13 @@
 "use strict"
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k
-    var desc = Object.getOwnPropertyDescriptor(m, k)
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k] } }
-    }
-    Object.defineProperty(o, k2, desc)
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k
-    o[k2] = m[k]
-}))
-
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v })
-}) : function(o, v) {
-    o["default"] = v
-})
-
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = []
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k
-            return ar
-        }
-        return ownKeys(o)
-    }
-    return function (mod) {
-        if (mod && mod.__esModule) return mod
-        var result = {}
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i])
-        __setModuleDefault(result, mod)
-        return result
-    }
-})()
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const keyhelper = __importStar(require("./keyhelper"))
-const sender_key_distribution_message_1 = require("./sender-key-distribution-message")
+const {
+  generateSenderKey, 
+  generateSenderKeyId, 
+  generateSenderSigningKey
+} = require("./keyhelper")
+const { SenderKeyDistributionMessage } = require("./sender-key-distribution-message")
 
 class GroupSessionBuilder {
     constructor(senderKeyStore) {
@@ -53,9 +21,9 @@ class GroupSessionBuilder {
     async create(senderKeyName) {
         const senderKeyRecord = await this.senderKeyStore.loadSenderKey(senderKeyName)
         if (senderKeyRecord.isEmpty()) {
-            const keyId = keyhelper.generateSenderKeyId()
-            const senderKey = keyhelper.generateSenderKey()
-            const signingKey = keyhelper.generateSenderSigningKey()
+            const keyId = generateSenderKeyId()
+            const senderKey = generateSenderKey()
+            const signingKey = generateSenderSigningKey()
             senderKeyRecord.setSenderKeyState(keyId, 0, senderKey, signingKey)
             await this.senderKeyStore.storeSenderKey(senderKeyName, senderKeyRecord)
         }
@@ -63,7 +31,7 @@ class GroupSessionBuilder {
         if (!state) {
             throw new Error('No session state available')
         }
-        return new sender_key_distribution_message_1.SenderKeyDistributionMessage(state.getKeyId(), state.getSenderChainKey().getIteration(), state.getSenderChainKey().getSeed(), state.getSigningKeyPublic())
+        return new SenderKeyDistributionMessage(state.getKeyId(), state.getSenderChainKey().getIteration(), state.getSenderChainKey().getSeed(), state.getSigningKeyPublic())
     }
 }
 

package/lib/Signal/Group/group_cipher.js

@@ -2,8 +2,11 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const crypto_1 = require("@itsukichan/libsignal-node/src/crypto")
-const sender_key_message_1 = require("./sender-key-message")
+const {
+  decrypt, 
+  encrypt
+} = require("@itsukichan/libsignal-node/src/crypto")
+const { SenderKeyMessage } = require("./sender-key-message")
 
 class GroupCipher {
     constructor(senderKeyStore, senderKeyName) {
@@ -26,7 +29,7 @@ class GroupCipher {
         const iteration = senderKeyState.getSenderChainKey().getIteration()
         const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1)
         const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext)
-        const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate())
+        const senderKeyMessage = new SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate())
         
         await this.senderKeyStore.storeSenderKey(this.senderKeyName, record)
         
@@ -39,7 +42,7 @@ class GroupCipher {
             throw new Error('No SenderKeyRecord found for decryption')
         }
         
-        const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(null, null, null, null, senderKeyMessageBytes)
+        const senderKeyMessage = new SenderKeyMessage(null, null, null, null, senderKeyMessageBytes)
         const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId())
         
         if (!senderKeyState) {
@@ -87,7 +90,7 @@ class GroupCipher {
     }
     async getPlainText(iv, key, ciphertext) {
         try {
-            return crypto_1.decrypt(key, ciphertext, iv)
+            return decrypt(key, ciphertext, iv)
         }
         catch (e) {
             throw new Error('InvalidMessageException')
@@ -98,7 +101,7 @@ class GroupCipher {
             const ivBuffer = typeof iv === 'string' ? Buffer.from(iv, 'base64') : iv
             const keyBuffer = typeof key === 'string' ? Buffer.from(key, 'base64') : key
             const plaintextBuffer = typeof plaintext === 'string' ? Buffer.from(plaintext) : plaintext
-            return crypto_1.encrypt(keyBuffer, plaintextBuffer, ivBuffer)
+            return encrypt(keyBuffer, plaintextBuffer, ivBuffer)
         }
         catch (e) {
             throw new Error('InvalidMessageException')

package/lib/Signal/Group/index.js

@@ -1,61 +1,47 @@
 "use strict"
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+const __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k
-    var desc = Object.getOwnPropertyDescriptor(m, k)
+
+    let desc = Object.getOwnPropertyDescriptor(m, k)
+
     if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k] } }
+      desc = {
+          enumerable: true, 
+          get: function() { 
+              return m[k] 
+          }
+       }
     }
-    Object.defineProperty(o, k2, desc)
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k
-    o[k2] = m[k]
-}))
 
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v })
-}) : function(o, v) {
-    o["default"] = v
-})
+    Object.defineProperty(o, k2, desc) 
 
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = []
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k
-            return ar
-        }
-        return ownKeys(o)
-    }
-    return function (mod) {
-        if (mod && mod.__esModule) return mod
-        var result = {}
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i])
-        __setModuleDefault(result, mod)
-        return result
+    }) : (function(o, m, k, k2) {
+        if (k2 === undefined) k2 = k
+        o[k2] = m[k]
     }
-})()
-
-Object.defineProperty(exports, "__esModule", { value: true })
-exports.keyhelper = exports.CiphertextMessage = exports.SenderChainKey = exports.SenderMessageKey = exports.SenderKeyMessage = exports.SenderKeyState = exports.GroupCipher = exports.SenderKeyName = exports.SenderKeyRecord = exports.SenderKeyDistributionMessage = exports.GroupSessionBuilder = void 0
-var group_session_builder_1 = require("./group-session-builder")
-Object.defineProperty(exports, "GroupSessionBuilder", { enumerable: true, get: function () { return group_session_builder_1.GroupSessionBuilder } })
-var sender_key_distribution_message_1 = require("./sender-key-distribution-message")
-Object.defineProperty(exports, "SenderKeyDistributionMessage", { enumerable: true, get: function () { return sender_key_distribution_message_1.SenderKeyDistributionMessage } })
-var sender_key_record_1 = require("./sender-key-record")
-Object.defineProperty(exports, "SenderKeyRecord", { enumerable: true, get: function () { return sender_key_record_1.SenderKeyRecord } })
-var sender_key_name_1 = require("./sender-key-name")
-Object.defineProperty(exports, "SenderKeyName", { enumerable: true, get: function () { return sender_key_name_1.SenderKeyName } })
-var group_cipher_1 = require("./group_cipher")
-Object.defineProperty(exports, "GroupCipher", { enumerable: true, get: function () { return group_cipher_1.GroupCipher } })
-var sender_key_state_1 = require("./sender-key-state")
-Object.defineProperty(exports, "SenderKeyState", { enumerable: true, get: function () { return sender_key_state_1.SenderKeyState } })
-var sender_key_message_1 = require("./sender-key-message")
-Object.defineProperty(exports, "SenderKeyMessage", { enumerable: true, get: function () { return sender_key_message_1.SenderKeyMessage } })
-var sender_message_key_1 = require("./sender-message-key")
-Object.defineProperty(exports, "SenderMessageKey", { enumerable: true, get: function () { return sender_message_key_1.SenderMessageKey } })
-var sender_chain_key_1 = require("./sender-chain-key")
-Object.defineProperty(exports, "SenderChainKey", { enumerable: true, get: function () { return sender_chain_key_1.SenderChainKey } })
-var ciphertext_message_1 = require("./ciphertext-message")
-Object.defineProperty(exports, "CiphertextMessage", { enumerable: true, get: function () { return ciphertext_message_1.CiphertextMessage } })
-exports.keyhelper = __importStar(require("./keyhelper"))
+))
+
+const __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) {
+        if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) {
+            __createBinding(exports, m, p)
+       }
+   }
+}
+
+Object.defineProperty(exports, "__esModule", { 
+    value: true 
+})
+
+__exportStar(require("./ciphertext-message"), exports)
+__exportStar(require("./group-session-builder"), exports)
+__exportStar(require("./group_cipher"), exports)
+__exportStar(require("./keyhelper"), exports)
+__exportStar(require("./sender-chain-key"), exports) 
+__exportStar(require("./sender-key-distribution-message"), exports)
+__exportStar(require("./sender-key-message"), exports)
+__exportStar(require("./sender-key-name"), exports)
+__exportStar(require("./sender-key-record"), exports)
+__exportStar(require("./sender-key-state"), exports)
+__exportStar(require("./sender-message-key"), exports)

package/lib/Signal/Group/keyhelper.js

@@ -1,57 +1,24 @@
 "use strict"
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k
-    var desc = Object.getOwnPropertyDescriptor(m, k)
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k] } }
-    }
-    Object.defineProperty(o, k2, desc)
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k
-    o[k2] = m[k]
-}))
-
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v })
-}) : function(o, v) {
-    o["default"] = v
-})
-
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = []
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k
-            return ar
-        }
-        return ownKeys(o)
-    }
-    return function (mod) {
-        if (mod && mod.__esModule) return mod
-        var result = {}
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i])
-        __setModuleDefault(result, mod)
-        return result
-    }
-})()
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const nodeCrypto = __importStar(require("crypto"))
-const curve_1 = require("@itsukichan/libsignal-node/src/curve")
+const { 
+  randomInt, 
+  randomBytes 
+} = require("crypto")
+const { generateKeyPair } = require("@itsukichan/libsignal-node/src/curve")
 
 function generateSenderKey() {
-    return nodeCrypto.randomBytes(32)
+    return randomBytes(32)
 }
 
 function generateSenderKeyId() {
-    return nodeCrypto.randomInt(2147483647)
+    return randomInt(2147483647)
 }
 
 function generateSenderSigningKey(key) {
     if (!key) {
-        key = curve_1.generateKeyPair()
+        key = generateKeyPair()
     }
     return {
         public: Buffer.from(key.pubKey),