diodejs 0.1.0 → 0.1.1

package/README.md

@@ -87,13 +87,22 @@ async function main() {
   const connection = new DiodeConnection(host, port, certPath);
   await connection.connect();
 
-  const publishedPorts = [8080]; // Ports you want to publish
-  const publishPort = new PublishPort(connection, publishedPorts, certPath);
-
+  // Option 1: Simple array of ports (all public)
+  const publishedPorts = [8080, 3000]; 
+  
+  // Option 2: Object with port configurations for public/private access control
+  const publishedPortsWithConfig = {
+    8080: { mode: 'public' },  // Public port, accessible by any device
+    3000: { 
+      mode: 'private',  
+      whitelist: ['0x1234abcd5678...', '0x9876fedc5432...'] // Only these devices can connect
+    }
+  };
+  
+  const publishPort = new PublishPort(connection, publishedPortsWithConfig, certPath);
 }
 
 main();
-
 ```
 
 ## Reference
@@ -149,7 +158,9 @@ main();
 
 - **Constructor**: `new PublishPort(connection, publishedPorts, certPath)`
   - `connection` (DiodeConnection): An instance of `DiodeConnection`.
-  - `publishedPorts` (array): An array of ports to publish.
+  - `publishedPorts` (array|object): Either:
+    - An array of ports to publish (all public mode)
+    - An object mapping ports to their configuration: `{ port: { mode: 'public'|'private', whitelist: ['0x123...'] } }`
   - `certPath` (string): The path to the device certificate.
 
 - **Methods**:

package/examples/publishPortTest.js

@@ -11,7 +11,7 @@ async function startPublishing() {
   const connection = new DiodeConnection(host, port, certPath);
   await connection.connect();
 
-  const publishedPorts = [8080]; // Ports you want to publish
+  const publishedPorts = {8080: {mode: 'private', whitelist: ['0xca1e71d8105a598810578fb6042fa8cbc1e7f039']}}
   const publishPort = new PublishPort(connection, publishedPorts, certPath);
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diodejs",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "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": {

package/publishPort.js

@@ -39,9 +39,34 @@ class PublishPort extends EventEmitter {
   constructor(connection, publishedPorts, certPath) {
     super();
     this.connection = connection;
-    this.publishedPorts = new Set(publishedPorts); // Convert array to a Set
-    // Remove local connections map and use the one from connection
+    
+    // Convert publishedPorts to a Map with configurations
+    this.publishedPorts = new Map();
+    
+    // Handle both array format and object format
+    if (Array.isArray(publishedPorts)) {
+      // Legacy array format - treat all ports as public
+      publishedPorts.forEach(port => {
+        this.publishedPorts.set(port, { mode: 'public', whitelist: [] });
+      });
+    } else if (typeof publishedPorts === 'object' && publishedPorts !== null) {
+      // New object format with configurations
+      Object.entries(publishedPorts).forEach(([port, config]) => {
+        const portNum = parseInt(port, 10);
+        // Ensure config is properly structured
+        const portConfig = typeof config === 'object' && config !== null
+          ? { 
+              mode: config.mode || 'public', 
+              whitelist: Array.isArray(config.whitelist) ? config.whitelist : [] 
+            }
+          : { mode: 'public', whitelist: [] };
+        
+        this.publishedPorts.set(portNum, portConfig);
+      });
+    }
+    
     this.startListening();
+    logger.info(`Publishing ports: ${Array.from(this.publishedPorts.keys())}`);
     this.rpc = new DiodeRPC(connection);
     this.certPath = certPath;
   }
@@ -76,7 +101,7 @@ class PublishPort extends EventEmitter {
     const sessionId = Buffer.from(sessionIdRaw);
     const portString = makeReadable(portStringRaw);
     const ref = Buffer.from(refRaw);
-    const deviceId = Buffer.from(deviceIdRaw).toString('hex');
+    const deviceId = `0x${Buffer.from(deviceIdRaw).toString('hex')}`;
 
     logger.info(`Received portopen request for portString ${portString} with ref ${ref.toString('hex')} from device ${deviceId}`);
 
@@ -96,13 +121,24 @@ class PublishPort extends EventEmitter {
     }
 
     // Check if the port is published
-    if (!this.publishedPorts.has(port)) { // Use .has() instead of .includes()
+    if (!this.publishedPorts.has(port)) {
       logger.warn(`Port ${port} is not published. Rejecting request.`);
       // Send error response
       this.rpc.sendError(sessionId, ref, 'Port is not published');
       return;
     }
 
+    // Get port configuration and check whitelist if in private mode
+    const portConfig = this.publishedPorts.get(port);
+    if (portConfig.mode === 'private' && Array.isArray(portConfig.whitelist)) {
+      if (!portConfig.whitelist.includes(deviceId)) {
+        logger.warn(`Device ${deviceId} is not whitelisted for port ${port}. Rejecting request.`);
+        this.rpc.sendError(sessionId, ref, 'Device not whitelisted');
+        return;
+      }
+      logger.info(`Device ${deviceId} is whitelisted for port ${port}. Accepting request.`);
+    }
+
     // Handle based on protocol
     if (protocol === 'tcp') {
       this.handleTCPConnection(sessionId, ref, port);