@requestly/requestly-proxy 1.1.20 → 1.1.22

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

@@ -33,6 +33,19 @@ const bodyParser = (contentTypeHeader, buffer) => {
         });
     }
     return str_buffer;
+    /*
+     FOLLOWING IS HOW API CLIENT PARSES THE BODY
+     much simpler than above, but requires thorough testing
+    */
+    // // todo: add support for other content types
+    // let parsedResponse;
+    // if (contentTypeHeader?.includes("image/")) {
+    //   const raw = Buffer.from(buffer).toString("base64");
+    //   parsedResponse = `data:${contentTypeHeader};base64,${raw}`;
+    // } else {
+    //   parsedResponse = new TextDecoder().decode(buffer);
+    // }
+    // return parsedResponse;
 };
 exports.bodyParser = bodyParser;
 const getContentType = (contentTypeHeader) => {

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

@@ -160,18 +160,15 @@ class ProxyMiddlewareManager {
                         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.set_original_response({ body: parsedBody });
-                            // Body and status code before any modifications
                             ctx.rq_response_body = parsedBody;
-                            const { action_result_objs, continue_request } = yield rules_middleware.on_response_end(ctx);
-                            // ctx.rq_response_body, ctx.rq_response_status_code after modifications
-                            // TODO: @sahil to investigate why this is need
-                            // Remove some conflicting headers like content-length, if any
-                            delete (0, proxy_ctx_helper_1.getResponseHeaders)(ctx)["content-length"];
+                            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);

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

@@ -20,6 +20,7 @@ const fs_1 = __importDefault(require("fs"));
 const http_helpers_1 = require("../../helpers/http_helpers");
 const capture_console_logs_1 = __importDefault(require("capture-console-logs"));
 const utils_2 = require("../../../../utils");
+const constants_1 = require("../../constants");
 const { types } = require("util");
 const process_modify_response_action = (action, ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const allowed_handlers = [proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST, proxy_1.PROXY_HANDLER_TYPE.ON_RESPONSE_END, proxy_1.PROXY_HANDLER_TYPE.ON_ERROR];
@@ -47,18 +48,32 @@ const process_modify_response_action = (action, ctx) => __awaiter(void 0, void 0
     }
     if (action.responseType &&
         action.responseType === requestly_core_1.CONSTANTS.RESPONSE_BODY_TYPES.CODE) {
-        yield modify_response_using_code(action, ctx);
-        return (0, utils_1.build_action_processor_response)(action, true);
+        const contentTypeHeader = (0, proxy_ctx_helper_1.getResponseContentTypeHeader)(ctx);
+        const contentType = (0, http_helpers_1.getContentType)(contentTypeHeader);
+        if (constants_1.RQ_INTERCEPTED_CONTENT_TYPES.includes(contentType) || contentType == null) {
+            yield modify_response_using_code(action, ctx);
+            delete_breaking_headers(ctx);
+            return (0, utils_1.build_action_processor_response)(action, true);
+        }
+        // Sentry not working
+        // Sentry.captureException(new Error(`Content Type ${contentType} not supported for modification in programmatic mode`));
+        console.log(`Content Type ${contentType} not supported for modification in programmatic mode`);
+        return (0, utils_1.build_action_processor_response)(action, false);
     }
     else if (action.responseType === requestly_core_1.CONSTANTS.RESPONSE_BODY_TYPES.LOCAL_FILE) {
         modify_response_using_local(action, ctx);
+        delete_breaking_headers(ctx);
         return (0, utils_1.build_action_processor_response)(action, true);
     }
     else {
         modify_response(ctx, action.response, action.statusCode);
+        delete_breaking_headers(ctx);
         return (0, utils_1.build_action_processor_response)(action, true);
     }
 });
+const delete_breaking_headers = (ctx) => {
+    delete (0, proxy_ctx_helper_1.getResponseHeaders)(ctx)['content-length'];
+};
 const modify_response = (ctx, new_resp, status_code) => {
     ctx.rq_response_body = new_resp;
     ctx.rq_response_status_code = status_code;
@@ -97,7 +112,7 @@ const modify_response_using_code = (action, ctx) => __awaiter(void 0, void 0, vo
                     ? ctx.clientToProxyRequest.method
                     : null
                 : null,
-            response: ctx === null || ctx === void 0 ? void 0 : ctx.rq_response_body,
+            response: ctx === null || ctx === void 0 ? void 0 : ctx.rq_parsed_response_body,
             url: (0, proxy_ctx_helper_1.get_request_url)(ctx),
             responseType: (_c = (_b = ctx === null || ctx === void 0 ? void 0 : ctx.serverToProxyResponse) === null || _b === void 0 ? void 0 : _b.headers) === null || _c === void 0 ? void 0 : _c["content-type"],
             requestHeaders: ctx.clientToProxyRequest.headers,

package/package.json

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