More build improvements. Added more options for what addresses to use for server sockets and mdns.

Author: brett-smith

README.md

@@ -11,8 +11,8 @@ I started this to help me understand the TNFS protocol, as I intend to implement
  * `tnfscp` or *TNFS Copy*. A `cp` like tool for simple copies of files and directories from the command line and scripts.
  * `tnfstp` or *TNFS Transfer Program*. An `ftp` like tool, but with advanced command line completion, highlighting and more. 
  * `tnfs-fuse`. Mount TNFS resources to your file system and access them easily in any program. Makes use of [libfuse](https://github.com/libfuse/libfuse).
- * `tnfsd`. An alternative server implementation with extra features such as mDNS support, UPnP support, and enhanced file systemm and security features, particularly when used with *TNFS Java* client tools.
- * `tnfs-web`. An alternative web front-end based on [elFinder](https://github.com/Studio-42/elFinder).
+ * `tnfsjd`. An alternative server implementation with extra features such as mDNS support, UPnP support, and enhanced file systemm and security features, particularly when used with *TNFS Java* client tools.
+ * `tnfsjd-web`. An alternative web front-end based on [elFinder](https://github.com/Studio-42/elFinder).
  * All server tools have a `Dockerfile` to build your own docker containers. 
 
 See [Releases](releases) for downloads. 

cli/pom.xml

@@ -44,7 +44,7 @@ tnfsfuse - Mount TNFS resource to local file system</description>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<release>22</release>
+					<release>24</release>
 					<annotationProcessorPaths>
 						<path>
 							<groupId>info.picocli</groupId>

client/pom.xml

@@ -43,16 +43,4 @@
 			<artifactId>slf4j-simple</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<release>17</release>
-					<testRelease>17</testRelease>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>

client/src/main/java/uk/co/bithatch/tnfs/client/DefaultTNFSMount.java

@@ -21,6 +21,7 @@
 package uk.co.bithatch.tnfs.client;
 
 import java.io.IOException;
+import java.net.SocketTimeoutException;
 
 import uk.co.bithatch.tnfs.lib.Command;
 import uk.co.bithatch.tnfs.lib.Message;
@@ -55,8 +56,13 @@ public TNFSMount build() throws IOException {
 
 	private DefaultTNFSMount(Builder bldr) throws IOException {
 		super(bldr); 
-		var rep = client.send(Command.MOUNT, Message.of(Command.MOUNT, new Command.Mount(bldr.path, username, password)));
-		sessionId = rep.mesage().connectionId();
+		try {
+			var rep = client.send(Command.MOUNT, Message.of(Command.MOUNT, new Command.Mount(bldr.path, username, password)));
+			sessionId = rep.mesage().connectionId();
+		}
+		catch(SocketTimeoutException ste) {
+			throw new IOException("No TNFS service responded to request.");
+		}
 	}
 
 	@Override

client/src/main/java/uk/co/bithatch/tnfs/client/TNFSClient.java

@@ -25,6 +25,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.SocketTimeoutException;
 import java.net.StandardSocketOptions;
 import java.nio.BufferUnderflowException;
 import java.nio.channels.DatagramChannel;
@@ -239,12 +240,17 @@ Message write(Message pkt) throws IOException, EOFException {
 				dchannel.receive(buf);
 
 			buf.flip();
-			var msg = Message.decode(buf);
-			if(msg.seq() == pkt.seq()) {
-				return msg;
+			if(buf.hasRemaining()) {
+				var msg = Message.decode(buf);
+				if(msg.seq() == pkt.seq()) {
+					return msg;
+				}
+				else {
+					throw new IllegalStateException(String.format("Out of sequence (newer) response, lost a message. Expected %d, got %d", pkt.seq(), msg.seq()));
+				}
 			}
 			else {
-				throw new IllegalStateException(String.format("Out of sequence (newer) response, lost a message. Expected %d, got %d", pkt.seq(), msg.seq()));
+				throw new SocketTimeoutException();
 			}
 		}
 		else if(channel instanceof SocketChannel tchannel) {

client/src/main/java/uk/co/bithatch/tnfs/client/TNFSMount.java

@@ -31,9 +31,9 @@
 import uk.co.bithatch.tnfs.lib.ModeFlag;
 import uk.co.bithatch.tnfs.lib.OpenFlag;
 import uk.co.bithatch.tnfs.lib.TNFSDirectory;
-import uk.co.bithatch.tnfs.lib.TNFSFileSystem;
+import uk.co.bithatch.tnfs.lib.TNFSFileAccess;
 
-public interface TNFSMount extends TNFSFileSystem {
+public interface TNFSMount extends TNFSFileAccess {
 
 	/**
 	 * List all the names of entries in the root of this mount. This is a convenience method

daemon/Dockerfile

@@ -34,11 +34,12 @@ RUN mvn -f $HOME/pom.xml clean package -Dbuild.native.daemon=true
 # Package stage
 #
 FROM debian:stable-slim 
-COPY --from=build /usr/app/daemon/target/tnfsd /app/tnfsd
+COPY --from=build /usr/app/daemon/target/tnfsjd /app/tnfsjd
 COPY --from=build /usr/app/daemon/target/tnfs-user /app/tnfs-user
-COPY --from=build /usr/app/daemon/src/main/docker/configuration /etc/tnfsd
+COPY --from=build /usr/app/daemon/src/main/docker/configuration /etc/tnfsjd
+COPY --from=build /usr/app/daemon/src/main/docker/public-files /public-files
 EXPOSE 16384
 EXPOSE 16384/udp
-VOLUME /data
-VOLUME /etc/tnfsd
-ENTRYPOINT /app/tnfsd -L INFO
+VOLUME /public-files
+VOLUME /configuration
+ENTRYPOINT /app/tnfsjd -L INFO -C /etc/tnfsjd -O /configuration

daemon/README.md

@@ -1,6 +1,6 @@
 # tnfs-java-daemon
 
-A ready-to-go TNFS server, `tnfsd`.
+A ready-to-go TNFS server, `tnfsjd`.
 
  * UDP and TCP connections.
  * [TNFS Java Extensions](../extensions).
@@ -17,15 +17,15 @@ There are a few different ways to run the daemon. See `--help` option for more i
 The are self-contained, pre-built binaries for a few platforms. If yours is one supported, just download the executables and run.
 
 ```
-/path/to/tnfsd --help
+/path/to/tnfsjd --help
 ```
 
 ### Download Cross Platform Jars
 
 If you have a JDK installed, you can just download the `.jar` builds and run them.
 
 ```
-java -jar /path/to/tnfsd.jar --help
+java -jar /path/to/tnfsjd.jar --help
 ```
 
 ### Run From Source
@@ -39,7 +39,7 @@ You probably only want to do this if you are working on tnfs-java itself. You wi
 The run the application by choosing the appropriate profile and supplying the `args` property.
 
 ```
-mvn exec:run -P tnfsd -Dargs="--help"
+mvn exec:run -P tnfsjd -Dargs="--help"
 ```
 
 ### Docker
@@ -78,12 +78,12 @@ By default, the daemon and it's tools expect configuration files to be in certai
 
 | OS | User | Location |
 | --- | --- | --- |
-| Linux | root / server | /etc/tnfsd |
-| Linux | standard users | $HOME/.configuration/tnfsd |
-| Windows | administrator / service | C:\\Program Files\\Common Files\\tnfsd |
-| Windows | standard users | %HOME%/AppData/Roaming\\tnfsd |
-| Other | administrator / service | /etc/tnfsd |
-| Other | standard users | $HOME/.tnfsd |
+| Linux | root / server | /etc/tnfsjd |
+| Linux | standard users | $HOME/.configuration/tnfsjd |
+| Windows | administrator / service | C:\\Program Files\\Common Files\\tnfsjd |
+| Windows | standard users | %HOME%/AppData/Roaming\\tnfsjd |
+| Other | administrator / service | /etc/tnfsjd |
+| Other | standard users | $HOME/.tnfsjd |
 
 If you wish to use configuration from any other directory, use the `-C` (or `--configuration`) argument with the daemon or any tools.
 

daemon/pom.xml

@@ -28,7 +28,7 @@
 		<groupId>uk.co.bithatch</groupId>
 		<artifactId>tnfs-java</artifactId>
 		<version>0.9.0-SNAPSHOT</version>
-		<relativePath>../</relativePath>
+		<relativePath>../</relativePath> 
 	</parent> 
 	<artifactId>tnfs-java-daemon</artifactId>
 	<name>Java TNFS - Daemon</name>
@@ -43,6 +43,11 @@
 			<artifactId>tnfs-java-server-extensions</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>tnfs-java-daemonlib</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
@@ -51,10 +56,6 @@
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
         </dependency>
-        <dependency>
-		    <groupId>org.jmdns</groupId>
-		    <artifactId>jmdns</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.sshtools</groupId> 
 			<artifactId>porter</artifactId>
@@ -70,6 +71,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
+					<release>17</release>
+					<testRelease>17</testRelease>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>info.picocli</groupId>
@@ -86,13 +89,13 @@
 				<inherited>false</inherited>
 				<executions>
 					<execution>
-						<id>make-assembly-tnfsd</id>
+						<id>make-assembly-tnfsjd</id>
 						<phase>package</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<finalName>tnfsd</finalName>
+							<finalName>tnfsjd</finalName>
 							<archive>
 								<manifest>
 									<mainClass>uk.co.bithatch.tnfs.daemon.TNFSDaemon</mainClass>
@@ -168,15 +171,15 @@
 						<artifactId>native-maven-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>tnfsd-native-image</id>
+								<id>tnfsjd-native-image</id>
 								<goals>
 									<goal>build</goal>
 								</goals>
 								<phase>package</phase>
 								<configuration>
 									<mainClass>uk.co.bithatch.tnfs.daemon.TNFSDaemon</mainClass>
 									<skip>false</skip>
-									<imageName>tnfsd</imageName>
+									<imageName>tnfsjd</imageName>
 									<buildArgs>
 										<buildArg>--install-exit-handlers</buildArg>
                                         <buildArg>-march=compatibility</buildArg>
@@ -207,10 +210,10 @@
 
 		<!-- tnfscp -->
 		<profile>
-			<id>tnfsd</id>
+			<id>tnfsjd</id>
 			<activation>
 				<property>
-					<name>tnfsd</name>
+					<name>tnfsjd</name>
 				</property>
 			</activation>
 			<build>

daemon/src/main/docker/configuration/authentication.ini

@@ -4,5 +4,5 @@
 ;----------------------------------------
 ;[authentication]
 
-; Server Key - The servers key.
-; key = 
+	; Server Key - The servers key.
+	; key =