Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v2.1.1 #35

Merged
merged 17 commits into from
Apr 2, 2024
Merged

v2.1.1 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5df0228
sync !?
bugsounet Mar 30, 2024
4963ba4
begin add rate down/up
bugsounet Mar 30, 2024
d8cfde5
add rate down/up // Fix change device icon // review wifi 2.4 color
bugsounet Mar 31, 2024
04d09c9
add what class (?)
bugsounet Mar 31, 2024
9e691ec
version
bugsounet Mar 31, 2024
34cb459
Update README.md
bugsounet Mar 31, 2024
31c87ee
Update README.md
bugsounet Mar 31, 2024
e257a81
Add files via upload
bugsounet Mar 31, 2024
5070dc3
Update README.md
bugsounet Mar 31, 2024
941753e
Update README.md
bugsounet Mar 31, 2024
201f78e
delete important tag
bugsounet Mar 31, 2024
6e0b6ff
min require MM² version
bugsounet Mar 31, 2024
f5bdc61
typo
bugsounet Mar 31, 2024
5062383
Update README.md
bugsounet Apr 2, 2024
9625edd
Update README.md
bugsounet Apr 2, 2024
c8eab14
Update README.md
bugsounet Apr 2, 2024
ea6311a
Update package.json (rev)
bugsounet Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 45 additions & 8 deletions MMM-Freebox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
#FREE_PING,
#FREE_IP,
#FREE_DEBIT,
#FREE_DEBIT_DOWN,
#FREE_DEBIT_UP,
#FREE_BAND,
#FREE_BAND_TYPE,
#FREE_BAND_DOWN,
#FREE_BAND_UP,
#FREE_CLIENT {
display: flex;
font-size: small;
Expand All @@ -27,21 +32,36 @@
line-height: 1;
}

#FREE_VALUE {
#FREE_RATE {
margin-left: 10px;
text-align: left;
overflow:hidden;
text-overflow:ellipsis;
white-space: nowrap;
display:flex;
}

#FREE_RATE {

#FREE_RATE_DOWN,
#FREE_RATE_UP {
display: flex;
font-size: small;
align-items: center;
padding: 1px;
line-height: 1;
width: 80px;
}

#FREE_RATE_DOWN.noicon {
width: 65px;
}

#FREE_VALUE {
margin-left: 10px;
text-align: left;
overflow:hidden;
text-overflow:ellipsis;
white-space: nowrap;
width: 65px;
}

#FREE_VALUE.nomargin {
margin-left: 0px;
}

#FREE_TEXT {
Expand All @@ -55,6 +75,8 @@
white-space: nowrap;
}

#FREE_RATE_UP.hidden,
#FREE_VALUE.hidden,
#FREE_MODEL.hidden,
#FREE_ACCESS.hidden,
#FREE_IP.hidden,
Expand Down Expand Up @@ -223,6 +245,17 @@
background-position: 0 -1px;
}

#FREE_ICON.up {
background-image: url(resources/up.png);
}

#FREE_ICON.down {
background-image: url(resources/down.png);
}

#FREE_ICON.black {
background-image: url(resources/black.png);
}

#FREE_ICON.freebox_crystal0 {
background-image: url(resources/players.png);
Expand Down Expand Up @@ -447,7 +480,11 @@
}

#FREE_ACCESS.VM {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0ibWRpLXNlcnZlciIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik00LDFIMjBBMSwxIDAgMCwxIDIxLDJWNkExLDEgMCAwLDEgMjAsN0g0QTEsMSAwIDAsMSAzLDZWMkExLDEgMCAwLDEgNCwxTTQsOUgyMEExLDEgMCAwLDEgMjEsMTBWMTRBMSwxIDAgMCwxIDIwLDE1SDRBMSwxIDAgMCwxIDMsMTRWMTBBMSwxIDAgMCwxIDQsOU00LDE3SDIwQTEsMSAwIDAsMSAyMSwxOFYyMkExLDEgMCAwLDEgMjAsMjNINEExLDEgMCAwLDEgMywyMlYxOEExLDEgMCAwLDEgNCwxN005LDVIMTBWM0g5VjVNOSwxM0gxMFYxMUg5VjEzTTksMjFIMTBWMTlIOVYyMU01LDNWNUg3VjNINU01LDExVjEzSDdWMTFINU01LDE5VjIxSDdWMTlINVoiIC8+PC9zdmc+') !important;
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0ibWRpLXNlcnZlciIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik00LDFIMjBBMSwxIDAgMCwxIDIxLDJWNkExLDEgMCAwLDEgMjAsN0g0QTEsMSAwIDAsMSAzLDZWMkExLDEgMCAwLDEgNCwxTTQsOUgyMEExLDEgMCAwLDEgMjEsMTBWMTRBMSwxIDAgMCwxIDIwLDE1SDRBMSwxIDAgMCwxIDMsMTRWMTBBMSwxIDAgMCwxIDQsOU00LDE3SDIwQTEsMSAwIDAsMSAyMSwxOFYyMkExLDEgMCAwLDEgMjAsMjNINEExLDEgMCAwLDEgMywyMlYxOEExLDEgMCAwLDEgNCwxN005LDVIMTBWM0g5VjVNOSwxM0gxMFYxMUg5VjEzTTksMjFIMTBWMTlIOVYyMU01LDNWNUg3VjNINU01LDExVjEzSDdWMTFINU01LDE5VjIxSDdWMTlINVoiIC8+PC9zdmc+');
}

