Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Add support for sending large files (up to 2GB) #2368

Open
wants to merge 64 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
602cc5a
Add support for sending large files (up to 1GB)
opssemnik Jul 28, 2023
037cc5c
Update Client.js with latest version from main repo
opssemnik Jul 28, 2023
f8e7eca
Fix Large Media messages not opening on iOS
opssemnik Jul 28, 2023
5b7a978
Update code-style to match standards
opssemnik Jul 29, 2023
c452fe8
Merge branch 'main' into patch-1
opssemnik Jul 31, 2023
9d11e08
Update Logic by @shirser121
opssemnik Aug 4, 2023
180dfa7
Fix ESLint
opssemnik Aug 4, 2023
50bed35
Remove single use variable
opssemnik Aug 4, 2023
51d9f00
Fix ESlint after latest commits
opssemnik Aug 6, 2023
123abd2
Merge branch 'main' into patch-1
shirser121 Aug 6, 2023
6dcaed8
Merge branch 'main' into patch-1
shirser121 Aug 7, 2023
9fbf83a
Merge branch 'main' into patch-1
shirser121 Aug 7, 2023
1d0516d
Merge branch 'main' into patch-1
opssemnik Aug 7, 2023
dde5851
Merge branch 'main' into patch-1
opssemnik Aug 7, 2023
8527624
Merge branch 'main' into patch-1
shirser121 Aug 8, 2023
753b51f
Merge branch 'main' into patch-1
opssemnik Aug 8, 2023
97b9aee
Merge branch 'main' into patch-1
opssemnik Aug 9, 2023
e1cbdff
Merge branch 'main' into patch-1
opssemnik Aug 10, 2023
13f9822
Fix large file ABORT_ERROR
opssemnik Aug 14, 2023
a0899ea
Add fileSize to fromFilePath
opssemnik Aug 14, 2023
d1f369b
Add mediaKeyInfo node to uploadMedia function
opssemnik Aug 14, 2023
9b894f6
Add fileSize to MessageMedia.fromFilePath
opssemnik Aug 14, 2023
9bcdbb0
Fix cached files crashing
opssemnik Aug 14, 2023
6434b75
Add upload limit checking
opssemnik Aug 14, 2023
77c244a
Add getUploadLimits to Injected
opssemnik Aug 14, 2023
c393071
Add getUploadLimits to Client
opssemnik Aug 14, 2023
1511b0f
Update index.d.ts to add getUploadLimits()
opssemnik Aug 14, 2023
912a63b
Merge pull request #2 from opssemnik/main
opssemnik Aug 14, 2023
7aec07d
Fix typo
opssemnik Aug 14, 2023
34e5515
Update error on media size too large
opssemnik Aug 14, 2023
14932ef
Update javadocs on getUploadLimits
opssemnik Aug 14, 2023
6c3576a
Fix ESLint in Client.js
opssemnik Aug 14, 2023
1446c4a
Fix ESLint on injected
opssemnik Aug 14, 2023
01decc3
Fix code style
opssemnik Aug 14, 2023
599d0e4
Calculate filesize from data if not provided
opssemnik Aug 14, 2023
491acdb
Update attachment size check
opssemnik Aug 14, 2023
dac8936
Fix ESLint
opssemnik Aug 14, 2023
a355cc5
Update parameter name for clearer indication
opssemnik Aug 14, 2023
e5816fe
Fix media on ios (1/2)
opssemnik Aug 15, 2023
724bc4f
Fix media on ios (2/2)
opssemnik Aug 15, 2023
93996d4
Update fileSize check
opssemnik Aug 15, 2023
6271bb2
Dont skip encryption on mandatory files
opssemnik Aug 15, 2023
7be7bcb
Fix undef
opssemnik Aug 15, 2023
13d3e10
Fix ESLint
opssemnik Aug 15, 2023
1467549
Fix latest ESLint
opssemnik Aug 15, 2023
309f096
Fix waveform on downloaded audio files
opssemnik Aug 15, 2023
67e970a
Merge pull request #3 from opssemnik/fix-waveform-downloaded-audios
opssemnik Aug 15, 2023
6800462
Fix typo + eslint
opssemnik Aug 22, 2023
745d596
Merge branch 'main' into patch-1
opssemnik Aug 23, 2023
c40d81f
Merge branch 'main' into patch-1
opssemnik Aug 24, 2023
8e5a763
Merge branch 'main' into patch-1
opssemnik Aug 29, 2023
bb200bf
Merge branch 'main' into patch-1
opssemnik Sep 17, 2023
86c7ef8
Merge branch 'main' into patch-1
PurpShell Sep 21, 2023
36479d6
Merge branch 'main' into patch-1
opssemnik Oct 16, 2023
0d33347
Merge branch 'main' into patch-1
opssemnik Oct 22, 2023
8b034b8
Update Client.js
opssemnik Oct 22, 2023
459e460
Merge branch 'main' into patch-1
alechkos Dec 7, 2023
19b5be1
Merge branch 'main' into patch-1
alechkos Dec 13, 2023
d88bf30
Merge branch 'main' into patch-1
shirser121 Dec 19, 2023
b4cde52
Merge branch 'main' into patch-1
alechkos Jan 2, 2024
fae60f5
Merge branch 'main' into patch-1
alechkos Jan 11, 2024
4a6cda1
Merge branch 'main' into patch-1
alechkos Jan 14, 2024
5493cd2
Merge branch 'main' into patch-1
shirser121 Apr 3, 2024
a92cf72
Merge branch 'main' into patch-1
shirser121 Jun 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ declare namespace WAWebJS {
/** Deletes the current user's profile picture */
deleteProfilePicture(): Promise<boolean>

/** Gets the maximum file size for a given media type*/
getUploadLimits(mediaType: string): Promise<string>

/** Generic event */
on(event: string, listener: (...args: any) => void): this

Expand Down
62 changes: 59 additions & 3 deletions src/Client.js
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ class Client extends EventEmitter {
if (options.mentions && options.mentions.some(possiblyContact => possiblyContact instanceof Contact)) {
console.warn('Mentions with an array of Contact are now deprecated. See more at https://github.com/pedroslopez/whatsapp-web.js/pull/2166.');
options.mentions = options.mentions.map(a => a.id._serialized);
}
}
let internalOptions = {
linkPreview: options.linkPreview === false ? undefined : true,
sendAudioAsVoice: options.sendAudioAsVoice,
Expand All @@ -827,8 +827,10 @@ class Client extends EventEmitter {
extraOptions: options.extra
};


const sendSeen = typeof options.sendSeen === 'undefined' ? true : options.sendSeen;


if (content instanceof MessageMedia) {
internalOptions.attachment = content;
internalOptions.isViewOnce = options.isViewOnce,
Expand All @@ -855,7 +857,7 @@ class Client extends EventEmitter {
internalOptions.list = content;
content = '';
}

if (internalOptions.sendMediaAsSticker && internalOptions.attachment) {
internalOptions.attachment = await Util.formatToWebpSticker(
internalOptions.attachment, {
Expand All @@ -866,21 +868,62 @@ class Client extends EventEmitter {
);
}


if (internalOptions.attachment?.data?.length > (1024 * 1024 * 79)) {
opssemnik marked this conversation as resolved.
Show resolved Hide resolved
let startDivision = 2;
let middle = internalOptions.attachment.data.length / startDivision;
let currentIndex = 0;


while (middle > (1024 * 1024 * 50)){
startDivision += 1;
middle = Math.floor(internalOptions.attachment.data.length / startDivision);
}

const randomId = Util.generateHash(32);

while(currentIndex < internalOptions.attachment.data.length){
let chunkPiece = middle;
if(currentIndex + middle > internalOptions.attachment.data.length){
chunkPiece = internalOptions.attachment.data.length - currentIndex;
}
await this.pupPage.evaluate(async (chatId, chunk, randomId) => {
if (chunk && window[`mediaChunk_${randomId}`]) {
window[`mediaChunk_${randomId}`] += chunk;
}
else {
window[`mediaChunk_${randomId}`] = chunk;
}
}, chatId, internalOptions.attachment.data.substring(currentIndex, currentIndex+chunkPiece), randomId);
currentIndex += chunkPiece;

}

internalOptions.attachment = new MessageMedia(internalOptions.attachment.mimetype,`mediaChunk_${randomId}`, internalOptions.attachment.filename,internalOptions.attachment.filesize);
}

opssemnik marked this conversation as resolved.
Show resolved Hide resolved
const newMessage = await this.pupPage.evaluate(async (chatId, message, options, sendSeen) => {
const chatWid = window.Store.WidFactory.createWid(chatId);
const chat = await window.Store.Chat.find(chatWid);



if (sendSeen) {
window.WWebJS.sendSeen(chatId);
}

if(options?.attachment?.data?.startsWith('mediaChunk')) {
options.attachment.data = window[options.attachment.data];
delete window[options.attachment.data];
}
opssemnik marked this conversation as resolved.
Show resolved Hide resolved

const msg = await window.WWebJS.sendMessage(chat, message, options, sendSeen);
return msg.serialize();
}, chatId, content, internalOptions, sendSeen);


return new Message(this, newMessage);
}
}

/**
* Searches for messages
Expand Down Expand Up @@ -1434,6 +1477,19 @@ class Client extends EventEmitter {
return await window.Store.Label.addOrRemoveLabels(actions, chats);
}, labelIds, chatIds);
}

/***
* Returns the maximum file size for the given MessageType
* @param {string} messageType (valid values are = 'audio', 'document', 'video', 'sticker')
* @returns {Promise<string>}
*/
async getUploadLimits(messageType) {
const uploadLimit = await this.pupPage.evaluate(async (messageType) => {
return await window.WWebJS.getUploadLimits(messageType);
}, messageType);

return uploadLimit;
}
}

module.exports = Client;
3 changes: 2 additions & 1 deletion src/structures/MessageMedia.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ class MessageMedia {
const b64data = fs.readFileSync(filePath, {encoding: 'base64'});
const mimetype = mime.getType(filePath);
const filename = path.basename(filePath);
const fileSize = fs.statSync(filePath).size;

return new MessageMedia(mimetype, b64data, filename);
return new MessageMedia(mimetype, b64data, filename, fileSize);
}

/**
Expand Down
50 changes: 41 additions & 9 deletions src/util/Injected.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ exports.ExposeStore = (moduleRaidStr) => {
window.Store.ContactMethods = window.mR.findModule('getUserid')[0];
window.Store.BusinessProfileCollection = window.mR.findModule('BusinessProfileCollection')[0].BusinessProfileCollection;
window.Store.UploadUtils = window.mR.findModule((module) => (module.default && module.default.encryptAndUpload) ? module.default : null)[0].default;
window.Store.UploadLimits = window.mR.findModule('getUploadLimit')[0].getUploadLimit;
window.Store.UserConstructor = window.mR.findModule((module) => (module.default && module.default.prototype && module.default.prototype.isServer && module.default.prototype.isUser) ? module.default : null)[0].default;
window.Store.Validators = window.mR.findModule('findLinks')[0];
window.Store.VCard = window.mR.findModule('vcardFromContactModel')[0];
Expand Down Expand Up @@ -118,6 +119,11 @@ exports.LoadUtils = () => {

};

window.WWebJS.getUploadLimits = async (mediaType) => {
opssemnik marked this conversation as resolved.
Show resolved Hide resolved
const uploadLimit = window.Store.UploadLimits(mediaType);
return uploadLimit;
};

window.WWebJS.sendMessage = async (chat, content, options = {}) => {
let attOptions = {};
if (options.attachment) {
Expand All @@ -126,7 +132,8 @@ exports.LoadUtils = () => {
: await window.WWebJS.processMediaData(options.attachment, {
forceVoice: options.sendAudioAsVoice,
forceDocument: options.sendMediaAsDocument,
forceGif: options.sendVideoAsGif
forceGif: options.sendVideoAsGif,
isViewOnce: options.isViewOnce
});

if (options.caption){
Expand Down Expand Up @@ -376,13 +383,16 @@ exports.LoadUtils = () => {
return stickerInfo;
};

window.WWebJS.processMediaData = async (mediaInfo, { forceVoice, forceDocument, forceGif }) => {
window.WWebJS.processMediaData = async (mediaInfo, { forceVoice, forceDocument, forceGif, isViewOnce }) => {
const file = window.WWebJS.mediaInfoToFile(mediaInfo);
const mData = await window.Store.OpaqueData.createFromData(file, file.type);
const mediaPrep = window.Store.MediaPrep.prepRawMedia(mData, { asDocument: forceDocument });
const mediaData = await mediaPrep.waitForPrep();
const mediaObject = window.Store.MediaObject.getOrCreateMediaObject(mediaData.filehash);

const mediaObject = window.Store.MediaObject.getOrCreateMediaObject(mediaData.filehash);
const uploadOrigin = 2;
const forwardedFromWeb = false;
const maxFileSize = window.Store.UploadLimits(mediaData.type);

const mediaType = window.Store.MediaTypes.msgToMediaType({
type: mediaData.type,
isGif: mediaData.isGif
Expand All @@ -403,23 +413,45 @@ exports.LoadUtils = () => {
mediaData.type = 'document';
}

if(mediaInfo.filesize && maxFileSize > mediaInfo.file){
throw new Error(`Media size ({$mediaInfo.filesize}) exceeds current upload limit ({$maxFileSize})`);
}
opssemnik marked this conversation as resolved.
Show resolved Hide resolved

if (!(mediaData.mediaBlob instanceof window.Store.OpaqueData)) {
mediaData.mediaBlob = await window.Store.OpaqueData.createFromData(mediaData.mediaBlob, mediaData.mediaBlob.type);
}

mediaData.renderableUrl = mediaData.mediaBlob.url();
mediaObject.consolidate(mediaData.toJSON());
mediaData.mediaBlob.autorelease();

const uploadedMedia = await window.Store.MediaUpload.uploadMedia({
let mediaKeyInfoKey = await window.WWebJS.generateHash(32);
const mediaKeyInfoTimestamp = Date.now();

let uploadedMedia = await window.Store.MediaUpload.uploadMedia({
mimetype: mediaData.mimetype,
mediaObject,
mediaType
mediaType,
isViewOnce: isViewOnce,
opssemnik marked this conversation as resolved.
Show resolved Hide resolved
uploadOrigin: uploadOrigin,
forwardedFromWeb: forwardedFromWeb,
mediaKeyInfo: { key: mediaKeyInfoKey, timestamp: mediaKeyInfoTimestamp }
});

const mediaEntry = uploadedMedia.mediaEntry;
let mediaEntry = uploadedMedia.mediaEntry;
if (!mediaEntry) {
throw new Error('upload failed: media entry was not created');
uploadedMedia = await window.Store.MediaUpload.uploadMedia({
mimetype: mediaData.mimetype,
mediaObject,
mediaType,
isViewOnce: isViewOnce,
opssemnik marked this conversation as resolved.
Show resolved Hide resolved
uploadOrigin: uploadOrigin,
forwardedFromWeb: forwardedFromWeb
});

mediaEntry = uploadedMedia.mediaEntry;
if(!mediaEntry){
throw new Error('upload failed: media entry was not created');
}
}

mediaData.set({
Expand Down