OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Merge pull request #2773 from cdr/upgrade-vscode-1.53

Browse Source 
feat(vscode): update to version 1.53.2
This commit is contained in:
Joe Previte
2021-03-05 14:03:10 -07:00
committed by GitHub
parent 5f42112269 e47eabf375
commit 925073db31
1916 changed files with 84281 additions and 66671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/browser/pages/vscode.html
View File

@ -3,8 +3,7 @@
<html>
<head>
<script>
globalThis.MonacoPerformanceMarks = globalThis.MonacoPerformanceMarks || []
globalThis.MonacoPerformanceMarks.push("renderer/started", Date.now())
performance.mark("code/didStartRenderer")
</script>
<meta charset="utf-8" />
@ -44,7 +43,7 @@
<script data-cfasync="false" src="{{CS_STATIC_BASE}}/dist/register.js"></script>
<script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/loader.js"></script>
<script>
globalThis.MonacoPerformanceMarks.push("willLoadWorkbenchMain", Date.now())
performance.mark("code/willLoadWorkbenchMain")
</script>
<!-- PROD_ONLY
<script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/workbench/workbench.web.api.nls.js"></script>

5
src/node/routes/vscode.ts
View File

@ -207,5 +207,8 @@ wsRouter.ws("/", ensureAuthenticated, async (req) => {
`Sec-WebSocket-Accept: ${reply}`,
].join("\r\n") + "\r\n\r\n",
)
await vscode.sendWebsocket(req.ws, req.query)
// TODO: Parse this header properly. Currently unused so haven't bothered.
const extensions = req.headers["sec-websocket-extensions"]
const permessageDeflate = extensions ? extensions.includes("permessage-deflate") : false
await vscode.sendWebsocket(req.ws, req.query, permessageDeflate)
})

4
src/node/vscode.ts
View File

@ -120,12 +120,12 @@ export class VscodeProvider {
/**
* VS Code expects a raw socket. It will handle all the web socket frames.
*/
public async sendWebsocket(socket: net.Socket, query: ipc.Query): Promise<void> {
public async sendWebsocket(socket: net.Socket, query: ipc.Query, permessageDeflate: boolean): Promise<void> {
const vscode = await this._vscode
// TLS sockets cannot be transferred to child processes so we need an
// in-between. Non-TLS sockets will be returned as-is.
const socketProxy = await this.socketProvider.createProxy(socket)
this.send({ type: "socket", query }, vscode, socketProxy)
this.send({ type: "socket", query, permessageDeflate }, vscode, socketProxy)
}
private send(message: ipc.CodeServerMessage, vscode?: cp.ChildProcess, socket?: net.Socket): void {