npm - @requestly/requestly-proxy - Versions diffs - 1.3.8 → 1.3.10 - Mend

@requestly/requestly-proxy 1.3.8 → 1.3.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/components/proxy-middleware/helpers/handleUnreachableAddress.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+export function isAddressUnreachableError(host: any): Promise<any>;
+export function dataToServeUnreachablePage(host: any): {
+    status: number;
+    contentType: string;
+    body: string;
+};

package/dist/components/proxy-middleware/helpers/handleUnreachableAddress.js ADDED Viewed

@@ -0,0 +1,86 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAddressUnreachableError = isAddressUnreachableError;
+exports.dataToServeUnreachablePage = dataToServeUnreachablePage;
+const dns_1 = __importDefault(require("dns"));
+function isAddressUnreachableError(host) {
+    return new Promise((resolve, reject) => {
+        dns_1.default.lookup(host, (err, address) => {
+            if (err) {
+                if (err.code === 'ENOTFOUND') {
+                    resolve(true);
+                }
+                else {
+                    reject(err);
+                }
+            }
+            else {
+                resolve(false);
+            }
+        });
+    });
+}
+function dataToServeUnreachablePage(host) {
+    return {
+        status: 502,
+        contentType: 'text/html',
+        body: `
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>ERR_NAME_NOT_RESOLVED</title>
+    <link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
+    <style>
+        body {
+            background-color: #f2f2f2;
+            color: #333;
+            font-family: 'Roboto', sans-serif;
+            margin: 0;
+            padding: 0;
+        }
+        .container {
+            max-width: 600px;
+            margin: 100px auto;
+            padding: 20px;
+            text-align: center;
+        }
+        .sad-face {
+            font-size: 80px;
+            margin-bottom: 20px;
+        }
+        h1 {
+            font-size: 24px;
+            font-weight: normal;
+            margin-bottom: 10px;
+        }
+        p {
+            font-size: 16px;
+            color: #666;
+        }
+        @media (max-width: 600px) {
+            .container {
+                margin-top: 50px;
+                padding: 10px;
+            }
+            .sad-face {
+                font-size: 60px;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="sad-face">:(</div>
+        <h1>This site can’t be reached</h1>
+        <p>The webpage at <strong>${host}/</strong> might be temporarily down or it may have moved permanently to a new web address.</p>
+        <p><strong>ERR_NAME_NOT_RESOLVED</strong></p>
+    </div>
+</body>
+</html>
+        `.trim()
+    };
+}

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

@@ -17,6 +17,7 @@ const ctx_rq_namespace_1 = __importDefault(require("./helpers/ctx_rq_namespace")
 const http_helpers_1 = require("./helpers/http_helpers");
 const constants_1 = require("./constants");
 const requestly_core_1 = require("@requestly/requestly-core");
+const handleUnreachableAddress_1 = require("./helpers/handleUnreachableAddress");
 // import SSLProxyingConfigFetcher from "renderer/lib/fetcher/ssl-proxying-config-fetcher";
 // import SSLProxyingManager from "../ssl-proxying/ssl-proxying-manager";
 exports.MIDDLEWARE_TYPE = {
@@ -96,7 +97,36 @@ class ProxyMiddlewareManager {
                             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);
+                        if (!ctx.rq.request_finished) {
+                            logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
+                        }
+                    }
+                    else if (kind === "PROXY_TO_SERVER_REQUEST_ERROR") {
+                        try {
+                            const host = (0, proxy_ctx_helper_1.get_request_url)(ctx);
+                            const isAddressUnreachable = await (0, handleUnreachableAddress_1.isAddressUnreachableError)(host);
+                            if (isAddressUnreachable) {
+                                const { status, contentType, body } = (0, handleUnreachableAddress_1.dataToServeUnreachablePage)(host);
+                                ctx.proxyToClientResponse.writeHead(status, http_1.default.STATUS_CODES[status], {
+                                    "Content-Type": contentType,
+                                    "x-rq-error": "ERR_NAME_NOT_RESOLVED"
+                                });
+                                ctx.proxyToClientResponse.end(body);
+                                ctx.rq.set_final_response({
+                                    status_code: status,
+                                    headers: { "Content-Type": contentType },
+                                    body: body,
+                                });
+                                logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
+                                return;
+                            }
+                        }
+                        catch (error) {
+                            console.error("Error checking address:", error);
+                        }
+                    }
+                    else {
+                        console.log("Expected Error after early termination of request: ", err);
                     }
                     return callback();
                 });
