@reservamos/browser-analytics 1.1.8-alpha.1 → 1.2.0-alpha.0

package/dist/browser-analytics.d.ts

@@ -158,6 +158,7 @@ declare const passengersCreatedSchema: z.ZodObject<{
 		"Passenger Document Type": string;
 		"Passenger Document Id": string;
 	}>, "many">>;
+	Coupon: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
 }, "strict", z.ZodTypeAny, {
 	product: "web" | "web-mobile" | "ios" | "android" | "app";
 	Trips: {
@@ -198,6 +199,7 @@ declare const passengersCreatedSchema: z.ZodObject<{
 		"Passenger Document Type": string;
 		"Passenger Document Id": string;
 	}[] | undefined;
+	Coupon?: string | undefined;
 }, {
 	product: "web" | "web-mobile" | "ios" | "android" | "app";
 	Trips: {
@@ -238,6 +240,7 @@ declare const passengersCreatedSchema: z.ZodObject<{
 		"Passenger Document Type": string;
 		"Passenger Document Id": string;
 	}[] | undefined;
+	Coupon?: string | undefined;
 }>;
 export type PassengersCreatedProps = z.infer<typeof passengersCreatedSchema>;
 declare function trackPassengersCreated(eventProps: PassengersCreatedProps, meta?: EventMetadata): void;
@@ -366,9 +369,9 @@ declare const paymentAttemptSchema: z.ZodObject<{
 		"Passenger Document Type": string;
 		"Passenger Document Id": string;
 	}[] | undefined;
+	Coupon?: string | undefined;
 	"Operation Id"?: string | undefined;
 	Insurance?: boolean | undefined;
-	Coupon?: string | undefined;
 	"User Status"?: string | undefined;
 }, {
 	product: "web" | "web-mobile" | "ios" | "android" | "app";
@@ -411,9 +414,9 @@ declare const paymentAttemptSchema: z.ZodObject<{
 		"Passenger Document Type": string;
 		"Passenger Document Id": string;
 	}[] | undefined;
+	Coupon?: string | undefined;
 	"Operation Id"?: string | undefined;
 	Insurance?: boolean | undefined;
-	Coupon?: string | undefined;
 	"User Status"?: string | undefined;
 }>;
 export type PaymentAttemptProps = z.infer<typeof paymentAttemptSchema>;
@@ -821,14 +824,23 @@ declare const purchaseConfirmationSchema: z.ZodObject<{
 	]>;
 	"Payment Type": z.ZodOptional<z.ZodString>;
 	Total: z.ZodOptional<z.ZodNumber>;
+	product: z.ZodOptional<z.ZodEffects<z.ZodEnum<[
+		"web",
+		"web-mobile",
+		"ios",
+		"android",
+		"app"
+	]>, "web" | "web-mobile" | "ios" | "android" | "app", "web" | "web-mobile" | "ios" | "android" | "app">>;
 }, "strict", z.ZodTypeAny, {
 	"Operation Id": string;
 	"Payment Status": "confirmed" | "pending_pix";
+	product?: "web" | "web-mobile" | "ios" | "android" | "app" | undefined;
 	Total?: number | undefined;
 	"Payment Type"?: string | undefined;
 }, {
 	"Operation Id": string;
 	"Payment Status": "confirmed" | "pending_pix";
+	product?: "web" | "web-mobile" | "ios" | "android" | "app" | undefined;
 	Total?: number | undefined;
 	"Payment Type"?: string | undefined;
 }>;
@@ -1300,6 +1312,7 @@ declare const analytics: {
 	identify: typeof identify;
 	identifiers: {
 		getFingerprintId: () => string | null;
+		waitForFingerprintId: (timeoutMs?: number) => Promise<string | null>;
 		getDistinctId: () => string | null;
 	};
 	profiles: {

package/dist/browser-analytics.esm.js

@@ -4173,7 +4173,8 @@ function r$3({ apiName: r2, defaultApiVersion: i }) {
       method: "POST",
       body: JSON.stringify(p3),
       headers: _2,
-      ...(f3 == null ? void 0 : f3.signal) && { signal: f3.signal }
+      ...(f3 == null ? void 0 : f3.signal) && { signal: f3.signal },
+      ...(f3 == null ? void 0 : f3.keepalive) !== void 0 && { keepalive: f3.keepalive }
     });
     return f3 ? y2 : await y2.json();
   }
@@ -4269,7 +4270,8 @@ async function a$3({ requestId: a2, visitorId: o2, distinctId: s2, purchaseToken
       responseType: "response",
       apiPrefix: "api",
       omitHeaders: ["Origin"],
-      signal: u2.signal
+      signal: u2.signal,
+      keepalive: true
     });
     return l2 && r$2(l2, {
       httpStatus: e3.status,
@@ -13471,7 +13473,7 @@ function observeIdentifyResult(stage, report, onTimeout) {
   }, 5e3);
   return { complete };
 }
