Compare commits

5 Commits
1.2.0 ... main

8 changed files with 213 additions and 71 deletions

View File

@@ -11,6 +11,7 @@ files:
- "!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}" - "!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}"
asarUnpack: asarUnpack:
- resources/** - resources/**
- "**/node_modules/@tockawa/nfc-pcsc/**/*"
win: win:
executableName: nfc-app-desktop executableName: nfc-app-desktop
nsis: nsis:
@@ -18,6 +19,7 @@ nsis:
shortcutName: ${productName} shortcutName: ${productName}
uninstallDisplayName: ${productName} uninstallDisplayName: ${productName}
createDesktopShortcut: always createDesktopShortcut: always
oneClick: true
mac: mac:
entitlementsInherit: build/entitlements.mac.plist entitlementsInherit: build/entitlements.mac.plist
extendInfo: extendInfo:
@@ -37,7 +39,8 @@ linux:
category: Utility category: Utility
appImage: appImage:
artifactName: ${name}-${version}.${ext} artifactName: ${name}-${version}.${ext}
npmRebuild: false npmRebuild: true
asar: true
publish: publish:
provider: generic provider: generic
url: https://example.com/auto-updates url: https://example.com/auto-updates

65
package-lock.json generated
View File

@@ -1,20 +1,20 @@
{ {
"name": "nfc-app-desktop", "name": "nfc-app-desktop",
"version": "1.0.0", "version": "1.1.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "nfc-app-desktop", "name": "nfc-app-desktop",
"version": "1.0.0", "version": "1.1.0",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@electron-toolkit/preload": "^3.0.2", "@electron-toolkit/preload": "^3.0.2",
"@electron-toolkit/utils": "^4.0.0", "@electron-toolkit/utils": "^4.0.0",
"@pokusew/pcsclite": "^0.6.0",
"@tockawa/nfc-pcsc": "latest", "@tockawa/nfc-pcsc": "latest",
"axios": "^1.13.6",
"electron-updater": "^6.3.9", "electron-updater": "^6.3.9",
"nfc-pcsc": "latest" "nfc-pcsc": "^0.8.1"
}, },
"devDependencies": { "devDependencies": {
"@electron-toolkit/eslint-config-prettier": "3.0.0", "@electron-toolkit/eslint-config-prettier": "3.0.0",
@@ -3151,6 +3151,7 @@
"version": "0.4.0", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
"dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/at-least-node": { "node_modules/at-least-node": {
@@ -3163,17 +3164,6 @@
"node": ">= 4.0.0" "node": ">= 4.0.0"
} }
}, },
"node_modules/axios": {
"version": "1.13.6",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz",
"integrity": "sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==",
"license": "MIT",
"dependencies": {
"follow-redirects": "^1.15.11",
"form-data": "^4.0.5",
"proxy-from-env": "^1.1.0"
}
},
"node_modules/balanced-match": { "node_modules/balanced-match": {
"version": "4.0.4", "version": "4.0.4",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
@@ -3545,6 +3535,7 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"es-errors": "^1.3.0", "es-errors": "^1.3.0",
@@ -3740,6 +3731,7 @@
"version": "1.0.8", "version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"delayed-stream": "~1.0.0" "delayed-stream": "~1.0.0"
@@ -3981,6 +3973,7 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=0.4.0" "node": ">=0.4.0"
@@ -4160,6 +4153,7 @@
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"call-bind-apply-helpers": "^1.0.1", "call-bind-apply-helpers": "^1.0.1",
@@ -4541,6 +4535,7 @@
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
"devOptional": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.4" "node": ">= 0.4"
@@ -4550,6 +4545,7 @@
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
"devOptional": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.4" "node": ">= 0.4"
@@ -4559,6 +4555,7 @@
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"es-errors": "^1.3.0" "es-errors": "^1.3.0"
@@ -4571,6 +4568,7 @@
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
"integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"es-errors": "^1.3.0", "es-errors": "^1.3.0",
@@ -5128,26 +5126,6 @@
"dev": true, "dev": true,
"license": "ISC" "license": "ISC"
}, },
"node_modules/follow-redirects": {
"version": "1.15.11",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
"integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
"funding": [
{
"type": "individual",
"url": "https://github.com/sponsors/RubenVerborgh"
}
],
"license": "MIT",
"engines": {
"node": ">=4.0"
},
"peerDependenciesMeta": {
"debug": {
"optional": true
}
}
},
"node_modules/foreground-child": { "node_modules/foreground-child": {
"version": "3.3.1", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
@@ -5182,6 +5160,7 @@
"version": "4.0.5", "version": "4.0.5",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
"integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"asynckit": "^0.4.0", "asynckit": "^0.4.0",
@@ -5247,6 +5226,7 @@
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
"dev": true,
"license": "MIT", "license": "MIT",
"funding": { "funding": {
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
@@ -5276,6 +5256,7 @@
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
"integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"call-bind-apply-helpers": "^1.0.2", "call-bind-apply-helpers": "^1.0.2",
@@ -5300,6 +5281,7 @@
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"dunder-proto": "^1.0.1", "dunder-proto": "^1.0.1",
@@ -5455,6 +5437,7 @@
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
"devOptional": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.4" "node": ">= 0.4"
@@ -5521,6 +5504,7 @@
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.4" "node": ">= 0.4"
@@ -5533,6 +5517,7 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"has-symbols": "^1.0.3" "has-symbols": "^1.0.3"
@@ -5548,6 +5533,7 @@
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"function-bind": "^1.1.2" "function-bind": "^1.1.2"
@@ -6116,6 +6102,7 @@
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.4" "node": ">= 0.4"
@@ -6138,6 +6125,7 @@
"version": "1.52.0", "version": "1.52.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.6" "node": ">= 0.6"
@@ -6147,6 +6135,7 @@
"version": "2.1.35", "version": "2.1.35",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"mime-db": "1.52.0" "mime-db": "1.52.0"
@@ -6999,12 +6988,6 @@
"signal-exit": "^3.0.2" "signal-exit": "^3.0.2"
} }
}, },
"node_modules/proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
"license": "MIT"
},
"node_modules/pump": { "node_modules/pump": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",

View File

@@ -1,6 +1,6 @@
{ {
"name": "nfc-app-desktop", "name": "nfc-app-desktop",
"version": "1.0.0", "version": "1.1.0",
"description": "An Electron application with Vue and TypeScript", "description": "An Electron application with Vue and TypeScript",
"main": "./out/main/index.js", "main": "./out/main/index.js",
"author": "example.com", "author": "example.com",
@@ -25,10 +25,10 @@
"dependencies": { "dependencies": {
"@electron-toolkit/preload": "^3.0.2", "@electron-toolkit/preload": "^3.0.2",
"@electron-toolkit/utils": "^4.0.0", "@electron-toolkit/utils": "^4.0.0",
"@pokusew/pcsclite": "^0.6.0",
"@tockawa/nfc-pcsc": "latest", "@tockawa/nfc-pcsc": "latest",
"axios": "^1.13.6",
"electron-updater": "^6.3.9", "electron-updater": "^6.3.9",
"nfc-pcsc": "latest" "nfc-pcsc": "^0.8.1"
}, },
"devDependencies": { "devDependencies": {
"@electron-toolkit/eslint-config-prettier": "3.0.0", "@electron-toolkit/eslint-config-prettier": "3.0.0",

View File

@@ -11,6 +11,7 @@ import { logger } from "./LogService";
* @returns * @returns
*/ */
export async function labelReqHandler( export async function labelReqHandler(
//@ts-ignore: event no usado
event: IpcMainInvokeEvent, event: IpcMainInvokeEvent,
data: CodeRequest, data: CodeRequest,
): Promise<Result<string, CodeResponse>> { ): Promise<Result<string, CodeResponse>> {
@@ -89,7 +90,7 @@ export async function printReqHandler(
res("ok"); res("ok");
}); });
socket.on("timeout", (err) => { socket.on("timeout", (err: unknown) => {
if (finished) return; if (finished) return;
finished = true; finished = true;
logger.error("Print timeout", err); logger.error("Print timeout", err);

View File

@@ -2,12 +2,31 @@ import { app, shell, BrowserWindow, ipcMain } from "electron";
import { join } from "path"; import { join } from "path";
import { electronApp, optimizer, is } from "@electron-toolkit/utils"; import { electronApp, optimizer, is } from "@electron-toolkit/utils";
import icon from "../../resources/icon.png?asset"; import icon from "../../resources/icon.png?asset";
import { NfcService } from "../services/NfcService";
import { labelReqHandler, printReqHandler } from "./handlers"; import { labelReqHandler, printReqHandler } from "./handlers";
import { logger } from "./LogService"; import { logger } from "./LogService";
import { createConnection } from "net"; import { createConnection } from "net";
import { NfcService } from "../services/NfcService";
// 1. Global Error Handling (CRITICAL: As early as possible)
process.on("uncaughtException", (error) => {
logger.error("!!! UNCAUGHT EXCEPTION !!!", error);
console.error("Uncaught Exception:", error);
// Give some time for log to write before exit
setTimeout(() => app.quit(), 1000);
});
process.on("unhandledRejection", (reason) => {
logger.error("!!! UNHANDLED REJECTION !!!", reason);
console.error("Unhandled Rejection:", reason);
});
logger.info(">>> MAIN PROCESS BOOTSTRAP START <<<");
logger.info(
`Platform: ${process.platform} | Arch: ${process.arch} | Version: ${app.getVersion()}`,
);
function createWindow(): void { function createWindow(): void {
logger.info("Creating main window...");
// Create the browser window. // Create the browser window.
const mainWindow = new BrowserWindow({ const mainWindow = new BrowserWindow({
width: 900, width: 900,
@@ -21,20 +40,31 @@ function createWindow(): void {
}, },
}); });
const nfcService = new NfcService((event) => { let nfcService: NfcService | null = null;
if (!mainWindow.isDestroyed()) {
mainWindow.webContents.send(`nfc:${event.type}`, event);
}
});
ipcMain.handle("nfc:getReaderName", () => { ipcMain.handle("nfc:getReaderName", () => {
return nfcService.getReaderName(); return nfcService ? nfcService.getReaderName() : "OFFLINE";
}); });
mainWindow.on("ready-to-show", () => { mainWindow.on("ready-to-show", () => {
mainWindow.show(); mainWindow.show();
}); });
mainWindow.on("show", () => {
// 2. Initialize NFC AFTER window is ready to show (DEFERRED INIT)
logger.info("Deferred: Initializing NfcService...");
try {
nfcService = new NfcService((event) => {
if (!mainWindow.isDestroyed()) {
mainWindow.webContents.send(`nfc:${event.type}`, event);
}
});
logger.info("Deferred: NfcService initialization finished.");
} catch (error) {
logger.error("Deferred: Failed to initialize NfcService", error);
}
});
mainWindow.webContents.setWindowOpenHandler((details) => { mainWindow.webContents.setWindowOpenHandler((details) => {
shell.openExternal(details.url); shell.openExternal(details.url);
return { action: "deny" }; return { action: "deny" };
@@ -106,14 +136,14 @@ app.whenReady().then(() => {
req(true); req(true);
}); });
socket.on("timeout", (err) => { socket.on("timeout", (_) => {
if (finished) return; if (finished) return;
finished = true; finished = true;
socket.destroy(); socket.destroy();
rej(false); rej(false);
}); });
socket.on("error", (err) => { socket.on("error", (_) => {
if (finished) return; if (finished) return;
finished = true; finished = true;
socket.destroy(); socket.destroy();
@@ -123,7 +153,9 @@ app.whenReady().then(() => {
}, },
); );
logger.info("App Ready. Creating main window...");
createWindow(); createWindow();
logger.info("Main window creation triggered.");
app.on("activate", function () { app.on("activate", function () {
// On macOS it's common to re-create a window in the app when the // On macOS it's common to re-create a window in the app when the

View File

@@ -31,13 +31,9 @@ onMounted(async () => {
window.api.nfc.onTag((event) => { window.api.nfc.onTag((event) => {
uid.value = event.uid; uid.value = event.uid;
readCard();
readerState.value = "success"; readerState.value = "success";
// Reset state after 3 seconds
setTimeout(() => {
readerState.value = "waiting";
uid.value = null;
}, 3000);
}); });
window.api.nfc.onRemoved(() => { window.api.nfc.onRemoved(() => {
@@ -45,7 +41,7 @@ onMounted(async () => {
// Reset state after 3 seconds // Reset state after 3 seconds
setTimeout(() => { setTimeout(() => {
readerState.value = "waiting"; readerState.value = "waiting";
}, 3000); }, 1000);
}); });
window.api.nfc.onError((event) => { window.api.nfc.onError((event) => {
@@ -86,7 +82,13 @@ const readCard = async (): Promise<void> => {
// TODO: De momento está hardcodeado porque no se puede leer la tarjeta // TODO: De momento está hardcodeado porque no se puede leer la tarjeta
const card_id = "019cdd39-fc08-7417-b16d-a78794a24c01"; const card_id = uid.value;
if (card_id == undefined) {
// TODO: LOG
console.error("Error leyendo el token de la tarjeta");
return;
}
const override = false; const override = false;
const res = await loadLabel({ const res = await loadLabel({

View File

@@ -1,5 +1,72 @@
import PCSC, { Tag, Reader } from "@tockawa/nfc-pcsc";
import { logger } from "../main/LogService"; import { logger } from "../main/LogService";
import { NFC } from "nfc-pcsc";
// @ts-expect-error: .
function formatHexBuffer(buff: Buffer): string {
console.log("LEN:", buff.length);
const str = (
buff
.toString("hex")
.replace(/(.{2})/g, "$1 ")
.match(/.{1,48}/g) ?? [""]
).join("\n");
return str;
}
function findIndexOfPattern(buff: Buffer, pattern: number[]): number {
if (pattern.length === 0) return -1;
for (let i = 0; i <= buff.length - pattern.length; i++) {
let coincidencia = true;
for (let j = 0; j < pattern.length; j++) {
if (buff[i + j] !== pattern[j]) {
coincidencia = false;
break;
}
}
if (coincidencia) return i; // Retorna el índice de inicio
}
return -1; // Retorna -1 si no encuentra nada
}
function findPublicToken(buff: Buffer): string {
/**
57 - EMV
13 - LEN (19)
[3B] 54 69 23 - PAN BIN
[5B] 08 79 39 81 68 - PAN REMANDER
[4B]
d - separador
29 09 - fecha de expiración
22 1 - codigo de servicio
[7B]
0 - separador
00 00 06 1 - public token (7)
97 5 - cvc
00 - public token (2)
f - padding
*/
const BYTE_INICIO_TOKEN = 12;
const issuerData = [0x57];
const emvOffset = issuerData.length + 1;
const inicio = findIndexOfPattern(buff, issuerData);
const finIndex = inicio + emvOffset + buff[inicio + issuerData.length];
const issuerDataBuff = buff.subarray(inicio, finIndex);
const inicioData = emvOffset; // EMV + LEN
const inicioToken = inicioData + BYTE_INICIO_TOKEN;
const tokenbuff = issuerDataBuff.subarray(inicioToken);
const tokenstr = tokenbuff.toString("hex");
// El primer cuarteto es un 0 de separacion el último es una f de padding
const token = tokenstr.substring(1, 8) + tokenstr.substring(11, 13);
console.log("Public token", tokenstr, " - ", token);
return token;
}
export type NfcEvent = export type NfcEvent =
| { type: "tag"; uid: string } | { type: "tag"; uid: string }
@@ -7,15 +74,31 @@ export type NfcEvent =
| { type: "reader"; name: string } | { type: "reader"; name: string }
| { type: "error"; message: string }; | { type: "error"; message: string };
// Estan hardcodeados pero en principio no deberia hacer falta más
const commands = {
app: [0x00, 0xa4, 0x04, 0x00, 0x05, 0xa0, 0x00, 0x00, 0x00, 0x04, 0x00],
options: [0x80, 0xa8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00],
record: [0x00, 0xb2, 0x01, 0x14, 0x00],
};
/** PROVISIONAL */
export class NfcService { export class NfcService {
private nfc: PCSC; private nfc: NFC;
private onEvent?: (event: NfcEvent) => void; private onEvent?: (event: NfcEvent) => void;
private currentReaderName: string = "OFFLINE"; private currentReaderName: string = "OFFLINE";
constructor(onEvent?: (event: NfcEvent) => void) { constructor(onEvent?: (event: NfcEvent) => void) {
this.nfc = new PCSC.default(); logger.info("NfcService: Constructor start");
try {
logger.info("NfcService: Creating PCSC instance...");
this.nfc = new NFC(console);
logger.info("NfcService: PCSC instance created.");
} catch (err) {
logger.error("NfcService: Failed to create PCSC instance", err);
throw err;
}
this.onEvent = onEvent; this.onEvent = onEvent;
this.init(); this.init();
logger.info("NfcService: Constructor end");
} }
public getReaderName(): string { public getReaderName(): string {
@@ -23,23 +106,60 @@ export class NfcService {
} }
private init(): void { private init(): void {
this.nfc.on("reader", (reader: Reader) => { logger.info(
"NfcService: Starting initialization and attaching listeners...",
);
this.nfc.on("reader", (reader) => {
console.log(`Lector detectado: ${reader.name}`); console.log(`Lector detectado: ${reader.name}`);
logger.info(`NFC Reader detected: ${reader.name}`); logger.info(`NFC Reader detected: ${reader.name}`);
reader.aid = "a0000000041010";
this.currentReaderName = reader.name; this.currentReaderName = reader.name;
if (this.onEvent) { if (this.onEvent) {
this.onEvent({ type: "reader", name: reader.name }); this.onEvent({ type: "reader", name: reader.name });
} }
reader.autoProcessing = false;
reader.on("card", async (card: Tag) => { reader.on("card", async (card) => {
console.log(`Tarjeta detectada! UID: ${card.uid}`); const send = async (
logger.info(`NFC Tag detected: ${card.uid}`); cmd: number[],
comment: string | null = null,
responseMaxLength: number = 40,
): Promise<Buffer<ArrayBufferLike>> => {
const b = Buffer.from(cmd);
console.log(
(comment ? `[${comment}] ` : "") + `sending`,
b,
);
const data = await reader.transmit(b, responseMaxLength);
/*
console.log(
(comment ? `[${comment}] ` : "") + `received data \n`,
formatHexBuffer(data),
);
*/
return data;
};
console.log(`Tarjeta detectada! UID: ${JSON.stringify(card)}`);
logger.info(`NFC Tag detected: ${JSON.stringify(card)}`);
await send(commands.app, "step 1 - select app", 255);
await send(commands.options, "step 2 - read options", 255);
const res3 = await send(
commands.record,
"step 3 - read record 2 - 1",
255,
);
//decodeRecord(res3);
const token = findPublicToken(res3);
if (this.onEvent) { if (this.onEvent) {
this.onEvent({ type: "tag", uid: card.uid }); this.onEvent({ type: "tag", uid: token });
} }
}); });
reader.on("card.off", async (card: Tag) => { reader.on("card.off", async (card) => {
console.log(`Tarjeta retirada: ${card.uid}`); console.log(`Tarjeta retirada: ${card.uid}`);
logger.info(`NFC Tag removed: ${card.uid}`); logger.info(`NFC Tag removed: ${card.uid}`);
if (this.onEvent) { if (this.onEvent) {
@@ -76,6 +196,7 @@ export class NfcService {
}); });
} }
}); });
logger.info("NfcService: Initialization sequence complete.");
} }
public stop(): void { public stop(): void {