#FREE_ACCESS.what {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0ibWRpLWhlbHAtY2lyY2xlIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTE1LjA3LDExLjI1TDE0LjE3LDEyLjE3QzEzLjQ1LDEyLjg5IDEzLDEzLjUgMTMsMTVIMTFWMTQuNUMxMSwxMy4zOSAxMS40NSwxMi4zOSAxMi4xNywxMS42N0wxMy40MSwxMC40MUMxMy43OCwxMC4wNSAxNCw5LjU1IDE0LDlDMTQsNy44OSAxMy4xLDcgMTIsN0EyLDIgMCAwLDAgMTAsOUg4QTQsNCAwIDAsMSAxMiw1QTQsNCAwIDAsMSAxNiw5QzE2LDkuODggMTUuNjQsMTAuNjcgMTUuMDcsMTEuMjVNMTMsMTlIMTFWMTdIMTNNMTIsMkExMCwxMCAwIDAsMCAyLDEyQTEwLDEwIDAgMCwwIDEyLDIyQTEwLDEwIDAgMCwwIDIyLDEyQzIyLDYuNDcgMTcuNSwyIDEyLDJaIiAvPjwvc3ZnPg==');
}

/* ------------ */
Expand Down
173 changes: 155 additions & 18 deletions MMM-Freebox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FB = (...arg) => { /* do nothing */ };

