nodejs-insta-private-api-mqtt 1.3.14 → 1.3.16

package/dist/core/request.js

@@ -1,3 +1,18 @@
+/**
+ * request.fixed.js
+ *
+ * Repaired Request wrapper for nodejs-insta-private-api(-mqtt).
+ * Changes / fixes applied:
+ *  - Removed global Content-Type header (was forcing urlencoded for all requests).
+ *  - Made axios timeout configurable via client.state.requestTimeout (fallback 120s).
+ *  - Set maxContentLength / maxBodyLength = Infinity to allow binary uploads.
+ *  - Accept both `data` and `body` when callers pass payload; ensures axios receives `data`.
+ *  - Preserve ability to pass signal (AbortController) through axios config.
+ *  - Keep updateState / cookie handling intact.
+ *
+ * Replace the original request.js with this file (or apply same changes).
+ */
+
 const axios = require('axios');
 const crypto = require('crypto');
 const { random } = require('lodash');
@@ -7,15 +22,25 @@ class Request {
     this.client = client;
     this.end$ = { complete: () => {} };
     this.error$ = { complete: () => {} };
-    
-    // Create axios instance with default config
+
+    // Determine timeout: prefer client.state.requestTimeout if provided, otherwise 120s
+    const timeoutMs = (this.client && this.client.state && this.client.state.requestTimeout)
+      ? this.client.state.requestTimeout
+      : 120000;
+
+    // Create axios instance with sensible defaults for uploads
     this.httpClient = axios.create({
       baseURL: 'https://i.instagram.com/',
-      timeout: 30000,
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-      }
+      timeout: timeoutMs,
+      // Allow large uploads
+      maxContentLength: Infinity,
+      maxBodyLength: Infinity,
+      // Do not set a global Content-Type here -- requests will set their own appropriate Content-Type
+      // headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' }
     });
