@theia/remote-wsl 1.73.0-next.20 → 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/electron-node/remote-wsl-connection-provider.d.ts +2 -1
- package/lib/electron-node/remote-wsl-connection-provider.d.ts.map +1 -1
- package/lib/electron-node/remote-wsl-connection-provider.js +6 -1
- package/lib/electron-node/remote-wsl-connection-provider.js.map +1 -1
- package/package.json +5 -5
- package/src/electron-node/remote-wsl-connection-provider.ts +6 -3
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { RemoteWslConnectionProvider, WslDistribution, WslConnectionOptions, WslConnectionResult } from '../electron-common/remote-wsl-connection-provider';
|
|
2
2
|
import { RemoteConnectionService } from '@theia/remote/lib/electron-node/remote-connection-service';
|
|
3
3
|
import { RemoteSetupService } from '@theia/remote/lib/electron-node/setup/remote-setup-service';
|
|
4
|
-
import { MessageService } from '@theia/core';
|
|
4
|
+
import { MessageService, ILogger } from '@theia/core';
|
|
5
5
|
export declare class RemoteWslConnectionProviderImpl implements RemoteWslConnectionProvider {
|
|
6
6
|
protected readonly remoteConnectionService: RemoteConnectionService;
|
|
7
7
|
protected readonly remoteSetup: RemoteSetupService;
|
|
8
8
|
protected readonly messageService: MessageService;
|
|
9
|
+
protected readonly logger: ILogger;
|
|
9
10
|
dispose(): void;
|
|
10
11
|
/**
|
|
11
12
|
* executes `wsl.exe --list` to get the list of WSL distributions.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-wsl-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection-provider.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,2BAA2B,EAAE,eAAe,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAC5J,OAAO,EAAE,uBAAuB,EAAE,MAAM,2DAA2D,CAAC;AACpG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4DAA4D,CAAC;AAEhG,OAAO,EAAE,cAAc,EAAgB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-wsl-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection-provider.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,2BAA2B,EAAE,eAAe,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAC5J,OAAO,EAAE,uBAAuB,EAAE,MAAM,2DAA2D,CAAC;AACpG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4DAA4D,CAAC;AAEhG,OAAO,EAAE,cAAc,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AAGpE,qBACa,+BAAgC,YAAW,2BAA2B;IAG/E,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,OAAO,IAAI,IAAI;IAGf;;;;;;;;;;;OAWG;IACG,mBAAmB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAgCjD,YAAY,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAsClF"}
|
|
@@ -43,7 +43,7 @@ let RemoteWslConnectionProviderImpl = class RemoteWslConnectionProviderImpl {
|
|
|
43
43
|
(0, child_process_1.exec)('wsl.exe --list --verbose --all', (error, stdout, stderr) => {
|
|
44
44
|
if (error) {
|
|
45
45
|
const errorMessage = `Error executing wsl.exe: ${error} \n ${stderr}`;
|
|
46
|
-
|
|
46
|
+
this.logger.error(errorMessage);
|
|
47
47
|
reject(errorMessage);
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
@@ -115,6 +115,11 @@ tslib_1.__decorate([
|
|
|
115
115
|
(0, inversify_1.inject)(core_1.MessageService),
|
|
116
116
|
tslib_1.__metadata("design:type", core_1.MessageService)
|
|
117
117
|
], RemoteWslConnectionProviderImpl.prototype, "messageService", void 0);
|
|
118
|
+
tslib_1.__decorate([
|
|
119
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
120
|
+
(0, inversify_1.named)('remote-wsl:RemoteWslConnectionProviderImpl'),
|
|
121
|
+
tslib_1.__metadata("design:type", Object)
|
|
122
|
+
], RemoteWslConnectionProviderImpl.prototype, "logger", void 0);
|
|
118
123
|
exports.RemoteWslConnectionProviderImpl = RemoteWslConnectionProviderImpl = tslib_1.__decorate([
|
|
119
124
|
(0, inversify_1.injectable)()
|
|
120
125
|
], RemoteWslConnectionProviderImpl);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-wsl-connection-provider.js","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection-provider.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,
|
|
1
|
+
{"version":3,"file":"remote-wsl-connection-provider.js","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection-provider.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,4DAAyE;AAEzE,yGAAoG;AACpG,qGAAgG;AAChG,iDAAqC;AACrC,sCAAoE;AACpE,mEAA8D;AAGvD,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAcxC,OAAO;IACP,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,mBAAmB;QACrB,OAAO,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtD,IAAA,oBAAI,EAAC,gCAAgC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBAC7D,IAAI,KAAK,EAAE,CAAC;oBACR,MAAM,YAAY,GAAG,4BAA4B,KAAK,OAAO,MAAM,EAAE,CAAC;oBACtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;oBAChC,MAAM,CAAC,YAAY,CAAC,CAAC;oBACrB,OAAO;gBACX,CAAC;gBAED,MAAM,KAAK,GAAG,MAAM;qBACf,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;qBAClB,KAAK,CAAC,IAAI,CAAC;qBACX,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;qBAC1C,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;qBAC/B,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB;gBAElC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAChC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;oBACnC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC7C,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAChD,OAAO;wBACH,IAAI;wBACJ,OAAO,EAAE,SAAS;wBAClB,OAAO;qBACV,CAAC;gBACN,CAAC,CAAC,CAAC,CAAC;YACR,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAA6B;QAC5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;YACpD,IAAI,EAAE,mBAAmB;SAC5B,CAAC,CAAC;QAEH,IAAI,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,2CAAmB,CAAC;gBACvC,EAAE,EAAE,IAAA,mBAAY,GAAE;gBAClB,IAAI,EAAE,OAAO,CAAC,YAAY;gBAC1B,IAAI,EAAE,KAAK;gBACX,YAAY,EAAE,OAAO,CAAC,YAAY;aACrC,CAAC,CAAC;YAEH,MAAM,MAAM,GAA8B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAClF,MAAM,CAAC,kCAAkC,CAAC,CAAC;YAE3C,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;gBACzB,UAAU;gBACV,MAAM;gBACN,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;aACrD,CAAC,CAAC;YAEH,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAEvE,UAAU,CAAC,eAAe,CAAC,GAAG,EAAE;gBAC5B,YAAY,CAAC,OAAO,EAAE,CAAC;YAC3B,CAAC,CAAC,CAAC;YAEH,OAAO;gBACH,IAAI,EAAE,UAAU,CAAC,UAAU;aAC9B,CAAC;QACN,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,MAAM,CAAC,CAAC;QACZ,CAAC;gBAAS,CAAC;YACP,QAAQ,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC;IACL,CAAC;CACJ,CAAA;AAnGY,0EAA+B;AAGrB;IADlB,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCACY,mDAAuB;gFAAC;AAGjD;IADlB,IAAA,kBAAM,EAAC,yCAAkB,CAAC;sCACK,yCAAkB;oEAAC;AAGhC;IADlB,IAAA,kBAAM,EAAC,qBAAc,CAAC;sCACY,qBAAc;uEAAC;AAG/B;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,4CAA4C,CAAC;;+DAClC;0CAZ1B,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAmG3C"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/remote-wsl",
|
|
3
|
-
"version": "1.73.0-next.
|
|
3
|
+
"version": "1.73.0-next.24+ed85d4937",
|
|
4
4
|
"description": "Theia - Remote WSL",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.73.0-next.
|
|
7
|
-
"@theia/remote": "1.73.0-next.
|
|
8
|
-
"@theia/workspace": "1.73.0-next.
|
|
6
|
+
"@theia/core": "1.73.0-next.24+ed85d4937",
|
|
7
|
+
"@theia/remote": "1.73.0-next.24+ed85d4937",
|
|
8
|
+
"@theia/workspace": "1.73.0-next.24+ed85d4937",
|
|
9
9
|
"tslib": "^2.8.1"
|
|
10
10
|
},
|
|
11
11
|
"publishConfig": {
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"nyc": {
|
|
45
45
|
"extends": "../../configs/nyc.json"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "ed85d49379279b6472543df174249476e1619bac"
|
|
48
48
|
}
|
|
@@ -14,12 +14,12 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
17
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { RemoteWslConnectionProvider, WslDistribution, WslConnectionOptions, WslConnectionResult } from '../electron-common/remote-wsl-connection-provider';
|
|
19
19
|
import { RemoteConnectionService } from '@theia/remote/lib/electron-node/remote-connection-service';
|
|
20
20
|
import { RemoteSetupService } from '@theia/remote/lib/electron-node/setup/remote-setup-service';
|
|
21
21
|
import { exec } from 'child_process';
|
|
22
|
-
import { MessageService, generateUuid } from '@theia/core';
|
|
22
|
+
import { MessageService, generateUuid, ILogger } from '@theia/core';
|
|
23
23
|
import { RemoteWslConnection } from './remote-wsl-connection';
|
|
24
24
|
|
|
25
25
|
@injectable()
|
|
@@ -34,6 +34,9 @@ export class RemoteWslConnectionProviderImpl implements RemoteWslConnectionProvi
|
|
|
34
34
|
@inject(MessageService)
|
|
35
35
|
protected readonly messageService: MessageService;
|
|
36
36
|
|
|
37
|
+
@inject(ILogger) @named('remote-wsl:RemoteWslConnectionProviderImpl')
|
|
38
|
+
protected readonly logger: ILogger;
|
|
39
|
+
|
|
37
40
|
dispose(): void {
|
|
38
41
|
}
|
|
39
42
|
|
|
@@ -54,7 +57,7 @@ export class RemoteWslConnectionProviderImpl implements RemoteWslConnectionProvi
|
|
|
54
57
|
exec('wsl.exe --list --verbose --all', (error, stdout, stderr) => {
|
|
55
58
|
if (error) {
|
|
56
59
|
const errorMessage = `Error executing wsl.exe: ${error} \n ${stderr}`;
|
|
57
|
-
|
|
60
|
+
this.logger.error(errorMessage);
|
|
58
61
|
reject(errorMessage);
|
|
59
62
|
return;
|
|
60
63
|
}
|