gifted-baileys 1.5.4 → 1.5.6

package/src/Store/index.ts

@@ -0,0 +1,3 @@
+import makeCacheManagerAuthState from './make-cache-manager-store'
+import makeInMemoryStore from './make-in-memory-store'
+export { makeInMemoryStore, makeCacheManagerAuthState }

package/{lib → src}/Store/make-cache-manager-store.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,19 +16,19 @@ const cache_manager_1 = require("cache-manager");
 const WAProto_1 = require("../../WAProto");
 const Utils_1 = require("../Utils");
 const logger_1 = __importDefault(require("../Utils/logger"));
-const makeCacheManagerAuthState = async (store, sessionKey) => {
+const makeCacheManagerAuthState = (store, sessionKey) => __awaiter(void 0, void 0, void 0, function* () {
     const defaultKey = (file) => `${sessionKey}:${file}`;
-    const databaseConn = await (0, cache_manager_1.caching)(store);
-    const writeData = async (file, data) => {
+    const databaseConn = yield (0, cache_manager_1.caching)(store);
+    const writeData = (file, data) => __awaiter(void 0, void 0, void 0, function* () {
         let ttl = undefined;
         if (file === 'creds') {
             ttl = 63115200; // 2 years
         }
-        await databaseConn.set(defaultKey(file), JSON.stringify(data, Utils_1.BufferJSON.replacer), ttl);
-    };
-    const readData = async (file) => {
+        yield databaseConn.set(defaultKey(file), JSON.stringify(data, Utils_1.BufferJSON.replacer), ttl);
+    });
+    const readData = (file) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            const data = await databaseConn.get(defaultKey(file));
+            const data = yield databaseConn.get(defaultKey(file));
             if (data) {
                 return JSON.parse(data, Utils_1.BufferJSON.reviver);
             }
@@ -29,42 +38,42 @@ const makeCacheManagerAuthState = async (store, sessionKey) => {
             logger_1.default.error(error);
             return null;
         }
-    };
-    const removeData = async (file) => {
+    });
+    const removeData = (file) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            return await databaseConn.del(defaultKey(file));
+            return yield databaseConn.del(defaultKey(file));
         }
         catch (_a) {
             logger_1.default.error(`Error removing ${file} from session ${sessionKey}`);
         }
-    };
-    const clearState = async () => {
+    });
+    const clearState = () => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            const result = await databaseConn.store.keys(`${sessionKey}*`);
-            await Promise.all(result.map(async (key) => await databaseConn.del(key)));
+            const result = yield databaseConn.store.keys(`${sessionKey}*`);
+            yield Promise.all(result.map((key) => __awaiter(void 0, void 0, void 0, function* () { return yield databaseConn.del(key); })));
         }
         catch (err) {
         }
-    };
-    const creds = (await readData('creds')) || (0, Utils_1.initAuthCreds)();
+    });
+    const creds = (yield readData('creds')) || (0, Utils_1.initAuthCreds)();
     return {
         clearState,
         saveCreds: () => writeData('creds', creds),
         state: {
             creds,
             keys: {
-                get: async (type, ids) => {
+                get: (type, ids) => __awaiter(void 0, void 0, void 0, function* () {
                     const data = {};
-                    await Promise.all(ids.map(async (id) => {
-                        let value = await readData(`${type}-${id}`);
+                    yield Promise.all(ids.map((id) => __awaiter(void 0, void 0, void 0, function* () {
+                        let value = yield readData(`${type}-${id}`);
                         if (type === 'app-state-sync-key' && value) {
                             value = WAProto_1.proto.Message.AppStateSyncKeyData.fromObject(value);
                         }
                         data[id] = value;
-                    }));
+                    })));
                     return data;
-                },
-                set: async (data) => {
+                }),
+                set: (data) => __awaiter(void 0, void 0, void 0, function* () {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     const tasks = [];
                     for (const category in data) {
@@ -74,10 +83,10 @@ const makeCacheManagerAuthState = async (store, sessionKey) => {
                             tasks.push(value ? writeData(key, value) : removeData(key));
                         }
                     }
-                    await Promise.all(tasks);
-                },
+                    yield Promise.all(tasks);
+                }),
             }
         }
     };
-};
+});
 exports.default = makeCacheManagerAuthState;

package/src/Store/make-cache-manager-store.ts

