diodejs 0.1.3 → 0.1.5

package/README.md

@@ -69,7 +69,7 @@ async function main() {
     // Multiple or single port binding with configuration object
     const portsConfig = {
       3002: { targetPort: 80, deviceIdHex: "5365baf29cb7ab58de588dfc448913cb609283e2" },
-      3003: { targetPort: 443, deviceIdHex: "5365baf29cb7ab58de588dfc448913cb609283e2" }
+      3003: { targetPort: 443, deviceIdHex: "0x5365baf29cb7ab58de588dfc448913cb609283e2" } // Works with or without 0x prefix
     };
     
     const portForward = new BindPort(connection, portsConfig);
@@ -185,17 +185,18 @@ main();
     - `connection` (DiodeConnection): An instance of `DiodeConnection`.
     - `localPort` (number): The local port to bind.
     - `targetPort` (number): The target port on the device.
-    - `deviceIdHex` (string): The device ID in hexadecimal format.
+    - `deviceIdHex` (string): The device ID in hexadecimal format (with or without '0x' prefix).
   
   New Constructor:
   - `new BindPort(connection, portsConfig)`
     - `connection` (DiodeConnection): An instance of `DiodeConnection`.
     - `portsConfig` (object): A configuration object where keys are local ports and values are objects with `targetPort` and `deviceIdHex`.
       Example: `{ 3002: { targetPort: 80, deviceIdHex: "5365baf29cb7ab58de588dfc448913cb609283e2" } }`
+      Note: deviceIdHex can be provided with or without the '0x' prefix.
 
 - **Methods**:
   - `bind()`: Binds all configured local ports to their target ports on the devices.
-  - `addPort(localPort, targetPort, deviceIdHex)`: Adds a new port binding configuration.
+  - `addPort(localPort, targetPort, deviceIdHex)`: Adds a new port binding configuration. deviceIdHex can include '0x' prefix.
   - `removePort(localPort)`: Removes a port binding configuration.
   - `bindSinglePort(localPort)`: Binds a single local port to its target.
   - `closeAllServers()`: Closes all active server instances.

package/bindPort.js

@@ -10,11 +10,21 @@ class BindPort {
     // Handle legacy constructor (connection, localPort, targetPort, deviceIdHex)
     if (typeof localPortOrPortsConfig === 'number' && targetPort !== undefined && deviceIdHex !== undefined) {
       this.portsConfig = {
-        [localPortOrPortsConfig]: { targetPort, deviceIdHex }
+        [localPortOrPortsConfig]: { 
+          targetPort, 
+          deviceIdHex: this._stripHexPrefix(deviceIdHex) 
+        }
       };
     } else {
       // New constructor (connection, portsConfig)
       this.portsConfig = localPortOrPortsConfig || {};
+      
+      // Strip 0x prefix from all deviceIdHex values in portsConfig
+      for (const port in this.portsConfig) {
+        if (this.portsConfig[port].deviceIdHex) {
+          this.portsConfig[port].deviceIdHex = this._stripHexPrefix(this.portsConfig[port].deviceIdHex);
+        }
+      }
     }
     
     this.servers = new Map(); // Track server instances by localPort
@@ -24,6 +34,14 @@ class BindPort {
     this._setupMessageListener();
   }
   
+  // Helper method to strip 0x prefix from hex strings
+  _stripHexPrefix(hexString) {
+    if (typeof hexString === 'string' && hexString.toLowerCase().startsWith('0x')) {
+      return hexString.slice(2);
+    }
+    return hexString;
+  }
+  
   _setupMessageListener() {
     // Listen for data events from the device
     this.connection.on('unsolicited', (message) => {
@@ -88,12 +106,12 @@ class BindPort {
       return false;
     }
     
-    this.portsConfig[localPort] = { targetPort, deviceIdHex };
+    this.portsConfig[localPort] = { 
+      targetPort, 
+      deviceIdHex: this._stripHexPrefix(deviceIdHex) 
+    };
     
-    // If we're already bound, set up this new port immediately
-    if (this.servers.size > 0) {
-      this.bindSinglePort(localPort);
-    }
+    this.bindSinglePort(localPort);
     
     return true;
   }

package/examples/portForwardTest.js

@@ -9,7 +9,7 @@ async function main() {
     await connection.connect();
   
     const portForward = new BindPort(connection, {
-        3003: { targetPort: 8080, deviceIdHex: "ca1e71d8105a598810578fb6042fa8cbc1e7f039" },
+        3003: { targetPort: 8080, deviceIdHex: "0xca1e71d8105a598810578fb6042fa8cbc1e7f039" },
         3004: { targetPort: 443, deviceIdHex: "5365baf29cb7ab58de588dfc448913cb609283e2" }
       });
     portForward.bind();
@@ -23,7 +23,7 @@ async function main() {
     // after 10 seconds, add port 3003 back
     setTimeout(() => {
         console.log("Adding port 3003 back");
-        portForward.addPort(3003, 8080, "ca1e71d8105a598810578fb6042fa8cbc1e7f039");
+        portForward.addPort(3003, 8080, "0xca1e71d8105a598810578fb6042fa8cbc1e7f039");
     }, 10000);
     
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diodejs",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "A JavaScript client for interacting with the Diode network. It provides functionalities to bind and publish ports, send RPC commands, and handle responses.",
   "main": "index.js",
   "scripts": {