1b60ef418c
* Flesh out fixes to align with upstream. * Update route handlers to better reflect fallback behavior. * Add platform to vscode-reh-web task Our strategy has been to build once and then recompile native modules for individual platforms. It looks like VS Code builds from scratch for each platform. But we can target any platform, grab the pre-packaged folder, then continue with own packaging. In the future we may want to rework to match upstream. * Fix issue where workspace args are not parsed. * Fix issues surrounding opening files within code-server's terminal. * Readd parent wrapper for hot reload. * Allow more errors. * Fix issues surrounding Coder link. * Add dir creation and fix cli It seems VS Code explodes when certain directories do not exist so import the reh agent instead of the server component since it creates the directories (require patching thus the VS Code update). Also the CLI (for installing extensions) did not seem to be working so point that to the same place since it also exports a function for running that part of the CLI. * Remove hardcoded VSCODE_DEV=1 This causes VS Code to use the development HTML file. Move this to the watch command instead. I deleted the other stuff before it as well since in the latest main.js they do not have this code so I figure we should be safe to omit it. * Fix mismatching commit between client and server * Mostly restore command-line parity Restore most everything and remove the added server arguments. This will let us add and remove options after later so we can contain the number of breaking changes. To accomplish this a hard separation is added between the CLI arguments and the server arguments. The separation between user-provided arguments and arguments with defaults is also made more clear. The extra directory flags have been left out as they were buggy and should be implemented upstream although I think there are better solutions anyway. locale and install-source are unsupported with the web remote and are left removed. It is unclear whether they were used before anyway. Some restored flags still need to have their behavior re-implemented. * Fix static endpoint not emitting 404s This fixes the last failing unit test. Fix a missing dependency, add some generic reverse proxy support for the protocol, and add back a missing nfpm fix. * Import missing logError * Fix 403 errors * Add code-server version to about dialog * Use user settings to disable welcome page The workspace setting seems to be recognized but if so it is having no effect. * Update VS Code cache step with new build directories Co-authored-by: Asher <ash@coder.com>
119 lines
3.3 KiB
TypeScript
119 lines
3.3 KiB
TypeScript
import { logger } from "@coder/logger"
|
|
import * as express from "express"
|
|
import * as fs from "fs"
|
|
import * as path from "path"
|
|
import { HttpCode } from "../../../src/common/http"
|
|
import { AuthType } from "../../../src/node/cli"
|
|
import { codeServer, PluginAPI } from "../../../src/node/plugin"
|
|
import * as apps from "../../../src/node/routes/apps"
|
|
import * as httpserver from "../../utils/httpserver"
|
|
const fsp = fs.promises
|
|
|
|
// Jest overrides `require` so our usual override doesn't work.
|
|
jest.mock("code-server", () => codeServer, { virtual: true })
|
|
|
|
/**
|
|
* Use $LOG_LEVEL=debug to see debug logs.
|
|
*/
|
|
describe("plugin", () => {
|
|
let papi: PluginAPI
|
|
let s: httpserver.HttpServer
|
|
|
|
beforeAll(async () => {
|
|
// Only include the test plugin to avoid contaminating results with other
|
|
// plugins that might be on the filesystem.
|
|
papi = new PluginAPI(logger, `${path.resolve(__dirname, "test-plugin")}:meow`, "")
|
|
await papi.loadPlugins(false)
|
|
|
|
const app = express.default()
|
|
const wsApp = express.default()
|
|
|
|
const common: express.RequestHandler = (req, _, next) => {
|
|
// Routes might use these arguments.
|
|
req.args = {
|
|
_: [],
|
|
auth: AuthType.None,
|
|
host: "localhost",
|
|
port: 8080,
|
|
"proxy-domain": [],
|
|
config: "~/.config/code-server/config.yaml",
|
|
verbose: false,
|
|
usingEnvPassword: false,
|
|
usingEnvHashedPassword: false,
|
|
"extensions-dir": "",
|
|
"user-data-dir": "",
|
|
workspace: "",
|
|
folder: "",
|
|
}
|
|
next()
|
|
}
|
|
|
|
app.use(common)
|
|
wsApp.use(common)
|
|
|
|
papi.mount(app, wsApp)
|
|
app.use("/api/applications", apps.router(papi))
|
|
|
|
s = new httpserver.HttpServer()
|
|
await s.listen(app)
|
|
s.listenUpgrade(wsApp)
|
|
})
|
|
|
|
afterAll(async () => {
|
|
await s.dispose()
|
|
})
|
|
|
|
it("/api/applications", async () => {
|
|
const resp = await s.fetch("/api/applications")
|
|
expect(resp.status).toBe(200)
|
|
const body = await resp.json()
|
|
logger.debug(`${JSON.stringify(body)}`)
|
|
expect(body).toStrictEqual([
|
|
{
|
|
name: "Test App",
|
|
version: "4.0.0",
|
|
|
|
description: "This app does XYZ.",
|
|
iconPath: "/test-plugin/test-app/icon.svg",
|
|
homepageURL: "https://example.com",
|
|
path: "/test-plugin/test-app",
|
|
|
|
plugin: {
|
|
name: "test-plugin",
|
|
version: "1.0.0",
|
|
modulePath: path.join(__dirname, "test-plugin"),
|
|
|
|
displayName: "Test Plugin",
|
|
description: "Plugin used in code-server tests.",
|
|
routerPath: "/test-plugin",
|
|
homepageURL: "https://example.com",
|
|
},
|
|
},
|
|
])
|
|
})
|
|
|
|
it("/test-plugin/test-app", async () => {
|
|
const indexHTML = await fsp.readFile(path.join(__dirname, "test-plugin/public/index.html"), {
|
|
encoding: "utf8",
|
|
})
|
|
const resp = await s.fetch("/test-plugin/test-app")
|
|
expect(resp.status).toBe(200)
|
|
const body = await resp.text()
|
|
expect(body).toBe(indexHTML)
|
|
})
|
|
|
|
it("/test-plugin/test-app (websocket)", async () => {
|
|
const ws = s.ws("/test-plugin/test-app")
|
|
const message = await new Promise((resolve) => {
|
|
ws.once("message", (message) => resolve(message))
|
|
})
|
|
ws.terminate()
|
|
expect(message).toBe("hello")
|
|
})
|
|
|
|
it("/test-plugin/error", async () => {
|
|
const resp = await s.fetch("/test-plugin/error")
|
|
expect(resp.status).toBe(HttpCode.LargePayload)
|
|
})
|
|
})
|