@webiny/api-core 6.5.0-beta.5 → 6.5.0-beta.6

package/ApiCoreFeature.js

@@ -13,12 +13,14 @@ import { EncryptionFeature } from "./features/encryption/feature.js";
 import { FeatureFlagsFeature } from "./features/featureFlags/feature.js";
 import { MaskerFeature } from "./features/masker/feature.js";
 import { AiFeature } from "./features/ai/feature.js";
+import { HttpClientFeature } from "./features/httpClient/feature.js";
 import { NullWebhookDispatcher } from "./features/webhooks/WebhookDispatcher/NullWebhookDispatcher.js";
 import { WebhookProviderFeature } from "./features/webhooks/index.js";
 const ApiCoreFeature = createFeature({
     name: "ApiCore",
     register (container, config) {
         MaskerFeature.register(container);
+        HttpClientFeature.register(container);
         AiFeature.register(container);
         LoggerFeature.register(container);
         EventPublisherFeature.register(container);

package/ApiCoreFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApiCoreFeature.js","sources":["../src/ApiCoreFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { Container } from \"@webiny/di\";\nimport { EventPublisherFeature } from \"~/features/eventPublisher/feature.js\";\nimport { LoggerFeature } from \"~/features/logger/feature.js\";\nimport { SecurityFeature } from \"~/features/security/SecurityFeature.js\";\nimport { SystemFeature } from \"~/features/system/SystemFeature.js\";\nimport { TenancyFeature } from \"./features/tenancy/TenancyFeature.js\";\nimport { AdminUsersFeature } from \"~/features/users/AdminUsersFeature.js\";\nimport type { ApiCoreStorageOperations } from \"~/types/core.js\";\nimport { IdpAuthenticatorFeature } from \"~/idp/feature.js\";\nimport { KeyValueStoreFeature } from \"~/features/keyValueStore/feature.js\";\nimport { BuildParamsFeature } from \"~/features/buildParams/feature.js\";\nimport { DebuggerFeature } from \"~/features/debugger/feature.js\";\nimport { EncryptionFeature } from \"~/features/encryption/feature.js\";\nimport { FeatureFlagsFeature } from \"~/features/featureFlags/feature.js\";\nimport { MaskerFeature } from \"~/features/masker/feature.js\";\nimport { AiFeature } from \"~/features/ai/feature.js\";\nimport { NullWebhookDispatcher } from \"./features/webhooks/WebhookDispatcher/NullWebhookDispatcher.js\";\nimport { WebhookProviderFeature } from \"~/features/webhooks/index.js\";\n\nexport const ApiCoreFeature = createFeature({\n    name: \"ApiCore\",\n    register(container: Container, config: ApiCoreStorageOperations) {\n        // Register features\n        MaskerFeature.register(container);\n        AiFeature.register(container);\n        LoggerFeature.register(container);\n        EventPublisherFeature.register(container);\n        BuildParamsFeature.register(container);\n        DebuggerFeature.register(container);\n        EncryptionFeature.register(container);\n        FeatureFlagsFeature.register(container);\n        TenancyFeature.register(container, config.tenancyStorageOperations);\n        SecurityFeature.register(container, config.securityStorageOperations);\n        AdminUsersFeature.register(container, config.usersStorageOperations);\n        KeyValueStoreFeature.register(container, config.keyValueStorageOperations);\n        SystemFeature.register(container);\n        IdpAuthenticatorFeature.register(container);\n        container.register(NullWebhookDispatcher).inSingletonScope();\n        WebhookProviderFeature.register(container);\n    }\n});\n"],"names":["ApiCoreFeature","createFeature","container","config","MaskerFeature","AiFeature","LoggerFeature","EventPublisherFeature","BuildParamsFeature","DebuggerFeature","EncryptionFeature","FeatureFlagsFeature","TenancyFeature","SecurityFeature","AdminUsersFeature","KeyValueStoreFeature","SystemFeature","IdpAuthenticatorFeature","NullWebhookDispatcher","WebhookProviderFeature"],"mappings":";;;;;;;;;;;;;;;;;AAoBO,MAAMA,iBAAiBC,cAAc;IACxC,MAAM;IACN,UAASC,SAAoB,EAAEC,MAAgC;QAE3DC,cAAc,QAAQ,CAACF;QACvBG,UAAU,QAAQ,CAACH;QACnBI,cAAc,QAAQ,CAACJ;QACvBK,sBAAsB,QAAQ,CAACL;QAC/BM,mBAAmB,QAAQ,CAACN;QAC5BO,gBAAgB,QAAQ,CAACP;QACzBQ,kBAAkB,QAAQ,CAACR;QAC3BS,oBAAoB,QAAQ,CAACT;QAC7BU,eAAe,QAAQ,CAACV,WAAWC,OAAO,wBAAwB;QAClEU,gBAAgB,QAAQ,CAACX,WAAWC,OAAO,yBAAyB;QACpEW,kBAAkB,QAAQ,CAACZ,WAAWC,OAAO,sBAAsB;QACnEY,qBAAqB,QAAQ,CAACb,WAAWC,OAAO,yBAAyB;QACzEa,cAAc,QAAQ,CAACd;QACvBe,wBAAwB,QAAQ,CAACf;QACjCA,UAAU,QAAQ,CAACgB,uBAAuB,gBAAgB;QAC1DC,uBAAuB,QAAQ,CAACjB;IACpC;AACJ"}
+{"version":3,"file":"ApiCoreFeature.js","sources":["../src/ApiCoreFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { Container } from \"@webiny/di\";\nimport { EventPublisherFeature } from \"~/features/eventPublisher/feature.js\";\nimport { LoggerFeature } from \"~/features/logger/feature.js\";\nimport { SecurityFeature } from \"~/features/security/SecurityFeature.js\";\nimport { SystemFeature } from \"~/features/system/SystemFeature.js\";\nimport { TenancyFeature } from \"./features/tenancy/TenancyFeature.js\";\nimport { AdminUsersFeature } from \"~/features/users/AdminUsersFeature.js\";\nimport type { ApiCoreStorageOperations } from \"~/types/core.js\";\nimport { IdpAuthenticatorFeature } from \"~/idp/feature.js\";\nimport { KeyValueStoreFeature } from \"~/features/keyValueStore/feature.js\";\nimport { BuildParamsFeature } from \"~/features/buildParams/feature.js\";\nimport { DebuggerFeature } from \"~/features/debugger/feature.js\";\nimport { EncryptionFeature } from \"~/features/encryption/feature.js\";\nimport { FeatureFlagsFeature } from \"~/features/featureFlags/feature.js\";\nimport { MaskerFeature } from \"~/features/masker/feature.js\";\nimport { AiFeature } from \"~/features/ai/feature.js\";\nimport { HttpClientFeature } from \"~/features/httpClient/feature.js\";\nimport { NullWebhookDispatcher } from \"./features/webhooks/WebhookDispatcher/NullWebhookDispatcher.js\";\nimport { WebhookProviderFeature } from \"~/features/webhooks/index.js\";\n\nexport const ApiCoreFeature = createFeature({\n    name: \"ApiCore\",\n    register(container: Container, config: ApiCoreStorageOperations) {\n        // Register features\n        MaskerFeature.register(container);\n        HttpClientFeature.register(container);\n        AiFeature.register(container);\n        LoggerFeature.register(container);\n        EventPublisherFeature.register(container);\n        BuildParamsFeature.register(container);\n        DebuggerFeature.register(container);\n        EncryptionFeature.register(container);\n        FeatureFlagsFeature.register(container);\n        TenancyFeature.register(container, config.tenancyStorageOperations);\n        SecurityFeature.register(container, config.securityStorageOperations);\n        AdminUsersFeature.register(container, config.usersStorageOperations);\n        KeyValueStoreFeature.register(container, config.keyValueStorageOperations);\n        SystemFeature.register(container);\n        IdpAuthenticatorFeature.register(container);\n        container.register(NullWebhookDispatcher).inSingletonScope();\n        WebhookProviderFeature.register(container);\n    }\n});\n"],"names":["ApiCoreFeature","createFeature","container","config","MaskerFeature","HttpClientFeature","AiFeature","LoggerFeature","EventPublisherFeature","BuildParamsFeature","DebuggerFeature","EncryptionFeature","FeatureFlagsFeature","TenancyFeature","SecurityFeature","AdminUsersFeature","KeyValueStoreFeature","SystemFeature","IdpAuthenticatorFeature","NullWebhookDispatcher","WebhookProviderFeature"],"mappings":";;;;;;;;;;;;;;;;;;AAqBO,MAAMA,iBAAiBC,cAAc;IACxC,MAAM;IACN,UAASC,SAAoB,EAAEC,MAAgC;QAE3DC,cAAc,QAAQ,CAACF;QACvBG,kBAAkB,QAAQ,CAACH;QAC3BI,UAAU,QAAQ,CAACJ;QACnBK,cAAc,QAAQ,CAACL;QACvBM,sBAAsB,QAAQ,CAACN;QAC/BO,mBAAmB,QAAQ,CAACP;QAC5BQ,gBAAgB,QAAQ,CAACR;QACzBS,kBAAkB,QAAQ,CAACT;QAC3BU,oBAAoB,QAAQ,CAACV;QAC7BW,eAAe,QAAQ,CAACX,WAAWC,OAAO,wBAAwB;QAClEW,gBAAgB,QAAQ,CAACZ,WAAWC,OAAO,yBAAyB;QACpEY,kBAAkB,QAAQ,CAACb,WAAWC,OAAO,sBAAsB;QACnEa,qBAAqB,QAAQ,CAACd,WAAWC,OAAO,yBAAyB;QACzEc,cAAc,QAAQ,CAACf;QACvBgB,wBAAwB,QAAQ,CAAChB;QACjCA,UAAU,QAAQ,CAACiB,uBAAuB,gBAAgB;QAC1DC,uBAAuB,QAAQ,CAAClB;IACpC;AACJ"}

package/features/ai/AiModelRegistry.d.ts

@@ -1,9 +1,11 @@
 import { AiModelRegistry as AiModelRegistryAbstraction } from "./abstractions.js";
 import { AiSdkFactory } from "./abstractions.js";
+import { AiModelCatalog } from "./abstractions.js";
 import type { AiModel } from "./abstractions.js";
 declare class AiModelRegistryImpl implements AiModelRegistryAbstraction.Interface {
     private readonly sdkFactories;
-    constructor(sdkFactories: AiSdkFactory.Interface[]);
+    private readonly catalog;
+    constructor(sdkFactories: AiSdkFactory.Interface[], catalog: AiModelCatalog.Interface);
     listModels(): Promise<AiModel[]>;
 }
 export declare const AiModelRegistry: typeof AiModelRegistryImpl & {

package/features/ai/AiModelRegistry.js

@@ -1,17 +1,24 @@
-import { AiModelRegistry, AiSdkFactory } from "./abstractions.js";
+import { AiModelCatalog, AiModelRegistry, AiSdkFactory } from "./abstractions.js";
 class AiModelRegistryImpl {
-    constructor(sdkFactories){
+    constructor(sdkFactories, catalog){
         this.sdkFactories = sdkFactories;
+        this.catalog = catalog;
     }
     async listModels() {
-        return this.sdkFactories.flatMap((factory)=>factory.models.map((m)=>({
+        const providers = await this.catalog.listProviders();
+        return this.sdkFactories.flatMap((factory)=>{
+            const provider = providers?.find((p)=>p.id === factory.id);
+            const providerName = provider?.name ?? factory.name;
+            const models = provider?.models ?? factory.models;
+            return models.map((m)=>({
                     providerId: factory.id,
-                    providerName: factory.name,
+                    providerName,
                     modelId: m.id,
                     modelName: m.name,
                     deprecated: m.deprecated,
                     endOfLife: m.endOfLife
-                })));
+                }));
+        });
     }
 }
 const AiModelRegistry_AiModelRegistry = AiModelRegistry.createImplementation({
@@ -22,7 +29,8 @@ const AiModelRegistry_AiModelRegistry = AiModelRegistry.createImplementation({
             {
                 multiple: true
             }
-        ]
+        ],
+        AiModelCatalog
     ]
 });
 export { AiModelRegistry_AiModelRegistry as AiModelRegistry };

package/features/ai/AiModelRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/ai/AiModelRegistry.js","sources":["../../../src/features/ai/AiModelRegistry.ts"],"sourcesContent":["import { AiModelRegistry as AiModelRegistryAbstraction } from \"./abstractions.js\";\nimport { AiSdkFactory } from \"./abstractions.js\";\nimport type { AiModel } from \"./abstractions.js\";\n\nclass AiModelRegistryImpl implements AiModelRegistryAbstraction.Interface {\n    constructor(private readonly sdkFactories: AiSdkFactory.Interface[]) {}\n\n    async listModels(): Promise<AiModel[]> {\n        return this.sdkFactories.flatMap(factory =>\n            factory.models.map(m => ({\n                providerId: factory.id,\n                providerName: factory.name,\n                modelId: m.id,\n                modelName: m.name,\n                deprecated: m.deprecated,\n                endOfLife: m.endOfLife\n            }))\n        );\n    }\n}\n\nexport const AiModelRegistry = AiModelRegistryAbstraction.createImplementation({\n    implementation: AiModelRegistryImpl,\n    dependencies: [[AiSdkFactory, { multiple: true }]]\n});\n"],"names":["AiModelRegistryImpl","sdkFactories","factory","m","AiModelRegistry","AiModelRegistryAbstraction","AiSdkFactory"],"mappings":";AAIA,MAAMA;IACF,YAA6BC,YAAsC,CAAE;aAAxCA,YAAY,GAAZA;IAAyC;IAEtE,MAAM,aAAiC;QACnC,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAACC,CAAAA,UAC7BA,QAAQ,MAAM,CAAC,GAAG,CAACC,CAAAA,IAAM;oBACrB,YAAYD,QAAQ,EAAE;oBACtB,cAAcA,QAAQ,IAAI;oBAC1B,SAASC,EAAE,EAAE;oBACb,WAAWA,EAAE,IAAI;oBACjB,YAAYA,EAAE,UAAU;oBACxB,WAAWA,EAAE,SAAS;gBAC1B;IAER;AACJ;AAEO,MAAMC,kCAAkBC,gBAAAA,oBAA+C,CAAC;IAC3E,gBAAgBL;IAChB,cAAc;QAAC;YAACM;YAAc;gBAAE,UAAU;YAAK;SAAE;KAAC;AACtD"}
+{"version":3,"file":"features/ai/AiModelRegistry.js","sources":["../../../src/features/ai/AiModelRegistry.ts"],"sourcesContent":["import { AiModelRegistry as AiModelRegistryAbstraction } from \"./abstractions.js\";\nimport { AiSdkFactory } from \"./abstractions.js\";\nimport { AiModelCatalog } from \"./abstractions.js\";\nimport type { AiModel } from \"./abstractions.js\";\n\nclass AiModelRegistryImpl implements AiModelRegistryAbstraction.Interface {\n    constructor(\n        private readonly sdkFactories: AiSdkFactory.Interface[],\n        private readonly catalog: AiModelCatalog.Interface\n    ) {}\n\n    async listModels(): Promise<AiModel[]> {\n        const providers = await this.catalog.listProviders();\n\n        /*\n         * A provider is only offered when an SDK factory can serve it. The catalog decides its\n         * models; a factory the catalog doesn't know (a custom SDK), or an unreachable catalog,\n         * falls back to the factory's own list.\n         */\n        return this.sdkFactories.flatMap(factory => {\n            const provider = providers?.find(p => p.id === factory.id);\n            const providerName = provider?.name ?? factory.name;\n            const models = provider?.models ?? factory.models;\n\n            return models.map(m => ({\n                providerId: factory.id,\n                providerName,\n                modelId: m.id,\n                modelName: m.name,\n                deprecated: m.deprecated,\n                endOfLife: m.endOfLife\n            }));\n        });\n    }\n}\n\nexport const AiModelRegistry = AiModelRegistryAbstraction.createImplementation({\n    implementation: AiModelRegistryImpl,\n    dependencies: [[AiSdkFactory, { multiple: true }], AiModelCatalog]\n});\n"],"names":["AiModelRegistryImpl","sdkFactories","catalog","providers","factory","provider","p","providerName","models","m","AiModelRegistry","AiModelRegistryAbstraction","AiSdkFactory","AiModelCatalog"],"mappings":";AAKA,MAAMA;IACF,YACqBC,YAAsC,EACtCC,OAAiC,CACpD;aAFmBD,YAAY,GAAZA;aACAC,OAAO,GAAPA;IAClB;IAEH,MAAM,aAAiC;QACnC,MAAMC,YAAY,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa;QAOlD,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAACC,CAAAA;YAC7B,MAAMC,WAAWF,WAAW,KAAKG,CAAAA,IAAKA,EAAE,EAAE,KAAKF,QAAQ,EAAE;YACzD,MAAMG,eAAeF,UAAU,QAAQD,QAAQ,IAAI;YACnD,MAAMI,SAASH,UAAU,UAAUD,QAAQ,MAAM;YAEjD,OAAOI,OAAO,GAAG,CAACC,CAAAA,IAAM;oBACpB,YAAYL,QAAQ,EAAE;oBACtBG;oBACA,SAASE,EAAE,EAAE;oBACb,WAAWA,EAAE,IAAI;oBACjB,YAAYA,EAAE,UAAU;oBACxB,WAAWA,EAAE,SAAS;gBAC1B;QACJ;IACJ;AACJ;AAEO,MAAMC,kCAAkBC,gBAAAA,oBAA+C,CAAC;IAC3E,gBAAgBX;IAChB,cAAc;QAAC;YAACY;YAAc;gBAAE,UAAU;YAAK;SAAE;QAAEC;KAAe;AACtE"}

