isr-engine 4.2.0 → 4.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -1
- package/dist/{contentRevalidation-D3SZwwbX.js → CacheTagContext-Btmq8KCD.js} +20 -7
- package/dist/CacheTagContext-Btmq8KCD.js.map +1 -0
- package/dist/{abVariantContext-BNInoflb.js → abVariantContext-yWZOqscY.js} +94 -36
- package/dist/abVariantContext-yWZOqscY.js.map +1 -0
- package/dist/cli/cli.js +1 -1
- package/dist/context/CacheTagContext.d.ts +10 -0
- package/dist/context/CacheTagContext.d.ts.map +1 -0
- package/dist/{createCacheInspectorMiddleware-CDOoJXGO.js → createCacheInspectorMiddleware-DUYq46J4.js} +2 -2
- package/dist/{createCacheInspectorMiddleware-CDOoJXGO.js.map → createCacheInspectorMiddleware-DUYq46J4.js.map} +1 -1
- package/dist/{createCachedFetcher-Y7zbGgjb.js → createCachedFetcher-CgJscexq.js} +29 -10
- package/dist/createCachedFetcher-CgJscexq.js.map +1 -0
- package/dist/{createISRApp-DA3-5Ezk.js → createISRApp-yBEBvYD5.js} +74 -56
- package/dist/createISRApp-yBEBvYD5.js.map +1 -0
- package/dist/defaults/runtime/contentRevalidation.d.ts +5 -2
- package/dist/defaults/runtime/contentRevalidation.d.ts.map +1 -1
- package/dist/defaults/runtime/createCachedFetcher.d.ts +5 -1
- package/dist/defaults/runtime/createCachedFetcher.d.ts.map +1 -1
- package/dist/defaults/runtime/defineSiteHooks.d.ts +7 -2
- package/dist/defaults/runtime/defineSiteHooks.d.ts.map +1 -1
- package/dist/defaults/runtime/defineSiteHooks.js +103 -36
- package/dist/defaults/runtime/defineSiteHooks.js.map +1 -1
- package/dist/defaults/runtime/renderCancellation.d.ts +3 -0
- package/dist/defaults/runtime/renderCancellation.d.ts.map +1 -0
- package/dist/engine/seo/resolveSeoConfig.d.ts +1 -0
- package/dist/engine/seo/resolveSeoConfig.d.ts.map +1 -1
- package/dist/isr-engine.js +4 -4
- package/dist/plugin/isrCacheMiddleware.d.ts.map +1 -1
- package/dist/rsc/browser.js +1 -1
- package/dist/rsc/browser.js.map +1 -1
- package/dist/rsc/cacheTag.d.ts +1 -8
- package/dist/rsc/cacheTag.d.ts.map +1 -1
- package/dist/rsc/index.js +3 -2
- package/dist/rsc/revalidate.d.ts +3 -2
- package/dist/rsc/revalidate.d.ts.map +1 -1
- package/dist/{rsc-CbZ-BsWD.js → rsc-BYq2vvnh.js} +2 -2
- package/dist/{rsc-CbZ-BsWD.js.map → rsc-BYq2vvnh.js.map} +1 -1
- package/dist/server/contentRevalidationRoute.d.ts +4 -0
- package/dist/server/contentRevalidationRoute.d.ts.map +1 -0
- package/dist/server/opsConfig.d.ts +6 -1
- package/dist/server/opsConfig.d.ts.map +1 -1
- package/dist/server/productionRuntime.d.ts.map +1 -1
- package/dist/server/publishedSitemap.d.ts.map +1 -1
- package/dist/types/ISRConfig.d.ts +16 -0
- package/dist/types/ISRConfig.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/context/CacheTagContext.ts +20 -0
- package/src/defaults/entry.server.ssr.tsx +10 -0
- package/src/defaults/runtime/contentRevalidation.ts +9 -3
- package/src/defaults/runtime/createCachedFetcher.ts +45 -10
- package/src/defaults/runtime/defineServerEntry.tsx +26 -28
- package/src/defaults/runtime/defineSiteHooks.ts +138 -44
- package/src/defaults/runtime/renderCancellation.ts +10 -0
- package/src/types/ISRConfig.ts +18 -0
- package/dist/abVariantContext-BNInoflb.js.map +0 -1
- package/dist/contentRevalidation-D3SZwwbX.js.map +0 -1
- package/dist/createCachedFetcher-Y7zbGgjb.js.map +0 -1
- package/dist/createISRApp-DA3-5Ezk.js.map +0 -1
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
/** Data and response cache scopes to invalidate after a content write commits. */
|
|
2
2
|
export interface ContentRevalidationOptions {
|
|
3
|
+
/** Exact site paths, including any locale prefix. */
|
|
3
4
|
paths?: readonly string[];
|
|
5
|
+
/** Business pathnames expanded using the runtime's routing config and the supplied locales. */
|
|
6
|
+
localizedPaths?: readonly string[];
|
|
4
7
|
tags?: readonly string[];
|
|
5
8
|
locales?: readonly string[];
|
|
6
9
|
sitemap?: boolean;
|
|
7
10
|
}
|
|
8
11
|
export interface ContentPublication {
|
|
9
12
|
id: string;
|
|
10
|
-
scopes: Readonly<Required<ContentRevalidationOptions>>;
|
|
13
|
+
scopes: Readonly<Omit<Required<ContentRevalidationOptions>, 'localizedPaths'>>;
|
|
11
14
|
}
|
|
12
15
|
type ContentInvalidation = ContentPublication['scopes'] & {
|
|
13
16
|
allPageMetadata?: true;
|
|
@@ -18,6 +21,6 @@ export declare function registerContentInvalidator(invalidate: ContentInvalidato
|
|
|
18
21
|
}): () => void;
|
|
19
22
|
/** The default scope recovers page metadata after a missed Redis notification. */
|
|
20
23
|
export declare function invalidateContentCaches(scopes?: ContentInvalidation): void;
|
|
21
|
-
export declare function normalizeContentScopes(input: unknown): ContentPublication['scopes']
|
|
24
|
+
export declare function normalizeContentScopes(input: unknown): ContentPublication['scopes'] & Pick<ContentRevalidationOptions, 'localizedPaths'>;
|
|
22
25
|
export {};
|
|
23
26
|
//# sourceMappingURL=contentRevalidation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contentRevalidation.d.ts","sourceRoot":"","sources":["../../../src/defaults/runtime/contentRevalidation.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,MAAM,WAAW,0BAA0B;IACzC,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"contentRevalidation.d.ts","sourceRoot":"","sources":["../../../src/defaults/runtime/contentRevalidation.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,MAAM,WAAW,0BAA0B;IACzC,qDAAqD;IACrD,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,+FAA+F;IAC/F,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAChF;AAED,KAAK,mBAAmB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,GAAG;IAAE,eAAe,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AACrF,KAAK,kBAAkB,GAAG,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAC;AAQhE,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,kBAAkB,EAC9B,EAAE,IAAY,EAAE;;CAAK,GACpB,MAAM,IAAI,CAUZ;AAED,kFAAkF;AAClF,wBAAgB,uBAAuB,CACrC,MAAM,GAAE,mBAMP,GACA,IAAI,CAiBN;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,GACb,kBAAkB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAyBnF"}
|
|
@@ -2,13 +2,17 @@ export interface CachedFetcherOptions<TArg, TValue> {
|
|
|
2
2
|
/** 从入参生成缓存 key */
|
|
3
3
|
key: (arg: TArg) => string;
|
|
4
4
|
/** 实际加载逻辑(network / fs / dynamic import 都可) */
|
|
5
|
-
fetch: (arg: TArg) => Promise<TValue>;
|
|
5
|
+
fetch: (arg: TArg, markDegraded?: () => void) => Promise<TValue>;
|
|
6
6
|
/** 缓存 TTL(毫秒),默认 60s */
|
|
7
7
|
ttl?: number;
|
|
8
8
|
/** LRU 容量,默认 500 */
|
|
9
9
|
max?: number;
|
|
10
10
|
/** 启用 stale-while-revalidate:过期仍返回旧值,后台异步刷新(默认 false) */
|
|
11
11
|
swr?: boolean;
|
|
12
|
+
/** Maximum time after expiry to reuse the last successful value on refresh errors. */
|
|
13
|
+
staleIfErrorMs?: number;
|
|
14
|
+
/** Called in each consumer's context when it receives a stale or degraded result. */
|
|
15
|
+
onDegraded?: () => void;
|
|
12
16
|
/** 拉取失败时的回退值(如不提供则抛错) */
|
|
13
17
|
fallback?: (arg: TArg, error: unknown) => TValue | Promise<TValue>;
|
|
14
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCachedFetcher.d.ts","sourceRoot":"","sources":["../../../src/defaults/runtime/createCachedFetcher.ts"],"names":[],"mappings":"AAwDA,MAAM,WAAW,oBAAoB,CAAC,IAAI,EAAE,MAAM;IAChD,kBAAkB;IAClB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,MAAM,CAAC;IAC3B,+CAA+C;IAC/C,KAAK,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"createCachedFetcher.d.ts","sourceRoot":"","sources":["../../../src/defaults/runtime/createCachedFetcher.ts"],"names":[],"mappings":"AAwDA,MAAM,WAAW,oBAAoB,CAAC,IAAI,EAAE,MAAM;IAChD,kBAAkB;IAClB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,MAAM,CAAC;IAC3B,+CAA+C;IAC/C,KAAK,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,EAAE,MAAM,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACjE,wBAAwB;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,sFAAsF;IACtF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qFAAqF;IACrF,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACpE;AAaD,MAAM,MAAM,aAAa,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEzE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAC9C,IAAI,EAAE,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,GACvC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG;IAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,GAAG,IAAI,CAAA;CAAE,CAsFtF"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import type { IntlPayload, PageSeoMeta } from './seo-runtime';
|
|
2
|
-
import type { DynamicSeoResolver, ISRConfig } from '../../types';
|
|
2
|
+
import type { DynamicSeoResolver, ISRConfig, LanguageCatalogEntry } from '../../types';
|
|
3
3
|
import { type I18nConfig } from '../../runtime/i18n';
|
|
4
4
|
export { getCookieHeader, parseCookieHeader, readCookie } from '../../utils/cookie';
|
|
5
5
|
export type SiteRuntimeConfig = ISRConfig['runtime'];
|
|
6
|
+
declare const MARK_METADATA_DEGRADED: unique symbol;
|
|
6
7
|
export interface SiteRuntimeContext {
|
|
7
8
|
runtime: SiteRuntimeConfig;
|
|
8
9
|
services: RuntimeServices;
|
|
9
10
|
telemetry?: string;
|
|
10
11
|
site?: string;
|
|
12
|
+
[MARK_METADATA_DEGRADED]?: () => void;
|
|
11
13
|
}
|
|
12
14
|
export interface RuntimeServices {
|
|
13
15
|
api?: string;
|
|
@@ -16,6 +18,8 @@ export interface RuntimeServices {
|
|
|
16
18
|
export type RuntimeServiceBase = string | ((ctx: SiteRuntimeContext) => string | null | undefined);
|
|
17
19
|
export type IntlMessagesByLocale = Record<string, Record<string, unknown>>;
|
|
18
20
|
export interface CreateAdminIntlLoaderOptions {
|
|
21
|
+
/** Supported routes, independent of which dictionaries are present in the local fallback. */
|
|
22
|
+
locales?: readonly string[];
|
|
19
23
|
/** 远端字典端点;相对路径会用 runtime.services.api 拼接 */
|
|
20
24
|
endpoint?: string;
|
|
21
25
|
/** 本地兜底字典,通常来自 ssr.config.ts runtime.i18n.fallbackLocal */
|
|
@@ -176,6 +180,7 @@ export interface ServerHooksOutput {
|
|
|
176
180
|
startedAt: number;
|
|
177
181
|
}) => Promise<Record<string, unknown>>;
|
|
178
182
|
loadIntl: (req: Request) => Promise<IntlPayload | null>;
|
|
183
|
+
loadLanguageCatalog?: () => Promise<readonly LanguageCatalogEntry[]>;
|
|
179
184
|
loadSeoMeta: (req: Request) => Promise<PageSeoMeta | null>;
|
|
180
185
|
onError: (err: unknown, req: Request, ctx: {
|
|
181
186
|
traceId: string;
|
|
@@ -188,5 +193,5 @@ export interface ServerHooksOutput {
|
|
|
188
193
|
__configureRuntime?: (runtime: SiteRuntimeConfig) => ServerHooksOutput;
|
|
189
194
|
}
|
|
190
195
|
export declare function defineSiteHooks(config: SiteHooksConfig): ServerHooksOutput;
|
|
191
|
-
export declare function applyRuntimeToServerHooks<T extends object>(hooks: T, runtime: SiteRuntimeConfig): T
|
|
196
|
+
export declare function applyRuntimeToServerHooks<T extends object>(hooks: T, runtime: SiteRuntimeConfig): T & Pick<ServerHooksOutput, 'loadLanguageCatalog'>;
|
|
192
197
|
//# sourceMappingURL=defineSiteHooks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defineSiteHooks.d.ts","sourceRoot":"","sources":["../../../src/defaults/runtime/defineSiteHooks.ts"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EACV,kBAAkB,EAClB,SAAS,
|
|
1
|
+
{"version":3,"file":"defineSiteHooks.d.ts","sourceRoot":"","sources":["../../../src/defaults/runtime/defineSiteHooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { i as resolveI18nConfig, n as negotiateLocale, r as parseLocale, s as trimTrailingSlashes } from "../../i18n-BZpAOZeO.js";
|
|
2
|
-
import { a as getCookieHeader, i as readLocalePreference, l as contentPathname, o as parseCookieHeader, s as readCookie, t as createCachedFetcher } from "../../createCachedFetcher-
|
|
3
|
-
import {
|
|
2
|
+
import { a as getCookieHeader, i as readLocalePreference, l as contentPathname, o as parseCookieHeader, s as readCookie, t as createCachedFetcher } from "../../createCachedFetcher-CgJscexq.js";
|
|
3
|
+
import { a as registerContentInvalidator, n as markUncacheable } from "../../CacheTagContext-Btmq8KCD.js";
|
|
4
4
|
// src/defaults/runtime/defineSiteHooks.ts
|
|
5
5
|
/**
|
|
6
6
|
* defineSiteHooks —— 高阶 FaaS hooks 工厂(声明式配置 → 完整 ServerEntryHooks)
|
|
@@ -35,6 +35,7 @@ import { r as registerContentInvalidator } from "../../contentRevalidation-D3SZw
|
|
|
35
35
|
* });
|
|
36
36
|
*/
|
|
37
37
|
var CONTENT_INVALIDATOR = Symbol("contentInvalidator");
|
|
38
|
+
var MARK_METADATA_DEGRADED = Symbol("markMetadataDegraded");
|
|
38
39
|
function createEmptyRuntimeConfig() {
|
|
39
40
|
return {
|
|
40
41
|
site: void 0,
|
|
@@ -81,11 +82,12 @@ function createAdminIntlLoader(options = {}) {
|
|
|
81
82
|
const endpoint = options.endpoint ?? "/api/i18n/{locale}/manifest";
|
|
82
83
|
const fallbackMessages = options.fallbackMessages ?? {};
|
|
83
84
|
const defaultLocale = options.defaultLocale;
|
|
84
|
-
const supportedLocales = Object.keys(fallbackMessages);
|
|
85
|
+
const supportedLocales = options.locales ?? Object.keys(fallbackMessages);
|
|
85
86
|
return async (locale, ctx) => {
|
|
86
87
|
const normalizedLocale = supportedLocales.length && defaultLocale ? matchConfiguredLocale(locale, supportedLocales) ?? defaultLocale : locale;
|
|
87
88
|
const remoteUrl = resolveAdminUrl(endpoint, { locale: normalizedLocale }, ctx);
|
|
88
|
-
const
|
|
89
|
+
const markDegraded = ctx[MARK_METADATA_DEGRADED];
|
|
90
|
+
const remoteMessages = remoteUrl ? extractIntlMessagesOrNull(await fetchMetadataJson(remoteUrl, options.timeoutMs, markDegraded), options.endpoint ? markDegraded : void 0) : null;
|
|
89
91
|
const localMessages = fallbackMessages[normalizedLocale] ?? (defaultLocale ? fallbackMessages[defaultLocale] : void 0) ?? {};
|
|
90
92
|
return {
|
|
91
93
|
locale: normalizedLocale,
|
|
@@ -108,7 +110,7 @@ function createAdminSeoLoader(options = {}) {
|
|
|
108
110
|
...params,
|
|
109
111
|
pathname
|
|
110
112
|
}, ctx);
|
|
111
|
-
const remoteMeta = extractSeoMetaOrNull(remoteUrl ? await
|
|
113
|
+
const remoteMeta = extractSeoMetaOrNull(remoteUrl ? await fetchMetadataJson(remoteUrl, options.timeoutMs, ctx[MARK_METADATA_DEGRADED]) : null);
|
|
112
114
|
if (remoteMeta) return remoteMeta;
|
|
113
115
|
if (compiledResolvers.length > 0) for (const compiled of compiledResolvers) {
|
|
114
116
|
const m = pathname.match(compiled.re);
|
|
@@ -126,6 +128,7 @@ function createAdminSeoLoader(options = {}) {
|
|
|
126
128
|
});
|
|
127
129
|
if (result) return result;
|
|
128
130
|
} catch (err) {
|
|
131
|
+
ctx[MARK_METADATA_DEGRADED]?.();
|
|
129
132
|
console.warn("[seo] dynamic resolver threw, falling through to fallback", err);
|
|
130
133
|
}
|
|
131
134
|
}
|
|
@@ -169,6 +172,7 @@ function createAdminSiteHooks(options, runtime) {
|
|
|
169
172
|
prefixDefault: i18n.prefixDefault ?? runtimeI18n.prefixDefault,
|
|
170
173
|
detect: i18n.detect,
|
|
171
174
|
load: createAdminIntlLoader({
|
|
175
|
+
locales,
|
|
172
176
|
endpoint: i18n.endpoint ?? runtimeI18n.endpoint,
|
|
173
177
|
fallbackMessages,
|
|
174
178
|
defaultLocale,
|
|
@@ -210,6 +214,7 @@ function applyRuntimeToServerHooks(hooks, runtime) {
|
|
|
210
214
|
intl: runtimeHooks.intl,
|
|
211
215
|
beforeRequest: runtimeHooks.beforeRequest,
|
|
212
216
|
loadIntl: runtimeHooks.loadIntl,
|
|
217
|
+
loadLanguageCatalog: runtimeHooks.loadLanguageCatalog,
|
|
213
218
|
loadSeoMeta: runtimeHooks.loadSeoMeta,
|
|
214
219
|
onError: runtimeHooks.onError
|
|
215
220
|
};
|
|
@@ -223,6 +228,7 @@ function applyRuntimeToServerHooks(hooks, runtime) {
|
|
|
223
228
|
...hooks,
|
|
224
229
|
siteBaseUrl,
|
|
225
230
|
apiBaseUrl,
|
|
231
|
+
loadLanguageCatalog: baseHooks.loadLanguageCatalog ?? createLanguageCatalog(runtime, runtime.i18n?.locales),
|
|
226
232
|
...runtimeSeoHook && { loadSeoMeta: runtimeSeoHook }
|
|
227
233
|
};
|
|
228
234
|
}
|
|
@@ -236,16 +242,11 @@ function createSiteHooks(config, runtime) {
|
|
|
236
242
|
telemetry: services.telemetry,
|
|
237
243
|
site: site || void 0
|
|
238
244
|
};
|
|
239
|
-
const
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
return await r.json();
|
|
245
|
-
} catch {
|
|
246
|
-
return null;
|
|
247
|
-
}
|
|
248
|
-
};
|
|
245
|
+
const metadataContext = (markDegraded) => ({
|
|
246
|
+
...runtimeCtx,
|
|
247
|
+
[MARK_METADATA_DEGRADED]: markDegraded
|
|
248
|
+
});
|
|
249
|
+
const fetchJson = (path, markDegraded) => api ? fetchMetadataJson(api + path, null, markDegraded) : Promise.resolve(null);
|
|
249
250
|
const runtimeLocale = runtime.i18n;
|
|
250
251
|
const rememberLocale = runtimeLocale?.prefixDefault && runtimeLocale.rememberLocale;
|
|
251
252
|
const intlCfg = rememberLocale ? {
|
|
@@ -279,25 +280,26 @@ function createSiteHooks(config, runtime) {
|
|
|
279
280
|
key: (locale) => `intl:${locale}`,
|
|
280
281
|
ttl: intlCfg.ttl ?? 6e4,
|
|
281
282
|
swr: true,
|
|
282
|
-
|
|
283
|
-
|
|
283
|
+
onDegraded: markUncacheable,
|
|
284
|
+
fetch: async (locale, markDegraded) => {
|
|
285
|
+
if (intlCfg.load) return await intlCfg.load(locale, metadataContext(markDegraded)) ?? {
|
|
284
286
|
locale,
|
|
285
287
|
messages: {},
|
|
286
288
|
direction: rtlOf(locale)
|
|
287
289
|
};
|
|
288
290
|
if (intlCfg.endpoint) {
|
|
289
|
-
const url =
|
|
290
|
-
const json = await
|
|
291
|
+
const url = resolveAdminUrl(intlCfg.endpoint, { locale }, runtimeCtx);
|
|
292
|
+
const json = url ? await fetchMetadataJson(url, null) : null;
|
|
291
293
|
if (json !== null && intlCfg.transform) {
|
|
292
294
|
const transformed = await intlCfg.transform(json, locale);
|
|
293
|
-
if (transformed) return {
|
|
295
|
+
if (transformed && isUsableDictionary(transformed.messages)) return {
|
|
294
296
|
...transformed,
|
|
295
297
|
direction: transformed.direction ?? rtlOf(transformed.locale)
|
|
296
298
|
};
|
|
297
299
|
}
|
|
298
300
|
return {
|
|
299
301
|
locale,
|
|
300
|
-
messages:
|
|
302
|
+
messages: extractIntlMessagesOrNull(json, url ? markDegraded : void 0) ?? {},
|
|
301
303
|
direction: rtlOf(locale)
|
|
302
304
|
};
|
|
303
305
|
}
|
|
@@ -333,8 +335,9 @@ function createSiteHooks(config, runtime) {
|
|
|
333
335
|
const cache = createCachedFetcher({
|
|
334
336
|
key: (request) => JSON.stringify(request),
|
|
335
337
|
ttl: remote.ttl ?? 3e5,
|
|
336
|
-
|
|
337
|
-
|
|
338
|
+
onDegraded: markUncacheable,
|
|
339
|
+
fetch: async ({ params }, markDegraded) => {
|
|
340
|
+
const data = await fetchJson(fillTemplate(remote.endpoint, params), markDegraded);
|
|
338
341
|
if (data === null) return null;
|
|
339
342
|
return remote.transform(data, { ...params });
|
|
340
343
|
},
|
|
@@ -353,7 +356,8 @@ function createSiteHooks(config, runtime) {
|
|
|
353
356
|
const cache = createCachedFetcher({
|
|
354
357
|
key: (request) => JSON.stringify(request),
|
|
355
358
|
ttl: local.ttl ?? 3e5,
|
|
356
|
-
|
|
359
|
+
onDegraded: markUncacheable,
|
|
360
|
+
fetch: async ({ params }, markDegraded) => local.load({ ...params }, metadataContext(markDegraded)),
|
|
357
361
|
fallback: () => null
|
|
358
362
|
});
|
|
359
363
|
seoCaches.push(cache);
|
|
@@ -394,6 +398,7 @@ function createSiteHooks(config, runtime) {
|
|
|
394
398
|
async loadIntl(req) {
|
|
395
399
|
return intlLoader(detectLocale(req));
|
|
396
400
|
},
|
|
401
|
+
loadLanguageCatalog: createLanguageCatalog(runtime, runtimeLocale?.locales ?? supportedLocales),
|
|
397
402
|
async loadSeoMeta(req) {
|
|
398
403
|
const url = new URL(req.url);
|
|
399
404
|
const locale = detectLocale(req);
|
|
@@ -449,16 +454,72 @@ function matchConfiguredLocale(value, supportedLocales) {
|
|
|
449
454
|
const prefix = lower.split("-")[0];
|
|
450
455
|
return supportedLocales.find((locale) => locale.toLowerCase().split("-")[0] === prefix);
|
|
451
456
|
}
|
|
452
|
-
function
|
|
453
|
-
|
|
457
|
+
function extractIntlMessagesOrNull(data, markDegraded) {
|
|
458
|
+
const body = isRecord(data) ? data : {};
|
|
459
|
+
const dataValue = body.data;
|
|
460
|
+
const candidate = body.strings ?? body.messages ?? (isRecord(dataValue) && "strings" in dataValue ? dataValue.strings : dataValue);
|
|
461
|
+
if (body.status !== false && isUsableDictionary(candidate)) return normalizeMessages(candidate);
|
|
462
|
+
markDegraded?.();
|
|
463
|
+
return null;
|
|
464
|
+
}
|
|
465
|
+
function isUsableDictionary(value) {
|
|
466
|
+
return isRecord(value) && Object.values(value).some(hasMessageValue);
|
|
454
467
|
}
|
|
455
|
-
function
|
|
456
|
-
if (
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
468
|
+
function hasMessageValue(value) {
|
|
469
|
+
if (typeof value === "string") return value.trim().length > 0;
|
|
470
|
+
if (typeof value === "boolean" || typeof value === "number") return true;
|
|
471
|
+
return !!value && typeof value === "object" && Object.values(value).some(hasMessageValue);
|
|
472
|
+
}
|
|
473
|
+
function displayLanguageName(locale) {
|
|
474
|
+
try {
|
|
475
|
+
return new Intl.DisplayNames([locale], {
|
|
476
|
+
type: "language",
|
|
477
|
+
fallback: "none"
|
|
478
|
+
}).of(locale) ?? locale;
|
|
479
|
+
} catch (error) {
|
|
480
|
+
if (error instanceof RangeError) return locale;
|
|
481
|
+
throw error;
|
|
482
|
+
}
|
|
483
|
+
}
|
|
484
|
+
function createLanguageCatalog(runtime, locales = []) {
|
|
485
|
+
const defaults = locales.map((locale) => ({
|
|
486
|
+
locale,
|
|
487
|
+
name: displayLanguageName(locale)
|
|
488
|
+
}));
|
|
489
|
+
const config = runtime.i18n?.catalog;
|
|
490
|
+
if (!config || !locales.length) return async () => defaults;
|
|
491
|
+
const ctx = {
|
|
492
|
+
runtime,
|
|
493
|
+
services: resolveRuntimeServices(runtime)
|
|
494
|
+
};
|
|
495
|
+
const url = resolveAdminUrl(config.endpoint, {}, ctx);
|
|
496
|
+
const load = createCachedFetcher({
|
|
497
|
+
key: () => "language-catalog",
|
|
498
|
+
ttl: config.ttl ?? runtime.i18n?.ttl,
|
|
499
|
+
onDegraded: markUncacheable,
|
|
500
|
+
fallback: () => defaults,
|
|
501
|
+
fetch: async () => {
|
|
502
|
+
const json = url ? await fetchMetadataJson(url, runtime.i18n?.timeoutMs) : null;
|
|
503
|
+
const entries = isRecord(json) ? json.data : json;
|
|
504
|
+
if (!Array.isArray(entries)) throw new TypeError("Invalid language catalog response");
|
|
505
|
+
const names = /* @__PURE__ */ new Map();
|
|
506
|
+
for (const entry of entries) {
|
|
507
|
+
if (!isRecord(entry) || typeof entry.locale !== "string" || typeof entry.name !== "string") throw new TypeError("Invalid language catalog entry");
|
|
508
|
+
const name = entry.name.trim();
|
|
509
|
+
if (name) names.set(entry.locale.toLowerCase(), name);
|
|
510
|
+
}
|
|
511
|
+
return defaults.map(({ locale, name }) => ({
|
|
512
|
+
locale,
|
|
513
|
+
name: names.get(locale.toLowerCase()) ?? name
|
|
514
|
+
}));
|
|
515
|
+
}
|
|
516
|
+
});
|
|
517
|
+
const invalidate = (scopes) => {
|
|
518
|
+
if (scopes.allPageMetadata || scopes.locales.length) load.invalidate();
|
|
519
|
+
};
|
|
520
|
+
Object.defineProperty(load, CONTENT_INVALIDATOR, { value: invalidate });
|
|
521
|
+
registerContentInvalidator(invalidate, { weak: true });
|
|
522
|
+
return load;
|
|
462
523
|
}
|
|
463
524
|
function normalizeMessages(messages) {
|
|
464
525
|
if (isFlatRecord(messages)) return expandDottedRecord(messages);
|
|
@@ -582,15 +643,21 @@ function createServerReportId() {
|
|
|
582
643
|
return null;
|
|
583
644
|
}
|
|
584
645
|
}
|
|
585
|
-
async function
|
|
646
|
+
async function fetchMetadataJson(url, timeoutMs = 1200, markDegraded) {
|
|
586
647
|
try {
|
|
587
|
-
const response = await fetch(url, {
|
|
648
|
+
const response = timeoutMs === null ? await fetch(url) : await fetch(url, {
|
|
588
649
|
headers: { Accept: "application/json" },
|
|
589
650
|
signal: timeoutMs > 0 ? AbortSignal.timeout(timeoutMs) : void 0
|
|
590
651
|
});
|
|
591
|
-
if (!response.ok)
|
|
652
|
+
if (!response.ok) {
|
|
653
|
+
if (response.status !== 404) markDegraded?.();
|
|
654
|
+
response.body?.cancel().catch(() => void 0);
|
|
655
|
+
return null;
|
|
656
|
+
}
|
|
657
|
+
if (response.status === 204) return null;
|
|
592
658
|
return await response.json();
|
|
593
659
|
} catch {
|
|
660
|
+
markDegraded?.();
|
|
594
661
|
return null;
|
|
595
662
|
}
|
|
596
663
|
}
|