@microsoft/omnichannel-chat-widget 0.1.0-main.eb80fb1 → 0.1.0-main.ebfc563

package/lib/cjs/common/telemetry/TelemetryManager.js

@@ -4,70 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.disposeLoggers = exports.TelemetryTimers = exports.TelemetryManager = exports.RegisterLoggers = void 0;
-
 var _TelemetryConstants = require("./TelemetryConstants");
-
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
-
 var _ariaTelemetryLogger = require("./loggers/ariaTelemetryLogger");
-
 var _consoleLogger = require("./loggers/consoleLogger");
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+var _defaultAriaConfig = require("./defaultConfigs/defaultAriaConfig");
+var _TelemetryHelper = require("./TelemetryHelper");
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 class TelemetryTimers {}
-
 exports.TelemetryTimers = TelemetryTimers;
-
 _defineProperty(TelemetryTimers, "LcwLoadToChatButtonTimer", void 0);
-
 _defineProperty(TelemetryTimers, "ProactiveChatScreenTimer", void 0);
-
 _defineProperty(TelemetryTimers, "WidgetLoadTimer", void 0);
-
 class TelemetryManager {}
-
 exports.TelemetryManager = TelemetryManager;
-
 _defineProperty(TelemetryManager, "InternalTelemetryData", void 0);
-
 const loggers = [];
-
 const disposeLoggers = () => {
   loggers.map(logger => {
     logger.dispose();
   });
 };
-
 exports.disposeLoggers = disposeLoggers;
