修复Mac下的虾米验证、托盘问题

src/main/rendererEvents/xm_verify/index.js

@@ -0,0 +1,4 @@
+const { isMac } = require('../../../common/utils')
+
+// mac下的 BrowserView 无法拖动验证栏，改用 BrowserWindow
+require(isMac ? './xm_verify_win' : './xm_verify_view')

src/main/rendererEvents/xm_verify/xm_verify.js

@@ -0,0 +1,4 @@
+const { isMac } = require('../../../common/utils')
+
+// mac下的 BrowserView 无法拖动验证栏，改用 BrowserWindow
+require(isMac ? './xm_verify_win' : './xm_verify_view')

src/main/rendererEvents/xm_verify/xm_verify_view.js

@@ -1,9 +1,10 @@
 const { BrowserView } = require('electron')
-const { mainHandle } = require('../../common/ipc')
-const { getWindowSizeInfo } = require('../utils')
-const { isMac } = require('../../common/utils')
+const { mainHandle } = require('../../../common/ipc')
+const { getWindowSizeInfo } = require('../../utils')
 
 let view
+let isActioned = false
+let rejectFn
 
 const closeView = async() => {
   if (!view) return
@@ -21,44 +22,45 @@ mainHandle('xm_verify_open', (event, url) => new Promise((resolve, reject) => {
     view.destroy()
   }
 
-  let firstLoad = true
+  rejectFn = reject
+
+  isActioned = false
 
   view = new BrowserView({
     webPreferences: {
       enableRemoteModule: false,
       disableHtmlFullscreenWindowResize: true,
     },
-    movable: false,
   })
   view.webContents.on('did-finish-load', () => {
-    if (/punish\?/.test(view.webContents.getURL())) {
-      if (isMac) { // 解决 MAC 首次加载页面无法拖动滑块的问题
-        if (firstLoad) view.webContents.reload()
-        firstLoad = false
-      }
-      return
-    }
+    if (/punish\?/.test(view.webContents.getURL())) return
     let ses = view.webContents.session
     ses.cookies.get({ name: 'x5sec' })
       .then(async([x5sec]) => {
+        isActioned = true
         await closeView()
         if (!x5sec) return reject(new Error('get x5sec failed'))
         resolve(x5sec.value)
       }).catch(async err => {
+        isActioned = true
         await closeView()
         reject(err)
       })
   })
+
   global.mainWindow.setBrowserView(view)
   const windowSizeInfo = getWindowSizeInfo(global.appSetting)
-  view.setBounds({ x: (windowSizeInfo.width - 360) / 2, y: ((windowSizeInfo.height - 320 + 52) / 2), width: 360, height: 320 })
+  view.setBounds({ x: (windowSizeInfo.width - 380) / 2, y: ((windowSizeInfo.height - 320 + 52) / 2), width: 380, height: 320 })
   view.webContents.loadURL(url, {
     httpReferrer: 'https://www.xiami.com/',
   })
-  view.webContents.openDevTools({ mode: 'undocked' })
+  // view.webContents.openDevTools()
 }))
 
 mainHandle('xm_verify_close', async() => {
   await closeView()
+  if (!rejectFn) return
+  if (!isActioned) rejectFn(new Error('canceled verify'))
+  rejectFn = null
 })
 

src/main/rendererEvents/xm_verify/xm_verify_win.js

@@ -0,0 +1,77 @@
+const { BrowserWindow } = require('electron')
+const { mainHandle } = require('../../../common/ipc')
+const { getWindowSizeInfo } = require('../../utils')
+
+let win
+
+const closeWin = async() => {
+  if (!win) return
+  // await win.webContents.session.clearCache()
+  // if (global.mainWindow) global.mainWindow.removeBrowserView(win)
+  if (win.isDestroyed()) {
+    win = null
+    return
+  }
+  await win.webContents.session.clearStorageData()
+  win.destroy()
+  win = null
+}
+
+mainHandle('xm_verify_open', (event, url) => new Promise((resolve, reject) => {
+  if (!global.mainWindow) return reject(new Error('mainwindow is undefined'))
+  if (win) win.destroy()
+
+  let isActioned = false
+
+  const mainWindowSizeInfo = global.mainWindow.getBounds()
+  const windowSizeInfo = getWindowSizeInfo(global.appSetting)
+  win = new BrowserWindow({
+    parent: global.mainWindow,
+    width: 460,
+    height: 370,
+    resizable: false,
+    // transparent: true,
+    x: mainWindowSizeInfo.x + (windowSizeInfo.width - 460) / 2,
+    y: mainWindowSizeInfo.y + (windowSizeInfo.height - 320 + 52) / 2,
+    minimizable: false,
+    maximizable: false,
+    // movable: false,
+    // frame: false,
+    // modal: true,
+    webPreferences: {
+      enableRemoteModule: false,
+      disableHtmlFullscreenWindowResize: true,
+    },
+  })
+  win.webContents.on('did-finish-load', () => {
+    if (/punish\?/.test(win.webContents.getURL())) return
+    let ses = win.webContents.session
+    ses.cookies.get({ name: 'x5sec' })
+      .then(async([x5sec]) => {
+        isActioned = true
+        await closeWin()
+        if (!x5sec) return reject(new Error('get x5sec failed'))
+        resolve(x5sec.value)
+      }).catch(async err => {
+        isActioned = true
+        await closeWin()
+        reject(err)
+      })
+  })
+
+  win.webContents.loadURL(url, {
+    httpReferrer: 'https://www.xiami.com/',
+  })
+
+  win.on('closed', async() => {
+    await closeWin()
+    if (isActioned) return
+    reject(new Error('canceled verify'))
+  })
+
+  // win.webContents.openDevTools()
+}))
+
+mainHandle('xm_verify_close', async() => {
+  await closeWin()
+})