javascript-solid-server 0.0.27 → 0.0.29

package/package.json

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

package/src/handlers/container.js

@@ -138,10 +138,11 @@ export async function createPodStructure(name, webId, baseUrl) {
   await storage.createContainer(`${podPath}public/`);
   await storage.createContainer(`${podPath}private/`);
   await storage.createContainer(`${podPath}settings/`);
+  await storage.createContainer(`${podPath}profile/`);
 
-  // Generate and write WebID profile as index.html at pod root
+  // Generate and write WebID profile at /profile/card (standard Solid location)
   const profileHtml = generateProfile({ webId, name, podUri, issuer });
-  await storage.write(`${podPath}index.html`, profileHtml);
+  await storage.write(`${podPath}profile/card`, profileHtml);
 
   // Generate and write preferences
   const prefs = generatePreferences({ webId, podUri });
@@ -175,6 +176,11 @@ export async function createPodStructure(name, webId, baseUrl) {
   const publicAcl = generatePublicFolderAcl(`${podUri}public/`, webId);
   await storage.write(`${podPath}public/.acl`, serializeAcl(publicAcl));
 
+  // Profile folder: owner full, public read (with inheritance)
+  // Profile documents must be publicly readable for WebID verification
+  const profileAcl = generatePublicFolderAcl(`${podUri}profile/`, webId);
+  await storage.write(`${podPath}profile/.acl`, serializeAcl(profileAcl));
+
   return { podPath, podUri };
 }
 
@@ -224,22 +230,22 @@ export async function handleCreatePod(request, reply) {
   }
 
   // Build URIs
-  // WebID is at pod root: /alice/#me (path mode) or alice.example.com/#me (subdomain mode)
+  // WebID follows standard Solid convention: /alice/profile/card#me
   const subdomainsEnabled = request.subdomainsEnabled;
   const baseDomain = request.baseDomain;
 
   let baseUri, podUri, webId;
   if (subdomainsEnabled && baseDomain) {
-    // Subdomain mode: alice.example.com/
+    // Subdomain mode: alice.example.com/profile/card#me
     const podHost = `${name}.${baseDomain}`;
     baseUri = `${request.protocol}://${baseDomain}`;
     podUri = `${request.protocol}://${podHost}/`;
-    webId = `${podUri}#me`;
+    webId = `${podUri}profile/card#me`;
   } else {
-    // Path mode: example.com/alice/
+    // Path mode: example.com/alice/profile/card#me
     baseUri = `${request.protocol}://${request.hostname}`;
     podUri = `${baseUri}${podPath}`;
-    webId = `${podUri}#me`;
+    webId = `${podUri}profile/card#me`;
   }
 
   // Issuer needs trailing slash for CTH compatibility

package/src/handlers/resource.js

@@ -495,20 +495,53 @@ export async function handlePatch(request, reply) {
 
   // Read existing content or start with empty JSON-LD document
   let document;
+  let htmlWrapper = null; // Track HTML wrapper for data island re-embedding
+
   if (resourceExists) {
     const existingContent = await storage.read(storagePath);
     if (existingContent === null) {
       return reply.code(500).send({ error: 'Read error' });
     }
 
-    // Parse existing document as JSON-LD
-    try {
-      document = JSON.parse(existingContent.toString());
-    } catch (e) {
-      return reply.code(409).send({
-        error: 'Conflict',
-        message: 'Resource is not valid JSON-LD and cannot be patched'
-      });
+    const contentStr = existingContent.toString();
+
+    // Check if this is HTML with embedded JSON-LD data island
+    if (contentStr.trimStart().startsWith('<!DOCTYPE') || contentStr.trimStart().startsWith('<html')) {
+      // Extract JSON-LD from <script type="application/ld+json"> tag
+      const jsonLdMatch = contentStr.match(/<script\s+type=["']application\/ld\+json["']\s*>([\s\S]*?)<\/script>/i);
+
+      if (!jsonLdMatch) {
+        return reply.code(409).send({
+          error: 'Conflict',
+          message: 'HTML document does not contain a JSON-LD data island'
+        });
+      }
+
+      try {
+        document = JSON.parse(jsonLdMatch[1]);
+        // Save the HTML parts for re-embedding after patch
+        const jsonLdStart = contentStr.indexOf(jsonLdMatch[0]) + jsonLdMatch[0].indexOf('>') + 1;
+        const jsonLdEnd = jsonLdStart + jsonLdMatch[1].length;
+        htmlWrapper = {
+          before: contentStr.substring(0, jsonLdStart),
+          after: contentStr.substring(jsonLdEnd)
+        };
+      } catch (e) {
+        return reply.code(409).send({
+          error: 'Conflict',
+          message: 'HTML data island contains invalid JSON-LD'
+        });
+      }
+    } else {
+      // Parse as plain JSON-LD
+      try {
+        document = JSON.parse(contentStr);
+      } catch (e) {
+        return reply.code(409).send({
+          error: 'Conflict',
+          message: 'Resource is not valid JSON-LD and cannot be patched'
+        });
+      }
     }
   } else {
     // Create empty JSON-LD document for new resource
@@ -568,7 +601,14 @@ export async function handlePatch(request, reply) {
   }
 
   // Write updated document
-  const updatedContent = JSON.stringify(updatedDocument, null, 2);
+  let updatedContent;
+  if (htmlWrapper) {
+    // Re-embed JSON-LD into HTML wrapper
+    const jsonLdStr = JSON.stringify(updatedDocument, null, 2);
+    updatedContent = htmlWrapper.before + '\n' + jsonLdStr + '\n  ' + htmlWrapper.after;
+  } else {
+    updatedContent = JSON.stringify(updatedDocument, null, 2);
+  }
   const success = await storage.write(storagePath, Buffer.from(updatedContent));
 
   if (!success) {

package/src/idp/interactions.js

@@ -354,10 +354,10 @@ export async function handleRegisterPost(request, reply, issuer) {
   }
 
   try {
-    // Build URLs
+    // Build URLs - WebID follows standard Solid convention: /profile/card#me
     const baseUrl = issuer.endsWith('/') ? issuer.slice(0, -1) : issuer;
     const podUri = `${baseUrl}/${username}/`;
-    const webId = `${podUri}#me`;
+    const webId = `${podUri}profile/card#me`;
 
     // Check if pod already exists
     const podPath = `${username}/`;

package/src/webid/profile.js

@@ -56,17 +56,17 @@ export function generateProfileJsonLd({ webId, name, podUri, issuer }) {
 }
 
 /**
- * Generate HTML profile with embedded JSON-LD
+ * Generate HTML profile with embedded JSON-LD data island
+ * The page uses mashlib + solidos-lite to render the profile from the data island
  * @param {object} options
  * @param {string} options.webId - Full WebID URI
  * @param {string} options.name - Display name
  * @param {string} options.podUri - Pod root URI
  * @param {string} options.issuer - OIDC issuer URI
- * @returns {string} HTML document with JSON-LD
+ * @returns {string} HTML document with JSON-LD data island
  */
 export function generateProfile({ webId, name, podUri, issuer }) {
   const jsonLd = generateProfileJsonLd({ webId, name, podUri, issuer });
-  const pod = podUri.endsWith('/') ? podUri : podUri + '/';
 
   return `<!DOCTYPE html>
 <html lang="en">
@@ -74,30 +74,52 @@ export function generateProfile({ webId, name, podUri, issuer }) {
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>${escapeHtml(name)}'s Profile</title>
+  <link rel="stylesheet" href="https://javascriptsolidserver.github.io/mashlib-jss/dist/mash.css">
   <script type="application/ld+json">
 ${JSON.stringify(jsonLd, null, 2)}
   </script>
   <style>
-    body { font-family: system-ui, sans-serif; max-width: 600px; margin: 2rem auto; padding: 0 1rem; }
-    h1 { color: #333; }
-    .card { background: #f5f5f5; padding: 1.5rem; border-radius: 8px; }
-    dt { font-weight: bold; margin-top: 1rem; }
-    dd { margin-left: 0; color: #666; }
-    a { color: #7c4dff; }
+    body { margin: 0; font-family: system-ui, sans-serif; }
+    .loading { padding: 2rem; text-align: center; color: #666; }
   </style>
 </head>
 <body>
-  <div class="card">
-    <h1>${escapeHtml(name)}</h1>
-    <dl>
-      <dt>WebID</dt>
-      <dd><a href="${escapeHtml(webId)}">${escapeHtml(webId)}</a></dd>
-      <dt>Storage</dt>
-      <dd><a href="${escapeHtml(pod)}">${escapeHtml(pod)}</a></dd>
-      <dt>Inbox</dt>
-      <dd><a href="${escapeHtml(pod)}inbox/">${escapeHtml(pod)}inbox/</a></dd>
-    </dl>
+  <div class="TabulatorOutline" id="DummyUUID" role="main">
+    <table id="outline"></table>
+    <div id="GlobalDashboard"></div>
   </div>
+  <div class="loading" id="loading">Loading profile...</div>
+
+  <script src="https://javascriptsolidserver.github.io/mashlib-jss/dist/mashlib.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/solidos-lite/solidos-lite.js"></script>
+  <script>
+  document.addEventListener('DOMContentLoaded', function() {
+    const loadingEl = document.getElementById('loading');
+
+    // Initialize solidos-lite to handle data islands
+    const success = SolidOSLite.init({ verbose: false });
+    if (!success) {
+      loadingEl.textContent = 'Failed to initialize. Please try refreshing.';
+      return;
+    }
+
+    // Parse data islands into the RDF store
+    SolidOSLite.parseAllIslands();
+
+    // Mark this document as already fetched
+    const pageBase = window.location.href.split('?')[0].split('#')[0];
+    const fetcher = SolidLogic.store.fetcher;
+    fetcher.requested[pageBase] = 'done';
+    fetcher.requested[pageBase.replace(/\\/$/, '')] = 'done';
+
+    // Navigate to #me
+    const subject = $rdf.sym(pageBase + '#me');
+    const outliner = panes.getOutliner(document);
+    outliner.GotoSubject(subject, true, undefined, true, undefined);
+
+    loadingEl.style.display = 'none';
+  });
+  </script>
 </body>
 </html>`;
 }