1.1 --- a/ko/bck2brwsr/pom.xml	Thu Aug 29 08:00:42 2013 +0000
     1.2 +++ b/ko/bck2brwsr/pom.xml	Thu Aug 29 14:35:01 2013 +0000
     1.3 @@ -92,5 +92,11 @@
     1.4        <version>${project.version}</version>
     1.5        <type>jar</type>
     1.6      </dependency>
     1.7 +    <dependency>
     1.8 +      <groupId>org.apidesign.html</groupId>
     1.9 +      <artifactId>net.java.html.boot</artifactId>
    1.10 +      <version>0.5</version>
    1.11 +      <type>jar</type>
    1.12 +    </dependency>
    1.13    </dependencies>
    1.14  </project>

     2.1 --- a/ko/bck2brwsr/src/main/java/org/apidesign/bck2brwsr/ko2brwsr/BrwsrCtxImpl.java	Thu Aug 29 08:00:42 2013 +0000
     2.2 +++ b/ko/bck2brwsr/src/main/java/org/apidesign/bck2brwsr/ko2brwsr/BrwsrCtxImpl.java	Thu Aug 29 14:35:01 2013 +0000
     2.3 @@ -26,12 +26,13 @@
     2.4  import org.apidesign.html.json.spi.PropertyBinding;
     2.5  import org.apidesign.html.json.spi.Technology;
     2.6  import org.apidesign.html.json.spi.Transfer;
     2.7 +import org.apidesign.html.json.spi.WSTransfer;
     2.8  
     2.9  /**
    2.10   *
    2.11   * @author Jaroslav Tulach <jtulach@netbeans.org>
    2.12   */
    2.13 -final class BrwsrCtxImpl implements Technology<Object>, Transfer {
    2.14 +final class BrwsrCtxImpl implements Technology<Object>, Transfer, WSTransfer<LoadWS> {
    2.15      private BrwsrCtxImpl() {}
    2.16      
    2.17      public static final BrwsrCtxImpl DEFAULT = new BrwsrCtxImpl();
    2.18 @@ -126,4 +127,19 @@
    2.19      public void runSafe(Runnable r) {
    2.20          r.run();
    2.21      }
    2.22 +
    2.23 +    @Override
    2.24 +    public LoadWS open(String url, JSONCall callback) {
    2.25 +        return new LoadWS(callback, url);
    2.26 +    }
    2.27 +
    2.28 +    @Override
    2.29 +    public void send(LoadWS socket, JSONCall data) {
    2.30 +        socket.send(data);
    2.31 +    }
    2.32 +
    2.33 +    @Override
    2.34 +    public void close(LoadWS socket) {
    2.35 +        socket.close();
    2.36 +    }
    2.37  }

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/ko/bck2brwsr/src/main/java/org/apidesign/bck2brwsr/ko2brwsr/LoadWS.java	Thu Aug 29 14:35:01 2013 +0000
     3.3 @@ -0,0 +1,126 @@
     3.4 +/**
     3.5 + * Back 2 Browser Bytecode Translator
     3.6 + * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
     3.7 + *
     3.8 + * This program is free software: you can redistribute it and/or modify
     3.9 + * it under the terms of the GNU General Public License as published by
    3.10 + * the Free Software Foundation, version 2 of the License.
    3.11 + *
    3.12 + * This program is distributed in the hope that it will be useful,
    3.13 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    3.14 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    3.15 + * GNU General Public License for more details.
    3.16 + *
    3.17 + * You should have received a copy of the GNU General Public License
    3.18 + * along with this program. Look for COPYING file in the top folder.
    3.19 + * If not, see http://opensource.org/licenses/GPL-2.0.
    3.20 + */
    3.21 +package org.apidesign.bck2brwsr.ko2brwsr;
    3.22 +
    3.23 +import net.java.html.js.JavaScriptBody;
    3.24 +import org.apidesign.html.json.spi.JSONCall;
    3.25 +
    3.26 +/** Communication with WebSockets for WebView 1.8.
    3.27 + *
    3.28 + * @author Jaroslav Tulach <jtulach@netbeans.org>
    3.29 + */
    3.30 +final class LoadWS {
    3.31 +    private static final boolean SUPPORTED = isWebSocket();
    3.32 +    private final Object ws;
    3.33 +    private final JSONCall call;
    3.34 +    LoadWS(JSONCall first, String url) {
    3.35 +        call = first;
    3.36 +        ws = initWebSocket(this, url);
    3.37 +        if (ws == null) {
    3.38 +            first.notifyError(new IllegalArgumentException("Wrong URL: " + url));
    3.39 +        }
    3.40 +    }
    3.41 +    
    3.42 +    static boolean isSupported() {
    3.43 +        return SUPPORTED;
    3.44 +    }
    3.45 +    
    3.46 +    void send(JSONCall call) {
    3.47 +        push(call);
    3.48 +    }
    3.49 +    
    3.50 +    private synchronized void push(JSONCall call) {
    3.51 +        send(ws, call.getMessage());
    3.52 +    }
    3.53 +
    3.54 +    void onOpen(Object ev) {
    3.55 +        if (!call.isDoOutput()) {
    3.56 +            call.notifySuccess(null);
    3.57 +        }
    3.58 +    }
    3.59 +    
    3.60 +    
    3.61 +    @JavaScriptBody(args = { "data" }, body = "try {\n"
    3.62 +        + "    return eval('(' + data + ')');\n"
    3.63 +        + "  } catch (error) {;\n"
    3.64 +        + "    return data;\n"
    3.65 +        + "  }\n"
    3.66 +    )
    3.67 +    private static native Object toJSON(String data);
    3.68 +    
    3.69 +    void onMessage(Object ev, String data) {
    3.70 +        Object json = toJSON(data);
    3.71 +        call.notifySuccess(json);
    3.72 +    }
    3.73 +    
    3.74 +    void onError(Object ev) {
    3.75 +        call.notifyError(new Exception(ev.toString()));
    3.76 +    }
    3.77 +
    3.78 +    void onClose(boolean wasClean, int code, String reason) {
    3.79 +        call.notifyError(null);
    3.80 +    }
    3.81 +    
    3.82 +    @JavaScriptBody(args = {}, body = "if (window.WebSocket) return true; else return false;")
    3.83 +    private static boolean isWebSocket() {
    3.84 +        return false;
    3.85 +    }
    3.86 +
    3.87 +    @JavaScriptBody(args = { "back", "url" }, javacall = true, body = ""
    3.88 +        + "if (window.WebSocket) {\n"
    3.89 +        + "  try {\n"
    3.90 +        + "    var ws = new window.WebSocket(url);\n"
    3.91 +        + "    ws.onopen = function(ev) {\n"
    3.92 +        + "      back.@org.apidesign.bck2brwsr.ko2brwsr.LoadWS::onOpen(Ljava/lang/Object;)(ev);\n"
    3.93 +        + "    };\n"
    3.94 +        + "    ws.onmessage = function(ev) {\n"
    3.95 +        + "      back.@org.apidesign.bck2brwsr.ko2brwsr.LoadWS::onMessage(Ljava/lang/Object;Ljava/lang/String;)(ev, ev.data);\n"
    3.96 +        + "    };\n"
    3.97 +        + "    ws.onerror = function(ev) {\n"
    3.98 +        + "      back.@org.apidesign.bck2brwsr.ko2brwsr.LoadWS::onError(Ljava/lang/Object;)(ev);\n"
    3.99 +        + "    };\n"
   3.100 +        + "    ws.onclose = function(ev) {\n"
   3.101 +        + "      back.@org.apidesign.bck2brwsr.ko2brwsr.LoadWS::onClose(ZILjava/lang/String;)(ev.wasClean, ev.code, ev.reason);\n"
   3.102 +        + "    };\n"
   3.103 +        + "    return ws;\n"
   3.104 +        + "  } catch (ex) {\n"
   3.105 +        + "    return null;\n"
   3.106 +        + "  }\n"
   3.107 +        + "} else {\n"
   3.108 +        + "  return null;\n"
   3.109 +        + "}\n"
   3.110 +    )
   3.111 +    private static Object initWebSocket(Object back, String url) {
   3.112 +        return null;
   3.113 +    }
   3.114 +    
   3.115 +
   3.116 +    @JavaScriptBody(args = { "ws", "msg" }, body = ""
   3.117 +        + "ws.send(msg);"
   3.118 +    )
   3.119 +    private void send(Object ws, String msg) {
   3.120 +    }
   3.121 +
   3.122 +    @JavaScriptBody(args = { "ws" }, body = "ws.close();")
   3.123 +    private static void close(Object ws) {
   3.124 +    }
   3.125 +
   3.126 +    void close() {
   3.127 +        close(ws);
   3.128 +    }
   3.129 +}

     4.1 --- a/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java	Thu Aug 29 08:00:42 2013 +0000
     4.2 +++ b/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java	Thu Aug 29 14:35:01 2013 +0000
     4.3 @@ -28,6 +28,7 @@
     4.4  import org.apidesign.html.context.spi.Contexts;
     4.5  import org.apidesign.html.json.spi.Technology;
     4.6  import org.apidesign.html.json.spi.Transfer;
     4.7 +import org.apidesign.html.json.spi.WSTransfer;
     4.8  import org.apidesign.html.json.tck.KOTest;
     4.9  import org.apidesign.html.json.tck.KnockoutTCK;
    4.10  import org.openide.util.lookup.ServiceProvider;
    4.11 @@ -51,6 +52,7 @@
    4.12      public BrwsrCtx createContext() {
    4.13          return Contexts.newBuilder().
    4.14              register(Transfer.class, BrwsrCtxImpl.DEFAULT, 9).
    4.15 +            register(WSTransfer.class, BrwsrCtxImpl.DEFAULT, 9).
    4.16              register(Technology.class, BrwsrCtxImpl.DEFAULT, 9).build();
    4.17      }
    4.18  

     5.1 --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Thu Aug 29 08:00:42 2013 +0000
     5.2 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Thu Aug 29 14:35:01 2013 +0000
     5.3 @@ -157,29 +157,29 @@
     5.4      
     5.5      private HttpServer initServer(String path, boolean addClasses) throws IOException {
     5.6          HttpServer s = HttpServer.createSimpleServer(path, new PortRange(8080, 65535));
     5.7 -        final WebSocketAddOn addon = new WebSocketAddOn();
     5.8 -        for (NetworkListener listener : s.getListeners()) {
     5.9 -            listener.registerAddOn(addon);
    5.10 -        }
    5.11 -        
    5.12 +        /*
    5.13          ThreadPoolConfig fewThreads = ThreadPoolConfig.defaultConfig().copy().
    5.14              setPoolName("Fx/Bck2 Brwsr").
    5.15 -            setCorePoolSize(1).
    5.16 +            setCorePoolSize(3).
    5.17              setMaxPoolSize(5);
    5.18          ThreadPoolConfig oneKernel = ThreadPoolConfig.defaultConfig().copy().
    5.19              setPoolName("Kernel Fx/Bck2").
    5.20 -            setCorePoolSize(1).
    5.21 +            setCorePoolSize(3).
    5.22              setMaxPoolSize(3);
    5.23          for (NetworkListener nl : s.getListeners()) {
    5.24              nl.getTransport().setWorkerThreadPoolConfig(fewThreads);
    5.25              nl.getTransport().setKernelThreadPoolConfig(oneKernel);
    5.26          }
    5.27 -        
    5.28 +        */
    5.29          final ServerConfiguration conf = s.getServerConfiguration();
    5.30          if (addClasses) {
    5.31              conf.addHttpHandler(new VM(), "/bck2brwsr.js");
    5.32              conf.addHttpHandler(new Classes(resources), "/classes/");
    5.33          }
    5.34 +        final WebSocketAddOn addon = new WebSocketAddOn();
    5.35 +        for (NetworkListener listener : s.getListeners()) {
    5.36 +            listener.registerAddOn(addon);
    5.37 +        }
    5.38          return s;
    5.39      }
    5.40      

     6.1 --- a/launcher/pom.xml	Thu Aug 29 08:00:42 2013 +0000
     6.2 +++ b/launcher/pom.xml	Thu Aug 29 14:35:01 2013 +0000
     6.3 @@ -12,7 +12,7 @@
     6.4    <packaging>pom</packaging>
     6.5    <name>Launchers</name>
     6.6    <properties>
     6.7 -      <grizzly.version>2.3.2</grizzly.version>
     6.8 +      <grizzly.version>2.3.3</grizzly.version>
     6.9    </properties>
    6.10    <modules>
    6.11      <module>api</module>