Add web socket support to rest api (#650)

* Add websocket url serializing to rest api * Fix style issues * Fix style issues
jitsi · Apr 23, 2018 · f6bc6f7 · f6bc6f7
1 parent 6043598
commit f6bc6f7
Showing 1 changed file with 40 additions and 0 deletions.
diff --git a/src/main/java/org/jitsi/videobridge/rest/JSONSerializer.java b/src/main/java/org/jitsi/videobridge/rest/JSONSerializer.java
@@ -135,6 +135,13 @@ final class JSONSerializer
     static final String RTP_HEADER_EXTS
         = RTPHdrExtPacketExtension.ELEMENT_NAME + "s";
 
+    /**
+     * The name of the JSON pair which specifies the value of the
+     *  <tt>webSockets</tt> property of <tt>WebSocketPacketExtension</tt>.
+     */
+    static final String WEBSOCKET_LIST
+            = WebSocketPacketExtension.ELEMENT_NAME + "s";
+
     /**
      * The name of the JSON pair which specifies the value of the
      * <tt>namespace</tt> property of <tt>IceUdpTransportPacketExtension</tt>.
@@ -979,6 +986,9 @@ public static JSONObject serializeTransport(
                         DtlsFingerprintPacketExtension.class);
             List<CandidatePacketExtension> candidateList
                 = transport.getCandidateList();
+            List<WebSocketPacketExtension> webSocketList
+                = transport.getChildExtensionsOfType(
+                        WebSocketPacketExtension.class);
             RemoteCandidatePacketExtension remoteCandidate
                 = transport.getRemoteCandidate();
             boolean rtcpMux = transport.isRtcpMux();
@@ -1010,6 +1020,12 @@ public static JSONObject serializeTransport(
                         remoteCandidate.getElementName(),
                         serializeCandidate(remoteCandidate));
             }
+            if ( (webSocketList != null) && (!webSocketList.isEmpty()) )
+            {
+                jsonObject.put(
+                        WEBSOCKET_LIST,
+                        serializeWebSockets(webSocketList));
+            }
             // rtcpMux
             if (rtcpMux)
             {
@@ -1021,6 +1037,30 @@ public static JSONObject serializeTransport(
         return jsonObject;
     }
 
+    private static String serializeWebSocket(
+             WebSocketPacketExtension webSocket)
+    {
+        return webSocket.getUrl();
+    }
+
+    private static JSONArray serializeWebSockets(
+             List<WebSocketPacketExtension> webSocketList)
+    {
+        JSONArray webSocketsJSONArray;
+
+        if (webSocketList == null)
+        {
+            webSocketsJSONArray = null;
+        }
+        else
+        {
+            webSocketsJSONArray = new JSONArray();
+            for (WebSocketPacketExtension webSocket : webSocketList)
+                webSocketsJSONArray.add(serializeWebSocket(webSocket));
+        }
+        return webSocketsJSONArray;
+    }
+
     /** Prevents the initialization of new <tt>JSONSerializer</tt> instances. */
     private JSONSerializer()
     {