package/features/ai/DEVELOPERS.md

@@ -1,10 +1,41 @@
 # AI Models
 
-This directory contains the AI SDK factory implementations that define which models are available in Webiny's AI Powerups.
+This directory contains the AI SDK factory implementations that serve the models available in Webiny's AI Powerups.
+
+## Where the model list comes from
+
+`AiModelRegistry` takes the published catalog at `https://api.webiny.com/ai/models` (`RemoteAiModelCatalog`, overridable through `WCP_API_URL`) and intersects it with the registered SDK factories:
+
+- A catalog provider with no SDK factory is not offered. The SDK factory is the last gate.
+- For a provider that has a factory, the catalog's models and names replace the factory's own list.
+- A factory the catalog doesn't know (a custom SDK) keeps its own `models`.
+- If the catalog can't be loaded (timeout, error status, invalid body), every factory falls back to its own `models`.
+
+The catalog is cached for an hour per process. A failed load is retried after a minute. The first AI call on a cold Lambda waits for the fetch. If the catalog doesn't answer within 3 seconds, the fetch is aborted and the factories' own lists are used.
+
+So adding or deprecating a model for an existing provider is a catalog change and needs no release. The `*_MODELS` arrays below are the offline fallback; keep them roughly in sync.
+
+The catalog response looks like this. Dates are ISO strings, and fields the schema doesn't know (`api`, `supports`, ...) are dropped:
+
+```json
+{
+  "providers": [
+    {
+      "id": "openai",
+      "name": "OpenAI",
+      "models": [
+        { "id": "o3", "name": "o3", "deprecated": "2026-06-11", "endOfLife": "2026-12-11" }
+      ]
+    }
+  ]
+}
+```
+
+A response that doesn't match the schema counts as a failed load, so one bad entry drops the whole catalog and every factory falls back to its own list.
 
 ## Selection criteria
 
-Every model listed in a factory **must** support:
+Every model in the catalog or in a factory **must** support:
 
 - **Tool/function calling** — AI Powerups relies on tools for structured output (content generation, entry comparison, image enrichment, etc.). Models without tool support will break these features at runtime.
 - **Chat/text generation** — only conversational models are listed; embedding, image-generation, TTS, and other specialized models are excluded.
@@ -21,7 +52,7 @@ Each model entry in `IAiSdkModel` supports two optional `Date` fields:
 
 Set these fields when the provider announces deprecation or end-of-life dates. The UI can use them to warn users about upcoming shutdowns or steer them toward replacements.
 
-When a model reaches its `endOfLife` date, remove it from the factory in the next release — keeping it would cause runtime failures.
+When a model reaches its `endOfLife` date, remove it from the catalog, which takes effect within an hour. Remove it from the factory in the next release too, or deployments that can't reach the catalog will keep offering a model that no longer works.
 
 ## Providers
 
@@ -103,24 +134,28 @@ Source: https://ai.google.dev/gemini-api/docs/deprecations
 ## Adding a new model
 
 1. Verify the model supports tool/function calling.
-2. Add an entry to the `*_MODELS` array in the corresponding factory file. The `id` must match the provider's API model ID exactly.
-3. If the model has known deprecation or end-of-life dates, set `deprecated` and/or `endOfLife` as `new Date("YYYY-MM-DD")`.
-4. Update the table in this file.
+2. Add it to the catalog at `https://api.webiny.com/ai/models`. That is what users see.
+3. Add an entry to the `*_MODELS` array in the corresponding factory file. The `id` must match the provider's API model ID exactly.
+4. If the model has known deprecation or end-of-life dates, set `deprecated` and/or `endOfLife`: ISO strings (`"YYYY-MM-DD"`) in the catalog, `new Date("YYYY-MM-DD")` in the factory.
+5. Update the table in this file.
 
 ## Adding a new provider
 
-1. Create a new `<Provider>SdkFactory.ts` implementing `AiSdkFactory`.
+A new provider needs a release, because the catalog can only offer providers that have an SDK factory.
+
+1. Create a new `<Provider>SdkFactory.ts` implementing `AiSdkFactory`. Its `id` is the key the catalog matches on.
 2. Add the `@ai-sdk/<provider>` dependency via `yarn add` in `packages/api-core`.
 3. Register the factory in `feature.ts`.
-4. Update this file.
+4. Add the provider to the catalog under the same `id`. Until you do, the factory's own `models` are used.
+5. Update this file.
 
 ## Updating models
 
-Check the provider docs periodically and update the lists:
+Check the provider docs periodically and update the catalog first, then the factory lists:
 
 - **New models**: add to the top of the active section.
 - **Deprecated models**: set `deprecated` and `endOfLife` dates, move to the bottom of the array.
