crabatool 1.0.365 → 1.0.367

package/lib/server.js

@@ -8,17 +8,22 @@ var compression = require('compression');
 
 exports = module.exports;
 
-// 每次都重启server
-var aloneServer;
-var connections = new Set();
+// 存储每个使用和的在线预览server实例
+var servers = {};
 
+// 1. 自定义启动服务模式（crabaai里面启动用户创建的案例，每个使用者仅创建一个server，互不影响，使用者在线预览案例需要）
 exports.run = function(options) {
   var that = this;
-  if (aloneServer) {
-    forceShutdown(aloneServer, function() {
+  var serverid;
+  if (options) {
+    serverid = options.serverid;
+  }
+  var oldServer = servers[serverid];
+
+  if (oldServer) {
+    forceShutdown(oldServer, function() {
       console.log('关闭旧实例...');
 
-      connections = new Set();
       that.start(options);
     });
   } else {
@@ -26,12 +31,31 @@ exports.run = function(options) {
   }
 }
 
-// 独立server
+// 2. 独立server服务（crabatool使用）
 exports.start = function(options) {
   var app = new express();
   createServer(app, options);
 
 }
+
+// 3. 返回在线预览案例server总数
+exports.count = function() {
+  return Object.keys(servers).length;
+}
+
+// 4. 强制结束所有案例server
+exports.closeAll = function() {
+  var keys = Object.keys(servers);
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    var oldServer = servers[key];
+    forceShutdown(oldServer, function() {
+      console.log('强制下线实例:' + key);
+    });
+  }
+  servers = {}; // 置空实例列表
+}
+
 function createServer(app, options) {
   //app.use(express.json({ limit: '50mb' })); // post数据包大小限制
   app.use(compression()); // 开启压缩
@@ -155,30 +179,78 @@ function createServer(app, options) {
     }
   });
 
-  if (options) {
-    aloneServer = server;
+  // 自定义启动服务模式
+  if (options && options.serverid) {
+    servers[options.serverid] = server;
+    server.__serverid = options.serverid;
+    server.__connections = new Set();
+    //resetTimeout(server); // 启动时初始化计时器
+
+    // 有新的请求时初始化计时器
+    server.on("request", (req, res) => {
+      resetTimeout(server); 
+    });
 
     // 记录所有活跃连接
     server.on('connection', (socket) => {
-      connections.add(socket);
+      server.__connections.add(socket);
+
       socket.on('close', () => {
-        connections.delete(socket);
+        if (server.__connections) {
+          server.__connections.delete(socket);
+        }
       });
     });
 
-
+    console.log('当前server实例总数:' + exports.count());
   }
 }
 
+// 重置倒计时
+function resetTimeout(server) {
+  var timeoutId = server.__timeoutId;
+  if (timeoutId) {
+    clearTimeout(timeoutId);
+  }
+
+  server.__timeoutId = setTimeout(() => {
+    console.log('10 分钟无活动，关闭server服务器...');
+    forceShutdown(server);
+  }, 10 * 60 * 1000); // 10 分钟
+}
 
-// 强制关闭所有活跃连接的函数
+// 关闭server服务，先强制关闭所有活跃连接的函数（否则close会很久）
 function forceShutdown(server, cb) {
-  console.log(`强制关闭 ${connections.size} 个活跃连接`);
-  connections.forEach((socket) => {
-    socket.destroy(); // 强制销毁 socket
-  });
+  // 关闭计时器
+  if (server.__timeoutId) {
+    clearTimeout(server.__timeoutId);
+    delete server.__timeoutId;
+  }
+
+  // 1. 关闭链接
+  var connections = server.__connections;
+  if (connections) {
+    console.log(`强制关闭 ${connections.size} 个活跃连接`);
+    connections.forEach((socket) => {
+      socket.destroy(); // 强制销毁 socket
+      socket.unref();   // 确保进程退出
+    });
+
+  }
+  // 2. 如果使用 Node.js >= 18.2.0，可直接清理空闲连接就不需要__connections来管理了链接了
+  if (server.closeIdleConnections) {
+    server.closeIdleConnections();
+  }
+
+  // 3. 关闭server
   server.close(() => {
-    console.log('服务器已关闭');
-    cb();
+    delete server.__connections;
+    delete servers[server.__serverid];
+
+    console.log('服务器已关闭' + server.__serverid);
+
+    if (typeof cb == 'function') {
+      cb();
+    }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.365",
+  "version": "1.0.367",
   "description": "crabatool",
   "main": "index.js",
   "bin": {