Adds optional subprotocol

Author: Gaeel Bradshaw

NativeWebSocket/Assets/WebSocket/WebSocket.cs

@@ -240,6 +240,34 @@ public WebSocket (string url, Dictionary<string, string> headers = null) {
       this.instanceId = instanceId;
     }
 
+    public WebSocket (string url, string subprotocol, Dictionary<string, string> headers = null) {
+      if (!WebSocketFactory.isInitialized) {
+        WebSocketFactory.Initialize ();
+      }
+
+      int instanceId = WebSocketFactory.WebSocketAllocate (url);
+      WebSocketFactory.instances.Add (instanceId, this);
+
+      WebSocketFactory.WebSocketAddSubProtocol(instanceId, subprotocol);
+
+      this.instanceId = instanceId;
+    }
+
+    public WebSocket (string url, List<string> subprotocols, Dictionary<string, string> headers = null) {
+      if (!WebSocketFactory.isInitialized) {
+        WebSocketFactory.Initialize ();
+      }
+
+      int instanceId = WebSocketFactory.WebSocketAllocate (url);
+      WebSocketFactory.instances.Add (instanceId, this);
+
+      foreach (string subprotocol in subprotocols) {
+        WebSocketFactory.WebSocketAddSubProtocol(instanceId, subprotocol);
+      }
+
+      this.instanceId = instanceId;
+    }
+
     ~WebSocket () {
       WebSocketFactory.HandleInstanceDestroy (this.instanceId);
     }
@@ -344,6 +372,7 @@ public class WebSocket : IWebSocket
 
         private Uri uri;
         private Dictionary<string, string> headers;
+        private List<string> subprotocols;
         private ClientWebSocket m_Socket = new ClientWebSocket();
 
         private CancellationTokenSource m_TokenSource;
@@ -368,6 +397,48 @@ public WebSocket(string url, Dictionary<string, string> headers = null)
                 this.headers = headers;
             }
 
+            subprotocols = new List<string>();
+
+            string protocol = uri.Scheme;
+            if (!protocol.Equals("ws") && !protocol.Equals("wss"))
+                throw new ArgumentException("Unsupported protocol: " + protocol);
+        }
+
+        public WebSocket(string url, string subprotocol, Dictionary<string, string> headers = null)
+        {
+            uri = new Uri(url);
+
+            if (headers == null)
+            {
+                this.headers = new Dictionary<string, string>();
+            }
+            else
+            {
+                this.headers = headers;
+            }
+
+            subprotocols = new List<string> {subprotocol};
+
+            string protocol = uri.Scheme;
+            if (!protocol.Equals("ws") && !protocol.Equals("wss"))
+                throw new ArgumentException("Unsupported protocol: " + protocol);
+        }
+
+        public WebSocket(string url, List<string> subprotocols, Dictionary<string, string> headers = null)
+        {
+            uri = new Uri(url);
+
+            if (headers == null)
+            {
+                this.headers = new Dictionary<string, string>();
+            }
+            else
+            {
+                this.headers = headers;
+            }
+
+            this.subprotocols = subprotocols;
+
             string protocol = uri.Scheme;
             if (!protocol.Equals("ws") && !protocol.Equals("wss"))
                 throw new ArgumentException("Unsupported protocol: " + protocol);
@@ -392,6 +463,10 @@ public async Task Connect()
                     m_Socket.Options.SetRequestHeader(header.Key, header.Value);
                 }
 
+                foreach (string subprotocol in subprotocols) {
+                    m_Socket.Options.AddSubProtocol(subprotocol);
+                }
+
                 await m_Socket.ConnectAsync(uri, m_CancellationToken);
                 OnOpen?.Invoke();
 
@@ -652,6 +727,9 @@ public static class WebSocketFactory
     [DllImport ("__Internal")]
     public static extern int WebSocketAllocate (string url);
 
+    [DllImport ("__Internal")]
+    public static extern int WebSocketAddSubProtocol (int instanceId, string subprotocol);
+
     [DllImport ("__Internal")]
     public static extern void WebSocketFree (int instanceId);
 

NativeWebSocket/Assets/WebSocket/WebSocket.jslib

@@ -142,6 +142,7 @@ var LibraryWebSocket = {
 		var id = webSocketState.lastId++;
 
 		webSocketState.instances[id] = {
+		  subprotocols: [],
 			url: urlStr,
 			ws: null
 		};
@@ -150,6 +151,19 @@ var LibraryWebSocket = {
 
 	},
 
+  /**
+   * Add subprotocol to instance
+   *
+   * @param instanceId Instance ID
+   * @param subprotocol Subprotocol name to add to instance
+   */
+  WebSocketAddSubProtocol: function(instanceId, subprotocol) {
+
+    var subprotocolStr = Pointer_stringify(subprotocol);
+    webSocketState.instances[instanceId].subprotocols.push(subprotocolStr);
+
+  },
+
 	/**
 	 * Remove reference to WebSocket instance
 	 *
@@ -188,7 +202,7 @@ var LibraryWebSocket = {
 		if (instance.ws !== null)
 			return -2;
 
-		instance.ws = new WebSocket(instance.url);
+		instance.ws = new WebSocket(instance.url, instance.subprotocols);
 
 		instance.ws.binaryType = 'arraybuffer';