@webex/webex-core 3.0.0-beta.2 → 3.0.0-beta.21

package/src/lib/stateless-webex-plugin.js

@@ -50,7 +50,7 @@ export default class StatelessWebexPlugin {
    * @private
    * @type {boolean}
    */
-    ready = true;
+  ready = true;
 
   /**
    * Constructor. One of attrs.webex or options.parent is required
@@ -63,7 +63,9 @@ export default class StatelessWebexPlugin {
     let webex = attrs.webex || options.parent;
 
     if (!webex) {
-      throw new Error('One of `attrs.webex` or `options.parent` must be supplied when initializing a StatelessWebexPlugin');
+      throw new Error(
+        'One of `attrs.webex` or `options.parent` must be supplied when initializing a StatelessWebexPlugin'
+      );
     }
 
     while (webex.parent || webex.collection) {

package/src/lib/storage/decorators.js

@@ -4,13 +4,7 @@
 
 /* eslint no-invalid-this: [0] */
 
-import {
-  curry,
-  debounce,
-  identity,
-  result,
-  wrap
-} from 'lodash';
+import {curry, debounce, identity, result, wrap} from 'lodash';
 import {make} from '@webex/common';
 
 import {NotFoundError} from './errors';
@@ -32,7 +26,9 @@ export function persist(...args) {
     if (prop !== 'initialize') {
       // Once we have class-based alternative to AmpersandState, it should be
       // detected here.
-      throw new TypeError('@persist can only currently be applied to AmpersandState objects or their derivatives and must be applied to the initialize method');
+      throw new TypeError(
+        '@persist can only currently be applied to AmpersandState objects or their derivatives and must be applied to the initialize method'
+      );
     }
 
     descriptor.value = wrap(descriptor.value, function persistExecutor(fn, ...initializeArgs) {
@@ -44,20 +40,23 @@ export function persist(...args) {
       // a debounce of zero, we're effectively coalescing all the changes
       // triggered by a single call to set() and commiting them on the next tick
       // eslint-disable-next-line no-invalid-this
-      this.on(changeEvent, debounce(() => {
-        const shouldPersist = !decider || Reflect.apply(decider, this, ...initializeArgs);
+      this.on(
+        changeEvent,
+        debounce(() => {
+          const shouldPersist = !decider || Reflect.apply(decider, this, ...initializeArgs);
 
-        if (!shouldPersist) {
-          return Promise.resolve();
-        }
-        if (key === '@') {
-          // eslint-disable-next-line no-invalid-this
-          return this.boundedStorage.put(key, this);
-        }
+          if (!shouldPersist) {
+            return Promise.resolve();
+          }
+          if (key === '@') {
+            // eslint-disable-next-line no-invalid-this
+            return this.boundedStorage.put(key, this);
+          }
 
-        // eslint-disable-next-line no-invalid-this
-        return this.boundedStorage.put(key, this[key]);
-      }, 0));
+          // eslint-disable-next-line no-invalid-this
+          return this.boundedStorage.put(key, this[key]);
+        }, 0)
+      );
 
       return ret;
     });
@@ -88,8 +87,9 @@ export function waitForValue(key) {
     descriptor.value = wrap(descriptor.value, function waitForValueExecutor(fn, ...args) {
       const keys = blockingKeys.get(target, prop);
 
-      return Promise.all([...keys].map((k) => this.boundedStorage.waitFor(k)))
-        .then(() => Reflect.apply(fn, this, args));
+      return Promise.all([...keys].map((k) => this.boundedStorage.waitFor(k))).then(() =>
+        Reflect.apply(fn, this, args)
+      );
     });
 
     // This *should* make decorators compatible with AmpersandState class
@@ -159,60 +159,62 @@ function prepareInitialize(target, prop) {
     const self = this;
     const namespace = this.getNamespace();
 
-    this.webex.initialize = wrap(this.webex.initialize || identity, function applyInit(fn, ...args) {
-      // Call webex's initalize method first
-      // Reminder: in order for MockWebex to accept initial storage data, the
-      // wrapped initialize() must be invoked before attempting to load data.
-      // Reminder: context here is `webex`, not `self`.
-      stack.add(namespace);
-      Reflect.apply(fn, this, args);
-
-      // Then prepare a function for setting values retrieved from storage
-      const set = curry((key, value) => {
-        this.logger.debug(`storage:(${namespace}): got \`${key}\` for first time`);
-        if (key === '@') {
-          self.parent.set({
-            [namespace.toLowerCase()]: value
-          });
-        }
-        else if (result(self[key], 'isState')) {
-          self[key].set(value);
-        }
-        else {
-          self.set(key, value);
-        }
-        this.logger.debug(`storage:(${namespace}): set \`${key}\` for first time`);
-      });
+    this.webex.initialize = wrap(
+      this.webex.initialize || identity,
+      function applyInit(fn, ...args) {
+        // Call webex's initalize method first
+        // Reminder: in order for MockWebex to accept initial storage data, the
+        // wrapped initialize() must be invoked before attempting to load data.
+        // Reminder: context here is `webex`, not `self`.
+        stack.add(namespace);
+        Reflect.apply(fn, this, args);
+
+        // Then prepare a function for setting values retrieved from storage
+        const set = curry((key, value) => {
+          this.logger.debug(`storage:(${namespace}): got \`${key}\` for first time`);
+          if (key === '@') {
+            self.parent.set({
+              [namespace.toLowerCase()]: value,
+            });
+          } else if (result(self[key], 'isState')) {
+            self[key].set(value);
+          } else {
+            self.set(key, value);
+          }
+          this.logger.debug(`storage:(${namespace}): set \`${key}\` for first time`);
+        });
 
-      // And prepare an error handler for when those keys can't be found
-      const handle = curry((key, reason) => {
-        if (reason instanceof NotFoundError || process.env.NODE_ENV !== 'production' && reason.toString().includes('MockNotFoundError')) {
-          this.logger.debug(`storage(${namespace}): no data for \`${key}\`, continuing`);
+        // And prepare an error handler for when those keys can't be found
+        const handle = curry((key, reason) => {
+          if (
+            reason instanceof NotFoundError ||
+            (process.env.NODE_ENV !== 'production' &&
+              reason.toString().includes('MockNotFoundError'))
+          ) {
+            this.logger.debug(`storage(${namespace}): no data for \`${key}\`, continuing`);
 
-          return Promise.resolve();
-        }
-        this.logger.error(`storage(${namespace}): failed to init \`${key}\``, reason);
+            return Promise.resolve();
+          }
+          this.logger.error(`storage(${namespace}): failed to init \`${key}\``, reason);
 
-        return Promise.reject(reason);
-      });
+          return Promise.reject(reason);
+        });
 
-      // Iterate over the list of keys marked as blocking via `@waitForValue`
-      const keys = blockingKeys.get(target, prop);
-      const promises = [];
+        // Iterate over the list of keys marked as blocking via `@waitForValue`
+        const keys = blockingKeys.get(target, prop);
+        const promises = [];
 
-      keys.forEach((key) => {
-        promises.push(this.boundedStorage.get(namespace, key)
-          .then(set(key))
-          .catch(handle(key)));
-      });
+        keys.forEach((key) => {
+          promises.push(this.boundedStorage.get(namespace, key).then(set(key)).catch(handle(key)));
+        });
 
-      Promise.all(promises)
-        .then(() => {
+        Promise.all(promises).then(() => {
           stack.delete(namespace);
           if (stack.size === 0) {
             this.loaded = true;
           }
         });
-    });
+      }
+    );
   }
 }

package/src/lib/storage/index.js

@@ -2,11 +2,9 @@
  * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
  */
 
-export {
-  persist,
-  waitForValue
-} from './decorators';
-export {default as makeWebexStore} from './make-webex-store.js';
-export {default as makeWebexPluginStore} from './make-webex-plugin-store.js';
+export {persist, waitForValue} from './decorators';
+export {default as makeWebexStore} from './make-webex-store';
+export {default as makeWebexPluginStore} from './make-webex-plugin-store';
+
 export {default as MemoryStoreAdapter} from './memory-store-adapter';
 export {StorageError, NotFoundError} from './errors';

package/src/lib/storage/make-webex-plugin-store.js

@@ -28,12 +28,10 @@ function serialize(value) {
     if (isArray(val)) {
       if (val.length === 0) {
         serialized[key] = undefined;
-      }
-      else {
+      } else {
         serialized[key] = val.map(serialize);
       }
-    }
-    else if (isObject(val)) {
+    } else if (isObject(val)) {
       Object.keys(val).forEach((k) => {
         val[k] = serialize(val[k]);
       });
@@ -102,12 +100,11 @@ export default function makeWebexPluginStorage(type, context) {
         defers.get(this).set(key, defer);
       }
 
-      return context.webex[`${type}Storage`].get(context.getNamespace(), key)
-        .then((res) => {
-          defer.resolve();
+      return context.webex[`${type}Storage`].get(context.getNamespace(), key).then((res) => {
+        defer.resolve();
 
-          return res;
-        });
+        return res;
+      });
     }
 
     /**
@@ -129,11 +126,15 @@ export default function makeWebexPluginStorage(type, context) {
      * @returns {Promise}
      */
     waitFor(key) {
-      context.logger.debug(`plugin-storage(${context.getNamespace()}): waiting to init key \`${key}\``);
+      context.logger.debug(
+        `plugin-storage(${context.getNamespace()}): waiting to init key \`${key}\``
+      );
       const defer = defers.get(this).get(key);
 
       if (defer) {
-        context.logger.debug(`plugin-storage(${context.getNamespace()}): already inited \`${key}\``);
+        context.logger.debug(
+          `plugin-storage(${context.getNamespace()}): already inited \`${key}\``
+        );
 
         return defer.promise;
       }
@@ -160,19 +161,22 @@ export default function makeWebexPluginStorage(type, context) {
 
       // Intentionally bypasses this.get so we don't resolve the promise until
       // after the parent value is set.
-      context.webex[`${type}Storage`].get(context.getNamespace(), key)
+      context.webex[`${type}Storage`]
+        .get(context.getNamespace(), key)
         .then((value) => {
-          context.logger.debug(`plugin-storage(${context.getNamespace()}): got \`${key}\` for first time`);
+          context.logger.debug(
+            `plugin-storage(${context.getNamespace()}): got \`${key}\` for first time`
+          );
           if (key === '@') {
             context.parent.set(value);
-          }
-          else if (result(context[key], 'isState')) {
+          } else if (result(context[key], 'isState')) {
             context[key].set(value);
-          }
-          else {
+          } else {
             context.set(key, value);
           }
-          context.logger.debug(`plugin-storage(${context.getNamespace()}): set \`${key}\` for first time`);
+          context.logger.debug(
+            `plugin-storage(${context.getNamespace()}): set \`${key}\` for first time`
+          );
           defer.resolve();
           context.logger.debug(`plugin-storage(${context.getNamespace()}): inited \`${key}\``);
         })
@@ -180,12 +184,21 @@ export default function makeWebexPluginStorage(type, context) {
           // The  next conditional is a bit of an unfortunate solution to deal
           // with circular dependencies in unit tests. It should not effect
           // integration tests or production code.
-          if (reason instanceof NotFoundError || process.env.NODE_ENV !== 'production' && reason.toString().includes('MockNotFoundError')) {
-            context.logger.debug(`plugin-storage(${context.getNamespace()}): no data for \`${key}\`, continuing`);
+          if (
+            reason instanceof NotFoundError ||
+            (process.env.NODE_ENV !== 'production' &&
+              reason.toString().includes('MockNotFoundError'))
+          ) {
+            context.logger.debug(
+              `plugin-storage(${context.getNamespace()}): no data for \`${key}\`, continuing`
+            );
 
             return defer.resolve();
           }
-          context.logger.warn(`plugin-storage(${context.getNamespace()}): failed to init \`${key}\``, reason);
+          context.logger.warn(
+            `plugin-storage(${context.getNamespace()}): failed to init \`${key}\``,
+            reason
+          );
 
           return defer.reject(reason);
         });

package/src/lib/storage/make-webex-store.js

@@ -67,8 +67,7 @@ export default function makeWebexStore(type, webex) {
     del(namespace, key) {
       webex.logger.debug(`webex-store: removing ${namespace}:${key}`);
 
-      return this._getBinding(namespace)
-        .then((binding) => binding.del(key));
+      return this._getBinding(namespace).then((binding) => binding.del(key));
     }
 
     /**
@@ -81,8 +80,7 @@ export default function makeWebexStore(type, webex) {
     get(namespace, key) {
       webex.logger.debug(`webex-store: retrieving ${namespace}:${key}`);
 
-      return this._getBinding(namespace)
-        .then((binding) => binding.get(key));
+      return this._getBinding(namespace).then((binding) => binding.get(key));
     }
 
     /**
@@ -124,13 +122,14 @@ export default function makeWebexStore(type, webex) {
           return resolve(binding);
         }
 
-        return resolve(this.adapter.bind(namespace, {logger: webex.logger})
-          .then((_binding) => {
+        return resolve(
+          this.adapter.bind(namespace, {logger: webex.logger}).then((_binding) => {
             webex.logger.debug(`storage: made binding for \`${namespace}\``);
             this.bindings.set(namespace, _binding);
 
             return _binding;
-          }));
+          })
+        );
       });
     }
   }

package/src/lib/storage/memory-store-adapter.js

@@ -59,7 +59,7 @@ function _bind(namespace, options = {}) {
       logger.debug(`memory-store-adapter: writing \`${key}\``);
 
       return Promise.resolve(map.set(key, value));
-    }
+    },
   });
 }
 
@@ -73,7 +73,7 @@ export default {
         }
 
         return _bind(namespace, options);
-      }
+      },
     };
-  }
+  },
 };

package/src/lib/webex-core-plugin-mixin.js

@@ -26,7 +26,7 @@ export default function mixinWebexCorePlugins(State, config, interceptors) {
           deps: [`${name}.${key}`],
           fn() {
             return this[name][key];
-          }
+          },
         });
       });
     }
@@ -55,13 +55,16 @@ export default function mixinWebexCorePlugins(State, config, interceptors) {
 
     if (options.onBeforeLogout) {
       config.onBeforeLogout = config.onBeforeLogout || [];
-      const onBeforeLogout = isArray(options.onBeforeLogout) ? options.onBeforeLogout : [options.onBeforeLogout];
+      const onBeforeLogout = isArray(options.onBeforeLogout)
+        ? options.onBeforeLogout
+        : [options.onBeforeLogout];
 
       onBeforeLogout.forEach((fn) =>
         config.onBeforeLogout.push({
           plugin: name,
-          fn
-        }));
+          fn,
+        })
+      );
     }
 
     // Only mess with the plugin's derived properties if it's an amp-state plugin
@@ -69,7 +72,7 @@ export default function mixinWebexCorePlugins(State, config, interceptors) {
       const {fn, depList} = State.prototype._derived.ready;
       const def = {
         deps: depList.concat(`${name}.ready`),
-        fn
+        fn,
       };
 
       createDerivedProperty(State.prototype, 'ready', def);
@@ -91,7 +94,7 @@ function createDerivedProperty(modelProto, name, definition) {
   const def = (modelProto._derived[name] = {
     fn: isFunction(definition) ? definition : definition.fn,
     cache: definition.cache !== false,
-    depList: definition.deps || []
+    depList: definition.deps || [],
   });
 
   // add to our shared dependency list
@@ -106,6 +109,6 @@ function createDerivedProperty(modelProto, name, definition) {
     },
     set() {
       throw new TypeError(`\`${name}\` is a derived property, it can't be set directly.`);
-    }
+    },
   });
 }

package/src/lib/webex-http-error.js

@@ -19,17 +19,17 @@ export default class WebexHttpError extends HttpError {
 
     Reflect.defineProperty(this, 'options', {
       enumerable: false,
-      value: res.options
+      value: res.options,
     });
 
     if (this.options.url) {
       message += `\n${this.options.method} ${this.options.url}`;
-    }
-    else if (this.options.uri) {
+    } else if (this.options.uri) {
       message += `\n${this.options.method} ${this.options.uri}`;
-    }
-    else {
-      message += `\n${this.options.method} ${this.options.service.toUpperCase()}/${this.options.resource}`;
+    } else {
+      message += `\n${this.options.method} ${this.options.service.toUpperCase()}/${
+        this.options.resource
+      }`;
     }
     message += `\nWEBEX_TRACKING_ID: ${this.options.headers.trackingid}`;
     if (this.options.headers && this.options.headers['x-trans-id']) {
@@ -39,7 +39,7 @@ export default class WebexHttpError extends HttpError {
       Reflect.defineProperty(this, 'retryAfter', {
         enumerable: true,
         value: this.headers['retry-after'],
-        writeable: false
+        writeable: false,
       });
 
       message += `\nRETRY-AFTER: ${this.retryAfter}`;
@@ -52,7 +52,6 @@ export default class WebexHttpError extends HttpError {
 
 HttpError.makeSubTypes(WebexHttpError);
 
-
 /**
  * TooManyRequests
  */

package/src/lib/webex-internal-core-plugin-mixin.js

@@ -48,13 +48,16 @@ export default function mixinWebexInternalCorePlugins(State, config, interceptor
 
     if (options.onBeforeLogout) {
       config.onBeforeLogout = config.onBeforeLogout || [];
-      const onBeforeLogout = isArray(options.onBeforeLogout) ? options.onBeforeLogout : [options.onBeforeLogout];
+      const onBeforeLogout = isArray(options.onBeforeLogout)
+        ? options.onBeforeLogout
+        : [options.onBeforeLogout];
 
       onBeforeLogout.forEach((fn) =>
         config.onBeforeLogout.push({
           plugin: name,
-          fn
-        }));
+          fn,
+        })
+      );
     }
 
     // Only mess with the plugin's derived properties if it's an amp-state plugin
@@ -62,7 +65,7 @@ export default function mixinWebexInternalCorePlugins(State, config, interceptor
       const {fn, depList} = State.prototype._derived.ready;
       const def = {
         deps: depList.concat(`${name}.ready`),
-        fn
+        fn,
       };
 
       createDerivedProperty(State.prototype, 'ready', def);
@@ -84,7 +87,7 @@ function createDerivedProperty(modelProto, name, definition) {
   const def = (modelProto._derived[name] = {
     fn: isFunction(definition) ? definition : definition.fn,
     cache: definition.cache !== false,
-    depList: definition.deps || []
+    depList: definition.deps || [],
   });
 
   // add to our shared dependency list
@@ -99,6 +102,6 @@ function createDerivedProperty(modelProto, name, definition) {
     },
     set() {
       throw new TypeError(`\`${name}\` is a derived property, it can't be set directly.`);
-    }
+    },
   });
 }

package/src/lib/webex-plugin.js

@@ -5,11 +5,7 @@
 import util from 'util';
 
 import AmpState from 'ampersand-state';
-import {
-  cloneDeep,
-  isObject,
-  omit
-} from 'lodash';
+import {cloneDeep, isObject, omit} from 'lodash';
 
 import {makeWebexPluginStore} from './storage';
 
@@ -22,22 +18,19 @@ const WebexPlugin = AmpState.extend({
       deps: [],
       fn() {
         return makeWebexPluginStore('bounded', this);
-      }
+      },
     },
     unboundedStorage: {
       deps: [],
       fn() {
         return makeWebexPluginStore('unbounded', this);
-      }
+      },
     },
     config: {
-    // figure out why caching config breaks the refresh integration test
-    // but not the refresh automation test.
+      // figure out why caching config breaks the refresh integration test
+      // but not the refresh automation test.
       cache: false,
-      deps: [
-        'webex',
-        'webex.config'
-      ],
+      deps: ['webex', 'webex.config'],
       fn() {
         if (this.webex && this.webex.config) {
           const namespace = this.getNamespace();
@@ -50,24 +43,23 @@ const WebexPlugin = AmpState.extend({
         }
 
         return {};
-      }
+      },
     },
 
     logger: {
-      deps: [
-        'webex',
-        'webex.logger'
-      ],
+      deps: ['webex', 'webex.logger'],
       fn() {
         return this.webex.logger || console;
-      }
+      },
     },
 
     webex: {
       deps: ['parent'],
       fn() {
         if (!this.parent && !this.collection) {
-          throw new Error('Cannot determine `this.webex` without `this.parent` or `this.collection`. Please initialize `this` via `children` or `collection` or set `this.parent` manually');
+          throw new Error(
+            'Cannot determine `this.webex` without `this.parent` or `this.collection`. Please initialize `this` via `children` or `collection` or set `this.parent` manually'
+          );
         }
 
         /* eslint consistent-this: [0] */
@@ -78,13 +70,13 @@ const WebexPlugin = AmpState.extend({
         }
 
         return parent;
-      }
-    }
+      },
+    },
   },
 
   session: {
     parent: {
-      type: 'any'
+      type: 'any',
     },
     /**
      * Indicates this plugin is ready to be used. Defaults to true but can be
@@ -95,8 +87,8 @@ const WebexPlugin = AmpState.extend({
      */
     ready: {
       default: true,
-      type: 'boolean'
-    }
+      type: 'boolean',
+    },
   },
 
   /**
@@ -148,7 +140,12 @@ const WebexPlugin = AmpState.extend({
     // Propagate change:[attribute] events from children
     this.on('change', (model, options) => {
       if (this.parent) {
-        this.parent.trigger(`change:${this.getNamespace().toLowerCase()}`, this.parent, this, options);
+        this.parent.trigger(
+          `change:${this.getNamespace().toLowerCase()}`,
+          this.parent,
+          this,
+          options
+        );
       }
     });
   },
@@ -161,11 +158,22 @@ const WebexPlugin = AmpState.extend({
    * @returns {Object}
    */
   inspect(depth) {
-    return util.inspect(omit(this.serialize({
-      props: true,
-      session: true,
-      derived: true
-    }), 'boundedStorage', 'unboundedStorage', 'config', 'logger', 'webex', 'parent'), {depth});
+    return util.inspect(
+      omit(
+        this.serialize({
+          props: true,
+          session: true,
+          derived: true,
+        }),
+        'boundedStorage',
+        'unboundedStorage',
+        'config',
+        'logger',
+        'webex',
+        'parent'
+      ),
+      {depth}
+    );
   },
 
   request(...args) {
@@ -200,8 +208,7 @@ const WebexPlugin = AmpState.extend({
     if (isObject(key) || key === null) {
       attrs = key;
       options = value;
-    }
-    else {
+    } else {
       attrs = {};
       attrs[key] = value;
     }
@@ -209,7 +216,7 @@ const WebexPlugin = AmpState.extend({
     options = options || {};
 
     return [attrs, options];
-  }
+  },
 });
 
 export default WebexPlugin;