@kadi.build/file-sharing 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kadi.build/file-sharing",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "File sharing service with tunneling and local S3-compatible interface",
   "type": "module",
   "main": "src/index.js",

package/src/FileSharingServer.js

@@ -123,6 +123,16 @@ function _filterDefined(obj) {
   return Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== undefined));
 }
 
+/**
+ * Convert a bind address (like `0.0.0.0` or `::`) into a client-usable address.
+ * Bind-all addresses are not connectable by clients; replace them with `127.0.0.1`.
+ * @param {string} host
+ * @returns {string}
+ */
+function _clientHost(host) {
+  return (host === '0.0.0.0' || host === '::' || host === '[::]') ? '127.0.0.1' : host;
+}
+
 export class FileSharingServer extends EventEmitter {
   constructor(config = {}) {
     super();
@@ -169,6 +179,24 @@ export class FileSharingServer extends EventEmitter {
       };
     }
 
+    // ----------------------------------------------------------------
+    // Port collision detection: when S3 is enabled and both ports match,
+    // auto-assign s3Port to 0 (OS picks a free port) to avoid EADDRINUSE.
+    // ----------------------------------------------------------------
+    if (this.config.enableS3 && this.config.port === this.config.s3Port && this.config.port !== 0) {
+      const userExplicitlySetS3Port = config.s3Port !== undefined;
+      if (userExplicitlySetS3Port) {
+        throw new Error(
+          `Port collision: port and s3Port are both set to ${this.config.port}. ` +
+          `The HTTP server and S3 server cannot bind the same port. ` +
+          `Please specify a different s3Port (or use s3Port: 0 for auto-assign).`
+        );
+      }
+      // User only set `port` (not s3Port) and it happens to match the s3Port default.
+      // Auto-resolve by letting the OS pick a free port for S3.
+      this.config.s3Port = 0;
+    }
+
     // ----------------------------------------------------------------
     // Load secrets from env vars / .env (constructor config takes priority)
     // ----------------------------------------------------------------
@@ -337,7 +365,13 @@ export class FileSharingServer extends EventEmitter {
     }
 
     const service = options.service || 'kadi'; // KĀDI is the default
-    const port = this.config.port;
+
+    // Allow caller to specify which port to tunnel via options.port.
+    // Default: when S3 is running, target the S3 port (where custom routes
+    // and middleware are installed via addCustomRoute/addMiddleware).
+    // Otherwise fall back to the HTTP file-server port.
+    const port = options.port
+      ?? (this.s3Server?.isRunning ? this.s3Server.config.port : this.config.port);
 
     // TunnelManager.createTunnel(port, options) — port is first arg (number),
     // options.service tells it which provider to use.
@@ -412,12 +446,13 @@ export class FileSharingServer extends EventEmitter {
    * @returns {object} Server information
    */
   getInfo() {
+    const host = _clientHost(this.config.host);
     return {
       isRunning: this.isRunning,
-      localUrl: `http://${this.config.host}:${this.config.port}`,
+      localUrl: `http://${host}:${this.config.port}`,
       publicUrl: this.tunnel?.publicUrl || null,
       s3Endpoint: this.s3Server?.isRunning
-        ? `http://${this.config.host}:${this.config.s3Port}`
+        ? `http://${host}:${this.s3Server.config.port}`
         : null,
       staticDir: this.config.staticDir,
       stats: this.downloadMonitor.getStats(),
@@ -488,7 +523,7 @@ export class FileSharingServer extends EventEmitter {
   /** @type {string|null} */
   get s3Endpoint() {
     return this.s3Server?.isRunning
-      ? `http://${this.config.host}:${this.config.s3Port}`
+      ? `http://${_clientHost(this.config.host)}:${this.s3Server.config.port}`
       : null;
   }
 

package/src/HttpServerProvider.js

@@ -88,10 +88,14 @@ export class HttpServerProvider extends EventEmitter {
         this.startTime = new Date();
 
         const protocol = this.config.ssl ? 'https' : 'http';
+        // Use a client-connectable host in the URL (0.0.0.0 is a bind address, not routable)
+        const clientHost = (this.config.host === '0.0.0.0' || this.config.host === '::' || this.config.host === '[::]')
+          ? '127.0.0.1'
+          : this.config.host;
         const info = {
           port: addr.port,
           host: this.config.host,
-          url: `${protocol}://${this.config.host}:${addr.port}`
+          url: `${protocol}://${clientHost}:${addr.port}`
         };
 
         this.emit('started', info);

package/src/S3Server.js

@@ -70,9 +70,12 @@ export class S3Server extends EventEmitter {
    */
   async start() {
     if (this.isRunning) {
+      const clientHost = (this.config.host === '0.0.0.0' || this.config.host === '::' || this.config.host === '[::]')
+        ? '127.0.0.1'
+        : this.config.host;
       return {
         port: this.config.port,
-        endpoint: `http://${this.config.host}:${this.config.port}`
+        endpoint: `http://${clientHost}:${this.config.port}`
       };
     }
 
@@ -118,10 +121,14 @@ export class S3Server extends EventEmitter {
         this.isRunning = true;
         this._serverId = `kadi-s3-${addr.port}`;
 
+        // Use a client-connectable host in the endpoint (0.0.0.0 is a bind address, not routable)
+        const clientHost = (this.config.host === '0.0.0.0' || this.config.host === '::' || this.config.host === '[::]')
+          ? '127.0.0.1'
+          : this.config.host;
         const info = {
           port: addr.port,
           host: this.config.host,
-          endpoint: `http://${this.config.host}:${addr.port}`,
+          endpoint: `http://${clientHost}:${addr.port}`,
           serverId: this._serverId
         };