Use _paq

Author: ioedeveloper

apps/remix-ide/src/app.ts

@@ -71,7 +71,7 @@ import { HardhatHandleDesktop } from './app/plugins/electron/hardhatPlugin'
 import { circomPlugin } from './app/plugins/electron/circomElectronPlugin'
 import { GitHubAuthHandler } from './app/plugins/electron/gitHubAuthHandler'
 import { GitPlugin } from './app/plugins/git'
-import { Matomo } from './app/plugins/matomo'
+import type { Matomo } from './app/plugins/matomo'
 import { DesktopClient } from './app/plugins/desktop-client'
 import { DesktopHost } from './app/plugins/electron/desktopHostPlugin'
 import { WalletConnect } from './app/plugins/walletconnect'
@@ -112,6 +112,8 @@ import TabProxy from './app/panels/tab-proxy.js'
 import { Plugin } from '@remixproject/engine'
 import BottomBarPanel from './app/components/bottom-bar-panel'
 
+const _paq = (window._paq = window._paq || [])
+
 export class platformApi {
   get name() {
     return isElectron() ? appPlatformTypes.desktop : appPlatformTypes.web
@@ -217,7 +219,7 @@ class AppComponent {
     this.workspace = pluginLoader.get()
     if (pluginLoader.current === 'queryParams') {
       this.workspace.map((workspace) => {
-        this.matomo.push(['trackEvent', 'App', 'queryParams-activated', workspace])
+        _paq.push(['trackEvent', 'App', 'queryParams-activated', workspace])
       })
     }
     this.engine = new RemixEngine()
@@ -246,7 +248,7 @@ class AppComponent {
     this.showMatomo = contextShouldShowMatomo && (!this.matomoConfAlreadySet || shouldRenewConsent)
 
     if (this.showMatomo && shouldRenewConsent) {
-      this.matomo.push(['trackEvent', 'Matomo', 'refreshMatomoPermissions']);
+      _paq.push(['trackEvent', 'Matomo', 'refreshMatomoPermissions']);
     }
 
     this.walkthroughService = new WalkthroughService(appManager)
@@ -682,7 +684,7 @@ class AppComponent {
               if (callDetails.length > 1) {
                 this.appManager.call('notification', 'toast', `initiating ${callDetails[0]} and calling "${callDetails[1]}" ...`)
                 // @todo(remove the timeout when activatePlugin is on 0.3.0)
-                this.matomo.push(['trackEvent', 'App', 'queryParams-calls', this.params.call])
+                _paq.push(['trackEvent', 'App', 'queryParams-calls', this.params.call])
                 //@ts-ignore
                 await this.appManager.call(...callDetails).catch(console.error)
               }
@@ -693,7 +695,7 @@ class AppComponent {
 
               // call all functions in the list, one after the other
               for (const call of calls) {
-                this.matomo.push(['trackEvent', 'App', 'queryParams-calls', call])
+                _paq.push(['trackEvent', 'App', 'queryParams-calls', call])
                 const callDetails = call.split('//')
                 if (callDetails.length > 1) {
                   this.appManager.call('notification', 'toast', `initiating ${callDetails[0]} and calling "${callDetails[1]}" ...`)

apps/remix-ide/src/app/components/preload.tsx

@@ -45,7 +45,7 @@ export const Preload = (props: any) => {
         })
       })
       .catch((err) => {
-        matomo.push(['trackEvent', 'App', 'PreloadError', err && err.message])
+        window._paq.push(['trackEvent', 'App', 'PreloadError', err && err.message])
         console.error('Error loading Remix:', err)
         setError(true)
       })
@@ -62,7 +62,7 @@ export const Preload = (props: any) => {
     setShowDownloader(false)
     const fsUtility = new fileSystemUtility()
     const migrationResult = await fsUtility.migrate(localStorageFileSystem.current, remixIndexedDB.current)
-    _paq.push(['trackEvent', 'Migrate', 'result', migrationResult ? 'success' : 'fail'])
+    window._paq.push(['trackEvent', 'Migrate', 'result', migrationResult ? 'success' : 'fail'])
     await setFileSystems()
   }
 
@@ -73,10 +73,10 @@ export const Preload = (props: any) => {
     ])
     if (fsLoaded) {
       console.log(fsLoaded.name + ' activated')
-      matomo.push(['trackEvent', 'Storage', 'activate', fsLoaded.name])
+      window._paq.push(['trackEvent', 'Storage', 'activate', fsLoaded.name])
       loadAppComponent()
     } else {
-      matomo.push(['trackEvent', 'Storage', 'error', 'no supported storage'])
+      window._paq.push(['trackEvent', 'Storage', 'error', 'no supported storage'])
       setSupported(false)
     }
   }
@@ -94,8 +94,8 @@ export const Preload = (props: any) => {
       return
     }
     async function loadStorage() {
-      ;(await remixFileSystems.current.addFileSystem(remixIndexedDB.current)) || matomo.push(['trackEvent', 'Storage', 'error', 'indexedDB not supported'])
-      ;(await remixFileSystems.current.addFileSystem(localStorageFileSystem.current)) || matomo.push(['trackEvent', 'Storage', 'error', 'localstorage not supported'])
+      ;(await remixFileSystems.current.addFileSystem(remixIndexedDB.current)) || window._paq.push(['trackEvent', 'Storage', 'error', 'indexedDB not supported'])
+      ;(await remixFileSystems.current.addFileSystem(localStorageFileSystem.current)) || window._paq.push(['trackEvent', 'Storage', 'error', 'localstorage not supported'])
       await testmigration()
       remixIndexedDB.current.loaded && (await remixIndexedDB.current.checkWorkspaces())
       localStorageFileSystem.current.loaded && (await localStorageFileSystem.current.checkWorkspaces())

apps/remix-ide/src/app/plugins/matomo.ts

@@ -20,7 +20,6 @@ export class Matomo extends Plugin {
   }
 
   async track(data: string[]) {
-    if (!allowedPlugins.includes(this.currentRequest.from)) return
     this._paq.push(data)
   }
 

apps/remix-ide/src/assets/js/loader.js

@@ -8,7 +8,7 @@ const domainsOnPrem = {
   'alpha.remix.live': 1,
   'beta.remix.live': 2,
   'remix.ethereum.org': 3,
-  'localhost': 4 // remix desktop
+  'localhost': isElectron() ? 4 : 1, // remix desktop
 }
 
 let cloudDomainToTrack = domains[window.location.hostname]