improved Reader

added .npmignore updated usage example script
pokusew · May 15, 2016 · 7ee0396 · 7ee0396
1 parent ed28202
commit 7ee0396
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,2 @@
+
+!dist/
diff --git a/README.md b/README.md
@@ -7,31 +7,47 @@ A simple wrapper around [santigimeno/node-pcsclite](https://github.com/santigime
 ```javascript
 import NFC from './src/NFC';
 
-const nfc = new NFC();
+const nfc = new NFC(logger);
 
 let readers = [];
 
 nfc.on('reader', reader => {
 
+	console.log(`NFC (${reader.reader.name}): device attached`);
+
 	readers.push(reader);
 
 	console.log(readers);
 
 	reader.on('card', card => {
 
 		// card uid is hex string
-		console.log('card detected', card.uid);
+		console.log(`NFC (${reader.reader.name}): card detected`, card.uid);
+
+	});
+
+	reader.on('error', err => {
+
+		console.log(`NFC (${reader.reader.name}): an error occurred`, err);
 
 	});
 
 	reader.on('end', () => {
 
+		console.log(`NFC (${reader.reader.name}): device removed`);
+
 		delete readers[readers.indexOf(reader)];
 
 		console.log(readers);
 
 	});
 
+});
+
+nfc.on('error', err => {
+
+	console.log('NFC: an error occurred', err);
+
 });
 ```
 

diff --git a/src/Reader.js b/src/Reader.js
@@ -119,15 +119,24 @@ class Reader extends EventEmitter {
 
 				this.logger.info(err);
 
+				this.emit('error', err);
+				return;
+
 			}
 			else {
 
 				this.logger.info('Data received', data);
 
+				if (data.length !== 9) {
+					this.emit('error', 'Invalid data.');
+					return;
+				}
+
 				let error = data.readUInt16BE(7);
 
 				if (error !== 0x9000) {
 					// an error occurred
+					this.emit('error', 'Error reading UID.');
 					return;
 				}
 

diff --git a/test/test.js b/test/test.js
@@ -19,23 +19,39 @@ let readers = [];
 
 nfc.on('reader', reader => {
 
+	console.log(`NFC (${reader.reader.name}): device attached`);
+
 	readers.push(reader);
 
 	console.log(readers);
 
 	reader.on('card', card => {
 
 		// card uid is hex string
-		console.log('card detected', card.uid);
+		console.log(`NFC (${reader.reader.name}): card detected`, card.uid);
+
+	});
+
+	reader.on('error', err => {
+
+		console.log(`NFC (${reader.reader.name}): an error occurred`, err);
 
 	});
 
 	reader.on('end', () => {
 
+		console.log(`NFC (${reader.reader.name}): device removed`);
+
 		delete readers[readers.indexOf(reader)];
 
 		console.log(readers);
 
 	});
 
 });
+
+nfc.on('error', err => {
+
+	console.log('NFC: an error occurred', err);
+
+});