From 102cfce37b4569952a5158bc55a739e1f6f82aeb Mon Sep 17 00:00:00 2001 From: lionel-rowe Date: Thu, 13 Nov 2025 06:13:34 +0800 Subject: [PATCH] Use async versions of bcrypt methods to avoid freezing browser tab (#204) * Use async versions of bcrypt methods to avoid freezing browser tab * Update bcryptjs to 3.0.3 and remove setInterval workaround * extract tools strings enhancements * i18n plugin optimization --------- Co-authored-by: ShareVB --- locales/en.yml | 8 +- package.json | 5 +- pnpm-lock.yaml | 181 +++++++++--------- scripts/extract-tools-strings.mjs | 4 +- src/main.ts | 4 + src/plugins/i18n.plugin.ts | 13 +- src/shims.d.ts | 9 + src/tools/bcrypt/bcrypt.models.test.ts | 53 +++++ src/tools/bcrypt/bcrypt.models.ts | 100 ++++++++++ src/tools/bcrypt/bcrypt.vue | 119 ++++++++++-- .../htpasswd-generator.service.test.ts | 4 +- tsconfig.vitest.json | 2 +- 12 files changed, 385 insertions(+), 117 deletions(-) create mode 100644 src/tools/bcrypt/bcrypt.models.test.ts create mode 100644 src/tools/bcrypt/bcrypt.models.ts diff --git a/locales/en.yml b/locales/en.yml index 822ec442..9f58614f 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -233,8 +233,14 @@ tools: placeholder-your-string-to-compare: Your string to compare... label-your-hash: 'Your hash: ' placeholder-your-hash-to-compare: Your hash to compare... - label-do-they-match: 'Do they match ? ' tag-copy-hash: Copy hash + hashed-string: Hashed string + comparison-result: Comparison result + matched: Matched + no-match: No match + timed-out-after-timeout-period: Timed out after {timeoutPeriod} + hashed-in-elapsed-period: Hashed in {elapsedPeriod} + compared-in-elapsed-period: Compared in {elapsedPeriod} crontab-generator: title: Crontab generator description: >- diff --git a/package.json b/package.json index 3511da5f..999506bf 100644 --- a/package.json +++ b/package.json @@ -94,6 +94,7 @@ "@zxcvbn-ts/language-en": "^3.0.2", "@zxing/library": "^0.21.3", "a11y-color-contrast": "^0.2.0", + "abort-signal-polyfill": "^1.0.0", "aircodes": "^1.3.16", "ajv": "^8.17.1", "ajv-errors": "^3.0.0", @@ -101,7 +102,7 @@ "ansible-vault": "^1.3.0", "apache-md5": "^1.1.8", "arr-diff": "^4.0.0", - "bcryptjs": "^2.4.3", + "bcryptjs": "^3.0.3", "big.js": "^6.2.2", "braces": "^3.0.3", "bwip-js": "^4.5.1", @@ -380,7 +381,7 @@ "@types/morsee": "^1.0.2", "@types/nanoid-dictionary": "^4.2.3", "@types/netmask": "^2.0.5", - "@types/node": "^22.18.11", + "@types/node": "^24.10.1", "@types/node-forge": "^1.3.14", "@types/potrace": "^2.1.5", "@types/punycode": "^2.1.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2e3217ab..32cc4dcb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -170,6 +170,9 @@ importers: a11y-color-contrast: specifier: ^0.2.0 version: 0.2.0 + abort-signal-polyfill: + specifier: ^1.0.0 + version: 1.0.0(@types/node@24.10.1) aircodes: specifier: ^1.3.16 version: 1.3.16 @@ -192,8 +195,8 @@ importers: specifier: ^4.0.0 version: 4.0.0 bcryptjs: - specifier: ^2.4.3 - version: 2.4.3 + specifier: ^3.0.3 + version: 3.0.3 big.js: specifier: ^6.2.2 version: 6.2.2 @@ -427,7 +430,7 @@ importers: version: 4.5.1 ical-generator: specifier: ^8.1.1 - version: 8.1.1(@types/luxon@3.4.2)(@types/node@22.18.11)(dayjs@1.11.13)(luxon@3.5.0)(moment-timezone@0.5.47)(moment@2.30.1) + version: 8.1.1(@types/luxon@3.4.2)(@types/node@24.10.1)(dayjs@1.11.13)(luxon@3.5.0)(moment-timezone@0.5.47)(moment@2.30.1) ical.js: specifier: ^2.2.0 version: 2.2.0 @@ -577,7 +580,7 @@ importers: version: 3.5.0 markdown-docx: specifier: ^1.2.0 - version: 1.2.0(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + version: 1.2.0(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) markdown-it: specifier: ^14.1.0 version: 14.1.0 @@ -1024,8 +1027,8 @@ importers: specifier: ^2.0.5 version: 2.0.5 '@types/node': - specifier: ^22.18.11 - version: 22.18.11 + specifier: ^24.10.1 + version: 24.10.1 '@types/node-forge': specifier: ^1.3.14 version: 1.3.14 @@ -1070,10 +1073,10 @@ importers: version: 0.57.1(eslint@8.47.0)(typescript@5.2.2) '@vitejs/plugin-vue': specifier: ^4.3.4 - version: 4.6.2(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(vue@3.3.4) + version: 4.6.2(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(vue@3.3.4) '@vitejs/plugin-vue-jsx': specifier: ^3.0.2 - version: 3.0.2(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(vue@3.3.4) + version: 3.0.2(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(vue@3.3.4) '@vue/compiler-sfc': specifier: ^3.2.47 version: 3.2.47 @@ -1121,10 +1124,10 @@ importers: version: 5.2.2 unocss: specifier: ^0.57.1 - version: 0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + version: 0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) unocss-preset-scrollbar: specifier: ^0.2.1 - version: 0.2.1(unocss@0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))) + version: 0.2.1(unocss@0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))) unplugin-icons: specifier: ^0.17.0 version: 0.17.4(@vue/compiler-sfc@3.2.47)(vue-template-compiler@2.7.14) @@ -1133,22 +1136,22 @@ importers: version: 0.25.0(@babel/parser@7.27.2)(rollup@2.79.2)(vue@3.3.4) unplugin-vue-markdown: specifier: ^29.1.0 - version: 29.1.0(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + version: 29.1.0(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) vite: specifier: ^4.4.9 - version: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + version: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) vite-plugin-node-polyfills: specifier: ^0.23.0 - version: 0.23.0(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + version: 0.23.0(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) vite-plugin-pwa: specifier: ^1.1.0 - version: 1.1.0(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0) + version: 1.1.0(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0) vite-plugin-splash-screen: specifier: ^0.2.0 version: 0.2.0 vite-plugin-wasm: specifier: ^3.4.1 - version: 3.4.1(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + version: 3.4.1(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) vite-svg-loader: specifier: ^4.0.0 version: 4.0.0 @@ -4155,14 +4158,11 @@ packages: '@types/node@17.0.45': resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - '@types/node@22.18.11': - resolution: {integrity: sha512-Gd33J2XIrXurb+eT2ktze3rJAfAp9ZNjlBdh4SVgyrKEOADwCbdUDaK7QgJno8Ue4kcajscsKqu6n8OBG3hhCQ==} - '@types/node@22.7.5': resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==} - '@types/node@24.3.0': - resolution: {integrity: sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==} + '@types/node@24.10.1': + resolution: {integrity: sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==} '@types/normalize-package-data@2.4.1': resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -4779,6 +4779,15 @@ packages: resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==} engines: {node: '>=6.5'} + abort-signal-polyfill@1.0.0: + resolution: {integrity: sha512-89GbKgHHfY4TKluDySuVdB1Qm2zZ6E9UrlRur5TxTHXzeLsXdbdiEXvDADhvBJnA9a6vCVZH/+Q0sJj2gbV5vA==} + engines: {node: '>=18.18.0'} + peerDependencies: + '@types/node': '>=18.18.0' + peerDependenciesMeta: + '@types/node': + optional: true + acorn-import-phases@1.0.4: resolution: {integrity: sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==} engines: {node: '>=10.13.0'} @@ -5068,8 +5077,9 @@ packages: bcrypt-pbkdf@1.0.2: resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==} - bcryptjs@2.4.3: - resolution: {integrity: sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==} + bcryptjs@3.0.3: + resolution: {integrity: sha512-GlF5wPWnSa/X5LKM1o0wz0suXIINz1iHRLvTS+sLyi7XPbe5ycmYI3DlZqVGZZtDgl4DmasFg7gOB3JYbphV5g==} + hasBin: true bencode@4.0.0: resolution: {integrity: sha512-AERXw18df0pF3ziGOCyUjqKZBVNH8HV3lBxnx5w0qtgMIk4a1wb9BkcCQbkp9Zstfrn/dzRwl7MmUHHocX3sRQ==} @@ -10565,11 +10575,8 @@ packages: undici-types@6.19.8: resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} - undici-types@6.21.0: - resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} - - undici-types@7.10.0: - resolution: {integrity: sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==} + undici-types@7.16.0: + resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} unhead@0.5.1: resolution: {integrity: sha512-5ZZ0wNRWWdY8+YEg3sX4IXr5r2duc1JslUyfHX1rAGBsaJ62IJRxI6DmgZqSEN0yfqYclCZenxNG+rmWjPKFQw==} @@ -14613,12 +14620,12 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.1.12 '@tailwindcss/oxide-win32-x64-msvc': 4.1.12 - '@tailwindcss/vite@4.1.12(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))': + '@tailwindcss/vite@4.1.12(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))': dependencies: '@tailwindcss/node': 4.1.12 '@tailwindcss/oxide': 4.1.12 tailwindcss: 4.1.12 - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) '@thaunknown/thirty-two@1.0.5': dependencies: @@ -14829,7 +14836,7 @@ snapshots: '@types/asn1@0.2.4': dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@types/bcryptjs@2.4.6': {} @@ -14987,7 +14994,7 @@ snapshots: '@types/fs-extra@11.0.4': dependencies: '@types/jsonfile': 6.1.1 - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@types/gensync@1.0.4': {} @@ -15009,7 +15016,7 @@ snapshots: '@types/jsdom@21.1.7': dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@types/tough-cookie': 4.0.2 parse5: 7.1.2 @@ -15019,7 +15026,7 @@ snapshots: '@types/jsonfile@6.1.1': dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@types/jsonpath@0.2.4': {} @@ -15027,7 +15034,7 @@ snapshots: '@types/libmime@5.0.3': dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@types/linkify-it@3.0.2': {} @@ -15081,7 +15088,7 @@ snapshots: '@types/memorystream@0.3.4': dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@types/mime-types@3.0.1': {} @@ -15095,34 +15102,30 @@ snapshots: '@types/node-fetch@2.6.12': dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 form-data: 4.0.0 '@types/node-forge@1.3.14': dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@types/node@16.9.1': {} '@types/node@17.0.45': {} - '@types/node@22.18.11': - dependencies: - undici-types: 6.21.0 - '@types/node@22.7.5': dependencies: undici-types: 6.19.8 - '@types/node@24.3.0': + '@types/node@24.10.1': dependencies: - undici-types: 7.10.0 + undici-types: 7.16.0 '@types/normalize-package-data@2.4.1': {} '@types/potrace@2.1.5': dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 jimp: 0.16.1 transitivePeerDependencies: - debug @@ -15133,7 +15136,7 @@ snapshots: '@types/qrcode@1.5.5': dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@types/resolve@1.20.2': {} @@ -15148,7 +15151,7 @@ snapshots: '@types/sshpk@1.17.4': dependencies: '@types/asn1': 0.2.4 - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@types/stringify-object@4.0.5': {} @@ -15408,13 +15411,13 @@ snapshots: '@unicode/unicode-15.1.0@1.6.6': {} - '@unocss/astro@0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))': + '@unocss/astro@0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))': dependencies: '@unocss/core': 0.57.7 '@unocss/reset': 0.57.7 - '@unocss/vite': 0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + '@unocss/vite': 0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) optionalDependencies: - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) transitivePeerDependencies: - rollup @@ -15578,7 +15581,7 @@ snapshots: dependencies: '@unocss/core': 0.57.7 - '@unocss/vite@0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))': + '@unocss/vite@0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))': dependencies: '@ampproject/remapping': 2.3.0 '@rollup/pluginutils': 5.1.4(rollup@2.79.2) @@ -15590,7 +15593,7 @@ snapshots: chokidar: 3.6.0 fast-glob: 3.3.3 magic-string: 0.30.17 - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) transitivePeerDependencies: - rollup @@ -15600,19 +15603,19 @@ snapshots: '@vicons/tabler@0.12.0': {} - '@vitejs/plugin-vue-jsx@3.0.2(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(vue@3.3.4)': + '@vitejs/plugin-vue-jsx@3.0.2(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(vue@3.3.4)': dependencies: '@babel/core': 7.22.10 '@babel/plugin-transform-typescript': 7.22.10(@babel/core@7.22.10) '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.22.10) - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) vue: 3.3.4 transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@4.6.2(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(vue@3.3.4)': + '@vitejs/plugin-vue@4.6.2(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(vue@3.3.4)': dependencies: - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) vue: 3.3.4 '@vitest/expect@0.34.6': @@ -16004,6 +16007,10 @@ snapshots: dependencies: event-target-shim: 5.0.1 + abort-signal-polyfill@1.0.0(@types/node@24.10.1): + optionalDependencies: + '@types/node': 24.10.1 + acorn-import-phases@1.0.4(acorn@8.15.0): dependencies: acorn: 8.15.0 @@ -16273,7 +16280,7 @@ snapshots: dependencies: tweetnacl: 0.14.5 - bcryptjs@2.4.3: {} + bcryptjs@3.0.3: {} bencode@4.0.0: dependencies: @@ -17441,7 +17448,7 @@ snapshots: docx@9.5.1: dependencies: - '@types/node': 24.3.0 + '@types/node': 24.10.1 hash.js: 1.1.7 jszip: 3.10.1 nanoid: 5.1.6 @@ -18792,12 +18799,12 @@ snapshots: ibantools@4.5.1: {} - ical-generator@8.1.1(@types/luxon@3.4.2)(@types/node@22.18.11)(dayjs@1.11.13)(luxon@3.5.0)(moment-timezone@0.5.47)(moment@2.30.1): + ical-generator@8.1.1(@types/luxon@3.4.2)(@types/node@24.10.1)(dayjs@1.11.13)(luxon@3.5.0)(moment-timezone@0.5.47)(moment@2.30.1): dependencies: uuid-random: 1.3.2 optionalDependencies: '@types/luxon': 3.4.2 - '@types/node': 22.18.11 + '@types/node': 24.10.1 dayjs: 1.11.13 luxon: 3.5.0 moment: 2.30.1 @@ -19206,7 +19213,7 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -19754,9 +19761,9 @@ snapshots: map-stream@0.1.0: {} - markdown-docx@1.2.0(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): + markdown-docx@1.2.0(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): dependencies: - '@tailwindcss/vite': 4.1.12(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + '@tailwindcss/vite': 4.1.12(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) commander: 13.1.0 docx: 9.5.1 image-size: 2.0.2 @@ -20984,7 +20991,7 @@ snapshots: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 22.18.11 + '@types/node': 24.10.1 long: 5.3.1 protocol-buffers-schema@2.2.0: {} @@ -22413,9 +22420,7 @@ snapshots: undici-types@6.19.8: {} - undici-types@6.21.0: {} - - undici-types@7.10.0: {} + undici-types@7.16.0: {} unhead@0.5.1: dependencies: @@ -22507,14 +22512,14 @@ snapshots: random-int: 3.0.0 sha.js: 2.4.11 - unocss-preset-scrollbar@0.2.1(unocss@0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))): + unocss-preset-scrollbar@0.2.1(unocss@0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))): dependencies: '@unocss/preset-mini': 0.31.17 - unocss: 0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + unocss: 0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) - unocss@0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): + unocss@0.57.7(postcss@8.5.3)(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): dependencies: - '@unocss/astro': 0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + '@unocss/astro': 0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) '@unocss/cli': 0.57.7(rollup@2.79.2) '@unocss/core': 0.57.7 '@unocss/extractor-arbitrary-variants': 0.57.7 @@ -22533,9 +22538,9 @@ snapshots: '@unocss/transformer-compile-class': 0.57.7 '@unocss/transformer-directives': 0.57.7 '@unocss/transformer-variant-group': 0.57.7 - '@unocss/vite': 0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) + '@unocss/vite': 0.57.7(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)) optionalDependencies: - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) transitivePeerDependencies: - postcss - rollup @@ -22598,7 +22603,7 @@ snapshots: - rollup - supports-color - unplugin-vue-markdown@29.1.0(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): + unplugin-vue-markdown@29.1.0(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): dependencies: '@mdit-vue/plugin-component': 2.1.4 '@mdit-vue/plugin-frontmatter': 2.1.4 @@ -22608,7 +22613,7 @@ snapshots: markdown-it-async: 2.2.0 unplugin: 2.3.5 unplugin-utils: 0.2.4 - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) unplugin@1.16.1: dependencies: @@ -22800,14 +22805,14 @@ snapshots: replace-ext: 2.0.0 teex: 1.0.1 - vite-node@0.34.6(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0): + vite-node@0.34.6(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0): dependencies: cac: 6.7.14 debug: 4.4.0 mlly: 1.7.3 pathe: 1.1.2 picocolors: 1.1.1 - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) transitivePeerDependencies: - '@types/node' - less @@ -22818,20 +22823,20 @@ snapshots: - supports-color - terser - vite-plugin-node-polyfills@0.23.0(rollup@2.79.2)(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): + vite-plugin-node-polyfills@0.23.0(rollup@2.79.2)(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): dependencies: '@rollup/plugin-inject': 5.0.5(rollup@2.79.2) node-stdlib-browser: 1.3.0 - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) transitivePeerDependencies: - rollup - vite-plugin-pwa@1.1.0(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0): + vite-plugin-pwa@1.1.0(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0): dependencies: debug: 4.4.0 pretty-bytes: 6.1.1 tinyglobby: 0.2.12 - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) workbox-build: 7.3.0 workbox-window: 7.3.0 transitivePeerDependencies: @@ -22839,22 +22844,22 @@ snapshots: vite-plugin-splash-screen@0.2.0: {} - vite-plugin-wasm@3.4.1(vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): + vite-plugin-wasm@3.4.1(vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0)): dependencies: - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) vite-svg-loader@4.0.0: dependencies: '@vue/compiler-sfc': 3.3.4 svgo: 3.3.2 - vite@4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0): + vite@4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0): dependencies: esbuild: 0.18.20 postcss: 8.4.28 rollup: 3.28.0 optionalDependencies: - '@types/node': 22.18.11 + '@types/node': 24.10.1 fsevents: 2.3.3 less: 4.2.2 lightningcss: 1.30.1 @@ -22865,7 +22870,7 @@ snapshots: dependencies: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 - '@types/node': 22.18.11 + '@types/node': 24.10.1 '@vitest/expect': 0.34.6 '@vitest/runner': 0.34.6 '@vitest/snapshot': 0.34.6 @@ -22884,8 +22889,8 @@ snapshots: strip-literal: 1.0.1 tinybench: 2.5.0 tinypool: 0.7.0 - vite: 4.4.9(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) - vite-node: 0.34.6(@types/node@22.18.11)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite: 4.4.9(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) + vite-node: 0.34.6(@types/node@24.10.1)(less@4.2.2)(lightningcss@1.30.1)(sass@1.83.4)(terser@5.39.0) why-is-node-running: 2.2.2 optionalDependencies: jsdom: 22.1.0 @@ -23544,7 +23549,7 @@ snapshots: dependencies: '@types/fs-extra': 11.0.4 '@types/minimist': 1.2.5 - '@types/node': 24.3.0 + '@types/node': 24.10.1 '@types/ps-tree': 1.1.6 '@types/which': 3.0.4 chalk: 5.6.2 diff --git a/scripts/extract-tools-strings.mjs b/scripts/extract-tools-strings.mjs index 2766c915..a1fd618f 100644 --- a/scripts/extract-tools-strings.mjs +++ b/scripts/extract-tools-strings.mjs @@ -54,8 +54,8 @@ function processVueComponent(filePath, toolName) { } const hasAlreayI18n = filePath.endsWith('.vue') - ? content.includes("const { t } = useI18n();") - : content.includes("import { translate as t } from '@/plugins/i18n.plugin';"); + ? /const\s+\{.*?\bt\b.*?\}\s+=\s+useI18n\(.*?\)/s.test(content) + : /import\s+\{.*?\btranslate\b.*?\}\s+from\s+(['"])@\/plugins\/i18n\.plugin\1/s.test(content); if (hasAlreayI18n) { console.log(`Already extracted: ${filePath}`); return; diff --git a/src/main.ts b/src/main.ts index df9bd222..72b82778 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,6 +5,8 @@ import { library } from '@fortawesome/fontawesome-svg-core'; import { fas } from '@fortawesome/free-solid-svg-icons'; import { LoadingPlugin } from 'vue-loading-overlay'; +import { installAbortSignalPolyfill } from 'abort-signal-polyfill'; + import { registerSW } from 'virtual:pwa-register'; import shadow from 'vue-shadow-dom'; import { hideSplashScreen } from 'vite-plugin-splash-screen/runtime'; @@ -27,6 +29,8 @@ window.addEventListener('vite:preloadError', (event: Event) => { window.location.reload(); }); +installAbortSignalPolyfill(); + // eslint-disable-next-line no-extend-native BigInt.prototype.toJSON = function () { return JSON.rawJSON ? JSON.rawJSON(this.toString()) : this.toString(); diff --git a/src/plugins/i18n.plugin.ts b/src/plugins/i18n.plugin.ts index e66ebaaf..db35b951 100644 --- a/src/plugins/i18n.plugin.ts +++ b/src/plugins/i18n.plugin.ts @@ -3,9 +3,11 @@ import { get } from '@vueuse/core'; import type { Plugin } from 'vue'; import { createI18n } from 'vue-i18n'; +const DEFAULT_LOCALE = String(import.meta.env.VITE_LANGUAGE || 'en'); + const i18n = createI18n({ legacy: false, - locale: import.meta.env.VITE_LANGUAGE || 'en', + locale: DEFAULT_LOCALE, messages, }); @@ -15,7 +17,8 @@ export const i18nPlugin: Plugin = { }, }; -export const translate = function (localeKey: string, list: unknown[] = []) { - const hasKey = i18n.global.te(localeKey, get(i18n.global.locale)); - return hasKey ? i18n.global.t(localeKey, list) : localeKey; -}; +export function getCurrentLocale(): string { + return get(i18n.global.locale); +} + +export const translate = i18n.global.t as typeof i18n.global.t; diff --git a/src/shims.d.ts b/src/shims.d.ts index 7f983204..decb0592 100644 --- a/src/shims.d.ts +++ b/src/shims.d.ts @@ -55,3 +55,12 @@ interface Navigator { interface FontFaceSet { add(fontFace: FontFace) } + +// TODO remove once https://github.com/microsoft/TypeScript/issues/60608 is resolved +// eslint-disable-next-line @typescript-eslint/no-namespace +namespace Intl { + class DurationFormat { + constructor(locale?: Intl.LocalesArgument, options?: { style?: 'long' }); + format(duration: { seconds?: number; milliseconds?: number }): string; + } +} diff --git a/src/tools/bcrypt/bcrypt.models.test.ts b/src/tools/bcrypt/bcrypt.models.test.ts new file mode 100644 index 00000000..9a30725c --- /dev/null +++ b/src/tools/bcrypt/bcrypt.models.test.ts @@ -0,0 +1,53 @@ +import { compare, hash } from 'bcryptjs'; +import { assert, describe, expect, test } from 'vitest'; +import { installAbortSignalPolyfill } from 'abort-signal-polyfill'; +import { type Update, bcryptWithProgressUpdates } from './bcrypt.models'; + +// Install the polyfill +installAbortSignalPolyfill(); + +// simplified polyfill for https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fromAsync +async function fromAsync(iter: AsyncIterable) { + const out: T[] = []; + for await (const val of iter) { + out.push(val); + } + return out; +} + +function checkProgressAndGetResult(updates: Update[]) { + const first = updates.at(0); + const penultimate = updates.at(-2); + const last = updates.at(-1); + const allExceptLast = updates.slice(0, -1); + + expect(allExceptLast.every(x => x.kind === 'progress')).toBeTruthy(); + expect(first).toEqual({ kind: 'progress', progress: 0 }); + expect(penultimate).toEqual({ kind: 'progress', progress: 1 }); + + assert(last != null && last.kind === 'success'); + + return last; +} + +describe('bcrypt models', () => { + describe(bcryptWithProgressUpdates.name, () => { + test('with bcrypt hash function', async () => { + const updates = await fromAsync(bcryptWithProgressUpdates(hash, ['abc', 5])); + const result = checkProgressAndGetResult(updates); + + expect(result.value).toMatch(/^\$2[ab]\$05\$.{53}$/); + expect(result.timeTakenMs).toBeGreaterThan(0); + }); + + test('with bcrypt compare function', async () => { + const updates = await fromAsync( + bcryptWithProgressUpdates(compare, ['abc', '$2a$05$FHzYelm8Qn.IhGP.N8V1TOWFlRTK.8cphbxZSvSFo9B6HGscnQdhy']), + ); + const result = checkProgressAndGetResult(updates); + + expect(result.value).toBe(true); + expect(result.timeTakenMs).toBeGreaterThan(0); + }); + }); +}); diff --git a/src/tools/bcrypt/bcrypt.models.ts b/src/tools/bcrypt/bcrypt.models.ts new file mode 100644 index 00000000..b40cec68 --- /dev/null +++ b/src/tools/bcrypt/bcrypt.models.ts @@ -0,0 +1,100 @@ +import { getCurrentLocale, translate as t } from '@/plugins/i18n.plugin'; + +Intl.DurationFormat ??= class DurationFormat { + format(duration: { seconds?: number; milliseconds?: number }): string { + return 'seconds' in duration + ? `${duration.seconds} seconds` + : `${duration.milliseconds} milliseconds`; + } +}; + +export type Update = + | { + kind: 'progress' + progress: number + } + | { + kind: 'success' + value: Result + timeTakenMs: number + } + | { + kind: 'error' + message: string + }; + +// generic type for the callback versions of bcryptjs's `hash` and `compare` +export type BcryptFn = ( + arg1: string, + arg2: Param, + callback: (err: Error | null, hash: Result) => void, + progressCallback: (percent: number) => void, +) => void; + +interface BcryptWithProgressOptions { + signal: AbortSignal + timeoutMs: number +} + +export async function* bcryptWithProgressUpdates( + fn: BcryptFn, + args: [string, Param], + options?: Partial, +): AsyncGenerator, undefined, undefined> { + const { timeoutMs = 10_000 } = options ?? {}; + // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error + // @ts-ignore: AbortSignal.any breaks typecheck + const signal: AbortSignal = AbortSignal.any([ + AbortSignal.timeout(timeoutMs), + options?.signal, + ].filter(x => x != null)); + + let res = (_: Update) => {}; + const nextPromise = () => new Promise>(resolve => res = resolve); + const promises = [nextPromise()]; + const nextValue = (value: Update) => { + res(value); + promises.push(nextPromise()); + }; + + const start = Date.now(); + + fn( + args[0], + args[1], + (err, result) => { + nextValue( + err == null + ? { kind: 'success', value: result, timeTakenMs: Date.now() - start } + : { kind: 'error', message: err.message }, + ); + }, + (progress) => { + if (signal.aborted) { + nextValue({ kind: 'progress', progress: 0 }); + if (signal.reason instanceof DOMException && signal.reason.name === 'TimeoutError') { + const message = t('tools.bcrypt.texts.timed-out-after-timeout-period', { + timeoutPeriod: new Intl.DurationFormat(getCurrentLocale(), { style: 'long' }) + .format({ seconds: Math.round(timeoutMs / 1000) }), + }); + + nextValue({ kind: 'error', message }); + } + + // throw inside callback to cancel execution of hashing/comparing + throw signal.reason; + } + else { + nextValue({ kind: 'progress', progress }); + } + }, + ); + + for await (const value of promises) { + yield value; + + if (value.kind === 'success' || value.kind === 'error') { + return; + } + } +} diff --git a/src/tools/bcrypt/bcrypt.vue b/src/tools/bcrypt/bcrypt.vue index 6b7e1462..e9177d45 100644 --- a/src/tools/bcrypt/bcrypt.vue +++ b/src/tools/bcrypt/bcrypt.vue @@ -1,21 +1,79 @@ - diff --git a/src/tools/htpasswd-generator/htpasswd-generator.service.test.ts b/src/tools/htpasswd-generator/htpasswd-generator.service.test.ts index bc097ea6..99a74085 100644 --- a/src/tools/htpasswd-generator/htpasswd-generator.service.test.ts +++ b/src/tools/htpasswd-generator/htpasswd-generator.service.test.ts @@ -5,7 +5,7 @@ describe('htpasswd-generator', () => { it('generate correct entries', () => { const commonValues = { username: 'a', password: 'a' }; - expect(generateHtpasswd({ ...commonValues, saltRounds: 10, algorithm: 'bcrypt' })).toContain('a:$2a$10$'); + expect(generateHtpasswd({ ...commonValues, saltRounds: 10, algorithm: 'bcrypt' })).toMatch(/a:\$2[ab]\$10\$/); expect(generateHtpasswd({ ...commonValues, salt: 'k9azwE5H', algorithm: 'apr1' })).toBe('a:$apr1$k9azwE5H$zIyj4gqCWXiwB2Iof6jHf1'); expect(generateHtpasswd({ ...commonValues, salt: 'xs4x6VWJ', algorithm: 'md5' })).toBe('a:$1$xs4x6VWJ$lOH0fBF6QyWdTOEeqcFnP/'); expect(generateHtpasswd({ ...commonValues, salt: 'grEPbuEp', algorithm: 'sha256' })).toBe('a:$5$grEPbuEp$DUmEMT5C4TRgZCs9ZFKOJZ/IgR5FJIOUH0dasQFPw57'); @@ -16,7 +16,7 @@ describe('htpasswd-generator', () => { it('generate correct entries (unicode)', () => { const commonValues = { username: 'a', password: 'àùé' }; - expect(generateHtpasswd({ ...commonValues, saltRounds: 10, algorithm: 'bcrypt' })).toContain('a:$2a$10$'); + expect(generateHtpasswd({ ...commonValues, saltRounds: 10, algorithm: 'bcrypt' })).toMatch(/a:\$2[ab]\$10\$/); expect(() => generateHtpasswd({ ...commonValues, salt: 'mL016JCr', algorithm: 'apr1' })).toThrow(); expect(() => generateHtpasswd({ ...commonValues, salt: 'YshCU1p1', algorithm: 'md5' })).toThrow(); expect(generateHtpasswd({ ...commonValues, salt: 'Rojf48Kp', algorithm: 'sha256' })).toBe('a:$5$Rojf48Kp$/dY3S.yDqW2ZH/YKrF85q6JszyP.bhIF/Qu31Q49Oa5'); diff --git a/tsconfig.vitest.json b/tsconfig.vitest.json index 0d7369ad..4835c49b 100644 --- a/tsconfig.vitest.json +++ b/tsconfig.vitest.json @@ -3,7 +3,7 @@ "exclude": [], "compilerOptions": { "composite": true, - "lib": [], + "lib": ["es2022"], "types": ["node", "jsdom", "unplugin-icons/types/vue"] } }