Send actual path within EventData (#49)

* Send actual path within EventData

Also fixed some type declarations

* Remove path from listener signature

Co-authored-by: Basten Gao <[email protected]>

* Call listener without path

Co-authored-by: Basten Gao <[email protected]>

* Fix `send` return value

Co-authored-by: Basten Gao <[email protected]>

* Add contributors

---------

Co-authored-by: Basten Gao <[email protected]>

Author: alessandroraffa

android/src/main/java/com/bastengao/serialport/SerialPortWrapper.java

@@ -48,6 +48,7 @@ public void run() {
                             byte[] data = Arrays.copyOf(buffer, size);
                             String hex = SerialPortApiModule.bytesToHex(data);
                             event.putString("data", hex);
+                            event.putString("path", path);
                             sender.sendEvent(DataReceivedEvent, event);
                         }
                     } catch (IOException e) {

package.json

@@ -35,6 +35,13 @@
     "name": "bastengao",
     "email": "[email protected]"
   },
+  "contributors": [
+    {
+      "name": "Alessandro Raffa @ Infobiotech",
+      "email": "[email protected]",
+      "url": "https://github.com/infobiotech"
+    }
+  ],
   "license": "MIT",
   "licenseFilename": "LICENSE",
   "readmeFilename": "README.md",

src/API.ts

@@ -77,7 +77,7 @@ export default class API {
    * @param {openOptions} options
    * @returns {Promise<SerialPort>} connected serial port
    */
-  static open(devicePath: string, {baudRate, parity = 0, dataBits = 8, stopBits = 1}: { baudRate: number, parity?: number, dataBits?: number, stopBits?: number }) {
+  static open(devicePath: string, {baudRate, parity = 0, dataBits = 8, stopBits = 1}: { baudRate: number, parity?: number, dataBits?: number, stopBits?: number }): Promise<SerialPort> {
     if (Platform.OS !== 'android') throw new Error(`Not support ${Platform.OS}`)
     return SerialPortAPI.open(devicePath, baudRate, parity, dataBits, stopBits)
       .then((serialPort: SerialPortWrapper) => {

src/SerialPort.ts

@@ -10,6 +10,7 @@ export interface SerialPortWrapper {
 
 export interface EventData {
   data: string;
+  path: string;
 }
 
 export interface ListenerProxy {
@@ -64,7 +65,7 @@ class SerialPort {
    * @param {string} hex the hex of data
    * @returns {Promise} success promise
    */
-  send(hex: string) {
+  send(hex: string): Promise<boolean> {
     return SerialPortAPI.send(this.path, hex)
   }
 
@@ -73,8 +74,11 @@ class SerialPort {
    * @param {listener} listener
    * @returns {Subscription} subscription
    */
-  onReceived(listener: (data: Buffer) => void): EventSubscription {
+  onReceived(listener: (buffer: Buffer) => void): EventSubscription {
     const listenerProxy = (event: EventData) => {
+      if (!event.path || this.path !== event.path) {
+        return;
+      }
       if (!event.data) {
         return;
       }