OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity
This repository has been archived on 2024-09-09. You can view files and clone it, but cannot push or open issues or pull requests.
0713fa900b
code-server/ci/dev/vscode.patch

4384 lines
178 KiB
Diff
Raw Normal View History

vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
diff --git a/.eslintrc.json b/.eslintrc.json
index 055bc22f8e48e7dee559b83ac56c12a54c6ad544..14c026c04a7df5ac94bea2856e3a7a513c213775 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -64,7 +64,7 @@
"code-no-standalone-editor": "warn",
"code-no-unexternalized-strings": "warn",
"code-layering": [
- "warn",
+ "off",
{
"common": [],
"node": [
@@ -90,7 +90,7 @@
}
],
"code-import-patterns": [
- "warn",
+ "off",
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// !!! Do not relax these rules !!!
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/.gitignore b/.gitignore
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
index b7f5b58c8ede171be547c56b61ce76f79a3accc3..856fbd8c67460fe099d7fbee1475e906b500f053 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/.gitignore
+++ b/.gitignore
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@@ -25,7 +25,6 @@ out-vscode-reh-web-pkg/
Implement new structure
2020-02-04 20:27:46 +01:00
out-vscode-web/
out-vscode-web-min/
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
out-vscode-web-pkg/
Implement new structure
2020-02-04 20:27:46 +01:00
-src/vs/server
resources/server
build/node_modules
coverage/
Fix node version mismatch
2020-03-26 19:34:32 +01:00
diff --git a/.yarnrc b/.yarnrc
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
deleted file mode 100644
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index d97527dab46aa4e7aa2df386bda3a8b4f93fcb80..0000000000000000000000000000000000000000
Fix node version mismatch
2020-03-26 19:34:32 +01:00
--- a/.yarnrc
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
+++ /dev/null
@@ -1,3 +0,0 @@
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
-disturl "https://electronjs.org/headers"
-target "9.3.3"
Fix node version mismatch
2020-03-26 19:34:32 +01:00
-runtime "electron"
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
index 5f367d1f0777d2cb46ad47e376337900733981b5..ba74af1d61a00ce42020418126e62879397f57bf 100644
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -44,6 +44,7 @@ BUILD_TARGETS.forEach(({ platform, arch }) => {
});
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
function getNodeVersion() {
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ return process.versions.node;
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
return target;
Patch VS Code to avoid deleting extension dependencies (#2170) Closes #1961
2020-10-08 22:55:13 +02:00
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
index dac71c814798ecfac99750be856078e043d239bf..6edd7ea56baef7cd9f87a9020df32d3b8519b615 100644
Patch VS Code to avoid deleting extension dependencies (#2170) Closes #1961
2020-10-08 22:55:13 +02:00
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -70,7 +70,7 @@ function fromLocal(extensionPath: string, forWeb: boolean): Stream {
if (isWebPacked) {
input = updateExtensionPackageJSON(input, (data: any) => {
delete data.scripts;
- delete data.dependencies;
+ // https://github.com/cdr/code-server/pull/2041#issuecomment-685910322
delete data.devDependencies;
if (data.main) {
data.main = data.main.replace('/out/', /dist/);
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
diff --git a/build/lib/node.ts b/build/lib/node.ts
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 64397034461b1661f82007c141cbf4c039a3b722..c53dccf4dc0a99122ed96cf10c2eb632bb25059e 100644
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
--- a/build/lib/node.ts
+++ b/build/lib/node.ts
@@ -4,13 +4,10 @@
*--------------------------------------------------------------------------------------------*/
import * as path from 'path';
-import * as fs from 'fs';
const root = path.dirname(path.dirname(__dirname));
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
+const version = process.versions.node;
const node = process.platform === 'win32' ? 'node.exe' : 'node';
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
-console.log(nodePath);
\ No newline at end of file
+console.log(nodePath);
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
diff --git a/build/lib/util.ts b/build/lib/util.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index c0a0d9619d736c6558b0b91e6c7537c1a06cc947..48853bc6201a602cadbef47a8f46281be93421e9 100644
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -336,6 +336,7 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
}
export function getElectronVersion(): string {
+ return process.versions.node;
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
const target = /^target "(.*)"$/m.exec(yarnrc)![1];
return target;
Skip unused dependencies
2020-03-26 21:12:05 +01:00
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 8f8b0019a7792a993fbd6bf95b013b596aa2935a..ea054c725bea2eec342e12b07314241aa18a4951 100644
Skip unused dependencies
2020-03-26 21:12:05 +01:00
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -33,10 +33,11 @@ function yarnInstall(location, opts) {
Skip unused dependencies
2020-03-26 21:12:05 +01:00
yarnInstall('extensions'); // node modules shared by all extensions
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
-if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) {
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
- yarnInstall('remote'); // node modules used by vscode server
- yarnInstall('remote/web'); // node modules used by vscode web
-}
+// NOTE@coder: Skip these dependencies since we don't use them.
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+// if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) {
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+// yarnInstall('remote'); // node modules used by vscode server
+// yarnInstall('remote/web'); // node modules used by vscode web
+// }
Skip unused dependencies
2020-03-26 21:12:05 +01:00
const allExtensionFolders = fs.readdirSync('extensions');
const extensions = allExtensionFolders.filter(e => {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -69,9 +70,9 @@ runtime "${runtime}"`;
Skip unused dependencies
2020-03-26 21:12:05 +01:00
}
yarnInstall(`build`); // node modules required for build
-yarnInstall('test/automation'); // node modules required for smoketest
-yarnInstall('test/smoke'); // node modules required for smoketest
-yarnInstall('test/integration/browser'); // node modules required for integration
+// yarnInstall('test/automation'); // node modules required for smoketest
+// yarnInstall('test/smoke'); // node modules required for smoketest
+// yarnInstall('test/integration/browser'); // node modules required for integration
yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
cp.execSync('git config pull.rebase true');
Switch fully to GH Actions
2020-05-08 02:44:32 +02:00
diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index cb88d37adefd4882f61a2711fdd7f72b89e1a6e3..6b3253af0a3a0aa4d75456379ef1c00f4cb98d13 100644
Switch fully to GH Actions
2020-05-08 02:44:32 +02:00
--- a/build/npm/preinstall.js
+++ b/build/npm/preinstall.js
@@ -8,8 +8,9 @@ let err = false;
const majorNodeVersion = parseInt(/^(\d+)\./.exec(process.versions.node)[1]);
if (majorNodeVersion < 10 || majorNodeVersion >= 13) {
- console.error('\033[1;31m*** Please use node >=10 and <=12.\033[0;0m');
- err = true;
+ // We are ok building above Node 12.
+ // console.error('\033[1;31m*** Please use node >=10 and <=12.\033[0;0m');
+ // err = true;
}
const cp = require('child_process');
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/coder.js b/coder.js
new file mode 100644
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
index 0000000000000000000000000000000000000000..df5b42cba463b6c0043aebbc835f852f1284aa36
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/coder.js
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
@@ -0,0 +1,64 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+// This must be ran from VS Code's root.
+const gulp = require("gulp");
+const path = require("path");
+const _ = require("underscore");
+const buildfile = require("./src/buildfile");
+const common = require("./build/lib/optimize");
+const util = require("./build/lib/util");
+const deps = require("./build/dependencies");
+
+const vscodeEntryPoints = _.flatten([
+ buildfile.entrypoint("vs/workbench/workbench.web.api"),
+ buildfile.entrypoint("vs/server/entry"),
+ buildfile.base,
+ buildfile.workbenchWeb,
+ buildfile.workerExtensionHost,
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
+ buildfile.workerNotebook,
Implement new structure
2020-02-04 20:27:46 +01:00
+ buildfile.keyboardMaps,
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ buildfile.entrypoint("vs/platform/files/node/watcher/unix/watcherApp", ["vs/css", "vs/nls"]),
+ buildfile.entrypoint("vs/platform/files/node/watcher/nsfw/watcherApp", ["vs/css", "vs/nls"]),
+ buildfile.entrypoint("vs/workbench/services/extensions/node/extensionHostProcess", ["vs/css", "vs/nls"]),
Implement new structure
2020-02-04 20:27:46 +01:00
+]);
+
+const vscodeResources = [
+ "out-build/vs/server/fork.js",
+ "!out-build/vs/server/doc/**",
+ "out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js",
+ "out-build/bootstrap.js",
+ "out-build/bootstrap-fork.js",
+ "out-build/bootstrap-amd.js",
Add missing bootstrap-node.js to final build Fixes #1884.
2020-07-21 18:31:27 +02:00
+ 'out-build/bootstrap-node.js',
Implement new structure
2020-02-04 20:27:46 +01:00
+ "out-build/paths.js",
Add NPM package, debs, rpms and refactor CI/build process Closes many issues that I'll prune after adding more docs for users.
2020-04-30 13:52:54 +02:00
+ 'out-build/vs/**/*.{svg,png,html,ttf}',
Implement new structure
2020-02-04 20:27:46 +01:00
+ "!out-build/vs/code/browser/workbench/*.html",
+ '!out-build/vs/code/electron-browser/**',
+ "out-build/vs/base/common/performance.js",
+ "out-build/vs/base/node/languagePacks.js",
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ 'out-build/vs/base/browser/ui/codicons/codicon/**',
Implement new structure
2020-02-04 20:27:46 +01:00
+ "out-build/vs/workbench/browser/media/*-theme.css",
+ "out-build/vs/workbench/contrib/debug/**/*.json",
+ "out-build/vs/workbench/contrib/externalTerminal/**/*.scpt",
+ "out-build/vs/workbench/contrib/webview/browser/pre/*.js",
+ "out-build/vs/**/markdown.css",
+ "out-build/vs/workbench/contrib/tasks/**/*.json",
+ "out-build/vs/platform/files/**/*.md",
+ "!**/test/**"
+];
+
+gulp.task("optimize", gulp.series(
+ util.rimraf("out-vscode"),
+ common.optimizeTask({
+ src: "out-build",
+ entryPoints: vscodeEntryPoints,
+ resources: vscodeResources,
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ loaderConfig: common.loaderConfig(),
Implement new structure
2020-02-04 20:27:46 +01:00
+ out: "out-vscode",
+ inlineAmdImages: true,
+ bundleInfo: undefined
+ }),
+));
+
+gulp.task("minify", gulp.series(
+ util.rimraf("out-vscode-min"),
+ common.minifyTask("out-vscode")
+));
Remove broken symlinks in extensions node modules The broken symlinks cause nfpm to fail.
2020-07-30 20:22:44 +02:00
diff --git a/extensions/postinstall.js b/extensions/postinstall.js
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index da4fa3e9d0443d679dfbab1000b434af2ae01afd..50f3e1144f8057883dea8b91ec2f7073458dbd94 100644
Remove broken symlinks in extensions node modules The broken symlinks cause nfpm to fail.
2020-07-30 20:22:44 +02:00
--- a/extensions/postinstall.js
+++ b/extensions/postinstall.js
@@ -24,6 +24,9 @@ function processRoot() {
rimraf.sync(filePath);
}
}
+
+ // Delete .bin so it doesn't contain broken symlinks that trip up nfpm.
+ rimraf.sync(path.join(__dirname, 'node_modules', '.bin'));
}
function processLib() {
Remove unused ts-expect-error from VS Code I'm not sure why other builds are passing with this still in.
2020-11-12 19:30:41 +01:00
diff --git a/extensions/typescript-language-features/src/utils/platform.ts b/extensions/typescript-language-features/src/utils/platform.ts
index 2d754bf4054713f53beed030f9211b33532c1b4b..708b7e40a662e4ca93420992bf7a5af0c62ea5b2 100644
--- a/extensions/typescript-language-features/src/utils/platform.ts
+++ b/extensions/typescript-language-features/src/utils/platform.ts
@@ -6,6 +6,6 @@
import * as vscode from 'vscode';
export function isWeb(): boolean {
- // @ts-expect-error
+ // NOTE@coder: Remove unused ts-expect-error directive which causes tsc to error.
return typeof navigator !== 'undefined' && vscode.env.uiKind === vscode.UIKind.Web;
}
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/package.json b/package.json
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 28f8a69a2a91f9cb9f4dbd73ed3e689b2b3afe84..b5f5b10004d3e36092a30f685938a606b333c465 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/package.json
+++ b/package.json
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
@@ -46,7 +46,11 @@
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
"watch-web": "gulp watch-web --max_old_space_size=4095",
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
"eslint": "eslint -c .eslintrc.json --rulesdir ./build/lib/eslint --ext .ts --ext .js ./src/vs ./extensions"
Implement new structure
2020-02-04 20:27:46 +01:00
},
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ "dependencies_comment": "Move rimraf to dependencies because it is used in the postinstall script.",
Implement new structure
2020-02-04 20:27:46 +01:00
"dependencies": {
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ "@coder/logger": "^1.1.12",
Implement new structure
2020-02-04 20:27:46 +01:00
+ "@coder/node-browser": "^1.0.8",
Compress when sending client-side extension tars
2020-02-28 21:25:28 +01:00
+ "@coder/requirefs": "^1.1.5",
Implement new structure
2020-02-04 20:27:46 +01:00
"applicationinsights": "1.0.8",
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
"chokidar": "3.4.3",
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
"graceful-fs": "4.2.3",
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
@@ -60,6 +64,7 @@
"native-keymap": "2.2.0",
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
"native-watchdog": "1.3.0",
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
"node-pty": "0.10.0-beta17",
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ "rimraf": "^2.2.8",
"spdlog": "^0.11.1",
"sudo-prompt": "9.1.1",
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
"tas-client-umd": "0.1.2",
@@ -161,7 +166,6 @@
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
"pump": "^1.0.1",
"queue": "3.0.6",
"rcedit": "^1.1.0",
- "rimraf": "^2.2.8",
"sinon": "^1.17.2",
"source-map": "^0.4.4",
"style-loader": "^1.0.0",
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -193,5 +197,8 @@
Force minimist update
2020-07-23 20:00:38 +02:00
"windows-foreground-love": "0.2.0",
"windows-mutex": "0.3.0",
"windows-process-tree": "0.2.4"
+ },
+ "resolutions": {
+ "minimist": "^1.2.5"
}
Update to VS Code 1.48.2 (#2000)
2020-08-26 17:18:47 +02:00
}
Send report issues to code-server repo
2020-04-07 00:23:14 +02:00
diff --git a/product.json b/product.json
vscode: Update product.json The new fields are from vscodium and make the welcome page documentation links work correctly. I also renamed the distribution to "code-server" so that when you're in a browser, it now says code-server instead of Code OSS.
2020-11-24 01:03:54 +01:00
index 7cab6d1b9f3b84bfc703856e93773a293fd198cf..6924d94f65b390f52885b1036f7e96bce0e34680 100644
Send report issues to code-server repo
2020-04-07 00:23:14 +02:00
--- a/product.json
+++ b/product.json
vscode: Update product.json The new fields are from vscodium and make the welcome page documentation links work correctly. I also renamed the distribution to "code-server" so that when you're in a browser, it now says code-server instead of Code OSS.
2020-11-24 01:03:54 +01:00
@@ -1,6 +1,6 @@
{
- "nameShort": "Code - OSS",
- "nameLong": "Code - OSS",
+ "nameShort": "code-server",
+ "nameLong": "code-server",
"applicationName": "code-oss",
"dataFolderName": ".vscode-oss",
"win32MutexName": "vscodeoss",
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -20,7 +20,7 @@
Send report issues to code-server repo
2020-04-07 00:23:14 +02:00
"darwinBundleIdentifier": "com.visualstudio.code.oss",
"linuxIconName": "com.visualstudio.code.oss",
"licenseFileName": "LICENSE.txt",
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
- "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
Send report issues to code-server repo
2020-04-07 00:23:14 +02:00
+ "reportIssueUrl": "https://github.com/cdr/code-server/issues/new",
"urlProtocol": "code-oss",
"extensionAllowedProposedApi": [
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
"ms-vscode.vscode-js-profile-flame",
vscode: Update product.json The new fields are from vscodium and make the welcome page documentation links work correctly. I also renamed the distribution to "code-server" so that when you're in a browser, it now says code-server instead of Code OSS.
2020-11-24 01:03:54 +01:00
@@ -136,5 +136,14 @@
"publisherDisplayName": "Microsoft"
}
}
- ]
+ ],
+
+ "//": "https://github.com/VSCodium/vscodium/pull/155/files",
+ "documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484#vscode",
+ "keyboardShortcutsUrlMac": "https://go.microsoft.com/fwlink/?linkid=832143",
+ "keyboardShortcutsUrlLinux": "https://go.microsoft.com/fwlink/?linkid=832144",
+ "keyboardShortcutsUrlWin": "https://go.microsoft.com/fwlink/?linkid=832145",
+ "introductoryVideosUrl": "https://go.microsoft.com/fwlink/?linkid=832146",
+ "tipsAndTricksUrl": "https://go.microsoft.com/fwlink/?linkid=852118",
+ "newsletterSignupUrl": "https://www.research.net/r/vsc-newsletter"
}
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
diff --git a/remote/.yarnrc b/remote/.yarnrc
deleted file mode 100644
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
index c1a32ce532afa501fb19bdbcf6bcb0ec151ecd99..0000000000000000000000000000000000000000
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
--- a/remote/.yarnrc
+++ /dev/null
@@ -1,3 +0,0 @@
-disturl "http://nodejs.org/dist"
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
-target "12.14.1"
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
-runtime "node"
Make sub-paths work
2019-07-22 23:00:59 +02:00
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
index f475b10e5e81d5c2511d8d36ca5fa30a54bc415a..e9a30b2cd2a7848241d9a430c28faccb51efdb9b 100644
Make sub-paths work
2019-07-22 23:00:59 +02:00
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
@@ -113,16 +113,17 @@ class RemoteAuthoritiesImpl {
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
if (host && host.indexOf(':') !== -1) {
host = `[${host}]`;
}
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
- const port = this._ports[authority];
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
+ // const port = this._ports[authority];
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
const connectionToken = this._connectionTokens[authority];
Fix paths from Windows client to non-Windows server Fixes #1659 Fixes #1642
2020-05-18 19:57:50 +02:00
let query = `path=${encodeURIComponent(uri.path)}`;
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
if (typeof connectionToken === 'string') {
query += `&tkn=${encodeURIComponent(connectionToken)}`;
}
+ // NOTE@coder: Changed this to work against the current path.
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
return URI.from({
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
- authority: `${host}:${port}`,
- path: `/vscode-remote-resource`,
+ authority: window.location.host,
+ path: `${window.location.pathname.replace(/\/+$/, '')}/vscode-remote-resource`,
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
query
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
});
}
Groundwork for language support - Implement the localization service. - Use the proper build process which generates the require JSON files. - Implement getting the locale and language configuration.
2019-08-03 02:26:41 +02:00
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
index 3361d83be5b7c3d08bdbfbe6947942a4695882c6..69ead8484e042bbad7075659f8e47f074bc217e4 100644
Groundwork for language support - Implement the localization service. - Use the proper build process which generates the require JSON files. - Implement getting the locale and language configuration.
2019-08-03 02:26:41 +02:00
--- a/src/vs/base/common/platform.ts
+++ b/src/vs/base/common/platform.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -71,6 +71,18 @@ if (typeof navigator === 'object' && !isElectronRenderer) {
Groundwork for language support - Implement the localization service. - Use the proper build process which generates the require JSON files. - Implement getting the locale and language configuration.
2019-08-03 02:26:41 +02:00
_isWeb = true;
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
_locale = navigator.language;
_language = _locale;
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ // NOTE@coder: Make languages work.
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ const el = typeof document !== 'undefined' && document.getElementById('vscode-remote-nls-configuration');
+ const rawNlsConfig = el && el.getAttribute('data-settings');
Groundwork for language support - Implement the localization service. - Use the proper build process which generates the require JSON files. - Implement getting the locale and language configuration.
2019-08-03 02:26:41 +02:00
+ if (rawNlsConfig) {
+ try {
+ const nlsConfig: NLSConfig = JSON.parse(rawNlsConfig);
+ _locale = nlsConfig.locale;
+ _translationsConfigFile = nlsConfig._translationsConfigFile;
+ _language = nlsConfig.availableLanguages['*'] || LANGUAGE_DEFAULT;
+ } catch (error) { /* Oh well. */ }
+ }
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
}
// Native environment
Remove our env vars from the shell This enables developing code-server in code-server.
2020-03-16 17:01:46 +01:00
diff --git a/src/vs/base/common/processes.ts b/src/vs/base/common/processes.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 17895a8510bca40924524dc107c33305c4783c45..ba019b43084e3998ab399108968c3c765a79eb32 100644
Remove our env vars from the shell This enables developing code-server in code-server.
2020-03-16 17:01:46 +01:00
--- a/src/vs/base/common/processes.ts
+++ b/src/vs/base/common/processes.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -112,6 +112,7 @@ export function sanitizeProcessEnvironment(env: IProcessEnvironment, ...preserve
Remove our env vars from the shell This enables developing code-server in code-server.
2020-03-16 17:01:46 +01:00
/^VSCODE_.+$/,
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
/^SNAP(|_.*)$/,
/^GDK_PIXBUF_.+$/,
Remove our env vars from the shell This enables developing code-server in code-server.
2020-03-16 17:01:46 +01:00
+ /^CODE_SERVER_.+$/,
];
const envKeys = Object.keys(env);
envKeys
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
diff --git a/src/vs/base/common/uriIpc.ts b/src/vs/base/common/uriIpc.ts
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index ef2291d49b13c9c995afc90eab9c92afabc2b3b4..29b2f9dfc2b7fa998ac1188db06dee95419fcd5b 100644
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
--- a/src/vs/base/common/uriIpc.ts
+++ b/src/vs/base/common/uriIpc.ts
@@ -5,6 +5,7 @@
import { URI, UriComponents } from 'vs/base/common/uri';
import { MarshalledObject } from 'vs/base/common/marshalling';
+import { Schemas } from './network';
export interface IURITransformer {
transformIncoming(uri: UriComponents): UriComponents;
@@ -31,29 +32,35 @@ function toJSON(uri: URI): UriComponents {
export class URITransformer implements IURITransformer {
- private readonly _uriTransformer: IRawURITransformer;
-
- constructor(uriTransformer: IRawURITransformer) {
- this._uriTransformer = uriTransformer;
+ constructor(private readonly remoteAuthority: string) {
}
+ // NOTE@coder: Coming in from the browser it'll be vscode-remote so it needs
+ // to be transformed into file.
public transformIncoming(uri: UriComponents): UriComponents {
- const result = this._uriTransformer.transformIncoming(uri);
- return (result === uri ? uri : toJSON(URI.from(result)));
+ return uri.scheme === Schemas.vscodeRemote
+ ? toJSON(URI.file(uri.path))
+ : uri;
}
+ // NOTE@coder: Going out to the browser it'll be file so it needs to be
+ // transformed into vscode-remote.
public transformOutgoing(uri: UriComponents): UriComponents {
- const result = this._uriTransformer.transformOutgoing(uri);
- return (result === uri ? uri : toJSON(URI.from(result)));
+ return uri.scheme === Schemas.file
+ ? toJSON(URI.from({ authority: this.remoteAuthority, scheme: Schemas.vscodeRemote, path: uri.path }))
+ : uri;
}
public transformOutgoingURI(uri: URI): URI {
- const result = this._uriTransformer.transformOutgoing(uri);
- return (result === uri ? uri : URI.from(result));
+ return uri.scheme === Schemas.file
+ ? URI.from({ authority: this.remoteAuthority, scheme: Schemas.vscodeRemote, path:uri.path })
+ : uri;
}
public transformOutgoingScheme(scheme: string): string {
- return this._uriTransformer.transformOutgoingScheme(scheme);
+ return scheme === Schemas.file
+ ? Schemas.vscodeRemote
+ : scheme;
}
}
@@ -152,4 +159,4 @@ export function transformAndReviveIncomingURIs<T>(obj: T, transformer: IURITrans
return obj;
}
return result;
-}
\ No newline at end of file
+}
Fix not being able to change language while code-server is running See #948. Only applies if code-server already tried to load a language.
2019-09-19 21:41:17 +02:00
diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 2c64061da7b01aef0bfe3cec851da232ca9461c8..db47fe2eb1cded1e9c33b42fe700421c36a1d481 100644
Fix not being able to change language while code-server is running See #948. Only applies if code-server already tried to load a language.
2019-09-19 21:41:17 +02:00
--- a/src/vs/base/node/languagePacks.js
+++ b/src/vs/base/node/languagePacks.js
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
@@ -128,7 +128,10 @@ function factory(nodeRequire, path, fs, perf) {
Fix not being able to change language while code-server is running See #948. Only applies if code-server already tried to load a language.
2019-09-19 21:41:17 +02:00
function getLanguagePackConfigurations(userDataPath) {
const configFile = path.join(userDataPath, 'languagepacks.json');
try {
- return nodeRequire(configFile);
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ // NOTE@coder: Swapped require with readFile since require is cached and
+ // we don't restart the server-side portion of code-server when the
+ // language changes.
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ return JSON.parse(fs.readFileSync(configFile, 'utf8'));
Fix not being able to change language while code-server is running See #948. Only applies if code-server already tried to load a language.
2019-09-19 21:41:17 +02:00
} catch (err) {
// Do nothing. If we can't read the file we have no
// language pack config.
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 0ef8b9dc81419b53b27cf111fb206d72ba56bada..e490cf7449623f96c780a65d538fad72cf9306e4 100644
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -17,6 +17,7 @@ import { isStandalone } from 'vs/base/browser/browser';
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
import { localize } from 'vs/nls';
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
import { Schemas } from 'vs/base/common/network';
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
import product from 'vs/platform/product/common/product';
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+import { encodePath } from 'vs/server/node/util';
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
function doCreateUri(path: string, queryValues: Map<string, string>): URI {
let query: string | undefined = undefined;
@@ -309,12 +310,18 @@ class WorkspaceProvider implements IWorkspaceProvider {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
// Folder
else if (isFolderToOpen(workspace)) {
- targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_FOLDER}=${encodeURIComponent(workspace.folderUri.toString())}`;
+ const target = workspace.folderUri.scheme === Schemas.vscodeRemote
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+ ? encodePath(workspace.folderUri.path)
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
+ : encodeURIComponent(workspace.folderUri.toString());
+ targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_FOLDER}=${target}`;
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
// Workspace
else if (isWorkspaceToOpen(workspace)) {
- targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_WORKSPACE}=${encodeURIComponent(workspace.workspaceUri.toString())}`;
+ const target = workspace.workspaceUri.scheme === Schemas.vscodeRemote
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+ ? encodePath(workspace.workspaceUri.path)
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
+ : encodeURIComponent(workspace.workspaceUri.toString());
+ targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_WORKSPACE}=${target}`;
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
// Append payload if any
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -404,7 +411,22 @@ class WindowIndicator implements IWindowIndicator {
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
throw new Error('Missing web configuration element');
}
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
- const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = JSON.parse(configElementAttribute);
+ const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = {
Fix webview 404s An extra slash caused a 404 (was /webview//vscode-resource).
2020-11-18 23:50:04 +01:00
+ webviewEndpoint: `${window.location.origin}${window.location.pathname.replace(/\/+$/, '')}/webview`,
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ ...JSON.parse(configElementAttribute),
+ };
+
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
+ // Strip the protocol from the authority if it exists.
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ const normalizeAuthority = (authority: string): string => authority.replace(/^https?:\/\//, '');
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
+ if (config.remoteAuthority) {
+ (config as any).remoteAuthority = normalizeAuthority(config.remoteAuthority);
+ }
Document workspace and folder behavior Also fixed a type issue.
2020-04-08 00:49:50 +02:00
+ if (config.workspaceUri && config.workspaceUri.authority) {
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
+ config.workspaceUri.authority = normalizeAuthority(config.workspaceUri.authority);
+ }
Document workspace and folder behavior Also fixed a type issue.
2020-04-08 00:49:50 +02:00
+ if (config.folderUri && config.folderUri.authority) {
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
+ config.folderUri.authority = normalizeAuthority(config.folderUri.authority);
+ }
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
// Revive static extension locations
if (Array.isArray(config.staticExtensions)) {
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -416,40 +438,7 @@ class WindowIndicator implements IWindowIndicator {
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
// Find workspace to open and payload
let foundWorkspace = false;
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
let workspace: IWorkspace;
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
- let payload = Object.create(null);
-
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
- const query = new URL(document.location.href).searchParams;
- query.forEach((value, key) => {
- switch (key) {
-
- // Folder
- case WorkspaceProvider.QUERY_PARAM_FOLDER:
- workspace = { folderUri: URI.parse(value) };
- foundWorkspace = true;
- break;
-
- // Workspace
- case WorkspaceProvider.QUERY_PARAM_WORKSPACE:
- workspace = { workspaceUri: URI.parse(value) };
- foundWorkspace = true;
- break;
-
- // Empty
- case WorkspaceProvider.QUERY_PARAM_EMPTY_WINDOW:
- workspace = undefined;
- foundWorkspace = true;
- break;
-
- // Payload
- case WorkspaceProvider.QUERY_PARAM_PAYLOAD:
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
- try {
- payload = JSON.parse(value);
- } catch (error) {
- console.error(error); // possible invalid JSON
- }
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
- break;
- }
- });
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ let payload = config.workspaceProvider?.payload || Object.create(null);
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
// If no workspace is provided through the URL, check for config attribute from server
if (!foundWorkspace) {
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 409bb7e1960c9c06485a6f6d7f39b2efce451d56..f27b651c49ea3fc92b03e31eb64c1cf27c7e4433 100644
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -7,6 +7,8 @@
* A list of command line arguments we support natively.
*/
export interface NativeParsedArgs {
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ 'extra-extensions-dir'?: string[];
+ 'extra-builtin-extensions-dir'?: string[];
_: string[];
'folder-uri'?: string[]; // undefined or array of 1 or more
'file-uri'?: string[]; // undefined or array of 1 or more
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 21b4d719cec1a724bbad407aeec38db9eb8d6f5a..edf46f097bf11bfb8883d38d38ee78b735f35b3f 100644
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -122,6 +122,8 @@ export interface INativeEnvironmentService extends IEnvironmentService {
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
extensionsPath?: string;
extensionsDownloadPath: string;
builtinExtensionsPath: string;
+ extraExtensionPaths: string[]
+ extraBuiltinExtensionPaths: string[]
// --- Smoke test support
driverHandle?: string;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 149e6ffb41a82f1a69cf37f105a31872ad4af8b4..ed99aab42b31bc2ab804391b6e3f4c7ff67d9259 100644
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -54,6 +54,8 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
'extensions-dir': { type: 'string', deprecates: 'extensionHomePath', cat: 'e', args: 'dir', description: localize('extensionHomePath', "Set the root path for extensions.") },
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
'extensions-download-dir': { type: 'string' },
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
'builtin-extensions-dir': { type: 'string' },
+ 'extra-builtin-extensions-dir': { type: 'string[]', cat: 'o', description: 'Path to an extra builtin extension directory.' },
+ 'extra-extensions-dir': { type: 'string[]', cat: 'o', description: 'Path to an extra user extension directory.' },
'list-extensions': { type: 'boolean', cat: 'e', description: localize('listExtensions', "List the installed extensions.") },
'show-versions': { type: 'boolean', cat: 'e', description: localize('showVersions', "Show versions of installed extensions, when using --list-extension.") },
'category': { type: 'string', cat: 'e', description: localize('category', "Filters installed extensions by provided category, when using --list-extension.") },
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -318,4 +320,3 @@ export function buildHelpMessage(productName: string, executableName: string, ve
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
export function buildVersionMessage(version: string | undefined, commit: string | undefined): string {
return `${version || localize('unknownVersion', "Unknown version")}\n${commit || localize('unknownCommit', "Unknown commit")}\n${process.arch}`;
}
-
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 80f68fb1decfd1c4fa1bcc30840900240df83f76..d4478b0000a511af11647876a536b8147163f9f8 100644
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -138,6 +138,13 @@ export class NativeEnvironmentService implements INativeEnvironmentService {
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
return resources.joinPath(this.userHome, product.dataFolderName, 'extensions').fsPath;
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.37.0
2019-08-10 01:50:05 +02:00
+ @memoize get extraExtensionPaths(): string[] {
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ return (this._args['extra-extensions-dir'] || []).map((p) => <string>parsePathArg(p, process));
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+ @memoize get extraBuiltinExtensionPaths(): string[] {
+ return (this._args['extra-builtin-extensions-dir'] || []).map((p) => <string>parsePathArg(p, process));
+ }
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+
@memoize
get extensionDevelopmentLocationURI(): URI[] | undefined {
const s = this._args.extensionDevelopmentPath;
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
diff --git a/src/vs/platform/extensionManagement/node/extensionsScanner.ts b/src/vs/platform/extensionManagement/node/extensionsScanner.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index aee65f8eddbfbce3e42362be9590c98d46f2ace5..dc891fba7c7af3ace02b0091ef858bea59e754c6 100644
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
--- a/src/vs/platform/extensionManagement/node/extensionsScanner.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsScanner.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -91,7 +91,7 @@ export class ExtensionsScanner extends Disposable {
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
}
async scanAllUserExtensions(): Promise<ILocalExtension[]> {
- return this.scanExtensionsInDir(this.extensionsPath, ExtensionType.User);
+ return this.scanExtensionsInDirs(this.extensionsPath, this.environmentService.extraExtensionPaths, ExtensionType.User);
Implement new structure
2020-02-04 20:27:46 +01:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
async extractUserExtension(identifierWithVersion: ExtensionIdentifierWithVersion, zipPath: string, token: CancellationToken): Promise<ILocalExtension> {
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -236,7 +236,13 @@ export class ExtensionsScanner extends Disposable {
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
private async scanExtensionsInDir(dir: string, type: ExtensionType): Promise<ILocalExtension[]> {
Implement new structure
2020-02-04 20:27:46 +01:00
const limiter = new Limiter<any>(10);
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
- const extensionsFolders = await pfs.readdir(dir);
+ const extensionsFolders = await pfs.readdir(dir)
Implement new structure
2020-02-04 20:27:46 +01:00
+ .catch((error) => {
+ if (error.code !== 'ENOENT') {
+ throw error;
+ }
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ return <string[]>[];
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ });
const extensions = await Promise.all<ILocalExtension>(extensionsFolders.map(extensionFolder => limiter.queue(() => this.scanExtension(extensionFolder, dir, type))));
return extensions.filter(e => e && e.identifier);
Implement new structure
2020-02-04 20:27:46 +01:00
}
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -266,7 +272,7 @@ export class ExtensionsScanner extends Disposable {
Implement new structure
2020-02-04 20:27:46 +01:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
private async scanDefaultSystemExtensions(): Promise<ILocalExtension[]> {
- const result = await this.scanExtensionsInDir(this.systemExtensionsPath, ExtensionType.System);
+ const result = await this.scanExtensionsInDirs(this.systemExtensionsPath, this.environmentService.extraBuiltinExtensionPaths, ExtensionType.System);
this.logService.trace('Scanned system extensions:', result.length);
return result;
}
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -370,4 +376,9 @@ export class ExtensionsScanner extends Disposable {
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
}
});
}
+
+ private async scanExtensionsInDirs(dir: string, dirs: string[], type: ExtensionType): Promise<ILocalExtension[]>{
+ const results = await Promise.all([dir, ...dirs].map((path) => this.scanExtensionsInDir(path, type)));
+ return results.reduce((flat, current) => flat.concat(current), []);
+ }
}
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 2bea85740cb3e00c955ec0f7aa46d5f9bb8d5dc8..c0953d7b73178fc4a7b030246a5281609c3dfce6 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -37,6 +37,12 @@ if (isWeb || typeof require === 'undefined' || typeof require.__$__nodeRequire !
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
],
Implement new structure
2020-02-04 20:27:46 +01:00
});
}
+ // NOTE@coder: Add the ability to inject settings from the server.
+ const el = document.getElementById('vscode-remote-product-configuration');
+ const rawProductConfiguration = el && el.getAttribute('data-settings');
+ if (rawProductConfiguration) {
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ Object.assign(product, JSON.parse(rawProductConfiguration));
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
// Native (non-sandboxed)
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
diff --git a/src/vs/platform/product/common/productService.ts b/src/vs/platform/product/common/productService.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 333e5b24b05c96e8d44e9025b7a777e6989de9e7..b13572327a6e91592eedea9bcb1e580397f5c224 100644
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
--- a/src/vs/platform/product/common/productService.ts
+++ b/src/vs/platform/product/common/productService.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -32,6 +32,8 @@ export type ConfigurationSyncStore = {
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
};
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
export interface IProductConfiguration {
+ readonly codeServerVersion?: string;
+
readonly version: string;
readonly date?: string;
readonly quality?: string;
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/src/vs/platform/remote/browser/browserSocketFactory.ts b/src/vs/platform/remote/browser/browserSocketFactory.ts
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 3715cbb8e6ee41c3d9b5090918d243b723ae2d00..c65de8ad37e727d66da97a8f8b170cbcef87181b 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/src/vs/platform/remote/browser/browserSocketFactory.ts
+++ b/src/vs/platform/remote/browser/browserSocketFactory.ts
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@@ -208,7 +208,8 @@ export class BrowserSocketFactory implements ISocketFactory {
Implement new structure
2020-02-04 20:27:46 +01:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
connect(host: string, port: number, query: string, callback: IConnectCallback): void {
- const socket = this._webSocketFactory.create(`ws://${host}:${port}/?${query}&skipWebSocketFrames=false`);
+ // NOTE@coder: Modified to work against the current path.
+ const socket = this._webSocketFactory.create(`${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${window.location.host}${window.location.pathname}?${query}&skipWebSocketFrames=false`);
const errorListener = socket.onError((err) => callback(err, undefined));
socket.onOpen(() => {
errorListener.dispose();
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@@ -216,6 +217,3 @@ export class BrowserSocketFactory implements ISocketFactory {
Implement new structure
2020-02-04 20:27:46 +01:00
});
}
}
-
-
-
Add connection type to websocket query parameters This allows external services to distinguish between them.
2020-03-05 22:48:26 +01:00
diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts
vscode: Reconnect in the background up to 5 seconds Based on the previous commits by @mgmachado but simplified. I also changed the threshold to error after a single attempt as the connection has likely been borked and the user should be in the know if they couldn't reconnect after 5 seconds. Closes #1791
2020-11-30 19:23:17 +01:00
index fdd5890c69f72025b94913380f0d226226e8c8fb..957b4812783f6b1d97d1003c63725f541042059f 100644
Add connection type to websocket query parameters This allows external services to distinguish between them.
2020-03-05 22:48:26 +01:00
--- a/src/vs/platform/remote/common/remoteAgentConnection.ts
+++ b/src/vs/platform/remote/common/remoteAgentConnection.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -93,7 +93,7 @@ async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptio
Add connection type to websocket query parameters This allows external services to distinguish between them.
2020-03-05 22:48:26 +01:00
options.socketFactory.connect(
options.host,
options.port,
- `reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`,
+ `type=${connectionTypeToString(connectionType)}&reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`,
(err: any, socket: ISocket | undefined) => {
if (err || !socket) {
options.logService.error(`${logPrefix} socketFactory.connect() failed. Error:`);
vscode: Reconnect in the background up to 5 seconds Based on the previous commits by @mgmachado but simplified. I also changed the threshold to error after a single attempt as the connection has likely been borked and the user should be in the know if they couldn't reconnect after 5 seconds. Closes #1791
2020-11-30 19:23:17 +01:00
@@ -338,7 +338,8 @@ export class ReconnectionWaitEvent {
public readonly type = PersistentConnectionEventType.ReconnectionWait;
constructor(
public readonly durationSeconds: number,
- private readonly cancellableTimer: CancelablePromise<void>
+ private readonly cancellableTimer: CancelablePromise<void>,
+ public readonly connectionAttempt: number
) { }
public skipWait(): void {
@@ -422,7 +423,7 @@ abstract class PersistentConnection extends Disposable {
const waitTime = (attempt < TIMES.length ? TIMES[attempt] : TIMES[TIMES.length - 1]);
try {
const sleepPromise = sleep(waitTime);
- this._onDidStateChange.fire(new ReconnectionWaitEvent(waitTime, sleepPromise));
+ this._onDidStateChange.fire(new ReconnectionWaitEvent(waitTime, sleepPromise, attempt+1));
this._options.logService.info(`${logPrefix} waiting for ${waitTime} seconds before reconnecting...`);
try {
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
diff --git a/src/vs/platform/storage/browser/storageService.ts b/src/vs/platform/storage/browser/storageService.ts
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
index ab3fd347b69f8a3d9b96e706cd87c911b8ffed6b..9d351037b577f9f1edfd18ae9b3c48a211f4467f 100644
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
--- a/src/vs/platform/storage/browser/storageService.ts
+++ b/src/vs/platform/storage/browser/storageService.ts
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
@@ -122,8 +122,8 @@ export class BrowserStorageService extends Disposable implements IStorageService
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
return this.getStorage(scope).getNumber(key, fallbackValue);
}
- store(key: string, value: string | boolean | number | undefined | null, scope: StorageScope): void {
- this.getStorage(scope).set(key, value);
+ store(key: string, value: string | boolean | number | undefined | null, scope: StorageScope): Promise<void> {
+ return this.getStorage(scope).set(key, value);
}
remove(key: string, scope: StorageScope): void {
diff --git a/src/vs/platform/storage/common/storage.ts b/src/vs/platform/storage/common/storage.ts
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
index 6611f1dae42055f69a55c1c154d9475f11cd4d0a..d598d4909d5ff6d1614e4a038b1865e1f9a4e963 100644
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
--- a/src/vs/platform/storage/common/storage.ts
+++ b/src/vs/platform/storage/common/storage.ts
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
@@ -85,7 +85,7 @@ export interface IStorageService {
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
* The scope argument allows to define the scope of the storage
* operation to either the current workspace only or all workspaces.
*/
- store(key: string, value: string | boolean | number | undefined | null, scope: StorageScope): void;
+ store(key: string, value: string | boolean | number | undefined | null, scope: StorageScope): Promise<void> | void;
/**
* Delete an element stored under the provided key from storage.
diff --git a/src/vs/platform/storage/node/storageService.ts b/src/vs/platform/storage/node/storageService.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
index 096b9e23493539c9937940a56e555d95bbae38d9..ef37e614004f550f7b64eacd362f6894fc523a42 100644
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
--- a/src/vs/platform/storage/node/storageService.ts
+++ b/src/vs/platform/storage/node/storageService.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -201,8 +201,8 @@ export class NativeStorageService extends Disposable implements IStorageService
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
return this.getStorage(scope).getNumber(key, fallbackValue);
}
- store(key: string, value: string | boolean | number | undefined | null, scope: StorageScope): void {
- this.getStorage(scope).set(key, value);
+ store(key: string, value: string | boolean | number | undefined | null, scope: StorageScope): Promise<void> {
+ return this.getStorage(scope).set(key, value);
}
remove(key: string, scope: StorageScope): void {
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/src/vs/server/browser/client.ts b/src/vs/server/browser/client.ts
new file mode 100644
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 0000000000000000000000000000000000000000..ead6a3cd5e98fdde074f19ee5043f152ed407146
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/browser/client.ts
cli: Add --disable-update-check flag Closes #2361
2020-11-25 17:37:40 +01:00
@@ -0,0 +1,241 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import { Emitter } from 'vs/base/common/event';
+import { URI } from 'vs/base/common/uri';
+import { localize } from 'vs/nls';
+import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { INodeProxyService, NodeProxyChannelClient } from 'vs/server/common/nodeProxy';
+import { TelemetryChannelClient } from 'vs/server/common/telemetry';
+import 'vs/workbench/contrib/localizations/browser/localizations.contribution';
+import { LocalizationsService } from 'vs/workbench/services/localizations/electron-browser/localizationsService';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+import { Options } from 'vs/server/ipc.d';
Set background color using VS Code theme
2020-03-27 22:58:50 +01:00
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+import { ILogService } from 'vs/platform/log/common/log';
vscode: Check updates with absolute path In case the window location path changes. Not entirely sure if it can but best to be on the safe side.
2020-11-24 18:59:06 +01:00
+import * as path from 'vs/base/common/path';
Implement new structure
2020-02-04 20:27:46 +01:00
+
+class TelemetryService extends TelemetryChannelClient {
+ public constructor(
+ @IRemoteAgentService remoteAgentService: IRemoteAgentService,
+ ) {
+ super(remoteAgentService.getConnection()!.getChannel('telemetry'));
+ }
+}
+
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+/**
+ * Remove extra slashes in a URL.
+ */
+export const normalize = (url: string, keepTrailing = false): string => {
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ return url.replace(/\/\/+/g, '/').replace(/\/+$/, keepTrailing ? '/' : '');
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+};
Implement new structure
2020-02-04 20:27:46 +01:00
+
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+/**
Enable loading external plugins
2020-07-29 22:02:14 +02:00
+ * Get options embedded in the HTML.
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+ */
+export const getOptions = <T extends Options>(): T => {
+ try {
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ return JSON.parse(document.getElementById('coder-options')!.getAttribute('data-settings')!);
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+ } catch (error) {
+ return {} as T;
+ }
+};
Set telemetry setting based on disable-telemetry flag By design the disable-telemetry flag does not affect extension telemetry, only the setting does, so disabling the setting when the flag is set should cause extensions to also stop sending telemetry. Fixes #1116.
2020-03-13 18:36:57 +01:00
+
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+const options = getOptions();
+
+const TELEMETRY_SECTION_ID = 'telemetry';
Implement new structure
2020-02-04 20:27:46 +01:00
+Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
+ 'id': TELEMETRY_SECTION_ID,
+ 'order': 110,
+ 'type': 'object',
+ 'title': localize('telemetryConfigurationTitle', 'Telemetry'),
+ 'properties': {
+ 'telemetry.enableTelemetry': {
+ 'type': 'boolean',
+ 'description': localize('telemetry.enableTelemetry', 'Enable usage data and errors to be sent to a Microsoft online service.'),
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+ 'default': !options.disableTelemetry,
Implement new structure
2020-02-04 20:27:46 +01:00
+ 'tags': ['usesOnlineServices']
+ }
+ }
+});
+
+class NodeProxyService extends NodeProxyChannelClient implements INodeProxyService {
+ private readonly _onClose = new Emitter<void>();
+ public readonly onClose = this._onClose.event;
+ private readonly _onDown = new Emitter<void>();
+ public readonly onDown = this._onDown.event;
+ private readonly _onUp = new Emitter<void>();
+ public readonly onUp = this._onUp.event;
+
+ public constructor(
+ @IRemoteAgentService remoteAgentService: IRemoteAgentService,
+ ) {
+ super(remoteAgentService.getConnection()!.getChannel('nodeProxy'));
+ remoteAgentService.getConnection()!.onDidStateChange((state) => {
+ switch (state.type) {
+ case PersistentConnectionEventType.ConnectionGain:
+ return this._onUp.fire();
+ case PersistentConnectionEventType.ConnectionLost:
+ return this._onDown.fire();
+ case PersistentConnectionEventType.ReconnectionPermanentFailure:
+ return this._onClose.fire();
+ }
+ });
+ }
+}
+
+registerSingleton(ILocalizationsService, LocalizationsService);
+registerSingleton(INodeProxyService, NodeProxyService);
+registerSingleton(ITelemetryService, TelemetryService);
+
+/**
+ * This is called by vs/workbench/browser/web.main.ts after the workbench has
+ * been initialized so we can initialize our own client-side code.
+ */
+export const initialize = async (services: ServiceCollection): Promise<void> => {
+ const event = new CustomEvent('ide-ready');
+ window.dispatchEvent(event);
+
+ if (parent) {
+ // Tell the parent loading has completed.
+ parent.postMessage({ event: 'loaded' }, window.location.origin);
+
+ // Proxy or stop proxing events as requested by the parent.
+ const listeners = new Map<string, (event: Event) => void>();
+ window.addEventListener('message', (parentEvent) => {
+ const eventName = parentEvent.data.bind || parentEvent.data.unbind;
+ if (eventName) {
+ const oldListener = listeners.get(eventName);
+ if (oldListener) {
+ document.removeEventListener(eventName, oldListener);
+ }
+ }
+
+ if (parentEvent.data.bind && parentEvent.data.prop) {
+ const listener = (event: Event) => {
+ parent.postMessage({
+ event: parentEvent.data.event,
+ [parentEvent.data.prop]: event[parentEvent.data.prop as keyof Event]
+ }, window.location.origin);
+ };
+ listeners.set(parentEvent.data.bind, listener);
+ document.addEventListener(parentEvent.data.bind, listener);
+ }
+ });
+ }
+
+ if (!window.isSecureContext) {
+ (services.get(INotificationService) as INotificationService).notify({
+ severity: Severity.Warning,
Elaborate what won't work over an insecure domain Closes #997.
2020-03-03 20:10:32 +01:00
+ message: 'code-server is being accessed over an insecure domain. Web views, the clipboard, and other functionality will not work as expected.',
Implement new structure
2020-02-04 20:27:46 +01:00
+ actions: {
+ primary: [{
Handle when VS Code fails to load This is mostly for development where VS Code might not have finished compiling yet.
2020-02-05 21:21:59 +01:00
+ id: 'understand',
+ label: 'I understand',
+ tooltip: '',
Implement new structure
2020-02-04 20:27:46 +01:00
+ class: undefined,
+ enabled: true,
+ checked: true,
+ dispose: () => undefined,
+ run: () => {
+ return Promise.resolve();
+ }
+ }],
+ }
+ });
+ }
Integrate update notifications into VS Code
2020-03-02 21:39:12 +01:00
+
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+ const logService = (services.get(ILogService) as ILogService);
vscode: Add missing semicolons See #2359
2020-11-24 18:47:58 +01:00
+ const storageService = (services.get(IStorageService) as IStorageService);
cli: Add --disable-update-check flag Closes #2361
2020-11-25 17:37:40 +01:00
+ const updateCheckEndpoint = path.join(options.base, "/update/check");
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+ const getUpdate = async (): Promise<void> => {
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ logService.debug('Checking for update...');
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+
vscode: Check updates with absolute path In case the window location path changes. Not entirely sure if it can but best to be on the safe side.
2020-11-24 18:59:06 +01:00
+ const response = await fetch(updateCheckEndpoint, {
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ headers: { 'Accept': 'application/json' },
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+ });
+ if (!response.ok) {
+ throw new Error(response.statusText);
+ }
+ const json = await response.json();
+ if (json.error) {
+ throw new Error(json.error);
+ }
+ if (json.isLatest) {
+ return;
+ }
+
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ const lastNoti = storageService.getNumber('csLastUpdateNotification', StorageScope.GLOBAL);
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+ if (lastNoti) {
cli: Add --disable-update-check flag Closes #2361
2020-11-25 17:37:40 +01:00
+ // Only remind them again after 1 week.
vscode: Fix update check timeouts Forgot an extra 60 in the check interval and the notification timeout. Very unfortunate. Check has been allowed every 168 minutes instead of every week.
2020-11-25 17:50:38 +01:00
+ const timeout = 1000*60*60*24*7;
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+ const threshold = lastNoti + timeout;
+ if (Date.now() < threshold) {
+ return;
+ }
+ }
+
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ storageService.store('csLastUpdateNotification', Date.now(), StorageScope.GLOBAL);
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+ (services.get(INotificationService) as INotificationService).notify({
+ severity: Severity.Info,
+ message: `[code-server v${json.latest}](https://github.com/cdr/code-server/releases/tag/v${json.latest}) has been released!`,
+ });
+ };
+
+ const updateLoop = (): void => {
+ getUpdate().catch((error) => {
+ logService.debug(`failed to check for update: ${error}`);
+ }).finally(() => {
+ // Check again every 6 hours.
vscode: Fix update check timeouts Forgot an extra 60 in the check interval and the notification timeout. Very unfortunate. Check has been allowed every 168 minutes instead of every week.
2020-11-25 17:50:38 +01:00
+ setTimeout(updateLoop, 1000*60*60*6);
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+ });
+ };
+
cli: Add --disable-update-check flag Closes #2361
2020-11-25 17:37:40 +01:00
+ if (!options.disableUpdateCheck) {
+ updateLoop();
+ }
vscode: Show notification when upgrade is available And link to the release notes.
2020-11-24 03:06:45 +01:00
+
Set background color using VS Code theme
2020-03-27 22:58:50 +01:00
+ // This will be used to set the background color while VS Code loads.
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ const theme = storageService.get('colorThemeData', StorageScope.GLOBAL);
Set background color using VS Code theme
2020-03-27 22:58:50 +01:00
+ if (theme) {
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ localStorage.setItem('colorThemeData', theme);
Set background color using VS Code theme
2020-03-27 22:58:50 +01:00
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+};
+
+export interface Query {
+ [key: string]: string | undefined;
+}
+
+/**
+ * Split a string up to the delimiter. If the delimiter doesn't exist the first
+ * item will have all the text and the second item will be an empty string.
+ */
+export const split = (str: string, delimiter: string): [string, string] => {
+ const index = str.indexOf(delimiter);
+ return index !== -1 ? [str.substring(0, index).trim(), str.substring(index + 1)] : [str, ''];
+};
+
+/**
+ * Return the URL modified with the specified query variables. It's pretty
+ * stupid so it probably doesn't cover any edge cases. Undefined values will
+ * unset existing values. Doesn't allow duplicates.
+ */
+export const withQuery = (url: string, replace: Query): string => {
+ const uri = URI.parse(url);
+ const query = { ...replace };
+ uri.query.split('&').forEach((kv) => {
+ const [key, value] = split(kv, '=');
+ if (!(key in query)) {
+ query[key] = value;
+ }
+ });
+ return uri.with({
+ query: Object.keys(query)
+ .filter((k) => typeof query[k] !== 'undefined')
+ .map((k) => `${k}=${query[k]}`).join('&'),
+ }).toString(true);
+};
diff --git a/src/vs/server/browser/extHostNodeProxy.ts b/src/vs/server/browser/extHostNodeProxy.ts
new file mode 100644
Exclude browser-supported remote extensions Removing them just for peace of mind even though they seem to get filtered out later. This line is meant to only add remote extensions that aren't capable of running in the browser. If they are browser-capable they don't need to run in our shimmed Node environment.
2020-10-15 00:21:05 +02:00
index 0000000000000000000000000000000000000000..5dd5406befcb593ad6366d9e98f46485ed14fbc0
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/browser/extHostNodeProxy.ts
Exclude browser-supported remote extensions Removing them just for peace of mind even though they seem to get filtered out later. This line is meant to only add remote extensions that aren't capable of running in the browser. If they are browser-capable they don't need to run in our shimmed Node environment.
2020-10-15 00:21:05 +02:00
@@ -0,0 +1,51 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import { Emitter } from 'vs/base/common/event';
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
+import { UriComponents } from 'vs/base/common/uri';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { ExtHostNodeProxyShape, MainContext, MainThreadNodeProxyShape } from 'vs/workbench/api/common/extHost.protocol';
+import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+
+export class ExtHostNodeProxy implements ExtHostNodeProxyShape {
+ _serviceBrand: any;
+
+ private readonly _onMessage = new Emitter<string>();
+ public readonly onMessage = this._onMessage.event;
+ private readonly _onClose = new Emitter<void>();
+ public readonly onClose = this._onClose.event;
+ private readonly _onDown = new Emitter<void>();
+ public readonly onDown = this._onDown.event;
+ private readonly _onUp = new Emitter<void>();
+ public readonly onUp = this._onUp.event;
+
+ private readonly proxy: MainThreadNodeProxyShape;
+
+ constructor(@IExtHostRpcService rpc: IExtHostRpcService) {
+ this.proxy = rpc.getProxy(MainContext.MainThreadNodeProxy);
+ }
+
+ public $onMessage(message: string): void {
+ this._onMessage.fire(message);
+ }
+
+ public $onClose(): void {
+ this._onClose.fire();
+ }
+
+ public $onUp(): void {
+ this._onUp.fire();
+ }
+
+ public $onDown(): void {
+ this._onDown.fire();
+ }
+
+ public send(message: string): void {
+ this.proxy.$send(message);
+ }
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
+
+ public async fetchExtension(extensionUri: UriComponents): Promise<Uint8Array> {
+ return this.proxy.$fetchExtension(extensionUri).then(b => b.buffer);
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+}
+
+export interface IExtHostNodeProxy extends ExtHostNodeProxy { }
+export const IExtHostNodeProxy = createDecorator<IExtHostNodeProxy>('IExtHostNodeProxy');
diff --git a/src/vs/server/browser/mainThreadNodeProxy.ts b/src/vs/server/browser/mainThreadNodeProxy.ts
new file mode 100644
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 0000000000000000000000000000000000000000..acabf8c167cabc954b8611a77f57641f3ca0b444
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/browser/mainThreadNodeProxy.ts
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
@@ -0,0 +1,55 @@
+import { VSBuffer } from 'vs/base/common/buffer';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { IDisposable } from 'vs/base/common/lifecycle';
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
+import { FileAccess } from 'vs/base/common/network';
+import { URI, UriComponents } from 'vs/base/common/uri';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { INodeProxyService } from 'vs/server/common/nodeProxy';
+import { ExtHostContext, IExtHostContext, MainContext, MainThreadNodeProxyShape } from 'vs/workbench/api/common/extHost.protocol';
+import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+
+@extHostNamedCustomer(MainContext.MainThreadNodeProxy)
+export class MainThreadNodeProxy implements MainThreadNodeProxyShape {
+ private disposed = false;
+ private disposables = <IDisposable[]>[];
+
+ constructor(
+ extHostContext: IExtHostContext,
+ @INodeProxyService private readonly proxyService: INodeProxyService,
+ ) {
+ if (!extHostContext.remoteAuthority) { // HACK: A terrible way to detect if running in the worker.
+ const proxy = extHostContext.getProxy(ExtHostContext.ExtHostNodeProxy);
+ this.disposables = [
+ this.proxyService.onMessage((message: string) => proxy.$onMessage(message)),
+ this.proxyService.onClose(() => proxy.$onClose()),
+ this.proxyService.onDown(() => proxy.$onDown()),
+ this.proxyService.onUp(() => proxy.$onUp()),
+ ];
+ }
+ }
+
+ $send(message: string): void {
+ if (!this.disposed) {
+ this.proxyService.send(message);
+ }
+ }
+
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
+ async $fetchExtension(extensionUri: UriComponents): Promise<VSBuffer> {
+ const fetchUri = URI.from({
+ scheme: window.location.protocol.replace(':', ''),
+ authority: window.location.host,
+ // Use FileAccess to get the static base path.
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ path: FileAccess.asBrowserUri('', require).path,
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
+ query: `tar=${encodeURIComponent(extensionUri.path)}`,
+ });
+ const response = await fetch(fetchUri.toString(true));
+ if (response.status !== 200) {
+ throw new Error(`Failed to download extension "${module}"`);
+ }
+ return VSBuffer.wrap(new Uint8Array(await response.arrayBuffer()));
+ }
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ dispose(): void {
+ this.disposables.forEach((d) => d.dispose());
+ this.disposables = [];
+ this.disposed = true;
+ }
+}
diff --git a/src/vs/server/browser/worker.ts b/src/vs/server/browser/worker.ts
new file mode 100644
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
index 0000000000000000000000000000000000000000..1d47ede49b76b1774329269ab5c86fedb5712c19
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/browser/worker.ts
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
@@ -0,0 +1,48 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import { Client } from '@coder/node-browser';
+import { fromTar } from '@coder/requirefs';
+import { URI } from 'vs/base/common/uri';
+import { ILogService } from 'vs/platform/log/common/log';
+import { ExtensionActivationTimesBuilder } from 'vs/workbench/api/common/extHostExtensionActivator';
+import { IExtHostNodeProxy } from './extHostNodeProxy';
+
+export const loadCommonJSModule = async <T>(
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ module: URI,
Implement new structure
2020-02-04 20:27:46 +01:00
+ activationTimesBuilder: ExtensionActivationTimesBuilder,
+ nodeProxy: IExtHostNodeProxy,
+ logService: ILogService,
+ vscode: any,
+): Promise<T> => {
+ const client = new Client(nodeProxy, { logger: logService });
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
+ const [buffer, init] = await Promise.all([
+ nodeProxy.fetchExtension(module),
+ client.handshake(),
+ ]);
Implement new structure
2020-02-04 20:27:46 +01:00
+ const rfs = fromTar(buffer);
+ (<any>self).global = self;
+ rfs.provide('vscode', vscode);
+ Object.keys(client.modules).forEach((key) => {
+ const mod = (client.modules as any)[key];
+ if (key === 'process') {
+ (<any>self).process = mod;
+ (<any>self).process.env = init.env;
+ return;
+ }
+
+ rfs.provide(key, mod);
+ switch (key) {
+ case 'buffer':
+ (<any>self).Buffer = mod.Buffer;
+ break;
+ case 'timers':
+ (<any>self).setImmediate = mod.setImmediate;
+ break;
+ }
+ });
+
+ try {
+ activationTimesBuilder.codeLoadingStart();
+ return rfs.require('.');
+ } finally {
+ activationTimesBuilder.codeLoadingStop();
+ }
+};
diff --git a/src/vs/server/common/nodeProxy.ts b/src/vs/server/common/nodeProxy.ts
new file mode 100644
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 0000000000000000000000000000000000000000..14b9de879ceab4c1976770fa7810d276c5aa3e36
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/common/nodeProxy.ts
@@ -0,0 +1,47 @@
+import { ReadWriteConnection } from '@coder/node-browser';
+import { Event } from 'vs/base/common/event';
+import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const INodeProxyService = createDecorator<INodeProxyService>('nodeProxyService');
+
+export interface INodeProxyService extends ReadWriteConnection {
+ _serviceBrand: any;
+ send(message: string): void;
+ onMessage: Event<string>;
+ onUp: Event<void>;
+ onClose: Event<void>;
+ onDown: Event<void>;
+}
+
+export class NodeProxyChannel implements IServerChannel {
+ constructor(private service: INodeProxyService) {}
+
+ listen(_: unknown, event: string): Event<any> {
+ switch (event) {
+ case 'onMessage': return this.service.onMessage;
+ }
+ throw new Error(`Invalid listen ${event}`);
+ }
+
+ async call(_: unknown, command: string, args?: any): Promise<any> {
+ switch (command) {
+ case 'send': return this.service.send(args[0]);
+ }
+ throw new Error(`Invalid call ${command}`);
+ }
+}
+
+export class NodeProxyChannelClient {
+ _serviceBrand: any;
+
+ public readonly onMessage: Event<string>;
+
+ constructor(private readonly channel: IChannel) {
+ this.onMessage = this.channel.listen<string>('onMessage');
+ }
+
+ public send(data: string): void {
+ this.channel.call('send', [data]);
+ }
+}
diff --git a/src/vs/server/common/telemetry.ts b/src/vs/server/common/telemetry.ts
new file mode 100644
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 0000000000000000000000000000000000000000..4ea6d95d36aaac07dbd4d0e16ab3c1bba255f683
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/common/telemetry.ts
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@@ -0,0 +1,65 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ITelemetryData } from 'vs/base/common/actions';
+import { Event } from 'vs/base/common/event';
+import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { ClassifiedEvent, GDPRClassification, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
+import { ITelemetryInfo, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+
+export class TelemetryChannel implements IServerChannel {
+ constructor(private service: ITelemetryService) {}
+
+ listen(_: unknown, event: string): Event<any> {
+ throw new Error(`Invalid listen ${event}`);
+ }
+
+ call(_: unknown, command: string, args?: any): Promise<any> {
+ switch (command) {
+ case 'publicLog': return this.service.publicLog(args[0], args[1], args[2]);
+ case 'publicLog2': return this.service.publicLog2(args[0], args[1], args[2]);
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ case 'publicLogError': return this.service.publicLogError(args[0], args[1]);
+ case 'publicLogError2': return this.service.publicLogError2(args[0], args[1]);
Implement new structure
2020-02-04 20:27:46 +01:00
+ case 'setEnabled': return Promise.resolve(this.service.setEnabled(args[0]));
+ case 'getTelemetryInfo': return this.service.getTelemetryInfo();
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ case 'setExperimentProperty': return Promise.resolve(this.service.setExperimentProperty(args[0], args[1]));
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+ throw new Error(`Invalid call ${command}`);
+ }
+}
+
+export class TelemetryChannelClient implements ITelemetryService {
+ _serviceBrand: any;
+
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ // These don't matter; telemetry is sent to the Node side which decides
+ // whether to send the telemetry event.
+ public isOptedIn = true;
+ public sendErrorTelemetry = true;
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ constructor(private readonly channel: IChannel) {}
+
+ public publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): Promise<void> {
+ return this.channel.call('publicLog', [eventName, data, anonymizeFilePaths]);
+ }
+
+ public publicLog2<E extends ClassifiedEvent<T> = never, T extends GDPRClassification<T> = never>(eventName: string, data?: StrictPropertyCheck<T, E>, anonymizeFilePaths?: boolean): Promise<void> {
+ return this.channel.call('publicLog2', [eventName, data, anonymizeFilePaths]);
+ }
+
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ public publicLogError(errorEventName: string, data?: ITelemetryData): Promise<void> {
+ return this.channel.call('publicLogError', [errorEventName, data]);
+ }
+
+ public publicLogError2<E extends ClassifiedEvent<T> = never, T extends GDPRClassification<T> = never>(eventName: string, data?: StrictPropertyCheck<T, E>): Promise<void> {
+ return this.channel.call('publicLogError2', [eventName, data]);
+ }
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ public setEnabled(value: boolean): void {
+ this.channel.call('setEnable', [value]);
+ }
+
+ public getTelemetryInfo(): Promise<ITelemetryInfo> {
+ return this.channel.call('getTelemetryInfo');
+ }
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+
+ public setExperimentProperty(name: string, value: string): void {
+ this.channel.call('setExperimentProperty', [name, value]);
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+}
diff --git a/src/vs/server/entry.ts b/src/vs/server/entry.ts
new file mode 100644
Add more logging around connections
2020-10-29 20:48:01 +01:00
index 0000000000000000000000000000000000000000..8482c48bae007ed6b39183001ae2cc6d140fcd50
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/entry.ts
Add more logging around connections
2020-10-29 20:48:01 +01:00
@@ -0,0 +1,79 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import { field } from '@coder/logger';
+import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
+import { CodeServerMessage, VscodeMessage } from 'vs/server/ipc';
+import { logger } from 'vs/server/node/logger';
+import { enableCustomMarketplace } from 'vs/server/node/marketplace';
+import { Vscode } from 'vs/server/node/server';
+
Handle unexpected string errors Looks like sometimes VS Code throws strings. For example if ifconfig is missing.
2020-03-03 00:19:28 +01:00
+setUnexpectedErrorHandler((error) => logger.warn(error instanceof Error ? error.message : error));
Implement new structure
2020-02-04 20:27:46 +01:00
+enableCustomMarketplace();
+
+/**
+ * Ensure we control when the process exits.
+ */
+const exit = process.exit;
+process.exit = function(code?: number) {
+ logger.warn(`process.exit() was prevented: ${code || 'unknown code'}.`);
+} as (code?: number) => never;
+
+// Kill VS Code if the parent process dies.
+if (typeof process.env.CODE_SERVER_PARENT_PID !== 'undefined') {
+ const parentPid = parseInt(process.env.CODE_SERVER_PARENT_PID, 10);
+ setInterval(() => {
+ try {
+ process.kill(parentPid, 0); // Throws an exception if the process doesn't exist anymore.
+ } catch (e) {
+ exit();
+ }
+ }, 5000);
+} else {
+ logger.error('no parent process');
+ exit(1);
+}
+
+const vscode = new Vscode();
+const send = (message: VscodeMessage): void => {
+ if (!process.send) {
+ throw new Error('not spawned with IPC');
+ }
+ process.send(message);
+};
+
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+// Wait for the init message then start up VS Code. Subsequent messages will
+// return new workbench options without starting a new instance.
Implement new structure
2020-02-04 20:27:46 +01:00
+process.on('message', async (message: CodeServerMessage, socket) => {
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ logger.debug('got message from code-server', field('type', message.type));
+ logger.trace('code-server message content', field('message', message));
Implement new structure
2020-02-04 20:27:46 +01:00
+ switch (message.type) {
+ case 'init':
+ try {
+ const options = await vscode.initialize(message.options);
+ send({ type: 'options', id: message.id, options });
+ } catch (error) {
+ logger.error(error.message);
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
+ logger.error(error.stack);
Implement new structure
2020-02-04 20:27:46 +01:00
+ exit(1);
+ }
+ break;
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ case 'cli':
+ try {
+ await vscode.cli(message.args);
+ exit(0);
+ } catch (error) {
+ logger.error(error.message);
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
+ logger.error(error.stack);
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ exit(1);
+ }
+ break;
Implement new structure
2020-02-04 20:27:46 +01:00
+ case 'socket':
+ vscode.handleWebSocket(socket, message.query);
+ break;
+ }
+});
+if (!process.send) {
+ logger.error('not spawned with IPC');
+ exit(1);
+} else {
+ // This lets the parent know the child is ready to receive messages.
+ send({ type: 'ready' });
+}
diff --git a/src/vs/server/fork.js b/src/vs/server/fork.js
new file mode 100644
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 0000000000000000000000000000000000000000..56331ff1fc32bbd82e769aaecb551e427f798ec3
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/fork.js
@@ -0,0 +1,3 @@
+// This must be a JS file otherwise when it gets compiled it turns into AMD
+// syntax which will not work without the right loader.
+require('../../bootstrap-amd').load('vs/server/entry');
diff --git a/src/vs/server/ipc.d.ts b/src/vs/server/ipc.d.ts
new file mode 100644
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 0000000000000000000000000000000000000000..0a4a91e5e36bda7f888feedda348aaff5fe32d27
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/ipc.d.ts
cli: Add --disable-update-check flag Closes #2361
2020-11-25 17:37:40 +01:00
@@ -0,0 +1,133 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+/**
+ * External interfaces for integration into code-server over IPC. No vs imports
+ * should be made in this file.
+ */
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+export interface Options {
vscode: Use options.base for update checking See https://github.com/cdr/code-server/pull/2358#discussion_r529858749
2020-11-25 17:26:46 +01:00
+ base: string
cli: Add --disable-update-check flag Closes #2361
2020-11-25 17:37:40 +01:00
+ disableTelemetry: boolean
+ disableUpdateCheck: boolean
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+}
Implement new structure
2020-02-04 20:27:46 +01:00
+
+export interface InitMessage {
+ type: 'init';
+ id: string;
+ options: VscodeOptions;
+}
+
Convert routes to Express
2020-10-21 01:05:58 +02:00
+export type Query = { [key: string]: string | string[] | undefined | Query | Query[] };
Implement new structure
2020-02-04 20:27:46 +01:00
+
+export interface SocketMessage {
+ type: 'socket';
+ query: Query;
+}
+
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+export interface CliMessage {
+ type: 'cli';
+ args: Args;
+}
+
Allow opening files, folders, and workspaces in existing code-server from CLI (#1994) Add initial support for opening files / folders in running code-server instance. Current limitations: - unable to open a file in a new window, only folders - unable to use addMode feature - others...
2020-08-27 20:06:21 +02:00
+export interface OpenCommandPipeArgs {
+ type: 'open';
+ fileURIs?: string[];
+ folderURIs: string[];
+ forceNewWindow?: boolean;
+ diffMode?: boolean;
+ addMode?: boolean;
+ gotoLineMode?: boolean;
+ forceReuseWindow?: boolean;
+ waitMarkerFilePath?: string;
+}
+
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+export type CodeServerMessage = InitMessage | SocketMessage | CliMessage;
Implement new structure
2020-02-04 20:27:46 +01:00
+
+export interface ReadyMessage {
+ type: 'ready';
+}
+
+export interface OptionsMessage {
+ id: string;
+ type: 'options';
+ options: WorkbenchOptions;
+}
+
+export type VscodeMessage = ReadyMessage | OptionsMessage;
+
+export interface StartPath {
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ url: string;
+ workspace: boolean;
Implement new structure
2020-02-04 20:27:46 +01:00
+}
+
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+export interface Args {
Move user data directory logic out of patch
2020-02-06 20:11:38 +01:00
+ 'user-data-dir'?: string;
+
Add proposed API flag (#2002) Co-authored-by: giddyuptiger <65830808+giddyuptiger@users.noreply.github.com>
2020-08-26 21:18:40 +02:00
+ 'enable-proposed-api'?: string[];
Move user data directory logic out of patch
2020-02-06 20:11:38 +01:00
+ 'extensions-dir'?: string;
+ 'builtin-extensions-dir'?: string;
+ 'extra-extensions-dir'?: string[];
+ 'extra-builtin-extensions-dir'?: string[];
+
Update locale file location Should make language packs work again.
2020-02-20 19:38:46 +01:00
+ locale?: string
+
Move user data directory logic out of patch
2020-02-06 20:11:38 +01:00
+ log?: string;
+ verbose?: boolean;
+
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ _: string[];
Implement new structure
2020-02-04 20:27:46 +01:00
+}
+
+export interface VscodeOptions {
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ readonly args: Args;
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ readonly remoteAuthority: string;
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ readonly startPath?: StartPath;
Implement new structure
2020-02-04 20:27:46 +01:00
+}
+
+export interface VscodeOptionsMessage extends VscodeOptions {
+ readonly id: string;
+}
+
+export interface UriComponents {
+ readonly scheme: string;
+ readonly authority: string;
+ readonly path: string;
+ readonly query: string;
+ readonly fragment: string;
+}
+
+export interface NLSConfiguration {
+ locale: string;
+ availableLanguages: {
+ [key: string]: string;
+ };
+ pseudo?: boolean;
+ _languagePackSupport?: boolean;
+}
+
+export interface WorkbenchOptions {
+ readonly workbenchWebConfiguration: {
+ readonly remoteAuthority?: string;
+ readonly folderUri?: UriComponents;
+ readonly workspaceUri?: UriComponents;
+ readonly logLevel?: number;
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ readonly workspaceProvider?: {
Add proposed API flag (#2002) Co-authored-by: giddyuptiger <65830808+giddyuptiger@users.noreply.github.com>
2020-08-26 21:18:40 +02:00
+ payload: [
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ ['userDataPath', string],
+ ['enableProposedApi', string],
Add proposed API flag (#2002) Co-authored-by: giddyuptiger <65830808+giddyuptiger@users.noreply.github.com>
2020-08-26 21:18:40 +02:00
+ ];
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ };
Implement new structure
2020-02-04 20:27:46 +01:00
+ };
+ readonly remoteUserDataUri: UriComponents;
+ readonly productConfiguration: {
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
+ codeServerVersion?: string;
Implement new structure
2020-02-04 20:27:46 +01:00
+ readonly extensionsGallery?: {
+ readonly serviceUrl: string;
+ readonly itemUrl: string;
+ readonly controlUrl: string;
+ readonly recommendationsUrl: string;
+ };
+ };
+ readonly nlsConfiguration: NLSConfiguration;
+ readonly commit: string;
+}
+
+export interface WorkbenchOptionsMessage {
+ id: string;
+}
diff --git a/src/vs/server/node/channel.ts b/src/vs/server/node/channel.ts
new file mode 100644
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 0000000000000000000000000000000000000000..4827b2da780b66e6dfd65c2a2f1c938cb23f6c26
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/channel.ts
Don't persist terminals for now
2020-11-19 22:13:46 +01:00
@@ -0,0 +1,897 @@
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+import { field, logger } from '@coder/logger';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { Server } from '@coder/node-browser';
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+import * as os from 'os';
Implement new structure
2020-02-04 20:27:46 +01:00
+import * as path from 'path';
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+import { VSBuffer } from 'vs/base/common/buffer';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { Emitter, Event } from 'vs/base/common/event';
+import { IDisposable } from 'vs/base/common/lifecycle';
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+import * as platform from 'vs/base/common/platform';
+import * as resources from 'vs/base/common/resources';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ReadableStreamEventPayload } from 'vs/base/common/stream';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { transformOutgoingURIs } from 'vs/base/common/uriIpc';
+import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
+import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { FileDeleteOptions, FileOpenOptions, FileOverwriteOptions, FileReadStreamOptions, FileType, FileWriteOptions, IStat, IWatchOptions } from 'vs/platform/files/common/files';
+import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
+import { ILogService } from 'vs/platform/log/common/log';
+import product from 'vs/platform/product/common/product';
+import { IRemoteAgentEnvironment, RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { INodeProxyService } from 'vs/server/common/nodeProxy';
+import { getTranslations } from 'vs/server/node/nls';
+import { getUriTransformer } from 'vs/server/node/util';
+import { IFileChangeDto } from 'vs/workbench/api/common/extHost.protocol';
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+import { IEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariable';
+import { MergedEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariableCollection';
+import { deserializeEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariableShared';
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+import * as terminal from 'vs/workbench/contrib/terminal/common/remoteTerminalChannel';
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+import { IShellLaunchConfig, ITerminalEnvironment, ITerminalLaunchError } from 'vs/workbench/contrib/terminal/common/terminal';
+import { TerminalDataBufferer } from 'vs/workbench/contrib/terminal/common/terminalDataBuffering';
+import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
+import { getSystemShell } from 'vs/workbench/contrib/terminal/node/terminal';
+import { getMainProcessParentEnv } from 'vs/workbench/contrib/terminal/node/terminalEnvironment';
+import { TerminalProcess } from 'vs/workbench/contrib/terminal/node/terminalProcess';
+import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ExtensionScanner, ExtensionScannerInput } from 'vs/workbench/services/extensions/node/extensionPoints';
+
+/**
+ * Extend the file provider to allow unwatching.
+ */
+class Watcher extends DiskFileSystemProvider {
+ public readonly watches = new Map<number, IDisposable>();
+
+ public dispose(): void {
+ this.watches.forEach((w) => w.dispose());
+ this.watches.clear();
+ super.dispose();
+ }
+
+ public _watch(req: number, resource: URI, opts: IWatchOptions): void {
+ this.watches.set(req, this.watch(resource, opts));
+ }
+
+ public unwatch(req: number): void {
+ this.watches.get(req)!.dispose();
+ this.watches.delete(req);
+ }
+}
+
+export class FileProviderChannel implements IServerChannel<RemoteAgentConnectionContext>, IDisposable {
+ private readonly provider: DiskFileSystemProvider;
+ private readonly watchers = new Map<string, Watcher>();
+
+ public constructor(
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ private readonly environmentService: INativeEnvironmentService,
Implement new structure
2020-02-04 20:27:46 +01:00
+ private readonly logService: ILogService,
+ ) {
+ this.provider = new DiskFileSystemProvider(this.logService);
+ }
+
+ public listen(context: RemoteAgentConnectionContext, event: string, args?: any): Event<any> {
+ switch (event) {
+ case 'filechange': return this.filechange(context, args[0]);
+ case 'readFileStream': return this.readFileStream(args[0], args[1]);
+ }
+
+ throw new Error(`Invalid listen '${event}'`);
+ }
+
+ private filechange(context: RemoteAgentConnectionContext, session: string): Event<IFileChangeDto[]> {
+ const emitter = new Emitter<IFileChangeDto[]>({
+ onFirstListenerAdd: () => {
+ const provider = new Watcher(this.logService);
+ this.watchers.set(session, provider);
+ const transformer = getUriTransformer(context.remoteAuthority);
+ provider.onDidChangeFile((events) => {
+ emitter.fire(events.map((event) => ({
+ ...event,
+ resource: transformer.transformOutgoing(event.resource),
+ })));
+ });
+ provider.onDidErrorOccur((event) => this.logService.error(event));
+ },
+ onLastListenerRemove: () => {
+ this.watchers.get(session)!.dispose();
+ this.watchers.delete(session);
+ },
+ });
+
+ return emitter.event;
+ }
+
+ private readFileStream(resource: UriComponents, opts: FileReadStreamOptions): Event<ReadableStreamEventPayload<VSBuffer>> {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ const cts = new CancellationTokenSource();
+ const fileStream = this.provider.readFileStream(this.transform(resource), opts, cts.token);
Implement new structure
2020-02-04 20:27:46 +01:00
+ const emitter = new Emitter<ReadableStreamEventPayload<VSBuffer>>({
+ onFirstListenerAdd: () => {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ fileStream.on('data', (data) => emitter.fire(VSBuffer.wrap(data)));
+ fileStream.on('error', (error) => emitter.fire(error));
+ fileStream.on('end', () => emitter.fire('end'));
Implement new structure
2020-02-04 20:27:46 +01:00
+ },
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ onLastListenerRemove: () => cts.cancel(),
Implement new structure
2020-02-04 20:27:46 +01:00
+ });
+
+ return emitter.event;
+ }
+
+ public call(_: unknown, command: string, args?: any): Promise<any> {
+ switch (command) {
+ case 'stat': return this.stat(args[0]);
+ case 'open': return this.open(args[0], args[1]);
+ case 'close': return this.close(args[0]);
+ case 'read': return this.read(args[0], args[1], args[2]);
+ case 'readFile': return this.readFile(args[0]);
+ case 'write': return this.write(args[0], args[1], args[2], args[3], args[4]);
+ case 'writeFile': return this.writeFile(args[0], args[1], args[2]);
+ case 'delete': return this.delete(args[0], args[1]);
+ case 'mkdir': return this.mkdir(args[0]);
+ case 'readdir': return this.readdir(args[0]);
+ case 'rename': return this.rename(args[0], args[1], args[2]);
+ case 'copy': return this.copy(args[0], args[1], args[2]);
+ case 'watch': return this.watch(args[0], args[1], args[2], args[3]);
+ case 'unwatch': return this.unwatch(args[0], args[1]);
+ }
+
+ throw new Error(`Invalid call '${command}'`);
+ }
+
+ public dispose(): void {
+ this.watchers.forEach((w) => w.dispose());
+ this.watchers.clear();
+ }
+
+ private async stat(resource: UriComponents): Promise<IStat> {
+ return this.provider.stat(this.transform(resource));
+ }
+
+ private async open(resource: UriComponents, opts: FileOpenOptions): Promise<number> {
+ return this.provider.open(this.transform(resource), opts);
+ }
+
+ private async close(fd: number): Promise<void> {
+ return this.provider.close(fd);
+ }
+
+ private async read(fd: number, pos: number, length: number): Promise<[VSBuffer, number]> {
+ const buffer = VSBuffer.alloc(length);
+ const bytesRead = await this.provider.read(fd, pos, buffer.buffer, 0, length);
+ return [buffer, bytesRead];
+ }
+
+ private async readFile(resource: UriComponents): Promise<VSBuffer> {
+ return VSBuffer.wrap(await this.provider.readFile(this.transform(resource)));
+ }
+
+ private write(fd: number, pos: number, buffer: VSBuffer, offset: number, length: number): Promise<number> {
+ return this.provider.write(fd, pos, buffer.buffer, offset, length);
+ }
+
+ private writeFile(resource: UriComponents, buffer: VSBuffer, opts: FileWriteOptions): Promise<void> {
+ return this.provider.writeFile(this.transform(resource), buffer.buffer, opts);
+ }
+
+ private async delete(resource: UriComponents, opts: FileDeleteOptions): Promise<void> {
+ return this.provider.delete(this.transform(resource), opts);
+ }
+
+ private async mkdir(resource: UriComponents): Promise<void> {
+ return this.provider.mkdir(this.transform(resource));
+ }
+
+ private async readdir(resource: UriComponents): Promise<[string, FileType][]> {
+ return this.provider.readdir(this.transform(resource));
+ }
+
+ private async rename(resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Promise<void> {
+ return this.provider.rename(this.transform(resource), URI.from(target), opts);
+ }
+
+ private copy(resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Promise<void> {
+ return this.provider.copy(this.transform(resource), URI.from(target), opts);
+ }
+
+ private async watch(session: string, req: number, resource: UriComponents, opts: IWatchOptions): Promise<void> {
+ this.watchers.get(session)!._watch(req, this.transform(resource), opts);
+ }
+
+ private async unwatch(session: string, req: number): Promise<void> {
+ this.watchers.get(session)!.unwatch(req);
+ }
+
+ private transform(resource: UriComponents): URI {
+ // Used for walkthrough content.
+ if (/^\/static[^/]*\//.test(resource.path)) {
+ return URI.file(this.environmentService.appRoot + resource.path.replace(/^\/static[^/]*\//, '/'));
+ // Used by the webview service worker to load resources.
+ } else if (resource.path === '/vscode-resource' && resource.query) {
+ try {
+ const query = JSON.parse(resource.query);
+ if (query.requestResourcePath) {
+ return URI.file(query.requestResourcePath);
+ }
+ } catch (error) { /* Carry on. */ }
+ }
+ return URI.from(resource);
+ }
+}
+
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+// See ../../workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
Implement new structure
2020-02-04 20:27:46 +01:00
+export class ExtensionEnvironmentChannel implements IServerChannel {
+ public constructor(
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ private readonly environment: INativeEnvironmentService,
Implement new structure
2020-02-04 20:27:46 +01:00
+ private readonly log: ILogService,
+ private readonly telemetry: ITelemetryService,
+ private readonly connectionToken: string,
+ ) {}
+
+ public listen(_: unknown, event: string): Event<any> {
+ throw new Error(`Invalid listen '${event}'`);
+ }
+
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ public async call(context: any, command: string, args: any): Promise<any> {
Implement new structure
2020-02-04 20:27:46 +01:00
+ switch (command) {
+ case 'getEnvironmentData':
+ return transformOutgoingURIs(
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ await this.getEnvironmentData(),
+ getUriTransformer(context.remoteAuthority),
+ );
+ case 'scanExtensions':
+ return transformOutgoingURIs(
+ await this.scanExtensions(args.language),
Implement new structure
2020-02-04 20:27:46 +01:00
+ getUriTransformer(context.remoteAuthority),
+ );
+ case 'getDiagnosticInfo': return this.getDiagnosticInfo();
+ case 'disableTelemetry': return this.disableTelemetry();
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ case 'logTelemetry': return this.logTelemetry(args[0], args[1]);
+ case 'flushTelemetry': return this.flushTelemetry();
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+ throw new Error(`Invalid call '${command}'`);
+ }
+
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ private async getEnvironmentData(): Promise<IRemoteAgentEnvironment> {
Implement new structure
2020-02-04 20:27:46 +01:00
+ return {
+ pid: process.pid,
+ connectionToken: this.connectionToken,
+ appRoot: URI.file(this.environment.appRoot),
Initialize config and use correct settings path Fixes #1829.
2020-06-24 18:40:17 +02:00
+ settingsPath: this.environment.settingsResource,
Implement new structure
2020-02-04 20:27:46 +01:00
+ logsPath: URI.file(this.environment.logsPath),
+ extensionsPath: URI.file(this.environment.extensionsPath!),
+ extensionHostLogsPath: URI.file(path.join(this.environment.logsPath, 'extension-host')),
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ globalStorageHome: this.environment.globalStorageHome,
+ workspaceStorageHome: this.environment.workspaceStorageHome,
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ userHome: this.environment.userHome,
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ os: platform.OS,
Implement new structure
2020-02-04 20:27:46 +01:00
+ };
+ }
+
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ private async scanExtensions(language: string): Promise<IExtensionDescription[]> {
+ const translations = await getTranslations(language, this.environment.userDataPath);
Implement new structure
2020-02-04 20:27:46 +01:00
+
+ const scanMultiple = (isBuiltin: boolean, isUnderDevelopment: boolean, paths: string[]): Promise<IExtensionDescription[][]> => {
+ return Promise.all(paths.map((path) => {
+ return ExtensionScanner.scanExtensions(new ExtensionScannerInput(
+ product.version,
+ product.commit,
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ language,
Implement new structure
2020-02-04 20:27:46 +01:00
+ !!process.env.VSCODE_DEV,
+ path,
+ isBuiltin,
+ isUnderDevelopment,
+ translations,
+ ), this.log);
+ }));
+ };
+
+ const scanBuiltin = async (): Promise<IExtensionDescription[][]> => {
+ return scanMultiple(true, false, [this.environment.builtinExtensionsPath, ...this.environment.extraBuiltinExtensionPaths]);
+ };
+
+ const scanInstalled = async (): Promise<IExtensionDescription[][]> => {
+ return scanMultiple(false, true, [this.environment.extensionsPath!, ...this.environment.extraExtensionPaths]);
+ };
+
+ return Promise.all([scanBuiltin(), scanInstalled()]).then((allExtensions) => {
+ const uniqueExtensions = new Map<string, IExtensionDescription>();
+ allExtensions.forEach((multipleExtensions) => {
+ multipleExtensions.forEach((extensions) => {
+ extensions.forEach((extension) => {
+ const id = ExtensionIdentifier.toKey(extension.identifier);
+ if (uniqueExtensions.has(id)) {
+ const oldPath = uniqueExtensions.get(id)!.extensionLocation.fsPath;
+ const newPath = extension.extensionLocation.fsPath;
+ this.log.warn(`${oldPath} has been overridden ${newPath}`);
+ }
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ uniqueExtensions.set(id, {
+ ...extension,
+ // Force extensions that should run on the client due to latency
+ // issues.
+ extensionKind: extension.identifier.value === 'vscodevim.vim'
+ ? [ 'web' ]
+ : extension.extensionKind,
+ });
Implement new structure
2020-02-04 20:27:46 +01:00
+ });
+ });
+ });
+ return Array.from(uniqueExtensions.values());
+ });
+ }
+
+ private getDiagnosticInfo(): Promise<IDiagnosticInfo> {
+ throw new Error('not implemented');
+ }
+
+ private async disableTelemetry(): Promise<void> {
+ this.telemetry.setEnabled(false);
+ }
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+
+ private async logTelemetry(eventName: string, data: ITelemetryData): Promise<void> {
+ this.telemetry.publicLog(eventName, data);
+ }
+
+ private async flushTelemetry(): Promise<void> {
+ // We always send immediately at the moment.
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+}
+
+export class NodeProxyService implements INodeProxyService {
+ public _serviceBrand = undefined;
+
+ public readonly server: Server;
+
+ private readonly _onMessage = new Emitter<string>();
+ public readonly onMessage = this._onMessage.event;
+ private readonly _$onMessage = new Emitter<string>();
+ public readonly $onMessage = this._$onMessage.event;
+ public readonly _onDown = new Emitter<void>();
+ public readonly onDown = this._onDown.event;
+ public readonly _onUp = new Emitter<void>();
+ public readonly onUp = this._onUp.event;
+
+ // Unused because the server connection will never permanently close.
+ private readonly _onClose = new Emitter<void>();
+ public readonly onClose = this._onClose.event;
+
+ public constructor() {
+ // TODO: down/up
+ this.server = new Server({
+ onMessage: this.$onMessage,
+ onClose: this.onClose,
+ onDown: this.onDown,
+ onUp: this.onUp,
+ send: (message: string): void => {
+ this._onMessage.fire(message);
+ }
+ });
+ }
+
+ public send(message: string): void {
+ this._$onMessage.fire(message);
+ }
+}
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+class VariableResolverService extends AbstractVariableResolverService {
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ constructor(
+ remoteAuthority: string,
+ args: terminal.ICreateTerminalProcessArguments,
+ env: platform.IProcessEnvironment,
+ ) {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ super({
+ getFolderUri: (name: string): URI | undefined => {
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ const folder = args.workspaceFolders.find((f) => f.name === name);
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return folder && URI.revive(folder.uri);
+ },
+ getWorkspaceFolderCount: (): number => {
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ return args.workspaceFolders.length;
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ },
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ // In ../../workbench/contrib/terminal/common/remoteTerminalChannel.ts it
+ // looks like there are `config:` entries which must be for this? Not sure
+ // how/if the URI comes into play though.
+ getConfigurationValue: (_: URI, section: string): string | undefined => {
+ return args.resolvedVariables[`config:${section}`];
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ },
+ getExecPath: (): string | undefined => {
Use resolverEnv to get exec path This is the last unused variable in the create terminal payload.
2020-11-19 19:42:59 +01:00
+ // Assuming that resolverEnv is just for use in the resolver and not for
+ // the terminal itself.
+ return (args.resolverEnv && args.resolverEnv['VSCODE_EXEC_PATH']) || env['VSCODE_EXEC_PATH'];
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ },
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ // This is just a guess; this is the only file-related thing we're sent
+ // and none of these resolver methods seem to get called so I don't know
+ // how to test.
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ getFilePath: (): string | undefined => {
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ const resource = transformIncoming(remoteAuthority, args.activeFileResource);
+ if (!resource) {
+ return undefined;
+ }
+ // See ../../editor/standalone/browser/simpleServices.ts;
+ // `BaseConfigurationResolverService` calls `getUriLabel` from there.
+ if (resource.scheme === 'file') {
+ return resource.fsPath;
+ }
+ return resource.path;
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ },
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ // It looks like these are set here although they aren't on the types:
+ // ../../workbench/contrib/terminal/common/remoteTerminalChannel.ts
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ getSelectedText: (): string | undefined => {
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ return args.resolvedVariables.selectedText;
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ },
+ getLineNumber: (): string | undefined => {
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ return args.resolvedVariables.selectedText;
+ },
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ }, undefined, env);
+ }
+}
+
+class Terminal {
+ private readonly process: TerminalProcess;
+ private _pid: number = -1;
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ private _title: string = '';
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ public readonly workspaceId: string;
+ public readonly workspaceName: string;
Handle non-persistent terminals
2020-11-18 00:51:17 +01:00
+ private readonly persist: boolean;
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+
+ private readonly _onDispose = new Emitter<void>();
+ public get onDispose(): Event<void> { return this._onDispose.event; }
+
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ // These are replayed when a client reconnects.
+ private cols: number;
+ private rows: number;
+ private replayData: string[] = [];
+ // This is based on string length and is pretty arbitrary.
+ private readonly maxReplayData = 10000;
+ private totalReplayData = 0;
+
Add timeout for disposing detached terminals
2020-11-19 18:21:15 +01:00
+ // According to the release notes the terminals are supposed to dispose after
+ // a short timeout; in our case we'll use 48 hours so you can get them back
+ // the next day or over the weekend.
+ private disposeTimeout: NodeJS.Timeout | undefined;
+ private disposeDelay = 48 * 60 * 60 * 1000;
+
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ private buffering = false;
+ private readonly _onEvent = new Emitter<terminal.IRemoteTerminalProcessEvent>({
+ // Don't bind to data until something is listening.
+ onFirstListenerAdd: () => {
+ logger.debug('Terminal bound', field('id', this.id));
+ if (!this.buffering) {
+ this.buffering = true;
+ this.bufferer.startBuffering(this.id, this.process.onProcessData);
+ }
+ },
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+
+ // Replay stored events.
+ onFirstListenerDidAdd: () => {
Add timeout for disposing detached terminals
2020-11-19 18:21:15 +01:00
+ // We only need to replay if the terminal is being reconnected which is
+ // true if there is a dispose timeout.
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ if (typeof this.disposeTimeout !== 'undefined') {
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ return;
+ }
+
Add timeout for disposing detached terminals
2020-11-19 18:21:15 +01:00
+ clearTimeout(this.disposeTimeout);
+ this.disposeTimeout = undefined;
+
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ logger.debug('Terminal replaying', field('id', this.id));
+ this._onEvent.fire({
+ type: 'replay',
+ events: [{
+ cols: this.cols,
+ rows: this.rows,
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ data: this.replayData.join(''),
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ }]
+ });
Handle non-persistent terminals
2020-11-18 00:51:17 +01:00
+ },
+
+ onLastListenerRemove: () => {
+ logger.debug('Terminal unbound', field('id', this.id));
+ if (!this.persist) { // Used by debug consoles.
+ this.dispose();
Add timeout for disposing detached terminals
2020-11-19 18:21:15 +01:00
+ } else {
+ this.disposeTimeout = setTimeout(() => {
+ this.dispose();
+ }, this.disposeDelay);
Handle non-persistent terminals
2020-11-18 00:51:17 +01:00
+ }
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ }
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ });
+
+ public get onEvent(): Event<terminal.IRemoteTerminalProcessEvent> { return this._onEvent.event; }
+
+ // Buffer to reduce the number of messages going to the renderer.
+ private readonly bufferer = new TerminalDataBufferer((_, data) => {
+ this._onEvent.fire({
+ type: 'data',
+ data,
+ });
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+
Don't persist terminals for now
2020-11-19 22:13:46 +01:00
+ // No need to store data if we aren't persisting.
+ if (!this.persist) {
+ return;
+ }
+
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ this.replayData.push(data);
+ this.totalReplayData += data.length;
+
+ let overflow = this.totalReplayData - this.maxReplayData;
+ if (overflow <= 0) {
+ return;
+ }
+
+ // Drop events until doing so would put us under budget.
+ let deleteCount = 0;
+ for (; deleteCount < this.replayData.length
+ && this.replayData[deleteCount].length <= overflow; ++deleteCount) {
+ overflow -= this.replayData[deleteCount].length;
+ }
+
+ if (deleteCount > 0) {
+ this.replayData.splice(0, deleteCount);
+ }
+
+ // Dropping any more events would put us under budget; trim the first event
+ // instead if still over budget.
+ if (overflow > 0 && this.replayData.length > 0) {
+ this.replayData[0] = this.replayData[0].substring(overflow);
+ }
+
+ this.totalReplayData = this.replayData.reduce((p, c) => p + c.length, 0);
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ });
+
+ public get pid(): number {
+ return this._pid;
+ }
+
+ public get title(): string {
+ return this._title;
+ }
+
+ public constructor(
+ public readonly id: number,
+ config: IShellLaunchConfig & { cwd: string },
+ args: terminal.ICreateTerminalProcessArguments,
+ env: platform.IProcessEnvironment,
+ logService: ILogService,
+ ) {
+ this.workspaceId = args.workspaceId;
+ this.workspaceName = args.workspaceName;
+
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ this.cols = args.cols;
+ this.rows = args.rows;
+
Don't persist terminals for now
2020-11-19 22:13:46 +01:00
+ // TODO: Don't persist terminals until we make it work with things like
+ // htop, vim, etc.
+ // this.persist = args.shouldPersistTerminal;
+ this.persist = false;
Handle non-persistent terminals
2020-11-18 00:51:17 +01:00
+
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ this.process = new TerminalProcess(
+ config,
+ config.cwd,
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ this.cols,
+ this.rows,
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ env,
+ process.env as platform.IProcessEnvironment, // Environment used for `findExecutable`.
+ false, // windowsEnableConpty: boolean,
+ logService,
+ );
+
+ // The current pid and title aren't exposed so they have to be tracked.
+ this.process.onProcessReady((event) => {
+ this._pid = event.pid;
+ this._onEvent.fire({
+ type: 'ready',
+ pid: event.pid,
+ cwd: event.cwd,
+ });
+ });
+
+ this.process.onProcessTitleChanged((title) => {
+ this._title = title;
+ this._onEvent.fire({
+ type: 'titleChanged',
+ title,
+ });
+ });
+
+ this.process.onProcessExit((exitCode) => {
+ logger.debug('Terminal exited', field('id', this.id), field('code', exitCode));
+ this._onEvent.fire({
+ type: 'exit',
+ exitCode,
+ });
+ this.dispose();
+ });
+
Add notes on unimplemented terminal events
2020-11-19 18:24:52 +01:00
+ // TODO: I think `execCommand` must have something to do with running
+ // commands on the terminal that will do things in VS Code but we already
+ // have that functionality via a socket so I'm not sure what this is for.
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ // type: 'execCommand';
+ // reqId: number;
+ // commandId: string;
+ // commandArgs: any[];
+
Add notes on unimplemented terminal events
2020-11-19 18:24:52 +01:00
+ // TODO: Maybe this is to ask if the terminal is currently attached to
+ // anything? But we already know that on account of whether anything is
+ // listening to our event emitter.
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ // type: 'orphan?';
+ }
+
+ public dispose() {
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ logger.debug('Terminal disposing', field('id', this.id));
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ this._onEvent.dispose();
+ this.bufferer.dispose();
+ this.process.dispose();
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ this.process.shutdown(true);
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ this._onDispose.fire();
+ this._onDispose.dispose();
+ }
+
+ public shutdown(immediate: boolean): void {
+ return this.process.shutdown(immediate);
+ }
+
+ public getCwd(): Promise<string> {
+ return this.process.getCwd();
+ }
+
+ public getInitialCwd(): Promise<string> {
+ return this.process.getInitialCwd();
+ }
+
+ public start(): Promise<ITerminalLaunchError | undefined> {
+ return this.process.start();
+ }
+
+ public input(data: string): void {
+ return this.process.input(data);
+ }
+
+ public resize(cols: number, rows: number): void {
Implement terminal replay event
2020-11-18 00:03:15 +01:00
+ this.cols = cols;
+ this.rows = rows;
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return this.process.resize(cols, rows);
+ }
+}
+
+// References: - ../../workbench/api/node/extHostTerminalService.ts
+// - ../../workbench/contrib/terminal/browser/terminalProcessManager.ts
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+export class TerminalProviderChannel implements IServerChannel<RemoteAgentConnectionContext>, IDisposable {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ private readonly terminals = new Map<number, Terminal>();
+ private id = 0;
+
+ public constructor (private readonly logService: ILogService) {
+
+ }
+
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ public listen(_: RemoteAgentConnectionContext, event: string, args?: any): Event<any> {
+ switch (event) {
+ case '$onTerminalProcessEvent': return this.onTerminalProcessEvent(args);
+ }
+
+ throw new Error(`Invalid listen '${event}'`);
+ }
+
+ private onTerminalProcessEvent(args: terminal.IOnTerminalProcessEventArguments): Event<terminal.IRemoteTerminalProcessEvent> {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return this.getTerminal(args.id).onEvent;
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ public call(context: RemoteAgentConnectionContext, command: string, args?: any): Promise<any> {
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ switch (command) {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ case '$createTerminalProcess': return this.createTerminalProcess(context.remoteAuthority, args);
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ case '$startTerminalProcess': return this.startTerminalProcess(args);
+ case '$sendInputToTerminalProcess': return this.sendInputToTerminalProcess(args);
+ case '$shutdownTerminalProcess': return this.shutdownTerminalProcess(args);
+ case '$resizeTerminalProcess': return this.resizeTerminalProcess(args);
+ case '$getTerminalInitialCwd': return this.getTerminalInitialCwd(args);
+ case '$getTerminalCwd': return this.getTerminalCwd(args);
+ case '$sendCommandResultToTerminalProcess': return this.sendCommandResultToTerminalProcess(args);
+ case '$orphanQuestionReply': return this.orphanQuestionReply(args[0]);
+ case '$listTerminals': return this.listTerminals(args[0]);
+ }
+
+ throw new Error(`Invalid call '${command}'`);
+ }
+
+ public dispose(): void {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ this.terminals.forEach((t) => t.dispose());
+ }
+
+ private async createTerminalProcess(remoteAuthority: string, args: terminal.ICreateTerminalProcessArguments): Promise<terminal.ICreateTerminalProcessResult> {
+ const terminalId = this.id++;
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ logger.debug('Creating terminal', field('id', terminalId), field('terminals', this.terminals.size));
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+
+ const shellLaunchConfig: IShellLaunchConfig = {
+ name: args.shellLaunchConfig.name,
+ executable: args.shellLaunchConfig.executable,
+ args: args.shellLaunchConfig.args,
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ // TODO: Should we transform if it's a string as well? The incoming
+ // transform only takes `UriComponents` so I suspect it's not necessary.
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ cwd: typeof args.shellLaunchConfig.cwd !== 'string'
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ ? transformIncoming(remoteAuthority, args.shellLaunchConfig.cwd)
+ : args.shellLaunchConfig.cwd,
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ env: args.shellLaunchConfig.env,
+ };
+
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ const activeWorkspaceUri = transformIncoming(remoteAuthority, args.activeWorkspaceFolder?.uri);
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ const activeWorkspace = activeWorkspaceUri && args.activeWorkspaceFolder ? {
+ ...args.activeWorkspaceFolder,
+ uri: activeWorkspaceUri,
+ toResource: (relativePath: string) => resources.joinPath(activeWorkspaceUri, relativePath),
+ } : undefined;
+
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+ const resolverService = new VariableResolverService(remoteAuthority, args, process.env as platform.IProcessEnvironment);
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ const resolver = terminalEnvironment.createVariableResolver(activeWorkspace, resolverService);
+
+ const getDefaultShellAndArgs = (): { executable: string; args: string[] | string } => {
+ if (shellLaunchConfig.executable) {
+ const executable = resolverService.resolve(activeWorkspace, shellLaunchConfig.executable);
+ let resolvedArgs: string[] | string = [];
+ if (shellLaunchConfig.args && Array.isArray(shellLaunchConfig.args)) {
+ for (const arg of shellLaunchConfig.args) {
+ resolvedArgs.push(resolverService.resolve(activeWorkspace, arg));
+ }
+ } else if (shellLaunchConfig.args) {
+ resolvedArgs = resolverService.resolve(activeWorkspace, shellLaunchConfig.args);
+ }
+ return { executable, args: resolvedArgs };
+ }
+
+ const executable = terminalEnvironment.getDefaultShell(
+ (key) => args.configuration[key],
+ args.isWorkspaceShellAllowed,
+ getSystemShell(platform.platform),
+ process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432'),
+ process.env.windir,
+ resolver,
+ this.logService,
+ false, // useAutomationShell
+ );
+
+ const resolvedArgs = terminalEnvironment.getDefaultShellArgs(
+ (key) => args.configuration[key],
+ args.isWorkspaceShellAllowed,
+ false, // useAutomationShell
+ resolver,
+ this.logService,
+ );
+
+ return { executable, args: resolvedArgs };
+ };
+
+ const getInitialCwd = (): string => {
+ return terminalEnvironment.getCwd(
+ shellLaunchConfig,
+ os.homedir(),
+ resolver,
+ activeWorkspaceUri,
+ args.configuration['terminal.integrated.cwd'],
+ this.logService,
+ );
+ };
+
+ // Use a separate var so Typescript recognizes these properties are no
+ // longer undefined.
+ const resolvedShellLaunchConfig = {
+ ...shellLaunchConfig,
+ ...getDefaultShellAndArgs(),
+ cwd: getInitialCwd(),
+ };
+
+ logger.debug('Resolved shell launch configuration', field('id', terminalId));
+
+ // Use instead of `terminal.integrated.env.${platform}` to make types work.
+ const getEnvFromConfig = (): terminal.ISingleTerminalConfiguration<ITerminalEnvironment> => {
+ if (platform.isWindows) {
+ return args.configuration['terminal.integrated.env.windows'];
+ } else if (platform.isMacintosh) {
+ return args.configuration['terminal.integrated.env.osx'];
+ }
+ return args.configuration['terminal.integrated.env.linux'];
+ };
+
+ const getNonInheritedEnv = async (): Promise<platform.IProcessEnvironment> => {
+ const env = await getMainProcessParentEnv();
+ env.VSCODE_IPC_HOOK_CLI = process.env['VSCODE_IPC_HOOK_CLI']!;
+ return env;
+ };
+
+ const env = terminalEnvironment.createTerminalEnvironment(
+ shellLaunchConfig,
+ getEnvFromConfig(),
+ resolver,
+ args.isWorkspaceShellAllowed,
+ product.version,
+ args.configuration['terminal.integrated.detectLocale'],
+ args.configuration['terminal.integrated.inheritEnv'] !== false
+ ? process.env as platform.IProcessEnvironment
+ : await getNonInheritedEnv()
+ );
+
+ // Apply extension environment variable collections to the environment.
+ if (!shellLaunchConfig.strictEnv) {
+ // They come in an array and in serialized format.
+ const envVariableCollections = new Map<string, IEnvironmentVariableCollection>();
+ for (const [k, v] of args.envVariableCollections) {
+ envVariableCollections.set(k, { map: deserializeEnvironmentVariableCollection(v) });
+ }
+ const mergedCollection = new MergedEnvironmentVariableCollection(envVariableCollections);
+ mergedCollection.applyToProcessEnvironment(env);
+ }
+
+ logger.debug('Resolved terminal environment', field('id', terminalId));
+
+ const terminal = new Terminal(terminalId, resolvedShellLaunchConfig, args, env, this.logService);
+ this.terminals.set(terminalId, terminal);
+ logger.debug('Created terminal', field('id', terminalId));
+ terminal.onDispose(() => this.terminals.delete(terminalId));
+
+ return {
+ terminalId,
+ resolvedShellLaunchConfig,
+ };
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ private getTerminal(id: number): Terminal {
+ const terminal = this.terminals.get(id);
+ if (!terminal) {
+ throw new Error(`terminal with id ${id} does not exist`);
+ }
+ return terminal;
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+
+ private async startTerminalProcess(args: terminal.IStartTerminalProcessArguments): Promise<ITerminalLaunchError | void> {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return this.getTerminal(args.id).start();
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+
+ private async sendInputToTerminalProcess(args: terminal.ISendInputToTerminalProcessArguments): Promise<void> {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return this.getTerminal(args.id).input(args.data);
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+
+ private async shutdownTerminalProcess(args: terminal.IShutdownTerminalProcessArguments): Promise<void> {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return this.getTerminal(args.id).shutdown(args.immediate);
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+
+ private async resizeTerminalProcess(args: terminal.IResizeTerminalProcessArguments): Promise<void> {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return this.getTerminal(args.id).resize(args.cols, args.rows);
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+
+ private async getTerminalInitialCwd(args: terminal.IGetTerminalInitialCwdArguments): Promise<string> {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return this.getTerminal(args.id).getInitialCwd();
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+
+ private async getTerminalCwd(args: terminal.IGetTerminalCwdArguments): Promise<string> {
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return this.getTerminal(args.id).getCwd();
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+
Add notes on unimplemented terminal events
2020-11-19 18:24:52 +01:00
+ private async sendCommandResultToTerminalProcess(_: terminal.ISendCommandResultToTerminalProcessArguments): Promise<void> {
+ // NOTE: Not required unless we implement the `execCommand` event, see above.
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ throw new Error('not implemented');
+ }
+
Add notes on unimplemented terminal events
2020-11-19 18:24:52 +01:00
+ private async orphanQuestionReply(_: terminal.IOrphanQuestionReplyArgs): Promise<void> {
+ // NOTE: Not required unless we implement the `orphan?` event, see above.
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ throw new Error('not implemented');
+ }
+
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ private async listTerminals(_: terminal.IListTerminalsArgs): Promise<terminal.IRemoteTerminalDescriptionDto[]> {
Add notes on unimplemented terminal events
2020-11-19 18:24:52 +01:00
+ // TODO: args.isInitialization. Maybe this is to have slightly different
+ // behavior when first listing terminals but I don't know what you'd want to
+ // do differently. Maybe it's to reset the terminal dispose timeouts or
+ // something like that, but why not do it each time you list?
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ return Promise.all(Array.from(this.terminals).map(async ([id, terminal]) => {
+ const cwd = await terminal.getCwd();
+ return {
+ id,
+ pid: terminal.pid,
+ title: terminal.title,
+ cwd,
Send back workspace ID and name in terminal list This makes it re-connect automatically.
2020-11-19 18:11:46 +01:00
+ workspaceId: terminal.workspaceId,
+ workspaceName: terminal.workspaceName,
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ };
+ }));
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+ }
+}
Implement remaining resolver methods
2020-11-19 19:26:31 +01:00
+
+function transformIncoming(remoteAuthority: string, uri: UriComponents | undefined): URI | undefined {
+ const transformer = getUriTransformer(remoteAuthority);
+ return uri ? URI.revive(transformer.transformIncoming(uri)) : uri;
+}
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/src/vs/server/node/connection.ts b/src/vs/server/node/connection.ts
new file mode 100644
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 0000000000000000000000000000000000000000..fb7999ee343ddfd5f225a5ef727c9e559059fb58
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/connection.ts
Fix exthost error and warn logging (#2366) Previously anything that wasn't "log" such as "warn" would end up doing `logger[logger.warn]`. Would have caught this if I hadn't used `any`... Fixes #2364.
2020-11-26 23:58:34 +01:00
@@ -0,0 +1,189 @@
Add more logging around connections
2020-10-29 20:48:01 +01:00
+import { field, Logger, logger } from '@coder/logger';
Implement new structure
2020-02-04 20:27:46 +01:00
+import * as cp from 'child_process';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { Emitter } from 'vs/base/common/event';
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
+import { FileAccess } from 'vs/base/common/network';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ISocket } from 'vs/base/parts/ipc/common/ipc.net';
+import { NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
+import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { getNlsConfiguration } from 'vs/server/node/nls';
+import { Protocol } from 'vs/server/node/protocol';
Fix exthost error and warn logging (#2366) Previously anything that wasn't "log" such as "warn" would end up doing `logger[logger.warn]`. Would have caught this if I hadn't used `any`... Fixes #2364.
2020-11-26 23:58:34 +01:00
+import { IExtHostReadyMessage } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
Implement new structure
2020-02-04 20:27:46 +01:00
+
+export abstract class Connection {
+ private readonly _onClose = new Emitter<void>();
+ public readonly onClose = this._onClose.event;
+ private disposed = false;
+ private _offline: number | undefined;
+
+ public constructor(protected protocol: Protocol, public readonly token: string) {}
+
+ public get offline(): number | undefined {
+ return this._offline;
+ }
+
+ public reconnect(socket: ISocket, buffer: VSBuffer): void {
+ this._offline = undefined;
+ this.doReconnect(socket, buffer);
+ }
+
+ public dispose(): void {
+ if (!this.disposed) {
+ this.disposed = true;
+ this.doDispose();
+ this._onClose.fire();
+ }
+ }
+
+ protected setOffline(): void {
+ if (!this._offline) {
+ this._offline = Date.now();
+ }
+ }
+
+ /**
+ * Set up the connection on a new socket.
+ */
+ protected abstract doReconnect(socket: ISocket, buffer: VSBuffer): void;
+ protected abstract doDispose(): void;
+}
+
+/**
+ * Used for all the IPC channels.
+ */
+export class ManagementConnection extends Connection {
+ public constructor(protected protocol: Protocol, token: string) {
+ super(protocol, token);
+ protocol.onClose(() => this.dispose()); // Explicit close.
+ protocol.onSocketClose(() => this.setOffline()); // Might reconnect.
+ }
+
+ protected doDispose(): void {
+ this.protocol.sendDisconnect();
+ this.protocol.dispose();
Fix connections sticking around indefinitely For some reason it only affects the extension host socket (something to do with passing it via IPC?) but I changed both just to be sure. Fixes #1795.
2020-06-30 23:41:47 +02:00
+ this.protocol.getUnderlyingSocket().destroy();
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+
+ protected doReconnect(socket: ISocket, buffer: VSBuffer): void {
+ this.protocol.beginAcceptReconnection(socket, buffer);
+ this.protocol.endAcceptReconnection();
+ }
+}
+
Fix exthost error and warn logging (#2366) Previously anything that wasn't "log" such as "warn" would end up doing `logger[logger.warn]`. Would have caught this if I hadn't used `any`... Fixes #2364.
2020-11-26 23:58:34 +01:00
+interface DisconnectedMessage {
+ type: 'VSCODE_EXTHOST_DISCONNECTED';
+}
+
+interface ConsoleMessage {
+ type: '__$console';
+ // See bootstrap-fork.js#L135.
+ severity: 'log' | 'warn' | 'error';
+ arguments: any[];
+}
+
+type ExtHostMessage = DisconnectedMessage | ConsoleMessage | IExtHostReadyMessage;
+
Implement new structure
2020-02-04 20:27:46 +01:00
+export class ExtensionHostConnection extends Connection {
+ private process?: cp.ChildProcess;
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ private readonly logger: Logger;
Implement new structure
2020-02-04 20:27:46 +01:00
+
+ public constructor(
+ locale:string, protocol: Protocol, buffer: VSBuffer, token: string,
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ private readonly environment: INativeEnvironmentService,
Implement new structure
2020-02-04 20:27:46 +01:00
+ ) {
+ super(protocol, token);
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ this.logger = logger.named('exthost', field('token', token));
Implement new structure
2020-02-04 20:27:46 +01:00
+ this.protocol.dispose();
+ this.spawn(locale, buffer).then((p) => this.process = p);
+ this.protocol.getUnderlyingSocket().pause();
+ }
+
+ protected doDispose(): void {
+ if (this.process) {
+ this.process.kill();
+ }
Fix connections sticking around indefinitely For some reason it only affects the extension host socket (something to do with passing it via IPC?) but I changed both just to be sure. Fixes #1795.
2020-06-30 23:41:47 +02:00
+ this.protocol.getUnderlyingSocket().destroy();
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+
+ protected doReconnect(socket: ISocket, buffer: VSBuffer): void {
+ // This is just to set the new socket.
+ this.protocol.beginAcceptReconnection(socket, null);
+ this.protocol.dispose();
+ this.sendInitMessage(buffer);
+ }
+
+ private sendInitMessage(buffer: VSBuffer): void {
+ const socket = this.protocol.getUnderlyingSocket();
+ socket.pause();
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ this.logger.trace('Sending socket');
Implement new structure
2020-02-04 20:27:46 +01:00
+ this.process!.send({ // Process must be set at this point.
+ type: 'VSCODE_EXTHOST_IPC_SOCKET',
+ initialDataChunk: (buffer.buffer as Buffer).toString('base64'),
+ skipWebSocketFrames: this.protocol.getSocket() instanceof NodeSocket,
+ }, socket);
+ }
+
+ private async spawn(locale: string, buffer: VSBuffer): Promise<cp.ChildProcess> {
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ this.logger.trace('Getting NLS configuration...');
Implement new structure
2020-02-04 20:27:46 +01:00
+ const config = await getNlsConfiguration(locale, this.environment.userDataPath);
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ this.logger.trace('Spawning extension host...');
Implement new structure
2020-02-04 20:27:46 +01:00
+ const proc = cp.fork(
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
+ FileAccess.asFileUri('bootstrap-fork', require).fsPath,
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
+ [ '--type=extensionHost' ],
Implement new structure
2020-02-04 20:27:46 +01:00
+ {
+ env: {
+ ...process.env,
+ AMD_ENTRYPOINT: 'vs/workbench/services/extensions/node/extensionHostProcess',
+ PIPE_LOGGING: 'true',
+ VERBOSE_LOGGING: 'true',
+ VSCODE_EXTHOST_WILL_SEND_SOCKET: 'true',
+ VSCODE_HANDLES_UNCAUGHT_ERRORS: 'true',
+ VSCODE_LOG_STACK: 'false',
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
+ VSCODE_LOG_LEVEL: process.env.LOG_LEVEL,
Implement new structure
2020-02-04 20:27:46 +01:00
+ VSCODE_NLS_CONFIG: JSON.stringify(config),
+ },
+ silent: true,
+ },
+ );
+
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ proc.on('error', (error) => {
+ this.logger.error('Exited unexpectedly', field('error', error));
+ this.dispose();
+ });
+ proc.on('exit', (code) => {
+ this.logger.trace('Exited', field('code', code));
+ this.dispose();
+ });
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ if (proc.stdout && proc.stderr) {
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ proc.stdout.setEncoding('utf8').on('data', (d) => this.logger.info(d));
+ proc.stderr.setEncoding('utf8').on('data', (d) => this.logger.error(d));
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ }
Add more logging around connections
2020-10-29 20:48:01 +01:00
+
Fix exthost error and warn logging (#2366) Previously anything that wasn't "log" such as "warn" would end up doing `logger[logger.warn]`. Would have caught this if I hadn't used `any`... Fixes #2364.
2020-11-26 23:58:34 +01:00
+ proc.on('message', (event: ExtHostMessage) => {
+ switch (event.type) {
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ case '__$console':
Fix exthost error and warn logging (#2366) Previously anything that wasn't "log" such as "warn" would end up doing `logger[logger.warn]`. Would have caught this if I hadn't used `any`... Fixes #2364.
2020-11-26 23:58:34 +01:00
+ const fn = this.logger[event.severity === 'log' ? 'info' : event.severity];
+ if (fn) {
+ fn('console', field('arguments', event.arguments));
+ } else {
+ this.logger.error('Unexpected severity', field('event', event));
+ }
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ break;
+ case 'VSCODE_EXTHOST_DISCONNECTED':
+ this.logger.trace('Going offline');
+ this.setOffline();
+ break;
+ case 'VSCODE_EXTHOST_IPC_READY':
+ this.logger.trace('Got ready message');
+ this.sendInitMessage(buffer);
+ break;
+ default:
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ this.logger.error('Unexpected message', field('event', event));
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ break;
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+ });
+
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ this.logger.trace('Waiting for handshake...');
+ return proc;
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+}
diff --git a/src/vs/server/node/insights.ts b/src/vs/server/node/insights.ts
new file mode 100644
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 0000000000000000000000000000000000000000..a0ece345f28f06afb2af12fe4901ad228b2475a4
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/insights.ts
@@ -0,0 +1,124 @@
+import * as appInsights from 'applicationinsights';
+import * as https from 'https';
+import * as http from 'http';
+import * as os from 'os';
+
+class Channel {
+ public get _sender() {
+ throw new Error('unimplemented');
+ }
+ public get _buffer() {
+ throw new Error('unimplemented');
+ }
+
+ public setUseDiskRetryCaching(): void {
+ throw new Error('unimplemented');
+ }
+ public send(): void {
+ throw new Error('unimplemented');
+ }
+ public triggerSend(): void {
+ throw new Error('unimplemented');
+ }
+}
+
+export class TelemetryClient {
+ public context: any = undefined;
+ public commonProperties: any = undefined;
+ public config: any = {};
+
+ public channel: any = new Channel();
+
+ public addTelemetryProcessor(): void {
+ throw new Error('unimplemented');
+ }
+
+ public clearTelemetryProcessors(): void {
+ throw new Error('unimplemented');
+ }
+
+ public runTelemetryProcessors(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackTrace(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackMetric(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackException(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackRequest(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackDependency(): void {
+ throw new Error('unimplemented');
+ }
+
+ public track(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackNodeHttpRequestSync(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackNodeHttpRequest(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackNodeHttpDependency(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackEvent(options: appInsights.Contracts.EventTelemetry): void {
+ if (!options.properties) {
+ options.properties = {};
+ }
+ if (!options.measurements) {
+ options.measurements = {};
+ }
+
+ try {
+ const cpus = os.cpus();
+ options.measurements.cores = cpus.length;
+ options.properties['common.cpuModel'] = cpus[0].model;
+ } catch (error) {}
+
+ try {
+ options.measurements.memoryFree = os.freemem();
+ options.measurements.memoryTotal = os.totalmem();
+ } catch (error) {}
+
+ try {
+ options.properties['common.shell'] = os.userInfo().shell;
+ options.properties['common.release'] = os.release();
+ options.properties['common.arch'] = os.arch();
+ } catch (error) {}
+
+ try {
+ const url = process.env.TELEMETRY_URL || 'https://v1.telemetry.coder.com/track';
+ const request = (/^http:/.test(url) ? http : https).request(url, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ });
+ request.on('error', () => { /* We don't care. */ });
+ request.write(JSON.stringify(options));
+ request.end();
+ } catch (error) {}
+ }
+
+ public flush(options: { callback: (v: string) => void }): void {
+ if (options.callback) {
+ options.callback('');
+ }
+ }
+}
diff --git a/src/vs/server/node/ipc.ts b/src/vs/server/node/ipc.ts
new file mode 100644
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 0000000000000000000000000000000000000000..5e560eb46e6a0a18c91e440c655ac0d44b09b6dd
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/ipc.ts
@@ -0,0 +1,61 @@
+import * as cp from 'child_process';
+import { Emitter } from 'vs/base/common/event';
+
+enum ControlMessage {
+ okToChild = 'ok>',
+ okFromChild = 'ok<',
+}
+
+interface RelaunchMessage {
+ type: 'relaunch';
+ version: string;
+}
+
+export type Message = RelaunchMessage;
+
+class IpcMain {
+ protected readonly _onMessage = new Emitter<Message>();
+ public readonly onMessage = this._onMessage.event;
+
+ public handshake(child?: cp.ChildProcess): Promise<void> {
+ return new Promise((resolve, reject) => {
+ const target = child || process;
+ if (!target.send) {
+ throw new Error('Not spawned with IPC enabled');
+ }
+ target.on('message', (message) => {
+ if (message === child ? ControlMessage.okFromChild : ControlMessage.okToChild) {
+ target.removeAllListeners();
+ target.on('message', (msg) => this._onMessage.fire(msg));
+ if (child) {
+ target.send!(ControlMessage.okToChild);
+ }
+ resolve();
+ }
+ });
+ if (child) {
+ child.once('error', reject);
+ child.once('exit', (code) => {
+ const error = new Error(`Unexpected exit with code ${code}`);
+ (error as any).code = code;
+ reject(error);
+ });
+ } else {
+ target.send(ControlMessage.okFromChild);
+ }
+ });
+ }
+
+ public relaunch(version: string): void {
+ this.send({ type: 'relaunch', version });
+ }
+
+ private send(message: Message): void {
+ if (!process.send) {
+ throw new Error('Not a child process with IPC enabled');
+ }
+ process.send(message);
+ }
+}
+
+export const ipcMain = new IpcMain();
diff --git a/src/vs/server/node/logger.ts b/src/vs/server/node/logger.ts
new file mode 100644
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 0000000000000000000000000000000000000000..2a39c524aaa1b4031e04a631842f30b6fec3d98a
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/logger.ts
@@ -0,0 +1,2 @@
+import { logger as baseLogger } from '@coder/logger';
+export const logger = baseLogger.named('vscode');
diff --git a/src/vs/server/node/marketplace.ts b/src/vs/server/node/marketplace.ts
new file mode 100644
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 0000000000000000000000000000000000000000..8956fc40d48448b9932036c4c286464881807338
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/marketplace.ts
@@ -0,0 +1,174 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import * as tarStream from 'tar-stream';
+import * as util from 'util';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { mkdirp } from 'vs/base/node/pfs';
+import * as vszip from 'vs/base/node/zip';
+import * as nls from 'vs/nls';
+import product from 'vs/platform/product/common/product';
+
+// We will be overriding these, so keep a reference to the original.
+const vszipExtract = vszip.extract;
+const vszipBuffer = vszip.buffer;
+
+export interface IExtractOptions {
+ overwrite?: boolean;
+ /**
+ * Source path within the TAR/ZIP archive. Only the files
+ * contained in this path will be extracted.
+ */
+ sourcePath?: string;
+}
+
+export interface IFile {
+ path: string;
+ contents?: Buffer | string;
+ localPath?: string;
+}
+
+export const tar = async (tarPath: string, files: IFile[]): Promise<string> => {
+ const pack = tarStream.pack();
+ const chunks: Buffer[] = [];
+ const ended = new Promise<Buffer>((resolve) => {
+ pack.on('end', () => resolve(Buffer.concat(chunks)));
+ });
+ pack.on('data', (chunk: Buffer) => chunks.push(chunk));
+ for (let i = 0; i < files.length; i++) {
+ const file = files[i];
+ pack.entry({ name: file.path }, file.contents);
+ }
+ pack.finalize();
+ await util.promisify(fs.writeFile)(tarPath, await ended);
+ return tarPath;
+};
+
+export const extract = async (archivePath: string, extractPath: string, options: IExtractOptions = {}, token: CancellationToken): Promise<void> => {
+ try {
+ await extractTar(archivePath, extractPath, options, token);
+ } catch (error) {
+ if (error.toString().includes('Invalid tar header')) {
+ await vszipExtract(archivePath, extractPath, options, token);
+ }
+ }
+};
+
+export const buffer = (targetPath: string, filePath: string): Promise<Buffer> => {
+ return new Promise<Buffer>(async (resolve, reject) => {
+ try {
+ let done: boolean = false;
+ await extractAssets(targetPath, new RegExp(filePath), (assetPath: string, data: Buffer) => {
+ if (path.normalize(assetPath) === path.normalize(filePath)) {
+ done = true;
+ resolve(data);
+ }
+ });
+ if (!done) {
+ throw new Error('couldn\'t find asset ' + filePath);
+ }
+ } catch (error) {
+ if (error.toString().includes('Invalid tar header')) {
+ vszipBuffer(targetPath, filePath).then(resolve).catch(reject);
+ } else {
+ reject(error);
+ }
+ }
+ });
+};
+
+const extractAssets = async (tarPath: string, match: RegExp, callback: (path: string, data: Buffer) => void): Promise<void> => {
+ return new Promise<void>((resolve, reject): void => {
+ const extractor = tarStream.extract();
+ const fail = (error: Error) => {
+ extractor.destroy();
+ reject(error);
+ };
+ extractor.once('error', fail);
+ extractor.on('entry', async (header, stream, next) => {
+ const name = header.name;
+ if (match.test(name)) {
+ extractData(stream).then((data) => {
+ callback(name, data);
+ next();
+ }).catch(fail);
+ } else {
+ stream.on('end', () => next());
+ stream.resume(); // Just drain it.
+ }
+ });
+ extractor.on('finish', resolve);
+ fs.createReadStream(tarPath).pipe(extractor);
+ });
+};
+
+const extractData = (stream: NodeJS.ReadableStream): Promise<Buffer> => {
+ return new Promise((resolve, reject): void => {
+ const fileData: Buffer[] = [];
+ stream.on('error', reject);
+ stream.on('end', () => resolve(Buffer.concat(fileData)));
+ stream.on('data', (data) => fileData.push(data));
+ });
+};
+
+const extractTar = async (tarPath: string, targetPath: string, options: IExtractOptions = {}, token: CancellationToken): Promise<void> => {
+ return new Promise<void>((resolve, reject): void => {
+ const sourcePathRegex = new RegExp(options.sourcePath ? `^${options.sourcePath}` : '');
+ const extractor = tarStream.extract();
+ const fail = (error: Error) => {
+ extractor.destroy();
+ reject(error);
+ };
+ extractor.once('error', fail);
+ extractor.on('entry', async (header, stream, next) => {
+ const nextEntry = (): void => {
+ stream.on('end', () => next());
+ stream.resume();
+ };
+
+ const rawName = path.normalize(header.name);
+ if (token.isCancellationRequested || !sourcePathRegex.test(rawName)) {
+ return nextEntry();
+ }
+
+ const fileName = rawName.replace(sourcePathRegex, '');
+ const targetFileName = path.join(targetPath, fileName);
+ if (/\/$/.test(fileName)) {
+ return mkdirp(targetFileName).then(nextEntry);
+ }
+
+ const dirName = path.dirname(fileName);
+ const targetDirName = path.join(targetPath, dirName);
+ if (targetDirName.indexOf(targetPath) !== 0) {
+ return fail(new Error(nls.localize('invalid file', 'Error extracting {0}. Invalid file.', fileName)));
+ }
+
+ await mkdirp(targetDirName, undefined);
+
+ const fstream = fs.createWriteStream(targetFileName, { mode: header.mode });
+ fstream.once('close', () => next());
+ fstream.once('error', fail);
+ stream.pipe(fstream);
+ });
+ extractor.once('finish', resolve);
+ fs.createReadStream(tarPath).pipe(extractor);
+ });
+};
+
+/**
+ * Override original functionality so we can use a custom marketplace with
+ * either tars or zips.
+ */
+export const enableCustomMarketplace = (): void => {
+ (<any>product).extensionsGallery = { // Use `any` to override readonly.
Switch to new extensions API
2020-02-19 21:36:42 +01:00
+ serviceUrl: process.env.SERVICE_URL || 'https://extensions.coder.com/api',
Implement new structure
2020-02-04 20:27:46 +01:00
+ itemUrl: process.env.ITEM_URL || '',
+ controlUrl: '',
+ recommendationsUrl: '',
+ ...(product.extensionsGallery || {}),
+ };
+
+ const target = vszip as typeof vszip;
+ target.zip = tar;
+ target.extract = extract;
+ target.buffer = buffer;
+};
diff --git a/src/vs/server/node/nls.ts b/src/vs/server/node/nls.ts
new file mode 100644
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 0000000000000000000000000000000000000000..3d428a57d31f29c40f9c3ce45f715b443badf4e9
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/nls.ts
Update locale file location Should make language packs work again.
2020-02-20 19:38:46 +01:00
@@ -0,0 +1,88 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import * as fs from 'fs';
+import * as path from 'path';
+import * as util from 'util';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import * as lp from 'vs/base/node/languagePacks';
+import product from 'vs/platform/product/common/product';
+import { Translations } from 'vs/workbench/services/extensions/common/extensionPoints';
+
+const configurations = new Map<string, Promise<lp.NLSConfiguration>>();
+const metadataPath = path.join(getPathFromAmdModule(require, ''), 'nls.metadata.json');
+
+export const isInternalConfiguration = (config: lp.NLSConfiguration): config is lp.InternalNLSConfiguration => {
+ return config && !!(<lp.InternalNLSConfiguration>config)._languagePackId;
+};
+
+const DefaultConfiguration = {
+ locale: 'en',
+ availableLanguages: {},
+};
+
+export const getNlsConfiguration = async (locale: string, userDataPath: string): Promise<lp.NLSConfiguration> => {
+ const id = `${locale}: ${userDataPath}`;
+ if (!configurations.has(id)) {
+ configurations.set(id, new Promise(async (resolve) => {
+ const config = product.commit && await util.promisify(fs.exists)(metadataPath)
+ ? await lp.getNLSConfiguration(product.commit, userDataPath, metadataPath, locale)
+ : DefaultConfiguration;
+ if (isInternalConfiguration(config)) {
+ config._languagePackSupport = true;
+ }
+ // If the configuration has no results keep trying since code-server
+ // doesn't restart when a language is installed so this result would
+ // persist (the plugin might not be installed yet or something).
+ if (config.locale !== 'en' && config.locale !== 'en-us' && Object.keys(config.availableLanguages).length === 0) {
+ configurations.delete(id);
+ }
+ resolve(config);
+ }));
+ }
+ return configurations.get(id)!;
+};
+
+export const getTranslations = async (locale: string, userDataPath: string): Promise<Translations> => {
+ const config = await getNlsConfiguration(locale, userDataPath);
+ if (isInternalConfiguration(config)) {
+ try {
+ return JSON.parse(await util.promisify(fs.readFile)(config._translationsConfigFile, 'utf8'));
+ } catch (error) { /* Nothing yet. */}
+ }
+ return {};
+};
+
+export const getLocaleFromConfig = async (userDataPath: string): Promise<string> => {
Update locale file location Should make language packs work again.
2020-02-20 19:38:46 +01:00
+ const files = ['locale.json', 'argv.json'];
+ for (let i = 0; i < files.length; ++i) {
+ try {
+ const localeConfigUri = path.join(userDataPath, 'User', files[i]);
+ const content = stripComments(await util.promisify(fs.readFile)(localeConfigUri, 'utf8'));
+ return JSON.parse(content).locale;
+ } catch (error) { /* Ignore. */ }
+ }
+ return 'en';
Implement new structure
2020-02-04 20:27:46 +01:00
+};
+
+// Taken from src/main.js in the main VS Code source.
+const stripComments = (content: string): string => {
+ const regexp = /('(?:[^\\']*(?:\\.)?)*')|('(?:[^\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g;
+
+ return content.replace(regexp, (match, _m1, _m2, m3, m4) => {
+ // Only one of m1, m2, m3, m4 matches
+ if (m3) {
+ // A block comment. Replace with nothing
+ return '';
+ } else if (m4) {
+ // A line comment. If it ends in \r?\n then keep it.
+ const length_1 = m4.length;
+ if (length_1 > 2 && m4[length_1 - 1] === '\n') {
+ return m4[length_1 - 2] === '\r' ? '\r\n' : '\n';
+ }
+ else {
+ return '';
+ }
+ } else {
+ // We match a string
+ return match;
+ }
+ });
+};
diff --git a/src/vs/server/node/protocol.ts b/src/vs/server/node/protocol.ts
new file mode 100644
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 0000000000000000000000000000000000000000..57213f92828fafefcab0e3c401a1e8ede472c9cc
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/protocol.ts
Initiate connection handshake from server This way the connection can be initiated by either side. It looks like sometimes the initial message from the client is lost (it never makes it into the onControlMessage callback) but I'm still not sure why or if that is preventable. Also added a timeout on the server end to clean things up in case the client never responds.
2020-10-30 00:54:18 +01:00
@@ -0,0 +1,91 @@
Add more logging around connections
2020-10-29 20:48:01 +01:00
+import { field } from '@coder/logger';
Implement new structure
2020-02-04 20:27:46 +01:00
+import * as net from 'net';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { PersistentProtocol } from 'vs/base/parts/ipc/common/ipc.net';
+import { NodeSocket, WebSocketNodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
+import { AuthRequest, ConnectionTypeRequest, HandshakeMessage } from 'vs/platform/remote/common/remoteAgentConnection';
Add more logging around connections
2020-10-29 20:48:01 +01:00
+import { logger } from 'vs/server/node/logger';
Implement new structure
2020-02-04 20:27:46 +01:00
+
+export interface SocketOptions {
+ readonly reconnectionToken: string;
+ readonly reconnection: boolean;
+ readonly skipWebSocketFrames: boolean;
+}
+
+export class Protocol extends PersistentProtocol {
+ public constructor(socket: net.Socket, public readonly options: SocketOptions) {
+ super(
+ options.skipWebSocketFrames
+ ? new NodeSocket(socket)
+ : new WebSocketNodeSocket(new NodeSocket(socket)),
+ );
Update VS Code to 1.37.0
2019-08-10 01:50:05 +02:00
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+
+ public getUnderlyingSocket(): net.Socket {
+ const socket = this.getSocket();
+ return socket instanceof NodeSocket
+ ? socket.socket
+ : (socket as WebSocketNodeSocket).socket.socket;
+ }
+
+ /**
+ * Perform a handshake to get a connection request.
+ */
+ public handshake(): Promise<ConnectionTypeRequest> {
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ logger.trace('Protocol handshake', field('token', this.options.reconnectionToken));
Implement new structure
2020-02-04 20:27:46 +01:00
+ return new Promise((resolve, reject) => {
Initiate connection handshake from server This way the connection can be initiated by either side. It looks like sometimes the initial message from the client is lost (it never makes it into the onControlMessage callback) but I'm still not sure why or if that is preventable. Also added a timeout on the server end to clean things up in case the client never responds.
2020-10-30 00:54:18 +01:00
+ const timeout = setTimeout(() => {
+ logger.error('Handshake timed out', field('token', this.options.reconnectionToken));
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ reject(new Error('timed out'));
Initiate connection handshake from server This way the connection can be initiated by either side. It looks like sometimes the initial message from the client is lost (it never makes it into the onControlMessage callback) but I'm still not sure why or if that is preventable. Also added a timeout on the server end to clean things up in case the client never responds.
2020-10-30 00:54:18 +01:00
+ }, 10000); // Matches the client timeout.
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ const handler = this.onControlMessage((rawMessage) => {
+ try {
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ const raw = rawMessage.toString();
+ logger.trace('Protocol message', field('token', this.options.reconnectionToken), field('message', raw));
+ const message = JSON.parse(raw);
Implement new structure
2020-02-04 20:27:46 +01:00
+ switch (message.type) {
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ case 'auth':
+ return this.authenticate(message);
Implement new structure
2020-02-04 20:27:46 +01:00
+ case 'connectionType':
+ handler.dispose();
Initiate connection handshake from server This way the connection can be initiated by either side. It looks like sometimes the initial message from the client is lost (it never makes it into the onControlMessage callback) but I'm still not sure why or if that is preventable. Also added a timeout on the server end to clean things up in case the client never responds.
2020-10-30 00:54:18 +01:00
+ clearTimeout(timeout);
Implement new structure
2020-02-04 20:27:46 +01:00
+ return resolve(message);
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ default:
+ throw new Error('Unrecognized message type');
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+ } catch (error) {
+ handler.dispose();
Initiate connection handshake from server This way the connection can be initiated by either side. It looks like sometimes the initial message from the client is lost (it never makes it into the onControlMessage callback) but I'm still not sure why or if that is preventable. Also added a timeout on the server end to clean things up in case the client never responds.
2020-10-30 00:54:18 +01:00
+ clearTimeout(timeout);
Implement new structure
2020-02-04 20:27:46 +01:00
+ reject(error);
+ }
+ });
Initiate connection handshake from server This way the connection can be initiated by either side. It looks like sometimes the initial message from the client is lost (it never makes it into the onControlMessage callback) but I'm still not sure why or if that is preventable. Also added a timeout on the server end to clean things up in case the client never responds.
2020-10-30 00:54:18 +01:00
+
+ // Kick off the handshake in case we missed the client's opening shot.
+ // TODO: Investigate why that message seems to get lost.
+ this.authenticate();
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
+ });
+ }
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ /**
+ * TODO: This ignores the authentication process entirely for now.
+ */
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ private authenticate(_?: AuthRequest): void {
Implement new structure
2020-02-04 20:27:46 +01:00
+ this.sendMessage({ type: 'sign', data: '' });
+ }
+
+ /**
+ * TODO: implement.
+ */
+ public tunnel(): void {
+ throw new Error('Tunnel is not implemented yet');
+ }
+
+ /**
+ * Send a handshake message. In the case of the extension host, it just sends
+ * back a debug port.
+ */
+ public sendMessage(message: HandshakeMessage | { debugPort?: number } ): void {
+ this.sendControl(VSBuffer.fromString(JSON.stringify(message)));
+ }
+}
diff --git a/src/vs/server/node/server.ts b/src/vs/server/node/server.ts
new file mode 100644
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 0000000000000000000000000000000000000000..5521d51a92d1b1e3469e890bae41277b560d08a2
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/server.ts
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
@@ -0,0 +1,302 @@
Add more logging around connections
2020-10-29 20:48:01 +01:00
+import { field } from '@coder/logger';
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+import * as fs from 'fs';
Implement new structure
2020-02-04 20:27:46 +01:00
+import * as net from 'net';
+import * as path from 'path';
+import { Emitter } from 'vs/base/common/event';
+import { Schemas } from 'vs/base/common/network';
+import { URI } from 'vs/base/common/uri';
+import { getMachineId } from 'vs/base/node/id';
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+import { ClientConnectionEvent, createChannelReceiver, IPCServer, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner';
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+import { main } from 'vs/code/node/cliProcessMain';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
+import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
+import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
+import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
+import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
+import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ExtensionManagementChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
+import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
+import { IFileService } from 'vs/platform/files/common/files';
+import { FileService } from 'vs/platform/files/common/fileService';
+import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
+import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+import { getLogLevel, ILoggerService, ILogService } from 'vs/platform/log/common/log';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { LoggerChannel } from 'vs/platform/log/common/logIpc';
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+import { LoggerService } from 'vs/platform/log/node/loggerService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { SpdLogService } from 'vs/platform/log/node/spdlogService';
+import product from 'vs/platform/product/common/product';
+import { IProductService } from 'vs/platform/product/common/productService';
+import { ConnectionType, ConnectionTypeRequest } from 'vs/platform/remote/common/remoteAgentConnection';
+import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
+import { IRequestService } from 'vs/platform/request/common/request';
+import { RequestChannel } from 'vs/platform/request/common/requestIpc';
+import { RequestService } from 'vs/platform/request/node/requestService';
+import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender';
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+import { combinedAppender, NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
+import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
+import { INodeProxyService, NodeProxyChannel } from 'vs/server/common/nodeProxy';
+import { TelemetryChannel } from 'vs/server/common/telemetry';
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+import { Query, VscodeOptions, WorkbenchOptions } from 'vs/server/ipc';
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+import { ExtensionEnvironmentChannel, FileProviderChannel, NodeProxyService, TerminalProviderChannel } from 'vs/server/node/channel';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { Connection, ExtensionHostConnection, ManagementConnection } from 'vs/server/node/connection';
+import { TelemetryClient } from 'vs/server/node/insights';
Fix VS Code product configuration not loading
2020-02-07 23:37:59 +01:00
+import { logger } from 'vs/server/node/logger';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { getLocaleFromConfig, getNlsConfiguration } from 'vs/server/node/nls';
+import { Protocol } from 'vs/server/node/protocol';
+import { getUriTransformer } from 'vs/server/node/util';
Add new (unimplemented) terminal service
2020-11-13 18:31:01 +01:00
+import { REMOTE_TERMINAL_CHANNEL_NAME } from 'vs/workbench/contrib/terminal/common/remoteTerminalChannel';
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from 'vs/workbench/services/remote/common/remoteAgentFileSystemChannel';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { RemoteExtensionLogFileName } from 'vs/workbench/services/remote/common/remoteAgentService';
+
+export class Vscode {
+ public readonly _onDidClientConnect = new Emitter<ClientConnectionEvent>();
+ public readonly onDidClientConnect = this._onDidClientConnect.event;
+ private readonly ipc = new IPCServer<RemoteAgentConnectionContext>(this.onDidClientConnect);
+
+ private readonly maxExtraOfflineConnections = 0;
+ private readonly connections = new Map<ConnectionType, Map<string, Connection>>();
+
+ private readonly services = new ServiceCollection();
+ private servicesPromise?: Promise<void>;
+
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
+ public async cli(args: NativeParsedArgs): Promise<void> {
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ return main(args);
+ }
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ public async initialize(options: VscodeOptions): Promise<WorkbenchOptions> {
+ const transformer = getUriTransformer(options.remoteAuthority);
+ if (!this.servicesPromise) {
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ this.servicesPromise = this.initializeServices(options.args);
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+ await this.servicesPromise;
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ const environment = this.services.get(IEnvironmentService) as INativeEnvironmentService;
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ const startPath = options.startPath;
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+ const parseUrl = (url: string): URI => {
+ // This might be a fully-specified URL or just a path.
+ try {
+ return URI.parse(url, true);
+ } catch (error) {
+ return URI.from({
+ scheme: Schemas.vscodeRemote,
+ authority: options.remoteAuthority,
+ path: url,
+ });
+ }
+ };
Implement new structure
2020-02-04 20:27:46 +01:00
+ return {
+ workbenchWebConfiguration: {
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+ workspaceUri: startPath && startPath.workspace ? parseUrl(startPath.url) : undefined,
+ folderUri: startPath && !startPath.workspace ? parseUrl(startPath.url) : undefined,
Implement new structure
2020-02-04 20:27:46 +01:00
+ remoteAuthority: options.remoteAuthority,
+ logLevel: getLogLevel(environment),
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ workspaceProvider: {
Add proposed API flag (#2002) Co-authored-by: giddyuptiger <65830808+giddyuptiger@users.noreply.github.com>
2020-08-26 21:18:40 +02:00
+ payload: [
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ ['userDataPath', environment.userDataPath],
+ ['enableProposedApi', JSON.stringify(options.args['enable-proposed-api'] || [])]
Add proposed API flag (#2002) Co-authored-by: giddyuptiger <65830808+giddyuptiger@users.noreply.github.com>
2020-08-26 21:18:40 +02:00
+ ],
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ },
Implement new structure
2020-02-04 20:27:46 +01:00
+ },
+ remoteUserDataUri: transformer.transformOutgoing(URI.file(environment.userDataPath)),
Fix VS Code product configuration not loading
2020-02-07 23:37:59 +01:00
+ productConfiguration: product,
Implement new structure
2020-02-04 20:27:46 +01:00
+ nlsConfiguration: await getNlsConfiguration(environment.args.locale || await getLocaleFromConfig(environment.userDataPath), environment.userDataPath),
Fix VS Code product configuration not loading
2020-02-07 23:37:59 +01:00
+ commit: product.commit || 'development',
Implement new structure
2020-02-04 20:27:46 +01:00
+ };
+ }
+
+ public async handleWebSocket(socket: net.Socket, query: Query): Promise<true> {
+ if (!query.reconnectionToken) {
+ throw new Error('Reconnection token is missing from query parameters');
+ }
+ const protocol = new Protocol(socket, {
+ reconnectionToken: <string>query.reconnectionToken,
+ reconnection: query.reconnection === 'true',
+ skipWebSocketFrames: query.skipWebSocketFrames === 'true',
+ });
+ try {
+ await this.connect(await protocol.handshake(), protocol);
+ } catch (error) {
+ protocol.sendMessage({ type: 'error', reason: error.message });
+ protocol.dispose();
+ protocol.getSocket().dispose();
+ }
+ return true;
+ }
+
+ private async connect(message: ConnectionTypeRequest, protocol: Protocol): Promise<void> {
+ if (product.commit && message.commit !== product.commit) {
Fix VS Code product configuration not loading
2020-02-07 23:37:59 +01:00
+ logger.warn(`Version mismatch (${message.commit} instead of ${product.commit})`);
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+
+ switch (message.desiredConnectionType) {
+ case ConnectionType.ExtensionHost:
+ case ConnectionType.Management:
+ if (!this.connections.has(message.desiredConnectionType)) {
+ this.connections.set(message.desiredConnectionType, new Map());
+ }
+ const connections = this.connections.get(message.desiredConnectionType)!;
+
+ const ok = async () => {
+ return message.desiredConnectionType === ConnectionType.ExtensionHost
+ ? { debugPort: await this.getDebugPort() }
+ : { type: 'ok' };
+ };
+
+ const token = protocol.options.reconnectionToken;
+ if (protocol.options.reconnection && connections.has(token)) {
+ protocol.sendMessage(await ok());
+ const buffer = protocol.readEntireBuffer();
+ protocol.dispose();
+ return connections.get(token)!.reconnect(protocol.getSocket(), buffer);
+ } else if (protocol.options.reconnection || connections.has(token)) {
+ throw new Error(protocol.options.reconnection
+ ? 'Unrecognized reconnection token'
+ : 'Duplicate reconnection token'
+ );
+ }
+
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ logger.debug('New connection', field('token', token));
Implement new structure
2020-02-04 20:27:46 +01:00
+ protocol.sendMessage(await ok());
+
+ let connection: Connection;
+ if (message.desiredConnectionType === ConnectionType.Management) {
+ connection = new ManagementConnection(protocol, token);
+ this._onDidClientConnect.fire({
+ protocol, onDidClientDisconnect: connection.onClose,
+ });
+ // TODO: Need a way to match clients with a connection. For now
+ // dispose everything which only works because no extensions currently
+ // utilize long-running proxies.
+ (this.services.get(INodeProxyService) as NodeProxyService)._onUp.fire();
+ connection.onClose(() => (this.services.get(INodeProxyService) as NodeProxyService)._onDown.fire());
+ } else {
+ const buffer = protocol.readEntireBuffer();
+ connection = new ExtensionHostConnection(
+ message.args ? message.args.language : 'en',
+ protocol, buffer, token,
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ this.services.get(IEnvironmentService) as INativeEnvironmentService,
Implement new structure
2020-02-04 20:27:46 +01:00
+ );
+ }
+ connections.set(token, connection);
Add more logging around connections
2020-10-29 20:48:01 +01:00
+ connection.onClose(() => {
+ logger.debug('Connection closed', field('token', token));
+ connections.delete(token);
+ });
Implement new structure
2020-02-04 20:27:46 +01:00
+ this.disposeOldOfflineConnections(connections);
+ break;
+ case ConnectionType.Tunnel: return protocol.tunnel();
+ default: throw new Error('Unrecognized connection type');
+ }
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+
+ private disposeOldOfflineConnections(connections: Map<string, Connection>): void {
+ const offline = Array.from(connections.values())
+ .filter((connection) => typeof connection.offline !== 'undefined');
+ for (let i = 0, max = offline.length - this.maxExtraOfflineConnections; i < max; ++i) {
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ logger.debug('Disposing offline connection', field('token', offline[i].token));
Implement new structure
2020-02-04 20:27:46 +01:00
+ offline[i].dispose();
+ }
+ }
+
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
+ private async initializeServices(args: NativeParsedArgs): Promise<void> {
+ const environmentService = new NativeEnvironmentService(args);
Initialize config and use correct settings path Fixes #1829.
2020-06-24 18:40:17 +02:00
+ // https://github.com/cdr/code-server/issues/1693
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ fs.mkdirSync(environmentService.globalStorageHome.fsPath, { recursive: true });
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ const logService = new SpdLogService(RemoteExtensionLogFileName, environmentService.logsPath, getLogLevel(environmentService));
+ const fileService = new FileService(logService);
+ fileService.registerProvider(Schemas.file, new DiskFileSystemProvider(logService));
+
+ const piiPaths = [
+ path.join(environmentService.userDataPath, 'clp'), // Language packs.
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ environmentService.appRoot,
Implement new structure
2020-02-04 20:27:46 +01:00
+ environmentService.extensionsPath,
+ environmentService.builtinExtensionsPath,
+ ...environmentService.extraExtensionPaths,
+ ...environmentService.extraBuiltinExtensionPaths,
+ ];
+
+ this.ipc.registerChannel('logger', new LoggerChannel(logService));
+ this.ipc.registerChannel(ExtensionHostDebugBroadcastChannel.ChannelName, new ExtensionHostDebugBroadcastChannel());
+
+ this.services.set(ILogService, logService);
+ this.services.set(IEnvironmentService, environmentService);
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
+ this.services.set(INativeEnvironmentService, environmentService);
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+ this.services.set(ILoggerService, new SyncDescriptor(LoggerService));
Initialize config and use correct settings path Fixes #1829.
2020-06-24 18:40:17 +02:00
+
+ const configurationService = new ConfigurationService(environmentService.settingsResource, fileService);
+ await configurationService.initialize();
+ this.services.set(IConfigurationService, configurationService);
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ this.services.set(IRequestService, new SyncDescriptor(RequestService));
+ this.services.set(IFileService, fileService);
+ this.services.set(IProductService, { _serviceBrand: undefined, ...product });
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+
+ const machineId = await getMachineId();
Implement new structure
2020-02-04 20:27:46 +01:00
+
+ await new Promise((resolve) => {
+ const instantiationService = new InstantiationService(this.services);
+
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+ instantiationService.invokeFunction((accessor) => {
Implement new structure
2020-02-04 20:27:46 +01:00
+ instantiationService.createInstance(LogsDataCleaner);
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+
+ let telemetryService: ITelemetryService;
+ if (!environmentService.disableTelemetry) {
+ telemetryService = new TelemetryService({
+ appender: combinedAppender(
+ new AppInsightsAppender('code-server', null, () => new TelemetryClient() as any),
+ new TelemetryLogAppender(accessor.get(ILoggerService), environmentService)
+ ),
+ sendErrorTelemetry: true,
+ commonProperties: resolveCommonProperties(
+ product.commit, product.version, machineId,
+ [], environmentService.installSourcePath, 'code-server',
+ ),
+ piiPaths,
+ }, configurationService);
+ } else {
+ telemetryService = NullTelemetryService;
+ }
+
+ this.services.set(ITelemetryService, telemetryService);
+
+ this.services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService));
+ this.services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService));
+ this.services.set(ILocalizationsService, new SyncDescriptor(LocalizationsService));
+ this.services.set(INodeProxyService, new SyncDescriptor(NodeProxyService));
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ this.ipc.registerChannel('extensions', new ExtensionManagementChannel(
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+ accessor.get(IExtensionManagementService),
Implement new structure
2020-02-04 20:27:46 +01:00
+ (context) => getUriTransformer(context.remoteAuthority),
+ ));
+ this.ipc.registerChannel('remoteextensionsenvironment', new ExtensionEnvironmentChannel(
+ environmentService, logService, telemetryService, '',
+ ));
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+ this.ipc.registerChannel('request', new RequestChannel(accessor.get(IRequestService)));
Implement new structure
2020-02-04 20:27:46 +01:00
+ this.ipc.registerChannel('telemetry', new TelemetryChannel(telemetryService));
Add new logger service The telemetry service depends on this now. I had to move it into invokeFunction and use accessor.get otherwise getLogger on the service was undefined. I also had to move some the extension management service because it depends on the moved telemetry service. I moved a few other services as well to better match VS Code (sharedProcessMain.ts). I swapped some this.services.get with accessor.get since that seems to be the correct method although for these other services either method seems to work.
2020-11-07 05:49:05 +01:00
+ this.ipc.registerChannel('nodeProxy', new NodeProxyChannel(accessor.get(INodeProxyService)));
+ this.ipc.registerChannel('localizations', <IServerChannel<any>>createChannelReceiver(accessor.get(ILocalizationsService)));
Implement new structure
2020-02-04 20:27:46 +01:00
+ this.ipc.registerChannel(REMOTE_FILE_SYSTEM_CHANNEL_NAME, new FileProviderChannel(environmentService, logService));
Implement most of remote terminal service It works, at least, but there are still some missing parts.
2020-11-17 20:26:07 +01:00
+ this.ipc.registerChannel(REMOTE_TERMINAL_CHANNEL_NAME, new TerminalProviderChannel(logService));
Implement new structure
2020-02-04 20:27:46 +01:00
+ resolve(new ErrorTelemetry(telemetryService));
+ });
+ });
+ }
+
+ /**
+ * TODO: implement.
+ */
+ private async getDebugPort(): Promise<number | undefined> {
+ return undefined;
+ }
+}
diff --git a/src/vs/server/node/util.ts b/src/vs/server/node/util.ts
new file mode 100644
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 0000000000000000000000000000000000000000..d76f655e36647b1c9d38d2f7986f2b78a4bcfb50
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/util.ts
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
@@ -0,0 +1,13 @@
+import { URITransformer } from 'vs/base/common/uriIpc';
Implement new structure
2020-02-04 20:27:46 +01:00
+
+export const getUriTransformer = (remoteAuthority: string): URITransformer => {
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
+ return new URITransformer(remoteAuthority);
Implement new structure
2020-02-04 20:27:46 +01:00
+};
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+
+/**
+ * Encode a path for opening via the folder or workspace query parameter. This
+ * preserves slashes so it can be edited by hand more easily.
+ */
+export const encodePath = (path: string): string => {
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ return path.split('/').map((p) => encodeURIComponent(p)).join('/');
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+};
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index a4df8523631563a498c9ab6e51105074616a481a..f03da094e9080544102bbd3f037a71b348e5bd83 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -61,6 +61,7 @@ import './mainThreadComments';
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
import './mainThreadNotebook';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
import './mainThreadTask';
import './mainThreadLabelService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import 'vs/server/browser/mainThreadNodeProxy';
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
import './mainThreadTunnelService';
import './mainThreadAuthentication';
import './mainThreadTimeline';
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
diff --git a/src/vs/workbench/api/browser/mainThreadStorage.ts b/src/vs/workbench/api/browser/mainThreadStorage.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 57abf0e86a5edeeb2bc497af5e140ec13d9b5810..704d0f9ae19d436a7207ff735aabc289c422dd1e 100644
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
--- a/src/vs/workbench/api/browser/mainThreadStorage.ts
+++ b/src/vs/workbench/api/browser/mainThreadStorage.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -62,11 +62,11 @@ export class MainThreadStorage implements MainThreadStorageShape {
Patch VS Code to wait for storage write (#2049) VS Code has a short delay before writing storage (probably to queue up rapid changes). In the web version of VS Code this happens on the client which means if the page is reloaded before the delay expires the write never happens. Storage updates are already promises so this simply returns the promise returned by the delayer so it won't resolve until the write actually happens. Fixes #2021.
2020-09-03 20:57:46 +02:00
return JSON.parse(jsonValue);
}
- $setValue(shared: boolean, key: string, value: object): Promise<void> {
+ async $setValue(shared: boolean, key: string, value: object): Promise<void> {
let jsonValue: string;
try {
jsonValue = JSON.stringify(value);
- this._storageService.store(key, jsonValue, shared ? StorageScope.GLOBAL : StorageScope.WORKSPACE);
+ await this._storageService.store(key, jsonValue, shared ? StorageScope.GLOBAL : StorageScope.WORKSPACE);
} catch (err) {
return Promise.reject(err);
}
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 284c6aff854a747d1202c34581a1419c35e9654f..f0173d80103ca91b5eab144a10935bc0990119c9 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
@@ -68,6 +68,7 @@ import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransf
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { IExtHostNodeProxy } from 'vs/server/browser/extHostNodeProxy';
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
import { ExtHostTheming } from 'vs/workbench/api/common/extHostTheming';
import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -103,6 +104,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
const extHostStorage = accessor.get(IExtHostStorage);
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
const extensionStoragePaths = accessor.get(IExtensionStoragePaths);
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
const extHostLogService = accessor.get(ILogService);
+ const extHostNodeProxy = accessor.get(IExtHostNodeProxy);
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
const extHostTunnelService = accessor.get(IExtHostTunnelService);
const extHostApiDeprecation = accessor.get(IExtHostApiDeprecationService);
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
const extHostWindow = accessor.get(IExtHostWindow);
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -114,6 +116,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
rpcProtocol.set(ExtHostContext.ExtHostConfiguration, extHostConfiguration);
rpcProtocol.set(ExtHostContext.ExtHostExtensionService, extensionService);
rpcProtocol.set(ExtHostContext.ExtHostStorage, extHostStorage);
+ rpcProtocol.set(ExtHostContext.ExtHostNodeProxy, extHostNodeProxy);
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
rpcProtocol.set(ExtHostContext.ExtHostTunnelService, extHostTunnelService);
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
rpcProtocol.set(ExtHostContext.ExtHostWindow, extHostWindow);
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 77ef6577821399b150407e980c8fd35e9d005ca6..264e3361accec20e4e1eaae10ae8ca05e47b1fae 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -816,6 +816,17 @@ export interface MainThreadLabelServiceShape extends IDisposable {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
$unregisterResourceLabelFormatter(handle: number): void;
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+export interface MainThreadNodeProxyShape extends IDisposable {
+ $send(message: string): void;
Move extension fetch to main thread This makes the fetch work independently of the worker's origin which is no longer the same as the main thread (the main problem is the inability to send cookies without setting SameSite to None).
2020-10-14 23:56:27 +02:00
+ $fetchExtension(extensionUri: UriComponents): Promise<VSBuffer>;
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+}
+export interface ExtHostNodeProxyShape {
+ $onMessage(message: string): void;
+ $onClose(): void;
+ $onDown(): void;
+ $onUp(): void;
+}
+
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
export interface MainThreadSearchShape extends IDisposable {
$registerFileSearchProvider(handle: number, scheme: string): void;
$registerTextSearchProvider(handle: number, scheme: string): void;
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -1796,6 +1807,7 @@ export const MainContext = {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
MainThreadWindow: createMainId<MainThreadWindowShape>('MainThreadWindow'),
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
MainThreadLabelService: createMainId<MainThreadLabelServiceShape>('MainThreadLabelService'),
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
MainThreadNotebook: createMainId<MainThreadNotebookShape>('MainThreadNotebook'),
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ MainThreadNodeProxy: createMainId<MainThreadNodeProxyShape>('MainThreadNodeProxy'),
MainThreadTheming: createMainId<MainThreadThemingShape>('MainThreadTheming'),
MainThreadTunnelService: createMainId<MainThreadTunnelServiceShape>('MainThreadTunnelService'),
MainThreadTimeline: createMainId<MainThreadTimelineShape>('MainThreadTimeline')
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -1838,6 +1850,7 @@ export const ExtHostContext = {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
ExtHostOutputService: createMainId<ExtHostOutputServiceShape>('ExtHostOutputService'),
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
ExtHosLabelService: createMainId<ExtHostLabelServiceShape>('ExtHostLabelService'),
ExtHostNotebook: createMainId<ExtHostNotebookShape>('ExtHostNotebook'),
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ ExtHostNodeProxy: createMainId<ExtHostNodeProxyShape>('ExtHostNodeProxy'),
ExtHostTheming: createMainId<ExtHostThemingShape>('ExtHostTheming'),
ExtHostTunnelService: createMainId<ExtHostTunnelServiceShape>('ExtHostTunnelService'),
ExtHostAuthentication: createMainId<ExtHostAuthenticationShape>('ExtHostAuthentication'),
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 328b9327207e4f2068bfab6cf374c622d8c5fc69..38963843095c9116011665027f46d3fb85c30ff8 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/common/extHostExtensionService.ts
+++ b/src/vs/workbench/api/common/extHostExtensionService.ts
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
@@ -31,6 +31,7 @@ import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitData
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { IExtHostNodeProxy } from 'vs/server/browser/extHostNodeProxy';
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
import { Emitter, Event } from 'vs/base/common/event';
@@ -82,6 +83,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
protected readonly _extHostWorkspace: ExtHostWorkspace;
protected readonly _extHostConfiguration: ExtHostConfiguration;
protected readonly _logService: ILogService;
+ protected readonly _nodeProxy: IExtHostNodeProxy;
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
protected readonly _extHostTunnelService: IExtHostTunnelService;
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
protected readonly _extHostTerminalService: IExtHostTerminalService;
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -114,6 +116,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
@ILogService logService: ILogService,
@IExtHostInitDataService initData: IExtHostInitDataService,
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
@IExtensionStoragePaths storagePath: IExtensionStoragePaths,
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+ @IExtHostNodeProxy nodeProxy: IExtHostNodeProxy,
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
@IExtHostTunnelService extHostTunnelService: IExtHostTunnelService,
@IExtHostTerminalService extHostTerminalService: IExtHostTerminalService
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
) {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -125,6 +128,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
this._extHostWorkspace = extHostWorkspace;
this._extHostConfiguration = extHostConfiguration;
this._logService = logService;
+ this._nodeProxy = nodeProxy;
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
this._extHostTunnelService = extHostTunnelService;
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
this._extHostTerminalService = extHostTerminalService;
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
this._disposables = new DisposableStore();
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -362,7 +366,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup);
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
return Promise.all([
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
- this._loadCommonJSModule<IExtensionModule>(joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder),
+ this._loadCommonJSModule<IExtensionModule>(joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder, !extensionDescription.browser),
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
this._loadExtensionContext(extensionDescription)
]).then(values => {
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
return AbstractExtHostExtensionService._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], activationTimesBuilder);
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -754,7 +758,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
protected abstract _beforeAlmostReadyToRunExtensions(): Promise<void>;
protected abstract _getEntryPoint(extensionDescription: IExtensionDescription): string | undefined;
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
- protected abstract _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ protected abstract _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder, isRemote?: boolean): Promise<T>;
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
public abstract $setRemoteEnvironment(env: { [key: string]: string | null }): Promise<void>;
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
diff --git a/src/vs/workbench/api/node/extHost.node.services.ts b/src/vs/workbench/api/node/extHost.node.services.ts
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index b3c89e51cfc25a53293a352a2a8ad50d5f26d595..e21abe4e13bc25a5b72f556bbfb61085842faeb7 100644
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
--- a/src/vs/workbench/api/node/extHost.node.services.ts
+++ b/src/vs/workbench/api/node/extHost.node.services.ts
@@ -3,6 +3,8 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
+import { IExtHostNodeProxy } from 'vs/server/browser/extHostNodeProxy';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+import { NotImplementedProxy } from 'vs/base/common/types';
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { ExtHostOutputService2 } from 'vs/workbench/api/node/extHostOutputService';
import { ExtHostTerminalService } from 'vs/workbench/api/node/extHostTerminalService';
@@ -36,3 +38,4 @@ registerSingleton(IExtHostSearch, NativeExtHostSearch);
registerSingleton(IExtHostTask, ExtHostTask);
registerSingleton(IExtHostTerminalService, ExtHostTerminalService);
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
registerSingleton(IExtHostTunnelService, ExtHostTunnelService);
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+registerSingleton(IExtHostNodeProxy, class extends NotImplementedProxy<IExtHostNodeProxy>(String(IExtHostNodeProxy)) { whenReady = Promise.resolve(); });
Read most recent socket path from file
2020-09-15 23:51:43 +02:00
diff --git a/src/vs/workbench/api/node/extHostCLIServer.ts b/src/vs/workbench/api/node/extHostCLIServer.ts
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index b3857616f7006127c423dcef7020ae4653da5ff6..594cd75b546a4b845e56122c846f63e29dc5f948 100644
Read most recent socket path from file
2020-09-15 23:51:43 +02:00
--- a/src/vs/workbench/api/node/extHostCLIServer.ts
+++ b/src/vs/workbench/api/node/extHostCLIServer.ts
@@ -11,6 +11,8 @@ import { IWindowOpenable, IOpenWindowOptions } from 'vs/platform/windows/common/
import { URI } from 'vs/base/common/uri';
import { hasWorkspaceFileExtension } from 'vs/platform/workspaces/common/workspaces';
import { ILogService } from 'vs/platform/log/common/log';
+import { join } from 'vs/base/common/path';
+import { tmpdir } from 'os';
export interface OpenCommandPipeArgs {
type: 'open';
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -58,6 +60,11 @@ export class CLIServerBase {
}
Read most recent socket path from file
2020-09-15 23:51:43 +02:00
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
private async setup(): Promise<string> {
Read most recent socket path from file
2020-09-15 23:51:43 +02:00
+ // NOTE@coder: Write this out so we can get the most recent path.
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ fs.promises.writeFile(join(tmpdir(), 'vscode-ipc'), this._ipcHandlePath).catch((error) => {
Read most recent socket path from file
2020-09-15 23:51:43 +02:00
+ this.logService.error(error);
+ });
+
try {
this._server.listen(this.ipcHandlePath);
this._server.on('error', err => this.logService.error(err));
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
diff --git a/src/vs/workbench/api/worker/extHost.worker.services.ts b/src/vs/workbench/api/worker/extHost.worker.services.ts
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 3843fdec386edc09a1d361b63de892a04e0070ed..8aac4df527857e964798362a69f5591bef07c165 100644
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
--- a/src/vs/workbench/api/worker/extHost.worker.services.ts
+++ b/src/vs/workbench/api/worker/extHost.worker.services.ts
@@ -8,6 +8,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
import { ExtHostExtensionService } from 'vs/workbench/api/worker/extHostExtensionService';
import { ExtHostLogService } from 'vs/workbench/api/worker/extHostLogService';
+import { ExtHostNodeProxy, IExtHostNodeProxy } from 'vs/server/browser/extHostNodeProxy';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
// #########################################################################
// ### ###
@@ -17,3 +18,4 @@ import { ExtHostLogService } from 'vs/workbench/api/worker/extHostLogService';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
registerSingleton(IExtHostExtensionService, ExtHostExtensionService);
registerSingleton(ILogService, ExtHostLogService);
+registerSingleton(IExtHostNodeProxy, ExtHostNodeProxy);
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 021af6e0f8983c492f9cdd048ba2dcae7640bc1d..4474a93beba03365709c3cda98b682131ad4745f 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/worker/extHostExtensionService.ts
+++ b/src/vs/workbench/api/worker/extHostExtensionService.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -11,6 +11,7 @@ import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterc
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
Update VS code to 1.49.3 (#2081)
2020-10-07 19:37:37 +02:00
import { ExtensionRuntime } from 'vs/workbench/api/common/extHostTypes';
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
import { timeout } from 'vs/base/common/async';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { loadCommonJSModule } from 'vs/server/browser/worker';
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
class WorkerRequireInterceptor extends RequireInterceptor {
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -46,10 +47,15 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
}
protected _getEntryPoint(extensionDescription: IExtensionDescription): string | undefined {
- return extensionDescription.browser;
+ // NOTE@coder: We can support regular Node modules as well. These will just
+ // require the root of the extension.
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ return extensionDescription.browser || '.';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
}
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
- protected async _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
+ protected async _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder, isRemote?: boolean): Promise<T> {
+ if (isRemote) {
+ return loadCommonJSModule(module, activationTimesBuilder, this._nodeProxy, this._logService, this._fakeModules!.getModule('vscode', module));
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+ }
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
module = module.with({ path: ensureSuffix(module.path, '.js') });
const response = await fetch(module.toString(true));
vscode: Disable go home button See https://github.com/cdr/code-server/issues/2328
2020-11-24 01:06:51 +01:00
diff --git a/src/vs/workbench/browser/actions/navigationActions.ts b/src/vs/workbench/browser/actions/navigationActions.ts
index 7344a3a29b32f7b370b99bf0cfdc79a322195ff8..dc21396e83e2f53914447d3460c2ee1103ecb28e 100644
--- a/src/vs/workbench/browser/actions/navigationActions.ts
+++ b/src/vs/workbench/browser/actions/navigationActions.ts
@@ -310,4 +310,8 @@ actionsRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusNextPart,
actionsRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusPreviousPart, { primary: KeyMod.Shift | KeyCode.F6 }), 'View: Focus Previous Part', CATEGORIES.View.value);
const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
-workbenchRegistry.registerWorkbenchContribution(GoHomeContributor, LifecyclePhase.Ready);
+// See https://github.com/cdr/code-server/issues/2328
+// workbenchRegistry.registerWorkbenchContribution(GoHomeContributor, LifecyclePhase.Ready);
+export const _1 = workbenchRegistry;
+export const _2 = GoHomeContributor;
+export const _3 = LifecyclePhase.Ready;
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index ced2d815834e40a1543e80516472799075980733..dfcae73e8a042307600c67f163aa00ba9e0762f4 100644
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
--- a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
+++ b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
@@ -55,6 +55,10 @@
align-items: center;
justify-content: center;
order: -1;
+
+ /* NOTE@coder: Hide since it doesn't seem to do anything when used with
+ code-server except open the VS Code repository. */
+ display: none !important;
}
.monaco-workbench .activitybar > .content > .home-bar > .home-bar-icon-badge {
Make extension sidebar work
2019-07-10 23:29:15 +02:00
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 80544aab34c12bb42a36519885e9872ef2b24158..17b56856a0b3fd936dbc094ff39797d5b8ccaadf 100644
Make extension sidebar work
2019-07-10 23:29:15 +02:00
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -43,6 +43,7 @@ import { FileLogService } from 'vs/platform/log/common/fileLogService';
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
import { toLocalISOString } from 'vs/base/common/date';
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
import { isWorkspaceToOpen, isFolderToOpen } from 'vs/platform/windows/common/windows';
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { initialize } from 'vs/server/browser/client';
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
import { coalesce } from 'vs/base/common/arrays';
import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -101,6 +102,8 @@ class BrowserMain extends Disposable {
Implement status bar API
2019-09-03 23:38:53 +02:00
// Startup
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
const instantiationService = workbench.startup();
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ await initialize(services.serviceCollection);
+
// Return API Facade
return instantiationService.invokeFunction(accessor => {
const commandService = accessor.get(ICommandService);
Fix schema matching against vscode-remote Fixes #1104.
2019-10-29 17:31:00 +01:00
diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
index 94e7e7a4bac154c45078a1b5034e50634a7a43af..8164200dcef1efbc65b50eef9c270af3ca655fbd 100644
Fix schema matching against vscode-remote Fixes #1104.
2019-10-29 17:31:00 +01:00
--- a/src/vs/workbench/common/resources.ts
+++ b/src/vs/workbench/common/resources.ts
@@ -15,6 +15,7 @@ import { ParsedExpression, IExpression, parse } from 'vs/base/common/glob';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
import { withNullAsUndefined } from 'vs/base/common/types';
+import { Schemas } from 'vs/base/common/network';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Fix schema matching against vscode-remote Fixes #1104.
2019-10-29 17:31:00 +01:00
export class ResourceContextKey extends Disposable implements IContextKey<URI> {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -74,7 +75,8 @@ export class ResourceContextKey extends Disposable implements IContextKey<URI> {
Fix schema matching against vscode-remote Fixes #1104.
2019-10-29 17:31:00 +01:00
if (!ResourceContextKey._uriEquals(this._resourceKey.get(), value)) {
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
this._contextKeyService.bufferChangeEvents(() => {
this._resourceKey.set(value);
- this._schemeKey.set(value ? value.scheme : null);
+ // NOTE@coder: Fixes source control context menus (#1104).
+ this._schemeKey.set(value ? (value.scheme === Schemas.vscodeRemote ? Schemas.file : value.scheme) : null);
this._filenameKey.set(value ? basename(value) : null);
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
this._dirnameKey.set(value ? dirname(value).fsPath : null);
this._pathKey.set(value ? value.fsPath : null);
vscode: Reconnect in the background up to 5 seconds Based on the previous commits by @mgmachado but simplified. I also changed the threshold to error after a single attempt as the connection has likely been borked and the user should be in the know if they couldn't reconnect after 5 seconds. Closes #1791
2020-11-30 19:23:17 +01:00
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
index c6d98b601a3b6966e8a99d2c05b3b7f02b08e6ca..c2a76fbd75d24d509f312cb8bf094eb297374f04 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -778,17 +778,30 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
}
switch (e.type) {
case PersistentConnectionEventType.ConnectionLost:
+ break;
+ case PersistentConnectionEventType.ReconnectionWait:
+ const BACKGROUND_RECONNECT_THRESHOLD = 2;
+ // If the first reconnect fails, we show the popup.
+ // This corresponds to about 5s wait.
+ if (e.connectionAttempt < BACKGROUND_RECONNECT_THRESHOLD) {
+ break;
+ }
+
if (!visibleProgress) {
visibleProgress = showProgress(ProgressLocation.Dialog, [reconnectButton, reloadButton]);
}
visibleProgress.report(nls.localize('connectionLost', "Connection Lost"));
- break;
- case PersistentConnectionEventType.ReconnectionWait:
+
reconnectWaitEvent = e;
visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reconnectButton, reloadButton]);
visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds);
break;
case PersistentConnectionEventType.ReconnectionRunning:
+ if (!visibleProgress) {
+ // Our background reconnection threshold hasn't been hit yet.
+ break;
+ }
+
visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reloadButton]);
visibleProgress.report(nls.localize('reconnectionRunning', "Attempting to reconnect..."));
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 74f6922e98b4bb6a7fb100f5aac015afe9fc171b..3243a97c2d378013d96ffbe87e9df6dd4a66776d 100644
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -149,9 +149,11 @@
Fix highlighted scmviewlet items in Firefox Fixes #1549.
2020-05-01 19:53:44 +02:00
margin-right: 8px;
}
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
-.scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions {
Fix highlighted scmviewlet items in Firefox Fixes #1549.
2020-05-01 19:53:44 +02:00
- flex-grow: 100;
-}
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+/* NOTE@coder: Causes the label to shrink to zero width in Firefox due to
Fix highlighted scmviewlet items in Firefox Fixes #1549.
2020-05-01 19:53:44 +02:00
+ * overflow:hidden. This isn't right anyway, as far as I can tell. */
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+/* .scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions { */
Fix highlighted scmviewlet items in Firefox Fixes #1549.
2020-05-01 19:53:44 +02:00
+/* flex-grow: 100; */
+/* } */
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
.scm-view .monaco-list .monaco-list-row .resource-group > .actions,
.scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions {
vscode: Customize welcome page for code-server - Title/subtitle are now code-server and VS Code version - Added a list of code-server help links
2020-11-24 01:07:35 +01:00
diff --git a/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts b/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts
index 6af6a4b7f42654ec6cc60e0ba5efd376919f3e04..3a8176951628e0b2528aae8796ba684c3ab53d9a 100644
--- a/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts
+++ b/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts
@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { escape } from 'vs/base/common/strings';
+import product from 'vs/platform/product/common/product';
import { localize } from 'vs/nls';
export default () => `
@@ -11,7 +12,7 @@ export default () => `
<div class="welcomePage" role="document">
<div class="title">
<h1 class="caption">${escape(localize('welcomePage.vscode', "Visual Studio Code"))}</h1>
- <p class="subtitle detail">${escape(localize({ key: 'welcomePage.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))}</p>
+ <p class="subtitle detail">VS Code v${product.version}</p>
</div>
<div class="row">
<div class="splash">
@@ -32,6 +33,19 @@ export default () => `
</ul>
<p class="none detail">${escape(localize('welcomePage.noRecentFolders', "No recent folders"))}</p>
</div>
+ <div class="section help">
+ <h2 class="caption">code-server ${escape(localize('welcomePage.help', "Help"))}</h2>
+ <ul>
+ <li><a href="https://github.com/cdr/code-server">GitHub Repository</a></li>
+ <li><a href="https://github.com/cdr/code-server/releases/tag/v${product.codeServerVersion}">Release Notes</a></li>
+ <li><a href="https://github.com/cdr/code-server/issues">Issue Tracker</a></li>
+ <li><a href="https://github.com/cdr/code-server/blob/master/doc/FAQ.md">FAQ</a></li>
+ <li><a href="https://github.com/cdr/code-server/blob/master/doc/guide.md">Setup Guide</a></li>
+ <li><a href="https://github.com/cdr/code-server/tree/master/doc">Docs</a></li>
+ <li><a href="https://github.com/cdr/code-server/discussions">Discussions</a></li>
+ <li><a href="https://cdr.co/join-community">Slack</a></li>
+ </ul>
+ </div>
<div class="section help">
<h2 class="caption">${escape(localize('welcomePage.help', "Help"))}</h2>
<ul>
diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
index 738ce140c1af76ee0017c59cc883578e966f5348..80833b7023ed5795bb3de303b54ec08d9dab9b94 100644
--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
+++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
@@ -94,7 +94,7 @@
}
.monaco-workbench .part.editor > .content .welcomePage .splash .section {
- margin-bottom: 5em;
+ margin-bottom: 3em;
}
.monaco-workbench .part.editor > .content .welcomePage .splash ul {
diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
vscode: Add missing semicolons See #2359
2020-11-24 18:47:58 +01:00
index 4a61a79fe447e2aa238af568791bff1e0cec4d29..69cc2e4331a3b04d05d79632920f5c5bbfa924e8 100644
vscode: Customize welcome page for code-server - Title/subtitle are now code-server and VS Code version - Added a list of code-server help links
2020-11-24 01:07:35 +01:00
--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
+++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
@@ -328,7 +328,7 @@ class WelcomePage extends Disposable {
const prodName = container.querySelector('.welcomePage .title .caption') as HTMLElement;
if (prodName) {
- prodName.textContent = this.productService.nameLong;
vscode: Add missing semicolons See #2359
2020-11-24 18:47:58 +01:00
+ prodName.textContent = `code-server v${this.productService.codeServerVersion}`;
vscode: Customize welcome page for code-server - Title/subtitle are now code-server and VS Code version - Added a list of code-server help links
2020-11-24 01:07:35 +01:00
}
recentlyOpened.then(({ workspaces }) => {
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
diff --git a/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts b/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index ed4f26407391bd62219a9f8245a5cd63a7cb7488..92f26d1b082f80475cf76409a4569e948e9e0bd9 100644
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
--- a/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts
+++ b/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -130,6 +130,8 @@ export class SimpleNativeWorkbenchEnvironmentService implements INativeWorkbench
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
extensionsPath?: string | undefined;
extensionsDownloadPath: string = undefined!;
builtinExtensionsPath: string = undefined!;
+ extraExtensionPaths: string[] = undefined!;
+ extraBuiltinExtensionPaths: string[] = undefined!;
driverHandle?: string | undefined;
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
diff --git a/src/vs/workbench/services/dialogs/browser/dialogService.ts b/src/vs/workbench/services/dialogs/browser/dialogService.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 85d83f37da179a1e39266cf72a02e971f590308e..0659738b36df1747c9afcabf8d9abf26c890990b 100644
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
--- a/src/vs/workbench/services/dialogs/browser/dialogService.ts
+++ b/src/vs/workbench/services/dialogs/browser/dialogService.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -125,11 +125,12 @@ export class DialogService implements IDialogService {
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
async about(): Promise<void> {
const detailString = (useAgo: boolean): string => {
return nls.localize('aboutDetail',
- "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
+ "code-server: v{4}\n VS Code: v{0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
this.productService.version || 'Unknown',
this.productService.commit || 'Unknown',
this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',
- navigator.userAgent
+ navigator.userAgent,
+ this.productService.codeServerVersion || 'Unknown',
);
};
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index a8d43045ecc8cbe04b3f8440cff16d42aadbcad0..d051473515e35b331672b780109bd40229153c8c 100644
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
Use file system for settings and fix data home path It's possible that using browser storage makes more sense with settings sync, so we might want to revisit this once/if we get settings sync working. As it currently is though, browser storage just causes jank. The path was also missing a `User` at the end so I added that. This might affect the Vim extension which would have been writing to the wrong path previously but I don't believe it should affect anything else since they would have been writing to browser storage. - Fixes #2208 - Fixes #2231 - Fixes #2279 - Fixes #2274
2020-11-20 20:47:58 +01:00
@@ -119,8 +119,25 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@memoize
get logFile(): URI { return joinPath(this.options.logsPath, 'window.log'); }
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Use file system for settings and fix data home path It's possible that using browser storage makes more sense with settings sync, so we might want to revisit this once/if we get settings sync working. As it currently is though, browser storage just causes jank. The path was also missing a `User` at the end so I added that. This might affect the Vim extension which would have been writing to the wrong path previously but I don't believe it should affect anything else since they would have been writing to browser storage. - Fixes #2208 - Fixes #2231 - Fixes #2279 - Fixes #2274
2020-11-20 20:47:58 +01:00
+ // NOTE@coder: Use the same path in // ../../../../platform/environment/node/environmentService.ts
+ // and don't use the user data scheme. This solves two problems:
+ // 1. Extensions running in the browser (like Vim) might use these paths
+ // directly instead of using the file service and most likely can't write
+ // to `/User` on disk.
+ // 2. Settings will be stored in the file system instead of in browser
+ // storage. Using browser storage makes sharing or seeding settings
+ // between browsers difficult. We may want to revisit this once/if we get
+ // settings sync.
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@memoize
- get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.userData }); }
Use file system for settings and fix data home path It's possible that using browser storage makes more sense with settings sync, so we might want to revisit this once/if we get settings sync working. As it currently is though, browser storage just causes jank. The path was also missing a `User` at the end so I added that. This might affect the Vim extension which would have been writing to the wrong path previously but I don't believe it should affect anything else since they would have been writing to browser storage. - Fixes #2208 - Fixes #2231 - Fixes #2279 - Fixes #2274
2020-11-20 20:47:58 +01:00
+ get userRoamingDataHome(): URI { return joinPath(URI.file(this.userDataPath).with({ scheme: Schemas.vscodeRemote }), 'User'); }
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ @memoize
+ get userDataPath(): string {
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ const dataPath = this.payload?.get('userDataPath');
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ if (!dataPath) {
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ throw new Error('userDataPath was not provided to environment service');
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ }
+ return dataPath;
+ }
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@memoize
get settingsResource(): URI { return joinPath(this.userRoamingDataHome, 'settings.json'); }
Use file system for settings and fix data home path It's possible that using browser storage makes more sense with settings sync, so we might want to revisit this once/if we get settings sync working. As it currently is though, browser storage just causes jank. The path was also missing a `User` at the end so I added that. This might affect the Vim extension which would have been writing to the wrong path previously but I don't believe it should affect anything else since they would have been writing to browser storage. - Fixes #2208 - Fixes #2231 - Fixes #2279 - Fixes #2274
2020-11-20 20:47:58 +01:00
@@ -301,7 +318,12 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
Add proposed API flag (#2002) Co-authored-by: giddyuptiger <65830808+giddyuptiger@users.noreply.github.com>
2020-08-26 21:18:40 +02:00
extensionHostDebugEnvironment.params.port = parseInt(value);
break;
case 'enableProposedApi':
- extensionHostDebugEnvironment.extensionEnabledProposedApi = [];
+ try {
+ extensionHostDebugEnvironment.extensionEnabledProposedApi = JSON.parse(value);
+ } catch (error) {
+ console.error(error);
+ extensionHostDebugEnvironment.extensionEnabledProposedApi = [];
+ }
break;
}
}
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index 50d4d812b76f09435fcff8148aac4ceeaeb30873..faacf88fcef119f9f959739656d64a84c8f64cbf 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -221,7 +221,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
Allow extensions of any kind This enables vscode-icons among others.
2020-04-29 00:08:43 +02:00
}
}
}
- return true;
+ return false; // NOTE@coder: Don't disable anything by extensionKind.
}
return false;
}
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index de7e301d3f0c67ce662827f61427a5a7b3616b9f..877ea8e11e6e6d34b9a8fe16287af309e569285e 100644
Allow extensions of any kind This enables vscode-icons among others.
2020-04-29 00:08:43 +02:00
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -251,7 +251,9 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
Fix language packs (#2058) * Fix incorrect nls.json fetch When moving this out of the HTML I didn't remove {{BASE}}. * Fix language package installation Updates #2046.
2020-09-04 17:10:40 +02:00
// Install Language pack on all servers
if (isLanguagePackExtension(manifest)) {
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
- servers.push(...this.servers);
+ // NOTE@coder: It does not appear language packs can be installed on the web
+ // extension management server at this time. Filter out the web to fix this.
+ servers.push(...this.servers.filter(s => s !== this.extensionManagementServerService.webExtensionManagementServer));
} else {
const server = this.getExtensionManagementServerToInstall(manifest);
if (server) {
@@ -320,6 +322,11 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
return this.extensionManagementServerService.webExtensionManagementServer;
Allow extensions of any kind This enables vscode-icons among others.
2020-04-29 00:08:43 +02:00
}
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ // NOTE@coder: Fall back to installing on the remote server.
+ if (this.extensionManagementServerService.remoteExtensionManagementServer) {
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
+ return this.extensionManagementServerService.remoteExtensionManagementServer;
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ }
+
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
return undefined;
}
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
index 1dff19bf177eff24f722b748b79835a653241c4d..01ce9bc00cc39c27e75db006425c359f813a4719 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/services/extensions/browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionService.ts
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
@@ -87,7 +87,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
if (code === ExtensionHostExitCode.StartTimeout10s) {
this._notificationService.prompt(
Severity.Error,
- nls.localize('extensionService.startTimeout', "The Web Worker Extension Host did not start in 10s."),
+ nls.localize('extensionService.startTimeout', 'The Web Worker Extension Host did not start in 10s.'),
[]
);
return;
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -177,8 +177,10 @@ export class ExtensionService extends AbstractExtensionService implements IExten
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
this._remoteAgentService.getEnvironment(),
this._remoteAgentService.scanExtensions()
]);
- localExtensions = this._checkEnabledAndProposedAPI(localExtensions);
remoteExtensions = this._checkEnabledAndProposedAPI(remoteExtensions);
+ // NOTE@coder: Include remotely hosted extensions that should run locally.
+ localExtensions = this._checkEnabledAndProposedAPI(localExtensions)
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
+ .concat(remoteExtensions.filter(ext => !ext.browser && ext.extensionKind && (ext.extensionKind === 'web' || ext.extensionKind.includes('web'))));
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
const remoteAgentConnection = this._remoteAgentService.getConnection();
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
this._runningLocation = this._runningLocationClassifier.determineRunningLocation(localExtensions, remoteExtensions);
vscode: Make eslint pass I disabled code-layering and code-import-patterns as I don't think we can make them easily pass as we reference all sorts of code from both browser and node files. At least not worth the headache now to refactor everything.
2020-11-27 14:17:19 +01:00
@@ -188,7 +190,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
const result = this._registry.deltaExtensions(remoteExtensions.concat(localExtensions), []);
if (result.removedDueToLooping.length > 0) {
- this._logOrShowMessage(Severity.Error, nls.localize('looping', "The following extensions contain dependency loops and have been disabled: {0}", result.removedDueToLooping.map(e => `'${e.identifier.value}'`).join(', ')));
+ this._logOrShowMessage(Severity.Error, nls.localize('looping', 'The following extensions contain dependency loops and have been disabled: {0}', result.removedDueToLooping.map(e => `'${e.identifier.value}'`).join(', ')));
}
if (remoteEnv && remoteAgentConnection) {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/services/extensions/common/extensionsUtil.ts b/src/vs/workbench/services/extensions/common/extensionsUtil.ts
Use --full-index for patch This should eliminate potential noise in the diffs for the patch since different versions seem to default to different hash lengths.
2020-09-03 21:32:29 +02:00
index 65e532ee58dfc06ed944846d01b885cb8f260ebc..0b6282fde7ad03c7ea9872a777cbf487253abed1 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/services/extensions/common/extensionsUtil.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsUtil.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -37,7 +37,8 @@ export function canExecuteOnWorkspace(manifest: IExtensionManifest, productServi
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
export function canExecuteOnWeb(manifest: IExtensionManifest, productService: IProductService, configurationService: IConfigurationService): boolean {
const extensionKind = getExtensionKind(manifest, productService, configurationService);
- return extensionKind.some(kind => kind === 'web');
Implement new structure
2020-02-04 20:27:46 +01:00
+ // NOTE@coder: Hardcode vim for now.
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
+ return extensionKind.some(kind => kind === 'web') || manifest.name === 'vim';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
export function getExtensionKind(manifest: IExtensionManifest, productService: IProductService, configurationService: IConfigurationService): ExtensionKind[] {
Make extension host reconnect
2019-09-10 01:44:17 +02:00
diff --git a/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts b/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index e39d131fe7b1dd4bd1093fedb8faba8e1fe969e8..94f2f1d7c4a0b3cb46eaaffe1181b3abbf997d7f 100644
Make extension host reconnect
2019-09-10 01:44:17 +02:00
--- a/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
+++ b/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
@@ -16,7 +16,7 @@ import { IInitData } from 'vs/workbench/api/common/extHost.protocol';
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
import { MessageType, createMessageOfType, isMessageOfType, IExtHostSocketMessage, IExtHostReadyMessage, IExtHostReduceGraceTimeMessage, ExtensionHostExitCode } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
import { ExtensionHostMain, IExitFn } from 'vs/workbench/services/extensions/common/extensionHostMain';
import { VSBuffer } from 'vs/base/common/buffer';
-import { IURITransformer, URITransformer, IRawURITransformer } from 'vs/base/common/uriIpc';
+import { IURITransformer, URITransformer } from 'vs/base/common/uriIpc';
import { exists } from 'vs/base/node/pfs';
import { realpath } from 'vs/base/node/extpath';
import { IHostUtils } from 'vs/workbench/api/common/extHostExtensionService';
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@@ -57,12 +57,13 @@ const args = minimist(process.argv.slice(2), {
Fix extensions that try to load from node_modules.asar Should allow manual installation of bracket pair colorizer 2: #544.
2019-09-13 20:07:50 +02:00
const Module = require.__$__nodeRequire('module') as any;
const originalLoad = Module._load;
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Fix extensions that try to load from node_modules.asar Should allow manual installation of bracket pair colorizer 2: #544.
2019-09-13 20:07:50 +02:00
- Module._load = function (request: string) {
+ Module._load = function (request: string, parent: object, isMain: boolean) {
if (request === 'natives') {
throw new Error('Either the extension or a NPM dependency is using the "natives" node module which is unsupported as it can cause a crash of the extension host. Click [here](https://go.microsoft.com/fwlink/?linkid=871887) to find out more');
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Fix extensions that try to load from node_modules.asar Should allow manual installation of bracket pair colorizer 2: #544.
2019-09-13 20:07:50 +02:00
- return originalLoad.apply(this, arguments);
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ // NOTE@coder: Map node_module.asar requests to regular node_modules.
Fix extensions that try to load from node_modules.asar Should allow manual installation of bracket pair colorizer 2: #544.
2019-09-13 20:07:50 +02:00
+ return originalLoad.apply(this, [request.replace(/node_modules\.asar(\.unpacked)?/, 'node_modules'), parent, isMain]);
};
})();
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@@ -135,8 +136,11 @@ function _createExtHostProtocol(): Promise<PersistentProtocol> {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
// Wait for rich client to reconnect
protocol.onSocketClose(() => {
- // The socket has closed, let's give the renderer a certain amount of time to reconnect
- disconnectRunner1.schedule();
+ // NOTE@coder: Inform the server so we can manage offline
+ // connections there instead. Our goal is to persist connections
+ // forever (to a reasonable point) to account for things like
+ // hibernating overnight.
+ process.send!({ type: 'VSCODE_EXTHOST_DISCONNECTED' });
});
Make extension host reconnect
2019-09-10 01:44:17 +02:00
}
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
}
Update VS Code to 1.48.0 (#1982)
2020-08-25 20:06:41 +02:00
@@ -313,11 +317,9 @@ export async function startExtensionHostProcess(): Promise<void> {
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
// Attempt to load uri transformer
let uriTransformer: IURITransformer | null = null;
- if (initData.remote.authority && args.uriTransformerPath) {
+ if (initData.remote.authority) {
try {
- const rawURITransformerFactory = <any>require.__$__nodeRequire(args.uriTransformerPath);
- const rawURITransformer = <IRawURITransformer>rawURITransformerFactory(initData.remote.authority);
- uriTransformer = new URITransformer(rawURITransformer);
+ uriTransformer = new URITransformer(initData.remote.authority);
} catch (e) {
console.error(e);
}
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
index b39a5cbb9eadbc046144d2e76d26a9b0e950ddaa..3b4cc7274e149ee10dba0dbbb09cf25939091f4b 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
+++ b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -15,7 +15,11 @@
Implement new structure
2020-02-04 20:27:46 +01:00
require.config({
baseUrl: monacoBaseUrl,
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
catchError: true,
- createTrustedScriptURL: (value: string) => value
+ createTrustedScriptURL: (value: string) => value,
Implement new structure
2020-02-04 20:27:46 +01:00
+ paths: {
Fix worker require paths when behind proxy
2020-03-03 00:44:16 +01:00
+ '@coder/node-browser': `../node_modules/@coder/node-browser/out/client/client.js`,
+ '@coder/requirefs': `../node_modules/@coder/requirefs/out/requirefs.js`,
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
});
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
require(['vs/workbench/services/extensions/worker/extensionHostWorker'], () => { }, err => console.error(err));
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
diff --git a/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts b/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
index d7aefde89c74bc6096d6e66c45368c8582594efa..9758f3bb96b48603251336e6a64e270ee89744f0 100644
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
--- a/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
+++ b/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
@@ -5,8 +5,8 @@
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
import { createChannelSender } from 'vs/base/parts/ipc/common/ipc';
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.50.0 - The .js build files are no longer committed so they're gone. - ParsedArgs and EnvironmentService are now NativeParsedArgs and NativeEnvironmentService. - Interface for environment service was moved. - getPathFromAmdModule was deprecated.
2020-10-12 22:34:54 +02:00
// @ts-ignore: interface is implemented via proxy
export class LocalizationsService implements ILocalizationsService {
@@ -14,9 +14,9 @@ export class LocalizationsService implements ILocalizationsService {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
declare readonly _serviceBrand: undefined;
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
constructor(
- @ISharedProcessService sharedProcessService: ISharedProcessService,
+ @IRemoteAgentService remoteAgentService: IRemoteAgentService,
) {
- return createChannelSender<ILocalizationsService>(sharedProcessService.getChannel('localizations'));
+ return createChannelSender<ILocalizationsService>(remoteAgentService.getConnection()!.getChannel('localizations'));
}
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Make extension sidebar work
2019-07-10 23:29:15 +02:00
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index 509f8ac8ce3a689386e439302a53c27e4fdfcef7..2bf9a737bd0dbfa1e604acfc890be45823f02ebe 100644
Make extension sidebar work
2019-07-10 23:29:15 +02:00
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -35,7 +35,8 @@ import 'vs/workbench/services/textfile/browser/browserTextFileService';
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
import 'vs/workbench/services/keybinding/browser/keymapService';
import 'vs/workbench/services/extensions/browser/extensionService';
import 'vs/workbench/services/extensionManagement/common/extensionManagementServerService';
Update VS Code to 1.37.0
2019-08-10 01:50:05 +02:00
-import 'vs/workbench/services/telemetry/browser/telemetryService';
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+// NOTE@coder: We send it all to the server side to be processed there instead.
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
+// import 'vs/workbench/services/telemetry/browser/telemetryService';
Update VS Code to 1.37.0
2019-08-10 01:50:05 +02:00
import 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
import 'vs/workbench/services/credentials/browser/credentialsService';
import 'vs/workbench/services/url/browser/urlService';
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/yarn.lock b/yarn.lock
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
index ff358cb6a10984868ed5a5aed5729ac6eb8ebeb7..69668d95ecad219da26ccc4d837913b9324a0e28 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/yarn.lock
+++ b/yarn.lock
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
@@ -140,6 +140,23 @@
lodash "^4.17.13"
Implement new structure
2020-02-04 20:27:46 +01:00
to-fast-properties "^2.0.0"
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+"@coder/logger@^1.1.12":
+ version "1.1.12"
+ resolved "https://registry.yarnpkg.com/@coder/logger/-/logger-1.1.12.tgz#def113b7183abc35a8da2b57f0929f7e9626f4e0"
+ integrity sha512-oM0j3lTVPqApUm3e0bKKcXpfAiJEys31fgEfQlHmvEA13ujsC4zDuXnt0uzDtph48eMoNRLOF/EE4mNShVJKVw==
Implement new structure
2020-02-04 20:27:46 +01:00
+
+"@coder/node-browser@^1.0.8":
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/@coder/node-browser/-/node-browser-1.0.8.tgz#c22f581b089ad7d95ad1362fd351c57b7fbc6e70"
+ integrity sha512-NLF9sYMRCN9WK1C224pHax1Cay3qKypg25BhVg7VfNbo3Cpa3daata8RF/rT8JK3lPsu8PmFgDRQjzGC9X1Lrw==
+
Compress when sending client-side extension tars
2020-02-28 21:25:28 +01:00
+"@coder/requirefs@^1.1.5":
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/@coder/requirefs/-/requirefs-1.1.5.tgz#259db370d563a79a96fb150bc9d69c7db6edc9fb"
+ integrity sha512-3jB47OFCql9+9FI6Vc4YX0cfFnG5rxBfrZUH45S4XYtYGOz+/Xl4h4d2iMk50b7veHkeSWGlB4VHC3UZ16zuYQ==
Implement new structure
2020-02-04 20:27:46 +01:00
+ optionalDependencies:
+ jszip "2.6.0"
+
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
"@electron/get@^1.0.1":
version "1.7.2"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.7.2.tgz#286436a9fb56ff1a1fcdf0e80131fd65f4d1e0fd"
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -5403,6 +5420,13 @@ jsprim@^1.2.2:
Implement new structure
2020-02-04 20:27:46 +01:00
json-schema "0.2.3"
verror "1.10.0"
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
+jszip@2.6.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/jszip/-/jszip-2.6.0.tgz#7fb3e9c2f11c8a9840612db5dabbc8cf3a7534b7"
+ integrity sha1-f7PpwvEciphAYS212rvIzzp1NLc=
+ dependencies:
+ pako "~1.0.0"
+
just-debounce@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea"
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -5983,26 +6007,11 @@ minimatch@0.3:
Force minimist update
2020-07-23 20:00:38 +02:00
dependencies:
brace-expansion "^1.1.7"
-minimist@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
- integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.2.5:
+minimist@0.0.8, minimist@^1.2.0, minimist@^1.2.5, minimist@~0.0.1:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-minimist@~0.0.1:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
- integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-
minipass@^2.2.1, minipass@^2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
Update VS Code to 1.51.1
2020-11-07 05:47:51 +01:00
@@ -6744,6 +6753,11 @@ p-try@^2.0.0:
Implement new structure
2020-02-04 20:27:46 +01:00
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
+pako@~1.0.0:
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+ integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
Implement new structure
2020-02-04 20:27:46 +01:00
+
pako@~1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
Copy Permalink