@neelegirl/baileys 1.5.6 → 1.5.7

package/lib/Utils/use-multi-file-auth-state.js

@@ -1,23 +1,34 @@
-import { Mutex } from 'async-mutex';
-import { mkdir, readFile, stat, unlink, writeFile } from 'fs/promises';
-import { join } from 'path';
-import { proto } from '../../WAProto/index.js';
-import { initAuthCreds } from './auth-utils.js';
-import { BufferJSON } from './generics.js';
+"use strict"
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod }
+}
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const async_mutex_1 = __importDefault(require("async-mutex"))
+const promises_1 = require("fs/promises")
+const path_1 = require("path")
+const WAProto_1 = require("../../WAProto")
+const auth_utils_1 = require("./auth-utils")
+const generics_1 = require("./generics")
 // We need to lock files due to the fact that we are using async functions to read and write files
 // https://github.com/WhiskeySockets/Baileys/issues/794
 // https://github.com/nodejs/node/issues/26338
 // Use a Map to store mutexes for each file path
-const fileLocks = new Map();
+const fileLocks = new Map()
+
 // Get or create a mutex for a specific file path
 const getFileLock = (path) => {
-    let mutex = fileLocks.get(path);
-    if (!mutex) {
-        mutex = new Mutex();
-        fileLocks.set(path, mutex);
-    }
-    return mutex;
-};
+	let mutex = fileLocks.get(path)
+	if (!mutex) {
+		mutex = new async_mutex_1.Mutex() 
+		fileLocks.set(path, mutex)
+	}
+
+	return mutex
+}
+
 /**
  * stores the full authentication state in a single folder.
  * Far more efficient than singlefileauthstate
@@ -25,97 +36,203 @@ const getFileLock = (path) => {
  * Again, I wouldn't endorse this for any production level use other than perhaps a bot.
  * Would recommend writing an auth state for use with a proper SQL or No-SQL DB
  * */
