zcatalyst-cli 1.17.5 → 1.18.0-beta.0

package/lib/shell/dependencies/invoker/cron/java/JavacronInvoker.java

@@ -14,6 +14,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
@@ -76,10 +79,22 @@ public class JavacronInvoker {
 		return stringWriter.toString();
 	}
 
+	private static HashMap<String, Object> jsonToMap(Object ob) throws Exception {
+		if(ob instanceof String) {
+			return jsonToMap((String) ob);
+		}
+		
+		if (ob instanceof JSONObject) {
+			return jsonToMap((JSONObject) ob);
+		} 
+		throw new Exception("Unexpected json input");
+	}
 	private static HashMap<String, Object> jsonToMap(String t) throws Exception {
+		return jsonToMap(new JSONObject(t));
+	}
+	private static HashMap<String, Object> jsonToMap(JSONObject jObject) throws Exception {
 
 		HashMap<String, Object> map = new HashMap<String, Object>();
-		JSONObject jObject = new JSONObject(t);
 		Iterator<?> keys = jObject.keys();
 
 		while (keys.hasNext()) {
@@ -91,18 +106,33 @@ public class JavacronInvoker {
 		return map;
 	}
 
-	private static void writeResponse(String response, String invokerDir) throws Exception {
+	private static void writeResponse(String response, Integer status, String invokerDir) throws Exception {
+		// write response data
 		String responseFilePath = Paths.get(invokerDir, "../user_res_body").toString();
+
 		BufferedWriter responseWriter = new BufferedWriter(new FileWriter(responseFilePath));
 		responseWriter.write(response);
 		responseWriter.close();
+
+		// write response meta
+		String metaFilePath = Paths.get(invokerDir, "../user_meta.json").toString();
+
+		BufferedWriter metaWriter = new BufferedWriter(new FileWriter(metaFilePath));
+		JSONObject metaJson = new JSONObject();
+		metaJson.put("statusCode", status);
+		metaWriter.write(new JSONObject().put("response", metaJson).toString());
+		metaWriter.close();
 	}
 
 	private static void throwAndExit(Exception err, int exitCode, String invokerDir) {
 		try {
 			String sStackTrace = getStackTraceAsString(err); // stack trace as a string
-			if (exitCode > 0) {
-				writeResponse(CRON_STATUS.FAILURE.name(), invokerDir);
+			if (exitCode == 532) {
+				writeResponse("CODE_EXCEPTION", exitCode, invokerDir);
+			} else if (exitCode == 500) {
+				writeResponse("INTERNAL_SERVER_ERROR", 500, invokerDir);
+			} else if (exitCode == 408) {
+				writeResponse("TIMEOUT", exitCode, invokerDir);
 			}
 			System.out.println(sStackTrace);
 		} catch (Exception e) {
@@ -198,7 +228,8 @@ public class JavacronInvoker {
 			String fnExePath = Paths.get(invokerDir, "../../", "functions", fnName).normalize().toString();
 
 			HashMap<String, Object> queryData = jsonToMap(args[2]);
-			HashMap<String, Object> projectData = jsonToMap(args[3]);
+			String projectData = args[3];
+			HashMap<String, Object> projectDataMap = jsonToMap(projectData);
 			HashMap<String, Object> authData = jsonToMap(args[4]);
 
 			File[] jarFiles = new File(fnExePath).listFiles(new FilenameFilter() {
@@ -219,7 +250,7 @@ public class JavacronInvoker {
 			URLClassLoader child = new URLClassLoader(URLs, JavacronInvoker.class.getClassLoader());
 			Class<?> cls = Class.forName(fnExeName, true, child);
 
-			setZCThreadLocalProject(projectData);
+			setZCThreadLocalProject(projectDataMap);
 			setZCThreadLocalAuth(authData);
 
 			DefaultCronRequest defaultCron = new DefaultCronRequest();
@@ -233,9 +264,10 @@ public class JavacronInvoker {
 				userData.put(key, value);
 			});
 
-			defaultCron.setCronDetails(null);
-			defaultCron.setRemainingExecutionCount(-1);
-			defaultCron.setCronParam(userData);
+			defaultCron.setCronDetails(userData.get("cron_details") != null ? (JSONObject) userData.get("cron_details") : null);
+			defaultCron.setRemainingExecutionCount(userData.get("remaining_count") != null ? (Integer) userData.get("remaining_count") : -1);
+			defaultCron.setCronParam(jsonToMap(userData.get("data")));
+			defaultCron.setProjectDetails(userData.get("project_details") != null ? (JSONObject) userData.get("project_details") : new JSONObject(projectData));
 			CronRequest cronRequest = defaultCron;
 
 			DefaultContext defaultContext = new DefaultContext(cls.getName(), 900000L);
@@ -243,16 +275,33 @@ public class JavacronInvoker {
 
 			Method runner = cls.getMethod("handleCronExecute", CronRequest.class, Context.class);
 			CRON_STATUS cronStatus = null;
-			try {
+
+			if(System.getenv("DEBUG").equals("false")) {
+				Timer executionTimer = new Timer(true);
+				executionTimer.schedule(new TimerTask() {
+					@Override
+					public void run() {
+						throwAndExit(new TimeoutException("function execution timeout"), 408, invokerDir);
+					}
+				}, defaultContext.getMaxExecutionTimeMs());
+			}
+
+			try {	
 				cronStatus = (CRON_STATUS) runner.invoke(cls.getDeclaredConstructor().newInstance(), cronRequest, context);
 			} catch (Exception e) {
-				throwAndExit(e, 2, invokerDir);
+				throwAndExit(e, 532, invokerDir);
+			}
+
+			if(cronStatus == null) {
+				writeResponse("UNINTENTIONAL_TERMINATION", 531, invokerDir);
+			} else {
+				int status = cronStatus.getStatus();
+				writeResponse(cronStatus.name(), status == 500 ? 530 : status, invokerDir);
 			}
 
-			writeResponse(cronStatus.name(), invokerDir);
 			System.exit(0);
 		} catch (Exception e) {
-			throwAndExit(e, 0, invokerDir);
+			throwAndExit(e, 500, invokerDir);
 		}
 	}
 }

package/lib/shell/dependencies/invoker/cron/node.mjs

@@ -13,9 +13,11 @@ const buildDir = JSON.parse(args[4]);
 
 const requestFile = path.join(buildDir, '.catalyst', 'user_req_body');
 const responseFile = path.join(buildDir, '.catalyst', 'user_res_body');
+const metaFile = path.join(buildDir, '.catalyst', 'user_meta.json');
 
-const writeToFile = (resp) => {
+const writeToFile = (resp, status) => {
 	fs.writeFileSync(responseFile, resp);
+	fs.writeFileSync(metaFile, JSON.stringify({ response: { statusCode: status } }));
 };
 
 let body = {};
@@ -29,27 +31,39 @@ if (fs.existsSync(requestFile)) {
 	}
 }
 
-const endTime = 15 * 60 * 1000 + Date.now();
+/**
+ * execution timeout 15 minutes
+ */
+const timeout = 15 * 60 * 1000;
+const endTime = timeout + Date.now();
+
+// exit on timeout
+process.env.DEBUG === 'false' &&
+	setTimeout(() => {
+		writeToFile('TIMEOUT', 408);
+		process.exit(0);
+	}, timeout);
 
 const context = {
 	catalystHeaders: Object.assign(projectJson, authJson),
-	getMaxExecutionTimeMs: () => 15 * 60 * 1000, // 15 mins
+	getMaxExecutionTimeMs: () => timeout,
 	getRemainingExecutionTimeMs: () => endTime - Date.now(),
 	closeWithSuccess: () => {
-		writeToFile('SUCCESS');
+		writeToFile('SUCCESS', 200);
 		process.exit(0);
 	},
 	closeWithFailure: () => {
-		writeToFile('FAILURE');
+		writeToFile('FAILURE', 530);
 		process.exit(0);
 	}
 };
+
 const cronReq = {
-	getCronParam: (KEY) => userData[KEY] || body[KEY],
-	getAllCronParam: () => (userData && Object.keys(userData).length > 0 ? userData : body),
-	getRemainingExecutionCount: () => -1,
-	getCronDetails: () => null,
-	getProjectDetails: () => projectJson
+	getCronParam: (KEY) => userData.data[KEY] || body[KEY],
+	getAllCronParams: () => (Object.keys(userData.data).length > 0 ? userData.data : body),
+	getRemainingExecutionCount: () => userData.remaining_count || -1,
+	getCronDetails: () => userData.cron_details || null,
+	getProjectDetails: () => userData.project_details || projectJson
 };
 
 import(pathToFileURL(target.index))
@@ -65,23 +79,13 @@ import(pathToFileURL(target.index))
 		} catch (e) {
 			// eslint-disable-next-line no-console
 			console.error(e);
-			writeToFile(
-				{
-					error: inspect(e)
-				},
-				{ response: { statusCode: 500 } }
-			);
-			process.exit(2);
+			writeToFile('CODE_EXCEPTION', 532);
+			process.exit(0);
 		}
 	})
 	.catch((e) => {
 		// eslint-disable-next-line no-console
 		console.error(e);
-		writeToFile(
-			{
-				error: inspect(e)
-			},
-			{ response: { statusCode: 500 } }
-		);
-		process.exit(2);
+		writeToFile('INTERNAL_SERVER_ERROR', 500);
+		process.exit(0);
 	});

package/lib/shell/dependencies/invoker/event/java/JavaeventInvoker.java

@@ -14,6 +14,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
@@ -91,19 +94,33 @@ public class JavaeventInvoker {
 		return map;
 	}
 
-	private static void writeResponse(String response, String invokerDir) throws Exception {
+	private static void writeResponse(String response, Integer status, String invokerDir) throws Exception {
+		// write response data
 		String responseFilePath = Paths.get(invokerDir, "../user_res_body").toString();
 
 		BufferedWriter responseWriter = new BufferedWriter(new FileWriter(responseFilePath));
 		responseWriter.write(response);
 		responseWriter.close();
+
+		// write response meta
+		String metaFilePath = Paths.get(invokerDir, "../user_meta.json").toString();
+
+		BufferedWriter metaWriter = new BufferedWriter(new FileWriter(metaFilePath));
+		JSONObject metaJson = new JSONObject();
+		metaJson.put("statusCode", status);
+		metaWriter.write(new JSONObject().put("response", metaJson).toString());
+		metaWriter.close();
 	}
 
 	private static void throwAndExit(Exception err, int exitCode, String invokerDir) {
 		try {
 			String sStackTrace = getStackTraceAsString(err); // stack trace as a string
-			if (exitCode > 0) {
-				writeResponse(EVENT_STATUS.FAILURE.name(), invokerDir);
+			if (exitCode == 532) {
+				writeResponse("CODE_EXCEPTION", exitCode, invokerDir);
+			} else if (exitCode == 500) {
+				writeResponse("INTERNAL_SERVER_ERROR", exitCode, invokerDir);
+			} else if (exitCode == 408) {
+				writeResponse("TIMEOUT", exitCode, invokerDir);
 			}
 			System.out.println(sStackTrace);
 		} catch (Exception e) {
@@ -250,16 +267,33 @@ public class JavaeventInvoker {
 
 			Method runner = cls.getMethod("handleEvent", EventRequest.class, Context.class);
 			EVENT_STATUS eventStatus = null;
+			
+			if(System.getenv("DEBUG").equals("false")) {
+				Timer executionTimer = new Timer(true);
+				executionTimer.schedule(new TimerTask() {
+					@Override
+					public void run() {
+						throwAndExit(new TimeoutException("function execution timeout"), 408, invokerDir);
+					}
+				}, defaultContext.getMaxExecutionTimeMs());
+			}
+
 			try {
 				eventStatus = (EVENT_STATUS) runner.invoke(cls.getDeclaredConstructor().newInstance(), eventRequest, context);
 			} catch (Exception e) {
-				throwAndExit(e, 2, invokerDir);
+				throwAndExit(e, 532, invokerDir);
 			}
 
-			writeResponse(eventStatus.name(), invokerDir);
+			if(eventStatus == null) {
+				writeResponse("UNINTENTIONAL_TERMINATION", 531, invokerDir);
+			} else {
+				int status = eventStatus.getStatus();
+				writeResponse(eventStatus.name(), status == 500 ? 530 : status, invokerDir);
+			}
+			
 			System.exit(0);
 		} catch (Exception e) {
-			throwAndExit(e, 0, invokerDir);
+			throwAndExit(e, 500, invokerDir);
 		}
 	}
 }

package/lib/shell/dependencies/invoker/event/node.mjs

@@ -12,23 +12,36 @@ const authJson = JSON.parse(args[3]);
 const buildDir = JSON.parse(args[4]);
 
 const responseFile = path.join(buildDir, '.catalyst', 'user_res_body');
+const metaFile = path.join(buildDir, '.catalyst', 'user_meta.json');
 
-const writeToFile = (resp) => {
+const writeToFile = (resp, status) => {
 	fs.writeFileSync(responseFile, resp);
+	fs.writeFileSync(metaFile, JSON.stringify({ response: { statusCode: status } }));
 };
 
-const endTime = 15 * 60 * 1000 + Date.now();
+/**
+ * execution timeout of 15 minutes
+ */
+const timeout = 15 * 60 * 1000;
+const endTime = timeout + Date.now();
+
+// exit on timeout
+process.env.DEBUG === 'false' &&
+	setTimeout(() => {
+		writeToFile('TIMEOUT', 408);
+		process.exit(0);
+	}, timeout);
 
 const context = {
 	catalystHeaders: Object.assign(projectJson, authJson),
-	getMaxExecutionTimeMs: () => 15 * 60 * 1000, // 15 mins
+	getMaxExecutionTimeMs: () => timeout,
 	getRemainingExecutionTimeMs: () => endTime - Date.now(),
 	closeWithSuccess: () => {
-		writeToFile('SUCCESS');
+		writeToFile('SUCCESS', 200);
 		process.exit(0);
 	},
 	closeWithFailure: () => {
-		writeToFile('FAILURE');
+		writeToFile('FAILURE', 530);
 		process.exit(0);
 	}
 };
@@ -72,13 +85,13 @@ import(pathToFileURL(target.index))
 		} catch (e) {
 			// eslint-disable-next-line no-console
 			console.error(e);
-			writeToFile('FAILURE');
-			process.exit(2);
+			writeToFile('CODE_EXCEPTION', 532);
+			process.exit(0);
 		}
 	})
 	.catch((e) => {
 		// eslint-disable-next-line no-console
 		console.error(e);
-		writeToFile('FAILURE');
-		process.exit(2);
+		writeToFile('INTERNAL_ERROR', 500);
+		process.exit(0);
 	});

package/lib/shell/dependencies/invoker/integ/java/JavaintegInvoker.java

@@ -189,13 +189,13 @@ public class JavaintegInvoker {
 					}
 
 				} catch (IOException e) {
-					throwAndExit(e, 1, invokerDir);
+					throwAndExit(e, 500, invokerDir);
 				}
 
 				try {
 					configJson = new JSONObject(sb.toString());
 				} catch (JSONException ex) {
-					throwAndExit(ex, 1, invokerDir);
+					throwAndExit(ex, 500, invokerDir);
 				}
 			}
 			ZCThreadLocal.putValue("CONFIG_JSON", configJson);
@@ -234,7 +234,7 @@ public class JavaintegInvoker {
 			try {
 				integResponse = (ZCIntegResponse) runner.invoke(cls.getDeclaredConstructor().newInstance(), integRequest);
 			} catch (Exception e) {
-				throwAndExit(e, 2, invokerDir);
+				throwAndExit(e, 532, invokerDir);
 			}
 			
 			if(integResponse == null) {

package/lib/shell/dependencies/invoker/integ/node.mjs

@@ -15,9 +15,9 @@ const buildDir = JSON.parse(args[4]);
 
 const responseFile = join(buildDir, '.catalyst', 'user_res_body');
 
-const writeAndExit = (resp, exitCode = 0) => {
+const writeAndExit = (resp) => {
 	writeFileSync(responseFile, JSON.stringify(resp));
-	process.exit(exitCode);
+	process.exit(0);
 };
 
 const integrationRequest = data || {};
@@ -38,7 +38,7 @@ const integrationResponse = {
 		) {
 			// eslint-disable-next-line no-console
 			console.error('Invalid response object: ', response);
-			return writeAndExit({ Status: 500 }, 2);
+			return writeAndExit({ Status: 500 });
 		}
 
 		const clean_response = response.buildResponse();
@@ -55,7 +55,7 @@ const integrationResponse = {
 				"Invalid value returned from function 'buildResponse()': ",
 				clean_response
 			);
-			return writeAndExit({ Status: 500 }, 2);
+			return writeAndExit({ Status: 500 });
 		}
 		return writeAndExit({
 			Status: clean_response.status,
@@ -78,11 +78,11 @@ import(pathToFileURL(target.index))
 		} catch (e) {
 			// eslint-disable-next-line no-console
 			console.error(e);
-			writeAndExit({ error: inspect(e) }, 2);
+			writeAndExit({ error: inspect(e) }, 0);
 		}
 	})
 	.catch((e) => {
 		// eslint-disable-next-line no-console
 		console.error(e);
-		writeAndExit({ error: inspect(e) }, 2);
+		writeAndExit({ error: inspect(e) });
 	});