Merge branch 'rel-next'

Author: stewartoallen

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
 
     steps:
       - name: Checkout code

.github/workflows/prettier-check.yml

@@ -1,4 +1,4 @@
-name: 'Docs Fomatting Check'
+name: 'Docs Formatting Check'
 on:
   push:
     paths:
@@ -12,12 +12,19 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup bun
-        uses: oven-sh/setup-bun@v2
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          bun-version: latest
-      - name: Install dependencies
-        run: bun install
-      - name: check format for docs 
-        run:
-          bun docs-check
+          node-version: '20'
+      - name: Check docs formatting (retry once on transient network failure)
+        shell: bash
+        run: |
+          for attempt in 1 2; do
+            npx --yes prettier@3.5.3 --config ./conf/prettier.config.js ./docs --check && exit 0
+            if [ "$attempt" -lt 2 ]; then
+              echo "Prettier check failed (attempt $attempt). Retrying..."
+              sleep 5
+            fi
+          done
+          echo "Prettier check failed after retries."
+          exit 1

.gitignore

@@ -17,6 +17,7 @@ package-lock.json
 src/ext/jszip-esm.js
 src/ext/quickjs.js
 src/ext/three.js
+src/void/solver
 tmp
 tmp_*/
 web/boot/bundle*

app-el.js

@@ -14,6 +14,23 @@ const devel = process.argv.slice(2).map(v => v.replaceAll('-', '')).indexOf('dev
 
 process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true;
 
+// Enable GPU/graphics acceleration for Linux (addresses WebGL issues)
+// Equivalent to Chrome flags that fixed the rendering in Chrome browser
+if (process.platform === 'linux') {
+    // CRITICAL: Override GPU blocklist - allows hardware acceleration on blocked GPUs
+    app.commandLine.appendSwitch('ignore-gpu-blocklist');
+
+    // Enable WebGL draft extensions (improves WebGL compatibility)
+    app.commandLine.appendSwitch('enable-webgl-draft-extensions');
+
+    // Force GPU acceleration for 2D/3D rendering
+    app.commandLine.appendSwitch('enable-gpu-rasterization');
+
+    // Optional: Try Vulkan if available (Chromium auto-falls back to OpenGL if not)
+    // Uncomment if you need Vulkan specifically, but most systems work without it:
+    app.commandLine.appendSwitch('enable-features', 'Vulkan');
+}
+
 server({
     port: 5309,
     apps: basDir,
@@ -61,12 +78,15 @@ function createWindow() {
         if (url.endsWith('/mesh') || url.endsWith('/mesh/')) {
             return;
         }
+        if (url.endsWith('/void') || url.endsWith('/void/')) {
+            return;
+        }
         event.preventDefault();
         shell.openExternal(url);
     });
 
     webContents.on('did-finish-load', () => {
-        mainWindow.webContents.executeJavaScript(`{ let x = document.getElementById('app-quit'); if (x) { x.onclick = () => window.close() } }; null;`);
+        // console.log('did finish load');
     });
 
     if (devel) {

app.js

@@ -26,6 +26,7 @@ const mods = {};
 const load = [];
 const api = {};
 
+let lastTouchTime = {};
 let forceUseCache = false;
 let serviceWorker = true;
 let crossOrigin = false;
@@ -134,10 +135,12 @@ function init(mod) {
         "/boot"            : redir((pre??"") + "/boot/", 301),
         "/kiri"            : redir((pre??"") + "/kiri/", 301),
         "/mesh"            : redir((pre??"") + "/mesh/", 301),
-        "/meta"            : redir((pre??"") + "/meta/", 301),
+        "/void"            : redir((pre??"") + "/void/", 301),
+        "/form"            : redir((pre??"") + "/form/", 301),
         "/kiri/index.html" : redir((pre??"") + "/kiri/", 301),
         "/mesh/index.html" : redir((pre??"") + "/mesh/", 301),
-        "/meta/index.html" : redir((pre??"") + "/meta/", 301)
+        "/void/index.html" : redir((pre??"") + "/void/", 301),
+        "/form/index.html" : redir((pre??"") + "/form/", 301)
     }));
     mod.add(handleVersion);
     mod.add(fixedmap("/api/", api));
@@ -153,12 +156,15 @@ function init(mod) {
     mod.static("/lib/", "alt");
     mod.static("/lib/", "src");
     mod.static("/obj/", "web/obj");
-    mod.static("/font/", "web/font");
+    mod.static("/boot/", "web/boot");
     mod.static("/fon2/", "web/fon2");
+    mod.static("/font/", "web/font");
+    mod.static("/form/", "web/void");
+    mod.static("/icon/", "web/icon");
+    mod.static("/kiri/", "web/kiri");
     mod.static("/mesh/", "web/mesh");
     mod.static("/moto/", "web/moto");
-    mod.static("/kiri/", "web/kiri");
-    mod.static("/boot/", "web/boot");
+    mod.static("/void/", "web/void");
 
     // module loader
     function load_modules(root, force) {
@@ -186,10 +192,10 @@ function init(mod) {
         });
     }
 
-    // load development and 3rd party modules
+    // load development and app modules (onshape, thingiverse)
     load_modules('mod');
 
-    // load optional local modules
+    // load optional local modules (bambu)
     load_modules('mods');
 
     // run load functions injected by modules
@@ -208,16 +214,34 @@ function init(mod) {
         }
     }
 
