@@ -16,7 +16,7 @@ import {
1616 SessionError ,
1717 SessionResponse ,
1818} from "../../common/api"
19- import { ApiEndpoint , HttpCode } from "../../common/http"
19+ import { ApiEndpoint , HttpCode , HttpError } from "../../common/http"
2020import { normalize } from "../../common/util"
2121import { HttpProvider , HttpProviderOptions , HttpResponse , HttpServer , Route } from "../http"
2222import { findApplications , findWhitelistedApplications , Vscode } from "./bin"
@@ -57,10 +57,9 @@ export class ApiHttpProvider extends HttpProvider {
5757 } )
5858 }
5959
60- public async handleRequest ( route : Route , request : http . IncomingMessage ) : Promise < HttpResponse | undefined > {
61- if ( ! this . authenticated ( request ) ) {
62- return { code : HttpCode . Unauthorized }
63- }
60+ public async handleRequest ( route : Route , request : http . IncomingMessage ) : Promise < HttpResponse > {
61+ this . ensureAuthenticated ( request )
62+
6463 switch ( route . base ) {
6564 case ApiEndpoint . applications :
6665 this . ensureMethod ( request )
@@ -82,15 +81,16 @@ export class ApiHttpProvider extends HttpProvider {
8281 content : await this . running ( ) ,
8382 } as HttpResponse < RunningResponse >
8483 }
85- return undefined
84+
85+ throw new HttpError ( "Not found" , HttpCode . NotFound )
8686 }
8787
8888 public async handleWebSocket (
8989 route : Route ,
9090 request : http . IncomingMessage ,
9191 socket : net . Socket ,
9292 head : Buffer ,
93- ) : Promise < true | undefined > {
93+ ) : Promise < true > {
9494 if ( ! this . authenticated ( request ) ) {
9595 throw new Error ( "not authenticated" )
9696 }
@@ -100,7 +100,8 @@ export class ApiHttpProvider extends HttpProvider {
100100 case ApiEndpoint . run :
101101 return this . handleRunSocket ( route , request , socket , head )
102102 }
103- return undefined
103+
104+ throw new HttpError ( "Not found" , HttpCode . NotFound )
104105 }
105106
106107 private async handleStatusSocket ( request : http . IncomingMessage , socket : net . Socket , head : Buffer ) : Promise < true > {
@@ -220,12 +221,12 @@ export class ApiHttpProvider extends HttpProvider {
220221 /**
221222 * Handle /session endpoint.
222223 */
223- private async session ( request : http . IncomingMessage ) : Promise < HttpResponse | undefined > {
224+ private async session ( request : http . IncomingMessage ) : Promise < HttpResponse > {
224225 this . ensureMethod ( request , [ "DELETE" , "POST" ] )
225226
226227 const data = await this . getData ( request )
227228 if ( ! data ) {
228- return undefined
229+ throw new HttpError ( "Not found" , HttpCode . NotFound )
229230 }
230231
231232 switch ( request . method ) {
@@ -252,7 +253,7 @@ export class ApiHttpProvider extends HttpProvider {
252253 }
253254 }
254255
255- return undefined
256+ throw new HttpError ( "Not found" , HttpCode . NotFound )
256257 }
257258
258259 /**
0 commit comments