clay-server 5.3.0-beta.5 → 5.3.0-beta.7

package/lib/project-file-watch.js

@@ -31,8 +31,7 @@ function attachFileWatch(ctx) {
   }
 
   // --- File watcher ---
-  // One open file per websocket client. A project-wide singleton watcher made
-  // one browser tab silently replace another tab's live preview subscription.
+  // Bounded instance subscriptions belong to the authenticated socket.
   var fileWatchers = new Map();
 
   function settleFileWatchReady(entry, ready) {
@@ -76,6 +75,7 @@ function attachFileWatch(ctx) {
     var latest = fileWatchers.get(key);
     if (!latest || latest.relPath !== relPath) return;
     try {
+      if (latest.authority !== JSON.stringify([client && client._clayUser && client._clayUser.id || null, scopeFor(client)])) { closeFileWatch(key); return; }
       var snapshot = readFileSnapshot(client, relPath);
       if (!snapshot) return;
       if (latest.hasSnapshot && latest.content === snapshot.content && latest.size === snapshot.size) return;
@@ -84,6 +84,8 @@ function attachFileWatch(ctx) {
       latest.size = snapshot.size;
       sendFileChanged(client, {
         type: "fs_file_changed",
+        instanceId: latest.instanceId,
+        requestId: latest.requestId,
         path: relPath,
         content: snapshot.content,
         size: snapshot.size,
@@ -95,7 +97,7 @@ function attachFileWatch(ctx) {
     }
   }
 
-  function startFileWatch(client, relPath) {
+  function startFileWatch(client, relPath, binding) {
     // Preserve the old single-argument API for callers outside the websocket
     // file browser. They share one legacy subscription.
     if (typeof relPath !== "string") {
@@ -104,9 +106,16 @@ function attachFileWatch(ctx) {
     }
     var absPath;
     try { absPath = checkedPath(relPath, scopeFor(client)); } catch (error) { return Promise.resolve(false); }
+    if (binding && (!/^[A-Za-z0-9_-]{1,128}$/.test(binding.instanceId || '') || typeof binding.requestId !== 'string' || binding.requestId.length > 128)) return Promise.resolve(false);
     var key = client || "_legacy";
+    if (binding) {
+      var entries = Array.from(fileWatchers.entries()).filter(function (pair) { return pair[1].client === client; });
+      var match = entries.find(function (pair) { return pair[1].instanceId === binding.instanceId; });
+      if (!match && entries.length >= 8) return Promise.resolve(false);
+      key = match ? match[0] : {};
+    }
     var existing = fileWatchers.get(key);
-    if (existing && existing.relPath === relPath) return existing.ready;
+    if (existing && existing.relPath === relPath && existing.requestId === (binding ? binding.requestId : undefined)) return existing.ready;
     closeFileWatch(key);
 
     // Watch the parent directory rather than the file inode. Editors and agent
@@ -132,6 +141,10 @@ function attachFileWatch(ctx) {
       var ready = new Promise(function (resolve) { resolveReady = resolve; });
       var entry = {
         watcher: watcher,
+        client: client,
+        authority: JSON.stringify([client && client._clayUser && client._clayUser.id || null, scopeFor(client)]),
+        instanceId: binding ? binding.instanceId : undefined,
+        requestId: binding ? binding.requestId : undefined,
         relPath: relPath,
         debounce: null,
         reconcile: null,
@@ -158,7 +171,7 @@ function attachFileWatch(ctx) {
         publishFileChanged(key, client, relPath);
         if (fileWatchers.get(key) === entry) settleFileWatchReady(entry, true);
       });
-      watcher.on("error", function () { closeFileWatch(key); });
+      watcher.on("error", function () { if (fileWatchers.get(key) === entry) closeFileWatch(key); });
       return ready;
     } catch (e) {
       closeFileWatch(key);
@@ -166,9 +179,15 @@ function attachFileWatch(ctx) {
     }
   }
 
-  function stopFileWatch(client) {
+  function stopFileWatch(client, binding) {
     if (arguments.length > 0) {
-      closeFileWatch(client || "_legacy");
+      Array.from(fileWatchers.entries()).forEach(function (pair) {
+        var entry = pair[1];
+        if (entry.client !== client) return;
+        if (binding && (entry.instanceId !== binding.instanceId || entry.requestId !== binding.requestId)) return;
+        closeFileWatch(pair[0]);
+      });
+      if (!binding) closeFileWatch(client || "_legacy");
       return;
     }
     var keys = Array.from(fileWatchers.keys());

package/lib/project-filesystem.js

@@ -45,13 +45,14 @@ function attachFilesystem(ctx) {
     // Resolve live authority before every operation; never trust message roles.
     if (/^fs_/.test(msg.type) && msg.type !== "fs_unwatch") {
       try {
+        if (msg.instanceId && (msg.projectSlug !== slug || (msg.accountId || null) !== (ws._clayUser && ws._clayUser.id || null))) throw new Error('File pane context changed');
         fileScope = access.fileScope(ws);
         if (/^fs_(list|read|write|watch)$/.test(msg.type)) {
           fileTarget = resolveFilePath(cwd, msg.type === "fs_list" ? msg.path || "." : msg.path, fileScope);
         }
       } catch (e) {
         var denied = fileError(e);
-        sendTo(ws, { type: msg.type + "_result", path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId, ok: false, error: denied.message, errorCode: denied.code });
+        sendTo(ws, { type: msg.type + "_result", path: msg.path, instanceId: msg.instanceId, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId, ok: false, error: denied.message, errorCode: denied.code });
         return true;
       }
     }
@@ -115,7 +116,7 @@ function attachFilesystem(ctx) {
 
     // --- fs_read ---
     if (msg.type === "fs_read") {
-      var metadata = { type: 'fs_read_result', path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId };
+      var metadata = { type: 'fs_read_result', path: msg.path, instanceId: msg.instanceId, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId };
       try {
         var readResult = operations.read(fileScope, msg.path);
         try { var fileSnapshot = operations.snapshot(fileScope, msg.path); if (fileSnapshot.hash === require('crypto').createHash('sha256').update(readResult.content).digest('hex')) readResult.controlRevision = require('./clay-control-target-projection').digest(fileSnapshot); } catch (ignored) {}
@@ -210,12 +211,12 @@ function attachFilesystem(ctx) {
 
     // --- File watcher ---
     if (msg.type === "fs_watch") {
-      if (msg.path) startFileWatch(ws, msg.path);
+      if (msg.path) startFileWatch(ws, msg.path, msg.instanceId ? { instanceId: msg.instanceId, requestId: msg.requestId } : null);
       return true;
     }
 
     if (msg.type === "fs_unwatch") {
-      stopFileWatch(ws);
+      stopFileWatch(ws, msg.instanceId ? { instanceId: msg.instanceId, requestId: msg.requestId } : { instanceId: undefined, requestId: undefined });
       return true;
     }
 

package/lib/project-sessions.js

@@ -93,6 +93,7 @@ function formatAskUserAnswerAsMessage(input, answers) {
 function attachSessions(ctx) {
   var mateDefaultsToken = {};
   var contextUsage = contextUsageModule.attachContextUsage(ctx);
+  var backgroundTaskReader = require("./project-background-tasks").attach(ctx);
   var cwd = ctx.cwd;
   var slug = ctx.slug;
   var isMate = ctx.isMate;
@@ -606,6 +607,7 @@ function attachSessions(ctx) {
     if (workerRemoval.handleMessage(ws, msg)) return true;
     if (serverSettingsMessages.handleServerSettings({ opts: opts, usersModule: usersModule, sendTo: sendTo, send: send }, ws, msg)) return true;
     if (contextUsage.handleMessage(ws, msg)) return true;
+    if (backgroundTaskReader.handleMessage(ws, msg)) return true;
 
     if (msg.type === "push_subscribe") {
       var _pushUserId = ws._clayUser ? ws._clayUser.id : null;
@@ -681,6 +683,9 @@ function attachSessions(ctx) {
         if (creationRequestId) sendTo(ws, { type: "new_session_result", requestId: creationRequestId, ok: false, error: text });
         else sendTo(ws, { type: "error", text: text });
       };
+      if (msg.activate === false && (!creationRequestId || isMate || ws._clayPane || msg.slug !== slug)) {
+        creationFailed("Inactive creation requires this exact project and an ordinary session request."); return true;
+      }
       // The same request id is created at most once per socket.
       if (creationRequestId) {
         if (!ws._createdRequests) ws._createdRequests = [];
@@ -723,7 +728,8 @@ function attachSessions(ctx) {
       // Reuse an existing blank GUI session instead of stacking another
       // one. A vendor-less blank is acceptable: nothing has happened in it,
       // so stamping the requested vendor is equivalent to a fresh create.
-      var reusable = msg.forceNew === true ? null : sm.findReusableBlankSession({
+      var inactiveCreation = msg.activate === false && !!creationRequestId && !isMate && !ws._clayPane;
+      var reusable = msg.forceNew === true || inactiveCreation ? null : sm.findReusableBlankSession({
         vendor: sessionOpts.vendor || null,
         ownerId: sessionOpts.ownerId || null,
       });
@@ -734,9 +740,10 @@ function attachSessions(ctx) {
         sm.switchSession(reusable.localId, ws);
         newSess = reusable;
       } else {
-        newSess = sm.createSession(sessionOpts, ws);
+        newSess = inactiveCreation ? sm.createSessionRaw(sessionOpts) : sm.createSession(sessionOpts, ws);
       }
-      ws._clayActiveSession = newSess.localId;
+      if (!inactiveCreation) ws._clayActiveSession = newSess.localId;
+      else { sm.saveSessionFile(newSess); sm.broadcastSessionList(); }
       var folderPlaced = msg.folderId === undefined ? null : sessionFolders.placeNewSession(ws, newSess, msg.folderId, msg.folderSlug);
       if (msg.requestId) {
         var created = { type: "new_session_result", requestId: String(msg.requestId).substring(0, 200), ok: true, sessionId: newSess.localId };
@@ -758,8 +765,8 @@ function attachSessions(ctx) {
         send({ type: "last_vendor", vendor: msg.vendor });
       }
       var nsPresKey = ws._clayUser ? ws._clayUser.id : "_default";
-      if (!ws._clayPane) userPresence.setPresence(slug, nsPresKey, userPresence.sessionIdForPersistence(newSess), null);
-      if (usersModule.isMultiUser() && !ws._clayPane) {
+      if (!inactiveCreation && !ws._clayPane) userPresence.setPresence(slug, nsPresKey, userPresence.sessionIdForPersistence(newSess), null);
+      if (!inactiveCreation && usersModule.isMultiUser() && !ws._clayPane) {
         broadcastPresence();
       }
       return true;

package/lib/project-shared-browser.js

@@ -52,9 +52,13 @@ function attachSharedBrowser(ctx) {
     if (tabs.length > 1) throw new Error("Choose a browserId from status before operating a tab");
     return tabs[0] || null;
   }
+  function sendBrowserMessage(ws, session, message) {
+    var payload = require('./pane-session-transport').outbound(ws, message, session.localId);
+    if (payload) ctx.sendTo(ws, payload);
+  }
   function sendState(ws, session, record, present, focus) {
     if (!ws || ws.readyState !== 1 || !allowed(session, ws) || (record && !recordAllowed(record, ws))) return;
-    ctx.sendTo(ws, { type: "shared_browser_state", sessionId: session.localId, browser: projection(record), browsers: sessionRecords(session).map(projection), present: !!present, focus: !!focus });
+    sendBrowserMessage(ws, session, { type: "shared_browser_state", sessionId: session.localId, browser: projection(record), browsers: sessionRecords(session).map(projection), present: !!present, focus: !!focus });
   }
   function broadcast(record, present) {
     ctx.clients.forEach(function (ws) {
@@ -110,7 +114,7 @@ function attachSharedBrowser(ctx) {
       record.frame = { type: "shared_browser_frame", sessionId: record.session.localId, browserId: record.id,
         data: message.data, width: record.width, height: record.height };
       viewers.forEach(function (id, ws) {
-        if (watching(record, ws) && ws.bufferedAmount < 1024 * 1024) ctx.sendTo(ws, record.frame);
+        if (watching(record, ws) && ws.bufferedAmount < 1024 * 1024) sendBrowserMessage(ws, record.session, record.frame);
       });
       visibility(record);
     } else broadcast(record);
@@ -287,7 +291,7 @@ function attachSharedBrowser(ctx) {
       record = selectRecord(session, msg.browserId);
       if (!record || !recordAllowed(record, ws) || msg.browserId !== record.id) throw new Error("Browser session expired");
       if (msg.type === "shared_browser_view") {
-        if (msg.visible) { var previous = records.get(viewers.get(ws)); viewers.set(ws, record.id); if (previous && previous !== record) visibility(previous); if (record.frame) ctx.sendTo(ws, record.frame); }
+        if (msg.visible) { var previous = records.get(viewers.get(ws)); viewers.set(ws, record.id); if (previous && previous !== record) visibility(previous); if (record.frame) sendBrowserMessage(ws, record.session, record.frame); }
         else viewers.delete(ws);
         visibility(record);
       } else if (msg.type === "shared_browser_control") {

package/lib/project-split-view-document.js

@@ -1,9 +1,11 @@
 var layout = require("./split-view-layout");
+var workspace = require("./project-view-workspace");
 
 function validDocument(value) {
   if (!value || value.version !== 1 || !value.projects || typeof value.projects !== "object" || Array.isArray(value.projects)) return false;
   var projectSlugs = Object.keys(value.projects);
   for (var i = 0; i < projectSlugs.length; i++) {
+    if (["__proto__", "constructor", "prototype"].indexOf(projectSlugs[i]) >= 0) return false;
     var project = value.projects[projectSlugs[i]];
     if (!project || !project.owners || typeof project.owners !== "object" || Array.isArray(project.owners)) return false;
     var ownerKeys = Object.keys(project.owners);
@@ -11,7 +13,7 @@ function validDocument(value) {
       var record = project.owners[ownerKeys[j]];
       if (!record || !(record.ownerId === null || typeof record.ownerId === "string") ||
           !(record.linuxUser === null || typeof record.linuxUser === "string") ||
-          !Number.isInteger(record.revision) || record.revision < 0 || !Array.isArray(record.views)) return false;
+          !Number.isSafeInteger(record.revision) || record.revision < 0 || !Array.isArray(record.views)) return false;
       var ids = [], memberships = [];
       var ownerIdForKey = ownerKeys[j] === "default" ? null : ownerKeys[j].slice(5);
       if (ownerKeys[j] !== "default" && (ownerKeys[j].slice(0, 5) !== "user:" || !ownerIdForKey || ownerIdForKey !== record.ownerId)) return false;
@@ -25,9 +27,21 @@ function validDocument(value) {
           memberships.push(checked.origins[m]);
         }
       }
+      if (record.activeViewId != null && ids.indexOf(record.activeViewId) < 0) return false;
     }
   }
   return true;
 }
 
-module.exports = { validDocument: validDocument };
+// Normalize copies only. Legacy records keep their original revision and bytes
+// until an explicit mutation; no resource lookup or implicit migration write.
+function normalizeDocument(value) {
+  if (!validDocument(value)) throw new TypeError('Invalid saved View document');
+  var result = JSON.parse(JSON.stringify(value));
+  Object.keys(result.projects).forEach(function (slug) {
+    var owners = result.projects[slug].owners;
+    Object.keys(owners).forEach(function (key) { owners[key].views = owners[key].views.map(workspace.normalized); });
+  });
+  return result;
+}
+module.exports = { validDocument: validDocument, normalizeDocument: normalizeDocument };