make totalMemory work again

Signed-off-by: Stefan Niederhauser <[email protected]>

Author: nidi3

graphviz-java/src/main/java/guru/nidi/graphviz/engine/AbstractJsGraphvizEngine.java

@@ -20,7 +20,7 @@
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Map.Entry;
 
-import static guru.nidi.graphviz.engine.IoUtils.*;
+import static guru.nidi.graphviz.engine.IoUtils.readStream;
 
 public abstract class AbstractJsGraphvizEngine extends AbstractGraphvizEngine {
     public AbstractJsGraphvizEngine(boolean sync) {
@@ -36,9 +36,9 @@ public String execute(String src, Options options) {
 
     protected String jsVizExec(String src, Options options) {
         final Entry<String, Options> srcAndOptions = preprocessCode(src, options);
-        return src.startsWith("render")
-                ? src
-                : ("render('" + srcAndOptions.getKey() + "'," + srcAndOptions.getValue().toJson(false) + ");");
+        final String memory = options.totalMemory == null ? "" : "totalMemory=" + options.totalMemory + ";";
+        final String render = "render('" + srcAndOptions.getKey() + "'," + srcAndOptions.getValue().toJson(false) + ");";
+        return src.startsWith("render") ? src : (memory + render);
     }
 
     protected Entry<String, Options> preprocessCode(String src, Options options) {
@@ -68,12 +68,19 @@ protected String jsVizCode() throws IOException {
     }
 
     protected String jsInitEnv() {
-        return "var viz = new Viz();"
+        return "var viz; var totalMemory = 16777216;"
+                + "function initViz(force){"
+                + "  if (force || !viz || viz.totalMemory !== totalMemory){"
+                + "    viz = new Viz({Module: function(){ return Viz.Module({TOTAL_MEMORY: totalMemory}); }, render: Viz.render});"
+                + "    viz.totalMemory = totalMemory;"
+                + "  }"
+                + "  return viz;"
+                + "}"
                 + "function render(src, options){"
                 + "  try {"
-                + "    viz.renderString(src, options)"
+                + "    initViz().renderString(src, options)"
                 + "      .then(function(res) { result(res); })"
-                + "      .catch(function(err) { viz = new Viz(); error(err.toString()); });"
+                + "      .catch(function(err) { initViz(true); error(err.toString()); });"
                 + "  } catch(e) { error(e.toString()); }"
                 + "}";
     }

graphviz-java/src/main/java/guru/nidi/graphviz/engine/GraphvizGraalEngine.java

@@ -20,7 +20,7 @@
 
 import java.io.InputStream;
 
-import static guru.nidi.graphviz.engine.IoUtils.*;
+import static guru.nidi.graphviz.engine.IoUtils.readStream;
 
 class GraphvizGraalEngine extends AbstractJsGraphvizEngine {
     private static final Context CTX = Context.newBuilder("js").allowAllAccess(true).build();

graphviz-java/src/main/java/guru/nidi/graphviz/engine/GraphvizNashornEngine.java

@@ -20,7 +20,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static guru.nidi.graphviz.engine.IoUtils.*;
+import static guru.nidi.graphviz.engine.IoUtils.readStream;
 
 class GraphvizNashornEngine extends AbstractJsGraphvizEngine {
     private static final ScriptEngine ENGINE = new ScriptEngineManager().getEngineByExtension("js");

graphviz-java/src/main/java/guru/nidi/graphviz/engine/Rasterizer.java

@@ -20,7 +20,7 @@
 import java.awt.image.BufferedImage;
 import java.util.function.Consumer;
 
-import static guru.nidi.graphviz.engine.IoUtils.*;
+import static guru.nidi.graphviz.engine.IoUtils.isOnClasspath;
 
 public interface Rasterizer {
     @Nullable

graphviz-java/src/test/java/guru/nidi/graphviz/model/ExampleTest.java

@@ -74,7 +74,7 @@ void ex1b() throws IOException {
         final Node
                 printf = node("printf"),
                 make_string = node("make_string");
-        final Graph g = graph().graphAttr().with("dpi",300).directed().with(
+        final Graph g = graph().graphAttr().with("dpi", 300).directed().with(
                 node("main").with(Color.rgb("ffcc00"), Style.FILLED).link(
                         node("parse").link(node("execute")
                                 .link(make_string, printf, node("compare"))),