@theia/core 1.43.1 → 1.45.0
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/README.md +6 -6
- package/i18n/nls.cs.json +10 -3
- package/i18n/nls.de.json +10 -3
- package/i18n/nls.es.json +10 -3
- package/i18n/nls.fr.json +10 -3
- package/i18n/nls.hu.json +10 -3
- package/i18n/nls.it.json +10 -3
- package/i18n/nls.ja.json +10 -3
- package/i18n/nls.json +10 -3
- package/i18n/nls.pl.json +10 -3
- package/i18n/nls.pt-br.json +10 -3
- package/i18n/nls.pt-pt.json +10 -3
- package/i18n/nls.ru.json +10 -3
- package/i18n/nls.zh-cn.json +10 -3
- package/lib/browser/common-frontend-contribution.d.ts +10 -0
- package/lib/browser/common-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/common-frontend-contribution.js +68 -10
- package/lib/browser/common-frontend-contribution.js.map +1 -1
- package/lib/browser/connection-status-service.d.ts +2 -2
- package/lib/browser/connection-status-service.d.ts.map +1 -1
- package/lib/browser/connection-status-service.js +3 -3
- package/lib/browser/connection-status-service.js.map +1 -1
- package/lib/browser/connection-status-service.spec.js +6 -6
- package/lib/browser/connection-status-service.spec.js.map +1 -1
- package/lib/browser/core-preferences.d.ts.map +1 -1
- package/lib/browser/core-preferences.js +16 -0
- package/lib/browser/core-preferences.js.map +1 -1
- package/lib/browser/dialogs.d.ts +0 -1
- package/lib/browser/dialogs.d.ts.map +1 -1
- package/lib/browser/dialogs.js +1 -34
- package/lib/browser/dialogs.js.map +1 -1
- package/lib/browser/frontend-application-module.d.ts.map +1 -1
- package/lib/browser/frontend-application-module.js +4 -0
- package/lib/browser/frontend-application-module.js.map +1 -1
- package/lib/browser/icon-theme-contribution.d.ts +1 -0
- package/lib/browser/icon-theme-contribution.d.ts.map +1 -1
- package/lib/browser/icon-theme-contribution.js +1 -0
- package/lib/browser/icon-theme-contribution.js.map +1 -1
- package/lib/browser/icon-theme-service.d.ts +1 -0
- package/lib/browser/icon-theme-service.d.ts.map +1 -1
- package/lib/browser/icon-theme-service.js.map +1 -1
- package/lib/browser/language-icon-provider.d.ts +15 -0
- package/lib/browser/language-icon-provider.d.ts.map +1 -0
- package/lib/browser/language-icon-provider.js +74 -0
- package/lib/browser/language-icon-provider.js.map +1 -0
- package/lib/browser/language-service.d.ts +22 -0
- package/lib/browser/language-service.d.ts.map +1 -1
- package/lib/browser/language-service.js +28 -0
- package/lib/browser/language-service.js.map +1 -1
- package/lib/browser/messaging/connection-source.d.ts +9 -0
- package/lib/browser/messaging/connection-source.d.ts.map +1 -0
- package/lib/browser/messaging/connection-source.js +20 -0
- package/lib/browser/messaging/connection-source.js.map +1 -0
- package/lib/browser/messaging/frontend-id-provider.d.ts +13 -0
- package/lib/browser/messaging/frontend-id-provider.d.ts.map +1 -0
- package/lib/browser/messaging/frontend-id-provider.js +40 -0
- package/lib/browser/messaging/frontend-id-provider.js.map +1 -0
- package/lib/browser/messaging/messaging-frontend-module.d.ts.map +1 -1
- package/lib/browser/messaging/messaging-frontend-module.js +18 -1
- package/lib/browser/messaging/messaging-frontend-module.js.map +1 -1
- package/lib/browser/messaging/service-connection-provider.d.ts +48 -0
- package/lib/browser/messaging/service-connection-provider.d.ts.map +1 -0
- package/lib/browser/messaging/service-connection-provider.js +115 -0
- package/lib/browser/messaging/service-connection-provider.js.map +1 -0
- package/lib/browser/messaging/ws-connection-provider.d.ts +7 -38
- package/lib/browser/messaging/ws-connection-provider.d.ts.map +1 -1
- package/lib/browser/messaging/ws-connection-provider.js +17 -121
- package/lib/browser/messaging/ws-connection-provider.js.map +1 -1
- package/lib/browser/messaging/ws-connection-source.d.ts +41 -0
- package/lib/browser/messaging/ws-connection-source.d.ts.map +1 -0
- package/lib/browser/messaging/ws-connection-source.js +210 -0
- package/lib/browser/messaging/ws-connection-source.js.map +1 -0
- package/lib/browser/preload/i18n-preload-contribution.js +1 -1
- package/lib/browser/preload/i18n-preload-contribution.js.map +1 -1
- package/lib/browser/shell/application-shell.js +1 -1
- package/lib/browser/shell/application-shell.js.map +1 -1
- package/lib/browser/tree/tree-compression/compressed-tree-widget.d.ts +1 -0
- package/lib/browser/tree/tree-compression/compressed-tree-widget.d.ts.map +1 -1
- package/lib/browser/tree/tree-compression/compressed-tree-widget.js +5 -0
- package/lib/browser/tree/tree-compression/compressed-tree-widget.js.map +1 -1
- package/lib/browser/tree/tree-widget.d.ts +6 -0
- package/lib/browser/tree/tree-widget.d.ts.map +1 -1
- package/lib/browser/tree/tree-widget.js +21 -11
- package/lib/browser/tree/tree-widget.js.map +1 -1
- package/lib/browser/user-working-directory-provider.d.ts +8 -1
- package/lib/browser/user-working-directory-provider.d.ts.map +1 -1
- package/lib/browser/user-working-directory-provider.js +22 -1
- package/lib/browser/user-working-directory-provider.js.map +1 -1
- package/lib/browser/window/default-secondary-window-service.d.ts +3 -0
- package/lib/browser/window/default-secondary-window-service.d.ts.map +1 -1
- package/lib/browser/window/default-secondary-window-service.js +55 -1
- package/lib/browser/window/default-secondary-window-service.js.map +1 -1
- package/lib/common/contribution-filter/contribution-filter.d.ts +9 -0
- package/lib/common/contribution-filter/contribution-filter.d.ts.map +1 -1
- package/lib/common/event.js +1 -1
- package/lib/common/event.js.map +1 -1
- package/lib/common/message-rpc/channel.d.ts.map +1 -1
- package/lib/common/message-rpc/channel.js +7 -1
- package/lib/common/message-rpc/channel.js.map +1 -1
- package/lib/common/message-rpc/message-buffer.d.ts +2 -0
- package/lib/common/message-rpc/message-buffer.d.ts.map +1 -1
- package/lib/common/message-rpc/message-buffer.js +4 -0
- package/lib/common/message-rpc/message-buffer.js.map +1 -1
- package/lib/common/message-rpc/uint8-array-message-buffer.d.ts +1 -0
- package/lib/common/message-rpc/uint8-array-message-buffer.d.ts.map +1 -1
- package/lib/common/message-rpc/uint8-array-message-buffer.js +6 -0
- package/lib/common/message-rpc/uint8-array-message-buffer.js.map +1 -1
- package/lib/common/messaging/connection-management.d.ts +25 -0
- package/lib/common/messaging/connection-management.d.ts.map +1 -0
- package/lib/common/messaging/connection-management.js +38 -0
- package/lib/common/messaging/connection-management.js.map +1 -0
- package/lib/common/messaging/handler.d.ts +1 -0
- package/lib/common/messaging/handler.d.ts.map +1 -1
- package/lib/common/messaging/handler.js +2 -1
- package/lib/common/messaging/handler.js.map +1 -1
- package/lib/common/messaging/socket-write-buffer.d.ts +11 -0
- package/lib/common/messaging/socket-write-buffer.d.ts.map +1 -0
- package/lib/common/messaging/socket-write-buffer.js +50 -0
- package/lib/common/messaging/socket-write-buffer.js.map +1 -0
- package/lib/common/messaging/web-socket-channel.d.ts +7 -35
- package/lib/common/messaging/web-socket-channel.d.ts.map +1 -1
- package/lib/common/messaging/web-socket-channel.js +20 -9
- package/lib/common/messaging/web-socket-channel.js.map +1 -1
- package/lib/common/nls.js +12 -1
- package/lib/common/nls.js.map +1 -1
- package/lib/electron-browser/messaging/electron-frontend-id-provider.d.ts +5 -0
- package/lib/electron-browser/messaging/electron-frontend-id-provider.d.ts.map +1 -0
- package/lib/{electron-node/token/electron-token-messaging-contribution.js → electron-browser/messaging/electron-frontend-id-provider.js} +9 -28
- package/lib/electron-browser/messaging/electron-frontend-id-provider.js.map +1 -0
- package/lib/electron-browser/messaging/electron-ipc-connection-source.d.ts +24 -0
- package/lib/electron-browser/messaging/electron-ipc-connection-source.d.ts.map +1 -0
- package/lib/electron-browser/messaging/{electron-ipc-connection-provider.js → electron-ipc-connection-source.js} +19 -19
- package/lib/electron-browser/messaging/electron-ipc-connection-source.js.map +1 -0
- package/lib/electron-browser/messaging/electron-local-ws-connection-source.d.ts +7 -0
- package/lib/electron-browser/messaging/electron-local-ws-connection-source.d.ts.map +1 -0
- package/lib/electron-browser/messaging/{electron-local-ws-connection-provider.js → electron-local-ws-connection-source.js} +7 -7
- package/lib/electron-browser/messaging/electron-local-ws-connection-source.js.map +1 -0
- package/lib/electron-browser/messaging/electron-messaging-frontend-module.d.ts.map +1 -1
- package/lib/electron-browser/messaging/electron-messaging-frontend-module.js +45 -13
- package/lib/electron-browser/messaging/electron-messaging-frontend-module.js.map +1 -1
- package/lib/electron-browser/messaging/electron-ws-connection-source.d.ts +12 -0
- package/lib/electron-browser/messaging/electron-ws-connection-source.d.ts.map +1 -0
- package/lib/electron-browser/messaging/{electron-ws-connection-provider.js → electron-ws-connection-source.js} +14 -21
- package/lib/electron-browser/messaging/electron-ws-connection-source.js.map +1 -0
- package/lib/electron-browser/preload.d.ts.map +1 -1
- package/lib/electron-browser/preload.js +11 -0
- package/lib/electron-browser/preload.js.map +1 -1
- package/lib/electron-browser/window/electron-secondary-window-service.d.ts +1 -1
- package/lib/electron-browser/window/electron-secondary-window-service.d.ts.map +1 -1
- package/lib/electron-browser/window/electron-window-module.js +2 -2
- package/lib/electron-browser/window/electron-window-module.js.map +1 -1
- package/lib/electron-browser/window/electron-window-preferences.js +1 -1
- package/lib/electron-browser/window/electron-window-preferences.js.map +1 -1
- package/lib/electron-browser/window/electron-window-service.d.ts +4 -0
- package/lib/electron-browser/window/electron-window-service.d.ts.map +1 -1
- package/lib/electron-browser/window/electron-window-service.js +13 -0
- package/lib/electron-browser/window/electron-window-service.js.map +1 -1
- package/lib/electron-common/electron-api.d.ts +7 -0
- package/lib/electron-common/electron-api.d.ts.map +1 -1
- package/lib/electron-common/electron-api.js +3 -1
- package/lib/electron-common/electron-api.js.map +1 -1
- package/lib/electron-main/electron-api-main.d.ts +1 -0
- package/lib/electron-main/electron-api-main.d.ts.map +1 -1
- package/lib/electron-main/electron-api-main.js +15 -0
- package/lib/electron-main/electron-api-main.js.map +1 -1
- package/lib/electron-main/electron-main-application-module.js +5 -5
- package/lib/electron-main/electron-main-application-module.js.map +1 -1
- package/lib/electron-main/electron-main-application.d.ts +9 -13
- package/lib/electron-main/electron-main-application.d.ts.map +1 -1
- package/lib/electron-main/electron-main-application.js +60 -28
- package/lib/electron-main/electron-main-application.js.map +1 -1
- package/lib/electron-main/messaging/electron-connection-handler.d.ts.map +1 -0
- package/lib/electron-main/messaging/electron-connection-handler.js.map +1 -0
- package/lib/electron-main/messaging/electron-messaging-contribution.d.ts +13 -22
- package/lib/electron-main/messaging/electron-messaging-contribution.d.ts.map +1 -1
- package/lib/electron-main/messaging/electron-messaging-contribution.js +39 -39
- package/lib/electron-main/messaging/electron-messaging-contribution.js.map +1 -1
- package/lib/electron-main/messaging/electron-messaging-service.d.ts.map +1 -1
- package/lib/electron-main/messaging/electron-messaging-service.js.map +1 -1
- package/lib/electron-main/theia-electron-window.d.ts +2 -2
- package/lib/electron-main/theia-electron-window.d.ts.map +1 -1
- package/lib/electron-main/theia-electron-window.js +3 -2
- package/lib/electron-main/theia-electron-window.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 +11 -9
- package/lib/node/backend-application.js.map +1 -1
- package/lib/node/cli.d.ts +1 -1
- package/lib/node/cli.d.ts.map +1 -1
- package/lib/node/cli.js +9 -5
- package/lib/node/cli.js.map +1 -1
- package/lib/node/cli.spec.js +3 -3
- package/lib/node/cli.spec.js.map +1 -1
- package/lib/node/env-variables/env-variables-server.d.ts +3 -0
- package/lib/node/env-variables/env-variables-server.d.ts.map +1 -1
- package/lib/node/env-variables/env-variables-server.js +25 -1
- package/lib/node/env-variables/env-variables-server.js.map +1 -1
- package/lib/node/i18n/localization-server.d.ts +1 -1
- package/lib/node/i18n/localization-server.d.ts.map +1 -1
- package/lib/node/messaging/default-messaging-service.d.ts +29 -0
- package/lib/node/messaging/default-messaging-service.d.ts.map +1 -0
- package/lib/node/messaging/default-messaging-service.js +140 -0
- package/lib/node/messaging/default-messaging-service.js.map +1 -0
- package/lib/node/messaging/frontend-connection-service.d.ts +7 -0
- package/lib/node/messaging/frontend-connection-service.d.ts.map +1 -0
- package/lib/node/messaging/frontend-connection-service.js +19 -0
- package/lib/node/messaging/frontend-connection-service.js.map +1 -0
- package/lib/node/messaging/ipc-protocol.js +1 -1
- package/lib/node/messaging/ipc-protocol.js.map +1 -1
- package/lib/node/messaging/messaging-backend-module.d.ts.map +1 -1
- package/lib/node/messaging/messaging-backend-module.js +23 -9
- package/lib/node/messaging/messaging-backend-module.js.map +1 -1
- package/lib/node/messaging/messaging-service.d.ts +2 -3
- package/lib/node/messaging/messaging-service.d.ts.map +1 -1
- package/lib/node/messaging/test/test-web-socket-channel.d.ts +3 -3
- package/lib/node/messaging/test/test-web-socket-channel.d.ts.map +1 -1
- package/lib/node/messaging/test/test-web-socket-channel.js +38 -24
- package/lib/node/messaging/test/test-web-socket-channel.js.map +1 -1
- package/lib/node/messaging/websocket-endpoint.d.ts +21 -0
- package/lib/node/messaging/websocket-endpoint.d.ts.map +1 -0
- package/lib/node/messaging/websocket-endpoint.js +89 -0
- package/lib/node/messaging/websocket-endpoint.js.map +1 -0
- package/lib/node/messaging/websocket-frontend-connection-service.d.ts +30 -0
- package/lib/node/messaging/websocket-frontend-connection-service.d.ts.map +1 -0
- package/lib/node/messaging/websocket-frontend-connection-service.js +173 -0
- package/lib/node/messaging/websocket-frontend-connection-service.js.map +1 -0
- package/package.json +6 -6
- package/src/browser/common-frontend-contribution.ts +70 -9
- package/src/browser/connection-status-service.spec.ts +6 -6
- package/src/browser/connection-status-service.ts +2 -2
- package/src/browser/core-preferences.ts +16 -0
- package/src/browser/dialogs.ts +0 -34
- package/src/browser/frontend-application-module.ts +4 -0
- package/src/browser/icon-theme-contribution.ts +1 -0
- package/src/browser/icon-theme-service.ts +1 -0
- package/src/browser/language-icon-provider.ts +55 -0
- package/src/browser/language-service.ts +34 -0
- package/src/browser/messaging/connection-source.ts +26 -0
- package/src/browser/messaging/frontend-id-provider.ts +37 -0
- package/src/browser/messaging/messaging-frontend-module.ts +20 -2
- package/src/browser/messaging/service-connection-provider.ts +126 -0
- package/src/browser/messaging/ws-connection-provider.ts +16 -141
- package/src/browser/messaging/ws-connection-source.ts +210 -0
- package/src/browser/preload/i18n-preload-contribution.ts +1 -1
- package/src/browser/shell/application-shell.ts +1 -1
- package/src/browser/style/index.css +1 -0
- package/src/browser/style/os.css +87 -0
- package/src/browser/tree/tree-compression/compressed-tree-widget.tsx +27 -7
- package/src/browser/tree/tree-widget.tsx +21 -10
- package/src/browser/user-working-directory-provider.ts +32 -3
- package/src/browser/window/default-secondary-window-service.ts +54 -1
- package/src/common/contribution-filter/contribution-filter.ts +9 -0
- package/src/common/event.ts +1 -1
- package/src/common/i18n/nls.metadata.json +7695 -7220
- package/src/common/message-rpc/channel.ts +5 -1
- package/src/common/message-rpc/message-buffer.ts +6 -0
- package/src/common/message-rpc/uint8-array-message-buffer.ts +7 -0
- package/src/common/messaging/connection-management.ts +43 -0
- package/src/common/messaging/handler.ts +2 -0
- package/src/common/messaging/socket-write-buffer.ts +52 -0
- package/src/common/messaging/web-socket-channel.ts +28 -45
- package/src/common/nls.ts +12 -1
- package/src/electron-browser/messaging/electron-frontend-id-provider.ts +25 -0
- package/src/electron-browser/messaging/{electron-ipc-connection-provider.ts → electron-ipc-connection-source.ts} +17 -13
- package/src/electron-browser/messaging/{electron-local-ws-connection-provider.ts → electron-local-ws-connection-source.ts} +2 -2
- package/src/electron-browser/messaging/electron-messaging-frontend-module.ts +49 -12
- package/src/electron-browser/messaging/{electron-ws-connection-provider.ts → electron-ws-connection-source.ts} +6 -17
- package/src/electron-browser/preload.ts +16 -1
- package/src/electron-browser/window/electron-secondary-window-service.ts +1 -1
- package/src/electron-browser/window/electron-window-module.ts +1 -1
- package/src/electron-browser/window/electron-window-preferences.ts +1 -1
- package/src/electron-browser/window/electron-window-service.ts +11 -0
- package/src/electron-common/electron-api.ts +8 -0
- package/src/electron-main/electron-api-main.ts +20 -1
- package/src/electron-main/electron-main-application-module.ts +5 -5
- package/src/electron-main/electron-main-application.ts +72 -44
- package/src/electron-main/messaging/electron-messaging-contribution.ts +45 -43
- package/src/electron-main/messaging/electron-messaging-service.ts +1 -0
- package/src/electron-main/theia-electron-window.ts +4 -3
- package/src/node/backend-application.ts +14 -11
- package/src/node/cli.spec.ts +3 -3
- package/src/node/cli.ts +9 -5
- package/src/node/env-variables/env-variables-server.ts +21 -1
- package/src/node/i18n/localization-server.ts +1 -1
- package/src/node/messaging/default-messaging-service.ts +129 -0
- package/src/node/messaging/frontend-connection-service.ts +24 -0
- package/src/node/messaging/ipc-protocol.ts +1 -1
- package/src/node/messaging/messaging-backend-module.ts +25 -10
- package/src/node/messaging/messaging-service.ts +3 -3
- package/src/node/messaging/test/test-web-socket-channel.ts +32 -27
- package/src/node/messaging/websocket-endpoint.ts +79 -0
- package/src/node/messaging/websocket-frontend-connection-service.ts +171 -0
- package/lib/common/messaging/abstract-connection-provider.d.ts +0 -45
- package/lib/common/messaging/abstract-connection-provider.d.ts.map +0 -1
- package/lib/common/messaging/abstract-connection-provider.js +0 -93
- package/lib/common/messaging/abstract-connection-provider.js.map +0 -1
- package/lib/electron-browser/messaging/electron-ipc-connection-provider.d.ts +0 -19
- package/lib/electron-browser/messaging/electron-ipc-connection-provider.d.ts.map +0 -1
- package/lib/electron-browser/messaging/electron-ipc-connection-provider.js.map +0 -1
- package/lib/electron-browser/messaging/electron-local-ws-connection-provider.d.ts +0 -7
- package/lib/electron-browser/messaging/electron-local-ws-connection-provider.d.ts.map +0 -1
- package/lib/electron-browser/messaging/electron-local-ws-connection-provider.js.map +0 -1
- package/lib/electron-browser/messaging/electron-ws-connection-provider.d.ts +0 -17
- package/lib/electron-browser/messaging/electron-ws-connection-provider.d.ts.map +0 -1
- package/lib/electron-browser/messaging/electron-ws-connection-provider.js.map +0 -1
- package/lib/electron-common/messaging/electron-connection-handler.d.ts.map +0 -1
- package/lib/electron-common/messaging/electron-connection-handler.js.map +0 -1
- package/lib/electron-node/token/electron-token-messaging-contribution.d.ts +0 -16
- package/lib/electron-node/token/electron-token-messaging-contribution.d.ts.map +0 -1
- package/lib/electron-node/token/electron-token-messaging-contribution.js.map +0 -1
- package/lib/node/messaging/messaging-contribution.d.ts +0 -44
- package/lib/node/messaging/messaging-contribution.d.ts.map +0 -1
- package/lib/node/messaging/messaging-contribution.js +0 -210
- package/lib/node/messaging/messaging-contribution.js.map +0 -1
- package/src/common/messaging/abstract-connection-provider.ts +0 -115
- package/src/electron-node/token/electron-token-messaging-contribution.ts +0 -41
- package/src/node/messaging/messaging-contribution.ts +0 -197
- /package/lib/{electron-common → electron-main}/messaging/electron-connection-handler.d.ts +0 -0
- /package/lib/{electron-common → electron-main}/messaging/electron-connection-handler.js +0 -0
- /package/src/{electron-common → electron-main}/messaging/electron-connection-handler.ts +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// *****************************************************************************
|
|
3
|
-
// Copyright (C)
|
|
3
|
+
// Copyright (C) 2023 STMicroelectronics and others.
|
|
4
4
|
//
|
|
5
5
|
// This program and the accompanying materials are made available under the
|
|
6
6
|
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -20,35 +20,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
20
20
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
21
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
22
|
};
|
|
23
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
-
};
|
|
26
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.
|
|
24
|
+
exports.ElectronFrontendIdProvider = void 0;
|
|
28
25
|
const inversify_1 = require("inversify");
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
* Override the browser MessagingContribution class to refuse connections that do not include a specific token.
|
|
33
|
-
* @deprecated since 1.8.0
|
|
34
|
-
*/
|
|
35
|
-
let ElectronMessagingContribution = class ElectronMessagingContribution extends messaging_contribution_1.MessagingContribution {
|
|
36
|
-
/**
|
|
37
|
-
* Only allow token-bearers.
|
|
38
|
-
*/
|
|
39
|
-
async allowConnect(request) {
|
|
40
|
-
if (this.tokenValidator.allowRequest(request)) {
|
|
41
|
-
return super.allowConnect(request);
|
|
42
|
-
}
|
|
43
|
-
return false;
|
|
26
|
+
let ElectronFrontendIdProvider = class ElectronFrontendIdProvider {
|
|
27
|
+
getId() {
|
|
28
|
+
return window.electronTheiaCore.WindowMetadata.webcontentId;
|
|
44
29
|
}
|
|
45
30
|
};
|
|
46
|
-
__decorate([
|
|
47
|
-
(0, inversify_1.inject)(electron_token_validator_1.ElectronTokenValidator),
|
|
48
|
-
__metadata("design:type", electron_token_validator_1.ElectronTokenValidator)
|
|
49
|
-
], ElectronMessagingContribution.prototype, "tokenValidator", void 0);
|
|
50
|
-
ElectronMessagingContribution = __decorate([
|
|
31
|
+
ElectronFrontendIdProvider = __decorate([
|
|
51
32
|
(0, inversify_1.injectable)()
|
|
52
|
-
],
|
|
53
|
-
exports.
|
|
54
|
-
//# sourceMappingURL=electron-
|
|
33
|
+
], ElectronFrontendIdProvider);
|
|
34
|
+
exports.ElectronFrontendIdProvider = ElectronFrontendIdProvider;
|
|
35
|
+
//# sourceMappingURL=electron-frontend-id-provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"electron-frontend-id-provider.js","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-frontend-id-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,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;;;;;;;;;AAEhF,yCAAuC;AAIvC,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IACnC,KAAK;QACD,OAAO,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,YAAY,CAAC;IAChE,CAAC;CACJ,CAAA;AAJY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAItC;AAJY,gEAA0B"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { interfaces } from 'inversify';
|
|
2
|
+
import { RpcProxy } from '../../common/messaging';
|
|
3
|
+
import { AbstractChannel, Channel, Emitter, Event, MaybePromise, WriteBuffer } from '../../common';
|
|
4
|
+
import { ConnectionSource } from '../../browser/messaging/connection-source';
|
|
5
|
+
import { FrontendApplicationContribution } from '../../browser';
|
|
6
|
+
export interface ElectronIpcOptions {
|
|
7
|
+
}
|
|
8
|
+
export declare const ElectronMainConnectionProvider: unique symbol;
|
|
9
|
+
/**
|
|
10
|
+
* Connection provider between the Theia frontend and the electron-main process via IPC.
|
|
11
|
+
*/
|
|
12
|
+
export declare namespace ElectronIpcConnectionProvider {
|
|
13
|
+
function createProxy<T extends object>(container: interfaces.Container, path: string, arg?: object): RpcProxy<T>;
|
|
14
|
+
}
|
|
15
|
+
export declare class ElectronIpcConnectionSource implements ConnectionSource, FrontendApplicationContribution {
|
|
16
|
+
protected readonly onConnectionDidOpenEmitter: Emitter<Channel>;
|
|
17
|
+
onConnectionDidOpen: Event<Channel>;
|
|
18
|
+
onStart(): MaybePromise<void>;
|
|
19
|
+
}
|
|
20
|
+
export declare class ElectronIpcRendererChannel extends AbstractChannel {
|
|
21
|
+
constructor();
|
|
22
|
+
getWriteBuffer(): WriteBuffer;
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=electron-ipc-connection-source.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"electron-ipc-connection-source.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-ipc-connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGnG,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAEhE,MAAM,WAAW,kBAAkB;CAClC;AAED,eAAO,MAAM,8BAA8B,eAA2C,CAAC;AAEvF;;GAEG;AACH,yBAAiB,6BAA6B,CAAC;IAE3C,SAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAEtH;CACJ;AAED,qBACa,2BAA4B,YAAW,gBAAgB,EAAE,+BAA+B;IACjG,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,OAAO,CAAC,OAAO,CAAC,CAAiB;IAChF,mBAAmB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAyC;IAE5E,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC;CAIhC;AAED,qBAAa,0BAA2B,SAAQ,eAAe;;IAQ3D,cAAc,IAAI,WAAW;CAMhC"}
|
|
@@ -20,36 +20,36 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
20
20
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
21
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
22
|
};
|
|
23
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
-
};
|
|
26
|
-
var ElectronIpcConnectionProvider_1;
|
|
27
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
|
-
exports.ElectronIpcRendererChannel = exports.ElectronIpcConnectionProvider = void 0;
|
|
24
|
+
exports.ElectronIpcRendererChannel = exports.ElectronIpcConnectionSource = exports.ElectronIpcConnectionProvider = exports.ElectronMainConnectionProvider = void 0;
|
|
29
25
|
const inversify_1 = require("inversify");
|
|
30
|
-
const abstract_connection_provider_1 = require("../../common/messaging/abstract-connection-provider");
|
|
31
26
|
const common_1 = require("../../common");
|
|
32
27
|
const uint8_array_message_buffer_1 = require("../../common/message-rpc/uint8-array-message-buffer");
|
|
28
|
+
exports.ElectronMainConnectionProvider = Symbol('ElectronMainConnectionProvider');
|
|
33
29
|
/**
|
|
34
30
|
* Connection provider between the Theia frontend and the electron-main process via IPC.
|
|
35
31
|
*/
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
32
|
+
var ElectronIpcConnectionProvider;
|
|
33
|
+
(function (ElectronIpcConnectionProvider) {
|
|
34
|
+
function createProxy(container, path, arg) {
|
|
35
|
+
return container.get(exports.ElectronMainConnectionProvider).createProxy(path, arg);
|
|
39
36
|
}
|
|
37
|
+
ElectronIpcConnectionProvider.createProxy = createProxy;
|
|
38
|
+
})(ElectronIpcConnectionProvider = exports.ElectronIpcConnectionProvider || (exports.ElectronIpcConnectionProvider = {}));
|
|
39
|
+
let ElectronIpcConnectionSource = class ElectronIpcConnectionSource {
|
|
40
40
|
constructor() {
|
|
41
|
-
|
|
42
|
-
this.
|
|
41
|
+
this.onConnectionDidOpenEmitter = new common_1.Emitter();
|
|
42
|
+
this.onConnectionDidOpen = this.onConnectionDidOpenEmitter.event;
|
|
43
43
|
}
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
onStart() {
|
|
45
|
+
const channel = new ElectronIpcRendererChannel();
|
|
46
|
+
this.onConnectionDidOpenEmitter.fire(channel);
|
|
46
47
|
}
|
|
47
48
|
};
|
|
48
|
-
|
|
49
|
-
(0, inversify_1.injectable)()
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
exports.ElectronIpcConnectionProvider = ElectronIpcConnectionProvider;
|
|
49
|
+
ElectronIpcConnectionSource = __decorate([
|
|
50
|
+
(0, inversify_1.injectable)()
|
|
51
|
+
], ElectronIpcConnectionSource);
|
|
52
|
+
exports.ElectronIpcConnectionSource = ElectronIpcConnectionSource;
|
|
53
53
|
class ElectronIpcRendererChannel extends common_1.AbstractChannel {
|
|
54
54
|
constructor() {
|
|
55
55
|
super();
|
|
@@ -62,4 +62,4 @@ class ElectronIpcRendererChannel extends common_1.AbstractChannel {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
exports.ElectronIpcRendererChannel = ElectronIpcRendererChannel;
|
|
65
|
-
//# sourceMappingURL=electron-ipc-connection-
|
|
65
|
+
//# sourceMappingURL=electron-ipc-connection-source.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"electron-ipc-connection-source.js","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-ipc-connection-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;;;;;;AAEhF,yCAAmD;AAEnD,yCAAmG;AACnG,oGAAkH;AAQrG,QAAA,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAEvF;;GAEG;AACH,IAAiB,6BAA6B,CAK7C;AALD,WAAiB,6BAA6B;IAE1C,SAAgB,WAAW,CAAmB,SAA+B,EAAE,IAAY,EAAE,GAAY;QACrG,OAAO,SAAS,CAAC,GAAG,CAA4B,sCAA8B,CAAC,CAAC,WAAW,CAAI,IAAI,EAAE,GAAG,CAAC,CAAC;IAC9G,CAAC;IAFe,yCAAW,cAE1B,CAAA;AACL,CAAC,EALgB,6BAA6B,GAA7B,qCAA6B,KAA7B,qCAA6B,QAK7C;AAGD,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAAxC;QACuB,+BAA0B,GAAqB,IAAI,gBAAO,EAAE,CAAC;QAChF,wBAAmB,GAAmB,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;IAMhF,CAAC;IAJG,OAAO;QACH,MAAM,OAAO,GAAG,IAAI,0BAA0B,EAAE,CAAC;QACjD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;CACJ,CAAA;AARY,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAQvC;AARY,kEAA2B;AAUxC,MAAa,0BAA2B,SAAQ,wBAAe;IAE3D;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,iDAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnI,CAAC;IAED,cAAc;QACV,MAAM,MAAM,GAAG,IAAI,kDAAqB,EAAE,CAAC;QAC3C,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACrE,OAAO,MAAM,CAAC;IAClB,CAAC;CAEJ;AAdD,gEAcC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Endpoint } from '../../browser/endpoint';
|
|
2
|
+
import { WebSocketConnectionSource } from '../../browser/messaging/ws-connection-source';
|
|
3
|
+
export declare function getLocalPort(): string | undefined;
|
|
4
|
+
export declare class ElectronLocalWebSocketConnectionSource extends WebSocketConnectionSource {
|
|
5
|
+
protected createEndpoint(path: string): Endpoint;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=electron-local-ws-connection-source.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"electron-local-ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-local-ws-connection-source.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAEzF,wBAAgB,YAAY,IAAI,MAAM,GAAG,SAAS,CAGjD;AAED,qBACa,sCAAuC,SAAQ,yBAAyB;cAE9D,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;CAgB5D"}
|
|
@@ -21,17 +21,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
21
21
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
22
|
};
|
|
23
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
|
-
exports.
|
|
24
|
+
exports.ElectronLocalWebSocketConnectionSource = exports.getLocalPort = void 0;
|
|
25
25
|
const inversify_1 = require("inversify");
|
|
26
|
-
const ws_connection_provider_1 = require("../../browser/messaging/ws-connection-provider");
|
|
27
26
|
const endpoint_1 = require("../../browser/endpoint");
|
|
27
|
+
const ws_connection_source_1 = require("../../browser/messaging/ws-connection-source");
|
|
28
28
|
function getLocalPort() {
|
|
29
29
|
var _a;
|
|
30
30
|
const params = new URLSearchParams(location.search);
|
|
31
31
|
return (_a = params.get('localPort')) !== null && _a !== void 0 ? _a : undefined;
|
|
32
32
|
}
|
|
33
33
|
exports.getLocalPort = getLocalPort;
|
|
34
|
-
let
|
|
34
|
+
let ElectronLocalWebSocketConnectionSource = class ElectronLocalWebSocketConnectionSource extends ws_connection_source_1.WebSocketConnectionSource {
|
|
35
35
|
createEndpoint(path) {
|
|
36
36
|
const localPort = getLocalPort();
|
|
37
37
|
if (!localPort) {
|
|
@@ -48,8 +48,8 @@ let ElectronLocalWebSocketConnectionProvider = class ElectronLocalWebSocketConne
|
|
|
48
48
|
return endpoint;
|
|
49
49
|
}
|
|
50
50
|
};
|
|
51
|
-
|
|
51
|
+
ElectronLocalWebSocketConnectionSource = __decorate([
|
|
52
52
|
(0, inversify_1.injectable)()
|
|
53
|
-
],
|
|
54
|
-
exports.
|
|
55
|
-
//# sourceMappingURL=electron-local-ws-connection-
|
|
53
|
+
], ElectronLocalWebSocketConnectionSource);
|
|
54
|
+
exports.ElectronLocalWebSocketConnectionSource = ElectronLocalWebSocketConnectionSource;
|
|
55
|
+
//# sourceMappingURL=electron-local-ws-connection-source.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"electron-local-ws-connection-source.js","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-local-ws-connection-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;;;;;;AAEhF,yCAAuC;AACvC,qDAAkD;AAClD,uFAAyF;AAEzF,SAAgB,YAAY;;IACxB,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACpD,OAAO,MAAA,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,mCAAI,SAAS,CAAC;AAChD,CAAC;AAHD,oCAGC;AAGD,IAAa,sCAAsC,GAAnD,MAAa,sCAAuC,SAAQ,gDAAyB;IAE9D,cAAc,CAAC,IAAY;QAC1C,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;QACjC,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SAC1F;QACD,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC;YAC1B,IAAI;SACP,EAAE;YACC,IAAI,EAAE,aAAa,SAAS,EAAE;YAC9B,QAAQ,EAAE,GAAG;YACb,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,EAAE;SACb,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IACpB,CAAC;CAEJ,CAAA;AAlBY,sCAAsC;IADlD,IAAA,sBAAU,GAAE;GACA,sCAAsC,CAkBlD;AAlBY,wFAAsC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-messaging-frontend-module.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-messaging-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"electron-messaging-frontend-module.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-messaging-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAgB5C,eAAO,MAAM,uBAAuB,iBA6ClC,CAAC"}
|
|
@@ -18,27 +18,59 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.messagingFrontendModule = void 0;
|
|
19
19
|
const inversify_1 = require("inversify");
|
|
20
20
|
const frontend_application_contribution_1 = require("../../browser/frontend-application-contribution");
|
|
21
|
-
const
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
const
|
|
21
|
+
const electron_ws_connection_source_1 = require("./electron-ws-connection-source");
|
|
22
|
+
const electron_ipc_connection_source_1 = require("./electron-ipc-connection-source");
|
|
23
|
+
const electron_local_ws_connection_source_1 = require("./electron-local-ws-connection-source");
|
|
24
|
+
const electron_frontend_id_provider_1 = require("./electron-frontend-id-provider");
|
|
25
|
+
const frontend_id_provider_1 = require("../../browser/messaging/frontend-id-provider");
|
|
26
|
+
const connection_source_1 = require("../../browser/messaging/connection-source");
|
|
27
|
+
const service_connection_provider_1 = require("../../browser/messaging/service-connection-provider");
|
|
28
|
+
const browser_1 = require("../../browser");
|
|
29
|
+
const connection_management_1 = require("../../common/messaging/connection-management");
|
|
30
|
+
const ws_connection_source_1 = require("../../browser/messaging/ws-connection-source");
|
|
31
|
+
const backendServiceProvider = Symbol('backendServiceProvider2');
|
|
32
|
+
const localServiceProvider = Symbol('localServiceProvider');
|
|
25
33
|
exports.messagingFrontendModule = new inversify_1.ContainerModule(bind => {
|
|
26
|
-
bind(
|
|
27
|
-
bind(
|
|
28
|
-
bind(
|
|
29
|
-
bind(
|
|
30
|
-
bind(
|
|
31
|
-
|
|
34
|
+
bind(connection_management_1.ConnectionCloseService).toDynamicValue(ctx => browser_1.WebSocketConnectionProvider.createProxy(ctx.container, connection_management_1.connectionCloseServicePath)).inSingletonScope();
|
|
35
|
+
bind(electron_ws_connection_source_1.ElectronWebSocketConnectionSource).toSelf().inSingletonScope();
|
|
36
|
+
bind(ws_connection_source_1.WebSocketConnectionSource).toService(electron_ws_connection_source_1.ElectronWebSocketConnectionSource);
|
|
37
|
+
bind(electron_ipc_connection_source_1.ElectronIpcConnectionSource).toSelf().inSingletonScope();
|
|
38
|
+
bind(frontend_application_contribution_1.FrontendApplicationContribution).toService(electron_ipc_connection_source_1.ElectronIpcConnectionSource);
|
|
39
|
+
bind(electron_local_ws_connection_source_1.ElectronLocalWebSocketConnectionSource).toSelf().inSingletonScope();
|
|
40
|
+
bind(backendServiceProvider).toDynamicValue(ctx => {
|
|
41
|
+
const container = ctx.container.createChild();
|
|
42
|
+
container.bind(service_connection_provider_1.ServiceConnectionProvider).toSelf().inSingletonScope();
|
|
43
|
+
container.bind(connection_source_1.ConnectionSource).toService(electron_ws_connection_source_1.ElectronWebSocketConnectionSource);
|
|
44
|
+
return container.get(service_connection_provider_1.ServiceConnectionProvider);
|
|
45
|
+
}).inSingletonScope();
|
|
46
|
+
bind(localServiceProvider).toDynamicValue(ctx => {
|
|
47
|
+
const container = ctx.container.createChild();
|
|
48
|
+
container.bind(service_connection_provider_1.ServiceConnectionProvider).toSelf().inSingletonScope();
|
|
49
|
+
container.bind(connection_source_1.ConnectionSource).toService(electron_local_ws_connection_source_1.ElectronLocalWebSocketConnectionSource);
|
|
50
|
+
return container.get(service_connection_provider_1.ServiceConnectionProvider);
|
|
51
|
+
}).inSingletonScope();
|
|
52
|
+
bind(electron_ipc_connection_source_1.ElectronMainConnectionProvider).toDynamicValue(ctx => {
|
|
53
|
+
const container = ctx.container.createChild();
|
|
54
|
+
container.bind(service_connection_provider_1.ServiceConnectionProvider).toSelf().inSingletonScope();
|
|
55
|
+
container.bind(connection_source_1.ConnectionSource).toService(electron_ipc_connection_source_1.ElectronIpcConnectionSource);
|
|
56
|
+
return container.get(service_connection_provider_1.ServiceConnectionProvider);
|
|
57
|
+
}).inSingletonScope();
|
|
58
|
+
bind(service_connection_provider_1.LocalConnectionProvider).toDynamicValue(ctx => {
|
|
59
|
+
const localPort = (0, electron_local_ws_connection_source_1.getLocalPort)();
|
|
32
60
|
if (localPort) {
|
|
33
61
|
// Return new web socket provider that connects to local app
|
|
34
|
-
return ctx.container.get(
|
|
62
|
+
return ctx.container.get(localServiceProvider);
|
|
35
63
|
}
|
|
36
64
|
else {
|
|
37
65
|
// Return the usual web socket provider that already established its connection
|
|
38
66
|
// That way we don't create a second socket connection
|
|
39
|
-
return ctx.container.get(
|
|
67
|
+
return ctx.container.get(backendServiceProvider);
|
|
40
68
|
}
|
|
41
69
|
}).inSingletonScope();
|
|
42
|
-
bind(
|
|
70
|
+
bind(service_connection_provider_1.RemoteConnectionProvider).toService(backendServiceProvider);
|
|
71
|
+
bind(frontend_application_contribution_1.FrontendApplicationContribution).toService(electron_ws_connection_source_1.ElectronWebSocketConnectionSource);
|
|
72
|
+
bind(electron_frontend_id_provider_1.ElectronFrontendIdProvider).toSelf().inSingletonScope();
|
|
73
|
+
bind(frontend_id_provider_1.FrontendIdProvider).toService(electron_frontend_id_provider_1.ElectronFrontendIdProvider);
|
|
74
|
+
bind(browser_1.WebSocketConnectionProvider).toSelf().inSingletonScope();
|
|
43
75
|
});
|
|
44
76
|
//# sourceMappingURL=electron-messaging-frontend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-messaging-frontend-module.js","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-messaging-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;AAEhF,yCAA4C;AAC5C,uGAAkG;AAClG,
|
|
1
|
+
{"version":3,"file":"electron-messaging-frontend-module.js","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-messaging-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;AAEhF,yCAA4C;AAC5C,uGAAkG;AAClG,mFAAoF;AACpF,qFAA+G;AAC/G,+FAA6G;AAC7G,mFAA6E;AAC7E,uFAAkF;AAClF,iFAA6E;AAC7E,qGAAmJ;AACnJ,2CAA4D;AAC5D,wFAAkH;AAClH,uFAAyF;AAEzF,MAAM,sBAAsB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AACjE,MAAM,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAE/C,QAAA,uBAAuB,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IAC9D,IAAI,CAAC,8CAAsB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,qCAA2B,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,kDAA0B,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1J,IAAI,CAAC,iEAAiC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,gDAAyB,CAAC,CAAC,SAAS,CAAC,iEAAiC,CAAC,CAAC;IAC7E,IAAI,CAAC,4DAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,mEAA+B,CAAC,CAAC,SAAS,CAAC,4DAA2B,CAAC,CAAC;IAC7E,IAAI,CAAC,4EAAsC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzE,IAAI,CAAC,sBAAsB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC9C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACtE,SAAS,CAAC,IAAI,CAAC,oCAAgB,CAAC,CAAC,SAAS,CAAC,iEAAiC,CAAC,CAAC;QAC9E,OAAO,SAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,oBAAoB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC5C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACtE,SAAS,CAAC,IAAI,CAAC,oCAAgB,CAAC,CAAC,SAAS,CAAC,4EAAsC,CAAC,CAAC;QACnF,OAAO,SAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,+DAA8B,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACtD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACtE,SAAS,CAAC,IAAI,CAAC,oCAAgB,CAAC,CAAC,SAAS,CAAC,4DAA2B,CAAC,CAAC;QACxE,OAAO,SAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,qDAAuB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC/C,MAAM,SAAS,GAAG,IAAA,kDAAY,GAAE,CAAC;QACjC,IAAI,SAAS,EAAE;YACX,4DAA4D;YAC5D,OAAO,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SAClD;aAAM;YACH,+EAA+E;YAC/E,sDAAsD;YACtD,OAAO,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;SACpD;IACL,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,sDAAwB,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAEjE,IAAI,CAAC,mEAA+B,CAAC,CAAC,SAAS,CAAC,iEAAiC,CAAC,CAAC;IACnF,IAAI,CAAC,0DAA0B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7D,IAAI,CAAC,yCAAkB,CAAC,CAAC,SAAS,CAAC,0DAA0B,CAAC,CAAC;IAC/D,IAAI,CAAC,qCAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAClE,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { FrontendApplicationContribution } from '../../browser/frontend-application-contribution';
|
|
2
|
+
import { WebSocketConnectionSource } from '../../browser/messaging/ws-connection-source';
|
|
3
|
+
/**
|
|
4
|
+
* Customized connection provider between the frontend and the backend in electron environment.
|
|
5
|
+
* This customized connection provider makes sure the websocket connection does not try to reconnect
|
|
6
|
+
* once the electron-browser window is refreshed. Otherwise, backend resources are not disposed.
|
|
7
|
+
*/
|
|
8
|
+
export declare class ElectronWebSocketConnectionSource extends WebSocketConnectionSource implements FrontendApplicationContribution {
|
|
9
|
+
constructor();
|
|
10
|
+
onStop(): void;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=electron-ws-connection-source.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"electron-ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-ws-connection-source.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAEzF;;;;GAIG;AACH,qBACa,iCAAkC,SAAQ,yBAA0B,YAAW,+BAA+B;;IAKvH,MAAM,IAAI,IAAI;CAMjB"}
|
|
@@ -20,39 +20,32 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
20
20
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
21
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
22
|
};
|
|
23
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
+
};
|
|
23
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
|
-
exports.
|
|
27
|
+
exports.ElectronWebSocketConnectionSource = void 0;
|
|
25
28
|
const inversify_1 = require("inversify");
|
|
26
|
-
const
|
|
29
|
+
const ws_connection_source_1 = require("../../browser/messaging/ws-connection-source");
|
|
27
30
|
/**
|
|
28
31
|
* Customized connection provider between the frontend and the backend in electron environment.
|
|
29
32
|
* This customized connection provider makes sure the websocket connection does not try to reconnect
|
|
30
33
|
* once the electron-browser window is refreshed. Otherwise, backend resources are not disposed.
|
|
31
34
|
*/
|
|
32
|
-
let
|
|
35
|
+
let ElectronWebSocketConnectionSource = class ElectronWebSocketConnectionSource extends ws_connection_source_1.WebSocketConnectionSource {
|
|
33
36
|
constructor() {
|
|
34
|
-
super(
|
|
35
|
-
/**
|
|
36
|
-
* Do not try to reconnect when the frontend application is stopping. The browser is navigating away from this page.
|
|
37
|
-
*/
|
|
38
|
-
this.stopping = false;
|
|
37
|
+
super();
|
|
39
38
|
}
|
|
40
39
|
onStop() {
|
|
41
|
-
var _a;
|
|
42
|
-
this.stopping = true;
|
|
43
40
|
// Manually close the websocket connections `onStop`. Otherwise, the channels will be closed with 30 sec (`MessagingContribution#checkAliveTimeout`) delay.
|
|
44
41
|
// https://github.com/eclipse-theia/theia/issues/6499
|
|
45
42
|
// `1001` indicates that an endpoint is "going away", such as a server going down or a browser having navigated away from a page.
|
|
46
|
-
|
|
47
|
-
}
|
|
48
|
-
async openChannel(path, handler, options) {
|
|
49
|
-
if (!this.stopping) {
|
|
50
|
-
super.openChannel(path, handler, options);
|
|
51
|
-
}
|
|
43
|
+
this.socket.close();
|
|
52
44
|
}
|
|
53
45
|
};
|
|
54
|
-
|
|
55
|
-
(0, inversify_1.injectable)()
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
46
|
+
ElectronWebSocketConnectionSource = __decorate([
|
|
47
|
+
(0, inversify_1.injectable)(),
|
|
48
|
+
__metadata("design:paramtypes", [])
|
|
49
|
+
], ElectronWebSocketConnectionSource);
|
|
50
|
+
exports.ElectronWebSocketConnectionSource = ElectronWebSocketConnectionSource;
|
|
51
|
+
//# sourceMappingURL=electron-ws-connection-source.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"electron-ws-connection-source.js","sourceRoot":"","sources":["../../../src/electron-browser/messaging/electron-ws-connection-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;;;;;;;;;AAEhF,yCAAuC;AAEvC,uFAAyF;AAEzF;;;;GAIG;AAEH,IAAa,iCAAiC,GAA9C,MAAa,iCAAkC,SAAQ,gDAAyB;IAC5E;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;IAED,MAAM;QACF,2JAA2J;QAC3J,qDAAqD;QACrD,iIAAiI;QACjI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACJ,CAAA;AAXY,iCAAiC;IAD7C,IAAA,sBAAU,GAAE;;GACA,iCAAiC,CAW7C;AAXY,8EAAiC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preload.d.ts","sourceRoot":"","sources":["../../src/electron-browser/preload.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preload.d.ts","sourceRoot":"","sources":["../../src/electron-browser/preload.ts"],"names":[],"mappings":"AAuOA,wBAAgB,OAAO,IAAI,IAAI,CAc9B"}
|
|
@@ -35,6 +35,7 @@ function convertMenu(menu, handlerMap) {
|
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
const api = {
|
|
38
|
+
WindowMetadata: { webcontentId: 'none' },
|
|
38
39
|
setMenuBarVisible: (visible, windowName) => ipcRenderer.send(electron_api_1.CHANNEL_SET_MENU_BAR_VISIBLE, visible, windowName),
|
|
39
40
|
setMenu: (menu) => {
|
|
40
41
|
commandHandlers.delete(mainMenuId);
|
|
@@ -88,6 +89,14 @@ const api = {
|
|
|
88
89
|
close: function () {
|
|
89
90
|
ipcRenderer.send(electron_api_1.CHANNEL_CLOSE);
|
|
90
91
|
},
|
|
92
|
+
onAboutToClose(handler) {
|
|
93
|
+
const h = (event, replyChannel) => {
|
|
94
|
+
handler();
|
|
95
|
+
event.sender.send(replyChannel);
|
|
96
|
+
};
|
|
97
|
+
ipcRenderer.on(electron_api_1.CHANNEL_ABOUT_TO_CLOSE, h);
|
|
98
|
+
return disposable_1.Disposable.create(() => ipcRenderer.off(electron_api_1.CHANNEL_ABOUT_TO_CLOSE, h));
|
|
99
|
+
},
|
|
91
100
|
onWindowEvent: function (event, handler) {
|
|
92
101
|
const h = (_event, evt) => {
|
|
93
102
|
if (event === evt) {
|
|
@@ -168,6 +177,7 @@ const api = {
|
|
|
168
177
|
sendData: data => {
|
|
169
178
|
ipcRenderer.send(electron_api_1.CHANNEL_IPC_CONNECTION, data);
|
|
170
179
|
},
|
|
180
|
+
useNativeElements: !('THEIA_ELECTRON_DISABLE_NATIVE_ELEMENTS' in process.env && process.env.THEIA_ELECTRON_DISABLE_NATIVE_ELEMENTS === '1')
|
|
171
181
|
};
|
|
172
182
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
173
183
|
function createDisposableListener(channel, handler) {
|
|
@@ -185,6 +195,7 @@ function preload() {
|
|
|
185
195
|
}
|
|
186
196
|
}
|
|
187
197
|
});
|
|
198
|
+
api.WindowMetadata.webcontentId = ipcRenderer.sendSync(electron_api_1.CHANNEL_WC_METADATA);
|
|
188
199
|
contextBridge.exposeInMainWorld('electronTheiaCore', api);
|
|
189
200
|
}
|
|
190
201
|
exports.preload = preload;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preload.js","sourceRoot":"","sources":["../../src/electron-browser/preload.ts"],"names":[],"mappings":";;;AAgBA,qDAAkD;AAGlD,
|
|
1
|
+
{"version":3,"file":"preload.js","sourceRoot":"","sources":["../../src/electron-browser/preload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DefaultSecondaryWindowService } from '../../browser/window/default-secondary-window-service';
|
|
2
|
-
import { ApplicationShell, ExtractableWidget } from '
|
|
2
|
+
import { ApplicationShell, ExtractableWidget } from '../../browser';
|
|
3
3
|
export declare class ElectronSecondaryWindowService extends DefaultSecondaryWindowService {
|
|
4
4
|
focus(win: Window): void;
|
|
5
5
|
protected doCreateSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell): Window | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,6BAA6B,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"electron-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,6BAA6B,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEpE,qBACa,8BAA+B,SAAQ,6BAA6B;IACpE,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;cAId,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS;YAQpG,QAAQ;CAIzB"}
|
|
@@ -22,14 +22,14 @@ const frontend_application_contribution_1 = require("../../browser/frontend-appl
|
|
|
22
22
|
const electron_clipboard_service_1 = require("../electron-clipboard-service");
|
|
23
23
|
const clipboard_service_1 = require("../../browser/clipboard-service");
|
|
24
24
|
const electron_main_window_service_1 = require("../../electron-common/electron-main-window-service");
|
|
25
|
-
const
|
|
25
|
+
const electron_ipc_connection_source_1 = require("../messaging/electron-ipc-connection-source");
|
|
26
26
|
const electron_window_preferences_1 = require("./electron-window-preferences");
|
|
27
27
|
const frontend_application_state_1 = require("../../browser/frontend-application-state");
|
|
28
28
|
const electron_frontend_application_state_1 = require("./electron-frontend-application-state");
|
|
29
29
|
const electron_secondary_window_service_1 = require("./electron-secondary-window-service");
|
|
30
30
|
const secondary_window_service_1 = require("../../browser/window/secondary-window-service");
|
|
31
31
|
exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
|
|
32
|
-
bind(electron_main_window_service_1.ElectronMainWindowService).toDynamicValue(context =>
|
|
32
|
+
bind(electron_main_window_service_1.ElectronMainWindowService).toDynamicValue(context => electron_ipc_connection_source_1.ElectronIpcConnectionProvider.createProxy(context.container, electron_main_window_service_1.electronMainWindowServicePath)).inSingletonScope();
|
|
33
33
|
(0, electron_window_preferences_1.bindWindowPreferences)(bind);
|
|
34
34
|
bind(window_service_1.WindowService).to(electron_window_service_1.ElectronWindowService).inSingletonScope();
|
|
35
35
|
bind(frontend_application_contribution_1.FrontendApplicationContribution).toService(window_service_1.WindowService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-window-module.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-window-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;AAEhF,yCAA4C;AAC5C,wEAAoE;AACpE,uEAAkE;AAClE,uGAAkG;AAClG,8EAAyE;AACzE,uEAAmE;AACnE,qGAA8H;AAC9H,
|
|
1
|
+
{"version":3,"file":"electron-window-module.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-window-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;AAEhF,yCAA4C;AAC5C,wEAAoE;AACpE,uEAAkE;AAClE,uGAAkG;AAClG,8EAAyE;AACzE,uEAAmE;AACnE,qGAA8H;AAC9H,gGAA4F;AAC5F,+EAAsE;AACtE,yFAA2F;AAC3F,+FAAgG;AAChG,2FAAqF;AACrF,4FAAuF;AAEvF,kBAAe,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACjE,IAAI,CAAC,wDAAyB,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CACrD,8DAA6B,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,4DAA6B,CAAC,CAC9F,CAAC,gBAAgB,EAAE,CAAC;IACrB,IAAA,mDAAqB,EAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,8BAAa,CAAC,CAAC,EAAE,CAAC,+CAAqB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACjE,IAAI,CAAC,mEAA+B,CAAC,CAAC,SAAS,CAAC,8BAAa,CAAC,CAAC;IAC/D,IAAI,CAAC,oCAAgB,CAAC,CAAC,EAAE,CAAC,qDAAwB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACvE,MAAM,CAAC,4DAA+B,CAAC,CAAC,EAAE,CAAC,6EAAuC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACvG,IAAI,CAAC,iDAAsB,CAAC,CAAC,EAAE,CAAC,kEAA8B,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACvF,CAAC,CAAC,CAAC"}
|
|
@@ -46,7 +46,7 @@ exports.electronWindowPreferencesSchema = {
|
|
|
46
46
|
default: common_1.isWindows ? 'custom' : 'native',
|
|
47
47
|
scope: 'application',
|
|
48
48
|
// eslint-disable-next-line max-len
|
|
49
|
-
description: nls_1.nls.localizeByDefault('Adjust the appearance of the window title bar. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply.'),
|
|
49
|
+
description: nls_1.nls.localizeByDefault('Adjust the appearance of the window title bar to be native by the OS or custom. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply.'),
|
|
50
50
|
included: !common_1.isOSX
|
|
51
51
|
},
|
|
52
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-window-preferences.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-window-preferences.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,0CAAuC;AACvC,2DAAgJ;AAChJ,yCAAgD;AAEhD,IAAiB,SAAS,CAOzB;AAPD,WAAiB,SAAS;IACT,iBAAO,GAAG,CAAC,CAAC;IACzB,mKAAmK;IACtJ,aAAG,GAAG,CAAC,CAAC,CAAC;IACT,aAAG,GAAG,CAAC,CAAC;IACrB,0DAA0D;IAC7C,mBAAS,GAAG,GAAG,CAAC;AACjC,CAAC,EAPgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAOzB;AAEY,QAAA,+BAA+B,GAAqB;IAC7D,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,kBAAkB,EAAE;YAChB,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,SAAS,CAAC,OAAO;YAC5B,SAAS,EAAE,SAAS,CAAC,GAAG;YACxB,SAAS,EAAE,SAAS,CAAC,GAAG;YACxB,OAAO,EAAE,aAAa;YACtB,mCAAmC;YACnC,aAAa,EAAE,SAAG,CAAC,iBAAiB,CAAC,2OAA2O,CAAC;SACpR;QACD,sBAAsB,EAAE;YACpB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;YAC1B,OAAO,EAAE,kBAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;YACxC,KAAK,EAAE,aAAa;YACpB,mCAAmC;YACnC,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"electron-window-preferences.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-window-preferences.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,0CAAuC;AACvC,2DAAgJ;AAChJ,yCAAgD;AAEhD,IAAiB,SAAS,CAOzB;AAPD,WAAiB,SAAS;IACT,iBAAO,GAAG,CAAC,CAAC;IACzB,mKAAmK;IACtJ,aAAG,GAAG,CAAC,CAAC,CAAC;IACT,aAAG,GAAG,CAAC,CAAC;IACrB,0DAA0D;IAC7C,mBAAS,GAAG,GAAG,CAAC;AACjC,CAAC,EAPgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAOzB;AAEY,QAAA,+BAA+B,GAAqB;IAC7D,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,kBAAkB,EAAE;YAChB,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,SAAS,CAAC,OAAO;YAC5B,SAAS,EAAE,SAAS,CAAC,GAAG;YACxB,SAAS,EAAE,SAAS,CAAC,GAAG;YACxB,OAAO,EAAE,aAAa;YACtB,mCAAmC;YACnC,aAAa,EAAE,SAAG,CAAC,iBAAiB,CAAC,2OAA2O,CAAC;SACpR;QACD,sBAAsB,EAAE;YACpB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;YAC1B,OAAO,EAAE,kBAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;YACxC,KAAK,EAAE,aAAa;YACpB,mCAAmC;YACnC,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,wNAAwN,CAAC;YAC5P,QAAQ,EAAE,CAAC,cAAK;SACnB;KACJ;CACJ,CAAC;AAEF,MAAa,2BAA2B;CAGvC;AAHD,kEAGC;AAEY,QAAA,oCAAoC,GAAG,MAAM,CAAC,sCAAsC,CAAC,CAAC;AACtF,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAG7E,SAAgB,+BAA+B,CAAC,WAA8B,EAAE,SAA2B,uCAA+B;IACtI,OAAO,IAAA,mCAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAFD,0EAEC;AAED,SAAgB,qBAAqB,CAAC,IAAqB;IACvD,IAAI,CAAC,iCAAyB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACjD,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,+BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,4CAAoC,CAAC,CAAC;QACrG,OAAO,+BAA+B,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,4CAAoC,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,uCAA+B,EAAE,CAAC,CAAC;IACxG,IAAI,CAAC,oCAAsB,CAAC,CAAC,SAAS,CAAC,4CAAoC,CAAC,CAAC;AACjF,CAAC;AARD,sDAQC"}
|
|
@@ -2,6 +2,8 @@ import { NewWindowOptions, WindowSearchParams } from '../../common/window';
|
|
|
2
2
|
import { DefaultWindowService } from '../../browser/window/default-window-service';
|
|
3
3
|
import { ElectronMainWindowService } from '../../electron-common/electron-main-window-service';
|
|
4
4
|
import { ElectronWindowPreferences } from './electron-window-preferences';
|
|
5
|
+
import { ConnectionCloseService } from '../../common/messaging/connection-management';
|
|
6
|
+
import { FrontendIdProvider } from '../../browser/messaging/frontend-id-provider';
|
|
5
7
|
export declare class ElectronWindowService extends DefaultWindowService {
|
|
6
8
|
/**
|
|
7
9
|
* Lock to prevent multiple parallel executions of the `beforeunload` listener.
|
|
@@ -11,8 +13,10 @@ export declare class ElectronWindowService extends DefaultWindowService {
|
|
|
11
13
|
* Close the window right away when `true`, else check if we can unload.
|
|
12
14
|
*/
|
|
13
15
|
protected closeOnUnload: boolean;
|
|
16
|
+
protected readonly frontendIdProvider: FrontendIdProvider;
|
|
14
17
|
protected readonly delegate: ElectronMainWindowService;
|
|
15
18
|
protected readonly electronWindowPreferences: ElectronWindowPreferences;
|
|
19
|
+
protected readonly connectionCloseService: ConnectionCloseService;
|
|
16
20
|
openNewWindow(url: string, { external }?: NewWindowOptions): undefined;
|
|
17
21
|
openNewDefaultWindow(params?: WindowSearchParams): void;
|
|
18
22
|
protected init(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-window-service.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAE,yBAAyB,EAAE,MAAM,oDAAoD,CAAC;AAC/F,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"electron-window-service.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAE,yBAAyB,EAAE,MAAM,oDAAoD,CAAC;AAC/F,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAElF,qBACa,qBAAsB,SAAQ,oBAAoB;IAE3D;;OAEG;IACH,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;IAEvC;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAGzC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,yBAAyB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAEzD,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,GAAE,gBAAqB,GAAG,SAAS;IAK1E,oBAAoB,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAKhE,SAAS,CAAC,IAAI,IAAI,IAAI;cAYH,uBAAuB,IAAI,IAAI;IAOlD;;OAEG;cACa,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAO7C,MAAM,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,IAAI;CAQrD"}
|
|
@@ -29,6 +29,8 @@ const inversify_1 = require("inversify");
|
|
|
29
29
|
const default_window_service_1 = require("../../browser/window/default-window-service");
|
|
30
30
|
const electron_main_window_service_1 = require("../../electron-common/electron-main-window-service");
|
|
31
31
|
const electron_window_preferences_1 = require("./electron-window-preferences");
|
|
32
|
+
const connection_management_1 = require("../../common/messaging/connection-management");
|
|
33
|
+
const frontend_id_provider_1 = require("../../browser/messaging/frontend-id-provider");
|
|
32
34
|
let ElectronWindowService = class ElectronWindowService extends default_window_service_1.DefaultWindowService {
|
|
33
35
|
constructor() {
|
|
34
36
|
super(...arguments);
|
|
@@ -55,6 +57,9 @@ let ElectronWindowService = class ElectronWindowService extends default_window_s
|
|
|
55
57
|
this.updateWindowZoomLevel();
|
|
56
58
|
}
|
|
57
59
|
});
|
|
60
|
+
window.electronTheiaCore.onAboutToClose(() => {
|
|
61
|
+
this.connectionCloseService.markForClose(this.frontendIdProvider.getId());
|
|
62
|
+
});
|
|
58
63
|
}
|
|
59
64
|
registerUnloadListeners() {
|
|
60
65
|
window.electronTheiaCore.setCloseRequestHandler(reason => this.isSafeToShutDown(reason));
|
|
@@ -81,6 +86,10 @@ let ElectronWindowService = class ElectronWindowService extends default_window_s
|
|
|
81
86
|
}
|
|
82
87
|
}
|
|
83
88
|
};
|
|
89
|
+
__decorate([
|
|
90
|
+
(0, inversify_1.inject)(frontend_id_provider_1.FrontendIdProvider),
|
|
91
|
+
__metadata("design:type", Object)
|
|
92
|
+
], ElectronWindowService.prototype, "frontendIdProvider", void 0);
|
|
84
93
|
__decorate([
|
|
85
94
|
(0, inversify_1.inject)(electron_main_window_service_1.ElectronMainWindowService),
|
|
86
95
|
__metadata("design:type", Object)
|
|
@@ -89,6 +98,10 @@ __decorate([
|
|
|
89
98
|
(0, inversify_1.inject)(electron_window_preferences_1.ElectronWindowPreferences),
|
|
90
99
|
__metadata("design:type", Object)
|
|
91
100
|
], ElectronWindowService.prototype, "electronWindowPreferences", void 0);
|
|
101
|
+
__decorate([
|
|
102
|
+
(0, inversify_1.inject)(connection_management_1.ConnectionCloseService),
|
|
103
|
+
__metadata("design:type", Object)
|
|
104
|
+
], ElectronWindowService.prototype, "connectionCloseService", void 0);
|
|
92
105
|
__decorate([
|
|
93
106
|
(0, inversify_1.postConstruct)(),
|
|
94
107
|
__metadata("design:type", Function),
|