Skip to content

Commit 7d240fa

Browse files
authored
chore: bump version to v1.3.9 (#66)
1 parent da53ee2 commit 7d240fa

File tree

6 files changed

+30
-7
lines changed

6 files changed

+30
-7
lines changed

dist/components/proxy-middleware/index.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,12 @@ class ProxyMiddlewareManager {
9696
headers: responseHeaders,
9797
body: ctx.rq_response_body,
9898
});
99-
logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
99+
if (!ctx.rq.request_finished) {
100+
logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
101+
}
102+
else {
103+
console.log("Expected Error after early termination of request: ", err);
104+
}
100105
}
101106
return callback();
102107
});
@@ -119,6 +124,10 @@ class ProxyMiddlewareManager {
119124
if (parsedBody && constants_1.RQ_INTERCEPTED_CONTENT_TYPES.includes(contentType)) {
120125
// Do modifications, if any
121126
const { action_result_objs, continue_request } = await rules_middleware.on_request_end(ctx);
127+
if (!continue_request) {
128+
logger_middleware.send_network_log(ctx, rules_middleware.action_result_objs, requestly_core_1.CONSTANTS.REQUEST_STATE.COMPLETE);
129+
return;
130+
}
122131
}
123132
// Use the updated request
124133
ctx.proxyToServerRequest.write(ctx.rq_request_body);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ class RulesMiddleware {
7878
return [];
7979
}
8080
this._update_request_data({ request_body: ctx.rq.get_json_request_body() });
81+
this.on_request_actions = this._process_rules();
8182
const { action_result_objs, continue_request } = await this.rule_action_processor.process_actions(this.on_request_actions, ctx);
8283
this._update_action_result_objs(action_result_objs);
8384
return { action_result_objs, continue_request };

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class RuleActionProcessor {
4545
body = JSON.stringify(body);
4646
}
4747
ctx.proxyToClientResponse.writeHead(status_code, headers).end(body);
48+
ctx.rq.request_finished = true;
4849
ctx.rq.set_final_response({
4950
status_code: status_code,
5051
headers: headers,

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,17 @@ const http_helpers_1 = require("../../helpers/http_helpers");
88
const utils_2 = require("../../../../utils");
99
const constants_1 = require("../../constants");
1010
const process_modify_response_action = async (action, ctx) => {
11-
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];
11+
const allowed_handlers = [
12+
proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST,
13+
proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST_END,
14+
proxy_1.PROXY_HANDLER_TYPE.ON_RESPONSE_END,
15+
proxy_1.PROXY_HANDLER_TYPE.ON_ERROR
16+
];
1217
if (!allowed_handlers.includes(ctx.currentHandler)) {
1318
return (0, utils_1.build_action_processor_response)(action, false);
1419
}
15-
if (ctx.currentHandler === proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST) {
20+
if (ctx.currentHandler === proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST ||
21+
ctx.currentHandler === proxy_1.PROXY_HANDLER_TYPE.ON_REQUEST_END) {
1622
if (action.serveWithoutRequest) {
1723
let contentType, finalBody;
1824
if (action.responseType === requestly_core_1.CONSTANTS.RESPONSE_BODY_TYPES.LOCAL_FILE) {
@@ -41,7 +47,13 @@ const process_modify_response_action = async (action, ctx) => {
4147
contentType = "text/plain";
4248
}
4349
const status = action.statusCode || 200;
44-
const finalHeaders = { "Content-Type": contentType };
50+
const finalHeaders = {
51+
"content-type": contentType,
52+
"access-control-allow-origin": "*",
53+
"access-control-allow-methods": "*",
54+
"access-control-allow-headers": "*",
55+
"access-control-allow-credentials": "true",
56+
};
4557
modify_response(ctx, finalBody, status);
4658
return (0, utils_1.build_action_processor_response)(action, true, (0, utils_1.build_post_process_data)(status, finalHeaders, finalBody));
4759
}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@requestly/requestly-proxy",
3-
"version": "1.3.8",
3+
"version": "1.3.9",
44
"description": "Proxy that gives superpowers to all the Requestly clients",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

0 commit comments

Comments
 (0)