@deepblend/dsh-blender-provider-local 0.2.9 → 0.2.11

package/lib/index.js

@@ -363,6 +363,8 @@ class BlenderSession {
     // itself, in the `ready` line bootstrap.py opens with — which is better evidence anyway, because
     // it is the pid the script believes it is rather than the one the spawn returned.
     this.pid = input.transport.pid ?? null
+    /** The workspace the other end says it serves, or null when it did not say. */
+    this.workspace = null
     /** @type {Map<string, {resolve: Function, reject: Function, timer: object}>} */
     this.waiting = new Map()
     this.progress = []
@@ -456,6 +458,9 @@ class BlenderSession {
     }
     if (document?.kind === 'ready') {
       if (typeof document.pid === 'number') this.pid = document.pid
+      // What the other end says it serves, when it says anything. Empty means "not stated", which the
+      // attach path treats as "serves anything" — every deployment before this key existed.
+      if (typeof document.workspace === 'string') this.workspace = document.workspace
       this.readyResolve?.(this)
       return
     }
@@ -986,6 +991,24 @@ export default class LocalBlenderRuntime extends Service {
     // connected and said nothing took 180 s to report — long enough that a user would conclude the
     // product had hung.
     await session.ready(ATTACH_READY_MS)
+
+    // THE WRONG-BLENDER CHECK. A socket path has a global default, so two workspaces on one machine
+    // can point the product at the SAME Blender — and without this, workspace B would drive the
+    // Blender workspace A's user is looking at, silently, because both sides behave correctly. A
+    // bridge that states a workspace and states a DIFFERENT one is refused; a bridge that states none
+    // is served, because that is what every deployment did before the key existed.
+    const stated = session.workspace
+    if (typeof stated === 'string' && stated.length > 0 && resolve(stated) !== resolve(this.workspaceRoot)) {
+      await session.close()
+      throw new BlenderError(
+        BlenderErrorCode.RUNTIME_UNAVAILABLE,
+        `The Blender at ${socketPath} serves the workspace ${stated}, and this deployment is ${this.workspaceRoot}. ` +
+          'Point this deployment at its own bridge (DEEPBLEND_BRIDGE_SOCKET / sessionSocket), or start that Blender ' +
+          'with DEEPBLEND_BRIDGE_WORKSPACE set to this workspace.',
+        { detail: { socketPath, bridgeWorkspace: stated, workspaceRoot: this.workspaceRoot } },
+      )
+    }
+
     return session
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepblend/dsh-blender-provider-local",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "type": "module",
   "description": "Local Blender Provider: the BlenderRuntime Service over ctx.subprocess (batch execution).",
   "main": "lib/index.js",
@@ -11,7 +11,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@deepblend/dsh-blender-contracts": "0.2.9"
+    "@deepblend/dsh-blender-contracts": "0.2.11"
   },
   "license": "MIT",
   "repository": {

package/python/deepblend_bridge.py

@@ -97,6 +97,15 @@ class _Bridge:
     def __init__(self, socket_path, options=None):
         self.socket_path = socket_path
         self.options = options or {}
+        # WHICH WORKSPACE THIS BLENDER SERVES, when it was told. Empty means "not stated", which is
+        # what every deployment did before this existed — and the product treats "not stated" as
+        # "serves anything" rather than as a mismatch, so nothing that worked before stops working.
+        #
+        # WHY IT MATTERS: the socket path has a global default, so two workspaces on one machine can
+        # point the product at the SAME Blender. Without this, the product in workspace B would drive
+        # the Blender that workspace A's user is looking at, and the operations would land in a scene
+        # nobody intended — silently, because both sides are behaving correctly.
+        self.workspace = self.options.get("workspace") or ""
         self.server = None
         self.thread = None
         self.requests = 0
@@ -131,6 +140,29 @@ class _Bridge:
         self.thread = threading.Thread(target=self._serve, name="deepblend-bridge", daemon=True)
         self.thread.start()
 
+    @staticmethod
+    def derive_workspace(open_file):
+        """The workspace a Blender belongs to, read from the file it has open — or nothing at all.
+
+        WHY THIS IS A DERIVATION AND NOT A GUESS. A checkpoint the product wrote lives at
+        `<workspace>/.deepblend/projects/<id>/revisions/<rev>/scene.blend`, so a Blender that has one
+        of those open IS working in that workspace — the path says so, in the product's own layout.
+        Anything else (an empty path, a file the user made themselves, a project laid out differently)
+        returns nothing, and nothing is what the product treats as "serves anything".
+
+        THAT ASYMMETRY IS THE POINT: a bridge that states a workspace it cannot be sure of would be
+        refused by the product for a mismatch the user did not cause, and the fix would look like a
+        configuration problem when it is a wrong guess. Silence is the honest answer when the path does
+        not say.
+        """
+        if not isinstance(open_file, str) or open_file == "":
+            return ""
+        marker = os.sep + ".deepblend" + os.sep
+        head, separator, _ = open_file.partition(marker)
+        if separator == "" or head == "":
+            return ""
+        return head
+
     def _someone_is_listening(self):
         """Whether a live bridge is behind this path, rather than a file left by a dead one."""
         probe = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -187,7 +219,12 @@ class _Bridge:
         nothing — so the product's `BlenderSession.ready()` waited forever on a peer that was already
         serving. A transport that answers the same conversation has to open it the same way.
         """
-        connection.sendall((json.dumps({"kind": "ready", "pid": os.getpid(), "socket": self.socket_path}) + "\n").encode("utf-8"))
+        connection.sendall((json.dumps({
+            "kind": "ready",
+            "pid": os.getpid(),
+            "socket": self.socket_path,
+            "workspace": self.workspace,
+        }) + "\n").encode("utf-8"))
         buffer = b""
         while True:
             chunk = connection.recv(65536)
@@ -267,6 +304,8 @@ class DEEPBLEND_PT_bridge(bpy.types.Panel):
         layout.label(text="Status: %s" % (_BRIDGE.status(),))
         layout.label(text="Socket: %s" % (os.path.basename(_BRIDGE.socket_path),))
         layout.label(text="Operations served: %d" % (_BRIDGE.requests,))
+        if _BRIDGE.workspace:
+            layout.label(text="Workspace: %s" % (os.path.basename(_BRIDGE.workspace),))
         if _BRIDGE.last_action is not None:
             layout.label(text="Last: %s" % (_BRIDGE.last_action,))
         if _BRIDGE.last_error is not None:
@@ -276,7 +315,11 @@ class DEEPBLEND_PT_bridge(bpy.types.Panel):
 def register():
     global _BRIDGE
     socket_path = os.environ.get("DEEPBLEND_BRIDGE_SOCKET", DEFAULT_SOCKET)
-    _BRIDGE = _Bridge(socket_path)
+    workspace = os.environ.get("DEEPBLEND_BRIDGE_WORKSPACE", "")
+    if workspace == "":
+        # In a GUI the user has a file open, and if the product wrote it, it names the workspace.
+        workspace = _Bridge.derive_workspace(getattr(bpy.data, "filepath", ""))
+    _BRIDGE = _Bridge(socket_path, {"workspace": workspace})
     try:
         _BRIDGE.start()
     except Exception as exc:
@@ -300,6 +343,7 @@ def main():
     """Headless entry point: serve until the process is asked to stop."""
     argv = sys.argv
     options = {}
+    workspace = os.environ.get("DEEPBLEND_BRIDGE_WORKSPACE", "")
     if "--" in argv:
         tokens = argv[argv.index("--") + 1:]
         index = 0
@@ -308,15 +352,23 @@ def main():
                 options["socket"] = tokens[index + 1]
                 index += 2
                 continue
+            if tokens[index] == "--workspace" and index + 1 < len(tokens):
+                workspace = tokens[index + 1]
+                index += 2
+                continue
             index += 1
     socket_path = options.get("socket", DEFAULT_SOCKET)
+    if workspace == "":
+        # WHAT THE OPEN FILE SAYS, when it says anything. An operator's explicit setting always wins;
+        # this only fills a silence, and only from a path that follows the product's own layout.
+        workspace = _Bridge.derive_workspace(getattr(bpy.data, "filepath", ""))
 
     if bootstrap is None:
         print(json.dumps({"kind": "error", "message": BOOTSTRAP_PROBLEM}), flush=True)
         return 2
 
     global _BRIDGE
-    _BRIDGE = _Bridge(socket_path, {"proc": None})
+    _BRIDGE = _Bridge(socket_path, {"proc": None, "workspace": workspace})
     try:
         _BRIDGE.start()
     except Exception as exc:
@@ -326,7 +378,7 @@ def main():
         # reports this in its panel; this is the same sentence for the headless one.
         print(json.dumps({"kind": "error", "message": bootstrap.error_text(exc)}), flush=True)
         return 2
-    print(json.dumps({"kind": "ready", "pid": os.getpid(), "socket": socket_path}), flush=True)
+    print(json.dumps({"kind": "ready", "pid": os.getpid(), "socket": socket_path, "workspace": workspace}), flush=True)
     try:
         # The serve thread is a daemon, so this loop is what keeps the process alive. A SIGTERM (or
         # the product closing the socket and asking for shutdown) ends it.