npm - @didask/scol-r - Versions diffs - 3.0.0-beta-1 → 3.0.0-beta.2 - Mend

@didask/scol-r 3.0.0-beta-1 → 3.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/HTMLGenerator.d.ts CHANGED Viewed

@@ -1,9 +1,5 @@
 export interface HTMLGeneratorProps {
     dataSource: string;
     libPath?: string;
-    sentry?: {
-        dsn: string;
-        tags?: Record<string, string>;
-    };
 }
 export declare function HTMLGenerator(props: HTMLGeneratorProps): string;

package/lib/HTMLGenerator.js CHANGED Viewed

@@ -1,20 +1,8 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTMLGenerator = void 0;
 function HTMLGenerator(props) {
-    var dataSource = props.dataSource, _a = props.libPath, libPath = _a === void 0 ? "lib" : _a, _b = props.sentry, dsn = _b.dsn, tags = _b.tags;
-    return "<!DOCTYPE html>\n    <html>\n        <head>\n            <title>SCO local endpoint</title>\n            <meta charset=\"UTF-8\"/>\n            <script>var exports = {};</script>\n            " + (dsn &&
-        "<script\n                src=\"https://browser.sentry-cdn.com/7.3.1/bundle.min.js\"\n                integrity=\"sha384-07qUw81m8MXGTEXf9FQODO4Vop82t3F03SS3v3EOfrf8j7bOb/oJNg6inMDKFk2I\"\n                crossorigin=\"anonymous\"\n            ></script>\n            <script>Sentry.init(" + JSON.stringify(__assign({ dsn: dsn }, (tags && { initialScope: { tags: tags } }))) + ");</script>") + "\n            <script type=\"text/javascript\" src=\"" + libPath + "/SCORMAdapter.js\"></script>\n            <script type=\"text/javascript\" src=\"" + libPath + "/MessageHandler.js\"></script>\n            <script type=\"text/javascript\" src=\"" + libPath + "/loadContent.js\"></script>\n            <style type=\"text/css\">\n                html, body { margin: 0; padding:0; overflow:hidden; width: 100%; height: 100%; }\n                body {\n                    font-size: 20px;\n                    font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n                    color: #1d1046;\n                }\n                #wrapper { display: flex; flex-direction: column; height: 100%; }\n                .container { width: 80%; max-width: 1200px; padding: 15px; margin: auto; }\n                #wrapper .header {\n                    padding-top: 20px; padding-bottom: 20px;\n                    background-color: #f3f4f5;\n                }\n                #wrapper .messages { flex-grow: 1; padding-top: 20px; padding-bottom: 20px; }\n                #wrapper .messages p { color: red; }\n                #title-error-messages { color: #1d1046; }\n                #wrapper .footer {\n                    background-color: #1d1046; color: white;\n                    padding-top: 10px; padding-bottom: 10px;\n                }\n                #wrapper .footer a { color: white; }\n\n                iframe { overflow: hidden; height: 100%; width: 100%; }\n                iframe + #wrapper { display: none; }\n                #runtime-error {\n                    position: fixed;\n                    left: 20px; bottom: 20px; padding: 15px;\n                    background-color: #f44a3d; color: white;\n                    font-size: 16px;\n                }\n                #runtime-error h6, #runtime-error p { margin: 0 0 10px;}\n                #runtime-error p:last-child { margin: 0;}\n                #runtime-error:empty { display: none; }\n            </style>\n        </head>\n        <!-- Set the body's data-source attribute to the SCO's remote endpoint. -->\n        <body onload=\"loadContent();\" data-source=\"" + dataSource + "\">\n            <div id=\"wrapper\">\n                <div class=\"header\"><div class=\"container\">\n                    <h1 id=\"title\">Your content is loading...</h1>\n                    <p id=\"subtitle\">Please wait, or if your content doesn't appear, try closing and opening this window again.</p>\n                </div></div>\n                <div class=\"messages container\">\n                    <h2 id=\"title-error-messages\">If the initialization fails, error messages will appear below:</h2>\n                </div>\n                <div class=\"footer\"><div class=\"container\" id=\"footer-content\">\n                    This content is loaded via <a href=\"https://github.com/Didask/scol-r\" target=\"_blank\">SCOL-R</a>, a cross-domain SCORM connector created by <a href=\"https://www.didask.com\" target=\"_blank\">Didask</a>.\n                </div></div>\n            </div>\n            <div id=\"runtime-error\"></div>\n        </body>\n    </html>";
+    var dataSource = props.dataSource, _a = props.libPath, libPath = _a === void 0 ? "lib" : _a;
+    return "<!DOCTYPE html>\n    <html>\n        <head>\n            <title>SCO local endpoint</title>\n            <meta charset=\"UTF-8\"/>\n            <script>var exports = {};</script>\n            <script type=\"text/javascript\" src=\"" + libPath + "/SCORMAdapter.js\"></script>\n            <script type=\"text/javascript\" src=\"" + libPath + "/MessageHandler.js\"></script>\n            <script type=\"text/javascript\" src=\"" + libPath + "/loadContent.js\"></script>\n            <style type=\"text/css\">\n                html, body { margin: 0; padding:0; overflow:hidden; width: 100%; height: 100%; }\n                body {\n                    font-size: 20px;\n                    font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n                    color: #1d1046;\n                }\n                #wrapper { display: flex; flex-direction: column; height: 100%; }\n                .container { width: 80%; max-width: 1200px; padding: 15px; margin: auto; }\n                #wrapper .header {\n                    padding-top: 20px; padding-bottom: 20px;\n                    background-color: #f3f4f5;\n                }\n                #wrapper .messages { flex-grow: 1; padding-top: 20px; padding-bottom: 20px; }\n                #wrapper .messages p { color: red; }\n                #title-error-messages { color: #1d1046; }\n                #wrapper .footer {\n                    background-color: #1d1046; color: white;\n                    padding-top: 10px; padding-bottom: 10px;\n                }\n                #wrapper .footer a { color: white; }\n\n                iframe { overflow: hidden; height: 100%; width: 100%; }\n                iframe + #wrapper { display: none; }\n                #runtime-error {\n                    position: fixed;\n                    left: 20px; bottom: 20px; padding: 15px;\n                    background-color: #f44a3d; color: white;\n                    font-size: 16px;\n                }\n                #runtime-error h6, #runtime-error p { margin: 0 0 10px;}\n                #runtime-error p:last-child { margin: 0;}\n                #runtime-error:empty { display: none; }\n            </style>\n        </head>\n        <!-- Set the body's data-source attribute to the SCO's remote endpoint. -->\n        <body onload=\"loadContent();\" data-source=\"" + dataSource + "\">\n            <div id=\"wrapper\">\n                <div class=\"header\"><div class=\"container\">\n                    <h1 id=\"title\">Your content is loading...</h1>\n                    <p id=\"subtitle\">Please wait, or if your content doesn't appear, try closing and opening this window again.</p>\n                </div></div>\n                <div class=\"messages container\">\n                    <h2 id=\"title-error-messages\">If the initialization fails, error messages will appear below:</h2>\n                </div>\n                <div class=\"footer\"><div class=\"container\" id=\"footer-content\">\n                    This content is loaded via <a href=\"https://github.com/Didask/scol-r\" target=\"_blank\">SCOL-R</a>, a cross-domain SCORM connector created by <a href=\"https://www.didask.com\" target=\"_blank\">Didask</a>.\n                </div></div>\n            </div>\n            <div id=\"runtime-error\"></div>\n        </body>\n    </html>";
 }
 exports.HTMLGenerator = HTMLGenerator;