-export const useMultiFileAuthState = async (folder) => {
+const useMultiFileAuthState = async (folder) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const writeData = async (data, file) => {
-        const filePath = join(folder, fixFileName(file));
-        const mutex = getFileLock(filePath);
+        const filePath = path_1.join(folder, fixFileName(file))
+        const mutex = getFileLock(filePath)
         return mutex.acquire().then(async (release) => {
             try {
-                await writeFile(filePath, JSON.stringify(data, BufferJSON.replacer));
-            }
-            finally {
-                release();
+               await promises_1.writeFile(filePath, JSON.stringify(data, generics_1.BufferJSON.replacer))
+            } finally {
+                release()
             }
-        });
-    };
+        })
+    }
     const readData = async (file) => {
         try {
-            const filePath = join(folder, fixFileName(file));
-            const mutex = getFileLock(filePath);
-            return await mutex.acquire().then(async (release) => {
+            const filePath = path_1.join(folder, fixFileName(file))
+            const mutex = getFileLock(filePath)
+            const data = await mutex.acquire().then(async (release) => {
                 try {
-                    const data = await readFile(filePath, { encoding: 'utf-8' });
-                    return JSON.parse(data, BufferJSON.reviver);
-                }
-                finally {
-                    release();
+                    return await promises_1.readFile(filePath, { encoding: 'utf-8' })
+                } finally {
+                    release()
                 }
-            });
+            })
+
+            return JSON.parse(data, generics_1.BufferJSON.reviver)
+        } catch (error) {
+            return null
         }
-        catch (error) {
-            return null;
-        }
-    };
+    }
     const removeData = async (file) => {
         try {
-            const filePath = join(folder, fixFileName(file));
-            const mutex = getFileLock(filePath);
-            return mutex.acquire().then(async (release) => {
-                try {
-                    await unlink(filePath);
+            const filePath = path_1.join(folder, fixFileName(file))
+            const mutex = getFileLock(filePath)
+            await mutex.acquire().then(async (release) => {
+               try {
+                    await promises_1.unlink(filePath)
+                } finally {
+                    release()
                 }
-                catch {
+            })
+        } catch {}
+    }
+    const folderInfo = await promises_1.stat(folder).catch(() => { })
+    if (folderInfo) {
+        if (!folderInfo.isDirectory()) {
+            throw new Error(`found something that is not a directory at ${folder}, either delete it or specify a different location`)
+        }
+    }
+    else {
+        await promises_1.mkdir(folder, { recursive: true })
+    }
+    const fixFileName = (file) => { 
+        return file?.replace(/\//g, '__')?.replace(/:/g, '-') 
+    }
+    const creds = await readData('creds.json') || auth_utils_1.initAuthCreds()
+    return {
+        state: {
+            creds,
+            keys: {
+                get: async (type, ids) => {
+                    const data = {}
+                    await Promise.all(ids.map(async (id) => {
+                        let value = await readData(`${type}-${id}.json`)
+                        if (type === 'app-state-sync-key' && value) {
+                            value = WAProto_1.proto.Message.AppStateSyncKeyData.fromObject(value)
+                        }
+                        data[id] = value
+                    }))
+                    return data
+                },
+                set: async (data) => {
+                    const tasks = []
+                    for (const category in data) {
+                        for (const id in data[category]) {
+                            const value = data[category][id]
+                            const file = `${category}-${id}.json`
+                            tasks.push(value ? writeData(value, file) : removeData(file))
+                        }
+                    }
+                    await Promise.all(tasks)
                 }
-                finally {
-                    release();
+            }
+        },
+        saveCreds: async () => {
+            return writeData(creds, 'creds.json')
+        }
+    }
+}
+
+/**
+ * stores the full authentication state in a single folder.
+ * Far more efficient than singlefileauthstate
+ *
+ * Again, I wouldn't endorse this for any production level use other than perhaps a bot.
+ * Would recommend writing an auth state for use with a proper SQL or No-SQL DB
+ * */
+const useMultiFileAuthStateV2 = async (folder) => {
+    const fixFileName = (file) => {
+        return file?.replace(/\//g, '__')?.replace(/:/g, '-')
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const writeData = async (data, file) => {
+        const filePath = path_1.join(folder, fixFileName(file))
+        const mutex = getFileLock(filePath)
+        return mutex.acquire().then(async (release) => {
+            try {
+                await promises_1.writeFile(
+                    filePath,
+                    JSON.stringify(data, generics_1.BufferJSON.replacer, 2) // <-- lesbar formatiert
+                )
+            } finally {
+                release()
+            }
+        })
+    }
+
+    const readData = async (file) => {
+        try {
+            const filePath = path_1.join(folder, fixFileName(file))
+            const mutex = getFileLock(filePath)
+            const data = await mutex.acquire().then(async (release) => {
+                try {
+                    return await promises_1.readFile(filePath, { encoding: 'utf-8' })
+                } finally {
+                    release()
                 }
-            });
+            })
+
+            return JSON.parse(data, generics_1.BufferJSON.reviver)
+        } catch (error) {
+            return null
         }
-        catch { }
-    };
-    const folderInfo = await stat(folder).catch(() => { });
+    }
+
+    const removeData = async (file) => {
+        try {
+            const filePath = path_1.join(folder, fixFileName(file))
+            const mutex = getFileLock(filePath)
+            await mutex.acquire().then(async (release) => {
+                try {
+                    await promises_1.unlink(filePath)
+                } finally {
+                    release()
+                }
+            })
+        } catch {}
+    }
+
+    const folderInfo = await promises_1.stat(folder).catch(() => {})
     if (folderInfo) {
         if (!folderInfo.isDirectory()) {
-            throw new Error(`found something that is not a directory at ${folder}, either delete it or specify a different location`);
+            throw new Error(`found something that is not a directory at ${folder}, either delete it or specify a different location`)
         }
+    } else {
+        await promises_1.mkdir(folder, { recursive: true })
     }
-    else {
-        await mkdir(folder, { recursive: true });
-    }
-    const fixFileName = (file) => file?.replace(/\//g, '__')?.replace(/:/g, '-');
-    const creds = (await readData('creds.json')) || initAuthCreds();
+
+    const creds = await readData('creds.json') || auth_utils_1.initAuthCreds()
+
     return {
         state: {
             creds,
             keys: {
                 get: async (type, ids) => {
-                    const data = {};
+                    const data = {}
                     await Promise.all(ids.map(async (id) => {
-                        let value = await readData(`${type}-${id}.json`);
+                        let value = await readData(`${type}-${id}.json`)
                         if (type === 'app-state-sync-key' && value) {
-                            value = proto.Message.AppStateSyncKeyData.fromObject(value);
+                            value = WAProto_1.proto.Message.AppStateSyncKeyData.fromObject(value)
                         }
-                        data[id] = value;
-                    }));
-                    return data;
+                        data[id] = value
+                    }))
+                    return data
                 },
                 set: async (data) => {
-                    const tasks = [];
+                    const tasks = []
                     for (const category in data) {
                         for (const id in data[category]) {
-                            const value = data[category][id];
-                            const file = `${category}-${id}.json`;
-                            tasks.push(value ? writeData(value, file) : removeData(file));
+                            const value = data[category][id]
+                            const file = `${category}-${id}.json`
+                            tasks.push(value ? writeData(value, file) : removeData(file))
                         }
                     }
-                    await Promise.all(tasks);
+                    await Promise.all(tasks)
                 }
             }
         },
         saveCreds: async () => {
-            return writeData(creds, 'creds.json');
+            return writeData(creds, 'creds.json')
         }
-    };
-};
-//# sourceMappingURL=use-multi-file-auth-state.js.map
+    }
+}
+
+
+module.exports = {
+  useMultiFileAuthState,
+  useMultiFileAuthStateV2
+}

package/lib/Utils/use-single-file-auth-state.d.ts

