Make examples and tests compatible with the new implementation

Author: fbbdev

example/fileServer.js

@@ -3,9 +3,6 @@
 /**
  * Copyright (c) 2016 Fabio Massaioli and other contributors
  *
- * Code from Node http module:
- *   Copyright Joyent, Inc. and other Node contributors
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
@@ -30,55 +27,51 @@ var fcgi = require('../index.js'),
     fs = require('fs'),
     util = require('util');
 
-var count = 0;
-
-function s(obj) {
-    return util.inspect(obj);
+function log(msg) {
+    fs.appendFileSync('fileServer.log', msg);
 }
 
 fcgi.createServer(function (req, res) {
-    count += 1;
-
-    req.on('complete', function () {
-        var path = req.url.slice(1);
-        fs.stat(path, function (err, stat) {
-            if (err) {
-                res.writeHead(500, {
-                    'Content-Type': 'text/plain; charset=utf-8',
-                    'Content-Length': err.stack.length
-                });
-                res.end(err.stack + '\n');
-            } else {
-                var stream = fs.createReadStream(path);
-                res.writeHead(200, {
-                    'Content-Type': 'application/octet-stream',
-                    'Content-Length': stat.size
-                });
-                stream.pipe(res);
-            }
-        });
+    var path = req.url.slice(1);
+    fs.stat(path, function (err, stat) {
+        if (err) {
+            res.writeHead(500, {
+                'Content-Type': 'text/plain; charset=utf-8',
+                'Content-Length': err.stack.length
+            });
+            res.end(err.stack + '\n');
+        } else {
+            var stream = fs.createReadStream(path);
+            res.writeHead(200, {
+                'Content-Type': 'application/octet-stream',
+                'Content-Length': stat.size
+            });
+            stream.pipe(res);
+        }
     });
-}).listen();
+}).listen(function () {
+    log('Listening\n');
+});
 
 process.on('uncaughtException', function (err) {
-    fs.appendFileSync('test.log', err.stack + '\n\n');
+    log(err.stack + '\n\n');
     process.exit(1);
 });
 
 process.on('exit', function () {
-    fs.appendFileSync('test.log', 'Exit - Uptime:' + process.uptime() + '\n\n');
+    log('Exit - Uptime:' + process.uptime() + '\n\n');
 });
 
 process.on('SIGTERM', function () {
-    fs.appendFileSync('test.log', 'SIGTERM\n');
+    log('SIGTERM\n');
     process.exit(0);
 });
 
 process.on('SIGINT', function () {
-    fs.appendFileSync('test.log', 'SIGINT\n');
+    log('SIGINT\n');
     process.exit(0);
 });
 
 process.on('SIGUSR1', function () {
-    fs.appendFileSync('test.log', 'SIGUSR1\n');
+    log('SIGUSR1\n');
 });

example/integration.js

@@ -3,9 +3,6 @@
 /**
  * Copyright (c) 2016 Fabio Massaioli, Robert Groh and other contributors
  *
- * Code from Node http module:
- *   Copyright Joyent, Inc. and other Node contributors
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the 'Software'), to deal in
  * the Software without restriction, including without limitation the rights to
@@ -56,11 +53,12 @@ fcgiFramework.createServer(function echo(req, res) {
         requestData = requestData + data;
     });
 
-    req.on('complete', function writeReqAsJson() {
+    req.on('end', function writeReqAsJson() {
         var echoData, size;
 
         try {
-            var strippedRequest = require('lodash').omit(req, 'connection', 'buffer', 'socket', '_events', '_readableState', 'data');
+            var strippedRequest = require('lodash').omit(req, 'client', 'connection', 'buffer', 'socket', '_events', '_readableState', 'data');
+            strippedRequest.cgiParams = req.socket.params;
             strippedRequest.data = requestData;
 
             echoData = JSON.stringify(strippedRequest, null, 4); //hopefully only here will an error be thrown
@@ -77,7 +75,7 @@ fcgiFramework.createServer(function echo(req, res) {
 
     req.on('error', answerWithError.bind(undefined, res));
 }).listen(socketPath, function cgiStarted(err) {
-    console.log('cgi app listen on socket:' + socketPath);
+    console.log('cgi app listen on socket: ' + socketPath);
     if (err) {
         throw err;
     } else {
@@ -96,6 +94,8 @@ fcgiFramework.createServer(function echo(req, res) {
                 }
             });
         });
-        server.listen(port);
+        server.listen(port, function() {
+            console.log('http server listening on port: ' + port);
+        });
     }
 });

test/mocha/integration/echo.js

@@ -1,9 +1,6 @@
 /**
  * Copyright (c) 2016 Fabio Massaioli, Robert Groh and other contributors
  *
- * Code from Node http module:
- *   Copyright Joyent, Inc. and other Node contributors
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the 'Software'), to deal in
  * the Software without restriction, including without limitation the rights to
@@ -63,8 +60,9 @@ describe('echo Server', function setup() {
             });
 
             req.on('end', function writeReqAsJson() {
-                var echoData, size, strippedRequest = require('lodash').omit(req, 'connection', 'buffer', 'socket', '_events', '_readableState', 'data');
+                var echoData, size, strippedRequest = require('lodash').omit(req, 'client', 'connection', 'buffer', 'socket', '_events', '_readableState', 'data');
 
+                strippedRequest.cgiParams = req.socket.params;
                 strippedRequest.data = requestData;
 
                 try {
@@ -168,7 +166,7 @@ describe('echo Server', function setup() {
 
             var echo = JSON.parse(body);
             expect(echo).to.have.deep.property('cgiParams.PATH_INFO', requestPath);
-            expect(echo).to.have.deep.property('_queryString', 'a=b&ca=d');
+            expect(echo).to.have.deep.property('url', requestPath + '?a=b&ca=d');
 
             done(err);
         });