Merge pull request #23 from sor4chi/feat/handler-argument

feat: add handler argument's error trigger, release note and the test
sor4chi · Nov 30, 2023 · 42d184e · 42d184e
2 parents 8d1fa0d + 2355df5
commit 42d184e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/.changeset/three-actors-develop.md b/.changeset/three-actors-develop.md
@@ -32,5 +32,16 @@ generateHonoObject("/", () => {})
     .webSocketError(async () => {});
 ```
 
+### Argument way
+
+```ts
+generateHonoObject("/", () => {}, {
+    alarm: async () => {},
+    webSocketMessage: async () => {},
+    webSocketClose: async () => {},
+    webSocketError: async () => {},
+});
+```
+
 Take care for registering multiple handlers for same event.
 If you register so, you will get an error.
diff --git a/packages/hono-do/src/index.ts b/packages/hono-do/src/index.ts
@@ -73,37 +73,30 @@ export function generateHonoObject<
     _handlers.webSocketError?.(...args, this.state, this.vars);
   };
 
-  const isCalledMap = new Map<string, boolean>();
-
   honoObject.alarm = function (handler: AlarmHandler) {
-    const name = "alarm";
-    if (isCalledMap.get(name)) throw Errors.handlerAlreadySet(name);
+    if (_handlers.alarm) throw Errors.handlerAlreadySet("alarm");
     _handlers.alarm = handler;
-    isCalledMap.set(name, true);
     return honoObject;
   };
 
   honoObject.webSocketMessage = function (handler: WebSocketMessageHandler) {
-    const name = "webSocketMessage";
-    if (isCalledMap.get(name)) throw Errors.handlerAlreadySet(name);
+    if (_handlers.webSocketMessage)
+      throw Errors.handlerAlreadySet("webSocketMessage");
     _handlers.webSocketMessage = handler;
-    isCalledMap.set(name, true);
     return honoObject;
   };
 
   honoObject.webSocketClose = function (handler: WebSocketCloseHandler) {
-    const name = "webSocketClose";
-    if (isCalledMap.get(name)) throw Errors.handlerAlreadySet(name);
+    if (_handlers.webSocketClose)
+      throw Errors.handlerAlreadySet("webSocketClose");
     _handlers.webSocketClose = handler;
-    isCalledMap.set(name, true);
     return honoObject;
   };
 
   honoObject.webSocketError = function (handler: WebSocketErrorHandler) {
-    const name = "webSocketError";
-    if (isCalledMap.get(name)) throw Errors.handlerAlreadySet(name);
+    if (_handlers.webSocketError)
+      throw Errors.handlerAlreadySet("webSocketError");
     _handlers.webSocketError = handler;
-    isCalledMap.set(name, true);
     return honoObject;
   };
 

diff --git a/packages/hono-do/tests/index.test.ts b/packages/hono-do/tests/index.test.ts
@@ -64,6 +64,15 @@ describe("generateHonoObject", () => {
       Errors.handlerAlreadySet("webSocketMessage"),
     );
   });
+
+  it("should error when multiple handler set to same Hono Object, with other way", async () => {
+    const DO = generateHonoObject("/", () => {}, {
+      alarm: async () => {},
+    });
+    expect(() => DO.alarm(async () => {})).toThrowError(
+      Errors.handlerAlreadySet("alarm"),
+    );
+  });
 });
 
 describe("Worker", () => {