@contentful/optimization-api-client 0.1.0-alpha7 → 0.1.0-alpha9

package/dist/index.mjs

@@ -1,88 +1,8 @@
-import * as __rspack_external__contentful_optimization_api_schemas_66dcf407 from "@contentful/optimization-api-schemas";
-import { diary, enable } from "diary";
-import "diary/utils";
-import p_retry from "p-retry";
-import { merge } from "es-toolkit";
+import { merge } from "es-toolkit/object";
 import { boolean as mini_boolean, extend, number, object, optional, partial, prefault, string } from "zod/mini";
-class Logger {
-    name = '@contentful/optimization';
-    PREFIX_PARTS = [
-        'Ctfl',
-        'O10n'
-    ];
-    DELIMITER = ':';
-    diary;
-    sinks = [];
-    constructor(){
-        this.diary = diary(this.name, this.onLogEvent.bind(this));
-        enable(this.name);
-    }
-    assembleLocationPrefix(logLocation) {
-        return `[${[
-            ...this.PREFIX_PARTS,
-            logLocation
-        ].join(this.DELIMITER)}]`;
-    }
-    addSink(sink) {
-        this.sinks = [
-            ...this.sinks.filter((existingSink)=>existingSink.name !== sink.name),
-            sink
-        ];
-    }
-    removeSink(name) {
-        this.sinks = this.sinks.filter((sink)=>sink.name !== name);
-    }
-    removeSinks() {
-        this.sinks = [];
-    }
-    debug(logLocation, message, ...args) {
-        this.diary.debug(`${this.assembleLocationPrefix(logLocation)} ${message}`, ...args);
-    }
-    info(logLocation, message, ...args) {
-        this.diary.info(`${this.assembleLocationPrefix(logLocation)} ${message}`, ...args);
-    }
-    log(logLocation, message, ...args) {
-        this.diary.log(`${this.assembleLocationPrefix(logLocation)} ${message}`, ...args);
-    }
-    warn(logLocation, message, ...args) {
-        this.diary.warn(`${this.assembleLocationPrefix(logLocation)} ${message}`, ...args);
-    }
-    error(logLocation, message, ...args) {
-        this.diary.error(`${this.assembleLocationPrefix(logLocation)} ${message}`, ...args);
-    }
-    fatal(logLocation, message, ...args) {
-        this.diary.fatal(`${this.assembleLocationPrefix(logLocation)} ${message}`, ...args);
-    }
-    onLogEvent(event) {
-        this.sinks.forEach((sink)=>{
-            sink.ingest(event);
-        });
-    }
-}
-const logger = new Logger();
-function createScopedLogger(location) {
-    return {
-        debug: (message, ...args)=>{
-            logger.debug(location, message, ...args);
-        },
-        info: (message, ...args)=>{
-            logger.info(location, message, ...args);
-        },
-        log: (message, ...args)=>{
-            logger.log(location, message, ...args);
-        },
-        warn: (message, ...args)=>{
-            logger.warn(location, message, ...args);
-        },
-        error: (message, ...args)=>{
-            logger.error(location, message, ...args);
-        },
-        fatal: (message, ...args)=>{
-            logger.fatal(location, message, ...args);
-        }
-    };
-}
-const createRetryFetchMethod_logger = createScopedLogger('ApiClient:Retry');
+import { createScopedLogger } from "./649.mjs";
+import { __rspack_external__contentful_optimization_api_schemas_66dcf407 } from "./199.mjs";
+const logger = createScopedLogger('ApiClient:Retry');
 const DEFAULT_INTERVAL_TIMEOUT = 0;
 const DEFAULT_RETRY_COUNT = 1;
 const RETRY_RESPONSE_STATUS = 503;
@@ -102,44 +22,55 @@ function createRetryFetchCallback({ apiName = 'Optimization', controller, fetchM
             if (response.status === RETRY_RESPONSE_STATUS) throw new HttpError(`${apiName} API request to "${url.toString()}" failed with status: "[${response.status}] ${response.statusText}".`, RETRY_RESPONSE_STATUS);
             if (!response.ok) {
                 const httpError = new Error(`Request to "${url.toString()}" failed with status: [${response.status}] ${response.statusText} - traceparent: ${response.headers.get('traceparent')}`);
-                createRetryFetchMethod_logger.error('Request failed with non-OK status:', httpError);
+                logger.error('Request failed with non-OK status:', httpError);
                 controller.abort();
                 return;
             }
-            createRetryFetchMethod_logger.debug(`Response from "${url.toString()}":`, response);
+            logger.debug(`Response from "${url.toString()}":`, response);
             return response;
         } catch (error) {
             if (error instanceof HttpError && error.status === RETRY_RESPONSE_STATUS) throw error;
-            createRetryFetchMethod_logger.error(`Request to "${url.toString()}" failed:`, error);
+            logger.error(`Request to "${url.toString()}" failed:`, error);
             controller.abort();
         }
     };
 }
