homebridge-smartsystem 6.8.13 → 7.0.1

package/accessories/windowcovering.js

@@ -93,13 +93,21 @@ class WindowCovering extends accessory_1.Accessory {
     getCurrentPosition(next) {
         (0, logger_1.log)("accessory", "get CurrentPosition was called of " + this.name);
         this.unit.reqState(unit => {
-            if (unit.status == types_1.UnitState.kOpen)
-                next(null, 100);
-            else if (unit.status == types_1.UnitState.kClosed)
-                next(null, 0);
-            else
-                next(null, 50); // ????
-        });
+            try {
+                if (!unit) {
+                    return next(new Error("Unit state not available"));
+                }
+                if (unit.status == types_1.UnitState.kOpen)
+                    next(null, 100);
+                else if (unit.status == types_1.UnitState.kClosed)
+                    next(null, 0);
+                else
+                    next(null, 50);
+            }
+            catch (err) {
+                next(err);
+            }
+        }).catch(err => next(err));
     }
     setTargetPosition(value, next) {
         // homekit is giving 0-100 for windows
@@ -123,13 +131,21 @@ class WindowCovering extends accessory_1.Accessory {
     getTargetPosition(next) {
         (0, logger_1.log)("accessory", "get Characteristic.TargetPosition was called");
         this.unit.reqState(unit => {
-            if (this.unit.status == types_1.UnitState.kOpen)
-                next(null, 100);
-            else if (this.unit.status == types_1.UnitState.kClosed)
-                next(null, 0);
-            else
-                next(null, 50); // ????
-        });
+            try {
+                if (!unit) {
+                    return next(new Error("Unit state not available"));
+                }
+                if (this.unit.status == types_1.UnitState.kOpen)
+                    next(null, 100);
+                else if (this.unit.status == types_1.UnitState.kClosed)
+                    next(null, 0);
+                else
+                    next(null, 50);
+            }
+            catch (err) {
+                next(err);
+            }
+        }).catch(err => next(err));
     }
     // called in response to Duotecno status update
     updateState() {

package/accessories/windowcovering.ts

@@ -110,15 +110,22 @@ export class WindowCovering extends Accessory {
 
   getCurrentPosition(next) {
     log("accessory", "get CurrentPosition was called of " + this.name);
-  
+
     this.unit.reqState(unit => {
-      if (unit.status == UnitState.kOpen) 
-        next(null, 100);
-      else if (unit.status == UnitState.kClosed) 
-        next(null, 0);
-      else 
-        next(null, 50);  // ????
-    });
+      try {
+        if (!unit) {
+          return next(new Error("Unit state not available"));
+        }
+        if (unit.status == UnitState.kOpen) 
+          next(null, 100);
+        else if (unit.status == UnitState.kClosed) 
+          next(null, 0);
+        else 
+          next(null, 50);
+      } catch(err) {
+        next(err);
+      }
+    }).catch(err => next(err));
   }
 
 
@@ -147,13 +154,20 @@ export class WindowCovering extends Accessory {
     log("accessory", "get Characteristic.TargetPosition was called");
 
     this.unit.reqState(unit => {
-      if (this.unit.status == UnitState.kOpen) 
-        next(null, 100);
-      else if (this.unit.status == UnitState.kClosed) 
-        next(null, 0);
-      else 
-        next(null, 50);  // ????
-    });
+      try {
+        if (!unit) {
+          return next(new Error("Unit state not available"));
+        }
+        if (this.unit.status == UnitState.kOpen) 
+          next(null, 100);
+        else if (this.unit.status == UnitState.kClosed) 
+          next(null, 0);
+        else 
+          next(null, 50);
+      } catch(err) {
+        next(err);
+      }
+    }).catch(err => next(err));
   }
 
   // called in response to Duotecno status update

package/config.json

@@ -167,7 +167,7 @@
       }
     ]
   },
