goosebit 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

goosebit/ui/static/js/firmware.js

@@ -1,131 +1,277 @@
 const CHUNK_SIZE = 10 * 1024 * 1024; // 10 MB chunk size
-const form = document.getElementById('upload-form');
-const fileInput = document.getElementById('file-upload');
-const fileSubmit = document.getElementById('file-upload-submit');
-const progressBar = document.getElementById('upload-progress');
+const uploadForm = document.getElementById("upload-form");
+const uploadFileInput = document.getElementById("file-upload");
+const uploadFileSubmit = document.getElementById("file-upload-submit");
+const uploadProgressBar = document.getElementById("upload-progress");
 
-form.addEventListener('submit', e => {
+let dataTable;
+
+uploadForm.addEventListener("submit", async (e) => {
     e.preventDefault();
-    sendFileChunks(fileInput.files[0])
+    await sendFileChunks(uploadFileInput.files[0]);
 });
 
-const sendFileChunks = async (file) => {
+async function sendFileChunks(file) {
     const totalChunks = Math.ceil(file.size / CHUNK_SIZE);
     let start = 0;
     let uploadedChunks = 0;
 
-    fileSubmit.disabled = true
-    fileInput.disabled = true
+    uploadFileSubmit.disabled = true;
+    uploadFileSubmit.classList.add("d-none");
+    uploadFileInput.disabled = true;
+    uploadProgressBar.parentElement.classList.remove("d-none");
 
     for (let i = 0; i < totalChunks; i++) {
         const end = Math.min(start + CHUNK_SIZE, file.size);
         const chunk = file.slice(start, end);
         const formData = new FormData();
-        formData.append('chunk', chunk);
-        formData.append('filename', file.name);
-        if (i == 0) {
-            formData.append('init', true);
-        } else  {
-            formData.append('init', false);
+        formData.append("chunk", chunk);
+        formData.append("filename", file.name);
+        if (i === 0) {
+            formData.append("init", "true");
+        } else {
+            formData.append("init", "false");
         }
 
-        if (i == totalChunks - 1) {
-            formData.append('done', true);
+        if (i === totalChunks - 1) {
+            formData.append("done", "true");
         } else {
-            formData.append('done', false);
+            formData.append("done", "false");
         }
 
-        const response = await fetch("/ui/upload", {
-            method: 'POST',
+        const response = await fetch("/ui/upload/local", {
+            method: "POST",
             body: formData,
         });
 
         if (response.ok) {
             uploadedChunks++;
             const progress = (uploadedChunks / totalChunks) * 100;
-            progressBar.style.width = `${progress}%`;
-            progressBar.innerHTML = `${Math.round(progress)}%`;
+            uploadProgressBar.style.width = `${progress}%`;
+            uploadProgressBar.innerHTML = `${Math.round(progress)}%`;
+        } else {
+            if (response.status === 400) {
+                const result = await response.json();
+                const alerts = document.getElementById("upload-alerts");
+                alerts.innerHTML = `<div class="alert alert-warning alert-dismissible fade show" role="alert">
+                    ${result.detail}
+                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+                </div>`;
+            }
         }
 
         start = end;
     }
 
-    window.setTimeout(function () {
-        resetProgress()
-    }, 1000)
-};
-
-function resetProgress() {
-    fileInput.disabled = false;
-    fileSubmit.disabled = false;
-    progressBar.style.width = `0%`;
-    progressBar.innerHTML = `0%`;
-    updateFirmwareList();
+    window.setTimeout(() => {
+        resetProgress();
+    }, 1000);
 }
 
-document.addEventListener("DOMContentLoaded", function() {
-    updateFirmwareList();
+const urlForm = document.getElementById("url-form");
+const urlFileInput = document.getElementById("file-url");
+const urlFileSubmit = document.getElementById("url-submit");
+
+urlForm.addEventListener("submit", async (e) => {
+    e.preventDefault();
+    await sendFileUrl(urlFileInput.value);
 });
 
+async function sendFileUrl(url) {
+    const formData = new FormData();
+    formData.append("url", url);
 
-function updateFirmwareList() {
-    const url = '/api/firmware/all';
+    const response = await fetch("/ui/upload/remote", {
+        method: "POST",
+        body: formData,
+    });
 
-    fetch(url)
-    .then(response => {
-        if (!response.ok) {
-            throw new Error('Request failed');
+    if (!response.ok) {
+        if (response.status === 400) {
+            const result = await response.json();
+            const alerts = document.getElementById("url-alerts");
+            alerts.innerHTML = `<div class="alert alert-warning alert-dismissible fade show" role="alert">
+                ${result.detail}
+                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+            </div>`;
         }
-        return response.json();
-    })
-    .then(data => {
-        const list = document.getElementById('firmware-list');
-        list.innerHTML = "";
-
-        data.forEach(item => {
-            const listItem = document.createElement('li');
-            listItem.textContent = item["version"];
-            listItem.classList = ["list-group-item d-flex justify-content-between align-items-center"];
-
-            const btnGroup = document.createElement("div")
-            btnGroup.classList = "btn-group"
-            btnGroup.role = "group"
-
-            const deleteBtn = document.createElement('button');
-            deleteBtn.innerHTML =  "<i class='bi bi-trash'></i>";
-            deleteBtn.classList = ["btn btn-danger"];
-            deleteBtn.onclick = function() {deleteFirmware(item["name"])};
-
-            const downloadBtn = document.createElement('button');
-            downloadBtn.innerHTML = "<i class='bi bi-cloud-download'></i>";
-            downloadBtn.classList = ["btn btn-primary"];
-            downloadBtn.onclick = function() {window.location.href = `/api/download/${item["name"]}`};
-
-            btnGroup.appendChild(deleteBtn);
-            btnGroup.appendChild(downloadBtn);
-
-            listItem.appendChild(btnGroup);
-            list.appendChild(listItem);
+    }
+}
+
+function updateFirmwareList() {
+    dataTable.ajax.reload(null, false);
+}
+
+function resetProgress() {
+    uploadFileInput.disabled = false;
+    uploadFileSubmit.disabled = false;
+    uploadFileSubmit.classList.remove("d-none");
+    urlFileInput.disabled = false;
+    urlFileSubmit.disabled = false;
+    uploadProgressBar.style.width = "0%";
+    uploadProgressBar.innerHTML = "0%";
+    uploadProgressBar.parentElement.classList.add("d-none");
+
+    updateFirmwareList();
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+    dataTable = new DataTable("#firmware-table", {
+        responsive: true,
+        paging: true,
+        processing: false,
+        serverSide: true,
+        order: [2, "desc"],
+        scrollCollapse: true,
+        scroller: true,
+        scrollY: "60vh",
+        stateSave: true,
+        stateLoadParams: (settings, data) => {
+            // if save state is older than last breaking code change...
+            if (data.time <= 1722415428000) {
+                // ... delete it
+                for (const key of Object.keys(data)) {
+                    delete data[key];
+                }
+            }
+        },
+        ajax: {
+            url: "/api/firmware/all",
+            contentType: "application/json",
+        },
+        initComplete: () => {
+            updateBtnState();
+        },
+        columnDefs: [
+            {
+                targets: "_all",
+                searchable: false,
+                orderable: false,
+                render: (data) => data || "-",
+            },
+        ],
+        columns: [
+            { data: "id", visible: false },
+            { data: "name", searchable: true },
+            { data: "version", searchable: true, orderable: true },
+            {
+                data: "size",
+                render: (data, type) => {
+                    if (type === "display" || type === "filter") {
+                        return `${(data / 1024 / 1024).toFixed(2)}MB`;
+                    }
+                    return data;
+                },
+            },
+        ],
+        select: true,
+        rowId: "id",
+        layout: {
+            bottom1Start: {
+                buttons: [
+                    {
+                        text: '<i class="bi bi-cloud-download" ></i>',
+                        action: (e, dt) => {
+                            const selectedFirmware = dt
+                                .rows({ selected: true })
+                                .data()
+                                .toArray()
+                                .map((d) => d.id);
+                            downloadFirmware(selectedFirmware[0]);
+                        },
+                        className: "buttons-download",
+                        titleAttr: "Download Firmware",
+                    },
+                    {
+                        text: '<i class="bi bi-trash" ></i>',
+                        action: async (e, dt) => {
+                            const selectedFirmware = dt
+                                .rows({ selected: true })
+                                .data()
+                                .toArray()
+                                .map((d) => d.id);
+                            await deleteFirmware(selectedFirmware);
+                        },
+                        className: "buttons-delete",
+                        titleAttr: "Delete Firmware",
+                    },
+                ],
+            },
+        },
+    });
+
+    dataTable
+        .on("select", () => {
+            updateBtnState();
+        })
+        .on("deselect", () => {
+            updateBtnState();
         });
-    })
-    .catch(error => {
-        console.error('Failed to fetch firmware data:', error);
+
+    // Compatibility tooltip
+    $(() => {
+        $('[data-toggle="tooltip"]').tooltip();
     });
+
+    $("#firmware-table tbody")
+        .on("mouseenter", "tr", function () {
+            const rowData = dataTable.row(this).data();
+            const compat = rowData.compatibility;
+            let tooltipText = "";
+            if (compat) {
+                const result = compat.reduce((acc, { model, revision }) => {
+                    if (!acc[model]) {
+                        acc[model] = [];
+                    }
+                    acc[model].push(revision);
+                    return acc;
+                }, {});
+
+                tooltipText = Object.entries(result)
+                    .map(([model, revision]) => `<b>${model}</b> [${revision.join(", ")}]`)
+                    .join(", ");
+            }
+
+            // Initialize Bootstrap tooltip
+            $(this)
+                .attr("title", tooltipText)
+                .tooltip({
+                    placement: "top",
+                    trigger: "hover",
+                    container: "body",
+                    html: true,
+                })
+                .tooltip("show");
+        })
+        .on("mouseleave", "tr", function () {
+            $(this).tooltip("dispose");
+        });
+
+    updateFirmwareList();
+});
+
+function updateBtnState() {
+    if (dataTable.rows({ selected: true }).any()) {
+        document.querySelector("button.buttons-delete").classList.remove("disabled");
+    } else {
+        document.querySelector("button.buttons-delete").classList.add("disabled");
+    }
+    if (dataTable.rows({ selected: true }).count() === 1) {
+        document.querySelector("button.buttons-download").classList.remove("disabled");
+    } else {
+        document.querySelector("button.buttons-download").classList.add("disabled");
+    }
 }
 
-function deleteFirmware(file) {
-    fetch('/api/firmware/delete', {
-        method: 'POST',
-        body: file,
-    })
-    .then(response => {
-        if (!response.ok) {
-            throw new Error('Failed to delete firmware.');
-        }
+async function deleteFirmware(files) {
+    try {
+        await post("/api/firmware/delete", files);
         updateFirmwareList();
-        return response.json();
-    })
-    .catch(error => {
-        console.error('Error:', error);
-    });
+    } catch (error) {
+        console.error("Deleting firmwares failed:", error);
+    }
+}
+
+function downloadFirmware(file) {
+    window.location.href = `/api/download/${file}`;
 }

goosebit/ui/static/js/index.js

@@ -1,54 +1,80 @@
-document.addEventListener("DOMContentLoaded", function() {
-    var dataTable = new DataTable("#device-table", {
+let dataTable;
+
+document.addEventListener("DOMContentLoaded", () => {
+    dataTable = new DataTable("#device-table", {
         responsive: true,
-        paging: false,
+        paging: true,
+        processing: false,
+        serverSide: true,
         scrollCollapse: true,
         scroller: true,
         scrollY: "65vh",
         stateSave: true,
+        stateLoadParams: (settings, data) => {
+            // if save state is older than last breaking code change...
+            if (data.time <= 1722434386000) {
+                // ... delete it
+                for (const key of Object.keys(data)) {
+                    delete data[key];
+                }
+            }
+        },
         ajax: {
             url: "/api/devices/all",
-            dataSrc: "",
+            contentType: "application/json",
         },
-        initComplete:function(){
+        initComplete: () => {
             updateBtnState();
         },
         columnDefs: [
+            {
+                targets: [0, 2],
+                searchable: true,
+                orderable: true,
+            },
             {
                 targets: "_all",
-                render: function(data, type, row) {
-                    return data || "❓";
-                },
-            }
+                searchable: false,
+                orderable: false,
+                render: (data) => data || "-",
+            },
         ],
         columns: [
-            { data: 'name' },
+            { data: "name" },
             {
-                data: 'online',
-                render: function(data, type, row) {
-                    if ( type === 'display' || type === 'filter' ) {
-                        online = data ? "Online" : "Offline"
-                        color = data ? "success" : "danger"
+                data: "online",
+                render: (data, type) => {
+                    if (type === "display" || type === "filter") {
+                        const color = data ? "success" : "danger";
                         return `
                         <div class="text-${color}">
                             ●
                         </div>
-                        `
+                        `;
                     }
                     return data;
-                }
+                },
+            },
+            { data: "uuid" },
+            { data: "fw_installed_version" },
+            {
+                data: "progress",
+                render: (data, type) => {
+                    if (type === "display" || type === "filter") {
+                        return data ? `${data}%` : "-";
+                    }
+                    return data;
+                },
             },
-            { data: 'uuid' },
-            { data: 'fw' },
-            { data: 'last_ip' },
+            { data: "last_ip" },
             {
-                data: 'last_seen',
-                render: function(data, type, row) {
-                    if ( type === 'display' || type === 'filter' ) {
+                data: "last_seen",
+                render: (data, type) => {
+                    if (type === "display" || type === "filter") {
                         return secondsToRecentDate(data);
                     }
                     return data;
-                }
+                },
             },
         ],
         select: true,
@@ -59,103 +85,76 @@ document.addEventListener("DOMContentLoaded", function() {
                     {
                         text: '<i class="bi bi-check-all"></i>',
                         extend: "selectAll",
-                        titleAttr: 'Select All'
+                        titleAttr: "Select All",
                     },
                     {
                         text: '<i class="bi bi-x"></i>',
                         extend: "selectNone",
-                        titleAttr: 'Clear Selection'
+                        titleAttr: "Clear Selection",
                     },
                     {
                         text: '<i class="bi bi-file-earmark-arrow-down"></i>',
-                        action: function (e, dt, node, config) {
-                            selectedDevices = dt.rows( {selected:true} ).data().toArray();
+                        action: (e, dt) => {
+                            const selectedDevices = dt.rows({ selected: true }).data().toArray();
                             downloadLogins(selectedDevices);
                         },
                         className: "buttons-export-login",
-                        titleAttr: 'Export Login'
+                        titleAttr: "Export Login",
                     },
                     {
                         text: '<i class="bi bi-file-text"></i>',
-                        action: function (e, dt, node, config) {
-                            selectedDevice = dt.rows( {selected:true} ).data().toArray()[0];
-                            window.location.href = `/ui/logs/${selectedDevice["uuid"]}`;
+                        action: (e, dt) => {
+                            const selectedDevice = dt.rows({ selected: true }).data().toArray()[0];
+                            window.location.href = `/ui/logs/${selectedDevice.uuid}`;
                         },
                         className: "buttons-logs",
-                        titleAttr: 'View Log'
+                        titleAttr: "View Log",
                     },
-                ]
-            }
-        }
+                ],
+            },
+        },
     });
 
-    dataTable.on( 'select', function ( e, dt, type, indexes ) {
-        updateBtnState();
-    } ).on( 'deselect', function ( e, dt, type, indexes ) {
-        updateBtnState();
-    } );
+    dataTable
+        .on("select", () => {
+            updateBtnState();
+        })
+        .on("deselect", () => {
+            updateBtnState();
+        });
 
-    setInterval(function () {
+    setInterval(() => {
         dataTable.ajax.reload(null, false);
     }, TABLE_UPDATE_TIME);
 });
 
 function updateBtnState() {
-    dataTable = $("#device-table").DataTable();
-    if (dataTable.rows( {selected:true} ).any()){
-        document.querySelector('button.buttons-select-none').classList.remove('disabled');
-        document.querySelector('button.buttons-export-login').classList.remove('disabled');
-    } else {
-        document.querySelector('button.buttons-select-none').classList.add('disabled');
-        document.querySelector('button.buttons-export-login').classList.add('disabled');
-    }
-    if (dataTable.rows( {selected:true} ).count() == 1){
-        document.querySelector('button.buttons-logs').classList.remove('disabled');
+    if (dataTable.rows({ selected: true }).any()) {
+        document.querySelector("button.buttons-select-none").classList.remove("disabled");
+        document.querySelector("button.buttons-export-login").classList.remove("disabled");
     } else {
-        document.querySelector('button.buttons-logs').classList.add('disabled');
+        document.querySelector("button.buttons-select-none").classList.add("disabled");
+        document.querySelector("button.buttons-export-login").classList.add("disabled");
     }
-
-
-    if(dataTable.rows( {selected:true} ).ids().toArray().length === dataTable.rows().ids().toArray().length){
-        document.querySelector('button.buttons-select-all').classList.add('disabled');
+    if (dataTable.rows({ selected: true }).count() === 1) {
+        document.querySelector("button.buttons-logs").classList.remove("disabled");
     } else {
-        document.querySelector('button.buttons-select-all').classList.remove('disabled');
+        document.querySelector("button.buttons-logs").classList.add("disabled");
     }
 }
 
 function downloadLogins(devices) {
-    let deviceLogins = devices.map(dev => {
-        return [dev["name"], `https://${dev["uuid"]}-access.loadsync.io`, dev["uuid"], dev["web_pwd"]];
+    const deviceLogins = devices.map((dev) => {
+        return [dev.name, `https://${dev.uuid}-access.loadsync.io`, dev.uuid];
     });
     deviceLogins.unshift(["Building", "Access Link", "Serial Number/Wifi SSID", "Login/Wifi Password"]);
 
-    let csvContent = "data:text/csv;charset=utf-8," + deviceLogins.map(e => e.join(",")).join("\n");
-    var encodedUri = encodeURI(csvContent);
-    var link = document.createElement("a");
+    const csvContent = `data:text/csv;charset=utf-8,${deviceLogins.map((e) => e.join(",")).join("\n")}`;
+    const encodedUri = encodeURI(csvContent);
+    const link = document.createElement("a");
     link.setAttribute("href", encodedUri);
     link.setAttribute("download", "LoadsyncLogins-Export.csv");
     document.body.appendChild(link);
 
     link.click();
 }
-
-function secondsToRecentDate(t) {
-    if (t == null) {
-        return null
-    }
-    t = Number(t);
-    var d = Math.floor(t / 86400)
-    var h = Math.floor(t % 86400 / 3600);
-    var m = Math.floor(t % 86400 % 3600 / 60);
-    var s = Math.floor(t % 86400 % 3600 % 60);
-
-    if (d > 0) {
-        return d + (d == 1 ? " day" : " days");
-    } else if (h > 0) {
-        return h + (h == 1 ? " hour" : " hours");
-    } else if (m > 0) {
-        return m + (m == 1 ? " minute" : " minutes");
-    } else {
-        return s + (s == 1 ? " second" : " seconds");
-    }
-}

goosebit/ui/static/js/logs.js

@@ -1,18 +1,25 @@
-document.addEventListener("DOMContentLoaded", function() {
-    var logs_ws = create_ws(`/realtime/logs/${device}`);
+document.addEventListener("DOMContentLoaded", () => {
+    const logs_ws = create_ws(`/realtime/logs/${device}`);
 
-    logs_ws.addEventListener('message', (event) => {
-        res = JSON.parse(event.data);
+    logs_ws.addEventListener("message", (event) => {
+        const res = JSON.parse(event.data);
 
-        const logElem = document.getElementById('device-log');
-        if (res["clear"]) {
-            logElem.textContent = ""
+        const logElem = document.getElementById("device-log");
+        if (res.clear) {
+            logElem.textContent = "";
         }
-        logElem.textContent += res["log"];
+        logElem.textContent += res.log;
+
+        const progressElem = document.getElementById("install-progress");
+        progressElem.style.width = `${res.progress}%`;
+        progressElem.innerHTML = `${res.progress}%`;
     });
 });
 
 function create_ws(s) {
-    var l = window.location;
-    return new WebSocket(((l.protocol === "https:") ? "wss://" : "ws://") + l.hostname + (((l.port != 80) && (l.port != 443)) ? ":" + l.port : "") + s);
+    const l = window.location;
+    const protocol = l.protocol === "https:" ? "wss://" : "ws://";
+    const port = l.port !== "80" || l.port !== "443" ? l.port : "";
+    const url = `${protocol}${l.hostname}${port}${s}`;
+    return new WebSocket(url);
 }