Clean up exceptions, integrate rxjs to request

Author: dilame

src/core/request.ts

@@ -1,7 +1,9 @@
-import { IgApiClient } from '../client';
 import { inRange, random } from 'lodash';
+import { Subject } from 'rxjs';
 import * as request from 'request-promise';
 import { Options, Response } from 'request';
+import hmac = require('crypto-js/hmac-sha256');
+import { IgApiClient } from '../client';
 import {
   ActionSpamError,
   AuthenticationError,
@@ -10,9 +12,6 @@ import {
   RequestError,
   SentryBlockError,
 } from '../exceptions';
-import { plainToClass } from 'class-transformer';
-import { CheckpointResponse } from '../responses';
-import hmac = require('crypto-js/hmac-sha256');
 
 type Payload = { [key: string]: any } | string;
 
@@ -22,6 +21,7 @@ interface SignedPost {
 }
 
 export class Request {
+  end$ = new Subject();
   constructor(private client: IgApiClient) {}
 
   private static requestTransform(body, response: Response, resolveWithFullResponse) {
@@ -37,15 +37,15 @@ export class Request {
     return resolveWithFullResponse ? response : response.body;
   }
 
-  private static handleError(response: Response) {
+  private handleError(response: Response) {
     const json = response.body;
     if (json.spam) {
       return new ActionSpamError(response);
     }
     if (typeof json.message === 'string') {
       if (json.message === 'challenge_required') {
-        const checkpointResponse = plainToClass(CheckpointResponse, json as CheckpointResponse);
-        return new CheckpointError(checkpointResponse);
+        this.client.state.checkpoint = json;
+        return new CheckpointError(response);
       }
       if (json.message === 'login_required') {
         return new AuthenticationError(response);
@@ -80,7 +80,8 @@ export class Request {
     if (response.body.status === 'ok') {
       return response;
     }
-    const error = Request.handleError(response);
+    const error = this.handleError(response);
+    this.end$.next();
     throw error;
   }
 

src/core/state.ts

@@ -1,14 +1,15 @@
+import * as _ from 'lodash';
+import * as Bluebird from 'bluebird';
 import * as Chance from 'chance';
+import { jar } from 'request';
+import { MemoryCookieStore, Cookie, CookieJar } from 'tough-cookie';
 import * as devices from '../samples/devices.json';
 import * as builds from '../samples/builds.json';
 import * as loginExperiments from '../samples/login-experiments.json';
 import * as experiments from '../samples/experiments.json';
-import { MemoryCookieStore, Cookie, CookieJar } from 'tough-cookie';
-import { jar } from 'request';
 import * as CONSTANTS from './constants';
-import * as _ from 'lodash';
-import * as Bluebird from 'bluebird';
 import { TLD } from './constants';
+import { CheckpointResponse } from '../responses';
 
 export class State {
   signatureKey: string = '19ce5f445dbfd9d29c59dc2a78c616a7fc090a8e018b9267bc4240a30244c53b';
@@ -36,6 +37,7 @@ export class State {
   proxyUrl: string;
   cookieStore = new MemoryCookieStore();
   cookieJar = jar(this.cookieStore);
+  checkpoint: CheckpointResponse = null;
   get CSRFToken() {
     const cookies = this.cookieJar.getCookies(CONSTANTS.HOST);
     const item = _.find(cookies, { key: 'csrftoken' });

src/exceptions.ts

@@ -1,6 +1,4 @@
-import * as _ from 'lodash';
 import { CustomError } from 'ts-custom-error';
-import * as routes from './core/routes';
 import { CheckpointResponse } from './responses';
 import { Response } from 'request';
 import { LoginRequiredResponse, SpamResponse } from './responses';
@@ -38,20 +36,13 @@ export class ActionSpamError extends RequestError<SpamResponse> {
   }
 }
 
-export class CheckpointError extends APIError {
-  constructor(public json: CheckpointResponse) {
-    super('Instagram call checkpoint for this action!');
-  }
-
+export class CheckpointError extends RequestError<CheckpointResponse> {
   get url() {
-    if (_.isObject(this.json.challenge) && _.isString(this.json.challenge.url)) {
-      return this.json.challenge.url;
-    }
-    return routes.getWebUrl('challenge');
+    return this.response.body.challenge.url;
   }
 
   get apiUrl() {
-    return 'https://i.instagram.com/api/v1' + this.json.challenge.api_path;
+    return 'https://i.instagram.com/api/v1' + this.response.body.challenge.api_path;
   }
 }
 

src/responses/checkpoint.response.ts

@@ -1,18 +1,14 @@
-import { Type } from 'class-transformer';
-
-class Challenge {
+export interface CheckpointResponse {
+  message: string;
+  challenge: CheckpointResponseChallenge;
+  status: string;
+  error_type: string;
+}
+export interface CheckpointResponseChallenge {
   url: string;
   api_path: string;
   hide_webview_header: boolean;
   lock: boolean;
   logout: boolean;
   native_flow: boolean;
 }
-
-export class CheckpointResponse {
-  message: string;
-  @Type(() => Challenge)
-  challenge: Challenge;
-  status: string;
-  error_type: string;
-}