-  "socapp": {
+  "xsocapp": {
     "debug": true,
     "port": 9999
   },
@@ -211,31 +211,68 @@
         "method": "GET",
         "type": "smappee",
         "plug": "1"
+      },
+      {
+        "logicalNodeAddress": 3,
+        "logicalAddress": 34,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "Notification Sender",
+        "displayName": "Notification Sender",
+        "extendedType": 0,
+        "nomacro": "N",
+        "nostop": "N",
+        "unitName": "Lamp-Bottom",
+        "value": 0,
+        "data": "",
+        "header": "",
+        "method": "GET",
+        "type": "http",
+        "plug": "https://duotecno.eu/nl/notification/send?title=Lamp+changed&body=Turned+#&proof=MwJDIgEUOgYNFQsmHEMjC15yXllXXmZVKgw6ASkBBw=="
       }
     ],
     "debug": false,
     "username": "pi",
     "password": "GMTecno",
-    "links": [
+    "links": [],
+    "devices": [
       {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 104,
+        "logicalNodeAddress": 3,
+        "logicalAddress": 34,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
-        "name": "unit",
-        "displayName": "unit",
+        "name": "Test Lamp",
+        "displayName": "Test Lamp",
         "extendedType": 0,
-        "accId": "986b901a30d92cb7bd0205be90f65786c2d87c9a95d8a0a60cb4c048deda5ce6",
-        "accName": "Tim Klein",
-        "accService": [
-          "CurrentPosition",
-          "PositionState",
-          "TargetPosition",
-          "ObstructionDetected"
-        ],
-        "type": "accessory",
-        "max": 100,
-        "min": 0
+        "id": 802,
+        "power": 0,
+        "energy": 0,
+        "voltage": 230,
+        "current": 0,
+        "relay": false,
+        "measured": true,
+        "powerSource": "shelly",
+        "powerChannel": "1+2",
+        "estimatedPower": 100
+      },
+      {
+        "logicalNodeAddress": 3,
+        "logicalAddress": 30,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "Blue LED",
+        "displayName": "Blue LED",
+        "extendedType": 0,
+        "id": 798,
+        "power": 0,
+        "energy": 0,
+        "voltage": 230,
+        "current": 0,
+        "relay": false,
+        "measured": false,
+        "powerSource": "none",
+        "powerChannel": "",
+        "estimatedPower": 50
       }
     ]
   },
@@ -456,7 +493,8 @@
       "nameservers": "8.8.8.8",
       "ip2": "",
       "gateway2": ""
-    }
+    },
+    "mdnsName": "duotecno-gateway"
   },
   "p1": false,
   "proxy": {
@@ -466,6 +504,6 @@
     "masterPort": 5001,
     "uniqueId": "",
     "debug": false,
-    "kind": "gw"
+    "kind": "solo"
   }
 }

package/duotecno/types.js

@@ -14,7 +14,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeInt = exports.now = exports.datetime = exports.time = exports.date = exports.watt = exports.hex = exports.two = exports.char = exports.ascii = exports.wait = exports.Sanitizers = exports.actionValueStr = exports.actionValue = exports.kEmptyBinding = exports.kEmptyLink = exports.LinkType = exports.kEmptySwitch = exports.SwitchType = exports.kEmptyRule = exports.kEmptyAction = exports.RuleType = exports.Boundaries = exports.kEmptyCommRecord = exports.WriteError = exports.kEmptySettings = exports.kEmptyNetworkConfig = exports.kEmptyGroup = exports.kEmptyScene = exports.kEmptyUnitScene = exports.kEmptyUnit = exports.UnitExtendedType = exports.UnitType = exports.UnitMotorCmd = exports.UnitState = exports.NodeType = void 0;
+exports.makeInt = exports.now = exports.datetime = exports.time = exports.date = exports.watt = exports.hex = exports.two = exports.cap = exports.char = exports.ascii = exports.wait = exports.Sanitizers = exports.actionValueStr = exports.actionValue = exports.kEmptyBinding = exports.kEmptyDevice = exports.PowerSource = exports.kEmptyLink = exports.LinkType = exports.kEmptySwitch = exports.SwitchType = exports.kEmptyRule = exports.kEmptyAction = exports.RuleType = exports.Boundaries = exports.kEmptyCommRecord = exports.WriteError = exports.kEmptySettings = exports.kEmptyNetworkConfig = exports.kEmptyGroup = exports.kEmptyScene = exports.kEmptyUnitScene = exports.kEmptyUnit = exports.UnitExtendedType = exports.UnitType = exports.UnitMotorCmd = exports.UnitState = exports.NodeType = void 0;
 const proxy_1 = require("../server/proxy");
 // Node types
 var NodeType;
