studiokit-scaffolding-js 4.7.0 → 4.7.1-alpha.2

package/lib/components/RefreshIndicator/index.js

@@ -26,6 +26,7 @@ var CircularProgress_1 = __importDefault(require("@material-ui/core/CircularProg
 var Sentry = __importStar(require("@sentry/react"));
 var detect_browser_1 = require("detect-browser");
 var react_1 = __importStar(require("react"));
+var lockDownBrowser_1 = require("../../utils/lockDownBrowser");
 var logger_1 = require("../../utils/logger");
 var Shortcut = function (_a) {
     var content = _a.content;
@@ -86,6 +87,7 @@ var RefreshIndicator = function (_a) {
     }, [hasLogged, localLogAndWarnAfterSeconds, seconds, shouldLog, shouldWarn]);
     var refreshShortcut = getRefreshShortcut();
     var hardRefreshShortcut = getHardRefreshShortcut();
+    var lockDownBrowserInfo = lockDownBrowser_1.getLockDownBrowserInfo();
     return (react_1.default.createElement("div", null,
         react_1.default.createElement(CircularProgress_1.default, { size: loaderSize !== null && loaderSize !== void 0 ? loaderSize : 40, style: loaderStyle !== null && loaderStyle !== void 0 ? loaderStyle : {
                 display: 'inherit',
@@ -102,11 +104,14 @@ var RefreshIndicator = function (_a) {
                     refreshShortcut ? react_1.default.createElement(react_1.default.Fragment, null,
                         ", ",
                         refreshShortcut) : ''),
-                hardRefreshShortcut && react_1.default.createElement("li", null,
-                    "\"Hard Refresh\" the page, ",
-                    hardRefreshShortcut),
-                react_1.default.createElement("li", { className: !!refreshShortcut || !!hardRefreshShortcut ? 'mb2' : '' }, "Try a different browser"),
-                react_1.default.createElement("li", null, "Clear your browser cache and then refresh")),
+                !lockDownBrowserInfo.isClientLockDownBrowser ? (react_1.default.createElement(react_1.default.Fragment, null,
+                    hardRefreshShortcut && react_1.default.createElement("li", null,
+                        "\"Hard Refresh\" the page, ",
+                        hardRefreshShortcut),
+                    react_1.default.createElement("li", { className: !!refreshShortcut || !!hardRefreshShortcut ? 'mb2' : '' }, "Try a different browser"),
+                    react_1.default.createElement("li", null, "Clear your browser cache and then refresh"))) : (react_1.default.createElement(react_1.default.Fragment, null,
+                    react_1.default.createElement("li", null, "Close and re-open LockDown Browser"),
+                    react_1.default.createElement("li", null, "Restart your computer and then re-open LockDown Browser")))),
             react_1.default.createElement("p", { className: "mb3" },
                 "If you are still experiencing loading issues, please contact us at",
                 ' ',

package/lib/utils/url.js

@@ -44,6 +44,7 @@ var lodash_1 = __importDefault(require("lodash"));
 var shard_1 = __importDefault(require("../constants/shard"));
 var tier_1 = __importDefault(require("../constants/tier"));
 var windowService_1 = __importDefault(require("../services/windowService"));
+var logger_1 = require("./logger");
 var shard_2 = require("./shard");
 function getApiBaseUrl(tier, apiUrlString) {
     // skip shard logic on LOCAL or if not using a custom domain (e.g. staging)
@@ -74,15 +75,46 @@ function isUrlValid(url) {
     return /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=]+$/.test(url);
 }
 exports.isUrlValid = isUrlValid;
+var RETRY_LIMIT = 5;
+function wait(time) {
+    return new Promise(function (resolve) {
+        setTimeout(resolve, time);
+    });
+}
 function fetchText(url, options) {
     return __awaiter(this, void 0, void 0, function () {
-        var resp;
+        var tryCount, didFail, resp, text, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, fetch(url, options)];
+                case 0:
+                    tryCount = 0;
+                    didFail = false;
+                    _a.label = 1;
                 case 1:
+                    didFail = false;
+                    tryCount++;
+                    _a.label = 2;
+                case 2:
+                    _a.trys.push([2, 5, , 7]);
+                    return [4 /*yield*/, fetch(url, options)];
+                case 3:
                     resp = _a.sent();
-                    return [2 /*return*/, resp.text()];
+                    return [4 /*yield*/, resp.text()];
+                case 4:
+                    text = _a.sent();
+                    return [2 /*return*/, text];
+                case 5:
+                    error_1 = _a.sent();
+                    didFail = true;
+                    logger_1.getLogger().error("Failed to fetch " + url + ". attempt: " + tryCount + ", error: " + error_1);
+                    return [4 /*yield*/, wait(2 ^ (tryCount * 100))]; // 100, 200, 400...
+                case 6:
+                    _a.sent(); // 100, 200, 400...
+                    return [3 /*break*/, 7];
+                case 7:
+                    if (tryCount < RETRY_LIMIT && didFail) return [3 /*break*/, 1];
+                    _a.label = 8;
+                case 8: throw new Error("Failed to fetch " + url + " after " + RETRY_LIMIT + " attempts.");
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "studiokit-scaffolding-js",
-	"version": "4.7.0",
+	"version": "4.7.1-alpha.2",
 	"description": "Common scaffolding for Studio apps at Purdue",
 	"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
 	"license": "MIT",