Add server #2

GirlBossRush · 2021-08-05T14:34:44Z

WIP

This PR cleans up much of our server protocol logic to use upstream’s existing IPC behaviors. Previously, we would translate WebSockets into a child process socket which behaves more consistently with the Electron approach to server communication. However, upstream has since made a more generic protocol interface which connect directly with a WebSocket.

Development usage

Open 4 terminals and run the following commands:

# Client watcher
yarn watch-client

# Web extensions watcher
yarn watch-web

# Start front-end server
yarn web

# Start back-end server
node out/cli.js --server localhost:8082 some_file_path

TODO

Document upstream’s usage of VSBuffer and how we parse message payloads
Move new interfaces to their respective files
Clean up debug code
Update our files to match upstream’s linter
Touch up CLI experience

jsjoeio · 2021-08-05T19:07:28Z

This is a huge PR but I will review soon!

jsjoeio

Great work @TeffenEllis!

I think the hardest part is knowing what you added compared to what was already there. Feel free to dismiss most things that are not related to things you changed.

Most comments are questions or nits.

I'm not going to approve since I think @code-asher should really be the one to approve since he has the most context on everything VSCode-related in code-server.

Overall though, super thankful you're tackling this and can't wait to be using this instead of the subtree we currently have 🙏

jsjoeio · 2021-08-06T23:15:00Z

.eslintignore

