Updates for REST server handling, add base-url config parameter

Author: mikera

convex-cli/src/main/java/convex/cli/peer/PeerStart.java

@@ -63,6 +63,11 @@ public class PeerStart extends APeerCommand {
 			description = "URL for the peer to set for other peers to use.")
 	private String url;
 
+	@Option(names = { "--base-url" }, 
+			description = "Base URL for REST API / web access.")
+	private String baseURL;
+
+	
 	@Option(names = { "--norest" }, description = "Disable REST srever.")
 	private boolean norest;
 
@@ -161,6 +166,7 @@ public void execute() throws InterruptedException {
 				config.put(Keywords.KEYPAIR, peerKey);
 				config.put(Keywords.STORE, store);
 				config.put(Keywords.URL, url);
+				config.put(Keywords.BASE_URL, baseURL);
 				if (genesisKey!=null) {
 					AccountKey gpk=genesisKey.getAccountKey();
 					State state=Init.createState(gpk,gpk,List.of(gpk));

convex-core/src/main/java/convex/core/cvm/Keywords.java

@@ -61,7 +61,8 @@ public class Keywords {
 
 	public static final Keyword BIND_ADDRESS = Keyword.intern("bind-address");
 	public static final Keyword URL = Keyword.intern("url");
-
+	public static final Keyword BASE_URL = Keyword.intern("base-url");
+	
 	// Account record keys
 	public static final Keyword SEQUENCE = Keyword.intern("sequence");
 	public static final Keyword KEY = Keyword.intern("key");
@@ -149,4 +150,5 @@ public class Keywords {
 
 
 
+
 }

convex-peer/src/main/java/convex/net/impl/netty/NettyInboundHandler.java

@@ -34,7 +34,7 @@ public NettyInboundHandler(Consumer<Message> receiveAction, Predicate<Message> r
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { // (4)
         // Close the connection when an exception is raised.
-		log.info("Closed Netty channel due to: "+cause.getMessage(),cause);
+		log.debug("Closed Netty channel due to: "+cause.getMessage(),cause);
         ctx.close();
     }
 

convex-restapi/src/main/java/convex/restapi/RESTServer.java

@@ -287,6 +287,17 @@ public HashMap<Keyword, Object> getConfig() {
 		return server.getConfig();
 	}
 
+	/**
+	 * Gets the base URL to use for external links. May be null
+	 * @return
+	 */
+	public String getBaseURL() {
+		Object o= server.getConfig().get(Keywords.BASE_URL);
+		if (o instanceof String) return (String)o;
+		return null;
+	}
+
+	
 	public static void main(String[] args) throws InterruptedException, ConfigException, LaunchException {
 		HashMap<Keyword,Object> config=new HashMap<>();
 		config.put(Keywords.KEYPAIR, AKeyPair.generate());