@ada-support/embed2 1.13.0 → 1.13.2

package/dist/npm-entry/common/helpers/host-telemetry.d.ts

@@ -1,13 +1,15 @@
 import type { StartOptions } from "@ada-support/embed-types";
 export type HostTelemetrySurface = "mobile" | "browser";
-export type HostTelemetryPlatform = "ios" | "android" | "react_native" | "web" | "unknown";
+export type HostTelemetryPlatform = "ios" | "android" | "react-native" | "web" | "unknown";
 export type HostTelemetryWebSdkOrigin = "legacy" | "messaging";
+export type HostTelemetryMobileShell = "messaging-sdk" | "legacy-sdk";
 export interface HostTelemetryContext {
     surface: HostTelemetrySurface;
     hostPlatform: HostTelemetryPlatform;
     webSdkOrigin: HostTelemetryWebSdkOrigin;
+    mobileShell?: HostTelemetryMobileShell;
     mobilePackage?: string;
-    sdkVariant?: string;
+    mobileVersion?: string;
 }
 export declare const HOST_TELEMETRY_QUERY_PARAM = "ada_host_telemetry";
 type StartOptionsWithHostTelemetry = StartOptions & {
@@ -15,6 +17,7 @@ type StartOptionsWithHostTelemetry = StartOptions & {
 };
 export declare function resolveHostTelemetryFromStartOptions(adaSettings: StartOptionsWithHostTelemetry, options?: {
     pathname?: string;
+    protocol?: string;
 }): HostTelemetryContext;
 export declare function serializeHostTelemetry(hostTelemetry: HostTelemetryContext): string;
 export declare function shouldPropagateHostTelemetry(hostTelemetry: HostTelemetryContext): boolean;

package/dist/npm-entry/index.js

@@ -15919,7 +15919,7 @@ const client = new BrowserClient({
     return event;
   },
   environment: "production",
-  release: "1.13.0-a6606d6",
+  release: "1.13.2-ea8e50e",
   sampleRate: 0.25,
   autoSessionTracking: false,
   // Integrations don't seem to work with Sentry: https://github.com/getsentry/sentry-javascript/issues/2541
@@ -16509,7 +16509,7 @@ function getEmbedURL(_ref) {
   } else {
     host = `http://${handle}.localhost:${ports.localhost.default}`;
   }
-  return `${host}/embed/${frameName}/${"a6606d6"}/index.html`;
+  return `${host}/embed/${frameName}/${"ea8e50e"}/index.html`;
 }
 function constructQueryString(query) {
   return Object.keys(query).map(key => {
@@ -17697,9 +17697,9 @@ async function log(message, extra, options) {
       service: "embed",
       env: "production",
       embedVersion: 2,
-      version: "1.13.0",
+      version: "1.13.2",
       isNpm: true,
-      commitHash: "a6606d6"
+      commitHash: "ea8e50e"
     }))
   });
 }
@@ -18465,7 +18465,32 @@ const getChatVersionFromManifest = manifest => {
   dist/* adaLocalStorage */.BB.setItem("ada-embed_chat-manifest-cache", manifestString);
   return hash;
 };