-    // create alt artifacts with module extensions
+    // synthesize new main when applicable
+    createArtifacts();
+}
+
+// create alt artifacts with module extensions
+function createArtifacts() {
     if (dryrun || !isElectron) {
-        logger.log('creating artifacts', Object.keys(append));
+        if (debug) {
+            setTimeout(createArtifacts, 1000);
+        }
+        if (Object.keys(lastTouchTime).length === 0) {
+            logger.log('creating artifacts', Object.keys(append));
+        }
         for (let [ key, val ] of Object.entries(append)) {
             // append mains
             let src = `${dir}/src/main/${key}.js`;
             if (!fs.existsSync(src)) {
                 logger.log('missing', src);
                 continue;
             }
+            let ltt = fs.statSync(src).mtimeMs;
+            if (lastTouchTime[src] === ltt) {
+                continue;
+            } else if (debug) {
+                logger.log('changed', src);
+            }
+            lastTouchTime[src] = ltt;
+            // console.log({ src, ltt });
             fs.mkdirSync(`${dir}/alt/main`, { recursive: true });
             let body = fs.readFileSync(src);
             fs.writeFileSync(`${dir}/alt/main/${key}.js`, body + val);
@@ -234,7 +258,7 @@ function init(mod) {
     } else {
         logger.log('skipping artifacts');
     }
-};
+}
 
 // either add module assets to path or require(init.js)
 function loadModule(mod, dir) {
@@ -257,7 +281,7 @@ function initModule(mod, file, dir) {
     logger.log({ module: file, dir });
     require_fresh(file)({
         // express functions added here show up at "/api/" url root
-        api: api,
+        api,
         adm: {
             setver(ver) { oversion = ver },
             crossOrigin(bool) { crossOrigin = bool }
@@ -329,8 +353,10 @@ function initModule(mod, file, dir) {
             const path = mod.dir + '/' + dir + '/' + file;
             try {
                 const body = fs.readFileSync(path);
-                if (debug && !single) logger.log({ inject: code, file, opt });
-                if (opt.first) {
+                if (debug && !single) {
+                    logger.log({ inject: code, file, opt });
+                }
+                if (opt.first && append[code]) {
                     append[code] = body.toString() + '\n' + append[code];
                 } else {
                     append[code] += body.toString() + '\n';
@@ -369,8 +395,11 @@ function handleSetup(req, res, next) {
 }
 
 const productionMap = {
-    '/lib/mesh/work.js' : '/lib/pack/mesh-work.js',
+    '/lib/main/void.js' : '/lib/pack/void-main.js',
+    '/lib/main/planegcs.wasm' : '/lib/void/solver/planegcs_dist/planegcs.wasm',
+    '/lib/worker/solids_worker.js' : '/lib/pack/void-work-solid.js',
     '/lib/main/mesh.js' : '/lib/pack/mesh-main.js',
+    '/lib/mesh/work.js' : '/lib/pack/mesh-work.js',
     '/lib/main/kiri.js' : '/lib/pack/kiri-main.js',
     '/lib/kiri/run/engine.js' : '/lib/pack/kiri-eng.js',
     '/lib/kiri/run/minion.js' : '/lib/pack/kiri-pool.js',
@@ -487,7 +516,7 @@ function ifModifiedDate(req) {
 
 function addCorsHeaders(req, res) {
     res.setHeader('Access-Control-Allow-Credentials', 'true');
-    res.setHeader('Access-Control-Allow-Headers', 'X-Moto-Ajax, Content-Type');
+    res.setHeader('Access-Control-Allow-Headers', 'X-Api-Key, X-Host, X-Moto-Ajax, Content-Type');
     res.setHeader('Access-Control-Allow-Origin', req.headers['origin'] || '*');
     if (req.headers['access-control-request-private-network'] === 'true') {
         res.setHeader('Access-Control-Allow-Private-Network', 'true');

bin/bundle-prod.config.json

@@ -16,7 +16,8 @@
       { "src": "src/pack/kiri-pool.js", "dst": "lib/kiri/run/minion.js" },
       { "src": "src/gpu/raster-worker.js", "dst": "lib/gpu/raster-worker.js" },
       { "src": "src/ext/tween.js", "dst": "lib/ext/tween.js" },
-      { "src": "src/moto/license.js", "dst": "lib/moto/license.js" }
+      { "src": "src/moto/license.js", "dst": "lib/moto/license.js" },
+      { "src": "src/void/solver/planegcs_dist/planegcs.wasm", "dst": "lib/main/planegcs.wasm" }
     ],
     "excludes": [
         "src/pack",

bin/esbuild.config.mjs

@@ -9,6 +9,9 @@ const isProd = mode === 'prod';
 
 console.log(`Building in ${mode} mode...`);
 
+const VOID_OUTFILE = 'src/pack/void-main.js';
+const VOID_EXTRAS = [ ];
+
 const MESH_OUTFILE = 'src/pack/mesh-main.js';
 const MESH_EXTRAS = [ ];
 
@@ -29,7 +32,7 @@ async function appendExtraModules(extras, outfile, minify = false) {
             const result = await transform(code, {
                 minify: true,
                 loader: 'js',
-                target: 'es2020',
+                target: 'es2022',
             });
             return result.code;
         })
@@ -92,14 +95,28 @@ const rec = {
     minify: isProd,      // false for dev, true for prod
     platform: 'browser',
     sourcemap: false,
-    target: 'es2020',
+    target: 'es2022',
 };
 
 async function buildApp() {
     try {
         // Concatenate kiri devices
         generateDevices();
 
+        // Bundle void main app
+        await build(Object.assign({}, rec, {
+            entryPoints: [ 'src/main/void.js' ],
+            outfile: VOID_OUTFILE,
+        }));
+
+        appendExtraModules(VOID_EXTRAS, VOID_OUTFILE, isProd);
+
+        // Bundle void worker
+        await build(Object.assign({}, rec, {
+            entryPoints: [ 'src/void/worker/solids_worker.js' ],
+            outfile: 'src/pack/void-work-solid.js',
+        }));
+
         // Bundle mesh main app
         await build(Object.assign({}, rec, {
             entryPoints: [ 'src/main/mesh.js' ],

bin/webpack-three-bundle.js

@@ -7,6 +7,7 @@ import { LineMaterial } from '../node_modules/three/examples/jsm/lines/LineMater
 import { LineGeometry } from '../node_modules/three/examples/jsm/lines/LineGeometry.js';
 import { LineSegments2 } from '../node_modules/three/examples/jsm/lines/LineSegments2.js';
 import { LineSegmentsGeometry } from '../node_modules/three/examples/jsm/lines/LineSegmentsGeometry.js';
+import { TrackballControls } from '../node_modules/three/examples/jsm/controls/TrackballControls.js';
 
 import * as MeshBVHLib from '../node_modules/three-mesh-bvh/build/index.module.js';
 
@@ -19,5 +20,6 @@ export {
     LineGeometry,
     LineSegments2,
     LineSegmentsGeometry,
+    TrackballControls,
     MeshBVHLib
-}; 
+};

conf/links.csv

@@ -1,17 +1,19 @@
-src/ext/gerber.js,../../node_modules/@tracespace/parser/umd/parser.js
-src/ext/manifold.js,../../node_modules/manifold-3d/manifold.js
-src/ext/base64.js,../../node_modules/base64-js/base64js.min.js
-src/ext/earcut.js,../../node_modules/earcut/src/earcut.js
-src/ext/tween.js,../../node_modules/@tweenjs/tween.js/src/Tween.js
-src/ext/jszip.js,../../node_modules/jszip/dist/jszip.js
-src/wasm/manifold.wasm,../../node_modules/manifold-3d/manifold.wasm
-src/kiri/lang-en.js,../../web/kiri/lang/en.js
-web/fon2,../node_modules/bootstrap-icons/font/
-web/kiri/lang/pl.js,pl-pl.js
-web/kiri/lang/pt-pt.js,pt.js
-web/kiri/lang/da-dk.js,da.js
-web/kiri/lang/en-us.js,en.js
-web/kiri/lang/fr-fr.js,fr.js
-web/kiri/lang/de.js,de-de.js
-web/kiri/lang/es.js,es-es.js
-web/font,../node_modules/@fortawesome/fontawesome-free/
+src//gpu/raster.js,../../node_modules/@gridspace/raster-path/build/raster-path.js
+src//gpu/raster-worker.js,../../node_modules/@gridspace/raster-path/build/raster-worker.js
+src//ext/gerber.js,../../node_modules/@tracespace/parser/umd/parser.js
+src//ext/manifold.js,../../node_modules/manifold-3d/manifold.js
+src//ext/base64.js,../../node_modules/base64-js/base64js.min.js
+src//ext/earcut.js,../../node_modules/earcut/src/earcut.js
+src//ext/tween.js,../../node_modules/@tweenjs/tween.js/src/Tween.js
+src//ext/jszip.js,../../node_modules/jszip/dist/jszip.js
+src//wasm/manifold.wasm,../../node_modules/manifold-3d/manifold.wasm
+src//kiri/app/lang-en.js,../../../web/kiri/lang/en.js
+web//fon2,../node_modules/bootstrap-icons/font/
+web//kiri/lang/pl.js,pl-pl.js
+web//kiri/lang/pt-pt.js,pt.js
+web//kiri/lang/da-dk.js,da.js
+web//kiri/lang/en-us.js,en.js
+web//kiri/lang/fr-fr.js,fr.js
+web//kiri/lang/de.js,de-de.js
+web//kiri/lang/es.js,es-es.js
+web//font,../node_modules/@fortawesome/fontawesome-free/