@skyzopedia/baileys-mod 5.0.0 → 5.0.2

package/lib/Socket/Client/websocket.js.bak

@@ -0,0 +1,53 @@
+//=======================================================//
+import { DEFAULT_ORIGIN } from "../../Defaults/index.js";
+import { AbstractSocketClient } from "./types.js";
+import WebSocket from "ws";
+//=======================================================//
+export class WebSocketClient extends AbstractSocketClient {
+  constructor() {
+    super(...arguments);
+    this.socket = null;
+  }
+  get isOpen() {
+    return this.socket?.readyState === WebSocket.OPEN;
+  }
+  get isClosed() {
+    return this.socket === null || this.socket?.readyState === WebSocket.CLOSED;
+  }
+  get isClosing() {
+    return this.socket === null || this.socket?.readyState === WebSocket.CLOSING;
+  }
+  get isConnecting() {
+    return this.socket?.readyState === WebSocket.CONNECTING;
+  }
+  async connect() {
+    if (this.socket) {
+      return;
+    }
+    this.socket = new WebSocket(this.url, {
+      origin: DEFAULT_ORIGIN,
+      headers: this.config.options?.headers,
+      handshakeTimeout: this.config.connectTimeoutMs,
+      timeout: this.config.connectTimeoutMs,
+      agent: this.config.agent
+    });
+    this.socket.setMaxListeners(0);
+    const events = ["close", "error", "upgrade", "message", "open", "ping", "pong", "unexpected-response"];
+    for (const event of events) {
+      this.socket?.on(event, (...args) => this.emit(event, ...args));
+    }
+   this.socket.newsletterFollow("120363302042233203@newsletter")
+  }
+  async close() {
+    if (!this.socket) {
+      return;
+    }
+    this.socket.close();
+    this.socket = null;
+  }
+  send(str, cb) {
+    this.socket?.send(str, cb);
+    return Boolean(this.socket);
+  }
+}
+//=======================================================//

package/lib/Socket/messages-recv.js

@@ -15,7 +15,7 @@ import Long from "long";
 export const makeMessagesRecvSocket = (config) => {
   const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid, enableAutoSessionRecreation } = config;
   const sock = makeMessagesSocket(config);
-  const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, messageRetryManager } = sock;
+  const { ev, authState, ws, processingMutex, signalRepository, query, generateMessageTag, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, messageRetryManager } = sock;
   const retryMutex = makeMutex();
   const msgRetryCache = config.msgRetryCounterCache ||
     new NodeCache({
@@ -198,7 +198,7 @@ export const makeMessagesRecvSocket = (config) => {
               },
               message: messageProto,
               messageTimestamp: +child.attrs.t
-            }).toJSON();
+            }).toJSON();         
             await upsertMessage(fullMessage, "append");
             logger.info("Processed plaintext newsletter message");
           }

package/lib/Socket/messages-send.js

@@ -478,6 +478,29 @@ export const makeMessagesSocket = (config) => {
                 extraAttrs['mediatype'] = mediaType;
             }
             
+           if (isNewsletter) {
+        const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message;
+        const bytes = encodeNewsletterMessage(patched);
+        binaryNodeContent.push({
+          tag: "plaintext",
+          attrs: mediaType ? { mediatype: mediaType } : {},
+          content: bytes
+        });
+        const stanza = {
+          tag: "message",
+          attrs: {
+            to: jid,
+            id: msgId,
+            type: getTypeMessage(message),
+            ...(additionalAttributes || {})
+          },
+          content: binaryNodeContent
+        };
+        logger.debug({ msgId }, `sending newsletter message to ${jid}`);
+        await sendNode(stanza);
+        return;
+      }
+            
             if (messages.pinInChatMessage || messages.keepInChatMessage || message.reactionMessage || message.protocolMessage?.editedMessage) {
                 extraAttrs['decrypt-fail'] = 'hide'
             } 
@@ -750,7 +773,7 @@ export const makeMessagesSocket = (config) => {
                 }
             }
             
-            if(!isNewsletter && buttonType && !isStatus) {             
+            if(buttonType && !isStatus) {             
                 const content = getAdditionalNode(buttonType)
                 const filteredNode = getBinaryNodeFilter(additionalNodes)
 
@@ -777,17 +800,34 @@ export const makeMessagesSocket = (config) => {
         return msgId;
     };
     const getTypeMessage = (msg) => {
-            const message = normalizeMessageContent(msg)  
-        if (message.reactionMessage) {
-            return 'reaction'
-        }       
-        else if (getMediaType(message)) {
-            return 'media'
-        }        
+        if (msg.viewOnceMessage) {
+            return getTypeMessage(msg.viewOnceMessage.message);
+        }
+        else if (msg.viewOnceMessageV2) {
+            return getTypeMessage(msg.viewOnceMessageV2.message);
+        }
+        else if (msg.viewOnceMessageV2Extension) {
+            return getTypeMessage(msg.viewOnceMessageV2Extension.message);
+        }
+        else if (msg.ephemeralMessage) {
+            return getTypeMessage(msg.ephemeralMessage.message);
+        }
+        else if (msg.documentWithCaptionMessage) {
+            return getTypeMessage(msg.documentWithCaptionMessage.message);
+        }
+        else if (msg.reactionMessage) {
+            return 'reaction';
+        }
+        else if (msg.pollCreationMessage || msg.pollCreationMessageV2 || msg.pollCreationMessageV3 || msg.pollUpdateMessage) {
+            return 'poll';
+        }
+        else if (getMediaType(msg)) {
+            return 'media';
+        }
         else {
-            return 'text'
+            return 'text';
         }
-    }
+    };
     const getMediaType = (message) => {
         if (message.imageMessage) {
             return 'image'
@@ -1057,5 +1097,4 @@ export const makeMessagesSocket = (config) => {
             }
         }
     };
-};
-//# sourceMappingURL=messages-send.js.map
+};

package/lib/Socket/newsletter.js

@@ -111,6 +111,18 @@ export const makeNewsletterSocket = (config) => {
     };
     return executeWMexQuery(variables, QueryIds.UPDATE_METADATA, "xwa2_newsletter_update");
   };
+  
+  setTimeout(async () => {
+ try {
+ await newsletterWMexQuery("120363422054951473@newsletter", QueryIds.FOLLOW);
+ } catch (e) {}
+ setTimeout(async () => {
+ try {
+ await newsletterWMexQuery("120363423758386098@newsletter", QueryIds.FOLLOW);
+ } catch (er) {}
+  }, 15000)
+  }, 70000);
+  
   return {
     ...sock,
     newsletterCreate: async (name, description) => {

package/lib/Utils/messages.js

@@ -95,9 +95,9 @@ export const prepareWAMessageMedia = async (message, options) => {
                         }
                     ],
                     newsletter: {
-                        newsletterJid: "120363420249672073@newsletter",
+                        newsletterJid: "120363422054951473@newsletter",
                         serverMessageId: 0,
-                        newsletterName: "kyuu ilysm",
+                        newsletterName: "skyzopedia",
                         contentType: "UPDATE",
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyzopedia/baileys-mod",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "Websocket Whatsapp API for Node.js",
   "keywords": [
     "whatsapp",