Merge pull request #14 from kadampabookings/prod

Mid-February work

Author: salmonb

pom.xml

@@ -35,7 +35,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <configuration>
-                        <skippedModules>webfx-stack-authn-login-ui-gateway-webviewbased-gwt,webfx-stack-authn-login-ui-gateway-webviewbased-openjfx,webfx-stack-com-bus-json-client-websocket-java,webfx-stack-com-bus-json-client-websocket-web,webfx-stack-com-websocket-gwt-j2cl,webfx-stack-com-websocket-java</skippedModules>
+                        <skippedModules>webfx-stack-authn-login-ui-gateway-webviewbased-gwt,webfx-stack-authn-login-ui-gateway-webviewbased-openjfx,webfx-stack-com-bus-json-client-websocket-java,webfx-stack-com-bus-json-client-websocket-web,webfx-stack-com-websocket-gwt-j2cl-native,webfx-stack-com-websocket-gwt-j2cl-sockjs,webfx-stack-com-websocket-java</skippedModules>
                     </configuration>
                 </plugin>
             </plugins>
@@ -98,7 +98,8 @@
         <module>webfx-stack-com-bus-simple</module>
         <module>webfx-stack-com-serial</module>
         <module>webfx-stack-com-websocket</module>
-        <module>webfx-stack-com-websocket-gwt-j2cl</module>
+        <module>webfx-stack-com-websocket-gwt-j2cl-native</module>
+        <module>webfx-stack-com-websocket-gwt-j2cl-sockjs</module>
         <module>webfx-stack-com-websocket-java</module>
         <module>webfx-stack-db-datascope</module>
         <module>webfx-stack-db-datasource</module>

webfx-stack-authn-login-ui-gateway-password-plugin/pom.xml

@@ -45,6 +45,12 @@
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>dev.webfx</groupId>
+            <artifactId>webfx-extras-util-control</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-extras-util-scene</artifactId>

webfx-stack-authn-login-ui-gateway-password-plugin/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/password/UILoginView.java

@@ -3,6 +3,8 @@
 
 import dev.webfx.extras.panes.ScalePane;
 import dev.webfx.extras.styles.bootstrap.Bootstrap;
+import dev.webfx.extras.util.control.Controls;
+import dev.webfx.extras.util.control.HtmlInputAutocomplete;
 import dev.webfx.platform.uischeduler.UiScheduler;
 import dev.webfx.platform.windowlocation.WindowLocation;
 import dev.webfx.stack.authn.AuthenticateWithUsernamePasswordCredentials;