@@ -119,6 +149,10 @@ class ProxyMiddlewareManager {
                     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);
+                        if (!continue_request) {
+                            logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
+                            return;
+                        }
                     }
                     // Use the updated request
                     ctx.proxyToServerRequest.write(ctx.rq_request_body);

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

@@ -78,6 +78,7 @@ class RulesMiddleware {
                 return [];
             }
             this._update_request_data({ request_body: ctx.rq.get_json_request_body() });
+            this.on_request_actions = this._process_rules();
             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 };

package/dist/components/proxy-middleware/rule_action_processor/handle_mixed_response.d.ts CHANGED Viewed

@@ -12,12 +12,12 @@ declare function handleMixedResponse(ctx: any, destinationUrl: any): Promise<{
     status: boolean;
     response_data: {
         headers: {
-            "Content-Type": any;
+            "content-type": any;
             "Content-Length": number;
             "Cache-Control": string;
         } | {
             "Cache-Control": string;
-            "Content-Type"?: undefined;
+            "content-type"?: undefined;
             "Content-Length"?: undefined;
         };
         status_code: number;

package/dist/components/proxy-middleware/rule_action_processor/handle_mixed_response.js CHANGED Viewed

@@ -76,12 +76,16 @@ const handleMixedResponse = async (ctx, destinationUrl) => {
             const mimeType = mime.lookup(path);
             const bodyContent = buffers.toString("utf-8"); // assuming utf-8 encoding
             const headers = mimeType ? {
-                "Content-Type": mimeType,
+                "content-type": mimeType,
                 "Content-Length": Buffer.byteLength(bodyContent),
                 "Cache-Control": "no-cache"
             } : {
                 "Cache-Control": "no-cache"
             };
+            headers["access-control-allow-origin"] = "*";
+            headers["access-control-allow-credentials"] = "true";
+            headers["access-control-allow-methods"] = "*";
+            headers["access-control-allow-headers"] = "*";
             return {
                 status: true,
                 response_data: {

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

@@ -45,6 +45,7 @@ class RuleActionProcessor {
                     body = JSON.stringify(body);
                 }
                 ctx.proxyToClientResponse.writeHead(status_code, headers).end(body);
+                ctx.rq.request_finished = true;
                 ctx.rq.set_final_response({
                     status_code: status_code,
                     headers: headers,

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

@@ -8,11 +8,17 @@ const http_helpers_1 = require("../../helpers/http_helpers");
 const utils_2 = require("../../../../utils");
 const constants_1 = require("../../constants");
 const process_modify_response_action = async (action, ctx) => {
-    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];
+    const allowed_handlers = [
+        proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST,
+        proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST_END,
+        proxy_1.PROXY_HANDLER_TYPE.ON_RESPONSE_END,
+        proxy_1.PROXY_HANDLER_TYPE.ON_ERROR
+    ];
     if (!allowed_handlers.includes(ctx.currentHandler)) {
         return (0, utils_1.build_action_processor_response)(action, false);
     }
-    if (ctx.currentHandler === proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST) {
+    if (ctx.currentHandler === proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST ||
+        ctx.currentHandler === proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST_END) {
         if (action.serveWithoutRequest) {
             let contentType, finalBody;
             if (action.responseType === requestly_core_1.CONSTANTS.RESPONSE_BODY_TYPES.LOCAL_FILE) {
@@ -41,7 +47,13 @@ const process_modify_response_action = async (action, ctx) => {
                 contentType = "text/plain";
             }
             const status = action.statusCode || 200;
-            const finalHeaders = { "Content-Type": contentType };
+            const finalHeaders = {
+                "content-type": contentType,
+                "access-control-allow-origin": "*",
+                "access-control-allow-methods": "*",
+                "access-control-allow-headers": "*",
+                "access-control-allow-credentials": "true",
+            };
             modify_response(ctx, finalBody, status);
             return (0, utils_1.build_action_processor_response)(action, true, (0, utils_1.build_post_process_data)(status, finalHeaders, finalBody));
         }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@requestly/requestly-proxy",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "description": "Proxy that gives superpowers to all the Requestly clients",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",