-- **End-of-life reached**: remove from the factory. Keeping a dead model causes runtime failures.
-- **Never remove a model before its end-of-life date** — users may have presets referencing it, and removing it breaks `ProvidersHandler` validation on save.
+- **End-of-life reached**: remove from the catalog and the factory. Keeping a dead model causes runtime failures.
+- **Never remove a model before its end-of-life date** — users may have presets referencing it, and removing it breaks `ProvidersHandler` validation on save. This matters more for the catalog than for the factory: `Ai` rejects any model the registry doesn't list, so dropping a model from the catalog breaks calls that use it in every deployment within the hour.
 
-Last updated: September 2026.
+Last updated: October 2026.

package/features/ai/RemoteAiModelCatalog.d.ts

@@ -0,0 +1,13 @@
+import { AiModelCatalog as AiModelCatalogAbstraction } from "./abstractions.js";
+import type { AiCatalogProvider } from "./abstractions.js";
+import { Logger } from "../../features/logger/index.js";
+import { HttpClient } from "../../features/httpClient/index.js";
+declare class RemoteAiModelCatalogImpl implements AiModelCatalogAbstraction.Interface {
+    private readonly httpClient;
+    private readonly logger;
+    constructor(httpClient: HttpClient.Interface, logger: Logger.Interface);
+    listProviders(): Promise<AiCatalogProvider[] | undefined>;
+    private fetchProviders;
+}
+export declare const RemoteAiModelCatalog: import("@webiny/di").Implementation<typeof RemoteAiModelCatalogImpl>;
+export {};

package/features/ai/RemoteAiModelCatalog.js

@@ -0,0 +1,69 @@
+import { z } from "zod";
+import { createImplementation } from "@webiny/feature/api";
+import { getWcpApiUrl } from "@webiny/wcp";
+import { AiModelCatalog } from "./abstractions.js";
+import { Logger } from "../logger/index.js";
+import { HttpClient } from "../httpClient/index.js";
+const FETCH_TIMEOUT_MS = 3000;
+const SUCCESS_TTL_MS = 3600000;
+const FAILURE_TTL_MS = 60000;
+const optionalDate = z.coerce.date().optional();
+const catalogSchema = z.object({
+    providers: z.array(z.object({
+        id: z.string(),
+        name: z.string(),
+        models: z.array(z.object({
+            id: z.string(),
+            name: z.string(),
+            deprecated: optionalDate,
+            endOfLife: optionalDate
+        }))
+    }))
+});
+let cached;
+class RemoteAiModelCatalogImpl {
+    constructor(httpClient, logger){
+        this.httpClient = httpClient;
+        this.logger = logger;
+    }
+    listProviders() {
+        if (cached && cached.expiresAt > Date.now()) return cached.providers;
+        const entry = {
+            expiresAt: Date.now() + SUCCESS_TTL_MS,
+            providers: this.fetchProviders().then((providers)=>{
+                if (!providers) entry.expiresAt = Date.now() + FAILURE_TTL_MS;
+                return providers;
+            })
+        };
+        cached = entry;
+        return entry.providers;
+    }
+    async fetchProviders() {
+        const url = getWcpApiUrl("/ai/models");
+        const response = await this.httpClient.requestJson({
+            url,
+            timeoutMs: FETCH_TIMEOUT_MS
+        });
+        if (response.isFail()) return void this.logger.warn({
+            url,
+            error: response.error
+        }, "Failed to load AI models.");
+        const result = catalogSchema.safeParse(response.value);
+        if (!result.success) return void this.logger.warn({
+            url,
+            error: result.error
+        }, "Received invalid AI models.");
+        return result.data.providers;
+    }
+}
+const RemoteAiModelCatalog = createImplementation({
+    abstraction: AiModelCatalog,
+    implementation: RemoteAiModelCatalogImpl,
+    dependencies: [
+        HttpClient,
+        Logger
+    ]
+});
+export { RemoteAiModelCatalog };
+
+//# sourceMappingURL=RemoteAiModelCatalog.js.map

package/features/ai/RemoteAiModelCatalog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/ai/RemoteAiModelCatalog.js","sources":["../../../src/features/ai/RemoteAiModelCatalog.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { getWcpApiUrl } from \"@webiny/wcp\";\nimport { AiModelCatalog as AiModelCatalogAbstraction } from \"./abstractions.js\";\nimport type { AiCatalogProvider } from \"./abstractions.js\";\nimport { Logger } from \"~/features/logger/index.js\";\nimport { HttpClient } from \"~/features/httpClient/index.js\";\n\nconst FETCH_TIMEOUT_MS = 3000;\nconst SUCCESS_TTL_MS = 60 * 60 * 1000;\nconst FAILURE_TTL_MS = 60 * 1000;\n\nconst optionalDate = z.coerce.date().optional();\n\nconst catalogSchema = z.object({\n    providers: z.array(\n        z.object({\n            id: z.string(),\n            name: z.string(),\n            models: z.array(\n                z.object({\n                    id: z.string(),\n                    name: z.string(),\n                    deprecated: optionalDate,\n                    endOfLife: optionalDate\n                })\n            )\n        })\n    )\n});\n\ninterface CachedCatalog {\n    expiresAt: number;\n    providers: Promise<AiCatalogProvider[] | undefined>;\n}\n\n/*\n * Process-wide on purpose: the catalog is the same for every tenant and request, and\n * `Ai.resolveLanguageModel()` reads it on every call, so a warm Lambda should fetch it once.\n */\nlet cached: CachedCatalog | undefined;\n\nclass RemoteAiModelCatalogImpl implements AiModelCatalogAbstraction.Interface {\n    constructor(\n        private readonly httpClient: HttpClient.Interface,\n        private readonly logger: Logger.Interface\n    ) {}\n\n    listProviders(): Promise<AiCatalogProvider[] | undefined> {\n        if (cached && cached.expiresAt > Date.now()) {\n            return cached.providers;\n        }\n\n        const entry: CachedCatalog = {\n            expiresAt: Date.now() + SUCCESS_TTL_MS,\n            providers: this.fetchProviders().then(providers => {\n                if (!providers) {\n                    entry.expiresAt = Date.now() + FAILURE_TTL_MS;\n                }\n                return providers;\n            })\n        };\n        cached = entry;\n\n        return entry.providers;\n    }\n\n    private async fetchProviders(): Promise<AiCatalogProvider[] | undefined> {\n        const url = getWcpApiUrl(\"/ai/models\");\n\n        const response = await this.httpClient.requestJson({ url, timeoutMs: FETCH_TIMEOUT_MS });\n        if (response.isFail()) {\n            this.logger.warn({ url, error: response.error }, \"Failed to load AI models.\");\n            return undefined;\n        }\n\n        const result = catalogSchema.safeParse(response.value);\n        if (!result.success) {\n            this.logger.warn({ url, error: result.error }, \"Received invalid AI models.\");\n            return undefined;\n        }\n\n        return result.data.providers;\n    }\n}\n\nexport const RemoteAiModelCatalog = createImplementation({\n    abstraction: AiModelCatalogAbstraction,\n    implementation: RemoteAiModelCatalogImpl,\n    dependencies: [HttpClient, Logger]\n});\n"],"names":["FETCH_TIMEOUT_MS","SUCCESS_TTL_MS","FAILURE_TTL_MS","optionalDate","z","catalogSchema","cached","RemoteAiModelCatalogImpl","httpClient","logger","Date","entry","providers","url","getWcpApiUrl","response","result","RemoteAiModelCatalog","createImplementation","AiModelCatalogAbstraction","HttpClient","Logger"],"mappings":";;;;;;AAQA,MAAMA,mBAAmB;AACzB,MAAMC,iBAAiB;AACvB,MAAMC,iBAAiB;AAEvB,MAAMC,eAAeC,EAAE,MAAM,CAAC,IAAI,GAAG,QAAQ;AAE7C,MAAMC,gBAAgBD,EAAE,MAAM,CAAC;IAC3B,WAAWA,EAAE,KAAK,CACdA,EAAE,MAAM,CAAC;QACL,IAAIA,EAAE,MAAM;QACZ,MAAMA,EAAE,MAAM;QACd,QAAQA,EAAE,KAAK,CACXA,EAAE,MAAM,CAAC;YACL,IAAIA,EAAE,MAAM;YACZ,MAAMA,EAAE,MAAM;YACd,YAAYD;YACZ,WAAWA;QACf;IAER;AAER;AAWA,IAAIG;AAEJ,MAAMC;IACF,YACqBC,UAAgC,EAChCC,MAAwB,CAC3C;aAFmBD,UAAU,GAAVA;aACAC,MAAM,GAANA;IAClB;IAEH,gBAA0D;QACtD,IAAIH,UAAUA,OAAO,SAAS,GAAGI,KAAK,GAAG,IACrC,OAAOJ,OAAO,SAAS;QAG3B,MAAMK,QAAuB;YACzB,WAAWD,KAAK,GAAG,KAAKT;YACxB,WAAW,IAAI,CAAC,cAAc,GAAG,IAAI,CAACW,CAAAA;gBAClC,IAAI,CAACA,WACDD,MAAM,SAAS,GAAGD,KAAK,GAAG,KAAKR;gBAEnC,OAAOU;YACX;QACJ;QACAN,SAASK;QAET,OAAOA,MAAM,SAAS;IAC1B;IAEA,MAAc,iBAA2D;QACrE,MAAME,MAAMC,aAAa;QAEzB,MAAMC,WAAW,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YAAEF;YAAK,WAAWb;QAAiB;QACtF,IAAIe,SAAS,MAAM,IAAI,YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YAAEF;YAAK,OAAOE,SAAS,KAAK;QAAC,GAAG;QAIrD,MAAMC,SAASX,cAAc,SAAS,CAACU,SAAS,KAAK;QACrD,IAAI,CAACC,OAAO,OAAO,EAAE,YACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YAAEH;YAAK,OAAOG,OAAO,KAAK;QAAC,GAAG;QAInD,OAAOA,OAAO,IAAI,CAAC,SAAS;IAChC;AACJ;AAEO,MAAMC,uBAAuBC,qBAAqB;IACrD,aAAaC;IACb,gBAAgBZ;IAChB,cAAc;QAACa;QAAYC;KAAO;AACtC"}

package/features/ai/abstractions.d.ts

@@ -82,6 +82,20 @@ export declare const AiModelRegistry: import("@webiny/di").Abstraction<IAiModelR
 export declare namespace AiModelRegistry {
     type Interface = IAiModelRegistry;
 }