+async function delayRetry(intervalTimeout) {
+    if (intervalTimeout <= 0) return;
+    const { promise, resolve } = Promise.withResolvers();
+    setTimeout(()=>{
+        resolve(void 0);
+    }, intervalTimeout);
+    await promise;
+}
 function createRetryFetchMethod({ apiName = 'Optimization', fetchMethod = fetch, intervalTimeout = DEFAULT_INTERVAL_TIMEOUT, onFailedAttempt, retries = DEFAULT_RETRY_COUNT } = {}) {
     return async (url, init)=>{
         const controller = new AbortController();
-        let retryResponse;
-        try {
-            retryResponse = await p_retry(createRetryFetchCallback({
+        const maxAttempts = retries + 1;
+        const attemptFetch = createRetryFetchCallback({
+            apiName,
+            controller,
+            fetchMethod,
+            init,
+            url
+        });
+        for(let attemptNumber = 1; attemptNumber <= maxAttempts; attemptNumber++)try {
+            const response = await attemptFetch();
+            if (response) return response;
+            break;
+        } catch (error) {
+            if (!(error instanceof HttpError) || error.status !== RETRY_RESPONSE_STATUS) throw error;
+            const retriesLeft = maxAttempts - attemptNumber;
+            onFailedAttempt?.({
                 apiName,
-                controller,
-                fetchMethod,
-                init,
-                url
-            }), {
-                minTimeout: intervalTimeout,
-                onFailedAttempt: (options)=>onFailedAttempt?.({
-                        ...options,
-                        apiName
-                    }),
-                retries,
-                signal: controller.signal
+                error,
+                attemptNumber,
+                retriesLeft
             });
-        } catch (error) {
-            if (!(error instanceof Error) || 'AbortError' !== error.name) throw error;
+            if (0 === retriesLeft) throw error;
+            await delayRetry(intervalTimeout);
         }
-        if (!retryResponse) throw new Error(`${apiName} API request to "${url.toString()}" may not be retried.`);
-        return retryResponse;
+        throw new Error(`${apiName} API request to "${url.toString()}" may not be retried.`);
     };
 }
 const createTimeoutFetchMethod_logger = createScopedLogger('ApiClient:Timeout');
@@ -231,7 +162,7 @@ class ExperienceApiClient extends src_ApiClientBase {
             const response = await this.fetch(this.constructUrl(`v2/organizations/${this.clientId}/environments/${this.environment}/profiles/${id}`, options), {
                 method: 'GET'
             });
-            const { data: { changes, experiences, profile } } = __rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceResponse.parse(await response.json());
+            const { data: { changes, experiences, profile } } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(__rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceResponse, await response.json());
             const data = {
                 changes,
                 personalizations: experiences,
@@ -257,10 +188,7 @@ class ExperienceApiClient extends src_ApiClientBase {
     async createProfile({ events }, options = {}) {
         const requestName = 'Create Profile';
         ExperienceApiClient_logger.info(`Sending "${requestName}" request`);
-        const body = {
-            events: __rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceEventArray.parse(events),
-            options: this.constructBodyOptions(options)
-        };
+        const body = this.constructExperienceRequestBody(events, options);
         ExperienceApiClient_logger.debug(`"${requestName}" request body:`, body);
         try {
             const response = await this.makeProfileMutationRequest({
@@ -268,7 +196,7 @@ class ExperienceApiClient extends src_ApiClientBase {
                 body,
                 options
             });
-            const { data: { changes, experiences, profile } } = __rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceResponse.parse(await response.json());
+            const { data: { changes, experiences, profile } } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(__rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceResponse, await response.json());
             const data = {
                 changes,
                 personalizations: experiences,
@@ -287,10 +215,7 @@ class ExperienceApiClient extends src_ApiClientBase {
         if (!profileId) throw new Error('Valid profile ID required.');
         const requestName = 'Update Profile';
         ExperienceApiClient_logger.info(`Sending "${requestName}" request`);
-        const body = {
-            events: __rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceEventArray.parse(events),
-            options: this.constructBodyOptions(options)
-        };
+        const body = this.constructExperienceRequestBody(events, options);
         ExperienceApiClient_logger.debug(`"${requestName}" request body:`, body);
         try {
             const response = await this.makeProfileMutationRequest({
@@ -298,7 +223,7 @@ class ExperienceApiClient extends src_ApiClientBase {
                 body,
                 options
             });
-            const { data: { changes, experiences, profile } } = __rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceResponse.parse(await response.json());
+            const { data: { changes, experiences, profile } } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(__rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceResponse, await response.json());
             const data = {
                 changes,
                 personalizations: experiences,
@@ -325,10 +250,10 @@ class ExperienceApiClient extends src_ApiClientBase {
     async upsertManyProfiles({ events }, options = {}) {
         const requestName = 'Upsert Many Profiles';
         ExperienceApiClient_logger.info(`Sending "${requestName}" request`);
-        const body = {
-            events: __rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceEventArray.parse(events),
+        const body = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(__rspack_external__contentful_optimization_api_schemas_66dcf407.BatchExperienceRequestData, {
+            events,
             options: this.constructBodyOptions(options)
-        };
+        });
         ExperienceApiClient_logger.debug(`"${requestName}" request body:`, body);
         try {
             const response = await this.makeProfileMutationRequest({
@@ -339,7 +264,7 @@ class ExperienceApiClient extends src_ApiClientBase {
                     ...options
                 }
             });
-            const { data: { profiles } } = __rspack_external__contentful_optimization_api_schemas_66dcf407.BatchExperienceResponse.parse(await response.json());
+            const { data: { profiles } } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(__rspack_external__contentful_optimization_api_schemas_66dcf407.BatchExperienceResponse, await response.json());
             ExperienceApiClient_logger.debug(`"${requestName}" request successfully completed`);
             return profiles;
         } catch (error) {
@@ -373,6 +298,12 @@ class ExperienceApiClient extends src_ApiClientBase {
         ];
         return bodyOptions;
     };
+    constructExperienceRequestBody(events, options) {
+        return __rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceRequestData.parse({
+            events: (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(__rspack_external__contentful_optimization_api_schemas_66dcf407.ExperienceEventArray, events),
+            options: this.constructBodyOptions(options)
+        });
+    }
 }
 const experience = ExperienceApiClient;
 const InsightsApiClient_logger = createScopedLogger('ApiClient:Insights');
@@ -389,7 +320,7 @@ class InsightsApiClient extends src_ApiClientBase {
     async sendBatchEvents(batches, options = {}) {
         const { beaconHandler = this.beaconHandler } = options;
         const url = new URL(`v1/organizations/${this.clientId}/environments/${this.environment}/events`, this.baseUrl);
-        const body = __rspack_external__contentful_optimization_api_schemas_66dcf407.BatchInsightsEventArray.parse(batches);
+        const body = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(__rspack_external__contentful_optimization_api_schemas_66dcf407.BatchInsightsEventArray, batches);
         if ('function' == typeof beaconHandler) {
             InsightsApiClient_logger.debug('Queueing events via beaconHandler');
             const beaconSuccessfullyQueued = beaconHandler(url, body);
@@ -424,7 +355,12 @@ class ApiClient {
     experience;
     insights;
     constructor(config){
-        const { personalization, analytics, ...apiConfig } = config;
+        const { personalization, analytics, clientId, environment, fetchOptions } = config;
+        const apiConfig = {
+            clientId,
+            environment,
+            fetchOptions
+        };
         this.config = apiConfig;
         this.experience = new experience({
             ...apiConfig,
@@ -444,11 +380,20 @@ const UniversalEventBuilderArgs = object({
     screen: optional(__rspack_external__contentful_optimization_api_schemas_66dcf407.Screen),
     userAgent: optional(string())
 });
-const ComponentViewBuilderArgs = extend(UniversalEventBuilderArgs, {
+const ComponentInteractionBuilderArgsBase = extend(UniversalEventBuilderArgs, {
     componentId: string(),
     experienceId: optional(string()),
-    variantIndex: optional(number()),
-    sticky: optional(mini_boolean())
+    variantIndex: optional(number())
+});
+const ComponentViewBuilderArgs = extend(ComponentInteractionBuilderArgsBase, {
+    sticky: optional(mini_boolean()),
+    componentViewId: string(),
+    viewDurationMs: number()
+});
+const ComponentClickBuilderArgs = ComponentInteractionBuilderArgsBase;
+const ComponentHoverBuilderArgs = extend(ComponentInteractionBuilderArgsBase, {
+    componentHoverId: string(),
+    hoverDurationMs: number()
 });
 const IdentifyBuilderArgs = extend(UniversalEventBuilderArgs, {
     traits: optional(__rspack_external__contentful_optimization_api_schemas_66dcf407.Traits),
@@ -512,17 +457,40 @@ class EventBuilder {
             timestamp
         };
     }
-    buildComponentView(args) {
-        const { componentId, experienceId, variantIndex, ...universal } = ComponentViewBuilderArgs.parse(args);
+    buildEntryComponentBase(universal, componentId, experienceId, variantIndex) {
         return {
             ...this.buildUniversalEventProperties(universal),
-            type: 'component',
             componentType: 'Entry',
             componentId,
             experienceId,
             variantIndex: variantIndex ?? 0
         };
     }
+    buildComponentView(args) {
+        const { componentId, componentViewId, experienceId, variantIndex, viewDurationMs, ...universal } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(ComponentViewBuilderArgs, args);
+        return {
+            ...this.buildEntryComponentBase(universal, componentId, experienceId, variantIndex),
+            type: 'component',
+            componentViewId,
+            viewDurationMs
+        };
+    }
+    buildComponentClick(args) {
+        const { componentId, experienceId, variantIndex, ...universal } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(ComponentClickBuilderArgs, args);
+        return {
+            ...this.buildEntryComponentBase(universal, componentId, experienceId, variantIndex),
+            type: 'component_click'
+        };
+    }
+    buildComponentHover(args) {
+        const { componentHoverId, componentId, experienceId, hoverDurationMs, variantIndex, ...universal } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(ComponentHoverBuilderArgs, args);
+        return {
+            ...this.buildEntryComponentBase(universal, componentId, experienceId, variantIndex),
+            type: 'component_hover',
+            componentHoverId,
+            hoverDurationMs
+        };
+    }
     buildFlagView(args) {
         return {
             ...this.buildComponentView(args),
@@ -530,7 +498,7 @@ class EventBuilder {
         };
     }
     buildIdentify(args) {
-        const { traits = {}, userId, ...universal } = IdentifyBuilderArgs.parse(args);
+        const { traits = {}, userId, ...universal } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(IdentifyBuilderArgs, args);
         return {
             ...this.buildUniversalEventProperties(universal),
             type: 'identify',
@@ -539,14 +507,14 @@ class EventBuilder {
         };
     }
     buildPageView(args = {}) {
-        const { properties = {}, ...universal } = PageViewBuilderArgs.parse(args);
+        const { properties = {}, ...universal } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(PageViewBuilderArgs, args);
         const pageProperties = this.getPageProperties();
         const merged = merge({
             ...pageProperties,
             title: pageProperties.title ?? DEFAULT_PAGE_PROPERTIES.title
         }, properties);
         const { context: { screen: _, ...universalContext }, ...universalProperties } = this.buildUniversalEventProperties(universal);
-        const context = __rspack_external__contentful_optimization_api_schemas_66dcf407.PageEventContext.parse(universalContext);
+        const context = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(__rspack_external__contentful_optimization_api_schemas_66dcf407.PageEventContext, universalContext);
         return {
             ...universalProperties,
             context,
@@ -555,9 +523,9 @@ class EventBuilder {
         };
     }
     buildScreenView(args) {
-        const { name, properties, ...universal } = ScreenViewBuilderArgs.parse(args);
+        const { name, properties, ...universal } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(ScreenViewBuilderArgs, args);
         const { context: { page: _, ...universalContext }, ...universalProperties } = this.buildUniversalEventProperties(universal);
-        const context = __rspack_external__contentful_optimization_api_schemas_66dcf407.ScreenEventContext.parse(universalContext);
+        const context = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(__rspack_external__contentful_optimization_api_schemas_66dcf407.ScreenEventContext, universalContext);
         return {
             ...universalProperties,
             context,
@@ -567,7 +535,7 @@ class EventBuilder {
         };
     }
     buildTrack(args) {
-        const { event, properties = {}, ...universal } = TrackBuilderArgs.parse(args);
+        const { event, properties = {}, ...universal } = (0, __rspack_external__contentful_optimization_api_schemas_66dcf407.parseWithFriendlyError)(TrackBuilderArgs, args);
         return {
             ...this.buildUniversalEventProperties(universal),
             type: 'track',
@@ -577,7 +545,6 @@ class EventBuilder {
     }
 }
 const builders_EventBuilder = EventBuilder;
-export * from "@contentful/optimization-api-schemas";
 export { ApiClient, DEFAULT_PAGE_PROPERTIES, EXPERIENCE_BASE_URL, INSIGHTS_BASE_URL, builders_EventBuilder as EventBuilder };
 
 //# sourceMappingURL=index.mjs.map