@webex/internal-plugin-metrics 3.12.0-next.4 → 3.12.0-next.41

package/src/privacy-and-security-permission-enricher/index.ts

@@ -0,0 +1,142 @@
+import type {ClientEventPayload, PrivacyAndSecurityPermission} from '../metrics.types';
+import {
+  CAMERA_AND_MICROPHONE_PERMISSION_EVENTS,
+  CONTENT_SHARE_PERMISSION_EVENTS,
+  FINAL_PERMISSION_EVENTS,
+  MEDIA_TX_PERMISSION_EVENTS,
+  NO_PERMISSION_ENRICHMENT,
+} from './constants';
+import type {
+  PermissionEnrichmentContext,
+  PermissionEnrichmentPolicy,
+  PermissionEnrichmentRule,
+} from './types';
+import {
+  getChangedPermission,
+  projectPrivacyAndSecurityPermission,
+  resolveContentShareResources,
+  resolveMediaResources,
+} from './utils';
+
+export const PERMISSION_ENRICHMENT_RULES = [
+  {
+    events: CAMERA_AND_MICROPHONE_PERMISSION_EVENTS,
+    resolve: () => ({resources: ['camera', 'microphone'], terminal: false}),
+  },
+  {
+    events: MEDIA_TX_PERMISSION_EVENTS,
+    resolve: (payload) => ({resources: resolveMediaResources(payload), terminal: false}),
+  },
+  {
+    events: CONTENT_SHARE_PERMISSION_EVENTS,
+    resolve: (payload) => ({
+      resources: resolveContentShareResources(payload),
+      terminal: false,
+    }),
+  },
+  {
+    events: FINAL_PERMISSION_EVENTS,
+    resolve: () => ({resources: ['camera', 'microphone', 'contentShare'], terminal: true}),
+  },
+] satisfies readonly PermissionEnrichmentRule[];
+
+const resolvePermissionEnrichmentPolicy = (
+  name: PermissionEnrichmentContext['name'],
+  payload?: ClientEventPayload
+): PermissionEnrichmentPolicy =>
+  PERMISSION_ENRICHMENT_RULES.find(({events}) => events.has(name))?.resolve(payload) ??
+  NO_PERMISSION_ENRICHMENT;
+
+/**
+ * Enriches eligible client events with relevant browser permission changes.
+ */
+export default class PrivacyAndSecurityPermissionEnricher {
+  private permission?: PrivacyAndSecurityPermission;
+
+  private lastReported = new Map<string, PrivacyAndSecurityPermission>();
+
+  private readonly onEnrichmentError: (error: unknown) => void;
+
+  /**
+   * Creates a permission enricher.
+   * @param {Function} onEnrichmentError permission enrichment error handler
+   */
+  constructor(onEnrichmentError: (error: unknown) => void) {
+    this.onEnrichmentError = onEnrichmentError;
+  }
+
+  /**
+   * Stores the latest normalized browser permission state.
+   * @param {PrivacyAndSecurityPermission} permission permission snapshot
+   * @returns {void}
+   */
+  public setPermission(permission: PrivacyAndSecurityPermission): void {
+    this.permission = projectPrivacyAndSecurityPermission(permission, [
+      'camera',
+      'microphone',
+      'contentShare',
+    ]);
+  }
+
+  /**
+   * Returns the original payload or a copy enriched with relevant permission changes.
+   * @param {PermissionEnrichmentContext} context event context and permission history scope
+   * @returns {ClientEventPayload | undefined}
+   */
+  public enrich({
+    name,
+    payload,
+    scope,
+  }: PermissionEnrichmentContext): ClientEventPayload | undefined {
+    const policy = resolvePermissionEnrichmentPolicy(name, payload);
+
+    try {
+      if (payload?.privacyAndSecurityPermission !== undefined) {
+        // An explicitly supplied permission payload is authoritative for this event.
+        if (!policy.terminal) {
+          this.lastReported.set(scope, {
+            ...this.lastReported.get(scope),
+            ...(payload.privacyAndSecurityPermission as PrivacyAndSecurityPermission),
+          });
+        }
+
+        return payload;
+      }
+
+      if (policy.resources.length === 0) {
+        return payload;
+      }
+
+      const projectedPermission = this.permission
+        ? projectPrivacyAndSecurityPermission(this.permission, policy.resources)
+        : undefined;
+
+      if (!projectedPermission) {
+        return payload;
+      }
+
+      if (policy.terminal) {
+        return {...payload, privacyAndSecurityPermission: projectedPermission};
+      }
+
+      const lastReported = this.lastReported.get(scope) ?? {};
+      const changedPermission = getChangedPermission(projectedPermission, lastReported);
+
+      if (!changedPermission) {
+        return payload;
+      }
+
+      this.lastReported.set(scope, {...lastReported, ...changedPermission});
+
+      return {...payload, privacyAndSecurityPermission: changedPermission};
+    } catch (error) {
+      this.onEnrichmentError(error);
+
+      return payload;
+    } finally {
+      if (policy.terminal) {
+        this.lastReported.delete(scope);
+      }
+    }
+  }
+}