+export interface AiCatalogProvider {
+    id: string;
+    name: string;
+    models: IAiSdkModel[];
+}
+export interface IAiModelCatalog {
+    /** Returns `undefined` when the catalog can't be loaded. */
+    listProviders(): Promise<AiCatalogProvider[] | undefined>;
+}
+/** The published list of providers and models Webiny supports. SDK factories still gate what is offered. */
+export declare const AiModelCatalog: import("@webiny/di").Abstraction<IAiModelCatalog>;
+export declare namespace AiModelCatalog {
+    type Interface = IAiModelCatalog;
+}
 export interface IAiSdkTool<TInput = any> {
     readonly name: string;
     readonly description: string;

package/features/ai/abstractions.js

@@ -4,8 +4,9 @@ const AiSdkFactory = createAbstraction("AiSdkFactory");
 const AiConnectionFactory = createAbstraction("AiConnectionFactory");
 const Ai = createAbstraction("Ai");
 const AiModelRegistry = createAbstraction("AiModelRegistry");
+const AiModelCatalog = createAbstraction("AiModelCatalog");
 const AiSdkTool = createAbstraction("AiSdkTool");
 const AiSdkTools = createAbstraction("AiSdkTools");
-export { Ai, AiConnectionFactory, AiModelRegistry, AiSdk, AiSdkFactory, AiSdkTool, AiSdkTools };
+export { Ai, AiConnectionFactory, AiModelCatalog, AiModelRegistry, AiSdk, AiSdkFactory, AiSdkTool, AiSdkTools };
 
 //# sourceMappingURL=abstractions.js.map

package/features/ai/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/ai/abstractions.js","sources":["../../../src/features/ai/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { generateText } from \"ai\";\nimport type { streamText } from \"ai\";\nimport type { LanguageModel } from \"ai\";\nimport type { FlexibleSchema, ToolSet } from \"ai\";\n\n// AiSdk\n\nexport interface IAiSdkModel {\n    id: string; // raw model id, e.g. \"claude-sonnet-4-5\"\n    name: string; // human-friendly name, e.g. \"Claude Sonnet 4.5\"\n    deprecated?: Date;\n    endOfLife?: Date;\n}\n\nexport interface IAiSdk {\n    languageModel(modelId: string): LanguageModel;\n}\n\n/** A single AI SDK instance (e.g. OpenAI, Anthropic) that resolves model instances. */\nexport const AiSdk = createAbstraction<IAiSdk>(\"AiSdk\");\n\nexport namespace AiSdk {\n    export type Interface = IAiSdk;\n}\n\n// AiSdkFactory\n\nexport interface IAiSdkFactory {\n    readonly id: string; // machine id, e.g. \"anthropic\"\n    readonly name: string; // human-friendly name, e.g. \"Anthropic\"\n    readonly models: readonly IAiSdkModel[]; // static model list, no API call needed\n    execute(apiKey?: string): Promise<IAiSdk>;\n}\n\n/** Factory that asynchronously initialises an AI SDK. Register one per provider namespace. */\nexport const AiSdkFactory = createAbstraction<IAiSdkFactory>(\"AiSdkFactory\");\n\nexport namespace AiSdkFactory {\n    export type Interface = IAiSdkFactory;\n}\n\n// AiConnection\n\nexport interface IAiConnectionInline {\n    readonly sdkName: string;\n    readonly apiKey?: string;\n}\n\nexport interface IAiConnection extends IAiConnectionInline {\n    readonly id: string;\n}\n\n// AiConnectionFactory\n\nexport interface IAiConnectionFactory {\n    execute(): Promise<IAiConnection>;\n}\n\n/** Factory that asynchronously produces an AiConnection. */\nexport const AiConnectionFactory = createAbstraction<IAiConnectionFactory>(\"AiConnectionFactory\");\n\nexport namespace AiConnectionFactory {\n    export type Interface = IAiConnectionFactory;\n}\n\n// Ai\n\ntype SDKGenerateTextParams = Parameters<typeof generateText>[0];\ntype SDKStreamTextParams = Parameters<typeof streamText>[0];\n\nexport type AiGenerateTextParams = Omit<SDKGenerateTextParams, \"model\"> & {\n    model: string;\n    connection?: string | IAiConnectionInline;\n};\nexport type AiStreamTextParams = Omit<SDKStreamTextParams, \"model\"> & {\n    model: string;\n    connection?: string | IAiConnectionInline;\n};\n\nexport interface AiModel {\n    providerId: string; // e.g. \"anthropic\"\n    providerName: string; // e.g. \"Anthropic\"\n    modelId: string; // e.g. \"claude-sonnet-4-5\"\n    modelName: string; // e.g. \"Claude Sonnet 4.5\"\n    deprecated: Date | undefined;\n    endOfLife: Date | undefined;\n}\n\nexport interface IAi {\n    generateText(params: AiGenerateTextParams): ReturnType<typeof generateText>;\n    streamText(params: AiStreamTextParams): Promise<ReturnType<typeof streamText>>;\n    listModels(): Promise<AiModel[]>;\n    listModelsByConnections(): Promise<AiModel[]>;\n    listModelsByConnection(connection: string | IAiConnectionInline): Promise<AiModel[]>;\n}\n\n/** Interact with AI language models using registered providers. */\nexport const Ai = createAbstraction<IAi>(\"Ai\");\n\nexport namespace Ai {\n    export type Interface = IAi;\n    export type GenerateTextParams = AiGenerateTextParams;\n    export type StreamTextParams = AiStreamTextParams;\n}\n\n// AiModelRegistry\n\nexport interface IAiModelRegistry {\n    listModels(): Promise<AiModel[]>;\n}\n\n/** Single source of truth for available AI models. Decoratable to restrict the model list. */\nexport const AiModelRegistry = createAbstraction<IAiModelRegistry>(\"AiModelRegistry\");\n\nexport namespace AiModelRegistry {\n    export type Interface = IAiModelRegistry;\n}\n\n// AiSdkTool\n\nexport interface IAiSdkTool<TInput = any> {\n    readonly name: string;\n    readonly description: string;\n    readonly inputSchema: FlexibleSchema<TInput>;\n    execute(input: TInput): Promise<unknown>;\n}\n\n/** A single tool that can be provided to AI generateText/streamText calls. */\nexport const AiSdkTool = createAbstraction<IAiSdkTool>(\"AiSdkTool\");\n\nexport namespace AiSdkTool {\n    export type Interface = IAiSdkTool;\n}\n\n// AiSdkTools\n\nexport interface IAiSdkTools {\n    getToolSet(): ToolSet;\n}\n\n/** Collection of AI SDK tools. Returns a ready-to-use ToolSet for generateText/streamText. */\nexport const AiSdkTools = createAbstraction<IAiSdkTools>(\"AiSdkTools\");\n\nexport namespace AiSdkTools {\n    export type Interface = IAiSdkTools;\n}\n"],"names":["AiSdk","createAbstraction","AiSdkFactory","AiConnectionFactory","Ai","AiModelRegistry","AiSdkTool","AiSdkTools"],"mappings":";AAoBO,MAAMA,QAAQC,kBAA0B;AAgBxC,MAAMC,eAAeD,kBAAiC;AAwBtD,MAAME,sBAAsBF,kBAAwC;AAsCpE,MAAMG,KAAKH,kBAAuB;AAelC,MAAMI,kBAAkBJ,kBAAoC;AAgB5D,MAAMK,YAAYL,kBAA8B;AAahD,MAAMM,aAAaN,kBAA+B"}
+{"version":3,"file":"features/ai/abstractions.js","sources":["../../../src/features/ai/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { generateText } from \"ai\";\nimport type { streamText } from \"ai\";\nimport type { LanguageModel } from \"ai\";\nimport type { FlexibleSchema, ToolSet } from \"ai\";\n\n// AiSdk\n\nexport interface IAiSdkModel {\n    id: string; // raw model id, e.g. \"claude-sonnet-4-5\"\n    name: string; // human-friendly name, e.g. \"Claude Sonnet 4.5\"\n    deprecated?: Date;\n    endOfLife?: Date;\n}\n\nexport interface IAiSdk {\n    languageModel(modelId: string): LanguageModel;\n}\n\n/** A single AI SDK instance (e.g. OpenAI, Anthropic) that resolves model instances. */\nexport const AiSdk = createAbstraction<IAiSdk>(\"AiSdk\");\n\nexport namespace AiSdk {\n    export type Interface = IAiSdk;\n}\n\n// AiSdkFactory\n\nexport interface IAiSdkFactory {\n    readonly id: string; // machine id, e.g. \"anthropic\"\n    readonly name: string; // human-friendly name, e.g. \"Anthropic\"\n    readonly models: readonly IAiSdkModel[]; // static model list, no API call needed\n    execute(apiKey?: string): Promise<IAiSdk>;\n}\n\n/** Factory that asynchronously initialises an AI SDK. Register one per provider namespace. */\nexport const AiSdkFactory = createAbstraction<IAiSdkFactory>(\"AiSdkFactory\");\n\nexport namespace AiSdkFactory {\n    export type Interface = IAiSdkFactory;\n}\n\n// AiConnection\n\nexport interface IAiConnectionInline {\n    readonly sdkName: string;\n    readonly apiKey?: string;\n}\n\nexport interface IAiConnection extends IAiConnectionInline {\n    readonly id: string;\n}\n\n// AiConnectionFactory\n\nexport interface IAiConnectionFactory {\n    execute(): Promise<IAiConnection>;\n}\n\n/** Factory that asynchronously produces an AiConnection. */\nexport const AiConnectionFactory = createAbstraction<IAiConnectionFactory>(\"AiConnectionFactory\");\n\nexport namespace AiConnectionFactory {\n    export type Interface = IAiConnectionFactory;\n}\n\n// Ai\n\ntype SDKGenerateTextParams = Parameters<typeof generateText>[0];\ntype SDKStreamTextParams = Parameters<typeof streamText>[0];\n\nexport type AiGenerateTextParams = Omit<SDKGenerateTextParams, \"model\"> & {\n    model: string;\n    connection?: string | IAiConnectionInline;\n};\nexport type AiStreamTextParams = Omit<SDKStreamTextParams, \"model\"> & {\n    model: string;\n    connection?: string | IAiConnectionInline;\n};\n\nexport interface AiModel {\n    providerId: string; // e.g. \"anthropic\"\n    providerName: string; // e.g. \"Anthropic\"\n    modelId: string; // e.g. \"claude-sonnet-4-5\"\n    modelName: string; // e.g. \"Claude Sonnet 4.5\"\n    deprecated: Date | undefined;\n    endOfLife: Date | undefined;\n}\n\nexport interface IAi {\n    generateText(params: AiGenerateTextParams): ReturnType<typeof generateText>;\n    streamText(params: AiStreamTextParams): Promise<ReturnType<typeof streamText>>;\n    listModels(): Promise<AiModel[]>;\n    listModelsByConnections(): Promise<AiModel[]>;\n    listModelsByConnection(connection: string | IAiConnectionInline): Promise<AiModel[]>;\n}\n\n/** Interact with AI language models using registered providers. */\nexport const Ai = createAbstraction<IAi>(\"Ai\");\n\nexport namespace Ai {\n    export type Interface = IAi;\n    export type GenerateTextParams = AiGenerateTextParams;\n    export type StreamTextParams = AiStreamTextParams;\n}\n\n// AiModelRegistry\n\nexport interface IAiModelRegistry {\n    listModels(): Promise<AiModel[]>;\n}\n\n/** Single source of truth for available AI models. Decoratable to restrict the model list. */\nexport const AiModelRegistry = createAbstraction<IAiModelRegistry>(\"AiModelRegistry\");\n\nexport namespace AiModelRegistry {\n    export type Interface = IAiModelRegistry;\n}\n\n// AiModelCatalog\n\nexport interface AiCatalogProvider {\n    id: string; // Matches `AiSdkFactory.id`, e.g. \"anthropic\".\n    name: string; // Human-friendly name, e.g. \"Anthropic\".\n    models: IAiSdkModel[];\n}\n\nexport interface IAiModelCatalog {\n    /** Returns `undefined` when the catalog can't be loaded. */\n    listProviders(): Promise<AiCatalogProvider[] | undefined>;\n}\n\n/** The published list of providers and models Webiny supports. SDK factories still gate what is offered. */\nexport const AiModelCatalog = createAbstraction<IAiModelCatalog>(\"AiModelCatalog\");\n\nexport namespace AiModelCatalog {\n    export type Interface = IAiModelCatalog;\n}\n\n// AiSdkTool\n\nexport interface IAiSdkTool<TInput = any> {\n    readonly name: string;\n    readonly description: string;\n    readonly inputSchema: FlexibleSchema<TInput>;\n    execute(input: TInput): Promise<unknown>;\n}\n\n/** A single tool that can be provided to AI generateText/streamText calls. */\nexport const AiSdkTool = createAbstraction<IAiSdkTool>(\"AiSdkTool\");\n\nexport namespace AiSdkTool {\n    export type Interface = IAiSdkTool;\n}\n\n// AiSdkTools\n\nexport interface IAiSdkTools {\n    getToolSet(): ToolSet;\n}\n\n/** Collection of AI SDK tools. Returns a ready-to-use ToolSet for generateText/streamText. */\nexport const AiSdkTools = createAbstraction<IAiSdkTools>(\"AiSdkTools\");\n\nexport namespace AiSdkTools {\n    export type Interface = IAiSdkTools;\n}\n"],"names":["AiSdk","createAbstraction","AiSdkFactory","AiConnectionFactory","Ai","AiModelRegistry","AiModelCatalog","AiSdkTool","AiSdkTools"],"mappings":";AAoBO,MAAMA,QAAQC,kBAA0B;AAgBxC,MAAMC,eAAeD,kBAAiC;AAwBtD,MAAME,sBAAsBF,kBAAwC;AAsCpE,MAAMG,KAAKH,kBAAuB;AAelC,MAAMI,kBAAkBJ,kBAAoC;AAoB5D,MAAMK,iBAAiBL,kBAAmC;AAgB1D,MAAMM,YAAYN,kBAA8B;AAahD,MAAMO,aAAaP,kBAA+B"}