@@ -99,7 +99,7 @@ exports.kEmptyGroup = { name: "Home", id: 0, order: 0, visible: true };
 ;
 exports.kEmptyNetworkConfig = { ip1: "", ip2: "", gateway1: "", gateway2: "", nameservers: "" };
 ;
-exports.kEmptySettings = { network: exports.kEmptyNetworkConfig };
+exports.kEmptySettings = { network: exports.kEmptyNetworkConfig, mdnsName: "duotecno-gateway" };
 ;
 ;
 ;
@@ -155,6 +155,17 @@ var LinkType;
     LinkType["kAccessory"] = "accessory";
 })(LinkType = exports.LinkType || (exports.LinkType = {}));
 exports.kEmptyLink = Object.assign(Object.assign({}, exports.kEmptyUnit), { type: LinkType.kNoType, max: 100, min: 0, accName: "acc", accId: "", accService: [] });
+/////////////
+// Devices //
+/////////////
+var PowerSource;
+(function (PowerSource) {
+    PowerSource["kNone"] = "none";
+    PowerSource["kP1"] = "p1";
+    PowerSource["kShelly"] = "shelly";
+    PowerSource["kSmappee"] = "smappee";
+})(PowerSource = exports.PowerSource || (exports.PowerSource = {}));
+exports.kEmptyDevice = Object.assign(Object.assign({}, exports.kEmptyUnit), { id: 0, power: 0, energy: 0, voltage: 230.0, current: 0, relay: false, measured: false, powerSource: PowerSource.kNone, powerChannel: "", estimatedPower: 0 });
 exports.kEmptyBinding = {
     channel: "0", masterAddress: "0.0.0.0", masterPort: 5001, register: 0
 };
