@webex/internal-plugin-metrics 2.59.1 → 2.59.3-next.1

package/src/batcher.js

@@ -1,99 +1,99 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {Batcher, WebexHttpError} from '@webex/webex-core';
-import {safeSetTimeout} from '@webex/common-timers';
-
-const sym = Symbol('metric id');
-
-const MetricsBatcher = Batcher.extend({
-  namespace: 'Metrics',
-
-  prepareItem(item) {
-    // Keep non-prod data out of metrics
-    const env = process.env.NODE_ENV === 'production' ? null : 'TEST';
-
-    item.appType = item.appType || this.config.appType;
-    item.env = item.env || env;
-    item.time = item.time || Date.now();
-    item.version = item.version || this.webex.version;
-
-    return Promise.resolve(item);
-  },
-
-  prepareRequest(queue) {
-    return Promise.resolve(
-      queue.map((item) => {
-        item.postTime = item.postTime || Date.now();
-
-        return item;
-      })
-    );
-  },
-
-  submitHttpRequest(payload) {
-    return this.webex.request({
-      method: 'POST',
-      service: 'metrics',
-      resource: 'metrics',
-      body: {
-        metrics: payload,
-      },
-    });
-  },
-
-  handleHttpSuccess(res) {
-    return Promise.all(res.options.body.metrics.map((item) => this.acceptItem(item)));
-  },
-
-  handleHttpError(reason) {
-    if (reason instanceof WebexHttpError.NetworkOrCORSError) {
-      this.logger.warn(
-        'metrics-batcher: received network error submitting metrics, reenqueuing payload'
-      );
-
-      return Promise.all(
-        reason.options.body.metrics.map(
-          (item) =>
-            new Promise((resolve) => {
-              const delay = item[sym].nextDelay;
-
-              if (delay < this.config.batcherRetryPlateau) {
-                item[sym].nextDelay *= 2;
-              }
-              safeSetTimeout(() => {
-                resolve(this.rerequest(item));
-              }, delay);
-            })
-        )
-      );
-    }
-
-    return Reflect.apply(Batcher.prototype.handleHttpError, this, [reason]);
-  },
-
-  rerequest(item) {
-    return Promise.all([this.getDeferredForRequest(item), this.prepareItem(item)]).then(
-      ([defer, req]) => {
-        this.enqueue(req)
-          .then(() => this.bounce())
-          .catch((reason) => defer.reject(reason));
-      }
-    );
-  },
-
-  fingerprintRequest(item) {
-    item[sym] = item[sym] || {
-      nextDelay: 1000,
-    };
-
-    return Promise.resolve(item[sym]);
-  },
-
-  fingerprintResponse(item) {
-    return Promise.resolve(item[sym]);
-  },
-});
-
-export default MetricsBatcher;
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {Batcher, WebexHttpError} from '@webex/webex-core';
+import {safeSetTimeout} from '@webex/common-timers';
+
+const sym = Symbol('metric id');
+
+const MetricsBatcher = Batcher.extend({
+  namespace: 'Metrics',
+
+  prepareItem(item) {
+    // Keep non-prod data out of metrics
+    const env = process.env.NODE_ENV === 'production' ? null : 'TEST';
+
+    item.appType = item.appType || this.config.appType;
+    item.env = item.env || env;
+    item.time = item.time || Date.now();
+    item.version = item.version || this.webex.version;
+
+    return Promise.resolve(item);
+  },
+
+  prepareRequest(queue) {
+    return Promise.resolve(
+      queue.map((item) => {
+        item.postTime = item.postTime || Date.now();
+
+        return item;
+      })
+    );
+  },
+
+  submitHttpRequest(payload) {
+    return this.webex.request({
+      method: 'POST',
+      service: 'metrics',
+      resource: 'metrics',
+      body: {
+        metrics: payload,
+      },
+    });
+  },
+
+  handleHttpSuccess(res) {
+    return Promise.all(res.options.body.metrics.map((item) => this.acceptItem(item)));
+  },
+
+  handleHttpError(reason) {
+    if (reason instanceof WebexHttpError.NetworkOrCORSError) {
+      this.logger.warn(
+        'metrics-batcher: received network error submitting metrics, reenqueuing payload'
+      );
+
+      return Promise.all(
+        reason.options.body.metrics.map(
+          (item) =>
+            new Promise((resolve) => {
+              const delay = item[sym].nextDelay;
+
+              if (delay < this.config.batcherRetryPlateau) {
+                item[sym].nextDelay *= 2;
+              }
+              safeSetTimeout(() => {
+                resolve(this.rerequest(item));
+              }, delay);
+            })
+        )
+      );
+    }
+
+    return Reflect.apply(Batcher.prototype.handleHttpError, this, [reason]);
+  },
+
+  rerequest(item) {
+    return Promise.all([this.getDeferredForRequest(item), this.prepareItem(item)]).then(
+      ([defer, req]) => {
+        this.enqueue(req)
+          .then(() => this.bounce())
+          .catch((reason) => defer.reject(reason));
+      }
+    );
+  },
+
+  fingerprintRequest(item) {
+    item[sym] = item[sym] || {
+      nextDelay: 1000,
+    };
+
+    return Promise.resolve(item[sym]);
+  },
+
+  fingerprintResponse(item) {
+    return Promise.resolve(item[sym]);
+  },
+});
+
+export default MetricsBatcher;

