Manual button state fixes; embrava testing

chadwallacehart · chadwallacehart · commit 8f87f5438853 · 2021-02-10T21:56:43.000-05:00
diff --git a/background.js b/background.js
@@ -1,11 +1,18 @@
 // global vars
 let presences = [];
 let totalStreams = 0;
-let ledStatus = "off";
+let ledStatus;
 let settings = JSON.parse(localStorage.getItem("settings"));
 
 //ToDo: Need to handle when there are no settings
 console.log("Settings:", settings);
+if(settings.busy)
+    ledStatus = settings.busy;
+else{
+    settings.busy = false;
+    ledStatus = "off";
+
+}
 
 // prototype for our presence status object
 function Presence(url, streamCount, tabId, tabStatus) {
@@ -44,8 +51,12 @@ function webhook(state){
             }
         };
 
-        if (postBody !== "")
-            fetchParams.body = JSON.stringify(JSON.parse(postBody));    // ToDo: not sure why I need the parse all of the sudden
+        if (postBody !== ""){
+            // fetchParams.body = postBody;
+            // ToDo: debug
+            // window.fetchParams = fetchParams;
+            fetchParams.body = JSON.stringify(postBody);    // ToDo: not sure why I need the parse all of the sudden
+        }
     }
 
     console.log(headers);
@@ -54,17 +65,17 @@ function webhook(state){
         fetchParams.headers = Object.assign(fetchParams.headers, JSON.parse(headers));
 
 
-    console.log(url, fetchParams);
+    //console.log(url, fetchParams);
 
     fetch(url, fetchParams)
     // In case we care about the response someday
         .then(
             response => {
-                console.log("webhook sent. Response code: " + response.status);
+                console.log("fetch details:", url, fetchParams, response);
                 response.text().then(text => console.log("response text: " + text))
             })
         .catch(function (error) {
-            console.log('Request failed', error);
+            console.log("fetch request failed details:", url, fetchParams, error);
         });
 }
 
