@patch-adams/core 1.5.16 → 1.5.18

package/dist/cli.js

@@ -2203,23 +2203,96 @@ function generateLrsBridgeCode(options) {
       }
     }
 
+    /**
+     * Fetch document name from our authenticated server (cdsImporter proxy).
+     * Derives server base URL from LRS_PROXY_ENDPOINT.
+     * Falls back gracefully if CORS blocks or server is unavailable.
+     * This is the final fallback when Bravais API and PARAMS are not available.
+     */
+    function fetchDocumentNameFromServer(documentId, callback) {
+      if (!LRS_PROXY_ENDPOINT || !documentId) {
+        callback(null);
+        return;
+      }
+
+      // Derive server base from LRS proxy endpoint
+      // e.g., https://api.example.com/create/statement \u2192 https://api.example.com/create/
+      var serverBase = LRS_PROXY_ENDPOINT.replace(/\\/statement\\/?$/, '/');
+      if (!serverBase || serverBase === LRS_PROXY_ENDPOINT) {
+        log('Could not derive server base URL from LRS_PROXY_ENDPOINT');
+        callback(null);
+        return;
+      }
+
+      var apiUrl = serverBase + 'cdsImporter/api/documents/' + documentId;
+      log('Fetching document name from server:', apiUrl);
+
+      var xhr = new XMLHttpRequest();
+      xhr.open('GET', apiUrl, true);
+      xhr.withCredentials = true;
+      xhr.setRequestHeader('Accept', 'application/json');
+      xhr.timeout = 5000;
+
+      xhr.onreadystatechange = function() {
+        if (xhr.readyState === 4) {
+          if (xhr.status >= 200 && xhr.status < 300) {
+            try {
+              var data = JSON.parse(xhr.responseText);
+              if (data.name) {
+                log('Document name from server:', data.name);
+                callback(data.name);
+              } else {
+                callback(null);
+              }
+            } catch (e) {
+              callback(null);
+            }
+          } else {
+            log('Server document lookup returned:', xhr.status);
+            callback(null);
+          }
+        }
+      };
+
+      xhr.onerror = function() {
+        log('Server document lookup network error (CORS or connectivity)');
+        callback(null);
+      };
+      xhr.ontimeout = function() {
+        log('Server document lookup timed out');
+        callback(null);
+      };
+
+      try { xhr.send(); } catch (e) { callback(null); }
+    }
+
     /**
      * Update course info with data from document API
      */
     function updateCourseInfoFromApi(docData) {
       if (!docData || !LRS.courseInfo) return;
 
-      // Document GUID
-      if (docData.guid && !LRS.courseInfo.guid) {
+      // Document GUID \u2014 Bravais API GUID ALWAYS overrides baked-in GUID.
+      // The baked-in GUID is a random UUID from wrap time. The Bravais GUID is the
+      // canonical document identifier that Analytics uses to link statements to documents.
+      // Without this override, our statements have a different object.id than cloudplayer
+      // statements, so Analytics treats them as unrelated to the document.
+      if (docData.guid) {
+        if (LRS.courseInfo.guid && LRS.courseInfo.guid !== docData.guid) {
+          log('Overriding baked-in GUID with Bravais GUID:', LRS.courseInfo.guid, '->', docData.guid);
+        }
         LRS.courseInfo.guid = docData.guid;
         LRS.courseInfo.id = 'http://xyleme.com/bravais/document/' + docData.guid;
-        log('Updated course guid from API:', docData.guid);
+        log('Document GUID from API:', docData.guid);
       }
 
-      // Version GUID from latestVersion
-      if (docData.latestVersion && docData.latestVersion.guid && !LRS.courseInfo.versionGuid) {
+      // Version GUID \u2014 same principle: Bravais version GUID must override baked-in
+      if (docData.latestVersion && docData.latestVersion.guid) {
+        if (LRS.courseInfo.versionGuid && LRS.courseInfo.versionGuid !== docData.latestVersion.guid) {
+          log('Overriding baked-in version GUID:', LRS.courseInfo.versionGuid, '->', docData.latestVersion.guid);
+        }
         LRS.courseInfo.versionGuid = docData.latestVersion.guid;
-        log('Updated version guid from API:', docData.latestVersion.guid);
+        log('Version GUID from API:', docData.latestVersion.guid);
       }
 
       // Other metadata
@@ -2233,6 +2306,19 @@ function generateLrsBridgeCode(options) {
         LRS.courseInfo.resourceType = docData.resourceType;
       }
 
+      // Update packageName from API document name (matches Bravais Analytics object name)
+      // Only set if not already baked in at wrap time
+      if (docData.name && !LRS.courseInfo.packageName) {
+        LRS.courseInfo.packageName = docData.name;
+        log('Updated packageName from API:', docData.name);
+      }
+
+      // Update documentId from API if we didn't have it
+      if (docData.id && !LRS.courseInfo.documentId) {
+        LRS.courseInfo.documentId = String(docData.id);
+        log('Updated documentId from API:', docData.id);
+      }
+
       log('Course info updated from API:', LRS.courseInfo);
     }
 
@@ -2570,15 +2656,20 @@ function generateLrsBridgeCode(options) {
       if (!info.packageName) {
         var bravaisDocName = null;
 
-        // Strategy 1: Walk parent frames for PARAMS.documentName
+        // Strategy 1: Walk parent frames for PARAMS.documentName and PARAMS.did
         try {
           var win = window;
           for (var i = 0; i < 10; i++) {
             try {
-              if (win.PARAMS && win.PARAMS.documentName) {
-                bravaisDocName = win.PARAMS.documentName;
-                log('Bravais document name from PARAMS:', bravaisDocName);
-                break;
+              if (win.PARAMS) {
+                if (win.PARAMS.documentName && !bravaisDocName) {
+                  bravaisDocName = win.PARAMS.documentName;
+                  log('Bravais document name from PARAMS:', bravaisDocName);
+                }
+                if (win.PARAMS.did && !info.documentId) {
+                  info.documentId = String(win.PARAMS.did);
+                  log('Bravais document ID from PARAMS.did:', info.documentId);
+                }
               }
             } catch (e) {}
             if (win === win.parent) break;
@@ -5186,12 +5277,30 @@ function generateLrsBridgeCode(options) {
         tryLaunchEvents();
       }
 
+      // After Bravais API metadata resolves, try our authenticated server as a
+      // final fallback to get the document name for packageName.
+      // This handles cases where PARAMS is cross-origin blocked and no baked name exists.
+      function maybeEnrichAndReady() {
+        if (LRS.courseInfo.packageName || !LRS.courseInfo.documentId || !LRS_PROXY_ENDPOINT) {
+          onDocReady();
+          return;
+        }
+        log('No packageName yet, trying server-side document lookup for ID:', LRS.courseInfo.documentId);
+        fetchDocumentNameFromServer(LRS.courseInfo.documentId, function(name) {
+          if (name) {
+            LRS.courseInfo.packageName = name;
+            log('Set packageName from server lookup:', name);
+          }
+          onDocReady();
+        });
+      }
+
       function fetchDocDataAndReady(docId) {
         fetchDocumentMetadata(docId, function(docData) {
           if (docData) {
             updateCourseInfoFromApi(docData);
           }
-          onDocReady();
+          maybeEnrichAndReady();
         });
       }
 
@@ -5211,7 +5320,7 @@ function generateLrsBridgeCode(options) {
             } else {
               warn('Could not fetch document data from shared API - statements may fail aggregation');
             }
-            onDocReady();
+            maybeEnrichAndReady();
           });
         } else if (documentId) {
           // No shared link token, try with extracted document ID (requires auth)
@@ -5220,11 +5329,11 @@ function generateLrsBridgeCode(options) {
         } else {
           // No identifiers available
           warn('No shared link token or document ID - statements may fail aggregation');
-          onDocReady();
+          maybeEnrichAndReady();
         }
       } else {
-        // Already have GUID
-        onDocReady();
+        // Already have GUID \u2014 still try to enrich packageName if missing
+        maybeEnrichAndReady();
       }
 
       // Setup beforeunload to send terminated