package/src/call-diagnostic-events-batcher.js

@@ -1,62 +1,62 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import Batcher from './batcher';
-
-const CallDiagnosticEventsBatcher = Batcher.extend({
-  namespace: 'Metrics',
-
-  /**
-   * @param {string} webClientDomain
-   * @returns {string}
-   */
-  getBuildType(webClientDomain) {
-    if (
-      webClientDomain?.includes('teams.webex.com') ||
-      webClientDomain?.includes('localhost') ||
-      webClientDomain?.includes('127.0.0.1') ||
-      process.env.NODE_ENV !== 'production'
-    ) {
-      return 'test';
-    }
-
-    return process.env.NODE_ENV === 'production' ? 'prod' : 'test';
-  },
-
-  prepareItem(item) {
-    // networkType should be a enum value: `wifi`, `ethernet`, `cellular`, or `unknown`.
-    // Browsers cannot provide such information right now. However, it is a required field.
-    const origin = {
-      buildType: this.getBuildType(item.event?.eventData?.webClientDomain),
-      networkType: 'unknown',
-    };
-
-    item.eventPayload.origin = Object.assign(origin, item.eventPayload.origin);
-
-    return Promise.resolve(item);
-  },
-
-  prepareRequest(queue) {
-    // Add sent timestamp
-    queue.forEach((item) => {
-      item.eventPayload.originTime = item.eventPayload.originTime || {};
-      item.eventPayload.originTime.sent = new Date().toISOString();
-    });
-
-    return Promise.resolve(queue);
-  },
-
-  submitHttpRequest(payload) {
-    return this.webex.request({
-      method: 'POST',
-      service: 'metrics',
-      resource: 'clientmetrics',
-      body: {
-        metrics: payload,
-      },
-    });
-  },
-});
-
-export default CallDiagnosticEventsBatcher;
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import Batcher from './batcher';
+
+const CallDiagnosticEventsBatcher = Batcher.extend({
+  namespace: 'Metrics',
+
+  /**
+   * @param {string} webClientDomain
+   * @returns {string}
+   */
+  getBuildType(webClientDomain) {
+    if (
+      webClientDomain?.includes('teams.webex.com') ||
+      webClientDomain?.includes('localhost') ||
+      webClientDomain?.includes('127.0.0.1') ||
+      process.env.NODE_ENV !== 'production'
+    ) {
+      return 'test';
+    }
+
+    return process.env.NODE_ENV === 'production' ? 'prod' : 'test';
+  },
+
+  prepareItem(item) {
+    // networkType should be a enum value: `wifi`, `ethernet`, `cellular`, or `unknown`.
+    // Browsers cannot provide such information right now. However, it is a required field.
+    const origin = {
+      buildType: this.getBuildType(item.event?.eventData?.webClientDomain),
+      networkType: 'unknown',
+    };
+
+    item.eventPayload.origin = Object.assign(origin, item.eventPayload.origin);
+
+    return Promise.resolve(item);
+  },
+
+  prepareRequest(queue) {
+    // Add sent timestamp
+    queue.forEach((item) => {
+      item.eventPayload.originTime = item.eventPayload.originTime || {};
+      item.eventPayload.originTime.sent = new Date().toISOString();
+    });
+
+    return Promise.resolve(queue);
+  },
+
+  submitHttpRequest(payload) {
+    return this.webex.request({
+      method: 'POST',
+      service: 'metrics',
+      resource: 'clientmetrics',
+      body: {
+        metrics: payload,
+      },
+    });
+  },
+});
+
+export default CallDiagnosticEventsBatcher;

package/src/client-metrics-batcher.js