@@ -16,3 +16,4 @@
 **/extensions/markdown-language-features/notebook-out/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
 **/extensions/**/dist/**
+


❓ Intentional?

jsjoeio · 2021-08-06T23:15:34Z

.eslintrc.json

@@ -825,10 +825,12 @@
 				"target": "**/vs/server/**",
 				"restrictions": [
 					"vs/nls",
+					"**/vs/code/**/{common,server,browser,node,electron-sandbox,electron-browser}/**",


❓ Why do we add these two entries in here?

jsjoeio · 2021-08-06T23:16:47Z

.vscode/settings.json

+	"typescript.format.insertSpaceAfterConstructor": false,
+	"javascript.format.insertSpaceAfterConstructor": false,
+	"javascript.format.insertSpaceBeforeFunctionParenthesis": false,
+	"typescript.format.insertSpaceBeforeFunctionParenthesis": false,
+	"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
+	"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,


❓Guessing you didn't add this, but do we know why we do this?

jsjoeio · 2021-08-06T23:18:00Z

build/gulpfile.reh.js

+	// NOTE@coder: Fix version due to .yarnrc removal.
+	return process.versions.node;


❓This seems like a temp fix. Should we open an issue to fix later?

jsjoeio · 2021-08-06T23:20:51Z

build/lib/extensions.ts

@@ -67,7 +67,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


jsjoeio · 2021-08-06T23:45:08Z

src/vs/server/protocol.ts

+// export const createSocketWrapper = (netSocket: net.Socket, { skipWebSocketFrames, permessageDeflate, inflateBytes }: ServerProtocolOptions): ISocket => {
+// const nodeSocket = new NodeSocket(netSocket);
+// if (skipWebSocketFrames) {
+// 	return nodeSocket;
+// }
+
+// return new WebSocketNodeSocket(
+// 	nodeSocket,
+// 	permessageDeflate || false,
+// 	inflateBytes || null,
+// 	// Always record inflate bytes if using permessage-deflate.
+// 	permessageDeflate || false,
+// );
+// };


jsjoeio · 2021-08-06T23:45:24Z

src/vs/server/protocol.ts

+			// Kick off the handshake in case we missed the client's opening shot.
+			// TODO: Investigate why that message seems to get lost.


Add follow-up issue?

jsjoeio · 2021-08-06T23:46:58Z

src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts

+					$('p', { style: 'margin-bottom: 0; display: flex; align-items: center' },
+						$('span', { class: 'codicon codicon-warning', style: 'margin-right: 2px; color: #C4A103' }),
+						'WARNING'),
+					$('p', { style: 'margin-top: 0; margin-bottom: 4px' },
+						'These extensions are not official. Find additional open-source extensions ',
+						$('a', { style: `color: ${linkColor}`, href: 'https://open-vsx.org/', target: '_blank' }, 'here'),
+						'. See ',
+						$('a', { style: `color: ${linkColor}`, href: 'https://github.com/cdr/code-server/blob/master/docs/FAQ.md#differences-compared-to-vs-code', target: '_blank' }, 'docs'),
+						'.'


this looks super janky but is that because it's jQuery? 😂

jsjoeio · 2021-08-06T23:48:42Z

src/vs/base/common/ipc.d.ts

+// export interface Args {
+// 	'user-data-dir'?: string
+
+// 	'enable-proposed-api'?: string[]
+// 	'extensions-dir'?: string
+// 	'builtin-extensions-dir'?: string
+// 	'extra-extensions-dir'?: string[]
+// 	'extra-builtin-extensions-dir'?: string[]
+// 	'ignore-last-opened'?: boolean
+
+// 	locale?: string
+
+// 	log?: string
+// 	verbose?: boolean
+
+// 	_: string[]
+// }


jsjoeio · 2021-08-06T23:48:48Z

src/vs/base/common/ipc.d.ts

+export interface OptionsMessage {
+	id: string
+	type: 'options'
+	// options: WorkbenchOptions


jsjoeio

Nice work fixing the .yarnrc notes!

Looks really good - I'm getting excited!

jsjoeio · 2021-08-09T22:31:18Z

src/vs/server/entry.ts

@@ -68,17 +44,15 @@ export async function main(args: ServerArgs) {
 		let query = new URLSearchParams();

 		if (request.url) {
+			// TODO use `socket.remoteAddress`


Not sure if this is our todo or theres? (entry is our file right?)

Suggested change

// TODO use `socket.remoteAddress`

// TODO@coder use `socket.remoteAddress`

jsjoeio · 2021-08-10T18:22:34Z

src/vs/server/server.ts

+// import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+// import { ExtensionService } from 'vs/workbench/services/extensions/browser/extensionService';


Should we remove?

Fix issues surrounding IPC interfaces. Update names. Fix spacing. Add missing property. Flesh out web socket cleanup. Flesh out web socket migration. WIP. Fix issues surrounding web socket frames. Touch up. Combine web command with server. Allow JS interop. Fix issues surrounding built in extensions. WIP Fix issues surrounding net socket lifecycle, and frequent restarts. Clean up socket lifecycle. Remove unused socket wrappers. Fix issues where logger is defined before ready. Clean up extension lifecycle.

GirlBossRush · 2021-10-01T15:18:09Z

Resolved in coder/code-server#4010

Updating Fork

GirlBossRush self-assigned this Aug 5, 2021

GirlBossRush added the enhancement New feature or request label Aug 5, 2021

GirlBossRush requested review from jsjoeio, code-asher and oxy August 5, 2021 14:34

GirlBossRush mentioned this pull request Aug 5, 2021

Move vendored VScode to separate fork coder/code-server#3835

Closed

4 tasks

jsjoeio reviewed Aug 6, 2021

View reviewed changes

jsjoeio reviewed Aug 9, 2021

View reviewed changes

jsjoeio reviewed Aug 10, 2021

View reviewed changes

GirlBossRush force-pushed the 1.58.2-server branch from dd3adc1 to a5c23aa Compare August 12, 2021 17:05

GirlBossRush force-pushed the 1.58.2-server branch from 558335d to 61f19b7 Compare August 19, 2021 21:30

GirlBossRush force-pushed the 1.58.2-server branch from 61f19b7 to 572311e Compare August 19, 2021 21:36

GirlBossRush mentioned this pull request Aug 21, 2021

Clean up and refactor VSCode integration coder/code-server#4010

Merged

GirlBossRush closed this Oct 1, 2021

GirlBossRush deleted the 1.58.2-server branch October 1, 2021 15:18

GirlBossRush pushed a commit that referenced this pull request Nov 19, 2021

Merge pull request #2 from microsoft/main

093353c

Updating Fork

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add server #2

Add server #2

GirlBossRush commented Aug 5, 2021

jsjoeio commented Aug 5, 2021

jsjoeio left a comment

jsjoeio Aug 6, 2021

jsjoeio Aug 6, 2021

jsjoeio Aug 6, 2021

jsjoeio Aug 6, 2021

jsjoeio Aug 6, 2021

jsjoeio Aug 6, 2021

jsjoeio Aug 6, 2021

jsjoeio Aug 6, 2021

jsjoeio Aug 6, 2021

jsjoeio Aug 6, 2021

jsjoeio left a comment

jsjoeio Aug 9, 2021

jsjoeio Aug 10, 2021

GirlBossRush commented Oct 1, 2021

		// NOTE@coder: Fix version due to .yarnrc removal.
		return process.versions.node;

		// Kick off the handshake in case we missed the client's opening shot.
		// TODO: Investigate why that message seems to get lost.

	// TODO use `socket.remoteAddress`
	// TODO@coder use `socket.remoteAddress`

		// import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
		// import { ExtensionService } from 'vs/workbench/services/extensions/browser/extensionService';

Add server #2

Add server #2

Conversation

GirlBossRush commented Aug 5, 2021

Development usage

TODO

jsjoeio commented Aug 5, 2021

jsjoeio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jsjoeio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GirlBossRush commented Oct 1, 2021