Merge branch 'main' of github.com:code-dot-org/javabuilder into create-codepipeline

Author: cat5inthecradle

api-gateway-routes/api_gateway_proxy_function.rb

@@ -79,8 +79,6 @@ def on_connect(event, context)
     function_name = ENV['BUILD_AND_RUN_CONSOLE_PROJECT_LAMBDA_ARN']
   elsif authorizer['mini_app_type'] == 'theater'
     function_name = ENV['BUILD_AND_RUN_THEATER_PROJECT_LAMBDA_ARN']
-  elsif authorizer['mini_app_type'] == 'playground'
-    function_name = ENV['BUILD_AND_RUN_PLAYGROUND_PROJECT_LAMBDA_ARN']
   else
     return { statusCode: 400, body: "invalid mini-app" }
   end

org-code-javabuilder/.gitignore

@@ -17,3 +17,6 @@ app/.project
 .vscode/*
 
 *.zip
+
+# ignore neighborhood grid.txt file (auto-generated when running locally)
+lib/grid.txt

org-code-javabuilder/lib/src/main/java/dev/javabuilder/LocalMetricClient.java

@@ -1,11 +1,12 @@
 package dev.javabuilder;
 
+import org.code.protocol.JavabuilderSharedObject;
 import org.code.protocol.MetricClient;
 
 // Local implementation of MetricClient. Since all we can do locally
 // is log and we already have regular logging for every metric,
 // these methods do nothing.
-public class LocalMetricClient implements MetricClient {
+public class LocalMetricClient extends JavabuilderSharedObject implements MetricClient {
   @Override
   public void publishSevereError() {}
 

org-code-javabuilder/lib/src/main/java/dev/javabuilder/LocalSystemExitHelper.java

@@ -2,13 +2,16 @@
 
 import org.code.javabuilder.PerformanceTracker;
 import org.code.javabuilder.SystemExitHelper;
+import org.code.protocol.JavabuilderContext;
 
 public class LocalSystemExitHelper implements SystemExitHelper {
 
   @Override
   public void exit(int status) {
-    PerformanceTracker.getInstance().trackInstanceEnd();
-    PerformanceTracker.getInstance().logPerformance();
+    PerformanceTracker performanceTracker =
+        (PerformanceTracker) JavabuilderContext.getInstance().get(PerformanceTracker.class);
+    performanceTracker.trackInstanceEnd();
+    performanceTracker.logPerformance();
     System.exit(status);
   }
 }

org-code-javabuilder/lib/src/main/java/dev/javabuilder/WebSocketServer.java

@@ -53,16 +53,19 @@ public WebSocketServer() {
   @OnOpen
   public void onOpen(Session session) {
     this.finishedExecution = false;
-    PerformanceTracker.resetTracker();
-    PerformanceTracker.getInstance().trackInstanceStart(Clock.systemUTC().instant());
+    JavabuilderContext.getInstance().destroyAndReset();
+    PerformanceTracker performanceTracker = new PerformanceTracker();
+    JavabuilderContext.getInstance().register(PerformanceTracker.class, performanceTracker);
+    performanceTracker.trackInstanceStart(Clock.systemUTC().instant());
     // Decode the authorization token
     String token = session.getRequestParameterMap().get("Authorization").get(0);
     Base64.Decoder decoder = Base64.getDecoder();
     String payload = new String(decoder.decode(token.split("\\.")[1]));
     JSONObject queryInput = new JSONObject(payload);
 
     final String connectionId = "LocalhostWebSocketConnection";
-    final String levelId = queryInput.getString("level_id");
+    final String levelId =
+        queryInput.has("level_id") ? String.valueOf(queryInput.getInt("level_id")) : "noneProvided";
     final String channelId =
         queryInput.has("channel_id") ? queryInput.getString("channel_id") : "noneProvided";
     final ExecutionType executionType =
@@ -76,8 +79,8 @@ public void onOpen(Session session) {
     // turn off the default console logger
     this.logger.setUseParentHandlers(false);
 
-    MetricClient metricClient = new LocalMetricClient();
-    MetricClientManager.create(metricClient);
+    LocalMetricClient metricClient = new LocalMetricClient();
+    JavabuilderContext.getInstance().register(MetricClient.class, metricClient);
 
     Properties.setConnectionId(connectionId);
 
@@ -88,7 +91,6 @@ public void onOpen(Session session) {
     if (executionType == ExecutionType.TEST) {
       outputAdapter = new UserTestOutputAdapter(websocketOutputAdapter);
     }
-    final LifecycleNotifier lifecycleNotifier = new LifecycleNotifier();
 
     final ExceptionHandler exceptionHandler =
         new ExceptionHandler(outputAdapter, new LocalSystemExitHelper());
@@ -107,7 +109,6 @@ public void onOpen(Session session) {
                         compileList,
                         new LocalTempDirectoryManager(),
                         contentManager,
-                        lifecycleNotifier,
                         new LocalSystemExitHelper());
                 codeExecutionManager.execute();
               } catch (Throwable e) {
@@ -133,14 +134,17 @@ public void onOpen(Session session) {
   @OnClose
   public void myOnClose() {
     Logger.getLogger(MAIN_LOGGER).info("WebSocket closed.");
-    PerformanceTracker.getInstance().logPerformance();
+    PerformanceTracker performanceTracker =
+        (PerformanceTracker) JavabuilderContext.getInstance().get(PerformanceTracker.class);
+    performanceTracker.logPerformance();
     // If the websocket was closed before execution was finished, make sure we clean up.
     if (!this.finishedExecution) {
       if (codeExecutionManager != null) {
         this.codeExecutionManager.shutDown();
       }
       this.logger.removeHandler(this.logHandler);
     }
+    JavabuilderContext.getInstance().destroyAndReset();
   }
 
   /**

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/AWSMetricClient.java

@@ -3,11 +3,12 @@
 import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatchClientBuilder;
 import com.amazonaws.services.cloudwatch.model.*;
+import org.code.protocol.JavabuilderSharedObject;
 import org.code.protocol.MetricClient;
 
 // Metric Client which published metrics to AWS CloudWatch.
 // Requires cloudwatch:PutMetricData permission on the Lambda.
-public class AWSMetricClient implements MetricClient {
+public class AWSMetricClient extends JavabuilderSharedObject implements MetricClient {
   private final AmazonCloudWatch cloudWatchClient;
   private final Dimension functionNameDimension;
 

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/AWSSystemExitHelper.java

@@ -7,6 +7,7 @@
 import com.amazonaws.services.apigatewaymanagementapi.model.GoneException;
 import java.util.logging.Handler;
 import java.util.logging.Logger;
+import org.code.protocol.JavabuilderContext;
 
 public class AWSSystemExitHelper implements SystemExitHelper {
   private final String connectionId;
@@ -19,8 +20,10 @@ public AWSSystemExitHelper(String connectionId, AmazonApiGatewayManagementApi ap
 
   @Override
   public void exit(int status) {
-    PerformanceTracker.getInstance().trackInstanceEnd();
-    PerformanceTracker.getInstance().logPerformance();
+    PerformanceTracker performanceTracker =
+        (PerformanceTracker) JavabuilderContext.getInstance().get(PerformanceTracker.class);
+    performanceTracker.trackInstanceEnd();
+    performanceTracker.logPerformance();
     this.cleanUpResources();
     System.exit(status);
   }

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/CodeBuilderRunnable.java

@@ -34,7 +34,10 @@ private void executeCodeBuilder() throws JavabuilderException, InternalFacingExc
     UserProjectFiles validationFiles = fileLoader.getValidation();
     CodeBuilder codeBuilder =
         new CodeBuilder(
-            GlobalProtocol.getInstance(), userProjectFiles, validationFiles, this.tempFolder);
+            JavabuilderContext.getInstance().getGlobalProtocol(),
+            userProjectFiles,
+            validationFiles,
+            this.tempFolder);
     switch (this.executionType) {
       case COMPILE_ONLY:
         codeBuilder.buildUserCode(this.compileList);

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/CodeExecutionManager.java

@@ -23,7 +23,6 @@ public class CodeExecutionManager {
   private final ExecutionType executionType;
   private final List<String> compileList;
   private final TempDirectoryManager tempDirectoryManager;
-  private final LifecycleNotifier lifecycleNotifier;
   private final ContentManager contentManager;
   private final SystemExitHelper systemExitHelper;
   private final CodeBuilderRunnableFactory codeBuilderRunnableFactory;
@@ -53,7 +52,6 @@ public CodeExecutionManager(
       List<String> compileList,
       TempDirectoryManager tempDirectoryManager,
       ContentManager contentManager,
-      LifecycleNotifier lifecycleNotifier,
       SystemExitHelper systemExitHelper) {
     this(
         fileLoader,
@@ -62,7 +60,6 @@ public CodeExecutionManager(
         executionType,
         compileList,
         tempDirectoryManager,
-        lifecycleNotifier,
         contentManager,
         systemExitHelper,
         new CodeBuilderRunnableFactory());
@@ -75,7 +72,6 @@ public CodeExecutionManager(
       ExecutionType executionType,
       List<String> compileList,
       TempDirectoryManager tempDirectoryManager,
-      LifecycleNotifier lifecycleNotifier,
       ContentManager contentManager,
       SystemExitHelper systemExitHelper,
       CodeBuilderRunnableFactory codeBuilderRunnableFactory) {
@@ -85,7 +81,6 @@ public CodeExecutionManager(
     this.executionType = executionType;
     this.compileList = compileList;
     this.tempDirectoryManager = tempDirectoryManager;
-    this.lifecycleNotifier = lifecycleNotifier;
     this.contentManager = contentManager;
     this.systemExitHelper = systemExitHelper;
     this.codeBuilderRunnableFactory = codeBuilderRunnableFactory;
@@ -125,8 +120,10 @@ public void shutDown() {
    */
   private void onPreExecute() throws InternalServerException {
     // Create the Global Protocol instance
-    GlobalProtocol.create(
-        this.outputAdapter, this.inputAdapter, this.lifecycleNotifier, this.contentManager);
+    GlobalProtocol protocolInstance =
+        new GlobalProtocol(
+            this.outputAdapter, new InputHandler(this.inputAdapter), this.contentManager);
+    JavabuilderContext.getInstance().register(GlobalProtocol.class, protocolInstance);
 
     // Create temp folder
     try {
@@ -138,8 +135,7 @@ private void onPreExecute() throws InternalServerException {
     // Save System in/out and replace with custom in/out
     this.systemInputStream = System.in;
     this.systemOutputStream = System.out;
-    this.overrideInputStream =
-        new InputRedirectionStream(GlobalProtocol.getInstance().getInputHandler());
+    this.overrideInputStream = new InputRedirectionStream(protocolInstance.getInputHandler());
     this.overrideOutputStream = new OutputPrintStream(this.outputAdapter);
     System.setOut(this.overrideOutputStream);
     System.setIn(this.overrideInputStream);
@@ -148,15 +144,13 @@ private void onPreExecute() throws InternalServerException {
 
   /**
    * Post-execution steps: 1) Notify listeners, 2) clean up global resources, 3) clear temporary
-   * folder, 4) close custom in/out streams, 5) Replace System.in/out with original in/out, 6)
-   * Destroy Global Protocol
+   * folder, 4) close custom in/out streams, 5) Replace System.in/out with original in/out
    */
   private void onPostExecute() {
     // Notify user and listeners
     LambdaUtils.safelySendMessage(
         this.outputAdapter, new StatusMessage(StatusMessageKey.EXITED), false);
-    this.lifecycleNotifier.onExecutionEnded();
-    GlobalProtocol.getInstance().cleanUpResources();
+    JavabuilderContext.getInstance().onExecutionEnded();
     try {
       // Close custom input/output streams
       this.overrideInputStream.close();
@@ -170,10 +164,9 @@ private void onPostExecute() {
       LoggerUtils.logTrackingException(e);
       this.systemExitHelper.exit(TEMP_DIRECTORY_CLEANUP_ERROR_CODE);
     } finally {
-      // Replace System in/out with original System in/out and destroy Global Protocol
+      // Replace System in/out with original System in/out
       System.setIn(this.systemInputStream);
       System.setOut(this.systemOutputStream);
-      GlobalProtocol.destroy();
       this.isInitialized = false;
     }
   }

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/JavaRunner.java

@@ -6,10 +6,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import org.code.javabuilder.util.JarUtils;
-import org.code.protocol.JavabuilderException;
-import org.code.protocol.OutputAdapter;
-import org.code.protocol.StatusMessage;
-import org.code.protocol.StatusMessageKey;
+import org.code.protocol.*;
 
 /** The class that executes the student's code */
 public class JavaRunner {
@@ -93,11 +90,13 @@ private boolean run(
             classLoaderUrls, JavaRunner.class.getClassLoader(), classNames, permissionLevel);
 
     boolean runResult;
-    PerformanceTracker.getInstance().trackUserCodeStart();
+    PerformanceTracker performanceTracker =
+        (PerformanceTracker) JavabuilderContext.getInstance().get(PerformanceTracker.class);
+    performanceTracker.trackUserCodeStart();
     try {
       runResult = runner.run(urlClassLoader);
     } finally {
-      PerformanceTracker.getInstance().trackUserCodeEnd();
+      performanceTracker.trackUserCodeEnd();
     }
 
     try {