From d2be04bbd283bfe391054e72e29553fda11a442c Mon Sep 17 00:00:00 2001 From: Bruno Perel Date: Sat, 9 Mar 2024 11:27:47 +0100 Subject: [PATCH] Fix demo CSV paths Fix pastec status endpoints Update TypeScript from 5.3 to to 5.4 --- apps/dumili | 2 +- apps/web/package.json | 2 +- apps/web/pnpm-lock.yaml | 204 +++++++++--------- apps/whattheduck-ionic | 2 +- packages/api/index.ts | 4 +- packages/api/package.json | 2 +- packages/api/pnpm-lock.yaml | 66 +++--- .../api/services/collection/issues/index.ts | 12 +- packages/api/status.ts | 108 +++++----- packages/duckguessr-ml | 2 +- packages/socket.io-client-services/index.ts | 125 ++++++----- packages/socket.io-services/package.json | 2 +- packages/socket.io-services/pnpm-lock.yaml | 8 +- packages/socket.io-services/types.ts | 2 +- 14 files changed, 283 insertions(+), 258 deletions(-) diff --git a/apps/dumili b/apps/dumili index b10a160e8..28ceea211 160000 --- a/apps/dumili +++ b/apps/dumili @@ -1 +1 @@ -Subproject commit b10a160e81ce2515967f963a952b7c96aa448500 +Subproject commit 28ceea21137be62018b759a776114e110d4b3969 diff --git a/apps/web/package.json b/apps/web/package.json index 69c6854d5..a56aea58e 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -64,7 +64,7 @@ "histoire": "^0.17.9", "prettier": "^3.2.5", "sass": "^1.71.1", - "typescript": "^5.3.3", + "typescript": "^5.4.2", "typescript-eslint": "^7.1.0", "unplugin-auto-import": "^0.17.5", "unplugin-icons": "^0.18.5", diff --git a/apps/web/pnpm-lock.yaml b/apps/web/pnpm-lock.yaml index 91b1a43df..d2a81afc6 100644 --- a/apps/web/pnpm-lock.yaml +++ b/apps/web/pnpm-lock.yaml @@ -46,7 +46,7 @@ dependencies: version: 2.0.7 pinia: specifier: ^2.1.7 - version: 2.1.7(typescript@5.3.3)(vue@3.4.21) + version: 2.1.7(typescript@5.4.2)(vue@3.4.21) timeago.js: specifier: ^4.0.2 version: 4.0.2 @@ -55,7 +55,7 @@ dependencies: version: 3.2.0(vue@3.4.21) vue: specifier: ^3.4.21 - version: 3.4.21(typescript@5.3.3) + version: 3.4.21(typescript@5.4.2) vue-chartjs: specifier: ^5.3.0 version: 5.3.0(chart.js@4.4.1)(vue@3.4.21) @@ -87,7 +87,7 @@ dependencies: devDependencies: '@antfu/eslint-config': specifier: ^1.2.1 - version: 1.2.1(eslint@8.57.0)(typescript@5.3.3)(vitest@1.3.1) + version: 1.2.1(eslint@8.57.0)(typescript@5.4.2)(vitest@1.3.1) '@histoire/plugin-vue': specifier: ^0.17.12 version: 0.17.12(histoire@0.17.9)(vite@5.1.4)(vue@3.4.21) @@ -149,11 +149,11 @@ devDependencies: specifier: ^1.71.1 version: 1.71.1 typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.2 + version: 5.4.2 typescript-eslint: specifier: ^7.1.0 - version: 7.1.0(eslint@8.57.0)(typescript@5.3.3) + version: 7.1.0(eslint@8.57.0)(typescript@5.4.2) unplugin-auto-import: specifier: ^0.17.5 version: 0.17.5(@vueuse/core@10.8.0) @@ -177,7 +177,7 @@ devDependencies: version: 1.3.1(sass@1.71.1) vue-tsc: specifier: ^1.8.27 - version: 1.8.27(typescript@5.3.3) + version: 1.8.27(typescript@5.4.2) packages: @@ -191,7 +191,7 @@ packages: engines: {node: '>=14.0.0'} dev: true - /@antfu/eslint-config@1.2.1(eslint@8.57.0)(typescript@5.3.3)(vitest@1.3.1): + /@antfu/eslint-config@1.2.1(eslint@8.57.0)(typescript@5.4.2)(vitest@1.3.1): resolution: {integrity: sha512-/B7jSc9RARxGNZUoxkB2EL7pL7v5ubt25Ah3QbQaCalcIOC3YF+60mL4/G8Oi9Rtdng7ytNGg3bi50voKfqINQ==} hasBin: true peerDependencies: @@ -201,9 +201,9 @@ packages: '@eslint-types/jsdoc': 46.8.2-1 '@eslint-types/typescript-eslint': 6.21.0 '@eslint-types/unicorn': 49.0.0 - '@stylistic/eslint-plugin': 1.6.2(eslint@8.57.0)(typescript@5.3.3) - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.3.3) - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@stylistic/eslint-plugin': 1.6.2(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.2) eslint: 8.57.0 eslint-config-flat-gitignore: 0.1.3 eslint-plugin-antfu: 1.0.13(eslint@8.57.0) @@ -214,10 +214,10 @@ packages: eslint-plugin-markdown: 3.0.1(eslint@8.57.0) eslint-plugin-n: 16.6.2(eslint@8.57.0) eslint-plugin-no-only-tests: 3.1.0 - eslint-plugin-perfectionist: 2.5.0(eslint@8.57.0)(typescript@5.3.3)(vue-eslint-parser@9.4.2) + eslint-plugin-perfectionist: 2.5.0(eslint@8.57.0)(typescript@5.4.2)(vue-eslint-parser@9.4.2) eslint-plugin-unicorn: 49.0.0(eslint@8.57.0) eslint-plugin-unused-imports: 3.1.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint@8.57.0) - eslint-plugin-vitest: 0.3.22(@typescript-eslint/eslint-plugin@6.21.0)(eslint@8.57.0)(typescript@5.3.3)(vitest@1.3.1) + eslint-plugin-vitest: 0.3.22(@typescript-eslint/eslint-plugin@6.21.0)(eslint@8.57.0)(typescript@5.4.2)(vitest@1.3.1) eslint-plugin-vue: 9.22.0(eslint@8.57.0) eslint-plugin-yml: 1.12.2(eslint@8.57.0) execa: 8.0.1 @@ -333,7 +333,7 @@ packages: dependencies: '@popperjs/core': 2.11.8 debounce: 1.2.1 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) dev: false /@codemirror/commands@6.3.3: @@ -728,7 +728,7 @@ packages: histoire: 0.17.9(sass@1.71.1)(vite@5.1.4) launch-editor: 2.6.1 pathe: 1.1.2 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) transitivePeerDependencies: - vite dev: true @@ -1303,7 +1303,7 @@ packages: '@sentry/core': 7.102.1 '@sentry/types': 7.102.1 '@sentry/utils': 7.102.1 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) dev: false /@sinclair/typebox@0.27.8: @@ -1342,20 +1342,20 @@ packages: picomatch: 4.0.1 dev: true - /@stylistic/eslint-plugin-plus@1.6.2(eslint@8.57.0)(typescript@5.3.3): + /@stylistic/eslint-plugin-plus@1.6.2(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-EDMwa6gzKw4bXRqdIAUvZDfIgwotbjJs8o+vYE22chAYtVAnA0Pcq+cPx0Uk35t2gvJWb5OaLDjqA6oy1tD0jg==} peerDependencies: eslint: '*' dependencies: '@types/eslint': 8.56.3 - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@stylistic/eslint-plugin-ts@1.6.2(eslint@8.57.0)(typescript@5.3.3): + /@stylistic/eslint-plugin-ts@1.6.2(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-FizV58em0OjO/xFHRIy/LJJVqzxCNmYC/xVtKDf8aGDRgZpLo+lkaBKfBrbMkAGzhBKbYj+iLEFI4WEl6aVZGQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1363,14 +1363,14 @@ packages: dependencies: '@stylistic/eslint-plugin-js': 1.6.2(eslint@8.57.0) '@types/eslint': 8.56.3 - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@stylistic/eslint-plugin@1.6.2(eslint@8.57.0)(typescript@5.3.3): + /@stylistic/eslint-plugin@1.6.2(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-EFnVcKOE5HTiMlVwisL9hHjz8a69yBbJRscWF/z+/vl6M4ew8NVrBlY8ea7KdV8QtyCY4Yapmsbg5ZDfhWlEgg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1378,8 +1378,8 @@ packages: dependencies: '@stylistic/eslint-plugin-js': 1.6.2(eslint@8.57.0) '@stylistic/eslint-plugin-jsx': 1.6.2(eslint@8.57.0) - '@stylistic/eslint-plugin-plus': 1.6.2(eslint@8.57.0)(typescript@5.3.3) - '@stylistic/eslint-plugin-ts': 1.6.2(eslint@8.57.0)(typescript@5.3.3) + '@stylistic/eslint-plugin-plus': 1.6.2(eslint@8.57.0)(typescript@5.4.2) + '@stylistic/eslint-plugin-ts': 1.6.2(eslint@8.57.0)(typescript@5.4.2) '@types/eslint': 8.56.3 eslint: 8.57.0 transitivePeerDependencies: @@ -1531,7 +1531,7 @@ packages: /@types/web-bluetooth@0.0.20: resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} - /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1543,10 +1543,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.4 eslint: 8.57.0 @@ -1554,13 +1554,13 @@ packages: ignore: 5.3.1 natural-compare: 1.4.0 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1572,10 +1572,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/scope-manager': 7.1.0 - '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3) - '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/visitor-keys': 7.1.0 debug: 4.3.4 eslint: 8.57.0 @@ -1583,13 +1583,13 @@ packages: ignore: 5.3.1 natural-compare: 1.4.0 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1601,16 +1601,16 @@ packages: dependencies: '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.2) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.4 eslint: 8.57.0 - typescript: 5.3.3 + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1622,11 +1622,11 @@ packages: dependencies: '@typescript-eslint/scope-manager': 7.1.0 '@typescript-eslint/types': 7.1.0 - '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.4.2) '@typescript-eslint/visitor-keys': 7.1.0 debug: 4.3.4 eslint: 8.57.0 - typescript: 5.3.3 + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true @@ -1647,7 +1647,7 @@ packages: '@typescript-eslint/visitor-keys': 7.1.0 dev: true - /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1657,17 +1657,17 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) debug: 4.3.4 eslint: 8.57.0 - ts-api-utils: 1.2.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/type-utils@7.1.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/type-utils@7.1.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1677,12 +1677,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3) - '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.4.2) + '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.4.2) debug: 4.3.4 eslint: 8.57.0 - ts-api-utils: 1.2.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true @@ -1697,7 +1697,7 @@ packages: engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree@6.21.0(typescript@5.3.3): + /@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.2): resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1713,13 +1713,13 @@ packages: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@7.1.0(typescript@5.3.3): + /@typescript-eslint/typescript-estree@7.1.0(typescript@5.4.2): resolution: {integrity: sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1735,13 +1735,13 @@ packages: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1752,7 +1752,7 @@ packages: '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.2) eslint: 8.57.0 semver: 7.6.0 transitivePeerDependencies: @@ -1760,7 +1760,7 @@ packages: - typescript dev: true - /@typescript-eslint/utils@7.1.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/utils@7.1.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1771,7 +1771,7 @@ packages: '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 7.1.0 '@typescript-eslint/types': 7.1.0 - '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.4.2) eslint: 8.57.0 semver: 7.6.0 transitivePeerDependencies: @@ -1828,7 +1828,7 @@ packages: '@unhead/shared': 1.8.10 hookable: 5.5.3 unhead: 1.8.10 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) dev: false /@vitejs/plugin-vue@5.0.4(vite@5.1.4)(vue@3.4.21): @@ -1839,7 +1839,7 @@ packages: vue: ^3.2.25 dependencies: vite: 5.1.4(sass@1.71.1) - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) dev: true /@vitest/expect@1.3.1: @@ -1915,7 +1915,7 @@ packages: ast-kit: 0.11.3 local-pkg: 0.5.0 magic-string-ast: 0.3.0 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) transitivePeerDependencies: - rollup dev: true @@ -1932,7 +1932,7 @@ packages: '@vue/shared': 3.4.20 magic-string: 0.30.7 unplugin: 1.7.1 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) transitivePeerDependencies: - rollup dev: true @@ -2012,7 +2012,7 @@ packages: /@vue/devtools-api@6.6.1: resolution: {integrity: sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==} - /@vue/language-core@1.8.27(typescript@5.3.3): + /@vue/language-core@1.8.27(typescript@5.4.2): resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==} peerDependencies: typescript: '*' @@ -2028,7 +2028,7 @@ packages: minimatch: 9.0.3 muggle-string: 0.3.1 path-browserify: 1.0.1 - typescript: 5.3.3 + typescript: 5.4.2 vue-template-compiler: 2.7.16 dev: true @@ -2057,7 +2057,7 @@ packages: dependencies: '@vue/compiler-ssr': 3.4.21 '@vue/shared': 3.4.21 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) /@vue/shared@3.4.20: resolution: {integrity: sha512-KTEngal0aiUvNJ6I1Chk5Ew5XqChsFsxP4GKAYXWb99zKJWjNU72p2FWEOmZWHxHcqtniOJsgnpd3zizdpfEag==} @@ -2076,7 +2076,7 @@ packages: optional: true dependencies: js-beautify: 1.15.1 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) vue-component-type-helpers: 1.8.27 dev: true @@ -2306,7 +2306,7 @@ packages: dependencies: '@floating-ui/vue': 1.0.6(vue@3.4.21) '@vueuse/core': 10.8.0(vue@3.4.21) - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) transitivePeerDependencies: - '@vue/composition-api' dev: false @@ -3096,7 +3096,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.2) debug: 3.2.7 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 @@ -3230,7 +3230,7 @@ packages: engines: {node: '>=5.0.0'} dev: true - /eslint-plugin-perfectionist@2.5.0(eslint@8.57.0)(typescript@5.3.3)(vue-eslint-parser@9.4.2): + /eslint-plugin-perfectionist@2.5.0(eslint@8.57.0)(typescript@5.4.2)(vue-eslint-parser@9.4.2): resolution: {integrity: sha512-F6XXcq4mKKUe/SREoMGQqzgw6cgCgf3pFzkFfQVIGtqD1yXVpQjnhTepzhBeZfxZwgMzR9HO4yH4CUhIQ2WBcQ==} peerDependencies: astro-eslint-parser: ^0.16.0 @@ -3248,7 +3248,7 @@ packages: vue-eslint-parser: optional: true dependencies: - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) eslint: 8.57.0 minimatch: 9.0.3 natural-compare-lite: 1.4.0 @@ -3310,12 +3310,12 @@ packages: '@typescript-eslint/eslint-plugin': optional: true dependencies: - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.4.2) eslint: 8.57.0 eslint-rule-composer: 0.3.0 dev: true - /eslint-plugin-vitest@0.3.22(@typescript-eslint/eslint-plugin@6.21.0)(eslint@8.57.0)(typescript@5.3.3)(vitest@1.3.1): + /eslint-plugin-vitest@0.3.22(@typescript-eslint/eslint-plugin@6.21.0)(eslint@8.57.0)(typescript@5.4.2)(vitest@1.3.1): resolution: {integrity: sha512-atkFGQ7aVgcuSeSMDqnyevIyUpfBPMnosksgEPrKE7Y8xQlqG/5z2IQ6UDau05zXaaFv7Iz8uzqvIuKshjZ0Zw==} engines: {node: ^18.0.0 || >= 20.0.0} peerDependencies: @@ -3328,8 +3328,8 @@ packages: vitest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.3.3) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) eslint: 8.57.0 vitest: 1.3.1(sass@1.71.1) transitivePeerDependencies: @@ -5229,7 +5229,7 @@ packages: engines: {node: '>=12'} dev: true - /pinia@2.1.7(typescript@5.3.3)(vue@3.4.21): + /pinia@2.1.7(typescript@5.4.2)(vue@3.4.21): resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==} peerDependencies: '@vue/composition-api': ^1.4.0 @@ -5242,8 +5242,8 @@ packages: optional: true dependencies: '@vue/devtools-api': 6.6.1 - typescript: 5.3.3 - vue: 3.4.21(typescript@5.3.3) + typescript: 5.4.2 + vue: 3.4.21(typescript@5.4.2) vue-demi: 0.14.7(vue@3.4.21) dev: false @@ -5967,13 +5967,13 @@ packages: engines: {node: '>=8'} dev: false - /ts-api-utils@1.2.1(typescript@5.3.3): + /ts-api-utils@1.2.1(typescript@5.4.2): resolution: {integrity: sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==} engines: {node: '>=16'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.3.3 + typescript: 5.4.2 dev: true /tslib@2.6.2: @@ -6010,7 +6010,7 @@ packages: resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} engines: {node: '>=8'} - /typescript-eslint@7.1.0(eslint@8.57.0)(typescript@5.3.3): + /typescript-eslint@7.1.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-GfAALH4zoqae5mIfHr7WU3BsULHP73hjwF8vCmyTkH3IXHXjqg3JNWwUcd8CwOTLIr4tjRTZQWpToyESPnpOhg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -6020,16 +6020,16 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3) - '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/eslint-plugin': 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.4.2) eslint: 8.57.0 - typescript: 5.3.3 + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /typescript@5.3.3: - resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + /typescript@5.4.2: + resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} engines: {node: '>=14.17'} hasBin: true @@ -6178,7 +6178,7 @@ packages: minimatch: 9.0.3 resolve: 1.22.8 unplugin: 1.7.1 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) transitivePeerDependencies: - rollup - supports-color @@ -6233,7 +6233,7 @@ packages: peerDependencies: vue: ^3.0.0 dependencies: - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) dev: false /validate-npm-package-license@3.0.4: @@ -6318,7 +6318,7 @@ packages: debug: 4.3.4 fast-glob: 3.3.2 vite: 5.1.4(sass@1.71.1) - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) vue-router: 4.3.0(vue@3.4.21) transitivePeerDependencies: - supports-color @@ -6430,7 +6430,7 @@ packages: vue: ^3.0.0-0 || ^2.7.0 dependencies: chart.js: 4.4.1 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) dev: false /vue-component-type-helpers@1.8.27: @@ -6449,7 +6449,7 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) /vue-eslint-parser@9.4.2(eslint@8.57.0): resolution: {integrity: sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==} @@ -6478,7 +6478,7 @@ packages: '@intlify/core-base': 9.9.1 '@intlify/shared': 9.9.1 '@vue/devtools-api': 6.6.1 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) /vue-mapbox-ts@0.9.10(vue@3.4.21): resolution: {integrity: sha512-Rqcp84JTxYSYmiJx8NLT2Gb7IKBUwdKa4u8ChLQ7E3bSIsDNv6dNVPS6H8rdmhktoBKzyoFCYU4FPMad/cLL5g==} @@ -6493,7 +6493,7 @@ packages: fast-deep-equal: 3.1.3 mapbox-gl: 3.1.2 my-deferred: 1.2.0 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) dev: false /vue-router@4.3.0(vue@3.4.21): @@ -6502,14 +6502,14 @@ packages: vue: ^3.2.0 dependencies: '@vue/devtools-api': 6.6.1 - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) /vue-slicksort@2.0.5(vue@3.4.21): resolution: {integrity: sha512-fXz1YrNjhUbJK7o0tMk27mIr4pMAZYLSYvtmLazCtfpvz+zafPCn34ILDL8B7hT7WLVZKreYs6JVe5VWymqmzA==} peerDependencies: vue: '>=3.0.0' dependencies: - vue: 3.4.21(typescript@5.3.3) + vue: 3.4.21(typescript@5.4.2) dev: false /vue-template-compiler@2.7.16: @@ -6519,19 +6519,19 @@ packages: he: 1.2.0 dev: true - /vue-tsc@1.8.27(typescript@5.3.3): + /vue-tsc@1.8.27(typescript@5.4.2): resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==} hasBin: true peerDependencies: typescript: '*' dependencies: '@volar/typescript': 1.11.1 - '@vue/language-core': 1.8.27(typescript@5.3.3) + '@vue/language-core': 1.8.27(typescript@5.4.2) semver: 7.6.0 - typescript: 5.3.3 + typescript: 5.4.2 dev: true - /vue@3.4.21(typescript@5.3.3): + /vue@3.4.21(typescript@5.4.2): resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==} peerDependencies: typescript: '*' @@ -6544,7 +6544,7 @@ packages: '@vue/runtime-dom': 3.4.21 '@vue/server-renderer': 3.4.21(vue@3.4.21) '@vue/shared': 3.4.21 - typescript: 5.3.3 + typescript: 5.4.2 /w3c-keyname@2.2.8: resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==} diff --git a/apps/whattheduck-ionic b/apps/whattheduck-ionic index f591faa0e..bd2527010 160000 --- a/apps/whattheduck-ionic +++ b/apps/whattheduck-ionic @@ -1 +1 @@ -Subproject commit f591faa0efcaee09209592dea2d98121a28ecc53 +Subproject commit bd2527010f5981b9a23eb41e46ab774358caae52 diff --git a/packages/api/index.ts b/packages/api/index.ts index 061f0df0d..dfba01955 100644 --- a/packages/api/index.ts +++ b/packages/api/index.ts @@ -53,10 +53,10 @@ const httpServer = createServer(async (req, res) => { data = await getDbStatus() break; case '/status/pastecsearch': - data = await getPastecStatus() + data = await getPastecSearchStatus() break; case '/status/pastec': - data = await getPastecSearchStatus() + data = await getPastecStatus() default: res.writeHead(404); res.end(); diff --git a/packages/api/package.json b/packages/api/package.json index 7446e2443..dc9a6a346 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -44,7 +44,7 @@ "ts-node": "^10.9.2", "tsc-alias": "^1.8.8", "tsconfig-paths": "^4.2.0", - "typescript": "^5.3.3", + "typescript": "^5.4.2", "typescript-eslint": "^7.1.0" } } \ No newline at end of file diff --git a/packages/api/pnpm-lock.yaml b/packages/api/pnpm-lock.yaml index af69aa57f..1a439eeec 100644 --- a/packages/api/pnpm-lock.yaml +++ b/packages/api/pnpm-lock.yaml @@ -93,7 +93,7 @@ devDependencies: version: 3.2.5 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@18.19.18)(typescript@5.3.3) + version: 10.9.2(@types/node@18.19.18)(typescript@5.4.2) tsc-alias: specifier: ^1.8.8 version: 1.8.8 @@ -101,11 +101,11 @@ devDependencies: specifier: ^4.2.0 version: 4.2.0 typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.2 + version: 5.4.2 typescript-eslint: specifier: ^7.1.0 - version: 7.1.0(eslint@8.57.0)(typescript@5.3.3) + version: 7.1.0(eslint@8.57.0)(typescript@5.4.2) packages: @@ -378,7 +378,7 @@ packages: resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} dev: true - /@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -390,10 +390,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/scope-manager': 7.1.0 - '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3) - '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/visitor-keys': 7.1.0 debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 @@ -401,13 +401,13 @@ packages: ignore: 5.3.1 natural-compare: 1.4.0 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -419,11 +419,11 @@ packages: dependencies: '@typescript-eslint/scope-manager': 7.1.0 '@typescript-eslint/types': 7.1.0 - '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.4.2) '@typescript-eslint/visitor-keys': 7.1.0 debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 - typescript: 5.3.3 + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true @@ -436,7 +436,7 @@ packages: '@typescript-eslint/visitor-keys': 7.1.0 dev: true - /@typescript-eslint/type-utils@7.1.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/type-utils@7.1.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -446,12 +446,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3) - '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.4.2) + '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.4.2) debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 - ts-api-utils: 1.2.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true @@ -461,7 +461,7 @@ packages: engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree@7.1.0(typescript@5.3.3): + /@typescript-eslint/typescript-estree@7.1.0(typescript@5.4.2): resolution: {integrity: sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -477,13 +477,13 @@ packages: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.2.1(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@7.1.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/utils@7.1.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -494,7 +494,7 @@ packages: '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 7.1.0 '@typescript-eslint/types': 7.1.0 - '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.4.2) eslint: 8.57.0 semver: 7.6.0 transitivePeerDependencies: @@ -1855,16 +1855,16 @@ packages: hasBin: true dev: true - /ts-api-utils@1.2.1(typescript@5.3.3): + /ts-api-utils@1.2.1(typescript@5.4.2): resolution: {integrity: sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==} engines: {node: '>=16'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.3.3 + typescript: 5.4.2 dev: true - /ts-node@10.9.2(@types/node@18.19.18)(typescript@5.3.3): + /ts-node@10.9.2(@types/node@18.19.18)(typescript@5.4.2): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -1890,7 +1890,7 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.3.3 + typescript: 5.4.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -1932,7 +1932,7 @@ packages: engines: {node: '>=10'} dev: true - /typescript-eslint@7.1.0(eslint@8.57.0)(typescript@5.3.3): + /typescript-eslint@7.1.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-GfAALH4zoqae5mIfHr7WU3BsULHP73hjwF8vCmyTkH3IXHXjqg3JNWwUcd8CwOTLIr4tjRTZQWpToyESPnpOhg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1942,16 +1942,16 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3) - '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/eslint-plugin': 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.4.2) eslint: 8.57.0 - typescript: 5.3.3 + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /typescript@5.3.3: - resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + /typescript@5.4.2: + resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} engines: {node: '>=14.17'} hasBin: true dev: true diff --git a/packages/api/services/collection/issues/index.ts b/packages/api/services/collection/issues/index.ts index 483fa7232..51251c79c 100644 --- a/packages/api/services/collection/issues/index.ts +++ b/packages/api/services/collection/issues/index.ts @@ -1,5 +1,6 @@ import { parse } from "csv-parse/sync"; -import { readFileSync } from "fs"; +import { existsSync, readFileSync } from "fs"; +import { cwd } from "process"; import { Socket } from "socket.io"; import { TransactionResults } from "~dm-types/TransactionResults"; @@ -272,6 +273,8 @@ export const resetDemo = async () => { return; } + const csvPath = existsSync("/app/services/demo_issues.csv") ? "/app/services/": cwd() + "/services/"; + demo.lastReset = new Date(); await prismaDm.demo.update({ data: demo, @@ -293,8 +296,11 @@ export const resetDemo = async () => { issuenumber: string; } + const currentDir = process.cwd(); + console.log(currentDir) + const csvIssues: CsvIssue[] = parse( - readFileSync("/app/routes/demo/demo_issues.csv"), + readFileSync(`${csvPath}demo_issues.csv`), { columns: true } ); await prismaDm.$transaction( @@ -320,7 +326,7 @@ export const resetDemo = async () => { } const csvPurchases: CsvPurchase[] = parse( - readFileSync("/app/routes/demo/demo_purchases.csv"), + readFileSync(`${csvPath}demo_purchases.csv`), { columns: true } ); await prismaDm.$transaction( diff --git a/packages/api/status.ts b/packages/api/status.ts index 4952306b9..ee507cbbf 100644 --- a/packages/api/status.ts +++ b/packages/api/status.ts @@ -1,5 +1,4 @@ import axios from "axios"; -import { readFileSync } from "fs"; import { prismaCoa, @@ -9,8 +8,9 @@ import { prismaEdgeCreator, } from "~/prisma"; - -export const getDbStatus = async (): Promise<{ error: string } | {status: 'ok'}> => { +export const getDbStatus = async (): Promise< + { error: string } | { status: "ok" } +> => { const checks = [ { db: "dm", check: async () => prismaDm.user.count() }, { db: "coverInfo", check: async () => prismaCoverInfo.cover.count() }, @@ -25,23 +25,27 @@ export const getDbStatus = async (): Promise<{ error: string } | {status: 'ok'}> ]; const failedChecks = checks.filter( - async ({ check }) => (await check()) === 0 + async ({ check }) => (await check()) === 0, ); if (failedChecks.length) { - return ({ - error: "Some DB checks have failed: " + failedChecks.map(({ db }) => db).join(", "), - }); + return { + error: + "Some DB checks have failed: " + + failedChecks.map(({ db }) => db).join(", "), + }; } const coaTables = ( - (await prismaCoa.$queryRaw<{ - Tables_in_coa: string; - }[]>`SHOW FULL TABLES WHERE Table_type = 'BASE TABLE'`) + await prismaCoa.$queryRaw< + { + Tables_in_coa: string; + }[] + >`SHOW FULL TABLES WHERE Table_type = 'BASE TABLE'` ).map(({ Tables_in_coa }) => Tables_in_coa); const query = coaTables .map( (coaTable) => - `(SELECT ${coaTable} AS tableName, SELECT COUNT(*) FROM ${coaTable} AS tableCount)` + `(SELECT ${coaTable} AS tableName, SELECT COUNT(*) FROM ${coaTable} AS tableCount)`, ) .join(" UNION "); const coaTablesWithCount = (await prismaCoa.$queryRawUnsafe(query)) as { @@ -49,56 +53,62 @@ export const getDbStatus = async (): Promise<{ error: string } | {status: 'ok'}> tableCount: number; }[]; const emptyCoaTables = coaTablesWithCount.filter( - ({ tableCount }) => tableCount === 0 + ({ tableCount }) => tableCount === 0, ); if (emptyCoaTables.length) { - return ({ + return { error: "Some COA tables are empty: " + emptyCoaTables.join(", "), - }); + }; } return { - status: 'ok' - } -} + status: "ok", + }; +}; -export const getPastecStatus = async (): Promise<{ numberOfImages: number } | { error: string }> => { - const response = ( - await axios.get(`${process.env.PASTEC_HOSTS}/imageIds`) - ).data; - if (response) { - const imageIds = JSON.parse(response)?.image_ids; - if (imageIds) { - return ({ numberOfImages: imageIds.length }); +export const getPastecStatus = async (): Promise< + { numberOfImages: number } | { error: string } +> => { + try { + const response = (await axios.get(`${process.env.PASTEC_HOSTS}/imageIds`)) + .data; + if (response) { + const imageIds = JSON.parse(response)?.image_ids; + if (imageIds) { + return { numberOfImages: imageIds.length }; + } else { + return { error: "Pastec /imageIds response is invalid" }; + } } else { - return ({ error: "Pastec /imageIds response is invalid" }); + return { error: "Pastec is unreachable" }; } - } else { - return ({ error: "Pastec is unreachable" }); + } catch (e) { + return { error: `Pastec is unreachable: ${e}` }; } -} +}; -export const getPastecSearchStatus = async (): Promise<{ numberOfImages: number } | { error: string }> => { - const response = ( - await axios.post( - `${process.env.PASTEC_HOSTS}/searcher`, - readFileSync( - `${process.env.INDUCKS_COVERS_ROOT}/au/bp/001/au_bp_001a_001.jpg` +export const getPastecSearchStatus = async (): Promise< + { numberOfImages: number } | { error: string } +> => { + try { + const response = ( + await axios.post( + `${process.env.PASTEC_HOSTS}/searcher`, + `${process.env.INDUCKS_COVERS_ROOT}/au/bp/001/au_bp_001a_001.jpg`, ) - ) - ).data; - if (response) { - const imageIds: number[] = JSON.parse(response)?.imageIds; - if (imageIds) { - if (imageIds.length) { - return ({ numberOfImages: imageIds.length }); - } else { - return ({ error: "Pastec search returned no image" }); + ).data; + if (response) { + const imageIds: number[] = JSON.parse(response)?.imageIds; + if (imageIds) { + if (imageIds.length) { + return { numberOfImages: imageIds.length }; + } else { + return { error: "Pastec search returned no image" }; + } } - } else { - return ({ error: "Pastec /searcher response is invalid" }); } - } else { - return ({ error: "Pastec is unreachable" }); + return { error: "Pastec /searcher response is invalid" }; + } catch (e) { + return { error: `Pastec is unreachable: ${e}` }; } -} \ No newline at end of file +}; diff --git a/packages/duckguessr-ml b/packages/duckguessr-ml index eabeaf30c..057622c91 160000 --- a/packages/duckguessr-ml +++ b/packages/duckguessr-ml @@ -1 +1 @@ -Subproject commit eabeaf30c7fa4af2282cf9b511c3935fc015b182 +Subproject commit 057622c91082d1578392689583cc87b6cdfe9c95 diff --git a/packages/socket.io-client-services/index.ts b/packages/socket.io-client-services/index.ts index d11b2f420..87f944f67 100644 --- a/packages/socket.io-client-services/index.ts +++ b/packages/socket.io-client-services/index.ts @@ -1,4 +1,8 @@ -import { CacheOptions } from "axios-cache-interceptor"; +import type { + CacheOptions, + NotEmptyStorageValue, +} from "axios-cache-interceptor"; +export type { NotEmptyStorageValue }; export { buildStorage, buildWebStorage } from "axios-cache-interceptor"; import { io, Socket } from "socket.io-client"; import { ref } from "vue"; @@ -13,7 +17,7 @@ export type LastParameter unknown> = Last< export type EventReturnTypeIncludingError< T extends (...args: any[]) => unknown > = - // @ts-expect-error ??? + // @ts-ignore ??? LastParameter>; type SocketCacheOptions = Pick; @@ -32,71 +36,76 @@ type EventCalls = { export const session = ref<{ getToken: () => Promise; - clearSession: () => Promise|void; + clearSession: () => Promise | void; sessionExists: () => Promise; onConnectError: () => void; }>(); export const cacheStorage = ref( undefined as CacheOptions["storage"] | undefined -); +); export const useSocket = (socketRootUrl: string) => ({ - addNamespace: ( + addNamespace: ( namespaceName: string, - cacheOptions?: Required) =>new Proxy({} as EventCalls & { connect: () => void }, { - get: - >(_: never, event: EventName) => - async ( - ...args: AllButLast> - ): Promise< - EventReturnTypeIncludingError | undefined - > => { - const socket = io(socketRootUrl + namespaceName, { - multiplex: false, - auth: async (cb) => { - if (!session.value) { - return; + cacheOptions?: Required + ) => + new Proxy({} as EventCalls & { connect: () => void }, { + get: + >(_: never, event: EventName) => + async ( + ...args: AllButLast> + ): Promise< + EventReturnTypeIncludingError | undefined + > => { + const socket = io(socketRootUrl + namespaceName, { + multiplex: false, + auth: async (cb) => { + if (!session.value) { + return; + } + const token = await session.value.getToken(); + cb({ + token + }); + }, + }).on("connect_error", (e) => { + if (session.value?.onConnectError) { + session.value.onConnectError(); + console.error(`Namespace ${namespaceName}: connect_error: ${e}`); + throw e; + } else { + console.error( + `Namespace ${namespaceName}: onConnectError is not defined` + ); + throw e; } - cb({ - token: await session.value.getToken(), - }); - }, - }).on("connect_error", (e) => { - if (session.value?.onConnectError) { - session.value.onConnectError(); - console.trace(`Namespace ${namespaceName}: connect_error: ${e}`); - } else { - console.trace( - `Namespace ${namespaceName}: onConnectError is not defined` - ); - } - }); - if (event === "connect") { - socket.connect(); - return; - } - let data; - if (cacheOptions) { - if (!cacheStorage.value) { - throw new Error("storage must be defined"); + }); + if (event === "connect") { + socket.connect(); + return; } - const cacheKey = `${event} ${JSON.stringify(args)}`; - const cacheData = (await cacheStorage.value.get(cacheKey)) as Awaited< - ReturnType - >; - const hasCacheData = - cacheData !== undefined && - !(typeof cacheData === "object" && cacheData.state === "empty"); - if (hasCacheData) { - return cacheData; + let data; + if (cacheOptions) { + if (!cacheStorage.value) { + throw new Error("storage must be defined"); + } + const cacheKey = `${event} ${JSON.stringify(args)}`; + const cacheData = (await cacheStorage.value.get( + cacheKey + )) as Awaited>; + const hasCacheData = + cacheData !== undefined && + !(typeof cacheData === "object" && cacheData.state === "empty"); + if (hasCacheData) { + return cacheData; + } + data = await socket.emitWithAck(event, ...args); + cacheStorage.value.set(cacheKey, data); + } else { + data = await socket.emitWithAck(event, ...args); } - data = await socket.emitWithAck(event, ...args); - cacheStorage.value.set(cacheKey, data); - } else { - data = await socket.emitWithAck(event, ...args); - } - return data; - }, - }) -}) + return data; + }, + }), +}); diff --git a/packages/socket.io-services/package.json b/packages/socket.io-services/package.json index cb48f9cdb..782b95627 100644 --- a/packages/socket.io-services/package.json +++ b/packages/socket.io-services/package.json @@ -5,6 +5,6 @@ "node": ">=18.0.0 <19.0.0" }, "devDependencies": { - "typescript": "^5.3.3" + "typescript": "^5.4.2" } } \ No newline at end of file diff --git a/packages/socket.io-services/pnpm-lock.yaml b/packages/socket.io-services/pnpm-lock.yaml index 99bd229e5..f913194f7 100644 --- a/packages/socket.io-services/pnpm-lock.yaml +++ b/packages/socket.io-services/pnpm-lock.yaml @@ -6,13 +6,13 @@ settings: devDependencies: typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.2 + version: 5.4.2 packages: - /typescript@5.3.3: - resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + /typescript@5.4.2: + resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} engines: {node: '>=14.17'} hasBin: true dev: true diff --git a/packages/socket.io-services/types.ts b/packages/socket.io-services/types.ts index 66594879a..b514b69d9 100644 --- a/packages/socket.io-services/types.ts +++ b/packages/socket.io-services/types.ts @@ -12,7 +12,7 @@ export type LastParameter unknown> = Last< export type EventReturnTypeIncludingError< T extends (...args: any[]) => unknown, > = - // @ts-expect-error ??? + // @ts-ignore ??? LastParameter>; export type EventReturnType unknown> =