@@ -0,0 +1,13 @@
+import { ILogger } from './logger'
+import type { AuthenticationState } from '../Types'
+
+/**
+ * @deprecated use multi file auth state instead please
+ * stores the full authentication state in a single JSON file
+ *
+ * DO NOT USE IN A PROD ENVIRONMENT, only meant to serve as an example
+ * */
+export declare const useSingleFileAuthState: (filename: string, logger?: ILogger) => {
+    state: AuthenticationState
+    saveState: () => void
+}

package/lib/Utils/use-single-file-auth-state.js

@@ -0,0 +1,80 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const WAProto_1 = require("../../WAProto")
+const auth_utils_1 = require("./auth-utils")
+const generics_1 = require("./generics")
+
+// useless key map only there to maintain backwards compatibility
+// do not use in your own systems please
+const KEY_MAP = {
+    'pre-key': 'preKeys',
+    'session': 'sessions',
+    'sender-key': 'senderKeys',
+    'app-state-sync-key': 'appStateSyncKeys',
+    'app-state-sync-version': 'appStateVersions',
+    'sender-key-memory': 'senderKeyMemory'
+}
+
+/**
+ * @deprecated use multi file auth state instead please
+ * stores the full authentication state in a single JSON file
+ *
+ * DO NOT USE IN A PROD ENVIRONMENT, only meant to serve as an example
+ * */
+const useSingleFileAuthState = (filename, logger) => {
+    // require fs here so that in case "fs" is not available -- the app does not crash
+    const { readFileSync, writeFileSync, existsSync } = require('fs')
+    let creds
+    let keys = {}
+    // save the authentication state to a file
+    const saveState = () => {
+        logger && logger.trace('saving auth state')
+        writeFileSync(filename, 
+        // BufferJSON replacer utility saves buffers nicely
+        JSON.stringify({ creds, keys }, generics_1.BufferJSON.replacer, 2))
+    }
+    if (existsSync(filename)) {
+        const result = JSON.parse(readFileSync(filename, { encoding: 'utf-8' }), generics_1.BufferJSON.reviver)
+        creds = result.creds
+        keys = result.keys
+    }
+    else {
+        creds = auth_utils_1.initAuthCreds()
+        keys = {}
+    }
+    return {
+        state: {
+            creds,
+            keys: {
+                get: (type, ids) => {
+                    const key = KEY_MAP[type]
+                    return ids.reduce((dict, id) => {
+                        let value = keys[key]?.[id]
+                        if (value) {
+                            if (type === 'app-state-sync-key') {
+                                value = WAProto_1.proto.Message.AppStateSyncKeyData.fromObject(value)
+                            }
+                            dict[id] = value
+                        }
+                        return dict
+                    }, {})
+                },
+                set: (data) => {
+                    for (const _key in data) {
+                        const key = KEY_MAP[_key]
+                        keys[key] = keys[key] || {}
+                        Object.assign(keys[key], data[_key])
+                    }
+                    saveState()
+                }
+            }
+        },
+        saveState
+    }
+}
+
+module.exports = {
+  useSingleFileAuthState
+}

package/lib/Utils/validate-connection.d.ts

@@ -1,11 +1,13 @@
-import { proto } from '../../WAProto/index.js';
-import type { AuthenticationCreds, SignalCreds, SocketConfig } from '../Types/index.js';
-import { type BinaryNode } from '../WABinary/index.js';
-export declare const generateLoginNode: (userJid: string, config: SocketConfig) => proto.IClientPayload;
-export declare const generateRegistrationNode: ({ registrationId, signedPreKey, signedIdentityKey }: SignalCreds, config: SocketConfig) => proto.ClientPayload;
-export declare const configureSuccessfulPairing: (stanza: BinaryNode, { advSecretKey, signedIdentityKey, signalIdentities }: Pick<AuthenticationCreds, "advSecretKey" | "signedIdentityKey" | "signalIdentities">) => {
-    creds: Partial<AuthenticationCreds>;
-    reply: BinaryNode;
-};
-export declare const encodeSignedDeviceIdentity: (account: proto.IADVSignedDeviceIdentity, includeSignatureKey: boolean) => Uint8Array<ArrayBufferLike>;
-//# sourceMappingURL=validate-connection.d.ts.map
+import { proto } from '../../WAProto'
+import type { AuthenticationCreds, SignalCreds, SocketConfig } from '../Types'
+import { BinaryNode } from '../WABinary'
+
+export declare const generateLoginNode: (userJid: string, config: SocketConfig) => proto.IClientPayload
+
+export declare const generateRegistrationNode: ({ registrationId, signedPreKey, signedIdentityKey }: SignalCreds, config: SocketConfig) => proto.ClientPayload
+
+export declare const configureSuccessfulPairing: (stanza: BinaryNode, { advSecretKey, signedIdentityKey, signalIdentities }: Pick<AuthenticationCreds, 'advSecretKey' | 'signedIdentityKey' | 'signalIdentities'>) => {
+    creds: Partial<AuthenticationCreds>
+    reply: BinaryNode
+}
+export declare const encodeSignedDeviceIdentity: (account: proto.IADVSignedDeviceIdentity, includeSignatureKey: boolean) => Uint8Array