@patch-adams/core 1.5.19 → 1.5.21

package/dist/cli.js

@@ -1922,6 +1922,129 @@ function generateLrsBridgeCode(options) {
       return hasValidMbox || hasValidAccount;
     }
 
+    // ========================================================================
+    // CROSS-FRAME ACTOR SHARING
+    // PA-Patcher injects the bridge into ALL HTML files in a SCORM package.
+    // Rise courses have multiple HTML files (index.html, scormcontent/index.html),
+    // each getting their own bridge instance with its own LRS.actor.
+    // The skin overlay (email gate) only runs in one frame and sets the actor there.
+    // Without sharing, other bridge instances keep the Anonymous Learner actor.
+    // Solution: persist actor to localStorage so all bridge instances can use it.
+    // ========================================================================
+    var ACTOR_STORAGE_KEY = 'pa_lrs_shared_actor';
+
+    function isAnonymousActor(actor) {
+      if (!actor) return true;
+      if (!actor.name) return true;
+      var n = actor.name.toLowerCase();
+      return n === 'anonymous learner' || n === 'unknown learner' || n === 'anonymous' || n === 'unknown';
+    }
+
+    /**
+     * Persist actor to localStorage for cross-frame sharing.
+     * Only stores non-anonymous actors.
+     */
+    function persistActor(actor) {
+      if (!actor || isAnonymousActor(actor)) return;
+      try {
+        localStorage.setItem(ACTOR_STORAGE_KEY, JSON.stringify(actor));
+        log('Actor persisted to localStorage:', actor.name);
+      } catch (e) { /* localStorage unavailable */ }
+    }
+
+    /**
+     * Load shared actor from localStorage.
+     * Returns the stored actor or null.
+     */
+    function loadSharedActor() {
+      try {
+        var stored = localStorage.getItem(ACTOR_STORAGE_KEY);
+        if (stored) {
+          var actor = JSON.parse(stored);
+          if (actor && !isAnonymousActor(actor)) {
+            return actor;
+          }
+        }
+      } catch (e) { /* localStorage unavailable or parse error */ }
+      return null;
+    }
+
+    /**
+     * Get the best available actor for statement building.
+     * ALWAYS checks localStorage because the skin overlay in another frame
+     * may have updated the actor AFTER this bridge instance initialized.
+     * (e.g., user enters email in skin overlay \u2192 actor persisted to localStorage,
+     *  but the bridge in scormcontent/index.html already loaded a stale actor at init)
+     */
+    function getActor() {
+      // Always check localStorage for the freshest actor \u2014 it may have been
+      // updated by the skin overlay in another frame since our init
+      var shared = loadSharedActor();
+      if (shared) {
+        // Only update if different from current (avoid unnecessary log spam)
+        if (!LRS.actor || LRS.actor.name !== shared.name ||
+            (LRS.actor.account && shared.account && LRS.actor.account.name !== shared.account.name)) {
+          log('Actor updated from cross-frame storage:', shared.name);
+        }
+        LRS.actor = shared;
+        return shared;
+      }
+      // Fallback to current actor or re-extract
+      if (LRS.actor && !isAnonymousActor(LRS.actor)) {
+        return LRS.actor;
+      }
+      return LRS.actor || extractActor();
+    }
+
+    /**
+     * Set actor on the bridge with cross-frame persistence.
+     * Called by skins and external code via window.pa_patcher.lrs.setActor(actor)
+     */
+    LRS.setActor = function(actor) {
+      LRS.actor = actor;
+      persistActor(actor);
+
+      // Propagate to ALL frames: walk UP parent chain AND DOWN into child iframes
+      // UP: parent frames (e.g., if skin is in a child iframe)
+      try {
+        var w = window;
+        for (var i = 0; i < 10; i++) {
+          try {
+            if (w !== window && w.pa_patcher && w.pa_patcher.lrs) {
+              w.pa_patcher.lrs.actor = actor;
+            }
+          } catch (e) { /* cross-origin */ }
+          if (w === w.parent) break;
+          w = w.parent;
+        }
+      } catch (e) {}
+
+      // DOWN: child iframes (e.g., scormcontent/index.html has its own bridge)
+      function setActorInChildren(win) {
+        try {
+          var frames = win.frames;
+          for (var j = 0; j < frames.length; j++) {
+            try {
+              if (frames[j].pa_patcher && frames[j].pa_patcher.lrs) {
+                frames[j].pa_patcher.lrs.actor = actor;
+                log('Actor propagated to child frame', j);
+              }
+              // Recurse into nested iframes
+              setActorInChildren(frames[j]);
+            } catch (e) { /* cross-origin child */ }
+          }
+        } catch (e) {}
+      }
+      setActorInChildren(window);
+
+      if (window.console && window.console.info) {
+        console.info('[PA-LRS] Actor set:', actor.name,
+          actor.mbox ? '(' + actor.mbox + ')' : '',
+          actor.account ? '(account: ' + actor.account.name + ')' : '',
+          '\u2014 shared across frames');
+      }
+    };
+
     /**
      * Async version that fetches Bravais session if needed
      * Also re-checks all sources in case they became available
@@ -1933,6 +2056,7 @@ function generateLrsBridgeCode(options) {
         // Try to enhance actor with email if missing
         enhanceActorWithEmail(actor, function(enhancedActor) {
           LRS.actor = enhancedActor;
+          persistActor(enhancedActor);
           callback(enhancedActor);
         });
       }
@@ -2939,7 +3063,7 @@ function generateLrsBridgeCode(options) {
 
       var statement = {
         id: generateUUID(),
-        actor: LRS.actor || extractActor(),
+        actor: getActor(),
         verb: typeof verb === 'string' ? (VERBS[verb] || { id: verb, display: { 'en-US': verb } }) : verb,
         object: courseObj,
         timestamp: new Date().toISOString()
@@ -3361,7 +3485,7 @@ function generateLrsBridgeCode(options) {
     function buildStatementXyleme(verb, activityObject, result, additionalContext) {
       var statement = {
         id: generateUUID(),
-        actor: LRS.actor || extractActor(),
+        actor: getActor(),
         verb: typeof verb === 'string' ? (VERBS[verb] || { id: verb, display: { 'en-US': verb } }) : verb,
         object: activityObject,
         timestamp: new Date().toISOString()
@@ -5090,6 +5214,15 @@ function generateLrsBridgeCode(options) {
         // Extract actor (sync first for immediate use)
         extractActor();
 
+        // Check localStorage for actor set by another frame (e.g., skin overlay in a different HTML file)
+        if (isAnonymousActor(LRS.actor)) {
+          var sharedActor = loadSharedActor();
+          if (sharedActor) {
+            LRS.actor = sharedActor;
+            log('Loaded actor from cross-frame storage at init:', sharedActor.name);
+          }
+        }
+
         log('Bridge initialized in mode:', LRS.mode);
         log('Actor:', LRS.actor);
         log('Course:', LRS.courseInfo);