package/features/ai/feature.js

@@ -4,6 +4,7 @@ import { AnthropicSdkFactory } from "./AnthropicSdkFactory.js";
 import { GoogleSdkFactory } from "./GoogleSdkFactory.js";
 import { Ai } from "./Ai.js";
 import { AiModelRegistry } from "./AiModelRegistry.js";
+import { RemoteAiModelCatalog } from "./RemoteAiModelCatalog.js";
 import { AiSdkTools } from "./AiSdkTools.js";
 import { AiOutputToolRegistry } from "./toolPipeline/AiOutputToolRegistry.js";
 import { AiToolPipelineRunner } from "./toolPipeline/AiToolPipelineRunner.js";
@@ -15,6 +16,7 @@ const AiFeature = createFeature({
         container.register(AnthropicSdkFactory);
         container.register(GoogleSdkFactory);
         container.register(Ai);
+        container.register(RemoteAiModelCatalog);
         container.register(AiModelRegistry);
         container.register(AiSdkTools);
         container.register(AiOutputToolRegistry);

package/features/ai/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/ai/feature.js","sources":["../../../src/features/ai/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { OpenAiSdkFactory } from \"./OpenAiSdkFactory.js\";\nimport { AnthropicSdkFactory } from \"./AnthropicSdkFactory.js\";\nimport { GoogleSdkFactory } from \"./GoogleSdkFactory.js\";\nimport { Ai } from \"./Ai.js\";\nimport { AiModelRegistry } from \"./AiModelRegistry.js\";\nimport { AiSdkTools } from \"./AiSdkTools.js\";\nimport { AiOutputToolRegistry } from \"./toolPipeline/AiOutputToolRegistry.js\";\nimport { AiToolPipelineRunner } from \"./toolPipeline/AiToolPipelineRunner.js\";\nimport { DefaultTextExtractor } from \"./TextExtractor/DefaultTextExtractor.js\";\n\nexport const AiFeature = createFeature({\n    name: \"AiFeature\",\n    register(container) {\n        container.register(OpenAiSdkFactory);\n        container.register(AnthropicSdkFactory);\n        container.register(GoogleSdkFactory);\n        container.register(Ai);\n        container.register(AiModelRegistry);\n        container.register(AiSdkTools);\n        container.register(AiOutputToolRegistry);\n        container.register(AiToolPipelineRunner);\n        container.register(DefaultTextExtractor);\n    }\n});\n"],"names":["AiFeature","createFeature","container","OpenAiSdkFactory","AnthropicSdkFactory","GoogleSdkFactory","Ai","AiModelRegistry","AiSdkTools","AiOutputToolRegistry","AiToolPipelineRunner","DefaultTextExtractor"],"mappings":";;;;;;;;;;AAWO,MAAMA,YAAYC,cAAc;IACnC,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QACnBH,UAAU,QAAQ,CAACI;QACnBJ,UAAU,QAAQ,CAACK;QACnBL,UAAU,QAAQ,CAACM;QACnBN,UAAU,QAAQ,CAACO;QACnBP,UAAU,QAAQ,CAACQ;QACnBR,UAAU,QAAQ,CAACS;IACvB;AACJ"}
+{"version":3,"file":"features/ai/feature.js","sources":["../../../src/features/ai/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { OpenAiSdkFactory } from \"./OpenAiSdkFactory.js\";\nimport { AnthropicSdkFactory } from \"./AnthropicSdkFactory.js\";\nimport { GoogleSdkFactory } from \"./GoogleSdkFactory.js\";\nimport { Ai } from \"./Ai.js\";\nimport { AiModelRegistry } from \"./AiModelRegistry.js\";\nimport { RemoteAiModelCatalog } from \"./RemoteAiModelCatalog.js\";\nimport { AiSdkTools } from \"./AiSdkTools.js\";\nimport { AiOutputToolRegistry } from \"./toolPipeline/AiOutputToolRegistry.js\";\nimport { AiToolPipelineRunner } from \"./toolPipeline/AiToolPipelineRunner.js\";\nimport { DefaultTextExtractor } from \"./TextExtractor/DefaultTextExtractor.js\";\n\nexport const AiFeature = createFeature({\n    name: \"AiFeature\",\n    register(container) {\n        container.register(OpenAiSdkFactory);\n        container.register(AnthropicSdkFactory);\n        container.register(GoogleSdkFactory);\n        container.register(Ai);\n        container.register(RemoteAiModelCatalog);\n        container.register(AiModelRegistry);\n        container.register(AiSdkTools);\n        container.register(AiOutputToolRegistry);\n        container.register(AiToolPipelineRunner);\n        container.register(DefaultTextExtractor);\n    }\n});\n"],"names":["AiFeature","createFeature","container","OpenAiSdkFactory","AnthropicSdkFactory","GoogleSdkFactory","Ai","RemoteAiModelCatalog","AiModelRegistry","AiSdkTools","AiOutputToolRegistry","AiToolPipelineRunner","DefaultTextExtractor"],"mappings":";;;;;;;;;;;AAYO,MAAMA,YAAYC,cAAc;IACnC,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QACnBH,UAAU,QAAQ,CAACI;QACnBJ,UAAU,QAAQ,CAACK;QACnBL,UAAU,QAAQ,CAACM;QACnBN,UAAU,QAAQ,CAACO;QACnBP,UAAU,QAAQ,CAACQ;QACnBR,UAAU,QAAQ,CAACS;QACnBT,UAAU,QAAQ,CAACU;IACvB;AACJ"}

package/features/ai/index.d.ts

@@ -1,5 +1,5 @@
-export { AiSdk, AiSdkFactory, AiConnectionFactory, Ai, AiModelRegistry, AiSdkTool, AiSdkTools } from "./abstractions.js";
-export type { IAiConnection, IAiConnectionInline, AiModel, IAiSdkModel, IAiModelRegistry, IAiSdkTool, IAiSdkTools } from "./abstractions.js";
+export { AiSdk, AiSdkFactory, AiConnectionFactory, Ai, AiModelRegistry, AiModelCatalog, AiSdkTool, AiSdkTools } from "./abstractions.js";
+export type { IAiConnection, IAiConnectionInline, AiModel, IAiSdkModel, IAiModelRegistry, AiCatalogProvider, IAiSdkTool, IAiSdkTools } from "./abstractions.js";
 export { AiOutputTool, AiOutputToolRegistry, AiToolPipelineRunner } from "./toolPipeline/index.js";
 export type { IAiOutputTool, IAiOutputToolRegistry, IAiToolPipelineRunner } from "./toolPipeline/index.js";
 export { TextExtractor, DefaultTextExtractor } from "./TextExtractor/index.js";

package/features/ai/index.js

@@ -1,4 +1,4 @@
-export { Ai, AiConnectionFactory, AiModelRegistry, AiSdk, AiSdkFactory, AiSdkTool, AiSdkTools } from "./abstractions.js";
+export { Ai, AiConnectionFactory, AiModelCatalog, AiModelRegistry, AiSdk, AiSdkFactory, AiSdkTool, AiSdkTools } from "./abstractions.js";
 export { AiOutputTool, AiOutputToolRegistry, AiToolPipelineRunner } from "./toolPipeline/index.js";
 export { DefaultTextExtractor, TextExtractor } from "./TextExtractor/index.js";
 export { AiAfterGenerateTextEvent, AiAfterGenerateTextEventHandler, AiBeforeGenerateTextEvent, AiBeforeGenerateTextEventHandler, AiBeforeStreamTextEvent, AiBeforeStreamTextEventHandler, AiGenerateTextErrorEvent, AiGenerateTextErrorEventHandler } from "./events.js";

package/features/httpClient/HttpClient.d.ts

@@ -0,0 +1,7 @@
+import { Result } from "@webiny/feature/api";
+import { HttpClient as HttpClientAbstraction } from "./abstractions.js";
+declare class HttpClientImpl implements HttpClientAbstraction.Interface {
+    requestJson(request: HttpClientAbstraction.Request): Promise<Result<unknown, HttpClientAbstraction.Error>>;
+}
+export declare const HttpClient: import("@webiny/di").Implementation<typeof HttpClientImpl>;
+export {};

package/features/httpClient/HttpClient.js

@@ -0,0 +1,72 @@
+import { Result, createImplementation } from "@webiny/feature/api";
+import { HttpClient } from "./abstractions.js";
+import { HttpRequestError } from "./HttpRequestError.js";
+import { HttpStatusError } from "./HttpStatusError.js";
+const DEFAULT_TIMEOUT_MS = 10000;
+function createRequestInit(request) {
+    const timeoutMs = request.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+    const headers = new Headers(request.headers);
+    const init = {
+        method: request.method ?? "GET",
+        headers,
+        signal: AbortSignal.timeout(timeoutMs)
+    };
+    if (void 0 !== request.body) {
+        if (!headers.has("content-type")) headers.set("content-type", "application/json");
+        init.body = JSON.stringify(request.body);
+    }
+    return init;
+}
+function isTimeout(error) {
+    return error instanceof Error && "TimeoutError" === error.name;
+}
+function parseJson(text) {
+    if ("" === text) return Result.ok(void 0);
+    try {
+        const value = JSON.parse(text);
+        return Result.ok(value);
+    } catch (error) {
+        return Result.fail(error);
+    }
+}
+class HttpClientImpl {
+    async requestJson(request) {
+        const { url } = request;
+        const init = createRequestInit(request);
+        let response;
+        let text;
+        try {
+            response = await fetch(url, init);
+            text = await response.text();
+        } catch (error) {
+            const reason = isTimeout(error) ? "timeout" : "network";
+            return Result.fail(new HttpRequestError({
+                url,
+                reason
+            }, error));
+        }
+        const body = parseJson(text);
+        if (!response.ok) {
+            const statusError = new HttpStatusError({
+                url,
+                status: response.status,
+                statusText: response.statusText,
+                body: body.isOk() ? body.value : void 0
+            });
+            return Result.fail(statusError);
+        }
+        if (body.isFail()) return Result.fail(new HttpRequestError({
+            url,
+            reason: "invalidJson"
+        }, body.error));
+        return Result.ok(body.value);
+    }
+}
+const HttpClient_HttpClient = createImplementation({
+    abstraction: HttpClient,
+    implementation: HttpClientImpl,
+    dependencies: []
+});
+export { HttpClient_HttpClient as HttpClient };
+
+//# sourceMappingURL=HttpClient.js.map

