System
Loading Matterbridge status...
- WebSocket:
- Last seen:
+ WebSocket:
+ Last seen:
diff --git a/rock-s0/cockpit/manifest.json b/rock-s0/cockpit/manifest.json
index 145f913..17d559b 100644
--- a/rock-s0/cockpit/manifest.json
+++ b/rock-s0/cockpit/manifest.json
@@ -7,5 +7,5 @@
"label": "Matterbridge"
}
},
- "content-security-policy": "default-src 'self'; script-src 'self' https://cdnjs.cloudflare.com; style-src 'self';"
+ "content-security-policy": "default-src 'self'; script-src 'self'; connect-src 'self' wss://localhost:8283 wss://shelly:8283; style-src 'self';"
}
\ No newline at end of file
diff --git a/rock-s0/cockpit/matterbridge.js b/rock-s0/cockpit/matterbridge.js
index 426a234..e92faa0 100644
--- a/rock-s0/cockpit/matterbridge.js
+++ b/rock-s0/cockpit/matterbridge.js
@@ -4,12 +4,20 @@
cockpit.transport.wait(function () {
console.log('Matterbridge Cockpit extension loaded');
+ var lastSeen = 0;
+ var restart = false;
+ var matterbridgeCurrent = '';
+ var matterbridgeLatest = '';
+ var shellyCurrent = '';
+ var shellyLatest = '';
+
// Fetch and display the Matterbridge status
function fetchStatus() {
cockpit
.spawn(['systemctl', '--user', 'is-active', 'matterbridge'])
.then(function (status) {
document.getElementById('matterbridge-status').innerText = `Service: ${status.trim().replace('\n', '')}`;
+ connectToWebSocket();
})
.catch(function (error) {
console.error('Error fetching Matterbridge status:', error);
@@ -25,7 +33,11 @@ cockpit.transport.wait(function () {
// Extract the version number using a regular expression
const versionMatch = status.match(/matterbridge@(\d+\.\d+\.\d+)/);
const version = versionMatch ? versionMatch[1] : 'Unknown';
+ matterbridgeCurrent = version;
document.getElementById('matterbridge-current').innerText = `Current version: ${version}`;
+ if (matterbridgeCurrent === matterbridgeLatest) {
+ document.getElementById('matterbridge-update').style.display = 'none';
+ }
})
.catch(function (error) {
console.error('Error fetching Matterbridge current version:', error);
@@ -37,7 +49,9 @@ cockpit.transport.wait(function () {
function fetchMatterbridgeLatest() {
cockpit
.spawn(['npm', 'show', 'matterbridge', 'version'])
+ // cockpit.spawn(["whoami"])
.then(function (status) {
+ matterbridgeLatest = status.trim();
document.getElementById('matterbridge-latest').innerText = `Latest version: ${status.trim()}`;
})
.catch(function (error) {
@@ -54,7 +68,11 @@ cockpit.transport.wait(function () {
// Extract the version number using a regular expression
const versionMatch = status.match(/matterbridge-shelly@(\d+\.\d+\.\d+)/);
const version = versionMatch ? versionMatch[1] : 'Unknown';
+ shellyCurrent = version;
document.getElementById('shelly-current').innerText = `Current version: ${version}`;
+ if (shellyCurrent === shellyLatest) {
+ document.getElementById('shelly-update').style.display = 'none';
+ }
})
.catch(function (error) {
console.error('Error fetching Shelly plugin current version:', error);
@@ -66,7 +84,9 @@ cockpit.transport.wait(function () {
function fetchShellyLatest() {
cockpit
.spawn(['npm', 'show', 'matterbridge-shelly', 'version'])
+ // cockpit.spawn(["whoami"])
.then(function (status) {
+ shellyLatest = status.trim();
document.getElementById('shelly-latest').innerText = `Latest version: ${status.trim()}`;
showQR();
})
@@ -101,6 +121,45 @@ cockpit.transport.wait(function () {
}
}
+ // Function to connect to Matterbridge WebSocket API
+ function connectToWebSocket() {
+ const hostname = window.location.hostname;
+ const ws = new WebSocket(`wss://shelly:8283`);
+
+ setInterval(() => {
+ const elapsedSeconds = Math.round((Date.now() - lastSeen) / 1000);
+ console.log(`Elapsed seconds: ${elapsedSeconds}`);
+ if (elapsedSeconds < 10)
+ document.getElementById('matterbridge-lastseen').innerText = `Last seen: now`;
+ else if (elapsedSeconds < 60)
+ document.getElementById('matterbridge-lastseen').innerText = `Last seen: ${elapsedSeconds} seconds ago`;
+ else
+ document.getElementById('matterbridge-lastseen').innerText = `Last seen: ${Math.round(elapsedSeconds / 60)} minute(s) ago`;
+ }, 10000);
+
+ ws.onopen = function () {
+ console.log('Connected to Matterbridge WebSocket API');
+ document.getElementById('matterbridge-websocket').innerText = `Websocket: connected`;
+ document.getElementById('matterbridge-lastseen').innerText = `Last seen: now`;
+ };
+
+ ws.onmessage = function (event) {
+ const message = event.data;
+ console.log('Received message:'/*, message*/);
+ lastSeen = Date.now();
+ };
+
+ ws.onerror = function (error) {
+ console.error('WebSocket error:', error);
+ document.getElementById('matterbridge-websocket').innerText = `Websocket: error`;
+ };
+
+ ws.onclose = function () {
+ console.log('WebSocket connection closed');
+ document.getElementById('matterbridge-websocket').innerText = `Websocket: connection closed`;
+ };
+ }
+
// Fetch logs
function fetchLogs() {
cockpit
@@ -118,8 +177,9 @@ cockpit.transport.wait(function () {
// Open the frontend
document.getElementById('frontend-button')?.addEventListener('click', function () {
+ console.log('Opening matterbridge frontend...');
const hostname = window.location.hostname;
- const newUrl = `http://${hostname}:8283`;
+ const newUrl = `https://${hostname}:8283`;
window.open(newUrl, '_blank');
});
@@ -132,6 +192,8 @@ cockpit.transport.wait(function () {
.then(function (logs) {
console.log('Updated matterbridge:', logs);
fetchMatterbridgeCurrent();
+ restart = true;
+ document.getElementById('matterbridge-update').style.display = 'none';
})
.catch(function (error) {
console.error('Error updating matterbridge:', error);
@@ -148,6 +210,8 @@ cockpit.transport.wait(function () {
.then(function (logs) {
console.log('Updated matterbridge-shelly:', logs);
fetchShellyCurrent();
+ restart = true;
+ document.getElementById('shelly-update').style.display = 'none';
})
.catch(function (error) {
console.error('Error updating matterbridge-shelly:', error);
From 27dc9beaabf66800f38ccb39fce3ec44e8d4cd24 Mon Sep 17 00:00:00 2001
From: Luligu <132135057+Luligu@users.noreply.github.com>
Date: Thu, 24 Oct 2024 12:17:41 +0200
Subject: [PATCH 02/48] Dev 1.0.9-dev.1
---
rock-s0/INSTALL.md | 20 ++-
rock-s0/cockpit/LICENSE | 202 +++++++++++++++++++++++++++++++
rock-s0/cockpit/index.html | 17 +++
rock-s0/cockpit/manifest.json | 2 +-
rock-s0/cockpit/matterbridge.css | 36 ++++++
rock-s0/cockpit/matterbridge.js | 143 +++++++++++++++++-----
rock-s0/samba/smb.conf | 10 +-
7 files changed, 389 insertions(+), 41 deletions(-)
create mode 100644 rock-s0/cockpit/LICENSE
diff --git a/rock-s0/INSTALL.md b/rock-s0/INSTALL.md
index 85c4a54..e1ad7b4 100644
--- a/rock-s0/INSTALL.md
+++ b/rock-s0/INSTALL.md
@@ -5,15 +5,25 @@ loader: rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin
image: rock-s0_debian_bookworm_cli_b6.img
```
-lligu@ubuntu:~/Radxa$ rkdeveloptool ld
+rkdeveloptool ld
+```
DevNo=1 Vid=0x2207,Pid=0x330e,LocationID=202 Maskrom
-lligu@ubuntu:~/Radxa$ sudo rkdeveloptool db rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin
+
+```
+sudo rkdeveloptool db rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin
+```
Downloading bootloader succeeded.
-lligu@ubuntu:~/Radxa$ sudo rkdeveloptool wl 0 rock-s0_debian_bookworm_cli_b6.img
+
+```
+sudo rkdeveloptool wl 0 rock-s0_debian_bookworm_cli_b6.img
+```
Write LBA from file (100%)
-lligu@ubuntu:~/Radxa$ sudo rkdeveloptool rd
-Reset Device OK.
+
```
+sudo rkdeveloptool rd
+```
+Reset Device OK.
+
# Update system with rsetup
diff --git a/rock-s0/cockpit/LICENSE b/rock-s0/cockpit/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/rock-s0/cockpit/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/rock-s0/cockpit/index.html b/rock-s0/cockpit/index.html
index 99d0620..b833c65 100644
--- a/rock-s0/cockpit/index.html
+++ b/rock-s0/cockpit/index.html
@@ -46,6 +46,23 @@