Fix uploadPhoto (based on PR#144) (#165)

* Updated uploadPhoto without axios
Authored-by: codexJoin <[email protected]>

Author: revall

README.md

@@ -77,8 +77,8 @@ const client = new Instagram({ username, password, cookieStore })
 
   await client.login()
 
-  // Upload Photo
-  const { media } = await client.uploadPhoto(photo)
+  // Upload Photo to feed or story, just configure 'post' to 'feed' or 'story'
+  const { media } = await client.uploadPhoto({ photo: photo, caption: 'testing', post: 'feed' })
   console.log(`https://www.instagram.com/p/${media.code}/`)
 })()
 ```
@@ -98,8 +98,7 @@ const client = new Instagram({ username, password, cookieStore })
   * [.updateProfile({ name, email, username, phoneNumber, gender, biography, website, similarAccountSuggestions })](#updateprofileparams)
   * [.changeProfilePhoto({ photo })](#changeprofilephotoparams)
   * [.deleteMedia({ mediaId })](#deletemediaparams)
-  * [.uploadPhoto({ photo, caption })](#uploadphotoparams)
-  * [.uploadStory({ photo, caption })](#uploadstoryparams)
+  * [.uploadPhoto({ photo, caption, post })](#uploadphotoparams)
   * [.getMediaFeedByLocation({ locationId })](#getmediafeedbylocationparams)
   * [.getMediaFeedByHashtag({ hashtag })](#getmediafeedbyhashtagparams)
   * [.locationSearch({ query, latitude, longitude })](#locationsearchparams)
@@ -244,22 +243,13 @@ await client.deleteMedia({ mediaId: '1442533050805297981' })
 ### uploadPhoto(params)
 ```js
 const photo = 'https://scontent-scl1-1.cdninstagram.com/t51.2885-15/e35/16465198_658888867648924_4042368904838774784_n.jpg'
-await client.uploadPhoto({ photo, caption: '❤️' })
+await client.uploadPhoto({ photo, caption: '❤️', post: 'feed' })
 ```
-> Upload a photo to Instagram.
-- `params`
-  - `photo`: A `String` of path file or URL
-  - `caption`: The caption of photo. Default is ` `
-
-### uploadStory(params)
-```js
-const photo = 'https://scontent-scl1-1.cdninstagram.com/t51.2885-15/e35/16465198_658888867648924_4042368904838774784_n.jpg'
-await client.uploadStory({ photo })
-```
-> Upload a story to Instagram, it only work for images (`jpg`)
+> Upload a photo to Instagram. Only jpeg images allowed.
 - `params`
   - `photo`: A `String` of path file or URL
   - `caption`: The caption of photo. Default is ` `
+  - `post`: The local post, `feed` or `story`
 
 ### getMediaFeedByLocation(params)
 ```js

helpers/index.js

@@ -1,10 +1,10 @@
 module.exports = {
   media: {
     GraphImage: {
-      id: '1442533050805297981',
+      id: '2366929737360789025',
       pk: 1442533050805297981,
-      shortcode: 'BQE6Cq2AqM9',
-      comments: [{ id: '17865614554065776' }]
+      shortcode: 'CDZBg47ss4h',
+      comments: [{ id: '17844885632304941' }]
     }
   },
   users: {

lib/index.js

@@ -87,6 +87,7 @@ class Instagram {
     this.request = this.request.defaults({
       headers: { 'X-CSRFToken': csrftoken }
     })
+
     this.credentials = {
       username,
       password,
@@ -360,29 +361,103 @@ class Instagram {
   }
 
   async _uploadPhoto({ photo }) {
-    return this.request.post('/create/upload/photo/', {
-      formData: {
-        upload_id: Date.now().toString(),
-        photo: isUrl(photo) ? request(photo) : fs.createReadStream(photo),
-        media_type: '1'
-      }
-    })
-  }
+    // Warning! don't change anything bellow.
+    const uploadId = Date.now()
+
+    let file
 
-  async uploadStory({ photo, caption = '' }) {
-    return this._uploadPhoto({ photo }).then(({ upload_id }) =>
-      this.request.post('/create/configure_to_story/', {
-        form: { upload_id, caption }
+    // Needed to new method, if image is from url.
+    if (isUrl(photo)) {
+      // Enconding: null is required, only this way a Buffer is returned
+      file = await request.get({ url: photo, encoding: null })
+    } else {
+      file = await fs.readFileSync(photo)
+    }
+
+    const ruploadParams = {
+      media_type: 1,
+      upload_id: uploadId.toString(),
+      upload_media_height: 1080,
+      upload_media_width: 1080,
+      xsharing_user_ids: JSON.stringify([]),
+      image_compression: JSON.stringify({
+        lib_name: 'moz',
+        lib_version: '3.1.m',
+        quality: '80'
       })
-    )
+    }
+
+    const nameEntity = `${uploadId}_0_${Math.random(1000000000, 9999999999)}`
+
+    const headersPhoto = {
+      'x-entity-type': 'image/jpeg',
+      offset: 0,
+      'x-entity-name': nameEntity,
+      'x-instagram-rupload-params': JSON.stringify(ruploadParams),
+      'x-entity-length': file.byteLength,
+      'Content-Length': file.byteLength,
+      'Content-Type': 'application/octet-stream',
+      'x-ig-app-id': `1217981644879628`,
+      'Accept-Encoding': 'gzip',
+      'X-Pigeon-Rawclienttime': (Date.now() / 1000).toFixed(3),
+      'X-IG-Connection-Speed': `${Math.random(1000, 3700)}kbps`,
+      'X-IG-Bandwidth-Speed-KBPS': '-1.000',
+      'X-IG-Bandwidth-TotalBytes-B': '0',
+      'X-IG-Bandwidth-TotalTime-MS': '0'
+    }
+
+    // Json = false, must be important to post work!
+    let responseUpload = await this.request({
+      uri: `/rupload_igphoto/${nameEntity}`,
+      headers: headersPhoto,
+      method: 'POST',
+      json: false,
+      body: file
+    })
+
+    try {
+      responseUpload = JSON.parse(responseUpload)
+
+      if ('upload_id' in responseUpload) return responseUpload
+
+      throw new Error('Image upload error')
+    } catch (e) {
+      throw new Error(`Image upload error: ${e}`)
+    }
   }
 
-  async uploadPhoto({ photo, caption = '' }) {
-    return this._uploadPhoto({ photo }).then(({ upload_id }) =>
-      this.request.post('/create/configure/', {
-        form: { upload_id, caption }
-      })
-    )
+  // Upload to story moved to uploadPhoto
+  // Post: 'feed' or 'story'
+  async uploadPhoto({ photo, caption = '', post = 'feed' }) {
+    const dateObj = new Date()
+    const now = dateObj
+      .toISOString()
+      .replace(/T/, ' ')
+      .replace(/\..+/, ' ')
+    const offset = dateObj.getTimezoneOffset()
+
+    const responseUpload = await this._uploadPhoto({ photo })
+
+    return this.request
+      .post(
+        `/create/${post === 'feed' ? 'configure/' : 'configure_to_story/'}`,
+        {
+          form: {
+            upload_id: responseUpload.upload_id,
+            caption,
+            timezone_offset: offset,
+            date_time_original: now,
+            date_time_digitalized: now,
+            source_type: '4',
+            edits: {
+              crop_original_size: [1080, 1080],
+              crop_center: [0.0, -0.0],
+              crop_zoom: 1.0
+            }
+          }
+        }
+      )
+      .then(response => response)
   }
 
   async getMediaFeedByLocation({ locationId }) {