studiokit-scaffolding-js 4.7.0 → 4.7.1-alpha.1
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.
- package/lib/utils/url.js +35 -3
- package/package.json +1 -1
package/lib/utils/url.js
CHANGED
|
@@ -44,6 +44,7 @@ var lodash_1 = __importDefault(require("lodash"));
|
|
|
44
44
|
var shard_1 = __importDefault(require("../constants/shard"));
|
|
45
45
|
var tier_1 = __importDefault(require("../constants/tier"));
|
|
46
46
|
var windowService_1 = __importDefault(require("../services/windowService"));
|
|
47
|
+
var logger_1 = require("./logger");
|
|
47
48
|
var shard_2 = require("./shard");
|
|
48
49
|
function getApiBaseUrl(tier, apiUrlString) {
|
|
49
50
|
// skip shard logic on LOCAL or if not using a custom domain (e.g. staging)
|
|
@@ -74,15 +75,46 @@ function isUrlValid(url) {
|
|
|
74
75
|
return /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=]+$/.test(url);
|
|
75
76
|
}
|
|
76
77
|
exports.isUrlValid = isUrlValid;
|
|
78
|
+
var RETRY_LIMIT = 5;
|
|
79
|
+
function wait(time) {
|
|
80
|
+
return new Promise(function (resolve) {
|
|
81
|
+
setTimeout(resolve, time);
|
|
82
|
+
});
|
|
83
|
+
}
|
|
77
84
|
function fetchText(url, options) {
|
|
78
85
|
return __awaiter(this, void 0, void 0, function () {
|
|
79
|
-
var resp;
|
|
86
|
+
var tryCount, didFail, resp, text, error_1;
|
|
80
87
|
return __generator(this, function (_a) {
|
|
81
88
|
switch (_a.label) {
|
|
82
|
-
case 0:
|
|
89
|
+
case 0:
|
|
90
|
+
tryCount = 0;
|
|
91
|
+
didFail = false;
|
|
92
|
+
_a.label = 1;
|
|
83
93
|
case 1:
|
|
94
|
+
didFail = false;
|
|
95
|
+
tryCount++;
|
|
96
|
+
_a.label = 2;
|
|
97
|
+
case 2:
|
|
98
|
+
_a.trys.push([2, 5, , 7]);
|
|
99
|
+
return [4 /*yield*/, fetch(url, options)];
|
|
100
|
+
case 3:
|
|
84
101
|
resp = _a.sent();
|
|
85
|
-
return [
|
|
102
|
+
return [4 /*yield*/, resp.text()];
|
|
103
|
+
case 4:
|
|
104
|
+
text = _a.sent();
|
|
105
|
+
return [2 /*return*/, text];
|
|
106
|
+
case 5:
|
|
107
|
+
error_1 = _a.sent();
|
|
108
|
+
didFail = true;
|
|
109
|
+
logger_1.getLogger().error("Failed to fetch " + url + ". attempt: " + tryCount + ", error: " + error_1);
|
|
110
|
+
return [4 /*yield*/, wait(2 ^ (tryCount * 100))]; // 100, 200, 400...
|
|
111
|
+
case 6:
|
|
112
|
+
_a.sent(); // 100, 200, 400...
|
|
113
|
+
return [3 /*break*/, 7];
|
|
114
|
+
case 7:
|
|
115
|
+
if (tryCount < RETRY_LIMIT && didFail) return [3 /*break*/, 1];
|
|
116
|
+
_a.label = 8;
|
|
117
|
+
case 8: throw new Error("Failed to fetch " + url + " after " + RETRY_LIMIT + " attempts.");
|
|
86
118
|
}
|
|
87
119
|
});
|
|
88
120
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "studiokit-scaffolding-js",
|
|
3
|
-
"version": "4.7.
|
|
3
|
+
"version": "4.7.1-alpha.1",
|
|
4
4
|
"description": "Common scaffolding for Studio apps at Purdue",
|
|
5
5
|
"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
|
|
6
6
|
"license": "MIT",
|