@didask/scol-r 2.6.4 → 2.7.0

package/lib/MessageHandler.d.ts

@@ -1,4 +1,15 @@
-export declare function MessageReceiver(win: Window, sourceOrigin: string, adapter: any): void;
+export declare class MessageReceiver {
+    private readonly adapter;
+    constructor(win: Window, sourceOrigin: string, adapter: any);
+    commit(): void;
+    setTitle(title: string): void;
+    setScore(score: string): void;
+    setStudent(studentId: string, studentName: string): void;
+    setLessonStatus(lessonStatus: string): void;
+    setObjectives(objectivesIds: string[]): void;
+    setObjectiveScore(objectiveId: string, score: number): void;
+    setObjectiveStatus(objectiveId: string, status: string): void;
+}
 export declare class MessageEmitter {
     private currentWindow;
     private lmsOrigin;

package/lib/MessageHandler.js

@@ -1,58 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageEmitter = exports.MessageReceiver = void 0;
-function MessageReceiver(win, sourceOrigin, adapter) {
-    this.timeoutId = null;
-    win.addEventListener("message", function (e) {
-        var _this = this;
-        if (e.origin !== sourceOrigin)
-            return;
-        var functionName = e.data["function"];
-        var functionArgs = e.data["arguments"];
-        if (functionName &&
-            functionArgs &&
-            typeof this[functionName] === "function") {
-            this[functionName].apply(this, functionArgs);
-            if (this.timeoutId) {
-                clearTimeout(this.timeoutId);
+var MessageReceiver = /** @class */ (function () {
+    function MessageReceiver(win, sourceOrigin, adapter) {
+        this.adapter = adapter;
+        var timeoutId = null;
+        win.addEventListener("message", function (e) {
+            var _this = this;
+            if (e.origin !== sourceOrigin)
+                return;
+            var functionName = e.data["function"];
+            var functionArgs = e.data["arguments"];
+            if (functionName &&
+                functionArgs &&
+                typeof this[functionName] === "function") {
+                // @ts-ignore
+                this[functionName].apply(this, functionArgs);
+                if (timeoutId) {
+                    clearTimeout(timeoutId);
+                }
+                timeoutId = setTimeout(function () {
+                    _this.commit();
+                    timeoutId = null;
+                }, 500);
             }
-            this.timeoutId = setTimeout(function () {
-                _this.commit();
-                _this.timeoutId = null;
-            }, 500);
-        }
-    }.bind(this));
-    this.commit = function () {
-        adapter.LMSCommit();
+        }.bind(this));
+    }
+    MessageReceiver.prototype.commit = function () {
+        this.adapter.LMSCommit();
     };
-    this.setTitle = function (title) {
+    MessageReceiver.prototype.setTitle = function (title) {
         document.title = title;
     };
-    this.setScore = function (score) {
-        adapter.setScore(score);
+    MessageReceiver.prototype.setScore = function (score) {
+        this.adapter.setScore(score);
     };
-    this.setStudent = function (studentId, studentName) {
-        adapter.setStudent(studentId, studentName);
+    MessageReceiver.prototype.setStudent = function (studentId, studentName) {
+        this.adapter.setStudent(studentId, studentName);
     };
-    this.setLessonStatus = function (lessonStatus) {
-        adapter.setLessonStatus(lessonStatus);
+    MessageReceiver.prototype.setLessonStatus = function (lessonStatus) {
+        this.adapter.setLessonStatus(lessonStatus);
     };
-    this.setObjectives = function (objectivesIds) {
-        if (adapter.objectivesAreAvailable) {
-            adapter.setObjectives(objectivesIds);
+    MessageReceiver.prototype.setObjectives = function (objectivesIds) {
+        if (this.adapter.objectivesAreAvailable) {
+            this.adapter.setObjectives(objectivesIds);
         }
     };
-    this.setObjectiveScore = function (objectiveId, score) {
-        if (adapter.objectivesAreAvailable) {
-            adapter.setObjectiveScore(objectiveId, score);
+    MessageReceiver.prototype.setObjectiveScore = function (objectiveId, score) {
+        if (this.adapter.objectivesAreAvailable) {
+            this.adapter.setObjectiveScore(objectiveId, score);
         }
     };
-    this.setObjectiveStatus = function (objectiveId, status) {
-        if (adapter.objectivesAreAvailable) {
-            adapter.setObjectiveStatus(objectiveId, status);
+    MessageReceiver.prototype.setObjectiveStatus = function (objectiveId, status) {
+        if (this.adapter.objectivesAreAvailable) {
+            this.adapter.setObjectiveStatus(objectiveId, status);
         }
     };
-}
+    return MessageReceiver;
+}());
 exports.MessageReceiver = MessageReceiver;
 var MessageEmitter = /** @class */ (function () {
     function MessageEmitter(lmsOrigin) {

package/lib/SCORMAdapter.d.ts

@@ -17,14 +17,14 @@ export declare class SCORMAdapter {
     LMSTerminate(): true | void;
     LMSGetValue(name: string): any;
     LMSSetValue(name: string, value: string | number): true | void;
-    LMSCommit(): boolean;
+    LMSCommit(): true | undefined;
     LMSGetLastError(): number;
     LMSGetErrorString(errorCode: number): any;
     LMSGetDiagnostic(errorCode: number): any;
     get lastRequest(): {
-        method: "get" | "set";
+        method?: "get" | "set" | undefined;
         key: string;
-    };
+    } | null;
     getDataFromLMS(): any;
     getLearnerId(): any;
     getLearnerName(): any;

package/lib/SCORMAdapter.js

@@ -15,7 +15,7 @@ var SCORMAdapter = /** @class */ (function () {
                 code: 401,
                 getShouldBeIgnored: function () {
                     return !_this._isSCORM2004 &&
-                        _this._lastRequest &&
+                        !!_this._lastRequest &&
                         _this._lastRequest.method === "get" &&
                         _this._lastRequest.key === "cmi.objectives._children";
                 },
@@ -24,7 +24,7 @@ var SCORMAdapter = /** @class */ (function () {
                 code: 402,
                 getShouldBeIgnored: function () {
                     return _this._isSCORM2004 &&
-                        _this._lastRequest &&
+                        !!_this._lastRequest &&
                         _this._lastRequest.method === "get" &&
                         _this._lastRequest.key === "cmi.objectives._children";
                 },
@@ -32,11 +32,16 @@ var SCORMAdapter = /** @class */ (function () {
             {
                 code: 351,
                 getShouldBeIgnored: function () {
-                    return _this._lastRequest.method === "set" &&
+                    var _a;
+                    return ((_a = _this._lastRequest) === null || _a === void 0 ? void 0 : _a.method) === "set" &&
                         new RegExp("^cmi.objectives.\\d+.id$").test(_this._lastRequest.key) &&
                         !!_this.LMSGetValue(_this._lastRequest.key);
                 },
             },
+            {
+                code: 113,
+                getShouldBeIgnored: function () { var _a; return ((_a = _this._lastRequest) === null || _a === void 0 ? void 0 : _a.key) === "Terminate"; },
+            },
         ];
         this._API = null;
         this._isSCORM2004 = false;
@@ -167,6 +172,7 @@ var SCORMAdapter = /** @class */ (function () {
         return success || this._handleError(functionName);
     };
     SCORMAdapter.prototype.LMSTerminate = function () {
+        this._lastRequest = { key: "Terminate" };
         var functionName = this._isSCORM2004 ? "Terminate" : "Finish";
         var result = this._callAPIFunction(functionName);
         var success = this.validateResult(result);

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@didask/scol-r",
-  "version": "2.6.4",
+  "version": "2.7.0",
   "description": "Shareable Cross-Origin Learning Resources",
   "main": "index.html",
   "types": "lib/index.d.ts",
-  "files": ["lib/"],
+  "files": [
+    "lib/"
+  ],
   "scripts": {
     "build": "tsc",
     "clean": "rm -rf node_modules lib",
@@ -14,7 +16,10 @@
     "type": "git",
     "url": "git+https://github.com/Didask/scol-r.git"
   },
-  "keywords": ["SCORM", "CORS"],
+  "keywords": [
+    "SCORM",
+    "CORS"
+  ],
   "author": "Didask",
   "license": "ISC",
   "bugs": {

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');
-});