assets live compiler: process modified file (not entire set of files) fix #549

Author: jknack

jooby-assets-j2v8/src/main/java/org/jooby/assets/V8Context.java

@@ -27,7 +27,9 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,6 +47,8 @@
 import com.google.common.io.BaseEncoding;
 import com.google.common.io.ByteStreams;
 
+import javaslang.control.Try;
+
 public class V8Context {
 
   public interface Callback {
@@ -129,24 +133,19 @@ private List<AssetProblem> problems(final V8Array array) {
     return result.build();
   }
 
+  private <T> Optional<T> get(final String name, final Function<String, T> provider) {
+    return Try.of(() -> Optional.of(register(provider.apply(name)))).getOrElse(Optional.empty());
+  }
+
   private AssetProblem problem(final V8Object js) {
-    int line = -1;
-    if (js.contains("line")) {
-      line = ((Number) js.get("line")).intValue();
-    }
-    int column = -1;
-    if (js.contains("column")) {
-      column = ((Number) js.get("column")).intValue();
-    }
-    String filename = "file.js";
-    if (js.contains("filename")) {
-      filename = js.getString("filename");
-    }
-    String evidence = null;
-    if (js.contains("evidence")) {
-      evidence = js.getString("evidence");
-    }
-    return new AssetProblem(filename, line, column, js.getString("message"), evidence);
+    Optional<Integer> line = get("line", name -> ((Number) js.get(name)).intValue());
+    Optional<Integer> column = get("column", name -> ((Number) js.get(name)).intValue());
+    Optional<String> filename = get("filename", js::getString);
+    Optional<String> evidence = get("evidence", js::getString);
+    Optional<String> message = get("message", js::getString);
+
+    return new AssetProblem(filename.orElse("file.js"), line.orElse(-1), column.orElse(-1),
+        message.orElse(""), evidence.orElse(null));
   }
 
   private URL resolve(final String path) {

jooby-assets/src/main/java/org/jooby/assets/AssetCompiler.java

@@ -397,7 +397,6 @@ private String compile(final List<AssetProcessor> pipeline, final Iterator<Strin
     StringBuilder buff = new StringBuilder();
     while (files.hasNext()) {
       String file = files.next();
-      log.info("  {}", file);
       buff.append(compile(pipeline, file, type, readFile(loader, file, charset))).append(sep);
     }
     return buff.toString();
@@ -406,6 +405,7 @@ private String compile(final List<AssetProcessor> pipeline, final Iterator<Strin
   private String compile(final List<AssetProcessor> pipeline, final String filename,
       final MediaType type, final String input) throws Exception {
 
+    log.info("  {}", filename);
     Iterator<AssetProcessor> it = pipeline.iterator();
     String contents = input;
     while (it.hasNext()) {
@@ -414,11 +414,11 @@ private String compile(final List<AssetProcessor> pipeline, final String filenam
         String pname = processor.name();
         long start = System.currentTimeMillis();
         try {
-          log.debug("executing: {}", pname);
+          log.debug("    executing: {}", pname);
           contents = processor.process(filename, contents, conf);
         } finally {
           long end = System.currentTimeMillis();
-          log.debug("{} took {}ms", pname, end - start);
+          log.debug("    {} took {}ms", pname, end - start);
         }
       }
     }

jooby-assets/src/main/java/org/jooby/internal/assets/LiveCompiler.java

@@ -22,60 +22,86 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardWatchEventKinds;
 import java.nio.file.WatchEvent.Kind;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 
+import org.jooby.MediaType;
 import org.jooby.Request;
 import org.jooby.Response;
 import org.jooby.Route;
 import org.jooby.assets.AssetCompiler;
 import org.jooby.assets.AssetException;
 import org.jooby.assets.AssetProblem;
+import org.jooby.internal.URLAsset;
 
 import com.google.common.collect.Lists;
 import com.typesafe.config.Config;
 
+import javaslang.control.Try;
+
 public class LiveCompiler implements Route.Handler {
 
   private final Config conf;
 
   private final AssetCompiler compiler;
 
-  private final AtomicReference<AssetException> lastErr = new AtomicReference<AssetException>(null);
+  private final Map<String, AssetException> errors = new ConcurrentHashMap<>();
 
   private final Watcher watcher;
 
   private final AtomicBoolean firstRun = new AtomicBoolean(true);
 
+  private Path basedir;
+
   public LiveCompiler(final Config conf, final AssetCompiler compiler) throws IOException {
     this.conf = requireNonNull(conf, "Config is required.");
     this.compiler = requireNonNull(compiler, "Asset compiler is required.");
-    this.watcher = new Watcher(this::onChange, Paths.get("public"));
+    this.basedir = Paths.get("public");
+    this.watcher = new Watcher(this::onChange, basedir);
+
   }
 
   private void onChange(final Kind<?> kind, final Path path) {
     File outputdir = new File(conf.getString("application.tmpdir"), "__public_");
     outputdir.mkdirs();
+    String filename = Route.normalize(Try.of(() -> path.subpath(1, path.getNameCount()).toString())
+        .getOrElse(path.toString()));
     try {
       boolean firstRun = this.firstRun.compareAndSet(true, false);
-      if (!firstRun) {
+      if (!firstRun && !path.equals(basedir)) {
         if (!compiler.contains(path.toString())) {
           return;
         }
       }
-      compiler.build(conf.getString("application.env"), outputdir);
-      lastErr.set(null);
+      if (kind == StandardWatchEventKinds.ENTRY_DELETE) {
+        errors.remove(filename);
+      } else {
+        if (Files.isDirectory(path)) {
+          errors.clear();
+          compiler.build(conf.getString("application.env"), outputdir);
+        } else {
+          MediaType type = MediaType.byPath(path).orElse(MediaType.octetstream);
+          compiler.build(new URLAsset(path.toUri().toURL(), filename, type));
+          errors.remove(filename);
+        }
+      }
     } catch (AssetException ex) {
-      lastErr.set(rewrite(ex));
+      String localname = ex.getProblems().stream()
+          .findFirst()
+          .map(AssetProblem::getFilename)
+          .orElse(filename);
+      errors.put(localname, rewrite(ex));
     } catch (Exception ex) {
-      ex.printStackTrace();
       AssetException assetEx = rewrite(new AssetException("compiler",
-          new AssetProblem(path.toString(), -1, -1, ex.getMessage(), null), ex));
-      lastErr.set(assetEx);
+          new AssetProblem(filename, -1, -1, ex.getMessage(), null), ex));
+      errors.put(filename, assetEx);
     }
   }
 
@@ -97,9 +123,11 @@ private AssetException rewrite(final AssetException ex) {
 
   @Override
   public void handle(final Request req, final Response rsp) throws Throwable {
-    AssetException ex = lastErr.get();
-    if (ex != null) {
-      throw ex;
+    if (req.param("assets.sync").isSet()) {
+      onChange(StandardWatchEventKinds.ENTRY_MODIFY, basedir);
+    }
+    if (errors.size() > 0) {
+      throw errors.values().iterator().next();
     }
   }
 

jooby-assets/src/main/java/org/jooby/internal/assets/Watcher.java

@@ -145,7 +145,7 @@ private boolean processEvents() {
       Path child = dir.resolve(name);
       File file = child.toFile();
 
-      if (file.isFile()) {
+      if (file.isFile() || kind == ENTRY_DELETE) {
         listener.accept(kind, dir.resolve(name));
       }