[jsscripting] Refactor log formatting & Respect toString polyfills (#13844)

* [jsscripting] Refactor log formatting & Respect toString polyfills
* [jsscripting] Catch errors in log formatting & Improve handling of Java obj
* [jsscripting] Update log format failure message

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
This commit is contained in:
Florian Hotze 2022-12-05 20:46:17 +01:00 committed by GitHub
parent d0b1458e89
commit bf48eccf8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,66 +19,63 @@
function stringify (value) { function stringify (value) {
try { try {
if (Java.isJavaObject(value) || value instanceof Error) { if (typeof value === 'string') return value;
return value.toString(); // special cases
} else { if (value === undefined) {
// special cases return 'undefined';
if (value === undefined) { }
return 'undefined'; if (value === null) {
} return 'null';
if (typeof value === 'function') { }
return '[Function]'; // JSON.stringify all objects that do not polyfill toString()
} const str = value.toString();
if (value instanceof RegExp) { if (typeof value === 'object' && (str === '[object Object]') || str === '[object Java]') {
return value.toString();
}
// fallback to JSON
return JSON.stringify(value, null, 2); return JSON.stringify(value, null, 2);
} }
return str;
} catch (e) { } catch (e) {
return '[Circular: ' + e + ']'; return 'Error: failed to format log message: ' + e;
} }
} }
function format (f) { function format (f) {
if (typeof f !== 'string') { try {
const objects = []; const args = arguments;
for (let index = 0; index < arguments.length; index++) {
objects.push(stringify(arguments[index]));
}
return objects.join(' ');
}
if (arguments.length === 1) return f; // If there is only one argument, stringify and return it
if (args.length === 1) return stringify(f);
let i = 1; // Else if the first arg is string, do regex string formatting
const args = arguments; // the number of args after the formatted string must match the number of % placeholder
const len = args.length; let str;
let str = String(f).replace(formatRegExp, function (x) { let i = 1;
if (x === '%%') return '%'; if (typeof f === 'string') {
if (i >= len) return x; str = String(f).replace(formatRegExp, function (x) {
switch (x) { if (x === '%%') return '%';
case '%s': return String(args[i++]); if (i >= args.length) return x;
case '%d': return Number(args[i++]); switch (x) {
case '%j': case '%s': return String(args[i++]);
try { case '%d': return Number(args[i++]);
return stringify(args[i++]); case '%j':
} catch (_) { try {
return '[Circular]'; return stringify(args[i++]);
} catch (e) {
return '[Circular]';
}
// falls through
default:
return x;
} }
// falls through });
default:
return x;
} }
}); // Else stringify and join all args
for (let x = args[i]; i < len; x = args[++i]) { for (let x = args[i]; i < args.length; x = args[++i]) {
if (x === null || (typeof x !== 'object' && typeof x !== 'symbol')) {
str += ' ' + x;
} else {
str += ' ' + stringify(x); str += ' ' + stringify(x);
} }
return str;
} catch (e) {
return 'Error: failed to format log message: ' + e;
} }
return str;
} }
const counters = {}; const counters = {};