@cocreate/server-mesh 1.1.0 → 1.2.1

package/.github/workflows/automated.yml

@@ -3,7 +3,7 @@ name: Automated Workflow
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   about:

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.2.1](https://github.com/CoCreate-app/CoCreate-server-mesh/compare/v1.2.0...v1.2.1) (2026-07-19)
+
+
+### Bug Fixes
+
+* set default branch to main ([50a0548](https://github.com/CoCreate-app/CoCreate-server-mesh/commit/50a054846d72ca79bb564aaf2546257c41f62051))
+
+# [1.2.0](https://github.com/CoCreate-app/CoCreate-server-mesh/compare/v1.1.0...v1.2.0) (2026-07-18)
+
+
+### Features
+
+* implement coordinated graceful shutdown and improve server instance eviction handling ([c667b53](https://github.com/CoCreate-app/CoCreate-server-mesh/commit/c667b53d1519c50bb7d4f0a9f78657fc6fefbd56))
+
 # [1.1.0](https://github.com/CoCreate-app/CoCreate-server-mesh/compare/v1.0.0...v1.1.0) (2026-07-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/server-mesh",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Pluggable, event-driven WebSocket clustering and P2P mesh driver for CoCreate Server, enabling dynamic server-to-server state synchronization across multi-cloud and bare-metal environments.",
   "keywords": [
     "cocreate-socket",

package/release.config.js

@@ -1,6 +1,6 @@
 export default {
   dryRun: false,
-  branches: ["master"],
+  branches: ["main"],
   plugins: [
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",

package/src/index.js

@@ -126,6 +126,14 @@ class ServerMesh extends EventEmitter {
             socketSend(uniqueSockets, payload);
         }
     }
+
+    /**
+     * Coordinates the graceful shutdown sequence. Called directly from the Master server class.
+     * @returns {Promise<void>} Resolves when all connections have dropped and port binds are freed
+     */
+    async close() {
+        return closeMesh();
+    }
 }
 
 const serverMeshInstance = new ServerMesh();
@@ -266,9 +274,6 @@ function removeSocketFromAllOrgServers(ws) {
 export async function init(server) {
     serverCtx = server;
 
-    process.on('SIGINT', handleGracefulShutdown);
-    process.on('SIGTERM', handleGracefulShutdown);
-
     const isPrimary = serverCtx.isPrimary;
 
     if (!isPrimary) {
@@ -445,17 +450,32 @@ export async function init(server) {
     wsPingInterval = setInterval(pingActiveWebsockets, 30000);
 }
 
-
 /**
  * Registers this server instance once on startup to allow discovery.
  */
 async function registerServer() {
     if (isGracefulExitRunning || !serverCtx?.crud) return;
+    const instanceId = serverCtx.infrastructure?.instanceId;
+    if (instanceId) {
+        try {
+            await serverCtx.crud.send({
+                method: 'object.delete',
+                array: 'servers',
+                $filter: {
+                    query: { 'infrastructure.instanceId': instanceId },
+                    limit: 0
+                },
+                organization_id: serverCtx.organization_id,
+                host: serverCtx.host
+            });
+        } catch (err) {
+            console.warn("[@cocreate/server-mesh] Startup instance-eviction run failed/skipped:", err.message);
+        }
+    }
 
     const registerPayload = {
-        method: 'object.update',
+        method: 'object.create',
         array: 'servers',
-        upsert: true,
         object: {
             _id: serverCtx.id,
             ip: serverCtx.ip,
@@ -501,12 +521,14 @@ function pingActiveWebsockets() {
 
 /**
  * Cleanly handles node evictions and releases network bindings.
+ * Rewritten to support fully coordinated async invocation from Primary Server controller without process.exit
+ * @returns {Promise<void>} Resolves when the HTTPS mesh server port is successfully released.
  */
-async function handleGracefulShutdown() {
+async function closeMesh() {
     if (isGracefulExitRunning) return;
     isGracefulExitRunning = true;
     
-    console.log(`\n[@cocreate/server-mesh] Graceful shutdown initiated. Cleaning up mesh state...`);
+    console.log(`[@cocreate/server-mesh] Coordinated secure mesh shutdown triggered. Evicting state...`);
 
     clearInterval(wsPingInterval);
 
@@ -542,19 +564,16 @@ async function handleGracefulShutdown() {
         try { meshWss.close(); } catch {}
     }
 
-    if (secureMeshServer) {
-        secureMeshServer.close(() => {
-            console.log(`[@cocreate/server-mesh] Port ${MESH_PORT} successfully released.`);
-            process.exit(0);
-        });
-    } else {
-        process.exit(0);
-    }
-
-    setTimeout(() => {
-        console.warn('[@cocreate/server-mesh] Force-exiting gracefully hung process.');
-        process.exit(1);
-    }, 3000).unref();
+    return new Promise((resolve) => {
+        if (secureMeshServer) {
+            secureMeshServer.close(() => {
+                console.log(`[@cocreate/server-mesh] Secure inter-node port ${MESH_PORT} successfully released.`);
+                resolve();
+            });
+        } else {
+            resolve();
+        }
+    });
 }
 
 /**
@@ -563,24 +582,6 @@ async function handleGracefulShutdown() {
 async function getServers() {
     if (isGracefulExitRunning || !serverCtx?.crud) return;
 
-    const instanceId = serverCtx.infrastructure?.instanceId;
-    if (instanceId) {
-        try {
-            await serverCtx.crud.send({
-                method: 'object.delete',
-                array: 'servers',
-                $filter: {
-                    query: { 'infrastructure.instanceId': instanceId },
-                    limit: 0
-                },
-                organization_id: serverCtx.organization_id,
-                host: serverCtx.host
-            });
-        } catch (err) {
-            console.warn("[@cocreate/server-mesh] Startup instance-eviction run failed/skipped:", err.message);
-        }
-    }
-
     // Register profile once on boot
     await registerServer();