@wix/himalaya-cli 0.1574.0 → 0.1575.0

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/dev-server/src/app-config.d.ts

@@ -17,16 +17,20 @@ export interface LinkableScreen {
     parentScreenId: string;
     tabId: string;
 }
+export interface FrogTelemetryConfig {
+    src: number;
+    variant?: string;
+    endpoint?: string;
+    commonParams?: "himi" | "oneapp";
+    mobileAppId?: string;
+    lv?: string;
+}
 export interface TelemetryConfig {
     enabled: boolean;
     samplingRate: number;
     eventAllowlist?: string[];
     ingestUrl?: string;
-    frog?: {
-        src: number;
-        variant?: string;
-        endpoint?: string;
-    };
+    frog?: FrogTelemetryConfig;
     sentry?: {
         enabled: boolean;
         dsn: string;
@@ -127,6 +131,13 @@ export interface WixPlatformConfig {
         src?: number;
         endpoint?: string;
         variant?: string;
+        /** `"oneapp"` = stamp the RN one-app engine's common fields and POST its envelope
+         *  (apps replacing the RN Owner / Spaces / Branded apps). Default `"himi"`. */
+        commonParams?: "himi" | "oneapp";
+        /** oneapp: RN `mobile_app_id` — `owner`, `spaces`, `brandedLite_{msid}` (`{msid}` is replaced). */
+        mobileAppId?: string;
+        /** oneapp: logger version `_lv`. Default `1.0.0|Himi`. */
+        lv?: string;
     };
     /** Petri experiment scope (the conduction namespace for this app). */
     experiments?: {

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/ts/src/define-app.d.ts

@@ -915,6 +915,12 @@ export interface TelemetryConfig {
         src: number;
         variant?: string;
         endpoint?: string;
+        /** `"oneapp"` = RN one-app engine common fields + POST envelope (epic #4973). Default `"himi"`. */
+        commonParams?: "himi" | "oneapp";
+        /** oneapp: RN `mobile_app_id`; `{msid}` is replaced with the bound/active site. */
+        mobileAppId?: string;
+        /** oneapp: logger version `_lv` (default `1.0.0|Himi`). */
+        lv?: string;
     };
     /**
      * Optional Sentry backend (WS-D / RFC 0042 monitoring). When present + `enabled`,

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/telemetry/wix-bi/src/index.d.ts

@@ -1,4 +1,6 @@
 import type { TelemetrySink, TelemetryEvent } from "@wix/himalaya/core";
+import { type FrogCommonParams, type OneAppFrogContext } from "./oneapp.js";
+export * from "./oneapp.js";
 /**
  * WixFrogTelemetrySink — forwards canonical Himalaya telemetry to a Wix Frog
  * endpoint as fire-and-forget BI beacons (RFC 0042, Wix Platform SDK).
@@ -35,6 +37,19 @@ export interface WixFrogTelemetrySinkOptions {
      *  errors (BI is best-effort and must never throw into the emit path). Injected
      *  by tests to capture the constructed URL. */
     send?: (url: string) => void;
+    /** Which common beacon fields to stamp. `"himi"` (default) is the Symphony beacon
+     *  below; `"oneapp"` reproduces the RN one-app engine (see `./oneapp.ts`). */
+    commonParams?: FrogCommonParams;
+    /** oneapp: RN `mobile_app_id` (`owner`, `spaces`, `brandedLite_{msid}`). */
+    mobileAppId?: string;
+    /** oneapp: logger version `_lv`. Default `1.0.0|Himi`. */
+    lv?: string;
+    /** oneapp: the host state stamped on every event (identity, device, versions). */
+    context?: () => OneAppFrogContext;
+    /** oneapp: POST transport (`url`, JSON body). Defaults to a keepalive `fetch` POST. */
+    sendPost?: (url: string, body: string) => void;
+    /** oneapp: clock for the envelope `dt`. Injected by tests. */
+    now?: () => number;
 }
 /** Frog `evid` codes (mirror of the original SymphonyBI.swift). */
 export declare const FROG_EVID: {

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/telemetry/wix-bi/src/oneapp.d.ts

@@ -0,0 +1,90 @@
+/**
+ * The `commonParams: "oneapp"` mode of the Wix frog sink (#4711, #4974, epic #4973).
+ *
+ * Reproduces what the React Native one-app engine sends, so the Himi apps that replace
+ * the RN Owner / Spaces / Branded apps keep feeding the same BI tables and dashboards:
+ * the engine's common fields, a per-event `src` + endpoint, and the RN POST envelope
+ * `{"dt":0,"g":{},"e":[{"dt":<eventTime-sendTime>,"f":{…}}]}`.
+ *
+ * The contract is the shared fixture `core/schema/fixtures/bi-oneapp-envelope.json`; the
+ * web host (`core/web-host/src/telemetry/WixFrogTelemetrySink.ts`), iOS and Android sinks
+ * implement the same rules and are tested against the same cases. Pure — no I/O.
+ */
+/** Keys the host always stamps. Removed from event params, then re-stamped from the host,
+ *  so neither a worker nor a typo can forge them. The first 14 are the adapter-owned
+ *  names of `wix-private/mobile-native-core` `bi-codegen/src/runtime-fields.js`. */
+export declare const FROG_HOST_STAMPED_FIELDS: readonly string[];
+/** Keys a WORKER may not send through `wixPlatform.bi.track` / `bi.log`: the host-stamped
+ *  set plus the engine's per-site and per-module fields, which only platform code sets. */
+export declare const FROG_WORKER_RESERVED_FIELDS: readonly string[];
+export declare const ONEAPP_DEFAULT_LV = "1.0.0|Himi";
+export declare const ONEAPP_DEFAULT_ENDPOINT = "oneapp";
+export type FrogCommonParams = "himi" | "oneapp";
+/** The served `telemetryConfig.frog` block, as far as oneapp mode reads it. */
+export interface OneAppFrogConfig {
+    /** Fallback src for an event that carries none. */
+    src: number;
+    /** Fallback endpoint: a bare frog endpoint name (`oneapp`) or a full URL. */
+    endpoint?: string;
+    /** RN `mobile_app_id` (`owner`, `spaces`, `brandedLite_{msid}`). `{msid}` is replaced. */
+    mobileAppId?: string;
+    /** Logger version `_lv`. Default `1.0.0|Himi`. */
+    lv?: string;
+}
+/** Host state at the moment the event was emitted. Every field is optional except the
+ *  platform ones; a missing or empty value is omitted from the beacon. */
+export interface OneAppFrogContext {
+    os: "ios" | "android" | "web" | string;
+    installationId?: string;
+    bundleVersion?: string;
+    appVersion?: string;
+    osVersion?: string;
+    deviceModel?: string;
+    language?: string;
+    bsi?: string;
+    /** `undefined` = not known yet: neither `uuid` nor `_visitorId` is stamped. */
+    signedIn?: boolean;
+    /** The signed-in identity is a site member (Branded / member apps), not a Wix account user. */
+    isSiteMember?: boolean;
+    /** The Wix account user id (owner apps). Sent as `uuid` unless the user is a site member. */
+    userId?: string;
+    memberId?: string;
+    contactId?: string;
+    /** The app's bound site (Branded); wins over an event's own msid. */
+    forcedMsid?: string;
+    /** The currently selected site; used when the event names none. */
+    activeMsid?: string;
+}
+export interface OneAppFrogEventInput {
+    type: string;
+    screenId?: string;
+    payload?: Record<string, unknown>;
+    timestampMs: number;
+}
+/** One built event, before envelope encoding. */
+export interface OneAppFrogEvent {
+    /** Full POST URL (`https://frog.wix.com/<endpoint>`). */
+    url: string;
+    /** When the event happened (epoch ms) — becomes `dt` relative to the send time. */
+    eventTimeMs: number;
+    /** The `f` object, in stamping order. */
+    fields: Record<string, string | number>;
+}
+export declare function redactFrogParam(value: string): string;
+export declare function eventEndpoint(eventEndpointValue: string | undefined, configEndpoint: string | undefined): string;
+/** `oneapp` → `https://frog.wix.com/oneapp`; a full URL is kept as-is. */
+export declare function frogEndpointUrl(endpoint: string | undefined): string;
+/** Drop every worker-reserved key from a worker `bi.track` payload. Returns the kept
+ *  payload and the dropped key names (the caller logs them once in debug). */
+export declare function stripWorkerReservedFields<T extends Record<string, unknown>>(payload: T): {
+    payload: T;
+    dropped: string[];
+};
+/**
+ * Build one oneapp frog event, or `null` for an event oneapp mode does not send.
+ * Only explicit `bi` events are sent here; `screen_view` / `action_dispatched` are mapped
+ * by the platform screen and action maps (later epic issues), never as generic 501/522.
+ */
+export declare function buildOneAppFrogEvent(event: OneAppFrogEventInput, config: OneAppFrogConfig, ctx: OneAppFrogContext): OneAppFrogEvent | null;
+/** The RN `sendEventsV2` POST body for events that share one endpoint URL. */
+export declare function encodeFrogEnvelope(events: ReadonlyArray<Pick<OneAppFrogEvent, "eventTimeMs" | "fields">>, sendTimeMs: number): string;

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/wix-bi.mjs

@@ -1,14 +1,140 @@
-// ../../stdlib/telemetry/wix-bi/src/index.ts
-var DEFAULT_ENDPOINT = "https://frog.wix.com/scheduling-assistant";
+// ../../stdlib/telemetry/wix-bi/src/oneapp.ts
+var FROG_HOST_STAMPED_FIELDS = Object.freeze([
+  "src",
+  "evid",
+  "installationId",
+  "client_id",
+  "mobile_app_id",
+  "osType",
+  "_lv",
+  "bundleVersion",
+  "appVersion",
+  "osVersion",
+  "deviceModel",
+  "mobile_lng",
+  "ct",
+  "bsi",
+  "uuid",
+  "_visitorId",
+  "_msid",
+  "member_id",
+  "contactId",
+  "_contactId"
+]);
+var FROG_WORKER_RESERVED_FIELDS = Object.freeze([
+  ...FROG_HOST_STAMPED_FIELDS,
+  "ownerId",
+  "roles",
+  "brand_id",
+  "identity_data",
+  "moduleName",
+  "moduleVersion",
+  // Only platform code may attribute an event to a site other than the active one.
+  "msid"
+]);
+var ONEAPP_DEFAULT_LV = "1.0.0|Himi";
+var ONEAPP_DEFAULT_ENDPOINT = "oneapp";
+var FROG_ORIGIN = "https://frog.wix.com";
 var REDACT_EMAIL = /[^\s@]+@[^\s@]+\.[^\s@]+/;
 var REDACT_JWT = /\beyJ[A-Za-z0-9_-]{5,}\.[A-Za-z0-9_-]{5,}\.[A-Za-z0-9_-]{5,}\b/;
-var REDACT_PHONE = /(?:\+|00)\d[\d\s().-]{6,}\d/;
-function redactParam(value) {
+var REDACT_PHONE = /(?<![\w-])(?:\+|00)\d[\d\s().-]{6,}\d(?![\w-])/;
+function redactFrogParam(value) {
   if (REDACT_EMAIL.test(value)) return "[redacted-email]";
   if (REDACT_JWT.test(value)) return "[redacted-token]";
   if (REDACT_PHONE.test(value)) return "[redacted-phone]";
   return value;
 }
+var BARE_ENDPOINT = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
+function eventEndpoint(eventEndpointValue, configEndpoint) {
+  return frogEndpointUrl(eventEndpointValue && BARE_ENDPOINT.test(eventEndpointValue) ? eventEndpointValue : configEndpoint);
+}
+function frogEndpointUrl(endpoint) {
+  const e = (endpoint ?? "").trim() || ONEAPP_DEFAULT_ENDPOINT;
+  if (e.includes("://")) return e;
+  return `${FROG_ORIGIN}/${e.replace(/^\/+/, "")}`;
+}
+var nonEmpty = (v) => typeof v === "string" && v.length > 0;
+function stripWorkerReservedFields(payload) {
+  const reserved = new Set(FROG_WORKER_RESERVED_FIELDS);
+  reserved.delete("evid");
+  reserved.delete("src");
+  const out = {};
+  const dropped = [];
+  for (const [k, v] of Object.entries(payload)) {
+    if (reserved.has(k)) dropped.push(k);
+    else out[k] = v;
+  }
+  return { payload: out, dropped };
+}
+function buildOneAppFrogEvent(event, config, ctx) {
+  if (event.type !== "bi") return null;
+  const p = event.payload ?? {};
+  const str = (v) => v === void 0 || v === null ? void 0 : String(v);
+  const evid = Number(str(p.evid));
+  if (!str(p.evid) || !Number.isFinite(evid)) return null;
+  const evSrc = Number(str(p.src));
+  const src = str(p.src) && Number.isFinite(evSrc) ? evSrc : config.src;
+  const url = eventEndpoint(str(p.endpoint), config.endpoint);
+  const f = { src, evid };
+  const stamped = new Set(FROG_HOST_STAMPED_FIELDS);
+  for (const [k, raw] of Object.entries(p)) {
+    if (k === "endpoint" || k === "msid" || stamped.has(k)) continue;
+    const v = str(raw);
+    if (v !== void 0) f[k] = redactFrogParam(v);
+  }
+  const msid = [ctx.forcedMsid, str(p.msid), ctx.activeMsid].find(nonEmpty);
+  const set = (k, v) => {
+    if (typeof v === "number" ? Number.isFinite(v) : nonEmpty(v)) f[k] = v;
+  };
+  set("installationId", ctx.installationId);
+  set("client_id", ctx.installationId);
+  const appIdTemplate = config.mobileAppId;
+  if (nonEmpty(appIdTemplate)) {
+    if (!appIdTemplate.includes("{msid}")) set("mobile_app_id", appIdTemplate);
+    else if (msid) set("mobile_app_id", appIdTemplate.split("{msid}").join(msid));
+  }
+  set("osType", ctx.os);
+  set("_lv", nonEmpty(config.lv) ? config.lv : ONEAPP_DEFAULT_LV);
+  set("bundleVersion", ctx.bundleVersion);
+  set("appVersion", ctx.appVersion);
+  set("osVersion", ctx.osVersion);
+  set("deviceModel", ctx.deviceModel);
+  set("mobile_lng", ctx.language);
+  set("ct", event.timestampMs);
+  set("bsi", ctx.bsi);
+  const signedIn = ctx.signedIn === true;
+  if (signedIn && !ctx.isSiteMember) set("uuid", ctx.userId);
+  if (ctx.signedIn === false) set("_visitorId", ctx.installationId);
+  if (msid) {
+    f.msid = msid;
+    f._msid = msid;
+  }
+  if (signedIn && ctx.isSiteMember) {
+    set("member_id", ctx.memberId);
+    set("contactId", ctx.contactId);
+    set("_contactId", ctx.contactId);
+  }
+  return { url, eventTimeMs: event.timestampMs, fields: f };
+}
+function encodeFrogEnvelope(events, sendTimeMs) {
+  return JSON.stringify({
+    dt: 0,
+    g: {},
+    e: events.map((e) => ({ dt: e.eventTimeMs - sendTimeMs, f: e.fields }))
+  });
+}
+
+// ../../stdlib/telemetry/wix-bi/src/index.ts
+var DEFAULT_ENDPOINT = "https://frog.wix.com/scheduling-assistant";
+var REDACT_EMAIL2 = /[^\s@]+@[^\s@]+\.[^\s@]+/;
+var REDACT_JWT2 = /\beyJ[A-Za-z0-9_-]{5,}\.[A-Za-z0-9_-]{5,}\.[A-Za-z0-9_-]{5,}\b/;
+var REDACT_PHONE2 = /(?<![\w-])(?:\+|00)\d[\d\s().-]{6,}\d(?![\w-])/;
+function redactParam(value) {
+  if (REDACT_EMAIL2.test(value)) return "[redacted-email]";
+  if (REDACT_JWT2.test(value)) return "[redacted-token]";
+  if (REDACT_PHONE2.test(value)) return "[redacted-phone]";
+  return value;
+}
 var FROG_EVID = {
   pageView: 501,
   click: 522
@@ -65,12 +191,36 @@ function defaultSend(url) {
   } catch {
   }
 }
+function defaultSendPost(url, body) {
+  try {
+    void globalThis.fetch?.(url, { method: "POST", body, keepalive: true, mode: "no-cors", headers: { "Content-Type": "text/plain;charset=UTF-8" } })?.catch(() => {
+    });
+  } catch {
+  }
+}
 function WixFrogTelemetrySink(options) {
   const send = options.send ?? defaultSend;
+  const sendPost = options.sendPost ?? defaultSendPost;
+  const now = options.now ?? (() => Date.now());
   return {
     sinkId: "wix-bi",
     emit(event) {
       try {
+        if (options.commonParams === "oneapp") {
+          const ctx = options.context?.() ?? {
+            os: "web",
+            installationId: resolve(options.installationId),
+            activeMsid: resolve(options.msid),
+            language: resolve(options.lang) ?? defaultLocale()
+          };
+          const built = buildOneAppFrogEvent(
+            { type: event.type, screenId: event.screenId, payload: event.payload, timestampMs: event.timestamp ?? now() },
+            { src: options.src, endpoint: options.endpoint, mobileAppId: options.mobileAppId, lv: options.lv },
+            ctx
+          );
+          if (built) sendPost(built.url, encodeFrogEnvelope([built], now()));
+          return;
+        }
         const url = buildFrogBeacon(event, options);
         if (url) send(url);
       } catch {
@@ -80,7 +230,17 @@ function WixFrogTelemetrySink(options) {
 }
 export {
   FROG_EVID,
+  FROG_HOST_STAMPED_FIELDS,
+  FROG_WORKER_RESERVED_FIELDS,
+  ONEAPP_DEFAULT_ENDPOINT,
+  ONEAPP_DEFAULT_LV,
   WixFrogTelemetrySink,
-  buildFrogBeacon
+  buildFrogBeacon,
+  buildOneAppFrogEvent,
+  encodeFrogEnvelope,
+  eventEndpoint,
+  frogEndpointUrl,
+  redactFrogParam,
+  stripWorkerReservedFields
 };
 //# sourceMappingURL=wix-bi.mjs.map