ion/Melo
1
0
Fork 0
Code Issues Pull Requests Actions 11 Packages Projects Releases Wiki Activity

新增启动参数-play

Browse Source
This commit is contained in:
lyswhut
2021-02-22 12:59:39 +08:00
parent b6107b7281
commit fa0d9ad4c3
23 changed files with 121 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/rendererEvents/index.js
-2
View File
@@ -18,6 +18,4 @@ require('./showDialog')
require('./playList')
require('./data')
// require('./xm_verify')
require('./kw_decodeLyric')
src/main/rendererEvents/xm_verify/index.js
-4
View File
@@ -1,4 +0,0 @@
const { isMac } = require('../../../common/utils')
// mac下的 BrowserView 无法拖动验证栏，改用 BrowserWindow
require(isMac ? './xm_verify_win' : './xm_verify_view')
src/main/rendererEvents/xm_verify/xm_verify.js
-4
View File
@@ -1,4 +0,0 @@
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
-79
View File
@@ -1,79 +0,0 @@
const { BrowserView } = require('electron')
const { mainHandle, NAMES: { mainWindow: ipcMainWindowNames } } = require('../../../common/ipc')
const { getWindowSizeInfo } = require('../../utils')
let view
let isActioned = false
let rejectFn
const closeView = async() => {
if (!view) return
// await view.webContents.session.clearCache()
if (global.modules.mainWindow) global.modules.mainWindow.removeBrowserView(view)
await view.webContents.session.clearStorageData()
view.destroy()
view = null
}
mainHandle(ipcMainWindowNames.handle_xm_verify_open, (event, url) => new Promise((resolve, reject) => {
if (!global.modules.mainWindow) return reject(new Error('mainWindow is undefined'))
if (view) {
global.modules.mainWindow.removeBrowserView(view)
view.destroy()
}
rejectFn = reject
isActioned = false
view = new BrowserView({
webPreferences: {
enableRemoteModule: false,
disableHtmlFullscreenWindowResize: true,
},
})
// view.webContents.on('did-finish-load', () => {
// 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)
// })
// })
view.webContents.session.webRequest.onCompleted({ urls: ['*://www.xiami.com/*'] }, details => {
if (/\/_____tmd_____\/slide\?/.test(details.url)) {
for (const item of details.responseHeaders['set-cookie']) {
if (!/^x5sec=/.test(item)) continue
const x5sec = /x5sec=(\w+);.+$/.exec(item)
isActioned = true
closeView().finally(() => {
if (!x5sec) return reject(new Error('get x5sec failed'))
resolve(x5sec[1])
})
}
}
})
// console.log(url)
global.modules.mainWindow.setBrowserView(view)
const windowSizeInfo = getWindowSizeInfo(global.appSetting)
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()
}))
mainHandle(ipcMainWindowNames.handle_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
-91
View File
@@ -1,91 +0,0 @@
const { BrowserWindow } = require('electron')
const { mainHandle, NAMES: { mainWindow: ipcMainWindowNames } } = require('../../../common/ipc')
const { getWindowSizeInfo } = require('../../utils')
let win
const closeWin = async() => {
if (!win) return
// await win.webContents.session.clearCache()
// if (global.modules.mainWindow) global.modules.mainWindow.removeBrowserView(win)
if (win.isDestroyed()) {
win = null
return
}
await win.webContents.session.clearStorageData()
win.destroy()
win = null
}
mainHandle(ipcMainWindowNames.handle_xm_verify_open, (event, url) => new Promise((resolve, reject) => {
if (!global.modules.mainWindow) return reject(new Error('mainWindow is undefined'))
if (win) win.destroy()
let isActioned = false
const mainWindowSizeInfo = global.modules.mainWindow.getBounds()
const windowSizeInfo = getWindowSizeInfo(global.appSetting)
win = new BrowserWindow({
parent: global.modules.mainWindow,
width: 1000,
height: 800,
resizable: false,
// transparent: true,
x: mainWindowSizeInfo.x + (windowSizeInfo.width - 1000) / 2,
y: mainWindowSizeInfo.y + (windowSizeInfo.height - 800 + 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.session.webRequest.onCompleted({ urls: ['*://www.xiami.com/*'] }, details => {
if (/\/_____tmd_____\/slide\?/.test(details.url)) {
for (const item of details.responseHeaders['set-cookie']) {
if (!/^x5sec=/.test(item)) continue
const x5sec = /x5sec=(\w+);.+$/.exec(item)
isActioned = true
closeWin().finally(() => {
if (!x5sec) return reject(new Error('get x5sec failed'))
resolve(x5sec[1])
})
}
}
})
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(ipcMainWindowNames.handle_xm_verify_close, async() => {
await closeWin()
})