td-server 0.2.0 → 1.1.0

package/README.md

@@ -1,2 +1,3 @@
 # td-server
+
 Server for the Tripledollar development environment.

package/lib/server.js

@@ -1,15 +1,16 @@
 #!/usr/bin/env node
 
+var ip = /^\d+\.\d+\.\d+\.\d+$/.test(process.argv0) ? process.argv0 : '127.0.0.1';
 var root = process.cwd();
 var port = process.env.TD_PORT || 3000;
 
 var connect = require('connect')
 ,   http = require('http')
-,	bodyParser = require('body-parser')
+,   bodyParser = require('body-parser')
 ,   stat = require('serve-static')
-,	queries = require('connect-query')
-,	favicon = require('serve-favicon')
-,	url = require('url')
+,   queries = require('connect-query')
+,   favicon = require('serve-favicon')
+,   url = require('url')
 ,   morgan = require('morgan');
 
 var app = connect()
@@ -19,17 +20,17 @@ var app = connect()
   .use(bodyParser.urlencoded({extended: true}))
   .use(bodyParser.json())
   .use(function (req, res, next) {
-	  if (req.url === '/exit') {
-		res.end();
-		process.exit();
-	  } if (req.url === '/status') {
-		res.write('Running on port ' + port + ' with root ' + root + '\n');
-		res.end();
-	  } else {
-		next();
-	  }
+    if (req.url === '/exit') {
+    res.end();
+    process.exit();
+    } if (req.url === '/status') {
+      res.write('Running on port ' + port + ' with root ' + root + '\n');
+      res.end();
+    } else {
+      next();
+    }
    })
   .use(stat(root));
 
-var server = http.createServer(app).listen(port, "127.0.0.1");
+var server = http.createServer(app).listen(port, ip);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "td-server",
-  "version": "0.2.0",
+  "version": "1.1.0",
   "description": "Development server for Tripledollar.",
   "main": "index.js",
   "scripts": {
@@ -12,11 +12,11 @@
   },
   "dependencies": {
     "body-parser": ">=1.10.1",
-    "connect-query": ">=0.2.0",
     "connect": ">=3.3.3",
-    "morgan": ">=1.5.0",
-    "serve-static": ">=1.7.1",
-    "serve-favicon": ">=2.2.0"
+    "connect-query": ">=0.2.0",
+    "morgan": ">=1.9.1",
+    "serve-favicon": ">=2.2.0",
+    "serve-static": ">=1.7.1"
   },
   "keywords": [
     "tripledollar"

package/lib/xserver.js

@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-
-var root = process.cwd();
-var port = process.env.TD_PORT || 3000;
-
-console.log();
-console.log('HTTP server started with PID', process.pid, 'and port', port, 'and root', root);
-console.log('Use command "td -k" to stop it.');
-console.log();
-
-var connect = require('connect')
-,   http = require('http')
-,	bodyParser = require('body-parser')
-,   stat = require('serve-static')
-,	queries = require('connect-query')
-,	favicon = require('serve-favicon')
-,	proxy = require('proxy-middleware')
-,	url = require('url')
-,   morgan = require('morgan');
-
-var app = connect()
-  .use(morgan(':date :method :url :status'))
-  .use(favicon(__dirname + '/../images/favicon.ico'))
-  .use(queries())
-  .use(bodyParser.urlencoded({extended: true}))
-  .use(bodyParser.json())
-  .use(function (req, res, next) {
-	  if (req.url === '/exit') {
-		res.end();
-		process.exit();
-	  } if (req.url === '/status') {
-		res.write('Running on port ' + port + ' with root ' + root + '\n');
-		res.end();
-	  } else {
-		next();
-	  }
-   })
-  .use(stat(root));
-
-if (process.env.TD_PROXY) {
-	console.log('PROXY', process.env.TD_PROXY);
-	var opts = url.parse(process.env.TD_PROXY);
-	opts.cookieRewrite = true;
-	opts.headers = {origin: 'http://klickonom.se'};
-	app.use('/proxy', proxy(opts));
-}
-
-var server = http.createServer(app).listen(port, "127.0.0.1");
-