1.1.1

wrong execution path for index.js - fixed

README.md

@@ -8,12 +8,12 @@ Make sure you have the latest stable version of [Node.js][3] installed on your c
 
 ```console
 $ node -v
-v0.12.6
+v7.0.0
 ```
-Install `forever` and `xcarve-proxy` on your computer using `npm`.
+Install `xcarve-proxy` on your computer using `npm`.
 
 ```console
-$ npm install -g forever xcarve-proxy
+$ npm install -g xcarve-proxy
 ```
 
 ## Starting the Proxy
@@ -43,7 +43,7 @@ stopping proxy...
 ```
 ## License
 
-Copyright (c) 2015 Adafruit Industries. Licensed under the MIT license.
+Copyright (c) 2015-2016 Adafruit Industries. Licensed under the MIT license.
 
 Adafruit invests time and resources providing this open source code,
 please support Adafruit and open-source hardware by purchasing products
@@ -52,4 +52,4 @@ from [Adafruit](https://adafruit.com)!
 [1]: https://github.com/adafruit/xcarve-server
 [2]: http://easel.inventables.com
 [3]: https://nodejs.org
-[4]: https://learn.adafruit.com/control-an-xcarve-wirelessly
+[4]: https://learn.adafruit.com/control-an-xcarve-cnc-machine-wirelessly-with-a-raspberry-pi

cli

@@ -1,42 +1,53 @@
 #!/usr/bin/env node
 
-var spawn = require('child_process').spawn,
+var pm2 = require('pm2'),
     fs = require('fs'),
     path = require('path'),
     logo = fs.readFileSync(path.join(__dirname,'logo.txt'), 'utf8'),
     cli = require('commander'),
     package = require('./package.json');
 
-
-var command = process.platform === 'win32' ? 'forever.cmd' : 'forever';
-
 function start() {
 
-  var child = spawn(command, ['start', '-c', 'node', 'index.js', '-s'], {
-    cwd: __dirname,
-    env: process.env,
-    detached: true
-  });
-
   console.log(logo);
-  console.log('starting proxy on port 1338...');
 
-  child.on('error', console.log);
+  pm2.connect((err) => {
+
+    if(err) {
+      console.error(err);
+      process.exit(2);
+    }
+
+    pm2.start({
+      script: path.join(__dirname,'index.js'),
+      name: 'xcarve'
+    }, (err, apps) => {
+      pm2.disconnect();
+      if (err) throw err
+      console.log('starting proxy on port 1338...\n');
+    });
+
+  });
 
 }
 
 function stop() {
 
-  var child = spawn(command, ['stop', '-c', 'node', 'index.js', '-s'], {
+  pm2.connect((err) => {
-    cwd: __dirname,
+
-    env: process.env,
+    if(err) {
-    detached: true
+      console.error(err);
+      process.exit(2);
+    }
+
+    pm2.stop('xcarve', (err) => {
+      if(err) throw err;
+      console.log('stopping proxy...');
+      process.exit();
+    });
+
   });
 
-  console.log('stopping proxy...');
-
-  child.on('error', console.log);
-
 }
 
 cli.version(package.version);
@@ -47,5 +58,3 @@ cli.parse(process.argv);
 if (!process.argv.slice(2).length) {
   cli.outputHelp();
 }
-
-process.exit();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcarve-proxy",
-  "version": "1.0.8",
+  "version": "1.1.1",
   "description": "A Node.js proxy server for connecting to a Raspberry Pi that is running xcarve-server.",
   "bin": "./cli",
   "scripts": {
@@ -24,6 +24,7 @@
   "homepage": "https://github.com/adafruit/xcarve-proxy",
   "dependencies": {
     "commander": "^2.8.1",
-    "http-proxy": "^1.11.1"
+    "http-proxy": "^1.11.1",
+    "pm2": "^2.1.4"
   }
 }