package/src/privacy-and-security-permission-enricher/types.ts

@@ -0,0 +1,21 @@
+import type {
+  ClientEvent,
+  ClientEventPayload,
+  PrivacyAndSecurityPermissionResource,
+} from '../metrics.types';
+
+export type PermissionEnrichmentPolicy = {
+  resources: readonly PrivacyAndSecurityPermissionResource[];
+  terminal: boolean;
+};
+
+export type PermissionEnrichmentRule = {
+  events: ReadonlySet<ClientEvent['name']>;
+  resolve: (payload?: ClientEventPayload) => PermissionEnrichmentPolicy;
+};
+
+export type PermissionEnrichmentContext = {
+  name: ClientEvent['name'];
+  payload?: ClientEventPayload;
+  scope: string;
+};

package/src/privacy-and-security-permission-enricher/utils.ts

@@ -0,0 +1,82 @@
+import {isEqual} from 'lodash';
+
+import type {
+  ClientEventPayload,
+  PrivacyAndSecurityPermission,
+  PrivacyAndSecurityPermissionResource,
+} from '../metrics.types';
+
+export const resolveMediaResources = (
+  payload?: ClientEventPayload
+): PrivacyAndSecurityPermissionResource[] => {
+  switch (payload?.mediaType) {
+    case 'audio':
+      return ['microphone'];
+    case 'video':
+      return ['camera'];
+    case 'share':
+      return ['contentShare'];
+    default:
+      return [];
+  }
+};
+
+export const resolveContentShareResources = (
+  payload?: ClientEventPayload
+): PrivacyAndSecurityPermissionResource[] => {
+  if (payload?.mediaType !== 'share') {
+    return [];
+  }
+
+  return ['contentShare'];
+};
+
+const copyPermissionState = (
+  source: PrivacyAndSecurityPermission,
+  target: PrivacyAndSecurityPermission,
+  resource: PrivacyAndSecurityPermissionResource
+): void => {
+  switch (resource) {
+    case 'camera':
+      if (source.camera) {
+        target.camera = {...source.camera};
+      }
+      break;
+    case 'microphone':
+      if (source.microphone) {
+        target.microphone = {...source.microphone};
+      }
+      break;
+    case 'contentShare':
+      if (source.contentShare) {
+        target.contentShare = {...source.contentShare};
+      }
+      break;
+    default:
+      break;
+  }
+};
+
+export const projectPrivacyAndSecurityPermission = (
+  permission: PrivacyAndSecurityPermission,
+  resources: readonly PrivacyAndSecurityPermissionResource[]
+): PrivacyAndSecurityPermission | undefined => {
+  const projectedPermission: PrivacyAndSecurityPermission = {};
+
+  resources.forEach((resource) => {
+    copyPermissionState(permission, projectedPermission, resource);
+  });
+
+  return Object.keys(projectedPermission).length > 0 ? projectedPermission : undefined;
+};
+
+export const getChangedPermission = (
+  current: PrivacyAndSecurityPermission,
+  previous: PrivacyAndSecurityPermission
+): PrivacyAndSecurityPermission | undefined => {
+  const changedResources = (Object.keys(current) as PrivacyAndSecurityPermissionResource[]).filter(
+    (resource) => !isEqual(current[resource], previous[resource])
+  );
+
+  return projectPrivacyAndSecurityPermission(current, changedResources);
+};

package/test/unit/spec/automated-user.ts

