Merge pull request #2 from Nexmo/markl-remove-client-tests

Remove client tests

Author: Mark Lewin

README.md

@@ -31,7 +31,7 @@ Fill in the values in `.env` as appropriate.
 Run the following command in the application directory:
 
 ```sh
-node receive-concat-express.js
+npm start
 ```
 The application should be running on the port you specified in `.env`.
 
@@ -43,9 +43,9 @@ https://demo.ngrok.io/webhooks/inbound-sms
 
 ### Using the App
 
-Send a long (> 160 standard GSM characters) text message to the number you specified in the `TO_NUMBER` setting in your `.env` file. Alternatively, you can use `send-sms-concat.js` for testing.
+Send a long (> 160 standard GSM characters) text message to the number you specified in the `TO_NUMBER` setting in your `.env` file.
 
-The console output of `receive-concat-express.js` should show the invididual message parts and then the complete message once all the parts have been received and reassembled.
+The console output of `server.js` should show the invididual message parts and then the complete message once all the parts have been received and reassembled.
 
 ## License
 

send-sms-concat.js

@@ -0,0 +1,75 @@
+require('dotenv').config();
+const app = require('express')();
+const bodyParser = require('body-parser');
+
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: true }));
+
+app
+    .route('/webhooks/inbound-sms')
+    .get(handleInboundSms)
+    .post(handleInboundSms);
+
+let concat_sms = []; // Array of message objects
+
+function handleInboundSms(request, response) {
+    const params = Object.assign(request.query, request.body);
+
+    if (params['concat'] === 'true') {
+        /* This is a concatenated message. Add it to an array
+           so that we can process it later. */
+        concat_sms.push({
+            ref: params['concat-ref'],
+            part: params['concat-part'],
+            from: params.msisdn,
+            message: params.text
+        });
+
+        /* Do we have all the message parts yet? They might
+           not arrive consecutively. */
+        let parts_for_ref = concat_sms.filter(function (part) {
+            return part.ref == params['concat-ref'];
+        });
+
+        // Is this the last message part for this reference?
+        if (parts_for_ref.length == params['concat-total']) {
+            console.dir(parts_for_ref);
+            processConcatSms(parts_for_ref);
+        }
+    } else {
+        // Not a concatenated message, so just display it
+        displaySms(params.msisdn, params.text);
+    }
+
+    // Send OK status
+    response.status(204).send();
+}
+
+function processConcatSms(all_parts) {
+
+    // Order all the message parts
+    all_parts.sort(function (a, b) {
+        if (Number(a.part) < Number(b.part)) {
+            return -1;
+        } else {
+            return 1;
+        }
+    })
+
+    let concat_message = '';
+
+    // Reassemble the message from the parts
+    for (i = 0; i < all_parts.length; i++) {
+        concat_message += all_parts[i].message;
+    }
+
+    displaySms(all_parts[0].from, concat_message);
+}
+
+function displaySms(msisdn, text) {
+    console.log('FROM: ' + msisdn);
+    console.log('MESSAGE: ' + text);
+    console.log('---');
+}
+
+app.listen(process.env.PORT);