package/lib/SCORMAdapter.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ export declare class SCORMAdapter {
     private _ignorableErrorCodes;
     constructor(errorCallback?: Function);
     get foundAPI(): boolean;
+    private _initialize;
     private _findAndSetAPI;
     private _findAPIInWindow;
     private _callAPIFunction;

package/lib/SCORMAdapter.js CHANGED Viewed

@@ -20,6 +20,16 @@ var SCORMAdapter = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    SCORMAdapter.prototype._initialize = function () {
+        if (this._isSCORM2004) {
+            this.LMSSetValue("cmi.score.min", 0);
+            this.LMSSetValue("cmi.score.max", 100);
+        }
+        else {
+            this.LMSSetValue("cmi.core.score.min", 0);
+            this.LMSSetValue("cmi.core.score.max", 100);
+        }
+    };
     SCORMAdapter.prototype._findAndSetAPI = function () {
         var _this = this;
         if (typeof window === "undefined") {
@@ -116,6 +126,9 @@ var SCORMAdapter = /** @class */ (function () {
             (this._isSCORM2004
                 ? lastErrorCode === 103 // 103 in 2004.* = already initialized
                 : lastErrorCode === 101); // 101 in 1.2 = already initialized
+        if (success) {
+            this._initialize();
+        }
         return success || this._handleError(functionName);
     };
     SCORMAdapter.prototype.LMSTerminate = function () {
@@ -160,10 +173,13 @@ var SCORMAdapter = /** @class */ (function () {
         return this.LMSGetValue(CMIVariableName);
     };
     SCORMAdapter.prototype.setScore = function (score) {
-        var CMIVariableName = this._isSCORM2004
-            ? "cmi.score.raw"
-            : "cmi.core.score.raw";
-        this.LMSSetValue(CMIVariableName, score);
+        if (this._isSCORM2004) {
+            this.LMSSetValue("cmi.score.raw", score);
+            this.LMSSetValue("cmi.score.scaled", score / 100);
+        }
+        else {
+            this.LMSSetValue("cmi.core.score.raw", score);
+        }
     };
     SCORMAdapter.prototype.getScore = function () {
         var CMIVariableName = this._isSCORM2004

package/lib/loadContent.js CHANGED Viewed

@@ -1,4 +1,5 @@
 function loadContent() {
+    var _this = this;
     var messages = {
         en: {
             pageTitle: "Your content is loading...",
@@ -48,11 +49,6 @@ function loadContent() {
         newMessage.innerHTML = localizeMessage(message);
         messagesContainer.length && messagesContainer[0].appendChild(newMessage);
     };
-    var captureSentryException = function (args) {
-        if ("Sentry" in window) {
-            Sentry.captureException(new Error(args.reduce(function (acc, arg) { return (arg ? acc + " -- " + arg : acc); }, "")));
-        }
-    };
     var displayRuntimeError = function () {
         var errorContainer = document.getElementById("runtime-error");
         if (!(arguments && arguments.length)) {
@@ -68,62 +64,66 @@ function loadContent() {
             thisError.innerHTML = localizeMessage(arguments[i]);
             errorContainer.appendChild(thisError);
         }
-        captureSentryException(arguments);
         // Remove the messages after 6 seconds
         setTimeout(function () {
             errorContainer.innerHTML = "";
         }, 6000);
     };
-    var ADAPTER = new SCORMAdapter(displayRuntimeError);
-    if (!ADAPTER.foundAPI) {
-        displayInitError("apiNotFound");
-        return;
-    }
-    if (!ADAPTER.LMSInitialize()) {
-        displayInitError("couldNotInitialize");
-        return;
-    }
-    var lessonStatus = ADAPTER.getLessonStatus();
-    if (lessonStatus === "not attempted") {
-        ADAPTER.setLessonStatus("incomplete");
-    }
-    var sourceUrl = document.body.getAttribute("data-source");
-    if (!sourceUrl) {
-        displayInitError("sourceUrlMissing");
-        return;
-    }
-    var sourceUrlParser = document.createElement("a");
-    sourceUrlParser.href = sourceUrl;
-    var learnerId = ADAPTER.getLearnerId();
-    if (learnerId == null) {
-        displayInitError("learnerIdMissing");
-        return;
-    }
-    sourceUrlParser.search +=
-        (sourceUrlParser.search.indexOf("?") === -1 ? "?" : "&") +
-            "scorm&learner_id=" +
-            learnerId +
-            "&lms_origin=" +
-            encodeURIComponent(location.origin) +
-            "&data_from_lms=" +
-            ADAPTER.getDataFromLMS();
+    // var ADAPTER = new SCORMAdapter(displayRuntimeError);
+    // if (!ADAPTER.foundAPI) {
+    //   displayInitError("apiNotFound");
+    //   return;
+    // }
+    // if (!ADAPTER.LMSInitialize()) {
+    //   displayInitError("couldNotInitialize");
+    //   return;
+    // }
+    // var lessonStatus = ADAPTER.getLessonStatus();
+    // if (lessonStatus === "not attempted") {
+    //   ADAPTER.setLessonStatus("incomplete");
+    // }
+    // var sourceUrl = document.body.getAttribute("data-source");
+    // if (!sourceUrl) {
+    //   displayInitError("sourceUrlMissing");
+    //   return;
+    // }
+    // var learnerId = ADAPTER.getLearnerId();
+    // if (learnerId == null) {
+    //   displayInitError("learnerIdMissing");
+    //   return;
+    // }
+    var url = new URL(sourceUrl);
+    url.searchParams.append("scorm", true);
+    url.searchParams.append("learner_id", learnerId);
+    url.searchParams.append("lms_origin", encodeURIComponent(location.origin));
+    // url.searchParams.append("data_from_lms", ADAPTER.getDataFromLMS());
     var iframe = document.createElement("iframe");
-    iframe.setAttribute("src", sourceUrlParser.href);
     iframe.setAttribute("frameborder", "0");
     iframe.setAttribute("height", "100%");
     iframe.setAttribute("width", "100%");
-    document.body.insertBefore(iframe, document.getElementById("wrapper"));
+    var wrapper = document.getElementById("wrapper");
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", url.toString());
+    xhr.onreadystatechange = function () {
+        if (_this.readyState === _this.DONE && _this.status === 200) {
+            iframe.setAttribute("src", url.toString());
+            document.body.insertBefore(iframe, wrapper);
+        }
+    };
+    xhr.responseType = "blob";
+    xhr.setRequestHeader("Authorization", "Bearer " + token);
+    xhr.send();
     var sessionStart = new Date();
-    var host = sourceUrlParser.host;
+    var host = url.host;
     // The `host` variable may or may not contain the port number depending on the browser.
     // We remove it if it wasnt' explicitly set.
     if (host.indexOf(":") > -1 &&
-        sourceUrl.indexOf(host) !== sourceUrlParser.protocol.length + 2) {
+        sourceUrl.indexOf(host) !== url.protocol.length + 2) {
         host = host.slice(0, host.indexOf(":"));
     }
-    var sourceOrigin = sourceUrlParser.protocol + "//" + host;
-    new MessageReceiver(window, sourceOrigin, ADAPTER);
-    window.addEventListener("beforeunload", function (e) {
-        ADAPTER.LMSTerminate();
-    });
+    var sourceOrigin = url.protocol + "//" + host;
+    // new MessageReceiver(window, sourceOrigin, ADAPTER);
+    // window.addEventListener("beforeunload", function (e) {
+    //   ADAPTER.LMSTerminate();
+    // });
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@didask/scol-r",
-  "version": "3.0.0-beta-1",
+  "version": "3.0.0-beta.2",
   "description": "Shareable Cross-Origin Learning Resources",
   "main": "index.html",
   "types": "lib/index.d.ts",
@@ -8,7 +8,8 @@
     "lib/"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "tsc",
+    "clean": "rm -rf node_modules lib"
   },
   "repository": {
     "type": "git",