Skip to content

Commit 07c360f

Browse files
committed
Merge branch 'develop' into alpha
2 parents 8c9f2ab + 4e67a59 commit 07c360f

File tree

3 files changed

+32
-21
lines changed

3 files changed

+32
-21
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"devDependencies": {
3737
"@advanced-rest-client/arc-cookies": "^0.1.0",
3838
"@advanced-rest-client/arc-definitions": "^3.1.1",
39-
"@advanced-rest-client/arc-environment": "^0.1.4",
39+
"@advanced-rest-client/arc-environment": "^0.1.5",
4040
"@advanced-rest-client/arc-headers": "^0.1.7",
4141
"@advanced-rest-client/arc-icons": "^3.2.2",
4242
"@advanced-rest-client/arc-ie": "^1.0.4",
@@ -50,7 +50,7 @@
5050
"@advanced-rest-client/exchange-search-panel": "^4.0.0",
5151
"@advanced-rest-client/monaco-support": "^1.0.1",
5252
"@advanced-rest-client/pouchdb-quick-search": "^2.0.3",
53-
"@advanced-rest-client/request-engine": "^0.1.10",
53+
"@advanced-rest-client/request-engine": "^0.1.11",
5454
"@advanced-rest-client/requests-list": "^0.1.11",
5555
"@anypoint-web-components/anypoint-button": "^1.1.1",
5656
"@anypoint-web-components/anypoint-dialog": "^0.1.7",

src/app/scripts/arc/Request.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ModulesRegistry.register(ModulesRegistry.request, '@advanced-rest-client/request
99
ModulesRegistry.register(ModulesRegistry.response, '@advanced-rest-client/request-engine/response/request-authorization', ResponseAuthorization, ['store', 'events']);
1010

1111
/** @typedef {import('@advanced-rest-client/arc-events').ApiTransportEvent} ApiTransportEvent */
12+
/** @typedef {import('@advanced-rest-client/arc-types').ArcRequest.ArcEditorRequest} ArcEditorRequest */
1213
/** @typedef {import('@advanced-rest-client/arc-types').ArcRequest.ArcBaseRequest} ArcBaseRequest */
1314
/** @typedef {import('@advanced-rest-client/arc-types').ArcRequest.TransportRequest} TransportRequest */
1415
/** @typedef {import('@advanced-rest-client/arc-types').ArcRequest.RequestConfig} RequestConfig */
@@ -92,13 +93,23 @@ export class Request {
9293
}
9394

9495
async [makeRequestHandler](e) {
95-
const transportRequest = e.detail;
96-
const request = await this.factory.processRequest(transportRequest, {
97-
evaluateVariables: this.evaluateVariables,
98-
evaluateSystemVariables: this.evaluateSystemVariables,
99-
});
100-
// this event is significant, even though it is handled by the same class.
101-
TransportEvents.transport(document.body, request.id, request.request);
96+
const transportRequest = /** @type ArcEditorRequest */ (e.detail);
97+
try {
98+
const request = await this.factory.processRequest(transportRequest, {
99+
evaluateVariables: this.evaluateVariables,
100+
evaluateSystemVariables: this.evaluateSystemVariables,
101+
});
102+
// this event is significant, even though it is handled by the same class.
103+
TransportEvents.transport(document.body, request.id, request.request);
104+
} catch (err) {
105+
logger.error(err);
106+
const { id, request } = transportRequest;
107+
TransportEvents.response(document.body, id, request, undefined, {
108+
error: err,
109+
loadingTime: 0,
110+
status: 0,
111+
});
112+
}
102113
}
103114

104115
/**

0 commit comments

Comments
 (0)