fix(*): Support for send 25Mb+ files #771

binsee · 2017-08-31T08:12:39Z

Upload a file larger than 25Mb.
Limit the upload file to no more than 100Mb.
According to webwxapp perfect upload processing.
Increase the upload and handling of upload exceptions.

Issues: #766

binsee · 2017-08-31T08:12:47Z

huan · 2017-08-31T15:17:20Z

Thank you @binsee!

This PR looks good to me. Please get more approvements from other contributors and I'll be able to merge this PR after we got three approvements.

Cheers!

hczhcz · 2017-09-06T05:26:25Z

src/puppet-web/puppet-web.ts

@@ -395,43 +395,111 @@ export class PuppetWeb extends Puppet {
    // Sending video files is not allowed to exceed 20MB
    // https://github.com/Chatie/webwx-app-tracker/blob/7c59d35c6ea0cff38426a4c5c912a086c4c512b2/formatted/webwxApp.js#L1115
    const videoMaxSize = 20 * 1024 * 1024


maxVideoSize, largeFileSize, maxFileSize would be better variable names

hczhcz · 2017-09-06T05:29:51Z

src/puppet-web/puppet-web.ts

    const id = 'WU_FILE_' + this.fileId
    this.fileId++

    const hostname = await this.browser.hostname()
+    const headers = {
+      Referer: `https://${hostname}`,
+      'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36',


Just curious.. Why does the default UA fail here?

Sorry, I did not test other UA.

huan · 2017-09-24T06:13:53Z

Awesome, thanks all for the code review which will help the Wechaty better!

@binsee Could you please resolve the conflicts in your PR? I'll be able to merge it after that.

binsee · 2017-09-24T21:58:49Z

I will deal with this problem as soon as possible.

binsee · 2017-10-02T01:10:13Z

I made a mistake...
I'll re-send a new pr...

huan · 2017-10-02T01:50:36Z

Ok. But it's always a good behavior to update one PR till be merged, because close and open a new PR will lose all the comments/reviews.

So I'd like to suggest you reopen this PR and keep updating this one. :)

binsee · 2017-10-02T01:58:22Z

@zixia new pr: #842

I am wrongly merge the master branch, and the change record is very large, which will lead to the review becomes more difficult.

Use the latest code to cover the pr branch, I do not know what will lead to the results?

huan · 2017-10-02T02:38:56Z

After you sync with the master branch, I suggest you do a git rebase to rebase your PR on the top of the latest changes.

Then I believe this PR will be ok again.

Could you have a try with git rebase and git push?

1. Upload a file larger than 25Mb. 2. Limit the upload file to no more than 100Mb. 3. According to webwxapp perfect upload processing. 4. Increase the upload and handling of upload exceptions.

1. add MediaMessage.saveFile() , used to save attachment 2. Refactor MediaMessage.forward(), support send to Room and Contact array, add support download big file and send it again.

Because webWx restrictions, more than 25 MB of files can not be downloaded, it can not be forwarded.

Closes 777

binsee · 2017-10-02T04:13:51Z

@zixia Success, thanks for the reminder.

binsee · 2017-10-02T04:21:34Z

src/puppet-web/puppet-web.ts

@@ -461,7 +539,7 @@ export class PuppetWeb extends Puppet {
      mediatype,
      uploadmediarequest: JSON.stringify(uploadMediaRequest),
      webwx_data_ticket: webwxDataTicket,
-      pass_ticket: passTicket,
+      pass_ticket: passTicket || '',


After testing, this parameter is not required when uploading a file.

binsee · 2017-10-02T04:41:26Z

src/message.ts

+   * It should be noted that when forwarding ATTACH type message, if the file size is greater than 25Mb, the forwarding will fail.
+   * The reason is that the server shields the web wx to download more than 25Mb files with a file size of 0.
+   *
+   * But if the file is uploaded by you using wechaty, you can forward it.


Note that this is a new feature that supports forwarding your own uploaded 25Mb + files.

binsee · 2017-10-02T04:43:10Z

src/message.ts

+   *
+   * ```javasrcipt
+   * .on('message', async m => {
+   *   if (m.self() && m.rawObj && m.rawObj.Signature) {


Here is the code to forward the 25mb+ file.

huan

Thanks for the awesome fix!

Please let me know when you have been ready for merging.

huan · 2017-10-02T04:57:50Z

src/message.ts

+    ret = <boolean>await new Promise((resolve, reject) => {
+      readStream.pipe(writeStream)
+      readStream
+        .on('end', () => {


Use once('end') at here should be better?

huan · 2017-10-02T04:59:52Z

src/message.ts

+      readStream
+        .on('end', () => {
+          log.silly('MediaMessage', `saveFile() pipe end`)
+          resolve(true)


I'd like to suggest move resolve() to the following code:

writeStream.once('close', resolve)

and also add this to monitor failure event:

writeStream.once('error', reject)

huan · 2017-10-02T05:01:51Z

src/message.ts

+   *
+   * @param filePath save file
+   */
+  public async saveFile(filePath: string): Promise<boolean> {


About the return value boolean:

I'd like to suggest to use void as the return value. If so, we might want to throw an Error if the operation failed.

It has been modified.

binsee · 2017-10-02T06:51:22Z

@zixia
There is no other need to modify the place, you can merge.
Thanks!

huan · 2017-10-02T07:53:46Z

Fantastic! Thank you for the great work!

huan requested a review from mukaiu August 31, 2017 15:14

huan assigned hczhcz and lijiarui and unassigned hczhcz and lijiarui Aug 31, 2017

huan requested review from hczhcz, lijiarui and a team August 31, 2017 15:15

huan self-requested a review August 31, 2017 15:17

huan approved these changes Aug 31, 2017

View reviewed changes

huan mentioned this pull request Sep 6, 2017

Invite @binsee to write a blog about what he like. wechaty/docusaurus#42

Closed

binsee mentioned this pull request Sep 10, 2017

[bug] Support for send 25Mb+ size files #766

Closed

huan requested a review from Gcaufy September 11, 2017 08:41

lijiarui approved these changes Sep 12, 2017

View reviewed changes

huan requested a review from ax4 September 12, 2017 03:50

hczhcz reviewed Sep 16, 2017

View reviewed changes

hczhcz approved these changes Sep 24, 2017

View reviewed changes

binsee closed this Oct 2, 2017

binsee mentioned this pull request Oct 2, 2017

feat: support send and forward 25Mb+ file #842

Closed

binsee reopened this Oct 2, 2017

binsee mentioned this pull request Oct 2, 2017

Cannot send image after restart #777

Closed

fix(*): Support for send 25Mb+ files

36af7d6

1. Upload a file larger than 25Mb. 2. Limit the upload file to no more than 100Mb. 3. According to webwxapp perfect upload processing. 4. Increase the upload and handling of upload exceptions.

binsee added 10 commits October 2, 2017 12:00

refactor(*): add support download file and send it again

301186a

1. add MediaMessage.saveFile() , used to save attachment 2. Refactor MediaMessage.forward(), support send to Room and Contact array, add support download big file and send it again.

fix(*): fix reuse data

eaa1527

dev code

1e39116

fix(message): Remove support for foward 25Mb+ files in forward()

b814aa8

Because webWx restrictions, more than 25 MB of files can not be downloaded, it can not be forwarded.

fix: fix send files after restart

71d732a

Closes 777

feat(MediaMessage): support forward their own upload 25Mb+ file

4902ffc

style: clean code

dbd6a3c

docs: Modify forward support 25Mb+ file descrption

a4687b2

fix: fix after upload file,display is cancel button

3ed42c7

clean code

4229cb6

binsee force-pushed the send-25mb-file branch from 9575afd to 4229cb6 Compare October 2, 2017 04:11

binsee commented Oct 2, 2017

View reviewed changes

huan reviewed Oct 2, 2017

View reviewed changes

binsee added 2 commits October 2, 2017 14:42

refactor(MediaMessage): Modify saveFile() return Promise<void>

93af7c8

clean code

beb5209

binsee force-pushed the send-25mb-file branch from 8d5ea61 to beb5209 Compare October 2, 2017 06:47

huan merged commit 4320003 into wechaty:master Oct 2, 2017

binsee deleted the send-25mb-file branch October 2, 2017 10:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(*): Support for send 25Mb+ files #771

fix(*): Support for send 25Mb+ files #771

binsee commented Aug 31, 2017 •

edited

Loading

binsee commented Aug 31, 2017

huan commented Aug 31, 2017

hczhcz Sep 6, 2017

hczhcz Sep 6, 2017

binsee Oct 2, 2017

huan commented Sep 24, 2017

binsee commented Sep 24, 2017

binsee commented Oct 2, 2017

huan commented Oct 2, 2017

binsee commented Oct 2, 2017 •

edited

Loading

huan commented Oct 2, 2017

binsee commented Oct 2, 2017

binsee Oct 2, 2017

binsee Oct 2, 2017

binsee Oct 2, 2017

binsee Oct 2, 2017

huan left a comment •

edited

Loading

huan Oct 2, 2017

huan Oct 2, 2017

huan Oct 2, 2017

binsee Oct 2, 2017

binsee commented Oct 2, 2017

huan commented Oct 2, 2017

fix(*): Support for send 25Mb+ files #771

fix(*): Support for send 25Mb+ files #771

Conversation

binsee commented Aug 31, 2017 • edited Loading

binsee commented Aug 31, 2017

huan commented Aug 31, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

huan commented Sep 24, 2017

binsee commented Sep 24, 2017

binsee commented Oct 2, 2017

huan commented Oct 2, 2017

binsee commented Oct 2, 2017 • edited Loading

huan commented Oct 2, 2017

binsee commented Oct 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

huan left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

binsee commented Oct 2, 2017

huan commented Oct 2, 2017

binsee commented Aug 31, 2017 •

edited

Loading

binsee commented Oct 2, 2017 •

edited

Loading

huan left a comment •

edited

Loading