Commit e90c633

committed

Add local route handler.

1 parent 97bd72d commit e90c633Copy full SHA for e90c633

File tree

+42

-17

lines changed

+42

-17

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ export interface Args extends VsArgs {`
`53`	`53`	`"new-window"?: boolean`
`54`	`54`
`55`	`55`	`link?: OptionalString`
	`56`	`+ "local-directory"?: OptionalString`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`interface Option<T> {`
`@@ -179,6 +180,10 @@ const options: Options<Required<Args>> = {`
`179`	`180`	`,
`180`	`181`	`beta: true,`
`181`	`182`	`},`
	`183`	`+ "local-directory": {`
	`184`	`+ type: OptionalString,`
	`185`	`+ description: "Serve files from a given directory",`
	`186`	`+ },`
`182`	`187`	`}`
`183`	`188`
`184`	`189`	`export const optionDescriptions = (): string[] => {`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import { plural } from "../../common/util"`
`12`	`12`	`import { AuthType, DefaultedArgs } from "../cli"`
`13`	`13`	`import { rootPath } from "../constants"`
`14`	`14`	`import { Heart } from "../heart"`
`15`		`-import { commonTemplateVars } from "../http"`
	`15`	`+import { commonTemplateVars,ensureAuthenticated } from "../http"`
`16`	`16`	`import { loadPlugins } from "../plugin"`
`17`	`17`	`import * as domainProxy from "../proxy"`
`18`	`18`	`import { getMediaMime, paths } from "../util"`
`@@ -118,6 +118,16 @@ export const register = async (`
`118`	`118`
`119`	`119`	`app.use("/", _static.router)`
`120`	`120`
	`121`	`+ if (args["local-directory"]?.value) {`
	`122`	`+ const directoryPath = path.resolve(args["local-directory"].value)`
	`123`	+ logger.info(`Serving files from local directory "${directoryPath}" at "/local"`)
	`124`	`+`
	`125`	`+ const localDirectoryRouter = express.Router()`
	`126`	`+ _static.createServeDirectoryHandler(localDirectoryRouter, "/local", directoryPath)`
	`127`	`+`
	`128`	`+ app.use(ensureAuthenticated, localDirectoryRouter)`
	`129`	`+ }`
	`130`	`+`
`121`	`131`	`app.use("/update", update.router)`
`122`	`132`
`123`	`133`	`await loadPlugins(app, args)`

Lines changed: 22 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,34 @@`
`1`		`-import { Router, static as createStaticRouteHandler } from "express"`
	`1`	`+import { Router, static as serveStatic } from "express"`
`2`	`2`	`import { resolve } from "path"`
	`3`	`+import { ServeStaticOptions } from "serve-static"`
`3`	`4`	`import { commit, rootPath } from "../constants"`
`4`	`5`
`5`	`6`	`export const router = Router()`
`6`	`7`
	`8`	`+export const createDefaultStaticRouteHandlerOptions = (): ServeStaticOptions => ({`
	`9`	`+ cacheControl: commit !== "development",`
	`10`	`+})`
	`11`	`+`
	`12`	`+export const createServeDirectoryHandler = (`
	`13`	`+ router: Router,`
	`14`	`+ publicRoute: string,`
	`15`	`+ directoryPath: string,`
	`16`	`+ options: ServeStaticOptions = {},`
	`17`	`+): void => {`
	`18`	`+ router.use(`
	`19`	`+ publicRoute,`
	`20`	`+ serveStatic(directoryPath, {`
	`21`	`+ ...createDefaultStaticRouteHandlerOptions(),`
	`22`	`+ ...options,`
	`23`	`+ }),`
	`24`	`+ )`
	`25`	`+}`
	`26`	`+`
`7`	`27`	`const staticPaths: Record<string, string> = {`
`8`	`28`	`"/static": "dist",`
`9`	`29`	`"/static/media": "src/browser/public/media",`
`10`	`30`	`}`
`11`	`31`
`12`	`32`	`for (const [publicRoute, sourcePath] of Object.entries(staticPaths)) {`
`13`		`- router.use(`
`14`		`- publicRoute,`
`15`		`- createStaticRouteHandler(resolve(rootPath, sourcePath), {`
`16`		`- index: false,`
`17`		`- cacheControl: commit !== "development",`
`18`		`- }),`
`19`		`- )`
	`33`	`+ createServeDirectoryHandler(router, publicRoute, resolve(rootPath, sourcePath), { index: false })`
`20`	`34`	`}`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { field, logger } from "@coder/logger"`
`2`	`2`	`import * as crypto from "crypto"`
`3`		`-import { RequestHandler, Router,staticascreateStaticRouteHandler } from "express"`
	`3`	`+import { RequestHandler, Router } from "express"`
`4`	`4`	`import { promises as fs } from "fs"`
`5`	`5`	`import * as path from "path"`
`6`	`6`	`import { resolve } from "path"`
`@@ -15,6 +15,7 @@ import { authenticated, commonTemplateVars, ensureAuthenticated, redirect } from`
`15`	`15`	`import { getMediaMime, pathToFsPath } from "../util"`
`16`	`16`	`import { VscodeProvider } from "../vscode"`
`17`	`17`	`import { Router as WsRouter } from "../wsRouter"`
	`18`	`+import { createServeDirectoryHandler } from "./static"`
`18`	`19`
`19`	`20`	`export const router = Router()`
`20`	`21`
`@@ -103,13 +104,8 @@ wsRouter.ws("/", ensureAuthenticated, async (req) => {`
`103`	`104`	`)`
`104`	`105`	`await vscode.sendWebsocket(req.ws, req.query)`
`105`	`106`	`})`
`106`		`-router.use(`
`107`		`- "/lib",`
`108`		`- createStaticRouteHandler(resolve(rootPath, "lib"), {`
`109`		`- index: false,`
`110`		`- cacheControl: commit !== "development",`
`111`		`- }),`
`112`		`-)`
	`107`	`+`
	`108`	`+createServeDirectoryHandler(router, "/lib", resolve(rootPath, "lib"))`
`113`	`109`
`114`	`110`	`interface TarHandlerQueryParams extends ParsedQs {`
`115`	`111`	`filePath?: string \| string[]`

Comments

(0)