(Exceptions) clean up exceptions

src/core/request.ts

@@ -2,7 +2,14 @@ import { IgApiClient } from '../client';
 import { inRange, random } from 'lodash';
 import * as request from 'request-promise';
 import { Options, Response } from 'request';
-import { ActionSpamError, AuthenticationError, CheckpointError, RequestError, SentryBlockError } from '../exceptions';
+import {
+  ActionSpamError,
+  AuthenticationError,
+  CheckpointError,
+  PrivateUserError,
+  RequestError,
+  SentryBlockError,
+} from '../exceptions';
 import { plainToClass } from 'class-transformer';
 import { CheckpointResponse } from '../responses';
 import hmac = require('crypto-js/hmac-sha256');
@@ -33,14 +40,19 @@ export class Request {
   private static handleError(response: Response) {
     const json = response.body;
     if (json.spam) {
-      return new ActionSpamError(json);
+      return new ActionSpamError(response);
     }
-    if (json.message === 'challenge_required') {
-      const checkpointResponse = plainToClass(CheckpointResponse, json as CheckpointResponse);
-      return new CheckpointError(checkpointResponse);
-    }
-    if (json.message === 'login_required') {
-      return new AuthenticationError('Login required to process this request');
+    if (typeof json.message === 'string') {
+      if (json.message === 'challenge_required') {
+        const checkpointResponse = plainToClass(CheckpointResponse, json as CheckpointResponse);
+        return new CheckpointError(checkpointResponse);
+      }
+      if (json.message === 'login_required') {
+        return new AuthenticationError(response);
+      }
+      if (json.message.toLowerCase() === 'not authorized to view user') {
+        return new PrivateUserError(response);
+      }
     }
     if (json.error_type === 'sentry_block') {
       return new SentryBlockError(json);

src/exceptions.ts

@@ -3,75 +3,38 @@ 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';
 
 // Basic error
 export class APIError extends CustomError {
   constructor(message = 'Instagram API error was made.') {
     super(message);
   }
-
-  serialize() {
-    return {
-      error: this.constructor.name,
-      errorMessage: this.message,
-    };
-  }
 }
 
-export class RequestError extends APIError {
-  constructor(public response: Response) {
+export class RequestError<TBody extends { [x: string]: any } = any> extends APIError {
+  constructor(public response: Pick<Response, Exclude<keyof Response, 'body'>> & { body: TBody }) {
     super(
-      `${response.request.method} ${response.request.uri.path} - ${response.statusCode} ${
-        response.statusMessage
-      } ${response.body.message || ''}`,
+      `${response.body.message || ''}; ${response.request.method} ${response.request.uri.path} - ${
+        response.statusCode
+      } ${response.statusMessage}`,
     );
   }
 }
 
-export class AuthenticationError extends APIError {
-  constructor(message = 'Not possible to authenticate') {
-    super(message);
-  }
-}
+export class AuthenticationError extends RequestError<LoginRequiredResponse> {}
 
 export class ParseError extends APIError {
   constructor(public body: string) {
     super('Not possible to parse API response');
   }
 }
 
-export class ActionSpamError extends APIError {
-  constructor(public json) {
-    super('This action was disabled due to block from instagram!');
-    this.json = json;
-  }
-
-  serialize() {
-    return _.extend(APIError.prototype.serialize.call(this), {
-      errorData: {
-        blockTime: this.getBlockTime(),
-        message: this.getFeedbackMessage(),
-      },
-    });
-  }
-
-  getBlockTime() {
-    if (_.isObject(this.json) && _.isString(this.json.feedback_message)) {
-      const hours = this.json.feedback_message.match(/(\d+)(\s)*hour(s)/);
-      if (!hours || !_.isArray(hours)) return 0;
-      const blockTime = parseInt(hours[1]) * 60 * 60 * 1000;
-      return blockTime + 1000 * 60 * 5;
-    }
-    return 0;
-  }
-
-  getFeedbackMessage() {
-    let message = 'No feedback message';
-    if (_.isString(this.json.feedback_message)) {
-      const title = _.isString(this.json.feedback_title) ? this.json.feedback_title + ': ' : '';
-      message = title + this.json.feedback_message;
-    }
-    return message;
+export class ActionSpamError extends RequestError<SpamResponse> {
+  get expirationDate(): string | null {
+    const date = this.response.body.feedback_message.match(/(\d{4}-\d{2}-\d{2})/);
+    if (date === null) return null;
+    return date[0];
   }
 }
 
@@ -110,11 +73,7 @@ export class NotFoundError extends APIError {
   }
 }
 
-export class PrivateUserError extends APIError {
-  constructor(message = 'User is private and you are not authorized to view his content!') {
-    super(message);
-  }
-}
+export class PrivateUserError extends RequestError {}
 
 export class TooManyFollowsError extends APIError {
   constructor() {

src/responses/index.ts

@@ -6,3 +6,5 @@ export * from './account.repository.login.response';
 export * from './user.repository.info.response';
 export * from './user.repository.search.response';
 export * from './user.feed.response';
+export * from './spam.response';
+export * from './login-required.response';

src/responses/login-required.response.ts

@@ -0,0 +1,5 @@
+export interface LoginRequiredResponse {
+  message: 'login_required';
+  logout_reason: number;
+  status: 'fail';
+}

src/responses/spam.response.ts

@@ -0,0 +1,11 @@
+export interface SpamResponse {
+  message: 'feedback_required';
+  spam: true;
+  feedback_title: string;
+  feedback_message: string;
+  feedback_url: string;
+  feedback_appeal_label: string;
+  feedback_ignore_label: string;
+  feedback_action: string;
+  status: 'fail';
+}