Fix for Chrome

tegon · Sep 28, 2019 · f20afd7 · f20afd7
1 parent 7f58e6a
commit f20afd7
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 30 deletions.
diff --git a/src/class/ItemParser.js b/src/class/ItemParser.js
@@ -10,10 +10,10 @@ class ItemParser {
     return location.href;
   }
 
-  isReady() {
+  async isReady() {
     let isReady = false;
 
-    const session = NetflixApiUtils.getSession();
+    const session = await NetflixApiUtils.getSession();
 
     if (session) {
       this.id = session.videoId.toString();
@@ -33,7 +33,7 @@ class ItemParser {
   }
 
   async checkIsReady(resolve) {
-    if (this.isReady()) {
+    if (await this.isReady()) {
       const data = await NetflixApiUtils.getMetadata(this.id);
       resolve(data);
     } else {

diff --git a/src/class/NetflixApiUtils.js b/src/class/NetflixApiUtils.js
@@ -255,25 +255,45 @@ const netflixApiUtils = {
     }
   },
 
+  _getSession(resolve, event) {
+    window.removeEventListener('traktflix-getSession-fromPage', this.sessionListener);
+
+    const session = JSON.parse(event.detail.session);
+
+    resolve(session);
+  },
+
   getSession() {
-    const netflix = window.netflix || (window.wrappedJSObject && window.wrappedJSObject.netflix);
+    return new Promise(resolve => {
+      if (window.wrappedJSObject) {
+        const netflix = window.wrappedJSObject.netflix;
 
-    if (netflix) {
-      const sessions = netflix.appContext.state.playerApp.getState().videoPlayer.playbackStateBySessionId;
-      const key = Object.keys(sessions).filter(key => key.match(/^watch/))[0];
+        if (netflix) {
+          const sessions = netflix.appContext.state.playerApp.getState().videoPlayer.playbackStateBySessionId;
+          const key = Object.keys(sessions).filter(key => key.match(/^watch/))[0];
 
-      let session = null;
+          let session = null;
 
-      if (key) {
-        session = Object.assign({}, sessions[key]);
-      }
+          if (key) {
+            session = Object.assign({}, sessions[key]);
+          }
 
-      if (window.wrappedJSObject) {
-        XPCNativeWrapper(window.wrappedJSObject.netflix);
-      }
+          XPCNativeWrapper(window.wrappedJSObject.netflix);
 
-      return session;
-    }
+          resolve(session);
+        } else {
+          resolve();
+        }
+      } else {
+        this.sessionListener = this._getSession.bind(this, resolve);
+
+        window.addEventListener('traktflix-getSession-fromPage', this.sessionListener, false);
+
+        const event = new CustomEvent('traktflix-getSession-toPage');
+
+        window.dispatchEvent(event);
+      }
+    });
   },
 };
 

diff --git a/src/class/content/EventWatcher.js b/src/class/content/EventWatcher.js
@@ -30,7 +30,7 @@ export default class EventWatcher {
   }
 
   async checkForChanges() {
-    const session = NetflixApiUtils.getSession();
+    const session = await NetflixApiUtils.getSession();
 
     if (typeof session !== 'undefined') {
       if (session) {

diff --git a/src/class/content/Scrobble.js b/src/class/content/Scrobble.js
@@ -81,8 +81,8 @@ export default class Scrobble {
     });
   }
 
-  checkForChanges() {
-    const session = NetflixApiUtils.getSession();
+  async checkForChanges() {
+    const session = await NetflixApiUtils.getSession();
 
     if (session) {
       this.progress = Math.round((session.currentTime / session.duration) * 10000) / 100;

diff --git a/src/class/popup/Header.js b/src/class/popup/Header.js
@@ -12,11 +12,18 @@ class Header extends React.Component {
     const tabs = await browser.tabs.query({url: `*://*.netflix.com/*`, active: true});
 
     if (tabs.length > 0) {
-      browser.tabs.create({
-        cookieStoreId: tabs[0].cookieStoreId,
-        index: tabs[0].index + 1,
-        url: browser.runtime.getURL('html/history-sync.html'),
-      });
+      if (browser.cookies) {
+        browser.tabs.create({
+          cookieStoreId: tabs[0].cookieStoreId,
+          index: tabs[0].index + 1,
+          url: browser.runtime.getURL('html/history-sync.html'),
+        });
+      } else {
+        browser.tabs.create({
+          index: tabs[0].index + 1,
+          url: browser.runtime.getURL('html/history-sync.html'),
+        });
+      }
     }
   }
 

diff --git a/src/modules/content/index.js b/src/modules/content/index.js
@@ -36,17 +36,76 @@ async function init() {
   }
 }
 
+function _getApiDefs(event) {
+  window.removeEventListener('traktflix-getApiDefs-fromPage', getApiDefs);
+
+  const { authUrl, buildIdentifier } = event.detail;
+
+  if (authUrl && buildIdentifier) {
+    browser.runtime.sendMessage({ type: 'setApiDefs', authUrl, buildIdentifier });
+  }
+}
+
 function getApiDefs() {
-  const netflix = window.netflix || (window.wrappedJSObject && window.wrappedJSObject.netflix);
+  if (window.wrappedJSObject) {
+    const netflix = window.wrappedJSObject.netflix;
 
-  if (netflix) {
-    const authUrl = netflix.reactContext.models.userInfo.data.authURL;
-    const buildIdentifier = netflix.reactContext.models.serverDefs.data.BUILD_IDENTIFIER;
+    if (netflix) {
+      const authUrl = netflix.reactContext.models.userInfo.data.authURL;
+      const buildIdentifier = netflix.reactContext.models.serverDefs.data.BUILD_IDENTIFIER;
 
-    browser.runtime.sendMessage({type: `setApiDefs`, authUrl, buildIdentifier});
+      browser.runtime.sendMessage({ type: 'setApiDefs', authUrl, buildIdentifier });
 
-    if (window.wrappedJSObject) {
       XPCNativeWrapper(window.wrappedJSObject.netflix);
     }
+  } else {
+    const script = document.createElement('script');
+
+    script.textContent = `
+      window.addEventListener('traktflix-getApiDefs-toPage', () => {
+        let authUrl = '';
+        let buildIdentifier = '';
+
+        if (netflix) {
+          authUrl = netflix.reactContext.models.userInfo.data.authURL;
+          buildIdentifier = netflix.reactContext.models.serverDefs.data.BUILD_IDENTIFIER;
+        }
+
+        const event = new CustomEvent('traktflix-getApiDefs-fromPage', {
+          detail: { authUrl, buildIdentifier },
+        });
+
+        window.dispatchEvent(event);
+      });
+
+      window.addEventListener('traktflix-getSession-toPage', () => {
+        let session;
+
+        if (netflix) {
+          const sessions = netflix.appContext.state.playerApp.getState().videoPlayer.playbackStateBySessionId;
+          const key = Object.keys(sessions).filter(key => key.match(/^watch/))[0];
+
+          session = null;
+
+          if (key) {
+            session = sessions[key];
+          }
+        }
+
+        const event = new CustomEvent('traktflix-getSession-fromPage', {
+          detail: { session: JSON.stringify(session) },
+        });
+
+        window.dispatchEvent(event);
+      });
+    `;
+
+    document.body.appendChild(script);
+
+    window.addEventListener('traktflix-getApiDefs-fromPage', _getApiDefs, false);
+
+    const event = new CustomEvent('traktflix-getApiDefs-toPage');
+
+    window.dispatchEvent(event);
   }
 }