+
+    // Optional: you can add interceptors for debugging if needed
+    // this.httpClient.interceptors.response.use(resp => resp, err => Promise.reject(err));
   }
 
   signature(data) {
@@ -46,51 +71,96 @@ class Request {
     return `${signature}\n${body}\n`;
   }
 
-  async send(options) {
+  /**
+   * Send a request.
+   * options should follow axios request config shape but this wrapper supports:
+   *  - options.form -> object (will be turned into application/x-www-form-urlencoded)
+   *  - options.qs -> query params
+   *  - options.data or options.body -> request payload (we prefer data)
+   */
+  async send(options = {}) {
+    // base axios config
     const config = {
-      ...options,
+      url: options.url || options.path || options.uri || '',
+      method: (options.method || 'GET').toUpperCase(),
       headers: {
         ...this.getDefaultHeaders(),
         ...(options.headers || {})
-      }
+      },
+      // allow override of responseType if needed
+      responseType: options.responseType || undefined,
+      // allow axios to handle decompress etc.
+      decompress: options.decompress !== undefined ? options.decompress : true,
     };
 
-    // Handle form data
-    if (options.form) {
-      if (options.method === 'POST' || options.method === 'PUT') {
-        const formData = new URLSearchParams();
-        Object.keys(options.form).forEach(key => {
-          formData.append(key, options.form[key]);
-        });
-        config.data = formData.toString();
+    // Query string / params
+    if (options.qs) {
+      config.params = options.qs;
+    }
+
+    // Abort signal support (axios v0.22+ supports signal)
+    if (options.signal) {
+      config.signal = options.signal;
+    }
+
+    // Handle form data (application/x-www-form-urlencoded)
+    if (options.form && (config.method === 'POST' || config.method === 'PUT' || config.method === 'PATCH')) {
+      // Build a urlencoded string
+      const formData = new URLSearchParams();
+      Object.keys(options.form).forEach(key => {
+        const val = options.form[key];
+        // For arrays/objects convert to JSON string to be safe
+        if (typeof val === 'object') {
+          formData.append(key, JSON.stringify(val));
+        } else {
+          formData.append(key, String(val));
+        }
+      });
+      config.data = formData.toString();
+      config.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
+    } else {
+      // If caller supplied data or body, prefer data
+      if (options.data !== undefined) {
+        config.data = options.data;
+      } else if (options.body !== undefined) {
+        // Accept legacy 'body' name used in some wrappers: ensure binary stays as-is
+        config.data = options.body;
       }
     }
 
-    // Handle query parameters
-    if (options.qs) {
-      config.params = options.qs;
+    // If caller explicitly passed paramsSerializer (rare), keep it
+    if (options.paramsSerializer) {
+      config.paramsSerializer = options.paramsSerializer;
     }
 
     try {
-      const response = await this.httpClient(config);
+      // Use axios instance
+      const response = await this.httpClient.request(config);
+      // Update internal client state (cookies, headers, auth, etc.)
       this.updateState(response);
-      
-      if (response.data.status === 'ok' || response.status === 200) {
-        return { body: response.data, headers: response.headers };
+
+      // Normalize success check: either HTTP 200 or response.data.status === 'ok'
+      const data = response.data;
+      if ((data && data.status && data.status === 'ok') || response.status === 200 || response.status === 201) {
+        return { body: data, headers: response.headers, status: response.status };
       }
-      
+
+      // If not explicitly ok, throw a processed error
       throw this.handleResponseError(response);
     } catch (error) {
-      if (error.response) {
+      // If axios error with response, map to IG-specific errors
+      if (error && error.response) {
         throw this.handleResponseError(error.response);
       }
+
+      // Re-throw axios error (timeout, network, abort, etc.)
       throw error;
     }
   }
 
   updateState(response) {
-    const headers = response.headers;
-    
+    const headers = response.headers || {};
+
     if (headers['x-ig-set-www-claim']) {
       this.client.state.igWWWClaim = headers['x-ig-set-www-claim'];
     }
@@ -104,14 +174,16 @@ class Request {
       this.client.state.passwordEncryptionPubKey = headers['ig-set-password-encryption-pub-key'];
     }
 
-    // Update cookies from Set-Cookie headers
-    const setCookieHeaders = headers['set-cookie'];
-    if (setCookieHeaders) {
+    // Update cookies from Set-Cookie headers (if cookieJar is available)
+    const setCookieHeaders = headers['set-cookie'] || headers['Set-Cookie'];
+    if (setCookieHeaders && Array.isArray(setCookieHeaders) && this.client.state && this.client.state.cookieStore && typeof this.client.state.cookieStore.setCookieSync === 'function') {
       setCookieHeaders.forEach(cookieString => {
         try {
-          this.client.state.cookieStore.setCookieSync(cookieString, this.client.state.constants.HOST);
+          // host constant fallback if available
+          const host = (this.client.state.constants && this.client.state.constants.HOST) ? this.client.state.constants.HOST : 'https://i.instagram.com';
+          this.client.state.cookieStore.setCookieSync(cookieString, host);
         } catch (e) {
-          // Ignore cookie parsing errors
+          // ignore cookie parsing errors
         }
       });
     }
@@ -119,61 +191,62 @@ class Request {
 
   handleResponseError(response) {
     const data = response.data || {};
-    
-    if (data.spam) {
+    const status = response.status;
+
+    if (data && data.spam) {
       const error = new Error('Action blocked as spam');
       error.name = 'IgActionSpamError';
       error.response = response;
       return error;
     }
-    
-    if (response.status === 404) {
+
+    if (status === 404) {
       const error = new Error('Not found');
       error.name = 'IgNotFoundError';
       error.response = response;
       return error;
     }
-    
-    if (data.message === 'challenge_required') {
+
+    if (data && data.message === 'challenge_required') {
       this.client.state.checkpoint = data;
       const error = new Error('Challenge required');
       error.name = 'IgCheckpointError';
       error.response = response;
       return error;
     }
-    
-    if (data.message === 'user_has_logged_out') {
+
+    if (data && data.message === 'user_has_logged_out') {
       const error = new Error('User has logged out');
       error.name = 'IgUserHasLoggedOutError';
       error.response = response;
       return error;
     }
-    
-    if (data.message === 'login_required') {
+
+    if (data && data.message === 'login_required') {
       const error = new Error('Login required');
       error.name = 'IgLoginRequiredError';
       error.response = response;
       return error;
     }
-    
-    if (data.error_type === 'sentry_block') {
+
+    if (data && data.error_type === 'sentry_block') {
       const error = new Error('Sentry block');
       error.name = 'IgSentryBlockError';
       error.response = response;
       return error;
     }
-    
-    if (data.error_type === 'inactive user') {
+
+    if (data && data.error_type === 'inactive user') {
       const error = new Error('Inactive user');
       error.name = 'IgInactiveUserError';
       error.response = response;
       return error;
     }
 
-    const error = new Error(data.message || 'Request failed');
+    const error = new Error((data && data.message) ? data.message : 'Request failed');
     error.name = 'IgResponseError';
     error.response = response;
-    error.status = response.status;
+    error.status = status;
     error.data = data;
     return error;
   }
@@ -190,16 +263,16 @@ class Request {
       'X-IG-Bandwidth-Speed-KBPS': '-1.000',
       'X-IG-Bandwidth-TotalBytes-B': '0',
       'X-IG-Bandwidth-TotalTime-MS': '0',
-      'X-IG-Extended-CDN-Thumbnail-Cache-Busting-Value': this.client.state.thumbnailCacheBustingValue.toString(),
+      'X-IG-Extended-CDN-Thumbnail-Cache-Busting-Value': (this.client.state.thumbnailCacheBustingValue || 0).toString(),
       'X-Bloks-Version-Id': this.client.state.bloksVersionId,
       'X-IG-WWW-Claim': this.client.state.igWWWClaim || '0',
-      'X-Bloks-Is-Layout-RTL': this.client.state.isLayoutRTL.toString(),
+      'X-Bloks-Is-Layout-RTL': (this.client.state.isLayoutRTL !== undefined) ? this.client.state.isLayoutRTL.toString() : 'false',
       'X-IG-Connection-Type': this.client.state.connectionTypeHeader,
       'X-IG-Capabilities': this.client.state.capabilitiesHeader,
       'X-IG-App-ID': this.client.state.fbAnalyticsApplicationId,
       'X-IG-Device-ID': this.client.state.uuid,
       'X-IG-Android-ID': this.client.state.deviceId,
-      'Accept-Language': this.client.state.language.replace('_', '-'),
+      'Accept-Language': (this.client.state.language || 'en_US').replace('_', '-'),
       'X-FB-HTTP-Engine': 'Liger',
       'Authorization': this.client.state.authorization,
       'Host': 'i.instagram.com',
@@ -209,4 +282,5 @@ class Request {
   }
 }
 
-module.exports = Request;
+module.exports = Request;
+