dsh-cad 0.13.0 → 0.13.1

package/lib/modeling/modeling-worker.cjs

@@ -12,6 +12,7 @@ const { parentPort } = require('node:worker_threads')
 const path = require('node:path')
 const fs = require('node:fs')
 const { createRequire } = require('node:module')
+const { pathToFileURL } = require('node:url')
 const { createAdapter } = require('./occt-adapter.cjs')
 const { createOcctTsAdapter } = require('./occtts-adapter.cjs')
 const { createOcctBridge, loadSharedOcctModule } = require('./occt-bridge.cjs')
@@ -20,10 +21,6 @@ const require3 = createRequire(__filename)
 // The ES6 emscripten build reads a global __dirname when its factory runs.
 if (typeof globalThis.__dirname === 'undefined') globalThis.__dirname = __dirname
 
-const loaderPath = require3.resolve('opencascade.js/dist/opencascade.wasm.js')
-const loaderModule = require3(loaderPath)
-const wasmBinary = fs.readFileSync(path.join(path.dirname(loaderPath), 'opencascade.wasm.wasm'))
-
 // Kernel selection: occt.ts is the PRIMARY backend (single-kernel modeling,
 // true B-splines, shell/draft native, direct HLR); opencascade.js stays as
 // the fallback when occt.ts cannot load. `adapter` carries whichever.
