diff --git a/Dockerfile b/Dockerfile index 031b538..a665cbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,21 +33,6 @@ RUN pnpm build:static FROM base AS app WORKDIR /app/tianji -# We don't need the standalone Chromium -ENV PUPPETEER_SKIP_DOWNLOAD=true -ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser -ENV DEBUG=puppeteer:* - -# NOTICE: Make sure Puppeteer is v22.7.1. Reference: https://pptr.dev/supported-browsers -RUN apk add --no-cache \ - chromium \ - nss \ - freetype \ - harfbuzz \ - udev \ - ca-certificates \ - ttf-freefont - COPY . . RUN pnpm install --filter @tianji/server... --config.dedupe-peer-dependents=false diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d009e78..7e6792c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -540,8 +540,8 @@ importers: specifier: ^0.4.4 version: 0.4.4 puppeteer: - specifier: 22.7.1 - version: 22.7.1(typescript@5.5.4) + specifier: 23.4.1 + version: 23.4.1(typescript@5.5.4) request-ip: specifier: ^3.3.0 version: 3.3.0 @@ -2717,11 +2717,6 @@ packages: '@probe.gl/stats@3.6.0': resolution: {integrity: sha512-JdALQXB44OP4kUBN/UrQgzbJe4qokbVF4Y8lkIA8iVCFnjVowWIgkD/z/0QO65yELT54tTrtepw1jScjKB+rhQ==} - '@puppeteer/browsers@2.2.3': - resolution: {integrity: sha512-bJ0UBsk0ESOs6RFcLXOt99a3yTDcOKlzfjad+rhFwdaG1Lu/Wzq58GHYCDTlZ9z6mldf4g+NTb+TXEfe0PpnsQ==} - engines: {node: '>=18'} - hasBin: true - '@puppeteer/browsers@2.4.0': resolution: {integrity: sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==} engines: {node: '>=18'} @@ -5287,11 +5282,6 @@ packages: resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} engines: {node: '>=6.0'} - chromium-bidi@0.5.19: - resolution: {integrity: sha512-UA6zL77b7RYCjJkZBsZ0wlvCTD+jTjllZ8f6wdO4buevXgTZYjV+XLB9CiEa2OuuTGGTLnI7eN9I60YxuALGQg==} - peerDependencies: - devtools-protocol: '*' - chromium-bidi@0.6.5: resolution: {integrity: sha512-RuLrmzYrxSb0s9SgpB+QN5jJucPduZQ/9SIe76MDxYJuecPW5mxMdacJ1f4EtgiV+R0p3sCkznTMvH0MPGFqjA==} peerDependencies: @@ -6032,6 +6022,15 @@ packages: supports-color: optional: true + debug@4.3.7: + resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + decamelize@1.2.0: resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==} engines: {node: '>=0.10.0'} @@ -6172,15 +6171,15 @@ packages: devlop@1.1.0: resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==} - devtools-protocol@0.0.1273771: - resolution: {integrity: sha512-QDbb27xcTVReQQW/GHJsdQqGKwYBE7re7gxehj467kKP2DKuYBUj6i2k5LRiAC66J1yZG/9gsxooz/s9pcm0Og==} - devtools-protocol@0.0.1312386: resolution: {integrity: sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==} devtools-protocol@0.0.1330662: resolution: {integrity: sha512-pzh6YQ8zZfz3iKlCvgzVCu22NdpZ8hNmwU6WnQjNVquh0A9iVosPtNLWDwaWVGyrntQlltPFztTMK5Cg6lfCuw==} + devtools-protocol@0.0.1342118: + resolution: {integrity: sha512-75fMas7PkYNDTmDyb6PRJCH7ILmHLp+BhrZGeMsa4bCh40DTxgCz2NRy5UDzII4C5KuD0oBMZ9vXKhEl6UD/3w==} + dezalgo@1.0.4: resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==} @@ -10116,18 +10115,17 @@ packages: resolution: {integrity: sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==} engines: {node: '>=12.20'} - puppeteer-core@22.7.1: - resolution: {integrity: sha512-jD7T7yN7PWGuJmNT0TAEboA26s0VVnvbgCxqgQIF+eNQW2u71ENaV2JwzSJiCHO+e72H4Ue6AgKD9USQ8xAcOQ==} - engines: {node: '>=18'} - puppeteer-core@23.3.0: resolution: {integrity: sha512-sB2SsVMFs4gKad5OCdv6w5vocvtEUrRl0zQqSyRPbo/cj1Ktbarmhxy02Zyb9R9HrssBcJDZbkrvBnbaesPyYg==} engines: {node: '>=18'} - puppeteer@22.7.1: - resolution: {integrity: sha512-JBCBCwQ9+dyPp5haqeecgv0N0vgWFx44woUeKJaPeJT8CU3RXrd8F/tqJQbuAmcWlbMhYJSlTJkIFrwVAs6BNA==} + puppeteer-core@23.4.1: + resolution: {integrity: sha512-uCxGtn8VE9PlKhdFJX/zZySi9K3Ufr3qUZe28jxJoZUqiMJOi+SFh2zhiFDSjWqZIDkc0FtnaCC+rewW3MYXmg==} + engines: {node: '>=18'} + + puppeteer@23.4.1: + resolution: {integrity: sha512-+wWfWTkQ8L9IB/3OVGSUp37c0eQ5za/85KdX+LAq2wTZkMdocgYGMCs+/91e2f/RXIYzve4x/uGxN8zG2sj8+w==} engines: {node: '>=18'} - deprecated: < 22.8.2 is no longer supported hasBin: true qrcode.react@3.1.0: @@ -11831,9 +11829,6 @@ packages: tar-fs@2.1.1: resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} - tar-fs@3.0.5: - resolution: {integrity: sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==} - tar-fs@3.0.6: resolution: {integrity: sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==} @@ -12823,18 +12818,6 @@ packages: utf-8-validate: optional: true - ws@8.16.0: - resolution: {integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==} - engines: {node: '>=10.0.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: '>=5.0.2' - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - ws@8.18.0: resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==} engines: {node: '>=10.0.0'} @@ -16244,19 +16227,6 @@ snapshots: dependencies: '@babel/runtime': 7.24.0 - '@puppeteer/browsers@2.2.3': - dependencies: - debug: 4.3.4 - extract-zip: 2.0.1 - progress: 2.0.3 - proxy-agent: 6.4.0 - semver: 7.6.0 - tar-fs: 3.0.5 - unbzip2-stream: 1.4.3 - yargs: 17.7.2 - transitivePeerDependencies: - - supports-color - '@puppeteer/browsers@2.4.0': dependencies: debug: 4.3.6 @@ -19725,13 +19695,6 @@ snapshots: chrome-trace-event@1.0.3: {} - chromium-bidi@0.5.19(devtools-protocol@0.0.1273771): - dependencies: - devtools-protocol: 0.0.1273771 - mitt: 3.0.1 - urlpattern-polyfill: 10.0.0 - zod: 3.22.4 - chromium-bidi@0.6.5(devtools-protocol@0.0.1330662): dependencies: devtools-protocol: 0.0.1330662 @@ -19739,6 +19702,13 @@ snapshots: urlpattern-polyfill: 10.0.0 zod: 3.23.8 + chromium-bidi@0.6.5(devtools-protocol@0.0.1342118): + dependencies: + devtools-protocol: 0.0.1342118 + mitt: 3.0.1 + urlpattern-polyfill: 10.0.0 + zod: 3.23.8 + ci-info@3.8.0: {} citty@0.1.6: @@ -20524,6 +20494,10 @@ snapshots: dependencies: ms: 2.1.2 + debug@4.3.7: + dependencies: + ms: 2.1.3 + decamelize@1.2.0: {} decode-named-character-reference@1.0.2: @@ -20661,12 +20635,12 @@ snapshots: dependencies: dequal: 2.0.3 - devtools-protocol@0.0.1273771: {} - devtools-protocol@0.0.1312386: {} devtools-protocol@0.0.1330662: {} + devtools-protocol@0.0.1342118: {} + dezalgo@1.0.4: dependencies: asap: 2.0.6 @@ -25756,18 +25730,6 @@ snapshots: dependencies: escape-goat: 4.0.0 - puppeteer-core@22.7.1: - dependencies: - '@puppeteer/browsers': 2.2.3 - chromium-bidi: 0.5.19(devtools-protocol@0.0.1273771) - debug: 4.3.4 - devtools-protocol: 0.0.1273771 - ws: 8.16.0 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - puppeteer-core@23.3.0: dependencies: '@puppeteer/browsers': 2.4.0 @@ -25781,12 +25743,27 @@ snapshots: - supports-color - utf-8-validate - puppeteer@22.7.1(typescript@5.5.4): + puppeteer-core@23.4.1: dependencies: - '@puppeteer/browsers': 2.2.3 + '@puppeteer/browsers': 2.4.0 + chromium-bidi: 0.6.5(devtools-protocol@0.0.1342118) + debug: 4.3.7 + devtools-protocol: 0.0.1342118 + typed-query-selector: 2.12.0 + ws: 8.18.0 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + + puppeteer@23.4.1(typescript@5.5.4): + dependencies: + '@puppeteer/browsers': 2.4.0 + chromium-bidi: 0.6.5(devtools-protocol@0.0.1342118) cosmiconfig: 9.0.0(typescript@5.5.4) - devtools-protocol: 0.0.1273771 - puppeteer-core: 22.7.1 + devtools-protocol: 0.0.1342118 + puppeteer-core: 23.4.1 + typed-query-selector: 2.12.0 transitivePeerDependencies: - bufferutil - supports-color @@ -28304,14 +28281,6 @@ snapshots: pump: 3.0.0 tar-stream: 2.2.0 - tar-fs@3.0.5: - dependencies: - pump: 3.0.0 - tar-stream: 3.1.6 - optionalDependencies: - bare-fs: 2.3.4 - bare-path: 2.1.3 - tar-fs@3.0.6: dependencies: pump: 3.0.0 @@ -29549,8 +29518,6 @@ snapshots: ws@8.11.0: {} - ws@8.16.0: {} - ws@8.18.0: {} xdg-basedir@4.0.0: {} diff --git a/src/server/package.json b/src/server/package.json index 57e3829..0947ff6 100644 --- a/src/server/package.json +++ b/src/server/package.json @@ -60,7 +60,7 @@ "passport": "^0.7.0", "passport-jwt": "^4.0.1", "ping": "^0.4.4", - "puppeteer": "22.7.1", + "puppeteer": "23.4.1", "request-ip": "^3.3.0", "socket.io": "^4.7.4", "swagger-ui-express": "^5.0.0",