@didask/scol-r 2.5.3 → 2.6.0

package/lib/SCORMAdapter.d.ts

@@ -12,10 +12,11 @@ export declare class SCORMAdapter {
     private _callAPIFunction;
     private _handleError;
     private _warnNOAPI;
-    LMSInitialize(): any;
-    LMSTerminate(): any;
+    private validateResult;
+    LMSInitialize(): true | void;
+    LMSTerminate(): true | void;
     LMSGetValue(name: string): any;
-    LMSSetValue(name: string, value: string | number): any;
+    LMSSetValue(name: string, value: string | number): true | void;
     LMSCommit(): any;
     LMSGetLastError(): number;
     LMSGetErrorString(errorCode: number): any;

package/lib/SCORMAdapter.js

@@ -144,11 +144,20 @@ var SCORMAdapter = /** @class */ (function () {
         console.warn("Cannot execute this function because the SCORM API is not available.");
         this._errorCallback("apiNotFound");
     };
+    SCORMAdapter.prototype.validateResult = function (result) {
+        if (typeof result === "string") {
+            return result === "true";
+        }
+        else if (typeof result === "boolean") {
+            return result;
+        }
+        return false;
+    };
     SCORMAdapter.prototype.LMSInitialize = function () {
         var functionName = "Initialize";
         var result = this._callAPIFunction(functionName);
         var lastErrorCode = this.LMSGetLastError();
-        var success = eval(result.toString()) ||
+        var success = this.validateResult(result) ||
             (this._isSCORM2004
                 ? lastErrorCode === 103 // 103 in 2004.* = already initialized
                 : lastErrorCode === 101); // 101 in 1.2 = already initialized
@@ -160,7 +169,7 @@ var SCORMAdapter = /** @class */ (function () {
     SCORMAdapter.prototype.LMSTerminate = function () {
         var functionName = this._isSCORM2004 ? "Terminate" : "Finish";
         var result = this._callAPIFunction(functionName);
-        var success = eval(result.toString());
+        var success = this.validateResult(result);
         return success || this._handleError(functionName);
     };
     SCORMAdapter.prototype.LMSGetValue = function (name) {
@@ -174,13 +183,24 @@ var SCORMAdapter = /** @class */ (function () {
         this._lastRequest = { method: "set", key: name };
         var functionName = "SetValue";
         var result = this._callAPIFunction(functionName, [name, value]);
-        var success = eval(result.toString());
+        var success = this.validateResult(result);
         return success || this._handleError("".concat(functionName, ": {").concat(name, ": ").concat(value, "}"));
     };
     SCORMAdapter.prototype.LMSCommit = function () {
+        var _this = this;
         var result = this._callAPIFunction("Commit");
-        var success = eval(result.toString());
-        return success || this._errorCallback("commitFailed");
+        if ("then" in result && typeof result.then === "function") {
+            result.then(function (success) {
+                if (!_this.validateResult(success)) {
+                    _this._errorCallback("commitFailed");
+                }
+            });
+            return true;
+        }
+        else {
+            var success = this.validateResult(result);
+            return success || this._errorCallback("commitFailed");
+        }
     };
     SCORMAdapter.prototype.LMSGetLastError = function () {
         return parseInt(this._callAPIFunction("GetLastError"));
@@ -360,12 +380,12 @@ var convertToTimeInterval = function (milliseconds) {
     var minutes = data.minutes % 60;
     var seconds = data.seconds % 60;
     var cents = data.cents % 100;
-    var daysString = days ? days + 'D' : '';
-    var hoursString = hours ? hours + 'H' : '';
-    var minutesString = minutes ? minutes + 'M' : '';
-    var secondsString = seconds || '0' + (cents ? '.' + cents : '') + 'S';
-    var hms = [hoursString, minutesString, secondsString].join('');
-    return 'P' + daysString + 'T' + hms;
+    var daysString = days ? days + "D" : "";
+    var hoursString = hours ? hours + "H" : "";
+    var minutesString = minutes ? minutes + "M" : "";
+    var secondsString = seconds || "0" + (cents ? "." + cents : "") + "S";
+    var hms = [hoursString, minutesString, secondsString].join("");
+    return "P" + daysString + "T" + hms;
 };
 exports.convertToTimeInterval = convertToTimeInterval;
 var convertMsToCMITimespan = function (milliseconds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@didask/scol-r",
-  "version": "2.5.3",
+  "version": "2.6.0",
   "description": "Shareable Cross-Origin Learning Resources",
   "main": "index.html",
   "types": "lib/index.d.ts",

package/lib/SCORMAdapter.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/SCORMAdapter.test.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var bun_test_1 = require("bun:test");
-var SCORMAdapter_1 = require("./SCORMAdapter");
-bun_test_1.test('convertMsToCMITimespan ("0000:00:00.00")', function () {
-    var milliseconds = (36 * 60 * 60 * 1000) + (6 * 60 * 1000) + (2 * 1000) + (23 * 10);
-    var CMITimespan = SCORMAdapter_1.convertMsToCMITimespan(milliseconds);
-    bun_test_1.expect(CMITimespan).toBe('0036:06:02.23');
-});
-bun_test_1.test('convertToTimeInterval', function () {
-    var milliseconds = (36 * 60 * 60 * 1000) + (6 * 60 * 1000) + (2 * 1000) + (23 * 10);
-    var timeInterval = SCORMAdapter_1.convertToTimeInterval(milliseconds);
-    bun_test_1.expect(timeInterval).toBe('P1DT12H6M2');
-});