@hirohsu/user-web-feedback 2.8.11 → 2.8.13

package/dist/cli.cjs

@@ -92987,6 +92987,9 @@ var WebServer = class {
   sseTransports = /* @__PURE__ */ new Map();
   sseTransportsList = [];
   pendingDeliveryCache = /* @__PURE__ */ new Map();
+  streamableHttpTransports = /* @__PURE__ */ new Map();
+  streamableHttpSseActive = /* @__PURE__ */ new Map();
+  activeSessionPromises = /* @__PURE__ */ new Map();
   dbInitialized = false;
   selfProbeService;
   /**
@@ -94986,6 +94989,17 @@ var WebServer = class {
   /**
    * 處理回饋提交
    */
+  async waitForActiveConnection(maxRounds = 5, intervalMs = 5e3) {
+    for (let round = 1; round <= maxRounds; round++) {
+      const hasStreamableSSE = [...this.streamableHttpSseActive.values()].some((v) => v);
+      const hasSSETransport = this.sseTransportsList.length > 0;
+      if (hasStreamableSSE || hasSSETransport) return true;
+      logger.warn(`[\u9023\u7DDA\u7B49\u5F85] \u7B2C ${round}/${maxRounds} \u8F2A\uFF1A\u76EE\u524D\u7121\u6D3B\u8E8D MCP Client \u9023\u7DDA\uFF0C${intervalMs / 1e3}s \u5F8C\u91CD\u8A66...`);
+      await new Promise((r) => setTimeout(r, intervalMs));
+    }
+    logger.error(`[\u9023\u7DDA\u7B49\u5F85] \u5DF2\u5617\u8A66 ${maxRounds} \u8F2A\u4ECD\u7121\u6D3B\u8E8D\u9023\u7DDA\uFF0C\u5C07\u76F4\u63A5\u9001\u51FA\uFF08\u5FEB\u53D6\u6A5F\u5236\u4F5C\u70BA\u4FDD\u8B77\uFF09`);
+    return false;
+  }
   async handleFeedbackSubmission(socket, feedbackData) {
     const session = this.sessionStorage.getSession(feedbackData.sessionId);
     if (!session) {
@@ -95044,6 +95058,10 @@ var WebServer = class {
           const projectId = session.projectId;
           setTimeout(() => this.pendingDeliveryCache.delete(projectId), 6e4);
         }
+        const hasConnection = await this.waitForActiveConnection();
+        if (hasConnection) {
+          logger.info("[\u9023\u7DDA\u76E3\u63A7] \u9023\u7DDA\u78BA\u8A8D\uFF0C\u6B63\u5728\u9001\u51FA\u56DE\u8986\u81F3 MCP Client...");
+        }
         session.resolve(session.feedback);
         const sessionIdToDelete = feedbackData.sessionId;
         setTimeout(() => this.sessionStorage.deleteSession(sessionIdToDelete), 5e3);
@@ -95131,8 +95149,11 @@ var WebServer = class {
   async collectFeedback(workSummary, timeoutSeconds, projectName, projectPath) {
     const sessionId = this.generateSessionId();
     const project = projectName ? projectManager.getOrCreateProject(projectName, projectPath) : projectManager.getDefaultProject();
-    logger.info(`\u5EFA\u7ACB\u56DE\u994B\u6703\u8A71: ${sessionId}, \u903E\u6642: ${timeoutSeconds}\u79D2, \u5C08\u6848: ${project.name} (${project.id})`);
-    const feedbackUrl = this.generateFeedbackUrl(sessionId);
+    const existingPromise = this.activeSessionPromises.get(project.id);
+    if (existingPromise) {
+      logger.warn(`[\u91CD\u8907\u8ACB\u6C42] \u5C08\u6848 "${project.name}" \u5DF2\u6709\u9032\u884C\u4E2D\u7684\u56DE\u994B\u6703\u8A71\uFF0C\u91CD\u7528\u73FE\u6709\u8ACB\u6C42\uFF08\u9632\u6B62\u91CD\u8907\u5F48\u7A97\uFF09`);
+      return existingPromise;
+    }
     const pendingEntry = this.pendingDeliveryCache.get(project.id);
     if (pendingEntry && pendingEntry.expiresAt > Date.now()) {
       const prevSession = this.sessionStorage.getSession(pendingEntry.result.sessionId);
@@ -95142,7 +95163,9 @@ var WebServer = class {
         return pendingEntry.result;
       }
     }
-    return new Promise((resolve2, reject) => {
+    logger.info(`\u5EFA\u7ACB\u56DE\u994B\u6703\u8A71: ${sessionId}, \u903E\u6642: ${timeoutSeconds}\u79D2, \u5C08\u6848: ${project.name} (${project.id})`);
+    const feedbackUrl = this.generateFeedbackUrl(sessionId);
+    const sessionPromise = new Promise((resolve2, reject) => {
       const session = {
         workSummary,
         feedback: [],
@@ -95172,6 +95195,11 @@ var WebServer = class {
         });
       }
     });
+    this.activeSessionPromises.set(project.id, sessionPromise);
+    void sessionPromise.finally(() => {
+      this.activeSessionPromises.delete(project.id);
+    });
+    return sessionPromise;
   }
   emitDashboardSessionCreated(projectId, sessionId, projectName, workSummary) {
     if (this.io) {
@@ -95439,7 +95467,6 @@ var WebServer = class {
    */
   async setupStreamableHTTPEndpoints() {
     const { StreamableHTTPServerTransport: StreamableHTTPServerTransport2 } = await Promise.resolve().then(() => (init_streamableHttp2(), streamableHttp_exports2));
-    const streamableTransports = /* @__PURE__ */ new Map();
     this.app.post("/mcp", import_express.default.json(), async (req, res) => {
       logger.debug("\u6536\u5230 Streamable HTTP \u8ACB\u6C42:", JSON.stringify(req.body));
       if (!this.mcpServerRef) {
@@ -95450,7 +95477,7 @@ var WebServer = class {
       req.socket?.setKeepAlive(true, 3e4);
       req.on("close", () => {
         if (!res.writableEnded) {
-          logger.warn("[\u5BB9\u932F] MCP Client HTTP \u9023\u7DDA\u5728\u5DE5\u5177\u57F7\u884C\u671F\u9593\u63D0\u524D\u95DC\u9589\uFF0C\u56DE\u8986\u53EF\u80FD\u672A\u9001\u9054\uFF0C\u4E0B\u6B21\u547C\u53EB\u5C07\u5F9E\u5FEB\u53D6\u53D6\u56DE");
+          logger.warn("[\u9023\u7DDA\u76E3\u63A7] MCP Client HTTP \u9023\u7DDA\u5728\u5DE5\u5177\u57F7\u884C\u671F\u9593\u63D0\u524D\u95DC\u9589\uFF0C\u56DE\u8986\u53EF\u80FD\u672A\u9001\u9054");
         }
       });
       const sessionId = req.headers["mcp-session-id"];
@@ -95462,23 +95489,30 @@ var WebServer = class {
         });
         transport.onclose = () => {
           const sid = transport.sessionId;
-          if (sid) streamableTransports.delete(sid);
-          logger.info(`Streamable HTTP Transport \u5DF2\u95DC\u9589, \u6703\u8A71: ${sid}`);
+          if (sid) {
+            this.streamableHttpTransports.delete(sid);
+            this.streamableHttpSseActive.delete(sid);
+            logger.info(`[\u9023\u7DDA\u76E3\u63A7] MCP Client \u5DF2\u65B7\u7DDA (sessionId=${sid})\uFF0C\u5269\u9918\u6D3B\u8E8D\u9023\u7DDA: ${this.streamableHttpTransports.size}`);
+          }
         };
         try {
           await this.mcpServerRef.getMcpServerInstance().connect(transport);
-          logger.info("Streamable HTTP Transport \u5DF2\u9023\u63A5");
+          const clientIp = req.headers["x-forwarded-for"] || req.socket?.remoteAddress || "unknown";
+          logger.info(`[\u9023\u7DDA\u76E3\u63A7] \u2705 MCP Client \u5DF2\u9023\u7DDA \u2014 IP: ${clientIp}`);
           await transport.handleRequest(req, res, req.body);
           const sid = transport.sessionId;
-          if (sid) streamableTransports.set(sid, transport);
+          if (sid) {
+            this.streamableHttpTransports.set(sid, transport);
+            logger.info(`[\u9023\u7DDA\u76E3\u63A7] MCP Session \u5DF2\u5EFA\u7ACB (sessionId=${sid})\uFF0C\u76EE\u524D\u6D3B\u8E8D\u9023\u7DDA: ${this.streamableHttpTransports.size}`);
+          }
         } catch (error2) {
           logger.error("\u8655\u7406 Streamable HTTP \u521D\u59CB\u5316\u8ACB\u6C42\u5931\u6557:", error2);
           if (!res.headersSent) {
             res.status(500).json({ error: "Failed to initialize MCP session" });
           }
         }
-      } else if (sessionId && streamableTransports.has(sessionId)) {
-        const transport = streamableTransports.get(sessionId);
+      } else if (sessionId && this.streamableHttpTransports.has(sessionId)) {
+        const transport = this.streamableHttpTransports.get(sessionId);
         try {
           await transport.handleRequest(req, res, req.body);
         } catch (error2) {
@@ -95493,24 +95527,29 @@ var WebServer = class {
     });
     this.app.delete("/mcp", async (req, res) => {
       const sessionId = req.headers["mcp-session-id"];
-      if (sessionId && streamableTransports.has(sessionId)) {
-        const transport = streamableTransports.get(sessionId);
+      if (sessionId && this.streamableHttpTransports.has(sessionId)) {
+        const transport = this.streamableHttpTransports.get(sessionId);
         try {
           await transport.handleRequest(req, res, req.body);
         } catch {
         }
-        streamableTransports.delete(sessionId);
+        this.streamableHttpTransports.delete(sessionId);
+        this.streamableHttpSseActive.delete(sessionId);
+        logger.info(`[\u9023\u7DDA\u76E3\u63A7] MCP Session \u5DF2\u522A\u9664 (sessionId=${sessionId})`);
       } else {
         res.status(404).json({ error: "Session not found" });
       }
     });
     this.app.get("/mcp", async (req, res) => {
       const sessionId = req.query["sessionId"];
-      if (!sessionId || !streamableTransports.has(sessionId)) {
+      if (!sessionId || !this.streamableHttpTransports.has(sessionId)) {
         res.status(400).json({ error: "Invalid session" });
         return;
       }
-      const transport = streamableTransports.get(sessionId);
+      this.streamableHttpSseActive.set(sessionId, true);
+      const activeSseCount = [...this.streamableHttpSseActive.values()].filter(Boolean).length;
+      logger.info(`[\u9023\u7DDA\u76E3\u63A7] \u{1F4E1} GET SSE \u4EA4\u4ED8\u901A\u9053\u5DF2\u958B\u555F (sessionId=${sessionId})\uFF0C\u6D3B\u8E8D SSE \u6578: ${activeSseCount}`);
+      const transport = this.streamableHttpTransports.get(sessionId);
       const heartbeat = setInterval(() => {
         try {
           if (!res.writableEnded) res.write(": ping\n\n");
@@ -95519,7 +95558,12 @@ var WebServer = class {
           clearInterval(heartbeat);
         }
       }, 15e3);
-      req.on("close", () => clearInterval(heartbeat));
+      req.on("close", () => {
+        clearInterval(heartbeat);
+        this.streamableHttpSseActive.set(sessionId, false);
+        const remaining = [...this.streamableHttpSseActive.values()].filter(Boolean).length;
+        logger.warn(`[\u9023\u7DDA\u76E3\u63A7] \u26A0\uFE0F GET SSE \u4EA4\u4ED8\u901A\u9053\u5DF2\u95DC\u9589 (sessionId=${sessionId})\uFF0C\u5269\u9918\u6D3B\u8E8D SSE \u6578: ${remaining}`);
+      });
       try {
         await transport.handleRequest(req, res);
       } catch (error2) {

package/dist/index.cjs

@@ -90002,6 +90002,9 @@ var WebServer = class {
   sseTransports = /* @__PURE__ */ new Map();
   sseTransportsList = [];
   pendingDeliveryCache = /* @__PURE__ */ new Map();
+  streamableHttpTransports = /* @__PURE__ */ new Map();
+  streamableHttpSseActive = /* @__PURE__ */ new Map();
+  activeSessionPromises = /* @__PURE__ */ new Map();
   dbInitialized = false;
   selfProbeService;
   /**
@@ -92001,6 +92004,17 @@ var WebServer = class {
   /**
    * 處理回饋提交
    */
+  async waitForActiveConnection(maxRounds = 5, intervalMs = 5e3) {
+    for (let round = 1; round <= maxRounds; round++) {
+      const hasStreamableSSE = [...this.streamableHttpSseActive.values()].some((v) => v);
+      const hasSSETransport = this.sseTransportsList.length > 0;
+      if (hasStreamableSSE || hasSSETransport) return true;
+      logger.warn(`[\u9023\u7DDA\u7B49\u5F85] \u7B2C ${round}/${maxRounds} \u8F2A\uFF1A\u76EE\u524D\u7121\u6D3B\u8E8D MCP Client \u9023\u7DDA\uFF0C${intervalMs / 1e3}s \u5F8C\u91CD\u8A66...`);
+      await new Promise((r) => setTimeout(r, intervalMs));
+    }
+    logger.error(`[\u9023\u7DDA\u7B49\u5F85] \u5DF2\u5617\u8A66 ${maxRounds} \u8F2A\u4ECD\u7121\u6D3B\u8E8D\u9023\u7DDA\uFF0C\u5C07\u76F4\u63A5\u9001\u51FA\uFF08\u5FEB\u53D6\u6A5F\u5236\u4F5C\u70BA\u4FDD\u8B77\uFF09`);
+    return false;
+  }
   async handleFeedbackSubmission(socket, feedbackData) {
     const session = this.sessionStorage.getSession(feedbackData.sessionId);
     if (!session) {
@@ -92059,6 +92073,10 @@ var WebServer = class {
           const projectId = session.projectId;
           setTimeout(() => this.pendingDeliveryCache.delete(projectId), 6e4);
         }
+        const hasConnection = await this.waitForActiveConnection();
+        if (hasConnection) {
+          logger.info("[\u9023\u7DDA\u76E3\u63A7] \u9023\u7DDA\u78BA\u8A8D\uFF0C\u6B63\u5728\u9001\u51FA\u56DE\u8986\u81F3 MCP Client...");
+        }
         session.resolve(session.feedback);
         const sessionIdToDelete = feedbackData.sessionId;
         setTimeout(() => this.sessionStorage.deleteSession(sessionIdToDelete), 5e3);
@@ -92146,8 +92164,11 @@ var WebServer = class {
   async collectFeedback(workSummary, timeoutSeconds, projectName, projectPath) {
     const sessionId = this.generateSessionId();
     const project = projectName ? projectManager.getOrCreateProject(projectName, projectPath) : projectManager.getDefaultProject();
-    logger.info(`\u5EFA\u7ACB\u56DE\u994B\u6703\u8A71: ${sessionId}, \u903E\u6642: ${timeoutSeconds}\u79D2, \u5C08\u6848: ${project.name} (${project.id})`);
-    const feedbackUrl = this.generateFeedbackUrl(sessionId);
+    const existingPromise = this.activeSessionPromises.get(project.id);
+    if (existingPromise) {
+      logger.warn(`[\u91CD\u8907\u8ACB\u6C42] \u5C08\u6848 "${project.name}" \u5DF2\u6709\u9032\u884C\u4E2D\u7684\u56DE\u994B\u6703\u8A71\uFF0C\u91CD\u7528\u73FE\u6709\u8ACB\u6C42\uFF08\u9632\u6B62\u91CD\u8907\u5F48\u7A97\uFF09`);
+      return existingPromise;
+    }
     const pendingEntry = this.pendingDeliveryCache.get(project.id);
     if (pendingEntry && pendingEntry.expiresAt > Date.now()) {
       const prevSession = this.sessionStorage.getSession(pendingEntry.result.sessionId);
@@ -92157,7 +92178,9 @@ var WebServer = class {
         return pendingEntry.result;
       }
     }
-    return new Promise((resolve, reject) => {
+    logger.info(`\u5EFA\u7ACB\u56DE\u994B\u6703\u8A71: ${sessionId}, \u903E\u6642: ${timeoutSeconds}\u79D2, \u5C08\u6848: ${project.name} (${project.id})`);
+    const feedbackUrl = this.generateFeedbackUrl(sessionId);
+    const sessionPromise = new Promise((resolve, reject) => {
       const session = {
         workSummary,
         feedback: [],
@@ -92187,6 +92210,11 @@ var WebServer = class {
         });
       }
     });
+    this.activeSessionPromises.set(project.id, sessionPromise);
+    void sessionPromise.finally(() => {
+      this.activeSessionPromises.delete(project.id);
+    });
+    return sessionPromise;
   }
   emitDashboardSessionCreated(projectId, sessionId, projectName, workSummary) {
     if (this.io) {
@@ -92454,7 +92482,6 @@ var WebServer = class {
    */
   async setupStreamableHTTPEndpoints() {
     const { StreamableHTTPServerTransport: StreamableHTTPServerTransport2 } = await Promise.resolve().then(() => (init_streamableHttp2(), streamableHttp_exports2));
-    const streamableTransports = /* @__PURE__ */ new Map();
     this.app.post("/mcp", import_express.default.json(), async (req, res) => {
       logger.debug("\u6536\u5230 Streamable HTTP \u8ACB\u6C42:", JSON.stringify(req.body));
       if (!this.mcpServerRef) {
@@ -92465,7 +92492,7 @@ var WebServer = class {
       req.socket?.setKeepAlive(true, 3e4);
       req.on("close", () => {
         if (!res.writableEnded) {
-          logger.warn("[\u5BB9\u932F] MCP Client HTTP \u9023\u7DDA\u5728\u5DE5\u5177\u57F7\u884C\u671F\u9593\u63D0\u524D\u95DC\u9589\uFF0C\u56DE\u8986\u53EF\u80FD\u672A\u9001\u9054\uFF0C\u4E0B\u6B21\u547C\u53EB\u5C07\u5F9E\u5FEB\u53D6\u53D6\u56DE");
+          logger.warn("[\u9023\u7DDA\u76E3\u63A7] MCP Client HTTP \u9023\u7DDA\u5728\u5DE5\u5177\u57F7\u884C\u671F\u9593\u63D0\u524D\u95DC\u9589\uFF0C\u56DE\u8986\u53EF\u80FD\u672A\u9001\u9054");
         }
       });
       const sessionId = req.headers["mcp-session-id"];
@@ -92477,23 +92504,30 @@ var WebServer = class {
         });
         transport.onclose = () => {
           const sid = transport.sessionId;
-          if (sid) streamableTransports.delete(sid);
-          logger.info(`Streamable HTTP Transport \u5DF2\u95DC\u9589, \u6703\u8A71: ${sid}`);
+          if (sid) {
+            this.streamableHttpTransports.delete(sid);
+            this.streamableHttpSseActive.delete(sid);
+            logger.info(`[\u9023\u7DDA\u76E3\u63A7] MCP Client \u5DF2\u65B7\u7DDA (sessionId=${sid})\uFF0C\u5269\u9918\u6D3B\u8E8D\u9023\u7DDA: ${this.streamableHttpTransports.size}`);
+          }
         };
         try {
           await this.mcpServerRef.getMcpServerInstance().connect(transport);
-          logger.info("Streamable HTTP Transport \u5DF2\u9023\u63A5");
+          const clientIp = req.headers["x-forwarded-for"] || req.socket?.remoteAddress || "unknown";
+          logger.info(`[\u9023\u7DDA\u76E3\u63A7] \u2705 MCP Client \u5DF2\u9023\u7DDA \u2014 IP: ${clientIp}`);
           await transport.handleRequest(req, res, req.body);
           const sid = transport.sessionId;
-          if (sid) streamableTransports.set(sid, transport);
+          if (sid) {
+            this.streamableHttpTransports.set(sid, transport);
+            logger.info(`[\u9023\u7DDA\u76E3\u63A7] MCP Session \u5DF2\u5EFA\u7ACB (sessionId=${sid})\uFF0C\u76EE\u524D\u6D3B\u8E8D\u9023\u7DDA: ${this.streamableHttpTransports.size}`);
+          }
         } catch (error2) {
           logger.error("\u8655\u7406 Streamable HTTP \u521D\u59CB\u5316\u8ACB\u6C42\u5931\u6557:", error2);
           if (!res.headersSent) {
             res.status(500).json({ error: "Failed to initialize MCP session" });
           }
         }
-      } else if (sessionId && streamableTransports.has(sessionId)) {
-        const transport = streamableTransports.get(sessionId);
+      } else if (sessionId && this.streamableHttpTransports.has(sessionId)) {
+        const transport = this.streamableHttpTransports.get(sessionId);
         try {
           await transport.handleRequest(req, res, req.body);
         } catch (error2) {
@@ -92508,24 +92542,29 @@ var WebServer = class {
     });
     this.app.delete("/mcp", async (req, res) => {
       const sessionId = req.headers["mcp-session-id"];
-      if (sessionId && streamableTransports.has(sessionId)) {
-        const transport = streamableTransports.get(sessionId);
+      if (sessionId && this.streamableHttpTransports.has(sessionId)) {
+        const transport = this.streamableHttpTransports.get(sessionId);
         try {
           await transport.handleRequest(req, res, req.body);
         } catch {
         }
-        streamableTransports.delete(sessionId);
+        this.streamableHttpTransports.delete(sessionId);
+        this.streamableHttpSseActive.delete(sessionId);
+        logger.info(`[\u9023\u7DDA\u76E3\u63A7] MCP Session \u5DF2\u522A\u9664 (sessionId=${sessionId})`);
       } else {
         res.status(404).json({ error: "Session not found" });
       }
     });
     this.app.get("/mcp", async (req, res) => {
       const sessionId = req.query["sessionId"];
-      if (!sessionId || !streamableTransports.has(sessionId)) {
+      if (!sessionId || !this.streamableHttpTransports.has(sessionId)) {
         res.status(400).json({ error: "Invalid session" });
         return;
       }
-      const transport = streamableTransports.get(sessionId);
+      this.streamableHttpSseActive.set(sessionId, true);
+      const activeSseCount = [...this.streamableHttpSseActive.values()].filter(Boolean).length;
+      logger.info(`[\u9023\u7DDA\u76E3\u63A7] \u{1F4E1} GET SSE \u4EA4\u4ED8\u901A\u9053\u5DF2\u958B\u555F (sessionId=${sessionId})\uFF0C\u6D3B\u8E8D SSE \u6578: ${activeSseCount}`);
+      const transport = this.streamableHttpTransports.get(sessionId);
       const heartbeat = setInterval(() => {
         try {
           if (!res.writableEnded) res.write(": ping\n\n");
@@ -92534,7 +92573,12 @@ var WebServer = class {
           clearInterval(heartbeat);
         }
       }, 15e3);
-      req.on("close", () => clearInterval(heartbeat));
+      req.on("close", () => {
+        clearInterval(heartbeat);
+        this.streamableHttpSseActive.set(sessionId, false);
+        const remaining = [...this.streamableHttpSseActive.values()].filter(Boolean).length;
+        logger.warn(`[\u9023\u7DDA\u76E3\u63A7] \u26A0\uFE0F GET SSE \u4EA4\u4ED8\u901A\u9053\u5DF2\u95DC\u9589 (sessionId=${sessionId})\uFF0C\u5269\u9918\u6D3B\u8E8D SSE \u6578: ${remaining}`);
+      });
       try {
         await transport.handleRequest(req, res);
       } catch (error2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirohsu/user-web-feedback",
-  "version": "2.8.11",
+  "version": "2.8.13",
   "description": "基於Node.js的MCP回饋收集器 - 支持AI工作彙報和用戶回饋收集",
   "main": "dist/index.cjs",
   "bin": {