homebridge-smartsystem 6.8.13 → 7.0.1

package/server/smartapp.ts

@@ -9,7 +9,7 @@
 // v2.0: mar/apr 2020
 
 import { Context, HttpResponse, WebApp } from "./webapp";
-import { Sanitizers, Rule, kEmptyRule, actionValue, Action, kEmptySwitch, Switch, SwitchType, hex, Binding, NetworkConfig, SettingsConfig, kEmptySettings, Link, LinkType, kEmptyLink } from "../duotecno/types";
+import { Sanitizers, Rule, kEmptyRule, actionValue, Action, kEmptySwitch, Switch, SwitchType, hex, Binding, NetworkConfig, SettingsConfig, kEmptySettings, Link, LinkType, kEmptyLink, Device, kEmptyDevice, PowerSource } from "../duotecno/types";
 import { log, debug, err } from "../duotecno/logger";
 import { System } from "../duotecno/system";
 import { Node, Unit } from "../duotecno/protocol";
@@ -25,6 +25,7 @@ import { PowerBase } from "./powerbase";
 import { dt2hbvalue, hb2dtvalue, hbAccessories, hbGetValue, hbLogin, hbName, hbService, hbSetState, hbStop, hbSubscribe } from "./HB";
 import { httpRequest, ContentType } from "./HA-API";
 import { cleanStart, kEmptyProxy, ProxyConfig, setProxyConfig } from "./proxy";
+import * as WebSocket from 'ws';
 
 const kMaster = {name: "master", type: "string", default: "0.0.0.0:5001"} as const;
 const kAddress = {name: "address", type: "string", default: "0.0.0.0"} as const;