package/features/httpClient/HttpClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/httpClient/HttpClient.js","sources":["../../../src/features/httpClient/HttpClient.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { HttpClient as HttpClientAbstraction } from \"./abstractions.js\";\nimport { HttpRequestError } from \"./HttpRequestError.js\";\nimport { HttpStatusError } from \"./HttpStatusError.js\";\n\nconst DEFAULT_TIMEOUT_MS = 10_000;\n\nfunction createRequestInit(request: HttpClientAbstraction.Request): RequestInit {\n    const timeoutMs = request.timeoutMs ?? DEFAULT_TIMEOUT_MS;\n    const headers = new Headers(request.headers);\n    const init: RequestInit = {\n        method: request.method ?? \"GET\",\n        headers,\n        signal: AbortSignal.timeout(timeoutMs)\n    };\n\n    if (request.body !== undefined) {\n        if (!headers.has(\"content-type\")) {\n            headers.set(\"content-type\", \"application/json\");\n        }\n        init.body = JSON.stringify(request.body);\n    }\n\n    return init;\n}\n\nfunction isTimeout(error: unknown): boolean {\n    return error instanceof Error && error.name === \"TimeoutError\";\n}\n\n// An empty body parses to `undefined`, so a 204 is not an invalid response.\nfunction parseJson(text: string): Result<unknown, unknown> {\n    if (text === \"\") {\n        return Result.ok(undefined);\n    }\n    try {\n        const value: unknown = JSON.parse(text);\n        return Result.ok(value);\n    } catch (error) {\n        return Result.fail(error);\n    }\n}\n\nclass HttpClientImpl implements HttpClientAbstraction.Interface {\n    async requestJson(\n        request: HttpClientAbstraction.Request\n    ): Promise<Result<unknown, HttpClientAbstraction.Error>> {\n        const { url } = request;\n        const init = createRequestInit(request);\n\n        let response: Response;\n        let text: string;\n        try {\n            response = await fetch(url, init);\n            text = await response.text();\n        } catch (error) {\n            const reason = isTimeout(error) ? \"timeout\" : \"network\";\n            return Result.fail(new HttpRequestError({ url, reason }, error));\n        }\n\n        const body = parseJson(text);\n\n        if (!response.ok) {\n            const statusError = new HttpStatusError({\n                url,\n                status: response.status,\n                statusText: response.statusText,\n                body: body.isOk() ? body.value : undefined\n            });\n            return Result.fail(statusError);\n        }\n\n        if (body.isFail()) {\n            return Result.fail(new HttpRequestError({ url, reason: \"invalidJson\" }, body.error));\n        }\n\n        return Result.ok(body.value);\n    }\n}\n\nexport const HttpClient = createImplementation({\n    abstraction: HttpClientAbstraction,\n    implementation: HttpClientImpl,\n    dependencies: []\n});\n"],"names":["DEFAULT_TIMEOUT_MS","createRequestInit","request","timeoutMs","headers","Headers","init","AbortSignal","undefined","JSON","isTimeout","error","Error","parseJson","text","Result","value","HttpClientImpl","url","response","fetch","reason","HttpRequestError","body","statusError","HttpStatusError","HttpClient","createImplementation","HttpClientAbstraction"],"mappings":";;;;AAMA,MAAMA,qBAAqB;AAE3B,SAASC,kBAAkBC,OAAsC;IAC7D,MAAMC,YAAYD,QAAQ,SAAS,IAAIF;IACvC,MAAMI,UAAU,IAAIC,QAAQH,QAAQ,OAAO;IAC3C,MAAMI,OAAoB;QACtB,QAAQJ,QAAQ,MAAM,IAAI;QAC1BE;QACA,QAAQG,YAAY,OAAO,CAACJ;IAChC;IAEA,IAAID,AAAiBM,WAAjBN,QAAQ,IAAI,EAAgB;QAC5B,IAAI,CAACE,QAAQ,GAAG,CAAC,iBACbA,QAAQ,GAAG,CAAC,gBAAgB;QAEhCE,KAAK,IAAI,GAAGG,KAAK,SAAS,CAACP,QAAQ,IAAI;IAC3C;IAEA,OAAOI;AACX;AAEA,SAASI,UAAUC,KAAc;IAC7B,OAAOA,iBAAiBC,SAASD,AAAe,mBAAfA,MAAM,IAAI;AAC/C;AAGA,SAASE,UAAUC,IAAY;IAC3B,IAAIA,AAAS,OAATA,MACA,OAAOC,OAAO,EAAE,CAACP;IAErB,IAAI;QACA,MAAMQ,QAAiBP,KAAK,KAAK,CAACK;QAClC,OAAOC,OAAO,EAAE,CAACC;IACrB,EAAE,OAAOL,OAAO;QACZ,OAAOI,OAAO,IAAI,CAACJ;IACvB;AACJ;AAEA,MAAMM;IACF,MAAM,YACFf,OAAsC,EACe;QACrD,MAAM,EAAEgB,GAAG,EAAE,GAAGhB;QAChB,MAAMI,OAAOL,kBAAkBC;QAE/B,IAAIiB;QACJ,IAAIL;QACJ,IAAI;YACAK,WAAW,MAAMC,MAAMF,KAAKZ;YAC5BQ,OAAO,MAAMK,SAAS,IAAI;QAC9B,EAAE,OAAOR,OAAO;YACZ,MAAMU,SAASX,UAAUC,SAAS,YAAY;YAC9C,OAAOI,OAAO,IAAI,CAAC,IAAIO,iBAAiB;gBAAEJ;gBAAKG;YAAO,GAAGV;QAC7D;QAEA,MAAMY,OAAOV,UAAUC;QAEvB,IAAI,CAACK,SAAS,EAAE,EAAE;YACd,MAAMK,cAAc,IAAIC,gBAAgB;gBACpCP;gBACA,QAAQC,SAAS,MAAM;gBACvB,YAAYA,SAAS,UAAU;gBAC/B,MAAMI,KAAK,IAAI,KAAKA,KAAK,KAAK,GAAGf;YACrC;YACA,OAAOO,OAAO,IAAI,CAACS;QACvB;QAEA,IAAID,KAAK,MAAM,IACX,OAAOR,OAAO,IAAI,CAAC,IAAIO,iBAAiB;YAAEJ;YAAK,QAAQ;QAAc,GAAGK,KAAK,KAAK;QAGtF,OAAOR,OAAO,EAAE,CAACQ,KAAK,KAAK;IAC/B;AACJ;AAEO,MAAMG,wBAAaC,qBAAqB;IAC3C,aAAaC;IACb,gBAAgBX;IAChB,cAAc,EAAE;AACpB"}

package/features/httpClient/HttpRequestError.d.ts

@@ -0,0 +1,10 @@
+import { BaseError } from "@webiny/feature/api";
+export interface HttpRequestErrorData {
+    url: string;
+    reason: "network" | "timeout" | "invalidJson";
+}
+/** The request didn't produce a usable response: it failed, timed out, or the body wasn't JSON. */
+export declare class HttpRequestError extends BaseError<HttpRequestErrorData> {
+    readonly code: "HttpClient/Request";
+    constructor(data: HttpRequestErrorData, cause: unknown);
+}

package/features/httpClient/HttpRequestError.js

@@ -0,0 +1,13 @@
+import { BaseError } from "@webiny/feature/api";
+class HttpRequestError extends BaseError {
+    constructor(data, cause){
+        super({
+            message: `Request to "${data.url}" failed (${data.reason}).`,
+            data
+        }), this.code = "HttpClient/Request";
+        this.cause = cause;
+    }
+}
+export { HttpRequestError };
+
+//# sourceMappingURL=HttpRequestError.js.map

package/features/httpClient/HttpRequestError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/httpClient/HttpRequestError.js","sources":["../../../src/features/httpClient/HttpRequestError.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\n\nexport interface HttpRequestErrorData {\n    url: string;\n    reason: \"network\" | \"timeout\" | \"invalidJson\";\n}\n\n/** The request didn't produce a usable response: it failed, timed out, or the body wasn't JSON. */\nexport class HttpRequestError extends BaseError<HttpRequestErrorData> {\n    override readonly code = \"HttpClient/Request\" as const;\n\n    constructor(data: HttpRequestErrorData, cause: unknown) {\n        super({\n            message: `Request to \"${data.url}\" failed (${data.reason}).`,\n            data\n        });\n        this.cause = cause;\n    }\n}\n"],"names":["HttpRequestError","BaseError","data","cause"],"mappings":";AAQO,MAAMA,yBAAyBC;IAGlC,YAAYC,IAA0B,EAAEC,KAAc,CAAE;QACpD,KAAK,CAAC;YACF,SAAS,CAAC,YAAY,EAAED,KAAK,GAAG,CAAC,UAAU,EAAEA,KAAK,MAAM,CAAC,EAAE,CAAC;YAC5DA;QACJ,SANc,IAAI,GAAG;QAOrB,IAAI,CAAC,KAAK,GAAGC;IACjB;AACJ"}

package/features/httpClient/HttpStatusError.d.ts

@@ -0,0 +1,12 @@
+import { BaseError } from "@webiny/feature/api";
+export interface HttpStatusErrorData {
+    url: string;
+    status: number;
+    statusText: string;
+    body: unknown;
+}
+/** The server answered with a non-2xx status. */
+export declare class HttpStatusError extends BaseError<HttpStatusErrorData> {
+    readonly code: "HttpClient/Status";
+    constructor(data: HttpStatusErrorData);
+}

package/features/httpClient/HttpStatusError.js

@@ -0,0 +1,12 @@
+import { BaseError } from "@webiny/feature/api";
+class HttpStatusError extends BaseError {
+    constructor(data){
+        super({
+            message: `Request to "${data.url}" failed with status ${data.status}.`,
+            data
+        }), this.code = "HttpClient/Status";
+    }
+}
+export { HttpStatusError };
+
+//# sourceMappingURL=HttpStatusError.js.map

