@patch-adams/core 1.4.30 → 1.4.32

package/dist/cli.js

@@ -4453,58 +4453,101 @@ function generateLrsBridgeCode(options) {
           if (isUnknown) {
             log('Actor is Unknown Learner - SCORM API likely not available yet, polling for it...');
             var scormPollCount = 0;
-            var scormMaxPolls = 20; // wait up to 20 seconds
+            var scormMaxPolls = 30; // wait up to 30 seconds
+            var scormResolved = false;
+
+            // Helper: search all possible locations for SCORM API
+            function findScormApiAnywhere() {
+              // 1. Search parent frame hierarchy (standard approach)
+              var api2004 = findAPIInFrameHierarchy('API_1484_11', 10);
+              if (api2004) return { api: api2004.api, type: '2004', source: 'parent-chain level ' + api2004.level };
+              var api12 = findAPIInFrameHierarchy('API', 10);
+              if (api12) return { api: api12.api, type: '1.2', source: 'parent-chain level ' + api12.level };
+
+              // 2. Check window.opener and its parent hierarchy (LMS opens content in popup)
+              try {
+                if (window.opener && window.opener !== window) {
+                  // Direct check on opener
+                  if (window.opener.API_1484_11) return { api: window.opener.API_1484_11, type: '2004', source: 'window.opener' };
+                  if (window.opener.API) return { api: window.opener.API, type: '1.2', source: 'window.opener' };
+                  // Check opener's parent chain
+                  var openerWin = window.opener;
+                  var openerLevel = 0;
+                  while (openerLevel < 10) {
+                    try {
+                      if (openerWin.API_1484_11) return { api: openerWin.API_1484_11, type: '2004', source: 'opener-chain level ' + openerLevel };
+                      if (openerWin.API) return { api: openerWin.API, type: '1.2', source: 'opener-chain level ' + openerLevel };
+                      if (openerWin.parent && openerWin.parent !== openerWin) { openerWin = openerWin.parent; openerLevel++; }
+                      else break;
+                    } catch(e) { break; }
+                  }
+                }
+              } catch(e) { /* cross-origin opener */ }
+
+              // 3. Check for global LMS functions (Bravais/Xyleme mock API)
+              try {
+                if (typeof window.LMSInitialize === 'function') {
+                  return { api: { LMSInitialize: window.LMSInitialize, LMSGetValue: window.LMSGetValue, LMSSetValue: window.LMSSetValue, LMSCommit: window.LMSCommit, LMSFinish: window.LMSFinish, LMSGetLastError: window.LMSGetLastError, LMSGetErrorString: window.LMSGetErrorString }, type: '1.2', source: 'global-functions' };
+                }
+              } catch(e) {}
+              try {
+                if (window.parent && window.parent !== window && typeof window.parent.LMSInitialize === 'function') {
+                  return { api: { LMSInitialize: window.parent.LMSInitialize, LMSGetValue: window.parent.LMSGetValue, LMSSetValue: window.parent.LMSSetValue, LMSCommit: window.parent.LMSCommit, LMSFinish: window.parent.LMSFinish, LMSGetLastError: window.parent.LMSGetLastError, LMSGetErrorString: window.parent.LMSGetErrorString }, type: '1.2', source: 'parent-global-functions' };
+                }
+              } catch(e) {}
+
+              return null;
+            }
+
+            function onScormApiFound(result, pollNum) {
+              if (scormResolved) return;
+              scormResolved = true;
+
+              LRS.scormApi = result.api;
+              LRS.scormApiFound = true;
+              LRS.scormApiType = result.type;
+
+              // Read learner_id for diagnostics
+              var scormLearnerId = 'n/a', scormLearnerName = 'n/a';
+              try {
+                if (result.type === '2004') {
+                  scormLearnerId = result.api.GetValue('cmi.learner_id');
+                  scormLearnerName = result.api.GetValue('cmi.learner_name');
+                } else {
+                  scormLearnerId = result.api.LMSGetValue('cmi.core.student_id');
+                  scormLearnerName = result.api.LMSGetValue('cmi.core.student_name');
+                }
+              } catch(e) { scormLearnerId = 'error'; scormLearnerName = 'error'; }
+              console.info('[PA-LRS] SCORM API found (poll ' + pollNum + ', source=' + result.source +
+                ', type=' + result.type + '): learner_id=' + scormLearnerId + ', learner_name=' + scormLearnerName);
+
+              // refreshActor re-reads learner_id from SCORM and runs employee lookup
+              LRS.refreshActor(function(refreshedActor) {
+                if (window.console && window.console.info) {
+                  console.info('[PA-LRS] Actor resolved (after SCORM wait, poll ' + pollNum + '): name=' +
+                    (refreshedActor ? refreshedActor.name : 'none') +
+                    ', mbox=' + (refreshedActor ? refreshedActor.mbox : 'none') +
+                    ', account=' + (refreshedActor && refreshedActor.account ? refreshedActor.account.name : 'none'));
+                }
+                actorReady = true;
+                tryLaunchEvents();
+              });
+            }
 
             var scormPollTimer = setInterval(function() {
+              if (scormResolved) { clearInterval(scormPollTimer); return; }
               scormPollCount++;
 
-              // Search parent frames for SCORM API (not just current window)
-              var api2004 = findAPIInFrameHierarchy('API_1484_11', 10);
-              var api12 = !api2004 ? findAPIInFrameHierarchy('API', 10) : null;
-              var foundApi = api2004 || api12;
+              var result = findScormApiAnywhere();
 
-              if (foundApi) {
+              if (result) {
                 clearInterval(scormPollTimer);
-                var foundType = api2004 ? '2004' : '1.2';
-                log('SCORM API found on poll ' + scormPollCount + ' at level ' + foundApi.level);
-
-                // Update LRS SCORM API reference
-                if (!LRS.scormApi) {
-                  LRS.scormApi = foundApi.api;
-                  LRS.scormApiFound = true;
-                  LRS.scormApiType = foundType;
-                }
-
-                // Read learner_id right now for diagnostics
-                var scormLearnerId = 'n/a', scormLearnerName = 'n/a';
-                try {
-                  if (foundType === '2004') {
-                    scormLearnerId = foundApi.api.GetValue('cmi.learner_id');
-                    scormLearnerName = foundApi.api.GetValue('cmi.learner_name');
-                  } else {
-                    scormLearnerId = foundApi.api.LMSGetValue('cmi.core.student_id');
-                    scormLearnerName = foundApi.api.LMSGetValue('cmi.core.student_name');
-                  }
-                } catch(e) { scormLearnerId = 'error'; scormLearnerName = 'error'; }
-                console.info('[PA-LRS] SCORM API found (poll ' + scormPollCount + ', type=' + foundType +
-                  ', level=' + foundApi.level + '): learner_id=' + scormLearnerId + ', learner_name=' + scormLearnerName);
-
-                // refreshActor re-reads learner_id from SCORM and runs employee lookup
-                LRS.refreshActor(function(refreshedActor) {
-                  if (window.console && window.console.info) {
-                    console.info('[PA-LRS] Actor resolved (after SCORM wait, poll ' + scormPollCount + '): name=' +
-                      (refreshedActor ? refreshedActor.name : 'none') +
-                      ', mbox=' + (refreshedActor ? refreshedActor.mbox : 'none') +
-                      ', account=' + (refreshedActor && refreshedActor.account ? refreshedActor.account.name : 'none'));
-                  }
-                  actorReady = true;
-                  tryLaunchEvents();
-                });
+                onScormApiFound(result, scormPollCount);
               } else if (scormPollCount >= scormMaxPolls) {
                 clearInterval(scormPollTimer);
                 log('SCORM API not found after ' + scormMaxPolls + 's, proceeding with Unknown Learner');
                 if (window.console && window.console.info) {
-                  console.info('[PA-LRS] Actor resolved (timeout): name=' + (actor ? actor.name : 'none') +
+                  console.info('[PA-LRS] Actor resolved (timeout ' + scormMaxPolls + 's): name=' + (actor ? actor.name : 'none') +
                     ', account=' + (actor && actor.account ? actor.account.name : 'none'));
                 }
                 actorReady = true;