nodio-cli 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodio-cli",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Nodio distributed storage network",
   "main": "src/server/index.js",
   "type": "commonjs",

package/src/node/index.js

@@ -31,7 +31,7 @@ async function isPortFree(port) {
       server.close(() => resolve(true));
     });
 
-    server.listen(port, '127.0.0.1');
+    server.listen({ port, exclusive: true });
   });
 }
 

package/src/node/runtime.js

@@ -85,11 +85,18 @@ class NodioNodeRuntime {
       res.json({ ok: true, nodeId: this.nodeId });
     });
 
-    await new Promise((resolve) => {
-      app.listen(this.port, () => {
+    await new Promise((resolve, reject) => {
+      const server = app.listen({ port: this.port, exclusive: true }, () => {
         console.log(`Nodio node ${this.nodeId} listening on port ${this.port}`);
         resolve();
       });
+
+      server.once('error', (error) => {
+        if (error && error.code === 'EADDRINUSE') {
+          return reject(new Error(`port ${this.port} is already in use`));
+        }
+        return reject(error);
+      });
     });
   }
 

package/src/server/routes.js

@@ -63,18 +63,33 @@ function buildRoutes(config) {
       }
 
       let effectiveNodeId = nodeId || existingByNodeKey?.nodeId || null;
+      let claimedKnownNode = null;
 
       if (!effectiveNodeId && deviceKey && normalizedKnownNodeIds.length > 0) {
-        const oldestOfflineKnownNode = await NodeModel.findOne({
-          deviceKey,
-          status: 'offline',
-          nodeId: { $in: normalizedKnownNodeIds }
-        })
-          .sort({ createdAt: 1 })
-          .lean();
+        claimedKnownNode = await NodeModel.findOneAndUpdate(
+          {
+            deviceKey,
+            status: 'offline',
+            nodeId: { $in: normalizedKnownNodeIds }
+          },
+          {
+            $set: {
+              url,
+              capacityBytes: capacity,
+              freeBytes: free,
+              status: 'online',
+              lastHeartbeatAt: new Date(),
+              ...(nodeKey ? { nodeKey } : {})
+            }
+          },
+          {
+            new: true,
+            sort: { createdAt: 1 }
+          }
+        );
 
-        if (oldestOfflineKnownNode) {
-          effectiveNodeId = oldestOfflineKnownNode.nodeId;
+        if (claimedKnownNode) {
+          effectiveNodeId = claimedKnownNode.nodeId;
         }
       }
 
@@ -82,22 +97,23 @@ function buildRoutes(config) {
         effectiveNodeId = `donor-${uuidv4().slice(0, 8)}`;
       }
 
-      const node = await NodeModel.findOneAndUpdate(
-        { nodeId: effectiveNodeId },
-        {
-          $set: {
-            nodeId: effectiveNodeId,
-            ...(deviceKey ? { deviceKey } : {}),
-            ...(nodeKey ? { nodeKey } : {}),
-            url,
-            capacityBytes: capacity,
-            freeBytes: free,
-            status: 'online',
-            lastHeartbeatAt: new Date()
-          }
-        },
-        { upsert: true, new: true, setDefaultsOnInsert: true }
-      );
+      const node = claimedKnownNode
+        || await NodeModel.findOneAndUpdate(
+          { nodeId: effectiveNodeId },
+          {
+            $set: {
+              nodeId: effectiveNodeId,
+              ...(deviceKey ? { deviceKey } : {}),
+              ...(nodeKey ? { nodeKey } : {}),
+              url,
+              capacityBytes: capacity,
+              freeBytes: free,
+              status: 'online',
+              lastHeartbeatAt: new Date()
+            }
+          },
+          { upsert: true, new: true, setDefaultsOnInsert: true }
+        );
 
       res.json({
         nodeId: node.nodeId,