fix upload media url error (#415)

wechaty · Apr 18, 2017 · 5c24012 · 5c24012
1 parent b02c7ab
commit 5c24012
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/puppet-web/bridge.ts b/src/puppet-web/bridge.ts
@@ -373,6 +373,17 @@ export class Bridge {
     }
   }
 
+  public async getUploadMediaUrl(): Promise<string> {
+    log.verbose('PuppetWebBridge', 'getUploadMediaUrl()')
+
+    try {
+      return await this.proxyWechaty('getUploadMediaUrl')
+    } catch (e) {
+      log.silly('PuppetWebBridge', 'proxyWechaty(getUploadMediaUrl) exception: %s', e.message)
+      throw e
+    }
+  }
+
   public sendMedia(toUserName: string, mediaId: string, type: number): Promise<void> {
     if (!toUserName) {
       throw new Error('UserName not found')

diff --git a/src/puppet-web/puppet-web.ts b/src/puppet-web/puppet-web.ts
@@ -357,6 +357,7 @@ export class PuppetWeb extends Puppet {
 
     let baseRequest = await this.getBaseRequest()
     let passTicket = await this.bridge.getPassticket()
+    let uploadMediaUrl = await this.bridge.getUploadMediaUrl()
     let cookie = await this.browser.readCookie()
     let first = cookie.find(c => c.name === 'webwx_data_ticket')
     let webwxDataTicket = first && first.value
@@ -398,7 +399,7 @@ export class PuppetWeb extends Puppet {
 
     let mediaId = await new Promise((resolve, reject) => {
       request.post({
-        url: `https://file.${hostname}/cgi-bin/mmwebwx-bin/webwxuploadmedia?f=json`,
+        url: uploadMediaUrl + '?f=json',
         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',

diff --git a/src/puppet-web/wechaty-bro.js b/src/puppet-web/wechaty-bro.js
@@ -453,6 +453,11 @@
     return accountFactory.getPassticket()
   }
 
+  function getUploadMediaUrl() {
+    var confFactory = WechatyBro.glue.confFactory
+    return confFactory.API_webwxuploadmedia
+  }
+
   function sendMedia(ToUserName, MediaId,Type) {
     var chatFactory = WechatyBro.glue.chatFactory
     var confFactory = WechatyBro.glue.confFactory
@@ -858,6 +863,7 @@
     , getMsgPublicLinkImg: getMsgPublicLinkImg
     , getBaseRequest:      getBaseRequest
     , getPassticket:       getPassticket
+    , getUploadMediaUrl:   getUploadMediaUrl
     , sendMedia:           sendMedia
 
     // for Wechaty Contact Class