@@ -86,10 +88,11 @@ private void initialiseMainVBox(VBox container) {
         emailTextField = newMaterialTextField(PasswordI18nKeys.Email);
         VBox.setMargin(emailTextField, new Insets(40, 0, 0, 0));
         emailTextField.setPrefWidth(370);
-
+        Controls.setHtmlInputTypeAndAutocompleteToEmail(emailTextField);
 
         passwordFieldAndMessageVbox = new VBox(10);
         passwordField = newMaterialPasswordField(PasswordI18nKeys.Password);
+        Controls.setHtmlInputAutocomplete(passwordField, HtmlInputAutocomplete.CURRENT_PASSWORD);
         passwordField.setPrefWidth(370);
         VBox.setMargin(passwordField, new Insets(15, 0, 0, 0));
 

webfx-stack-authn-login-ui-gateway-password-plugin/src/main/java/module-info.java

@@ -8,6 +8,7 @@
     requires javafx.graphics;
     requires webfx.extras.panes;
     requires webfx.extras.styles.bootstrap;
+    requires webfx.extras.util.control;
     requires webfx.extras.util.scene;
     requires webfx.kit.util;
     requires webfx.platform.uischeduler;

webfx-stack-com-bus-json-client-websocket/src/main/java/dev/webfx/stack/com/bus/spi/impl/json/client/websocket/WebSocketBus.java

@@ -54,19 +54,18 @@ public class WebSocketBus extends JsonClientBus {
         ConfigLoader.onConfigLoaded("webfx.stack.com.client.websocket", config -> {
             WebSocketBusOptions options = new WebSocketBusOptions();
             options.applyConfig(config);
-            //options.turnUnsetPropertiesToDefault(); // should be already done by the platform but just in case
+            options.turnUnsetPropertiesToDefault();
             onOptions(options);
         });
     }
 
     protected void onOptions(WebSocketBusOptions options) {
         String serverUri =
-                (options.getProtocol() == WebSocketBusOptions.Protocol.WS ? "ws" : "http")
-                        + (Booleans.isTrue(options.isServerSSL()) ? "s://" : "://")
+                        (Booleans.isTrue(options.isServerSSL()) ? "wss://" : "ws://")
                         + options.getServerHost()
                         + ':' + options.getServerPort()
                         + '/' + options.getBusPrefix()
-                        + (options.getProtocol() == WebSocketBusOptions.Protocol.WS ? "/websocket" : "");
+                        + '/' + options.getWebsocketSuffix();
         internalWebSocketHandler = new WebSocketListener() {
             @Override
             public void onOpen() {

webfx-stack-com-bus-json-client-websocket/src/main/java/dev/webfx/stack/com/bus/spi/impl/json/client/websocket/WebSocketBusOptions.java

@@ -1,7 +1,6 @@
 package dev.webfx.stack.com.bus.spi.impl.json.client.websocket;
 
 import dev.webfx.platform.ast.ReadOnlyAstObject;
-import dev.webfx.platform.console.Console;
 import dev.webfx.platform.util.Objects;
 import dev.webfx.stack.com.bus.BusOptions;
 
@@ -10,26 +9,20 @@
  */
 public final class WebSocketBusOptions extends BusOptions {
 
-    public enum Protocol {
-        WS,   // Web Socket protocol, to be used by non web applications (Jre, Android, iOS)
-        HTTP  // HTTP protocol, to be used by web applications running in the browser (GWT, TeaVM)
-    }
-
-    private Protocol protocol;
     private Boolean serverSSL;
     private String serverHost;
     private String serverPort;
-
+    private String websocketSuffix;
     private Integer pingInterval;
 
     private ReadOnlyAstObject socketOptions;
 
     @Override
     public WebSocketBusOptions turnUnsetPropertiesToDefault() {
-        protocol = Objects.coalesce(protocol, Protocol.WS);
         serverSSL = Objects.coalesce(serverSSL, Boolean.FALSE);
         serverHost = Objects.coalesce(serverHost, "localhost");
         serverPort = Objects.coalesce(serverPort, "80");
+        websocketSuffix = Objects.coalesce(websocketSuffix, "websocket");
         pingInterval = Objects.coalesce(pingInterval, 30_000);
         super.turnUnsetPropertiesToDefault();
         return this;
@@ -41,35 +34,11 @@ public WebSocketBusOptions applyConfig(ReadOnlyAstObject config) {
         serverSSL = config.getBoolean("serverSSL");
         serverHost = config.getString("serverHost");
         serverPort = config.getString("serverPort");
+        websocketSuffix = config.getString("websocketSuffix");
         pingInterval = config.getInteger("pingInterval");
-        String configProtocol = config.getString("protocol");
-        if (configProtocol != null) {
-            switch (configProtocol.toLowerCase()) {
-                case "https":
-                    serverSSL = true;
-                case "http":
-                    protocol = Protocol.HTTP;
-                    break;
-                case "wss":
-                    serverSSL = true;
-                case "ws":
-                    protocol = Protocol.WS;
-                    break;
-            }
-        }
-        if (protocol == null) {
-            Console.log("⚠️ Default WS protocol will be applied for WebSocket due to unrecognized protocol configuration value: " + configProtocol);
-            protocol = Protocol.WS;
-        }
-        return this;
-    }
-
-    public Protocol getProtocol() {
-        return protocol;
-    }
-
-    public WebSocketBusOptions setProtocol(Protocol protocol) {
-        this.protocol = protocol;
+        if (serverSSL == null)
+            serverSSL = "80".equals(serverPort);
+        socketOptions = config;
         return this;
     }
 
@@ -87,6 +56,10 @@ public WebSocketBusOptions setServerSSL(Boolean serverSSL) {
         return this;
     }
 
+    public Boolean isServerSSL() {
+        return serverSSL;
+    }
+
     public WebSocketBusOptions setServerPort(String serverPort) {
         this.serverPort = serverPort;
         return this;
@@ -96,19 +69,25 @@ public String getServerPort() {
         return serverPort;
     }
 
-    public Boolean isServerSSL() {
-        return serverSSL;
+    public WebSocketBusOptions setWebsocketSuffix(String websocketSuffix) {
+        this.websocketSuffix = websocketSuffix;
+        return this;
     }
 
-    public int getPingInterval() {
-        return pingInterval;
+    public String getWebsocketSuffix() {
+        return websocketSuffix;
     }
 
     public WebSocketBusOptions setPingInterval(Integer pingInterval) {
         this.pingInterval = pingInterval;
         return this;
     }
 
+    public int getPingInterval() {
+        return pingInterval;
+    }
+
+
     public ReadOnlyAstObject getSocketOptions() {
         return socketOptions;
     }

webfx-stack-com-bus/src/main/java/dev/webfx/stack/com/bus/BusOptions.java

@@ -10,20 +10,14 @@
 public class BusOptions {
 
     private String busPrefix;
-    private String clientBusAddressPrefix;
-    private String serverBusAddress;
 
     public BusOptions turnUnsetPropertiesToDefault() {
         busPrefix = Objects.coalesce(busPrefix, "eventbus");
-        clientBusAddressPrefix = Objects.coalesce(clientBusAddressPrefix, "client");
-        serverBusAddress = Objects.coalesce(serverBusAddress, "server");
         return this;
     }
 
     public BusOptions applyConfig(ReadOnlyAstObject config) {
         busPrefix = config.getString("busPrefix", busPrefix);
-        clientBusAddressPrefix = config.getString("clientBusAddressPrefix", clientBusAddressPrefix);
-        serverBusAddress = config.getString("serverBusAddress", serverBusAddress);
         return this;
     }
 

webfx-stack-com-websocket-gwt-j2cl/pom.xml renamed to webfx-stack-com-websocket-gwt-j2cl-native/pom.xml

@@ -11,7 +11,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>webfx-stack-com-websocket-gwt-j2cl</artifactId>
+    <artifactId>webfx-stack-com-websocket-gwt-j2cl-native</artifactId>
 
     <dependencies>
 
@@ -22,12 +22,12 @@
 
         <dependency>
             <groupId>com.google.elemental2</groupId>
-            <artifactId>elemental2-dom</artifactId>
+            <artifactId>elemental2-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.jsinterop</groupId>
-            <artifactId>jsinterop-annotations</artifactId>
+            <groupId>com.google.elemental2</groupId>
+            <artifactId>elemental2-dom</artifactId>
         </dependency>
 
         <dependency>

webfx-stack-com-websocket-gwt-j2cl-native/src/main/java/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/nativ/GwtJ2clNativeWebSocket.java

@@ -0,0 +1,65 @@
+package dev.webfx.stack.com.websocket.spi.impl.gwtj2cl.nativ;
+
+import dev.webfx.platform.ast.AST;
+import dev.webfx.stack.com.websocket.WebSocket;
+import dev.webfx.stack.com.websocket.WebSocketListener;
+import elemental2.core.ArrayBuffer;
+import elemental2.dom.Blob;
+import jsinterop.base.Js;
+
+/**
+ * @author Bruno Salmon
+ */
+final class GwtJ2clNativeWebSocket implements WebSocket {
+
+    private final elemental2.dom.WebSocket nativeWebSocket;
+
+    public GwtJ2clNativeWebSocket(elemental2.dom.WebSocket nativeWebSocket) {
+        this.nativeWebSocket = nativeWebSocket;
+    }
+
+    @Override
+    public void send(String data) {
+        nativeWebSocket.send(data);
+    }
+
+    @Override
+    public void close() {
+        nativeWebSocket.close();
+    }
+
+    @Override
+    public State getReadyState() {
+        int sockJsState = nativeWebSocket.readyState;
+        if (sockJsState == elemental2.dom.WebSocket.OPEN)
+            return State.OPEN;
+        if (sockJsState == elemental2.dom.WebSocket.CONNECTING)
+            return State.CONNECTING;
+        if (sockJsState == elemental2.dom.WebSocket.CLOSING)
+            return State.CLOSING;
+        if (sockJsState == elemental2.dom.WebSocket.CLOSED)
+            return State.CLOSED;
+        throw new IllegalStateException("Unrecognized readyState");
+    }
+
+    @Override
+    public void setListener(WebSocketListener listener) {
+        nativeWebSocket.onopen = e -> listener.onOpen();
+        nativeWebSocket.onmessage = e -> {
+            String dataType = Js.typeof(e.data);
+            if ("String".equals(dataType))
+                listener.onMessage(e.data.asString());
+            else if (e.data instanceof Blob) {
+                ((Blob) e.data).text().then(text -> {
+                    listener.onMessage(text);
+                    return null;
+                });
+            } else if (e.data instanceof ArrayBuffer) {
+                // TODO: implement this case
+            }
+        };
+        nativeWebSocket.onclose = e -> listener.onClose(AST.createObject().set("code", e.code).set("reason", e.reason));
+        nativeWebSocket.onerror = e -> listener.onError(e.toString());
+    }
+
+}

webfx-stack-com-websocket-gwt-j2cl-native/src/main/java/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/nativ/GwtJ2clNativeWebSocketServiceProvider.java

@@ -0,0 +1,17 @@
+package dev.webfx.stack.com.websocket.spi.impl.gwtj2cl.nativ;
+
+import dev.webfx.platform.ast.ReadOnlyAstObject;
+import dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider;
+
+/**
+ * @author Bruno Salmon
+ */
+public final class GwtJ2clNativeWebSocketServiceProvider implements WebSocketServiceProvider {
+
+    @Override
+    public GwtJ2clNativeWebSocket createWebSocket(String url, ReadOnlyAstObject options) {
+        // Otherwise we create a brand new SockJS connection
+        return new GwtJ2clNativeWebSocket(new elemental2.dom.WebSocket(url));
+    };
+
+}