From 90dc5b4ad080a2ae066bfd30cdf40d5ade41d00a Mon Sep 17 00:00:00 2001 From: Daniel Moran Date: Mon, 27 Jun 2016 12:05:57 +0200 Subject: [PATCH 1/3] FIX Merge configuration with the device info in device retrieval --- lib/services/devices/deviceService.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/services/devices/deviceService.js b/lib/services/devices/deviceService.js index 093f1e52e..eac44a27a 100644 --- a/lib/services/devices/deviceService.js +++ b/lib/services/devices/deviceService.js @@ -618,7 +618,7 @@ function checkRegistry(fn) { function findOrCreate(deviceId, group, callback) { getDevice(deviceId, group.service, group.subservice, function(error, device) { if (!error && device) { - callback(null, device); + callback(null, device, group); } else if (error.name === 'DEVICE_NOT_FOUND') { var newDevice = { id: deviceId, @@ -631,7 +631,9 @@ function findOrCreate(deviceId, group, callback) { newDevice.protocol = config.getConfig().iotManager.protocol; } - registerDevice(newDevice, callback); + registerDevice(newDevice, function(error, device) { + callback(error, device, group); + }); } else { callback(error); } @@ -662,7 +664,17 @@ function retrieveDevice(deviceId, apiKey, callback) { } else { async.waterfall([ apply(groupService.get, config.getConfig().defaultResource || '', apiKey), - apply(findOrCreate, deviceId) + apply(findOrCreate, deviceId), + apply(mergeDeviceWithConfiguration, + [ + 'lazy', + 'active', + 'staticAttributes', + 'commands', + 'subscriptions' + ], + [null, null, [], [], [], [], []] + ) ], callback); } } From d002e1d54d2e379f7dd7654332773d04b0fa4fc9 Mon Sep 17 00:00:00 2001 From: Daniel Moran Date: Mon, 27 Jun 2016 12:17:20 +0200 Subject: [PATCH 2/3] ADD Environment variable to control single configuration mode --- CHANGES_NEXT_RELEASE | 7 ++----- README.md | 1 + lib/commonConfig.js | 4 ++++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index dc2baa242..a556e913b 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,5 +1,2 @@ -- ADD migration tool to migrate data from C++ IoTAgents to Node.js based ones (#388) -- FIX changing the log level with environment variables did not work -- Add functions to allow the IoTAs to check or create devices (#392) -- ADD version retrieval path (#395) -- Use the attributes defined in the Configuration as default alias values (#397) +- Merge configuration information in the retrieveDevice() function (#405) +- Expose the singleConfigurationMode attribute using environment variables (#404) diff --git a/README.md b/README.md index 4b068ca6a..89c23f393 100644 --- a/README.md +++ b/README.md @@ -929,6 +929,7 @@ The following table shows the accepted environment variables, as well as the con | IOTA_MONGO_HOST | mongodb.host | | IOTA_MONGO_PORT | mongodb.port | | IOTA_MONGO_DB | mongodb.db | +| IOTA_SINGLE_MODE | singleConfigurationMode | ## About API The library provides a simple operation to retrieve information about the library and the IoTA using it. A GET request diff --git a/lib/commonConfig.js b/lib/commonConfig.js index 760c13c9f..eab272790 100644 --- a/lib/commonConfig.js +++ b/lib/commonConfig.js @@ -164,6 +164,10 @@ function processEnvironmentVariables() { if (process.env.IOTA_MONGO_REPLICASET) { config.mongodb.replicaSet = process.env.IOTA_MONGO_REPLICASET; } + + if (process.env.IOTA_SINGLE_MODE) { + config.singleConfigurationMode = process.env.IOTA_SINGLE_MODE; + } } function setConfig(newConfig) { From 00f387d6debeb6194e216d7e3a8d6b19997f190d Mon Sep 17 00:00:00 2001 From: Daniel Moran Date: Mon, 27 Jun 2016 12:20:46 +0200 Subject: [PATCH 3/3] Prepare bugfix --- npm-shrinkwrap.json | 372 ++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 187 insertions(+), 187 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 26c71c3ec..b810e8eac 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,30 +1,30 @@ { "name": "iotagent-node-lib", - "version": "2.1.1", + "version": "2.1.2", "dependencies": { "async": { "version": "0.9.2", - "from": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "from": "async@>=0.9.0 <0.10.0", "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz" }, "body-parser": { "version": "1.15.2", - "from": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz", + "from": "body-parser@>=1.11.0 <2.0.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz", "dependencies": { "bytes": { "version": "2.4.0", - "from": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", + "from": "bytes@2.4.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz" }, "content-type": { "version": "1.0.2", - "from": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", + "from": "content-type@>=1.0.2 <1.1.0", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz" }, "debug": { "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "from": "debug@>=2.2.0 <2.3.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "dependencies": { "ms": { @@ -36,83 +36,83 @@ }, "depd": { "version": "1.1.0", - "from": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", + "from": "depd@>=1.1.0 <1.2.0", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" }, "http-errors": { "version": "1.5.0", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", + "from": "http-errors@>=1.5.0 <1.6.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", "dependencies": { "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@2.0.1", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "setprototypeof": { "version": "1.0.1", - "from": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz", + "from": "setprototypeof@1.0.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz" }, "statuses": { "version": "1.3.0", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz", + "from": "statuses@>=1.3.0 <2.0.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz" } } }, "iconv-lite": { "version": "0.4.13", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", + "from": "iconv-lite@0.4.13", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" }, "on-finished": { "version": "2.3.0", - "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "from": "on-finished@>=2.3.0 <2.4.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "dependencies": { "ee-first": { "version": "1.1.1", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "from": "ee-first@1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" } } }, "qs": { "version": "6.2.0", - "from": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz", + "from": "qs@6.2.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz" }, "raw-body": { "version": "2.1.7", - "from": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", + "from": "raw-body@>=2.1.7 <2.2.0", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", "dependencies": { "unpipe": { "version": "1.0.0", - "from": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "from": "unpipe@1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" } } }, "type-is": { "version": "1.6.13", - "from": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", + "from": "type-is@>=1.6.13 <1.7.0", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", "dependencies": { "media-typer": { "version": "0.3.0", - "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "from": "media-typer@0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" }, "mime-types": { "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "from": "mime-types@>=2.1.11 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", "dependencies": { "mime-db": { "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", + "from": "mime-db@>=1.23.0 <1.24.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" } } @@ -123,243 +123,243 @@ }, "command-shell-lib": { "version": "1.0.0", - "from": "https://registry.npmjs.org/command-shell-lib/-/command-shell-lib-1.0.0.tgz", + "from": "command-shell-lib@1.0.0", "resolved": "https://registry.npmjs.org/command-shell-lib/-/command-shell-lib-1.0.0.tgz" }, "express": { "version": "4.14.0", - "from": "https://registry.npmjs.org/express/-/express-4.14.0.tgz", + "from": "express@>=4.11.2 <5.0.0", "resolved": "https://registry.npmjs.org/express/-/express-4.14.0.tgz", "dependencies": { "accepts": { "version": "1.3.3", - "from": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", + "from": "accepts@>=1.3.3 <1.4.0", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", "dependencies": { "mime-types": { "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "from": "mime-types@>=2.1.11 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", "dependencies": { "mime-db": { "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", + "from": "mime-db@>=1.23.0 <1.24.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" } } }, "negotiator": { "version": "0.6.1", - "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "from": "negotiator@0.6.1", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz" } } }, "array-flatten": { "version": "1.1.1", - "from": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "from": "array-flatten@1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" }, "content-disposition": { "version": "0.5.1", - "from": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz", + "from": "content-disposition@0.5.1", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz" }, "content-type": { "version": "1.0.2", - "from": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", + "from": "content-type@>=1.0.2 <1.1.0", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz" }, "cookie": { "version": "0.3.1", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "from": "cookie@0.3.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz" }, "cookie-signature": { "version": "1.0.6", - "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "from": "cookie-signature@1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" }, "debug": { "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "from": "debug@>=2.2.0 <2.3.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "dependencies": { "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "from": "ms@0.7.1", "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" } } }, "depd": { "version": "1.1.0", - "from": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", + "from": "depd@>=1.1.0 <1.2.0", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" }, "encodeurl": { "version": "1.0.1", - "from": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "from": "encodeurl@>=1.0.1 <1.1.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz" }, "escape-html": { "version": "1.0.3", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "from": "escape-html@>=1.0.3 <1.1.0", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" }, "etag": { "version": "1.7.0", - "from": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", + "from": "etag@>=1.7.0 <1.8.0", "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz" }, "finalhandler": { "version": "0.5.0", - "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz", + "from": "finalhandler@0.5.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz", "dependencies": { "statuses": { "version": "1.3.0", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz", + "from": "statuses@>=1.3.0 <1.4.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz" }, "unpipe": { "version": "1.0.0", - "from": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "from": "unpipe@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" } } }, "fresh": { "version": "0.3.0", - "from": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", + "from": "fresh@0.3.0", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz" }, "merge-descriptors": { "version": "1.0.1", - "from": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "from": "merge-descriptors@1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" }, "methods": { "version": "1.1.2", - "from": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "from": "methods@>=1.1.2 <1.2.0", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" }, "on-finished": { "version": "2.3.0", - "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "from": "on-finished@>=2.3.0 <2.4.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "dependencies": { "ee-first": { "version": "1.1.1", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "from": "ee-first@1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" } } }, "parseurl": { "version": "1.3.1", - "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "from": "parseurl@>=1.3.1 <1.4.0", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" }, "path-to-regexp": { "version": "0.1.7", - "from": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "from": "path-to-regexp@0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" }, "proxy-addr": { "version": "1.1.2", - "from": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz", + "from": "proxy-addr@>=1.1.2 <1.2.0", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz", "dependencies": { "forwarded": { "version": "0.1.0", - "from": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", + "from": "forwarded@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz" }, "ipaddr.js": { "version": "1.1.1", - "from": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz", + "from": "ipaddr.js@1.1.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz" } } }, "qs": { "version": "6.2.0", - "from": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz", + "from": "qs@6.2.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz" }, "range-parser": { "version": "1.2.0", - "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "from": "range-parser@>=1.2.0 <1.3.0", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz" }, "send": { "version": "0.14.1", - "from": "https://registry.npmjs.org/send/-/send-0.14.1.tgz", + "from": "send@0.14.1", "resolved": "https://registry.npmjs.org/send/-/send-0.14.1.tgz", "dependencies": { "destroy": { "version": "1.0.4", - "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "from": "destroy@>=1.0.4 <1.1.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" }, "http-errors": { "version": "1.5.0", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", + "from": "http-errors@>=1.5.0 <1.6.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", "dependencies": { "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@2.0.1", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "setprototypeof": { "version": "1.0.1", - "from": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz", + "from": "setprototypeof@1.0.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz" } } }, "mime": { "version": "1.3.4", - "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "from": "mime@1.3.4", "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" }, "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "from": "ms@0.7.1", "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" }, "statuses": { "version": "1.3.0", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz", + "from": "statuses@>=1.3.0 <1.4.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz" } } }, "serve-static": { "version": "1.11.1", - "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz", + "from": "serve-static@>=1.11.1 <1.12.0", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz" }, "type-is": { "version": "1.6.13", - "from": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", + "from": "type-is@>=1.6.13 <1.7.0", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", "dependencies": { "media-typer": { "version": "0.3.0", - "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "from": "media-typer@0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" }, "mime-types": { "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "from": "mime-types@>=2.1.11 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", "dependencies": { "mime-db": { "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", + "from": "mime-db@>=1.23.0 <1.24.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" } } @@ -368,78 +368,78 @@ }, "utils-merge": { "version": "1.0.0", - "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "from": "utils-merge@1.0.0", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" }, "vary": { "version": "1.1.0", - "from": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz", + "from": "vary@>=1.1.0 <1.2.0", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz" } } }, "logops": { "version": "1.0.0-alpha.7", - "from": "https://registry.npmjs.org/logops/-/logops-1.0.0-alpha.7.tgz", + "from": "logops@1.0.0-alpha.7", "resolved": "https://registry.npmjs.org/logops/-/logops-1.0.0-alpha.7.tgz", "dependencies": { "colors": { "version": "1.1.2", - "from": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "from": "colors@>=1.1.2 <2.0.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz" }, "json-stringify-safe": { "version": "5.0.1", - "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "from": "json-stringify-safe@>=5.0.1 <6.0.0", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, "lodash.omit": { "version": "4.3.0", - "from": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.3.0.tgz", + "from": "lodash.omit@>=4.1.0 <5.0.0", "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.3.0.tgz", "dependencies": { "lodash._basedifference": { "version": "4.5.0", - "from": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz", + "from": "lodash._basedifference@>=4.5.0 <4.6.0", "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz", "dependencies": { "lodash._root": { "version": "3.0.1", - "from": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "from": "lodash._root@>=3.0.0 <3.1.0", "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz" } } }, "lodash._baseflatten": { "version": "4.2.1", - "from": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz", + "from": "lodash._baseflatten@>=4.2.0 <4.3.0", "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz" }, "lodash.keysin": { "version": "4.1.4", - "from": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-4.1.4.tgz", + "from": "lodash.keysin@>=4.0.0 <5.0.0", "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-4.1.4.tgz" }, "lodash.rest": { "version": "4.0.3", - "from": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.3.tgz", + "from": "lodash.rest@>=4.0.0 <5.0.0", "resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.3.tgz" } } }, "serr": { "version": "0.2.0", - "from": "https://registry.npmjs.org/serr/-/serr-0.2.0.tgz", + "from": "serr@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/serr/-/serr-0.2.0.tgz", "dependencies": { "lodash.isfunction": { "version": "3.0.8", - "from": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.8.tgz", + "from": "lodash.isfunction@>=3.0.6 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.8.tgz" }, "lodash.isobject": { "version": "3.0.2", - "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", + "from": "lodash.isobject@>=3.0.2 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz" } } @@ -448,37 +448,37 @@ }, "mongodb": { "version": "2.1.18", - "from": "https://registry.npmjs.org/mongodb/-/mongodb-2.1.18.tgz", + "from": "mongodb@2.1.18", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.1.18.tgz", "dependencies": { "es6-promise": { "version": "3.0.2", - "from": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", + "from": "es6-promise@3.0.2", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz" }, "mongodb-core": { "version": "1.3.18", - "from": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.18.tgz", + "from": "mongodb-core@1.3.18", "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.18.tgz", "dependencies": { "bson": { "version": "0.4.23", - "from": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz", + "from": "bson@>=0.4.23 <0.5.0", "resolved": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz" }, "require_optional": { "version": "1.0.0", - "from": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz", + "from": "require_optional@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz", "dependencies": { "semver": { - "version": "5.1.0", - "from": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz" + "version": "5.1.1", + "from": "semver@>=5.1.0 <6.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz" }, "resolve-from": { "version": "2.0.0", - "from": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "from": "resolve-from@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz" } } @@ -487,27 +487,27 @@ }, "readable-stream": { "version": "1.0.31", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", + "from": "readable-stream@1.0.31", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -515,58 +515,58 @@ } }, "mongoose": { - "version": "4.5.1", - "from": "https://registry.npmjs.org/mongoose/-/mongoose-4.5.1.tgz", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.5.1.tgz", + "version": "4.5.2", + "from": "mongoose@>=4.1.5 <5.0.0", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.5.2.tgz", "dependencies": { "async": { "version": "1.5.2", - "from": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "from": "async@1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" }, "bson": { "version": "0.4.23", - "from": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz", + "from": "bson@>=0.4.23 <0.5.0", "resolved": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz" }, "hooks-fixed": { "version": "1.1.0", - "from": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-1.1.0.tgz", + "from": "hooks-fixed@1.1.0", "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-1.1.0.tgz" }, "kareem": { "version": "1.1.0", - "from": "https://registry.npmjs.org/kareem/-/kareem-1.1.0.tgz", + "from": "kareem@1.1.0", "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.1.0.tgz" }, "mpath": { "version": "0.2.1", - "from": "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz", + "from": "mpath@0.2.1", "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz" }, "mpromise": { "version": "0.5.5", - "from": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz", + "from": "mpromise@0.5.5", "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz" }, "mquery": { "version": "1.11.0", - "from": "https://registry.npmjs.org/mquery/-/mquery-1.11.0.tgz", + "from": "mquery@1.11.0", "resolved": "https://registry.npmjs.org/mquery/-/mquery-1.11.0.tgz", "dependencies": { "bluebird": { "version": "2.10.2", - "from": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz", + "from": "bluebird@2.10.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz" }, "debug": { "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "from": "debug@2.2.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz" }, "sliced": { "version": "0.0.5", - "from": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz", + "from": "sliced@0.0.5", "resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz" } } @@ -578,89 +578,89 @@ }, "muri": { "version": "1.1.0", - "from": "https://registry.npmjs.org/muri/-/muri-1.1.0.tgz", + "from": "muri@1.1.0", "resolved": "https://registry.npmjs.org/muri/-/muri-1.1.0.tgz" }, "regexp-clone": { "version": "0.0.1", - "from": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz", + "from": "regexp-clone@0.0.1", "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz" }, "sliced": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", + "from": "sliced@1.0.1", "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz" } } }, "mu2": { "version": "0.5.21", - "from": "https://registry.npmjs.org/mu2/-/mu2-0.5.21.tgz", + "from": "mu2@>=0.5.20 <0.6.0", "resolved": "https://registry.npmjs.org/mu2/-/mu2-0.5.21.tgz" }, "mustache": { "version": "0.8.2", - "from": "https://registry.npmjs.org/mustache/-/mustache-0.8.2.tgz", + "from": "mustache@0.8.2", "resolved": "https://registry.npmjs.org/mustache/-/mustache-0.8.2.tgz" }, "node-uuid": { "version": "1.4.7", - "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", + "from": "node-uuid@>=1.4.1 <2.0.0", "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" }, "request": { "version": "2.72.0", - "from": "https://registry.npmjs.org/request/-/request-2.72.0.tgz", + "from": "request@>=2.39.0 <3.0.0", "resolved": "https://registry.npmjs.org/request/-/request-2.72.0.tgz", "dependencies": { "aws-sign2": { "version": "0.6.0", - "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "from": "aws-sign2@>=0.6.0 <0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" }, "aws4": { "version": "1.4.1", - "from": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz", + "from": "aws4@>=1.2.1 <2.0.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz" }, "bl": { "version": "1.1.2", - "from": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", + "from": "bl@>=1.1.2 <1.2.0", "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", "dependencies": { "readable-stream": { "version": "2.0.6", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "from": "readable-stream@>=2.0.5 <2.1.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "from": "isarray@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" }, "process-nextick-args": { "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "from": "process-nextick-args@>=1.0.6 <1.1.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "util-deprecate": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "from": "util-deprecate@>=1.0.1 <1.1.0", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" } } @@ -669,148 +669,148 @@ }, "caseless": { "version": "0.11.0", - "from": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "from": "caseless@>=0.11.0 <0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" }, "combined-stream": { "version": "1.0.5", - "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "from": "combined-stream@>=1.0.5 <1.1.0", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "dependencies": { "delayed-stream": { "version": "1.0.0", - "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "from": "delayed-stream@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" } } }, "extend": { "version": "3.0.0", - "from": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz", + "from": "extend@>=3.0.0 <3.1.0", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" }, "forever-agent": { "version": "0.6.1", - "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "from": "forever-agent@>=0.6.1 <0.7.0", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" }, "form-data": { "version": "1.0.0-rc4", - "from": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", + "from": "form-data@>=1.0.0-rc3 <1.1.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", "dependencies": { "async": { "version": "1.5.2", - "from": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "from": "async@>=1.5.2 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" } } }, "har-validator": { "version": "2.0.6", - "from": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", + "from": "har-validator@>=2.0.6 <2.1.0", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", "dependencies": { "chalk": { "version": "1.1.3", - "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "from": "chalk@>=1.1.1 <2.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "dependencies": { "ansi-styles": { "version": "2.2.1", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "from": "ansi-styles@>=2.2.1 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" }, "escape-string-regexp": { "version": "1.0.5", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" }, "has-ansi": { "version": "2.0.0", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "from": "has-ansi@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", + "from": "ansi-regex@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "strip-ansi": { "version": "3.0.1", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "from": "strip-ansi@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", + "from": "ansi-regex@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "supports-color": { "version": "2.0.0", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "from": "supports-color@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" } } }, "commander": { "version": "2.9.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "from": "commander@>=2.9.0 <3.0.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", "dependencies": { "graceful-readlink": { "version": "1.0.1", - "from": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "from": "graceful-readlink@>=1.0.0", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" } } }, "is-my-json-valid": { "version": "2.13.1", - "from": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", + "from": "is-my-json-valid@>=2.12.4 <3.0.0", "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", "dependencies": { "generate-function": { "version": "2.0.0", - "from": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", + "from": "generate-function@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" }, "generate-object-property": { "version": "1.2.0", - "from": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "from": "generate-object-property@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", "dependencies": { "is-property": { "version": "1.0.2", - "from": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "from": "is-property@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" } } }, "jsonpointer": { "version": "2.0.0", - "from": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz", + "from": "jsonpointer@2.0.0", "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" }, "xtend": { "version": "4.0.1", - "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "from": "xtend@>=4.0.0 <5.0.0", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, "pinkie-promise": { "version": "2.0.1", - "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "from": "pinkie-promise@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "dependencies": { "pinkie": { "version": "2.0.4", - "from": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "from": "pinkie@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" } } @@ -819,106 +819,106 @@ }, "hawk": { "version": "3.1.3", - "from": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "from": "hawk@>=3.1.3 <3.2.0", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", "dependencies": { "hoek": { "version": "2.16.3", - "from": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "from": "hoek@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" }, "boom": { "version": "2.10.1", - "from": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "from": "boom@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" }, "cryptiles": { "version": "2.0.5", - "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "from": "cryptiles@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" }, "sntp": { "version": "1.0.9", - "from": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "from": "sntp@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz" } } }, "http-signature": { "version": "1.1.1", - "from": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "from": "http-signature@>=1.1.0 <1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", "dependencies": { "assert-plus": { "version": "0.2.0", - "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "from": "assert-plus@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz" }, "jsprim": { - "version": "1.2.2", - "from": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz", + "version": "1.3.0", + "from": "jsprim@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz", "dependencies": { "extsprintf": { "version": "1.0.2", - "from": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", + "from": "extsprintf@1.0.2", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz" }, "json-schema": { "version": "0.2.2", - "from": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz", + "from": "json-schema@0.2.2", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz" }, "verror": { "version": "1.3.6", - "from": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", + "from": "verror@1.3.6", "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz" } } }, "sshpk": { "version": "1.8.3", - "from": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz", + "from": "sshpk@>=1.7.0 <2.0.0", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz", "dependencies": { "asn1": { "version": "0.2.3", - "from": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "from": "asn1@>=0.2.3 <0.3.0", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" }, "assert-plus": { "version": "1.0.0", - "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "from": "assert-plus@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" }, "dashdash": { "version": "1.14.0", - "from": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", + "from": "dashdash@>=1.12.0 <2.0.0", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz" }, "getpass": { "version": "0.1.6", - "from": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", + "from": "getpass@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz" }, "jsbn": { "version": "0.1.0", - "from": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz", + "from": "jsbn@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" }, "tweetnacl": { "version": "0.13.3", - "from": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz", + "from": "tweetnacl@>=0.13.0 <0.14.0", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz" }, "jodid25519": { "version": "1.0.2", - "from": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", + "from": "jodid25519@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" }, "ecc-jsbn": { "version": "0.1.1", - "from": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "from": "ecc-jsbn@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" } } @@ -927,76 +927,76 @@ }, "is-typedarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "from": "is-typedarray@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" }, "isstream": { "version": "0.1.2", - "from": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "from": "isstream@>=0.1.2 <0.2.0", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" }, "json-stringify-safe": { "version": "5.0.1", - "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "from": "json-stringify-safe@>=5.0.1 <5.1.0", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, "mime-types": { "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "from": "mime-types@>=2.1.7 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", "dependencies": { "mime-db": { "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", + "from": "mime-db@>=1.23.0 <1.24.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" } } }, "oauth-sign": { "version": "0.8.2", - "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "from": "oauth-sign@>=0.8.1 <0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" }, "qs": { "version": "6.1.0", - "from": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz", + "from": "qs@>=6.1.0 <6.2.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz" }, "stringstream": { "version": "0.0.5", - "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "from": "stringstream@>=0.0.4 <0.1.0", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" }, "tough-cookie": { "version": "2.2.2", - "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz", + "from": "tough-cookie@>=2.2.0 <2.3.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz" }, "tunnel-agent": { "version": "0.4.3", - "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "from": "tunnel-agent@>=0.4.1 <0.5.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" } } }, "revalidator": { "version": "0.3.1", - "from": "https://registry.npmjs.org/revalidator/-/revalidator-0.3.1.tgz", + "from": "revalidator@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.3.1.tgz" }, "sax": { "version": "0.6.1", - "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz", + "from": "sax@>=0.6.0 <0.7.0", "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz" }, "underscore": { "version": "1.8.3", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "from": "underscore@>=1.7.0 <2.0.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz" }, "xmldom": { "version": "0.1.19", - "from": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz", + "from": "xmldom@0.1.19", "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz" } } diff --git a/package.json b/package.json index bbf6cb8be..6e95865de 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "iotagent-node-lib", "description": "IoT Agent library to interface with NGSI Context Broker", - "version": "2.1.1", + "version": "2.1.2", "homepage": "https://github.com/telefonicaid/iotagent-node-lib", "keywords": [ "fiware",