@sunbird-cb/utils 1.0.7 → 1.0.8

package/bundles/sunbird-cb-utils.umd.js

@@ -4018,6 +4018,7 @@
             IWsEvents.prototype.to;
             IWsEvents.prototype.data;
             IWsEvents.prototype.passThroughData;
+            IWsEvents.prototype.pageContext;
         }
         var EnumTelemetrySubType;
         (function (EnumTelemetrySubType) {
@@ -4189,6 +4190,7 @@
             this.events$ = this.eventsSubject.asObservable();
         }
         EventService.prototype.dispatchEvent = function (event) {
+            event.pageContext = this.getContext(event.pageContext);
             this.eventsSubject.next(event);
         };
         EventService.prototype.raiseInteractTelemetry = function (edata, object, pageContext) {
@@ -4513,6 +4515,7 @@
                 this.telemetryConfig = __assign({}, this.telemetryConfig, { pdata: __assign({}, this.telemetryConfig.pdata, { id: environment.name + "." + this.telemetryConfig.pdata.id }), uid: this.configSvc.userProfile && this.configSvc.userProfile.userId, channel: this.rootOrgId || this.telemetryConfig.channel, sid: this.getTelemetrySessionId });
                 this.pData = this.telemetryConfig.pdata;
                 this.addPlayerListener();
+                this.addCustomEventListener();
                 this.addInteractListener();
                 this.addFeedbackListener();
                 this.addTimeSpentListener();
@@ -4538,19 +4541,20 @@
             enumerable: true,
             configurable: true
         });
-        TelemetryService.prototype.start = function (type, mode, id, data) {
+        TelemetryService.prototype.start = function (edata, data, pageContext) {
             try {
                 if (this.telemetryConfig) {
-                    $t.start(this.telemetryConfig, id, '1.0', {
-                        type: type,
-                        mode: mode,
-                        pageid: id,
+                    $t.start(this.telemetryConfig, (pageContext && pageContext.pageId) ?
+                        pageContext.pageId
+                        : '', '1.0', {
+                        type: edata.type,
+                        mode: edata.mode,
+                        pageid: (pageContext && pageContext.pageId) ?
+                            pageContext.pageId
+                            : '',
                         duration: 1,
                     }, {
-                        context: {
-                            pdata: __assign({}, this.pData, { id: this.pData.id }),
-                            env: 'home',
-                        },
+                        context: __assign({ pdata: __assign({}, this.pData, { id: this.pData.id }) }, (pageContext && pageContext.module ? { env: pageContext.module } : null)),
                         object: __assign({}, (data) && data),
                     });
                 }
@@ -4562,16 +4566,16 @@
                 console.log('Error in telemetry start', e);
             }
         };
-        TelemetryService.prototype.end = function (type, mode, id, data) {
+        TelemetryService.prototype.end = function (edata, data, pageContext) {
             try {
                 $t.end({
-                    type: type,
-                    mode: mode,
-                    pageid: id,
+                    type: edata.type,
+                    mode: edata.mode,
+                    pageid: (pageContext && pageContext.pageId) ?
+                        pageContext.pageId
+                        : '',
                 }, {
-                    context: {
-                        pdata: __assign({}, this.pData, { id: this.pData.id }),
-                    },
+                    context: __assign({ pdata: __assign({}, this.pData, { id: this.pData.id }) }, (pageContext && pageContext.module ? { env: pageContext.module } : null)),
                     object: __assign({}, (data) && data),
                 });
             }
@@ -4698,10 +4702,40 @@
             })))
                 .subscribe((function (event) {
                 if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Loaded) {
-                    _this.start(event.data.type || exports.WsEvents.WsTimeSpentType.Page, event.data.mode || exports.WsEvents.WsTimeSpentMode.View, event.data.pageId);
+                    _this.start({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, {}, event.pageContext);
                 }
                 if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Unloaded) {
-                    _this.end(event.data.type || exports.WsEvents.WsTimeSpentType.Page, event.data.mode || exports.WsEvents.WsTimeSpentMode.View, event.data.pageId);
+                    _this.end({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, {}, event.pageContext);
+                }
+            }));
+        };
+        TelemetryService.prototype.addCustomEventListener = function () {
+            var _this = this;
+            this.eventsSvc.events$
+                .pipe(operators.filter((function (event) {
+                return event &&
+                    event.eventType === exports.WsEvents.WsEventType.Telemetry;
+            })))
+                .subscribe((function (event) {
+                if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Loaded &&
+                    event.data.type !== exports.WsEvents.WsTimeSpentType.Player) {
+                    _this.start({
+                        type: event.data.type,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, event.data.object, event.pageContext);
+                }
+                if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Unloaded &&
+                    event.data.type !== exports.WsEvents.WsTimeSpentType.Player) {
+                    _this.end({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, event.data.object, event.pageContext);
                 }
             }));
         };
@@ -4720,14 +4754,22 @@
                 if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Loaded &&
                     (!content ||
                         (content.isIframeSupported || '').toLowerCase() === 'maybe' ||
-                        (content.isIframeSupported || '').toLowerCase() === 'yes')) {
-                    _this.start(event.data.type || exports.WsEvents.WsTimeSpentType.Player, event.data.mode || exports.WsEvents.WsTimeSpentMode.Play, event.data.identifier, event.data.object);
+                        (content.isIframeSupported || '').toLowerCase() === 'yes' ||
+                        (content.mimeType === 'application/pdf' || 'application/json'))) {
+                    _this.start({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, event.data.object, event.pageContext);
                 }
                 if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Unloaded &&
                     (!content ||
                         (content.isIframeSupported || '').toLowerCase() === 'maybe' ||
-                        (content.isIframeSupported || '').toLowerCase() === 'yes')) {
-                    _this.end(event.data.type || exports.WsEvents.WsTimeSpentType.Player, event.data.mode || exports.WsEvents.WsTimeSpentMode.Play, event.data.identifier, event.data.object);
+                        (content.isIframeSupported || '').toLowerCase() === 'yes' ||
+                        (content.mimeType === 'application/pdf' || 'application/json'))) {
+                    _this.end({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, event.data.object, event.pageContext);
                 }
             }));
         };