@requestly/requestly-proxy 1.3.2 → 1.3.4

package/dist/components/proxy-middleware/constants.d.ts

@@ -1,11 +1,11 @@
 export namespace RULE_ACTION {
-    const REDIRECT: string;
-    const MODIFY_HEADERS: string;
-    const MODIFY_USER_AGENT: string;
-    const BLOCK: string;
-    const INSERT: string;
-    const DELAY: string;
-    const MODIFY_RESPONSE: string;
-    const MODIFY_REQUEST: string;
+    let REDIRECT: string;
+    let MODIFY_HEADERS: string;
+    let MODIFY_USER_AGENT: string;
+    let BLOCK: string;
+    let INSERT: string;
+    let DELAY: string;
+    let MODIFY_RESPONSE: string;
+    let MODIFY_REQUEST: string;
 }
 export const RQ_INTERCEPTED_CONTENT_TYPES: string[];

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

@@ -5,7 +5,7 @@ class CtxRQNamespace {
     constructor() {
         this.set_original_request = ({ method = null, path = null, host = null, port = null, headers = null, agent = null, body = null, query_params = null, }) => {
             if (headers) {
-                this.original_request.headers = Object.assign({}, headers);
+                this.original_request.headers = { ...headers };
             }
             this.original_request.method = method || this.original_request.method;
             this.original_request.path = path || this.original_request.path;
@@ -18,7 +18,7 @@ class CtxRQNamespace {
         };
         this.set_original_response = ({ status_code = null, headers = null, body = null, query_params = null, }) => {
             if (headers) {
-                this.original_response.headers = Object.assign({}, headers);
+                this.original_response.headers = { ...headers };
             }
             this.original_response.status_code =
                 status_code || this.original_response.status_code;
@@ -27,7 +27,7 @@ class CtxRQNamespace {
         this.set_final_request = (proxyToServerRequestOptions) => {
             const { method, path, host, port, headers, agent, body, query_params, } = proxyToServerRequestOptions;
             if (headers) {
-                this.final_request.headers = Object.assign({}, headers);
+                this.final_request.headers = { ...headers };
             }
             this.final_request.method = method || this.final_request.method;
             this.final_request.path = path || this.final_request.path;
@@ -41,7 +41,7 @@ class CtxRQNamespace {
         };
         this.set_final_response = ({ status_code = null, headers = null, body = null, }) => {
             if (headers) {
-                this.final_response.headers = Object.assign({}, headers);
+                this.final_response.headers = { ...headers };
             }
             this.final_response.status_code =
                 status_code || this.final_response.status_code;

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

@@ -88,7 +88,7 @@ const createHarPostData = (body, headers) => {
     //   };
     // }
     return {
-        mimeType: contentType,
+        mimeType: contentType, // Let's assume by default content type is JSON
         text: body,
     };
 };
@@ -97,10 +97,10 @@ const createHarPostData = (body, headers) => {
 const createRequestHarObject = (requestHarObject, proxyToServerRequestOptions) => {
     const { method, host, path, body, headers, agent, query_params } = proxyToServerRequestOptions;
     return {
-        bodySize: -1,
-        headersSize: -1,
+        bodySize: -1, // TODO: calculate the body size
+        headersSize: -1, // TODO: calculate the header size
         httpVersion: "HTTP/1.1",
-        cookies: [],
+        cookies: [], // TODO: add support for Cookies
         headers: requestHarObject.headers || createHarHeaders(headers),
         method: requestHarObject.method || method,
         queryString: requestHarObject.queryString || createHarQueryStrings(query_params),
@@ -140,10 +140,10 @@ const createHarEntry = (requestHeaders, method, protocol, host, path, requestBod
 exports.createHarEntry = createHarEntry;
 const createHarRequest = (requestHeaders, method, protocol, host, path, requestBody, requestParams) => {
     return {
-        bodySize: -1,
-        headersSize: -1,
+        bodySize: -1, // TODO: calculate the body size
+        headersSize: -1, // TODO: calculate the header size
         httpVersion: "HTTP/1.1",
-        cookies: [],
+        cookies: [], // TODO: add support for Cookies
         headers: createHarHeaders(requestHeaders),
         method: method,
         queryString: createHarQueryStrings(requestParams),

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

@@ -1,12 +1,7 @@
 "use strict";
-// TODO: Removing this for now
-// import {
-//   extractUrlComponent,
-//   getQueryParamsMap,
-// } from "../../../../../../../common/components/utils/utils";
-// const CONSTANTS = require("../../../../../../../common/constants");
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResponseStatusCode = exports.getResponseContentTypeHeader = exports.getResponseHeaders = exports.getRequestContentTypeHeader = exports.getRequestHeaders = exports.get_json_query_params = exports.get_request_options = exports.get_response_options = exports.is_request_preflight = exports.get_original_response_headers = exports.get_original_request_headers = exports.get_request_url = exports.getQueryParamsMap = void 0;
+exports.getResponseStatusCode = exports.getResponseContentTypeHeader = exports.getResponseHeaders = exports.getRequestContentTypeHeader = exports.getRequestHeaders = exports.get_json_query_params = exports.get_request_options = exports.get_response_options = exports.is_request_preflight = exports.get_original_response_headers = exports.get_original_request_headers = exports.get_request_url = void 0;
+exports.getQueryParamsMap = getQueryParamsMap;
 const requestly_core_1 = require("@requestly/requestly-core");
 function extractUrlComponent(url, name) {
     const myUrl = new URL(url);
@@ -49,7 +44,6 @@ function getQueryParamsMap(queryString) {
     });
     return map;
 }
-exports.getQueryParamsMap = getQueryParamsMap;
 const get_request_url = (ctx) => {
     return ((ctx.isSSL ? "https://" : "http://") +
         ctx.clientToProxyRequest.headers.host +
@@ -92,7 +86,10 @@ const get_response_options = (ctx) => {
 };
 exports.get_response_options = get_response_options;
 const get_request_options = (ctx) => {
-    return Object.assign(Object.assign({}, ctx.proxyToServerRequestOptions), { query_params: (0, exports.get_json_query_params)(ctx) });
+    return {
+        ...ctx.proxyToServerRequestOptions,
+        query_params: (0, exports.get_json_query_params)(ctx),
+    };
 };
 exports.get_request_options = get_request_options;
 const get_json_query_params = (ctx) => {

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

@@ -79,7 +79,7 @@ class RuleProcessorHelper {
             const rule_action = rule_processor.process({
                 rule,
                 requestURL: this.request_data.request_url,
-                details: Object.assign(Object.assign({}, this.request_data), { requestData }),
+                details: { ...this.request_data, requestData },
             });
             return rule_action;
         };
@@ -94,7 +94,7 @@ class RuleProcessorHelper {
             const rule_action = rule_processor.process({
                 rule,
                 requestURL: this.request_data.request_url,
-                details: Object.assign(Object.assign({}, this.request_data), { requestData }),
+                details: { ...this.request_data, requestData },
             });
             return rule_action;
         };

package/dist/components/proxy-middleware/index.d.ts

@@ -1,9 +1,9 @@
 export namespace MIDDLEWARE_TYPE {
-    const AMIUSING: string;
-    const RULES: string;
-    const LOGGER: string;
-    const SSL_CERT: string;
-    const GLOBAL_STATE: string;
+    let AMIUSING: string;
+    let RULES: string;
+    let LOGGER: string;
+    let SSL_CERT: string;
+    let GLOBAL_STATE: string;
 }
 export default ProxyMiddlewareManager;
 declare class ProxyMiddlewareManager {

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

@@ -1,13 +1,4 @@
 "use strict";
-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 };
 };
@@ -82,106 +73,100 @@ class ProxyMiddlewareManager {
             const self = this;
             const is_detachable = true;
             const logger_middleware = new logger_middleware_1.default(this.config[exports.MIDDLEWARE_TYPE.LOGGER], this.loggerService);
-            const idx = this.init_request_handler((ctx, callback) => __awaiter(this, void 0, void 0, function* () {
+            const idx = this.init_request_handler(async (ctx, callback) => {
                 ctx.rq = new ctx_rq_namespace_1.default();
                 ctx.rq.set_original_request((0, proxy_ctx_helper_1.get_request_options)(ctx));
                 ctx.proxyToServerRequestOptions.rejectUnauthorized = false;
                 // Figure out a way to enable/disable middleware dynamically
                 // instead of re-initing this again
                 const rules_middleware = new rules_middleware_1.default(this.config[exports.MIDDLEWARE_TYPE.RULES], ctx, this.rulesHelper);
-                ctx.onError(function (ctx, err, kind, callback) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        // Should only modify response body & headers
-                        ctx.rq_response_body = "" + kind + ": " + err, "utf8";
-                        const { action_result_objs, continue_request } = yield rules_middleware.on_response(ctx);
-                        // Only modify response if any modify_response action is applied
-                        const modifyResponseActionExist = action_result_objs.some((action_result_obj) => { var _a; return ((_a = action_result_obj === null || action_result_obj === void 0 ? void 0 : action_result_obj.action) === null || _a === void 0 ? void 0 : _a.action) === "modify_response"; });
-                        if (modifyResponseActionExist) {
-                            const statusCode = ctx.rq_response_status_code || 404;
-                            const responseHeaders = (0, proxy_ctx_helper_1.getResponseHeaders)(ctx) || {};
-                            ctx.proxyToClientResponse.writeHead(statusCode, http_1.default.STATUS_CODES[statusCode], responseHeaders);
-                            ctx.proxyToClientResponse.end(ctx.rq_response_body);
-                            ctx.rq.set_final_response({
-                                status_code: statusCode,
-                                headers: responseHeaders,
-                                body: ctx.rq_response_body,
-                            });
-                            logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
-                        }
-                        return callback();
-                    });
+                ctx.onError(async function (ctx, err, kind, callback) {
+                    // Should only modify response body & headers
+                    ctx.rq_response_body = "" + kind + ": " + err, "utf8";
+                    const { action_result_objs, continue_request } = await rules_middleware.on_response(ctx);
+                    // Only modify response if any modify_response action is applied
+                    const modifyResponseActionExist = action_result_objs.some((action_result_obj) => { var _a; return ((_a = action_result_obj === null || action_result_obj === void 0 ? void 0 : action_result_obj.action) === null || _a === void 0 ? void 0 : _a.action) === "modify_response"; });
+                    if (modifyResponseActionExist) {
+                        const statusCode = ctx.rq_response_status_code || 404;
+                        const responseHeaders = (0, proxy_ctx_helper_1.getResponseHeaders)(ctx) || {};
+                        ctx.proxyToClientResponse.writeHead(statusCode, http_1.default.STATUS_CODES[statusCode], responseHeaders);
+                        ctx.proxyToClientResponse.end(ctx.rq_response_body);
+                        ctx.rq.set_final_response({
+                            status_code: statusCode,
+                            headers: responseHeaders,
+                            body: ctx.rq_response_body,
+                        });
+                        logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
+                    }
+                    return callback();
                 });
                 let request_body_chunks = [];
-                ctx.onRequestData(function (ctx, chunk, callback) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        if (chunk) {
-                            request_body_chunks.push(chunk);
-                        }
-                        return callback(null, null); // don't write chunks to client Request
-                    });
+                ctx.onRequestData(async function (ctx, chunk, callback) {
+                    if (chunk) {
+                        request_body_chunks.push(chunk);
+                    }
+                    return callback(null, null); // don't write chunks to client Request
                 });
-                ctx.onRequestEnd(function (ctx, callback) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        let body = new Buffer.concat(request_body_chunks);
-                        const contentTypeHeader = (0, proxy_ctx_helper_1.getRequestContentTypeHeader)(ctx);
-                        const contentType = (0, http_helpers_1.getContentType)(contentTypeHeader);
-                        const parsedBody = (0, http_helpers_1.bodyParser)(contentTypeHeader, body);
-                        // Request body before any modifications
-                        let pre_final_body = parsedBody || body.toString("utf8");
-                        ctx.rq.set_original_request({ body: pre_final_body });
-                        ctx.rq_request_body = pre_final_body;
-                        if (parsedBody && constants_1.RQ_INTERCEPTED_CONTENT_TYPES.includes(contentType)) {
-                            // Do modifications, if any
-                            const { action_result_objs, continue_request } = yield rules_middleware.on_request_end(ctx);
-                        }
-                        // Use the updated request
-                        ctx.proxyToServerRequest.write(ctx.rq_request_body);
-                        ctx.rq.set_final_request({ body: ctx.rq_request_body });
-                        return callback();
-                    });
+                ctx.onRequestEnd(async function (ctx, callback) {
+                    let body = new Buffer.concat(request_body_chunks);
+                    const contentTypeHeader = (0, proxy_ctx_helper_1.getRequestContentTypeHeader)(ctx);
+                    const contentType = (0, http_helpers_1.getContentType)(contentTypeHeader);
+                    const parsedBody = (0, http_helpers_1.bodyParser)(contentTypeHeader, body);
+                    // Request body before any modifications
+                    let pre_final_body = parsedBody || body.toString("utf8");
+                    ctx.rq.set_original_request({ body: pre_final_body });
+                    ctx.rq_request_body = pre_final_body;
+                    if (parsedBody && constants_1.RQ_INTERCEPTED_CONTENT_TYPES.includes(contentType)) {
+                        // Do modifications, if any
+                        const { action_result_objs, continue_request } = await rules_middleware.on_request_end(ctx);
+                    }
+                    // Use the updated request
+                    ctx.proxyToServerRequest.write(ctx.rq_request_body);
+                    ctx.rq.set_final_request({ body: ctx.rq_request_body });
+                    return callback();
                 });
-                ctx.onResponse((ctx, callback) => __awaiter(this, void 0, void 0, function* () {
+                ctx.onResponse(async (ctx, callback) => {
                     ctx.rq.set_original_response((0, proxy_ctx_helper_1.get_response_options)(ctx));
-                    const { action_result_objs, continue_request: continue_response } = yield rules_middleware.on_response(ctx);
+                    const { action_result_objs, continue_request: continue_response } = await rules_middleware.on_response(ctx);
                     if (continue_response) {
                         return callback();
                     }
-                }));
+                });
                 let response_body_chunks = [];
-                ctx.onResponseData(function (ctx, chunk, callback) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        if (chunk) {
-                            response_body_chunks.push(chunk);
-                        }
-                        return callback(null, null); // don't write chunks to client response
-                    });
+                ctx.onResponseData(async function (ctx, chunk, callback) {
+                    if (chunk) {
+                        response_body_chunks.push(chunk);
+                    }
+                    return callback(null, null); // don't write chunks to client response
                 });
-                ctx.onResponseEnd(function (ctx, callback) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        let body = new Buffer.concat(response_body_chunks);
-                        const contentTypeHeader = (0, proxy_ctx_helper_1.getResponseContentTypeHeader)(ctx);
-                        const contentType = (0, http_helpers_1.getContentType)(contentTypeHeader);
-                        const parsedBody = (0, http_helpers_1.bodyParser)(contentTypeHeader, body);
+                ctx.onResponseEnd(async function (ctx, callback) {
+                    let body = new Buffer.concat(response_body_chunks);
+                    const contentTypeHeader = (0, proxy_ctx_helper_1.getResponseContentTypeHeader)(ctx);
+                    const contentType = (0, http_helpers_1.getContentType)(contentTypeHeader);
+                    const parsedBody = (0, http_helpers_1.bodyParser)(contentTypeHeader, body);
+                    ctx.rq.set_original_response({ body: parsedBody });
+                    ctx.rq_response_body = body;
+                    ctx.rq_parsed_response_body = parsedBody;
+                    ctx.rq_response_status_code = (0, proxy_ctx_helper_1.getResponseStatusCode)(ctx);
+                    if (constants_1.RQ_INTERCEPTED_CONTENT_TYPES.includes(contentType) && parsedBody) {
+                        ctx.rq_response_body = parsedBody;
                         ctx.rq.set_original_response({ body: parsedBody });
-                        ctx.rq_response_body = body;
-                        ctx.rq_parsed_response_body = parsedBody;
-                        ctx.rq_response_status_code = (0, proxy_ctx_helper_1.getResponseStatusCode)(ctx);
-                        if (constants_1.RQ_INTERCEPTED_CONTENT_TYPES.includes(contentType) && parsedBody) {
-                            ctx.rq_response_body = parsedBody;
-                            ctx.rq.set_original_response({ body: parsedBody });
-                        }
-                        const { action_result_objs, continue_request } = yield rules_middleware.on_response_end(ctx);
-                        const statusCode = ctx.rq_response_status_code || (0, proxy_ctx_helper_1.getResponseStatusCode)(ctx);
-                        ctx.proxyToClientResponse.writeHead(statusCode, http_1.default.STATUS_CODES[statusCode], (0, proxy_ctx_helper_1.getResponseHeaders)(ctx));
-                        ctx.proxyToClientResponse.write(ctx.rq_response_body);
-                        ctx.rq.set_final_response(Object.assign(Object.assign({}, (0, proxy_ctx_helper_1.get_response_options)(ctx)), { status_code: ctx.rq_response_status_code || (0, proxy_ctx_helper_1.getResponseStatusCode)(ctx), body: ctx.rq_response_body }));
-                        logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
-                        return callback();
+                    }
+                    const { action_result_objs, continue_request } = await rules_middleware.on_response_end(ctx);
+                    const statusCode = ctx.rq_response_status_code || (0, proxy_ctx_helper_1.getResponseStatusCode)(ctx);
+                    ctx.proxyToClientResponse.writeHead(statusCode, http_1.default.STATUS_CODES[statusCode], (0, proxy_ctx_helper_1.getResponseHeaders)(ctx));
+                    ctx.proxyToClientResponse.write(ctx.rq_response_body);
+                    ctx.rq.set_final_response({
+                        ...(0, proxy_ctx_helper_1.get_response_options)(ctx),
+                        status_code: ctx.rq_response_status_code || (0, proxy_ctx_helper_1.getResponseStatusCode)(ctx),
+                        body: ctx.rq_response_body,
                     });
+                    logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
+                    return callback();
                 });
                 // Remove headers that may conflict
                 delete (0, proxy_ctx_helper_1.getRequestHeaders)(ctx)["content-length"];
-                const { action_result_objs, continue_request } = yield rules_middleware.on_request(ctx);
+                const { action_result_objs, continue_request } = await rules_middleware.on_request(ctx);
                 ctx.rq.set_final_request((0, proxy_ctx_helper_1.get_request_options)(ctx));
                 // TODO: Removing this log for now. Will add this when support is added for upsert in firebase logs.
                 logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.LOADING);
@@ -189,10 +174,10 @@ class ProxyMiddlewareManager {
                 if (continue_request) {
                     return callback();
                 }
-            }), is_detachable);
+            }, is_detachable);
         };
         this.init_ssl_tunneling_handler = () => {
-            this.proxy.onConnect((req, socket, head, callback) => __awaiter(this, void 0, void 0, function* () {
+            this.proxy.onConnect(async (req, socket, head, callback) => {
                 const host = req.url.split(":")[0];
                 const port = req.url.split(":")[1];
                 const origin = `https://${host}`;
@@ -208,29 +193,27 @@ class ProxyMiddlewareManager {
                     port: port,
                     host: host,
                     allowHalfOpen: false,
-                }, function () {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        conn.on("finish", () => {
-                            console.log(`Finish ${host}`);
-                            socket.destroy();
-                            delete global.rq.sslTunnelingSocketsMap[req.url];
-                        });
-                        socket.on("close", () => {
-                            console.log("Close");
-                            conn.end();
-                        });
-                        // socket.on('data', (data) => {
-                        //   // console.log("FROM SOCKET: " + data.toString("ascii") + "\n");
-                        //   console.log("FROM SOCKET: data");
-                        // });
-                        // conn.on('data', (data) => {
-                        //   // console.log("FROM CONN: " + data.toString("ascii") + "\n");
-                        //   console.log("FROM CONN: data");
-                        // });
-                        socket.write("HTTP/1.1 200 OK\r\n\r\n", "UTF-8", function () {
-                            conn.pipe(socket);
-                            socket.pipe(conn);
-                        });
+                }, async function () {
+                    conn.on("finish", () => {
+                        console.log(`Finish ${host}`);
+                        socket.destroy();
+                        delete global.rq.sslTunnelingSocketsMap[req.url];
+                    });
+                    socket.on("close", () => {
+                        console.log("Close");
+                        conn.end();
+                    });
+                    // socket.on('data', (data) => {
+                    //   // console.log("FROM SOCKET: " + data.toString("ascii") + "\n");
+                    //   console.log("FROM SOCKET: data");
+                    // });
+                    // conn.on('data', (data) => {
+                    //   // console.log("FROM CONN: " + data.toString("ascii") + "\n");
+                    //   console.log("FROM CONN: data");
+                    // });
+                    socket.write("HTTP/1.1 200 OK\r\n\r\n", "UTF-8", function () {
+                        conn.pipe(socket);
+                        socket.pipe(conn);
                     });
                 });
                 conn.on("error", function (err) {
@@ -239,7 +222,7 @@ class ProxyMiddlewareManager {
                 socket.on("error", function (err) {
                     filterSocketConnReset(err, "CLIENT_TO_PROXY_SOCKET");
                 });
-            }));
+            });
             // Since node 0.9.9, ECONNRESET on sockets are no longer hidden
             function filterSocketConnReset(err, socketDescription) {
                 if (err.errno === "ECONNRESET") {

package/dist/components/proxy-middleware/middlewares/amiusing_middleware.js

@@ -1,17 +1,8 @@
 "use strict";
-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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 class AmisuingMiddleware {
     constructor(is_active) {
-        this.on_request = (ctx) => __awaiter(this, void 0, void 0, function* () {
+        this.on_request = async (ctx) => {
             if (!this.is_active) {
                 return true;
             }
@@ -20,7 +11,7 @@ class AmisuingMiddleware {
                     ["amiusingrequestly"]: "true",
                 });
             }
-        });
+        };
         this.is_active = is_active;
     }
 }

package/dist/components/proxy-middleware/middlewares/logger_middleware.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = require("lodash");
-const httpsnippet_1 = __importDefault(require("httpsnippet"));
+// import { cloneDeep } from "lodash";
+// import HTTPSnippet from "httpsnippet";
 const utils_1 = require("../rule_action_processor/utils");
 const harObectCreator_1 = require("../helpers/harObectCreator");
-const url = require("url");
+// const url = require("url");
 class LoggerMiddleware {
     constructor(is_active, loggerService) {
         this.generate_curl_from_har = (requestHarObject) => {
@@ -15,15 +12,14 @@ class LoggerMiddleware {
                 return "";
             }
             let requestCurl = "";
-            try {
-                const harObject = (0, lodash_1.cloneDeep)(requestHarObject);
-                requestCurl = new httpsnippet_1.default(harObject).convert("shell", "curl", {
-                    indent: " ",
-                });
-            }
-            catch (err) {
-                console.error(`LoggerMiddleware.generate_curl_from_har Error: ${err}`);
-            }
+            // try {
+            //   const harObject = cloneDeep(requestHarObject);
+            //   requestCurl = new HTTPSnippet(harObject).convert("shell", "curl", {
+            //     indent: " ",
+            //   });
+            // } catch (err) {
+            //   console.error(`LoggerMiddleware.generate_curl_from_har Error: ${err}`);
+            // }
             return requestCurl;
         };
         this.send_network_log = (ctx, action_result_objs = [], requestState = "") => {
@@ -76,7 +72,7 @@ class LoggerMiddleware {
                 id: ctx.uuid,
                 timestamp: Math.floor(Date.now() / 1000),
                 finalHar: (0, harObectCreator_1.createHar)(ctx.rq.final_request.headers, ctx.rq.final_request.method, protocol, ctx.rq.final_request.host, ctx.rq.final_request.path, ctx.rq.final_request.body, ctx.rq.final_response.status_code, ctx.rq.final_response.body, ctx.rq.final_response.headers || {}, ctx.rq.final_request.query_params),
-                requestShellCurl: this.generate_curl_from_har((_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.rq) === null || _a === void 0 ? void 0 : _a.final_request) === null || _b === void 0 ? void 0 : _b.requestHarObject),
+                requestShellCurl: this.generate_curl_from_har((_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.rq) === null || _a === void 0 ? void 0 : _a.final_request) === null || _b === void 0 ? void 0 : _b.requestHarObject), // TODO: Move this to client side
                 actions: (0, utils_1.get_success_actions_from_action_results)(action_result_objs),
                 consoleLogs: (_c = ctx === null || ctx === void 0 ? void 0 : ctx.rq) === null || _c === void 0 ? void 0 : _c.consoleLogs,
                 requestState

package/dist/components/proxy-middleware/middlewares/rules_middleware.js

@@ -1,13 +1,4 @@
 "use strict";
-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 };
 };
@@ -34,13 +25,16 @@ class RulesMiddleware {
             this.rule_processor_helper.init_response_data(this.response_data);
         };
         this._update_request_data = (data) => {
-            this.request_data = Object.assign(Object.assign({}, this.request_data), data);
+            this.request_data = {
+                ...this.request_data,
+                ...data,
+            };
             this.rule_processor_helper.init_request_data(this.request_data);
         };
-        this._fetch_rules = () => __awaiter(this, void 0, void 0, function* () {
+        this._fetch_rules = async () => {
             var _a;
-            this.active_rules = yield this.rulesHelper.get_rules(true, ((_a = this.request_data) === null || _a === void 0 ? void 0 : _a.request_headers) || {});
-        });
+            this.active_rules = await this.rulesHelper.get_rules(true, ((_a = this.request_data) === null || _a === void 0 ? void 0 : _a.request_headers) || {});
+        };
         /*
           @return: actions[]
         */
@@ -58,44 +52,44 @@ class RulesMiddleware {
                     this.action_result_objs.concat(action_result_objs);
             }
         };
-        this.on_request = (ctx) => __awaiter(this, void 0, void 0, function* () {
+        this.on_request = async (ctx) => {
             if (!this.is_active) {
                 return [];
             }
             // TODO: Remove this. Hack to fix rule not fetching first time.
-            yield this._fetch_rules();
+            await this._fetch_rules();
             this.on_request_actions = this._process_rules();
-            const { action_result_objs, continue_request } = yield this.rule_action_processor.process_actions(this.on_request_actions, ctx);
+            const { action_result_objs, continue_request } = await this.rule_action_processor.process_actions(this.on_request_actions, ctx);
             this._update_action_result_objs(action_result_objs);
             return { action_result_objs, continue_request };
-        });
-        this.on_response = (ctx) => __awaiter(this, void 0, void 0, function* () {
+        };
+        this.on_response = async (ctx) => {
             if (!this.is_active) {
                 return [];
             }
             this._init_response_data(ctx);
             this.on_response_actions = this._process_rules(true);
-            const { action_result_objs, continue_request } = yield this.rule_action_processor.process_actions(this.on_response_actions, ctx);
+            const { action_result_objs, continue_request } = await this.rule_action_processor.process_actions(this.on_response_actions, ctx);
             this._update_action_result_objs(action_result_objs);
             return { action_result_objs, continue_request };
-        });
-        this.on_request_end = (ctx) => __awaiter(this, void 0, void 0, function* () {
+        };
+        this.on_request_end = async (ctx) => {
             if (!this.is_active) {
                 return [];
             }
             this._update_request_data({ request_body: ctx.rq.get_json_request_body() });
-            const { action_result_objs, continue_request } = yield this.rule_action_processor.process_actions(this.on_request_actions, ctx);
+            const { action_result_objs, continue_request } = await this.rule_action_processor.process_actions(this.on_request_actions, ctx);
             this._update_action_result_objs(action_result_objs);
             return { action_result_objs, continue_request };
-        });
-        this.on_response_end = (ctx) => __awaiter(this, void 0, void 0, function* () {
+        };
+        this.on_response_end = async (ctx) => {
             if (!this.is_active) {
                 return [];
             }
-            const { action_result_objs, continue_request } = yield this.rule_action_processor.process_actions(this.on_response_actions, ctx);
+            const { action_result_objs, continue_request } = await this.rule_action_processor.process_actions(this.on_response_actions, ctx);
             this._update_action_result_objs(action_result_objs);
             return { action_result_objs, continue_request };
-        });
+        };
         this.is_active = is_active;
         this.rule_processor_helper = new rule_processor_helper_1.default();
         this.rule_action_processor = new rule_action_processor_1.default();