I made some small upgrades to the amazing library you built

.eslintignore

@@ -0,0 +1 @@
+node_modules

.eslintrc.json

@@ -0,0 +1,10 @@
+{
+  "env": {
+      "node": true,
+      "es2022": true
+  },
+  "extends": "eslint:recommended",
+  "rules": {
+    "indent": ["error", "tab", { "SwitchCase": 1 }]
+  }
+}

.gitignore

@@ -5,6 +5,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
+log/
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
@@ -102,3 +103,10 @@ dist
 
 # TernJS port file
 .tern-port
+
+test2.js
+test.js
+
+cache/
+
+.DS_Store

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+  "cSpell.words": [
+    "ELEC",
+    "getsocket",
+    "inet",
+    "ipaddr",
+    "ntoa",
+    "precommand"
+  ]
+}

README.md

@@ -1,49 +1,88 @@
-# switcher-js
-switcher-js is a native nodejs library for controling [switcher smart water heater](https://switcher.co.il/).<br/>
-It is a native javascript port of a wonderful python script (can be found [here](https://github.com/NightRang3r/Switcher-V2-Python)) created as a result of the extensive work which has been done by Aviad Golan ([@AviadGolan](https://twitter.com/AviadGolan)) and Shai rod ([@NightRang3r](https://twitter.com/NightRang3r)).<br/>
+# switcher-js2
+
+*Fork of [@johnathanvidu JS implementation](https://github.com/johnathanvidu/switcher-js)*
+
+switcher-js is a native nodejs library for controling [Switcher](https://switcher.co.il/)  smart home accessories - water heater, sockets, and blinds.<br/><br/>
+It is a native javascript port of a wonderful python script (can be found [here](https://github.com/NightRang3r/Switcher-V2-Python)) created as a result of the extensive work which has been done by Aviad Golan ([@AviadGolan](https://twitter.com/AviadGolan)) and Shai rod ([@NightRang3r](https://twitter.com/NightRang3r)).
+
 It is a work in progress and there is still a lot of work left to do.
 
-I built it according to my specific needs and my specific device. If any issue arises, please feel free to open an issue and I'll do my best to help.<br/>
-Current supported devices known to work with switcher-js:<br/>
-- **Switcher V3** (Switcher touch) - FW **V1.51**
+I built it according to my specific needs and my specific device. If any issue arises, please feel free to open an issue and I'll do my best to help.
+
+Current supported devices known to work with switcher-js:
+
+- **Switcher Lights SL03**
+- **Switcher Lights SL02**
+- **Switcher Lights SL01**
+- **Switcher Runner S12**
+- **Switcher Runner S11**
+- **Switcher Runner Mini**
+- **Switcher Runner**
+- **Switcher V4**
+- **Switcher Mini**
+- **Switcher V3**: (Switcher touch) - Firmware **V1.51**
+- **Switcher V2**: Firmware **3.21** (Based on ESP chipset) 
+- **Switcher V2**: Firmware**72.32** (Qualcomm chipset)
 
 ## Installation
 Use [npm](https://www.npmjs.com/) to install switcher-js.
 ```bash
-npm install switcher-js
+npm install switcher-js2
 ```
 
-## Usage
+## Usage Examples:
 ```javascript
-const Switcher = require('switcher-js').Switcher;
+const Switcher = require('switcher-js2');
 
-var switcher = new Switcher('device-id', 'device-ip', 'phone-id', 'device-pass', 'log function');
+var switcher = new Switcher('device-id', 'device-ip', 'log function', 'listen(boolean)', 'device-type');
 ```
 
+### Discover
+
 To use the auto discover functionallity use: 
 ```javascript
-const Switcher = require('switcher-js').Switcher;
+const Switcher = require('switcher-js2');
 
-var proxy = Switcher.discover('phone-id', 'device-pass', 'log function');
+var proxy = Switcher.discover('log function', 'identifier(optional)', 'discovery-timeout(optional)');
 
 proxy.on('ready', (switcher) => {
     switcher.turn_on(); // switcher is a new initialized instance of Switcher class
 });
+
+
+setTimeout(() => {
+    proxy.close(); // optional way to close the discovery (if discovery-timeout is not set)
+}, 10000);
+
 ```
 
 discover will emit a ready event when auto discovery completed.
 
-phone-id (optional) - will be defaulted to 0000 if no value provided<br/>
-device-pass (optional) - will be defaulted to 00000000 if no value provided
+identifier (optional) - you can provide the Switcher name, IP or device-id to detect specific device.<br/>
+discovery-timeout (optional) - set maximum time in seconds to scan for devices.
 
-Examples:
-```javascript
-const Switcher = require('switcher-js').Switcher;
 
-var switcher = new Switcher('device-id', 'device-ip', 'phone-id', 'device-pass', 'log function');
+### Control
 
-switcher.on('state', (state) => { // state is the new switcher state 
-
+```javascript
+const Switcher = require('switcher-js2');
+
+var switcher = new Switcher('device-id', 'device-ip', 'log function', 'listen', 'device-type'); 
+// set listen to true if you want to listen for status messages
+
+switcher.on('status', (status) => { // status broadcast message - only works when listen=true
+    console.log(status)
+    /* response:
+    {
+        power: 1,
+        remaining_seconds: 591,
+        default_shutdown_seconds: 5400,
+        power_consumption: 2447 // in watts
+    }
+    */
+});
+switcher.on('state', (state) => { // state is the new switcher state
+    console.log(state) // 1
 });
 switcher.on('error', (error) => {
 
@@ -52,18 +91,85 @@ switcher.on('error', (error) => {
 switcher.turn_on();   // turns switcher on
 switcher.turn_on(15); // turns switcher on for 15 minutes
 switcher.turn_off();  // turns switcher off
+switcher.set_default_shutdown(3600) // set the default auto shutdown to 1 hour (must be between 3600 and 86340)
+switcher.status(status => { // get status
+    console.log(status);
+});
 switcher.close();     // closes any dangling connections safely
 ```
 
-switcher-js exposes two states for convenience 
+### Control Runner Devices (blinds)
 
 ```javascript
-const switcher = require('switcher-js');
+const Switcher = require('switcher-js2');
+
+var runner = new Switcher('device-id', 'device-ip', 'log function', 'listen', 'runner'); 
+// set 'device-type' to 'runner' if you want to control the runner devices
+
+runner.on('status', (status) => { // status broadcast message - only works when listen=true
+    console.log(status)
+    /* response:
+    {
+        position: 80,
+        direction: 'STOP'
+    }
+    */
+});
+runner.on('position', (pos) => { // position is the new switcher position
+    console.log(pos) // 100
+});
+switcher.on('error', (error) => {
+
+});
+
+switcher.set_position(80);   // Set blinds position to 80%
+
+switcher.stop_runner() // stop the blinds
+
+switcher.close();     // closes any dangling connections safely
+```
+
+### Listen
+
+Global listen functionality that listens to a single or multiple switcher devices for status messages.
+
+To use the listen functionallity use: 
+```javascript
+const Switcher = require('switcher-js2');
+
+var proxy = Switcher.listen('log function', 'identifier(optional)');
+
+proxy.on('message', (message) => {
+    console.log(message)
+    /* response:
+    {
+        device_id: 'e3a845',
+        device_ip: '10.0.0.1',
+        name: 'Boiler',
+        type: 'v4'
+        state: {
+            power: 1,
+            remaining_seconds: 591,
+            default_shutdown_seconds: 5400,
+            power_consumption: 2447 // in watts
+        }
+    }
+    */
+});
+
+proxy.close(); // close the listener socket
 
-switcher.ON = 0
-switcher.OFF = 1
 ```
 
+proxy will emit a message event every time it receives a message from a switcher device.
+
+identifier (optional) - you can provide the Switcher name, IP or device-id to filter specific device messages.
+
+## Multiple Connections
+
+Don't use Discover, Listen and Switcher with (listen=true) at the same time as it will return error since this socket is being used.
+If you want to listen to multiple devices, use the global listen function to get all statuses, and use the switcher instance without the listen capability.
+
 ## Contributing
 Pull requests are more than welcome. For major changes, please open an issue first to discuss what you would like to change.
 Even coding tips and standards are welcome, I have very limited experience with javascript, so there's a lot of things I don't know are cleaner or more standarized in the industry.

index.js

@@ -1,6 +1,4 @@
 const switcher = require('./src/switcher');
 
 
-module.exports = {
-    Switcher: switcher.Switcher
-}
+module.exports = switcher.Switcher