From b7525e1e7ec5c307930d996e2e4e0160d38b407b Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 23 Aug 2018 21:45:06 -0400 Subject: [PATCH] messagepack protocolf or signalr --- jslib | 2 +- package-lock.json | 54 ++++++++++++++++++++--------- package.json | 3 +- src/app/services/services.module.ts | 2 +- 4 files changed, 41 insertions(+), 20 deletions(-) diff --git a/jslib b/jslib index 5d95fc733c..bc198c60d1 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 5d95fc733c7b5aa922c38b5e4d92b1a755526719 +Subproject commit bc198c60d1916600f3bfb6ec82dd900dc6bd0642 diff --git a/package-lock.json b/package-lock.json index a93b6cf70b..fb6f46445d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,9 +97,17 @@ } }, "@aspnet/signalr": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@aspnet/signalr/-/signalr-1.0.2.tgz", - "integrity": "sha512-sXleqUCCbodCOqUA8MjLSvtAgDTvDhEq6j3JyAq/w4RMJhpZ+dXK9+6xEMbzag2hisq5e/8vDC82JYutkcOISQ==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@aspnet/signalr/-/signalr-1.0.3.tgz", + "integrity": "sha512-8nPSarp4k+oP2M6P7tw2FZMXOMR86wH9GPb/4wiqA18c4Ds88SUmE0pSpnNQPDOoWGMj6y9F2Xz5JyoynCPXWQ==" + }, + "@aspnet/signalr-protocol-msgpack": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@aspnet/signalr-protocol-msgpack/-/signalr-protocol-msgpack-1.0.3.tgz", + "integrity": "sha512-R5CRpxXGICi0Tgbd86uA8bC75Rm0y7Yp6oD87INfKxsav/m/xbz33rkGOI1OZIfsc/J6/WU5z0Bqpc2QgYfaJQ==", + "requires": { + "msgpack5": "^4.0.2" + } }, "@ngtools/webpack": { "version": "1.10.2", @@ -1113,6 +1121,15 @@ "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", "dev": true }, + "bl": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.0.1.tgz", + "integrity": "sha512-FrMgLukB9jujvJ92p5TA0hcKIHtInVXXhxD7qgAuV7k0cbPt9USZmOYnhDXH6IsnGeIUglX42TSBV7Gn4q5sbQ==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, "block-stream": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", @@ -1979,8 +1996,7 @@ "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=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cosmiconfig": { "version": "5.0.5", @@ -5144,8 +5160,7 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { "version": "1.3.5", @@ -5532,8 +5547,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", @@ -6497,6 +6511,17 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, + "msgpack5": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/msgpack5/-/msgpack5-4.2.0.tgz", + "integrity": "sha512-tQkRlwO4f3/E8Kq5qm6PcVw+J+K4+U/XNqeD9Ebo1qVsrjkcKb2FfmdtuuIslw42CGT+K3ZVKAvKfSPp3QRplQ==", + "requires": { + "bl": "^2.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.3.6", + "safe-buffer": "^5.1.2" + } + }, "multipipe": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", @@ -8029,8 +8054,7 @@ "process-nextick-args": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", - "dev": true + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "promise-inflight": { "version": "1.0.1", @@ -8261,7 +8285,6 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -8765,8 +8788,7 @@ "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==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", @@ -9339,7 +9361,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -10501,8 +10522,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "util.promisify": { "version": "1.0.0", diff --git a/package.json b/package.json index 306259eeac..db76bf7266 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,8 @@ "@angular/platform-browser-dynamic": "5.2.0", "@angular/router": "5.2.0", "@angular/upgrade": "5.2.0", - "@aspnet/signalr": "1.0.2", + "@aspnet/signalr": "1.0.3", + "@aspnet/signalr-protocol-msgpack": "1.0.3", "angular2-toaster": "4.0.2", "angulartics2": "5.0.1", "bootstrap": "4.1.3", diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index ca58641573..3dc386d2d1 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -132,7 +132,7 @@ export function initFactory(): Function { environmentService.baseUrl = window.location.origin; } else { environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : - window.location.origin + '/notifications'; + 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; } await apiService.setUrls({ base: isDev ? null : window.location.origin,