nodio-cli 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodio-cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "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 });
   });
 }
 
@@ -46,13 +46,35 @@ async function findFreePort(startPort, endPort) {
   throw new Error(`no free port found in range ${startPort}-${endPort}`);
 }
 
+function detectAdvertisedHost() {
+  const interfaces = os.networkInterfaces();
+  for (const addresses of Object.values(interfaces)) {
+    if (!Array.isArray(addresses)) {
+      continue;
+    }
+
+    for (const address of addresses) {
+      if (address.family === 'IPv4' && !address.internal) {
+        return address.address;
+      }
+    }
+  }
+
+  return '127.0.0.1';
+}
+
+function isLoopbackHost(host) {
+  const normalized = String(host || '').trim().toLowerCase();
+  return normalized === '127.0.0.1' || normalized === 'localhost' || normalized === '::1';
+}
+
 program
   .name('nodio-node')
   .description('Nodio donor node CLI')
   .argument('[capacity]', 'optional capacity shorthand, e.g. 10gb')
   .option('--node-id <id>', 'unique node ID (optional; auto-assigned and persisted if omitted)')
   .option('--server <url>', 'central server URL', 'https://api.nodio.me')
-  .option('--host <host>', 'host/IP exposed to network', '127.0.0.1')
+  .option('--host <host>', 'host/IP exposed to network (default: auto-detected LAN IP)', 'auto')
   .option('--port <port>', 'port to expose shard API (auto-picked when omitted)')
   .option('--storage-dir <path>', 'local shard storage directory (defaults to ~/.nodio-nodes/node-<port>)')
   .option('--capacity-gb <gb>', 'donated capacity in GB', '10')
@@ -70,6 +92,7 @@ program.action(async (capacityArg, options) => {
   const parsedCapacityArg = parseCapacityGb(capacityArg);
   const capacityGb = parsedCapacityArg ?? Number(options.capacityGb);
   const heartbeatMs = Number(options.heartbeatMs);
+  const advertisedHost = options.host === 'auto' ? detectAdvertisedHost() : options.host;
   const storageDir = options.storageDir
     ? path.resolve(options.storageDir)
     : path.join(os.homedir(), '.nodio-nodes', `node-${port}`);
@@ -87,10 +110,14 @@ program.action(async (capacityArg, options) => {
     throw new Error('heartbeat-ms must be greater than 0');
   }
 
+  if (isLoopbackHost(advertisedHost)) {
+    console.warn('[nodio-node] warning: loopback host is advertised; only this machine can reach this donor');
+  }
+
   const runtime = new NodioNodeRuntime({
     nodeId: options.nodeId,
     serverUrl: options.server,
-    publicUrl: `http://${options.host}:${port}`,
+    publicUrl: `http://${advertisedHost}:${port}`,
     port,
     storageDir,
     capacityBytes: Math.floor(capacityGb * 1024 * 1024 * 1024),

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

@@ -58,23 +58,53 @@ function buildRoutes(config) {
         existingByNodeKey = await NodeModel.findOne({ nodeKey }).lean();
       }
 
+      if (existingByNodeKey && deviceKey && existingByNodeKey.deviceKey && existingByNodeKey.deviceKey !== deviceKey) {
+        return res.status(409).json({ error: 'nodeKey belongs to a different device' });
+      }
+
       if (existingByNodeKey && nodeId && nodeId !== existingByNodeKey.nodeId) {
         return res.status(409).json({ error: 'nodeKey is already associated with a different nodeId' });
       }
 
       let effectiveNodeId = nodeId || existingByNodeKey?.nodeId || null;
+      let claimedKnownNode = null;
+
+      if (effectiveNodeId && deviceKey) {
+        const existingByNodeId = await NodeModel.findOne({ nodeId: effectiveNodeId }).lean();
+        if (
+          existingByNodeId
+          && existingByNodeId.deviceKey
+          && existingByNodeId.deviceKey !== deviceKey
+        ) {
+          return res.status(409).json({ error: 'nodeId belongs to a different device' });
+        }
+      }
 
       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 +112,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,