@theia/core 1.73.0-next.2 → 1.73.0-next.24
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.
- package/lib/browser/authentication-service.d.ts +2 -0
- package/lib/browser/authentication-service.d.ts.map +1 -1
- package/lib/browser/authentication-service.js +8 -2
- package/lib/browser/authentication-service.js.map +1 -1
- package/lib/browser/catalog.json +204 -73
- package/lib/browser/frontend-application.d.ts +2 -0
- package/lib/browser/frontend-application.d.ts.map +1 -1
- package/lib/browser/frontend-application.js +15 -9
- package/lib/browser/frontend-application.js.map +1 -1
- package/lib/browser/json-schema-store.d.ts +2 -0
- package/lib/browser/json-schema-store.d.ts.map +1 -1
- package/lib/browser/json-schema-store.js +8 -2
- package/lib/browser/json-schema-store.js.map +1 -1
- package/lib/browser/keybinding.js +2 -1
- package/lib/browser/keybinding.js.map +1 -1
- package/lib/browser/preferences/frontend-config-preference-contributions.d.ts +2 -0
- package/lib/browser/preferences/frontend-config-preference-contributions.d.ts.map +1 -1
- package/lib/browser/preferences/frontend-config-preference-contributions.js +7 -1
- package/lib/browser/preferences/frontend-config-preference-contributions.js.map +1 -1
- package/lib/browser/preferences/preference-schema-provider.spec.js +3 -0
- package/lib/browser/preferences/preference-schema-provider.spec.js.map +1 -1
- package/lib/browser/preferences/preference-validation-service.d.ts +2 -0
- package/lib/browser/preferences/preference-validation-service.d.ts.map +1 -1
- package/lib/browser/preferences/preference-validation-service.js +11 -5
- package/lib/browser/preferences/preference-validation-service.js.map +1 -1
- package/lib/browser/preferences/preference-validation-service.spec.js +2 -0
- package/lib/browser/preferences/preference-validation-service.spec.js.map +1 -1
- package/lib/browser/quick-input/quick-view-service.d.ts +1 -0
- package/lib/browser/quick-input/quick-view-service.d.ts.map +1 -1
- package/lib/browser/quick-input/quick-view-service.js +6 -1
- package/lib/browser/quick-input/quick-view-service.js.map +1 -1
- package/lib/browser/quick-input/quick-view-service.spec.d.ts +2 -0
- package/lib/browser/quick-input/quick-view-service.spec.d.ts.map +1 -0
- package/lib/browser/quick-input/quick-view-service.spec.js +41 -0
- package/lib/browser/quick-input/quick-view-service.spec.js.map +1 -0
- package/lib/browser/secondary-window-handler.d.ts +2 -0
- package/lib/browser/secondary-window-handler.d.ts.map +1 -1
- package/lib/browser/secondary-window-handler.js +12 -6
- package/lib/browser/secondary-window-handler.js.map +1 -1
- package/lib/browser/shell/application-shell.d.ts +2 -0
- package/lib/browser/shell/application-shell.d.ts.map +1 -1
- package/lib/browser/shell/application-shell.js +9 -3
- package/lib/browser/shell/application-shell.js.map +1 -1
- package/lib/browser/tree/tree-container.spec.js +4 -0
- package/lib/browser/tree/tree-container.spec.js.map +1 -1
- package/lib/browser/tree/tree.d.ts +2 -0
- package/lib/browser/tree/tree.d.ts.map +1 -1
- package/lib/browser/tree/tree.js +7 -1
- package/lib/browser/tree/tree.js.map +1 -1
- package/lib/browser/window/default-window-service.d.ts +2 -1
- package/lib/browser/window/default-window-service.d.ts.map +1 -1
- package/lib/browser/window/default-window-service.js +10 -5
- package/lib/browser/window/default-window-service.js.map +1 -1
- package/lib/browser/window/default-window-service.spec.js +2 -0
- package/lib/browser/window/default-window-service.spec.js.map +1 -1
- package/lib/browser-only/messaging/frontend-only-service-connection-provider.d.ts +2 -0
- package/lib/browser-only/messaging/frontend-only-service-connection-provider.d.ts.map +1 -1
- package/lib/browser-only/messaging/frontend-only-service-connection-provider.js +8 -2
- package/lib/browser-only/messaging/frontend-only-service-connection-provider.js.map +1 -1
- package/lib/common/command.d.ts +2 -0
- package/lib/common/command.d.ts.map +1 -1
- package/lib/common/command.js +10 -4
- package/lib/common/command.js.map +1 -1
- package/lib/electron-main/electron-main-application.d.ts +2 -0
- package/lib/electron-main/electron-main-application.d.ts.map +1 -1
- package/lib/electron-main/electron-main-application.js +17 -9
- package/lib/electron-main/electron-main-application.js.map +1 -1
- package/lib/electron-main/messaging/electron-messaging-contribution.d.ts +2 -0
- package/lib/electron-main/messaging/electron-messaging-contribution.d.ts.map +1 -1
- package/lib/electron-main/messaging/electron-messaging-contribution.js +9 -3
- package/lib/electron-main/messaging/electron-messaging-contribution.js.map +1 -1
- package/lib/electron-node/request/electron-backend-request-service.d.ts +2 -0
- package/lib/electron-node/request/electron-backend-request-service.d.ts.map +1 -1
- package/lib/electron-node/request/electron-backend-request-service.js +7 -1
- package/lib/electron-node/request/electron-backend-request-service.js.map +1 -1
- package/lib/electron-node/token/electron-token-backend-contribution.d.ts +2 -0
- package/lib/electron-node/token/electron-token-backend-contribution.d.ts.map +1 -1
- package/lib/electron-node/token/electron-token-backend-contribution.js +7 -1
- package/lib/electron-node/token/electron-token-backend-contribution.js.map +1 -1
- package/lib/electron-node/token/electron-token-validator.d.ts +2 -0
- package/lib/electron-node/token/electron-token-validator.d.ts.map +1 -1
- package/lib/electron-node/token/electron-token-validator.js +7 -1
- package/lib/electron-node/token/electron-token-validator.js.map +1 -1
- package/lib/node/backend-application.d.ts +2 -0
- package/lib/node/backend-application.d.ts.map +1 -1
- package/lib/node/backend-application.js +17 -11
- package/lib/node/backend-application.js.map +1 -1
- package/lib/node/backend-application.spec.js +3 -2
- package/lib/node/backend-application.spec.js.map +1 -1
- package/lib/node/messaging/default-messaging-service.d.ts +2 -0
- package/lib/node/messaging/default-messaging-service.d.ts.map +1 -1
- package/lib/node/messaging/default-messaging-service.js +8 -2
- package/lib/node/messaging/default-messaging-service.js.map +1 -1
- package/lib/node/messaging/test/default-messaging-service.spec.js +2 -0
- package/lib/node/messaging/test/default-messaging-service.spec.js.map +1 -1
- package/lib/node/messaging/websocket-endpoint.d.ts +2 -0
- package/lib/node/messaging/websocket-endpoint.d.ts.map +1 -1
- package/lib/node/messaging/websocket-endpoint.js +7 -1
- package/lib/node/messaging/websocket-endpoint.js.map +1 -1
- package/lib/node/process-utils.d.ts +2 -0
- package/lib/node/process-utils.d.ts.map +1 -1
- package/lib/node/process-utils.js +8 -2
- package/lib/node/process-utils.js.map +1 -1
- package/lib/node/process-utils.spec.js +11 -9
- package/lib/node/process-utils.spec.js.map +1 -1
- package/package.json +4 -4
- package/src/browser/authentication-service.ts +6 -3
- package/src/browser/frontend-application.ts +13 -9
- package/src/browser/json-schema-store.ts +6 -2
- package/src/browser/keybinding.ts +2 -2
- package/src/browser/preferences/frontend-config-preference-contributions.ts +7 -2
- package/src/browser/preferences/preference-schema-provider.spec.ts +5 -0
- package/src/browser/preferences/preference-validation-service.spec.ts +3 -1
- package/src/browser/preferences/preference-validation-service.ts +9 -6
- package/src/browser/quick-input/quick-view-service.spec.ts +50 -0
- package/src/browser/quick-input/quick-view-service.ts +5 -0
- package/src/browser/secondary-window-handler.ts +11 -7
- package/src/browser/shell/application-shell.ts +8 -4
- package/src/browser/tree/tree-container.spec.ts +6 -0
- package/src/browser/tree/tree.ts +6 -2
- package/src/browser/window/default-window-service.spec.ts +3 -1
- package/src/browser/window/default-window-service.ts +9 -6
- package/src/browser-only/messaging/frontend-only-service-connection-provider.ts +8 -3
- package/src/common/command.ts +8 -4
- package/src/electron-main/electron-main-application.ts +15 -9
- package/src/electron-main/messaging/electron-messaging-contribution.ts +7 -3
- package/src/electron-node/request/electron-backend-request-service.ts +6 -2
- package/src/electron-node/token/electron-token-backend-contribution.ts +6 -2
- package/src/electron-node/token/electron-token-validator.ts +6 -2
- package/src/node/backend-application.spec.ts +3 -3
- package/src/node/backend-application.ts +15 -11
- package/src/node/messaging/default-messaging-service.ts +6 -2
- package/src/node/messaging/test/default-messaging-service.spec.ts +3 -1
- package/src/node/messaging/websocket-endpoint.ts +6 -2
- package/src/node/process-utils.spec.ts +12 -9
- package/src/node/process-utils.ts +7 -3
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Event, RpcProxy, Channel } from '../../common';
|
|
2
2
|
import { ServiceConnectionProvider } from '../../browser/messaging/service-connection-provider';
|
|
3
|
+
import { ILogger } from '../../common/logger';
|
|
3
4
|
import { ConnectionSource } from '../../browser/messaging/connection-source';
|
|
4
5
|
export declare class FrontendOnlyConnectionSource implements ConnectionSource {
|
|
5
6
|
onConnectionDidOpen: Event<Channel>;
|
|
6
7
|
}
|
|
7
8
|
export declare class FrontendOnlyServiceConnectionProvider extends ServiceConnectionProvider {
|
|
9
|
+
protected readonly logger: ILogger;
|
|
8
10
|
onSocketDidOpen: Event<any>;
|
|
9
11
|
onSocketDidClose: Event<any>;
|
|
10
12
|
onIncomingMessageActivity: Event<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frontend-only-service-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser-only/messaging/frontend-only-service-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAA4B,MAAM,cAAc,CAAC;AAElF,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,qBACa,4BAA6B,YAAW,gBAAgB;IACjE,mBAAmB,iBAAgC;CACtD;AAED,qBACa,qCAAsC,SAAQ,yBAAyB;
|
|
1
|
+
{"version":3,"file":"frontend-only-service-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser-only/messaging/frontend-only-service-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAA4B,MAAM,cAAc,CAAC;AAElF,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAChG,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,qBACa,4BAA6B,YAAW,gBAAgB;IACjE,mBAAmB,iBAAgC;CACtD;AAED,qBACa,qCAAsC,SAAQ,yBAAyB;IAGhF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,eAAe,aAAc;IAC7B,gBAAgB,aAAc;IAC9B,yBAAyB,aAAc;IAC9B,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC;IAK3E,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,CAAC,iBAAiB,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;CAGhH"}
|
|
@@ -20,6 +20,7 @@ const tslib_1 = require("tslib");
|
|
|
20
20
|
const common_1 = require("../../common");
|
|
21
21
|
const inversify_1 = require("inversify");
|
|
22
22
|
const service_connection_provider_1 = require("../../browser/messaging/service-connection-provider");
|
|
23
|
+
const logger_1 = require("../../common/logger");
|
|
23
24
|
let FrontendOnlyConnectionSource = class FrontendOnlyConnectionSource {
|
|
24
25
|
constructor() {
|
|
25
26
|
this.onConnectionDidOpen = new common_1.Emitter().event;
|
|
@@ -37,15 +38,20 @@ let FrontendOnlyServiceConnectionProvider = class FrontendOnlyServiceConnectionP
|
|
|
37
38
|
this.onIncomingMessageActivity = common_1.Event.None;
|
|
38
39
|
}
|
|
39
40
|
createProxy(path, target) {
|
|
40
|
-
|
|
41
|
+
this.logger.debug(`[Frontend-Only Fallback] Created proxy connection for ${path}`);
|
|
41
42
|
const factory = target instanceof common_1.RpcProxyFactory ? target : new common_1.RpcProxyFactory(target);
|
|
42
43
|
return factory.createProxy();
|
|
43
44
|
}
|
|
44
45
|
listen(path, handler, reconnect) {
|
|
45
|
-
|
|
46
|
+
this.logger.debug('[Frontend-Only Fallback] Listen to websocket connection requested');
|
|
46
47
|
}
|
|
47
48
|
};
|
|
48
49
|
exports.FrontendOnlyServiceConnectionProvider = FrontendOnlyServiceConnectionProvider;
|
|
50
|
+
tslib_1.__decorate([
|
|
51
|
+
(0, inversify_1.inject)(logger_1.ILogger),
|
|
52
|
+
(0, inversify_1.named)('core:FrontendOnlyServiceConnectionProvider'),
|
|
53
|
+
tslib_1.__metadata("design:type", Object)
|
|
54
|
+
], FrontendOnlyServiceConnectionProvider.prototype, "logger", void 0);
|
|
49
55
|
exports.FrontendOnlyServiceConnectionProvider = FrontendOnlyServiceConnectionProvider = tslib_1.__decorate([
|
|
50
56
|
(0, inversify_1.injectable)()
|
|
51
57
|
], FrontendOnlyServiceConnectionProvider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frontend-only-service-connection-provider.js","sourceRoot":"","sources":["../../../src/browser-only/messaging/frontend-only-service-connection-provider.ts"],"names":[],"mappings":";;;;AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,yCAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"frontend-only-service-connection-provider.js","sourceRoot":"","sources":["../../../src/browser-only/messaging/frontend-only-service-connection-provider.ts"],"names":[],"mappings":";;;;AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,yCAAkF;AAClF,yCAAsD;AACtD,qGAAgG;AAChG,gDAA8C;AAIvC,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAAlC;QACH,wBAAmB,GAAG,IAAI,gBAAO,EAAW,CAAC,KAAK,CAAC;IACvD,CAAC;CAAA,CAAA;AAFY,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,sBAAU,GAAE;GACA,4BAA4B,CAExC;AAGM,IAAM,qCAAqC,GAA3C,MAAM,qCAAsC,SAAQ,uDAAyB;IAA7E;;QAKH,oBAAe,GAAG,cAAK,CAAC,IAAI,CAAC;QAC7B,qBAAgB,GAAG,cAAK,CAAC,IAAI,CAAC;QAC9B,8BAAyB,GAAG,cAAK,CAAC,IAAI,CAAC;IAS3C,CAAC;IARY,WAAW,CAAmB,IAAa,EAAE,MAAgB;QAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,IAAI,EAAE,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,MAAM,YAAY,wBAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,wBAAe,CAAI,MAAM,CAAC,CAAC;QAC5F,OAAO,OAAO,CAAC,WAAW,EAAE,CAAC;IACjC,CAAC;IACQ,MAAM,CAAC,IAAY,EAAE,OAAoD,EAAE,SAAkB;QAClG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;IAC3F,CAAC;CACJ,CAAA;AAhBY,sFAAqC;AAG3B;IADlB,IAAA,kBAAM,EAAC,gBAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,4CAA4C,CAAC;;qEAClC;gDAH1B,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAgBjD"}
|
package/lib/common/command.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Event, Emitter, WaitUntilEvent } from './event';
|
|
2
2
|
import { Disposable } from './disposable';
|
|
3
3
|
import { ContributionProvider } from './contribution-provider';
|
|
4
|
+
import { ILogger } from './logger';
|
|
4
5
|
/**
|
|
5
6
|
* A command is a unique identifier of a function
|
|
6
7
|
* which can be executed by a user via a keyboard shortcut,
|
|
@@ -117,6 +118,7 @@ export interface CommandService {
|
|
|
117
118
|
*/
|
|
118
119
|
export declare class CommandRegistry implements CommandService {
|
|
119
120
|
protected readonly contributionProvider: ContributionProvider<CommandContribution>;
|
|
121
|
+
protected readonly logger: ILogger;
|
|
120
122
|
protected readonly _commands: {
|
|
121
123
|
[id: string]: Command;
|
|
122
124
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/common/command.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,UAAU,EAAwB,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/common/command.ts"],"names":[],"mappings":"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"}
|
package/lib/common/command.js
CHANGED
|
@@ -24,6 +24,7 @@ const contribution_provider_1 = require("./contribution-provider");
|
|
|
24
24
|
const nls_1 = require("./nls");
|
|
25
25
|
const debounce = require("p-debounce");
|
|
26
26
|
const types_1 = require("./types");
|
|
27
|
+
const logger_1 = require("./logger");
|
|
27
28
|
var Command;
|
|
28
29
|
(function (Command) {
|
|
29
30
|
/* Determine whether object is a Command */
|
|
@@ -118,7 +119,7 @@ let CommandRegistry = class CommandRegistry {
|
|
|
118
119
|
*/
|
|
119
120
|
registerCommand(command, handler) {
|
|
120
121
|
if (this._commands[command.id]) {
|
|
121
|
-
|
|
122
|
+
this.logger.warn(`A command ${command.id} is already registered.`);
|
|
122
123
|
return disposable_1.Disposable.NULL;
|
|
123
124
|
}
|
|
124
125
|
const toDispose = new disposable_1.DisposableCollection(this.doRegisterCommand(command));
|
|
@@ -226,7 +227,7 @@ let CommandRegistry = class CommandRegistry {
|
|
|
226
227
|
}
|
|
227
228
|
}
|
|
228
229
|
catch (error) {
|
|
229
|
-
|
|
230
|
+
this.logger.error(error);
|
|
230
231
|
}
|
|
231
232
|
}
|
|
232
233
|
}
|
|
@@ -246,7 +247,7 @@ let CommandRegistry = class CommandRegistry {
|
|
|
246
247
|
}
|
|
247
248
|
}
|
|
248
249
|
catch (error) {
|
|
249
|
-
|
|
250
|
+
this.logger.error(error);
|
|
250
251
|
}
|
|
251
252
|
}
|
|
252
253
|
}
|
|
@@ -266,7 +267,7 @@ let CommandRegistry = class CommandRegistry {
|
|
|
266
267
|
}
|
|
267
268
|
}
|
|
268
269
|
catch (error) {
|
|
269
|
-
|
|
270
|
+
this.logger.error(error);
|
|
270
271
|
}
|
|
271
272
|
}
|
|
272
273
|
}
|
|
@@ -344,6 +345,11 @@ let CommandRegistry = class CommandRegistry {
|
|
|
344
345
|
}
|
|
345
346
|
};
|
|
346
347
|
exports.CommandRegistry = CommandRegistry;
|
|
348
|
+
tslib_1.__decorate([
|
|
349
|
+
(0, inversify_1.inject)(logger_1.ILogger),
|
|
350
|
+
(0, inversify_1.named)('core:CommandRegistry'),
|
|
351
|
+
tslib_1.__metadata("design:type", Object)
|
|
352
|
+
], CommandRegistry.prototype, "logger", void 0);
|
|
347
353
|
exports.CommandRegistry = CommandRegistry = tslib_1.__decorate([
|
|
348
354
|
(0, inversify_1.injectable)(),
|
|
349
355
|
tslib_1.__param(0, (0, inversify_1.inject)(contribution_provider_1.ContributionProvider)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/common/command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/common/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ import { WindowSearchParams } from '../common/window';
|
|
|
13
13
|
import { TheiaBrowserWindowOptions, TheiaElectronWindow, TheiaElectronWindowFactory } from './theia-electron-window';
|
|
14
14
|
import { ElectronMainApplicationGlobals } from './electron-main-constants';
|
|
15
15
|
import { ThemeMode } from '../common/theme';
|
|
16
|
+
import { ILogger } from '../common/logger';
|
|
16
17
|
export { ElectronMainApplicationGlobals };
|
|
17
18
|
/**
|
|
18
19
|
* Options passed to the main/default command handler.
|
|
@@ -84,6 +85,7 @@ export declare class ElectronMainApplication {
|
|
|
84
85
|
protected electronSecurityTokenService: ElectronSecurityTokenService;
|
|
85
86
|
protected readonly electronSecurityToken: ElectronSecurityToken;
|
|
86
87
|
protected readonly windowFactory: TheiaElectronWindowFactory;
|
|
88
|
+
protected readonly logger: ILogger;
|
|
87
89
|
protected readonly stopwatch: Stopwatch;
|
|
88
90
|
protected isPortable: boolean;
|
|
89
91
|
protected readonly electronStore: Storage<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-main-application.d.ts","sourceRoot":"","sources":["../../src/electron-main/electron-main-application.ts"],"names":[],"mappings":"AAiBA,OAAO,EACU,aAAa,EAAE,WAAW,EAAE,KAAK,IAAI,aAAa,EAElE,MAAM,gCAAgC,CAAC;AAMxC,OAAO,EAAQ,WAAW,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAgB,iCAAiC,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAC9I,OAAO,GAAG,MAAM,eAAe,CAAC;AAEhC,OAAO,EAAE,QAAQ,EAAW,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,OAAO,GAAG,QAAQ,gBAAgB,CAAC,CAAC;AAE3C,OAAO,EAAuB,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AACrH,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAK3E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"electron-main-application.d.ts","sourceRoot":"","sources":["../../src/electron-main/electron-main-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,6 +42,7 @@ const electron_api_main_1 = require("./electron-api-main");
|
|
|
42
42
|
const frontend_application_state_1 = require("../common/frontend-application-state");
|
|
43
43
|
const dynamic_require_1 = require("../node/dynamic-require");
|
|
44
44
|
const backend_global_1 = require("../node/backend-global");
|
|
45
|
+
const logger_1 = require("../common/logger");
|
|
45
46
|
const createYargs = require('yargs/yargs');
|
|
46
47
|
const ELECTRON_TIMER_WARNING_THRESHOLD = 50;
|
|
47
48
|
/**
|
|
@@ -142,7 +143,7 @@ let ElectronMainApplication = class ElectronMainApplication {
|
|
|
142
143
|
})
|
|
143
144
|
.positional('file', { type: 'string' }), async (args) => {
|
|
144
145
|
if (args.electronUserData) {
|
|
145
|
-
|
|
146
|
+
this.logger.info(`using electron user data area : '${args.electronUserData}'`);
|
|
146
147
|
await fs_1.promises.mkdir(args.electronUserData, { recursive: true });
|
|
147
148
|
electron_1.app.setPath('userData', args.electronUserData);
|
|
148
149
|
}
|
|
@@ -201,7 +202,7 @@ let ElectronMainApplication = class ElectronMainApplication {
|
|
|
201
202
|
this.saveWindowState(browserWindow);
|
|
202
203
|
}
|
|
203
204
|
else {
|
|
204
|
-
|
|
205
|
+
this.logger.warn(`no BrowserWindow with id: ${webContents.id}`);
|
|
205
206
|
}
|
|
206
207
|
}
|
|
207
208
|
/**
|
|
@@ -258,7 +259,7 @@ let ElectronMainApplication = class ElectronMainApplication {
|
|
|
258
259
|
}
|
|
259
260
|
async configureAndShowSplashScreen(mainWindow) {
|
|
260
261
|
const splashScreenOptions = this.getSplashScreenOptions();
|
|
261
|
-
|
|
262
|
+
this.logger.debug('SplashScreen options', splashScreenOptions);
|
|
262
263
|
const splashScreenBounds = await this.determineSplashScreenBounds(mainWindow.getBounds());
|
|
263
264
|
const splashScreenWindow = new electron_1.BrowserWindow({
|
|
264
265
|
...splashScreenBounds,
|
|
@@ -284,6 +285,8 @@ let ElectronMainApplication = class ElectronMainApplication {
|
|
|
284
285
|
const cancelTokenSource = new common_1.CancellationTokenSource();
|
|
285
286
|
const minTime = (0, promise_util_1.timeout)(splashScreenOptions.minDuration ?? 0, cancelTokenSource.token);
|
|
286
287
|
const maxTime = (0, promise_util_1.timeout)(splashScreenOptions.maxDuration ?? 30000, cancelTokenSource.token);
|
|
288
|
+
// Swallow rejections that occur when the cancellation token is cancelled after one of the timers wins.
|
|
289
|
+
const ignoreCancellation = () => { };
|
|
287
290
|
const showWindowAndCloseSplashScreen = () => {
|
|
288
291
|
cancelTokenSource.cancel();
|
|
289
292
|
if (!mainWindow.isVisible()) {
|
|
@@ -293,10 +296,10 @@ let ElectronMainApplication = class ElectronMainApplication {
|
|
|
293
296
|
};
|
|
294
297
|
electron_api_main_1.TheiaRendererAPI.onApplicationStateChanged(mainWindow.webContents, state => {
|
|
295
298
|
if (state === 'ready') {
|
|
296
|
-
minTime.then(() => showWindowAndCloseSplashScreen());
|
|
299
|
+
minTime.then(() => showWindowAndCloseSplashScreen(), ignoreCancellation);
|
|
297
300
|
}
|
|
298
301
|
});
|
|
299
|
-
maxTime.then(() => showWindowAndCloseSplashScreen());
|
|
302
|
+
maxTime.then(() => showWindowAndCloseSplashScreen(), ignoreCancellation);
|
|
300
303
|
return splashScreenWindow;
|
|
301
304
|
}
|
|
302
305
|
isShowSplashScreen() {
|
|
@@ -431,7 +434,7 @@ let ElectronMainApplication = class ElectronMainApplication {
|
|
|
431
434
|
workspacePath = await fs_1.promises.realpath(path.resolve(options.cwd, options.file));
|
|
432
435
|
}
|
|
433
436
|
catch {
|
|
434
|
-
|
|
437
|
+
this.logger.error(`Could not resolve the workspace path. "${options.file}" is not a valid 'file' option. Falling back to the default workspace location.`);
|
|
435
438
|
}
|
|
436
439
|
}
|
|
437
440
|
if (workspacePath !== undefined) {
|
|
@@ -505,14 +508,14 @@ let ElectronMainApplication = class ElectronMainApplication {
|
|
|
505
508
|
// On Wayland, screen.getCursorScreenPoint() causes a native crash (SIGSEGV)
|
|
506
509
|
// before any window is opened. Detect Wayland and use primary display instead.
|
|
507
510
|
if (this.isWaylandSession()) {
|
|
508
|
-
|
|
511
|
+
this.logger.debug('Running under Wayland, using primary display for new window.');
|
|
509
512
|
return electron_1.screen.getPrimaryDisplay();
|
|
510
513
|
}
|
|
511
514
|
try {
|
|
512
515
|
return electron_1.screen.getDisplayNearestPoint(electron_1.screen.getCursorScreenPoint());
|
|
513
516
|
}
|
|
514
517
|
catch (error) {
|
|
515
|
-
|
|
518
|
+
this.logger.warn('Failed to get cursor screen point, falling back to primary display.', error);
|
|
516
519
|
return electron_1.screen.getPrimaryDisplay();
|
|
517
520
|
}
|
|
518
521
|
}
|
|
@@ -579,7 +582,7 @@ let ElectronMainApplication = class ElectronMainApplication {
|
|
|
579
582
|
this.electronStore.set('windowstate', options);
|
|
580
583
|
}
|
|
581
584
|
catch (e) {
|
|
582
|
-
|
|
585
|
+
this.logger.error('Error while saving window state:', e);
|
|
583
586
|
}
|
|
584
587
|
}
|
|
585
588
|
/**
|
|
@@ -818,6 +821,11 @@ tslib_1.__decorate([
|
|
|
818
821
|
(0, inversify_1.inject)(theia_electron_window_1.TheiaElectronWindowFactory),
|
|
819
822
|
tslib_1.__metadata("design:type", Function)
|
|
820
823
|
], ElectronMainApplication.prototype, "windowFactory", void 0);
|
|
824
|
+
tslib_1.__decorate([
|
|
825
|
+
(0, inversify_1.inject)(logger_1.ILogger),
|
|
826
|
+
(0, inversify_1.named)('core:ElectronMainApplication'),
|
|
827
|
+
tslib_1.__metadata("design:type", Object)
|
|
828
|
+
], ElectronMainApplication.prototype, "logger", void 0);
|
|
821
829
|
tslib_1.__decorate([
|
|
822
830
|
(0, inversify_1.inject)(performance_1.Stopwatch),
|
|
823
831
|
tslib_1.__metadata("design:type", performance_1.Stopwatch)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-main-application.js","sourceRoot":"","sources":["../../src/electron-main/electron-main-application.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"electron-main-application.js","sourceRoot":"","sources":["../../src/electron-main/electron-main-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { ConnectionHandler, ContributionProvider, Emitter, WriteBuffer } from '.
|
|
|
5
5
|
import { MessagingService } from '../../node';
|
|
6
6
|
import { ElectronMessagingService } from './electron-messaging-service';
|
|
7
7
|
import { ElectronMainApplicationContribution } from '../electron-main-application';
|
|
8
|
+
import { ILogger } from '../../common/logger';
|
|
8
9
|
/**
|
|
9
10
|
* This component replicates the role filled by `MessagingContribution` but for Electron.
|
|
10
11
|
* Unlike the WebSocket based implementation, we do not expect to receive
|
|
@@ -15,6 +16,7 @@ import { ElectronMainApplicationContribution } from '../electron-main-applicatio
|
|
|
15
16
|
export declare class ElectronMessagingContribution implements ElectronMainApplicationContribution, ElectronMessagingService {
|
|
16
17
|
protected readonly messagingContributions: ContributionProvider<ElectronMessagingService.Contribution>;
|
|
17
18
|
protected readonly connectionHandlers: ContributionProvider<ConnectionHandler>;
|
|
19
|
+
protected readonly logger: ILogger;
|
|
18
20
|
protected readonly channelHandlers: ConnectionHandlers<Channel>;
|
|
19
21
|
/**
|
|
20
22
|
* Each electron window has a main channel and its own multiplexer to route multiple client messages the same IPC connection.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-messaging-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-main/messaging/electron-messaging-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,OAAO,EAAsB,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACjH,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,OAAO,EAAE,mCAAmC,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"electron-messaging-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-main/messaging/electron-messaging-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,OAAO,EAAsB,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACjH,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,OAAO,EAAE,mCAAmC,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C;;;;;;GAMG;AAEH,qBACa,6BAA8B,YAAW,mCAAmC,EAAE,wBAAwB;IAE/G,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;IAGvG,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;IAG/E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,eAAe,8BAAqC;IAEvE;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,yCAAgD;IAG/E,SAAS,CAAC,IAAI,IAAI,IAAI;IAKtB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;IAIjF,OAAO,IAAI,IAAI;IAWf,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI;IAWrE,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,GAAG,yBAAyB;IAiBtF,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAU/D,SAAS,CAAC,QAAQ,CAAC,UAAU,8BAA4B;IAEzD,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;CAG3H;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,eAAe;IAK9C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW;IAF3D,SAAkB,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAAC,CAAiB;gBAE9C,MAAM,EAAE,QAAQ,CAAC,WAAW;IAI3D,cAAc,IAAI,WAAW;CAYhC"}
|
|
@@ -25,6 +25,7 @@ const uint8_array_message_buffer_1 = require("../../common/message-rpc/uint8-arr
|
|
|
25
25
|
const electron_api_main_1 = require("../electron-api-main");
|
|
26
26
|
const electron_messaging_service_1 = require("./electron-messaging-service");
|
|
27
27
|
const electron_connection_handler_1 = require("./electron-connection-handler");
|
|
28
|
+
const logger_1 = require("../../common/logger");
|
|
28
29
|
/**
|
|
29
30
|
* This component replicates the role filled by `MessagingContribution` but for Electron.
|
|
30
31
|
* Unlike the WebSocket based implementation, we do not expect to receive
|
|
@@ -65,7 +66,7 @@ let ElectronMessagingContribution = class ElectronMessagingContribution {
|
|
|
65
66
|
windowChannel.onMessageEmitter.fire(() => new uint8_array_message_buffer_1.Uint8ArrayReadBuffer(data));
|
|
66
67
|
}
|
|
67
68
|
catch (error) {
|
|
68
|
-
|
|
69
|
+
this.logger.error('IPC: Failed to handle message', { error, data });
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
72
|
// Creates a new channel for a given sender/window
|
|
@@ -75,8 +76,8 @@ let ElectronMessagingContribution = class ElectronMessagingContribution {
|
|
|
75
76
|
multiplexer.onDidOpenChannel(openEvent => {
|
|
76
77
|
const { channel, id } = openEvent;
|
|
77
78
|
if (this.channelHandlers.route(id, channel)) {
|
|
78
|
-
|
|
79
|
-
channel.onClose(() =>
|
|
79
|
+
this.logger.debug(`Opening channel for service path '${id}'.`);
|
|
80
|
+
channel.onClose(() => this.logger.debug(`Closing channel on service path '${id}'.`));
|
|
80
81
|
}
|
|
81
82
|
});
|
|
82
83
|
sender.once('did-navigate', () => this.deleteChannel(sender.id, 'Window was refreshed'));
|
|
@@ -108,6 +109,11 @@ tslib_1.__decorate([
|
|
|
108
109
|
(0, inversify_1.named)(electron_connection_handler_1.ElectronConnectionHandler),
|
|
109
110
|
tslib_1.__metadata("design:type", Object)
|
|
110
111
|
], ElectronMessagingContribution.prototype, "connectionHandlers", void 0);
|
|
112
|
+
tslib_1.__decorate([
|
|
113
|
+
(0, inversify_1.inject)(logger_1.ILogger),
|
|
114
|
+
(0, inversify_1.named)('core:ElectronMessagingContribution'),
|
|
115
|
+
tslib_1.__metadata("design:type", Object)
|
|
116
|
+
], ElectronMessagingContribution.prototype, "logger", void 0);
|
|
111
117
|
tslib_1.__decorate([
|
|
112
118
|
(0, inversify_1.postConstruct)(),
|
|
113
119
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-messaging-contribution.js","sourceRoot":"","sources":["../../../src/electron-main/messaging/electron-messaging-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,yCAAqE;AACrE,8FAAoF;AACpF,8DAAiH;AACjH,yCAA6F;AAC7F,oGAAkH;AAClH,4DAAwD;AAExD,6EAAwE;AACxE,+EAA0E;
|
|
1
|
+
{"version":3,"file":"electron-messaging-contribution.js","sourceRoot":"","sources":["../../../src/electron-main/messaging/electron-messaging-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,9 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { NodeRequestOptions, NodeRequestService } from '@theia/request/lib/node-request-service';
|
|
17
|
+
import { ILogger } from '../../common';
|
|
17
18
|
export declare class ElectronBackendRequestService extends NodeRequestService {
|
|
19
|
+
protected readonly logger: ILogger;
|
|
18
20
|
getProxyUrl(url: string): Promise<string | undefined>;
|
|
19
21
|
resolveProxy(url: string): Promise<string | undefined>;
|
|
20
22
|
protected buildProxyUrl(url: string, proxyHost: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-backend-request-service.d.ts","sourceRoot":"","sources":["../../../src/electron-node/request/electron-backend-request-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"electron-backend-request-service.d.ts","sourceRoot":"","sources":["../../../src/electron-node/request/electron-backend-request-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAEjG,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAIvC,qBACa,6BAA8B,SAAQ,kBAAkB;IAGjE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEpB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAgBrD,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKrE,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;cAYtC,cAAc,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAmBpG"}
|
|
@@ -20,6 +20,7 @@ const tslib_1 = require("tslib");
|
|
|
20
20
|
const inversify_1 = require("inversify");
|
|
21
21
|
const node_request_service_1 = require("@theia/request/lib/node-request-service");
|
|
22
22
|
const electron_token_1 = require("../../electron-common/electron-token");
|
|
23
|
+
const common_1 = require("../../common");
|
|
23
24
|
(0, inversify_1.decorate)((0, inversify_1.injectable)(), node_request_service_1.NodeRequestService);
|
|
24
25
|
let ElectronBackendRequestService = class ElectronBackendRequestService extends node_request_service_1.NodeRequestService {
|
|
25
26
|
async getProxyUrl(url) {
|
|
@@ -34,7 +35,7 @@ let ElectronBackendRequestService = class ElectronBackendRequestService extends
|
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
catch (e) {
|
|
37
|
-
|
|
38
|
+
this.logger.error('Could not resolve electron proxy.', e);
|
|
38
39
|
}
|
|
39
40
|
return super.getProxyUrl(url);
|
|
40
41
|
}
|
|
@@ -75,6 +76,11 @@ let ElectronBackendRequestService = class ElectronBackendRequestService extends
|
|
|
75
76
|
}
|
|
76
77
|
};
|
|
77
78
|
exports.ElectronBackendRequestService = ElectronBackendRequestService;
|
|
79
|
+
tslib_1.__decorate([
|
|
80
|
+
(0, inversify_1.inject)(common_1.ILogger),
|
|
81
|
+
(0, inversify_1.named)('core:ElectronBackendRequestService'),
|
|
82
|
+
tslib_1.__metadata("design:type", Object)
|
|
83
|
+
], ElectronBackendRequestService.prototype, "logger", void 0);
|
|
78
84
|
exports.ElectronBackendRequestService = ElectronBackendRequestService = tslib_1.__decorate([
|
|
79
85
|
(0, inversify_1.injectable)()
|
|
80
86
|
], ElectronBackendRequestService);
|