From 751f87ae6daaa3719b1972a67005a57e334d883b Mon Sep 17 00:00:00 2001 From: System Administrator Date: Sat, 11 May 2024 18:59:13 -0500 Subject: [PATCH 1/5] Fixing error: loading non-context-aware native module in renderer --- .github/workflows/ci.yml | 0 .gitignore | 0 .idea/codeStyles/codeStyleConfig.xml | 0 .idea/dictionaries/pokusew.xml | 0 .idea/encodings.xml | 0 .idea/jsLibraryMappings.xml | 0 .idea/misc.xml | 0 .idea/modules.xml | 0 .idea/node-pcsclite.iml | 0 .idea/vcs.xml | 0 .idea/watcherTasks.xml | 0 .npmignore | 0 LICENSE.md | 0 README.md | 0 binding.gyp | 0 index.d.ts | 0 lib/pcsclite.js | 0 package.json | 2 +- src/addon.cpp | 11 ++++++++--- src/cardreader.cpp | 0 src/cardreader.h | 0 src/common.h | 0 src/pcsclite.cpp | 0 src/pcsclite.h | 0 test/test.js | 0 yarn.lock | 0 26 files changed, 9 insertions(+), 4 deletions(-) mode change 100644 => 100755 .github/workflows/ci.yml mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .idea/codeStyles/codeStyleConfig.xml mode change 100644 => 100755 .idea/dictionaries/pokusew.xml mode change 100644 => 100755 .idea/encodings.xml mode change 100644 => 100755 .idea/jsLibraryMappings.xml mode change 100644 => 100755 .idea/misc.xml mode change 100644 => 100755 .idea/modules.xml mode change 100644 => 100755 .idea/node-pcsclite.iml mode change 100644 => 100755 .idea/vcs.xml mode change 100644 => 100755 .idea/watcherTasks.xml mode change 100644 => 100755 .npmignore mode change 100644 => 100755 LICENSE.md mode change 100644 => 100755 README.md mode change 100644 => 100755 binding.gyp mode change 100644 => 100755 index.d.ts mode change 100644 => 100755 lib/pcsclite.js mode change 100644 => 100755 package.json mode change 100644 => 100755 src/addon.cpp mode change 100644 => 100755 src/cardreader.cpp mode change 100644 => 100755 src/cardreader.h mode change 100644 => 100755 src/common.h mode change 100644 => 100755 src/pcsclite.cpp mode change 100644 => 100755 src/pcsclite.h mode change 100644 => 100755 test/test.js mode change 100644 => 100755 yarn.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml old mode 100644 new mode 100755 diff --git a/.idea/dictionaries/pokusew.xml b/.idea/dictionaries/pokusew.xml old mode 100644 new mode 100755 diff --git a/.idea/encodings.xml b/.idea/encodings.xml old mode 100644 new mode 100755 diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml old mode 100644 new mode 100755 diff --git a/.idea/misc.xml b/.idea/misc.xml old mode 100644 new mode 100755 diff --git a/.idea/modules.xml b/.idea/modules.xml old mode 100644 new mode 100755 diff --git a/.idea/node-pcsclite.iml b/.idea/node-pcsclite.iml old mode 100644 new mode 100755 diff --git a/.idea/vcs.xml b/.idea/vcs.xml old mode 100644 new mode 100755 diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml old mode 100644 new mode 100755 diff --git a/.npmignore b/.npmignore old mode 100644 new mode 100755 diff --git a/LICENSE.md b/LICENSE.md old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/binding.gyp b/binding.gyp old mode 100644 new mode 100755 diff --git a/index.d.ts b/index.d.ts old mode 100644 new mode 100755 diff --git a/lib/pcsclite.js b/lib/pcsclite.js old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 index dad5d953..c72eef0b --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pokusew/pcsclite", - "version": "0.6.0", + "version": "0.6.1", "description": "Bindings over PC/SC to access Smart Cards", "keywords": [ "nfc", diff --git a/src/addon.cpp b/src/addon.cpp old mode 100644 new mode 100755 index c1d8b772..040eadc2 --- a/src/addon.cpp +++ b/src/addon.cpp @@ -1,11 +1,16 @@ #include "pcsclite.h" #include "cardreader.h" -void init_all(v8::Local target) { +using namespace v8; +using namespace node; + +void init_all(Local target) { PCSCLite::init(target); CardReader::init(target); } -// see https://nodejs.org/api/addons.html#context-aware-addons -// see https://github.com/nodejs/nan/blob/v2.18.0/nan.h#L165 +#if NODE_MAJOR_VERSION >= 10 NAN_MODULE_WORKER_ENABLED(pcsclite, init_all) +#else +NODE_MODULE(pcsclite, init_all) +#endif \ No newline at end of file diff --git a/src/cardreader.cpp b/src/cardreader.cpp old mode 100644 new mode 100755 diff --git a/src/cardreader.h b/src/cardreader.h old mode 100644 new mode 100755 diff --git a/src/common.h b/src/common.h old mode 100644 new mode 100755 diff --git a/src/pcsclite.cpp b/src/pcsclite.cpp old mode 100644 new mode 100755 diff --git a/src/pcsclite.h b/src/pcsclite.h old mode 100644 new mode 100755 diff --git a/test/test.js b/test/test.js old mode 100644 new mode 100755 diff --git a/yarn.lock b/yarn.lock old mode 100644 new mode 100755 From 13a040e366b2fec529213988a90d04bf49b4c010 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Sat, 11 May 2024 21:39:27 -0500 Subject: [PATCH 2/5] Package name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c72eef0b..9939fcdc 100755 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@pokusew/pcsclite", + "name": "@mbarrie2/pcsclite", "version": "0.6.1", "description": "Bindings over PC/SC to access Smart Cards", "keywords": [ From 2cf0a8bd93c2821c51e4e27f4aacd9a890899abc Mon Sep 17 00:00:00 2001 From: System Administrator Date: Sat, 11 May 2024 21:57:25 -0500 Subject: [PATCH 3/5] Readme update --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5e22ddd3..472532f0 100755 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # node-pcsclite -[![npm](https://img.shields.io/npm/v/@pokusew/pcsclite.svg)](https://www.npmjs.com/package/@pokusew/pcsclite) -[![build status](https://img.shields.io/github/actions/workflow/status/pokusew/node-pcsclite/ci.yml?logo=github)](https://github.com/pokusew/node-pcsclite/actions/workflows/ci.yml) +[![npm](https://img.shields.io/npm/v/@mbarrie2/pcsclite.svg)](https://www.npmjs.com/package/@mbarrie2/pcsclite) +[![build status](https://img.shields.io/github/actions/workflow/status/mbarrie2/node-pcsclite/ci.yml?logo=github)](https://github.com/mbarrie2/node-pcsclite/actions/workflows/ci.yml) [![node-pcsclite channel on discord](https://img.shields.io/badge/discord-join%20chat-61dafb.svg?logo=discord&logoColor=white)](https://discord.gg/bg3yazg) +This package is authored by @pokusew/pcsclite. But the error of making the module context aware for applications in **Electron** has been solved + Bindings over pcsclite to access Smart Cards. It works in **Linux**, **macOS** and **Windows**. > 📌 **Looking for library to work easy with NFC tags?** From 75ef4de77cc0bc18c446f800c51a7b278542e355 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Sat, 11 May 2024 22:00:03 -0500 Subject: [PATCH 4/5] 0.6.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9939fcdc..dc45adc5 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mbarrie2/pcsclite", - "version": "0.6.1", + "version": "0.6.2", "description": "Bindings over PC/SC to access Smart Cards", "keywords": [ "nfc", From b3f4987446a8bd4ce889b415113cd231d3d21a7e Mon Sep 17 00:00:00 2001 From: System Administrator Date: Sat, 11 May 2024 22:02:56 -0500 Subject: [PATCH 5/5] Readme update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 472532f0..d29f9930 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![build status](https://img.shields.io/github/actions/workflow/status/mbarrie2/node-pcsclite/ci.yml?logo=github)](https://github.com/mbarrie2/node-pcsclite/actions/workflows/ci.yml) [![node-pcsclite channel on discord](https://img.shields.io/badge/discord-join%20chat-61dafb.svg?logo=discord&logoColor=white)](https://discord.gg/bg3yazg) -This package is authored by @pokusew/pcsclite. But the error of making the module context aware for applications in **Electron** has been solved +This package is written by @pokusew/pcsclite. Fixed "making the module context aware for applications" error for applications in **Electron** Bindings over pcsclite to access Smart Cards. It works in **Linux**, **macOS** and **Windows**.