@@ -76,24 +87,40 @@ function ledChange(state) {
     chrome.tabs.query({active: true, windowType: "normal", currentWindow: true}, function (d) {
         let tabId = d[0].id;
         chrome.browserAction.setIcon({path: "icons/" + state + '.png'});    //Add tabId: tabId to make it tab specific
-
     });
+
+    // ToDo: make HID work
+    //HID
+    if(settings.hid){
+        glow([180,0,0]).catch(err=>console.error(err));
+    }
 }
 
 
 function statusControl(port) {
 
+
     totalStreams = presences.reduce((total, p) => total + p.streamCount, 0);
     let liveTabs = presences.reduce((total, p) => total + p.live(), 0);
 
     console.log("total stream count is: " + totalStreams);
     console.log("active tab count is: " + liveTabs);
 
+
+    // ToDo: need to manage manual status changes from on/off button
+
+    /*
+    * When to turn ON the light:
+    * Manual - err on side of being on too often
+    * TURN ON: if WebRTC active and LED is off
+    * TURN OFF: if WebRTC not active, not manual busy, and the LED is off
+    * */
+
     // Update the badge text
     chrome.browserAction.setBadgeText({text: liveTabs.toString()});
 
     // Turn the LED off
-    if (totalStreams === 0 && ledStatus === 'on') {
+    if (totalStreams === 0 && ledStatus === 'on' && !settings.busy) {
         ledChange("off");
         ledStatus = "off";
     }
@@ -110,7 +137,8 @@ function statusControl(port) {
         }
 
     }
-    // For debugging
+    /*
+    // ToDo: remove this if the above works; For debugging
     else if (totalStreams === 0 && ledStatus === 'off') {
         console.log("No WebRTC streams")
     } else if (totalStreams > 0 && ledStatus === 'on') {
@@ -120,6 +148,7 @@ function statusControl(port) {
     else {
         console.error("unhandled condition: ", totalStreams, ledStatus)
     }
+    */
 
     // Update the pop-up text
     port.postMessage({
@@ -230,11 +259,17 @@ chrome.runtime.onConnect.addListener(function (port) {
         if (message.type === "command") {
             console.log("popup command", message);
             if(message.command){
+                    // ToDo: ***manage manual status
+                    console.log("DEBUG:", message.command);
+                    settings.busy = message.command === "on";
                     ledChange(message.command);
+                    ledStatus = "on";
+
             }
         }
-        
 
+
+        // ToDo: I don't remember if this is required to load settings background.js or it is already shared from popup.js
         // Update settings data
         if (message.type === "settings") {
             console.log("popup settings", message);
diff --git a/include/embrava.js b/include/embrava.js
@@ -0,0 +1,44 @@
+async function glow(rgb) {
+    let device = await openDevice();
+    await colorize(device, rgb );
+}
+
+async function handleDisconnectClick() {
+    let device = await openDevice();
+    if( !device ) return;
+    let acolor = [ 0, 0, 0 ]; // off
+    await colorize(device, acolor);
+    await device.close();
+}
+
+async function openDevice() {
+    const vendorId = 0x2c0d; // embrava.com
+    const productId = 0x000c;  // blynclight standard
+    const device_list = await navigator.hid.getDevices();
+    let device = device_list.find(d => d.vendorId === vendorId && d.productId === productId);
+
+    if (!device) {
+        let devices = await navigator.hid.requestDevice({
+            filters: [{ vendorId, productId }],
+        });
+        console.log("devices:", devices);
+        device = devices[0];
+        if( !device ) return null;
+    }
+    if (!device.opened) {
+        await device.open();
+    }
+    console.log("device opened:",device);
+    return device;
+}
+
+async function colorize(device, [r, g, b] ) {
+    if(!device) return;
+    const data = Uint8Array.from([ r,b,g, 0x00, 0x00, 0x40, 0x02, 0xFF22 ]);
+    // 4th parameter is light control, 0 is stable, 70 is fast blink?, 100 is medium blink?
+    try {
+        await device.sendReport(0, data);    //If the HID device does not use report IDs, set reportId to 0.
+    } catch (error) {
+        console.error(error);
+    }
+}
diff --git a/manifest.json b/manifest.json
@@ -7,7 +7,7 @@
       "run_at": "document_start"
    } ],
   "background": {
-    "scripts": ["background.js"],
+    "scripts": ["background.js", "include/embrava.js"],
     "persistent": true
   },
   "browser_action": {
diff --git a/popup.html b/popup.html
@@ -33,6 +33,9 @@
         <button type="button" class="btn btn-primary busy" id="notBusyBtn">Not busy</button>
         <span style="float: right"><a href="#" id="settingsToggle">⚙️</a></span>
         <div id="settings" style="display:none" class="well">
+            <input id="embrava" type="checkbox">
+            <label for="embrava">Embrava BlyncLight</label><br>
+
             <h4>Webhook settings</h4>
             <ul class="nav nav-tabs">
                 <li class="active">
diff --git a/popup.js b/popup.js
@@ -7,6 +7,8 @@ $(document).ready( function () {
 
     let busyBtn =  $("#busyBtn");
     let notBusyBtn =  $("#notBusyBtn");
+    let hid = false;
+    let busy = false;
 
     let port = chrome.extension.connect({
         name: "WebRTC Presence popup"
@@ -19,11 +21,13 @@ $(document).ready( function () {
 
             if(msg.data.status) {
                 if (msg.data.status === "on") {
+                    busy = true;
                     console.log("turn busy button on");
                     busyBtn.removeClass("hidden");
                     notBusyBtn.addClass("hidden");
                 } else if (msg.data.status === "off") {
                     //busyBtn.addClass("hidden");
+                    busy = false;
                     busyBtn.addClass("hidden");
                     notBusyBtn.removeClass("hidden");
                 }
@@ -55,15 +59,19 @@ $(document).ready( function () {
         if(e.target.innerText==="Busy"){
             console.log("on button clicked; turning off");
             port.postMessage({type: "command", command:"off"});
+            busy = false;
         }
         else if(e.target.innerText==="Not busy"){
             console.log("off button clicked; turning on");
             port.postMessage({type: "command", command:"on"});
+            busy = true;
         }
         else{
             console.log("on/off button handler error", e);
         }
 
+        sendSettings();
+
     });
 
     // Function for sending the form data back to background.js
@@ -75,6 +83,9 @@ $(document).ready( function () {
         settings.onMethod = $("#onGetSwitch")[0].checked ? "GET" : "POST";
         settings.offMethod = $("#offGetSwitch")[0].checked ? "GET" : "POST";
 
+        settings.hid = hid;
+        settings.busy = busy;
+
         console.log(settings);
 
         port.postMessage({type: "settings", data: settings});
@@ -85,24 +96,39 @@ $(document).ready( function () {
 
 
     // Get settings data from a localStorage and populate the forms
-    let formData = JSON.parse(localStorage.getItem("settings"));
-    console.log("saved settings:", formData);
+    let settingsData = JSON.parse(localStorage.getItem("settings"));
+    console.log("saved settings:", settingsData);
+
+    // Update the UI if we have saved settings
+    if(settingsData){
+
+        hid = settingsData.hid;
+        busy = settingsData.busy;
+
+        $("#embrava").prop("checked", settingsData.hid);
 
-    // Update the forms if we have saved settings
-    if(formData){
+        if(settingsData.busy){
+            busyBtn.removeClass("hidden");
+            notBusyBtn.addClass("hidden");
+        }
+        else{
+            busyBtn.addClass("hidden");
+            notBusyBtn.removeClass("hidden");
+        }
 
-        onForm["onUrl"].value = formData["onUrl"] || "";
-        onForm["onHeaders"].value = formData["onHeaders"] || "";
-        onForm["onPostBody"].value = formData["onPostBody"] || "";
-        onForm["onGetSwitch"].checked = formData["onMethod"] === "GET";
+
+        onForm["onUrl"].value = settingsData["onUrl"] || "";
+        onForm["onHeaders"].value = settingsData["onHeaders"] || "";
+        onForm["onPostBody"].value = settingsData["onPostBody"] || "";
+        onForm["onGetSwitch"].checked = settingsData["onMethod"] === "GET";
         if(onForm["onGetSwitch"].checked)
             $(".onPostBody").hide();
 
 
-        offForm["offUrl"].value = formData["offUrl"] || "";
-        offForm["offHeaders"].value = formData["offHeaders"] || "";
-        offForm["offGetSwitch"].checked = formData["offMethod"] === "GET";
-        offForm["offPostBody"].value = formData["offPostBody"] || "";
+        offForm["offUrl"].value = settingsData["offUrl"] || "";
+        offForm["offHeaders"].value = settingsData["offHeaders"] || "";
+        offForm["offGetSwitch"].checked = settingsData["offMethod"] === "GET";
+        offForm["offPostBody"].value = settingsData["offPostBody"] || "";
         if(offForm["offGetSwitch"].checked)
             $(".offPostBody").hide();
 
@@ -119,6 +145,10 @@ $(document).ready( function () {
         $(".offPostBody").toggle();
     });
 
+    $("#embrava").change(()=>{
+        hid = !hid;
+    });
+
     $("#saveButton").click(()=>{
         sendSettings();
         localStorage.setItem("settings", JSON.stringify(settings));
