Replace sse library with sse-channel

Author: relekang

README.md

@@ -100,10 +100,16 @@ sse.addEventListener('micro-analytics-ping', function (e) { console.log('[sse]',
 #### Browser support
 
 Server-sent events is not supported in all browsers. This can easily be fixed by using a polyfill.
-Take a look at [the caniuse table][] for server-sent events if you need one.
+Take a look at [the caniuse table][] for server-sent events if you need one. Polyfills that are
+supported(disclaimer this list is from the documentation of the sse library we use [rexxars/sse-channel][]):
+
+* [amvtek/EventSource](https://github.com/amvtek/EventSource)
+* [Yaffle/EventSource)](https://github.com/Yaffle/EventSource)
+* [remy/polyfills/EventSource.js](https://github.com/remy/polyfills/blob/master/EventSource.js)
 
 [server-sent events]: https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events
 [the caniuse table]: http://caniuse.com/#feat=eventsource
+[rexxars/sse-channel]: https://github.com/rexxars/sse-channel
 
 ## License
 

package.json

@@ -31,7 +31,7 @@
     "micro-analytics-adapter-flat-file-db": "^1.2.1",
     "promise": "^7.1.1",
     "shelljs": "^0.7.6",
-    "sse": "0.0.6",
+    "sse-channel": "^2.0.6",
     "update-notifier": "^1.0.3",
     "zen-observable": "^0.4.0"
   },

src/handler.js

@@ -4,8 +4,26 @@ const { send, createError, sendError } = require('micro')
 const db = require('./db')
 const { pushView } = require('./utils')
 
+let sse;
+
+if (db.hasFeature("subscribe")) {
+  const SseChannel = require('sse-channel')
+  const sseHandler = require('./sse')
+  sse = new SseChannel({ cors: { origins: ['*'] } })
+  sseHandler(sse)
+}
+
 module.exports = async function (req, res) {
   const { pathname, query } = url.parse(req.url, /* parseQueryString */ true)
+
+  if (pathname === '/sse') {
+    if (sse) {
+      sse.addClient(req, res);
+    } else {
+      send(res, 400, {error: 'The current database adapter does not support live updates.'})
+    }
+  }
+
   res.setHeader('Access-Control-Allow-Origin', '*')
   // Send all views down if "?all" is true
   if (String(query.all) === 'true') {

src/index.js

@@ -1,5 +1,4 @@
 const micro = require('micro')
-const SSE = require('sse')
 
 const parseArgs = require('./parseArgs')
 const db = require('./db');
@@ -11,12 +10,6 @@ db.initDbAdapter(flags.adapter)
 const handler = require('./handler')
 const server = micro(handler)
 
-if (db.hasFeature("subscribe")) {
-  const sseHandler = require('./sse')
-  const sse = new SSE(server)
-  sse.on('connection', sseHandler)
-}
-
 server.listen(flags.port, flags.host, (error) => {
   if (error) {
     console.error(error)

yarn.lock

@@ -10,6 +10,14 @@ abbrev@1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
 
+[email protected]:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/access-control/-/access-control-1.0.0.tgz#aeba282cee77313e85240163d69e35b29e36d626"
+  dependencies:
+    millisecond "0.1.x"
+    setheader "0.0.x"
+    vary "1.1.x"
+
 acorn-globals@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
@@ -671,6 +679,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+[email protected]:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+
 debug@^2.1.1, debug@^2.2.0:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
@@ -1138,6 +1150,10 @@ imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
+in-publish@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+
 infinity-agent@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/infinity-agent/-/infinity-agent-2.0.3.tgz#45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"
@@ -1763,7 +1779,7 @@ lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
 
-lodash@^4.13.1, lodash@^4.14.0, lodash@^4.2.0:
+lodash@^4.0.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.2.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -1848,6 +1864,10 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
+[email protected]:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/millisecond/-/millisecond-0.1.2.tgz#6cc5ad386241cab8e78aff964f87028eec92dac5"
+
 mime-db@~1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
@@ -2038,10 +2058,6 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-options@latest:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
-
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -2437,6 +2453,12 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
+[email protected]:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/setheader/-/setheader-0.0.4.tgz#926ed28cf762149620931e7aea3f1b95816ec694"
+  dependencies:
+    debug "0.7.x"
+
 shelljs@^0.7.6:
   version "0.7.7"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
@@ -2513,11 +2535,13 @@ sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
-sse@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/sse/-/sse-0.0.6.tgz#3192461dfa38c78424dd9bf8ea025619a125aa10"
+sse-channel@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/sse-channel/-/sse-channel-2.0.6.tgz#311cc45efb21628f4e4989c9ceb976bb47835592"
   dependencies:
-    options latest
+    access-control "1.0.0"
+    in-publish "^2.0.0"
+    lodash "^4.0.1"
 
 sshpk@^1.7.0:
   version "1.11.0"
@@ -2786,6 +2810,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
+[email protected]:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
+
 [email protected]:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"