#576 Drop dependencies to Primus and Primus plugins

.Gruntfile.babel.js

@@ -1,6 +1,5 @@
 'use strict'
 
-import sbp from '~/shared/sbp.js'
 import resolve from 'rollup-plugin-node-resolve'
 import commonjs from 'rollup-plugin-commonjs'
 import alias from 'rollup-plugin-alias'
@@ -109,14 +108,7 @@ module.exports = (grunt) => {
 
   grunt.registerTask('build', function () {
     const rollup = this.flags.watch ? 'rollup:watch' : 'rollup'
-    if (this.flags.watch) {
-      // if we are being run with 'grunt dev', tell Primus to generate the file
-      // ./frontend/controller/utils/primus.js, otherwise, this is 'grunt test', and this
-      // block will be skipped so that pubsub.js can be required through ./backend/index.js
-      // TODO: get rid of this when we remove Primus (#576)
-      require('~/backend/pubsub.js') // hack to register 'backend/pubsub/setup' selector
-      sbp('backend/pubsub/setup', require('http').createServer(), true)
-    }
+
     if (!grunt.option('skipbuild')) {
       grunt.task.run(['exec:eslint', 'exec:flow', 'exec:puglint', 'exec:stylelint', 'copy', rollup])
     }
@@ -256,9 +248,6 @@ module.exports = (grunt) => {
           sourcemap: development
         },
         external: ['crypto'],
-        moduleContext: {
-          'frontend/controller/utils/primus.js': 'window'
-        },
         plugins: [
           alias({
             // https://vuejs.org/v2/guide/installation.html#Standalone-vs-Runtime-only-Build
@@ -314,7 +303,7 @@ module.exports = (grunt) => {
             // NOTE: uncommenting this saves ~1 second off build process
             //       while making it a massive pain to deal with dependencies
             //       and causing "ReferenceError: require is not defined"
-            // include: /(node_modules\/(blakejs|multihashes|tweetnacl|localforage|@babel|vue.+).*|primus\.js$)/,
+            // include: /(node_modules\/(blakejs|multihashes|tweetnacl|localforage|@babel|vue.+).*)/,
             namedExports: {
               'node_modules/vuelidate/lib/validators/index.js': ['required', 'between', 'email', 'minLength', 'requiredIf'],
               'node_modules/emoji-mart-vue-fast/dist/emoji-mart.js': ['Picker', 'EmojiIndex']

backend/index.js

@@ -34,9 +34,9 @@ module.exports = (new Promise((resolve, reject) => {
 }): Promise<void>)
 
 const shutdownFn = function (message) {
-  sbp('okTurtles.data/apply', PUBSUB_INSTANCE, function (primus) {
+  sbp('okTurtles.data/apply', PUBSUB_INSTANCE, function (pubsub) {
     console.log('message received in child, shutting down...', message)
-    primus.on('close', async function () {
+    pubsub.on('close', async function () {
       try {
         await sbp('backend/server/stop')
         console.log('Hapi server down')
@@ -49,7 +49,7 @@ const shutdownFn = function (message) {
         process.exit(1)
       }
     })
-    primus.destroy({ timeout: 1000 }) // TODO: close: false ?
+    pubsub.close()
   })
 }
 

backend/server.js

@@ -5,10 +5,9 @@ import './database.js'
 import Hapi from '@hapi/hapi'
 import GiAuth from './auth.js'
 import { GIMessage } from '~/shared/GIMessage.js'
-import { makeResponse } from '~/shared/functions.js'
-import { RESPONSE_TYPE } from '~/shared/constants.js'
 import { SERVER_RUNNING } from './events.js'
 import { SERVER_INSTANCE, PUBSUB_INSTANCE } from './instance-keys.js'
+import { createMessage, createServer } from './utils/pubsub.js'
 import chalk from 'chalk'
 
 const Inert = require('@hapi/inert')
@@ -45,10 +44,13 @@ sbp('sbp/selectors/register', {
   'backend/server/handleEntry': async function (entry: GIMessage) {
     const contractID = entry.contractID()
     await sbp('gi.db/log/addEntry', entry)
-    const response = makeResponse(RESPONSE_TYPE.ENTRY, entry.serialize())
     console.log(chalk.blue.bold(`broadcasting ${entry.description()}`))
-    sbp('okTurtles.data/apply', PUBSUB_INSTANCE, p => {
-      p.room(contractID).write(response)
+    sbp('okTurtles.data/apply', PUBSUB_INSTANCE, pubsub => {
+      if (contractID in pubsub.subscribersByContractID) {
+        pubsub.subscribersByContractID[contractID].forEach((client) => {
+          client.send(createMessage('entry', entry.serialize()))
+        })
+      }
     })
   },
   'backend/server/stop': function () {
@@ -62,14 +64,15 @@ if (process.env.NODE_ENV === 'development' && !process.env.CI) {
   })
 }
 
+sbp('okTurtles.data/set', PUBSUB_INSTANCE, createServer(hapi.listener))
+
 ;(async function () {
   // https://hapi.dev/tutorials/plugins
   await hapi.register([
     { plugin: GiAuth },
     { plugin: Inert }
   ])
   require('./routes.js')
-  require('./pubsub.js')
   await hapi.start()
   console.log('Backend server running at:', hapi.info.uri)
   sbp('okTurtles.events/emit', SERVER_RUNNING, hapi)