@@ -60,7 +61,9 @@ export class SmartApp extends WebApp {
   platform: Platform;
   switches: Array<Switch>;
   links: Array<Link>;
+  devices: Array<Device>;
   proxy: ProxyConfig;
+  wsServers: WebSocket.Server[];  // WebSocket servers for device control
 
 
   constructor(system: System, power: Power, platform: Platform) {
@@ -73,9 +76,31 @@ export class SmartApp extends WebApp {
     this.system.emitter.on('plug', this.alertSwitch.bind(this));
 
     // get some configurated params
-    this.port = this.config.port || this.port || 80;
+    const configuredPort = this.config.port || 80;
     this.password = platform.config.password || this.config.password || "";
-    this.user = platform.config.user || this.config.user || "pi"; 
+    this.user = platform.config.user || this.config.user || "pi";
+
+    // Set up multi-port listening if port is not 80
+    // Note: Port 80 requires root/sudo on Unix-like systems
+    // For development on macOS/Linux without sudo, use only configured port
+    if (configuredPort !== 80) {
+      // Check if we're running with appropriate privileges (process.getuid exists only on Unix)
+      const canBindPort80 = process.platform === 'win32' || (process.getuid && process.getuid() === 0);
+      
+      if (canBindPort80) {
+        log("smartapp", `Configured for dual-port mode: ${configuredPort} and 80`);
+        this.port = [80, configuredPort];
+      } else {
+        log("smartapp", `Running without root privileges - listening only on port ${configuredPort}`);
+        log("smartapp", `To enable port 80, run with sudo or use: sudo setcap 'cap_net_bind_service=+ep' $(which node)`);
+        this.port = configuredPort;
+      }
+    } else {
+      this.port = 80;
+    }
+
+    // Initialize mDNS service
+    this.setupMDNS(); 
 
     this.system = system;
     this.power = power;
@@ -84,6 +109,7 @@ export class SmartApp extends WebApp {
     // when all masters are loaded -> attach units to the switches
     this.system.emitter.on('ready', this.initSwitchUnits.bind(this));
     this.system.emitter.on('ready', this.initLinks.bind(this));
+    this.system.emitter.on('ready', this.initDeviceUnits.bind(this));
 
     this.addFile("unitList", __dirname + "/views/unit-list.ejs", "application/json");
     this.addFile("masterList", __dirname + "/views/master-list.ejs", "text/html");
@@ -97,19 +123,92 @@ export class SmartApp extends WebApp {
     this.addFile("switchList", __dirname + "/views/switch-list.ejs", "text/html");
     this.addFile("linkDetail", __dirname + "/views/link-details.ejs", "text/html");
     this.addFile("linkList", __dirname + "/views/link-list.ejs", "text/html");
+    this.addFile("deviceDetail", __dirname + "/views/device-details.ejs", "text/html");
+    this.addFile("deviceList", __dirname + "/views/device-list.ejs", "text/html");
     this.addFile("powerRule", __dirname + "/views/power-rule.ejs", "text/html");
     this.addFile("powerBinding", __dirname + "/views/power-binding.ejs", "text/html");
     this.addFile("materializeCSS", __dirname + "/views/assets/materialize.min.css", "text/css");
     this.addFile("materializeJS", __dirname + "/views/assets/materialize.min.js", "text/javascript");
     this.addFile("favicon", __dirname + "/views/assets/favicon.ico", "image/x-icon");
+    this.addFile("logoWhite", __dirname + "/views/assets/Duotecno_logo_white.svg", "image/svg+xml");
 
     this.addFile("proxy", __dirname + "/views/proxy.ejs", "text/html");
   }
 
+  // Override to use config.system.debug for template caching control
+  protected isDebugMode(): boolean {
+    return this.system?.config?.debug === true;
+  }
+
+  setupMDNS() {
+    // Read settings to get configured mDNS name
+    const settings = this.read("settings") as SettingsConfig;
+    const mdnsName = settings?.mdnsName || "duotecno-gateway";
+    const version = require('../package.json').version;
+    
+    // Initialize mDNS through parent class
+    this.initMDNS(mdnsName, version);
+  }
+
+  serve(onConnected?: () => void) {
+    // Initialize WebSocket servers array
+    this.wsServers = [];
+    
+    // Call parent serve method
+    super.serve(() => {
+      // Set up WebSocket servers on the HTTP servers
+      this.setupWebSocketServers();
+      
+      // Register mDNS service after server is listening
+      this.registerMDNS();
+      
+      // Call the original callback if provided
+      if (onConnected) {
+        onConnected();
+      }
+    });
+  }
+
+  setupWebSocketServers() {
+    // Get all HTTP servers
+    this.servers.forEach((httpServer, index) => {
+      const wss = new WebSocket.Server({ server: httpServer, path: '/devices' });
+      this.wsServers.push(wss);
+      
+      wss.on('connection', (ws: WebSocket) => {
+        log("smartapp", `WebSocket client connected on server ${index}`);
+        
+        // Send initial device list
+        this.sendDeviceList(ws);
+        
+        ws.on('message', (message: string) => {
+          try {
+            const data = JSON.parse(message.toString());
+            this.handleDeviceMessage(ws, data);
+          } catch (e) {
+            err("smartapp", `Invalid WebSocket message: ${e.message}`);
+          }
+        });
+        
+        ws.on('close', () => {
+          log("smartapp", `WebSocket client disconnected from server ${index}`);
+        });
+        
+        ws.on('error', (error) => {
+          err("smartapp", `WebSocket error on server ${index}: ${error.message}`);
+        });
+      });
+      
+      log("smartapp", `WebSocket server ${index} set up on path /devices`);
+    });
+  }
+
+ 
   writeConfig() {
     // copy switches into config, eliminate the runtime stuff (like unit)
     this.config.switches = this.switches.map(s => Sanitizers.makeSwitchConfig(s));
     this.config.links = this.links.map(s => Sanitizers.makeLinkConfig(s));
+    this.config.devices = this.devices.map(d => Sanitizers.makeDeviceConfig(d));
     
     super.writeConfig();
   }
@@ -121,6 +220,7 @@ export class SmartApp extends WebApp {
     // copy switches from config
     this.switches = this.config.switches.map(s => Sanitizers.switchConfig(s));
     this.links = this.config.links.map(s => Sanitizers.linkConfig(s));
+    this.devices = (this.config.devices || []).map(d => Sanitizers.deviceConfig(d));
   }
 
 
@@ -170,7 +270,7 @@ export class SmartApp extends WebApp {
   //////////////////////////////
 
   needsLogin(context: Context): boolean {
-    const noNeed = ((context.request === "units") || (context.request === "switches") || (context.request === "links")) && 
+    const noNeed = ((context.request === "units") || (context.request === "switches")) && 
                    ((context.action == "press") || (context.action == "get") || (context.action == "set"));
     return super.needsLogin(context) && (context.request != "files") && (!noNeed);
   }
@@ -210,6 +310,9 @@ export class SmartApp extends WebApp {
     } else if (context.request === "links") {
       return this.doLinks(context);
 
+    } else if (context.request === "devices") {
+      return this.doDevices(context);
+
     } else if (context.request === "switches") {
       return this.doSwitches(context);
 
@@ -290,35 +393,61 @@ export class SmartApp extends WebApp {
   // Settings //
   //////////////
   async doSettings(context: Context): Promise<HttpResponse> {
-    let config = this.read("settings");
+    let config: SettingsConfig = this.read("settings") as SettingsConfig;
+    let message = "";
 
     if (context.action === "save") {
       config = this.scrapeSettings(context);
       this.write("settings", config);
+      message = "Settings saved successfully. Restart the server for changes to take effect.";
+      
+      // Re-register mDNS with new name if changed
+      if (this.mdnsService) {
+        // Note: Full restart recommended for mDNS changes to take effect properly
+        log("smartapp", "Settings saved. mDNS name updated to: " + config.mdnsName);
+      }
 
     } else if (context.action === "restart") {
       context.request = "restart";
       return this.doRestart(false)
 
     } else if (context.action === "install") {
+      // Network IP configuration - temporarily disabled
+      // TODO: Re-implement DHCP configuration
+      message = "Network IP configuration is temporarily disabled. Use 'Save Settings' for mDNS configuration.";
+      
+      /* Commented out until DHCP implementation is fixed
       config = this.scrapeSettings(context);
       context.request = "install";
       this.write("settings", config);
       this.writeDHCP(context, <SettingsConfig>config);
+      */
 
     } else if (context.action === "reset") {
+      // Reset to DHCP - temporarily disabled
+      // TODO: Re-implement DHCP reset
+      message = "DHCP reset is temporarily disabled.";
+      
+      /* Commented out until DHCP implementation is fixed
       config = { ...kEmptySettings };
       this.resetDHCP(context);
       this.write("settings", config);
       return this.doReboot(context, false);
+      */
 
     } else if (context.action === "reboot") {
+      // System reboot - temporarily disabled
+      // TODO: Re-enable after testing
+      message = "System reboot is temporarily disabled.";
+      
+      /* Commented out until we want to enable system reboot
       return this.doReboot(context, false);
+      */
 
     } else {
-
+      // Just display the settings form
     }
-    return this.ejs("settings", context, { config });
+    return this.ejs("settings", context, { config, message });
   }
 
   scrapeSettings(context: Context): SettingsConfig {
@@ -329,7 +458,8 @@ export class SmartApp extends WebApp {
         nameservers: context.getParam({name: "nameservers", type: "string"}),
         ip2: context.getParam({name: "ip2", type: "string"}),
         gateway2: context.getParam({name: "gateway2", type: "string"})
-      }
+      },
+      mdnsName: context.getParam({name: "mdnsName", type: "string", default: "duotecno-gateway"})
     });
   }
 
@@ -518,18 +648,22 @@ export class SmartApp extends WebApp {
         const hbValue = dt2hbvalue(u, link.hbValue as number, link.min, link.max);
 
         if (typeof hbValue != "undefined") {
-          if (hbValue === -1) {
-            log("smartapp", "-> Virtual unit send 'stop' for accessory: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
-            const val = await hbStop(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, this.token);
-            if (typeof val != "undefined") link.hbValue = val;
-            
-          } else if (hbValue !== link.hbValue) {
-            log("smartapp", "-> Setting HB value for accessory: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName() + " with value " + u.value);
-            link.hbValue = hbValue;
-            await hbSetState(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, hbValue, this.token);
-
-          } else {
-            debug("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
+          try {
+            if (hbValue === -1) {
+              log("smartapp", "-> Virtual unit send 'stop' for accessory: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+              const val = await hbStop(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, this.token);
+              if (typeof val != "undefined") link.hbValue = val;
+              
+            } else if (hbValue !== link.hbValue) {
+              log("smartapp", "-> Setting HB value for accessory: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName() + " with value " + u.value);
+              link.hbValue = hbValue;
+              await hbSetState(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, hbValue, this.token);
+
+            } else {
+              debug("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
+            }
+          } catch(e) {
+            err("smartapp", "informLinks: failed to set HB value for accessory " + link.accName + " -> " + e.toString());
           }
         }
       }
@@ -629,6 +763,281 @@ export class SmartApp extends WebApp {
   }
 
 
+  /////////////
+  // Devices //
+  /////////////
+  initDeviceUnits() {
+    log("smartapp", "Init " + this.devices.length + " Devices -> add units");
+
+    this.devices.forEach(device => {
+      device.unit ||= this.system.findUnit(this.system.findMaster(device.masterAddress, device.masterPort), 
+                                           device.logicalNodeAddress, device.logicalAddress);
+      if (device.unit) {
+        device.relay = device.unit.status > 0;
+      } else {
+        log("smartapp", "** error ** missing device unit: " + hex(device.logicalNodeAddress)+"/"+hex(device.logicalAddress) + " **");
+      }
+    });
+  }
+
+  async doDevices(context: Context): Promise<HttpResponse> {
+    let inx: number = parseInt(context.id);
+    const units = this.system.allUsedUnits();
+
+    let message: string;
+    try {
+      if (context.action === "add") {
+        this.devices.push({...kEmptyDevice, measured: false});
+        inx = this.devices.length-1;
+        return this.ejs("deviceDetail", context, { device: this.devices[inx], id: inx,
+                                                   masters: this.system.masters, units });
+
+      } else if (context.action === "edit") {
+        return this.ejs("deviceDetail", context, { device: this.devices[inx], id: inx,
+                                                   masters: this.system.masters, units });
+  
+      } else if (context.action === "delete") {
+        this.deleteDevice(inx);
+
+      } else if (context.action === "change") {
+        this.updateDevice(inx, this.scrapeDevice(context));
+
+      } else {
+        // possible new IP Nodes, hence Units could be online
+        this.initDeviceUnits();
+      }
+
+    } catch(e) {
+      message = e.toString();
+    }
+    return this.ejs("deviceList", context, { masters: this.system.masters, devices: this.devices, message });
+  }
+
+  scrapeDevice(context: Context): Device {
+    const { masterAddress, masterPort, logicalAddress, logicalNodeAddress } = this.scrapeUnit(context, '');
+    const name = context.getParam({name: "name", type: "string", default: "Device" });
+    const powerSource = context.getParam({name: "powerSource", type: "string", default: "none" });
+    const powerChannel = context.getParam({name: "powerChannel", type: "string", default: "" });
+    const estimatedPower = context.getParam({name: "estimatedPower", type: "integer", default: 0 });
+    
+    // Calculate ID from node/unit
+    const id = logicalNodeAddress * 256 + logicalAddress;
+    
+    // Measured is true if powerSource is not "none"
+    const measured = powerSource !== "none";
+    
+    return { 
+      id, 
+      name, 
+      masterAddress, 
+      masterPort, 
+      logicalAddress, 
+      logicalNodeAddress, 
+      measured,
+      powerSource: powerSource as any,
+      powerChannel,
+      estimatedPower,
+      power: 0,
+      energy: 0,
+      voltage: 230.0,
+      current: 0,
+      relay: false
+    };
+  }
+
+  updateDevice(inx: number, device: Device) {
+    if ((inx >= 0) && (inx < this.devices.length)) {
+      this.devices[inx] = device;
+      this.initDeviceUnits();
+      this.writeConfig();
+    }
+  }
+
+  deleteDevice(inx: number) {
+    if ((inx >= 0) && (inx < this.devices.length)) {
+      this.devices.splice(inx, 1);
+      this.initDeviceUnits();
+      this.writeConfig();
+    }
+  }
+
+  //////////////////////
+  // Device - sockets //
+  //////////////////////
+  sendDeviceList(ws: WebSocket) {
+    const devices = this.getDeviceList();
+    if (ws.readyState === WebSocket.OPEN) {
+      ws.send(JSON.stringify(devices));
+    }
+  }
+
+  getDeviceList(): Array<any> {
+    return this.devices.map(device => {
+      // Get current relay state from unit if available
+      let relayState = device.relay || false;
+      if (device.unit) {
+        relayState = device.unit.status > 0;
+      }
+      
+      // Get power measurements based on power source
+      let power = 0;
+      let energy = 0;
+      let voltage = 230.0;
+      let current = 0;
+      let measured = false;
+      
+      if (device.powerSource === PowerSource.kSmappee && this.power.smappee) {
+        // Get power from Smappee
+        const smappeePower = this.getPowerFromSmappee(device.powerChannel);
+        if (smappeePower !== null) {
+          power = smappeePower;
+          measured = true;
+          current = power / voltage;
+        }
+      } else if (device.powerSource === PowerSource.kP1 && this.power.p1) {
+        // Get power from P1 meter
+        const p1Power = this.getPowerFromP1(device.powerChannel);
+        if (p1Power !== null) {
+          power = p1Power;
+          measured = true;
+          current = power / voltage;
+        }
+      } else if (device.powerSource === PowerSource.kShelly && this.power.shelly) {
+        // Get power from Shelly
+        const shellyPower = this.getPowerFromShelly(device.powerChannel);
+        if (shellyPower !== null) {
+          power = shellyPower;
+          measured = true;
+          current = power / voltage;
+        }
+      } else if (device.powerSource === PowerSource.kNone || !device.powerSource) {
+        // Use estimated power when relay is on
+        power = relayState ? (device.estimatedPower || 0) : 0;
+        measured = false;
+      }
+      
+      return {
+        id: device.id,
+        name: device.name,
+        power: power,
+        energy: energy,
+        voltage: voltage,
+        current: current,
+        relay: relayState,
+        measured: measured
+      };
+    });
+  }
+
+  getPowerFromSmappee(channel: string): number | null {
+    if (!this.power.smappee) return null;
+    try {
+      // Channel format could be "0", "0+1", "0+1+2", etc.
+      const channels = channel.split('+').map(c => parseInt(c.trim()));
+      let totalPower = 0;
+      for (const ch of channels) {
+        const binding = this.power.smappee.bindings.find(b => b.channel.includes(ch.toString()));
+        if (binding && binding.value !== undefined) {
+          totalPower += binding.value;
+        }
+      }
+      return totalPower;
+    } catch (e) {
+      err("smartapp", `Error getting Smappee power for channel ${channel}: ${e.message}`);
+      return null;
+    }
+  }
+
+  getPowerFromP1(channel: string): number | null {
+    if (!this.power.p1) return null;
+    try {
+      // P1 meter typically has single power value
+      const binding = this.power.p1.bindings.find(b => b.channel.includes(channel));
+      if (binding && binding.value !== undefined) {
+        return binding.value;
+      }
+      return null;
+    } catch (e) {
+      err("smartapp", `Error getting P1 power for channel ${channel}: ${e.message}`);
+      return null;
+    }
+  }
+
+  getPowerFromShelly(channel: string): number | null {
+    if (!this.power.shelly) return null;
+    try {
+      // Shelly channel format similar to Smappee
+      const channels = channel.split('+').map(c => parseInt(c.trim()));
+      let totalPower = 0;
+      for (const ch of channels) {
+        const binding = this.power.shelly.bindings.find(b => b.channel.includes(ch.toString()));
+        if (binding && binding.value !== undefined) {
+          totalPower += binding.value;
+        }
+      }
+      return totalPower;
+    } catch (e) {
+      err("smartapp", `Error getting Shelly power for channel ${channel}: ${e.message}`);
+      return null;
+    }
+  }
+
+  async handleDeviceMessage(ws: WebSocket, data: any) {
+    if (!Array.isArray(data)) {
+      err("smartapp", "WebSocket message must be an array");
+      return;
+    }
+    
+    // Empty array = keep-alive / poll
+    if (data.length === 0) {
+      this.sendDeviceList(ws);
+      return;
+    }
+    
+    // Process relay control commands
+    for (const cmd of data) {
+      if (cmd.id && cmd.relay !== undefined) {
+        await this.setDeviceRelay(cmd.id, cmd.relay);
+      }
+    }
+    
+    // Send updated device list
+    this.sendDeviceList(ws);
+  }
+
+  async setDeviceRelay(id: number, state: boolean) {
+    // Convert ID to node/unit (id = node * 256 + unit)
+    const node = Math.floor(id / 256);
+    const unit = id % 256;
+    
+    log("smartapp", `Setting device ${id} (node=${node}, unit=${unit}) to ${state}`);
+    
+    // Get the first master
+    const master = this.system.masters[0];
+    if (!master) {
+      err("smartapp", "No master available");
+      return;
+    }
+    
+    // Find the unit
+    const nodeObj = master.nodes.find(n => n.logicalAddress === node);
+    if (!nodeObj) {
+      err("smartapp", `Node ${node} not found`);
+      return;
+    }
+    
+    const unitObj = nodeObj.units.find(u => u.logicalAddress === unit);
+    if (!unitObj) {
+      err("smartapp", `Unit ${unit} in node ${node} not found`);
+      return;
+    }
+    
+    // Set the unit state (convert boolean to 0/100 for dimmer/switch)
+    await master.setUnitStatus(unitObj, state ? 100 : 0);
+  }
+
+
+
   // not used / tested for the moment
   async setLink(inx: number, newstate?: boolean, newvalue?: number)
   async setLink(inx: Link, newstate?: boolean, newvalue?: number)
@@ -1268,6 +1677,9 @@ export class SmartApp extends WebApp {
     } else if (file === "favicon.ico") {
       return this.file("favicon");
 
+    } else if (file === "Duotecno_logo_white.svg") {
+      return this.file("logoWhite");
+
     } else 
       return this.notFound(); 
   }

package/server/socapp.js

@@ -66,7 +66,8 @@ class SocApp extends webapp_1.WebApp {
     serve() {
         (0, logger_1.log)("socapp", "SocApp - Start http server on port " + this.port);
         super.serve(() => {
-            const wsServer = new ws_1.Server({ server: this.server });
+            // Create WebSocket server on the first HTTP server
+            const wsServer = new ws_1.Server({ server: this.servers[0] });
             wsServer.on('connection', this.handleClient.bind(this));
         });
     }

package/server/socapp.ts

@@ -63,7 +63,8 @@ export class SocApp extends WebApp {
   serve() {
     log("socapp", "SocApp - Start http server on port " + this.port);
     super.serve(() => {
-      const wsServer = new WSServer({server: this.server});
+      // Create WebSocket server on the first HTTP server
+      const wsServer = new WSServer({server: this.servers[0]});
       wsServer.on('connection', this.handleClient.bind(this));
     });
   }

package/server/views/assets/Duotecno_logo_black.svg

@@ -0,0 +1,10 @@
+<svg width="1550" height="1599" viewBox="0 0 1550 1599" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M54.6003 5.06515C49.9542 9.71127 46.4696 243.179 46.4696 523.107C46.4696 1023.73 46.4696 1031.86 23.239 1031.86C-6.96081 1031.86 -8.12233 1078.32 22.0774 1086.45C41.8235 1091.1 44.1465 1107.36 48.7926 1279.26C54.6003 1515.05 73.1847 1558.03 177.722 1582.42C206.761 1589.39 209.084 1587.07 209.084 1548.74C209.084 1513.89 205.599 1508.08 181.207 1508.08C163.784 1508.08 142.877 1495.31 128.938 1477.89C106.869 1450.01 104.546 1431.42 104.546 1268.81V1089.93H156.815C204.438 1089.93 209.084 1087.61 209.084 1060.9C209.084 1034.18 204.438 1031.86 156.815 1031.86H104.546L102.223 518.461C98.7384 65.4647 96.4154 3.90362 81.3155 0.419028C70.8617 -0.742501 59.2464 0.419028 54.6003 5.06515Z" fill="black"/>
+<path d="M778.233 216.463V340.747L721.318 361.655C649.303 387.208 586.581 456.9 563.35 537.046C541.281 609.061 541.281 641.583 562.189 711.275C593.55 816.974 679.503 890.151 775.91 895.958L818.887 898.281L822.371 494.069C824.694 96.8259 824.694 91.0182 801.464 91.0182C779.395 91.0182 778.233 97.9874 778.233 216.463ZM778.233 626.483V835.559L752.68 827.428C670.211 803.036 627.234 756.575 604.004 669.46C590.065 618.353 604.004 541.692 636.527 498.715C664.403 460.385 729.449 416.247 756.164 416.247C777.072 416.247 778.233 429.023 778.233 626.483Z" fill="black"/>
+<path d="M1324.15 358.171C1246.33 441.801 1221.94 659.007 1277.69 785.614C1346.22 942.421 1461.21 938.936 1522.77 777.483C1554.14 695.015 1557.62 553.308 1529.74 462.709C1491.41 332.617 1393.84 283.833 1324.15 358.171ZM1450.76 423.217C1487.93 470.84 1501.87 532.401 1496.06 632.292C1489.09 776.322 1439.14 854.144 1374.1 823.945C1284.66 783.291 1269.56 509.17 1350.87 418.571C1382.23 384.886 1421.72 386.048 1450.76 423.217Z" fill="black"/>
+<path d="M917.617 619.516C917.617 884.344 918.778 892.475 940.848 892.475C958.27 892.475 964.078 884.344 964.078 861.114V829.753L996.601 859.952C1063.97 924.998 1138.31 908.737 1160.38 826.268C1167.35 801.876 1173.15 684.561 1173.15 563.762C1173.15 354.687 1171.99 346.556 1149.92 346.556C1127.85 346.556 1126.69 354.687 1126.69 560.278C1126.69 678.754 1122.05 787.938 1115.08 804.199C1101.14 842.529 1062.81 843.691 1009.38 807.684L969.886 780.968L966.401 563.762C964.078 355.848 962.917 346.556 940.848 346.556C918.778 346.556 917.617 355.848 917.617 619.516Z" fill="black"/>
+<path d="M343.821 1048.12C277.614 1117.81 250.899 1265.33 283.422 1391.93C313.621 1509.25 372.859 1570.81 464.62 1580.1C502.951 1583.58 505.274 1581.26 508.758 1545.25C512.243 1510.41 509.92 1508.09 476.236 1508.09C396.09 1508.09 336.852 1438.39 320.591 1324.56L313.621 1275.78H429.774H545.927V1237.45C545.927 1186.34 515.728 1089.93 490.174 1059.73C439.067 999.335 392.605 994.689 343.821 1048.12ZM448.359 1098.07C468.105 1117.81 499.466 1184.02 499.466 1206.09C499.466 1213.06 464.62 1217.7 412.351 1217.7C318.267 1217.7 313.621 1214.22 338.013 1151.5C364.729 1081.8 408.867 1059.73 448.359 1098.07Z" fill="black"/>
+<path d="M1370.61 1016.76C1282.34 1049.28 1225.42 1230.48 1253.3 1387.29C1270.72 1486.02 1305.57 1552.22 1357.84 1582.42C1397.33 1604.49 1397.33 1604.49 1439.14 1582.42C1582.01 1504.6 1588.98 1116.65 1447.27 1030.7C1410.11 1007.47 1399.65 1006.3 1370.61 1016.76ZM1442.63 1107.36C1483.28 1148.01 1501.87 1223.51 1496.06 1330.37C1491.41 1433.75 1465.86 1497.63 1421.72 1518.54C1353.19 1548.74 1298.6 1454.65 1298.6 1307.14C1298.6 1204.93 1316.02 1144.53 1357.84 1102.71C1389.2 1071.35 1407.78 1072.51 1442.63 1107.36Z" fill="black"/>
+<path d="M752.68 1031.86C651.627 1062.06 587.743 1167.76 587.743 1304.82C587.743 1454.65 667.888 1569.65 778.234 1580.1C816.564 1583.58 818.887 1581.26 822.372 1545.25C825.856 1511.57 823.533 1508.09 793.334 1508.09C708.542 1508.09 638.85 1417.49 638.85 1304.82C638.85 1195.63 691.119 1121.3 781.718 1102.71C813.08 1095.74 818.887 1089.93 818.887 1060.9C818.887 1022.57 803.787 1015.6 752.68 1031.86Z" fill="black"/>
+<path d="M1045.39 1033.02C1029.12 1039.99 1004.73 1056.25 990.793 1069.03L964.078 1093.42V1063.22C964.078 1039.99 958.27 1031.86 940.848 1031.86C918.778 1031.86 917.617 1039.99 917.617 1304.82C917.617 1569.65 918.778 1577.78 940.848 1577.78C962.917 1577.78 964.078 1569.65 964.078 1368.7C964.078 1161.95 964.078 1158.46 991.955 1130.59C1034.93 1087.61 1079.07 1080.64 1105.78 1113.16C1124.37 1136.39 1126.69 1163.11 1126.69 1358.25C1126.69 1569.65 1127.85 1577.78 1149.92 1577.78C1171.99 1577.78 1173.15 1569.65 1173.15 1359.41C1173.15 1145.69 1163.86 1069.03 1134.82 1045.8C1110.43 1026.05 1075.59 1021.4 1045.39 1033.02Z" fill="black"/>
+</svg>

package/server/views/assets/Duotecno_logo_white.svg

@@ -0,0 +1,10 @@
+<svg width="1550" height="1599" viewBox="0 0 1550 1599" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M54.6003 5.06515C49.9542 9.71127 46.4696 243.179 46.4696 523.107C46.4696 1023.73 46.4696 1031.86 23.239 1031.86C-6.96081 1031.86 -8.12233 1078.32 22.0774 1086.45C41.8235 1091.1 44.1465 1107.36 48.7926 1279.26C54.6003 1515.05 73.1847 1558.03 177.722 1582.42C206.761 1589.39 209.084 1587.07 209.084 1548.74C209.084 1513.89 205.599 1508.08 181.207 1508.08C163.784 1508.08 142.877 1495.31 128.938 1477.89C106.869 1450.01 104.546 1431.42 104.546 1268.81V1089.93H156.815C204.438 1089.93 209.084 1087.61 209.084 1060.9C209.084 1034.18 204.438 1031.86 156.815 1031.86H104.546L102.223 518.461C98.7384 65.4647 96.4154 3.90362 81.3155 0.419028C70.8617 -0.742501 59.2464 0.419028 54.6003 5.06515Z" fill="white"/>
+<path d="M778.233 216.463V340.747L721.318 361.655C649.304 387.208 586.581 456.9 563.35 537.046C541.281 609.061 541.281 641.583 562.189 711.275C593.55 816.974 679.503 890.151 775.91 895.958L818.887 898.281L822.371 494.069C824.695 96.8259 824.695 91.0182 801.464 91.0182C779.395 91.0182 778.233 97.9874 778.233 216.463ZM778.233 626.483V835.559L752.68 827.428C670.211 803.036 627.234 756.575 604.004 669.46C590.066 618.353 604.004 541.692 636.527 498.715C664.403 460.385 729.449 416.247 756.164 416.247C777.072 416.247 778.233 429.023 778.233 626.483Z" fill="white"/>
+<path d="M1324.15 358.171C1246.33 441.801 1221.94 659.007 1277.69 785.614C1346.22 942.421 1461.21 938.936 1522.77 777.483C1554.14 695.015 1557.62 553.308 1529.74 462.709C1491.41 332.617 1393.84 283.833 1324.15 358.171ZM1450.76 423.217C1487.93 470.84 1501.87 532.401 1496.06 632.292C1489.09 776.322 1439.14 854.144 1374.1 823.945C1284.66 783.291 1269.56 509.17 1350.87 418.571C1382.23 384.886 1421.72 386.048 1450.76 423.217Z" fill="white"/>
+<path d="M917.617 619.516C917.617 884.344 918.778 892.475 940.848 892.475C958.27 892.475 964.078 884.344 964.078 861.114V829.753L996.601 859.952C1063.97 924.998 1138.31 908.737 1160.38 826.268C1167.35 801.876 1173.15 684.561 1173.15 563.762C1173.15 354.687 1171.99 346.556 1149.92 346.556C1127.85 346.556 1126.69 354.687 1126.69 560.278C1126.69 678.754 1122.05 787.938 1115.08 804.199C1101.14 842.529 1062.81 843.691 1009.38 807.684L969.886 780.968L966.401 563.762C964.078 355.848 962.917 346.556 940.848 346.556C918.778 346.556 917.617 355.848 917.617 619.516Z" fill="white"/>
+<path d="M343.821 1048.12C277.614 1117.81 250.899 1265.33 283.422 1391.93C313.621 1509.25 372.859 1570.81 464.62 1580.1C502.951 1583.58 505.274 1581.26 508.758 1545.25C512.243 1510.41 509.92 1508.09 476.236 1508.09C396.09 1508.09 336.852 1438.39 320.591 1324.56L313.621 1275.78H429.774H545.927V1237.45C545.927 1186.34 515.728 1089.93 490.174 1059.73C439.067 999.335 392.605 994.689 343.821 1048.12ZM448.359 1098.07C468.105 1117.81 499.466 1184.02 499.466 1206.09C499.466 1213.06 464.62 1217.7 412.351 1217.7C318.267 1217.7 313.621 1214.22 338.013 1151.5C364.729 1081.8 408.867 1059.73 448.359 1098.07Z" fill="white"/>
+<path d="M1370.61 1016.76C1282.34 1049.28 1225.42 1230.48 1253.3 1387.29C1270.72 1486.02 1305.57 1552.22 1357.84 1582.42C1397.33 1604.49 1397.33 1604.49 1439.14 1582.42C1582.01 1504.6 1588.98 1116.65 1447.27 1030.7C1410.11 1007.47 1399.65 1006.3 1370.61 1016.76ZM1442.63 1107.36C1483.28 1148.01 1501.87 1223.51 1496.06 1330.37C1491.41 1433.75 1465.86 1497.63 1421.72 1518.54C1353.19 1548.74 1298.6 1454.65 1298.6 1307.14C1298.6 1204.93 1316.02 1144.53 1357.84 1102.71C1389.2 1071.35 1407.78 1072.51 1442.63 1107.36Z" fill="white"/>
+<path d="M752.68 1031.86C651.627 1062.06 587.743 1167.76 587.743 1304.82C587.743 1454.65 667.888 1569.65 778.234 1580.1C816.564 1583.58 818.887 1581.26 822.372 1545.25C825.856 1511.57 823.533 1508.09 793.333 1508.09C708.542 1508.09 638.85 1417.49 638.85 1304.82C638.85 1195.63 691.119 1121.3 781.718 1102.71C813.079 1095.74 818.887 1089.93 818.887 1060.9C818.887 1022.57 803.787 1015.6 752.68 1031.86Z" fill="white"/>
+<path d="M1045.39 1033.02C1029.12 1039.99 1004.73 1056.25 990.793 1069.03L964.078 1093.42V1063.22C964.078 1039.99 958.27 1031.86 940.848 1031.86C918.778 1031.86 917.617 1039.99 917.617 1304.82C917.617 1569.65 918.778 1577.78 940.848 1577.78C962.917 1577.78 964.078 1569.65 964.078 1368.7C964.078 1161.95 964.078 1158.46 991.955 1130.59C1034.93 1087.61 1079.07 1080.64 1105.78 1113.16C1124.37 1136.39 1126.69 1163.11 1126.69 1358.25C1126.69 1569.65 1127.85 1577.78 1149.92 1577.78C1171.99 1577.78 1173.15 1569.65 1173.15 1359.41C1173.15 1145.69 1163.86 1069.03 1134.82 1045.8C1110.43 1026.05 1075.59 1021.4 1045.39 1033.02Z" fill="white"/>
+</svg>