From a6a06f70bf70b535c8a47f61935f1ddc29b6001e Mon Sep 17 00:00:00 2001
From: Marcel Ruiz Forns <mforns@wikimedia.org>
Date: Wed, 28 Apr 2021 16:28:11 +0200
Subject: [PATCH] Move VirtualPageViews back to mw.track

Use mw.track instead of dedicated tracker for VirtualPageViews.
This way we can migrate it to the new Event Platform client.
The new client does not observe DNT, which was the reason this
instrument was moved to a dedicated tracker on the first place.

Bug: T279382
Change-Id: I8bb515eab337ffed686ba7522bc6153cfdd8ca8d
---
 resources/dist/index.js                       | Bin 45174 -> 44677 bytes
 resources/dist/index.js.map.json              | Bin 215056 -> 210840 bytes
 src/changeListeners/pageviews.js              |  25 ++--
 src/getPageviewTracker.js                     | 111 ----------------
 src/index.js                                  |  20 +--
 .../changeListeners/pageviews.test.js         |  56 +++++----
 tests/node-qunit/getPageviewTracker.test.js   | 119 ------------------
 7 files changed, 56 insertions(+), 275 deletions(-)
 delete mode 100644 src/getPageviewTracker.js
 delete mode 100644 tests/node-qunit/getPageviewTracker.test.js

