v2.7.4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,13 +19,13 @@
   "dependencies": {
     "axios": "^0.21.1",
     "cheerio": "^1.0.0-rc.5",
-    "core-js": "^3.8.3",
+    "core-js": "^3.9.0",
     "dexie": "^3.0.3",
     "electron-localshortcut": "^3.2.1",
     "electron-proxy-agent": "^1.2.0",
     "electron-updater": "^4.3.5",
     "element-ui": "^2.15.0",
-    "fast-xml-parser": "^3.17.6",
+    "fast-xml-parser": "^3.18.0",
     "html2canvas": "^1.0.0-rc.7",
     "iptv-playlist-parser": "^0.6.0",
     "m3u": "0.0.2",
@@ -33,7 +33,7 @@
     "memcached": "^2.2.2",
     "modern-normalize": "^1.0.0",
     "mousetrap": "^1.6.5",
-    "pinyin-match": "^1.1.9",
+    "pinyin-match": "^1.2.0",
     "qrcode.vue": "^1.7.0",
     "randomstring": "^1.1.5",
     "session": "^0.1.0",
@@ -43,30 +43,30 @@
     "vue-infinite-loading": "^2.4.5",
     "vue-waterfall-plugin": "^1.1.0",
     "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.0",
-    "xgplayer": "^2.17.3",
+    "vuex": "^3.6.2",
+    "xgplayer": "^2.18.0",
     "xgplayer-flv.js": "^2.2.0",
-    "xgplayer-hls.js": "^2.4.0"
+    "xgplayer-hls.js": "^2.4.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.10",
-    "@vue/cli-plugin-eslint": "~4.5.10",
-    "@vue/cli-plugin-vuex": "~4.5.10",
-    "@vue/cli-service": "~4.5.10",
+    "@vue/cli-plugin-babel": "~4.5.11",
+    "@vue/cli-plugin-eslint": "~4.5.11",
+    "@vue/cli-plugin-vuex": "~4.5.11",
+    "@vue/cli-service": "~4.5.11",
     "@vue/eslint-config-standard": "^6.0.0",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
-    "electron": "^11.2.1",
+    "electron": "^11.3.0",
     "electron-devtools-installer": "^3.1.1",
-    "eslint": "^7.16.0",
+    "eslint": "^7.20.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-promise": "^4.3.1",
     "eslint-plugin-standard": "^4.1.0",
-    "eslint-plugin-vue": "^7.3.0",
+    "eslint-plugin-vue": "^7.6.0",
     "sass": "^1.30.0",
     "sass-loader": "^10.1.0",
-    "vue-cli-plugin-electron-builder": "2.0.0-rc.5",
+    "vue-cli-plugin-electron-builder": "2.0.0-rc.6",
     "vue-template-compiler": "^2.6.12"
   }
 }

src/background.js

