Add files via upload

Author: Philipp Gersch

com/devkev/devscript/nativecommands/NativeLibrary.java

@@ -19,7 +19,7 @@
 import com.devkev.devscript.raw.Library;
 import com.devkev.devscript.raw.Output;
 import com.devkev.devscript.raw.Process;
-import com.devkev.devscript.raw.Process.GeneratedLibrary;
+import com.devkev.devscript.raw.Process.HookedLibrary;
 import com.devkev.devscript.raw.ApplicationBuilder.Type;
 
 public class NativeLibrary extends Library {
@@ -153,38 +153,69 @@ public Object execute(Object[] args, Process application, Block block) throws Ex
 					}
 				},
 
-				new Command("exec", "string", "Executes a shell command") {
+				new Command("exec", "string", "Executes a shell command. Output only and limited to one command.") {
 					public Object execute(Object[] args, Process application, Block block) throws Exception {
 					String OS = System.getProperty("os.name", "generic").toLowerCase();
 
 					if ((OS.indexOf("mac") >= 0) || (OS.indexOf("darwin") >= 0)) {
 				    	//mac
 						ProcessBuilder builder = new ProcessBuilder("/bin/bash", "-c", args[0].toString());
 						java.lang.Process process = builder.start();
+						
 						BufferedReader reader =  new BufferedReader(new InputStreamReader(process.getInputStream()));
 						String line = null;
 						while ( (line = reader.readLine()) != null) {
 							application.log(line, true);
 						}
+						reader.close();
+
+						BufferedReader errorReader =  new BufferedReader(new InputStreamReader(process.getErrorStream()));
+						line = null;
+						while ( (line = errorReader.readLine()) != null) {
+							application.log(line, true);
+						}
+						errorReader.close();
+						process.destroy();
 
 					} else if (OS.indexOf("win") >= 0) {
 						//windows
 						ProcessBuilder builder = new ProcessBuilder("cmd", "/c", args[0].toString());
 						java.lang.Process process = builder.start();
+
 						BufferedReader reader =  new BufferedReader(new InputStreamReader(process.getInputStream()));
 						String line = null;
 						while ( (line = reader.readLine()) != null) {
 							application.log(line, true);
 						}
+						reader.close();
+
+						BufferedReader errorReader =  new BufferedReader(new InputStreamReader(process.getErrorStream()));
+						line = null;
+						while ( (line = errorReader.readLine()) != null) {
+							application.log(line, true);
+						}
+						errorReader.close();
+						process.destroy();
+						
 					} else if (OS.indexOf("nux") >= 0) {
 						//linux
 						ProcessBuilder builder = new ProcessBuilder("/bin/bash", "-c", args[0].toString());
 						java.lang.Process process = builder.start();
+						
 						BufferedReader reader =  new BufferedReader(new InputStreamReader(process.getInputStream()));
 						String line = null;
 						while ( (line = reader.readLine()) != null) {
 							application.log(line, true);
 						}
+						reader.close();
+
+						BufferedReader errorReader =  new BufferedReader(new InputStreamReader(process.getErrorStream()));
+						line = null;
+						while ( (line = errorReader.readLine()) != null) {
+							application.log(line, true);
+						}
+						errorReader.close();
+						process.destroy();
 
 					} else application.error("Failed to determine operating system");
 						return null;
@@ -716,7 +747,7 @@ public Object execute(Object[] args, Process application, Block block) throws Ex
 							application.log("onexit = {};  Fires when the application is finished. Useful for closing sockets etc.", true);
 							application.log("", true);
 							int maxLength = 0;
-							for(GeneratedLibrary lib : application.getLibraries()) {
+							for(HookedLibrary lib : application.getLibraries()) {
 								application.log("\nLIBRARY: '" + lib.name + "' (" + lib.commands.length + (lib.commands.length > 1 ? " commands)\n" : " command)\n"), true);
 								for(Command c : lib.commands) {
 									String example = "";
@@ -764,6 +795,9 @@ public Object execute(Object[] args, Process application, Block block) throws Ex
 							Class<?> pluginClass = loader.loadClass("CustomLibrary");
 
 							lib = (Library) pluginClass.getConstructor().newInstance();
+							lib.bound = application;
+							lib.scriptImport(application);
+							
 						} catch(Exception e) {
 							application.kill(block, "Java error occurred, while importing library: " + e.toString());
 							return null;
@@ -900,4 +934,9 @@ public Object execute(Object[] args, Process application, Block block) throws Ex
 		};
 	}
 
+	@Override
+	public void scriptImport(Process process) {}
+
+	@Override
+	public void scriptExit(Process process, int exitCode, String errorMessage) {}
 }

com/devkev/devscript/raw/ConsoleMain.java

@@ -9,7 +9,7 @@
 import com.devkev.gui.Window;
 
 /**@author Philipp Gersch
- * @version 1.8.2 (stable)
+ * @version 1.9.6 (stable)
  * Valid arguments are: <br>-e or --execute [some code] - Executes the String<br>
  * -f or --file [path] - Reads the file and executes the code from it.<br>
  * If no argument was passed, the default Editor GUI will open.*/

com/devkev/devscript/raw/Library.java

@@ -4,25 +4,42 @@
 
 public abstract class Library {
 
-	public final String COMPATIBLE_VERSION = "1.9.1";
+	public final String COMPATIBLE_VERSION = "1.10.0";
     private final ArrayList<Command> collection = new ArrayList<Command>();
     private String name = "";
 
+    public Process bound;
+    
     public abstract Command[] createLib();
 
     public Library(String name) {
     	this.name = name;
     	Command[] lib = createLib();
     	if(lib != null) addCommand(lib);
     }
+    
+    /**Called once when the library is initialized and the "import" command is called at script runtime.*/
+    public abstract void scriptImport(Process process);
 
-
+    /**Called when the JVM exits or the script finished
+     * Exit codes: 0 = ok, 1 = error*/
+    public abstract void scriptExit(Process process, int exitCode, String errorMessage);
+    
+    
     public static final Library merge(String mergedName, Library... lib) {
         Library merge = new Library(mergedName) {
             @Override
             public Command[] createLib() {
                 return null;
             }
+
+			@Override
+			public void scriptImport(Process process) {
+			}
+
+			@Override
+			public void scriptExit(Process process, int exitCode, String errorMessage) {
+			}
         };
         for(Library l : lib) merge.collection.addAll(l.collection);
         return merge;
@@ -47,7 +64,24 @@ public final String getName() {
     public String toString() {
     	return name;
     }
-
+    
+    /**Manually executes a function while the process is running<br>
+     * The function needs to be in the main block.*/
+    public void executeEventFunction(String functionName, Object ... variables) throws IllegalAccessError {
+    	if(bound != null) {
+    		if(bound.isRunning()) {
+    			Object obj = bound.getVariable(functionName, null);
+    			if(obj != null) {
+    				if(obj instanceof Block) {
+    					Block b = (Block) obj;
+    					bound.executeBlock(b, true, variables);
+    					
+    				} else throw new IllegalAccessError("Variable " + functionName + " is not a function!");
+    			} else throw new IllegalAccessError("Event funtion with the name " + functionName + " not registered!");
+    		} else throw new IllegalAccessError("Process not running!");
+    	} else throw new IllegalAccessError("Library was not added to any processes!");
+    }
+    
     public final boolean removeCommand(String commandName) {
         for(Command c : collection) {
             if(c.name.equals(commandName)) {

com/devkev/devscript/raw/Process.java

@@ -14,7 +14,7 @@ public class Process {
 
 	private static long process_id = 0L;
 
-	private ArrayList<GeneratedLibrary> libraries = new ArrayList<GeneratedLibrary>();
+	private ArrayList<HookedLibrary> libraries = new ArrayList<HookedLibrary>();
 	private ArrayList<Output> output = new ArrayList<Output>(1); 
 	private ArrayList<Variable> variables = new ArrayList<Variable>(5);
 	private ApplicationListener listener;
@@ -33,7 +33,7 @@ public class Process {
 
 	public long maxRuntime = 0; //Runtime in ms. If < 0, runtime is infinite
 	private long currentChar = 0;
-	public final String version = "1.9.1"; 
+	public final String version = "1.9.6"; 
 
 	/**The file, the script is executed from. May be null. Just useful for some Native commands*/
 	public File file = null;
@@ -46,11 +46,14 @@ public class Process {
 //	public volatile int execution_time = 0;
 //	public volatile float average_commands_per_sec = 0;
 
-	public class GeneratedLibrary {
+	public class HookedLibrary {
+		
 		public final Command[] commands;
 		public final String name;
+		public final Library lib;
 
-		public GeneratedLibrary(Library library) {
+		public HookedLibrary(Library library) {
+			this.lib = library;
 			this.commands = library.createLib();
 			this.name = library.getName();
 		}
@@ -94,9 +97,20 @@ boolean setValue(Object value, boolean ignoreCheck) {
 	 * If you don't want these native commands, call {@link Process#clearLibraries()} before adding your custom ones*/
 	public Process(boolean useCache) {
 		includeLibrary(new NativeLibrary());
+		
+		Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+			@Override
+			public void run() {
+				//Cant execute onexit function. Just execute the library listener
+				if(isRunning())
+					kill(main, "JVM killed");
+			}
+		}));
 	}
 
 	public Thread execute(String script, boolean newThread) {
+		finalizing = false;
+		
 		if(main != null) {
 			if(main.alive) {
 				warning("Java Environment was trying to start a new process, while its already running");
@@ -259,16 +273,8 @@ private void start(Block block) {
 //		}
 
 		//Searches for a variable called onexit with the type BLOCK
-	
-		
-		
-		if(block.equals(main) && listener != null) {
-			Object exitFunction = getVariable("onexit", null);
-
-			if(exitFunction != null) 
-				executeBlock(((Block) exitFunction), true);
-			
-			listener.done(main.exitCode); 
+		if(main == block) {
+			finalizeExit(0, "finished");
 		}
 		block.alive = false;
 		aliveBlocks.remove(block);
@@ -349,7 +355,7 @@ else if(!block.cached.isEmpty()) {
 			addToBlockCache = true;
 		}
 
-		for(GeneratedLibrary lib : libraries) {
+		for(HookedLibrary lib : libraries) {
 			for(Command c : lib.commands) {
 					if(c.commandNameOffset >= args.size()) continue;
 
@@ -648,9 +654,10 @@ public void setVariable(String name, Object value, boolean FINAL, boolean perman
 				if(stack1 <= stack2) {
 					if(!v.FINAL) {// || v.permanent) {
 						if(!v.setValue(value, getMain() == null)) kill(block, "Failed to assign type " + value + " to existing variable " + v.value);
-					} else if(getMain() != null) {
-						kill(block,"Tried to modyfy a constant: " + name);
 					}
+					//} else if(v.FINAL && getMain() != null) {
+					//	kill(block,"Tried to modyfy a constant: " + name);
+					//}
 					return;
 				}
 			}
@@ -679,7 +686,12 @@ public Object getVariable(String name, Block block) {
 	}
 
 	public void includeLibrary(Library lib) {
-		libraries.add(new GeneratedLibrary(lib));
+		if(lib.bound != null) {
+			if(lib.bound != this) {
+				throw new IllegalAccessError("This Library instance is already part of a different process. Try creating a new one: includeLibrary(new Library())");
+			}
+		}
+		libraries.add(new HookedLibrary(lib));
 	}
 
 	public void clearLibraries() {
@@ -719,12 +731,12 @@ public void warning(String message) {
 			});
 	}
 
-	public ArrayList<GeneratedLibrary> getLibraries() {
+	public ArrayList<HookedLibrary> getLibraries() {
 		return libraries;
 	}
 
-	public GeneratedLibrary getLibrary(String name) {
-		for(GeneratedLibrary lib : libraries) {
+	public HookedLibrary getLibrary(String name) {
+		for(HookedLibrary lib : libraries) {
 			if(lib.name.equals(name)) return lib;
 		}
 		return null;
@@ -739,15 +751,19 @@ public synchronized void kill(Block block, String errorMessage) {
 				block.currentCommand = block.currentCommand.subSequence(0, 10) + " ... " + block.currentCommand.substring(block.currentCommand.length() - 10, block.currentCommand.length());
 			}
 			if(!errorMessage.isEmpty()) error("Error at [" + block.currentCommand + "]> " + errorMessage);
-		
-			for(Block b : aliveBlocks) {
-				b.cached.clear();
-				b.alive = false;
-				b.interrupted = true;
+			
+			finalizeExit(1, errorMessage);
+			
+			for(int i = 0; i < aliveBlocks.size(); i++) {
+				aliveBlocks.get(i).cached.clear();
+				aliveBlocks.get(i).alive = false;
+				aliveBlocks.get(i).interrupted = true;
 			}
 			block.alive = false;
 			block.interrupted = true;
 			block.currentCommand = "";
+			
+			//System.out.println("Cleaning stack ...");
 		}
 
 		block.exitCode = Block.ERROR;
@@ -817,6 +833,7 @@ public String waitForInput() throws IOException {
 		return inputReader.readLine();
 	}
 
+	/**You can use {@link ApplicationInput}*/
 	public void setInput(InputStream input) {
 		if(input == null) return;
 
@@ -890,4 +907,30 @@ public static String findMatching(String string, int start, int skip, char openC
 		}
 		return null;
 	}
+	
+	boolean finalizing = false;
+	
+	private void finalizeExit(int exitCode, String errorMessage) {
+		if(!finalizing) return;
+		
+		finalizing = true;
+		
+		Object exitFunction = getVariable("onexit", null);
+		
+		if(exitFunction != null) 
+			executeBlock(((Block) exitFunction), true, exitCode, errorMessage);
+		
+		for(HookedLibrary lib : libraries) {
+			lib.lib.scriptExit(this, exitCode, errorMessage);
+		}
+	}
+	
+	@Override
+	protected void finalize() throws Throwable {
+		finalizeExit(1, "JVM Killed");
+		
+		if(listener != null) {
+			listener.done(main.exitCode); 
+		}
+	}
 }