iobroker.mywebui 1.42.30 → 1.42.32

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "mywebui",
-    "version": "1.42.30",
+    "version": "1.42.32",
     "titleLang": {
       "en": "mywebui",
       "de": "mywebui",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.mywebui",
-  "version": "1.42.30",
+  "version": "1.42.32",
   "description": "ioBroker mywebui - Custom edited mywebui by gokturk413 with 3D Editor",
   "type": "module",
   "main": "dist/backend/main.js",

package/www/dist/frontend/common/IobrokerHandler.js

@@ -587,19 +587,51 @@ export class IobrokerHandler {
     }
     async _getObjectFromFile(name) {
         const file = await this.connection.readFile(this.namespaceFiles, name, false);
+        let bytes;
         if (file.mimeType == 'application/json' || file.mimeType == 'text/javascript') {
             return JSON.parse(file.file);
+        } else if (file.mimeType == 'application/octet-stream' && file.file instanceof ArrayBuffer) {
+            bytes = new Uint8Array(file.file);
+        } else {
+            bytes = Uint8Array.from(file.file.data);
         }
-        if (file.mimeType == "application/octet-stream" && file.file instanceof ArrayBuffer) {
-            const dec = new TextDecoder();
-            return JSON.parse(dec.decode(file.file));
+        // Gzip magic bytes 1f 8b — decompress transparently
+        if (bytes[0] === 0x1f && bytes[1] === 0x8b && window.DecompressionStream) {
+            bytes = await this._gunzipBytes(bytes);
         }
-        const dec = new TextDecoder();
-        return JSON.parse(dec.decode(Uint8Array.from(file.file.data)));
+        return JSON.parse(new TextDecoder().decode(bytes));
     }
     async _saveObjectToFile(obj, name) {
-        const enc = new TextEncoder();
-        await this.connection.writeFile64(this.namespaceFiles, name, enc.encode(JSON.stringify(obj)));
+        const bytes = new TextEncoder().encode(JSON.stringify(obj));
+        // Compress files >512 KB to prevent WebSocket message overflow
+        if (bytes.length > 512 * 1024 && window.CompressionStream) {
+            const compressed = await this._gzipBytes(bytes);
+            await this.connection.writeFile64(this.namespaceFiles, name, compressed.buffer);
+        } else {
+            await this.connection.writeFile64(this.namespaceFiles, name, bytes);
+        }
+    }
+    async _gzipBytes(bytes) {
+        const cs = new CompressionStream('gzip');
+        const w = cs.writable.getWriter();
+        w.write(bytes); w.close();
+        const r = cs.readable.getReader();
+        const chunks = []; let res;
+        while (!(res = await r.read()).done) chunks.push(res.value);
+        const out = new Uint8Array(chunks.reduce((s, c) => s + c.length, 0));
+        let off = 0; for (const c of chunks) { out.set(c, off); off += c.length; }
+        return out;
+    }
+    async _gunzipBytes(bytes) {
+        const ds = new DecompressionStream('gzip');
+        const w = ds.writable.getWriter();
+        w.write(bytes); w.close();
+        const r = ds.readable.getReader();
+        const chunks = []; let res;
+        while (!(res = await r.read()).done) chunks.push(res.value);
+        const out = new Uint8Array(chunks.reduce((s, c) => s + c.length, 0));
+        let off = 0; for (const c of chunks) { out.set(c, off); off += c.length; }
+        return out;
     }
     async _saveBinaryToFile(binary, name) {
         await this.connection.writeFile64(this.namespaceFiles, name, await binary.arrayBuffer());

package/www/dist/frontend/config/IobrokerWebui3DScreenViewer.js

@@ -27,6 +27,7 @@ export class IobrokerWebui3DScreenViewer extends BaseCustomWebComponentConstruct
 
     disconnectedCallback() {
         this._animating = false;
+        if (this._cleanup) { this._cleanup(); this._cleanup = null; }
         if (this._renderer) { this._renderer.dispose(); this._renderer.domElement.remove(); this._renderer = null; }
         window.removeEventListener('resize', this._onResize);
     }
@@ -109,15 +110,49 @@ export class IobrokerWebui3DScreenViewer extends BaseCustomWebComponentConstruct
             const controls = new OrbitControls(camera, renderer.domElement);
             controls.enableDamping = true;
 
+            // Script context helpers
+            const frameCallbacks = [];
+            const selectCallbacks = [];
+            const _subscriptions = [];
+
+            const onFrame  = (fn) => frameCallbacks.push(fn);
+            const onSelect = (fn) => selectCallbacks.push(fn);
+            const log      = (...args) => console.log('[3D]', ...args);
+
+            const setState = (id, val) => {
+                try { iobrokerHandler.setState(id, val); } catch (_) {}
+            };
+            const getState = async (id) => {
+                try { return await iobrokerHandler.getState(id); } catch (_) { return null; }
+            };
+            const subscribe = (id, cb) => {
+                try {
+                    const unsub = iobrokerHandler.subscribeState(id, cb);
+                    _subscriptions.push(unsub);
+                    return unsub;
+                } catch (_) { return () => {}; }
+            };
+
+            const assets  = new Map();
+            const mixers  = new Map();
+
             // Run scene script if present
             if (sceneData.script) {
                 try {
-                    const fn = new Function('THREE', 'scene', 'camera', 'renderer', 'controls', sceneData.script);
-                    fn(THREE, scene, camera, renderer, controls);
+                    const fn = new Function(
+                        'THREE', 'scene', 'camera', 'renderer', 'controls',
+                        'onFrame', 'onSelect', 'setState', 'getState', 'subscribe',
+                        'assets', 'mixers', 'log',
+                        sceneData.script
+                    );
+                    fn(THREE, scene, camera, renderer, controls,
+                       onFrame, onSelect, setState, getState, subscribe,
+                       assets, mixers, log);
                 } catch (e) { console.warn('3D scene script error:', e); }
             }
 
             this._animating = true;
+            this._cleanup = () => { _subscriptions.forEach(u => { try { u(); } catch (_) {} }); };
             this._onResize = () => {
                 const vw = viewport.clientWidth, vh = viewport.clientHeight;
                 camera.aspect = vw / vh;
@@ -126,13 +161,17 @@ export class IobrokerWebui3DScreenViewer extends BaseCustomWebComponentConstruct
             };
             window.addEventListener('resize', this._onResize);
 
-            const animate = () => {
+            let _lastTime = 0;
+            const animate = (ts) => {
                 if (!this._animating) return;
                 requestAnimationFrame(animate);
-                controls.update();
+                const dt = _lastTime ? (ts - _lastTime) / 1000 : 0;
+                _lastTime = ts;
+                controls.update(dt);
+                for (const cb of frameCallbacks) { try { cb(dt, ts / 1000); } catch (_) {} }
                 renderer.render(scene, camera);
             };
-            animate();
+            animate(0);
 
         } catch (err) {
             console.error('3D Viewer error:', err);