From 8fddfc9e1279f072c69931a391375e10d4648832 Mon Sep 17 00:00:00 2001 From: nero120 Date: Thu, 15 Nov 2018 17:57:11 +0000 Subject: [PATCH] Replaced dependency mongojs with mongodb. Fixed deprecation warnings. --- dist/core/db.js | 8 +- dist/core/db.js.map | 2 +- dist/services/bookmarks.service.js | 4 +- dist/services/bookmarks.service.js.map | 2 +- npm-shrinkwrap.json | 122 +++++++++---------------- package.json | 3 +- src/core/db.ts | 10 +- src/services/bookmarks.service.ts | 4 +- test/integration/bookmarks.test.ts | 4 +- 9 files changed, 63 insertions(+), 96 deletions(-) diff --git a/dist/core/db.js b/dist/core/db.js index e100810..6d2fafe 100644 --- a/dist/core/db.js +++ b/dist/core/db.js @@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -const mongojs = require("mongojs"); +const mongodb = require("mongodb"); const mongoose = require("mongoose"); const config_1 = require("./config"); const exception_1 = require("./exception"); @@ -20,16 +20,18 @@ class DB { } static idIsValid(id) { let binary; + let base64Str; if (!id) { throw new exception_1.InvalidSyncIdException(); } try { - binary = mongojs.Binary(new Buffer(id, 'hex'), mongojs.Binary.SUBTYPE_UUID); + binary = new mongodb.Binary(Buffer.from(id, 'hex'), 4); + base64Str = binary.buffer.toString('base64'); } catch (err) { throw new exception_1.InvalidSyncIdException(); } - if (!binary || !binary.toJSON()) { + if (!binary || !base64Str) { throw new exception_1.InvalidSyncIdException(); } } diff --git a/dist/core/db.js.map b/dist/core/db.js.map index c465dcf..8652668 100644 --- a/dist/core/db.js.map +++ b/dist/core/db.js.map @@ -1 +1 @@ -{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/core/db.ts"],"names":[],"mappings":";;;;;;;;;;AACA,mCAAmC;AACnC,qCAAqC;AAErC,qCAA8B;AAC9B,2CAAqD;AACrD,qCAAoC;AAEpC,+BAA+B;AAC/B,MAAqB,EAAE;IAoBrB,YAAoB,GAA2E;QAA3E,QAAG,GAAH,GAAG,CAAwE;IAAI,CAAC;IAnB7F,MAAM,CAAC,SAAS,CAAC,EAAE;QACxB,IAAI,MAAM,CAAC;QAEX,IAAI,CAAC,EAAE,EAAE;YACP,MAAM,IAAI,kCAAsB,EAAE,CAAC;SACpC;QAED,IAAI;YACF,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;SAC7E;QACD,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,kCAAsB,EAAE,CAAC;SACpC;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE;YAC/B,MAAM,IAAI,kCAAsB,EAAE,CAAC;SACpC;IACH,CAAC;IAID,iCAAiC;IACpB,eAAe;;YAC1B,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAA;QAC7B,CAAC;KAAA;IAED,4DAA4D;IAC/C,cAAc;;YACzB,qDAAqD;YACrD,MAAM,OAAO,GAA+B;gBAC1C,gBAAgB,EAAE,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,WAAW;gBAC7C,SAAS,EAAE,CAAC;gBACZ,eAAe,EAAE,IAAI;aACtB,CAAC;YAEF,+BAA+B;YAC/B,MAAM,QAAQ,GAAG,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;YAC9E,MAAM,QAAQ,GAAG,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;YAE7E,6DAA6D;YAC7D,MAAM,WAAW,GAAG,aAAa,QAAQ,IAAI,QAAQ,IAAI,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,eAAe,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC;YACzK,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC;YAEnC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACpC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;oBACtB,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC9B,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAmB,EAAE,EAAE;oBACzC,IAAI,CAAC,GAAG,CAAC,iBAAQ,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;oBACtD,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;gBACtD,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AA1DD,qBA0DC"} \ No newline at end of file +{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/core/db.ts"],"names":[],"mappings":";;;;;;;;;;AACA,mCAAmC;AACnC,qCAAqC;AAErC,qCAA8B;AAC9B,2CAAqD;AACrD,qCAAoC;AAEpC,+BAA+B;AAC/B,MAAqB,EAAE;IAsBrB,YAAoB,GAA2E;QAA3E,QAAG,GAAH,GAAG,CAAwE;IAAI,CAAC;IArB7F,MAAM,CAAC,SAAS,CAAC,EAAE;QACxB,IAAI,MAAsB,CAAC;QAC3B,IAAI,SAAiB,CAAC;QAEtB,IAAI,CAAC,EAAE,EAAE;YACP,MAAM,IAAI,kCAAsB,EAAE,CAAC;SACpC;QAED,IAAI;YACF,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;YACvD,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SAC9C;QACD,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,kCAAsB,EAAE,CAAC;SACpC;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE;YACzB,MAAM,IAAI,kCAAsB,EAAE,CAAC;SACpC;IACH,CAAC;IAID,iCAAiC;IACpB,eAAe;;YAC1B,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAA;QAC7B,CAAC;KAAA;IAED,4DAA4D;IAC/C,cAAc;;YACzB,qDAAqD;YACrD,MAAM,OAAO,GAA+B;gBAC1C,gBAAgB,EAAE,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,WAAW;gBAC7C,SAAS,EAAE,CAAC;gBACZ,eAAe,EAAE,IAAI;aACtB,CAAC;YAEF,+BAA+B;YAC/B,MAAM,QAAQ,GAAG,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;YAC9E,MAAM,QAAQ,GAAG,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;YAE7E,6DAA6D;YAC7D,MAAM,WAAW,GAAG,aAAa,QAAQ,IAAI,QAAQ,IAAI,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,eAAe,gBAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC;YACzK,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC;YAEnC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACpC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;oBACtB,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC9B,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAmB,EAAE,EAAE;oBACzC,IAAI,CAAC,GAAG,CAAC,iBAAQ,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;oBACtD,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;gBACtD,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AA5DD,qBA4DC"} \ No newline at end of file diff --git a/dist/services/bookmarks.service.js b/dist/services/bookmarks.service.js index a9a3d21..ea02f24 100644 --- a/dist/services/bookmarks.service.js +++ b/dist/services/bookmarks.service.js @@ -292,8 +292,8 @@ class BookmarksService extends base_service_1.default { let newId; try { // Create a new v4 uuid and return as an unbroken string to use for a unique id - const bytes = uuid.v4(null, new Buffer(16)); - newId = new Buffer(bytes, 'base64').toString('hex'); + const bytes = uuid.v4(null, Buffer.alloc(16)); + newId = Buffer.from(bytes, 'base64').toString('hex'); } catch (err) { this.log(server_1.LogLevel.Error, 'Exception occurred in BookmarksService.newSyncId', null, err); diff --git a/dist/services/bookmarks.service.js.map b/dist/services/bookmarks.service.js.map index 95a6892..6cbe3f9 100644 --- a/dist/services/bookmarks.service.js.map +++ b/dist/services/bookmarks.service.js.map @@ -1 +1 @@ -{"version":3,"file":"bookmarks.service.js","sourceRoot":"","sources":["../../src/services/bookmarks.service.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"bookmarks.service.js","sourceRoot":"","sources":["../../src/services/bookmarks.service.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 7ea877c..59fd598 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1035,11 +1035,6 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, - "buffer-shims": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=" - }, "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", @@ -1586,7 +1581,8 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true }, "cors": { "version": "2.8.5", @@ -2406,11 +2402,6 @@ "stream-shift": "^1.0.0" } }, - "each-series": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/each-series/-/each-series-1.0.0.tgz", - "integrity": "sha1-+Ibmxm39sl7x/nNWQUbuXLR4r8s=" - }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -4713,7 +4704,8 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true }, "isexe": { "version": "2.0.0", @@ -5351,58 +5343,42 @@ "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" }, "mongodb": { - "version": "2.2.35", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.35.tgz", - "integrity": "sha1-zRta+KlGPj+aeH+ls9BVZVeXMPk=", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.1.9.tgz", + "integrity": "sha512-f+Og32wK/ovzVlC1S6Ft7yjVTvNsAOs6pBpDrPd2/3wPO9ijNsQrTNntuECjOSxGZpPVl0aRqgHzF1e9e+KvnQ==", "requires": { - "es6-promise": "3.2.1", - "mongodb-core": "2.1.19", - "readable-stream": "2.2.7" + "mongodb-core": "3.1.8", + "safe-buffer": "^5.1.2" }, "dependencies": { - "es6-promise": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz", - "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q=" - }, - "readable-stream": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz", - "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=", - "requires": { - "buffer-shims": "~1.0.0", - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~1.0.0", - "util-deprecate": "~1.0.1" - } + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" } } }, "mongodb-core": { - "version": "2.1.19", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.19.tgz", - "integrity": "sha1-APvV5aNXN2O5Fxz9hE5gqPKjoYs=", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.1.8.tgz", + "integrity": "sha512-reWCqIRNehyuLaqaz5JMOmh3Xd8JIjNX34o8mnewXLK2Fyt/Ky6BZbU+X0OPzy8qbX+JZrOtnuay7ASCieTYZw==", "requires": { - "bson": "~1.0.4", - "require_optional": "~1.0.0" - } - }, - "mongojs": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mongojs/-/mongojs-2.6.0.tgz", - "integrity": "sha512-r6tj71DjYcaRTi2jpa+CA6Iq72cTZclB2JKy+Zub+0JPTEq/l2plsAYfF2eHqSYBtZbKNcObvhGYk9E9UKZWJg==", - "requires": { - "each-series": "^1.0.0", - "mongodb": "^2.2.31", - "once": "^1.4.0", - "parse-mongo-url": "^1.1.1", - "readable-stream": "^2.3.3", - "thunky": "^1.0.2", - "to-mongodb-core": "^2.0.0", - "xtend": "^4.0.1" + "bson": "^1.1.0", + "require_optional": "^1.0.1", + "safe-buffer": "^5.1.2", + "saslprep": "^1.0.0" + }, + "dependencies": { + "bson": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.0.tgz", + "integrity": "sha512-9Aeai9TacfNtWXOYarkFJRW2CWo+dRon+fuLZYJmvLV3+MiUp0bEI6IAZfXEIg7/Pl/7IWlLaDnhzTsD81etQA==" + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "mongoose": { @@ -6132,11 +6108,6 @@ "error-ex": "^1.2.0" } }, - "parse-mongo-url": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/parse-mongo-url/-/parse-mongo-url-1.1.1.tgz", - "integrity": "sha1-ZiON9fjnwMjKTNlw1KtqE3PrdbU=" - }, "parseurl": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", @@ -7936,11 +7907,6 @@ "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", "dev": true }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" - }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -8146,6 +8112,7 @@ "version": "2.3.5", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", "integrity": "sha1-tPhQA6k4y7bsvOKhJPsQEr0ag40=", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -8159,7 +8126,8 @@ "process-nextick-args": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=" + "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=", + "dev": true } } }, @@ -8438,7 +8406,8 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=" + "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", + "dev": true }, "safe-json-stringify": { "version": "1.1.0", @@ -9128,6 +9097,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -9546,11 +9516,6 @@ "xtend": "~4.0.1" } }, - "thunky": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz", - "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=" - }, "timers-browserify": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", @@ -9572,11 +9537,6 @@ "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", "dev": true }, - "to-mongodb-core": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-mongodb-core/-/to-mongodb-core-2.0.0.tgz", - "integrity": "sha1-NZbsdhOsmtO5ioncua77pWnNJ+s=" - }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", @@ -10102,7 +10062,8 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true }, "util.promisify": { "version": "1.0.0", @@ -10534,7 +10495,8 @@ "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true }, "y18n": { "version": "4.0.0", diff --git a/package.json b/package.json index 8374388..0e77aa4 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "helmet": "^3.15.0", "mkdirp": "^0.5.1", "moment": "^2.22.2", - "mongojs": "^2.6.0", + "mongodb": "^3.1.9", "mongoose": "^5.3.12", "mongoose-uuid2": "^2.1.0", "smooth-scroll": "^15.0.0", @@ -43,6 +43,7 @@ "@types/express-rate-limit": "^2.9.3", "@types/helmet": "0.0.42", "@types/mocha": "^5.2.5", + "@types/mongodb": "^3.1.14", "@types/mongoose": "^5.3.1", "@types/node": "^10.12.7", "@types/sinon": "^5.0.5", diff --git a/src/core/db.ts b/src/core/db.ts index a8353c6..cb289c4 100644 --- a/src/core/db.ts +++ b/src/core/db.ts @@ -1,5 +1,5 @@ import { Request } from 'express'; -import * as mongojs from 'mongojs'; +import * as mongodb from 'mongodb'; import * as mongoose from 'mongoose'; import Config from './config'; @@ -9,20 +9,22 @@ import { LogLevel } from './server'; // Handles database interaction export default class DB { public static idIsValid(id): void { - let binary; + let binary: mongodb.Binary; + let base64Str: string; if (!id) { throw new InvalidSyncIdException(); } try { - binary = mongojs.Binary(new Buffer(id, 'hex'), mongojs.Binary.SUBTYPE_UUID); + binary = new mongodb.Binary(Buffer.from(id, 'hex'), 4); + base64Str = binary.buffer.toString('base64'); } catch (err) { throw new InvalidSyncIdException(); } - if (!binary || !binary.toJSON()) { + if (!binary || !base64Str) { throw new InvalidSyncIdException(); } } diff --git a/src/services/bookmarks.service.ts b/src/services/bookmarks.service.ts index 2a45fe1..2e0a00f 100644 --- a/src/services/bookmarks.service.ts +++ b/src/services/bookmarks.service.ts @@ -368,8 +368,8 @@ export default class BookmarksService extends BaseService { try { // Create a new v4 uuid and return as an unbroken string to use for a unique id - const bytes: any = uuid.v4(null, new Buffer(16)); - newId = new Buffer(bytes, 'base64').toString('hex'); + const bytes: any = uuid.v4(null, Buffer.alloc(16)); + newId = Buffer.from(bytes, 'base64').toString('hex'); } catch (err) { this.log(LogLevel.Error, 'Exception occurred in BookmarksService.newSyncId', null, err); diff --git a/test/integration/bookmarks.test.ts b/test/integration/bookmarks.test.ts index e86b9ba..1645858 100644 --- a/test/integration/bookmarks.test.ts +++ b/test/integration/bookmarks.test.ts @@ -42,8 +42,8 @@ describe('BookmarksRouter', () => { }); afterEach(async () => { - await BookmarksModel.remove({}).exec(); - await NewSyncLogsModel.remove({}).exec(); + await BookmarksModel.deleteMany({}).exec(); + await NewSyncLogsModel.deleteMany({}).exec(); await server.stop(); sandbox.restore();