From 626e913d485ad984bd1e79a5035d9f0de95e8354 Mon Sep 17 00:00:00 2001 From: Martin Donnelly Date: Fri, 7 Oct 2016 11:46:44 +0100 Subject: [PATCH] Removing mDot code and preparing for new Amazon Server --- app.js | 6 ++++- app/lib/base64.js | 61 +++++++++++++++++++++++++++++++++++++++++++++++ bower.json | 3 ++- 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 app/lib/base64.js diff --git a/app.js b/app.js index f9706e2..a84a9f3 100644 --- a/app.js +++ b/app.js @@ -133,6 +133,9 @@ app.post('/api/calendar/extend', function(req, res) { + + + // Events and sockets busEmitter.on('clientConnected', (socketSet) => { @@ -256,7 +259,8 @@ app.post('/api/v1/extend', function(req, res) { }); -app.listen(3000, function() { + +app.listen(3002, function() { logger.info('Express listening on 3000'); restartTimer(); }); diff --git a/app/lib/base64.js b/app/lib/base64.js new file mode 100644 index 0000000..d5e6af2 --- /dev/null +++ b/app/lib/base64.js @@ -0,0 +1,61 @@ +;(function () { + + var object = typeof exports != 'undefined' ? exports : self; // #8: web workers + var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='; + + function InvalidCharacterError(message) { + this.message = message; + } + InvalidCharacterError.prototype = new Error; + InvalidCharacterError.prototype.name = 'InvalidCharacterError'; + + // encoder + // [https://gist.github.com/999166] by [https://github.com/nignag] + object.btoa || ( + object.btoa = function (input) { + var str = String(input); + for ( + // initialize result and counter + var block, charCode, idx = 0, map = chars, output = ''; + // if the next str index does not exist: + // change the mapping table to "=" + // check if d has no fractional digits + str.charAt(idx | 0) || (map = '=', idx % 1); + // "8 - idx % 1 * 8" generates the sequence 2, 4, 6, 8 + output += map.charAt(63 & block >> 8 - idx % 1 * 8) + ) { + charCode = str.charCodeAt(idx += 3/4); + if (charCode > 0xFF) { + throw new InvalidCharacterError("'btoa' failed: The string to be encoded contains characters outside of the Latin1 range."); + } + block = block << 8 | charCode; + } + return output; + }); + + // decoder + // [https://gist.github.com/1020396] by [https://github.com/atk] + object.atob || ( + object.atob = function (input) { + var str = String(input).replace(/=+$/, ''); + if (str.length % 4 == 1) { + throw new InvalidCharacterError("'atob' failed: The string to be decoded is not correctly encoded."); + } + for ( + // initialize result and counters + var bc = 0, bs, buffer, idx = 0, output = ''; + // get next character + buffer = str.charAt(idx++); + // character found in table? initialize bit storage and add its ascii value; + ~buffer && (bs = bc % 4 ? bs * 64 + buffer : buffer, + // and if not first of each 4 characters, + // convert the first 8 bits to one ascii character + bc++ % 4) ? output += String.fromCharCode(255 & bs >> (-2 * bc & 6)) : 0 + ) { + // try to find character in table (0-63, not found => -1) + buffer = chars.indexOf(buffer); + } + return output; + }); + +}()); diff --git a/bower.json b/bower.json index d4a01f7..9622781 100644 --- a/bower.json +++ b/bower.json @@ -20,6 +20,7 @@ "jquery": "^2.2.3", "mui": "^0.6.8", "sugarjs-date": "^1.5.1", - "backbone": "^1.3.3" + "backbone": "^1.3.3", + "base64": "^1.0.0" } }