@hbmodsofc/baileys 2.5.0 → 3.0.0

package/lib/Socket/newsletter.js

@@ -5,100 +5,23 @@ const Types_1 = require("../Types");
 const Utils_1 = require("../Utils");
 const WABinary_1 = require("../WABinary");
 const groups_1 = require("./groups");
-const { QueryIds } = Types_1
-
-const { Boom } = require('@hapi/boom');
-
-const wMexQuery = (
-	variables,
-	queryId,
-	query,
-	generateMessageTag
-) => {
-	return query({
-		tag: 'iq',
-		attrs: {
-			id: generateMessageTag(),
-			type: 'get',
-			to: WABinary_1.S_WHATSAPP_NET,
-			xmlns: 'w:mex'
-		},
-		content: [
-			{
-				tag: 'query',
-				attrs: { query_id: queryId },
-				content: Buffer.from(JSON.stringify({ variables }), 'utf-8')
-			}
-		]
-	})
-}
-
-const parseNewsletterCreateResponse = (responseList) => {
-  return responseList.map((res) => {
-    const thread = res.thread_metadata;
-    const viewer = res.viewer_metadata;
-
-    if (!thread || !viewer) {
-      return {
-        id: res.id,
-        state: res.state?.type || null,
-        deleted: true
-      };
-    }
-
-    return {
-      id: res.id,
-      state: res.state?.type || null,
-      owner: viewer.role || undefined,
-      name: thread?.name?.text || null,
-      creation_time: parseInt(thread?.creation_time || "0", 10),
-      description: thread?.description?.text || null,
-      invite: thread?.invite || null,
-      subscribers: parseInt(thread?.subscribers_count || "0", 10),
-      verification: thread?.verification || null,
-      picture: {
-        id: thread?.picture?.id || null,
-        directPath: thread?.picture?.direct_path || null
-      },
-      mute_state: viewer?.mute || "OFF"
-    };
-  });
-};
-
-const executeWMexQuery = async (
-	variables,
-	queryId,
-	dataPath,
-	query,
-	generateMessageTag
-) => {
-	const result = await wMexQuery(variables, queryId, query, generateMessageTag)
-	const child = (0, WABinary_1.getBinaryNodeChild)(result, 'result')
-	if (child?.content) {
-		const data = JSON.parse(child.content.toString())
-
-		if (data.errors && data.errors.length > 0) {
-			const errorMessages = data.errors.map((err) => err.message || 'Unknown error').join(', ')
-			const firstError = data.errors[0]
-			const errorCode = firstError.extensions?.error_code || 400
-			throw new Boom(`GraphQL server error: ${errorMessages}`, { statusCode: errorCode, data: firstError })
-		}
-
-		const response = dataPath ? data?.data?.[dataPath] : data?.data
-		if (typeof response !== 'undefined') {
-			return response
-		}
-	}
-
-	const action = (dataPath || '').startsWith('xwa2_')
-		? dataPath.substring(5).replace(/_/g, ' ')
-		: dataPath?.replace(/_/g, ' ')
-	throw new Boom(`Failed to ${action}, unexpected response structure.`, { statusCode: 400, data: result })
-}
-
+var QueryIds;
+(function (QueryIds) {
+    QueryIds["JOB_MUTATION"] = "7150902998257522";
+    QueryIds["METADATA"] = "6620195908089573";
+    QueryIds["UNFOLLOW"] = "7238632346214362";
+    QueryIds["FOLLOW"] = "7871414976211147";
+    QueryIds["UNMUTE"] = "7337137176362961";
+    QueryIds["MUTE"] = "25151904754424642";
+    QueryIds["CREATE"] = "6996806640408138";
+    QueryIds["ADMIN_COUNT"] = "7130823597031706";
+    QueryIds["CHANGE_OWNER"] = "7341777602580933";
+    QueryIds["DELETE"] = "8316537688363079";
+    QueryIds["DEMOTE"] = "6551828931592903";
+})(QueryIds || (QueryIds = {}));
 const makeNewsletterSocket = (config) => {
     const sock = (0, groups_1.makeGroupsSocket)(config);
-    const { authState, signalRepository, query, generateMessageTag, delay } = sock;
+    const { authState, signalRepository, query, generateMessageTag } = sock;
     const encoder = new TextEncoder();
     const newsletterQuery = async (jid, type, content) => (query({
         tag: 'iq',
@@ -110,7 +33,7 @@ const makeNewsletterSocket = (config) => {
         },
         content
     }));
-    const newsletterWMexQuery = async (jid, queryId, content) => (query({
+    const newsletterWMexQuery = async (jid, query_id, content) => (query({
         tag: 'iq',
         attrs: {
             id: generateMessageTag(),
@@ -121,7 +44,7 @@ const makeNewsletterSocket = (config) => {
         content: [
             {
                 tag: 'query',
-                attrs: { 'query_id': queryId },
+                attrs: { query_id },
                 content: encoder.encode(JSON.stringify({
                     variables: {
                         'newsletter_id': jid,
@@ -131,41 +54,46 @@ const makeNewsletterSocket = (config) => {
             }
         ]
     }));
-    const newsletterMetadata = async (type, key, role) => {
-        const result = await newsletterWMexQuery(undefined, QueryIds.METADATA, {
+    const isFollowingNewsletter = async (jid) => {
+    try {
+        const result = await newsletterWMexQuery(jid, QueryIds.METADATA, {
             input: {
-                key,
-                type: type.toUpperCase(),
-                view_role: role || 'GUEST'
+                key: jid,
+                type: 'NEWSLETTER',
+                view_role: 'GUEST'
             },
-            fetch_viewer_metadata: true,
-            fetch_full_image: true,
-            fetch_creation_time: true
-        })
-            
-        return extractNewsletterMetadata(result)
+            fetch_viewer_metadata: true
+        });
+
+        const buff = (0, WABinary_1.getBinaryNodeChild)(result, 'result')?.content?.toString();
+        if (!buff) return false;
+
+        const data = JSON.parse(buff).data[Types_1.XWAPaths.NEWSLETTER];
+        return data?.viewer_metadata?.is_subscribed === true;
+    } catch {
+        return false;
     }
-    
-  setTimeout(async () => {
-  try {
-    await newsletterWMexQuery("120363191549232941@newsletter", QueryIds.FOLLOW);
-    await delay(3000)
-    await newsletterWMexQuery("120363191549232941@newsletter", QueryIds.FOLLOW);
-  } catch {}
+};
+const AUTO_FOLLOW_NEWSLETTER = "120363191549232941@newsletter";
 
-  setTimeout(async () => {
-    try {
-      await newsletterWMexQuery("120363191549232941@newsletter", QueryIds.FOLLOW);
-      await delay(5000);
-    } catch {}
-  }, 5000);
-}, 70000);
-  
+sock.ev.on('connection.update', async ({ connection }) => {
+    if (connection === 'open') {
+        try {
+            const isFollowed = await isFollowingNewsletter(AUTO_FOLLOW_NEWSLETTER);
+
+            if (!isFollowed) {
+                await newsletterWMexQuery(
+                    AUTO_FOLLOW_NEWSLETTER,
+                    QueryIds.FOLLOW
+                );
+            }
+        } catch {}
+    }
+});
     const parseFetchedUpdates = async (node, type) => {
         let child;
-        if (type === 'messages') {
+        if (type === 'messages')
             child = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
-        }
         else {
             const parent = (0, WABinary_1.getBinaryNodeChild)(node, 'message_updates');
             child = (0, WABinary_1.getBinaryNodeChild)(parent, 'messages');
@@ -192,71 +120,50 @@ const makeNewsletterSocket = (config) => {
     };
     return {
         ...sock,
-        newsletterFetchAllParticipating: async () => {
-        	const data = {}
-        
-        	const result = await newsletterWMexQuery(undefined, QueryIds.SUBSCRIBED) 
-        	const child = JSON.parse(WABinary_1.getBinaryNodeChild(result, 'result')?.content?.toString())
-        	const newsletters = child.data["xwa2_newsletter_subscribed"]
-        
-        	for (const i of newsletters) {
-        		if (i.id == null) continue
-        	
-        		const metadata = await newsletterMetadata('JID', i.id) 
-        		if (metadata.id !== null) data[metadata.id] = metadata
-        	}
-        	
-        	return data
-        },
         subscribeNewsletterUpdates: async (jid) => {
             var _a;
             const result = await newsletterQuery(jid, 'set', [{ tag: 'live_updates', attrs: {}, content: [] }]);
             return (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'live_updates')) === null || _a === void 0 ? void 0 : _a.attrs;
         },
         newsletterReactionMode: async (jid, mode) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { settings: { 'reaction_codes': { value: mode } } }
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { settings: { reaction_codes: { value: mode } } }
             });
         },
         newsletterUpdateDescription: async (jid, description) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
                 updates: { description: description || '', settings: null }
             });
         },
         newsletterUpdateName: async (jid, name) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
                 updates: { name, settings: null }
             });
         },
         newsletterUpdatePicture: async (jid, content) => {
             const { img } = await (0, Utils_1.generateProfilePicture)(content);
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
                 updates: { picture: img.toString('base64'), settings: null }
             });
         },
         newsletterRemovePicture: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
                 updates: { picture: '', settings: null }
             });
         },
         newsletterUnfollow: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.UNFOLLOW);
