Merge pull request #51 from conversation/18108-remove-browserchannel

Remove browserchannel as a dependency

README.md

@@ -38,6 +38,10 @@ If you need to re-compile the web client code, just run `npm install` again, or
 Running tests
 -------------
 
+If you didn't already:
+
+    createdb sharejs_example
+
 This project uses a pretty old version of nodeunit, but all tests can easily be run with:
 
     npm run test

package.json

@@ -18,7 +18,6 @@
     "sockjs": ">= 0.3.1",
     "socket.io": "2.5.0",
     "socket.io-client": "2.4.0",
-    "browserchannel": "~1",
     "ws": "0.4.32",
     "connect": "<3.x",
     "request": ">= 2.1.1",

src/client/connection.coffee

@@ -13,19 +13,16 @@
 
 if WEB?
   types = exports.types
-  {BCSocket, SockJS, WebSocket} = window
-  if BCSocket
-    socketImpl = 'channel'
+  {SockJS, WebSocket} = window
+  if SockJS
+    socketImpl = 'sockjs'
   else
-    if SockJS
-      socketImpl = 'sockjs'
-    else
-      socketImpl = 'websocket'
+    socketImpl = 'websocket'
 else
   types = require '../types'
-  {BCSocket} = require 'browserchannel'
   Doc = require('./doc').Doc
   WebSocket = require 'ws'
+  ReconnectingWebSocket = WebSocket
   socketImpl = null
 
 class Connection
@@ -44,10 +41,8 @@ class Connection
     if host.match /^wss?:/ then socketImpl = 'websocket'
 
     @socket = switch socketImpl
-      when 'channel' then new BCSocket(host, reconnect:true)
       when 'sockjs' then new ReconnectingWebSocket(host, SockJS)
-      when 'websocket' then new ReconnectingWebSocket(host)
-      else new BCSocket(host, reconnect:true)
+      else new ReconnectingWebSocket(host)
 
     @socket.onmessage = (msg) =>
       msg = JSON.parse(msg.data) if socketImpl in ['sockjs', 'websocket']

src/server/index.coffee

@@ -7,7 +7,6 @@ Model = require './model'
 createDb = require './db'
 
 rest = require './rest'
-browserChannel = require './browserchannel'
 sockjs = require './sockjs'
 websocket = require './websocket'
 
@@ -54,8 +53,6 @@ create.attach = attach = (server, options, model = createModel(options)) ->
   # done properly.
   server.use rest(createAgent, options.rest or {}) if options.rest != null
 
-  browserChannel.attach(server, createAgent, options.browserChannel or {}) if options.browserChannel != null
-
   if !(server instanceof http.Server)
     server = http.createServer server