@@ -455,6 +452,15 @@ async function boot() {
     kernelName = 'occt.ts'
   } else {
     console.warn('[dsh-cad] occt.ts unavailable — falling back to the opencascade.js backend')
+    // Load the fallback kernel lazily: a top-level require() of the
+    // emscripten loader crashes the whole worker at module scope when the
+    // resolved opencascade.js build is ESM (ERR_REQUIRE_ESM) — boot() never
+    // runs and the main thread hangs waiting for ready. Dynamic import()
+    // accepts both module formats and confines a broken fallback build to
+    // this branch (surfaced as a clean init error via boot().catch).
+    const loaderPath = require3.resolve('opencascade.js/dist/opencascade.wasm.js')
+    const loaderModule = await import(pathToFileURL(loaderPath).href)
+    const wasmBinary = fs.readFileSync(path.join(path.dirname(loaderPath), 'opencascade.wasm.wasm'))
     const initOpenCascade = loaderModule.default ?? loaderModule
     occt = await initOpenCascade({ wasmBinary })
     adapter = createAdapter(occt)

package/lib/modeling/occt-bridge.cjs

@@ -78,6 +78,9 @@ let sharedModule = null
 /** Load (once) and return the shared occt.ts raw module, or null when absent. */
 async function loadSharedOcctModule() {
   if (sharedModule !== null && sharedModule !== undefined) return sharedModule
+  // DSH_CAD_KERNEL=opencascade.js forces the fallback backend (diagnostics
+  // and regression tests — compare kernel behavior on a real model).
+  if (process.env.DSH_CAD_KERNEL === 'opencascade.js') return null
   const distDir = resolveDistDir()
   if (distDir === null) return null
   try {

package/package.json

@@ -1,93 +1,93 @@
-{
-  "name": "dsh-cad",
-  "description": "CAD visualization plugin for DeepSeek Harness: cad_view / cad_info tools with an embedded 3D (STL/OBJ/STEP/IGES) and 2D (DXF/SVG) viewer card in the Web UI",
-  "version": "0.13.0",
-  "type": "module",
-  "license": "MIT",
-  "author": "LAU-MARS",
-  "homepage": "https://lau-mars.github.io/dsh-cad/",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/LAU-MARS/dsh-cad.git"
-  },
-  "bugs": {
-    "url": "https://github.com/LAU-MARS/dsh-cad/issues"
-  },
-  "keywords": [
-    "deepseek-harness",
-    "dsh",
-    "dsh-plugin",
-    "cad",
-    "3d",
-    "2d",
-    "occt",
-    "opencascade",
-    "threejs",
-    "step",
-    "iges",
-    "dxf",
-    "svg"
-  ],
-  "engines": {
-    "node": ">=22",
-    "dsh": ">=0.1.0-rc.7"
-  },
-  "main": "lib/index.js",
-  "types": "lib/types/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "default": "./lib/index.js"
-    },
-    "./client": {
-      "default": "./lib/client.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-ui-conversation"
-      ],
-      "platform": "web"
-    }
-  },
-  "files": [
-    "lib",
-    "README.md",
-    "cordis.patch.yml"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json && node esbuild.client.mjs && node -e \"const fs=require('fs'); fs.copyFileSync('src/convert/step-worker.mjs','lib/convert/step-worker.mjs'); fs.mkdirSync('lib/modeling',{recursive:true}); fs.copyFileSync('src/modeling/occt-adapter.cjs','lib/modeling/occt-adapter.cjs'); fs.copyFileSync('src/modeling/modeling-worker.cjs','lib/modeling/modeling-worker.cjs'); fs.copyFileSync('src/modeling/occt-bridge.cjs','lib/modeling/occt-bridge.cjs'); fs.copyFileSync('src/modeling/occtts-adapter.cjs','lib/modeling/occtts-adapter.cjs'); for (const part of ['bracket','flange','shaft']) fs.copyFileSync('assets/demo-'+part+'.brep','lib/demo-'+part+'.brep')\"",
-    "watch": "tsc -p tsconfig.json --watch & node esbuild.client.mjs --watch",
-    "test": "vitest run --no-file-parallelism",
-    "test:watch": "vitest"
-  },
-  "dependencies": {
-    "ansatz-wasm": "^0.2.0",
-    "dxf-parser": "^1.1.2",
-    "occt-import-js": "^0.0.23",
-    "occt.ts": "^0.7.0",
-    "opencascade.js": "^1.1.1",
-    "three": "^0.185.1"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1-rc.1",
-    "@deepseek-ai/dsh-tools": ">=0.0.1-rc.1",
-    "react": "^18.2.0"
-  },
-  "devDependencies": {
-    "@deepseek-ai/dsh-tools": "^0.1.7-rc.2",
-    "@types/node": "^22.10.0",
-    "@types/react": "^18.3.1",
-    "esbuild": "^0.28.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.3.1",
-    "typescript": "^5.7.0",
-    "vitest": "^4.1.10"
-  }
-}
+{
+  "name": "dsh-cad",
+  "description": "CAD visualization plugin for DeepSeek Harness: cad_view / cad_info tools with an embedded 3D (STL/OBJ/STEP/IGES) and 2D (DXF/SVG) viewer card in the Web UI",
+  "version": "0.13.1",
+  "type": "module",
+  "license": "MIT",
+  "author": "LAU-MARS",
+  "homepage": "https://lau-mars.github.io/dsh-cad/",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/LAU-MARS/dsh-cad.git"
+  },
+  "bugs": {
+    "url": "https://github.com/LAU-MARS/dsh-cad/issues"
+  },
+  "keywords": [
+    "deepseek-harness",
+    "dsh",
+    "dsh-plugin",
+    "cad",
+    "3d",
+    "2d",
+    "occt",
+    "opencascade",
+    "threejs",
+    "step",
+    "iges",
+    "dxf",
+    "svg"
+  ],
+  "engines": {
+    "node": ">=22",
+    "dsh": ">=0.1.0-rc.7"
+  },
+  "main": "lib/index.js",
+  "types": "lib/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./client": {
+      "default": "./lib/client.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-conversation"
+      ],
+      "platform": "web"
+    }
+  },
+  "files": [
+    "lib",
+    "README.md",
+    "cordis.patch.yml"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json && node esbuild.client.mjs && node -e \"const fs=require('fs'); fs.copyFileSync('src/convert/step-worker.mjs','lib/convert/step-worker.mjs'); fs.mkdirSync('lib/modeling',{recursive:true}); fs.copyFileSync('src/modeling/occt-adapter.cjs','lib/modeling/occt-adapter.cjs'); fs.copyFileSync('src/modeling/modeling-worker.cjs','lib/modeling/modeling-worker.cjs'); fs.copyFileSync('src/modeling/occt-bridge.cjs','lib/modeling/occt-bridge.cjs'); fs.copyFileSync('src/modeling/occtts-adapter.cjs','lib/modeling/occtts-adapter.cjs'); for (const part of ['bracket','flange','shaft']) fs.copyFileSync('assets/demo-'+part+'.brep','lib/demo-'+part+'.brep')\"",
+    "watch": "tsc -p tsconfig.json --watch & node esbuild.client.mjs --watch",
+    "test": "vitest run --no-file-parallelism",
+    "test:watch": "vitest"
+  },
+  "dependencies": {
+    "ansatz-wasm": "^0.2.0",
+    "dxf-parser": "^1.1.2",
+    "occt-import-js": "^0.0.23",
+    "occt.ts": "^0.7.0",
+    "opencascade.js": "^1.1.1",
+    "three": "^0.185.1"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1-rc.1",
+    "@deepseek-ai/dsh-tools": ">=0.0.1-rc.1",
+    "react": "^18.2.0"
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-tools": "^0.1.7-rc.2",
+    "@types/node": "^22.10.0",
+    "@types/react": "^18.3.1",
+    "esbuild": "^0.28.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.3.1",
+    "typescript": "^5.7.0",
+    "vitest": "^4.1.10"
+  }
+}