javascript-solid-server 0.0.17 → 0.0.19

package/.claude/settings.local.json

@@ -55,7 +55,17 @@
       "WebFetch(domain:communitysolidserver.github.io)",
       "WebFetch(domain:solidos.github.io)",
       "WebFetch(domain:solidcommunity.net)",
-      "WebFetch(domain:www.npmjs.com)"
+      "WebFetch(domain:www.npmjs.com)",
+      "Bash(pm2 list:*)",
+      "Bash(pm2 logs:*)",
+      "Bash(pm2 restart:*)",
+      "Bash(timeout 60 npm test:*)",
+      "Bash(pm2 stop:*)",
+      "Bash(pm2 delete:*)",
+      "Bash(pm2 start:*)",
+      "Bash(DATA_ROOT=/home/melvin/jss/data pm2 start:*)",
+      "Bash(pm2 save:*)",
+      "Bash(gh issue create:*)"
     ]
   }
 }

package/bin/jss.js

@@ -59,6 +59,9 @@ program
     try {
       const config = await loadConfig(options, options.config);
 
+      // Set DATA_ROOT env var so all modules use the same data directory
+      process.env.DATA_ROOT = path.resolve(config.root);
+
       if (options.printConfig) {
         printConfig(config);
         process.exit(0);

package/package.json

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

package/src/handlers/resource.js

@@ -1,5 +1,5 @@
 import * as storage from '../storage/filesystem.js';
-import { getAllHeaders } from '../ldp/headers.js';
+import { getAllHeaders, getNotFoundHeaders } from '../ldp/headers.js';
 import { generateContainerJsonLd, serializeJsonLd } from '../ldp/container.js';
 import { isContainer, getContentType, isRdfContentType, getEffectiveUrlPath } from '../utils/url.js';
 import { parseN3Patch, applyN3Patch, validatePatch } from '../patch/n3-patch.js';
@@ -37,6 +37,10 @@ export async function handleGet(request, reply) {
   const stats = await storage.stat(storagePath);
 
   if (!stats) {
+    const origin = request.headers.origin;
+    const connegEnabled = request.connegEnabled || false;
+    const headers = getNotFoundHeaders({ resourceUrl, origin, connegEnabled });
+    Object.entries(headers).forEach(([k, v]) => reply.header(k, v));
     return reply.code(404).send({ error: 'Not Found' });
   }
 
@@ -219,6 +223,10 @@ export async function handleHead(request, reply) {
   const stats = await storage.stat(storagePath);
 
   if (!stats) {
+    const origin = request.headers.origin;
+    const connegEnabled = request.connegEnabled || false;
+    const headers = getNotFoundHeaders({ resourceUrl, origin, connegEnabled });
+    Object.entries(headers).forEach(([k, v]) => reply.header(k, v));
     return reply.code(404).send();
   }
 
@@ -366,6 +374,10 @@ export async function handleDelete(request, reply) {
   // Check if resource exists and get current ETag
   const stats = await storage.stat(storagePath);
   if (!stats) {
+    const origin = request.headers.origin;
+    const connegEnabled = request.connegEnabled || false;
+    const headers = getNotFoundHeaders({ resourceUrl, origin, connegEnabled });
+    Object.entries(headers).forEach(([k, v]) => reply.header(k, v));
     return reply.code(404).send({ error: 'Not Found' });
   }
 
@@ -442,6 +454,10 @@ export async function handlePatch(request, reply) {
   // Check if resource exists
   const stats = await storage.stat(storagePath);
   if (!stats) {
+    const origin = request.headers.origin;
+    const connegEnabled = request.connegEnabled || false;
+    const headers = getNotFoundHeaders({ resourceUrl, origin, connegEnabled });
+    Object.entries(headers).forEach(([k, v]) => reply.header(k, v));
     return reply.code(404).send({ error: 'Not Found' });
   }
 

package/src/idp/interactions.js

@@ -118,20 +118,22 @@ export async function handleLogin(request, reply, provider) {
 
     request.log.info({ accountId: account.id, uid }, 'Login successful');
 
-    // For CTH compatibility, we need to return a response that CTH can handle.
-    // CTH expects either:
-    // 1. A redirect it can follow (but Java HttpClient follows to final destination which fails)
-    // 2. A 200 response with "location" in body (CSS v3+ style)
-    //
-    // We use interactionResult to get the redirect URL, then save it and return JSON
-
-    // Save the login result to the interaction for programmatic clients
-    // This allows the auth endpoint to continue the flow when resumed
+    // Detect if this is a browser (wants HTML/redirect) or programmatic client (wants JSON)
+    const acceptHeader = request.headers.accept || '';
+    const wantsBrowserRedirect = acceptHeader.includes('text/html') && !acceptHeader.includes('application/json');
+
+    // Save the login result to the interaction
     interaction.result = result;
     await interaction.save(interaction.exp - Math.floor(Date.now() / 1000));
 
-    // For CTH and programmatic clients: use interactionFinished with hijacked response
-    // to properly complete the interaction while returning JSON
+    // For browsers (mashlib, etc): do a proper HTTP redirect
+    if (wantsBrowserRedirect) {
+      reply.hijack();
+      return provider.interactionFinished(request.raw, reply.raw, result, { mergeWithLastSubmission: false });
+    }
+
+    // For CTH and programmatic clients: return JSON with location
+    // CTH expects a 200 response with "location" in body (CSS v3+ style)
     try {
       reply.hijack();
 
@@ -188,7 +190,6 @@ export async function handleLogin(request, reply, provider) {
       request.log.warn({ err: err.message, errName: err.name, uid }, 'interactionFinished failed, using fallback');
 
       // Fallback: return the redirect URL for manual following
-      // The interaction result is already saved above
       const redirectTo = `/idp/auth/${uid}`;
       return reply
         .code(200)

package/src/ldp/headers.js

@@ -108,3 +108,33 @@ export function getAllHeaders({ isContainer = false, etag = null, contentType =
     ...getCorsHeaders(origin)
   };
 }
+
+/**
+ * Get headers for 404 responses (non-existent resources)
+ * These headers tell clients what methods are supported for creating the resource
+ * @param {object} options
+ * @returns {object}
+ */
+export function getNotFoundHeaders({ resourceUrl = null, origin = null, connegEnabled = false }) {
+  // Determine if this would be a container based on URL ending with /
+  const isContainer = resourceUrl?.endsWith('/') || false;
+  const aclUrl = resourceUrl ? getAclUrl(resourceUrl, isContainer) : null;
+
+  // Get Accept-* headers
+  const acceptHeaders = getAcceptHeaders(connegEnabled, isContainer);
+
+  const headers = {
+    ...getCorsHeaders(origin),
+    'Link': aclUrl ? `<${aclUrl}>; rel="acl"` : '',
+    'Accept-Patch': 'text/n3, application/sparql-update',
+    'Accept-Put': acceptHeaders['Accept-Put'] || 'application/ld+json, */*',
+    'Allow': 'GET, HEAD, PUT, PATCH, OPTIONS' + (isContainer ? ', POST' : ''),
+    'Vary': connegEnabled ? 'Accept, Authorization, Origin' : 'Authorization, Origin'
+  };
+
+  if (isContainer && acceptHeaders['Accept-Post']) {
+    headers['Accept-Post'] = acceptHeaders['Accept-Post'];
+  }
+
+  return headers;
+}

package/src/utils/url.js

@@ -120,7 +120,13 @@ export function getContentType(filePath) {
     '.jpeg': 'image/jpeg',
     '.gif': 'image/gif',
     '.svg': 'image/svg+xml',
-    '.pdf': 'application/pdf'
+    '.pdf': 'application/pdf',
+    '.ttl': 'text/turtle',
+    '.n3': 'text/n3',
+    '.nt': 'application/n-triples',
+    '.rdf': 'application/rdf+xml',
+    '.nq': 'application/n-quads',
+    '.trig': 'application/trig'
   };
   return types[ext] || 'application/octet-stream';
 }
@@ -131,5 +137,15 @@ export function getContentType(filePath) {
  * @returns {boolean}
  */
 export function isRdfContentType(contentType) {
-  return contentType === 'application/ld+json' || contentType === 'application/json';
+  const rdfTypes = [
+    'application/ld+json',
+    'application/json',
+    'text/turtle',
+    'text/n3',
+    'application/n-triples',
+    'application/rdf+xml',
+    'application/n-quads',
+    'application/trig'
+  ];
+  return rdfTypes.includes(contentType);
 }

package/test-data-idp-accounts/.idp/accounts/95d4d470-1e8c-4b17-bcff-a62b8a54813b.json

@@ -0,0 +1,9 @@
+{
+  "id": "95d4d470-1e8c-4b17-bcff-a62b8a54813b",
+  "email": "credtest@example.com",
+  "passwordHash": "$2b$10$dfsBq19GkIsL/qaer5LlxeSD8cMFJS4U8o7Wt06f/u29Cdhc8eJ3i",
+  "webId": "http://localhost:3101/credtest/#me",
+  "podName": "credtest",
+  "createdAt": "2025-12-27T13:57:26.941Z",
+  "lastLogin": "2025-12-27T13:57:27.182Z"
+}

package/test-data-idp-accounts/.idp/accounts/_email_index.json

@@ -1,3 +1,3 @@
 {
-  "credtest@example.com": "ea61c611-2dda-41b8-8787-c6a22c5f33cc"
+  "credtest@example.com": "95d4d470-1e8c-4b17-bcff-a62b8a54813b"
 }

package/test-data-idp-accounts/.idp/accounts/_webid_index.json

@@ -1,3 +1,3 @@
 {
-  "http://localhost:3101/credtest/#me": "ea61c611-2dda-41b8-8787-c6a22c5f33cc"
+  "http://localhost:3101/credtest/#me": "95d4d470-1e8c-4b17-bcff-a62b8a54813b"
 }

package/test-data-idp-accounts/.idp/keys/jwks.json

@@ -3,20 +3,20 @@
     "keys": [
       {
         "kty": "EC",
-        "x": "hn3QE_mBUEFiANsvmP5MpvQWUCvTxfhBUYsJYbtCG_g",
-        "y": "0F9jdfVkLit5_xYsHsCstuMsRIa5R6GdciY8ZF1zcgs",
+        "x": "_0WHR5nff4EnQiPYLZEuPKNmV7qWxizbdY6NeepX4gc",
+        "y": "JowkolFdgQSs4GZ7nGN5ljMII8QAxHDYv2Qp4x5eHgo",
         "crv": "P-256",
-        "d": "ippBE99bkrgDX1EQa3awsciu035kbhukikfYwZYh1Jc",
-        "kid": "267aed32-f9f4-4c72-9925-3e025b775bca",
+        "d": "zvFCMQvrEJwSTkfloHws3EFQRA0o5abR22so5LcCTao",
+        "kid": "ed8976e4-f907-4fb4-82ff-846a62807dd7",
         "use": "sig",
         "alg": "ES256",
-        "iat": 1766841163
+        "iat": 1766843846
       }
     ]
   },
   "cookieKeys": [
-    "Zf-WDQBZkGGOED37Z3NzHsO9Jy1L7AEgjIDfHbFbyp4",
-    "8MTMciOb4PQqVcG2SrwmPSAYFrhW8eS46WB7gDqK0CQ"
+    "oQ-IdseWVLpOiwPmpYeY1ShFHI3lLHRiW6NsYeNBpP0",
+    "xrKoXpxC4O7wOZ65jNr4Kw7DnFYdkyK4pw2HOJE4D10"
   ],
-  "createdAt": "2025-12-27T13:12:43.907Z"
+  "createdAt": "2025-12-27T13:57:26.882Z"
 }

package/test-data-idp-accounts/.idp/accounts/ea61c611-2dda-41b8-8787-c6a22c5f33cc.json

@@ -1,9 +0,0 @@
-{
-  "id": "ea61c611-2dda-41b8-8787-c6a22c5f33cc",
-  "email": "credtest@example.com",
-  "passwordHash": "$2b$10$EVWVKsbQ4A6DdswLEK/0ZOclDrBHBo/9GbWeP1s5uvxy4jWjTnY0m",
-  "webId": "http://localhost:3101/credtest/#me",
-  "podName": "credtest",
-  "createdAt": "2025-12-27T13:12:43.961Z",
-  "lastLogin": "2025-12-27T13:12:44.207Z"
-}