-
 const RegisterLoggers = () => {
   const registerLoggers = () => {
     var _TelemetryManager$Int, _TelemetryManager$Int2, _TelemetryManager$Int3, _TelemetryManager$Int4, _TelemetryManager$Int5, _TelemetryManager$Int6, _TelemetryManager$Int7, _TelemetryManager$Int8;
-
-    if (!((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int !== void 0 && (_TelemetryManager$Int2 = _TelemetryManager$Int.telemetryConfig) !== null && _TelemetryManager$Int2 !== void 0 && _TelemetryManager$Int2.disableConsoleLog) || !((_TelemetryManager$Int3 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int3 !== void 0 && (_TelemetryManager$Int4 = _TelemetryManager$Int3.telemetryConfig) !== null && _TelemetryManager$Int4 !== void 0 && _TelemetryManager$Int4.telemetryDisabled)) {
+    if (((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : (_TelemetryManager$Int2 = _TelemetryManager$Int.telemetryConfig) === null || _TelemetryManager$Int2 === void 0 ? void 0 : _TelemetryManager$Int2.disableConsoleLog) === false || ((_TelemetryManager$Int3 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int3 === void 0 ? void 0 : (_TelemetryManager$Int4 = _TelemetryManager$Int3.telemetryConfig) === null || _TelemetryManager$Int4 === void 0 ? void 0 : _TelemetryManager$Int4.telemetryDisabled) === false) {
       _omnichannelChatComponents.BroadcastService.getAnyMessage().subscribe(event => {
-        if (event.payload && event.eventName !== _TelemetryConstants.TelemetryEvent.ChatWidgetStateChanged) {
+        if (event.payload && event.eventName in _TelemetryConstants.TelemetryEvent) {
           logTelemetry(event);
         }
       });
     }
-
-    if (!((_TelemetryManager$Int5 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int5 !== void 0 && (_TelemetryManager$Int6 = _TelemetryManager$Int5.telemetryConfig) !== null && _TelemetryManager$Int6 !== void 0 && _TelemetryManager$Int6.disableConsoleLog)) {
+    if (((_TelemetryManager$Int5 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int5 === void 0 ? void 0 : (_TelemetryManager$Int6 = _TelemetryManager$Int5.telemetryConfig) === null || _TelemetryManager$Int6 === void 0 ? void 0 : _TelemetryManager$Int6.disableConsoleLog) === false) {
       loggers.push((0, _consoleLogger.consoleLogger)());
     }
-
-    if (!((_TelemetryManager$Int7 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int7 !== void 0 && (_TelemetryManager$Int8 = _TelemetryManager$Int7.telemetryConfig) !== null && _TelemetryManager$Int8 !== void 0 && _TelemetryManager$Int8.telemetryDisabled)) {
+    if (((_TelemetryManager$Int7 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int7 === void 0 ? void 0 : (_TelemetryManager$Int8 = _TelemetryManager$Int7.telemetryConfig) === null || _TelemetryManager$Int8 === void 0 ? void 0 : _TelemetryManager$Int8.telemetryDisabled) === false) {
       var _TelemetryManager$Int9, _TelemetryManager$Int18, _TelemetryManager$Int19;
-
       if ((_TelemetryManager$Int9 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int9 !== void 0 && _TelemetryManager$Int9.ariaConfig) {
         var _TelemetryManager$Int10, _TelemetryManager$Int11, _TelemetryManager$Int12, _TelemetryManager$Int13, _TelemetryManager$Int14, _TelemetryManager$Int15, _TelemetryManager$Int16, _TelemetryManager$Int17;
-
-        loggers.push((0, _ariaTelemetryLogger.ariaTelemetryLogger)(((_TelemetryManager$Int10 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int10 === void 0 ? void 0 : (_TelemetryManager$Int11 = _TelemetryManager$Int10.ariaConfig) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.ariaTelemetryKey) ?? "", ((_TelemetryManager$Int12 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : (_TelemetryManager$Int13 = _TelemetryManager$Int12.ariaConfig) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.disableCookieUsage) ?? false, ((_TelemetryManager$Int14 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : (_TelemetryManager$Int15 = _TelemetryManager$Int14.ariaConfig) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.collectorUriForTelemetry) ?? "", ((_TelemetryManager$Int16 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int16 === void 0 ? void 0 : (_TelemetryManager$Int17 = _TelemetryManager$Int16.ariaConfig) === null || _TelemetryManager$Int17 === void 0 ? void 0 : _TelemetryManager$Int17.ariaTelemetryApplicationName) ?? "OmniChannelProd_Web"));
+        loggers.push((0, _ariaTelemetryLogger.ariaTelemetryLogger)(((_TelemetryManager$Int10 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int10 === void 0 ? void 0 : (_TelemetryManager$Int11 = _TelemetryManager$Int10.ariaConfig) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.ariaTelemetryKey) ?? _defaultAriaConfig.defaultAriaConfig.ariaTelemetryKey, ((_TelemetryManager$Int12 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : (_TelemetryManager$Int13 = _TelemetryManager$Int12.ariaConfig) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.disableCookieUsage) ?? _defaultAriaConfig.defaultAriaConfig.disableCookieUsage, ((_TelemetryManager$Int14 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : (_TelemetryManager$Int15 = _TelemetryManager$Int14.ariaConfig) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.collectorUriForTelemetry) ?? _defaultAriaConfig.defaultAriaConfig.collectorUriForTelemetry, ((_TelemetryManager$Int16 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int16 === void 0 ? void 0 : (_TelemetryManager$Int17 = _TelemetryManager$Int16.ariaConfig) === null || _TelemetryManager$Int17 === void 0 ? void 0 : _TelemetryManager$Int17.ariaTelemetryApplicationName) ?? _defaultAriaConfig.defaultAriaConfig.ariaTelemetryApplicationName));
       }
-
       const customLoggers = (_TelemetryManager$Int18 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int18 === void 0 ? void 0 : (_TelemetryManager$Int19 = _TelemetryManager$Int18.telemetryConfig) === null || _TelemetryManager$Int19 === void 0 ? void 0 : _TelemetryManager$Int19.telemetryLoggers;
-
       if (customLoggers) {
         customLoggers.map(logger => {
           loggers.push(logger);
@@ -75,7 +55,6 @@ const RegisterLoggers = () => {
       }
     }
   };
-
   const parseInput = function (payload) {
     let scenarioType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _TelemetryConstants.ScenarioType.UNDEFINED;
     return {
@@ -83,15 +62,18 @@ const RegisterLoggers = () => {
       payload: payload
     };
   };
-
   const logTelemetry = telemetryEvent => {
     loggers.map(logger => {
+      var _payload;
       const logLevel = telemetryEvent.logLevel ?? _TelemetryConstants.LogLevel.INFO;
-      logger.log(logLevel, parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload));
+      const scenarioType = ((_payload = telemetryEvent.payload) === null || _payload === void 0 ? void 0 : _payload.scenarioType) ?? _TelemetryConstants.ScenarioType.UNDEFINED;
+      const telemetryInput = parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload, scenarioType);
+      telemetryInput.telemetryInfo = {
+        telemetryInfo: _TelemetryHelper.TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput)
+      };
+      logger.log(logLevel, telemetryInput);
     });
   };
-
   return registerLoggers();
 };
-
 exports.RegisterLoggers = RegisterLoggers;

package/lib/cjs/common/telemetry/defaultConfigs/defaultAriaConfig.js

@@ -7,7 +7,7 @@ exports.defaultAriaConfig = void 0;
 const defaultAriaConfig = {
   collectorUriForTelemetry: "",
   ariaTelemetryKey: "c7655518acf1403f93ff6b9f77942f0a-d01a02fd-6b50-4de3-a566-62eda11f93bc-7083",
-  ariaTelemetryApplicationName: "",
+  ariaTelemetryApplicationName: "D365_Omnichannel_Client_Public_Prod",
   disableCookieUsage: true
 };
 exports.defaultAriaConfig = defaultAriaConfig;

package/lib/cjs/common/telemetry/defaultConfigs/defaultTelemetryConfiguration.js

@@ -4,13 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultTelemetryConfiguration = void 0;
-
 var _defaultAriaConfig = require("./defaultAriaConfig");
-
 const defaultTelemetryConfiguration = {
   telemetryDisabled: false,
   disableConsoleLog: false,
   telemetryLoggers: [],
-  ariaConfigurations: _defaultAriaConfig.defaultAriaConfig
+  ariaConfigurations: _defaultAriaConfig.defaultAriaConfig,
+  chatWidgetVersion: "0.0.0-0",
+  chatComponentVersion: "0.0.0-0",
+  OCChatSDKVersion: "0.0.0-0"
 };
 exports.defaultTelemetryConfiguration = defaultTelemetryConfiguration;

package/lib/cjs/common/telemetry/loggers/ariaTelemetryLogger.js

@@ -4,72 +4,86 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ariaTelemetryLogger = void 0;
-
 var _utils = require("../../utils");
-
-var _AWTEventProperties = _interopRequireDefault(require("@microsoft/omnichannel-chat-sdk/lib/external/aria/webjs/AWTEventProperties"));
-
-var _AWTLogManager = _interopRequireDefault(require("@microsoft/omnichannel-chat-sdk/lib/external/aria/webjs/AWTLogManager"));
-
+var _AriaSDK = require("@microsoft/omnichannel-chat-sdk/lib/external/aria/webjs/AriaSDK");
 var _Enums = require("@microsoft/omnichannel-chat-sdk/lib/external/aria/common/Enums");
-
 var _Constants = require("../../Constants");
-
-var _TelemetryHelper = require("../TelemetryHelper");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+var _TelemetryManager = require("../TelemetryManager");
 const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, collectiorUriForTelemetry, ariaTelemetryApplicationName) => {
   let _logger;
-
   const logger = () => {
     if ((0, _utils.isNullOrUndefined)(_logger) && !(0, _utils.isNullOrEmptyString)(ariaTelemetryKey)) {
       const configuration = {
         disableCookiesUsage: disabledCookieUsage
       };
-
       if (!(0, _utils.isNullOrEmptyString)(collectiorUriForTelemetry)) {
         configuration.collectorUri = collectiorUriForTelemetry;
+      } else {
+        if (_TelemetryManager.TelemetryManager.InternalTelemetryData.environmentVersion == _Constants.EnvironmentVersion.prod) {
+          var _TelemetryManager$Int;
+          const orgUrl = (_TelemetryManager$Int = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.orgUrl;
+          if (!(0, _utils.isNullOrUndefined)(orgUrl)) {
+            // If the given org is a Production EU org, modify the Aria collector uri
+            const region = (0, _utils.getDomain)(orgUrl);
+            if (region === _Constants.AriaTelemetryConstants.EU) {
+              configuration.collectorUri = _Constants.AriaTelemetryConstants.EUROPE_ENDPOINT;
+            }
+          }
+        }
       }
-
       try {
-        _logger = _AWTLogManager.default.initialize(ariaTelemetryKey, configuration);
-
+        _logger = _AriaSDK.AWTLogManager.initialize(ariaTelemetryKey, configuration);
         if (_logger === undefined) {
-          _logger = _AWTLogManager.default.getLogger(ariaTelemetryKey);
+          _logger = _AriaSDK.AWTLogManager.getLogger(ariaTelemetryKey);
         }
       } catch (error) {
         console.log(error);
       }
     }
-
     return _logger;
   };
-
   const ariaLogger = {
     log: (logLevel, telemetryInput) => {
-      let property;
-      const eventProperties = new _AWTEventProperties.default();
-
-      const event = _TelemetryHelper.TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput);
-
-      eventProperties.setName(telemetryInput.scenarioType);
-
-      for (const key of Object.keys(event)) {
-        property = typeof event[key] === "object" ? JSON.stringify(event[key]) : event[key];
-        eventProperties.setProperty(key, property);
+      try {
+        var _telemetryInput$telem;
+        const telemetryInfo = telemetryInput === null || telemetryInput === void 0 ? void 0 : (_telemetryInput$telem = telemetryInput.telemetryInfo) === null || _telemetryInput$telem === void 0 ? void 0 : _telemetryInput$telem.telemetryInfo;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const eventProperties = {
+          name: telemetryInput.scenarioType,
+          properties: {}
+        };
+        if (telemetryInfo) {
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          Object.keys(telemetryInfo).forEach((key, index) => {
+            if (!(0, _utils.isNullOrUndefined)(telemetryInfo[key]) && !(0, _utils.isNullOrEmptyString)(telemetryInfo[key])) {
+              const property = {
+                value: typeof telemetryInfo[key] === "object" ? JSON.stringify(telemetryInfo[key]) : telemetryInfo[key],
+                type: typeof telemetryInfo[key] === "number" ? _Enums.AWTPropertyType.Double : _Enums.AWTPropertyType.String,
+                pii: _Enums.AWTPiiKind.NotSet,
+                cc: _Enums.AWTCustomerContentKind.NotSet
+              };
+              eventProperties.properties[key] = property;
+            }
+          });
+          const nameProperty = {
+            value: _Constants.Constants.LiveChatWidget,
+            type: _Enums.AWTPropertyType.String,
+            pii: _Enums.AWTPiiKind.GenericData,
+            cc: _Enums.AWTCustomerContentKind.NotSet
+          };
+          eventProperties.properties[ariaTelemetryApplicationName] = nameProperty;
+        }
+        logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
+      } catch (error) {
+        console.error("Error in logging telemetry to Aria logger:" + error);
       }
-
-      eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, _Constants.Constants.LiveChatWidget, _Enums.AWTPiiKind.GenericData);
-      logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
     },
     dispose: () => {
-      _AWTLogManager.default.flush(function () {
+      _AriaSDK.AWTLogManager.flush(function () {
         console.log("Aria logger disposed");
       });
     }
   };
   return ariaLogger;
 };
-
 exports.ariaTelemetryLogger = ariaTelemetryLogger;

package/lib/cjs/common/telemetry/loggers/consoleLogger.js

@@ -4,36 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.consoleLogger = void 0;
-
 var _Constants = require("../../Constants");
-
 var _TelemetryConstants = require("../TelemetryConstants");
-
 const consoleLogger = () => {
   const consoleLogger = {
     log: (logLevel, telemetryInput) => {
       const payload = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.payload && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload : "";
-
+      const telemetryInfo = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.telemetryInfo && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo : "";
       try {
         switch (logLevel) {
           case _TelemetryConstants.LogLevel.INFO:
-            console.info(_Constants.Constants.LiveChatWidget, payload);
+            console.info(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
-
           case _TelemetryConstants.LogLevel.DEBUG:
-            console.debug(_Constants.Constants.LiveChatWidget, payload);
+            console.debug(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
-
           case _TelemetryConstants.LogLevel.WARN:
-            console.warn(_Constants.Constants.LiveChatWidget, payload);
+            console.warn(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
-
           case _TelemetryConstants.LogLevel.ERROR:
-            console.error(_Constants.Constants.LiveChatWidget, payload);
+            console.error(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
-
           default:
-            console.debug(_Constants.Constants.LiveChatWidget, payload);
+            console.debug(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
         }
       } catch (ex) {
@@ -46,5 +39,4 @@ const consoleLogger = () => {
   };
   return consoleLogger;
 };
-
 exports.consoleLogger = consoleLogger;