Pushing up start of support for Browser Extension

Author: manifestinteractive

commands/remote.js

@@ -4,11 +4,9 @@ const express = require('express')
 const fs = require('fs')
 const https = require('https')
 const ipc = require('node-ipc')
-const ora = require('ora')
 const path = require('path')
 
 const config = require('../lib/config')()
-const notify = require('../lib/notify')()
 
 const port = 8443
 
@@ -17,7 +15,6 @@ module.exports = async options => {
   let instance = argv['_'][2] || null
   let selected = null
   let remote
-  let reloadTimeout
 
   // Get Client & Instance, or check for Default
   if (client && instance) {
@@ -42,24 +39,13 @@ module.exports = async options => {
     ipc.config.retry = 1500
     ipc.config.silent = true
     ipc.serve(() => {
-      ipc.server.on('message', cmd => {
-        // Check if `remote` exists from socket.io and listen for commands
-        if (remote && typeof remote.emit !== 'undefined') {
-          // Handle Live Reload if enabled
-          if (cmd === 'live-reload' && options.liveReload) {
-            clearTimeout(reloadTimeout)
-            reloadTimeout = setTimeout(() => {
-              notify({
-                title: `${client} ${instance}`,
-                icon: path.join(__dirname, '../icons/', 'sfcc-reload.png'),
-                subtitle: 'LIVE RELOAD',
-                message: `Sending Reload Request to Sandbox`
-              })
-
-              remote.emit('refresh', true)
-            }, 3000)
-          }
-        }
+      ipc.server.on('message', message => {
+        console.log('MESSAGE', message)
+        remote.emit('message', message)
+      })
+      ipc.server.on('watch', data => {
+        console.log('WATCH', data)
+        remote.emit('watch', data)
       })
     })
 
@@ -103,15 +89,23 @@ module.exports = async options => {
       if (options.liveReload) {
         remote.emit('message', 'Live Reload Enabled')
       }
+
+      socket.on('message', message => {
+        console.log('MESSAGE', message)
+      })
+
+      socket.on('get-config', () => {
+        io.emit('set-config', config.getAll())
+      })
     })
 
     server.listen(port, function() {
       console.log(`\n${chalk.bold('IMPORTANT')}: Make sure your sandbox has the following script tag:`)
       console.log('<script src="https://localhost:8443/sfcc-cli-remote.js" id="sfcc-cli-remote"></script>\n')
 
-      ora(
-        `${chalk.bold('REMOTE')} ${chalk.cyan.bold(client)} ${chalk.magenta.bold(instance)} [Ctrl-C to Cancel]\n`
-      ).start()
+      // ora(
+      //   `${chalk.bold('REMOTE')} ${chalk.cyan.bold(client)} ${chalk.magenta.bold(instance)} [Ctrl-C to Cancel]\n`
+      // ).start()
     })
   }
 }

commands/watch.js

@@ -88,9 +88,9 @@ module.exports = options => {
       }
     }
 
-    const callback = () => {
-      if (typeof remote.emit !== 'undefined') {
-        remote.emit('message', 'live-reload')
+    const callback = data => {
+      if (remote && typeof remote.emit !== 'undefined') {
+        remote.emit('watch', data)
       }
     }
 
@@ -121,6 +121,16 @@ module.exports = options => {
         wait: true
       })
 
+      if (remote && typeof remote.emit !== 'undefined') {
+        remote.emit('watch', {
+          type: 'error',
+          client: client,
+          instance: instance,
+          message: error,
+          timestamp: new Date().toString()
+        })
+      }
+
       errorMessage = `✖ Watch Error for '${client}' '${instance}': ${error}.`
       if (useLog) {
         logger.log(errorMessage)
@@ -139,6 +149,18 @@ module.exports = options => {
         })
       }
 
+      setTimeout(() => {
+        if (remote && typeof remote.emit !== 'undefined') {
+          remote.emit('watch', {
+            type: 'watch',
+            client: client,
+            instance: instance,
+            message: 'Starting Watcher',
+            timestamp: new Date().toString()
+          })
+        }
+      }, 100)
+
       if (useLog) {
         logger.log(`Watching ${client} ${instance}`, true)
       } else {

lib/config.js

@@ -53,6 +53,10 @@ module.exports = () => {
     return config
   }
 
+  const getAll = () => {
+    return config
+  }
+
   const set = (config, isUpdate) => {
     fs.writeFileSync(configFile, JSON.stringify(config), 'utf8')
 
@@ -65,6 +69,7 @@ module.exports = () => {
 
   return {
     get,
+    getAll,
     set
   }
 }

lib/upload.js

@@ -63,7 +63,13 @@ module.exports = async ({file, spinner, selected, client, instance, options, cal
       }
 
       if (typeof callback === 'function') {
-        callback()
+        callback({
+          type: 'upload',
+          client: client,
+          instance: instance,
+          message: file.replace(selected.d, '.'),
+          timestamp: new Date().toString()
+        })
       }
 
       logMessage = `${chalk.green('COMPLETE')} ${file.replace(selected.d, '.')}`