[FIX] Adtraction fallback

src/common/types.ts

@@ -534,21 +534,6 @@ interface GamepadActionArgsWithoutMetadata {
   metadata?: undefined
 }
 
-type ElWebview = {
-  canGoBack: () => boolean
-  canGoForward: () => boolean
-  goBack: () => void
-  goForward: () => void
-  reload: () => void
-  isLoading: () => boolean
-  getURL: () => string
-  copy: () => string
-  selectAll: () => void
-  findInPage: (text: string | RegExp) => void
-}
-
-export type WebviewType = HTMLWebViewElement & ElWebview
-
 export type InstallPlatform =
   | LegendaryInstallPlatform
   | GogInstallPlatform

src/frontend/components/UI/WebviewControls/index.tsx

@@ -7,12 +7,11 @@ import {
 import cx from 'classnames'
 import React, { SyntheticEvent, useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { WebviewType } from 'common/types'
 import SvgButton from '../SvgButton'
 import './index.css'
 
 interface WebviewControlsProps {
-  webview: WebviewType | null
+  webview: Electron.WebviewTag | null
   initURL: string
   openInBrowser: boolean
 }

src/frontend/screens/WebView/index.tsx

@@ -11,7 +11,7 @@ import { useNavigate, useLocation, useParams } from 'react-router'
 import { UpdateComponent } from 'frontend/components/UI'
 import WebviewControls from 'frontend/components/UI/WebviewControls'
 import ContextProvider from 'frontend/state/ContextProvider'
-import { Runner, WebviewType } from 'common/types'
+import { Runner } from 'common/types'
 import './index.css'
 import LoginWarning from '../Login/components/LoginWarning'
 import { NileLoginData } from 'common/types/nile'
@@ -49,7 +49,7 @@ export default function WebView({ store }: Props) {
     null
   )
   const navigate = useNavigate()
-  const webviewRef = useRef<WebviewType>(null)
+  const webviewRef = useRef<Electron.WebviewTag>(null)
 
   let lang = i18n.language
   if (i18n.language === 'pt') {
@@ -217,8 +217,19 @@ export default function WebView({ store }: Props) {
         }
       }
 
-      webview.addEventListener('dom-ready', loadstop)
+      const onerror = ({ validatedURL }: Electron.DidFailLoadEvent) => {
+        // Connection refused
+        if (validatedURL && validatedURL.match(/track\.adtraction\.com/)) {
+          const parsedUrl = new URL(validatedURL)
+          const redirectUrl = parsedUrl.searchParams.get('url')
+          if (redirectUrl) {
+            webview.loadURL(redirectUrl)
+          }
+        }
+      }
 
+      webview.addEventListener('dom-ready', loadstop)
+      webview.addEventListener('did-fail-load', onerror)
       // if the page title changed it's because the store loaded so there's
       // connectivity, we can update the status without waiting for the checks
       const updateConnectivity = () => {
@@ -231,6 +242,7 @@ export default function WebView({ store }: Props) {
       return () => {
         webview.removeEventListener('ipc-message', onIpcMessage)
         webview.removeEventListener('dom-ready', loadstop)
+        webview.removeEventListener('did-fail-load', onerror)
         webview.removeEventListener('page-title-updated', updateConnectivity)
       }
     }