Scheduling infrastructure for absolutely everyone.
fix: refactor i18n `loadTranslations` and set timeout to 3s (#22878)
Benny Joo4061bfb3fe37
diff --git a/apps/web/test/lib/handleChildrenEventTypes.test.ts b/apps/web/test/lib/handleChildrenEventTypes.test.tsindex 6f24f398cb6..ef488d7e984 100644--- a/apps/web/test/lib/handleChildrenEventTypes.test.ts+++ b/apps/web/test/lib/handleChildrenEventTypes.test.ts@@ -26,7 +26,12 @@ vi.mock("@calcom/emails/email-manager", () => {vi.mock("@calcom/lib/server/i18n", () => {return {- getTranslation: (key: string) => key,+ getTranslation: async (locale: string, namespace: string) => {+ const t = (key: string) => key;+ t.locale = locale;+ t.namespace = namespace;+ return t;+ },};});diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.tsindex 927a7dfb2f2..917b3fae8af 100644--- a/packages/features/ee/billing/credit-service.test.ts+++ b/packages/features/ee/billing/credit-service.test.ts@@ -25,6 +25,17 @@ vi.mock("@calcom/prisma", () => {vi.mock("stripe");+vi.mock("@calcom/lib/server/i18n", () => {+ return {+ getTranslation: async (locale: string, namespace: string) => {+ const t = (key: string) => key;+ t.locale = locale;+ t.namespace = namespace;+ return t;+ },+ };+});+vi.mock("@calcom/lib/constants", async () => {const actual = (await vi.importActual("@calcom/lib/constants")) as typeof import("@calcom/lib/constants");return {diff --git a/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.ts b/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.tsindex f13fd58ea00..4b8d3fb6af3 100644--- a/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.ts+++ b/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.ts@@ -43,6 +43,17 @@ vi.mock("@calcom/lib/domainManager/organization", () => ({createDomain: vi.fn(),}));+vi.mock("@calcom/lib/server/i18n", () => {+ return {+ getTranslation: async (locale: string, namespace: string) => {+ const t = (key: string) => key;+ t.locale = locale;+ t.namespace = namespace;+ return t;+ },+ };+});+const mockOrganizationOnboarding = {name: "Test Org",slug: "test-org",diff --git a/packages/features/ee/workflows/lib/reminders/reminderScheduler.test.ts b/packages/features/ee/workflows/lib/reminders/reminderScheduler.test.tsindex d8c8179b7ed..aa8549db6aa 100644--- a/packages/features/ee/workflows/lib/reminders/reminderScheduler.test.ts+++ b/packages/features/ee/workflows/lib/reminders/reminderScheduler.test.ts@@ -17,6 +17,16 @@ vi.mock("@calcom/features/ee/workflows/lib/reminders/providers/emailProvider", (sendOrScheduleWorkflowEmails: vi.fn(),}));+vi.mock("@calcom/lib/server/i18n", () => {+ return {+ getTranslation: async (locale: string, namespace: string) => {+ const t = (key: string) => key;+ t.locale = locale;+ t.namespace = namespace;+ return t;+ },+ };+});describe("reminderScheduler", () => {beforeEach(() => {vi.clearAllMocks();diff --git a/packages/features/ee/workflows/lib/test/compareReminderBodyToTemplate.test.ts b/packages/features/ee/workflows/lib/test/compareReminderBodyToTemplate.test.tsindex 6371b00b8b0..641cddfb9a9 100644--- a/packages/features/ee/workflows/lib/test/compareReminderBodyToTemplate.test.ts+++ b/packages/features/ee/workflows/lib/test/compareReminderBodyToTemplate.test.ts@@ -1,5 +1,5 @@import { createInstance } from "i18next";-import { expect, test, describe } from "vitest";+import { vi, expect, test, describe } from "vitest";import { getTranslation } from "@calcom/lib/server/i18n";import { TimeFormat } from "@calcom/lib/timeFormat";@@ -10,6 +10,17 @@ import { getTemplateBodyForAction } from "../actionHelperFunctions";import compareReminderBodyToTemplate from "../compareReminderBodyToTemplate";import plainTextReminderTemplates from "../reminders/templates/plainTextTemplates";+vi.mock("@calcom/lib/server/i18n", () => {+ return {+ getTranslation: async (locale: string, namespace: string) => {+ const t = (key: string) => key;+ t.locale = locale;+ t.namespace = namespace;+ return t;+ },+ };+});+const translation = async () => {const _i18n = createInstance();await _i18n.init({diff --git a/packages/lib/fetchWithTimeout.ts b/packages/lib/fetchWithTimeout.tsnew file mode 100644index 00000000000..ecb0646e262--- /dev/null+++ b/packages/lib/fetchWithTimeout.ts@@ -0,0 +1,13 @@+export async function fetchWithTimeout(url: string, options: RequestInit = {}, timeoutMs: number) {+ const controller = new AbortController();+ const timeout = setTimeout(() => controller.abort(), timeoutMs);+ try {+ const response = await fetch(url, {+ ...options,+ signal: controller.signal,+ });+ return response;+ } finally {+ clearTimeout(timeout);+ }+}diff --git a/packages/lib/server/i18n.ts b/packages/lib/server/i18n.tsindex 3e092b33091..d6358440010 100644--- a/packages/lib/server/i18n.ts+++ b/packages/lib/server/i18n.ts@@ -1,39 +1,15 @@import { createInstance } from "i18next";+/* eslint-disable @typescript-eslint/no-var-requires */+const { i18n } = require("@calcom/config/next-i18next.config");import { WEBAPP_URL } from "@calcom/lib/constants";+import { fetchWithTimeout } from "../fetchWithTimeout";+import logger from "../logger";+const translationCache = new Map<string, Record<string, string>>();const i18nInstanceCache = new Map<string, any>();--/**- * Loads English fallback translations for when requested locale translations fail- * Implements caching to avoid redundant network requests- * @returns {Promise<Record<string, string>>} English translations object or empty object on failure- */-async function loadFallbackTranslations() {- const cacheKey = "en-common";-- if (translationCache.has(cacheKey)) {- return translationCache.get(cacheKey);- }-- try {- const res = await fetch(`${WEBAPP_URL}/static/locales/en/common.json`, {- cache: process.env.NODE_ENV === "production" ? "force-cache" : "no-store",- });-- if (!res.ok) {- throw new Error(`Failed to fetch fallback translations: ${res.status}`);- }-- const translations = await res.json();- translationCache.set(cacheKey, translations);- return translations;- } catch (error) {- console.error("Could not fetch fallback translations:", error);- return {};- }-}+const SUPPORTED_NAMESPACES = ["common"];/*** Loads translations for a specific locale and namespace with optimized caching@@ -41,32 +17,33 @@ async function loadFallbackTranslations() {* @param {string} ns - The namespace for the translations* @returns {Promise<Record<string, string>>} Translations object or fallback translations on failure*/-export async function loadTranslations(_locale: string, ns: string) {- const locale = _locale === "zh" ? "zh-CN" : _locale;+export async function loadTranslations(_locale: string, _ns: string) {+ let locale = _locale === "zh" ? "zh-CN" : _locale;+ locale = i18n.locales.includes(locale) ? locale : "en";+ const ns = SUPPORTED_NAMESPACES.includes(_ns) ? _ns : "common";const cacheKey = `${locale}-${ns}`;if (translationCache.has(cacheKey)) {return translationCache.get(cacheKey);}- try {- const url = `${WEBAPP_URL}/static/locales/${locale}/${ns}.json`;- const response = await fetch(url, {+ const url = `${WEBAPP_URL}/static/locales/${locale}/${ns}.json`;+ const response = await fetchWithTimeout(+ url,+ {cache: process.env.NODE_ENV === "production" ? "force-cache" : "no-store",- });-- if (!response.ok) {- throw new Error(`Failed to fetch translations: ${response.status}`);- }+ },+ 3000+ );- const translations = await response.json();- translationCache.set(cacheKey, translations);- return translations;- } catch (error) {- console.warn(`Failed to load translations for ${locale}/${ns}, falling back to English:`, error);- const fallbackTranslations = await loadFallbackTranslations();- return fallbackTranslations;+ if (!response.ok) {+ logger.error(`Failed to fetch translations: ${response.status}`);+ return {};}++ const translations = await response.json();+ translationCache.set(cacheKey, translations);+ return translations;}/**diff --git a/packages/lib/server/repository/user.test.ts b/packages/lib/server/repository/user.test.tsindex c4a9ef03b91..87c19764ce1 100644--- a/packages/lib/server/repository/user.test.ts+++ b/packages/lib/server/repository/user.test.ts@@ -9,8 +9,11 @@ import { UserRepository } from "./user";vi.mock("@calcom/lib/server/i18n", () => {return {- getTranslation: (key: string) => {- return () => key;+ getTranslation: async (locale: string, namespace: string) => {+ const t = (key: string) => key;+ t.locale = locale;+ t.namespace = namespace;+ return t;},};});diff --git a/packages/lib/server/service/userCreationService.test.ts b/packages/lib/server/service/userCreationService.test.tsindex 098fd7649c5..006af47701a 100644--- a/packages/lib/server/service/userCreationService.test.ts+++ b/packages/lib/server/service/userCreationService.test.ts@@ -11,8 +11,11 @@ import { UserCreationService } from "./userCreationService";vi.mock("@calcom/lib/server/i18n", () => {return {- getTranslation: (key: string) => {- return () => key;+ getTranslation: async (locale: string, namespace: string) => {+ const t = (key: string) => key;+ t.locale = locale;+ t.namespace = namespace;+ return t;},};});