+
+// Symmetric with embed-loader's `__ada-embed-version` URL param. The regex
+// approach mirrors embed-loader so behavior stays aligned across the two
+// loaders; see embed-loader/source/init.ts.
+const getURLParam = name => {
+  const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const results = new RegExp(`[?&]${escaped}=([^&#]*)`).exec(window.location.href);
+  if (!results) {
+    return null;
+  }
+  try {
+    return decodeURIComponent(results[1]);
+  } catch {
+    // Ignore malformed query overrides instead of breaking embed startup.
+    return null;
+  }
+};
 const getChatVersion = async adaSettings => {
+  // Allow pinning via URL parameter — mirrors embed-loader's
+  // `?__ada-embed-version=<sha>` mechanism, bypasses the dev/dev2/stage
+  // auto-skip below (same override semantics as `window.__AdaChatVersion`).
+  const versionFromURL = getURLParam("__ada-chat-version");
+  if (versionFromURL) {
+    return versionFromURL;
+  }
+
   // allow versioning using global variable
   if (window.__AdaChatVersion) {
     return window.__AdaChatVersion;
@@ -18475,7 +18500,7 @@ const getChatVersion = async adaSettings => {
     domain
   } = adaSettings;
 
-  // Skip automatic versioning for ATT and dev/stage clusters but allow override through __AdaChatVersion
+  // Skip automatic versioning for ATT and dev/stage clusters but allow override through __AdaChatVersion or __ada-chat-version
   if (cluster === "att" || domain !== null && domain !== void 0 && domain.match(/ada-(dev|dev2|stage)/)) {
     return undefined;
   }
@@ -19094,9 +19119,23 @@ const HOST_TELEMETRY_QUERY_PARAM = "ada_host_telemetry";
 const TRUSTED_MOBILE_SDK_PATH = "/mobile-sdk-webview/";
 const MAX_TELEMETRY_TAG_LENGTH = 100;
 const TELEMETRY_TAG_VALUE_PATTERN = /^[a-z0-9_-]+$/;
+const SEMVER_TAG_VALUE_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
 
 // Private mobile-sdk handshake used only on the trusted /mobile-sdk-webview/ page.
 
+// `metaFields.sdkType` is a long-standing convention set by every legacy
+// mobile wrapper — iOS SDK (`"IOS"`), Android SDK (`"ANDROID"`), React Native
+// SDK (`"REACTNATIVE"`). The new Messaging wrappers pass the richer
+// `hostTelemetry` handshake instead, so this map is only consulted as a
+// legacy-attribution fallback.
+const LEGACY_SDK_TYPE_PLATFORM_MAP = {
+  IOS: "ios",
+  ANDROID: "android",
+  REACTNATIVE: "react-native",
+  "REACT-NATIVE": "react-native",
+  REACT_NATIVE: "react-native"
+};
+
 // Keep this normalization logic in sync with
 // chat/src/shared/services/host-telemetry.ts. Both sides normalize across the
 // embed/chat iframe boundary on purpose.
@@ -19118,9 +19157,8 @@ function normalizeHostPlatform(value) {
       return "ios";
     case "android":
       return "android";
-    case "react_native":
-    case "reactnative":
-      return "react_native";
+    case "react-native":
+      return "react-native";
     case "web":
       return "web";
     case "unknown":
@@ -19135,6 +19173,24 @@ function normalizeOrigin(value) {
   }
   return undefined;
 }
+function normalizeMobileShell(value) {
+  if (typeof value !== "string") {
+    return undefined;
+  }
+
+  // Accept both separator styles defensively, but normalize everything this
+  // helper emits back to the canonical kebab-case tags.
+  switch (value.trim().toLowerCase()) {
+    case "messaging_sdk":
+    case "messaging-sdk":
+      return "messaging-sdk";
+    case "legacy_sdk":
+    case "legacy-sdk":
+      return "legacy-sdk";
+    default:
+      return undefined;
+  }
+}
 function normalizeTelemetryTagValue(value) {
   if (typeof value !== "string") {
     return undefined;
@@ -19145,11 +19201,21 @@ function normalizeTelemetryTagValue(value) {
   }
   return normalizedValue;
 }
-function deriveSdkVariant(mobilePackage, webSdkOrigin) {
-  if (!mobilePackage || !webSdkOrigin) {
+function normalizeMobileVersion(value) {
+  if (typeof value !== "string") {
+    return undefined;
+  }
+  const trimmedValue = value.trim();
+  if (trimmedValue.length > MAX_TELEMETRY_TAG_LENGTH || !SEMVER_TAG_VALUE_PATTERN.test(trimmedValue)) {
     return undefined;
   }
-  return `${mobilePackage}-${webSdkOrigin}`;
+  return trimmedValue;
+}
+function deriveMessagingMobileShell(mobilePackage) {
+  return mobilePackage ? "messaging-sdk" : undefined;
+}
+function deriveLegacyMobileShell(surface, hostPlatform) {
+  return surface === "mobile" && hostPlatform !== "web" ? "legacy-sdk" : undefined;
 }
 function normalizeHostTelemetry(value) {
   const record = asRecord(value);
@@ -19160,58 +19226,108 @@ function normalizeHostTelemetry(value) {
   const hostPlatform = normalizeHostPlatform(record.hostPlatform);
   const webSdkOrigin = normalizeOrigin(record.webSdkOrigin);
   const mobilePackage = normalizeTelemetryTagValue(record.mobilePackage);
+  const mobileVersion = normalizeMobileVersion(record.mobileVersion);
   if (!surface || !hostPlatform || !webSdkOrigin) {
     return undefined;
   }
-  const sdkVariant = normalizeTelemetryTagValue(record.sdkVariant) ?? deriveSdkVariant(mobilePackage, webSdkOrigin);
-  return host_telemetry_objectSpread(host_telemetry_objectSpread({
+  const mobileShell = deriveMessagingMobileShell(mobilePackage) ?? normalizeMobileShell(record.mobileShell);
+  return host_telemetry_objectSpread(host_telemetry_objectSpread(host_telemetry_objectSpread({
     surface,
     hostPlatform,
     webSdkOrigin
-  }, mobilePackage ? {
+  }, mobileShell ? {
+    mobileShell
+  } : {}), mobilePackage ? {
     mobilePackage
-  } : {}), sdkVariant ? {
-    sdkVariant
+  } : {}), mobileVersion ? {
+    mobileVersion
   } : {});
 }
 function isTrustedMobileSdkHostPage() {
   let pathname = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : window.location.pathname;
   return pathname === TRUSTED_MOBILE_SDK_PATH || pathname === TRUSTED_MOBILE_SDK_PATH.slice(0, -1);
 }
+function isHttpOrigin() {
+  let protocol = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : window.location.protocol;
+  return protocol === "http:" || protocol === "https:";
+}
+function resolveLegacySdkTypePlatform(metaFields) {
+  const record = asRecord(metaFields);
+  const raw = record === null || record === void 0 ? void 0 : record.sdkType;
+  if (typeof raw !== "string") {
+    return undefined;
+  }
+  return LEGACY_SDK_TYPE_PLATFORM_MAP[raw.trim().toUpperCase()];
+}
+function resolveLegacySdkTypeFingerprint(metaFields, trustedMobileContext) {
+  if (!trustedMobileContext) {
+    return undefined;
+  }
+  const hostPlatform = resolveLegacySdkTypePlatform(metaFields);
+  if (!hostPlatform) {
+    return undefined;
+  }
+  return {
+    surface: "mobile",
+    hostPlatform,
+    webSdkOrigin: "legacy",
+    mobileShell: "legacy-sdk"
+  };
+}
 function resolveHostTelemetryFromStartOptions(adaSettings) {
   let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const trustedMobileSdkHostPage = isTrustedMobileSdkHostPage(options.pathname);
-  const explicit = trustedMobileSdkHostPage ? normalizeHostTelemetry(adaSettings.hostTelemetry) : undefined;
-  const webSdkOrigin = (explicit === null || explicit === void 0 ? void 0 : explicit.webSdkOrigin) ?? "legacy";
-  const hostPlatform = (explicit === null || explicit === void 0 ? void 0 : explicit.hostPlatform) ?? (trustedMobileSdkHostPage ? "unknown" : "web");
-  const surface = (explicit === null || explicit === void 0 ? void 0 : explicit.surface) ?? (trustedMobileSdkHostPage ? "mobile" : "browser");
+  // Non-http origins are assumed to be native WebView hosts (file://,
+  // react-native asset URIs) — legacy AndroidSDK and react-native-sdk both
+  // load a bundled `embed.html` from file://, so the trusted-path check alone
+  // misses them. Gating sdkType attribution on this prevents a web customer
+  // from incidentally tagging themselves as mobile via `metaFields.sdkType`.
+  const trustedMobileContext = trustedMobileSdkHostPage || !isHttpOrigin(options.protocol);
+  // Treat the presence of the hostTelemetry property as authoritative, even if
+  // normalization fails, so broken new-wrapper payloads are not downgraded
+  // into the legacy mobile-shell bucket.
+  const hasExplicitHostTelemetry = trustedMobileSdkHostPage && Object.prototype.hasOwnProperty.call(adaSettings, "hostTelemetry");
+  const explicit = hasExplicitHostTelemetry ? normalizeHostTelemetry(adaSettings.hostTelemetry) : undefined;
+  // Legacy wrappers (iOS SDK, AndroidSDK, react-native-sdk) all set
+  // `metaFields.sdkType` before calling `adaEmbed.start(...)`. They do not
+  // know about the newer `hostTelemetry` handshake, so this fingerprint is
+  // the only way to attribute their traffic to the right platform.
+  const legacyFingerprint = !hasExplicitHostTelemetry ? resolveLegacySdkTypeFingerprint(adaSettings.metaFields, trustedMobileContext) : undefined;
+  const webSdkOrigin = (explicit === null || explicit === void 0 ? void 0 : explicit.webSdkOrigin) ?? (legacyFingerprint === null || legacyFingerprint === void 0 ? void 0 : legacyFingerprint.webSdkOrigin) ?? "legacy";
+  const hostPlatform = (explicit === null || explicit === void 0 ? void 0 : explicit.hostPlatform) ?? (legacyFingerprint === null || legacyFingerprint === void 0 ? void 0 : legacyFingerprint.hostPlatform) ?? (trustedMobileSdkHostPage ? "unknown" : "web");
+  const surface = (explicit === null || explicit === void 0 ? void 0 : explicit.surface) ?? (legacyFingerprint === null || legacyFingerprint === void 0 ? void 0 : legacyFingerprint.surface) ?? (trustedMobileSdkHostPage ? "mobile" : "browser");
   const mobilePackage = explicit === null || explicit === void 0 ? void 0 : explicit.mobilePackage;
-  const sdkVariant = explicit === null || explicit === void 0 ? void 0 : explicit.sdkVariant;
-  return host_telemetry_objectSpread(host_telemetry_objectSpread({
+  const mobileVersion = explicit === null || explicit === void 0 ? void 0 : explicit.mobileVersion;
+  const mobileShell = deriveMessagingMobileShell(mobilePackage) ?? (explicit === null || explicit === void 0 ? void 0 : explicit.mobileShell) ?? (legacyFingerprint === null || legacyFingerprint === void 0 ? void 0 : legacyFingerprint.mobileShell) ?? (!hasExplicitHostTelemetry ? deriveLegacyMobileShell(surface, hostPlatform) : undefined);
+  return host_telemetry_objectSpread(host_telemetry_objectSpread(host_telemetry_objectSpread({
     surface,
     hostPlatform,
     webSdkOrigin
-  }, mobilePackage ? {
+  }, mobileShell ? {
+    mobileShell
+  } : {}), mobilePackage ? {
     mobilePackage
-  } : {}), sdkVariant ? {
-    sdkVariant
+  } : {}), mobileVersion ? {
+    mobileVersion
   } : {});
 }
 function serializeHostTelemetry(hostTelemetry) {
   return JSON.stringify(hostTelemetry);
 }
 function shouldPropagateHostTelemetry(hostTelemetry) {
-  return hostTelemetry.surface !== "browser" || hostTelemetry.hostPlatform !== "web" || hostTelemetry.webSdkOrigin !== "legacy" || Boolean(hostTelemetry.mobilePackage) || Boolean(hostTelemetry.sdkVariant);
+  return hostTelemetry.surface !== "browser" || hostTelemetry.hostPlatform !== "web" || hostTelemetry.webSdkOrigin !== "legacy" || Boolean(hostTelemetry.mobileShell) || Boolean(hostTelemetry.mobilePackage) || Boolean(hostTelemetry.mobileVersion);
 }
 function toMonitoringContext(hostTelemetry) {
-  return host_telemetry_objectSpread(host_telemetry_objectSpread({
+  return host_telemetry_objectSpread(host_telemetry_objectSpread(host_telemetry_objectSpread({
     surface: hostTelemetry.surface,
     host_platform: hostTelemetry.hostPlatform,
     web_sdk_origin: hostTelemetry.webSdkOrigin
-  }, hostTelemetry.mobilePackage ? {
+  }, hostTelemetry.mobileShell ? {
+    mobile_shell: hostTelemetry.mobileShell
+  } : {}), hostTelemetry.mobilePackage ? {
     mobile_package: hostTelemetry.mobilePackage
-  } : {}), hostTelemetry.sdkVariant ? {
-    sdk_variant: hostTelemetry.sdkVariant
+  } : {}), hostTelemetry.mobileVersion ? {
+    mobile_version: hostTelemetry.mobileVersion
   } : {});
 }
 ;// CONCATENATED MODULE: ./src/common/helpers/is-mobile.ts
@@ -19435,7 +19551,7 @@ class ChatFrame extends preact_module_d {
     log("Chat frame mount", {
       handle,
       chatUrl: this.url,
-      embedVersion: "a6606d6".slice(0, 7),
+      embedVersion: "ea8e50e".slice(0, 7),
       embedSettings: adaSettings
     });
 
@@ -19523,7 +19639,7 @@ class ChatFrame extends preact_module_d {
     const hostPageUrlParams = new URL(window.location.href).searchParams;
     const smsToken = hostPageUrlParams.get("adaSMSToken");
     const queryParams = {
-      embedVersion: "a6606d6".slice(0, 7),
+      embedVersion: "ea8e50e".slice(0, 7),
       greeting,
       language,
       skipGreeting,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ada-support/embed2",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "",
   "main": "dist/npm-entry",
   "typings": "dist/npm-entry/index-npm.d.ts",