package/features/httpClient/HttpStatusError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/httpClient/HttpStatusError.js","sources":["../../../src/features/httpClient/HttpStatusError.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\n\nexport interface HttpStatusErrorData {\n    url: string;\n    status: number;\n    statusText: string;\n    body: unknown; // the parsed JSON body, or `undefined` when there was none\n}\n\n/** The server answered with a non-2xx status. */\nexport class HttpStatusError extends BaseError<HttpStatusErrorData> {\n    override readonly code = \"HttpClient/Status\" as const;\n\n    constructor(data: HttpStatusErrorData) {\n        super({\n            message: `Request to \"${data.url}\" failed with status ${data.status}.`,\n            data\n        });\n    }\n}\n"],"names":["HttpStatusError","BaseError","data"],"mappings":";AAUO,MAAMA,wBAAwBC;IAGjC,YAAYC,IAAyB,CAAE;QACnC,KAAK,CAAC;YACF,SAAS,CAAC,YAAY,EAAEA,KAAK,GAAG,CAAC,qBAAqB,EAAEA,KAAK,MAAM,CAAC,CAAC,CAAC;YACtEA;QACJ,SANc,IAAI,GAAG;IAOzB;AACJ"}

package/features/httpClient/abstractions.d.ts

@@ -0,0 +1,32 @@
+import type { Result } from "@webiny/feature/api";
+import type { HttpRequestError } from "./HttpRequestError.js";
+import type { HttpStatusError } from "./HttpStatusError.js";
+export type HttpMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+export interface IHttpClientRequest {
+    url: string;
+    method?: HttpMethod;
+    headers?: Record<string, string>;
+    body?: unknown;
+    timeoutMs?: number;
+}
+export interface IHttpClientErrors {
+    request: HttpRequestError;
+    status: HttpStatusError;
+}
+type HttpClientError = IHttpClientErrors[keyof IHttpClientErrors];
+export interface IHttpClient {
+    /**
+     * Sends a request and parses the response body as JSON. The body is `unknown` on purpose:
+     * validate it before use.
+     */
+    requestJson(request: IHttpClientRequest): Promise<Result<unknown, HttpClientError>>;
+}
+/** Outbound HTTP requests with a timeout, a status check and JSON parsing. */
+export declare const HttpClient: import("@webiny/di").Abstraction<IHttpClient>;
+export declare namespace HttpClient {
+    type Interface = IHttpClient;
+    type Request = IHttpClientRequest;
+    type Method = HttpMethod;
+    type Error = HttpClientError;
+}
+export {};

package/features/httpClient/abstractions.js

@@ -0,0 +1,5 @@
+import { createAbstraction } from "@webiny/feature/api";
+const HttpClient = createAbstraction("HttpClient");
+export { HttpClient };
+
+//# sourceMappingURL=abstractions.js.map

package/features/httpClient/abstractions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/httpClient/abstractions.js","sources":["../../../src/features/httpClient/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { Result } from \"@webiny/feature/api\";\nimport type { HttpRequestError } from \"./HttpRequestError.js\";\nimport type { HttpStatusError } from \"./HttpStatusError.js\";\n\nexport type HttpMethod = \"GET\" | \"POST\" | \"PUT\" | \"PATCH\" | \"DELETE\";\n\nexport interface IHttpClientRequest {\n    url: string;\n    method?: HttpMethod; // defaults to \"GET\"\n    headers?: Record<string, string>;\n    body?: unknown; // sent as JSON\n    timeoutMs?: number; // defaults to 10 seconds\n}\n\nexport interface IHttpClientErrors {\n    request: HttpRequestError;\n    status: HttpStatusError;\n}\n\ntype HttpClientError = IHttpClientErrors[keyof IHttpClientErrors];\n\nexport interface IHttpClient {\n    /**\n     * Sends a request and parses the response body as JSON. The body is `unknown` on purpose:\n     * validate it before use.\n     */\n    requestJson(request: IHttpClientRequest): Promise<Result<unknown, HttpClientError>>;\n}\n\n/** Outbound HTTP requests with a timeout, a status check and JSON parsing. */\nexport const HttpClient = createAbstraction<IHttpClient>(\"HttpClient\");\n\nexport namespace HttpClient {\n    export type Interface = IHttpClient;\n    export type Request = IHttpClientRequest;\n    export type Method = HttpMethod;\n    export type Error = HttpClientError;\n}\n"],"names":["HttpClient","createAbstraction"],"mappings":";AA+BO,MAAMA,aAAaC,kBAA+B"}

package/features/httpClient/feature.d.ts

@@ -0,0 +1,4 @@
+export declare const HttpClientFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};

package/features/httpClient/feature.js

@@ -0,0 +1,11 @@
+import { createFeature } from "@webiny/feature/api";
+import { HttpClient } from "./HttpClient.js";
+const HttpClientFeature = createFeature({
+    name: "HttpClientFeature",
+    register (container) {
+        container.register(HttpClient).inSingletonScope();
+    }
+});
+export { HttpClientFeature };
+
+//# sourceMappingURL=feature.js.map

package/features/httpClient/feature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/httpClient/feature.js","sources":["../../../src/features/httpClient/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { HttpClient } from \"./HttpClient.js\";\n\nexport const HttpClientFeature = createFeature({\n    name: \"HttpClientFeature\",\n    register(container) {\n        container.register(HttpClient).inSingletonScope();\n    }\n});\n"],"names":["HttpClientFeature","createFeature","container","HttpClient"],"mappings":";;AAGO,MAAMA,oBAAoBC,cAAc;IAC3C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC,YAAY,gBAAgB;IACnD;AACJ"}

package/features/httpClient/index.d.ts

@@ -0,0 +1,3 @@
+export { HttpClient } from "./abstractions.js";
+export { HttpRequestError } from "./HttpRequestError.js";
+export { HttpStatusError } from "./HttpStatusError.js";

package/features/httpClient/index.js

@@ -0,0 +1,3 @@
+export { HttpClient } from "./abstractions.js";
+export { HttpRequestError } from "./HttpRequestError.js";
+export { HttpStatusError } from "./HttpStatusError.js";

package/idp/JwksCache.d.ts

@@ -1,7 +1,12 @@
 import type { Jwk } from "../features/security/utils/verifyJwtUsingJwk.js";
+import { HttpClient } from "../features/httpClient/index.js";
 import { JwkCache } from "./abstractions.js";
