chore: autofix tsc compliation (#6689)
This commit is contained in:
parent
731ffd2883
commit
034b8641c8
4
.github/workflows/autofix.yml
vendored
4
.github/workflows/autofix.yml
vendored
@ -42,4 +42,8 @@ jobs:
|
|||||||
run: npm run fmt
|
run: npm run fmt
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
|
|
||||||
|
- name: Compile TypeScript
|
||||||
|
run: npm run tsc
|
||||||
|
continue-on-error: true
|
||||||
|
|
||||||
- uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27
|
- uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27
|
||||||
|
|||||||
154
src/util.js
154
src/util.js
@ -10,97 +10,12 @@
|
|||||||
*/
|
*/
|
||||||
var _a;
|
var _a;
|
||||||
Object.defineProperty(exports, "__esModule", { value: true });
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
exports.CONSOLE_STYLE_FgPink =
|
exports.CONSOLE_STYLE_FgPink = exports.CONSOLE_STYLE_FgBrown = exports.CONSOLE_STYLE_FgViolet = exports.CONSOLE_STYLE_FgLightBlue = exports.CONSOLE_STYLE_FgLightGreen = exports.CONSOLE_STYLE_FgOrange = exports.CONSOLE_STYLE_FgGray = exports.CONSOLE_STYLE_FgWhite = exports.CONSOLE_STYLE_FgCyan = exports.CONSOLE_STYLE_FgMagenta = exports.CONSOLE_STYLE_FgBlue = exports.CONSOLE_STYLE_FgYellow = exports.CONSOLE_STYLE_FgGreen = exports.CONSOLE_STYLE_FgRed = exports.CONSOLE_STYLE_FgBlack = exports.CONSOLE_STYLE_Hidden = exports.CONSOLE_STYLE_Reverse = exports.CONSOLE_STYLE_Blink = exports.CONSOLE_STYLE_Underscore = exports.CONSOLE_STYLE_Dim = exports.CONSOLE_STYLE_Bright = exports.CONSOLE_STYLE_Reset = exports.PING_PER_REQUEST_TIMEOUT_DEFAULT = exports.PING_PER_REQUEST_TIMEOUT_MAX = exports.PING_PER_REQUEST_TIMEOUT_MIN = exports.PING_COUNT_DEFAULT = exports.PING_COUNT_MAX = exports.PING_COUNT_MIN = exports.PING_GLOBAL_TIMEOUT_DEFAULT = exports.PING_GLOBAL_TIMEOUT_MAX = exports.PING_GLOBAL_TIMEOUT_MIN = exports.PING_PACKET_SIZE_DEFAULT = exports.PING_PACKET_SIZE_MAX = exports.PING_PACKET_SIZE_MIN = exports.MIN_INTERVAL_SECOND = exports.MAX_INTERVAL_SECOND = exports.SQL_DATETIME_FORMAT_WITHOUT_SECOND = exports.SQL_DATETIME_FORMAT = exports.SQL_DATE_FORMAT = exports.STATUS_PAGE_MAINTENANCE = exports.STATUS_PAGE_PARTIAL_DOWN = exports.STATUS_PAGE_ALL_UP = exports.STATUS_PAGE_ALL_DOWN = exports.MAINTENANCE = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isNode = exports.isDev = void 0;
|
||||||
exports.CONSOLE_STYLE_FgBrown =
|
exports.TYPES_WITH_DOMAIN_EXPIRY_SUPPORT_VIA_FIELD = exports.evaluateJsonQuery = exports.intHash = exports.localToUTC = exports.utcToLocal = exports.utcToISODateTime = exports.isoToUTCDateTime = exports.parseTimeFromTimeObject = exports.parseTimeObject = exports.getMonitorRelativeURL = exports.genSecret = exports.getCryptoRandomInt = exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.log = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.badgeConstants = exports.CONSOLE_STYLE_BgGray = exports.CONSOLE_STYLE_BgWhite = exports.CONSOLE_STYLE_BgCyan = exports.CONSOLE_STYLE_BgMagenta = exports.CONSOLE_STYLE_BgBlue = exports.CONSOLE_STYLE_BgYellow = exports.CONSOLE_STYLE_BgGreen = exports.CONSOLE_STYLE_BgRed = exports.CONSOLE_STYLE_BgBlack = void 0;
|
||||||
exports.CONSOLE_STYLE_FgViolet =
|
|
||||||
exports.CONSOLE_STYLE_FgLightBlue =
|
|
||||||
exports.CONSOLE_STYLE_FgLightGreen =
|
|
||||||
exports.CONSOLE_STYLE_FgOrange =
|
|
||||||
exports.CONSOLE_STYLE_FgGray =
|
|
||||||
exports.CONSOLE_STYLE_FgWhite =
|
|
||||||
exports.CONSOLE_STYLE_FgCyan =
|
|
||||||
exports.CONSOLE_STYLE_FgMagenta =
|
|
||||||
exports.CONSOLE_STYLE_FgBlue =
|
|
||||||
exports.CONSOLE_STYLE_FgYellow =
|
|
||||||
exports.CONSOLE_STYLE_FgGreen =
|
|
||||||
exports.CONSOLE_STYLE_FgRed =
|
|
||||||
exports.CONSOLE_STYLE_FgBlack =
|
|
||||||
exports.CONSOLE_STYLE_Hidden =
|
|
||||||
exports.CONSOLE_STYLE_Reverse =
|
|
||||||
exports.CONSOLE_STYLE_Blink =
|
|
||||||
exports.CONSOLE_STYLE_Underscore =
|
|
||||||
exports.CONSOLE_STYLE_Dim =
|
|
||||||
exports.CONSOLE_STYLE_Bright =
|
|
||||||
exports.CONSOLE_STYLE_Reset =
|
|
||||||
exports.PING_PER_REQUEST_TIMEOUT_DEFAULT =
|
|
||||||
exports.PING_PER_REQUEST_TIMEOUT_MAX =
|
|
||||||
exports.PING_PER_REQUEST_TIMEOUT_MIN =
|
|
||||||
exports.PING_COUNT_DEFAULT =
|
|
||||||
exports.PING_COUNT_MAX =
|
|
||||||
exports.PING_COUNT_MIN =
|
|
||||||
exports.PING_GLOBAL_TIMEOUT_DEFAULT =
|
|
||||||
exports.PING_GLOBAL_TIMEOUT_MAX =
|
|
||||||
exports.PING_GLOBAL_TIMEOUT_MIN =
|
|
||||||
exports.PING_PACKET_SIZE_DEFAULT =
|
|
||||||
exports.PING_PACKET_SIZE_MAX =
|
|
||||||
exports.PING_PACKET_SIZE_MIN =
|
|
||||||
exports.MIN_INTERVAL_SECOND =
|
|
||||||
exports.MAX_INTERVAL_SECOND =
|
|
||||||
exports.SQL_DATETIME_FORMAT_WITHOUT_SECOND =
|
|
||||||
exports.SQL_DATETIME_FORMAT =
|
|
||||||
exports.SQL_DATE_FORMAT =
|
|
||||||
exports.STATUS_PAGE_MAINTENANCE =
|
|
||||||
exports.STATUS_PAGE_PARTIAL_DOWN =
|
|
||||||
exports.STATUS_PAGE_ALL_UP =
|
|
||||||
exports.STATUS_PAGE_ALL_DOWN =
|
|
||||||
exports.MAINTENANCE =
|
|
||||||
exports.PENDING =
|
|
||||||
exports.UP =
|
|
||||||
exports.DOWN =
|
|
||||||
exports.appName =
|
|
||||||
exports.isNode =
|
|
||||||
exports.isDev =
|
|
||||||
void 0;
|
|
||||||
exports.TYPES_WITH_DOMAIN_EXPIRY_SUPPORT_VIA_FIELD =
|
|
||||||
exports.evaluateJsonQuery =
|
|
||||||
exports.intHash =
|
|
||||||
exports.localToUTC =
|
|
||||||
exports.utcToLocal =
|
|
||||||
exports.utcToISODateTime =
|
|
||||||
exports.isoToUTCDateTime =
|
|
||||||
exports.parseTimeFromTimeObject =
|
|
||||||
exports.parseTimeObject =
|
|
||||||
exports.getMonitorRelativeURL =
|
|
||||||
exports.genSecret =
|
|
||||||
exports.getCryptoRandomInt =
|
|
||||||
exports.getRandomInt =
|
|
||||||
exports.getRandomArbitrary =
|
|
||||||
exports.TimeLogger =
|
|
||||||
exports.polyfill =
|
|
||||||
exports.log =
|
|
||||||
exports.debug =
|
|
||||||
exports.ucfirst =
|
|
||||||
exports.sleep =
|
|
||||||
exports.flipStatus =
|
|
||||||
exports.badgeConstants =
|
|
||||||
exports.CONSOLE_STYLE_BgGray =
|
|
||||||
exports.CONSOLE_STYLE_BgWhite =
|
|
||||||
exports.CONSOLE_STYLE_BgCyan =
|
|
||||||
exports.CONSOLE_STYLE_BgMagenta =
|
|
||||||
exports.CONSOLE_STYLE_BgBlue =
|
|
||||||
exports.CONSOLE_STYLE_BgYellow =
|
|
||||||
exports.CONSOLE_STYLE_BgGreen =
|
|
||||||
exports.CONSOLE_STYLE_BgRed =
|
|
||||||
exports.CONSOLE_STYLE_BgBlack =
|
|
||||||
void 0;
|
|
||||||
const dayjs_1 = require("dayjs");
|
const dayjs_1 = require("dayjs");
|
||||||
const jsonata = require("jsonata");
|
const jsonata = require("jsonata");
|
||||||
exports.isDev = process.env.NODE_ENV === "development";
|
exports.isDev = process.env.NODE_ENV === "development";
|
||||||
exports.isNode =
|
exports.isNode = typeof process !== "undefined" && ((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node);
|
||||||
typeof process !== "undefined" &&
|
|
||||||
((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0
|
|
||||||
? void 0
|
|
||||||
: _a.node);
|
|
||||||
const dayjs = exports.isNode ? require("dayjs") : dayjs_1.default;
|
const dayjs = exports.isNode ? require("dayjs") : dayjs_1.default;
|
||||||
exports.appName = "Uptime Kuma";
|
exports.appName = "Uptime Kuma";
|
||||||
exports.DOWN = 0;
|
exports.DOWN = 0;
|
||||||
@ -253,7 +168,8 @@ class Logger {
|
|||||||
let now;
|
let now;
|
||||||
if (dayjs.tz) {
|
if (dayjs.tz) {
|
||||||
now = dayjs.tz(new Date()).format();
|
now = dayjs.tz(new Date()).format();
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
now = dayjs().format();
|
now = dayjs().format();
|
||||||
}
|
}
|
||||||
const levelColor = consoleLevelColors[level];
|
const levelColor = consoleLevelColors[level];
|
||||||
@ -272,7 +188,8 @@ class Logger {
|
|||||||
}
|
}
|
||||||
modulePart = "[" + moduleColor + module + exports.CONSOLE_STYLE_Reset + "]";
|
modulePart = "[" + moduleColor + module + exports.CONSOLE_STYLE_Reset + "]";
|
||||||
levelPart = levelColor + `${level}:` + exports.CONSOLE_STYLE_Reset;
|
levelPart = levelColor + `${level}:` + exports.CONSOLE_STYLE_Reset;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
timePart = now;
|
timePart = now;
|
||||||
modulePart = `[${module}]`;
|
modulePart = `[${module}]`;
|
||||||
levelPart = `${level}:`;
|
levelPart = `${level}:`;
|
||||||
@ -346,21 +263,21 @@ function getRandomInt(min, max) {
|
|||||||
return Math.floor(Math.random() * (max - min + 1)) + min;
|
return Math.floor(Math.random() * (max - min + 1)) + min;
|
||||||
}
|
}
|
||||||
exports.getRandomInt = getRandomInt;
|
exports.getRandomInt = getRandomInt;
|
||||||
const getRandomBytes = (
|
const getRandomBytes = (typeof window !== "undefined" && window.crypto
|
||||||
typeof window !== "undefined" && window.crypto
|
?
|
||||||
? function () {
|
function () {
|
||||||
return (numBytes) => {
|
return (numBytes) => {
|
||||||
const randomBytes = new Uint8Array(numBytes);
|
const randomBytes = new Uint8Array(numBytes);
|
||||||
for (let i = 0; i < numBytes; i += 65536) {
|
for (let i = 0; i < numBytes; i += 65536) {
|
||||||
window.crypto.getRandomValues(randomBytes.subarray(i, i + Math.min(numBytes - i, 65536)));
|
window.crypto.getRandomValues(randomBytes.subarray(i, i + Math.min(numBytes - i, 65536)));
|
||||||
}
|
}
|
||||||
return randomBytes;
|
return randomBytes;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
: function () {
|
:
|
||||||
return require("crypto").randomBytes;
|
function () {
|
||||||
}
|
return require("crypto").randomBytes;
|
||||||
)();
|
})();
|
||||||
function getCryptoRandomInt(min, max) {
|
function getCryptoRandomInt(min, max) {
|
||||||
const range = max - min;
|
const range = max - min;
|
||||||
if (range >= Math.pow(2, 32)) {
|
if (range >= Math.pow(2, 32)) {
|
||||||
@ -386,7 +303,8 @@ function getCryptoRandomInt(min, max) {
|
|||||||
randomValue = randomValue & mask;
|
randomValue = randomValue & mask;
|
||||||
if (randomValue <= range) {
|
if (randomValue <= range) {
|
||||||
return min + randomValue;
|
return min + randomValue;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
return getCryptoRandomInt(min, max);
|
return getCryptoRandomInt(min, max);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -467,7 +385,8 @@ async function evaluateJsonQuery(data, jsonPath, jsonPathOperator, expectedValue
|
|||||||
let response;
|
let response;
|
||||||
try {
|
try {
|
||||||
response = JSON.parse(data);
|
response = JSON.parse(data);
|
||||||
} catch (_a) {
|
}
|
||||||
|
catch (_a) {
|
||||||
response =
|
response =
|
||||||
(typeof data === "object" || typeof data === "number") && !Buffer.isBuffer(data) ? data : data.toString();
|
(typeof data === "object" || typeof data === "number") && !Buffer.isBuffer(data) ? data : data.toString();
|
||||||
}
|
}
|
||||||
@ -479,17 +398,13 @@ async function evaluateJsonQuery(data, jsonPath, jsonPathOperator, expectedValue
|
|||||||
if (Array.isArray(response)) {
|
if (Array.isArray(response)) {
|
||||||
const responseStr = JSON.stringify(response);
|
const responseStr = JSON.stringify(response);
|
||||||
const truncatedResponse = responseStr.length > 25 ? responseStr.substring(0, 25) + "...]" : responseStr;
|
const truncatedResponse = responseStr.length > 25 ? responseStr.substring(0, 25) + "...]" : responseStr;
|
||||||
throw new Error(
|
throw new Error("JSON query returned the array " +
|
||||||
"JSON query returned the array " +
|
truncatedResponse +
|
||||||
truncatedResponse +
|
", but a primitive value is required. " +
|
||||||
", but a primitive value is required. " +
|
"Modify your query to return a single value via [0] to get the first element or use an aggregation like $count(), $sum() or $boolean().");
|
||||||
"Modify your query to return a single value via [0] to get the first element or use an aggregation like $count(), $sum() or $boolean()."
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
if (typeof response === "object" || response instanceof Date || typeof response === "function") {
|
if (typeof response === "object" || response instanceof Date || typeof response === "function") {
|
||||||
throw new Error(
|
throw new Error(`The post-JSON query evaluated response from the server is of type ${typeof response}, which cannot be directly compared to the expected value`);
|
||||||
`The post-JSON query evaluated response from the server is of type ${typeof response}, which cannot be directly compared to the expected value`
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
let jsonQueryExpression;
|
let jsonQueryExpression;
|
||||||
switch (jsonPathOperator) {
|
switch (jsonPathOperator) {
|
||||||
@ -517,15 +432,14 @@ async function evaluateJsonQuery(data, jsonPath, jsonPathOperator, expectedValue
|
|||||||
expected: expectedValue.toString(),
|
expected: expectedValue.toString(),
|
||||||
});
|
});
|
||||||
if (status === undefined) {
|
if (status === undefined) {
|
||||||
throw new Error(
|
throw new Error("Query evaluation returned undefined. Check query syntax and the structure of the response data");
|
||||||
"Query evaluation returned undefined. Check query syntax and the structure of the response data"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
status,
|
status,
|
||||||
response,
|
response,
|
||||||
};
|
};
|
||||||
} catch (err) {
|
}
|
||||||
|
catch (err) {
|
||||||
response = JSON.stringify(response);
|
response = JSON.stringify(response);
|
||||||
response = response && response.length > 50 ? `${response.substring(0, 100)}… (truncated)` : response;
|
response = response && response.length > 50 ? `${response.substring(0, 100)}… (truncated)` : response;
|
||||||
throw new Error(`Error evaluating JSON query: ${err.message}. Response from server was: ${response}`);
|
throw new Error(`Error evaluating JSON query: ${err.message}. Response from server was: ${response}`);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user