Skip to content

Commit 253cf1c

Browse files
committed
Remove unnecessary return types
1 parent f6a5eaa commit 253cf1c

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

src/node/app/api.ts

+3-7
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export class ApiHttpProvider extends HttpProvider {
9393
request: http.IncomingMessage,
9494
socket: net.Socket,
9595
head: Buffer,
96-
): Promise<true> {
96+
): Promise<void> {
9797
if (!this.authenticated(request)) {
9898
throw new Error("not authenticated")
9999
}
@@ -107,7 +107,7 @@ export class ApiHttpProvider extends HttpProvider {
107107
throw new HttpError("Not found", HttpCode.NotFound)
108108
}
109109

110-
private async handleStatusSocket(request: http.IncomingMessage, socket: net.Socket, head: Buffer): Promise<true> {
110+
private async handleStatusSocket(request: http.IncomingMessage, socket: net.Socket, head: Buffer): Promise<void> {
111111
const getMessageResponse = async (event: "health"): Promise<ServerMessage> => {
112112
switch (event) {
113113
case "health":
@@ -134,8 +134,6 @@ export class ApiHttpProvider extends HttpProvider {
134134
resolve()
135135
})
136136
})
137-
138-
return true
139137
}
140138

141139
/**
@@ -146,7 +144,7 @@ export class ApiHttpProvider extends HttpProvider {
146144
request: http.IncomingMessage,
147145
socket: net.Socket,
148146
head: Buffer,
149-
): Promise<true> {
147+
): Promise<void> {
150148
const sessionId = route.requestPath.replace(/^\//, "")
151149
logger.debug("connecting session", field("sessionId", sessionId))
152150
const ws = await new Promise<WebSocket>((resolve, reject) => {
@@ -177,8 +175,6 @@ export class ApiHttpProvider extends HttpProvider {
177175
}),
178176
),
179177
)
180-
181-
return true
182178
}
183179

184180
/**

src/node/app/vscode.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export class VscodeHttpProvider extends HttpProvider {
8989
return this._vscode
9090
}
9191

92-
public async handleWebSocket(route: Route, request: http.IncomingMessage, socket: net.Socket): Promise<true> {
92+
public async handleWebSocket(route: Route, request: http.IncomingMessage, socket: net.Socket): Promise<void> {
9393
if (!this.authenticated(request)) {
9494
throw new Error("not authenticated")
9595
}
@@ -113,7 +113,6 @@ export class VscodeHttpProvider extends HttpProvider {
113113

114114
const vscode = await this._vscode
115115
this.send({ type: "socket", query: route.query }, vscode, socket)
116-
return true
117116
}
118117

119118
private send(message: CodeServerMessage, vscode?: cp.ChildProcess, socket?: net.Socket): void {

src/node/http.ts

+3-10
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,14 @@ export abstract class HttpProvider {
147147
_socket: net.Socket,
148148
_head: Buffer,
149149
/* eslint-enable @typescript-eslint/no-unused-vars */
150-
): Promise<true | undefined> {
150+
): Promise<void> {
151151
throw new HttpError("Not found", HttpCode.NotFound)
152152
}
153153

154154
/**
155155
* Handle requests to the registered endpoint.
156156
*/
157-
public abstract handleRequest(route: Route, request: http.IncomingMessage): Promise<HttpResponse | undefined>
157+
public abstract handleRequest(route: Route, request: http.IncomingMessage): Promise<HttpResponse>
158158

159159
/**
160160
* Get the base relative to the provided route. For each slash we need to go
@@ -529,9 +529,6 @@ export class HttpServer {
529529
const route = this.parseUrl(request)
530530
try {
531531
const payload = this.maybeRedirect(request, route) || (await route.provider.handleRequest(route, request))
532-
if (!payload) {
533-
throw new HttpError("Not found", HttpCode.NotFound)
534-
}
535532
response.writeHead(payload.redirect ? HttpCode.Redirect : payload.code || HttpCode.Ok, {
536533
"Content-Type": payload.mime || getMediaMime(payload.filePath),
537534
...(payload.redirect ? { Location: this.constructRedirect(request, route, payload as RedirectResponse) } : {}),
@@ -633,11 +630,7 @@ export class HttpServer {
633630
throw new HttpError("Not found", HttpCode.NotFound)
634631
}
635632

636-
if (
637-
!(await route.provider.handleWebSocket(route, request, await this.socketProvider.createProxy(socket), head))
638-
) {
639-
throw new HttpError("Not found", HttpCode.NotFound)
640-
}
633+
await route.provider.handleWebSocket(route, request, await this.socketProvider.createProxy(socket), head)
641634
} catch (error) {
642635
socket.destroy(error)
643636
logger.warn(`discarding socket connection: ${error.message}`)

0 commit comments

Comments
 (0)