@codingame/monaco-vscode-remote-agent-service-override 4.5.0 → 4.5.2
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/index.d.ts +2 -1
- package/package.json +3 -3
- package/vscode/src/vs/platform/download/common/downloadIpc.js +2 -2
- package/vscode/src/vs/platform/remote/common/remoteSocketFactoryService.js +1 -1
- package/vscode/src/vs/workbench/contrib/remote/browser/explorerViewItems.js +14 -17
- package/vscode/src/vs/workbench/contrib/remote/browser/remote.js +117 -172
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteConnectionHealth.js +20 -35
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIndicator.js +71 -140
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteStartEntry.js +12 -19
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelFactory.js +14 -19
- package/vscode/src/vs/workbench/contrib/remote/common/remote.contribution.js +98 -161
- package/vscode/src/vs/workbench/services/remote/browser/remoteAgentService.js +20 -23
- package/remoteAgent.d.ts +0 -12
|
@@ -11,6 +11,7 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
|
11
11
|
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
12
12
|
import { forwardedPortsViewEnabled } from 'vscode/vscode/vs/workbench/services/remote/common/tunnelModel';
|
|
13
13
|
|
|
14
|
+
const _moduleId = "vs/workbench/contrib/remote/browser/tunnelFactory";
|
|
14
15
|
let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposable {
|
|
15
16
|
static { this.ID = 'workbench.contrib.tunnelFactory'; }
|
|
16
17
|
constructor(tunnelService, environmentService, openerService, remoteExplorerService, logService, contextKeyService) {
|
|
@@ -25,20 +26,12 @@ let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposab
|
|
|
25
26
|
privacyOptions = [
|
|
26
27
|
{
|
|
27
28
|
id: 'private',
|
|
28
|
-
label: ( localizeWithPath(
|
|
29
|
-
'vs/workbench/contrib/remote/browser/tunnelFactory',
|
|
30
|
-
'tunnelPrivacy.private',
|
|
31
|
-
"Private"
|
|
32
|
-
)),
|
|
29
|
+
label: ( localizeWithPath(_moduleId, 0, "Private")),
|
|
33
30
|
themeIcon: 'lock'
|
|
34
31
|
},
|
|
35
32
|
{
|
|
36
33
|
id: 'public',
|
|
37
|
-
label: ( localizeWithPath(
|
|
38
|
-
'vs/workbench/contrib/remote/browser/tunnelFactory',
|
|
39
|
-
'tunnelPrivacy.public',
|
|
40
|
-
"Public"
|
|
41
|
-
)),
|
|
34
|
+
label: ( localizeWithPath(_moduleId, 1, "Public")),
|
|
42
35
|
themeIcon: 'eye'
|
|
43
36
|
}
|
|
44
37
|
];
|
|
@@ -92,20 +85,22 @@ let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposab
|
|
|
92
85
|
}
|
|
93
86
|
async resolveExternalUri(uri) {
|
|
94
87
|
try {
|
|
95
|
-
return (
|
|
88
|
+
return (
|
|
89
|
+
((await this.openerService.resolveExternalUri(( (URI.parse(uri))))).resolved.toString())
|
|
90
|
+
);
|
|
96
91
|
}
|
|
97
92
|
catch {
|
|
98
93
|
return uri;
|
|
99
94
|
}
|
|
100
95
|
}
|
|
101
96
|
};
|
|
102
|
-
TunnelFactoryContribution = ( __decorate([
|
|
103
|
-
( __param(0, ITunnelService)),
|
|
104
|
-
( __param(1, IBrowserWorkbenchEnvironmentService)),
|
|
105
|
-
( __param(2, IOpenerService)),
|
|
106
|
-
( __param(3, IRemoteExplorerService)),
|
|
107
|
-
( __param(4, ILogService)),
|
|
108
|
-
( __param(5, IContextKeyService))
|
|
109
|
-
], TunnelFactoryContribution));
|
|
97
|
+
TunnelFactoryContribution = ( (__decorate([
|
|
98
|
+
( (__param(0, ITunnelService))),
|
|
99
|
+
( (__param(1, IBrowserWorkbenchEnvironmentService))),
|
|
100
|
+
( (__param(2, IOpenerService))),
|
|
101
|
+
( (__param(3, IRemoteExplorerService))),
|
|
102
|
+
( (__param(4, ILogService))),
|
|
103
|
+
( (__param(5, IContextKeyService)))
|
|
104
|
+
], TunnelFactoryContribution)));
|
|
110
105
|
|
|
111
106
|
export { TunnelFactoryContribution };
|
|
@@ -21,6 +21,7 @@ import { IDownloadService } from 'vscode/vscode/vs/platform/download/common/down
|
|
|
21
21
|
import { DownloadServiceChannel } from '../../../../platform/download/common/downloadIpc.js';
|
|
22
22
|
import { RemoteLoggerChannelClient } from '../../../../platform/log/common/logIpc.js';
|
|
23
23
|
|
|
24
|
+
const _moduleId = "vs/workbench/contrib/remote/common/remote.contribution";
|
|
24
25
|
let LabelContribution = class LabelContribution {
|
|
25
26
|
static { this.ID = 'workbench.contrib.remoteLabel'; }
|
|
26
27
|
constructor(labelService, remoteAgentService) {
|
|
@@ -51,25 +52,25 @@ let LabelContribution = class LabelContribution {
|
|
|
51
52
|
});
|
|
52
53
|
}
|
|
53
54
|
};
|
|
54
|
-
LabelContribution = ( __decorate([
|
|
55
|
-
( __param(0, ILabelService)),
|
|
56
|
-
( __param(1, IRemoteAgentService))
|
|
57
|
-
], LabelContribution));
|
|
55
|
+
LabelContribution = ( (__decorate([
|
|
56
|
+
( (__param(0, ILabelService))),
|
|
57
|
+
( (__param(1, IRemoteAgentService)))
|
|
58
|
+
], LabelContribution)));
|
|
58
59
|
let RemoteChannelsContribution = class RemoteChannelsContribution extends Disposable {
|
|
59
60
|
constructor(remoteAgentService, downloadService, loggerService) {
|
|
60
61
|
super();
|
|
61
62
|
const connection = remoteAgentService.getConnection();
|
|
62
63
|
if (connection) {
|
|
63
|
-
connection.registerChannel('download', ( new DownloadServiceChannel(downloadService)));
|
|
64
|
-
connection.withChannel('logger', async (channel) => this._register(( new RemoteLoggerChannelClient(loggerService, channel))));
|
|
64
|
+
connection.registerChannel('download', ( (new DownloadServiceChannel(downloadService))));
|
|
65
|
+
connection.withChannel('logger', async (channel) => this._register(( (new RemoteLoggerChannelClient(loggerService, channel)))));
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
};
|
|
68
|
-
RemoteChannelsContribution = ( __decorate([
|
|
69
|
-
( __param(0, IRemoteAgentService)),
|
|
70
|
-
( __param(1, IDownloadService)),
|
|
71
|
-
( __param(2, ILoggerService))
|
|
72
|
-
], RemoteChannelsContribution));
|
|
69
|
+
RemoteChannelsContribution = ( (__decorate([
|
|
70
|
+
( (__param(0, IRemoteAgentService))),
|
|
71
|
+
( (__param(1, IDownloadService))),
|
|
72
|
+
( (__param(2, ILoggerService)))
|
|
73
|
+
], RemoteChannelsContribution)));
|
|
73
74
|
let RemoteInvalidWorkspaceDetector = class RemoteInvalidWorkspaceDetector extends Disposable {
|
|
74
75
|
static { this.ID = 'workbench.contrib.remoteInvalidWorkspaceDetector'; }
|
|
75
76
|
constructor(fileService, dialogService, environmentService, contextService, fileDialogService, remoteAgentService) {
|
|
@@ -99,21 +100,9 @@ let RemoteInvalidWorkspaceDetector = class RemoteInvalidWorkspaceDetector extend
|
|
|
99
100
|
}
|
|
100
101
|
const res = await this.dialogService.confirm({
|
|
101
102
|
type: 'warning',
|
|
102
|
-
message: ( localizeWithPath(
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
"Workspace does not exist"
|
|
106
|
-
)),
|
|
107
|
-
detail: ( localizeWithPath(
|
|
108
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
109
|
-
'invalidWorkspaceDetail',
|
|
110
|
-
"Please select another workspace to open."
|
|
111
|
-
)),
|
|
112
|
-
primaryButton: ( localizeWithPath(
|
|
113
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
114
|
-
{ key: 'invalidWorkspacePrimary', comment: ['&& denotes a mnemonic'] },
|
|
115
|
-
"&&Open Workspace..."
|
|
116
|
-
))
|
|
103
|
+
message: ( localizeWithPath(_moduleId, 0, "Workspace does not exist")),
|
|
104
|
+
detail: ( localizeWithPath(_moduleId, 1, "Please select another workspace to open.")),
|
|
105
|
+
primaryButton: ( localizeWithPath(_moduleId, 2, "&&Open Workspace..."))
|
|
117
106
|
});
|
|
118
107
|
if (res.confirmed) {
|
|
119
108
|
if (workspace.configuration) {
|
|
@@ -123,15 +112,15 @@ let RemoteInvalidWorkspaceDetector = class RemoteInvalidWorkspaceDetector extend
|
|
|
123
112
|
}
|
|
124
113
|
}
|
|
125
114
|
};
|
|
126
|
-
RemoteInvalidWorkspaceDetector = ( __decorate([
|
|
127
|
-
( __param(0, IFileService)),
|
|
128
|
-
( __param(1, IDialogService)),
|
|
129
|
-
( __param(2, IWorkbenchEnvironmentService)),
|
|
130
|
-
( __param(3, IWorkspaceContextService)),
|
|
131
|
-
( __param(4, IFileDialogService)),
|
|
132
|
-
( __param(5, IRemoteAgentService))
|
|
133
|
-
], RemoteInvalidWorkspaceDetector));
|
|
134
|
-
const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
|
|
115
|
+
RemoteInvalidWorkspaceDetector = ( (__decorate([
|
|
116
|
+
( (__param(0, IFileService))),
|
|
117
|
+
( (__param(1, IDialogService))),
|
|
118
|
+
( (__param(2, IWorkbenchEnvironmentService))),
|
|
119
|
+
( (__param(3, IWorkspaceContextService))),
|
|
120
|
+
( (__param(4, IFileDialogService))),
|
|
121
|
+
( (__param(5, IRemoteAgentService)))
|
|
122
|
+
], RemoteInvalidWorkspaceDetector)));
|
|
123
|
+
const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
|
|
135
124
|
registerWorkbenchContribution2(LabelContribution.ID, LabelContribution, 1 );
|
|
136
125
|
workbenchContributionsRegistry.registerWorkbenchContribution(RemoteChannelsContribution, 3 );
|
|
137
126
|
registerWorkbenchContribution2(RemoteInvalidWorkspaceDetector.ID, RemoteInvalidWorkspaceDetector, 1 );
|
|
@@ -140,11 +129,7 @@ registerWorkbenchContribution2(RemoteInvalidWorkspaceDetector.ID, RemoteInvalidW
|
|
|
140
129
|
constructor() {
|
|
141
130
|
super({
|
|
142
131
|
id: 'workbench.action.triggerReconnect',
|
|
143
|
-
title: ( localize2WithPath(
|
|
144
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
145
|
-
'triggerReconnect',
|
|
146
|
-
'Connection: Trigger Reconnect'
|
|
147
|
-
)),
|
|
132
|
+
title: ( localize2WithPath(_moduleId, 3, 'Connection: Trigger Reconnect')),
|
|
148
133
|
category: Categories.Developer,
|
|
149
134
|
f1: true,
|
|
150
135
|
});
|
|
@@ -157,11 +142,7 @@ registerWorkbenchContribution2(RemoteInvalidWorkspaceDetector.ID, RemoteInvalidW
|
|
|
157
142
|
constructor() {
|
|
158
143
|
super({
|
|
159
144
|
id: 'workbench.action.pauseSocketWriting',
|
|
160
|
-
title: ( localize2WithPath(
|
|
161
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
162
|
-
'pauseSocketWriting',
|
|
163
|
-
'Connection: Pause socket writing'
|
|
164
|
-
)),
|
|
145
|
+
title: ( localize2WithPath(_moduleId, 4, 'Connection: Pause socket writing')),
|
|
165
146
|
category: Categories.Developer,
|
|
166
147
|
f1: true,
|
|
167
148
|
});
|
|
@@ -181,32 +162,28 @@ const extensionKindSchema = {
|
|
|
181
162
|
],
|
|
182
163
|
enumDescriptions: [
|
|
183
164
|
( localizeWithPath(
|
|
184
|
-
|
|
185
|
-
|
|
165
|
+
_moduleId,
|
|
166
|
+
5,
|
|
186
167
|
"UI extension kind. In a remote window, such extensions are enabled only when available on the local machine."
|
|
187
168
|
)),
|
|
188
169
|
( localizeWithPath(
|
|
189
|
-
|
|
190
|
-
|
|
170
|
+
_moduleId,
|
|
171
|
+
6,
|
|
191
172
|
"Workspace extension kind. In a remote window, such extensions are enabled only when available on the remote."
|
|
192
173
|
))
|
|
193
174
|
],
|
|
194
175
|
};
|
|
195
|
-
( Registry.as(Extensions$1.Configuration))
|
|
176
|
+
( (Registry.as(Extensions$1.Configuration)))
|
|
196
177
|
.registerConfiguration({
|
|
197
178
|
id: 'remote',
|
|
198
|
-
title: ( localizeWithPath(
|
|
199
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
200
|
-
'remote',
|
|
201
|
-
"Remote"
|
|
202
|
-
)),
|
|
179
|
+
title: ( localizeWithPath(_moduleId, 7, "Remote")),
|
|
203
180
|
type: 'object',
|
|
204
181
|
properties: {
|
|
205
182
|
'remote.extensionKind': {
|
|
206
183
|
type: 'object',
|
|
207
184
|
markdownDescription: ( localizeWithPath(
|
|
208
|
-
|
|
209
|
-
|
|
185
|
+
_moduleId,
|
|
186
|
+
8,
|
|
210
187
|
"Override the kind of an extension. `ui` extensions are installed and run on the local machine while `workspace` extensions are run on the remote. By overriding an extension's default kind using this setting, you specify if that extension should be installed and enabled locally or remotely."
|
|
211
188
|
)),
|
|
212
189
|
patternProperties: {
|
|
@@ -221,18 +198,14 @@ const extensionKindSchema = {
|
|
|
221
198
|
},
|
|
222
199
|
'remote.restoreForwardedPorts': {
|
|
223
200
|
type: 'boolean',
|
|
224
|
-
markdownDescription: ( localizeWithPath(
|
|
225
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
226
|
-
'remote.restoreForwardedPorts',
|
|
227
|
-
"Restores the ports you forwarded in a workspace."
|
|
228
|
-
)),
|
|
201
|
+
markdownDescription: ( localizeWithPath(_moduleId, 9, "Restores the ports you forwarded in a workspace.")),
|
|
229
202
|
default: true
|
|
230
203
|
},
|
|
231
204
|
'remote.autoForwardPorts': {
|
|
232
205
|
type: 'boolean',
|
|
233
206
|
markdownDescription: ( localizeWithPath(
|
|
234
|
-
|
|
235
|
-
|
|
207
|
+
_moduleId,
|
|
208
|
+
10,
|
|
236
209
|
"When enabled, new running processes are detected and ports that they listen on are automatically forwarded. Disabling this setting will not prevent all ports from being forwarded. Even when disabled, extensions will still be able to cause ports to be forwarded, and opening some URLs will still cause ports to forwarded."
|
|
237
210
|
)),
|
|
238
211
|
default: true
|
|
@@ -240,26 +213,26 @@ const extensionKindSchema = {
|
|
|
240
213
|
'remote.autoForwardPortsSource': {
|
|
241
214
|
type: 'string',
|
|
242
215
|
markdownDescription: ( localizeWithPath(
|
|
243
|
-
|
|
244
|
-
|
|
216
|
+
_moduleId,
|
|
217
|
+
11,
|
|
245
218
|
"Sets the source from which ports are automatically forwarded when {0} is true. On Windows and macOS remotes, the `process` and `hybrid` options have no effect and `output` will be used.",
|
|
246
219
|
'`#remote.autoForwardPorts#`'
|
|
247
220
|
)),
|
|
248
221
|
enum: ['process', 'output', 'hybrid'],
|
|
249
222
|
enumDescriptions: [
|
|
250
223
|
( localizeWithPath(
|
|
251
|
-
|
|
252
|
-
|
|
224
|
+
_moduleId,
|
|
225
|
+
12,
|
|
253
226
|
"Ports will be automatically forwarded when discovered by watching for processes that are started and include a port."
|
|
254
227
|
)),
|
|
255
228
|
( localizeWithPath(
|
|
256
|
-
|
|
257
|
-
|
|
229
|
+
_moduleId,
|
|
230
|
+
13,
|
|
258
231
|
"Ports will be automatically forwarded when discovered by reading terminal and debug output. Not all processes that use ports will print to the integrated terminal or debug console, so some ports will be missed. Ports forwarded based on output will not be \"un-forwarded\" until reload or until the port is closed by the user in the Ports view."
|
|
259
232
|
)),
|
|
260
233
|
( localizeWithPath(
|
|
261
|
-
|
|
262
|
-
|
|
234
|
+
_moduleId,
|
|
235
|
+
14,
|
|
263
236
|
"Ports will be automatically forwarded when discovered by reading terminal and debug output. Not all processes that use ports will print to the integrated terminal or debug console, so some ports will be missed. Ports will be \"un-forwarded\" by watching for processes that listen on that port to be terminated."
|
|
264
237
|
))
|
|
265
238
|
],
|
|
@@ -269,16 +242,16 @@ const extensionKindSchema = {
|
|
|
269
242
|
type: 'number',
|
|
270
243
|
default: 20,
|
|
271
244
|
markdownDescription: ( localizeWithPath(
|
|
272
|
-
|
|
273
|
-
|
|
245
|
+
_moduleId,
|
|
246
|
+
15,
|
|
274
247
|
"The number of auto forwarded ports that will trigger the switch from `process` to `hybrid` when automatically forwarding ports and `remote.autoForwardPortsSource` is set to `process` by default. Set to `0` to disable the fallback. When `remote.autoForwardPortsFallback` hasn't been configured, but `remote.autoForwardPortsSource` has, `remote.autoForwardPortsFallback` will be treated as though it's set to `0`."
|
|
275
248
|
))
|
|
276
249
|
},
|
|
277
250
|
'remote.forwardOnOpen': {
|
|
278
251
|
type: 'boolean',
|
|
279
252
|
description: ( localizeWithPath(
|
|
280
|
-
|
|
281
|
-
|
|
253
|
+
_moduleId,
|
|
254
|
+
16,
|
|
282
255
|
"Controls whether local URLs with a port will be forwarded when opened from the terminal and the debug console."
|
|
283
256
|
)),
|
|
284
257
|
default: true
|
|
@@ -289,8 +262,8 @@ const extensionKindSchema = {
|
|
|
289
262
|
'(^\\d+(-\\d+)?$)|(.+)': {
|
|
290
263
|
type: 'object',
|
|
291
264
|
description: ( localizeWithPath(
|
|
292
|
-
|
|
293
|
-
|
|
265
|
+
_moduleId,
|
|
266
|
+
17,
|
|
294
267
|
"A port, range of ports (ex. \"40000-55000\"), host and port (ex. \"db:1234\"), or regular expression (ex. \".+\\\\/server.js\"). For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression."
|
|
295
268
|
)),
|
|
296
269
|
properties: {
|
|
@@ -299,39 +272,35 @@ const extensionKindSchema = {
|
|
|
299
272
|
enum: ['notify', 'openBrowser', 'openBrowserOnce', 'openPreview', 'silent', 'ignore'],
|
|
300
273
|
enumDescriptions: [
|
|
301
274
|
( localizeWithPath(
|
|
302
|
-
|
|
303
|
-
|
|
275
|
+
_moduleId,
|
|
276
|
+
18,
|
|
304
277
|
"Shows a notification when a port is automatically forwarded."
|
|
305
278
|
)),
|
|
306
279
|
( localizeWithPath(
|
|
307
|
-
|
|
308
|
-
|
|
280
|
+
_moduleId,
|
|
281
|
+
19,
|
|
309
282
|
"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser."
|
|
310
283
|
)),
|
|
311
284
|
( localizeWithPath(
|
|
312
|
-
|
|
313
|
-
|
|
285
|
+
_moduleId,
|
|
286
|
+
20,
|
|
314
287
|
"Opens the browser when the port is automatically forwarded, but only the first time the port is forward during a session. Depending on your settings, this could open an embedded browser."
|
|
315
288
|
)),
|
|
316
289
|
( localizeWithPath(
|
|
317
|
-
|
|
318
|
-
|
|
290
|
+
_moduleId,
|
|
291
|
+
21,
|
|
319
292
|
"Opens a preview in the same window when the port is automatically forwarded."
|
|
320
293
|
)),
|
|
321
294
|
( localizeWithPath(
|
|
322
|
-
|
|
323
|
-
|
|
295
|
+
_moduleId,
|
|
296
|
+
22,
|
|
324
297
|
"Shows no notification and takes no action when this port is automatically forwarded."
|
|
325
298
|
)),
|
|
326
|
-
( localizeWithPath(
|
|
327
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
328
|
-
'remote.portsAttributes.ignore',
|
|
329
|
-
"This port will not be automatically forwarded."
|
|
330
|
-
))
|
|
299
|
+
( localizeWithPath(_moduleId, 23, "This port will not be automatically forwarded."))
|
|
331
300
|
],
|
|
332
301
|
description: ( localizeWithPath(
|
|
333
|
-
|
|
334
|
-
|
|
302
|
+
_moduleId,
|
|
303
|
+
24,
|
|
335
304
|
"Defines the action that occurs when the port is discovered for automatic forwarding"
|
|
336
305
|
)),
|
|
337
306
|
default: 'notify'
|
|
@@ -339,30 +308,22 @@ const extensionKindSchema = {
|
|
|
339
308
|
'elevateIfNeeded': {
|
|
340
309
|
type: 'boolean',
|
|
341
310
|
description: ( localizeWithPath(
|
|
342
|
-
|
|
343
|
-
|
|
311
|
+
_moduleId,
|
|
312
|
+
25,
|
|
344
313
|
"Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port."
|
|
345
314
|
)),
|
|
346
315
|
default: false
|
|
347
316
|
},
|
|
348
317
|
'label': {
|
|
349
318
|
type: 'string',
|
|
350
|
-
description: ( localizeWithPath(
|
|
351
|
-
|
|
352
|
-
'remote.portsAttributes.label',
|
|
353
|
-
"Label that will be shown in the UI for this port."
|
|
354
|
-
)),
|
|
355
|
-
default: ( localizeWithPath(
|
|
356
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
357
|
-
'remote.portsAttributes.labelDefault',
|
|
358
|
-
"Application"
|
|
359
|
-
))
|
|
319
|
+
description: ( localizeWithPath(_moduleId, 26, "Label that will be shown in the UI for this port.")),
|
|
320
|
+
default: ( localizeWithPath(_moduleId, 27, "Application"))
|
|
360
321
|
},
|
|
361
322
|
'requireLocalPort': {
|
|
362
323
|
type: 'boolean',
|
|
363
324
|
markdownDescription: ( localizeWithPath(
|
|
364
|
-
|
|
365
|
-
|
|
325
|
+
_moduleId,
|
|
326
|
+
28,
|
|
366
327
|
"When true, a modal dialog will show if the chosen local port isn't used for forwarding."
|
|
367
328
|
)),
|
|
368
329
|
default: false
|
|
@@ -370,32 +331,24 @@ const extensionKindSchema = {
|
|
|
370
331
|
'protocol': {
|
|
371
332
|
type: 'string',
|
|
372
333
|
enum: ['http', 'https'],
|
|
373
|
-
description: ( localizeWithPath(
|
|
374
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
375
|
-
'remote.portsAttributes.protocol',
|
|
376
|
-
"The protocol to use when forwarding this port."
|
|
377
|
-
))
|
|
334
|
+
description: ( localizeWithPath(_moduleId, 29, "The protocol to use when forwarding this port."))
|
|
378
335
|
}
|
|
379
336
|
},
|
|
380
337
|
default: {
|
|
381
|
-
'label': ( localizeWithPath(
|
|
382
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
383
|
-
'remote.portsAttributes.labelDefault',
|
|
384
|
-
"Application"
|
|
385
|
-
)),
|
|
338
|
+
'label': ( localizeWithPath(_moduleId, 27, "Application")),
|
|
386
339
|
'onAutoForward': 'notify'
|
|
387
340
|
}
|
|
388
341
|
}
|
|
389
342
|
},
|
|
390
343
|
markdownDescription: ( localizeWithPath(
|
|
391
|
-
|
|
392
|
-
|
|
344
|
+
_moduleId,
|
|
345
|
+
30,
|
|
393
346
|
"Set properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n \"label\": \"Application\"\n},\n\"40000-55000\": {\n \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```"
|
|
394
347
|
)),
|
|
395
348
|
defaultSnippets: [{ body: { '${1:3000}': { label: '${2:Application}', onAutoForward: 'openPreview' } } }],
|
|
396
349
|
errorMessage: ( localizeWithPath(
|
|
397
|
-
|
|
398
|
-
|
|
350
|
+
_moduleId,
|
|
351
|
+
31,
|
|
399
352
|
"Must be a port number, range of port numbers, or regular expression."
|
|
400
353
|
)),
|
|
401
354
|
additionalProperties: false,
|
|
@@ -416,34 +369,30 @@ const extensionKindSchema = {
|
|
|
416
369
|
enum: ['notify', 'openBrowser', 'openPreview', 'silent', 'ignore'],
|
|
417
370
|
enumDescriptions: [
|
|
418
371
|
( localizeWithPath(
|
|
419
|
-
|
|
420
|
-
|
|
372
|
+
_moduleId,
|
|
373
|
+
18,
|
|
421
374
|
"Shows a notification when a port is automatically forwarded."
|
|
422
375
|
)),
|
|
423
376
|
( localizeWithPath(
|
|
424
|
-
|
|
425
|
-
|
|
377
|
+
_moduleId,
|
|
378
|
+
19,
|
|
426
379
|
"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser."
|
|
427
380
|
)),
|
|
428
381
|
( localizeWithPath(
|
|
429
|
-
|
|
430
|
-
|
|
382
|
+
_moduleId,
|
|
383
|
+
21,
|
|
431
384
|
"Opens a preview in the same window when the port is automatically forwarded."
|
|
432
385
|
)),
|
|
433
386
|
( localizeWithPath(
|
|
434
|
-
|
|
435
|
-
|
|
387
|
+
_moduleId,
|
|
388
|
+
22,
|
|
436
389
|
"Shows no notification and takes no action when this port is automatically forwarded."
|
|
437
390
|
)),
|
|
438
|
-
( localizeWithPath(
|
|
439
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
440
|
-
'remote.portsAttributes.ignore',
|
|
441
|
-
"This port will not be automatically forwarded."
|
|
442
|
-
))
|
|
391
|
+
( localizeWithPath(_moduleId, 23, "This port will not be automatically forwarded."))
|
|
443
392
|
],
|
|
444
393
|
description: ( localizeWithPath(
|
|
445
|
-
|
|
446
|
-
|
|
394
|
+
_moduleId,
|
|
395
|
+
24,
|
|
447
396
|
"Defines the action that occurs when the port is discovered for automatic forwarding"
|
|
448
397
|
)),
|
|
449
398
|
default: 'notify'
|
|
@@ -451,30 +400,22 @@ const extensionKindSchema = {
|
|
|
451
400
|
'elevateIfNeeded': {
|
|
452
401
|
type: 'boolean',
|
|
453
402
|
description: ( localizeWithPath(
|
|
454
|
-
|
|
455
|
-
|
|
403
|
+
_moduleId,
|
|
404
|
+
25,
|
|
456
405
|
"Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port."
|
|
457
406
|
)),
|
|
458
407
|
default: false
|
|
459
408
|
},
|
|
460
409
|
'label': {
|
|
461
410
|
type: 'string',
|
|
462
|
-
description: ( localizeWithPath(
|
|
463
|
-
|
|
464
|
-
'remote.portsAttributes.label',
|
|
465
|
-
"Label that will be shown in the UI for this port."
|
|
466
|
-
)),
|
|
467
|
-
default: ( localizeWithPath(
|
|
468
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
469
|
-
'remote.portsAttributes.labelDefault',
|
|
470
|
-
"Application"
|
|
471
|
-
))
|
|
411
|
+
description: ( localizeWithPath(_moduleId, 26, "Label that will be shown in the UI for this port.")),
|
|
412
|
+
default: ( localizeWithPath(_moduleId, 27, "Application"))
|
|
472
413
|
},
|
|
473
414
|
'requireLocalPort': {
|
|
474
415
|
type: 'boolean',
|
|
475
416
|
markdownDescription: ( localizeWithPath(
|
|
476
|
-
|
|
477
|
-
|
|
417
|
+
_moduleId,
|
|
418
|
+
28,
|
|
478
419
|
"When true, a modal dialog will show if the chosen local port isn't used for forwarding."
|
|
479
420
|
)),
|
|
480
421
|
default: false
|
|
@@ -482,17 +423,13 @@ const extensionKindSchema = {
|
|
|
482
423
|
'protocol': {
|
|
483
424
|
type: 'string',
|
|
484
425
|
enum: ['http', 'https'],
|
|
485
|
-
description: ( localizeWithPath(
|
|
486
|
-
'vs/workbench/contrib/remote/common/remote.contribution',
|
|
487
|
-
'remote.portsAttributes.protocol',
|
|
488
|
-
"The protocol to use when forwarding this port."
|
|
489
|
-
))
|
|
426
|
+
description: ( localizeWithPath(_moduleId, 29, "The protocol to use when forwarding this port."))
|
|
490
427
|
}
|
|
491
428
|
},
|
|
492
429
|
defaultSnippets: [{ body: { onAutoForward: 'ignore' } }],
|
|
493
430
|
markdownDescription: ( localizeWithPath(
|
|
494
|
-
|
|
495
|
-
|
|
431
|
+
_moduleId,
|
|
432
|
+
32,
|
|
496
433
|
"Set default properties that are applied to all ports that don't get properties from the setting {0}. For example:\n\n```\n{\n \"onAutoForward\": \"ignore\"\n}\n```",
|
|
497
434
|
'`#remote.portsAttributes#`'
|
|
498
435
|
)),
|
|
@@ -503,8 +440,8 @@ const extensionKindSchema = {
|
|
|
503
440
|
enum: ['localhost', 'allInterfaces'],
|
|
504
441
|
default: 'localhost',
|
|
505
442
|
description: ( localizeWithPath(
|
|
506
|
-
|
|
507
|
-
|
|
443
|
+
_moduleId,
|
|
444
|
+
33,
|
|
508
445
|
"Specifies the local host name that will be used for port forwarding."
|
|
509
446
|
))
|
|
510
447
|
}
|
|
@@ -16,20 +16,21 @@ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/use
|
|
|
16
16
|
import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
|
|
17
17
|
import Severity$1 from 'vscode/vscode/vs/base/common/severity';
|
|
18
18
|
|
|
19
|
+
const _moduleId = "vs/workbench/services/remote/browser/remoteAgentService";
|
|
19
20
|
let RemoteAgentService = class RemoteAgentService extends AbstractRemoteAgentService {
|
|
20
21
|
constructor(remoteSocketFactoryService, userDataProfileService, environmentService, productService, remoteAuthorityResolverService, signService, logService) {
|
|
21
22
|
super(remoteSocketFactoryService, userDataProfileService, environmentService, productService, remoteAuthorityResolverService, signService, logService);
|
|
22
23
|
}
|
|
23
24
|
};
|
|
24
|
-
RemoteAgentService = ( __decorate([
|
|
25
|
-
( __param(0, IRemoteSocketFactoryService)),
|
|
26
|
-
( __param(1, IUserDataProfileService)),
|
|
27
|
-
( __param(2, IWorkbenchEnvironmentService)),
|
|
28
|
-
( __param(3, IProductService)),
|
|
29
|
-
( __param(4, IRemoteAuthorityResolverService)),
|
|
30
|
-
( __param(5, ISignService)),
|
|
31
|
-
( __param(6, ILogService))
|
|
32
|
-
], RemoteAgentService));
|
|
25
|
+
RemoteAgentService = ( (__decorate([
|
|
26
|
+
( (__param(0, IRemoteSocketFactoryService))),
|
|
27
|
+
( (__param(1, IUserDataProfileService))),
|
|
28
|
+
( (__param(2, IWorkbenchEnvironmentService))),
|
|
29
|
+
( (__param(3, IProductService))),
|
|
30
|
+
( (__param(4, IRemoteAuthorityResolverService))),
|
|
31
|
+
( (__param(5, ISignService))),
|
|
32
|
+
( (__param(6, ILogService)))
|
|
33
|
+
], RemoteAgentService)));
|
|
33
34
|
let RemoteConnectionFailureNotificationContribution = class RemoteConnectionFailureNotificationContribution {
|
|
34
35
|
static { this.ID = 'workbench.contrib.browserRemoteConnectionFailureNotification'; }
|
|
35
36
|
constructor(remoteAgentService, _dialogService, _hostService) {
|
|
@@ -46,34 +47,30 @@ let RemoteConnectionFailureNotificationContribution = class RemoteConnectionFail
|
|
|
46
47
|
await this._dialogService.prompt({
|
|
47
48
|
type: Severity$1.Error,
|
|
48
49
|
message: ( localizeWithPath(
|
|
49
|
-
|
|
50
|
-
|
|
50
|
+
_moduleId,
|
|
51
|
+
0,
|
|
51
52
|
"An unexpected error occurred that requires a reload of this page."
|
|
52
53
|
)),
|
|
53
54
|
detail: ( localizeWithPath(
|
|
54
|
-
|
|
55
|
-
|
|
55
|
+
_moduleId,
|
|
56
|
+
1,
|
|
56
57
|
"The workbench failed to connect to the server (Error: {0})",
|
|
57
58
|
err ? err.message : ''
|
|
58
59
|
)),
|
|
59
60
|
buttons: [
|
|
60
61
|
{
|
|
61
|
-
label: ( localizeWithPath(
|
|
62
|
-
'vs/workbench/services/remote/browser/remoteAgentService',
|
|
63
|
-
{ key: 'reload', comment: ['&& denotes a mnemonic'] },
|
|
64
|
-
"&&Reload"
|
|
65
|
-
)),
|
|
62
|
+
label: ( localizeWithPath(_moduleId, 2, "&&Reload")),
|
|
66
63
|
run: () => this._hostService.reload()
|
|
67
64
|
}
|
|
68
65
|
]
|
|
69
66
|
});
|
|
70
67
|
}
|
|
71
68
|
};
|
|
72
|
-
RemoteConnectionFailureNotificationContribution = ( __decorate([
|
|
73
|
-
( __param(0, IRemoteAgentService)),
|
|
74
|
-
( __param(1, IDialogService)),
|
|
75
|
-
( __param(2, IHostService))
|
|
76
|
-
], RemoteConnectionFailureNotificationContribution));
|
|
69
|
+
RemoteConnectionFailureNotificationContribution = ( (__decorate([
|
|
70
|
+
( (__param(0, IRemoteAgentService))),
|
|
71
|
+
( (__param(1, IDialogService))),
|
|
72
|
+
( (__param(2, IHostService)))
|
|
73
|
+
], RemoteConnectionFailureNotificationContribution)));
|
|
77
74
|
registerWorkbenchContribution2(RemoteConnectionFailureNotificationContribution.ID, RemoteConnectionFailureNotificationContribution, 2 );
|
|
78
75
|
|
|
79
76
|
export { RemoteAgentService };
|
package/remoteAgent.d.ts
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
|
|
2
|
-
|
|
3
|
-
interface RemoteAgentServiceOverrideParams {
|
|
4
|
-
/**
|
|
5
|
-
* if true, the default extensions on the remote agent will be scanned and added
|
|
6
|
-
* @default false
|
|
7
|
-
*/
|
|
8
|
-
scanRemoteExtensions?: boolean;
|
|
9
|
-
}
|
|
10
|
-
declare function getServiceOverride({ scanRemoteExtensions }?: RemoteAgentServiceOverrideParams): IEditorOverrideServices;
|
|
11
|
-
|
|
12
|
-
export { type RemoteAgentServiceOverrideParams, getServiceOverride as default };
|