msg net tcp client req resp and file dir module added. some bug fixed

Author: bambooww

core/pom.xml

@@ -20,6 +20,12 @@
 		<output.directory>../_output</output.directory>
 	  </properties>
 
+<build>
+        <finalName>iottree-core</finalName>
+        <plugins>
+        </plugins>
+    </build>
+    
 	<dependencies>
 		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
 		<dependency>

core/src/main/java/org/iottree/core/msgnet/MNMsg.java

@@ -28,7 +28,13 @@ public class MNMsg implements IMNCxtPk
 
 	private String topic = null ;
 
-	private Object payload = null ; 
+	private Object payload = null ;
+	
+	/**
+	 * byte[] is special, it will not be packed into JSON
+	 * it is be used only for one connection call,
+	 */
+	private byte[] bytesArray = null ;
 
 	public MNMsg()
 	{
@@ -115,6 +121,7 @@ public Map<String,Object> getHeadsMap()
 		return heads ;
 	}
 
+	
 	public MNMsg asPayload(Object payload)
 	{
 		if(payload==null)
@@ -236,6 +243,21 @@ public String getPayloadStr()
 		return this.payload.toString() ;
 	}
 
+	
+	
+	public MNMsg asBytesArray(byte[] bs)
+	{
+		this.bytesArray = bs ;
+		return this ;
+	}
+	
+	public byte[] getBytesArray()
+	{
+		return this.bytesArray ;
+	}
+	
+	
+	
 	public JSONObject toJO()
 	{
 		JSONObject jo = new JSONObject() ;
@@ -248,6 +270,11 @@ public JSONObject toJO()
 		}
 
 		jo.putOpt("payload", payload) ;
+		
+		
+		if(this.bytesArray!=null)
+			jo.put("bytes_len",this.bytesArray.length) ;
+		
 		return jo ;
 	}
 

core/src/main/java/org/iottree/core/msgnet/modules/FileDir_Close.java

@@ -0,0 +1,70 @@
+package org.iottree.core.msgnet.modules;
+
+import org.iottree.core.msgnet.MNConn;
+import org.iottree.core.msgnet.MNMsg;
+import org.iottree.core.msgnet.MNNodeMid;
+import org.iottree.core.msgnet.RTOut;
+import org.json.JSONObject;
+
+public class FileDir_Close  extends MNNodeMid
+{
+	
+	@Override
+	public int getOutNum()
+	{
+		return 1;
+	}
+
+	@Override
+	public String getTP()
+	{
+		return "file_dir_close";
+	}
+
+	@Override
+	public String getTPTitle()
+	{
+		return g("file_dir_close");
+	}
+
+	@Override
+	public String getColor()
+	{
+		return "#e7b686";
+	}
+
+	@Override
+	public String getIcon()
+	{
+		return "\\uf1c3";
+	}
+
+	@Override
+	public boolean isParamReady(StringBuilder failedr)
+	{
+		return true;
+	}
+
+	@Override
+	public JSONObject getParamJO()
+	{
+		return null;
+	}
+
+	@Override
+	protected void setParamJO(JSONObject jo)
+	{
+	}
+
+
+	@Override
+	protected RTOut RT_onMsgIn(MNConn in_conn, MNMsg msg) throws Exception
+	{
+		FileDir_M mnm = (FileDir_M)this.getOwnRelatedModule() ;
+		FileDir_M.FileItem fi = mnm.getOpenedFile() ;
+		if(fi==null)
+			return null ;
+		mnm.RT_closeFile();
+		return RTOut.createOutAll(new MNMsg().asPayload(fi.file.getAbsoluteFile())) ;
+	}
+}

core/src/main/java/org/iottree/core/msgnet/modules/FileDir_M.java

@@ -0,0 +1,181 @@
+package org.iottree.core.msgnet.modules;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.iottree.core.msgnet.MNModule;
+import org.iottree.core.store.SourceJDBC;
+import org.iottree.core.util.Convert;
+import org.json.JSONObject;
+
+public class FileDir_M extends MNModule
+{
+	public static class FileItem implements Closeable
+	{
+		File file = null ;
+		
+		FileInputStream inputs = null ;
+		
+		FileOutputStream outputs = null ;
+		
+		public FileItem(File f)
+		{
+			this.file = f ;
+		}
+		
+		private synchronized OutputStream getOutputS() throws FileNotFoundException
+		{
+			if(outputs!=null)
+				return outputs ;
+			File pdir = file.getParentFile() ;
+			if(!pdir.exists())
+				pdir.mkdirs() ;
+			
+			return outputs = new FileOutputStream(file) ;
+		}
+		
+		public void write(byte[] bs) throws IOException
+		{
+			write(bs,0,bs.length) ;
+		}
+		
+		public void write(byte[] bs,int offset,int len) throws IOException
+		{
+			OutputStream os = getOutputS() ;
+			os.write(bs,offset,len);
+		}
+
+		@Override
+		public void close() throws IOException
+		{
+			if(inputs!=null)
+			{
+				try
+				{
+					inputs.close();
+					inputs = null ;
+				}
+				catch(Exception ee)
+				{}
+			}
+			
+			if(outputs!=null)
+			{
+				try
+				{
+					outputs.close();
+					outputs = null ;
+				}
+				catch(Exception ee)
+				{}
+			}
+		}
+	}
+	
+	String dirPath = null ;
+	
+	@Override
+	public String getTP()
+	{
+		return "file_dir";
+	}
+
+	@Override
+	public String getTPTitle()
+	{
+		return g("file_dir");
+	}
+
+	@Override
+	public String getColor()
+	{
+		return "#e7b686";
+	}
+
+	@Override
+	public String getIcon()
+	{
+		return "\\uf07b";
+	}
+	
+	@Override
+	public String getPmTitle()
+	{
+		if(Convert.isNullOrEmpty(this.dirPath))
+			return "no dir path set";
+		return this.dirPath ;
+	}
+
+	@Override
+	public boolean isParamReady(StringBuilder failedr)
+	{
+		if(Convert.isNullOrEmpty(this.dirPath))
+		{
+			failedr.append("no dir path set") ;
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public JSONObject getParamJO()
+	{
+		JSONObject jo = new JSONObject() ;
+		jo.putOpt("dir_path", this.dirPath) ;
+		return jo;
+	}
+
+	@Override
+	protected void setParamJO(JSONObject jo)
+	{
+		this.dirPath = jo.optString("dir_path") ;
+	}
+	
+	public File getDirBase()
+	{
+		if(Convert.isNullOrEmpty(this.dirPath))
+			return null ;
+		return new File(this.dirPath) ;
+	}
+	
+	private transient FileItem curOpenFile = null ;
+
+	FileItem RT_openFile(String sub_fp,StringBuilder failedr) throws IOException
+	{
+		File dirb = this.getDirBase() ;
+		if(dirb==null)
+		{
+			failedr.append("no dir base in FileDir_M") ;
+			return null;
+		}
+		File f = new File(dirb,sub_fp) ;
+		if(curOpenFile!=null)
+			curOpenFile.close();
+		
+		return curOpenFile = new FileItem(f) ;
+	}
+	
+	FileItem getOpenedFile()
+	{
+		return this.curOpenFile ;
+	}
+	
+	void RT_closeFile() throws IOException
+	{
+		try
+		{
+			if(curOpenFile!=null)
+				curOpenFile.close();
+		}
+		finally
+		{
+			curOpenFile = null ;
+		}
+	}
+}