coursecode 0.1.56 → 0.1.58

package/framework/js/drivers/scorm-12-driver.js

@@ -14,6 +14,20 @@ import { ScormDriverBase } from './scorm-driver-base.js';
 import { eventBus } from '../core/event-bus.js';
 import { logger } from '../utilities/logger.js';
 import LZString from 'lz-string';
+import { serializeInteractionForScorm12 } from '../validation/scorm-validators.js';
+
+const SCORM12_SUSPEND_PREFIX = 'CC12:';
+
+function parseFiniteNumber(value, fallback = null) {
+    if (value === null || value === undefined || String(value).trim() === '') return fallback;
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : fallback;
+}
+
+function parseNonNegativeInteger(value) {
+    const parsed = Number(value);
+    return Number.isInteger(parsed) && parsed >= 0 ? parsed : 0;
+}
 
 // =============================================================================
 // Status Mapping
@@ -58,6 +72,12 @@ function mapStatusTo2004(lessonStatus) {
     }
 }
 
+function mapObjectiveStatusTo12(completionStatus, successStatus) {
+    if (successStatus === 'passed') return 'passed';
+    if (successStatus === 'failed') return 'failed';
+    return mapStatusTo12(completionStatus, successStatus);
+}
+
 // =============================================================================
 // Time Format Conversion
 // =============================================================================
@@ -82,6 +102,86 @@ function convertTimeFormat2004To12(iso8601) {
     return `${hStr}:${mStr}:${sStr}`;
 }
 
+/**
+ * Converts a SCORM 2004 timestamp to the SCORM 1.2 interaction time format.
+ * SCORM 1.2 stores only the time-of-day portion in cmi.interactions.n.time.
+ */
+function convertTimestamp2004To12(timestamp) {
+    if (!timestamp || typeof timestamp !== 'string') return '00:00:00';
+    const match = timestamp.match(/(?:T|^)(\d{2}):(\d{2}):(\d{2})/);
+    return match ? `${match[1]}:${match[2]}:${match[3]}` : '00:00:00';
+}
+
+/**
+ * Produces the compact suspend-data representation used by SCORM 1.2.
+ * Version 2 is lossless: the previous diet silently discarded objective,
+ * engagement, response, metadata, and extension-domain state on every save.
+ */
+function createScorm12DietState(fullState, currentSlide = null) {
+    const state = { ...fullState };
+    if (fullState.navigation && currentSlide) {
+        state.navigation = { ...fullState.navigation, currentSlide };
+    }
+    return { v: 2, s: state };
+}
+
+function expandScorm12DietState(dietState) {
+    if (dietState?.v === 2 && dietState.s && typeof dietState.s === 'object') {
+        return dietState.s;
+    }
+
+    // Backward-compatible reader for packages published with the original
+    // lossy diet representation.
+    const expanded = {};
+
+    if (dietState.nav) {
+        expanded.navigation = {
+            currentSlide: dietState.nav.cur,
+            visitedSlides: dietState.nav.vis || []
+        };
+    }
+    if (dietState.acc) expanded.accessibility = dietState.acc;
+    if (dietState.flg) expanded.flags = dietState.flg;
+
+    if (dietState.eng) {
+        expanded.engagement = {};
+        for (const [slideId, slideState] of Object.entries(dietState.eng)) {
+            expanded.engagement[slideId] = {
+                complete: slideState.c === 1,
+                tracked: {}
+            };
+        }
+    }
+
+    if (dietState.int) expanded.interactionResponses = dietState.int;
+
+    for (const [key, value] of Object.entries(dietState)) {
+        if (key.startsWith('as_')) expanded[`assessment_${key.substring(3)}`] = value;
+    }
+
+    return expanded;
+}
+
+function encodeScorm12SuspendState(state) {
+    return SCORM12_SUSPEND_PREFIX + LZString.compressToEncodedURIComponent(JSON.stringify(state));
+}
+
+function decodeScorm12SuspendState(value) {
+    if (value.startsWith(SCORM12_SUSPEND_PREFIX)) {
+        const decoded = LZString.decompressFromEncodedURIComponent(
+            value.slice(SCORM12_SUSPEND_PREFIX.length)
+        );
+        if (!decoded) throw new Error('SCORM 1.2 suspend_data is corrupted or truncated');
+        return JSON.parse(decoded);
+    }
+
+    // Read legacy UTF-16 CourseCode state without writing it back until a
+    // successful, explicit commit migrates it to the ASCII-safe format.
+    const legacy = LZString.decompressFromUTF16(value);
+    if (!legacy) throw new Error('SCORM 1.2 suspend_data is corrupted or uses an unsupported encoding');
+    return JSON.parse(legacy);
+}
+
 // =============================================================================
 // SCORM 1.2 Driver Class (using pipwerks)
 // =============================================================================