-export declare class JwksCache implements JwkCache.Interface {
+declare class JwksCacheImpl implements JwkCache.Interface {
+    private readonly httpClient;
     private cache;
+    constructor(httpClient: HttpClient.Interface);
     getKeys(issuer: string): Promise<Jwk[]>;
-    clearCache(): void;
+    private fetchJson;
 }
+export declare const JwksCache: import("@webiny/di").Implementation<typeof JwksCacheImpl>;
+export {};

package/idp/JwksCache.js

@@ -1,26 +1,53 @@
-class JwksCache {
+import { createImplementation } from "@webiny/feature/api";
+import { z } from "zod";
+import { HttpClient } from "../features/httpClient/index.js";
+import { JwkCache } from "./abstractions.js";
+const oidcConfigurationSchema = z.object({
+    jwks_uri: z.string()
+});
+const jwksSchema = z.object({
+    keys: z.array(z.looseObject({
+        kid: z.string().optional()
+    }))
+});
+function getOpenidConfigurationUrl(issuer) {
+    const openidUrl = new URL(issuer);
+    const pathname = openidUrl.pathname + "/.well-known/openid-configuration";
+    openidUrl.pathname = pathname.replace(/\/+/g, "/");
+    return openidUrl.toString();
+}
+class JwksCacheImpl {
+    constructor(httpClient){
+        this.httpClient = httpClient;
+        this.cache = new Map();
+    }
     async getKeys(issuer) {
         const cached = this.cache.get(issuer);
-        if (cached) return cached.jwks;
-        const openidUrl = new URL(issuer);
-        const pathname = openidUrl.pathname + "/.well-known/openid-configuration";
-        openidUrl.pathname = pathname.replace(/\/+/g, "/");
-        const oidcConfig = await fetch(openidUrl.toString()).then((res)=>res.json());
-        const jwksResponse = await fetch(oidcConfig.jwks_uri).then((res)=>res.json());
+        if (cached) return cached;
+        const openidConfigurationUrl = getOpenidConfigurationUrl(issuer);
+        const oidcConfig = await this.fetchJson(openidConfigurationUrl, oidcConfigurationSchema);
+        const jwksResponse = await this.fetchJson(oidcConfig.jwks_uri, jwksSchema);
         const jwks = jwksResponse.keys;
-        this.cache.set(issuer, {
-            oidcConfig,
-            jwks
-        });
+        this.cache.set(issuer, jwks);
         return jwks;
     }
-    clearCache() {
-        this.cache.clear();
-    }
-    constructor(){
-        this.cache = new Map();
+    async fetchJson(url, schema) {
+        const response = await this.httpClient.requestJson({
+            url
+        });
+        if (response.isFail()) throw response.error;
+        const result = schema.safeParse(response.value);
+        if (!result.success) throw new Error(`Invalid response from "${url}": ${result.error.message}`);
+        return result.data;
     }
 }
+const JwksCache = createImplementation({
+    abstraction: JwkCache,
+    implementation: JwksCacheImpl,
+    dependencies: [
+        HttpClient
+    ]
+});
 export { JwksCache };
 
 //# sourceMappingURL=JwksCache.js.map

package/idp/JwksCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"idp/JwksCache.js","sources":["../../src/idp/JwksCache.ts"],"sourcesContent":["import type { Jwk } from \"~/features/security/utils/verifyJwtUsingJwk.js\";\nimport { JwkCache } from \"./abstractions.js\";\n\ninterface OidcConfiguration {\n    jwks_uri: string;\n    [key: string]: any;\n}\n\ninterface CacheEntry {\n    oidcConfig: OidcConfiguration;\n    jwks: Jwk[];\n}\n\nexport class JwksCache implements JwkCache.Interface {\n    private cache = new Map<string, CacheEntry>();\n\n    async getKeys(issuer: string): Promise<Jwk[]> {\n        // Check cache first\n        const cached = this.cache.get(issuer);\n        if (cached) {\n            return cached.jwks;\n        }\n\n        // Fetch OIDC configuration\n        const openidUrl = new URL(issuer);\n        const pathname = openidUrl.pathname + \"/.well-known/openid-configuration\";\n        openidUrl.pathname = pathname.replace(/\\/+/g, \"/\");\n\n        const oidcConfig = await fetch(openidUrl.toString()).then(\n            res => res.json() as Promise<OidcConfiguration>\n        );\n\n        // Fetch JWKs from jwks_uri\n        const jwksResponse = await fetch(oidcConfig.jwks_uri).then(res => res.json());\n        const jwks = jwksResponse.keys as Jwk[];\n\n        // Cache both config and JWKs\n        this.cache.set(issuer, {\n            oidcConfig,\n            jwks\n        });\n\n        return jwks;\n    }\n\n    clearCache(): void {\n        this.cache.clear();\n    }\n}\n"],"names":["JwksCache","issuer","cached","openidUrl","URL","pathname","oidcConfig","fetch","res","jwksResponse","jwks","Map"],"mappings":"AAaO,MAAMA;IAGT,MAAM,QAAQC,MAAc,EAAkB;QAE1C,MAAMC,SAAS,IAAI,CAAC,KAAK,CAAC,GAAG,CAACD;QAC9B,IAAIC,QACA,OAAOA,OAAO,IAAI;QAItB,MAAMC,YAAY,IAAIC,IAAIH;QAC1B,MAAMI,WAAWF,UAAU,QAAQ,GAAG;QACtCA,UAAU,QAAQ,GAAGE,SAAS,OAAO,CAAC,QAAQ;QAE9C,MAAMC,aAAa,MAAMC,MAAMJ,UAAU,QAAQ,IAAI,IAAI,CACrDK,CAAAA,MAAOA,IAAI,IAAI;QAInB,MAAMC,eAAe,MAAMF,MAAMD,WAAW,QAAQ,EAAE,IAAI,CAACE,CAAAA,MAAOA,IAAI,IAAI;QAC1E,MAAME,OAAOD,aAAa,IAAI;QAG9B,IAAI,CAAC,KAAK,CAAC,GAAG,CAACR,QAAQ;YACnBK;YACAI;QACJ;QAEA,OAAOA;IACX;IAEA,aAAmB;QACf,IAAI,CAAC,KAAK,CAAC,KAAK;IACpB;;aAjCQ,KAAK,GAAG,IAAIC;;AAkCxB"}
+{"version":3,"file":"idp/JwksCache.js","sources":["../../src/idp/JwksCache.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport { z } from \"zod\";\nimport type { Jwk } from \"~/features/security/utils/verifyJwtUsingJwk.js\";\nimport { HttpClient } from \"~/features/httpClient/index.js\";\nimport { JwkCache } from \"./abstractions.js\";\n\nconst oidcConfigurationSchema = z.object({\n    jwks_uri: z.string()\n});\n\nconst jwksSchema = z.object({\n    keys: z.array(z.looseObject({ kid: z.string().optional() }))\n});\n\nfunction getOpenidConfigurationUrl(issuer: string): string {\n    const openidUrl = new URL(issuer);\n    const pathname = openidUrl.pathname + \"/.well-known/openid-configuration\";\n    openidUrl.pathname = pathname.replace(/\\/+/g, \"/\");\n    return openidUrl.toString();\n}\n\nclass JwksCacheImpl implements JwkCache.Interface {\n    private cache = new Map<string, Jwk[]>();\n\n    constructor(private readonly httpClient: HttpClient.Interface) {}\n\n    async getKeys(issuer: string): Promise<Jwk[]> {\n        const cached = this.cache.get(issuer);\n        if (cached) {\n            return cached;\n        }\n\n        const openidConfigurationUrl = getOpenidConfigurationUrl(issuer);\n        const oidcConfig = await this.fetchJson(openidConfigurationUrl, oidcConfigurationSchema);\n        const jwksResponse = await this.fetchJson(oidcConfig.jwks_uri, jwksSchema);\n        const jwks: Jwk[] = jwksResponse.keys;\n\n        this.cache.set(issuer, jwks);\n\n        return jwks;\n    }\n\n    // Throws, so a failed fetch fails the token verification instead of caching a bad answer.\n    private async fetchJson<T>(url: string, schema: z.ZodType<T>): Promise<T> {\n        const response = await this.httpClient.requestJson({ url });\n        if (response.isFail()) {\n            throw response.error;\n        }\n\n        const result = schema.safeParse(response.value);\n        if (!result.success) {\n            throw new Error(`Invalid response from \"${url}\": ${result.error.message}`);\n        }\n\n        return result.data;\n    }\n}\n\nexport const JwksCache = createImplementation({\n    abstraction: JwkCache,\n    implementation: JwksCacheImpl,\n    dependencies: [HttpClient]\n});\n"],"names":["oidcConfigurationSchema","z","jwksSchema","getOpenidConfigurationUrl","issuer","openidUrl","URL","pathname","JwksCacheImpl","httpClient","Map","cached","openidConfigurationUrl","oidcConfig","jwksResponse","jwks","url","schema","response","result","Error","JwksCache","createImplementation","JwkCache","HttpClient"],"mappings":";;;;AAMA,MAAMA,0BAA0BC,EAAE,MAAM,CAAC;IACrC,UAAUA,EAAE,MAAM;AACtB;AAEA,MAAMC,aAAaD,EAAE,MAAM,CAAC;IACxB,MAAMA,EAAE,KAAK,CAACA,EAAE,WAAW,CAAC;QAAE,KAAKA,EAAE,MAAM,GAAG,QAAQ;IAAG;AAC7D;AAEA,SAASE,0BAA0BC,MAAc;IAC7C,MAAMC,YAAY,IAAIC,IAAIF;IAC1B,MAAMG,WAAWF,UAAU,QAAQ,GAAG;IACtCA,UAAU,QAAQ,GAAGE,SAAS,OAAO,CAAC,QAAQ;IAC9C,OAAOF,UAAU,QAAQ;AAC7B;AAEA,MAAMG;IAGF,YAA6BC,UAAgC,CAAE;aAAlCA,UAAU,GAAVA;aAFrB,KAAK,GAAG,IAAIC;IAE4C;IAEhE,MAAM,QAAQN,MAAc,EAAkB;QAC1C,MAAMO,SAAS,IAAI,CAAC,KAAK,CAAC,GAAG,CAACP;QAC9B,IAAIO,QACA,OAAOA;QAGX,MAAMC,yBAAyBT,0BAA0BC;QACzD,MAAMS,aAAa,MAAM,IAAI,CAAC,SAAS,CAACD,wBAAwBZ;QAChE,MAAMc,eAAe,MAAM,IAAI,CAAC,SAAS,CAACD,WAAW,QAAQ,EAAEX;QAC/D,MAAMa,OAAcD,aAAa,IAAI;QAErC,IAAI,CAAC,KAAK,CAAC,GAAG,CAACV,QAAQW;QAEvB,OAAOA;IACX;IAGA,MAAc,UAAaC,GAAW,EAAEC,MAAoB,EAAc;QACtE,MAAMC,WAAW,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YAAEF;QAAI;QACzD,IAAIE,SAAS,MAAM,IACf,MAAMA,SAAS,KAAK;QAGxB,MAAMC,SAASF,OAAO,SAAS,CAACC,SAAS,KAAK;QAC9C,IAAI,CAACC,OAAO,OAAO,EACf,MAAM,IAAIC,MAAM,CAAC,uBAAuB,EAAEJ,IAAI,GAAG,EAAEG,OAAO,KAAK,CAAC,OAAO,EAAE;QAG7E,OAAOA,OAAO,IAAI;IACtB;AACJ;AAEO,MAAME,YAAYC,qBAAqB;IAC1C,aAAaC;IACb,gBAAgBf;IAChB,cAAc;QAACgB;KAAW;AAC9B"}

package/idp/feature.js

@@ -1,6 +1,5 @@
 import { createFeature } from "@webiny/feature/api";
 import { JwtAuthenticator } from "./JwtAuthenticator.js";
-import { JwkCache } from "./abstractions.js";
 import { JwksCache } from "./JwksCache.js";
 import { OidcJwtIdentityProvider } from "./OidcJwtIdentityProvider.js";
 const IdpAuthenticatorFeature = createFeature({
@@ -8,7 +7,7 @@ const IdpAuthenticatorFeature = createFeature({
     register (container) {
         container.register(JwtAuthenticator);
         container.register(OidcJwtIdentityProvider);
-        container.registerInstance(JwkCache, new JwksCache());
+        container.register(JwksCache).inSingletonScope();
     }
 });
 export { IdpAuthenticatorFeature };

package/idp/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"idp/feature.js","sources":["../../src/idp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { JwtAuthenticator } from \"./JwtAuthenticator.js\";\nimport { JwkCache } from \"./abstractions.js\";\nimport { JwksCache } from \"./JwksCache.js\";\nimport { OidcJwtIdentityProvider } from \"~/idp/OidcJwtIdentityProvider.js\";\n\nexport const IdpAuthenticatorFeature = createFeature({\n    name: \"IdpAuthenticator\",\n    register(container) {\n        container.register(JwtAuthenticator);\n        container.register(OidcJwtIdentityProvider);\n        container.registerInstance(JwkCache, new JwksCache());\n    }\n});\n"],"names":["IdpAuthenticatorFeature","createFeature","container","JwtAuthenticator","OidcJwtIdentityProvider","JwkCache","JwksCache"],"mappings":";;;;;AAMO,MAAMA,0BAA0BC,cAAc;IACjD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QACnBF,UAAU,gBAAgB,CAACG,UAAU,IAAIC;IAC7C;AACJ"}
+{"version":3,"file":"idp/feature.js","sources":["../../src/idp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { JwtAuthenticator } from \"./JwtAuthenticator.js\";\nimport { JwksCache } from \"./JwksCache.js\";\nimport { OidcJwtIdentityProvider } from \"~/idp/OidcJwtIdentityProvider.js\";\n\nexport const IdpAuthenticatorFeature = createFeature({\n    name: \"IdpAuthenticator\",\n    register(container) {\n        container.register(JwtAuthenticator);\n        container.register(OidcJwtIdentityProvider);\n        // Singleton, so the keys stay cached for the life of the process.\n        container.register(JwksCache).inSingletonScope();\n    }\n});\n"],"names":["IdpAuthenticatorFeature","createFeature","container","JwtAuthenticator","OidcJwtIdentityProvider","JwksCache"],"mappings":";;;;AAKO,MAAMA,0BAA0BC,cAAc;IACjD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QAEnBF,UAAU,QAAQ,CAACG,WAAW,gBAAgB;IAClD;AACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-core",
-	"version": "6.5.0-beta.5",
+	"version": "6.5.0-beta.6",
 	"type": "module",
 	"repository": {
 		"type": "git",
@@ -17,17 +17,17 @@
 		"@ai-sdk/anthropic": "4.0.65",
 		"@ai-sdk/google": "4.0.82",
 		"@ai-sdk/openai": "4.0.78",
-		"@webiny/api": "6.5.0-beta.5",
+		"@webiny/api": "6.5.0-beta.6",
 		"@webiny/di": "1.1.0",
-		"@webiny/error": "6.5.0-beta.5",
-		"@webiny/feature": "6.5.0-beta.5",
-		"@webiny/feature-flags": "6.5.0-beta.5",
-		"@webiny/handler": "6.5.0-beta.5",
-		"@webiny/handler-db": "6.5.0-beta.5",
-		"@webiny/handler-graphql": "6.5.0-beta.5",
-		"@webiny/plugins": "6.5.0-beta.5",
-		"@webiny/utils": "6.5.0-beta.5",
-		"@webiny/wcp": "6.5.0-beta.5",
+		"@webiny/error": "6.5.0-beta.6",
+		"@webiny/feature": "6.5.0-beta.6",
+		"@webiny/feature-flags": "6.5.0-beta.6",
+		"@webiny/handler": "6.5.0-beta.6",
+		"@webiny/handler-db": "6.5.0-beta.6",
+		"@webiny/handler-graphql": "6.5.0-beta.6",
+		"@webiny/plugins": "6.5.0-beta.6",
+		"@webiny/utils": "6.5.0-beta.6",
+		"@webiny/wcp": "6.5.0-beta.6",
 		"ai": "7.0.118",
 		"dataloader": "2.2.3",
 		"jose": "6.2.12",
@@ -40,9 +40,9 @@
 	},
 	"devDependencies": {
 		"@types/jsonwebtoken": "9.0.10",
-		"@webiny/build-tools": "6.5.0-beta.5",
-		"@webiny/handler-aws": "6.5.0-beta.5",
-		"@webiny/project-utils": "6.5.0-beta.5",
+		"@webiny/build-tools": "6.5.0-beta.6",
+		"@webiny/handler-aws": "6.5.0-beta.6",
+		"@webiny/project-utils": "6.5.0-beta.6",
 		"rimraf": "6.1.3",
 		"typescript": "7.0.2",
 		"vitest": "5.0.2"