@opensumi/ide-remote-opener 2.24.3 → 2.24.4
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.opener.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/remote.opener.contribution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remote.opener.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/remote.opener.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAgBnE,qBACa,8BAA+B,YAAW,qBAAqB;IAE1E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAGpC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAuB;IAG/D,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA0D;IAG/F,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA8B;IAElE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;IAE1C,OAAO;IAOP,MAAM;CAQP"}
|
|
@@ -3,25 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.RemoteOpenerContributionClient = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
|
-
const browser_1 = require("@opensumi/ide-connection/lib/browser");
|
|
7
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
8
|
const common_1 = require("../common");
|
|
10
9
|
const common_2 = require("../common");
|
|
11
10
|
// 从extension.contribution.ts中Copy过来，因为直接引入会有一定概率触发IDE初始化问题
|
|
12
11
|
const getClientId = (injector) => {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
// Electron 环境下，未指定 isRemote 时默认使用本地连接
|
|
16
|
-
// 否则使用 WebSocket 连接
|
|
17
|
-
if (appConfig.isElectronRenderer && !appConfig.isRemote) {
|
|
18
|
-
clientId = ide_core_browser_1.electronEnv.metadata.windowClientId;
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
const channelHandler = injector.get(browser_1.WSChannelHandler);
|
|
22
|
-
clientId = channelHandler.clientId;
|
|
23
|
-
}
|
|
24
|
-
return clientId;
|
|
12
|
+
const service = injector.get(ide_core_common_1.IApplicationService);
|
|
13
|
+
return service.clientId;
|
|
25
14
|
};
|
|
26
15
|
let RemoteOpenerContributionClient = class RemoteOpenerContributionClient {
|
|
27
16
|
constructor() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.opener.contribution.js","sourceRoot":"","sources":["../../src/browser/remote.opener.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"remote.opener.contribution.js","sourceRoot":"","sources":["../../src/browser/remote.opener.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAmE;AACnE,iEAAmE;AACnE,+DAA8G;AAE9G,sCAA0E;AAC1E,sCAImB;AAEnB,2DAA2D;AAC3D,MAAM,WAAW,GAAG,CAAC,QAAkB,EAAE,EAAE;IACzC,MAAM,OAAO,GAAwB,QAAQ,CAAC,GAAG,CAAC,qCAAmB,CAAC,CAAC;IACvE,OAAO,OAAO,CAAC,QAAQ,CAAC;AAC1B,CAAC,CAAC;AAGK,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAApC;QAaY,UAAK,GAAG,IAAA,gCAAc,GAAE,CAAC;IAiB5C,CAAC;IAfC,OAAO;QACL,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;QACnE,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACxC,YAAY,CAAC,iBAAiB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC1D;IACH,CAAC;IAED,MAAM;QACJ,IAAI;YACF,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,CAAC,uBAAuB,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;SACjE;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACrB;IACH,CAAC;CACF,CAAA;AA7BC;IAAC,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACC,aAAQ;gEAAC;AAEpC;IAAC,IAAA,cAAS,EAAC,gCAAuB,CAAC;;+EAC4B;AAE/D;IAAC,IAAA,cAAS,EAAC,0CAAiC,CAAC;;4EACkD;AAE/F;IAAC,IAAA,cAAS,EAAC,wCAA+B,CAAC;;2EACuB;AAXvD,8BAA8B;IAD1C,IAAA,wBAAM,EAAC,wCAAqB,CAAC;GACjB,8BAA8B,CA8B1C;AA9BY,wEAA8B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-remote-opener",
|
|
3
|
-
"version": "2.24.
|
|
3
|
+
"version": "2.24.4",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,13 +17,13 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "2.24.
|
|
21
|
-
"@opensumi/ide-core-common": "2.24.
|
|
22
|
-
"@opensumi/ide-core-node": "2.24.
|
|
20
|
+
"@opensumi/ide-connection": "2.24.4",
|
|
21
|
+
"@opensumi/ide-core-common": "2.24.4",
|
|
22
|
+
"@opensumi/ide-core-node": "2.24.4"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@opensumi/ide-core-browser": "2.24.
|
|
26
|
-
"@opensumi/ide-editor": "2.24.
|
|
25
|
+
"@opensumi/ide-core-browser": "2.24.4",
|
|
26
|
+
"@opensumi/ide-editor": "2.24.4"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "9248a630c5a3717c9357d4565c41532e9729ca11"
|
|
29
29
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Autowired, Injector, INJECTOR_TOKEN } from '@opensumi/di';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { ContributionProvider, Domain, getDebugLogger } from '@opensumi/ide-core-common';
|
|
2
|
+
import { ClientAppContribution } from '@opensumi/ide-core-browser';
|
|
3
|
+
import { ContributionProvider, Domain, getDebugLogger, IApplicationService } from '@opensumi/ide-core-common';
|
|
5
4
|
|
|
6
5
|
import { IRemoteOpenerService, RemoteOpenerServicePath } from '../common';
|
|
7
6
|
import {
|
|
@@ -12,18 +11,8 @@ import {
|
|
|
12
11
|
|
|
13
12
|
// 从extension.contribution.ts中Copy过来，因为直接引入会有一定概率触发IDE初始化问题
|
|
14
13
|
const getClientId = (injector: Injector) => {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
// Electron 环境下，未指定 isRemote 时默认使用本地连接
|
|
19
|
-
// 否则使用 WebSocket 连接
|
|
20
|
-
if (appConfig.isElectronRenderer && !appConfig.isRemote) {
|
|
21
|
-
clientId = electronEnv.metadata.windowClientId;
|
|
22
|
-
} else {
|
|
23
|
-
const channelHandler = injector.get(WSChannelHandler);
|
|
24
|
-
clientId = channelHandler.clientId;
|
|
25
|
-
}
|
|
26
|
-
return clientId;
|
|
14
|
+
const service: IApplicationService = injector.get(IApplicationService);
|
|
15
|
+
return service.clientId;
|
|
27
16
|
};
|
|
28
17
|
|
|
29
18
|
@Domain(ClientAppContribution)
|