Skip to content

Commit c05f7d4

Browse files
committed
Update route handlers to better reflect fallback behavior.
1 parent f3f2e04 commit c05f7d4

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

src/node/routes/errors.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { rootPath } from "../constants"
88
import { replaceTemplates } from "../http"
99
import { getMediaMime } from "../util"
1010

11-
const notFoundCodes = ["ENOENT", "EISDIR", "FileNotFound"]
11+
const notFoundCodes = ["ENOENT", "EISDIR"]
1212
export const errorHandler: express.ErrorRequestHandler = async (err, req, res, next) => {
1313
if (notFoundCodes.includes(err.code)) {
1414
err.status = HttpCode.NotFound

src/node/routes/vscode.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,19 @@ export const createVSServerRouter = async (args: DefaultedArgs): Promise<VSServe
6262
})
6363

6464
router.all("*", ensureAuthenticated, (req, res, next) => {
65-
req.on("error", (error) => errorHandler(error, req, res, next))
65+
req.on("error", (error: any) => {
66+
if (error.code === "FileNotFound") {
67+
next()
68+
}
69+
70+
errorHandler(error, req, res, next)
71+
})
6672

6773
codeServerMain.handleRequest(req, res)
6874
})
6975

7076
wsRouter.ws("/", ensureAuthenticated, (req) => {
7177
codeServerMain.handleUpgrade(req, req.socket)
72-
// netServer.emit("upgrade", req, req.socket, req.head)
7378

7479
req.socket.resume()
7580
})

vendor/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"postinstall": "./postinstall.sh"
88
},
99
"devDependencies": {
10-
"code-oss-dev": "cdr/vscode#3fc885904886003d88d1f300d6158bee486f644f"
10+
"code-oss-dev": "cdr/vscode#b3a1bf472c2f08f772cb675dcd43014063d03570"
1111
}
1212
}

vendor/yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,9 @@ clone-response@^1.0.2:
296296
dependencies:
297297
mimic-response "^1.0.0"
298298

299-
code-oss-dev@cdr/vscode#3fc885904886003d88d1f300d6158bee486f644f:
299+
code-oss-dev@cdr/vscode#b3a1bf472c2f08f772cb675dcd43014063d03570:
300300
version "1.61.1"
301-
resolved "https://codeload.github.com/cdr/vscode/tar.gz/3fc885904886003d88d1f300d6158bee486f644f"
301+
resolved "https://codeload.github.com/cdr/vscode/tar.gz/b3a1bf472c2f08f772cb675dcd43014063d03570"
302302
dependencies:
303303
"@microsoft/applicationinsights-web" "^2.6.4"
304304
"@vscode/sqlite3" "4.0.12"

0 commit comments

Comments
 (0)