@patch-adams/core 1.4.25 → 1.4.27

package/dist/cli.js

@@ -613,13 +613,13 @@ html.${htmlClass}.${loadingClass} body {
   var link = loadCSSSync(REMOTE_URL);
 
   link.onerror = function() {
-    console.warn('[Patch-Adams] CSS before failed to load from remote, using local fallback');
+    console.warn('[PA-Patcher] CSS before failed to load from remote, using local fallback');
     document.head.removeChild(link);
     loadCSSSync(LOCAL_PATH);
   };
 
   link.onload = function() {
-    console.log('[Patch-Adams] CSS before loaded from remote:', REMOTE_URL);
+    console.log('[PA-Patcher] CSS before loaded from remote:', REMOTE_URL);
   };
 })();
 </script>`;
@@ -673,7 +673,7 @@ function generateCssAfterLoader(options) {
         if (loaded) return;
         loaded = true;
         clearTimeout(timeoutId);
-        console.log('[Patch-Adams] CSS after loaded from remote:', REMOTE_URL);
+        console.log('[PA-Patcher] CSS after loaded from remote:', REMOTE_URL);
       },
       function() {
         if (loaded) return;
@@ -687,7 +687,7 @@ function generateCssAfterLoader(options) {
     timeoutId = setTimeout(function() {
       if (loaded) return;
       loaded = true;
-      console.warn('[Patch-Adams] CSS after timed out, using local fallback');
+      console.warn('[PA-Patcher] CSS after timed out, using local fallback');
       if (remoteLink.parentNode) {
         document.head.removeChild(remoteLink);
       }
@@ -699,10 +699,10 @@ function generateCssAfterLoader(options) {
     loadCSS(
       LOCAL_PATH,
       function() {
-        console.log('[Patch-Adams] CSS after loaded from local fallback:', LOCAL_PATH);
+        console.log('[PA-Patcher] CSS after loaded from local fallback:', LOCAL_PATH);
       },
       function() {
-        console.error('[Patch-Adams] CSS after failed to load from both remote and local');
+        console.error('[PA-Patcher] CSS after failed to load from both remote and local');
       }
     );
   }
@@ -1667,7 +1667,9 @@ function generateLrsBridgeCode(options) {
                         ((employee.fname || employee.firstName || '') + ' ' + (employee.lname || employee.lastName || '')).trim(),
                   firstName: employee.fname || employee.firstName || employee.first_name,
                   lastName: employee.lname || employee.lastName || employee.last_name,
-                  employeeId: employee.emp_id || employee.employeeId || employee.employee_id || employeeId
+                  employeeId: employee.emp_id || employee.employeeId || employee.employee_id || employeeId,
+                  bravaisUserId: employee.bravaisUserId || null,
+                  tenantUrl: employee.tenantUrl || null
                 };
                 log('Parsed employee data:', employeeLookupData);
                 // Persist to localStorage for cross-session caching
@@ -1741,6 +1743,16 @@ function generateLrsBridgeCode(options) {
           if (employeeData.name && (!actor.name || actor.name === 'Unknown Learner')) {
             actor.name = employeeData.name;
           }
+
+          // Update account with Bravais user ID and tenant URL if available
+          if (employeeData.bravaisUserId) {
+            var originalAccountName = actor.account ? actor.account.name : null;
+            actor.account = {
+              name: employeeData.bravaisUserId,
+              homePage: employeeData.tenantUrl || (actor.account && actor.account.homePage) || window.location.origin
+            };
+            log('Updated actor account: bravaisUserId=' + employeeData.bravaisUserId + ', homePage=' + actor.account.homePage + ' (was: ' + originalAccountName + ')');
+          }
         }
         callback(actor);
       });
@@ -2405,7 +2417,7 @@ function generateLrsBridgeCode(options) {
         tenantHomepage: null         // https://{tenant}.bravais.com format
       };
 
-      // 0. Use baked-in GUIDs from Patch-Adams config (highest priority - set at wrap time)
+      // 0. Use baked-in GUIDs from PA-Patcher config (highest priority - set at wrap time)
       if (DOCUMENT_GUID) {
         info.guid = DOCUMENT_GUID;
         info.id = 'http://xyleme.com/bravais/document/' + DOCUMENT_GUID;
@@ -2914,6 +2926,11 @@ function generateLrsBridgeCode(options) {
       // Publish index (default to 1)
       ctx.extensions['publishIndex'] = (LRS.courseInfo && LRS.courseInfo.publishIndex) ? LRS.courseInfo.publishIndex : 1;
 
+      // Employee ID from employee lookup (if available)
+      if (employeeLookupData && employeeLookupData.employeeId) {
+        ctx.extensions['employeeId'] = employeeLookupData.employeeId;
+      }
+
       // Xyleme schema version and PII flag
       ctx.extensions['http://xyleme.com/bravais/extensions/statement-schema'] = 'xyleme_10';
       ctx.extensions['http://xyleme.com/bravais/extensions/protect_pii'] = false;
@@ -4396,6 +4413,19 @@ function generateLrsBridgeCode(options) {
       // Setup connection
       var bridgeReady = setupBridge();
 
+      // Track async readiness: both actor and doc metadata must resolve before sending statements
+      var actorReady = false;
+      var docReady = false;
+      var launchEventsSent = false;
+
+      function tryLaunchEvents() {
+        if (launchEventsSent) return;
+        if (!actorReady || !docReady) return;
+        launchEventsSent = true;
+        log('Both actor and doc metadata ready, sending launch events');
+        setTimeout(sendLaunchEvents, 50);
+      }
+
       if (bridgeReady) {
         LRS.initialized = true;
 
@@ -4406,14 +4436,23 @@ function generateLrsBridgeCode(options) {
         log('Actor:', LRS.actor);
         log('Course:', LRS.courseInfo);
 
-        // Then try async actor extraction from Bravais session
-        // This will update the actor with real user info if available
+        // Then try async actor extraction (employee lookup, Bravais session)
+        // Launch events will NOT be sent until this completes
         extractActorAsync(function(actor) {
           log('Actor updated after async fetch:', actor);
+          actorReady = true;
+          // Log final actor state for diagnostics
+          if (window.console && window.console.info) {
+            console.info('[PA-LRS] Actor resolved: name=' + (actor ? actor.name : 'none') +
+              ', mbox=' + (actor ? actor.mbox : 'none') +
+              ', account=' + (actor && actor.account ? actor.account.name : 'none'));
+          }
+          tryLaunchEvents();
         });
       } else {
         warn('Bridge setup failed - operating in offline mode');
         LRS.mode = 'offline';
+        actorReady = true; // No actor to wait for in offline mode
       }
 
       // Always-visible bridge summary (not gated by DEBUG)
@@ -4458,13 +4497,17 @@ function generateLrsBridgeCode(options) {
         }
       }
 
-      function fetchDocDataAndSend(docId) {
+      function onDocReady() {
+        docReady = true;
+        tryLaunchEvents();
+      }
+
+      function fetchDocDataAndReady(docId) {
         fetchDocumentMetadata(docId, function(docData) {
           if (docData) {
             updateCourseInfoFromApi(docData);
           }
-          // Send launch events after API fetch (success or failure)
-          setTimeout(sendLaunchEvents, 100);
+          onDocReady();
         });
       }
 
@@ -4484,20 +4527,20 @@ function generateLrsBridgeCode(options) {
             } else {
               warn('Could not fetch document data from shared API - statements may fail aggregation');
             }
-            setTimeout(sendLaunchEvents, 100);
+            onDocReady();
           });
         } else if (documentId) {
           // No shared link token, try with extracted document ID (requires auth)
           log('No shared link token, fetching document data with ID:', documentId);
-          fetchDocDataAndSend(documentId);
+          fetchDocDataAndReady(documentId);
         } else {
           // No identifiers available
           warn('No shared link token or document ID - statements may fail aggregation');
-          setTimeout(sendLaunchEvents, 500);
+          onDocReady();
         }
       } else {
-        // Already have GUID - send after short delay
-        setTimeout(sendLaunchEvents, 500);
+        // Already have GUID
+        onDocReady();
       }
 
       // Setup beforeunload to send terminated
@@ -4582,7 +4625,7 @@ ${courseLines.join("\n")}
   },` : "";
   return `<!-- === PATCH-ADAMS: JS BEFORE (blocking) === -->
 <script data-pa="js-before-loader">
-// Initialize Patch-Adams global namespace IMMEDIATELY (before IIFE)
+// Initialize PA-Patcher global namespace IMMEDIATELY (before IIFE)
 window.pa_patcher = window.pa_patcher || {
   version: '1.0.25',
   htmlClass: '${htmlClass}',
@@ -4627,7 +4670,7 @@ window.pa_patcher = window.pa_patcher || {
     if (isExtensionError(event.reason)) {
       event.preventDefault();
       event.stopImmediatePropagation();
-      console.debug('[Patch-Adams] Suppressed browser extension error:', event.reason);
+      console.debug('[PA-Patcher] Suppressed browser extension error:', event.reason);
       return false;
     }
   }, true);
@@ -4637,7 +4680,7 @@ window.pa_patcher = window.pa_patcher || {
     if (isExtensionError(event.error || event.message)) {
       event.preventDefault();
       event.stopImmediatePropagation();
-      console.debug('[Patch-Adams] Suppressed browser extension error:', event.message);
+      console.debug('[PA-Patcher] Suppressed browser extension error:', event.message);
       return false;
     }
   }, true);
@@ -4662,17 +4705,17 @@ window.pa_patcher = window.pa_patcher || {
   var script = loadJSSync(REMOTE_URL);
 
   script.onerror = function() {
-    console.warn('[Patch-Adams] JS before failed to load from remote, using local fallback');
+    console.warn('[PA-Patcher] JS before failed to load from remote, using local fallback');
     document.head.removeChild(script);
     var fallback = loadJSSync(LOCAL_PATH);
     fallback.onload = function() {
       if (window.pa_patcher && window.pa_patcher.loaded) {
         window.pa_patcher.loaded.jsBefore = true;
       }
-      console.log('[Patch-Adams] JS before loaded from local fallback:', LOCAL_PATH);
+      console.log('[PA-Patcher] JS before loaded from local fallback:', LOCAL_PATH);
     };
     fallback.onerror = function() {
-      console.error('[Patch-Adams] JS before failed to load from both remote and local');
+      console.error('[PA-Patcher] JS before failed to load from both remote and local');
     };
   };
 
@@ -4680,7 +4723,7 @@ window.pa_patcher = window.pa_patcher || {
     if (window.pa_patcher && window.pa_patcher.loaded) {
       window.pa_patcher.loaded.jsBefore = true;
     }
-    console.log('[Patch-Adams] JS before loaded from remote:', REMOTE_URL);
+    console.log('[PA-Patcher] JS before loaded from remote:', REMOTE_URL);
   };
 })();
 ${lrsBridgeCode}
@@ -4751,14 +4794,14 @@ function generateJsAfterLoader(options) {
     if (window.pa_patcher && window.pa_patcher.loaded) {
       window.pa_patcher.loaded.jsAfter = true;
     }
-    console.log('[Patch-Adams] Loading complete, content revealed');
+    console.log('[PA-Patcher] Loading complete, content revealed');
 
     // Add visual badge to indicate patching is active
     var badge = document.createElement('div');
     badge.setAttribute('data-pa', 'badge');
     badge.style.cssText = 'position:fixed;bottom:10px;right:10px;background:#4CAF50;color:white;padding:4px 8px;border-radius:4px;font-size:11px;font-family:sans-serif;z-index:999999;opacity:0.8;cursor:pointer;';
     badge.textContent = 'PA';
-    badge.title = 'Patch-Adams Active';
+    badge.title = 'PA-Patcher Active';
     badge.onclick = function() { badge.style.display = 'none'; };
     document.body.appendChild(badge);
   }
@@ -4774,7 +4817,7 @@ function generateJsAfterLoader(options) {
         if (loaded) return;
         loaded = true;
         clearTimeout(timeoutId);
-        console.log('[Patch-Adams] JS after loaded from remote:', REMOTE_URL);
+        console.log('[PA-Patcher] JS after loaded from remote:', REMOTE_URL);
         // Give the script a moment to execute, then remove loading class
         setTimeout(removeLoadingClass, 50);
       },
@@ -4790,7 +4833,7 @@ function generateJsAfterLoader(options) {
     timeoutId = setTimeout(function() {
       if (loaded) return;
       loaded = true;
-      console.warn('[Patch-Adams] JS after timed out, using local fallback');
+      console.warn('[PA-Patcher] JS after timed out, using local fallback');
       if (remoteScript.parentNode) {
         document.body.removeChild(remoteScript);
       }
@@ -4802,11 +4845,11 @@ function generateJsAfterLoader(options) {
     loadJS(
       LOCAL_PATH,
       function() {
-        console.log('[Patch-Adams] JS after loaded from local fallback:', LOCAL_PATH);
+        console.log('[PA-Patcher] JS after loaded from local fallback:', LOCAL_PATH);
         setTimeout(removeLoadingClass, 50);
       },
       function() {
-        console.error('[Patch-Adams] JS after failed to load from both remote and local');
+        console.error('[PA-Patcher] JS after failed to load from both remote and local');
         // Still remove loading class so content is visible even if JS fails
         removeLoadingClass();
       }
@@ -5266,7 +5309,7 @@ var ManifestUpdater = class {
       const resourceClosePattern = /(\s*)<\/resource>/i;
       const match = xmlContent.match(resourceClosePattern);
       if (!match) {
-        console.warn("[Patch-Adams] Could not find </resource> tag in imsmanifest.xml");
+        console.warn("[PA-Patcher] Could not find </resource> tag in imsmanifest.xml");
         return [];
       }
       const updatedXml = xmlContent.replace(
@@ -5278,7 +5321,7 @@ $1</resource>`
       zip.updateFile("imsmanifest.xml", Buffer.from(updatedXml, "utf-8"));
       return ["imsmanifest.xml"];
     } catch (error) {
-      console.error("[Patch-Adams] Failed to update imsmanifest.xml:", error);
+      console.error("[PA-Patcher] Failed to update imsmanifest.xml:", error);
       return [];
     }
   }
