Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ui): scanning of small QR codes #3946

Merged
merged 4 commits into from
Oct 15, 2024
Merged

fix(ui): scanning of small QR codes #3946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3bedee
fix: scanning of small QR codes
AlCalzone Oct 12, 2024
cf10053
Merge branch 'master' into fix-QR-code-scanning
robertsLando Oct 15, 2024
790c33c
fix: add wasm file to build
robertsLando Oct 15, 2024
a20ed97
fix: serve zxing_reader.wasm from public/ dir
AlCalzone Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"ansi_up": "^6.0.2",
"archiver": "^7.0.1",
"axios": "^1.7.2",
"barcode-detector": "^2.2.11",
"connect-history-api-fallback": "2.0.0",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
Expand Down Expand Up @@ -111,7 +112,8 @@
"vuetify": "^2.7.2",
"winston": "^3.13.0",
"winston-daily-rotate-file": "^5.0.0",
"zwave-js": "^13.9.0"
"zwave-js": "^13.9.0",
"zxing-wasm": "^1.2.15"
},
"devDependencies": {
"@actions/github": "^6.0.0",
Expand Down
Binary file added public/zxing_reader.wasm
View file
Open in desktop
Binary file not shown.
19 changes: 18 additions & 1 deletion src/components/custom/QrReader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,29 @@
</div>
</template>
<script>
import QrScanner from 'qr-scanner'
// The BarcodeDetector Web API is not yet supported in all browsers,
// and "qr-scanner" defaults to a suboptimal implementation if it is not available.
// The following import makes a better implementation available that is based on a
// WebAssembly port of ZXing:
import { setZXingModuleOverrides } from 'barcode-detector'
import { wait } from '../../lib/utils.js'
import logger from '../../lib/logger'

const log = logger.get('QrReader')

import QrScanner from 'qr-scanner'

setZXingModuleOverrides({
locateFile: (path, prefix) => {
if (path.endsWith('.wasm')) {
// This file has been copied from node_modules/zxing-wasm/dist/reader/ to public/
// Don't forget to update the file when updating the node_module
return 'zxing_reader.wasm'
}
return prefix + path
},
})

export default {
props: {
qrbox: {
Expand Down
Loading