@rexxhayanasi/elaina-baileys 1.2.0-rc.6 → 1.2.0-rc.8

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,142 +1,54 @@
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareWAMessageMediaNewsletter = prepareWAMessageMediaNewsletter;
-exports.getWAUploadToServerNewsletter = getWAUploadToServerNewsletter;
-
-const fs = require("fs");
-const Boom = require("@hapi/boom");
-const { WAProto } = require("../../WAProto");
-const { 
-    MEDIA_PATH_MAP, 
-    uploadMedia, 
-    generateThumbnail, 
-    encryptedStream, 
-    getAudioDuration, 
-    getAudioWaveform, 
-    assertColor, 
-    unixTimestampSeconds 
-} = require("./index");
-const { DEFAULT_ORIGIN } = require("../Defaults");
-
-/**
- * Encode string ke Base64
- */
-function encodeBase64EncodedStringForUpload(str) {
-    if (!str) return "";
-    return Buffer.from(str).toString("base64");
-}
-
-/**
- * Placeholder function, harus diimplementasi sesuai Baileys v6
- */
-async function getRawMediaUploadData(media, mediaType, logger) {
-    throw new Error("Implement getRawMediaUploadData sesuai Baileys v6 mu");
-}
-
-/**
- * Upload ke server newsletter
- */
-function getWAUploadToServerNewsletter({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) {
-    return async (filePath, { mediaType, fileEncSha256B64, timeoutMs }) => {
-        let uploadInfo = await refreshMediaConn(false);
-        let urls;
-        const hosts = [...customUploadHosts, ...uploadInfo.hosts];
+exports.prepareWAMessageMediaNewsletter = exports.getRawMediaUploadDataNewsletter = void 0;
 
-        fileEncSha256B64 = encodeBase64EncodedStringForUpload(fileEncSha256B64);
+const crypto_1 = require("crypto");
+const boom_1 = require("@hapi/boom");
+const WAProto_1 = require("../../WAProto");
 
-        const headers = {
-            "Content-Type": "application/octet-stream",
-            Origin: DEFAULT_ORIGIN,
-            ...(options?.headers || {}),
-        };
-
-        for (const { hostname } of hosts) {
-            logger.debug(`uploading to "${hostname}"`);
-            const auth = encodeURIComponent(uploadInfo.auth);
-            const url = `https://${hostname}${MEDIA_PATH_MAP[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
-
-            let result;
-            try {
-                result = await uploadMedia({ url, filePath, headers, timeoutMs, agent: fetchAgent }, logger);
-
-                if (result?.url || result?.direct_path) {
-                    urls = {
-                        mediaUrl: result.url,
-                        directPath: result.direct_path,
-                        meta_hmac: result.meta_hmac,
-                        fbid: result.fbid,
-                        ts: result.ts,
-                    };
-                    break;
-                } else {
-                    uploadInfo = await refreshMediaConn(true);
-                    throw new Error(`upload failed, reason: ${JSON.stringify(result)}`);
-                }
-            } catch (error) {
-                const isLast = hostname === hosts[uploadInfo.hosts.length - 1]?.hostname;
-                logger.warn({ trace: error?.stack, uploadResult: result }, `Error in uploading to ${hostname}${isLast ? "" : ", retrying..."}`);
-            }
-        }
-
-        if (!urls) throw new Boom("Media upload failed on all hosts", { statusCode: 500 });
-        return urls;
+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
     };
 }
+exports.getRawMediaUploadDataNewsletter = getRawMediaUploadDataNewsletter;
 
-/**
- * Prepare WA message untuk newsletter
- */
 async function prepareWAMessageMediaNewsletter(message, options) {
-    const logger = options.logger;
-
-    let mediaType;
-    for (const key of Object.keys(MEDIA_PATH_MAP)) {
-        if (key in message) {
-            mediaType = key;
-            break;
-        }
+    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("Invalid media type", { statusCode: 400 });
+        throw new boom_1.Boom("Invalid newsletter media");
     }
-
-    const uploadData = { ...message, media: message[mediaType] };
-    delete uploadData[mediaType];
-
-    if (mediaType === "document" && !uploadData.fileName) uploadData.fileName = "file";
-    if (!uploadData.mimetype) uploadData.mimetype = MEDIA_PATH_MAP[mediaType]?.mimetype || "application/octet-stream";
-
-    const isNewsletter = options.newsletter || (options.jid && options.jid.endsWith("@newsletter"));
-    if (!isNewsletter) {
-        throw new Boom("This function is only for newsletter", { statusCode: 400 });
+    const buffer = message[mediaType];
+    if (!Buffer.isBuffer(buffer)) {
+        throw new boom_1.Boom("Newsletter media must be Buffer");
     }
-
-    const { filePath, fileSha256, fileLength } = await getRawMediaUploadData(uploadData.media, mediaType, logger);
-    const fileSha256B64 = fileSha256.toString("base64");
-
-    const urls = await getWAUploadToServerNewsletter(options, options.refreshMediaConn)(
-        filePath,
-        { mediaType, fileEncSha256B64: fileSha256B64, timeoutMs: options.mediaUploadTimeoutMs }
-    );
-
-    await fs.promises.unlink(filePath);
-
-    const messageObj = {};
-    messageObj[`${mediaType}Message`] = {
-        url: urls.mediaUrl,
-        directPath: urls.directPath,
-        fileSha256,
-        fileLength,
-        ...uploadData,
-        media: undefined,
+    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
     };
-
-    if (uploadData.ptv && mediaType === "video") {
-        messageObj.ptvMessage = messageObj.videoMessage;
-        delete messageObj.videoMessage;
+    if (mediaType === "video") {
+        proto.videoMessage.ptv = true;
     }
-
-    return WAProto.Message.fromObject(messageObj);
+    return WAProto_1.WAProto.Message.fromObject(proto);
 }
+exports.prepareWAMessageMediaNewsletter = prepareWAMessageMediaNewsletter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.2.0-rc.6",
+  "version": "1.2.0-rc.8",
   "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",