@@ -47,7 +47,7 @@ function createWindow () {
     if (!details.url.includes('//localhost') && details.requestHeaders.Referer && details.requestHeaders.Referer.includes('//localhost')) {
       details.requestHeaders.Referer = url.origin
     }
-    callback({
+    callback({ // https://github.com/electron/electron/issues/23988 回调似乎无法修改headers，暂时先用index.html的meta referer policy替代
       cancel: false,
       requestHeaders: details.requestHeaders
     })

src/components/EditSites.vue

@@ -119,7 +119,6 @@ import { mapMutations } from 'vuex'
 import { sites, setting } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import { remote } from 'electron'
-import { sites as defaultSites } from '../lib/dexie/initData'
 import fs from 'fs'
 import Sortable from 'sortablejs'
 
@@ -410,13 +409,23 @@ export default {
       })
     },
     resetSitesEvent () {
-      this.stopFlag = true
-      if (this.checkAllSitesLoading) {
-        this.$message.info('部分检测还未完全终止, 请稍等...')
-        return
+      let url = this.setting.sitesDataURL
+      if (!url) {
+        // 如果没有设置源站文件链接,使用默认的github源
+        url = 'https://raw.githubusercontent.com/cuiocean/ZY-Player-Resources/main/Sites/Sites.json'
       }
-      sites.clear().then(sites.bulkAdd(defaultSites).then(this.getSites()))
-      this.$message.success('重置源成功')
+      const axios = require('axios')
+      axios.get(url).then(res => {
+        if (res.status === 200) {
+          if (res.data.length > 0) {
+            sites.clear().then(sites.bulkAdd(res.data))
+            this.$message.success('重置源成功')
+            this.getSites()
+          }
+        }
+      }).catch(error => {
+        this.$message.error('导入云端源站失败. ' + error)
+      })
     },
     moveToTopEvent (i) {
       if (this.checkAllSitesLoading) {

src/components/Play.vue

@@ -65,13 +65,13 @@
             <path d="M5 2h14a3 3 0 0 1 3 3v17H2V5a3 3 0 0 1 3-3z"></path>
           </svg>
         </span>
-        <span class="zy-svg" @click="miniEvent" v-show="right.list.length > 0">
+        <span class="zy-svg" @click="miniEvent" v-show="!onlineUrl && right.list.length > 0">
           <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" aria-labelledby="diamondIconTitle">
             <title id="diamondIconTitle">精简模式</title>
             <path d="M12 20L3 11M12 20L21 11M12 20L8 11M12 20L16 11M3 11L7 5M3 11H8M7 5L8 11M7 5H12M17 5L21 11M17 5L16 11M17 5H12M21 11H16M8 11H16M8 11L12 5M16 11L12 5"></path>
           </svg>
         </span>
-        <span class="zy-svg" @click="playWithExternalPalyerEvent" v-show="right.list.length > 0">
+        <span class="zy-svg" @click="playWithExternalPalyerEvent" v-show="!onlineUrl && right.list.length > 0">
           <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="tvIconTitle">
             <title id="tvIconTitle" >使用第三方播放器</title>
             <polygon points="20 8 20 20 4 20 4 8"></polygon>
@@ -95,7 +95,7 @@
             <rect x="17" y="6" width="1" height="1"></rect>
           </svg>
         </span>
-        <span class="zy-svg" @click="showShortcutEvent" :class="right.type === 'shortcut' ? 'active' : ''" v-show="right.list.length > 0">
+        <span class="zy-svg" @click="showShortcutEvent" :class="right.type === 'shortcut' ? 'active' : ''" v-show="!onlineUrl && right.list.length > 0">
           <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="sendIconTitle">
             <title id="sendIconTitle">快捷键指南</title>
             <polygon points="21.368 12.001 3 21.609 3 14 11 12 3 9.794 3 2.394"></polygon>

src/components/Setting.vue

@@ -90,6 +90,9 @@
           <div class="zy-select">
             <div class="vs-placeholder vs-noAfter" @click="show.configDefaultParseUrlDialog = true">设置默认解析接口</div>
           </div>
+          <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="show.configSitesDataUrlDialog = true">设置源站接口文件</div>
+          </div>
           <div class="zy-input" @click="toggleExcludeRootClasses">
            <input type="checkbox" v-model = "d.excludeRootClasses" @change="updateSettingEvent"> 屏蔽主分类
           </div>
@@ -158,7 +161,7 @@
     <div> <!-- 设置默认解析接口 -->
       <el-dialog :visible.sync="show.configDefaultParseUrlDialog" v-if='show.configDefaultParseUrlDialog' title="设置默认解析接口" :append-to-body="true" @close="closeDialog">
         <el-form label-width="45px" label-position="left">
-          <el-form-item label="URL:" prop='defaultParseURL'>
+          <el-form-item label="URL:">
             <el-input v-model="setting.defaultParseURL" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="请输入解析接口地址，为空时会自动设置，重置时会自动更新默认接口地址"/>
           </el-form-item>
         </el-form>
@@ -169,6 +172,20 @@
         </span>
       </el-dialog>
     </div>
+    <div> <!-- 设置源站接口文件 -->
+      <el-dialog :visible="show.configSitesDataUrlDialog" v-if='show.configSitesDataUrlDialog' title="设置源站接口文件" :append-to-body="true" @close="closeDialog">
+        <el-form label-width="45px" label-position="left">
+          <el-form-item label="URL:">
+            <el-input v-model="setting.sitesDataURL" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="请输入解析接口地址，为空时会自动设置，重置时会自动更新默认接口地址"/>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="closeDialog">取消</el-button>
+          <el-button type="danger" @click="getDefaultdeSitesDataURL">重置</el-button>
+          <el-button type="primary" @click="configSitesDataURL">确定</el-button>
+        </span>
+      </el-dialog>
+    </div>
     <div> <!-- 输入密码页面 -->
       <el-dialog :visible.sync="show.checkPasswordDialog" v-if='show.checkPasswordDialog' :append-to-body="true" @close="closeDialog" width="300px">
         <el-form label-width="75px" label-position="left">
@@ -260,7 +277,8 @@ export default {
         changePasswordDialog: false,
         proxy: false,
         proxyDialog: false,
-        configDefaultParseUrlDialog: false
+        configDefaultParseUrlDialog: false,
+        configSitesDataUrlDialog: false
       },
       d: { },
       latestVersion: pkg.version,
@@ -310,6 +328,7 @@ export default {
         this.d = res
         this.setting = this.d
         if (!this.setting.defaultParseURL) this.configDefaultParseURL()
+        if (!this.setting.sitesDataURL) this.getDefaultdeSitesDataURL()
       })
     },
     getSites () {
@@ -360,6 +379,15 @@ export default {
       this.show.configDefaultParseUrlDialog = false
       this.updateSettingEvent()
     },
+    getDefaultdeSitesDataURL () {
+      this.setting.sitesDataURL = 'https://raw.githubusercontent.com/cuiocean/ZY-Player-Resources/main/Sites/Sites.json'
+    },
+    configSitesDataURL () {
+      if (!this.setting.sitesDataURL) this.getDefaultdeSitesDataURL()
+      this.d.sitesDataURL = this.setting.sitesDataURL
+      this.show.configSitesDataUrlDialog = false
+      this.updateSettingEvent()
+    },
     selectLocalPlayer () {
       const options = {
         filters: [
@@ -403,6 +431,7 @@ export default {
       this.show.checkPasswordDialog = false
       this.show.changePasswordDialog = false
       this.show.configDefaultParseUrlDialog = false
+      this.show.configSitesDataUrlDialog = false
       if (this.show.proxyDialog) {
         this.show.proxyDialog = false
         this.setting.proxy.type = 'none'

src/components/Share.vue

@@ -76,27 +76,23 @@ export default {
         info: {}
       }
     },
-    async getUrl (dl, index) {
-      const t = dl.dd._t
-      if (t) {
-        return t.split('#')[index].split('$')[1]
-      } else {
-        const id = this.share.info.ids || this.share.info.id
-        const cacheKey = this.share.key + '@' + id
-        let res = this.DetailCache[cacheKey]
-        if (!this.DetailCache[cacheKey]) {
-          res = await zy.detail(this.share.key, id)
-          this.DetailCache[cacheKey] = res
-        }
-        if (res) {
-          return res.fullList[0].list[index]
-        }
+    async getUrl (index) {
+      const id = this.share.info.ids || this.share.info.id
+      const cacheKey = this.share.key + '@' + id
+      let res = this.DetailCache[cacheKey]
+      if (!this.DetailCache[cacheKey]) {
+        res = await zy.detail(this.share.key, id)
+        this.DetailCache[cacheKey] = res
+      }
+      if (res) {
+        const url = res.fullList[0].list[index]
+        return url.includes('$') ? url.split('$')[1] : url
       }
     },
     async getDetail () {
       this.loading = true
       const index = this.share.index || 0
-      const url = await this.getUrl(this.share.info.dl, index)
+      const url = await this.getUrl(index)
       this.link = 'http://hunlongyu.gitee.io/zy-player-web?url=' + url + '&name=' + this.share.info.name
       this.loading = false
       this.$nextTick(() => {

src/lib/site/tools.js

@@ -108,7 +108,7 @@ const zy = {
     return new Promise((resolve, reject) => {
       this.getSite(key).then(res => {
         const url = res.api
-        axios.post(url).then(res => {
+        axios.get(url).then(res => {
           const data = res.data
           const json = parser.parse(data, this.xmlConfig)
           const jsondata = json.rss === undefined ? json : json.rss
@@ -153,7 +153,7 @@ const zy = {
         } else {
           url = `${site.api}?ac=videolist&pg=${pg}`
         }
-        axios.post(url).then(async res => {
+        axios.get(url).then(async res => {
           const data = res.data
           const json = parser.parse(data, this.xmlConfig)
           const jsondata = json.rss === undefined ? json : json.rss
@@ -185,7 +185,7 @@ const zy = {
         } else {
           url = `${site.api}?ac=videolist`
         }
-        axios.post(url).then(async res => {
+        axios.get(url).then(async res => {
           const data = res.data.match(/<list [^>]*>/)[0] + '</list>' // 某些源站不含页码时获取到的数据parser无法解析
           const json = parser.parse(data, this.xmlConfig)
           const jsondata = json.rss === undefined ? json : json.rss
@@ -213,7 +213,7 @@ const zy = {
       this.getSite(key).then(res => {
         const site = res
         const url = `${site.api}?wd=${encodeURI(wd)}`
-        axios.post(url, { timeout: 3000 }).then(res => {
+        axios.get(url, { timeout: 3000 }).then(res => {
           const data = res.data
           const json = parser.parse(data, this.xmlConfig)
           const jsondata = json.rss === undefined ? json : json.rss
@@ -245,7 +245,7 @@ const zy = {
     return new Promise((resolve, reject) => {
       this.getSite(key).then(res => {
         const url = `${res.api}?ac=videolist&ids=${id}`
-        axios.post(url).then(res => {
+        axios.get(url).then(res => {
           const data = res.data
           const json = parser.parse(data, this.xmlConfig)
           const jsondata = json.rss === undefined ? json : json.rss
@@ -317,7 +317,7 @@ const zy = {
         const site = res
         if (site.download) {
           const url = `${site.download}?ac=videolist&ids=${id}&ct=1`
-          axios.post(url).then(res => {
+          axios.get(url).then(res => {
             const data = res.data
             const json = parser.parse(data, this.xmlConfig)
             const jsondata = json.rss === undefined ? json : json.rss