@rexxhayanasi/elaina-baileys 1.2.0-rc.7 → 1.2.0-rc.9

package/lib/Socket/business.js

@@ -12,7 +12,7 @@ const makeBusinessSocket = (config) => {
     syncFullHistory: false,
     shouldIgnoreJid: () => false
 });
-    const { authState, query, waUploadToServer } = sock;
+    const { authState, query, waUploadToServer, refreshMediaConn } = sock;
     const getCatalog = async ({ jid, limit, cursor }) => {
         var _a;
         jid = jid || ((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id);
@@ -254,6 +254,7 @@ const makeBusinessSocket = (config) => {
     return {
         ...sock,
         logger: config.logger,
+        refreshMediaConn,
         getOrderDetails,
         getCatalog,
         getCollections,

package/lib/Utils/newslettermedia.js

@@ -1,103 +1,110 @@
 "use strict";
 
-const Crypto = require("crypto");
-const Boom = require("@hapi/boom");
-const { WAProto } = require("../../WAProto");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWAUploadToServerNewsletter = exports.prepareWAMessageMediaNewsletter = exports.getRawMediaUploadDataNewsletter = void 0;
 
-/**
- * Upload khusus newsletter (RAW)
- * CODE BY REXXHAYANASI REFERENCE BY WHISKEYSOCKETS 
- */
-function getWAUploadToServerNewsletter(config, refreshMediaConn) {
-    return async (buffer, uploadOpts = {}) => {
-        if (!Buffer.isBuffer(buffer)) {
-            throw new Boom("Newsletter upload expects Buffer");
-        }
-
-        const mediaConn = await refreshMediaConn();
-        if (!mediaConn || !mediaConn.hosts?.length) {
-            throw new Boom("Failed to obtain media connection for newsletter");
-        }
-
-        const host = mediaConn.hosts[0];
-        const url = `https://${host.hostname}${host.uploadPath}`;
-
-        const res = await fetch(url, {
-            method: "POST",
-            body: buffer,
-            headers: {
-                "Content-Type": "application/octet-stream",
-                "Content-Length": buffer.length,
-            },
-            agent: config.fetchAgent,
-        });
-
-        if (!res.ok) {
-            throw new Boom(`Newsletter upload failed: ${res.status}`);
-        }
+const crypto_1 = require("crypto");
+const boom_1 = require("@hapi/boom");
+const WAProto_1 = require("../../WAProto");
+const axios_1 = require("axios");
+const Defaults_1 = require("../Defaults");
 
-        const json = await res.json();
-
-        return {
-            mediaUrl: json.url,
-            directPath: json.direct_path,
-        };
-    };
-}
-
-/**
- * Ambil metadata RAW newsletter
- */
-async function getRawMediaUploadDataNewsletter(buffer) {
-    const fileSha256 = Crypto.createHash("sha256").update(buffer).digest();
+function getRawMediaUploadDataNewsletter(buffer) {
+    if (!Buffer.isBuffer(buffer)) {
+        throw new boom_1.Boom("Newsletter media must be Buffer");
+    }
+    const fileSha256 = (0, crypto_1.createHash)("sha256").update(buffer).digest();
     return {
         buffer,
         fileSha256,
-        fileLength: buffer.length,
+        fileLength: buffer.length
     };
 }
+exports.getRawMediaUploadDataNewsletter = getRawMediaUploadDataNewsletter;
 
-/**
- * Builder message newsletter (PTV / media)
- */
-async function prepareWAMessageMediaNewsletter(message, options) {
-    const mediaType = Object.keys(message)[0];
-    if (!mediaType) throw new Boom("Invalid newsletter media");
+function getWAUploadToServerNewsletter({ customUploadHosts = [], fetchAgent, logger, options = {} }, refreshMediaConn) {
+    return async (buffer, { mediaType, fileEncSha256B64 }) => {
+        if (!Buffer.isBuffer(buffer)) {
+            throw new boom_1.Boom("Upload expects Buffer");
+        }
+        let uploadInfo = await refreshMediaConn(false);
+        const hosts = [...customUploadHosts, ...uploadInfo.hosts];
+        let urls;
+        for (const { hostname, maxContentLengthBytes } of hosts) {
+            const auth = encodeURIComponent(uploadInfo.auth);
+            let mediaPath = Defaults_1.MEDIA_PATH_MAP[mediaType];
+            if (!mediaPath) {
+                mediaPath = "/newsletter/newsletter-image";
+            } else {
+                mediaPath = mediaPath.replace("/mms/", "/newsletter/newsletter-");
+            }
+            const url = `https://${hostname}${mediaPath}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
+            try {
+                if (maxContentLengthBytes && buffer.length > maxContentLengthBytes) {
+                    throw new boom_1.Boom("Body too large", { statusCode: 413 });
+                }
+                const res = await axios_1.default.post(url, buffer, {
+                    ...options,
+                    headers: {
+                        "Content-Type": "application/octet-stream",
+                        Origin: Defaults_1.DEFAULT_ORIGIN,
+                        ...(options.headers || {})
+                    },
+                    httpsAgent: fetchAgent,
+                    responseType: "json",
+                    maxBodyLength: Infinity,
+                    maxContentLength: Infinity
+                });
+                const result = res.data;
+                if (result?.url || result?.direct_path) {
+                    urls = {
+                        mediaUrl: result.url,
+                        directPath: result.direct_path
+                    };
+                    break;
+                }
+                uploadInfo = await refreshMediaConn(true);
+            } catch (err) {
+                logger?.warn?.({ err }, `Newsletter upload failed on ${hostname}`);
+            }
+        }
+        if (!urls) {
+            throw new boom_1.Boom("Newsletter media upload failed", { statusCode: 500 });
+        }
+        return urls;
+    };
+}
+exports.getWAUploadToServerNewsletter = getWAUploadToServerNewsletter;
 
+async function prepareWAMessageMediaNewsletter(message, options) {
+    if (!options || typeof options.upload !== "function") {
+        throw new boom_1.Boom("upload function is required");
+    }
+    const mediaType = Object.keys(message || {})[0];
+    if (!mediaType) {
+        throw new boom_1.Boom("Invalid newsletter media");
+    }
     const buffer = message[mediaType];
     if (!Buffer.isBuffer(buffer)) {
-        throw new Boom("Newsletter media must be Buffer");
+        throw new boom_1.Boom("Newsletter media must be Buffer");
     }
-
-    const uploadData = await getRawMediaUploadDataNewsletter(buffer);
-
-    const upload = getWAUploadToServerNewsletter(
-        {
-            fetchAgent: options.fetchAgent,
-        },
-        options.refreshMediaConn
-    );
-
-    const uploaded = await upload(buffer);
-
+    const uploadData = getRawMediaUploadDataNewsletter(buffer);
+    const uploaded = await options.upload(buffer, {
+        mediaType,
+        fileEncSha256B64: uploadData.fileSha256.toString("base64"),
+        newsletter: true
+    });
     const proto = {};
     proto[`${mediaType}Message`] = {
         url: uploaded.mediaUrl,
         directPath: uploaded.directPath,
         fileSha256: uploadData.fileSha256,
         fileLength: uploadData.fileLength,
-        mimetype: options.mimetype,
+        mimetype: options.mimetype
     };
-
     if (mediaType === "video") {
         proto.videoMessage.ptv = true;
     }
-
-    return WAProto.Message.fromObject(proto);
+    return WAProto_1.WAProto.Message.fromObject(proto);
 }
-
-module.exports = {
-    prepareWAMessageMediaNewsletter,
-    getRawMediaUploadDataNewsletter,
-    getWAUploadToServerNewsletter,
-};
+exports.prepareWAMessageMediaNewsletter = prepareWAMessageMediaNewsletter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.2.0-rc.7",
+  "version": "1.2.0-rc.9",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys", 
@@ -17,6 +17,9 @@
   ],
   "homepage": "https://whatsapp.com/channel/0029Vb70uHbD8SE2w5Q9M107",
   "license": "MIT",
+  "publishConfig": {
+    "tag": "experimental"
+  },
   "author": "RexxHayanasi",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",