fix(bonjour): updates dependency + better error handling (#1040)

Author: manucorporat

package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "autoprefixer": "6.7.2",
     "babili": "0.0.10",
-    "bonjour": "^3.5.0",
+    "bonjour": "github:resin-io/bonjour",
     "chalk": "1.1.3",
     "chokidar": "1.7.0",
     "clean-css": "3.4.24",

src/dev-server/bonjour.ts

@@ -3,28 +3,26 @@ import { getProjectJson } from '../util/ionic-project';
 import { ServeConfig } from './serve-config';
 
 export function createBonjourService(config: ServeConfig) {
-  if (!config.bonjour) {
+  if (!config.devapp) {
     return;
   }
   getProjectJson()
     .then(project => project.name)
     .catch(() => 'ionic-app-scripts')
     .then(projectName => {
-      Logger.info(`publishing bonjour service`);
+      try {
+        const bonjour = require('bonjour')();
+        const name = projectName + ':' + config.httpPort;
+        bonjour.publish({
+          name: name,
+          type: 'ionicdev',
+          port: config.httpPort
+        });
+        Logger.info(`publishing devapp service (${name})`);
 
-      const bonjour = require('bonjour')();
-      bonjour.publish({
-        name: projectName,
-        type: 'ionicdev',
-        port: config.httpPort
-      });
-
-      const unpublish = function () {
-        bonjour.unpublishAll();
-        bonjour.destroy();
-      };
-
-      process.on('exit', unpublish);
-      process.on('SIGINT', unpublish);
+      } catch (e) {
+        Logger.warn('bonjour failed when trying to publish service');
+        Logger.debug(e);
+      }
     });
 }

src/dev-server/serve-config.ts

@@ -17,7 +17,7 @@ export interface ServeConfig {
   useServerLogs: boolean;
   notifyOnConsoleLog: boolean;
   useProxy: boolean;
-  bonjour: boolean;
+  devapp: boolean;
 }
 export const LOGGER_DIR = '__ion-dev-server';
 export const IONIC_LAB_URL = '/ionic-lab';

src/serve.spec.ts

@@ -38,7 +38,7 @@ describe('test serve', () => {
       useServerLogs: false,
       useProxy: true,
       notifyOnConsoleLog: false,
-      bonjour: false
+      devapp: false
     };
     spyOn(network, 'findClosestOpenPorts').and.callFake((host: string, ports: number[]) => Promise.resolve(ports));
     spyOn(notificationServer, 'createNotificationServer');

src/serve.ts

@@ -47,7 +47,7 @@ export function serve(context: BuildContext) {
         useServerLogs: useServerLogs(context),
         useProxy: useProxy(context),
         notifyOnConsoleLog: sendClientConsoleLogs(context),
-        bonjour: useBonjour(context)
+        devapp: useBonjour(context)
       };
 
       createNotificationServer(config);
@@ -144,7 +144,7 @@ function browserOption(context: BuildContext): string {
 }
 
 function useBonjour(context: BuildContext): boolean {
-  return hasConfigValue(context, '--bonjour', '-B', 'bonjour', false);
+  return hasConfigValue(context, '--devapp', '-D', 'devapp', false);
 }
 
 function launchLab(context: BuildContext): boolean {