@requestly/requestly-proxy 1.1.3 → 1.1.5

package/dist/components/proxy-middleware/constants.js

@@ -16,6 +16,7 @@ exports.RQ_INTERCEPTED_CONTENT_TYPES = [
     "text/plain",
     "text/javascript",
     "application/javascript",
+    "application/x-javascript",
     "text/css",
     "application/css",
     "application/json",

package/dist/components/proxy-middleware/rule_action_processor/index.js

@@ -90,7 +90,7 @@ class RuleActionProcessor {
                     action_result = (0, modify_request_processor_1.default)(rule_action, ctx);
                     break;
                 case constants_1.RULE_ACTION.MODIFY_RESPONSE:
-                    action_result = (0, modify_response_processor_1.default)(rule_action, ctx);
+                    action_result = yield (0, modify_response_processor_1.default)(rule_action, ctx);
                     break;
                 case constants_1.RULE_ACTION.INSERT:
                     action_result = (0, insert_processor_1.default)(rule_action, ctx);

package/dist/components/proxy-middleware/rule_action_processor/processors/modify_response_processor.d.ts

@@ -1,6 +1,6 @@
 export default process_modify_response_action;
-declare function process_modify_response_action(action: any, ctx: any): {
+declare function process_modify_response_action(action: any, ctx: any): Promise<{
     action: any;
     success: boolean;
     post_process_data: any;
-};
+}>;

package/dist/components/proxy-middleware/rule_action_processor/processors/modify_response_processor.js

@@ -18,14 +18,14 @@ const proxy_ctx_helper_1 = require("../../helpers/proxy_ctx_helper");
 const utils_1 = require("../utils");
 const fs_1 = __importDefault(require("fs"));
 const { types } = require("util");
-const process_modify_response_action = (action, ctx) => {
+const process_modify_response_action = (action, ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const allowed_handlers = [proxy_1.PROXY_HANDLER_TYPE.ON_RESPONSE_END];
     if (!allowed_handlers.includes(ctx.currentHandler)) {
         return (0, utils_1.build_action_processor_response)(action, false);
     }
     if (action.responseType &&
         action.responseType === requestly_core_1.CONSTANTS.RESPONSE_BODY_TYPES.CODE) {
-        modify_response_using_code(action, ctx);
+        yield modify_response_using_code(action, ctx);
         return (0, utils_1.build_action_processor_response)(action, true);
     }
     else if (action.responseType === requestly_core_1.CONSTANTS.RESPONSE_BODY_TYPES.LOCAL_FILE) {
@@ -36,7 +36,7 @@ const process_modify_response_action = (action, ctx) => {
         modify_response(ctx, action.response, action.statusCode);
         return (0, utils_1.build_action_processor_response)(action, true);
     }
-};
+});
 const modify_response = (ctx, new_resp, status_code) => {
     ctx.rq_response_body = new_resp;
     ctx.rq_response_status_code = status_code;
@@ -90,8 +90,7 @@ const modify_response_using_code = (action, ctx) => __awaiter(void 0, void 0, vo
         if (types.isPromise(finalResponse)) {
             finalResponse = yield finalResponse;
         }
-        const isResponseJSON = args.responseType && args.responseType.includes("application/json");
-        if (typeof finalResponse === "object" && isResponseJSON) {
+        if (typeof finalResponse === "object") {
             finalResponse = JSON.stringify(finalResponse);
         }
         if (finalResponse && typeof finalResponse === "string") {

package/dist/components/proxy-middleware/rule_action_processor/processors/redirect_processor.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const proxy_1 = require("../../../../lib/proxy");
 const proxy_ctx_helper_1 = require("../../helpers/proxy_ctx_helper");
 const modified_requests_pool_1 = __importDefault(require("../modified_requests_pool"));
-const redirectHelper_1 = require("../../helpers/redirectHelper");
+const handle_mixed_response_1 = __importDefault(require("../handle_mixed_response"));
 const utils_1 = require("../utils");
 const { URL } = require("url");
 // adding util to get origin header for handling cors
@@ -41,12 +41,9 @@ const process_redirect_action = (action, ctx) => __awaiter(void 0, void 0, void
     else {
         modified_requests_pool_1.default.add(new_url);
     }
-    // handle mixed content and redirect with preserve cookie
-    if ((0, redirectHelper_1.shouldMakeExternalRequest)(ctx, action)) {
-        const { status: wasExternalRequestSuccessful, responseData } = yield (0, redirectHelper_1.makeExternalRequest)(ctx, new_url);
-        if (wasExternalRequestSuccessful) {
-            return (0, utils_1.build_action_processor_response)(action, true, (0, utils_1.build_post_process_data)(responseData.status_code, responseData.headers, responseData.body));
-        }
+    const { status: isMixedResponse, response_data } = yield (0, handle_mixed_response_1.default)(ctx, new_url);
+    if (isMixedResponse) {
+        return (0, utils_1.build_action_processor_response)(action, true, (0, utils_1.build_post_process_data)(response_data.status_code, response_data.headers, response_data.body));
     }
     // If this is a pre-flight request, don't redirect it
     if ((0, proxy_ctx_helper_1.is_request_preflight)(ctx))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@requestly/requestly-proxy",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Proxy that gives superpowers to all the Requestly clients",
   "main": "dist/index.js",
   "scripts": {

package/dist/components/proxy-middleware/helpers/redirectHelper.d.ts

@@ -1,9 +0,0 @@
-export function shouldMakeExternalRequest(ctx: any, action: any): boolean;
-export function makeExternalRequest(ctx: any, url: any): Promise<{
-    status: boolean;
-    responseData: {
-        headers: any;
-        status_code: any;
-        body: any;
-    };
-}>;

package/dist/components/proxy-middleware/helpers/redirectHelper.js

@@ -1,166 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeExternalRequest = exports.shouldMakeExternalRequest = void 0;
-const parser = require("ua-parser-js");
-const Sentry = __importStar(require("@sentry/browser"));
-const https_1 = __importDefault(require("https"));
-const http_1 = __importDefault(require("http"));
-const willCreateMixedResponseThatCanBeHandled = (ctx, destinationUrl) => {
-    var _a, _b, _c;
-    let user_agent_str = null;
-    user_agent_str = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.clientToProxyRequest) === null || _a === void 0 ? void 0 : _a.headers["user-agent"];
-    const user_agent = (_c = (_b = parser(user_agent_str)) === null || _b === void 0 ? void 0 : _b.browser) === null || _c === void 0 ? void 0 : _c.name;
-    const LOCAL_DOMAINS = ["localhost", "127.0.0.1"];
-    return ctx.isSSL && destinationUrl.includes("http:") && (user_agent === "Safari" ||
-        !LOCAL_DOMAINS.some((domain) => destinationUrl.includes(domain)));
-};
-const canPreserveCookie = (ctx, destinationUrl) => {
-    /* DOES NOT WORK */
-    // CAN'T DIFFERENTIATE CALL TO TOP LEVEL DOCUMENT
-    // // had to create this because host and referer were sometimes same 
-    // // but had additional prefixes like `/`
-    // // note: neither referer nor host have search params
-    // const areUrlsSame = (u1, u2) => {
-    //   try {
-    //     let u1obj = new URL(u1)
-    //     let u2obj = new URL(u2)  
-    //     return u1obj.href === u2obj.href
-    //   } catch {
-    //     // when url objects were not properly formed
-    //     return false
-    //   }
-    // }
-    // const requestHeaders = ctx?.clientToProxyRequest?.headers;
-    // const referer = requestHeaders["referer"] || requestHeaders["Referer"]
-    // const origin = requestHeaders["origin"] || requestHeaders["Origin"]
-    // // cannot preserve cookie on request for toplevel document
-    // if (
-    //   // navigating to the domain directly from the search bar
-    //   !referer || 
-    //   // when navigating using google search result
-    //   // referrer is present but origin is not
-    //   !origin || // bug: origin not passed by firefox in some cases
-    //   !areUrlsSame(referer, origin) 
-    // ) return false 
-    return true;
-};
-const shouldMakeExternalRequest = (ctx, action) => {
-    return ((action.preserveCookie && canPreserveCookie(ctx, action.url)) ||
-        willCreateMixedResponseThatCanBeHandled(ctx, action.url));
-};
-exports.shouldMakeExternalRequest = shouldMakeExternalRequest;
-function makeRequest(requestOptions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let requestAgent = http_1.default;
-        if (requestOptions.url.includes("https"))
-            requestAgent = https_1.default;
-        requestOptions.headers["Cache-Control"] = "no-cache";
-        try {
-            const { data, response } = yield new Promise((resolve, reject) => {
-                // `.request` wasn't working well with the provided request options
-                // node only provides wrapper for get, hence did not implement other methods
-                if (requestOptions.method === "GET") {
-                    let request = requestAgent.get(requestOptions.url, requestOptions, (res) => {
-                        const dataBuffers = [];
-                        res.on('data', (buffer) => {
-                            dataBuffers.push(buffer);
-                        });
-                        res.on('end', () => {
-                            resolve({ data: Buffer.concat(dataBuffers).toString(), response: res });
-                        });
-                    });
-                    request.on('error', (error) => {
-                        console.log("requestError", requestOptions);
-                        console.error(error);
-                        reject(error);
-                    });
-                }
-                else {
-                    // hack: to return an understandable response back to user
-                    // @nsr fix: implement all other methods using some workaround of http.request bug
-                    const errMsg = "Can only preserve cookies for get requests";
-                    const customError = new Error(errMsg);
-                    customError.response = { data: errMsg };
-                    throw customError;
-                }
-            });
-            return { success: true, response, data };
-        }
-        catch (error) {
-            Sentry.captureException(error);
-            console.error(error);
-            return { success: false, error };
-        }
-    });
-}
-const makeExternalRequest = (ctx, url) => __awaiter(void 0, void 0, void 0, function* () {
-    const requestOptions = ctx.proxyToServerRequestOptions;
-    // can't pass all request options because they o
-    // verride some attrubutes of node http request options 
-    // in the wrong way
-    let finalRequestOptions = {
-        headers: Object.assign({}, requestOptions.headers),
-        url,
-        method: requestOptions.method
-    };
-    if (url.includes("https")) {
-        finalRequestOptions = Object.assign(Object.assign({}, finalRequestOptions), { rejectUnauthorized: false, requestCert: true, agent: false, strictSSL: false });
-    }
-    const { success, error, response, data } = yield makeRequest(finalRequestOptions);
-    if (success) {
-        return {
-            status: true,
-            responseData: {
-                headers: Object.assign(Object.assign({}, response.headers), { "connection": "close", "Cache-Control": "no-cache" }),
-                status_code: response.statuscode,
-                body: data,
-            },
-        };
-    }
-    else {
-        return {
-            status: true,
-            responseData: {
-                headers: { "Cache-Control": "no-cache" },
-                status_code: 502,
-                body: error.response ? error.response.data : null,
-            },
-        };
-    }
-});
-exports.makeExternalRequest = makeExternalRequest;

package/dist/components/proxy-middleware/rule_action_processor/processors/helpers/redirectHelper.d.ts

@@ -1,22 +0,0 @@
-export function handleMixedResponse(ctx: any, destinationUrl: any): Promise<{
-    status: boolean;
-    response_data: {
-        headers: any;
-        status_code: any;
-        body: any;
-    };
-} | {
-    status: boolean;
-    response_data?: undefined;
-}>;
-export function handleServerSideRedirect(ctx: any, destinationUrl: any): Promise<{
-    status: boolean;
-    response_data: {
-        headers: any;
-        status_code: any;
-        body: any;
-    };
-} | {
-    status: boolean;
-    response_data?: undefined;
-}>;

package/dist/components/proxy-middleware/rule_action_processor/processors/helpers/redirectHelper.js

@@ -1,149 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleServerSideRedirect = exports.handleMixedResponse = void 0;
-const parser = require("ua-parser-js");
-const Sentry = __importStar(require("@sentry/browser"));
-const https_1 = __importDefault(require("https"));
-function makeSameRequestToDifferentUrl(ctx, url) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const requestOptions = {
-                headers: Object.assign(Object.assign({}, (_a = ctx === null || ctx === void 0 ? void 0 : ctx.clientToProxyRequest) === null || _a === void 0 ? void 0 : _a.headers), { "Cache-Control": "no-cache" }),
-                rejectUnauthorized: false,
-                requestCert: true,
-                agent: false,
-                strictSSL: false,
-            };
-            const { data, response } = yield new Promise((resolve, reject) => {
-                let request = https_1.default.get(url, requestOptions, (res) => {
-                    const dataBuffers = [];
-                    res.on('data', (buffer) => {
-                        dataBuffers.push(buffer);
-                    });
-                    res.on('end', () => {
-                        resolve({ data: Buffer.concat(dataBuffers).toString(), response: res });
-                    });
-                });
-                request.on('error', (error) => {
-                    console.error(error);
-                    reject(error);
-                });
-            });
-            return { success: true, response, data };
-        }
-        catch (error) {
-            Sentry.captureException(error);
-            console.error(error);
-            return { success: false, error };
-        }
-    });
-}
-const willCreateMixedResponse = (ctx, destinationUrl) => {
-    var _a, _b, _c, _d;
-    let user_agent_str = null;
-    user_agent_str = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.clientToProxyRequest) === null || _a === void 0 ? void 0 : _a.headers["user-agent"];
-    console.log("handling mixed response. i got headers", (_b = ctx === null || ctx === void 0 ? void 0 : ctx.clientToProxyRequest) === null || _b === void 0 ? void 0 : _b.headers);
-    const user_agent = (_d = (_c = parser(user_agent_str)) === null || _c === void 0 ? void 0 : _c.browser) === null || _d === void 0 ? void 0 : _d.name;
-    const LOCAL_DOMAINS = ["localhost", "127.0.0.1"];
-    return ctx.isSSL && (user_agent === "Safari" ||
-        !LOCAL_DOMAINS.some((domain) => destinationUrl.includes(domain)));
-};
-const handleMixedResponse = (ctx, destinationUrl) => __awaiter(void 0, void 0, void 0, function* () {
-    if (willCreateMixedResponse(ctx, destinationUrl)) {
-        const { success, error, response, data } = yield makeSameRequestToDifferentUrl(ctx, destinationUrl);
-        if (success) {
-            return {
-                status: true,
-                response_data: {
-                    headers: Object.assign(Object.assign({}, response.headers), { "connection": "close", "Cache-Control": "no-cache" }),
-                    status_code: response.statuscode,
-                    body: data,
-                },
-            };
-        }
-        else {
-            return {
-                status: true,
-                response_data: {
-                    headers: { "Cache-Control": "no-cache" },
-                    status_code: 502,
-                    body: error.response ? error.responserror.data : null,
-                },
-            };
-        }
-    }
-    return { status: false };
-});
-exports.handleMixedResponse = handleMixedResponse;
-const canMakeServerSideRedirect = (ctx, destinationUrl) => {
-    // todo: no redirects for html documents
-    // content-type
-    // will be handled by mixed content case
-    if (destinationUrl.includes("http"))
-        return false;
-    return true;
-};
-const handleServerSideRedirect = (ctx, destinationUrl) => __awaiter(void 0, void 0, void 0, function* () {
-    if (canMakeServerSideRedirect(ctx, destinationUrl)) {
-        const { success, error, response, data } = yield makeSameRequestToDifferentUrl(ctx, destinationUrl);
-        if (success) {
-            return {
-                status: true,
-                response_data: {
-                    headers: Object.assign(Object.assign({}, response.headers), { "connection": "close", "Cache-Control": "no-cache" }),
-                    status_code: response.statuscode,
-                    body: data,
-                },
-            };
-        }
-        else {
-            return {
-                status: true,
-                response_data: {
-                    headers: { "Cache-Control": "no-cache" },
-                    status_code: 502,
-                    body: error.response ? error.responserror.data : null,
-                },
-            };
-        }
-    }
-    return { status: false };
-});
-exports.handleServerSideRedirect = handleServerSideRedirect;
-// export default handleMixedResponse; // change exports