@@ -0,0 +1,100 @@
+import { caching, Storage } from 'cache-manager'
+import { proto } from '../../WAProto'
+import { AuthenticationCreds } from '../Types'
+import { BufferJSON, initAuthCreds } from '../Utils'
+import logger from '../Utils/logger'
+
+const makeCacheManagerAuthState = async(store: Storage, sessionKey: string) => {
+	const defaultKey = (file: string): string => `${sessionKey}:${file}`
+
+	const databaseConn = await caching(store)
+
+	const writeData = async(file: string, data: object) => {
+		let ttl: number | undefined = undefined
+		if(file === 'creds') {
+			ttl = 63115200 // 2 years
+		}
+
+		await databaseConn.set(
+			defaultKey(file),
+			JSON.stringify(data, BufferJSON.replacer),
+			ttl
+		)
+	}
+
+	const readData = async(file: string): Promise<AuthenticationCreds | null> => {
+		try {
+			const data = await databaseConn.get(defaultKey(file))
+
+			if(data) {
+				return JSON.parse(data as string, BufferJSON.reviver)
+			}
+
+			return null
+		} catch(error) {
+			logger.error(error)
+			return null
+		}
+	}
+
+	const removeData = async(file: string) => {
+		try {
+			return await databaseConn.del(defaultKey(file))
+		} catch{
+			logger.error(`Error removing ${file} from session ${sessionKey}`)
+		}
+	}
+
+	const clearState = async() => {
+		try {
+			const result = await databaseConn.store.keys(`${sessionKey}*`)
+			await Promise.all(
+				result.map(async(key) => await databaseConn.del(key))
+			)
+		} catch(err) {
+		}
+	}
+
+	const creds: AuthenticationCreds = (await readData('creds')) || initAuthCreds()
+
+	return {
+		clearState,
+		saveCreds: () => writeData('creds', creds),
+		state: {
+			creds,
+			keys: {
+				get: async(type: string, ids: string[]) => {
+					const data = {}
+					await Promise.all(
+						ids.map(async(id) => {
+							let value: proto.Message.AppStateSyncKeyData | AuthenticationCreds | null =
+                                await readData(`${type}-${id}`)
+							if(type === 'app-state-sync-key' && value) {
+								value = proto.Message.AppStateSyncKeyData.fromObject(value)
+							}
+
+							data[id] = value
+						})
+					)
+
+					return data
+				},
+				set: async(data) => {
+					// eslint-disable-next-line @typescript-eslint/no-explicit-any
+					const tasks: Promise<any>[] = []
+					for(const category in data) {
+						for(const id in data[category]) {
+							const value = data[category][id]
+							const key = `${category}-${id}`
+							tasks.push(value ? writeData(key, value) : removeData(key))
+						}
+					}
+
+					await Promise.all(tasks)
+				},
+			}
+		}
+	}
+}
+
+export default makeCacheManagerAuthState

package/{lib → src}/Store/make-in-memory-store.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -56,14 +65,6 @@ exports.default = (config) => {
             labels.upsertById(label.id, label);
         }
     };
-    const getValidContacts = () => {
-        for (const contact of Object.keys(contacts)) {
-            if (contact.indexOf('@') < 0) {
-                delete contacts[contact];
-            }
-        }
-        return Object.keys(contacts);
-    };
     /**
      * binds to a BaileysEventEmitter.
      * It listens to all events and constructs a state that you can query accurate data from.
@@ -74,11 +75,7 @@ exports.default = (config) => {
         ev.on('connection.update', update => {
             Object.assign(state, update);
         });
-        ev.on('messaging-history.set', ({ chats: newChats, contacts: newContacts, messages: newMessages, isLatest, syncType }) => {
-            if (syncType === WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND) {
-                return; // FOR NOW,
-                //TODO: HANDLE
-            }
+        ev.on('messaging-history.set', ({ chats: newChats, contacts: newContacts, messages: newMessages, isLatest }) => {
             if (isLatest) {
                 chats.clear();
                 for (const id in messages) {
@@ -104,7 +101,7 @@ exports.default = (config) => {
         ev.on('contacts.upsert', contacts => {
             contactsUpsert(contacts);
         });
-        ev.on('contacts.update', async (updates) => {
+        ev.on('contacts.update', (updates) => __awaiter(void 0, void 0, void 0, function* () {
             var _a;
             for (const update of updates) {
                 let contact;
@@ -112,27 +109,26 @@ exports.default = (config) => {
                     contact = contacts[update.id];
                 }
                 else {
-                    const validContacts = getValidContacts();
-                    const contactHashes = validContacts.map((contactId) => {
+                    const contactHashes = yield Promise.all(Object.keys(contacts).map((contactId) => __awaiter(void 0, void 0, void 0, function* () {
                         const { user } = (0, WABinary_1.jidDecode)(contactId);
-                        return [contactId, ((0, Utils_1.md5)(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)];
-                    });
+                        return [contactId, (yield (0, Utils_1.md5)(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)];
+                    })));
                     contact = contacts[((_a = contactHashes.find(([, b]) => b === update.id)) === null || _a === void 0 ? void 0 : _a[0]) || '']; // find contact by attrs.hash, when user is not saved as a contact
                 }
                 if (contact) {
                     if (update.imgUrl === 'changed') {
-                        contact.imgUrl = socket ? await (socket === null || socket === void 0 ? void 0 : socket.profilePictureUrl(contact.id)) : undefined;
+                        contact.imgUrl = socket ? yield (socket === null || socket === void 0 ? void 0 : socket.profilePictureUrl(contact.id)) : undefined;
                     }
                     else if (update.imgUrl === 'removed') {
                         delete contact.imgUrl;
                     }
-                    Object.assign(contacts[contact.id], contact);
                 }
                 else {
-                    logger.debug({ update }, 'got update for non-existant contact');
+                    return logger.debug({ update }, 'got update for non-existant contact');
                 }
+                Object.assign(contacts[contact.id], contact);
             }
-        });
+        }));
         ev.on('chats.upsert', newChats => {
             chats.upsert(...newChats);
         });
@@ -140,7 +136,7 @@ exports.default = (config) => {
             for (let update of updates) {
                 const result = chats.update(update.id, chat => {
                     if (update.unreadCount > 0) {
-                        update = { ...update };
+                        update = Object.assign({}, update);
                         update.unreadCount = (chat.unreadCount || 0) + update.unreadCount;
                     }
                     Object.assign(chat, update);
@@ -319,7 +315,7 @@ exports.default = (config) => {
         labelAssociations,
         bind,
         /** loads messages from the store, if not found -- uses the legacy connection */