@@ -228,6 +239,7 @@ exports.Sanitizers = {
         if (!config)
             config = {};
         config.network = exports.Sanitizers.networkConfig(config.network);
+        config.mdnsName = config.mdnsName || exports.kEmptySettings.mdnsName;
         return config;
     },
     networkConfig: function (config) {
@@ -306,6 +318,34 @@ exports.Sanitizers = {
         link.min = aLink.min || exports.kEmptyLink.min;
         return link;
     },
+    deviceConfig: function (aDevice) {
+        const device = exports.Sanitizers.unitDef(aDevice);
+        // Calculate ID from node/unit if not provided
+        device.id = aDevice.id || (device.logicalNodeAddress * 256 + device.logicalAddress);
+        device.power = aDevice.power || 0;
+        device.energy = aDevice.energy || 0;
+        device.voltage = aDevice.voltage || 230.0;
+        device.current = aDevice.current || 0;
+        device.relay = aDevice.relay || false;
+        device.measured = aDevice.measured || false;
+        device.powerSource = aDevice.powerSource || PowerSource.kNone;
+        device.powerChannel = aDevice.powerChannel || "";
+        device.estimatedPower = aDevice.estimatedPower || 0;
+        return device;
+    },
+    makeDeviceConfig: function (aDevice) {
+        return exports.Sanitizers.deviceConfig({
+            name: aDevice.name,
+            masterAddress: aDevice.masterAddress,
+            masterPort: aDevice.masterPort,
+            logicalAddress: aDevice.logicalAddress,
+            logicalNodeAddress: aDevice.logicalNodeAddress,
+            measured: aDevice.measured || false,
+            powerSource: aDevice.powerSource,
+            powerChannel: aDevice.powerChannel,
+            estimatedPower: aDevice.estimatedPower
+        });
+    },
     switchConfig: function (aSwitch) {
         const sw = exports.Sanitizers.unitDef(aSwitch);
         sw.nomacro = aSwitch.nomacro || "N";
@@ -536,6 +576,12 @@ function char(ascii) {
     return String.fromCharCode(ascii);
 }
 exports.char = char;
+function cap(s) {
+    if (s.length === 0)
+        return s;
+    return s[0].toUpperCase() + s.substr(1, s.length - 1).toLowerCase();
+}
+exports.cap = cap;
 function two(n) {
     return (+n < 10) ? ("0" + n) : n.toString();
 }

package/duotecno/types.ts

@@ -133,8 +133,9 @@ export const kEmptyNetworkConfig = { ip1: "", ip2: "", gateway1: "", gateway2: "
 
 export interface SettingsConfig {
   network: NetworkConfig;
+  mdnsName?: string;  // mDNS service name (default: duotecno-gateway)
 };
-export const kEmptySettings: SettingsConfig = { network: kEmptyNetworkConfig } as const;
+export const kEmptySettings: SettingsConfig = { network: kEmptyNetworkConfig, mdnsName: "duotecno-gateway" } as const;
 
 
 // from Protocol//Hardware to Nodes and Units
@@ -280,6 +281,43 @@ export const kEmptyLink: Link = {
   ...kEmptyUnit, type: LinkType.kNoType, max: 100, min: 0, accName: "acc", accId: "", accService: []
 };
 
+/////////////
+// Devices //
+/////////////
+export enum PowerSource {
+  kNone = "none",
+  kP1 = "p1",
+  kShelly = "shelly",
+  kSmappee = "smappee"
+}
+
+export interface Device extends UnitDef {
+  id: number;             // node * 256 + unit
+  power?: number;         // Current power in watts
+  energy?: number;        // Energy consumption in kWh
+  voltage?: number;       // Voltage (usually 230V)
+  current?: number;       // Current in amps
+  relay?: boolean;        // Current relay state
+  measured: boolean;      // True if values are measured, false if estimated
+  powerSource?: PowerSource; // Where to get power measurements from
+  powerChannel?: string;  // Channel/register for power source
+  estimatedPower?: number; // Estimated power when not measured
+  unit?: Unit;            // Link to actual Duotecno unit
+}
+
+export const kEmptyDevice: Device = {
+  ...kEmptyUnit, 
+  id: 0, 
+  power: 0, 
+  energy: 0, 
+  voltage: 230.0, 
+  current: 0, 
+  relay: false, 
+  measured: false,
+  powerSource: PowerSource.kNone,
+  powerChannel: "",
+  estimatedPower: 0
+};
 
 ///////////
 // Power //
@@ -324,6 +362,7 @@ export interface SmartAppConfig extends BaseConfig {
   username: string; password: string;
   switches: Array<Switch>;
   links: Array<Link>;
+  devices?: Array<Device>;
 }
 
 
@@ -443,6 +482,7 @@ export const Sanitizers = {
   settings: function(config: SettingsConfig): SettingsConfig {
     if (!config) config = <SettingsConfig>{};
     config.network = Sanitizers.networkConfig(config.network);
+    config.mdnsName = config.mdnsName || kEmptySettings.mdnsName;
     return config;
   },
 
@@ -527,6 +567,36 @@ export const Sanitizers = {
     return link;
   },
 
+  deviceConfig: function(aDevice): Device {
+    const device = <Device>Sanitizers.unitDef(aDevice);
+    // Calculate ID from node/unit if not provided
+    device.id = aDevice.id || (device.logicalNodeAddress * 256 + device.logicalAddress);
+    device.power = aDevice.power || 0;
+    device.energy = aDevice.energy || 0;
+    device.voltage = aDevice.voltage || 230.0;
+    device.current = aDevice.current || 0;
+    device.relay = aDevice.relay || false;
+    device.measured = aDevice.measured || false;
+    device.powerSource = aDevice.powerSource || PowerSource.kNone;
+    device.powerChannel = aDevice.powerChannel || "";
+    device.estimatedPower = aDevice.estimatedPower || 0;
+    return device;
+  },
+
+  makeDeviceConfig: function(aDevice): Device {
+    return Sanitizers.deviceConfig({ 
+      name: aDevice.name, 
+      masterAddress: aDevice.masterAddress, 
+      masterPort: aDevice.masterPort,
+      logicalAddress: aDevice.logicalAddress, 
+      logicalNodeAddress: aDevice.logicalNodeAddress,
+      measured: aDevice.measured || false,
+      powerSource: aDevice.powerSource,
+      powerChannel: aDevice.powerChannel,
+      estimatedPower: aDevice.estimatedPower
+    });
+  },
+
   switchConfig: function(aSwitch): Switch {
     const sw = <Switch>Sanitizers.unitDef(aSwitch);
     sw.nomacro = aSwitch.nomacro || "N";
@@ -772,6 +842,10 @@ export function ascii(char: string): number {
 export function char(ascii:  number): string {
   return String.fromCharCode(ascii)
 }
+export function cap(s: string): string {
+  if (s.length === 0) return s;
+  return s[0].toUpperCase() + s.substr(1, s.length - 1).toLowerCase();
+}
 
 
 export function two(n: number | string) { 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.8.13",
+  "version": "7.0.1",
   "description": "SmartServer (Proxy TCP sockets to the cloud, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
@@ -10,7 +10,12 @@
   "scripts": {
     "start": "DEBUG=* homebridge -D -P '/Users/johan/Development/duotecno/smartsocket'",
     "watch": "npx tsc --build . --watch",
-    "publish": "npx tsc --build && npm i && npm publish"
+    "build": "npx tsc --build",
+    "unpublish": "npm unpublish --force homebridge-smartsystem@6.8.17",
+    "prepublishOnly": "npm run build",
+    "publish": "npm publish",
+    "version:patch": "npm version patch && npm publish",
+    "version:minor": "npm version minor && npm publish"
   },
   "engines": {
     "node": "^18.20.4 || ^20.15.1 || ^22",
@@ -32,18 +37,21 @@
     "url": "https://github.com/jcoppieters/smartsocket.git"
   },
   "dependencies": {
+    "bonjour-service": "^1.3.0",
     "ejs": "^3.1.7",
     "mime-types": "^2.1.25",
     "mqtt": "^4.3.7",
+    "multicast-dns": "^7.2.5",
     "node-fetch": "^3.2.4",
     "rpi-gpio": "^2.1.7",
     "ws": "^7.4.6"
   },
   "devDependencies": {
+    "@types/bonjour": "^3.5.13",
     "@types/mime-types": "^2.1.0",
     "@types/node": "^16.10.9",
     "@types/ws": "^6.0.4",
-    "typescript": "^4.7.4",
-    "homebridge": "^1.3.9"
+    "homebridge": "^1.3.9",
+    "typescript": "^4.7.4"
   }
 }

package/raspberry-pi-setup.sh

@@ -0,0 +1,80 @@
+#!/bin/bash
+# Raspberry Pi Setup Script for Duotecno Gateway
+# This script configures the Raspberry Pi to be accessible via duotecno-gateway.local
+
+set -e
+
+echo "========================================"
+echo "  Duotecno Gateway - Raspberry Pi Setup"
+echo "========================================"
+echo ""
+
+# Check if running as root
+if [ "$EUID" -ne 0 ]; then 
+  echo "Please run as root (use sudo)"
+  exit 1
+fi
+
+# 1. Install Avahi (mDNS/Bonjour for Linux)
+echo "📦 Installing Avahi mDNS daemon..."
+apt-get update -qq
+apt-get install -y avahi-daemon avahi-utils libnss-mdns
+
+# 2. Set the hostname to duotecno-gateway
+echo "🏷️  Setting hostname to duotecno-gateway..."
+hostnamectl set-hostname duotecno-gateway
+
+# Update /etc/hosts
+sed -i '/127.0.1.1/d' /etc/hosts
+echo "127.0.1.1       duotecno-gateway" >> /etc/hosts
+
+# 3. Configure Avahi
+echo "⚙️  Configuring Avahi..."
+cat > /etc/avahi/avahi-daemon.conf << 'EOF'
+[server]
+host-name=duotecno-gateway
+domain-name=local
+use-ipv4=yes
+use-ipv6=yes
+allow-interfaces=eth0,wlan0
+deny-interfaces=docker0,veth*
+ratelimit-interval-usec=1000000
+ratelimit-burst=1000
+
+[wide-area]
+enable-wide-area=yes
+
+[publish]
+publish-addresses=yes
+publish-hinfo=yes
+publish-workstation=yes
+publish-domain=yes
+EOF
+
+# 4. Restart Avahi
+echo "🔄 Restarting Avahi daemon..."
+systemctl enable avahi-daemon
+systemctl restart avahi-daemon
+
+# 5. Wait a moment for Avahi to start
+sleep 2
+
+# 6. Test the configuration
+echo ""
+echo "✅ Setup complete!"
+echo ""
+echo "Testing mDNS resolution..."
+if avahi-resolve -n duotecno-gateway.local > /dev/null 2>&1; then
+  echo "✅ duotecno-gateway.local is resolvable"
+  avahi-resolve -n duotecno-gateway.local
+else
+  echo "⚠️  Warning: duotecno-gateway.local not yet resolvable (may need reboot)"
+fi
+
+echo ""
+echo "📋 Next steps:"
+echo "   1. Reboot the Raspberry Pi: sudo reboot"
+echo "   2. After reboot, access the gateway at:"
+echo "      http://duotecno-gateway.local"
+echo "      (or http://duotecno-gateway.local:5002 if not using port 80)"
+echo ""

package/server/HA-API.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpRequest = exports.ContentType = void 0;
 const logger_1 = require("../duotecno/logger");
 const http = require("http");
+const https = require("https");
 //////////////////////////////////
 // Home Assistant API           //
 // and other http based APIs    //
@@ -28,6 +29,8 @@ function httpRequest(url, method = "GET", formdata = "", contentType = ContentTy
     return __awaiter(this, void 0, void 0, function* () {
         if (url.indexOf("://") === -1)
             url = "http://" + url;
+        const isHttps = url.startsWith("https://");
+        const httpModule = isHttps ? https : http;
         return new Promise((resolve, reject) => {
             try {
                 // const data = querystring.stringify(formdata);
@@ -77,7 +80,7 @@ function httpRequest(url, method = "GET", formdata = "", contentType = ContentTy
                     }
                 }
                 (0, logger_1.debug)("smartapp", "Sending to " + url + " with options: " + JSON.stringify(options));
-                const req = http.request(url, options, res => {
+                const req = httpModule.request(url, options, res => {
                     let resp = "";
                     // res.setEncoding('utf8');
                     res.on('error', error => {

package/server/HA-API.ts

@@ -1,5 +1,6 @@
 import { debug, err, log } from "../duotecno/logger";
 import * as http from "http";
+import * as https from "https";
 
 //////////////////////////////////
 // Home Assistant API           //
@@ -11,6 +12,8 @@ export enum ContentType {form, plain, none, json};
 export async function httpRequest(url: string, method = "GET", formdata = "", 
                                contentType = ContentType.form, header: string | object = ""): Promise<Record<string, any>> {
   if (url.indexOf("://") === -1)  url = "http://" + url;
+  const isHttps = url.startsWith("https://");
+  const httpModule = isHttps ? https : http;
 
   return new Promise((resolve, reject) => {
     try {
@@ -57,7 +60,7 @@ export async function httpRequest(url: string, method = "GET", formdata = "",
       }
 
       debug("smartapp", "Sending to " + url + " with options: " + JSON.stringify(options));
-      const req = http.request(url, options, res => {
+      const req = httpModule.request(url, options, res => {
         let resp = "";
         // res.setEncoding('utf8');
         res.on('error', error => {

package/server/HB.js

@@ -319,7 +319,12 @@ function hbSubscribe(callback) {
         clearInterval(timer);
     }
     timer = setInterval(() => {
-        callback();
+        try {
+            callback();
+        }
+        catch (error) {
+            (0, logger_1.log)("HB", "hbSubscribe: error: " + JSON.stringify(error));
+        }
     }, 10000);
 }
 exports.hbSubscribe = hbSubscribe;

package/server/HB.ts

@@ -327,7 +327,11 @@ export function hbSubscribe(callback) {
   }
 
   timer = setInterval(() => {
-    callback()
+    try {
+      callback();
+    } catch (error) {
+      log("HB", "hbSubscribe: error: " + JSON.stringify(error));
+    }
   }, 10000);
 }