iobroker.mywebui 1.37.59 → 1.37.60

package/io-package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.mywebui",
-  "version": "1.37.59",
+  "version": "1.37.60",
   "description": "ioBroker mywebui - Custom edited mywebui by gokturk413",
   "type": "module",
   "main": "dist/backend/main.js",

package/www/dist/frontend/runtime/ScreenViewer.js

@@ -161,47 +161,46 @@ let ScreenViewer = class ScreenViewer extends BaseCustomWebComponentConstructorA
     }
     async loadScreenData(html, style, script, settings, properties) {
         // SERVER-SIDE SECURITY CHECK: backend reads screen file + groups from ioBroker DB
-        try {
-            const currentUser = await iobrokerHandler.getCurrentUser();
-            const username = currentUser?.name || iobrokerHandler.userName;
-            const accessResult = await new Promise((resolve) => {
-                iobrokerHandler.connection.sendTo(
-                    'mywebui.0', 'checkScreenAccess',
-                    { screenName: this.screenName, username },
-                    (result) => resolve(result || { allowed: false, reason: 'no response' })
+        if (this.screenName) {
+            try {
+                const username = iobrokerHandler.userName || (await iobrokerHandler.getCurrentUser())?.name;
+                const _check = iobrokerHandler.connection.sendTo(
+                    iobrokerHandler.namespace,
+                    'checkScreenAccess',
+                    { screenName: this.screenName, username }
                 );
-                // timeout: 5s — if backend doesn't respond, fail-open
-                setTimeout(() => resolve({ allowed: true, _timeout: true }), 5000);
-            });
+                const _timeout = new Promise(r => setTimeout(() => r({ allowed: true, _timeout: true }), 5000));
+                const accessResult = await Promise.race([_check, _timeout]);
 
-            if (!accessResult.allowed) {
-                console.warn('⛔ [Screen Visibility] Server denied access to:', this.screenName);
-                const action = accessResult.action || 'hide';
-                if (action === 'redirect' && accessResult.redirectScreen) {
-                    this.screenName = accessResult.redirectScreen;
-                    this._loadScreen();
+                if (!accessResult.allowed) {
+                    console.warn('⛔ [Screen Visibility] Server denied access to:', this.screenName);
+                    const action = accessResult.action || 'hide';
+                    if (action === 'redirect' && accessResult.redirectScreen) {
+                        this.screenName = accessResult.redirectScreen;
+                        this._loadScreen();
+                        return;
+                    }
+                    this._rootShadow.innerHTML = `
+                        <div style="display:flex;align-items:center;justify-content:center;height:100%;font-family:sans-serif;">
+                            <div style="text-align:center;padding:40px;">
+                                <div style="font-size:48px;margin-bottom:20px;">🔒</div>
+                                <h2 style="margin:0 0 10px 0;color:#666;">Access Denied</h2>
+                                <p style="color:#999;">You don't have permission to view this screen.</p>
+                            </div>
+                        </div>
+                    `;
                     return;
                 }
-                this._rootShadow.innerHTML = `
-                    <div style="display:flex;align-items:center;justify-content:center;height:100%;font-family:sans-serif;">
-                        <div style="text-align:center;padding:40px;">
-                            <div style="font-size:48px;margin-bottom:20px;">🔒</div>
-                            <h2 style="margin:0 0 10px 0;color:#666;">Access Denied</h2>
-                            <p style="color:#999;">You don't have permission to view this screen.</p>
-                        </div>
-                    </div>
-                `;
-                return;
-            }
 
-            if (accessResult._timeout) {
-                console.warn('[Screen Visibility] Backend timeout — fail-open');
-            } else {
-                console.log('✅ [Screen Visibility] Server granted access to:', this.screenName);
+                if (accessResult._timeout) {
+                    console.warn('[Screen Visibility] Backend timeout — fail-open');
+                } else {
+                    console.log('✅ [Screen Visibility] Server granted access to:', this.screenName);
+                }
+            } catch (err) {
+                console.error('❌ [Screen Visibility] Server check failed:', err);
+                // fail-open
             }
-        } catch (err) {
-            console.error('❌ [Screen Visibility] Server check failed:', err);
-            // fail-open: backend xətası olduqda screen-i göstər
         }
         
         if (properties) {