fix(POSTV1-browser): 同时支持 Chrome 150 与 151

apps/api/src/admin-state.ts

@@ -151,10 +151,13 @@ export function createAdminDiagnosticsProvider(input: {
     const system: AdminDiagnosticsResponse["system"] = {
       api_status: "ready",
       app_version: input.appVersion ?? input.browserSupportRelease?.appVersion ?? "0.0.0",
-      browser_support: (input.browserSupportRelease?.browsers ?? []).map((browser) => ({
-        brand: browser.brand,
-        major: Number.parseInt(browser.fullVersion.split(".")[0] ?? "0", 10),
-      })).filter((browser) => Number.isSafeInteger(browser.major) && browser.major > 0),
+      browser_support: (input.browserSupportRelease?.browsers ?? []).flatMap((browser) => {
+        const majors = browser.supportedMajorVersions
+          ?? [Number.parseInt(browser.fullVersion.split(".")[0] ?? "0", 10)];
+        return majors
+          .map((major) => ({ brand: browser.brand, major }))
+          .filter((entry) => Number.isSafeInteger(entry.major) && entry.major > 0);
+      }),
       worker_status: services.services.find((service) => service.service_id === "worker")?.status === "active"
         ? "ready"
         : services.services.find((service) => service.service_id === "worker")?.status === "unavailable"

apps/api/src/browser-support.ts

@@ -43,7 +43,7 @@ export const BrowserSupportSuccessSchema = Type.Object(
     app_version: Type.String({ maxLength: 80 }),
     browser: SupportedBrowserSummarySchema,
     status: Type.Literal("supported"),
-    supported_browsers: Type.Array(SupportedBrowserSummarySchema, { maxItems: 2 }),
+    supported_browsers: Type.Array(SupportedBrowserSummarySchema, { maxItems: 8 }),
   },
   { additionalProperties: false, $id: "BrowserSupportSuccess" },
 );
@@ -57,6 +57,7 @@ export interface BrowserSupportRelease {
   browsers: ReadonlyArray<{
     brand: SupportedBrand;
     fullVersion: string;
+    supportedMajorVersions?: ReadonlyArray<number>;
   }>;
 }
 
@@ -115,7 +116,14 @@ function supportedIdentity(entries: Array<{ brand: string; version: string }>) {
 
 export function supportedBrowserSummary(release: BrowserSupportRelease | undefined) {
   if (!release) return [];
-  return release.browsers.map(({ brand, fullVersion }) => ({ brand, major: major(fullVersion)! }));
+  return release.browsers.flatMap(({ brand, fullVersion, supportedMajorVersions }) => {
+    const majors = supportedMajorVersions ?? [major(fullVersion)!];
+    return majors.map((supportedMajor) => ({ brand, major: supportedMajor }));
+  });
+}
+
+function acceptedMajorVersions(browser: BrowserSupportRelease["browsers"][number]) {
+  return browser.supportedMajorVersions ?? [major(browser.fullVersion)!];
 }
 
 export function validateBrowserSupportRelease(value: unknown): value is BrowserSupportRelease {
@@ -126,13 +134,26 @@ export function validateBrowserSupportRelease(value: unknown): value is BrowserS
   }
   if (!Array.isArray(release.browsers) || release.browsers.length !== 2) return false;
   const brands = new Set(release.browsers.map(({ brand }) => brand));
+  const supportedMajorCount = release.browsers.reduce(
+    (count, browser) => count + (browser.supportedMajorVersions?.length ?? 1),
+    0,
+  );
   return (
     brands.size === 2 &&
     brands.has("Google Chrome") &&
     brands.has("Microsoft Edge") &&
-    release.browsers.every(
-      ({ brand, fullVersion }) => supportedBrands.has(brand) && fullVersionPattern.test(fullVersion),
-    )
+    supportedMajorCount <= 8 &&
+    release.browsers.every(({ brand, fullVersion, supportedMajorVersions }) => {
+      if (!supportedBrands.has(brand) || !fullVersionPattern.test(fullVersion)) return false;
+      const baselineMajor = major(fullVersion);
+      if (!baselineMajor) return false;
+      if (supportedMajorVersions === undefined) return true;
+      return supportedMajorVersions.length > 0
+        && supportedMajorVersions.length <= 8
+        && supportedMajorVersions.every((value: number) => Number.isSafeInteger(value) && value >= 1)
+        && new Set(supportedMajorVersions).size === supportedMajorVersions.length
+        && supportedMajorVersions.includes(baselineMajor);
+    })
   );
 }
 
@@ -188,7 +209,7 @@ export function checkBrowserSupport(
   }
 
   const supported = release?.browsers.find(({ brand }) => brand === fullIdentity.brand);
-  if (!supported || major(supported.fullVersion) !== fullIdentity.major) {
+  if (!supported || !acceptedMajorVersions(supported).includes(fullIdentity.major)) {
     return { reason: "version_unsupported", supported: false };
   }
   return { identity: fullIdentity, supported: true };
@@ -268,7 +289,7 @@ export function verifyBrowserSupportCookie(input: {
     return { reason: "identity_unavailable" as const, supported: false as const };
   }
   const supported = input.release.browsers.find(({ brand }) => brand === currentIdentity.brand);
-  if (currentIdentity.major !== payload.major || major(supported?.fullVersion ?? "") !== currentIdentity.major) {
+  if (!supported || currentIdentity.major !== payload.major || !acceptedMajorVersions(supported).includes(currentIdentity.major)) {
     return { reason: "version_unsupported" as const, supported: false as const };
   }
   return { identity: currentIdentity, supported: true as const };