@webex/webex-core 3.8.0-next.19 → 3.8.0-next.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +0 -18
- package/dist/index.js.map +1 -1
- package/dist/lib/batcher.js +1 -1
- package/dist/lib/credentials/credentials.js +1 -1
- package/dist/lib/credentials/token.js +1 -1
- package/dist/lib/services/services.js +1 -1
- package/dist/lib/services-v2/index.js +0 -21
- package/dist/lib/services-v2/index.js.map +1 -1
- package/dist/lib/services-v2/services-v2.js +46 -120
- package/dist/lib/services-v2/services-v2.js.map +1 -1
- package/dist/plugins/logger.js +1 -1
- package/dist/webex-core.js +2 -2
- package/package.json +13 -13
- package/src/index.js +0 -3
- package/src/lib/services-v2/index.js +0 -3
- package/src/lib/services-v2/services-v2.js +29 -121
- package/test/fixtures/host-catalog-v2.js +207 -1
- package/test/unit/spec/services-v2/services-v2.js +480 -766
- package/dist/lib/services-v2/service-host.js +0 -300
- package/dist/lib/services-v2/service-host.js.map +0 -1
- package/dist/lib/services-v2/service-registry.js +0 -534
- package/dist/lib/services-v2/service-registry.js.map +0 -1
- package/dist/lib/services-v2/service-state.js +0 -97
- package/dist/lib/services-v2/service-state.js.map +0 -1
- package/src/lib/services-v2/service-host.js +0 -267
- package/src/lib/services-v2/service-registry.js +0 -465
- package/src/lib/services-v2/service-state.js +0 -78
- package/test/integration/spec/services-v2/service-catalog.js +0 -838
- package/test/integration/spec/services-v2/services-v2.js +0 -1230
- package/test/unit/spec/services-v2/interceptors/hostmap.js +0 -79
- package/test/unit/spec/services-v2/interceptors/server-error.js +0 -204
- package/test/unit/spec/services-v2/interceptors/service.js +0 -194
- package/test/unit/spec/services-v2/service-catalog.js +0 -256
- package/test/unit/spec/services-v2/service-host.js +0 -260
- package/test/unit/spec/services-v2/service-registry.js +0 -747
- package/test/unit/spec/services-v2/service-state.js +0 -60
- package/test/unit/spec/services-v2/service-url.js +0 -258
package/dist/index.js
CHANGED
|
@@ -146,12 +146,6 @@ _Object$defineProperty(exports, "ServiceHost", {
|
|
|
146
146
|
return _services.ServiceHost;
|
|
147
147
|
}
|
|
148
148
|
});
|
|
149
|
-
_Object$defineProperty(exports, "ServiceHostV2", {
|
|
150
|
-
enumerable: true,
|
|
151
|
-
get: function get() {
|
|
152
|
-
return _servicesV.ServiceHostV2;
|
|
153
|
-
}
|
|
154
|
-
});
|
|
155
149
|
_Object$defineProperty(exports, "ServiceInterceptor", {
|
|
156
150
|
enumerable: true,
|
|
157
151
|
get: function get() {
|
|
@@ -170,24 +164,12 @@ _Object$defineProperty(exports, "ServiceRegistry", {
|
|
|
170
164
|
return _services.ServiceRegistry;
|
|
171
165
|
}
|
|
172
166
|
});
|
|
173
|
-
_Object$defineProperty(exports, "ServiceRegistryV2", {
|
|
174
|
-
enumerable: true,
|
|
175
|
-
get: function get() {
|
|
176
|
-
return _servicesV.ServiceRegistryV2;
|
|
177
|
-
}
|
|
178
|
-
});
|
|
179
167
|
_Object$defineProperty(exports, "ServiceState", {
|
|
180
168
|
enumerable: true,
|
|
181
169
|
get: function get() {
|
|
182
170
|
return _services.ServiceState;
|
|
183
171
|
}
|
|
184
172
|
});
|
|
185
|
-
_Object$defineProperty(exports, "ServiceStateV2", {
|
|
186
|
-
enumerable: true,
|
|
187
|
-
get: function get() {
|
|
188
|
-
return _servicesV.ServiceStateV2;
|
|
189
|
-
}
|
|
190
|
-
});
|
|
191
173
|
_Object$defineProperty(exports, "ServiceUrl", {
|
|
192
174
|
enumerable: true,
|
|
193
175
|
get: function get() {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["require","_credentials","_services","_servicesV","_storage","_webexCore","_interopRequireWildcard","_webexHttpError","_interopRequireDefault","_statelessWebexPlugin","_webexPlugin","_auth","_networkTiming","_payloadTransformer","_redirect","_responseLogger","_requestEvent","_requestLogger","_requestTiming","_userAgent","_webexTrackingId","_webexUserAgent","_rateLimit","_embargo","_defaultOptions","_batcher","_page","_config","_getRequireWildcardCache","e","_WeakMap","r","t","__esModule","_typeof","default","has","get","n","__proto__","a","_Object$defineProperty","_Object$getOwnPropertyDescriptor","u","Object","prototype","hasOwnProperty","call","i","set"],"sources":["index.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n *\n * Services is currently a part of webex-core due to how the contents of\n * the original internal-plugin-services needed to be accessed when webex-core\n * is initialized. As a plugin outside of webex-core, it would initialize after\n * credentials, causing all requests prior to its initialization to fail\n * federation requirements, and instead send requests to the environmentally-\n * assigned urls.\n */\n\nimport './plugins/logger';\nimport './lib/credentials';\nimport './lib/services';\n\nexport {Credentials, filterScope, grantErrors, sortScope, Token} from './lib/credentials';\n\nexport {\n constants as serviceConstants,\n ServiceCatalog,\n ServiceRegistry,\n ServiceState,\n ServiceInterceptor,\n ServerErrorInterceptor,\n Services,\n ServiceHost,\n ServiceUrl,\n HostMapInterceptor,\n} from './lib/services';\n\nexport {\n constants as serviceConstantsV2,\n ServiceCatalogV2,\n
|
|
1
|
+
{"version":3,"names":["require","_credentials","_services","_servicesV","_storage","_webexCore","_interopRequireWildcard","_webexHttpError","_interopRequireDefault","_statelessWebexPlugin","_webexPlugin","_auth","_networkTiming","_payloadTransformer","_redirect","_responseLogger","_requestEvent","_requestLogger","_requestTiming","_userAgent","_webexTrackingId","_webexUserAgent","_rateLimit","_embargo","_defaultOptions","_batcher","_page","_config","_getRequireWildcardCache","e","_WeakMap","r","t","__esModule","_typeof","default","has","get","n","__proto__","a","_Object$defineProperty","_Object$getOwnPropertyDescriptor","u","Object","prototype","hasOwnProperty","call","i","set"],"sources":["index.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n *\n * Services is currently a part of webex-core due to how the contents of\n * the original internal-plugin-services needed to be accessed when webex-core\n * is initialized. As a plugin outside of webex-core, it would initialize after\n * credentials, causing all requests prior to its initialization to fail\n * federation requirements, and instead send requests to the environmentally-\n * assigned urls.\n */\n\nimport './plugins/logger';\nimport './lib/credentials';\nimport './lib/services';\n\nexport {Credentials, filterScope, grantErrors, sortScope, Token} from './lib/credentials';\n\nexport {\n constants as serviceConstants,\n ServiceCatalog,\n ServiceRegistry,\n ServiceState,\n ServiceInterceptor,\n ServerErrorInterceptor,\n Services,\n ServiceHost,\n ServiceUrl,\n HostMapInterceptor,\n} from './lib/services';\n\nexport {\n constants as serviceConstantsV2,\n ServiceCatalogV2,\n ServiceInterceptorV2,\n ServerErrorInterceptorV2,\n ServicesV2,\n ServiceUrlV2,\n HostMapInterceptorV2,\n} from './lib/services-v2';\n\nexport {\n makeWebexStore,\n makeWebexPluginStore,\n MemoryStoreAdapter,\n NotFoundError,\n persist,\n StorageError,\n waitForValue,\n} from './lib/storage';\n\nexport {default, registerPlugin, registerInternalPlugin} from './webex-core';\n\nexport {default as WebexHttpError} from './lib/webex-http-error';\nexport {default as StatelessWebexPlugin} from './lib/stateless-webex-plugin';\nexport {default as WebexPlugin} from './lib/webex-plugin';\nexport {default as AuthInterceptor} from './interceptors/auth';\nexport {default as NetworkTimingInterceptor} from './interceptors/network-timing';\nexport {default as PayloadTransformerInterceptor} from './interceptors/payload-transformer';\nexport {default as RedirectInterceptor} from './interceptors/redirect';\nexport {default as ResponseLoggerInterceptor} from './interceptors/response-logger';\nexport {default as RequestEventInterceptor} from './interceptors/request-event';\nexport {default as RequestLoggerInterceptor} from './interceptors/request-logger';\nexport {default as RequestTimingInterceptor} from './interceptors/request-timing';\nexport {default as UserAgentInterceptor} from './interceptors/user-agent';\nexport {default as WebexTrackingIdInterceptor} from './interceptors/webex-tracking-id';\nexport {sequenceNumbers as webexTrackingIdSequenceNumbers} from './interceptors/webex-tracking-id';\nexport {default as WebexUserAgentInterceptor} from './interceptors/webex-user-agent';\nexport {default as RateLimitInterceptor} from './interceptors/rate-limit';\nexport {default as EmbargoInterceptor} from './interceptors/embargo';\nexport {default as DefaultOptionsInterceptor} from './interceptors/default-options';\n\nexport {default as Batcher} from './lib/batcher';\nexport {default as Page} from './lib/page';\nexport {default as config} from './config';\n"],"mappings":"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"}
|
package/dist/lib/batcher.js
CHANGED
|
@@ -286,7 +286,7 @@ var Batcher = _webexPlugin.default.extend({
|
|
|
286
286
|
fingerprintResponse: function fingerprintResponse(item) {
|
|
287
287
|
throw new Error('fingerprintResponse() must be implemented');
|
|
288
288
|
},
|
|
289
|
-
version: "3.8.0-next.
|
|
289
|
+
version: "3.8.0-next.20"
|
|
290
290
|
});
|
|
291
291
|
var _default2 = exports.default = Batcher;
|
|
292
292
|
//# sourceMappingURL=batcher.js.map
|
|
@@ -558,7 +558,7 @@ var Credentials = _webexPlugin.default.extend((_dec = (0, _common.oneFlight)({
|
|
|
558
558
|
this.refresh();
|
|
559
559
|
}
|
|
560
560
|
},
|
|
561
|
-
version: "3.8.0-next.
|
|
561
|
+
version: "3.8.0-next.20"
|
|
562
562
|
}, ((0, _applyDecoratedDescriptor2.default)(_obj, "getUserToken", [_dec, _dec2], (0, _getOwnPropertyDescriptor.default)(_obj, "getUserToken"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "initialize", [_dec3], (0, _getOwnPropertyDescriptor.default)(_obj, "initialize"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "invalidate", [_common.oneFlight, _dec4], (0, _getOwnPropertyDescriptor.default)(_obj, "invalidate"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "refresh", [_common.oneFlight, _dec5, _dec6], (0, _getOwnPropertyDescriptor.default)(_obj, "refresh"), _obj)), _obj)));
|
|
563
563
|
var _default = exports.default = Credentials;
|
|
564
564
|
//# sourceMappingURL=credentials.js.map
|
|
@@ -532,7 +532,7 @@ var Token = _webexPlugin.default.extend((_dec = (0, _common.oneFlight)({
|
|
|
532
532
|
return res.body;
|
|
533
533
|
});
|
|
534
534
|
},
|
|
535
|
-
version: "3.8.0-next.
|
|
535
|
+
version: "3.8.0-next.20"
|
|
536
536
|
}, ((0, _applyDecoratedDescriptor2.default)(_obj, "downscope", [_dec], (0, _getOwnPropertyDescriptor.default)(_obj, "downscope"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "refresh", [_common.oneFlight], (0, _getOwnPropertyDescriptor.default)(_obj, "refresh"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "revoke", [_common.oneFlight], (0, _getOwnPropertyDescriptor.default)(_obj, "revoke"), _obj)), _obj)));
|
|
537
537
|
var _default = exports.default = Token;
|
|
538
538
|
//# sourceMappingURL=token.js.map
|
|
@@ -26,30 +26,12 @@ _Object$defineProperty(exports, "ServiceCatalogV2", {
|
|
|
26
26
|
return _serviceCatalog.default;
|
|
27
27
|
}
|
|
28
28
|
});
|
|
29
|
-
_Object$defineProperty(exports, "ServiceHostV2", {
|
|
30
|
-
enumerable: true,
|
|
31
|
-
get: function get() {
|
|
32
|
-
return _serviceHost.default;
|
|
33
|
-
}
|
|
34
|
-
});
|
|
35
29
|
_Object$defineProperty(exports, "ServiceInterceptorV2", {
|
|
36
30
|
enumerable: true,
|
|
37
31
|
get: function get() {
|
|
38
32
|
return _service.default;
|
|
39
33
|
}
|
|
40
34
|
});
|
|
41
|
-
_Object$defineProperty(exports, "ServiceRegistryV2", {
|
|
42
|
-
enumerable: true,
|
|
43
|
-
get: function get() {
|
|
44
|
-
return _serviceRegistry.default;
|
|
45
|
-
}
|
|
46
|
-
});
|
|
47
|
-
_Object$defineProperty(exports, "ServiceStateV2", {
|
|
48
|
-
enumerable: true,
|
|
49
|
-
get: function get() {
|
|
50
|
-
return _serviceState.default;
|
|
51
|
-
}
|
|
52
|
-
});
|
|
53
35
|
_Object$defineProperty(exports, "ServiceUrlV2", {
|
|
54
36
|
enumerable: true,
|
|
55
37
|
get: function get() {
|
|
@@ -70,9 +52,6 @@ var _service = _interopRequireDefault(require("./interceptors/service"));
|
|
|
70
52
|
var _serverError = _interopRequireDefault(require("./interceptors/server-error"));
|
|
71
53
|
var _hostmap = _interopRequireDefault(require("./interceptors/hostmap"));
|
|
72
54
|
var _serviceCatalog = _interopRequireDefault(require("./service-catalog"));
|
|
73
|
-
var _serviceRegistry = _interopRequireDefault(require("./service-registry"));
|
|
74
|
-
var _serviceState = _interopRequireDefault(require("./service-state"));
|
|
75
|
-
var _serviceHost = _interopRequireDefault(require("./service-host"));
|
|
76
55
|
var _serviceUrl = _interopRequireDefault(require("./service-url"));
|
|
77
56
|
function _getRequireWildcardCache(e) { if ("function" != typeof _WeakMap) return null; var r = new _WeakMap(), t = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
78
57
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? _Object$getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? _Object$defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["constants","_interopRequireWildcard","require","exports","_servicesV","_interopRequireDefault","_service","_serverError","_hostmap","_serviceCatalog","
|
|
1
|
+
{"version":3,"names":["constants","_interopRequireWildcard","require","exports","_servicesV","_interopRequireDefault","_service","_serverError","_hostmap","_serviceCatalog","_serviceUrl","_getRequireWildcardCache","e","_WeakMap","r","t","__esModule","_typeof","default","has","get","n","__proto__","a","_Object$defineProperty","_Object$getOwnPropertyDescriptor","u","Object","prototype","hasOwnProperty","call","i","set"],"sources":["index.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n// import {registerInternalPlugin} from '../../webex-core';\n\nimport * as constants from './constants';\n// import ServerErrorInterceptor from './interceptors/server-error';\n// import ServiceInterceptor from './interceptors/service';\nexport {default as ServicesV2} from './services-v2';\n\n// registerInternalPlugin('services', ServicesV2, {\n// interceptors: {\n// ServiceInterceptor: ServiceInterceptor.create,\n// ServerErrorInterceptor: ServerErrorInterceptor.create,\n// },\n// });\n\nexport {constants};\nexport {default as ServiceInterceptorV2} from './interceptors/service';\nexport {default as ServerErrorInterceptorV2} from './interceptors/server-error';\nexport {default as HostMapInterceptorV2} from './interceptors/hostmap';\nexport {default as ServiceCatalogV2} from './service-catalog';\nexport {default as ServiceUrlV2} from './service-url';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,IAAAA,SAAA,GAAAC,uBAAA,CAAAC,OAAA;AAAyCC,OAAA,CAAAH,SAAA,GAAAA,SAAA;AAGzC,IAAAI,UAAA,GAAAC,sBAAA,CAAAH,OAAA;AAUA,IAAAI,QAAA,GAAAD,sBAAA,CAAAH,OAAA;AACA,IAAAK,YAAA,GAAAF,sBAAA,CAAAH,OAAA;AACA,IAAAM,QAAA,GAAAH,sBAAA,CAAAH,OAAA;AACA,IAAAO,eAAA,GAAAJ,sBAAA,CAAAH,OAAA;AACA,IAAAQ,WAAA,GAAAL,sBAAA,CAAAH,OAAA;AAAsD,SAAAS,yBAAAC,CAAA,6BAAAC,QAAA,mBAAAC,CAAA,OAAAD,QAAA,IAAAE,CAAA,OAAAF,QAAA,YAAAF,wBAAA,YAAAA,yBAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAX,wBAAAW,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,gBAAAK,OAAA,CAAAL,CAAA,0BAAAA,CAAA,WAAAM,OAAA,EAAAN,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAI,GAAA,CAAAP,CAAA,UAAAG,CAAA,CAAAK,GAAA,CAAAR,CAAA,OAAAS,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,sBAAA,IAAAC,gCAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAC,MAAA,CAAAC,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAlB,CAAA,EAAAc,CAAA,SAAAK,CAAA,GAAAR,CAAA,GAAAE,gCAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAK,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,sBAAA,CAAAH,CAAA,EAAAK,CAAA,EAAAK,CAAA,IAAAV,CAAA,CAAAK,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAL,CAAA,CAAAH,OAAA,GAAAN,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAiB,GAAA,CAAApB,CAAA,EAAAS,CAAA,GAAAA,CAAA"}
|
|
@@ -19,12 +19,10 @@ var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/pr
|
|
|
19
19
|
var _sha = _interopRequireDefault(require("crypto-js/sha256"));
|
|
20
20
|
var _lodash = require("lodash");
|
|
21
21
|
var _webexPlugin = _interopRequireDefault(require("../webex-plugin"));
|
|
22
|
-
var _metrics = _interopRequireDefault(require("
|
|
23
|
-
var _serviceCatalog = _interopRequireDefault(require("
|
|
24
|
-
var
|
|
25
|
-
var
|
|
26
|
-
var _serviceFedRamp = _interopRequireDefault(require("../services/service-fed-ramp"));
|
|
27
|
-
var _constants = require("../services/constants");
|
|
22
|
+
var _metrics = _interopRequireDefault(require("./metrics"));
|
|
23
|
+
var _serviceCatalog = _interopRequireDefault(require("./service-catalog"));
|
|
24
|
+
var _serviceFedRamp = _interopRequireDefault(require("./service-fed-ramp"));
|
|
25
|
+
var _constants = require("./constants");
|
|
28
26
|
function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
29
27
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
30
28
|
var trailingSlashes = /(?:^\/)|(?:\/$)/;
|
|
@@ -39,38 +37,16 @@ var DEFAULT_CLUSTER_IDENTIFIER = process.env.WEBEX_CONVERSATION_DEFAULT_CLUSTER
|
|
|
39
37
|
/* eslint-disable no-underscore-dangle */
|
|
40
38
|
/**
|
|
41
39
|
* @class
|
|
42
|
-
* This is the v2 implementation of the Services plugin. Used to manage DNSSec enabled users
|
|
43
|
-
* Use this at your own risk! This service will be updated continuously and may not be backwards compatible.
|
|
44
40
|
*/
|
|
45
41
|
var Services = _webexPlugin.default.extend({
|
|
46
42
|
namespace: 'Services',
|
|
47
|
-
/**
|
|
48
|
-
* The {@link WeakMap} of {@link ServiceRegistry} class instances that are
|
|
49
|
-
* keyed with WebexCore instances.
|
|
50
|
-
*
|
|
51
|
-
* @instance
|
|
52
|
-
* @type {WeakMap<WebexCore, ServiceRegistry>}
|
|
53
|
-
* @private
|
|
54
|
-
* @memberof Services
|
|
55
|
-
*/
|
|
56
|
-
registries: new _weakMap.default(),
|
|
57
|
-
/**
|
|
58
|
-
* The {@link WeakMap} of {@link ServiceState} class instances that are
|
|
59
|
-
* keyed with WebexCore instances.
|
|
60
|
-
*
|
|
61
|
-
* @instance
|
|
62
|
-
* @type {WeakMap<WebexCore, ServiceState>}
|
|
63
|
-
* @private
|
|
64
|
-
* @memberof Services
|
|
65
|
-
*/
|
|
66
|
-
states: new _weakMap.default(),
|
|
67
43
|
props: {
|
|
68
44
|
validateDomains: ['boolean', false, true],
|
|
69
45
|
initFailed: ['boolean', false, false]
|
|
70
46
|
},
|
|
71
47
|
_catalogs: new _weakMap.default(),
|
|
72
|
-
|
|
73
|
-
|
|
48
|
+
_activeServices: {},
|
|
49
|
+
_services: [],
|
|
74
50
|
/**
|
|
75
51
|
* @private
|
|
76
52
|
* Get the current catalog based on the assocaited
|
|
@@ -131,19 +107,19 @@ var Services = _webexPlugin.default.extend({
|
|
|
131
107
|
},
|
|
132
108
|
/**
|
|
133
109
|
* saves all the services from the pre and post catalog service
|
|
134
|
-
* @param {Object}
|
|
110
|
+
* @param {Object} activeServices
|
|
135
111
|
* @returns {void}
|
|
136
112
|
*/
|
|
137
|
-
|
|
138
|
-
this.
|
|
113
|
+
_updateActiveServices: function _updateActiveServices(activeServices) {
|
|
114
|
+
this._activeServices = _objectSpread(_objectSpread({}, this._activeServices), activeServices);
|
|
139
115
|
},
|
|
140
116
|
/**
|
|
141
117
|
* saves the hostCatalog object
|
|
142
|
-
* @param {Object}
|
|
118
|
+
* @param {Object} services
|
|
143
119
|
* @returns {void}
|
|
144
120
|
*/
|
|
145
|
-
|
|
146
|
-
this.
|
|
121
|
+
_updateServices: function _updateServices(services) {
|
|
122
|
+
this._services = (0, _lodash.unionBy)(services, this._services, 'id');
|
|
147
123
|
},
|
|
148
124
|
/**
|
|
149
125
|
* Update a list of `serviceUrls` to the most current
|
|
@@ -608,7 +584,7 @@ var Services = _webexPlugin.default.extend({
|
|
|
608
584
|
return service === name;
|
|
609
585
|
});
|
|
610
586
|
if (fetchFromServiceUrl) {
|
|
611
|
-
return _promise.default.resolve(this.
|
|
587
|
+
return _promise.default.resolve(this._activeServices[name]);
|
|
612
588
|
}
|
|
613
589
|
var priorityUrl = this.get(name, true);
|
|
614
590
|
var priorityUrlObj = this.getServiceFromUrl(url);
|
|
@@ -659,7 +635,7 @@ var Services = _webexPlugin.default.extend({
|
|
|
659
635
|
*/
|
|
660
636
|
replaceHostFromHostmap: function replaceHostFromHostmap(uri) {
|
|
661
637
|
var url = new URL(uri);
|
|
662
|
-
var hostCatalog = this.
|
|
638
|
+
var hostCatalog = this._services;
|
|
663
639
|
if (!hostCatalog) {
|
|
664
640
|
return uri;
|
|
665
641
|
}
|
|
@@ -674,76 +650,30 @@ var Services = _webexPlugin.default.extend({
|
|
|
674
650
|
/**
|
|
675
651
|
* @private
|
|
676
652
|
* Organize a received hostmap from a service
|
|
677
|
-
* catalog endpoint.
|
|
678
653
|
* @param {object} serviceHostmap
|
|
654
|
+
* catalog endpoint.
|
|
679
655
|
* @returns {object}
|
|
680
656
|
*/
|
|
681
|
-
_formatReceivedHostmap: function _formatReceivedHostmap(
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
var host;
|
|
693
|
-
try {
|
|
694
|
-
host = new URL(serviceUrl).host;
|
|
695
|
-
} catch (e) {
|
|
696
|
-
return;
|
|
697
|
-
}
|
|
698
|
-
var matchingCatalogEntry = serviceHostmap.hostCatalog[host];
|
|
699
|
-
var formattedHost = {
|
|
700
|
-
name: serviceName,
|
|
701
|
-
defaultUrl: serviceUrl,
|
|
702
|
-
defaultHost: host,
|
|
703
|
-
hosts: []
|
|
704
|
-
};
|
|
705
|
-
formattedHostmap.push(formattedHost);
|
|
706
|
-
|
|
707
|
-
// If the catalog does not have any hosts we will be unable to find the service ID
|
|
708
|
-
// so can't search for other hosts
|
|
709
|
-
if (!matchingCatalogEntry || !matchingCatalogEntry[0]) {
|
|
710
|
-
return;
|
|
711
|
-
}
|
|
712
|
-
var serviceId = extractId(matchingCatalogEntry[0]);
|
|
713
|
-
(0, _lodash.forEach)(matchingCatalogEntry, function (entry) {
|
|
714
|
-
// The ids for all hosts within a hostCatalog entry should be the same
|
|
715
|
-
// but for safety, only add host entries that have the same id as the first one
|
|
716
|
-
if (extractId(entry) === serviceId) {
|
|
717
|
-
formattedHost.hosts.push(_objectSpread(_objectSpread({}, entry), {}, {
|
|
718
|
-
homeCluster: true
|
|
719
|
-
}));
|
|
720
|
-
}
|
|
721
|
-
});
|
|
722
|
-
var otherHosts = [];
|
|
723
|
-
|
|
724
|
-
// find the services in the host catalog that have the same id
|
|
725
|
-
// and add them to the otherHosts
|
|
726
|
-
(0, _lodash.forEach)(serviceHostmap.hostCatalog, function (entry) {
|
|
727
|
-
// exclude the matching catalog entry as we have already added that
|
|
728
|
-
if (entry === matchingCatalogEntry) {
|
|
729
|
-
return;
|
|
730
|
-
}
|
|
731
|
-
(0, _lodash.forEach)(entry, function (entryHost) {
|
|
732
|
-
// only add hosts that have the correct id
|
|
733
|
-
if (extractId(entryHost) === serviceId) {
|
|
734
|
-
otherHosts.push(_objectSpread(_objectSpread({}, entryHost), {}, {
|
|
735
|
-
homeCluster: false
|
|
736
|
-
}));
|
|
737
|
-
}
|
|
738
|
-
});
|
|
657
|
+
_formatReceivedHostmap: function _formatReceivedHostmap(_ref9) {
|
|
658
|
+
var services = _ref9.services,
|
|
659
|
+
activeServices = _ref9.activeServices;
|
|
660
|
+
var formattedHostmap = services.map(function (_ref10) {
|
|
661
|
+
var id = _ref10.id,
|
|
662
|
+
serviceName = _ref10.serviceName,
|
|
663
|
+
serviceUrls = _ref10.serviceUrls;
|
|
664
|
+
var formattedServiceUrls = serviceUrls.map(function (serviceUrl) {
|
|
665
|
+
return _objectSpread({
|
|
666
|
+
host: new URL(serviceUrl.baseUrl).host
|
|
667
|
+
}, serviceUrl);
|
|
739
668
|
});
|
|
740
|
-
|
|
669
|
+
return {
|
|
670
|
+
id: id,
|
|
671
|
+
serviceName: serviceName,
|
|
672
|
+
serviceUrls: formattedServiceUrls
|
|
673
|
+
};
|
|
741
674
|
});
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
this._updateServiceUrls(serviceHostmap.serviceLinks);
|
|
746
|
-
this._updateHostCatalog(serviceHostmap.hostCatalog);
|
|
675
|
+
this._updateActiveServices(activeServices);
|
|
676
|
+
this._updateServices(services);
|
|
747
677
|
return formattedHostmap;
|
|
748
678
|
},
|
|
749
679
|
/**
|
|
@@ -777,9 +707,9 @@ var Services = _webexPlugin.default.extend({
|
|
|
777
707
|
* @returns {String} url of the service
|
|
778
708
|
*/
|
|
779
709
|
getServiceUrlFromClusterId: function getServiceUrlFromClusterId() {
|
|
780
|
-
var
|
|
781
|
-
|
|
782
|
-
cluster =
|
|
710
|
+
var _ref11 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
711
|
+
_ref11$cluster = _ref11.cluster,
|
|
712
|
+
cluster = _ref11$cluster === void 0 ? 'us' : _ref11$cluster;
|
|
783
713
|
var clusterId = cluster === 'us' ? DEFAULT_CLUSTER_IDENTIFIER : cluster;
|
|
784
714
|
|
|
785
715
|
// Determine if cluster has service name (non-US clusters from hydra do not)
|
|
@@ -787,10 +717,10 @@ var Services = _webexPlugin.default.extend({
|
|
|
787
717
|
// Add Service to cluster identifier
|
|
788
718
|
clusterId = "".concat(cluster, ":").concat(CLUSTER_SERVICE);
|
|
789
719
|
}
|
|
790
|
-
var
|
|
720
|
+
var _ref12 = this.getServiceFromClusterId({
|
|
791
721
|
clusterId: clusterId
|
|
792
722
|
}) || {},
|
|
793
|
-
url =
|
|
723
|
+
url = _ref12.url;
|
|
794
724
|
if (!url) {
|
|
795
725
|
throw Error("Could not find service for cluster [".concat(cluster, "]"));
|
|
796
726
|
}
|
|
@@ -859,11 +789,11 @@ var Services = _webexPlugin.default.extend({
|
|
|
859
789
|
*/
|
|
860
790
|
_fetchNewServiceHostmap: function _fetchNewServiceHostmap() {
|
|
861
791
|
var _this7 = this;
|
|
862
|
-
var
|
|
863
|
-
from =
|
|
864
|
-
query =
|
|
865
|
-
token =
|
|
866
|
-
forceRefresh =
|
|
792
|
+
var _ref13 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
793
|
+
from = _ref13.from,
|
|
794
|
+
query = _ref13.query,
|
|
795
|
+
token = _ref13.token,
|
|
796
|
+
forceRefresh = _ref13.forceRefresh;
|
|
867
797
|
var service = 'u2c';
|
|
868
798
|
var resource = from ? "/".concat(from, "/catalog") : '/catalog';
|
|
869
799
|
var qs = _objectSpread(_objectSpread({}, query || {}), {}, {
|
|
@@ -885,8 +815,8 @@ var Services = _webexPlugin.default.extend({
|
|
|
885
815
|
}
|
|
886
816
|
return this.webex.internal.newMetrics.callDiagnosticLatencies.measureLatency(function () {
|
|
887
817
|
return _this7.request(requestObject);
|
|
888
|
-
}, 'internal.get.u2c.time').then(function (
|
|
889
|
-
var body =
|
|
818
|
+
}, 'internal.get.u2c.time').then(function (_ref14) {
|
|
819
|
+
var body = _ref14.body;
|
|
890
820
|
return _this7._formatReceivedHostmap(body);
|
|
891
821
|
});
|
|
892
822
|
},
|
|
@@ -996,11 +926,7 @@ var Services = _webexPlugin.default.extend({
|
|
|
996
926
|
initialize: function initialize() {
|
|
997
927
|
var _this9 = this;
|
|
998
928
|
var catalog = new _serviceCatalog.default();
|
|
999
|
-
var registry = new _serviceRegistry.default();
|
|
1000
|
-
var state = new _serviceState.default();
|
|
1001
929
|
this._catalogs.set(this.webex, catalog);
|
|
1002
|
-
this.registries.set(this.webex, registry);
|
|
1003
|
-
this.states.set(this.webex, state);
|
|
1004
930
|
|
|
1005
931
|
// Listen for configuration changes once.
|
|
1006
932
|
this.listenToOnce(this.webex, 'change:config', function () {
|
|
@@ -1030,7 +956,7 @@ var Services = _webexPlugin.default.extend({
|
|
|
1030
956
|
}
|
|
1031
957
|
});
|
|
1032
958
|
},
|
|
1033
|
-
version: "3.8.0-next.
|
|
959
|
+
version: "3.8.0-next.20"
|
|
1034
960
|
});
|
|
1035
961
|
/* eslint-enable no-underscore-dangle */
|
|
1036
962
|
var _default = exports.default = Services;
|