Module.register("MMM-Freebox", {

requiresVersion: "2.26.0",
defaults: {
freebox: {},
debug: false,
Expand All @@ -17,6 +17,7 @@ Module.register("MMM-Freebox", {
showClient: true,
showClientRate: true,
showEthClientRate: false,
showClientRateDownOnly: true,
showClientIP: false,
showClientCnxType: true,
showFree: true,
Expand All @@ -34,8 +35,10 @@ Module.register("MMM-Freebox", {
this.Init = false;
this.Freebox = {
Hidden: true,
Bandwidth: null,
Debit: null,
BandwidthDown: null,
BandwidthUp: null,
DebitDown: null,
DebitUp: null,
IP: null,
Degroup: false,
Type: null,
Expand Down Expand Up @@ -108,8 +111,10 @@ Module.register("MMM-Freebox", {
this.Freebox.Model = payload.Model;
this.Freebox.Type = payload.Type;
this.Freebox.Degroup = payload.Degroup;
this.Freebox.Bandwidth = payload.Bandwidth;
this.Freebox.Debit = payload.Debit;
this.Freebox.BandwidthDown = payload.BandwidthDown;
this.Freebox.BandwidthUp = payload.BandwidthUp;
this.Freebox.DebitDown = payload.DebitDown;
this.Freebox.DebitUp = payload.DebitUp;
this.Freebox.IP = payload.IP;
this.Freebox.Clients = payload.Clients;
this.Freebox.Ping = payload.Ping;
Expand All @@ -133,11 +138,18 @@ Module.register("MMM-Freebox", {
/** Bande Passante **/
var bandWidth = document.getElementById("FREE_BAND");
var bandWidthIcon = bandWidth.querySelector("#FREE_ICON");
var bandWidthType = document.getElementById("FREE_BAND_TYPE");
var bandWidthDown = document.getElementById("FREE_BAND_DOWN");
var bandWidthUp = document.getElementById("FREE_BAND_UP");

var bandWidthValue = bandWidth.querySelector("#FREE_VALUE");
var bandWidthTypeValue = bandWidth.querySelector("#FREE_VALUE");
var bandWidthDownValue = bandWidthDown.querySelector("#FREE_VALUE");
var bandWidthUpValue = bandWidthUp.querySelector("#FREE_VALUE");
if (this.config.showIcon) bandWidthIcon.classList.remove("hidden");
if (this.config.showBandWidth) bandWidth.classList.remove("hidden");
bandWidthValue.textContent = this.Freebox.Type + (this.Freebox.Degroup ? " (Dégroupé): " : ": ") + this.Freebox.Bandwidth;
bandWidthTypeValue.textContent = this.Freebox.Type + (this.Freebox.Degroup ? " (Dégroupé): " : ": ");
bandWidthDownValue.textContent = this.Freebox.BandwidthDown;
bandWidthUpValue.textContent = this.Freebox.BandwidthUp;

/** Adresse IP **/
var IP = document.getElementById("FREE_IP");
Expand All @@ -160,6 +172,12 @@ Module.register("MMM-Freebox", {
return this.sendSocketNotification("CACHE");
}

/** Changement d'icone du client -> rebuild du cache **/
if (cache.type !== client.type) {
FB(`Type Appareil changé [${mac}] - ${cache.type} --> ${client.type}`);
return this.sendSocketNotification("CACHE");
}

/** Le nom d'affichage a été changé **/
var clientName = clientSelect.querySelector("#FREE_NAME");
client.name = client.name ? client.name : "(Appareil sans nom)";
Expand Down Expand Up @@ -188,15 +206,39 @@ Module.register("MMM-Freebox", {
else if (client.access_type === "sfp") clientAccess.className= "sfp"
*/
else if (client.access_type === "VM") clientAccess.className= "VM";
else clientAccess.className = "black";
// sometimes... WM is connected from repater !? (bug from api) -> displayed with what class `?`
else if (!client.access_type && client.active) clientAccess.className= "what";
else if (!client.active) clientAccess.className = "black";
// add connexion from repeater with `R` in red
if (client.repeater) clientAccess.classList.add("repeater");
else clientAccess.classList.remove("repeater");
}

/** debit client **/
var clientDebit = clientSelect.querySelector("#FREE_RATE");
var clientDebitDown = clientSelect.querySelector("#FREE_RATE_DOWN");
var clientDebitDownIcon = clientDebitDown.querySelector("#FREE_ICON");
var clientDebitDownValue = clientDebitDown.querySelector("#FREE_VALUE");
var clientDebitUp = clientSelect.querySelector("#FREE_RATE_UP");
var clientDebitUpIcon = clientDebitUp.querySelector("#FREE_ICON");
var clientDebitUpValue = clientDebitUp.querySelector("#FREE_VALUE");
if (this.config.showClientRate) clientDebit.classList.remove("hidden");
clientDebit.textContent = client.debit;
clientDebitDownValue.textContent = client.debitDown;
if (!this.config.showClientRateDownOnly) {
if (client.debitDown) {
clientDebitDownIcon.classList.add("down");
clientDebitUpIcon.classList.add("up");
} else {
clientDebitDownIcon.classList.add("black");
clientDebitUpIcon.classList.add("black");
}

clientDebitDownIcon.classList.remove("hidden");
clientDebitUp.classList.remove("hidden");
clientDebitUpIcon.classList.remove("hidden");
clientDebitUpValue.classList.remove("hidden");
clientDebitUpValue.textContent = client.debitUp;
}

/** bouton **/
var clientStatus = clientSelect.querySelector("INPUT");
Expand All @@ -221,15 +263,21 @@ Module.register("MMM-Freebox", {
/** Affichage Débit utilisé en temps réél **/
var debit = document.getElementById("FREE_DEBIT");
var debitIcon = debit.querySelector("#FREE_ICON");
var debitValue = debit.querySelector("#FREE_VALUE");
var debitUp = document.getElementById("FREE_DEBIT_UP");
var debitDown = document.getElementById("FREE_DEBIT_DOWN");
var debitDownValue = debitDown.querySelector("#FREE_VALUE");
var debitUpValue = debitUp.querySelector("#FREE_VALUE");

if (this.config.showIcon) debitIcon.classList.remove("hidden");
if (this.config.showRate) debit.classList.remove("hidden");
debitValue.textContent = this.Freebox.Debit;
debitDownValue.textContent = this.Freebox.DebitDown;
debitUpValue.textContent = this.Freebox.DebitUp;

/** Affichage Ping en temps réél **/
var ping = document.getElementById("FREE_PING");
var pingIcon = ping.querySelector("#FREE_ICON");
var pingValue = ping.querySelector("#FREE_VALUE");

if (this.config.showIcon) pingIcon.classList.remove("hidden");
if (this.config.showPing) ping.classList.remove("hidden");
pingValue.textContent = this.Freebox.Ping;
Expand Down Expand Up @@ -280,9 +328,41 @@ Module.register("MMM-Freebox", {
bandWidthIcon.id= "FREE_ICON";
bandWidth.appendChild(bandWidthIcon);

var bandWidthDisplay= document.createElement("div");
bandWidthDisplay.id = "FREE_VALUE";
bandWidth.appendChild(bandWidthDisplay);
var bandWidthType= document.createElement("div");
bandWidthType.id = "FREE_BAND_TYPE";
bandWidth.appendChild(bandWidthType);

var bandWidthTypeValue= document.createElement("div");
bandWidthTypeValue.id = "FREE_VALUE";
bandWidthType.appendChild(bandWidthTypeValue);

var bandWidthDown= document.createElement("div");
bandWidthDown.id = "FREE_BAND_DOWN";
bandWidth.appendChild(bandWidthDown);

var bandWidthDownIcon= document.createElement("div");
bandWidthDownIcon.className = "down";
bandWidthDownIcon.id = "FREE_ICON";
bandWidthDown.appendChild(bandWidthDownIcon);

var bandWidthDownRate= document.createElement("div");
bandWidthDownRate.id = "FREE_VALUE";
bandWidthDownRate.className = "nomargin";
bandWidthDown.appendChild(bandWidthDownRate);

var bandWidthUp= document.createElement("div");
bandWidthUp.id = "FREE_BAND_UP";
bandWidth.appendChild(bandWidthUp);

var bandWidthUpIcon= document.createElement("div");
bandWidthUpIcon.className = "up";
bandWidthUpIcon.id = "FREE_ICON";
bandWidthUp.appendChild(bandWidthUpIcon);

var bandWidthUpRate= document.createElement("div");
bandWidthUpRate.id = "FREE_VALUE";
bandWidthUpRate.className = "nomargin";
bandWidthUp.appendChild(bandWidthUpRate);

wrapper.appendChild(bandWidth);

Expand Down Expand Up @@ -343,10 +423,40 @@ Module.register("MMM-Freebox", {

var clientDebit = document.createElement("div");
clientDebit.id ="FREE_RATE";
clientDebit.textContent = "-";
clientDebit.classList.add("hidden");
client.appendChild(clientDebit);

var clientDebitDown= document.createElement("div");
clientDebitDown.id = "FREE_RATE_DOWN";
if (this.config.showClientRateDownOnly) clientDebitDown.className = "noicon";
clientDebit.appendChild( clientDebitDown);

var clientDebitDownIcon= document.createElement("div");
clientDebitDownIcon.className = "down hidden";
clientDebitDownIcon.id = "FREE_ICON";
clientDebitDown.appendChild(clientDebitDownIcon);

var clientDebitDownRate= document.createElement("div");
clientDebitDownRate.id = "FREE_VALUE";
clientDebitDownRate.className = "nomargin";
clientDebitDown.appendChild(clientDebitDownRate);

var clientDebitUp= document.createElement("div");
clientDebitUp.id = "FREE_RATE_UP";
clientDebitUp.className = "up hidden";
clientDebit.appendChild( clientDebitUp);

var clientDebitUpIcon= document.createElement("div");
clientDebitUpIcon.className = "up hidden";
clientDebitUpIcon.id = "FREE_ICON";
clientDebitUp.appendChild(clientDebitUpIcon);

var clientDebitUpRate= document.createElement("div");
clientDebitUpRate.id = "FREE_VALUE";
clientDebitUpRate.className = "nomargin hidden";
clientDebitUpRate.textContent = "-";
clientDebitUp.appendChild(clientDebitUpRate);

var clientStatus = document.createElement("div");
clientStatus.className = "switch";
clientStatus.classList.add("FBhidden");
Expand Down Expand Up @@ -374,19 +484,46 @@ Module.register("MMM-Freebox", {
var debit = document.createElement("div");
debit.id = "FREE_DEBIT";
debit.classList.add("hidden");

var debitIcon = document.createElement("div");
debitIcon.id= "FREE_ICON";
debitIcon.className = "rate";
debitIcon.classList.add("hidden");
debit.appendChild(debitIcon);

var debitText = document.createElement("div");
debitText.id = "FREE_TEXT";
debitText.textContent = "Débit total utilisé:";
debit.appendChild(debitText);
var debitDisplay= document.createElement("div");
debitDisplay.id = "FREE_VALUE";

debit.appendChild(debitDisplay);
var debitDown= document.createElement("div");
debitDown.id = "FREE_DEBIT_DOWN";
debit.appendChild(debitDown);

var debitDownIcon= document.createElement("div");
debitDownIcon.className = "down";
debitDownIcon.id = "FREE_ICON";
debitDown.appendChild(debitDownIcon);

var debitDownRate= document.createElement("div");
debitDownRate.id = "FREE_VALUE";
debitDownRate.className = "nomargin";
debitDown.appendChild(debitDownRate);

var debitUp= document.createElement("div");
debitUp.id = "FREE_DEBIT_UP";
debit.appendChild(debitUp);

var debitUpIcon= document.createElement("div");
debitUpIcon.className = "up";
debitUpIcon.id = "FREE_ICON";
debitUp.appendChild(debitUpIcon);

var debitUpRate= document.createElement("div");
debitUpRate.id = "FREE_VALUE";
debitUpRate.className = "nomargin";
debitUp.appendChild(debitUpRate);

wrapper.appendChild(debit);

/** ping **/
Expand Down
Loading