@patch-adams/core 1.5.4 → 1.5.5

package/dist/cli.js

@@ -4319,135 +4319,212 @@ function generateLrsBridgeCode(options) {
     // Intercepts cmi.interactions.N.* SetValue calls to capture quiz answers
     // directly from the SCORM data model \u2014 works regardless of Rise UI format
     // (Knowledge Check blocks, quiz lessons, etc.)
+    //
+    // IMPORTANT: This finds and wraps the ACTUAL SCORM API that Rise uses
+    // (window.API, parent.API, or global functions), NOT the bridge's copy.
+    // It runs unconditionally at init, not gated by actor resolution.
     // ========================================================================
     var scormInteractions = {};  // Pending interactions keyed by index N
     var scormInteractionsSent = {};  // Track which interactions were already sent
     var scormTrackerActive = false;  // Set true when SCORM tracker wraps SetValue \u2014 KC handler defers
 
-    function setupScormInteractionTracker() {
-      if (!TRACK_QUIZZES) return;
-      if (!LRS.scormApi) {
-        log('SCORM Interaction Tracker: No SCORM API found, skipping');
-        return;
-      }
-
-      var api = LRS.scormApi;
-      var apiType = LRS.scormApiType;
+    function interceptScormSetValue(key, value) {
+      if (typeof key !== 'string') return;
+      var interactionPattern = /^cmi\\.interactions\\.(\\d+)\\.(.+)$/;
+      var match = key.match(interactionPattern);
+      if (!match) return;
 
-      // Determine which SetValue function to wrap
-      var setValueFn = apiType === '2004' ? 'SetValue' : 'LMSSetValue';
-      var originalSetValue = api[setValueFn];
+      var idx = match[1];
+      var field = match[2];
 
-      if (typeof originalSetValue !== 'function') {
-        log('SCORM Interaction Tracker: No ' + setValueFn + ' function found');
-        return;
+      // Initialize interaction tracking for this index
+      if (!scormInteractions[idx]) {
+        scormInteractions[idx] = {};
       }
 
-      // SCORM 1.2 uses cmi.interactions.N.*, SCORM 2004 uses cmi.interactions.N.*
-      var interactionPattern = /^cmi\\.interactions\\.(\\d+)\\.(.+)$/;
+      // Store the field value
+      scormInteractions[idx][field] = String(value);
 
-      api[setValueFn] = function(key, value) {
-        // Always call the original first
-        var result = originalSetValue.apply(api, arguments);
+      log('SCORM Interaction [' + idx + '].' + field + ' = ' + String(value).substring(0, 100));
 
-        // Check if this is an interaction data element
-        if (typeof key === 'string') {
-          var match = key.match(interactionPattern);
-          if (match) {
-            var idx = match[1];
-            var field = match[2];
+      // When 'result' is set, the interaction is complete \u2014 fire xAPI statement
+      if (field === 'result' && !scormInteractionsSent[idx]) {
+        scormInteractionsSent[idx] = true;
+        var interaction = scormInteractions[idx];
 
-            // Initialize interaction tracking for this index
-            if (!scormInteractions[idx]) {
-              scormInteractions[idx] = {};
-            }
+        // Map SCORM interaction type to readable type
+        var typeMap = {
+          'choice': 'multiple-choice',
+          'true-false': 'true-false',
+          'fill-in': 'fill-in-blank',
+          'matching': 'matching',
+          'performance': 'performance',
+          'sequencing': 'sequencing',
+          'likert': 'likert',
+          'numeric': 'numeric'
+        };
 
-            // Store the field value
-            scormInteractions[idx][field] = value;
-
-            log('SCORM Interaction [' + idx + '].' + field + ' = ' + (value ? value.substring(0, 80) : value));
-
-            // When 'result' is set, the interaction is complete \u2014 fire xAPI statement
-            if (field === 'result' && !scormInteractionsSent[idx]) {
-              scormInteractionsSent[idx] = true;
-              var interaction = scormInteractions[idx];
-
-              // Map SCORM interaction type to readable type
-              var typeMap = {
-                'choice': 'multiple-choice',
-                'true-false': 'true-false',
-                'fill-in': 'fill-in-blank',
-                'matching': 'matching',
-                'performance': 'performance',
-                'sequencing': 'sequencing',
-                'likert': 'likert',
-                'numeric': 'numeric'
-              };
+        var scormType = interaction.type || 'unknown';
+        var questionType = typeMap[scormType] || scormType;
 
-              var scormType = interaction.type || 'unknown';
-              var questionType = typeMap[scormType] || scormType;
+        // Determine correctness from SCORM result value
+        // SCORM 1.2: 'correct', 'wrong', 'unanticipated', 'neutral'
+        // SCORM 2004: 'correct', 'incorrect', 'unanticipated', 'neutral'
+        var isCorrect = String(value) === 'correct';
 
-              // Determine correctness from SCORM result value
-              // SCORM 1.2: 'correct', 'wrong', 'unanticipated', 'neutral'
-              // SCORM 2004: 'correct', 'incorrect', 'unanticipated', 'neutral'
-              var isCorrect = value === 'correct';
+        // Get student response
+        var studentResponse = interaction.student_response || '';
 
-              // Get student response \u2014 for 'choice' type, this might be indices like '1,3'
-              var studentResponse = interaction.student_response || interaction['student_response'] || '';
+        // Get correct response pattern
+        var correctResponse = '';
+        Object.keys(interaction).forEach(function(k) {
+          if (k.indexOf('correct_responses') > -1 && k.indexOf('pattern') > -1) {
+            correctResponse = interaction[k];
+          }
+        });
 
-              // Get correct response pattern
-              var correctResponse = '';
-              // SCORM 1.2: correct_responses.0.pattern
-              // Check stored fields for correct_responses
-              Object.keys(interaction).forEach(function(k) {
-                if (k.indexOf('correct_responses') > -1 && k.indexOf('pattern') > -1) {
-                  correctResponse = interaction[k];
-                }
-              });
+        // Rise interaction IDs encode the question text (underscored)
+        // e.g. "Development_Week_Qui_I_want_a_clear_picture_of_..."
+        var interactionId = interaction.id || ('interaction-' + idx);
+
+        // Try to make a readable question text from the interaction ID
+        var questionText = interactionId
+          .replace(/_\\d+$/, '')  // remove trailing _0
+          .replace(/_/g, ' ')     // underscores to spaces
+          .substring(0, 200);
+
+        // Get lesson context
+        var lessonInfo = getCachedLessonInfo();
+
+        // Increment question counter
+        kcQuestionCounter++;
+
+        log('SCORM Interaction complete [' + idx + ']:', {
+          questionNumber: kcQuestionCounter,
+          questionText: questionText.substring(0, 60) + '...',
+          type: questionType,
+          studentResponse: studentResponse,
+          correctResponse: correctResponse,
+          result: String(value),
+          correct: isCorrect
+        });
 
-              // Get interaction ID (Rise sets this to a unique question identifier)
-              var interactionId = interaction.id || ('interaction-' + idx);
+        // Send xAPI answered statement
+        LRS.questionAnswered({
+          questionId: interactionId,
+          questionGuid: interactionId,
+          questionNumber: kcQuestionCounter,
+          questionText: questionText,
+          questionType: questionType,
+          answer: studentResponse,
+          correctAnswer: correctResponse,
+          correct: isCorrect,
+          result: isCorrect ? 'correct' : 'incorrect',
+          assessmentName: lessonInfo.name || 'Quiz',
+          lessonName: lessonInfo.name,
+          sectionName: lessonInfo.sectionName
+        });
+      }
+    }
 
-              // Get lesson context
-              var lessonInfo = getCachedLessonInfo();
+    function setupScormInteractionTracker() {
+      if (!TRACK_QUIZZES) return;
 
-              // Increment question counter
-              kcQuestionCounter++;
+      // Find the ACTUAL SCORM API that Rise uses \u2014 NOT our bridge's copy.
+      // Rise discovers the API via standard SCORM lookup (window.API, parent chain).
+      // The Bravais CDS player's ProxyApi.injectLmsApi() sets this up.
+      var wrapped = false;
 
-              log('SCORM Interaction complete [' + idx + ']:', {
-                id: interactionId,
-                type: questionType,
-                response: studentResponse,
-                correctResponse: correctResponse,
-                result: value,
-                correct: isCorrect,
-                questionNumber: kcQuestionCounter
-              });
+      // Try 1: window.API (SCORM 1.2) or window.API_1484_11 (SCORM 2004)
+      try {
+        if (window.API && typeof window.API.LMSSetValue === 'function') {
+          var origSetValue = window.API.LMSSetValue;
+          window.API.LMSSetValue = function(key, value) {
+            var result = origSetValue.apply(window.API, arguments);
+            interceptScormSetValue(key, value);
+            return result;
+          };
+          wrapped = true;
+          log('SCORM Interaction Tracker: Wrapped window.API.LMSSetValue');
+        }
+      } catch (e) { log('SCORM Tracker: Cannot access window.API:', e.message); }
 
-              // Send xAPI answered statement
-              LRS.questionAnswered({
-                questionId: interactionId,
-                questionGuid: interactionId,
-                questionNumber: kcQuestionCounter,
-                questionText: 'Question ' + kcQuestionCounter + ' (' + interactionId + ')',
-                questionType: questionType,
-                answer: studentResponse,
-                correctAnswer: correctResponse,
-                correct: isCorrect,
-                result: isCorrect ? 'correct' : 'incorrect',
-                assessmentName: lessonInfo.name || 'Quiz',
-                lessonName: lessonInfo.name,
-                sectionName: lessonInfo.sectionName
-              });
+      if (!wrapped) {
+        try {
+          if (window.API_1484_11 && typeof window.API_1484_11.SetValue === 'function') {
+            var origSetValue2004 = window.API_1484_11.SetValue;
+            window.API_1484_11.SetValue = function(key, value) {
+              var result = origSetValue2004.apply(window.API_1484_11, arguments);
+              interceptScormSetValue(key, value);
+              return result;
+            };
+            wrapped = true;
+            log('SCORM Interaction Tracker: Wrapped window.API_1484_11.SetValue');
+          }
+        } catch (e) { log('SCORM Tracker: Cannot access window.API_1484_11:', e.message); }
+      }
+
+      // Try 2: Parent frame API
+      if (!wrapped) {
+        try {
+          if (window.parent && window.parent !== window) {
+            if (window.parent.API && typeof window.parent.API.LMSSetValue === 'function') {
+              var origParentSetValue = window.parent.API.LMSSetValue;
+              window.parent.API.LMSSetValue = function(key, value) {
+                var result = origParentSetValue.apply(window.parent.API, arguments);
+                interceptScormSetValue(key, value);
+                return result;
+              };
+              wrapped = true;
+              log('SCORM Interaction Tracker: Wrapped window.parent.API.LMSSetValue');
             }
           }
-        }
+        } catch (e) { log('SCORM Tracker: Cannot access parent API (cross-origin)'); }
+      }
 
-        return result;
-      };
+      // Try 3: Global LMS functions (Bravais/Xyleme mock API)
+      if (!wrapped) {
+        try {
+          if (typeof window.LMSSetValue === 'function') {
+            var origGlobalSetValue = window.LMSSetValue;
+            window.LMSSetValue = function(key, value) {
+              var result = origGlobalSetValue.apply(window, arguments);
+              interceptScormSetValue(key, value);
+              return result;
+            };
+            wrapped = true;
+            log('SCORM Interaction Tracker: Wrapped window.LMSSetValue (global)');
+          }
+        } catch (e) { log('SCORM Tracker: Cannot wrap global LMSSetValue:', e.message); }
+      }
+
+      // Try 4: Fall back to bridge's copy (least likely to work but worth trying)
+      if (!wrapped && LRS.scormApi) {
+        var setValueFn = LRS.scormApiType === '2004' ? 'SetValue' : 'LMSSetValue';
+        if (typeof LRS.scormApi[setValueFn] === 'function') {
+          var origBridgeSetValue = LRS.scormApi[setValueFn];
+          LRS.scormApi[setValueFn] = function(key, value) {
+            var result = origBridgeSetValue.apply(LRS.scormApi, arguments);
+            interceptScormSetValue(key, value);
+            return result;
+          };
+          wrapped = true;
+          log('SCORM Interaction Tracker: Wrapped LRS.scormApi.' + setValueFn + ' (bridge copy)');
+        }
+      }
 
-      scormTrackerActive = true;
-      log('SCORM Interaction Tracker: Wrapped ' + setValueFn + ' (apiType=' + apiType + ') \u2014 KC DOM handler will defer to SCORM tracker');
+      if (wrapped) {
+        scormTrackerActive = true;
+        log('SCORM Interaction Tracker active \u2014 KC DOM handler will defer');
+      } else {
+        // API not available yet \u2014 retry in 2 seconds (Bravais proxy may not be ready)
+        log('SCORM Interaction Tracker: No SCORM API found yet, retrying in 2s...');
+        setTimeout(function() {
+          if (!scormTrackerActive) {
+            setupScormInteractionTracker();
+          }
+        }, 2000);
+      }
     }
 
     function setupInteractionInterceptors() {
@@ -4668,9 +4745,6 @@ function generateLrsBridgeCode(options) {
               LRS.scormApiFound = true;
               LRS.scormApiType = result.type;
 
-              // Wrap SCORM SetValue to intercept cmi.interactions for quiz tracking
-              setupScormInteractionTracker();
-
               // Read learner_id for diagnostics
               var scormLearnerId = 'n/a', scormLearnerName = 'n/a';
               try {
@@ -4753,6 +4827,10 @@ function generateLrsBridgeCode(options) {
       setupQuizInterceptors();
       setupInteractionInterceptors();
 
+      // Intercept SCORM cmi.interactions to capture quiz answers as xAPI statements
+      // This wraps the ACTUAL SCORM API (window.API etc.) that Rise calls
+      setupScormInteractionTracker();
+
       // Fetch document metadata from API to get GUIDs (async)
       // Then send course launched event
       var sharedLinkToken = LRS.courseInfo ? LRS.courseInfo.sharedLinkToken : null;