@requestly/requestly-proxy 1.1.22 → 1.1.24

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

@@ -22,14 +22,14 @@ const createHarQueryStrings = (query_params) => {
             query_value.forEach(val => {
                 res.push({
                     "name": query,
-                    "value": val
+                    "value": val !== null && val !== void 0 ? val : ""
                 });
             });
         }
         else {
             res.push({
                 "name": query,
-                "value": query_value
+                "value": query_value !== null && query_value !== void 0 ? query_value : ""
             });
         }
     });

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

@@ -49,13 +49,8 @@ const bodyParser = (contentTypeHeader, buffer) => {
 };
 exports.bodyParser = bodyParser;
 const getContentType = (contentTypeHeader) => {
-    if (!contentTypeHeader) {
-        return null;
-    }
-    let contentType = null;
-    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type
-    contentType = contentTypeHeader.split(";")[0];
-    return contentType;
+    var _a;
+    return (_a = contentTypeHeader === null || contentTypeHeader === void 0 ? void 0 : contentTypeHeader.split(";")[0]) !== null && _a !== void 0 ? _a : null;
 };
 exports.getContentType = getContentType;
 const parseJsonBody = (data) => {

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

@@ -117,6 +117,7 @@ const modify_response_using_code = (action, ctx) => __awaiter(void 0, void 0, vo
             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,
             requestData: (0, http_helpers_1.parseJsonBody)((_e = (_d = ctx.rq) === null || _d === void 0 ? void 0 : _d.final_request) === null || _e === void 0 ? void 0 : _e.body) || null,
+            statusCode: ctx.serverToProxyResponse.statusCode,
         };
         try {
             args.responseJSON = JSON.parse(args.response);

package/dist/lib/proxy/lib/ca.js

@@ -140,7 +140,19 @@ CA.create = function (caFolder, callback) {
         function (callback) {
             FS.exists(path.join(ca.certsFolder, "ca.pem"), function (exists) {
                 if (exists) {
-                    ca.loadCA(callback);
+                    // ca.loadCA(callback);
+                    ca.loadCA(function (err) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        if (ca.CAcert.validity.notAfter < new Date()) {
+                            // generate the certificate again since it is expired
+                            ca.generateCA(callback);
+                        }
+                        else {
+                            return callback();
+                        }
+                    });
                 }
                 else {
                     ca.generateCA(callback);

package/dist/lib/proxy/lib/proxy.js

@@ -689,6 +689,15 @@ Proxy.prototype._onWebSocketServerConnect = function (isSSL, ws, upgradeReq) {
         agent: ctx.isSSL ? self.httpsAgent : self.httpAgent,
         headers: ptosHeaders,
     };
+    if (ctopHeaders["sec-websocket-version"]) {
+        ctx.proxyToServerWebSocketOptions.protocolVersion = parseInt(ctopHeaders["sec-websocket-version"]);
+    }
+    if (ctopHeaders["sec-websocket-protocol"]) {
+        ctx.proxyToServerWebSocketOptions.subProtocol = ctopHeaders["sec-websocket-protocol"];
+    }
+    const socketOrigin = ctopHeaders["origin"] || ctopHeaders["sec-websocket-origin"];
+    if (socketOrigin)
+        ctx.proxyToServerWebSocketOptions.origin = socketOrigin;
     return self._onWebSocketConnection(ctx, function (err) {
         if (err) {
             return self._onWebSocketError(ctx, err);
@@ -696,7 +705,13 @@ Proxy.prototype._onWebSocketServerConnect = function (isSSL, ws, upgradeReq) {
         return makeProxyToServerWebSocket();
     });
     function makeProxyToServerWebSocket() {
-        ctx.proxyToServerWebSocket = new WebSocket(ctx.proxyToServerWebSocketOptions.url, ctx.proxyToServerWebSocketOptions);
+        try {
+            ctx.proxyToServerWebSocket = new WebSocket(ctx.proxyToServerWebSocketOptions.url, ctx.proxyToServerWebSocketOptions.subProtocol || "", ctx.proxyToServerWebSocketOptions);
+        }
+        catch (error) {
+            // because some sub protocols are not accepted
+            ctx.proxyToServerWebSocket = new WebSocket(ctx.proxyToServerWebSocketOptions.url, ctx.proxyToServerWebSocketOptions);
+        }
         ctx.proxyToServerWebSocket.on("message", self._onWebSocketFrame.bind(self, ctx, "message", true));
         ctx.proxyToServerWebSocket.on("ping", self._onWebSocketFrame.bind(self, ctx, "ping", true));
         ctx.proxyToServerWebSocket.on("pong", self._onWebSocketFrame.bind(self, ctx, "pong", true));

package/package.json

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