@@ -1,31 +1,31 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import Batcher from './batcher';
-
-const ClientMetricsBatcher = Batcher.extend({
-  namespace: 'Metrics',
-
-  prepareItem(item) {
-    // Add more defaults to payload when the clientmetrics endpoint evolves to support richer payloads
-    return Promise.resolve(item);
-  },
-
-  prepareRequest(queue) {
-    return Promise.resolve(queue);
-  },
-
-  submitHttpRequest(payload) {
-    return this.webex.request({
-      method: 'POST',
-      service: 'metrics',
-      resource: 'clientmetrics',
-      body: {
-        metrics: payload,
-      },
-    });
-  },
-});
-
-export default ClientMetricsBatcher;
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import Batcher from './batcher';
+
+const ClientMetricsBatcher = Batcher.extend({
+  namespace: 'Metrics',
+
+  prepareItem(item) {
+    // Add more defaults to payload when the clientmetrics endpoint evolves to support richer payloads
+    return Promise.resolve(item);
+  },
+
+  prepareRequest(queue) {
+    return Promise.resolve(queue);
+  },
+
+  submitHttpRequest(payload) {
+    return this.webex.request({
+      method: 'POST',
+      service: 'metrics',
+      resource: 'clientmetrics',
+      body: {
+        metrics: payload,
+      },
+    });
+  },
+});
+
+export default ClientMetricsBatcher;

package/src/config.js

@@ -1,42 +1,42 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {inBrowser} from '@webex/common';
-
-export const CLIENT_NAME = 'webex-js-sdk';
-export default {
-  device: {
-    preDiscoveryServices: {
-      metricsServiceUrl:
-        process.env.METRICS_SERVICE_URL || 'https://metrics-a.wbx2.com/metrics/api/v1',
-      metrics: process.env.METRICS_SERVICE_URL || 'https://metrics-a.wbx2.com/metrics/api/v1',
-    },
-  },
-  metrics: {
-    appType: inBrowser ? 'browser' : 'nodejs',
-    batcherWait: 500,
-    batcherMaxCalls: 50,
-    batcherMaxWait: 1500,
-    batcherRetryPlateau: 32000,
-  },
-};
-
-export const OS_NAME = {
-  WINDOWS: 'windows',
-  MAC: 'mac',
-  IOS: 'ios',
-  ANDROID: 'android',
-  CHROME: 'chrome',
-  LINUX: 'linux',
-  OTHERS: 'other',
-};
-
-export const OSMap = {
-  'Chrome OS': OS_NAME.CHROME,
-  macOS: OS_NAME.MAC,
-  Windows: OS_NAME.WINDOWS,
-  iOS: OS_NAME.IOS,
-  Android: OS_NAME.ANDROID,
-  Linux: OS_NAME.LINUX,
-};
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {inBrowser} from '@webex/common';
+
+export const CLIENT_NAME = 'webex-js-sdk';
+export default {
+  device: {
+    preDiscoveryServices: {
+      metricsServiceUrl:
+        process.env.METRICS_SERVICE_URL || 'https://metrics-a.wbx2.com/metrics/api/v1',
+      metrics: process.env.METRICS_SERVICE_URL || 'https://metrics-a.wbx2.com/metrics/api/v1',
+    },
+  },
+  metrics: {
+    appType: inBrowser ? 'browser' : 'nodejs',
+    batcherWait: 500,
+    batcherMaxCalls: 50,
+    batcherMaxWait: 1500,
+    batcherRetryPlateau: 32000,
+  },
+};
+
+export const OS_NAME = {
+  WINDOWS: 'windows',
+  MAC: 'mac',
+  IOS: 'ios',
+  ANDROID: 'android',
+  CHROME: 'chrome',
+  LINUX: 'linux',
+  OTHERS: 'other',
+};
+
+export const OSMap = {
+  'Chrome OS': OS_NAME.CHROME,
+  macOS: OS_NAME.MAC,
+  Windows: OS_NAME.WINDOWS,
+  iOS: OS_NAME.IOS,
+  Android: OS_NAME.ANDROID,
+  Linux: OS_NAME.LINUX,
+};

package/src/index.js

@@ -1,15 +1,15 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {registerInternalPlugin} from '@webex/webex-core';
-
-import Metrics from './metrics';
-import config from './config';
-
-registerInternalPlugin('metrics', Metrics, {
-  config,
-});
-
-export {default, getOSNameInternal} from './metrics';
-export {config};
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {registerInternalPlugin} from '@webex/webex-core';
+
+import Metrics from './metrics';
+import config from './config';
+
+registerInternalPlugin('metrics', Metrics, {
+  config,
+});
+
+export {default, getOSNameInternal} from './metrics';
+export {config};