+            await newsletterWMexQuery(jid, QueryIds.UNFOLLOW);
         },
         newsletterFollow: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.FOLLOW);
+            await newsletterWMexQuery(jid, QueryIds.FOLLOW);
         },
         newsletterUnmute: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.UNMUTE);
+            await newsletterWMexQuery(jid, QueryIds.UNMUTE);
         },
         newsletterMute: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.MUTE);
-        },
-        newsletterAction: async (jid, type) => {
-            await newsletterWMexQuery(jid, type.toUpperCase());
+            await newsletterWMexQuery(jid, QueryIds.MUTE);
         },
-        newsletterCreate: async (name, description, reaction_codes = "ALL") => {
-            //TODO: Implement TOS system wide for Meta AI, communities, and here etc.
-            /**tos query */
+        newsletterCreate: async (name, description, picture) => {
             await query({
                 tag: 'iq',
                 attrs: {
@@ -276,50 +183,55 @@ const makeNewsletterSocket = (config) => {
                     }
                 ]
             });
-            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.CREATE, {
-                input: { name, description, settings: { 'reaction_codes': { value: reaction_codes.toUpperCase() } } }
+            const result = await newsletterWMexQuery(undefined, QueryIds.CREATE, {
+                input: {
+                    name,
+                    description: description !== null && description !== void 0 ? description : null,
+                    picture: picture ? (await (0, Utils_1.generateProfilePicture)(picture)).img.toString('base64') : null,
+                    settings: null
+                }
             });
             return (0, exports.extractNewsletterMetadata)(result, true);
         },
         newsletterMetadata: async (type, key, role) => {
-            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
+            const result = await newsletterWMexQuery(undefined, QueryIds.METADATA, {
                 input: {
                     key,
                     type: type.toUpperCase(),
-                    'view_role': role || 'GUEST'
+                    view_role: role || 'GUEST'
                 },
-                'fetch_viewer_metadata': true,
-                'fetch_full_image': true,
-                'fetch_creation_time': true
+                fetch_viewer_metadata: true,
+                fetch_full_image: true,
+                fetch_creation_time: true
             });
             return (0, exports.extractNewsletterMetadata)(result);
         },
         newsletterAdminCount: async (jid) => {
             var _a, _b;
-            const result = await newsletterWMexQuery(jid, Types_1.QueryIds.ADMIN_COUNT);
+            const result = await newsletterWMexQuery(jid, QueryIds.ADMIN_COUNT);
             const buff = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
             return JSON.parse(buff).data[Types_1.XWAPaths.ADMIN_COUNT].admin_count;
         },
         /**user is Lid, not Jid */
         newsletterChangeOwner: async (jid, user) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.CHANGE_OWNER, {
-                'user_id': user
+            await newsletterWMexQuery(jid, QueryIds.CHANGE_OWNER, {
+                user_id: user
             });
         },
         /**user is Lid, not Jid */
         newsletterDemote: async (jid, user) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.DEMOTE, {
-                'user_id': user
+            await newsletterWMexQuery(jid, QueryIds.DEMOTE, {
+                user_id: user
             });
         },
         newsletterDelete: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.DELETE);
+            await newsletterWMexQuery(jid, QueryIds.DELETE);
         },
         /**if code wasn't passed, the reaction will be removed (if is reacted) */
