@amplifyup/sdk 0.1.39 → 0.1.41

package/dist/AmplifyRenderer.mjs

@@ -102,6 +102,7 @@ var AWSAdapter = class {
     const eventData = {
       type: "page",
       anonymousId: properties.instanceId,
+      sessionId: properties.sessionId,
       userId: properties.userId,
       properties: {
         path: properties.path || properties.url,
@@ -144,6 +145,7 @@ var AWSAdapter = class {
       type: "track",
       event: eventName,
       anonymousId: properties.instanceId,
+      sessionId: properties.sessionId,
       userId: properties.userId,
       properties: {
         ...properties
@@ -166,6 +168,7 @@ var AWSAdapter = class {
     const eventData = {
       type: "identify",
       anonymousId: traits.instanceId,
+      sessionId: traits.sessionId,
       traits: {
         ...traits,
         ...identifiers ? { identifiers } : {}
@@ -184,6 +187,7 @@ var AWSAdapter = class {
     const eventData = {
       type: "set_fields",
       anonymousId: context.instanceId,
+      sessionId: context.sessionId,
       fields,
       traits: {
         instanceId: context.instanceId,
@@ -206,7 +210,11 @@ var AWSAdapter = class {
 // src/storage.ts
 var INSTANCE_ID_KEY = "amplifyup_instance_id";
 var USER_ID_KEY = "amplifyup_user_id";
+var SESSION_ID_KEY = "amplifyup_session_id";
+var SESSION_ACTIVITY_KEY = "amplifyup_session_activity";
 var ANON_COOKIE_NAME = "amplifyup_anon_id";
+var SESSION_COOKIE_NAME = "amplifyup_session_id";
+var SESSION_IDLE_GAP_MS = 30 * 60 * 1e3;
 function generateGuid() {
   if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
     return crypto.randomUUID();
@@ -233,9 +241,9 @@ function readCookie(name) {
   }
   return null;
 }
-function writeCookie(name, value) {
+function writeCookie(name, value, maxAgeSeconds = 31536e3) {
   if (typeof document === "undefined") return;
-  document.cookie = `${name}=${encodeURIComponent(value)}; Path=/; Max-Age=31536000; SameSite=Lax`;
+  document.cookie = `${name}=${encodeURIComponent(value)}; Path=/; Max-Age=${maxAgeSeconds}; SameSite=Lax`;
 }
 function getInstanceId() {
   if (typeof window === "undefined") {
@@ -258,6 +266,23 @@ function getUserId() {
   }
   return localStorage.getItem(USER_ID_KEY);
 }
+function getSessionId() {
+  if (typeof window === "undefined") {
+    return "";
+  }
+  const now = Date.now();
+  const lastActivity = Number(localStorage.getItem(SESSION_ACTIVITY_KEY) || 0);
+  const fromCookie = readCookie(SESSION_COOKIE_NAME);
+  const fromLs = localStorage.getItem(SESSION_ID_KEY);
+  let sessionId = fromLs || fromCookie || "";
+  if (!sessionId || lastActivity > 0 && now - lastActivity >= SESSION_IDLE_GAP_MS) {
+    sessionId = generateGuid();
+  }
+  localStorage.setItem(SESSION_ID_KEY, sessionId);
+  localStorage.setItem(SESSION_ACTIVITY_KEY, String(now));
+  writeCookie(SESSION_COOKIE_NAME, sessionId, Math.floor(SESSION_IDLE_GAP_MS / 1e3));
+  return sessionId;
+}
 function setUserId(userId) {
   if (typeof window === "undefined") {
     return;
@@ -270,7 +295,10 @@ function clearIds() {
   }
   localStorage.removeItem(INSTANCE_ID_KEY);
   localStorage.removeItem(USER_ID_KEY);
+  localStorage.removeItem(SESSION_ID_KEY);
+  localStorage.removeItem(SESSION_ACTIVITY_KEY);
   document.cookie = `${ANON_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
+  document.cookie = `${SESSION_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
 }
 
 // src/targets.ts
@@ -378,7 +406,6 @@ function isComposerPreview() {
 }
 
 // src/index.ts
-var SESSION_IDLE_GAP_MS = 30 * 60 * 1e3;
 var DWELL_ACTIVITY_IDLE_MS = 2 * 60 * 1e3;
 var DWELL_POLL_MS = 5e3;
 function readPreviewQueryOverrides() {
@@ -554,6 +581,7 @@ var AmplifyUpSDK = class {
     if (typeof window === "undefined") return;
     window.AmplifyUp = {
       getInstanceId: () => this.getInstanceId(),
+      getSessionId: () => this.getSessionId(),
       getUserId: () => this.getUserId(),
       getTrackingId: () => this.getTrackingId(),
       getTarget: () => this.getTarget(),
@@ -976,12 +1004,14 @@ var AmplifyUpSDK = class {
       return;
     }
     const instanceId = getInstanceId();
+    const sessionId = getSessionId();
     const pageProperties = {
       name: url,
       path: url,
       url: typeof window !== "undefined" ? window.location.href : url,
       referrer: typeof document !== "undefined" ? document.referrer : void 0,
       instanceId,
+      sessionId,
       trackingId: this.config?.trackingId,
       // Timestamp is included in event payload
       ...properties
@@ -1000,8 +1030,10 @@ var AmplifyUpSDK = class {
       return;
     }
     const instanceId = getInstanceId();
+    const sessionId = getSessionId();
     const trackProperties = {
       instanceId,
+      sessionId,
       trackingId: this.config?.trackingId,
       url: typeof window !== "undefined" ? window.location.href : void 0,
       path: properties?.path || (typeof window !== "undefined" ? window.location.pathname : void 0),
@@ -1074,8 +1106,10 @@ var AmplifyUpSDK = class {
       return;
     }
     const instanceId = getInstanceId();
+    const sessionId = getSessionId();
     const identifyTraits = {
       instanceId,
+      sessionId,
       trackingId: this.config?.trackingId,
       ...traits
     };
@@ -1113,6 +1147,7 @@ var AmplifyUpSDK = class {
     if (typeof this.adapter.setProfileFields === "function") {
       this.adapter.setProfileFields(fields, {
         instanceId: instanceId || void 0,
+        sessionId: getSessionId() || void 0,
         trackingId: this.config?.trackingId
       });
     }
@@ -1163,6 +1198,12 @@ var AmplifyUpSDK = class {
   getInstanceId() {
     return getInstanceId();
   }
+  /**
+   * Get session id (30-minute inactivity reset).
+   */
+  getSessionId() {
+    return getSessionId();
+  }
   /**
    * Get user ID
    */
@@ -2694,7 +2735,10 @@ function useLiveComposerProps(layoutNodeId, props) {
         return;
       }
       if (!matchesNode(nodeId)) return;
-      setLive(nextProps);
+      setLive((prev) => ({
+        ...prev,
+        ...nextProps
+      }));
     };
     const onPatch = (event) => {
       const detail = event.detail || {};
@@ -2741,6 +2785,12 @@ function useAmplifyUp() {
   }
   return context;
 }
+function nodeRenderProps(node) {
+  return {
+    ...node.settings || {},
+    ...node.props || {}
+  };
+}
 var ComponentRenderBoundary = class extends Component {
   constructor() {
     super(...arguments);
@@ -3164,7 +3214,7 @@ function AmplifyRenderer({
           {
             nodeId: node.id,
             componentId: node.componentId,
-            props: node.props || {},
+            props: nodeRenderProps(node),
             slots: slotsToPass,
             renderComponent
           }