diff --git a/resources/dist/index.js b/resources/dist/index.js
index a735a7088a31335da7e9c67ed721a0a861b35cee..9e6c33e1f5d108b8d6fd795da54d16bb6f950c9b 100644
GIT binary patch
delta 932
zcmZvaOK4L;6o$F6O7VeKYpKsBDGhgU9Bio|34={*Qd?>gYoG)v;ofAD+<J2--bd1)
z)s=|i%Cjg~wGX1jwvj?y=|XTLx)*Vw=%RbwxbrbF)(W~g4ByQ8&p-dn*N?7i?_H~R
zhNMJoW+=W{>W9yf5vjjMqsMm(W+|(?U6@0sJ?!EXy6slb?E?UI@M^w9;+m~9Vz5%!
z<oP(8v}KLhb%scm*)fx4v`LmerOF6f+%Z!u>6p4-BckGhl4VIP?dRn8szD4T&#Z!y
zV(S}!Kx6-xykE>d_V4iDQvY`_RompOb$N@5=^kXX8=q#h2Tw5Ci^Ghb2xJ^1Woz7U
zkAeT5B_-hTy=f6f`2IU-5ZtpTnol!?uuUxZ^58IBncdPnu>lUjt-kGU?D5EkFD!7N
zK80foJ5(bno-c5V;R3v!_3YDWQWox0+{kEIgfsM<2&Y743tHy<k_97k$97o6WO-g>
z@+9(GaAWSI;IHP6Z}1CszHMF?d~$wT)Ljehd$M%&Z{<9dIRqB^Bo3Ds`dm2*!AcwS
zRa#(eVWugMa1lO{Rycas3$H8tx2_ust)F|=6sPhS{HQ$HS;8BR5gx0(c;J_$5`23|
zBnR*!X?7YnRzY3t>UYE^PznXTd`3&BbyiYLCM!fiBEGVSL)DCQ@K@9WCR1!~TC#~%
zlGenl+o>GFF$&MG@2!1UJR&ufQNRPyk#^{M^wg)~GA`jPj^P{*;Uey5LXoJP+j6|_
z(6N|_OR#zAdO&R$iqP}p0WBjNj;?zsjh|1Ecp?@`#)5;PadfHvN<o@nWP)pk?8R;`
z3Pj-LQm-7uUgSk+>OZ}sp>Sw46d4GO`+O1TT<&d&5S<xWJJ%45(g@_1d!#7LET<*?
z_DYA80r$#xsSF*}wu1$1qNyoFxEPq{!ZLSkx2ij)7f0c2wL=`cSZx>GH><-^x%Q?y
G@A?VdtxT8z

delta 1499
zcmZux-%A`<6lQD!X__WfY#K__tb@wEczYWY3&rh4SGyX+s#|{~h!H!xdv?6Z?9AlO
z9oIz``%?N+Lg<Btwu#0XNz|8seae4P3JrZIG?2dZsZV_@J>&YTke7jb`0hF1`Mz)N
zm%lgt^GDOu?}x4aogaoLk6Y8`@6nt!y(7jxYQ|dRJZ(1Z`f9r-HY|Xz`8BC@?09*{
zg=-S3Hf!UssKGChrMg+w{qIVyrS^bDL9B`}7b~wva{Shrxvg6)x^p-Fv;A^8_KR8u
zergB^(4_@Or8M)IVp2d_fsU1*l6<enZbM;S=(j(B|J5jWLFW~e<sy_mEfC5i50Tm2
z;f?EXr1C2KAx}ZHIOvaznJ>EFGE>5~ndVXGNmRk69EDId^V#{9A@GYq38uz}2ZBl%
z_^1z2oj|z<zN_ay@jE*3EP&Q2Q^>8Jta$~*{_+Ia?$YM3wa(=uMcEJ}V2&U`Ldlaw
zl!;5f1dC&3Vso2zc2PQWahB^~DhxplI1v!q8SG)Z=)Q=W%-Cp9LfY54z;&hX+Ow4F
zdGN`>OuDq3a0B6^hKUNHg3wVw9EJu-N?F3A;@pCMaEgIHr97f>1_^Mtde4zQ^?Ew#
zbQ44u8w7EQT?f(4`ayi0-bbaTahYUuy0quCPDwNJ`i<ks%{KGK{d?AkS-=0AdGVmd
z+<nk~Vi1r4TJX)I_fNCdR^oSDKd78HU-zB5(Wv%gb$5KgA{MhyNM1~wiGX>cQsr?3
z3M1o#ax{!PekrI-KonsPhfAz1<_KbNyRvjCtBMKK!WASo-b#-Zo5w2`-;B9}O0WQA
zk@m#q<x20#IEf&+MKRu1?Yz0Oa<Uoo47~@)TM4qf>S2dpR`0QxM~EL_fX+>5g>Dc^
z>ll!V7(Y6GUXaLq`>@Z7%=3qRO$)-buD@e0u5B;RQ<fE1;1JA^wHG)g+%1l<A=?+4
z90-hv{Q%S%W~z!&3aZ?97NqOwKv87nmm1#oVu%h7ynsk_`OxCma6NM;cea_>vf|?J
z5UHX7Twt<6G5_PUV+BE`&FS@@&bSG;Jw+*--uZdG$Ff{=YJ*#$NpJ8IVZ*PQxxLYz
z35n!R7<#o4St@x@-3=gjD4L%~D-$Z2-B)8kLBcvBiq&{YMxmpND9h;1^NoykEKk#|
zW-NEkbU%L9QDb?AEZ8VpV3RD%MgW`fLJ(+DNXR9TV6JI-@>ROl;F1wDvuRl-e(ZUz
zLKJ3-d~!OUoy%v2va^jpb4;`WzZpoM*eqq!bjJMpq??Q}o7!mREAEbG2eaeZ(Shu2
zM@Pn7+U$NSv-e0e8s<dCR5veKIkUA{vdZSn)&;9-KHU1(${W6Y_B{{Z4-5$paAGAu
i&OxkG1us@M%bCx&FCgrT?Q?kjyX~u1e&^-(TGM|{0Szhu

diff --git a/resources/dist/index.js.map.json b/resources/dist/index.js.map.json
index caa29e72a4e089c6c99f5f0108981cc406eac4da..87c7345210f11f7cdaae9e1fee93c490c631b6f5 100644
GIT binary patch
delta 9666
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
JXV)d8{|g}EQj7oq

delta 13241
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
T!*6~6O$VO(wd>yWwu%1+^Q|j^

diff --git a/src/changeListeners/pageviews.js b/src/changeListeners/pageviews.js
index a0e799a84..c6769cb6e 100644
--- a/src/changeListeners/pageviews.js
+++ b/src/changeListeners/pageviews.js
@@ -17,20 +17,21 @@ export default function pageviews(
 	boundActions, pageviewTracker
 ) {
 	return ( oldState, newState ) => {
-		let page;
+		let page, pageview;
 		if ( newState.pageviews && newState.pageviews.pageview && newState.pageviews.page ) {
 			page = newState.pageviews.page;
-			pageviewTracker( 'event.VirtualPageView', $.extend( {},
-				{
-					/* eslint-disable camelcase */
-					source_page_id: page.id,
-					source_namespace: page.namespaceId,
-					source_title: page.title,
-					source_url: page.url
-					/* eslint-enable camelcase */
-				},
-				newState.pageviews.pageview )
-			);
+			pageview = newState.pageviews.pageview;
+			pageviewTracker( 'event.VirtualPageView', {
+				/* eslint-disable camelcase */
+				source_page_id: page.id,
+				source_namespace: page.namespaceId,
+				source_title: mw.Title.newFromText( page.title ).getPrefixedDb(),
+				source_url: page.url,
+				page_id: pageview.page_id,
+				page_namespace: pageview.page_namespace,
+				page_title: mw.Title.newFromText( pageview.page_title ).getPrefixedDb()
+				/* eslint-enable camelcase */
+			} );
 			// Clear the pageview now its been logged.
 			boundActions.pageviewLogged();
 		}
diff --git a/src/getPageviewTracker.js b/src/getPageviewTracker.js
deleted file mode 100644
index 9f0554018..000000000
--- a/src/getPageviewTracker.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * @module getPageviewTracker
- */
-
-/**
- * @typedef {Object} MwCodeLoader
- *
- * Loads code from the server to the client on demand.
- *
- * @param {Array} dependencies to load
- * @return {JQuery.Deferred} resolving when the code is loaded and
- *   can be used by the client.
- *
- * @global
- */
-
-/**
- * Convert the first letter of a string to uppercase.
- *
- * @param {string} word
- * @return {string}
- */
-function titleCase( word ) {
-	return word[ 0 ].toUpperCase() + word.slice( 1 );
-}
-
-/**
- * Truncates a string to a maximum length based on its URI encoded value.
- *
- * @param {string} sourceUrl source string
- * @param {number} maxLength maximum length
- * @return {string} string is returned in the same encoding as the input
- */
-function limitByEncodedURILength( sourceUrl, maxLength ) {
-	let truncatedUrl = '';
-
-	sourceUrl.split( '' ).every( ( char ) => {
-		return ( encodeURIComponent( truncatedUrl + char ).length < maxLength ) ?
-			( truncatedUrl += char ) :
-			false;
-	} );
-	return truncatedUrl;
-}
-
-/**
- * Convert Title properties into mediawiki canonical form
- * and limit the length of source_url.
- *
- * @param {Object} eventData
- * @return {Object}
- */
-function prepareEventData( eventData ) {
-	const data = eventData;
-	/* eslint-disable camelcase */
-	data.source_title = mw.Title.newFromText( eventData.source_title )
-		.getPrefixedDb();
-	data.page_title = mw.Title.newFromText( eventData.page_title )
-		.getPrefixedDb();
-	// prevent source_url from exceeding varnish max-url size - T196904
-	data.source_url = limitByEncodedURILength( eventData.source_url, 1000 );
-
-	/* eslint-enable camelcase */
-	return data;
-}
-
-/**
- * Gets the appropriate analytics event tracker for logging virtual pageviews.
- * Note this bypasses EventLogging in order to track virtual pageviews
- * for pages where the DNT header (do not track) has been added.
- * This is explained in https://phabricator.wikimedia.org/T187277.
- *
- * @param {Object} config
- * @param {MwCodeLoader} loader that can source code that obeys the
- *  EventLogging api specification.
- * @param {Function} trackerGetter when called returns an instance
- *  of MediaWiki's EventLogging client
- * @param {Function} sendBeacon see
- *  https://developer.mozilla.org/en-US/docs/Web/API/Navigator/sendBeacon
- * @return {EventTracker}
- */
-function getPageviewTracker( config, loader, trackerGetter, sendBeacon ) {
-	const pageviewTracker = function ( topic, eventData ) {
-		const schema = titleCase( topic.slice( topic.indexOf( '.' ) + 1 ) );
-		const dependencies = [ 'ext.eventLogging' ];
-		return loader( dependencies ).then( function () {
-			const evLog = trackerGetter();
-			const payload = evLog.prepare( schema, prepareEventData( eventData ) );
-			const url = evLog.makeBeaconUrl( payload );
-			sendBeacon( url );
-		} );
-	};
-	return config.get( 'wgPopupsVirtualPageViews' ) ? pageviewTracker : () => {};
-}
-
-/**
- * Gets a function that can asynchronously transfer a small amount of data
- * over HTTP to a web server.
- *
- * @param {Window.Navigator} navigatorObj
- * @return {Function}
- */
-function getSendBeacon( navigatorObj ) {
-	return navigatorObj.sendBeacon ?
-		navigatorObj.sendBeacon.bind( navigatorObj ) :
-		( url ) => {
-			document.createElement( 'img' ).src = url;
-		};
-}
-
-export { getSendBeacon, limitByEncodedURILength };
-export default getPageviewTracker;
diff --git a/src/index.js b/src/index.js
index b4d3740ca..bd517e983 100644
--- a/src/index.js
+++ b/src/index.js
@@ -21,7 +21,6 @@ import changeListeners from './changeListeners';
 import * as actions from './actions';
 import reducers from './reducers';
 import createMediaWikiPopupsObject from './integrations/mwpopups';
-import getPageviewTracker, { getSendBeacon } from './getPageviewTracker';
 import { previewTypes, getPreviewType } from './preview/model';
 import isReferencePreviewsEnabled from './isReferencePreviewsEnabled';
 import setUserConfigFlags from './setUserConfigFlags';
@@ -68,6 +67,18 @@ function getStatsvTracker( user, config, experiments ) {
 	return isStatsvEnabled( user, config, experiments ) ? mw.track : () => {};
 }
 
+/**
+ * Gets the appropriate analytics event tracker for logging virtual pageviews.
+ *
+ * @param {Object} config
+ * @return {EventTracker}
+ */
+function getPageviewTracker( config ) {
+	return config.get( 'wgPopupsVirtualPageViews' ) ? mw.track : () => {
+		// NOP
+	};
+}
+
 /**
  * Gets the appropriate analytics event tracker for logging EventLogging events
  * via [the "EventLogging subscriber" analytics event protocol][0].
@@ -173,12 +184,7 @@ function registerChangeListeners(
 		settingsDialog = createSettingsDialogRenderer( mw.config ),
 		experiments = createExperiments( mw.experiments ),
 		statsvTracker = getStatsvTracker( mw.user, mw.config, experiments ),
-		// Virtual pageviews are always tracked.
-		pageviewTracker = getPageviewTracker( mw.config,
-			mw.loader.using,
-			() => mw.eventLog,
-			getSendBeacon( window.navigator )
-		),
+		pageviewTracker = getPageviewTracker( mw.config ),
 		eventLoggingTracker = getEventLoggingTracker(
 			mw.user,
 			mw.config,
diff --git a/tests/node-qunit/changeListeners/pageviews.test.js b/tests/node-qunit/changeListeners/pageviews.test.js
index b3661b89c..afb4b3989 100644
--- a/tests/node-qunit/changeListeners/pageviews.test.js
+++ b/tests/node-qunit/changeListeners/pageviews.test.js
@@ -1,11 +1,22 @@
 import pageviews from '../../../src/changeListeners/pageviews';
 
 const REFERRER = 'https://en.m.wikipedia.org/wiki/Kittens',
-	page = {
-		namespaceId: 1,
-		id: 42,
-		title: 'Kittens',
-		url: REFERRER
+	newState = {
+		pageviews: {
+			page: {
+				id: 42,
+				namespaceId: 1,
+				title: 'Kittens',
+				url: REFERRER
+			},
+			pageview: {
+				/* eslint-disable camelcase */
+				page_id: 43,
+				page_namespace: 1,
+				page_title: 'Rainbows'
+				/* eslint-enable camelcase */
+			}
+		}
 	};
 
 QUnit.module( 'ext.popups/pageviews', {
@@ -19,27 +30,17 @@ QUnit.module( 'ext.popups/pageviews', {
 			this.boundActions,
 			this.pageviewTracker
 		);
+
+		// Stub internal usage of mw.Title.newFromText
+		mw.Title.newFromText = ( str ) => {
+			return {
+				getPrefixedDb: () => { return str; }
+			};
+		};
 	}
 } );
-function createState( title ) {
-	return title ? {
-		pageviews: {
-			page,
-			pageview: {
-				page_title: title // eslint-disable-line camelcase
-			}
-		}
-	} : {
-		pageviews: {
-			page,
-			pageview: undefined
-		}
-	};
-}
 
 QUnit.test( 'it should log the queued event', function ( assert ) {
-	const newState = createState( 'Rainbows' );
-
 	this.changeListener( undefined, newState );
 
 	assert.ok(
@@ -47,11 +48,13 @@ QUnit.test( 'it should log the queued event', function ( assert ) {
 			'event.VirtualPageView',
 			{
 				/* eslint-disable camelcase */
-				page_title: 'Rainbows',
-				source_url: REFERRER,
 				source_page_id: 42,
 				source_namespace: 1,
-				source_title: 'Kittens'
+				source_title: 'Kittens',
+				source_url: REFERRER,
+				page_id: 43,
+				page_namespace: 1,
+				page_title: 'Rainbows'
 				/* eslint-enable camelcase */
 			}
 		),
@@ -64,7 +67,8 @@ QUnit.test( 'it should log the queued event', function ( assert ) {
 } );
 
 QUnit.test( 'it should not log something that is not a pageview', function ( assert ) {
-	const newState = createState();
+	const noPageviewState = $.extend( {}, newState );
+	delete noPageviewState.pageviews.pageview;
 
 	this.changeListener( undefined, newState );
 
diff --git a/tests/node-qunit/getPageviewTracker.test.js b/tests/node-qunit/getPageviewTracker.test.js
deleted file mode 100644
index 20f6ce798..000000000
--- a/tests/node-qunit/getPageviewTracker.test.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import getPageviewTracker, { getSendBeacon, limitByEncodedURILength } from '../../src/getPageviewTracker';
-
-QUnit.module( 'ext.popups#getPageviewTracker', {
-	beforeEach() {
-		this.makeBeaconUrl = this.sandbox.stub();
-		this.prepare = this.sandbox.stub();
-		this.trackerGetter = () => ( { makeBeaconUrl: this.makeBeaconUrl,
-			prepare: this.prepare } );
-
-		this.loader = () => Promise.resolve();
-
-		this.Title = {
-			newFromText: this.sandbox.stub()
-		};
-		mw.Title = this.Title;
-	},
-	afterEach() {
-		mw.Title = null;
-	}
-} );
-
-const enabledConfig = {
-	get: () => true
-};
-
-QUnit.test( 'getPageviewTracker', function ( assert ) {
-	const loader = this.sandbox.stub();
-	const sendBeacon = this.sandbox.stub();
-
-	/* eslint-disable camelcase */
-	const data = {
-		page_title: 'Test title',
-		source_title: 'Source title',
-		page_namespace: 1,
-		source_url: 'http://some/url'
-	};
-	const eventData = {
-		page_title: 'Test_title',
-		source_title: 'Source_title',
-		page_namespace: 1,
-		source_url: 'http://some/url'
-	};
-	this.Title.newFromText.withArgs( data.page_title ).returns( {
-		getPrefixedDb: () => eventData.page_title
-	} );
-	this.Title.newFromText.withArgs( data.source_title ).returns( {
-		getPrefixedDb: () => eventData.source_title
-	} );
-	/* eslint-enable camelcase */
-	const tracker = getPageviewTracker( enabledConfig,
-		loader, this.trackerGetter, sendBeacon );
-
-	loader.resolves();
-	return tracker( 'event.VirtualPageView', data ).then( () => {
-		assert.strictEqual( loader.callCount, 1, 'loader called once' );
-		assert.ok( loader.calledWith( [ 'ext.eventLogging' ] ),
-			'appropriate code is loaded' );
-		assert.strictEqual(
-			this.Title.newFromText.callCount,
-			2,
-			'The title factory was invoked twice.'
-		);
-		assert.ok( this.prepare.calledWith( 'VirtualPageView', eventData ),
-			'mw.eventLog.prepare called appropriately' );
-		assert.strictEqual( this.makeBeaconUrl.callCount, 1,
-			'makeBeacon called with result of prepare' );
-		assert.strictEqual( sendBeacon.callCount, 1,
-			'sendBeacon called with url from makeBeaconUrl' );
-	} );
-} );
-
-QUnit.test( 'getSendBeacon', function ( assert ) {
-	let success = false;
-	const navtr = {
-		successful: true,
-		sendBeacon: function () {
-		// This local variable helps test context. Don't refactor.
-			success = this.successful;
-		}
-	};
-	const sendBeacon = getSendBeacon( navtr );
-	sendBeacon();
-	assert.ok( success, 'native sendBeacon is used when available and run in appropriate context' );
-} );
-
-QUnit.test( 'getSendBeacon (fallback)', function ( assert ) {
-	const spy = this.sandbox.spy( document, 'createElement' );
-	const sendBeacon = getSendBeacon( {} );
-	sendBeacon();
-	assert.strictEqual( spy.callCount, 1, 'an img element is used as fallback' );
-} );
-
-QUnit.test( 'limitByEncodedURILength', function ( assert ) {
-	const shortUrl = 'https://en.wikipedia.org/wiki/banana',
-		longEncodedUrl = 'https://ka.wikipedia.org/wiki/%E1%83%95%E1%83%98%E1%83%99%E1%83%98%E1%83%9E%E1%83%94%E1%83%93%E1%83%98%E1%83%90:%E1%83%95%E1%83%98%E1%83%99%E1%83%98%E1%83%A1_%E1%83%A3%E1%83%A7%E1%83%95%E1%83%90%E1%83%A0%E1%83%A1_%E1%83%AB%E1%83%94%E1%83%92%E1%83%9A%E1%83%94%E1%83%91%E1%83%98/%E1%83%AB%E1%83%94%E1%83%92%E1%83%9A%E1%83%94%E1%83%91%E1%83%98%E1%83%A1_%E1%83%A1%E1%83%98%E1%83%90/%E1%83%99%E1%83%90%E1%83%AE%E1%83%94%E1%83%97%E1%83%98/%E1%83%A1%E1%83%90%E1%83%92%E1%83%90%E1%83%A0%E1%83%94%E1%83%AF%E1%83%9D%E1%83%A1_%E1%83%9B%E1%83%A3%E1%83%9C%E1%83%98%E1%83%AA%E1%83%98%E1%83%9E%E1%83%90%E1%83%9A%E1%83%98%E1%83%A2%E1%83%94%E1%83%A2%E1%83%98',
-		randomSequence = 'チプロ للا المتحة Добро пожаловат פעילה למען שוווв ВикипедиюA %20%F0%9F%A4%A8%20 IJ@_#*($PJOWR',
-		contentRg = new RegExp( limitByEncodedURILength( randomSequence, 326 ) );
-
-	assert.strictEqual(
-		limitByEncodedURILength( shortUrl, 1000 ), shortUrl,
-		'short url is not truncated' );
-
-	assert.strictEqual(
-		encodeURIComponent(
-			limitByEncodedURILength( longEncodedUrl, 1000 )
-		).length < 1000, true,
-		'long url is truncated to the correct length' );
-
-	assert.strictEqual(
-		encodeURIComponent(
-			limitByEncodedURILength( randomSequence, 50 )
-		).length < 50, true,
-		'Random string is truncated to the correct length' );
-
-	assert.strictEqual(
-		contentRg.test( randomSequence ), true,
-		'Truncated string contains the same content as the original'
-	);
-} );