@@ -0,0 +1,43 @@
+import {assert} from '@webex/test-helper-chai';
+
+import {isAutomatedUser, isAutomatedUserAgent} from '../../../src/automated-user';
+
+describe('automated user detection', () => {
+  [
+    {userAgent: 'SkypeUriPreview', expected: true},
+    {userAgent: 'skypeuripreview', expected: true},
+    {userAgent: 'Mozilla/5.0 (compatible; SkypeUriPreview/0.1)', expected: true},
+    {userAgent: 'Googlebot/2.1 (+http://www.google.com/bot.html)', expected: true},
+    {
+      userAgent:
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 Chrome/126.0.0.0 Safari/537.36',
+      expected: false,
+    },
+    {userAgent: undefined, expected: false},
+  ].forEach(({userAgent, expected}) => {
+    it(`returns ${expected} for ${userAgent || 'an undefined user agent'}`, () => {
+      assert.equal(isAutomatedUserAgent(userAgent), expected);
+    });
+  });
+
+  it('returns the cached classification when navigator changes', () => {
+    const cachedResult = isAutomatedUser();
+    const originalDescriptor = Object.getOwnPropertyDescriptor(global, 'navigator');
+
+    Object.defineProperty(global, 'navigator', {
+      value: cachedResult
+        ? {userAgent: 'Mozilla/5.0', webdriver: false}
+        : {userAgent: 'SkypeUriPreview', webdriver: true},
+      configurable: true,
+      writable: true,
+    });
+
+    assert.equal(isAutomatedUser(), cachedResult);
+
+    if (originalDescriptor) {
+      Object.defineProperty(global, 'navigator', originalDescriptor);
+    } else {
+      delete (global as any).navigator;
+    }
+  });
+});

package/test/unit/spec/batcher.js

@@ -177,6 +177,49 @@ describe('plugin-metrics', () => {
               assert.lengthOf(webex.internal.metrics.batcher.queue, 0);
             });
         });
+
+        it('rejects the deferred without reenqueuing when batcherRetryOnNetworkError is false', () => {
+          webex.config.metrics = {...config.metrics, batcherRetryOnNetworkError: false};
+
+          webex.request = function () {
+            // noop
+          };
+
+          sinon.stub(webex, 'request').callsFake((options) => {
+            options.headers = {
+              trackingid: 'test-no-retry',
+            };
+
+            return Promise.reject(
+              new WebexHttpError.NetworkOrCORSError({
+                statusCode: 0,
+                options,
+              })
+            );
+          });
+
+          const promise = webex.internal.metrics.batcher.request({
+            key: 'testMetric',
+          });
+
+          return promiseTick(50)
+            .then(() => assert.lengthOf(webex.internal.metrics.batcher.queue, 1))
+            .then(() => clock.tick(config.metrics.batcherWait))
+            .then(() => assert.calledOnce(webex.request))
+            .then(() => promiseTick(50))
+            .then(() =>
+              promise.then(
+                () => {
+                  assert.fail('promise should have been rejected');
+                },
+                (reason) => {
+                  assert.instanceOf(reason, WebexHttpError.NetworkOrCORSError);
+                  assert.lengthOf(webex.internal.metrics.batcher.queue, 0);
+                  assert.calledOnce(webex.request);
+                }
+              )
+            );
+        });
       });
     });
   });

package/test/unit/spec/call-diagnostic/call-diagnostic-metrics-batcher.ts

@@ -192,6 +192,12 @@ describe('plugin-metrics', () => {
           webex.internal.newMetrics.callDiagnosticLatencies.getTotalJMTWithUserDelay = sinon
             .stub()
             .returns(64);
+          webex.internal.newMetrics.callDiagnosticLatencies.getInterstitialToJoinOK = sinon
+            .stub()
+            .returns(10);
+          webex.internal.newMetrics.callDiagnosticLatencies.getTotalJMT = sinon
+            .stub()
+            .returns(20);
           const promise = webex.internal.newMetrics.callDiagnosticMetrics.submitToCallDiagnostics(
             //@ts-ignore
             {event: {name: 'client.locus.join.response'}}
@@ -346,6 +352,12 @@ describe('plugin-metrics', () => {
           webex.internal.newMetrics.callDiagnosticLatencies.getStayLobbyTime = sinon
             .stub()
             .returns(1);
+          webex.internal.newMetrics.callDiagnosticLatencies.getStayLobbyTimeCappedBy = sinon
+            .stub()
+            .returns(1);
+          webex.internal.newMetrics.callDiagnosticLatencies.getTotalMediaJMT = sinon
+            .stub()
+            .returns(44);
           webex.internal.newMetrics.callDiagnosticLatencies.getTotalMediaJMTWithUserDelay = sinon
             .stub()
             .returns(43);
@@ -366,9 +378,9 @@ describe('plugin-metrics', () => {
           assert.deepEqual(webex.request.getCalls()[0].args[0].body.metrics[0].eventPayload.event, {
             name: 'client.media-engine.ready',
             joinTimes: {
-              totalMediaJMT: 61,
+              totalMediaJMT: 44,
               interstitialToMediaOKJMT: 22,
-              callInitMediaEngineReady: 10,
+              callInitMediaEngineReady: 22,
               totalMediaJMTWithUserDelay: 43,
               totalJMTWithUserDelay: 64,
             },