@@ -5600,7 +5643,7 @@ ${js.after}
 var pluginRegistry = new PluginRegistry();
 
 // src/patcher/index.ts
-var DEFAULT_CSS_BEFORE = `/* Patch-Adams: CSS Before (blocking)
+var DEFAULT_CSS_BEFORE = `/* PA-Patcher: CSS Before (blocking)
  * This file loads at the start of <head> and blocks rendering.
  * Use it to hide content and prevent flash of unstyled content.
  *
@@ -5610,7 +5653,7 @@ var DEFAULT_CSS_BEFORE = `/* Patch-Adams: CSS Before (blocking)
  * }
  */
 `;
-var DEFAULT_CSS_AFTER = `/* Patch-Adams: CSS After (async)
+var DEFAULT_CSS_AFTER = `/* PA-Patcher: CSS After (async)
  * This file loads at the end of <head> with remote fallback.
  * Use it for style overrides that take precedence over Rise styles.
  *
@@ -5620,7 +5663,7 @@ var DEFAULT_CSS_AFTER = `/* Patch-Adams: CSS After (async)
  * }
  */
 `;
-var DEFAULT_JS_BEFORE = `// Patch-Adams: JS Before (blocking)
+var DEFAULT_JS_BEFORE = `// PA-Patcher: JS Before (blocking)
 // This file loads at the start of <head> and blocks rendering.
 // Use it for setup, API interception, and preparing globals.
 //
@@ -5630,9 +5673,9 @@ var DEFAULT_JS_BEFORE = `// Patch-Adams: JS Before (blocking)
 //   analytics: true
 // };
 
-console.log('[Patch-Adams] JS Before loaded');
+console.log('[PA-Patcher] JS Before loaded');
 `;
-var DEFAULT_JS_AFTER = `// Patch-Adams: JS After (async)
+var DEFAULT_JS_AFTER = `// PA-Patcher: JS After (async)
 // This file loads at the end of <body> with remote fallback.
 // Use it for DOM manipulation after Rise has initialized.
 //
@@ -5644,7 +5687,7 @@ var DEFAULT_JS_AFTER = `// Patch-Adams: JS After (async)
 //   // Your modifications here
 // });
 
-console.log('[Patch-Adams] JS After loaded');
+console.log('[PA-Patcher] JS After loaded');
 `;
 var Patcher = class {
   config;