Fixing bug snippet endpoint with startup script + improving logs

Author: Alathreon

JShellAPI/src/main/java/org/togetherjava/jshellapi/rest/JShellController.java

@@ -40,7 +40,7 @@ public JShellResult singleEval(@RequestParam(required = false) StartupScriptId s
     public List<String> snippets(@PathVariable String id, @RequestParam(required = false) boolean includeStartupScript) throws DockerException {
         validateId(id);
         if(!service.hasSession(id)) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Id " + id + " not found");
-        return service.session(id, null).snippets().map(l -> includeStartupScript || l.size() < 2 ? l : l.subList(2, l.size())).orElseThrow(() -> new ResponseStatusException(HttpStatus.CONFLICT, "An operation is already running"));
+        return service.session(id, null).snippets(includeStartupScript).orElseThrow(() -> new ResponseStatusException(HttpStatus.CONFLICT, "An operation is already running"));
     }
 
     @DeleteMapping("/{id}")

JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java

@@ -27,6 +27,7 @@ public class JShellService implements Closeable {
     private final long evalTimeout;
     private boolean doingOperation;
     private final DockerService dockerService;
+    private final int startupScriptSize;
 
     public JShellService(DockerService dockerService, JShellSessionService sessionService, String id, long timeout, boolean renewable, long evalTimeout, long evalTimeoutValidationLeeway, int sysOutCharLimit, int maxMemory, double cpus, String startupScript) throws DockerException {
         this.dockerService = dockerService;
@@ -38,7 +39,7 @@ public JShellService(DockerService dockerService, JShellSessionService sessionSe
         this.evalTimeoutValidationLeeway = evalTimeoutValidationLeeway;
         this.lastTimeoutUpdate = Instant.now();
         if(!dockerService.isDead(containerName())) {
-            LOGGER.error("Tried to create an existing container {}.", containerName());
+            LOGGER.warn("Tried to create an existing container {}.", containerName());
             throw new DockerException("The session isn't completely destroyed, try again later.");
         }
         try {
@@ -58,9 +59,12 @@ public JShellService(DockerService dockerService, JShellSessionService sessionSe
             reader = new BufferedReader(new InputStreamReader(containerOutput));
             writer.write(sanitize(startupScript));
             writer.newLine();
-        } catch (IOException | InterruptedException e) {
+            writer.flush();
+            checkContainerOK();
+            startupScriptSize = Integer.parseInt(reader.readLine());
+        } catch (Exception e) {
             LOGGER.warn("Unexpected error during creation.", e);
-            throw new DockerException(e);
+            throw new DockerException("Creation of the session failed.", e);
         }
         this.doingOperation = false;
     }
@@ -136,7 +140,7 @@ private JShellResult readResult() throws IOException, NumberFormatException, Doc
         return new JShellResult(snippetResults, abortion, stdoutOverflow, stdout);
     }
 
-    public Optional<List<String>> snippets() throws DockerException {
+    public Optional<List<String>> snippets(boolean includeStartupScript) throws DockerException {
         synchronized (this) {
             if(!tryStartOperation())  {
                 return Optional.empty();
@@ -155,7 +159,9 @@ public Optional<List<String>> snippets() throws DockerException {
             while(!(snippet = reader.readLine()).isEmpty()) {
                 snippets.add(cleanCode(snippet));
             }
-            return Optional.of(snippets);
+            return Optional.of(
+                    includeStartupScript ? snippets : snippets.subList(startupScriptSize, snippets.size())
+            );
         } catch (IOException ex) {
             LOGGER.warn("Unexpected error.", ex);
             close();