fix: handle route not found

izatop · Jul 20, 2023 · 9da3a3c · 9da3a3c
1 parent a85e514
commit 9da3a3c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/packages/app/src/Application.ts b/packages/app/src/Application.ts
@@ -100,7 +100,7 @@ export class Application<C extends Context> {
         return this.#index;
     }
 
-    protected captureException(reason: unknown): void {
+    public captureException(reason: unknown): void {
         this.logger.error("Unexpected error", reason);
 
         const {error} = this.#unit.getTransactionHandlers();

diff --git a/packages/ws/src/WebSocketServer.ts b/packages/ws/src/WebSocketServer.ts
@@ -15,7 +15,7 @@ import {
     unit,
     Unit,
 } from "@bunt/unit";
-import {assert, Defer, isDefined, isString, logger, Logger, noop, resolveOrReject, toError} from "@bunt/util";
+import {assert, Defer, isDefined, isString, logger, Logger, noop, resolveOrReject} from "@bunt/util";
 import {RequestMessage, WebServer} from "@bunt/web";
 import * as ws from "ws";
 import {WebSocketCloseReason} from "./const.js";
@@ -91,7 +91,7 @@ export class WebSocketServer<C extends Context> extends Disposer implements IRun
                         webSocket.close(resolveOrReject(resolve, reject));
                     }));
                 } catch (error) {
-                    this.logger.error("Unexpected error", error);
+                    this.#web.captureException(error);
                 }
             }
 
@@ -226,8 +226,17 @@ export class WebSocketServer<C extends Context> extends Disposer implements IRun
                 this.handle(connection, () => this.#unit.run(route.action as any, state));
             });
         } catch (error) {
-            this.logger.error(toError(error).message, error);
-            socket.destroy(toError(error));
+            this.#web.captureException(error);
+
+            const response = [
+                "HTTP/1.1 404 Not found",
+                "Content-Type: text/plain",
+                "Content-Length: 0",
+                "Connection: close",
+                "",
+            ];
+
+            socket.end(response.join("\r\n"));
         }
     };
 
@@ -236,7 +245,7 @@ export class WebSocketServer<C extends Context> extends Disposer implements IRun
             await action();
             connection.close(WebSocketCloseReason.NORMAL_CLOSURE);
         } catch (error) {
-            this.logger.error("Unexpected error", error);
+            this.#web.captureException(error);
             connection.close(WebSocketCloseReason.INTERNAL_ERROR);
         }
     }

diff --git a/yarn.lock b/yarn.lock
@@ -551,7 +551,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@bunt/web@^0.29.2, @bunt/web@workspace:packages/web":
+"@bunt/web@^0.29.3, @bunt/web@workspace:packages/web":
   version: 0.0.0-use.local
   resolution: "@bunt/web@workspace:packages/web"
   dependencies:
@@ -569,7 +569,7 @@ __metadata:
     "@bunt/app": ^0.29.2
     "@bunt/unit": ^0.29.0
     "@bunt/util": ^0.29.0
-    "@bunt/web": ^0.29.2
+    "@bunt/web": ^0.29.3
     "@types/websocket": ^1.0.5
     "@types/ws": ^8.5.5
     websocket: ^1.0.34