mirror of
https://github.com/coder/code-server.git
synced 2026-10-31 02:37:34 +08:00
* chore: update Code to 1.67 Was able to remove our changes to common/webview.ts since they are upstream now. Other than that no serious changes, just context diffs. * chore: update Code to 1.68 - Upstream moved the web socket endpoint so change the Express route from / to *. That will let web sockets work at any endpoint. - Everything in the workbench config is basically the same but de-indented (upstream extracted it into a separate object which resulted in a de-indent), the ordering is slightly different, and instead of vscodeBase we now need vscodeBase + this._staticRoute since everything is served from a sub-path now. - Move manifest link back to the root since that is where we host our manifest. - Change RemoteAuthoritiesImpl to use the same path building method as in other places (+ instead of using URI.parse/join). - Use existing host/port in RemoteAuthoritiesImpl and BrowserSocketFactory instead of patching them to use window.location (these are set from window.location to begin with so it should be the same result but with less patching). - Since BrowserSocketFactory includes a sub-path now (endpoints were changed upstream to serve from /quality/commit instead of from the root) the patch there has changed to prepend the base to that path (instead of using the base directly). - The workbench HTML now natively supports a base URL in the form of WORKBENCH_WEB_BASE_URL so no need for VS_BASE patches there anymore. - Upstream added type="image/x-icon" so I did as well. - Move the language patch to the end of the series so it is easier to eventually remove. - Remove the existing NLS config in favor of one that supports extensions. - Upstream deleted webview main.js and inlined it into the HTML so move that code (the parent origin check) into both those HTML files (index.html and index-no-csp.html). - The remaining diff is from changes to the surrounding context or a line was changed slightly by upstream (for example renamed files or new arguments like to the remote authority resolver). * fix: modify product.json before building Code injects this into the client during the build process so it needs to be updated before we build. * fix: update inline script nonces * Update HTML base path test * fix: missing commit Code overrides it with nothing. The date is also already injected. * fix: web extensions breaking when the commit changes By just using the marketplace directly instead of going through the backend. I am not sure what the point is when searching extensions already goes directly to the marketplace anyway. But also remove the prefix that breaks this as well because otherwise existing installations will break.
183 lines
5.9 KiB
TypeScript
183 lines
5.9 KiB
TypeScript
import { logger } from "@coder/logger"
|
|
import * as express from "express"
|
|
import * as http from "http"
|
|
import * as net from "net"
|
|
import * as path from "path"
|
|
import { WebsocketRequest } from "../../../typings/pluginapi"
|
|
import { logError } from "../../common/util"
|
|
import { CodeArgs, toCodeArgs } from "../cli"
|
|
import { isDevMode } from "../constants"
|
|
import { authenticated, ensureAuthenticated, redirect, replaceTemplates, self } from "../http"
|
|
import { SocketProxyProvider } from "../socket"
|
|
import { isFile, loadAMDModule } from "../util"
|
|
import { Router as WsRouter } from "../wsRouter"
|
|
|
|
/**
|
|
* This is the API of Code's web client server. code-server delegates requests
|
|
* to Code here.
|
|
*/
|
|
export interface IServerAPI {
|
|
handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise<void>
|
|
handleUpgrade(req: http.IncomingMessage, socket: net.Socket): void
|
|
handleServerError(err: Error): void
|
|
dispose(): void
|
|
}
|
|
|
|
// Types for ../../../lib/vscode/src/vs/server/node/server.main.ts:72.
|
|
export type CreateServer = (address: string | net.AddressInfo | null, args: CodeArgs) => Promise<IServerAPI>
|
|
|
|
export class CodeServerRouteWrapper {
|
|
/** Assigned in `ensureCodeServerLoaded` */
|
|
private _codeServerMain!: IServerAPI
|
|
private _wsRouterWrapper = WsRouter()
|
|
private _socketProxyProvider = new SocketProxyProvider()
|
|
public router = express.Router()
|
|
|
|
public get wsRouter() {
|
|
return this._wsRouterWrapper.router
|
|
}
|
|
|
|
//#region Route Handlers
|
|
|
|
private manifest: express.Handler = async (req, res, next) => {
|
|
res.writeHead(200, { "Content-Type": "application/manifest+json" })
|
|
|
|
return res.end(
|
|
replaceTemplates(
|
|
req,
|
|
JSON.stringify(
|
|
{
|
|
name: "code-server",
|
|
short_name: "code-server",
|
|
start_url: ".",
|
|
display: "fullscreen",
|
|
description: "Run Code on a remote server.",
|
|
icons: [192, 512].map((size) => ({
|
|
src: `{{BASE}}/_static/src/browser/media/pwa-icon-${size}.png`,
|
|
type: "image/png",
|
|
sizes: `${size}x${size}`,
|
|
})),
|
|
},
|
|
null,
|
|
2,
|
|
),
|
|
),
|
|
)
|
|
}
|
|
|
|
private $root: express.Handler = async (req, res, next) => {
|
|
const isAuthenticated = await authenticated(req)
|
|
const NO_FOLDER_OR_WORKSPACE_QUERY = !req.query.folder && !req.query.workspace
|
|
// Ew means the workspace was closed so clear the last folder/workspace.
|
|
const FOLDER_OR_WORKSPACE_WAS_CLOSED = req.query.ew
|
|
|
|
if (!isAuthenticated) {
|
|
const to = self(req)
|
|
return redirect(req, res, "login", {
|
|
to: to !== "/" ? to : undefined,
|
|
})
|
|
}
|
|
|
|
if (NO_FOLDER_OR_WORKSPACE_QUERY && !FOLDER_OR_WORKSPACE_WAS_CLOSED) {
|
|
const settings = await req.settings.read()
|
|
const lastOpened = settings.query || {}
|
|
// This flag disables the last opened behavior
|
|
const IGNORE_LAST_OPENED = req.args["ignore-last-opened"]
|
|
const HAS_LAST_OPENED_FOLDER_OR_WORKSPACE = lastOpened.folder || lastOpened.workspace
|
|
const HAS_FOLDER_OR_WORKSPACE_FROM_CLI = req.args._.length > 0
|
|
const to = self(req)
|
|
|
|
let folder = undefined
|
|
let workspace = undefined
|
|
|
|
// Redirect to the last folder/workspace if nothing else is opened.
|
|
if (HAS_LAST_OPENED_FOLDER_OR_WORKSPACE && !IGNORE_LAST_OPENED) {
|
|
folder = lastOpened.folder
|
|
workspace = lastOpened.workspace
|
|
} else if (HAS_FOLDER_OR_WORKSPACE_FROM_CLI) {
|
|
const lastEntry = path.resolve(req.args._[req.args._.length - 1])
|
|
const entryIsFile = await isFile(lastEntry)
|
|
const IS_WORKSPACE_FILE = entryIsFile && path.extname(lastEntry) === ".code-workspace"
|
|
|
|
if (IS_WORKSPACE_FILE) {
|
|
workspace = lastEntry
|
|
} else if (!entryIsFile) {
|
|
folder = lastEntry
|
|
}
|
|
}
|
|
|
|
if (folder || workspace) {
|
|
return redirect(req, res, to, {
|
|
folder,
|
|
workspace,
|
|
})
|
|
}
|
|
}
|
|
|
|
// Store the query parameters so we can use them on the next load. This
|
|
// also allows users to create functionality around query parameters.
|
|
await req.settings.write({ query: req.query })
|
|
|
|
next()
|
|
}
|
|
|
|
private $proxyRequest: express.Handler = async (req, res, next) => {
|
|
this._codeServerMain.handleRequest(req, res)
|
|
}
|
|
|
|
private $proxyWebsocket = async (req: WebsocketRequest) => {
|
|
const wrappedSocket = await this._socketProxyProvider.createProxy(req.ws)
|
|
this._codeServerMain.handleUpgrade(req, wrappedSocket)
|
|
|
|
req.ws.resume()
|
|
}
|
|
|
|
//#endregion
|
|
|
|
/**
|
|
* Fetches a code server instance asynchronously to avoid an initial memory overhead.
|
|
*/
|
|
private ensureCodeServerLoaded: express.Handler = async (req, _res, next) => {
|
|
if (this._codeServerMain) {
|
|
// Already loaded...
|
|
return next()
|
|
}
|
|
|
|
// Create the server...
|
|
|
|
const { args } = req
|
|
|
|
// See ../../../lib/vscode/src/vs/server/node/server.main.ts:72.
|
|
const createVSServer = await loadAMDModule<CreateServer>("vs/server/node/server.main", "createServer")
|
|
|
|
try {
|
|
this._codeServerMain = await createVSServer(null, {
|
|
...(await toCodeArgs(args)),
|
|
// TODO: Make the browser helper script work.
|
|
"without-connection-token": true,
|
|
"without-browser-env-var": true,
|
|
})
|
|
} catch (error) {
|
|
logError(logger, "CodeServerRouteWrapper", error)
|
|
if (isDevMode) {
|
|
return next(new Error((error instanceof Error ? error.message : error) + " (VS Code may still be compiling)"))
|
|
}
|
|
return next(error)
|
|
}
|
|
|
|
return next()
|
|
}
|
|
|
|
constructor() {
|
|
this.router.get("/", this.ensureCodeServerLoaded, this.$root)
|
|
this.router.get(/manifest.json$/, this.manifest)
|
|
this.router.all("*", ensureAuthenticated, this.ensureCodeServerLoaded, this.$proxyRequest)
|
|
this._wsRouterWrapper.ws("*", ensureAuthenticated, this.ensureCodeServerLoaded, this.$proxyWebsocket)
|
|
}
|
|
|
|
dispose() {
|
|
this._codeServerMain?.dispose()
|
|
this._socketProxyProvider.stop()
|
|
}
|
|
}
|