@didask/scol-r 2.1.1 → 2.2.1

package/lib/SCORMAdapter.d.ts

@@ -2,6 +2,7 @@ export declare class SCORMAdapter {
     private _API;
     private _isSCORM2004;
     private _errorCallback;
+    private _lastRequest;
     private _ignorableErrorCodes;
     constructor(errorCallback?: Function);
     get foundAPI(): boolean;
@@ -19,6 +20,10 @@ export declare class SCORMAdapter {
     LMSGetLastError(): number;
     LMSGetErrorString(errorCode: number): any;
     LMSGetDiagnostic(errorCode: number): any;
+    getLastRequest(): {
+        method: "get" | "set";
+        key: string;
+    };
     getDataFromLMS(): any;
     getLearnerId(): any;
     setScore(score: number): void;

package/lib/SCORMAdapter.js

@@ -5,12 +5,36 @@ var SCORMAdapter = /** @class */ (function () {
     function SCORMAdapter(errorCallback) {
         if (errorCallback === void 0) { errorCallback = function () { }; }
         this._ignorableErrorCodes = [
-            { code: 0 },
-            { code: 403, scope: "2004" },
+            { code: 0, shouldBeIgnored: true },
+            {
+                code: 403,
+                get shouldBeIgnored() {
+                    return this._isSCORM2004;
+                },
+            },
+            {
+                code: 401,
+                get shouldBeIgnored() {
+                    return (!this._isSCORM2004 &&
+                        this._lastRequest &&
+                        this._lastRequest.method === "get" &&
+                        this._lastRequest.key === "cmi.objectives._children");
+                },
+            },
+            {
+                code: 402,
+                get shouldBeIgnored() {
+                    return (this._isSCORM2004 &&
+                        this._lastRequest &&
+                        this._lastRequest.method === "get" &&
+                        this._lastRequest.key === "cmi.objectives._children");
+                },
+            },
         ];
         this._API = null;
         this._isSCORM2004 = false;
         this._errorCallback = errorCallback;
+        this._lastRequest = null;
         this._findAndSetAPI();
     }
     Object.defineProperty(SCORMAdapter.prototype, "foundAPI", {
@@ -31,7 +55,6 @@ var SCORMAdapter = /** @class */ (function () {
         }
     };
     SCORMAdapter.prototype._findAndSetAPI = function () {
-        var _this = this;
         if (typeof window === "undefined") {
             console.error("Unable to find an API adapter");
         }
@@ -48,10 +71,6 @@ var SCORMAdapter = /** @class */ (function () {
             else {
                 this._API = theAPI["API"];
                 this._isSCORM2004 = theAPI["isSCORM2004"];
-                this._ignorableErrorCodes = this._ignorableErrorCodes.filter(function (_a) {
-                    var scope = _a.scope;
-                    return !scope || (_this._isSCORM2004 ? scope === "2004" : scope === "1.2");
-                });
             }
             if (this._API == null) {
                 console.error("Couldn't find the API!");
@@ -105,8 +124,8 @@ var SCORMAdapter = /** @class */ (function () {
         var lastErrorString = this.LMSGetErrorString(lastErrorCode);
         var lastErrorDiagnostic = this.LMSGetDiagnostic(lastErrorCode);
         if (!this._ignorableErrorCodes.some(function (_a) {
-            var code = _a.code;
-            return code === lastErrorCode;
+            var code = _a.code, shouldBeIgnored = _a.shouldBeIgnored;
+            return code === lastErrorCode && shouldBeIgnored;
         })) {
             console.warn(functionName, "An error occured on the SCORM API: code " + lastErrorCode + ", message: " + lastErrorString, lastErrorDiagnostic);
             this._errorCallback(lastErrorString, lastErrorDiagnostic && lastErrorDiagnostic != lastErrorCode
@@ -138,12 +157,14 @@ var SCORMAdapter = /** @class */ (function () {
         return success || this._handleError(functionName);
     };
     SCORMAdapter.prototype.LMSGetValue = function (name) {
+        this._lastRequest = { method: "get", key: name };
         var functionName = "GetValue";
         var value = this._callAPIFunction(functionName, [name]);
         var success = this.LMSGetLastError() === 0;
         return success ? value : this._handleError(functionName + ": " + name);
     };
     SCORMAdapter.prototype.LMSSetValue = function (name, value) {
+        this._lastRequest = { method: "set", key: name };
         var functionName = "SetValue";
         var result = this._callAPIFunction(functionName, [name, value]);
         var success = eval(result.toString());
@@ -163,6 +184,9 @@ var SCORMAdapter = /** @class */ (function () {
     SCORMAdapter.prototype.LMSGetDiagnostic = function (errorCode) {
         return this._callAPIFunction("GetDiagnostic", [errorCode]);
     };
+    SCORMAdapter.prototype.getLastRequest = function () {
+        return this._lastRequest;
+    };
     SCORMAdapter.prototype.getDataFromLMS = function () {
         return this.LMSGetValue("cmi.launch_data");
     };
@@ -241,7 +265,8 @@ var SCORMAdapter = /** @class */ (function () {
     };
     Object.defineProperty(SCORMAdapter.prototype, "objectivesAreAvailable", {
         get: function () {
-            return this.LMSGetValue("cmi.objectives._children") !== null;
+            var objectivesFields = !!this.LMSGetValue("cmi.objectives._children");
+            return objectivesFields && this.LMSGetLastError() === 0;
         },
         enumerable: false,
         configurable: true

package/package.json

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