* (bluefox) Widgets were corrected

ioBroker · Sep 23, 2024 · b984571 · b984571
1 parent 8c24105
commit b984571
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 1,564 deletions.
diff --git a/admin/assets/index-C_gL5fg7.js b/admin/assets/index-C_gL5fg7.js
diff --git a/admin/assets/index-C_gL5fg7.js.map b/admin/assets/index-C_gL5fg7.js.map
diff --git a/admin/index_m.html b/admin/index_m.html
@@ -36,7 +36,7 @@
             document.head.appendChild(script);
         </script>
         <title>ioBroker.cameras</title>
-      <script type="module" crossorigin src="./assets/index-C_gL5fg7.js"></script>
+      <script type="module" crossorigin src="./assets/index-CXwjB4MA.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-BqFSCGOi.css">
     </head>
     <body>

diff --git a/cameras/url.js b/cameras/url.js
@@ -18,7 +18,7 @@ function unload(adapter, cam) {
     if (adapter.__urlCameras[cam.name]) {
         delete adapter.__urlCameras[cam.name];
     }
-    // after last unload, all the resources must be cleared too
+    // after last unloading, all the resources must be cleared too
     if (Object.keys(adapter.__urlCameras)) {
         // unload
     }
@@ -41,13 +41,15 @@ function process(adapter, cam) {
             cam.runningRequest = null;
             return {
                 body: response.data,
-                contentType: response.headers['Content-type'] || response.headers['content-type']
+                contentType: response.headers['Content-type'] || response.headers['content-type'],
             };
         })
         .catch(error => {
             if (error.response) {
+                adapter.log.error(`Cannot read ${cam.url}: ${error.response.data || error}`);
                 throw new Error(error.response.data || error.response.status);
             } else {
+                adapter.log.error(`Cannot read ${cam.url}: ${error}`);
                 throw new Error(error.code);
             }
         });
@@ -59,4 +61,4 @@ module.exports = {
     init,
     process,
     unload,
-};
+};
diff --git a/cameras/urlBasicAuth.js b/cameras/urlBasicAuth.js
@@ -43,8 +43,10 @@ function process(adapter, cam) {
         })
         .catch(error => {
             if (error.response) {
+                adapter.log.error(`Cannot read ${cam.url}: ${error.response.data || error}`);
                 throw new Error(error.response.data || error.response.status);
             } else {
+                adapter.log.error(`Cannot read ${cam.url}: ${error}`);
                 throw new Error(error.code);
             }
         });
@@ -56,4 +58,4 @@ module.exports = {
     init,
     process,
     unload,
-};
+};
diff --git a/lib/web.js b/lib/web.js
@@ -98,13 +98,19 @@ class ProxyCameras {
                         res.status(500).send(typeof error !== 'string' ? JSON.stringify(error) : error));
                 return;
             }
+
+            this.adapter.log.debug(`Request "${rule.name}" with "${query} on port ${this.config.port}...`);
+
             getUrl(rule.name, query, this.config.port)
                 .then(file => {
                     res.setHeader('Content-type', file.contentType);
                     res.status(200).send(file.body || '');
                 })
-                .catch(error =>
-                    res.status(500).send(typeof error !== 'string' ? JSON.stringify(error) : error));
+                .catch(error => {
+                    const text = error.response ? error.response.data || error : error;
+                    this.adapter.log.error(`Cannot request "${rule.name}" with "${query} on port ${this.config.port}: ${text}`);
+                    res.status(500).send(typeof error !== 'string' ? JSON.stringify(error) : error);
+                });
         });
     }
 }

diff --git a/src/src/Tabs/Cameras.tsx b/src/src/Tabs/Cameras.tsx
@@ -472,19 +472,6 @@ class Server extends Component<ServerProps, ServerState> {
                                         this.onCameraSettingsChanged(settings);
                                     }}
                                 />
-                                <div style={styles.sampleUrl}>
-                                    {I18n.t('Local URL')}
-                                    :&nbsp;
-                                    <a
-                                        style={styles.link}
-                                        href={`http://${this.props.native.bind}:${this.props.native.port}/${cam.name}?key=${this.props.native.key}`}
-                                        target="_blank"
-                                        rel="noopener noreferrer"
-                                    >
-                                        URL: http://{this.props.native.bind}:{this.props.native.port}/{cam.name}?key=
-                                        {this.props.native.key}
-                                    </a>
-                                </div>
                                 <div style={styles.sampleUrl}>
                                     {I18n.t('Web URL')}
                                     :&nbsp;