-const version = "1.1.8-alpha.1";
+const version = "1.2.0-alpha.0";
 const MIXPANEL_DISTINCT_ID_CACHE_KEY = "mp_distinct_id";
 const readinessSubscribers$1 = /* @__PURE__ */ new Set();
 let initializing = false;
@@ -13528,6 +13530,21 @@ function identify$1(userId2, properties, report) {
   trackingLifecycle.identify(userId2);
   mixpanel.identify(userId2);
   if (!updateCachedDistinctId(userId2)) report == null ? void 0 : report("cache", "unavailable");
+  writePeopleProperties(properties, report);
+}
+function attachProperty(key, value) {
+  if (!isReady()) {
+    return;
+  }
+  mixpanel.people.union(key, [value]);
+}
+function setPeopleProperties(properties, report) {
+  if (!isReady()) {
+    return;
+  }
+  writePeopleProperties(properties, report);
+}
+function writePeopleProperties(properties, report) {
   if (!report) {
     mixpanel.people.set(properties);
     return;
@@ -13544,18 +13561,6 @@ function identify$1(userId2, properties, report) {
     observer.complete("failed");
   }
 }
-function attachProperty(key, value) {
-  if (!isReady()) {
-    return;
-  }
-  mixpanel.people.union(key, [value]);
-}
-function setPeopleProperties(properties) {
-  if (!isReady()) {
-    return;
-  }
-  mixpanel.people.set(properties);
-}
 function isReady() {
   return !initializing && window.mixpanel !== void 0;
 }
@@ -13566,8 +13571,7 @@ function track(eventName, properties) {
   mixpanel.track(eventName, { ...properties, "Reservamos Version": version });
 }
 const getMixpanelDistinctId = () => {
-  var _a;
-  const distinctId = (_a = mixpanel == null ? void 0 : mixpanel.get_distinct_id) == null ? void 0 : _a.call(mixpanel);
+  const distinctId = isReady() ? mixpanel.get_distinct_id() : null;
   if (distinctId) {
     updateCachedDistinctId(distinctId);
     return distinctId;
@@ -13602,7 +13606,10 @@ const DEFAULT_CACHE_TIME_IN_DAYS = 7;
 const PROXY_QUERY_PARAM = "apiKey=<apiKey>&version=<version>&loaderVersion=<loaderVersion>";
 let fingerprintAgentReady = false;
 let initialization$1 = 0;
+let startedInitialization = -1;
 const readinessSubscribers = /* @__PURE__ */ new Set();
+const waitingConsumers = /* @__PURE__ */ new Set();
+let pendingIdentification;
 function onReady(notify) {
   readinessSubscribers.add(notify);
   return () => {
@@ -13612,6 +13619,8 @@ function onReady(notify) {
 function invalidate() {
   initialization$1++;
   fingerprintAgentReady = false;
+  pendingIdentification = void 0;
+  waitingConsumers.forEach((cancel) => cancel());
 }
 const getExpirationDate = (cacheTimeInDays) => {
   const currentDate = /* @__PURE__ */ new Date();
@@ -13658,7 +13667,8 @@ async function initFingerprint(apiKey, proxyUrl) {
     customEndpointArray.unshift(proxyUrl);
     customScriptEndpointArray.unshift(buildProxyUrl(proxyUrl));
   }
-  invalidate();
+  if (startedInitialization === initialization$1) invalidate();
+  startedInitialization = initialization$1;
   const attempt = initialization$1;
   window.fingerprintConfig = {};
   const client = new FpjsClient({
@@ -13678,6 +13688,7 @@ async function initFingerprint(apiKey, proxyUrl) {
   } catch (error) {
     if (window.fpClient === client && attempt === initialization$1) {
       fingerprintAgentReady = false;
+      waitingConsumers.forEach((cancel) => cancel());
     }
     console.error("Error initializing identification service:", error);
     throw error;
@@ -13704,12 +13715,51 @@ async function identifyVisitor(ignoreCache = false, context) {
   return requestIdentification(ignoreCache, context);
 }
 async function requestIdentification(ignoreCache, context) {
+  if (!ignoreCache && (pendingIdentification == null ? void 0 : pendingIdentification.isCurrent())) {
+    for (const participant of pendingIdentification.contexts) {
+      if (participant && !participant.isActive())
+        pendingIdentification.contexts.delete(participant);
+    }
+    pendingIdentification.contexts.add(context);
+    return pendingIdentification.promise;
+  }
+  const contexts = /* @__PURE__ */ new Set([context]);
+  const attempt = initialization$1;
+  const currentLifecycle = trackingLifecycle.capture();
+  const isCurrent = () => attempt === initialization$1 && currentLifecycle();
+  const sharedContext = {
+    isActive: () => isCurrent() && [...contexts].some(
+      (participant) => !participant || participant.isActive()
+    ),
+    report: (...args) => {
+      for (const participant of contexts) {
+        if (participant == null ? void 0 : participant.isActive()) participant.report(...args);
+      }
+    }
+  };
+  const request = {
+    contexts,
+    isCurrent,
+    promise: performIdentification(
+      ignoreCache,
+      sharedContext,
+      () => contexts.has(void 0)
+    )
+  };
+  pendingIdentification = request;
+  const clear = () => {
+    if (pendingIdentification === request) pendingIdentification = void 0;
+  };
+  void request.promise.then(clear, clear);
+  return request.promise;
+}
+async function performIdentification(ignoreCache, context, hasUnscopedConsumer) {
   if (!isFingerprintReady()) {
     throw new Error("Identification service is not initialized.");
   }
   try {
     const result = await window.fpClient.getVisitorData({}, ignoreCache);
-    if (!context || context.isActive()) {
+    if (context.isActive()) {
       try {
         setCachedFingerprint(result.visitorId);
       } catch {
@@ -13721,8 +13771,9 @@ async function requestIdentification(ignoreCache, context) {
             "Visitor Found": result.visitorFound
           });
         } catch (error) {
-          if (context) context.report("fingerprint", "failed");
-          else console.error("Error updating Mixpanel visitor profile:", error);
+          context.report("fingerprint", "failed");
+          if (hasUnscopedConsumer())
+            console.error("Error updating Mixpanel visitor profile:", error);
         }
       }
     }
@@ -13734,10 +13785,46 @@ async function requestIdentification(ignoreCache, context) {
       cacheHit: result.cacheHit
     };
   } catch (error) {
-    if (!context) console.error("Error retrieving fingerprint:", error);
+    if (hasUnscopedConsumer())
+      console.error("Error retrieving fingerprint:", error);
     throw error;
   }
 }
+function waitForFingerprintId(timeoutMs = 2e3) {
+  if (!Number.isFinite(timeoutMs) || timeoutMs < 0 || timeoutMs > 2147483647)
+    return Promise.resolve(null);
+  const cached = getCachedFingerprint();
+  if (cached) return Promise.resolve(cached);
+  return new Promise((resolve) => {
+    let active = true;
+    let started = false;
+    const finish = (visitorId) => {
+      if (!active) return;
+      active = false;
+      clearTimeout(timer);
+      stopReady();
+      stopLifecycle();
+      waitingConsumers.delete(cancel);
+      resolve(visitorId);
+    };
+    const cancel = () => finish(null);
+    const start = () => {
+      if (!active || started || !isFingerprintReady()) return;
+      started = true;
+      const identity = getFingerprint(false, {
+        // Caller timeout ends waiting; the shared request still checks its lifecycle.
+        isActive: () => true,
+        report: () => void 0
+      });
+      void identity.then((visitorId) => finish(visitorId || null), cancel);
+    };
+    const timer = setTimeout(cancel, timeoutMs);
+    const stopReady = onReady(start);
+    const stopLifecycle = trackingLifecycle.onChange(cancel);
+    waitingConsumers.add(cancel);
+    start();
+  });
+}
 function isFingerprintReady() {
   return window.fpClient !== void 0 && fingerprintAgentReady;
 }
@@ -13748,7 +13835,8 @@ const fingerprintService = {
   isFingerprintReady,
   onReady,
   invalidate,
-  getCachedFingerprint
+  getCachedFingerprint,
+  waitForFingerprintId
 };
 trackingLifecycle.onInitialization(invalidate);
 function createPendingWorkQueue(options) {
@@ -14073,7 +14161,8 @@ const passengersCreatedSchema = z.object({
   "Trip Count": intField("Trip Count").optional(),
   "Total": numberField("Total"),
   "product": productValidation,
-  "Passengers": arrayField(passengerSchema, "Passengers", 1).optional()
+  "Passengers": arrayField(passengerSchema, "Passengers", 1).optional(),
+  "Coupon": stringField("Coupon").optional()
 }).strict();
 const EVENT_NAME$8 = "Passengers Created";
 function trackPassengersCreated(eventProps, meta = {}) {
@@ -14141,7 +14230,8 @@ const purchaseConfirmationSchema = z.object({
   "Operation Id": z.string().min(1, "Operation Id is required"),
   "Payment Status": z.enum(["confirmed", "pending_pix"]),
   "Payment Type": z.string().optional(),
-  "Total": z.number().optional()
+  "Total": z.number().optional(),
+  "product": productValidation.optional()
 }).strict();
 const EVENT_NAME$4 = "Purchase Confirmation Viewed";
 function trackPurchaseConfirmation(eventData, meta = {}) {
@@ -14957,6 +15047,7 @@ async function requestAnonymousProfile(payload, report) {
 }
 const KNOWN_PROPERTIES = ["firstName", "lastName", "email", "phone"];
 const FINGERPRINT_PROPERTY = "Known Fingerprints";
+let latestAttempt = 0;
 function mapProperties(properties) {
   const parsedProperties = {
     $first_name: properties == null ? void 0 : properties.firstName,
@@ -15026,12 +15117,58 @@ const identifyWithLocation = async (userId2, properties, report) => {
     else report("datalake", "failed");
   }
 };
+async function enrichProfileAndLocation(userId2, properties, isActive, report) {
+  const profile = await waitForIdentifyStage(
+    "profile",
+    3e3,
+    (context) => isActive() ? createAnonymousProfileForIdentify({ ...properties }, context.report) : Promise.resolve(void 0),
+    report
+  );
+  if (!isActive()) return;
+  const enriched = {
+    ...properties,
+    ...profile && { reservamos_one_id: profile.id }
+  };
+  if (profile) {
+    try {
+      mixpanelService.setPeopleProperties(
+        { reservamos_one_id: profile.id },
+        report
+      );
+    } catch {
+      report("profile", "failed");
+    }
+  }
+  void identifyWithLocation(userId2, enriched, report);
+}
+async function enrichFingerprint(isActive, report) {
+  const fingerprint = await waitForIdentifyStage(
+    "fingerprint",
+    2e3,
+    (context) => !isActive() ? Promise.resolve("") : getFingerprintForIdentify({
+      isActive: () => context.isActive() && isActive(),
+      report: context.report
+    }),
+    report
+  );
+  if (!fingerprint || !isActive()) return;
+  try {
+    mixpanelService.attachProperty(FINGERPRINT_PROPERTY, fingerprint);
+  } catch {
+    report("fingerprint", "failed");
+  }
+}
 async function identify(userId2, properties = {}) {
+  const attempt = ++latestAttempt;
+  const input = { ...properties };
   const report = createIdentifyReporter();
-  if (!await waitForIdentifyReady(report)) return;
+  const initialLifecycle = trackingLifecycle.capture();
+  if (!await waitForIdentifyReady(report) || attempt !== latestAttempt || !initialLifecycle())
+    return;
+  let submitted = false;
   try {
     try {
-      validatorService.parseIdentifyProps(properties);
+      validatorService.parseIdentifyProps(input);
       if (!userId2) {
         report("validation", "invalid_input");
         return;
@@ -15040,38 +15177,22 @@ async function identify(userId2, properties = {}) {
       report("validation", "invalid_input");
       return;
     }
-    const anonymousProfile = await waitForIdentifyStage(
-      "profile",
-      3e3,
-      (context) => createAnonymousProfileForIdentify({ ...properties }, context.report),
-      report
-    );
-    if (anonymousProfile) {
-      properties.reservamos_one_id = anonymousProfile.id;
-    }
-    const mappedProps = mapProperties(properties);
     try {
-      mixpanelService.identify(userId2, mappedProps, report);
+      mixpanelService.identify(userId2, mapProperties(input), report);
     } catch {
       report("mixpanel", "failed");
+      return;
     }
-    const fingerprint = await waitForIdentifyStage(
-      "fingerprint",
-      2e3,
-      getFingerprintForIdentify,
-      report
-    );
-    if (fingerprint) {
-      try {
-        mixpanelService.attachProperty(FINGERPRINT_PROPERTY, fingerprint);
-      } catch {
-        report("fingerprint", "failed");
-      }
-    }
-  } catch {
-    report("mixpanel", "failed");
+    const currentLifecycle = trackingLifecycle.capture();
+    const isActive = () => attempt === latestAttempt && currentLifecycle();
+    const scopedReport = (...args) => {
+      if (isActive()) report(...args);
+    };
+    submitted = true;
+    void enrichProfileAndLocation(userId2, input, isActive, scopedReport);
+    void enrichFingerprint(isActive, scopedReport);
   } finally {
-    void identifyWithLocation(userId2, properties, report);
+    if (!submitted) void identifyWithLocation(userId2, { ...input }, report);
   }
 }
 z.object({
@@ -15273,6 +15394,7 @@ const analytics = {
   identify,
   identifiers: {
     getFingerprintId: fingerprintService.getCachedFingerprint,
+    waitForFingerprintId: fingerprintService.waitForFingerprintId,
     getDistinctId: mixpanelService.getMixpanelDistinctId
   },
   profiles: {