From 72852f90e25df73659d9d72a3a8667860914d710 Mon Sep 17 00:00:00 2001 From: Amruth Pillai Date: Tue, 14 Nov 2023 21:53:10 +0100 Subject: [PATCH] pin browserless/chrome version as latest it too unstable --- .../client/src/pages/builder/_components/toolbar.tsx | 5 ++--- apps/client/src/providers/locale.tsx | 3 +-- apps/server/src/config/schema.ts | 2 +- apps/server/src/printer/printer.service.ts | 12 ++++++------ package-lock.json | 2 +- package.json | 2 +- tools/compose/development.yml | 2 +- tools/compose/simple.yml | 2 +- tools/compose/traefik-secure.yml | 2 +- tools/compose/traefik.yml | 2 +- 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/apps/client/src/pages/builder/_components/toolbar.tsx b/apps/client/src/pages/builder/_components/toolbar.tsx index 13a34c772..8a0607f0d 100644 --- a/apps/client/src/pages/builder/_components/toolbar.tsx +++ b/apps/client/src/pages/builder/_components/toolbar.tsx @@ -49,9 +49,8 @@ export const BuilderToolbar = () => { return (
diff --git a/apps/client/src/providers/locale.tsx b/apps/client/src/providers/locale.tsx index 572ab3f59..b94952576 100644 --- a/apps/client/src/providers/locale.tsx +++ b/apps/client/src/providers/locale.tsx @@ -1,7 +1,7 @@ import "@/client/libs/dayjs"; import { i18n } from "@lingui/core"; -import { detect, fromNavigator, fromStorage, fromUrl } from "@lingui/detect-locale"; +import { detect, fromStorage, fromUrl } from "@lingui/detect-locale"; import { I18nProvider } from "@lingui/react"; import { useEffect } from "react"; @@ -20,7 +20,6 @@ export const LocaleProvider = ({ children }: Props) => { const detectedLocale = detect( fromUrl("locale"), fromStorage("locale"), - fromNavigator(), userLocale, defaultLocale, )!; diff --git a/apps/server/src/config/schema.ts b/apps/server/src/config/schema.ts index 1a88394e8..f61b29518 100644 --- a/apps/server/src/config/schema.ts +++ b/apps/server/src/config/schema.ts @@ -13,7 +13,6 @@ export const configSchema = z.object({ // URLs PUBLIC_URL: z.string().url(), STORAGE_URL: z.string().url(), - CHROME_URL: z.string().url(), // Database (Prisma) DATABASE_URL: z.string().url().startsWith("postgresql://"), @@ -24,6 +23,7 @@ export const configSchema = z.object({ // Browser CHROME_TOKEN: z.string(), + CHROME_URL: z.string().url(), // Mail Server SMTP_URL: z.string().url().startsWith("smtp://").optional(), diff --git a/apps/server/src/printer/printer.service.ts b/apps/server/src/printer/printer.service.ts index a4a3f1f4a..0671c5e49 100644 --- a/apps/server/src/printer/printer.service.ts +++ b/apps/server/src/printer/printer.service.ts @@ -14,13 +14,13 @@ import { Config } from "../config/schema"; import { StorageService } from "../storage/storage.service"; import { UtilsService } from "../utils/utils.service"; -const PRINTER_TIMEOUT = 15000; // 15 seconds +const PRINTER_TIMEOUT = 10000; // 10 seconds @Injectable() export class PrinterService { private readonly logger = new Logger(PrinterService.name); - private browserEndpoint: string; + private browserURL: string; constructor( private readonly configService: ConfigService, @@ -31,12 +31,12 @@ export class PrinterService { const chromeUrl = this.configService.getOrThrow("CHROME_URL"); const chromeToken = this.configService.getOrThrow("CHROME_TOKEN"); - this.browserEndpoint = `${chromeUrl}?token=${chromeToken}`; + this.browserURL = `${chromeUrl}?token=${chromeToken}`; } private getBrowser() { try { - return connect({ browserWSEndpoint: this.browserEndpoint }); + return connect({ browserWSEndpoint: this.browserURL }); } catch (error) { throw new InternalServerErrorException(ErrorMessage.InvalidBrowserConnection, error.message); } @@ -56,10 +56,10 @@ export class PrinterService { const start = performance.now(); const url = await retry(() => withTimeout(this.generateResume(resume), PRINTER_TIMEOUT), { - retries: 3, + retries: 2, randomize: true, onRetry: (_, attempt) => { - this.logger.debug(`Retrying resume print job: Attempt #${attempt}`); + this.logger.debug(`Print Resume: retry attempt #${attempt}`); }, }); diff --git a/package-lock.json b/package-lock.json index 4943f6f8a..2c982d540 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,7 +104,7 @@ "passport-jwt": "^4.0.1", "passport-local": "^1.0.0", "pdf-lib": "^1.17.1", - "puppeteer": "^21.5.1", + "puppeteer": "^21.4.1", "qrcode.react": "^3.1.0", "react": "18.2.0", "react-colorful": "^5.6.1", diff --git a/package.json b/package.json index aa650731b..4a6a78320 100644 --- a/package.json +++ b/package.json @@ -209,7 +209,7 @@ "passport-jwt": "^4.0.1", "passport-local": "^1.0.0", "pdf-lib": "^1.17.1", - "puppeteer": "^21.5.1", + "puppeteer": "^21.4.1", "qrcode.react": "^3.1.0", "react": "18.2.0", "react-colorful": "^5.6.1", diff --git a/tools/compose/development.yml b/tools/compose/development.yml index 408b1e945..67a47e783 100644 --- a/tools/compose/development.yml +++ b/tools/compose/development.yml @@ -41,7 +41,7 @@ services: # Chrome Browser (for printing and previews) chrome: - image: browserless/chrome + image: browserless/chrome:1.61.0-puppeteer-21.4.1 restart: unless-stopped ports: - ${CHROME_PORT:-8080}:3000 diff --git a/tools/compose/simple.yml b/tools/compose/simple.yml index 5f65cbd93..306e0fb26 100644 --- a/tools/compose/simple.yml +++ b/tools/compose/simple.yml @@ -36,7 +36,7 @@ services: # Chrome Browser (for printing and previews) chrome: - image: browserless/chrome + image: browserless/chrome:1.61.0-puppeteer-21.4.1 restart: unless-stopped environment: TOKEN: chrome_token diff --git a/tools/compose/traefik-secure.yml b/tools/compose/traefik-secure.yml index 01fecc911..6cf355bc7 100644 --- a/tools/compose/traefik-secure.yml +++ b/tools/compose/traefik-secure.yml @@ -41,7 +41,7 @@ services: # Chrome Browser (for printing and previews) chrome: - image: browserless/chrome + image: browserless/chrome:1.61.0-puppeteer-21.4.1 restart: unless-stopped environment: TOKEN: chrome_token diff --git a/tools/compose/traefik.yml b/tools/compose/traefik.yml index 5e44b9290..48e20a3ad 100644 --- a/tools/compose/traefik.yml +++ b/tools/compose/traefik.yml @@ -39,7 +39,7 @@ services: # Chrome Browser (for printing and previews) chrome: - image: browserless/chrome + image: browserless/chrome:1.61.0-puppeteer-21.4.1 restart: unless-stopped environment: TOKEN: chrome_token