javascript-solid-server 0.0.135 → 0.0.137

package/jsserve/package.json

@@ -0,0 +1,45 @@
+{
+  "name": "servejss",
+  "version": "0.0.7",
+  "description": "Static file server with REST write support - npx serve alternative",
+  "keywords": [
+    "serve",
+    "static",
+    "server",
+    "http",
+    "rest",
+    "webdav",
+    "file-server",
+    "development",
+    "solid"
+  ],
+  "type": "module",
+  "bin": {
+    "servejss": "./bin/jsserve.js"
+  },
+  "files": [
+    "bin",
+    "src"
+  ],
+  "scripts": {
+    "test": "node --test test/*.test.js"
+  },
+  "dependencies": {
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "javascript-solid-server": ">=0.0.136"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/JavaScriptSolidServer/jsserve.git"
+  },
+  "homepage": "https://github.com/JavaScriptSolidServer/jsserve#readme",
+  "bugs": {
+    "url": "https://github.com/JavaScriptSolidServer/jsserve/issues"
+  },
+  "author": "JavaScriptSolidServer Contributors",
+  "license": "MIT",
+  "engines": {
+    "node": ">=18"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-solid-server",
-  "version": "0.0.135",
+  "version": "0.0.137",
   "description": "A minimal, fast Solid server",
   "main": "src/index.js",
   "type": "module",

package/src/notifications/websocket.js

@@ -204,11 +204,18 @@ export function broadcast(url) {
   // Notify direct subscribers
   notifySubscribers(url);
 
-  // Also notify container subscribers (parent directory)
-  // This allows subscribing to a container and getting notified of all child changes
-  const containerUrl = getParentContainer(url);
-  if (containerUrl && containerUrl !== url) {
+  // Walk up all ancestor containers so subscribing to a root
+  // catches changes in nested paths (e.g. /db/mydata/ catches /db/mydata/issues/1)
+  // Stop at the origin root to avoid climbing past the hostname
+  let originRoot;
+  try { originRoot = new URL(url).origin + '/'; } catch (e) { return; }
+
+  let currentUrl = url;
+  let containerUrl = getParentContainer(currentUrl);
+  while (containerUrl && containerUrl !== currentUrl && containerUrl.length >= originRoot.length) {
     notifySubscribers(containerUrl);
+    currentUrl = containerUrl;
+    containerUrl = getParentContainer(currentUrl);
   }
 }
 

package/src/server.js

@@ -182,6 +182,8 @@ export function createServer(options = {}) {
   fastify.decorateRequest('defaultQuota', null);
   fastify.decorateRequest('config', null);
   fastify.decorateRequest('liveReloadEnabled', null);
+  fastify.decorateRequest('singleUser', null);
+  fastify.decorateRequest('singleUserName', null);
   fastify.addHook('onRequest', async (request) => {
     request.connegEnabled = connegEnabled;
     request.notificationsEnabled = notificationsEnabled || liveReloadEnabled;
@@ -195,6 +197,8 @@ export function createServer(options = {}) {
     request.defaultQuota = defaultQuota;
     request.config = { public: options.public, readOnly: options.readOnly };
     request.liveReloadEnabled = liveReloadEnabled;
+    request.singleUser = singleUser;
+    request.singleUserName = singleUserName;
 
     // Extract pod name from subdomain if enabled
     if (subdomainsEnabled && baseDomain) {

package/src/utils/url.js

@@ -150,22 +150,45 @@ export function getResourceName(urlPath) {
 
 /**
  * Extract pod name from URL path or request
+ *
+ * Resolves to one of four shapes, by deployment mode:
+ *
+ * - Subdomain mode with a recognized subdomain → `request.podName` (from hostname).
+ * - Subdomain mode with no recognized subdomain → `null` (base-domain access;
+ *   callers guard with `if (podName)` and skip pod-scoped side effects).
+ * - Single-user, root-pod (`singleUserName` empty or '/') → `'.'` so
+ *   `path.join(dataRoot, '.', QUOTA_FILE)` collapses to `<dataRoot>/QUOTA_FILE`.
+ * - Single-user, named pod → `singleUserName` (all requests share the one pod,
+ *   independent of URL — avoids mistaking a URL segment like `index.html`
+ *   for a pod name).
+ * - Path-based multi-pod (default, no flags) → first URL segment, or `null`
+ *   for requests at `/` that aren't inside any pod.
+ *
+ * Background: before this function knew about single-user mode, a
+ * `PUT /index.html` on a single-user root-pod deployment produced a pod name
+ * of `"index.html"`, and the quota sidecar landed at
+ * `<dataRoot>/index.html/.quota.json` → `ENOTDIR` (index.html is a file).
+ *
  * @param {string|object} pathOrRequest - URL path string or Fastify request object
- * @returns {string|null} - Pod name or null if not found
+ * @returns {string|null} - Pod name, `'.'` for root-pod, or `null` when no pod applies
  */
 export function getPodName(pathOrRequest) {
-  // If it's a request object
-  if (typeof pathOrRequest === 'object') {
-    // Subdomain mode: pod name from hostname
-    if (pathOrRequest.subdomainsEnabled && pathOrRequest.podName) {
-      return pathOrRequest.podName;
+  if (typeof pathOrRequest === 'object' && pathOrRequest !== null) {
+    // Subdomain mode: hostname drives it. Unrecognized host → no pod.
+    if (pathOrRequest.subdomainsEnabled) {
+      return pathOrRequest.podName || null;
     }
-    // Path mode: extract from URL
+    // Single-user mode: always the one pod, regardless of URL path.
+    if (pathOrRequest.singleUser) {
+      const name = pathOrRequest.singleUserName;
+      return (!name || name === '/') ? '.' : name;
+    }
+    // Path-based multi-pod: first URL segment.
     const urlPath = pathOrRequest.url?.split('?')[0] || '';
     return getPodNameFromPath(urlPath);
   }
 
-  // If it's a string path
+  // String form: path-based pod extraction.
   return getPodNameFromPath(pathOrRequest);
 }
 

package/test/url.test.js

@@ -0,0 +1,75 @@
+/**
+ * Unit tests for src/utils/url.js
+ *
+ * Focus: getPodName() resolution across the four supported deployment modes.
+ * Regression guard for #278 (single-user root-pod PUT → ENOTDIR).
+ */
+
+import { describe, it } from 'node:test';
+import assert from 'node:assert';
+import { getPodName } from '../src/utils/url.js';
+
+describe('getPodName', () => {
+  describe('subdomain mode', () => {
+    it('returns request.podName when the subdomain is recognized', () => {
+      const req = { subdomainsEnabled: true, podName: 'alice', url: '/profile/card' };
+      assert.strictEqual(getPodName(req), 'alice');
+    });
+
+    it('returns null on base-domain access (no recognized subdomain)', () => {
+      const req = { subdomainsEnabled: true, podName: null, url: '/anything' };
+      assert.strictEqual(getPodName(req), null);
+    });
+  });
+
+  describe('single-user mode', () => {
+    it("returns '.' for a root pod (singleUserName empty)", () => {
+      const req = { singleUser: true, singleUserName: '', url: '/index.html' };
+      assert.strictEqual(getPodName(req), '.');
+    });
+
+    it("returns '.' for a root pod (singleUserName '/')", () => {
+      const req = { singleUser: true, singleUserName: '/', url: '/index.html' };
+      assert.strictEqual(getPodName(req), '.');
+    });
+
+    it('returns singleUserName for a named pod, regardless of URL', () => {
+      const req = { singleUser: true, singleUserName: 'me', url: '/index.html' };
+      assert.strictEqual(getPodName(req), 'me');
+    });
+
+    it('does not mistake a URL segment for a pod in single-user mode', () => {
+      // Regression for #278: PUT /index.html previously produced pod
+      // "index.html", making the quota sidecar path <dataRoot>/index.html/.quota.json.
+      const req = { singleUser: true, singleUserName: '', url: '/index.html' };
+      assert.notStrictEqual(getPodName(req), 'index.html');
+    });
+  });
+
+  describe('path-based multi-pod (default)', () => {
+    it('returns the first URL segment as the pod name', () => {
+      const req = { url: '/alice/profile/card' };
+      assert.strictEqual(getPodName(req), 'alice');
+    });
+
+    it('returns null for requests at /', () => {
+      const req = { url: '/' };
+      assert.strictEqual(getPodName(req), null);
+    });
+
+    it('skips system paths beginning with a dot', () => {
+      const req = { url: '/.well-known/openid-configuration' };
+      assert.strictEqual(getPodName(req), null);
+    });
+  });
+
+  describe('string-form input', () => {
+    it('extracts pod name from a URL path string', () => {
+      assert.strictEqual(getPodName('/alice/foo'), 'alice');
+    });
+
+    it('returns null for the root path', () => {
+      assert.strictEqual(getPodName('/'), null);
+    });
+  });
+});