allow creating relative symlinks to worker sockets; in fact, let's do…

… that by default now

docs/user/03-config.md

@@ -27,6 +27,7 @@ The `options` object can contain the following keys:
 | `onlineTimeout`    | `int`    | The timeout for worker processes to report themselves as being online, in milliseconds. The countdown starts when the worker is spawned. This may need to be adjusted if your workers take a long time to initialise. Default: `10000`.                                                        |
 | `shutdownTimeout`  | `int`    | The time after sending the worker a `shutdown` message after which more drastic measures should be taken if the worker fails to terminate. Default: `10000`.                                                                                                                                   |
 | `maxStartAttempts` | `int`    | The maximum number of attempts to start a worker before an error is thrown. This is only applied when an explicit CLI command like `start` or `set-workers` is issued (including starting the daemon itself) - when a worker dies on its own, it will be restarted indefinitely. Default: `1`. |
+| `symlinks`         | `string` | Specifies how the worker sockets should be referenced in the symlinks exposed to Nginx. Can be either `absolute` or `relative`. By default, the symlinks will be relative.                                                                                                                     |
 
 
 ## Config files vs. paths

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodesockd",
-  "version": "2.0.0-rc.6",
+  "version": "2.0.0-rc.7",
   "description": "Bridges a Nginx reverse proxy to a Node.js service using Unix sockets",
   "homepage": "https://github.com/cdn77/node-socket-daemon",
   "license": "MIT",

src/common/config.ts

@@ -8,6 +8,7 @@ const partialOptionsSchema = z.strictObject({
   onlineTimeout: z.number().int().min(1).optional(),
   shutdownTimeout: z.number().int().min(1).optional(),
   maxStartAttempts: z.number().int().min(1).optional(),
+  symlinks: z.enum(['absolute', 'relative']).optional(),
   stdout: z.string().optional(),
   stderr: z.string().nullable().optional(),
 });
@@ -31,6 +32,7 @@ const finalOptionsSchema = z.strictObject({
   onlineTimeout: z.number().int().min(1).default(10000),
   shutdownTimeout: z.number().int().min(1).default(10000),
   maxStartAttempts: z.number().int().min(1).default(1),
+  symlinks: z.enum(['absolute', 'relative']).default('relative'),
   stdout: z.string().optional(),
   stderr: z.string().nullable().optional(),
 });

src/daemon/processManager.ts

@@ -415,7 +415,7 @@ export class ProcessManager extends EventEmitter<ProcessManagerEvents> {
 
     this.logger.debug(`Symlinking socket for worker ${worker.descr}`);
     const socketPath = this.formatWorkerSocketPath(worker.idx);
-    const actualPath = this.formatWorkerSocketPath(worker.id);
+    const actualPath = this.formatWorkerSocketPath(worker.id, this.config.options.symlinks === 'relative');
     const tmpPath = `${socketPath}.new`;
     await symlink(actualPath, tmpPath);
     await rename(tmpPath, socketPath);
@@ -428,7 +428,8 @@ export class ProcessManager extends EventEmitter<ProcessManagerEvents> {
     } catch { /* noop */ }
   }
 
-  private formatWorkerSocketPath(worker: number | string): string {
-    return this.config.socketFile.replace('{worker}', worker.toString());
+  private formatWorkerSocketPath(worker: number | string, relative: boolean = false): string {
+    const path = this.config.socketFile.replace('{worker}', worker.toString());
+    return relative ? path.replace(/^.*\//, './') : path;
   }
 }