Skip to content

Commit

Permalink
Make console API available in embedding usage.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaxisTekfield
MaxisTekfield committed Nov 29, 2021
1 parent 6f29fa5 commit e2b6307
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 36 deletions.
61 changes: 26 additions & 35 deletions ...javascript/tools/shell/NativeConsole.java → ...org/mozilla/javascript/NativeConsole.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

package org.mozilla.javascript.tools.shell;
package org.mozilla.javascript;

import java.io.IOException;
import java.nio.charset.Charset;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.IdFunctionObject;
import org.mozilla.javascript.IdScriptableObject;
import org.mozilla.javascript.NativeJSON;
import org.mozilla.javascript.ScriptRuntime;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
import org.mozilla.javascript.Undefined;

public class NativeConsole extends IdScriptableObject {
private static final long serialVersionUID = 5694613212458273057L;
Expand All @@ -30,22 +21,28 @@ public class NativeConsole extends IdScriptableObject {

private static final String DEFAULT_LABEL = "default";

private static final Pattern FMT_REG = Pattern.compile("%[sfdio%]");
private static final Pattern FMT_REG = Pattern.compile("%[sfdioO%]");

private final Map<String, Long> timers = new ConcurrentHashMap<>();

private final Map<String, AtomicInteger> counters = new ConcurrentHashMap<>();

private enum Level {
private final ConsolePrinter printer;

public enum Level {
TRACE,
DEBUG,
INFO,
WARN,
ERROR
}

static void init(Scriptable scope, boolean sealed) {
NativeConsole obj = new NativeConsole();
public interface ConsolePrinter extends Serializable {
void print(Level level, String msg);
}

public static void init(Scriptable scope, boolean sealed, ConsolePrinter printer) {
NativeConsole obj = new NativeConsole(printer);
obj.activatePrototypeMap(MAX_ID);
obj.setPrototype(getObjectPrototype(scope));
obj.setParentScope(scope);
Expand All @@ -55,7 +52,9 @@ static void init(Scriptable scope, boolean sealed) {
ScriptableObject.defineProperty(scope, "console", obj, ScriptableObject.DONTENUM);
}

private NativeConsole() {}
private NativeConsole(ConsolePrinter printer) {
this.printer = printer;
}

@Override
public String getClassName() {
Expand All @@ -73,7 +72,7 @@ protected void initPrototypeId(int id) {
switch (id) {
case Id_toSource:
arity = 0;
name = "toSrouce";
name = "toSource";
break;
case Id_trace:
arity = 1;
Expand Down Expand Up @@ -203,16 +202,7 @@ private void print(Context cx, Scriptable scope, Level level, Object[] args) {
Object[] fmtArgs = Arrays.copyOfRange(args, 1, args.length);
msg = format(cx, scope, msg, fmtArgs);
}
print(level, msg);
}

private void print(Level level, String msg) {
try {
ShellConsole shellConsole = Main.getGlobal().getConsole(Charset.defaultCharset());
shellConsole.println(level + " " + msg);
} catch (IOException e) {
throw Context.reportRuntimeError(e.getMessage());
}
printer.print(level, msg);
}

private String format(Context cx, Scriptable scope, String msg, Object[] args) {
Expand Down Expand Up @@ -250,6 +240,7 @@ private String format(Context cx, Scriptable scope, String msg, Object[] args) {
break;

case "%o":
case "%O":
replaceArg = formatObj(cx, scope, args, argIndex);
break;

Expand Down Expand Up @@ -296,28 +287,28 @@ private void jsAssert(Object[] args) {
msg.append(" console.assert");
}

print(Level.ERROR, msg.toString());
printer.print(Level.ERROR, msg.toString());
}

private void count(Object[] args) {
String label = args.length > 0 ? ScriptRuntime.toString(args[0]) : DEFAULT_LABEL;
int count = counters.computeIfAbsent(label, l -> new AtomicInteger(0)).incrementAndGet();
print(Level.INFO, label + ": " + count);
printer.print(Level.INFO, label + ": " + count);
}

private void countReset(Object[] args) {
String label = args.length > 0 ? ScriptRuntime.toString(args[0]) : DEFAULT_LABEL;
AtomicInteger counter = counters.remove(label);
if (counter == null) {
print(Level.WARN, "Count for '" + label + "' does not exist.");
printer.print(Level.WARN, "Count for '" + label + "' does not exist.");
}
}

private void time(Object[] args) {
String label = args.length > 0 ? ScriptRuntime.toString(args[0]) : DEFAULT_LABEL;
Long start = timers.get(label);
if (start != null) {
print(Level.WARN, "Timer '" + label + "' already exists.");
printer.print(Level.WARN, "Timer '" + label + "' already exists.");
return;
}
timers.put(label, System.nanoTime());
Expand All @@ -327,17 +318,17 @@ private void timeEnd(Object[] args) {
String label = args.length > 0 ? ScriptRuntime.toString(args[0]) : DEFAULT_LABEL;
Long start = timers.remove(label);
if (start == null) {
print(Level.WARN, "Timer '" + label + "' does not exist.");
printer.print(Level.WARN, "Timer '" + label + "' does not exist.");
return;
}
print(Level.INFO, label + ": " + nano2Milli(System.nanoTime() - start) + "ms");
printer.print(Level.INFO, label + ": " + nano2Milli(System.nanoTime() - start) + "ms");
}

private void timeLog(Object[] args) {
String label = args.length > 0 ? ScriptRuntime.toString(args[0]) : DEFAULT_LABEL;
Long start = timers.get(label);
if (start == null) {
print(Level.WARN, "Timer '" + label + "' does not exist.");
printer.print(Level.WARN, "Timer '" + label + "' does not exist.");
return;
}
StringBuilder msg =
Expand All @@ -348,7 +339,7 @@ private void timeLog(Object[] args) {
msg.append(" ").append(ScriptRuntime.toString(args[i]));
}
}
print(Level.INFO, msg.toString());
printer.print(Level.INFO, msg.toString());
}

private double nano2Milli(Long nano) {
Expand Down
3 changes: 2 additions & 1 deletion toolsrc/org/mozilla/javascript/tools/shell/Global.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.mozilla.javascript.Function;
import org.mozilla.javascript.ImporterTopLevel;
import org.mozilla.javascript.NativeArray;
import org.mozilla.javascript.NativeConsole;
import org.mozilla.javascript.RhinoException;
import org.mozilla.javascript.Script;
import org.mozilla.javascript.ScriptRuntime;
Expand Down Expand Up @@ -105,7 +106,7 @@ public void init(Context cx) {
// Define some global functions particular to the shell. Note
// that these functions are not part of ECMA.
initStandardObjects(cx, sealedStdLib);
NativeConsole.init(this, sealedStdLib);
NativeConsole.init(this, sealedStdLib, new ShellConsolePrinter());
String[] names = {
"defineClass",
"deserialize",
Expand Down
25 changes: 25 additions & 0 deletions toolsrc/org/mozilla/javascript/tools/shell/ShellConsolePrinter.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

package org.mozilla.javascript.tools.shell;

import java.io.IOException;
import java.nio.charset.Charset;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.NativeConsole;

/** Provide a printer use in console API */
class ShellConsolePrinter implements NativeConsole.ConsolePrinter {
private static final long serialVersionUID = 5869832740127501857L;

@Override
public void print(NativeConsole.Level level, String msg) {
try {
ShellConsole console = Main.getGlobal().getConsole(Charset.defaultCharset());
console.println(level + " " + msg);
} catch (IOException e) {
throw Context.reportRuntimeError(e.getMessage());
}
}
}

0 comments on commit e2b6307

Please sign in to comment.