Refactored node todo sample

Author: JocaPC

samples/features/json/todo-app/nodejs-express4-rest-api/.vscode/launch.json

@@ -0,0 +1,21 @@
+{
+    // Use IntelliSense to learn about possible Node.js debug attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "program": "${workspaceRoot}\\bin\\www",
+            "cwd": "${workspaceRoot}"
+        },
+        {
+            "type": "node",
+            "request": "attach",
+            "name": "Attach to Process",
+            "port": 5858
+        }
+    ]
+}

samples/features/json/todo-app/nodejs-express4-rest-api/README.md

@@ -29,7 +29,8 @@ To run this sample, you need the following prerequisites.
 **Software prerequisites:**
 
 1. SQL Server 2016 (or higher) or an Azure SQL Database
-2. Visual Studio 2015 (or higher) with the NodeJS
+2. Node.js runtime.
+
 
 **Azure prerequisites:**
 
@@ -39,13 +40,12 @@ To run this sample, you need the following prerequisites.
 
 ## Run this sample
 
-1. Navigate to the folder where you have downloaded sample and run **npm install** in command window, or run setup.bat if you are on Windows operating system. This command will install necessary npm packages defined in project.json.
-
-2. From SQL Server Management Studio or SQL Server Data Tools connect to your SQL Server 2016 or Azure SQL database and execute setup.sql script that will create and populate Todo table in the database.
+1. Navigate to the folder where you have downloaded sample and run **npm install** in command window.
 
-3. From Visual Studio, open the **TodoApp.xproj** file from the root directory,
+2. From SQL Server Management Studio or SQL Server Data Tools connect to your SQL Server 2016 or Azure SQL database and
+execute setup.sql script that will create and populate Todo table in the database.
 
-4. Locate db.js file in the project, change database connection info in createConnection() method to reference your database. the following tokens should be replaced:
+3. Locate db.js file in the project, change database connection info in createConnection() method to reference your database. the following tokens should be replaced:
  1. SERVERNAME - name of the database server.
  2. DATABASE - Name of database where Todo table is stored.
  3. USERNAME - SQL Server login that can access table data and execute stored procedures.
@@ -61,10 +61,9 @@ To run this sample, you need the following prerequisites.
     };
 ```
 
-5. Build project using Ctrl+Shift+B, right-click on project + Build, or Build/Build Solution from menu.
-
-6. Run sample app using F5 or Ctrl+F5. /todo Url will be opened with a list of all Todo items as a JSON array,
- 1. Open /api/Todo/1 Url to get details about a single Todo item with id 1,
+4. Run sample app from the command line using **node app.js**
+ 1. Open http://localhost:3000/todo Url to get list of all Todo items from a table,
+ 2. Open http://localhost:3000/todo/1 Url to get details about a single Todo item with id 1,
  2. Send POST, PUT, or DELETE Http requests to update content of Todo table.
 
 <a name=sample-details></a>

samples/features/json/todo-app/nodejs-express4-rest-api/app.js

@@ -11,5 +11,10 @@ app.use(function (req, res, next) {
     err.status = 404;
     next(err);
 });
+app.set('port', process.env.PORT || 3000);
+
+var server = app.listen(app.get('port'), function() {
+    console.log('Express server listening on port ' + server.address().port);
+});
 
 module.exports = app;

samples/features/json/todo-app/nodejs-express4-rest-api/bin/www

@@ -1,9 +1,3 @@
 #!/usr/bin/env node
 var debug = require('debug')('nodejs_express4_rest_api');
 var app = require('../app');
-
-app.set('port', process.env.PORT || 3000);
-
-var server = app.listen(app.get('port'), function() {
-    debug('Express server listening on port ' + server.address().port);
-});

samples/features/json/todo-app/nodejs-express4-rest-api/db.js

@@ -30,40 +30,47 @@ function createRequest(query, connection) {
 
 function stream (query, connection, output, defaultContent) {
 
-    errorHandler = function (ex) { throw ex; };
     var request = query;
     if (typeof query == "string") {
         request = this.createRequest(query, connection);
     }
-    
+    pipe(request, output, defaultContent);
+}
+
+function pipe (request, output, defaultContent) {
     var empty = true;
     request.on('row', function (columns) {
         empty = false;
         output.write(columns[0].value);
     });
-    
+
     request.on('done', function (rowCount, more, rows) {
-        if (empty) {
-            output.write(defaultContent);
-        }
-        output.end();
+        _OnDone(empty, defaultContent, output);
     });
-    
+
     request.on('doneProc', function (rowCount, more, rows) {
-        if (empty) {
+        _OnDone(empty, defaultContent, output);
+    }); 
+}
+
+function _OnDone(empty, defaultContent, output) { 
+        if(empty) { 
             output.write(defaultContent);
-        }
-        output.end();
-    });
-    
-    connection.on('connect', function (err) {
-        if (err) {
-            throw err;
-        }
-        connection.execSql(request);
-    });
+        } 
+        try { output.end(); } catch (err) { /* Ignore stream close error. */ }
+    }
+
+function executeRequest (request, connection) { 
+        connection.on('connect', function (err) {
+            if (err) {
+                throw err;
+            }
+            connection.execSql(request);
+        });
 }
 
 module.exports.createConnection = createConnection;
-module.exports.createRequest = createRequest;
-module.exports.stream = stream;
+module.exports.createRequest = createRequest; 
+module.exports.executeRequest = executeRequest;
+module.exports.stream = stream;
+module.exports.pipe = pipe;

samples/features/json/todo-app/nodejs-express4-rest-api/routes/todo.js

@@ -27,12 +27,7 @@ router.post('/', function (req, res) {
 
     request.addParameter('todo', TYPES.NVarChar, req.body);
 
-    connection.on('connect', function (err) {
-        if (err) {
-            throw err;
-        }
-        connection.execSql(request);
-    });
+    db.executeRequest(request, connection);
 });
 
 /* PUT update task. */
@@ -44,12 +39,7 @@ router.put('/:id', function (req, res) {
     request.addParameter('id', TYPES.Int, req.params.id);
     request.addParameter('todo', TYPES.NVarChar, req.body);
 
-    connection.on('connect', function (err) {
-        if (err) {
-            throw err;
-        }
-        connection.execSql(request);
-    });
+    db.executeRequest(request, connection);
 });
 
 /* DELETE single task. */
@@ -60,12 +50,7 @@ router.delete('/:id', function (req, res) {
 
     request.addParameter('id', TYPES.Int, req.params.id);
 
-    connection.on('connect', function (err) {
-        if (err) {
-            throw err;
-        }
-        connection.execSql(request);
-    });
+    db.executeRequest(request, connection);
 });
 
 module.exports = router;