-        loadMessages: async (jid, count, cursor) => {
+        loadMessages: (jid, count, cursor) => __awaiter(void 0, void 0, void 0, function* () {
             const list = assertMessageList(jid);
             const mode = !cursor || 'before' in cursor ? 'before' : 'after';
             const cursorKey = !!cursor ? ('before' in cursor ? cursor.before : cursor.after) : undefined;
@@ -342,7 +338,7 @@ exports.default = (config) => {
                 messages = [];
             }
             return messages;
-        },
+        }),
         /**
          * Get all available labels for profile
          *
@@ -371,31 +367,31 @@ exports.default = (config) => {
                 .all();
             return associations.map(({ labelId }) => labelId);
         },
-        loadMessage: async (jid, id) => { var _a; return (_a = messages[jid]) === null || _a === void 0 ? void 0 : _a.get(id); },
-        mostRecentMessage: async (jid) => {
+        loadMessage: (jid, id) => __awaiter(void 0, void 0, void 0, function* () { var _a; return (_a = messages[jid]) === null || _a === void 0 ? void 0 : _a.get(id); }),
+        mostRecentMessage: (jid) => __awaiter(void 0, void 0, void 0, function* () {
             var _a;
             const message = (_a = messages[jid]) === null || _a === void 0 ? void 0 : _a.array.slice(-1)[0];
             return message;
-        },
-        fetchImageUrl: async (jid, sock) => {
+        }),
+        fetchImageUrl: (jid, sock) => __awaiter(void 0, void 0, void 0, function* () {
             const contact = contacts[jid];
             if (!contact) {
                 return sock === null || sock === void 0 ? void 0 : sock.profilePictureUrl(jid);
             }
             if (typeof contact.imgUrl === 'undefined') {
-                contact.imgUrl = await (sock === null || sock === void 0 ? void 0 : sock.profilePictureUrl(jid));
+                contact.imgUrl = yield (sock === null || sock === void 0 ? void 0 : sock.profilePictureUrl(jid));
             }
             return contact.imgUrl;
-        },
-        fetchGroupMetadata: async (jid, sock) => {
+        }),
+        fetchGroupMetadata: (jid, sock) => __awaiter(void 0, void 0, void 0, function* () {
             if (!groupMetadata[jid]) {
-                const metadata = await (sock === null || sock === void 0 ? void 0 : sock.groupMetadata(jid));
+                const metadata = yield (sock === null || sock === void 0 ? void 0 : sock.groupMetadata(jid));
                 if (metadata) {
                     groupMetadata[jid] = metadata;
                 }
             }
             return groupMetadata[jid];
-        },
+        }),
         // fetchBroadcastListInfo: async(jid: string, sock: WASocket | undefined) => {
         // 	if(!groupMetadata[jid]) {
         // 		const metadata = await sock?.getBroadcastListInfo(jid)
@@ -405,11 +401,11 @@ exports.default = (config) => {
         // 	}
         // 	return groupMetadata[jid]
         // },
-        fetchMessageReceipts: async ({ remoteJid, id }) => {
+        fetchMessageReceipts: (_a) => __awaiter(void 0, [_a], void 0, function* ({ remoteJid, id }) {
             const list = messages[remoteJid];
             const msg = list === null || list === void 0 ? void 0 : list.get(id);
             return msg === null || msg === void 0 ? void 0 : msg.userReceipt;
-        },
+        }),
         toJSON,
         fromJSON,
         writeToFile: (path) => {