Fix example

This commit is contained in:
Martin Endler
2020-01-24 21:59:06 +01:00
parent de7ed0f4b4
commit 74d0b388c6
2 changed files with 51 additions and 63 deletions

107
README.md
View File

@@ -70,86 +70,79 @@ const pcsc = pcsclite();
pcsc.on('reader', (reader) => { pcsc.on('reader', (reader) => {
console.log('New reader detected', reader.name); console.log('New reader detected', reader.name);
reader.on('error', err => { reader.on('error', err => {
console.log('Error(', reader.name, '):', err.message); console.log('Error(', reader.name, '):', err.message);
}); });
reader.on('status', (status) => { reader.on('status', (status) => {
console.log('Status(', reader.name, '):', status); console.log('Status(', reader.name, '):', status);
// check what has changed // check what has changed
const changes = reader.state ^ status.state; const changes = reader.state ^ status.state;
if (!changes) { if (!changes) {
return; return;
}
if ((changes & reader.SCARD_STATE_EMPTY) && (status.state & reader.SCARD_STATE_EMPTY)) {
console.log("card removed");
reader.disconnect(reader.SCARD_LEAVE_CARD, err => {
if (err) {
console.log(err);
return;
} }
// noinspection JSBitwiseOperatorUsage console.log('Disconnected');
if ((changes & reader.SCARD_STATE_EMPTY) && (status.state & reader.SCARD_STATE_EMPTY)) {
console.log("card removed"); });
reader.disconnect(reader.SCARD_LEAVE_CARD, err => { }
else if ((changes & reader.SCARD_STATE_PRESENT) && (status.state & reader.SCARD_STATE_PRESENT)) {
if (err) { console.log("card inserted");
console.log(err);
return;
}
console.log('Disconnected'); reader.connect({ share_mode: reader.SCARD_SHARE_SHARED }, (err, protocol) => {
});
return;
if (err) {
console.log(err);
return;
} }
// noinspection JSBitwiseOperatorUsage console.log('Protocol(', reader.name, '):', protocol);
if ((changes & reader.SCARD_STATE_EMPTY) && (status.state & reader.SCARD_STATE_EMPTY)) {
console.log("card inserted"); reader.transmit(Buffer.from([0x00, 0xB0, 0x00, 0x00, 0x20]), 40, protocol, (err, data) => {
reader.connect({ share_mode: reader.SCARD_SHARE_SHARED }, (err, protocol) => { if (err) {
console.log(err);
if (err) {
console.log(err);
return;
}
console.log('Protocol(', reader.name, '):', protocol);
reader.transmit(Buffer.from([0x00, 0xB0, 0x00, 0x00, 0x20]), 40, protocol, (err, data) => {
if (err) {
console.log(err);
return;
}
console.log('Data received', data);
reader.close();
pcsc.close();
});
});
// noinspection UnnecessaryReturnStatementJS
return; return;
} }
}); console.log('Data received', data);
reader.close();
pcsc.close();
reader.on('end', () => { });
console.log('Reader', reader.name, 'removed');
}); });
}
});
reader.on('end', () => {
console.log('Reader', reader.name, 'removed');
});
}); });
pcsc.on('error', err => { pcsc.on('error', err => {
console.log('PCSC error', err.message); console.log('PCSC error', err.message);
}); });
``` ```

View File

@@ -39,11 +39,8 @@ pcsc.on('reader', (reader) => {
}); });
return;
} }
else if ((changes & reader.SCARD_STATE_PRESENT) && (status.state & reader.SCARD_STATE_PRESENT)) {
if ((changes & reader.SCARD_STATE_EMPTY) && (status.state & reader.SCARD_STATE_EMPTY)) {
console.log("card inserted"); console.log("card inserted");
@@ -71,8 +68,6 @@ pcsc.on('reader', (reader) => {
}); });
// noinspection UnnecessaryReturnStatementJS
return;
} }
}); });