@patch-adams/core 1.5.17 → 1.5.19

package/dist/cli.js

@@ -2272,17 +2272,27 @@ function generateLrsBridgeCode(options) {
     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) {
+        var oldGuid = LRS.courseInfo.guid;
         LRS.courseInfo.guid = docData.guid;
         LRS.courseInfo.id = 'http://xyleme.com/bravais/document/' + docData.guid;
-        log('Updated course guid from API:', docData.guid);
+        // Always-visible log (not behind DEBUG) so we can confirm override in production
+        console.info('[PA-LRS] Document GUID set from API:', docData.guid,
+          oldGuid && oldGuid !== docData.guid ? '(was: ' + oldGuid + ')' : '');
       }
 
-      // 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
@@ -2582,21 +2592,20 @@ function generateLrsBridgeCode(options) {
         info.sharedLinkName = launchInfo.sharedLinkName || info.sharedLinkName;
       }
 
-      // 3b. Try to extract GUIDs from Xyleme Cloud Player's internal data
-      // This is more reliable than API calls which may fail with 401
-      if (!info.guid || !info.versionGuid) {
-        var cloudPlayerData = extractFromXylemeCloudPlayer();
-        if (cloudPlayerData) {
-          info.guid = cloudPlayerData.guid || info.guid;
-          info.versionGuid = cloudPlayerData.versionGuid || info.versionGuid;
-          info.documentId = cloudPlayerData.documentId || info.documentId;
-          info.title = cloudPlayerData.title || info.title;
-          log('Updated course info from Cloud Player:', {
-            guid: info.guid,
-            versionGuid: info.versionGuid,
-            documentId: info.documentId
-          });
-        }
+      // 3b. Always try to extract GUIDs from Xyleme Cloud Player's internal data.
+      // Cloud Player data is authoritative \u2014 it has the canonical Bravais GUID.
+      // This overrides any baked-in GUID which is just a random UUID from wrap time.
+      var cloudPlayerData = extractFromXylemeCloudPlayer();
+      if (cloudPlayerData) {
+        if (cloudPlayerData.guid) info.guid = cloudPlayerData.guid;
+        if (cloudPlayerData.versionGuid) info.versionGuid = cloudPlayerData.versionGuid;
+        info.documentId = cloudPlayerData.documentId || info.documentId;
+        info.title = cloudPlayerData.title || info.title;
+        log('Updated course info from Cloud Player:', {
+          guid: info.guid,
+          versionGuid: info.versionGuid,
+          documentId: info.documentId
+        });
       }
 
       // 4. Try getCourseTitle() from preloadIntegrity.js
@@ -5218,12 +5227,18 @@ function generateLrsBridgeCode(options) {
 
       // Always-visible bridge summary (not gated by DEBUG)
       // This ensures diagnostics are available even in production builds
+      // Shows current GUID (may be from Cloud Player, baked-in, or pending API override)
+      var currentGuid = LRS.courseInfo ? LRS.courseInfo.guid : DOCUMENT_GUID;
+      var currentVerGuid = LRS.courseInfo ? LRS.courseInfo.versionGuid : VERSION_GUID;
+      var sharedToken = LRS.courseInfo ? LRS.courseInfo.sharedLinkToken : null;
       if (window.console && window.console.info) {
         console.info('[PA-LRS] Bridge v' + LRS.version + ': mode=' + LRS.mode +
           ', endpoint=' + (LRS_ENDPOINT ? LRS_ENDPOINT.substring(0, 30) + '...' : 'NONE') +
           ', proxy=' + (LRS_PROXY_ENDPOINT ? 'yes' : 'no') +
-          ', docGuid=' + (DOCUMENT_GUID || 'NONE') +
-          ', verGuid=' + (VERSION_GUID || 'NONE') +
+          ', docGuid=' + (currentGuid || 'NONE') +
+          (currentGuid !== DOCUMENT_GUID ? ' (overridden from baked: ' + DOCUMENT_GUID + ')' : '') +
+          ', verGuid=' + (currentVerGuid || 'NONE') +
+          ', sharedToken=' + (sharedToken || 'NONE') +
           ', actor=' + (LRS.actor ? (LRS.actor.name || 'anonymous') : 'none') +
           ', hasRefreshActor=' + (typeof LRS.refreshActor === 'function'));
       }
@@ -5294,35 +5309,30 @@ function generateLrsBridgeCode(options) {
         });
       }
 
-      if (!LRS.courseInfo.guid) {
-        // When we have a shared link token, use /api/shared/{token}/documents directly
-        // This endpoint does NOT require authentication and returns both document GUID and version GUID
-        if (sharedLinkToken) {
-          log('Have shared link token, fetching document data via shared API...');
-          // fetchDocumentMetadata will use /api/shared/{token}/documents when sharedLinkToken is present
-          fetchDocumentMetadata(null, function(docData) {
-            if (docData) {
-              updateCourseInfoFromApi(docData);
-              // Also update document name if available
-              if (docData.name) {
-                LRS.courseInfo.sharedLinkName = docData.name;
-              }
-            } else {
-              warn('Could not fetch document data from shared API - statements may fail aggregation');
+      // ALWAYS fetch document metadata from the Bravais API.
+      // Even if we have a baked-in GUID, we must override it with the canonical
+      // Bravais GUID so our statements link to the same document as cloudplayer.
+      // The baked-in GUID is a random UUID from wrap time; the Bravais GUID is
+      // assigned at upload and is what Analytics uses for aggregation.
+      if (sharedLinkToken) {
+        log('Have shared link token, fetching document data via shared API...');
+        fetchDocumentMetadata(null, function(docData) {
+          if (docData) {
+            updateCourseInfoFromApi(docData);
+            if (docData.name) {
+              LRS.courseInfo.sharedLinkName = docData.name;
             }
-            maybeEnrichAndReady();
-          });
-        } 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);
-          fetchDocDataAndReady(documentId);
-        } else {
-          // No identifiers available
-          warn('No shared link token or document ID - statements may fail aggregation');
+          } else {
+            warn('Could not fetch document data from shared API - statements may use baked-in GUID');
+          }
           maybeEnrichAndReady();
-        }
+        });
+      } else if (documentId) {
+        log('Fetching document data with ID:', documentId);
+        fetchDocDataAndReady(documentId);
       } else {
-        // Already have GUID \u2014 still try to enrich packageName if missing
+        // No identifiers available
+        warn('No shared link token or document ID - statements will use baked-in GUID');
         maybeEnrichAndReady();
       }