@@ -104,6 +204,11 @@ export class Scorm12Driver extends ScormDriverBase {
             learnerName: '',
             interactionsCount: 0
         };
+        this._objectiveIdToIndex = new Map();
+        this._objectivesCount = 0;
+        this._supportsObjectives = false;
+        this._supportsInteractions = false;
+        this._scoreChildren = new Set(['raw']);
     }
 
     // =========================================================================
@@ -116,10 +221,10 @@ export class Scorm12Driver extends ScormDriverBase {
 
     getCapabilities() {
         return {
-            supportsObjectives: true,
-            supportsInteractions: true,
+            supportsObjectives: this._supportsObjectives,
+            supportsInteractions: this._supportsInteractions,
             supportsComments: false,   // SCORM 1.2 comments are read-only
-            supportsEmergencySave: false,
+            supportsEmergencySave: true,
             maxSuspendDataBytes: 4096,
             asyncCommit: false
         };
@@ -187,15 +292,15 @@ export class Scorm12Driver extends ScormDriverBase {
         try {
             const rawStr = this._scorm.get('cmi.core.score.raw');
             if (!rawStr) return null;
-            const raw = parseFloat(rawStr);
-            if (isNaN(raw)) return null;
-            const minStr = this._scorm.get('cmi.core.score.min');
-            const maxStr = this._scorm.get('cmi.core.score.max');
+            const raw = parseFiniteNumber(rawStr);
+            if (raw === null) return null;
+            const minStr = this._scoreChildren.has('min') ? this._scorm.get('cmi.core.score.min') : '';
+            const maxStr = this._scoreChildren.has('max') ? this._scorm.get('cmi.core.score.max') : '';
             return {
                 scaled: raw / 100,
                 raw,
-                min: minStr ? parseFloat(minStr) : 0,
-                max: maxStr ? parseFloat(maxStr) : 100
+                min: parseFiniteNumber(minStr, 0),
+                max: parseFiniteNumber(maxStr, 100)
             };
         } catch (_e) {
             return null;
@@ -221,8 +326,8 @@ export class Scorm12Driver extends ScormDriverBase {
     reportScore({ raw, min, max }) {
         // SCORM 1.2 doesn't have scaled score — silently ignored
         if (raw !== undefined) this._rawSet('cmi.core.score.raw', String(raw));
-        if (min !== undefined) this._rawSet('cmi.core.score.min', String(min));
-        if (max !== undefined) this._rawSet('cmi.core.score.max', String(max));
+        if (min !== undefined && this._scoreChildren.has('min')) this._rawSet('cmi.core.score.min', String(min));
+        if (max !== undefined && this._scoreChildren.has('max')) this._rawSet('cmi.core.score.max', String(max));
     }
 
     reportCompletion(status) {
@@ -246,6 +351,7 @@ export class Scorm12Driver extends ScormDriverBase {
 
     reportObjective(objective) {
         if (!objective || !objective.id) return;
+        if (!this._supportsObjectives) return;
 
         // SCORM 1.2 objectives support: id, score.raw, score.min, score.max, status
         // But NOT success_status or completion_status separately
@@ -256,17 +362,13 @@ export class Scorm12Driver extends ScormDriverBase {
             this._rawSet(`cmi.objectives.${index}.score.raw`, String(objective.score));
             this._rawSet(`cmi.objectives.${index}.score.min`, '0');
             this._rawSet(`cmi.objectives.${index}.score.max`, '100');
-
-            // Map success_status to 1.2 objective status
-            if (objective.success_status === 'passed') {
-                this._rawSet(`cmi.objectives.${index}.status`, 'passed');
-            } else if (objective.success_status === 'failed') {
-                this._rawSet(`cmi.objectives.${index}.status`, 'failed');
-            }
         }
 
-        if (objective.completion_status === 'completed' && !objective.success_status) {
-            this._rawSet(`cmi.objectives.${index}.status`, 'completed');
+        if (objective.completion_status !== undefined || objective.success_status !== undefined) {
+            this._rawSet(
+                `cmi.objectives.${index}.status`,
+                mapObjectiveStatusTo12(objective.completion_status, objective.success_status)
+            );
         }
     }
 
@@ -275,31 +377,37 @@ export class Scorm12Driver extends ScormDriverBase {
             throw new Error('Scorm12Driver: interaction.id and interaction.type are required');
         }
 
+        if (!this._supportsInteractions) {
+            return { ...interaction, _index: null, nativeCmiSkipped: true };
+        }
+
+        const serializedInteraction = serializeInteractionForScorm12(interaction);
+
         const index = this._cache.interactionsCount;
 
         // SCORM 1.2 interaction fields
-        this._rawSet(`cmi.interactions.${index}.id`, interaction.id);
-        this._rawSet(`cmi.interactions.${index}.type`, interaction.type);
+        this._rawSet(`cmi.interactions.${index}.id`, serializedInteraction.id);
+        this._rawSet(`cmi.interactions.${index}.type`, serializedInteraction.type);
 
-        if (interaction.learner_response !== undefined && interaction.learner_response !== null && interaction.learner_response !== '') {
-            this._rawSet(`cmi.interactions.${index}.student_response`, interaction.learner_response);
+        if (serializedInteraction.learner_response !== '') {
+            this._rawSet(`cmi.interactions.${index}.student_response`, serializedInteraction.learner_response);
         }
-        if (interaction.result) {
-            this._rawSet(`cmi.interactions.${index}.result`, interaction.result);
+        if (serializedInteraction.result) {
+            this._rawSet(`cmi.interactions.${index}.result`, serializedInteraction.result);
         }
         if (interaction.timestamp) {
-            this._rawSet(`cmi.interactions.${index}.time`, interaction.timestamp);
+            this._rawSet(`cmi.interactions.${index}.time`, convertTimestamp2004To12(interaction.timestamp));
         }
         if (interaction.weighting !== undefined && interaction.weighting !== null) {
             this._rawSet(`cmi.interactions.${index}.weighting`, String(interaction.weighting));
         }
         if (interaction.latency) {
-            this._rawSet(`cmi.interactions.${index}.latency`, interaction.latency);
+            this._rawSet(`cmi.interactions.${index}.latency`, convertTimeFormat2004To12(interaction.latency));
         }
 
         // correct_responses
-        if (interaction.correct_responses && Array.isArray(interaction.correct_responses)) {
-            interaction.correct_responses.forEach((item, patternIndex) => {
+        if (serializedInteraction.correct_responses && Array.isArray(serializedInteraction.correct_responses)) {
+            serializedInteraction.correct_responses.forEach((item, patternIndex) => {
                 const patternValue = (typeof item === 'object' && item !== null && 'pattern' in item)
                     ? item.pattern
                     : item;
@@ -308,8 +416,8 @@ export class Scorm12Driver extends ScormDriverBase {
         }
 
         // objectives
-        if (interaction.objectives && Array.isArray(interaction.objectives)) {
-            interaction.objectives.forEach((objectiveId, objIndex) => {
+        if (serializedInteraction.objectives && Array.isArray(serializedInteraction.objectives)) {
+            serializedInteraction.objectives.forEach((objectiveId, objIndex) => {
                 this._rawSet(`cmi.interactions.${index}.objectives.${objIndex}.id`, objectiveId);
             });
         }
@@ -330,24 +438,18 @@ export class Scorm12Driver extends ScormDriverBase {
     // =========================================================================
 
     getSuspendData() {
-        const data = this._scorm.get('cmi.suspend_data') || '';
+        const data = this._rawGet('cmi.suspend_data');
 
         if (!data) {
             return null;
         }
 
-        const jsonString = LZString.decompressFromUTF16(data);
-        if (!jsonString) {
-            logger.warn('[Scorm12Driver] Failed to decompress suspend_data');
-            return null;
-        }
-
         try {
-            const parsed = JSON.parse(jsonString);
+            const parsed = decodeScorm12SuspendState(data);
             return this._expandDietState(parsed);
         } catch (error) {
-            logger.error('[Scorm12Driver] Failed to parse suspend_data:', error);
-            throw new Error(`Failed to parse suspend data: ${error.message}`);
+            logger.error('[Scorm12Driver] Failed to decode suspend_data:', error);
+            throw new Error(`SCORM 1.2 resume state cannot be safely restored: ${error.message}`);
         }
     }
 
@@ -357,10 +459,9 @@ export class Scorm12Driver extends ScormDriverBase {
         }
 
         // STRICT DIET MODE: Always prune, never adaptive
-        const dietData = this._createDietState(data);
+        const dietData = createScorm12DietState(data, this._cache.bookmark || null);
 
-        const serialized = JSON.stringify(dietData);
-        const compressed = LZString.compressToUTF16(serialized);
+        const compressed = encodeScorm12SuspendState(dietData);
 
         const compressedSizeKB = (compressed.length / 1024).toFixed(2);
         logger.debug(`[Scorm12Driver] Diet suspend_data: ${compressedSizeKB}KB compressed`);
@@ -369,6 +470,9 @@ export class Scorm12Driver extends ScormDriverBase {
             logger.error(`[Scorm12Driver] ⚠️ CRITICAL: Strict diet still exceeds 4KB! (${compressedSizeKB}KB)`);
             eventBus.emit('suspend-data:critical', { bytes: compressed.length, format: 'scorm1.2' });
         }
+        if (compressed.length > 4096) {
+            throw new Error(`SCORM 1.2 suspend_data exceeds the 4096-character limit (${compressed.length})`);
+        }
 
         this._rawSet('cmi.suspend_data', compressed);
         return true;
@@ -379,87 +483,11 @@ export class Scorm12Driver extends ScormDriverBase {
     // =========================================================================
 
     _createDietState(fullState) {
-        const diet = {};
-
-        // Use cached bookmark (the authoritative location)
-        const currentSlide = this._cache.bookmark || null;
-
-        if (fullState.navigation) {
-            diet.nav = {
-                cur: currentSlide,
-                vis: fullState.navigation.visitedSlides
-            };
-        }
-
-        if (fullState.accessibility) {
-            diet.acc = fullState.accessibility;
-        }
-
-        if (fullState.flags && Object.keys(fullState.flags).length > 0) {
-            diet.flg = fullState.flags;
-        }
-
-        if (fullState.engagement) {
-            diet.eng = {};
-            for (const [slideId, slideState] of Object.entries(fullState.engagement)) {
-                diet.eng[slideId] = { c: slideState.complete ? 1 : 0 };
-            }
-        }
-
-        if (fullState.interactionResponses && currentSlide) {
-            if (fullState.interactionResponses[currentSlide]) {
-                diet.int = { [currentSlide]: fullState.interactionResponses[currentSlide] };
-            }
-        }
-
-        for (const [key, value] of Object.entries(fullState)) {
-            if (key.startsWith('assessment_')) {
-                diet[`as_${key.substring(11)}`] = value;
-            }
-        }
-
-        return diet;
+        return createScorm12DietState(fullState, this._cache.bookmark || null);
     }
 
     _expandDietState(dietState) {
-        const expanded = {};
-
-        if (dietState.nav) {
-            expanded.navigation = {
-                currentSlide: dietState.nav.cur,
-                visitedSlides: dietState.nav.vis || []
-            };
-        }
-
-        if (dietState.acc) {
-            expanded.accessibility = dietState.acc;
-        }
-
-        if (dietState.flg) {
-            expanded.flags = dietState.flg;
-        }
-
-        if (dietState.eng) {
-            expanded.engagement = {};
-            for (const [slideId, slideState] of Object.entries(dietState.eng)) {
-                expanded.engagement[slideId] = {
-                    complete: slideState.c === 1,
-                    tracked: {}
-                };
-            }
-        }
-
-        if (dietState.int) {
-            expanded.interactionResponses = dietState.int;
-        }
-
-        for (const [key, value] of Object.entries(dietState)) {
-            if (key.startsWith('as_')) {
-                expanded[`assessment_${key.substring(3)}`] = value;
-            }
-        }
-
-        return expanded;
+        return expandScorm12DietState(dietState);
     }
 
     // =========================================================================
@@ -486,32 +514,81 @@ export class Scorm12Driver extends ScormDriverBase {
         const lessonStatus = this._scorm.get('cmi.core.lesson_status');
         this._statusCache = mapStatusTo2004(lessonStatus);
 
+        const scoreChildren = this._readChildren('cmi.core.score._children');
+        this._scoreChildren = new Set(['raw', ...scoreChildren]);
+
+        const topLevelChildren = this._readChildren('cmi._children');
+        this._supportsObjectives = topLevelChildren.has('objectives');
+        this._supportsInteractions = topLevelChildren.has('interactions');
+
         // Read interactions count for append tracking
         try {
-            const parsed = parseInt(this._scorm.get('cmi.interactions._count') || '0', 10);
-            this._cache.interactionsCount = isNaN(parsed) ? 0 : parsed;
+            if (!this._supportsInteractions) throw new Error('interactions unsupported');
+            this._cache.interactionsCount = parseNonNegativeInteger(
+                this._scorm.get('cmi.interactions._count') || '0'
+            );
         } catch (_e) {
             this._cache.interactionsCount = 0;
         }
+
+        this._objectiveIdToIndex.clear();
+        try {
+            if (!this._supportsObjectives) throw new Error('objectives unsupported');
+            this._objectivesCount = parseNonNegativeInteger(
+                this._scorm.get('cmi.objectives._count') || '0'
+            );
+        } catch (_e) {
+            this._objectivesCount = 0;
+        }
+        for (let i = 0; i < this._objectivesCount; i++) {
+            try {
+                const id = this._scorm.get(`cmi.objectives.${i}.id`) || '';
+                if (id) this._objectiveIdToIndex.set(id, i);
+            } catch (_e) {
+                // Preserve the LMS-reported count even if one optional row is unreadable.
+            }
+        }
     }
 
     /**
      * Objective index tracking (same pattern as SCORM 2004 but 1.2-native).
      */
-    _objectiveIdToIndex = new Map();
-
     _getOrCreateObjectiveIndex(objectiveId) {
         if (this._objectiveIdToIndex.has(objectiveId)) {
             return this._objectiveIdToIndex.get(objectiveId);
         }
 
-        const newIndex = this._objectiveIdToIndex.size;
+        const newIndex = this._objectivesCount;
         this._rawSet(`cmi.objectives.${newIndex}.id`, objectiveId);
         this._objectiveIdToIndex.set(objectiveId, newIndex);
+        this._objectivesCount++;
 
         return newIndex;
     }
 
+    _readChildren(key) {
+        try {
+            return new Set(
+                String(this._scorm.get(key) || '')
+                    .split(',')
+                    .map(value => value.trim())
+                    .filter(Boolean)
+            );
+        } catch (_error) {
+            return new Set();
+        }
+    }
+
+    _rawGet(key12) {
+        const value = this._scorm.get(key12);
+        const code = Number(this._scorm.debug?.getCode?.() || 0);
+        if (code !== 0) {
+            const info = this._scorm.debug?.getInfo?.(code) || `SCORM error ${code}`;
+            throw new Error(`Failed to get value for "${key12}": ${info}`);
+        }
+        return value || '';
+    }
+
     /**
      * Low-level raw SCORM 1.2 set. No mapping, no translation.
      */
@@ -547,7 +624,7 @@ export class Scorm12Driver extends ScormDriverBase {
         const success = this._scorm.set('cmi.core.lesson_status', lessonStatus);
 
         if (!success) {
-            logger.warn(`[Scorm12Driver] Failed to sync lesson_status to: ${lessonStatus}`);
+            throw new Error(`[Scorm12Driver] Failed to sync lesson_status to: ${lessonStatus}`);
         }
     }
 }
@@ -556,5 +633,11 @@ export class Scorm12Driver extends ScormDriverBase {
 export {
     mapStatusTo12,
     mapStatusTo2004,
-    convertTimeFormat2004To12
+    mapObjectiveStatusTo12,
+    convertTimeFormat2004To12,
+    convertTimestamp2004To12,
+    createScorm12DietState,
+    expandScorm12DietState,
+    encodeScorm12SuspendState,
+    decodeScorm12SuspendState
 };

package/framework/js/drivers/scorm-2004-driver.js

@@ -13,6 +13,17 @@ import { eventBus } from '../core/event-bus.js';
 import { logger } from '../utilities/logger.js';
 import LZString from 'lz-string';
 
+function parseFiniteNumber(value, fallback = null) {
+    if (value === null || value === undefined || String(value).trim() === '') return fallback;
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : fallback;
+}
+
+function parseNonNegativeInteger(value) {
+    const parsed = Number(value);
+    return Number.isInteger(parsed) && parsed >= 0 ? parsed : 0;
+}
+
 /**
  * SCORM 2004 4th Edition Driver
  * Communicates with window.API_1484_11 via the pipwerks SCORM wrapper.
@@ -32,6 +43,7 @@ export class Scorm2004Driver extends ScormDriverBase {
             learnerName: '',
             objectives: {},               // Cached objectives keyed by ID
             objectiveIdToIndex: new Map(), // Maps objective ID → CMI index
+            objectivesCount: 0,             // LMS-reported count; may exceed readable IDs
             interactions: [],              // Cached interactions array
             interactionsCount: 0           // Current count for append operations
         };
@@ -50,7 +62,7 @@ export class Scorm2004Driver extends ScormDriverBase {
             supportsObjectives: true,
             supportsInteractions: true,
             supportsComments: true,
-            supportsEmergencySave: false,
+            supportsEmergencySave: true,
             maxSuspendDataBytes: 64000,
             asyncCommit: false
         };
@@ -217,17 +229,16 @@ export class Scorm2004Driver extends ScormDriverBase {
 
     getScore() {
         const scaledStr = this._getValueOptional('cmi.score.scaled');
-        if (scaledStr === null) return null;
-        const scaled = parseFloat(scaledStr);
-        if (isNaN(scaled)) return null;
+        const scaled = parseFiniteNumber(scaledStr);
+        if (scaled === null) return null;
         const rawStr = this._getValueOptional('cmi.score.raw');
         const minStr = this._getValueOptional('cmi.score.min');
         const maxStr = this._getValueOptional('cmi.score.max');
         return {
             scaled,
-            raw: rawStr !== null ? parseFloat(rawStr) : scaled * 100,
-            min: minStr !== null ? parseFloat(minStr) : 0,
-            max: maxStr !== null ? parseFloat(maxStr) : 100
+            raw: parseFiniteNumber(rawStr, scaled * 100),
+            min: parseFiniteNumber(minStr, 0),
+            max: parseFiniteNumber(maxStr, 100)
         };
     }
 
@@ -386,8 +397,7 @@ export class Scorm2004Driver extends ScormDriverBase {
         // Decompress lz-string data
         const jsonString = LZString.decompressFromUTF16(data);
         if (!jsonString) {
-            logger.warn('[Scorm2004Driver] Failed to decompress suspend_data - may be corrupted');
-            return null;
+            throw new Error('SCORM 2004 resume state is corrupted or truncated; refusing to start with empty progress');
         }
 
         try {
@@ -457,6 +467,7 @@ export class Scorm2004Driver extends ScormDriverBase {
         if (compressed.length > 64000) {
             logger.error(`[Scorm2004Driver] ⚠️ CRITICAL: suspend_data is ${compressedSizeKB}KB compressed (over 64KB). Many LMSs will reject this!`);
             eventBus.emit('suspend-data:critical', { bytes: compressed.length });
+            throw new Error(`SCORM 2004 suspend_data exceeds the 64000-character safety limit (${compressed.length})`);
         } else if (compressed.length > 32000) {
             logger.warn(`[Scorm2004Driver] ⚠️ WARNING: suspend_data is ${compressedSizeKB}KB compressed (over 32KB). Approaching critical threshold.`);
             eventBus.emit('suspend-data:warning', { bytes: compressed.length });
@@ -585,8 +596,9 @@ export class Scorm2004Driver extends ScormDriverBase {
         // Load objectives from CMI arrays
         let objectivesCount = 0;
         try {
-            objectivesCount = parseInt(this._getValue('cmi.objectives._count') || '0', 10);
+            objectivesCount = parseNonNegativeInteger(this._getValue('cmi.objectives._count') || '0');
         } catch (_e) { /* No objectives stored — normal */ }
+        this._cmiCache.objectivesCount = objectivesCount;
 
         for (let i = 0; i < objectivesCount; i++) {
             let id;
@@ -610,16 +622,16 @@ export class Scorm2004Driver extends ScormDriverBase {
 
             const scoreRaw = this._getValueOptional(`cmi.objectives.${i}.score.raw`);
             if (scoreRaw) {
-                const parsed = parseFloat(scoreRaw);
-                if (!isNaN(parsed)) {
+                const parsed = parseFiniteNumber(scoreRaw);
+                if (parsed !== null) {
                     this._cmiCache.objectives[id].score = parsed;
                 }
             }
 
             const progressMeasure = this._getValueOptional(`cmi.objectives.${i}.progress_measure`);
             if (progressMeasure) {
-                const parsed = parseFloat(progressMeasure);
-                if (!isNaN(parsed)) {
+                const parsed = parseFiniteNumber(progressMeasure);
+                if (parsed !== null) {
                     this._cmiCache.objectives[id].progress_measure = parsed;
                 }
             }
@@ -633,9 +645,9 @@ export class Scorm2004Driver extends ScormDriverBase {
         // Load interactions from CMI arrays
         let interactionsCount = 0;
         try {
-            interactionsCount = parseInt(this._getValue('cmi.interactions._count') || '0', 10);
+            interactionsCount = parseNonNegativeInteger(this._getValue('cmi.interactions._count') || '0');
         } catch (_e) { /* No interactions stored — normal */ }
-        this._cmiCache.interactionsCount = isNaN(interactionsCount) ? 0 : interactionsCount;
+        this._cmiCache.interactionsCount = interactionsCount;
 
         for (let i = 0; i < interactionsCount; i++) {
             const interaction = { _index: i };
@@ -650,8 +662,8 @@ export class Scorm2004Driver extends ScormDriverBase {
 
             const weighting = this._getValueOptional(`cmi.interactions.${i}.weighting`);
             if (weighting) {
-                const parsed = parseFloat(weighting);
-                if (!isNaN(parsed)) {
+                const parsed = parseFiniteNumber(weighting);
+                if (parsed !== null) {
                     interaction.weighting = parsed;
                 }
             }
@@ -673,9 +685,10 @@ export class Scorm2004Driver extends ScormDriverBase {
             return this._cmiCache.objectiveIdToIndex.get(objectiveId);
         }
 
-        const newIndex = this._cmiCache.objectiveIdToIndex.size;
+        const newIndex = this._cmiCache.objectivesCount;
         this._setValue(`cmi.objectives.${newIndex}.id`, objectiveId);
         this._cmiCache.objectiveIdToIndex.set(objectiveId, newIndex);
+        this._cmiCache.objectivesCount++;
 
         return newIndex;
     }

package/framework/js/drivers/scorm-driver-base.js

@@ -109,4 +109,16 @@ export class ScormDriverBase {
 
         return true;
     }
+
+    /**
+     * Synchronous best-effort commit for pagehide. StateManager writes the
+     * latest suspend_data and exit mode immediately before this call.
+     */
+    emergencySave() {
+        if (!this._isConnected || this._isTerminated) return;
+        const success = this._scorm.save();
+        if (!success) {
+            throw new Error(`[${this.constructor.name}] SCORM emergency commit failed`);
+        }
+    }
 }