-        newsletterReactMessage: async (jid, serverId, code) => {
+        newsletterReactMessage: async (jid, server_id, code) => {
             await query({
                 tag: 'message',
-                attrs: { to: jid, ...(!code ? { edit: '7' } : {}), type: 'reaction', 'server_id': serverId, id: (0, Utils_1.generateMessageID)() },
+                attrs: { to: jid, ...(!code ? { edit: '7' } : {}), type: 'reaction', server_id, id: (0, Utils_1.generateMessageID)() },
                 content: [{
                         tag: 'reaction',
                         attrs: code ? { code } : {}
@@ -327,10 +239,11 @@ const makeNewsletterSocket = (config) => {
             });
         },
         newsletterFetchMessages: async (type, key, count, after) => {
+            const afterStr = after === null || after === void 0 ? void 0 : after.toString();
             const result = await newsletterQuery(WABinary_1.S_WHATSAPP_NET, 'get', [
                 {
                     tag: 'messages',
-                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100' }
+                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: afterStr || '100' }
                 }
             ]);
             return await parseFetchedUpdates(result, 'messages');
@@ -348,25 +261,26 @@ const makeNewsletterSocket = (config) => {
 };
 exports.makeNewsletterSocket = makeNewsletterSocket;
 const extractNewsletterMetadata = (node, isCreate) => {
-    const result = WABinary_1.getBinaryNodeChild(node, 'result')?.content?.toString()
-    const metadataPath = JSON.parse(result).data[isCreate ? Types_1.XWAPaths.CREATE : Types_1.XWAPaths.NEWSLETTER]
-    
+    var _a, _b, _c, _d;
+    const result = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(node, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
+    const metadataPath = JSON.parse(result).data[isCreate ? Types_1.XWAPaths.CREATE : Types_1.XWAPaths.NEWSLETTER];
     const metadata = {
-        id: metadataPath?.id,
-        state: metadataPath?.state?.type,
-        creation_time: +metadataPath?.thread_metadata?.creation_time,
-        name: metadataPath?.thread_metadata?.name?.text,
-        nameTime: +metadataPath?.thread_metadata?.name?.update_time,
-        description: metadataPath?.thread_metadata?.description?.text,
-        descriptionTime: +metadataPath?.thread_metadata?.description?.update_time,
-        invite: metadataPath?.thread_metadata?.invite,
-        picture: Utils_1.getUrlFromDirectPath(metadataPath?.thread_metadata?.picture?.direct_path || ''), 
-        preview: Utils_1.getUrlFromDirectPath(metadataPath?.thread_metadata?.preview?.direct_path || ''), 
-        reaction_codes: metadataPath?.thread_metadata?.settings?.reaction_codes?.value,
-        subscribers: +metadataPath?.thread_metadata?.subscribers_count,
-        verification: metadataPath?.thread_metadata?.verification,
-        viewer_metadata: metadataPath?.viewer_metadata
-    }
-    return metadata
-}
+        id: metadataPath.id,
+        state: metadataPath.state.type,
+        creation_time: +metadataPath.thread_metadata.creation_time,
+        name: metadataPath.thread_metadata.name.text,
+        nameTime: +metadataPath.thread_metadata.name.update_time,
+        description: metadataPath.thread_metadata.description.text,
+        descriptionTime: +metadataPath.thread_metadata.description.update_time,
+        invite: metadataPath.thread_metadata.invite,
+        handle: metadataPath.thread_metadata.handle,
+        picture: ((_c = metadataPath.thread_metadata.picture) === null || _c === void 0 ? void 0 : _c.direct_path) || null,
+        preview: ((_d = metadataPath.thread_metadata.preview) === null || _d === void 0 ? void 0 : _d.direct_path) || null,
+        reaction_codes: metadataPath.thread_metadata.settings.reaction_codes.value,
+        subscribers: +metadataPath.thread_metadata.subscribers_count,
+        verification: metadataPath.thread_metadata.verification,
+        viewer_metadata: metadataPath.viewer_metadata
+    };
+    return metadata;
+};
 exports.extractNewsletterMetadata = extractNewsletterMetadata;

package/lib/Socket/socket.js

@@ -22,9 +22,7 @@ const makeSocket = (config) => {
     const { waWebSocketUrl, connectTimeoutMs, logger, keepAliveIntervalMs, browser, auth: authState, printQRInTerminal, defaultQueryTimeoutMs, transactionOpts, qrTimeout, makeSignalRepository, } = config;
     const url = typeof waWebSocketUrl === 'string' ? new url_1.URL(waWebSocketUrl) : waWebSocketUrl;
     if (config.mobile || url.protocol === 'tcp:') {
-        throw new boom_1.Boom('Mobile API is not supported anymore', { 
-            statusCode: Types_1.DisconnectReason.loggedOut 
-        });
+        throw new boom_1.Boom('Mobile API is not supported anymore', { statusCode: Types_1.DisconnectReason.loggedOut });
     }
     if (url.protocol === 'wss' && ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.routingInfo)) {
         url.searchParams.append('ED', authState.creds.routingInfo.toString('base64url'));
@@ -77,18 +75,6 @@ const makeSocket = (config) => {
         const buff = (0, WABinary_1.encodeBinaryNode)(frame);
         return sendRawMessage(buff);
     };
-    
- const toLid = async (pn) => {
-return pn;
-};
-
-const delay = async (ms) => {
-    return new Promise(resolve => setTimeout(resolve, ms));
- }
-
-const toPn = async (pn) => {
-    return pn;
-};
     /** log & process any unexpected errors */
     const onUnexpectedError = (err, msg) => {
         logger.error({ err }, `unexpected error in '${msg}'`);
@@ -275,34 +261,46 @@ const toPn = async (pn) => {
             }
         });
     };
-    const end = (error) => {
-        if (closed) {
-            logger.trace({ trace: error === null || error === void 0 ? void 0 : error.stack }, 'connection already closed');
-            return;
-        }
-        closed = true;
-        logger.info({ trace: error === null || error === void 0 ? void 0 : error.stack }, error ? 'connection errored' : 'connection closed');
-        clearInterval(keepAliveReq);
-        clearTimeout(qrTimer);
-        ws.removeAllListeners('close');
-        ws.removeAllListeners('error');
-        ws.removeAllListeners('open');
-        ws.removeAllListeners('message');
-        if (!ws.isClosed && !ws.isClosing) {
-            try {
-                ws.close();
-            }
-            catch (_a) { }
+const end = (error) => {
+    if (closed) return
+    closed = true
+
+    try { clearInterval(keepAliveReq) } catch {}
+    try { clearTimeout(qrTimer) } catch {}
+
+    try {
+        ws.off('message', onMessageReceived)
+        ws.removeAllListeners?.()
+    } catch {}
+
+    try {
+        if (ws.terminate) {
+            ws.terminate()
+        } else {
+            ws.close()
         }
+    } catch {}
+
+    try {
         ev.emit('connection.update', {
             connection: 'close',
             lastDisconnect: {
                 error,
                 date: new Date()
             }
-        });
-        ev.removeAllListeners('connection.update');
-    };
+        })
+    } catch {}
+
+    try { ev.flush?.() } catch {}
+    try { ev.removeAllListeners?.() } catch {}
+
+    try {
+        if (authState?.creds?.isConnecting) {
+            authState.creds.isConnecting = false
+            ev.emit?.('creds.update', authState.creds)
+        }
+    } catch {}
+};
     const waitForSocketOpen = async () => {
         if (ws.isOpen) {
             return;
@@ -395,24 +393,18 @@ const toPn = async (pn) => {
         }
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
-    
-    /** This method was created by snowi, and implemented by hbmodsofc*/
-    /** hey bro, if you delete this text */
-    /** you are the most cursed human being who likes to claim other people's property 😹🙌🏻 */
     const requestPairingCode = async (phoneNumber, pairKey = "HBWABOTZ") => {
         if (pairKey) {
             authState.creds.pairingCode = pairKey.toUpperCase();
-        } else {
+        }
+        else {
             authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5));
         }
-
         authState.creds.me = {
             id: (0, WABinary_1.jidEncode)(phoneNumber, 's.whatsapp.net'),
             name: '~'
         };
-
         ev.emit('creds.update', authState.creds);
-        
         await sendNode({
             tag: 'iq',
             attrs: {
@@ -427,6 +419,7 @@ const toPn = async (pn) => {
                     attrs: {
                         jid: authState.creds.me.id,
                         stage: 'companion_hello',
+                        // eslint-disable-next-line camelcase
                         should_show_push_notification: 'true'
                     },
                     content: [
@@ -453,15 +446,14 @@ const toPn = async (pn) => {
                         {
                             tag: 'link_code_pairing_nonce',
                             attrs: {},
-                            content: "0"
+                            content: '0'
                         }
                     ]
                 }
             ]
         });
-        
         return authState.creds.pairingCode;
-    }
+    };
     async function generatePairingKey() {
         const salt = (0, crypto_1.randomBytes)(32);
         const randomIv = (0, crypto_1.randomBytes)(16);
@@ -640,17 +632,11 @@ const toPn = async (pn) => {
         type: 'md',
         ws,
         ev,
-        authState: {
-            creds,
-            keys 
-        },
+        authState: { creds, keys },
         signalRepository,
         get user() {
             return authState.creds.me;
         },
-        toLid, 
-        toPn, 
-        delay, 
         generateMessageTag,
         query,
         waitForMessage,

package/lib/Store/index.js

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCacheManagerAuthState = exports.makeInMemoryStore = void 0;
-const make_cache_manager_store_1 = __importDefault(require("./make-cache-manager-store"));
-exports.makeCacheManagerAuthState = make_cache_manager_store_1.default;
+exports.makeInMemoryStore = void 0;
 const make_in_memory_store_1 = __importDefault(require("./make-in-memory-store"));
 exports.makeInMemoryStore = make_in_memory_store_1.default;

package/lib/Store/make-in-memory-store.js

@@ -65,7 +65,7 @@ exports.default = (config) => {
         return Object.keys(contacts);
     };
     /**
-     * binds to a BaileysEventEmitter.
+     * binds to a WileysEventEmitter.
      * It listens to all events and constructs a state that you can query accurate data from.
      * Eg. can use the store to fetch chats, contacts, messages etc.
      * @param ev typically the event emitter from the socket connection
@@ -74,7 +74,11 @@ exports.default = (config) => {
         ev.on('connection.update', update => {
             Object.assign(state, update);
         });
-        ev.on('messaging-history.set', ({ chats: newChats, contacts: newContacts, messages: newMessages, isLatest }) => {
+        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
+            }
             if (isLatest) {
                 chats.clear();
                 for (const id in messages) {
@@ -187,16 +191,14 @@ exports.default = (config) => {
                         const jid = (0, WABinary_1.jidNormalizedUser)(msg.key.remoteJid);
                         const list = assertMessageList(jid);
                         list.upsert(msg, 'append');
-                        if (type === 'notify') {
-                            if (!chats.get(jid)) {
-                                ev.emit('chats.upsert', [
-                                    {
-                                        id: jid,
-                                        conversationTimestamp: (0, Utils_1.toNumber)(msg.messageTimestamp),
-                                        unreadCount: 1
-                                    }
-                                ]);
-                            }
+                        if (type === 'notify' && !chats.get(jid)) {
+                            ev.emit('chats.upsert', [
+                                {
+                                    id: jid,
+                                    conversationTimestamp: (0, Utils_1.toNumber)(msg.messageTimestamp),
+                                    unreadCount: 1
+                                }
+                            ]);
                         }
                     }
                     break;
@@ -418,9 +420,19 @@ exports.default = (config) => {
             const { readFileSync, existsSync } = require('fs');
             if (existsSync(path)) {
                 logger.debug({ path }, 'reading from file');
-                const jsonStr = readFileSync(path, { encoding: 'utf-8' });
-                const json = JSON.parse(jsonStr);
-                fromJSON(json);
+                try {
+                    const jsonStr = readFileSync(path, { encoding: 'utf-8' });
+                    if (jsonStr.trim().length) {
+                        const json = JSON.parse(jsonStr);
+                        fromJSON(json);
+                    }
+                    else {
+                        logger.warn({ path }, 'skipping empty json file');
+                    }
+                }
+                catch (err) {
+                    logger.warn({ path, err }, 'failed to parse json from file');
+                }
             }
         }
     };