@theia/remote-wsl 1.72.0-next.59 → 1.72.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/lib/electron-node/remote-wsl-connection.d.ts +1 -1
- package/lib/electron-node/remote-wsl-connection.d.ts.map +1 -1
- package/lib/electron-node/remote-wsl-connection.js +8 -27
- package/lib/electron-node/remote-wsl-connection.js.map +1 -1
- package/package.json +5 -5
- package/src/electron-node/remote-wsl-connection.ts +8 -24
|
@@ -20,7 +20,7 @@ export declare class RemoteWslConnection implements RemoteConnection {
|
|
|
20
20
|
forwardOut(socket: Socket, port: number): Promise<void>;
|
|
21
21
|
exec(cmd: string, args?: string[], options?: RemoteExecOptions): Promise<RemoteExecResult>;
|
|
22
22
|
execPartial(cmd: string, tester: RemoteExecTester, args?: string[], options?: RemoteExecOptions): Promise<RemoteExecResult>;
|
|
23
|
-
copy(localPath: string
|
|
23
|
+
copy(localPath: string, remotePath: string): Promise<void>;
|
|
24
24
|
dispose(): void;
|
|
25
25
|
disposeSync(): void;
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-wsl-connection.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AACvI,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-wsl-connection.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AACvI,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAI7B,MAAM,WAAW,0BAA0B;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,mBAAoB,YAAW,gBAAgB;IACxD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IAErB,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,SAAS,CAAC,QAAQ,CAAC,sBAAsB,gBAAuB;IAChE,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,CAAqC;gBAErD,OAAO,EAAE,0BAA0B;IAOzC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAe1F,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmD3H,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAehE,OAAO,IAAI,IAAI;IAIf,WAAW,IAAI,IAAI;CAGtB"}
|
|
@@ -20,7 +20,6 @@ const core_1 = require("@theia/core");
|
|
|
20
20
|
const net_1 = require("net");
|
|
21
21
|
const child_process_1 = require("child_process");
|
|
22
22
|
const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
23
|
-
const fs = require("fs");
|
|
24
23
|
class RemoteWslConnection {
|
|
25
24
|
get localPort() {
|
|
26
25
|
return this.remotePort;
|
|
@@ -97,32 +96,14 @@ class RemoteWslConnection {
|
|
|
97
96
|
async copy(localPath, remotePath) {
|
|
98
97
|
const deferred = new promise_util_1.Deferred();
|
|
99
98
|
const wslPath = `\\\\wsl$\\${this.distribution}\\${remotePath}`;
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
});
|
|
109
|
-
}
|
|
110
|
-
else if (Buffer.isBuffer(localPath)) {
|
|
111
|
-
fs.writeFile(wslPath, localPath, (error) => {
|
|
112
|
-
if (error) {
|
|
113
|
-
deferred.reject(error);
|
|
114
|
-
}
|
|
115
|
-
else {
|
|
116
|
-
deferred.resolve();
|
|
117
|
-
}
|
|
118
|
-
});
|
|
119
|
-
}
|
|
120
|
-
else {
|
|
121
|
-
const writeStream = fs.createWriteStream(wslPath);
|
|
122
|
-
localPath.pipe(writeStream);
|
|
123
|
-
writeStream.on('finish', () => deferred.resolve());
|
|
124
|
-
writeStream.on('error', (error) => deferred.reject(error));
|
|
125
|
-
}
|
|
99
|
+
(0, child_process_1.exec)(`copy "${localPath}" "${wslPath}"`, error => {
|
|
100
|
+
if (error) {
|
|
101
|
+
deferred.reject(error);
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
deferred.resolve();
|
|
105
|
+
}
|
|
106
|
+
});
|
|
126
107
|
return deferred.promise;
|
|
127
108
|
}
|
|
128
109
|
dispose() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-wsl-connection.js","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection.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,sCAA6C;AAE7C,6BAA6B;AAC7B,iDAA4C;AAC5C,sEAA+D;
|
|
1
|
+
{"version":3,"file":"remote-wsl-connection.js","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/remote-wsl",
|
|
3
|
-
"version": "1.72.0
|
|
3
|
+
"version": "1.72.0",
|
|
4
4
|
"description": "Theia - Remote WSL",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.72.0
|
|
7
|
-
"@theia/remote": "1.72.0
|
|
8
|
-
"@theia/workspace": "1.72.0
|
|
6
|
+
"@theia/core": "1.72.0",
|
|
7
|
+
"@theia/remote": "1.72.0",
|
|
8
|
+
"@theia/workspace": "1.72.0",
|
|
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": "5bc20bc672aa732fb7e05234cf63c1b514868896"
|
|
48
48
|
}
|
|
@@ -19,7 +19,6 @@ import { RemoteConnection, RemoteExecOptions, RemoteExecResult, RemoteExecTester
|
|
|
19
19
|
import { Socket } from 'net';
|
|
20
20
|
import { exec, spawn } from 'child_process';
|
|
21
21
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
22
|
-
import * as fs from 'fs';
|
|
23
22
|
|
|
24
23
|
export interface RemoteWslConnectionOptions {
|
|
25
24
|
id: string;
|
|
@@ -121,32 +120,17 @@ export class RemoteWslConnection implements RemoteConnection {
|
|
|
121
120
|
return deferred.promise;
|
|
122
121
|
}
|
|
123
122
|
|
|
124
|
-
async copy(localPath: string
|
|
123
|
+
async copy(localPath: string, remotePath: string): Promise<void> {
|
|
125
124
|
const deferred = new Deferred<void>();
|
|
126
125
|
const wslPath = `\\\\wsl$\\${this.distribution}\\${remotePath}`;
|
|
127
126
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
});
|
|
136
|
-
} else if (Buffer.isBuffer(localPath)) {
|
|
137
|
-
fs.writeFile(wslPath, localPath, (error: Error) => {
|
|
138
|
-
if (error) {
|
|
139
|
-
deferred.reject(error);
|
|
140
|
-
} else {
|
|
141
|
-
deferred.resolve();
|
|
142
|
-
}
|
|
143
|
-
});
|
|
144
|
-
} else {
|
|
145
|
-
const writeStream = fs.createWriteStream(wslPath);
|
|
146
|
-
localPath.pipe(writeStream);
|
|
147
|
-
writeStream.on('finish', () => deferred.resolve());
|
|
148
|
-
writeStream.on('error', (error: Error) => deferred.reject(error));
|
|
149
|
-
}
|
|
127
|
+
exec(`copy "${localPath}" "${wslPath}"`, error => {
|
|
128
|
+
if (error) {
|
|
129
|
+
deferred.reject(error);
|
|
130
|
+
} else {
|
|
131
|
+
deferred.resolve();
|
|
132
|
+
}
|
|
133
|
+
});
|
|
150
134
|
|
|
151
135
|
return deferred.promise;
|
|
152
136
|
}
|