occt-gltf-addon 0.1.1 → 0.1.3

package/README.md

@@ -2,22 +2,25 @@
 
 Node.js N-API 原生扩展：使用 OpenCascade (OCCT) 将 **STEP (.step/.stp)** 转换为 **glTF 2.0 (GLB)**。
 
-#### 安装（从 npm 安装会本地编译）
+#### 安装
 
-这个包默认会在 `npm install` 时执行本地编译（`cmake-js`）。
+- **Linux x64（Ubuntu 等）**：默认会安装预编译包 `occt-gltf-addon-linux-x64`（包含 OCCT runtime），一般 **不需要系统安装 OCCT**。
+- **macOS / 其他平台**：默认会在 `npm install` 时本地编译（`cmake-js`），需要 OCCT 开发文件（headers + libs）。
 
-你需要：
-- **CMake + C++ 编译器 + Python3**
-- **OCCT 安装**（共享库 + headers）
-
-通过环境变量指定 OCCT 安装前缀：
+本地编译时通过环境变量指定 OCCT 安装前缀：
 
 ```bash
 export OCCT_ROOT=/path/to/occt/prefix
 npm i occt-gltf-addon
 ```
 
-可选（启用 Draco 压缩需要开发包）：
+如需在 linux-x64 **强制源码编译**（不推荐，且需要你自己装 OCCT）：
+
+```bash
+OCCT_GLTF_ADDON_FORCE_BUILD=1 OCCT_ROOT=/path/to/occt/prefix npm i occt-gltf-addon
+```
+
+可选（仅在 **源码编译** 时用于启用 Draco 支持，需要开发包）：
 - `brew install draco` / `apt-get install libdraco-dev`
 
 如需跳过编译（不推荐，运行时会找不到 `.node`）：

package/index.js

@@ -40,9 +40,10 @@ const msg = [
   '[occt-gltf-addon] Failed to load native addon (.node).',
   `Tried: ${candidates.map((p) => JSON.stringify(p)).join(', ')}`,
   '',
-  'If you installed from npm, ensure native build succeeded:',
-  '- CMake + C++ toolchain are installed',
-  "- OCCT is installed and OCCT_ROOT points to its install prefix (e.g. '/opt/homebrew', '/usr', '/usr/local', or your custom install)",
+  'If you installed from npm:',
+  '- On linux-x64: you should get the prebuilt optional dependency `occt-gltf-addon-linux-x64` (no system OCCT required).',
+  '  Ensure optional deps are enabled (do NOT use `--no-optional`).',
+  '- Otherwise / if building from source: ensure CMake + C++ toolchain are installed, and OCCT_ROOT points to your OCCT install prefix',
   '',
   "You can try: 'npm rebuild occt-gltf-addon' (with OCCT_ROOT exported).",
 ].join('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "occt-gltf-addon",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "STEP (.step/.stp) to glTF (GLB) converter using OpenCascade (OCCT) via a Node.js N-API addon",
   "type": "commonjs",
   "main": "index.js",
@@ -63,7 +63,7 @@
     "docker:image:linux-amd64:nocache": "docker buildx build --no-cache --platform linux/amd64 -f docker/Dockerfile.linux-amd64 -t occt-addon-build:linux-amd64 ../.."
   },
   "optionalDependencies": {
-    "occt-gltf-addon-linux-x64": "0.1.0"
+    "occt-gltf-addon-linux-x64": "0.1.3"
   },
   "dependencies": {
     "cmake-js": "^7.3.1",

package/scripts/install.js

@@ -43,8 +43,27 @@ function main() {
       note(`Using prebuilt binary from ${prebuiltName}; skipping local build.`);
       return;
     } catch (e) {
-      // Prebuilt missing or not loadable (e.g. GLIBC mismatch). Fall back to local build.
-      note(`Prebuilt package ${prebuiltName} not usable; falling back to local build.`);
+      // Prebuilt missing or not loadable (e.g. GLIBC mismatch).
+      // On Linux, the default expectation is to use the prebuilt package (no system OCCT required).
+      // Only fall back to local build when the user explicitly opts in.
+      const detail = String(e && (e.stack || e.message || e));
+      if (e && e.code === 'MODULE_NOT_FOUND') {
+        note(`Prebuilt package ${prebuiltName} is not installed (MODULE_NOT_FOUND).`);
+        note('This usually means optional dependencies were skipped, or the prebuilt package was not published for this version yet.');
+      } else {
+        note(`Prebuilt package ${prebuiltName} failed to load.`);
+        note(detail);
+      }
+      const canBuildFromSource =
+        process.env.OCCT_GLTF_ADDON_FORCE_BUILD === '1' || !!process.env.OCCT_ROOT;
+      if (!canBuildFromSource) {
+        note(`Prebuilt package ${prebuiltName} not usable, and OCCT_ROOT is not set.`);
+        note('This package is intended to work on Linux via the prebuilt optional dependency.');
+        note('Fix: ensure optional dependencies are installed (do NOT use --no-optional).');
+        note('Or: set OCCT_ROOT and re-install to build from source (or set OCCT_GLTF_ADDON_FORCE_BUILD=1).');
+        process.exit(1);
+      }
+      note(`Prebuilt package ${prebuiltName} not usable; attempting local build from source...`);
     }
   }