From 5e64df0eaa5992d901fc525c92a99cee3c4fcd3b Mon Sep 17 00:00:00 2001
From: linyuchen <lin.yu.chen@foxmail.com>
Date: Thu, 8 Feb 2024 11:32:17 +0800
Subject: [PATCH] save

---
 src/ntqqapi/hook.ts      |  8 ++++++--
 src/server/httpserver.ts | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/ntqqapi/hook.ts b/src/ntqqapi/hook.ts
index e86b33e..b55e307 100644
--- a/src/ntqqapi/hook.ts
+++ b/src/ntqqapi/hook.ts
@@ -38,11 +38,15 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
         if (args?.[1] instanceof Array) {
             for (let receiveData of args?.[1]) {
                 const ntQQApiMethodName = receiveData.cmdName;
-                log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
+                // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
                 for (let hook of receiveHooks) {
                     if (hook.method === ntQQApiMethodName) {
                         new Promise((resolve, reject) => {
-                            hook.hookFunc(receiveData.payload);
+                            try {
+                                hook.hookFunc(receiveData.payload);
+                            }catch (e) {
+                                log("hook error", e, receiveData.payload)
+                            }
                         }).then()
                     }
                 }
diff --git a/src/server/httpserver.ts b/src/server/httpserver.ts
index 90f9ecc..1c269c3 100644
--- a/src/server/httpserver.ts
+++ b/src/server/httpserver.ts
@@ -1,7 +1,7 @@
 import {getConfigUtil, log} from "../common/utils";
 
 // const express = require("express");
-import express from "express";
+import express = require("express");
 import {Request} from 'express';
 import {Response} from 'express';
 
@@ -180,14 +180,18 @@ export function startExpress(port: number) {
     });
 
     async function registerRouter<PayloadType, ReturnDataType>(action: OB11ApiName, handle: (payload: PayloadType) => Promise<OB11Return<ReturnDataType>>) {
+        let url = action.toString()
+        if (!action.startsWith("/")){
+            url = "/" + action
+        }
         async function _handle(res: Response, payload: PayloadType) {
             res.send(await handle(payload))
         }
 
-        app.post('/' + action, (req: Request, res: Response) => {
+        app.post(url, (req: Request, res: Response) => {
             _handle(res, req.body).then()
         });
-        app.get('/' + action, (req: Request, res: Response) => {
+        app.get(url, (req: Request, res: Response) => {
             _handle(res, req.query as any).then()
         });
     }