优化网络请求

package.json

@@ -1,6 +1,6 @@
 {
   "name": "io.yutent.gaystat",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "搞基数据",
   "main": "src/main.js",
   "scripts": {
@@ -26,7 +26,7 @@
       "version": "11.0.4",
       "mirror": "https://npm.taobao.org/mirrors/electron/"
     },
-    "files": ["src/**/*", "node_modules/iofs/*"],
+    "files": ["src/**/*", "node_modules/iofs/*", "node_modules/node-fetch/*"],
     "mac": {
       "category": "public.app-category.developer-tools",
       "target": "dmg",
@@ -39,6 +39,7 @@
     "electron-builder": "^22.1.0"
   },
   "dependencies": {
-    "iofs": "^1.3.2"
+    "iofs": "^1.5.2",
+    "node-fetch": "^2.6.1"
   }
 }

src/css/app.css

@@ -1 +1 @@
-html{font-size:12.8px;width:100%;height:100vh}body{overflow:hidden;display:flex;flex-direction:column;width:100%;height:100%;line-height:1.25;font-size:14px;color:var(--color-dark-1);background:rgba(255,255,255,0.3)}.app-drag{-webkit-app-region:drag;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.app-nodrag{-webkit-app-region:no-drag}.app{position:relative;display:flex;height:100%}.app .sidebar{display:flex;flex-direction:column;justify-content:space-between;width:76px;height:100%;padding:48px 22px 24px;background:var(--color-dark-1);color:var(--color-plain-1)}.app .sidebar .item{cursor:pointer}.app .sidebar .item:hover,.app .sidebar .item.active{color:var(--color-orange-1)}.app .sidebar .item:active{color:var(--color-orange-2)}.app .select-box{display:flex;flex-direction:column;width:200px;height:100%;background:rgba(255,255,255,0.5)}.app .select-box .form{display:flex;align-items:center;width:100%;height:35px;padding:0 6px;background:#fff;border-bottom:1px solid var(--color-plain-2)}.app .select-box .form wc-input{flex:1}.app .select-box .list{flex:1}.app .select-box .list .item{display:flex;flex-direction:column;justify-content:center;height:48px;padding:6px;transition:color 0.15s ease-in-out, background 0.15s ease-in-out;cursor:pointer}.app .select-box .list .item section{display:flex;justify-content:space-between;align-items:center}.app .select-box .list .item cite{color:var(--color-grey-2)}.app .select-box .list .item .percent{padding:0 4px;border-radius:2px;font-size:12px;font-weight:bold;color:var(--color-grey-1)}.app .select-box .list .item .percent.red{color:var(--color-red-1)}.app .select-box .list .item .percent.green{color:var(--color-green-3)}.app .select-box .list .item:nth-child(odd){background:rgba(255,255,255,0.35)}.app .select-box .list .item:hover{color:var(--color-blue-1);background:rgba(255,255,255,0.35)}.app .select-box .list .item.active{color:var(--color-blue-3);background:rgba(255,255,255,0.7)}.app .detail{position:relative;flex:1;height:100%;border-left:1px solid var(--color-plain-2);background:#fff}.app .detail .title{display:flex;justify-content:space-between;align-items:center;width:100%;height:35px;padding:0 16px;font-size:16px;font-weight:bold}.app .detail .title span{display:inline-flex}.app .detail .title wc-button{margin:0 6px}.app .detail .card{width:96%;padding:12px 12px 16px;margin:12px 2% 24px;border:0;background:#fff;box-shadow:0 0 8px rgba(0,0,0,0.075)}.app .detail .card legend{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#64b5f6}.app .detail.blur::after{display:flex;justify-content:center;align-items:center;position:absolute;left:0;top:0;z-index:999;width:100%;height:100%;content:'搞基数据';background:#fff;color:#f7f8fb;font-size:100px}.app .preferences{width:640px;height:360px;border-radius:10px}.app .preferences .titlebar{width:100%;height:72px;border-bottom:1px solid var(--color-plain-3);background:var(--color-plain-1)}.app .preferences .titlebar .title{width:100%;height:24px;line-height:24px;text-align:center}.app .preferences .titlebar nav{display:flex;width:100%;height:40px;padding:0 16px;--size: 18px}.app .preferences .titlebar nav span{display:flex;flex-direction:column;align-items:center;justify-content:center;width:52px;height:40px;margin:0 6px;border-radius:6px;font-size:12px}.app .preferences .titlebar nav span.active{background:var(--color-plain-2);color:var(--color-blue-1)}.app .preferences .titlebar nav span:hover{background:var(--color-plain-2)}.app .preferences .tab-panel{padding:64px}.app .preferences .tab-panel p{margin-bottom:16px}.app .preferences .tab-panel .field{display:flex;align-items:center;height:64px}.app .preferences .tab-panel .field .label{width:200px;color:var(--color-grey-1)}.app.loading::after{display:flex;justify-content:center;align-items:center;position:absolute;left:0;top:0;z-index:999;width:100%;height:100%;content:'🌑';background:rgba(255,255,255,0.01);-webkit-backdrop-filter:blur(2px);backdrop-filter:blur(2px);color:var(--color-orange-1);font-size:50px;-webkit-animation:loading 1s infinite;animation:loading 1s infinite}@-webkit-keyframes loading{1%,100%{content:'🌑'}12.5%{content:'🌒'}25%{content:'🌓'}37.5%{content:'🌔'}50%{content:'🌕'}62.5%{content:'🌖'}75%{content:'🌗'}87.5%{content:'🌘'}}@keyframes loading{1%,100%{content:'🌑'}12.5%{content:'🌒'}25%{content:'🌓'}37.5%{content:'🌔'}50%{content:'🌕'}62.5%{content:'🌖'}75%{content:'🌗'}87.5%{content:'🌘'}}
+html{font-size:12.8px;width:100%;height:100vh}body{overflow:hidden;display:flex;flex-direction:column;width:100%;height:100%;line-height:1.25;font-size:14px;color:var(--color-dark-1);background:rgba(255,255,255,0.3)}.app-drag{-webkit-app-region:drag;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.app-nodrag{-webkit-app-region:no-drag}.app{position:relative;display:flex;height:100%}.app .sidebar{display:flex;flex-direction:column;justify-content:space-between;width:76px;height:100%;padding:48px 22px 24px;background:var(--color-dark-1);color:var(--color-plain-1)}.app .sidebar .item{cursor:pointer}.app .sidebar .item:hover,.app .sidebar .item.active{color:var(--color-orange-1)}.app .sidebar .item:active{color:var(--color-orange-2)}.app .select-box{display:flex;flex-direction:column;width:200px;height:100%;background:rgba(255,255,255,0.5)}.app .select-box .form{display:flex;align-items:center;width:100%;height:35px;padding:0 6px;background:#fff;border-bottom:1px solid var(--color-plain-2)}.app .select-box .form wc-input{flex:1}.app .select-box .list{flex:1}.app .select-box .list .item{display:flex;flex-direction:column;justify-content:center;height:48px;padding:6px;border-bottom:1px solid rgba(200,200,200,0.3);transition:color 0.15s ease-in-out, background 0.15s ease-in-out;cursor:pointer}.app .select-box .list .item section{display:flex;justify-content:space-between;align-items:center}.app .select-box .list .item cite{color:var(--color-grey-2)}.app .select-box .list .item .percent{padding:0 4px;border-radius:2px;font-size:12px;font-weight:bold;color:var(--color-grey-1)}.app .select-box .list .item .percent.red{color:var(--color-red-1)}.app .select-box .list .item .percent.green{color:var(--color-green-3)}.app .select-box .list .item:last-child{border-bottom:0}.app .select-box .list .item:hover{color:var(--color-blue-1);background:rgba(255,255,255,0.7)}.app .select-box .list .item.active{color:var(--color-plain-1);background:var(--color-blue-1)}.app .select-box .list .item.active cite{color:inherit}.app .select-box .list .item.active .percent{color:#fff}.app .detail{position:relative;flex:1;height:100%;border-left:1px solid var(--color-plain-2);background:#fff}.app .detail .title{display:flex;justify-content:space-between;align-items:center;width:100%;height:35px;padding:0 16px;font-size:16px;font-weight:bold}.app .detail .title span{display:inline-flex}.app .detail .title wc-button{margin:0 6px}.app .detail .card{width:96%;padding:12px 12px 16px;margin:12px 2% 24px;border:0;background:#fff;box-shadow:0 0 8px rgba(0,0,0,0.075)}.app .detail .card legend{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#64b5f6}.app .detail.blur::after{display:flex;justify-content:center;align-items:center;position:absolute;left:0;top:0;z-index:999;width:100%;height:100%;content:'搞基数据';background:#fff;color:#f7f8fb;font-size:100px}.app .preferences{width:640px;height:360px;border-radius:10px}.app .preferences .titlebar{width:100%;height:72px;border-bottom:1px solid var(--color-plain-3);background:var(--color-plain-1)}.app .preferences .titlebar .title{width:100%;height:24px;line-height:24px;text-align:center}.app .preferences .titlebar nav{display:flex;width:100%;height:40px;padding:0 16px;--size: 18px}.app .preferences .titlebar nav span{display:flex;flex-direction:column;align-items:center;justify-content:center;width:52px;height:40px;margin:0 6px;border-radius:6px;font-size:12px}.app .preferences .titlebar nav span.active{background:var(--color-plain-2);color:var(--color-blue-1)}.app .preferences .titlebar nav span:hover{background:var(--color-plain-2)}.app .preferences .tab-panel{padding:64px}.app .preferences .tab-panel p{margin-bottom:16px}.app .preferences .tab-panel .field{display:flex;align-items:center;height:64px}.app .preferences .tab-panel .field .label{width:200px;color:var(--color-grey-1)}.app.loading::after{display:flex;justify-content:center;align-items:center;position:absolute;left:0;top:0;z-index:999;width:100%;height:100%;content:'🌑';background:rgba(255,255,255,0.01);-webkit-backdrop-filter:blur(2px);backdrop-filter:blur(2px);color:var(--color-orange-1);font-size:50px;-webkit-animation:loading 1s infinite;animation:loading 1s infinite}@-webkit-keyframes loading{1%,100%{content:'🌑'}12.5%{content:'🌒'}25%{content:'🌓'}37.5%{content:'🌔'}50%{content:'🌕'}62.5%{content:'🌖'}75%{content:'🌗'}87.5%{content:'🌘'}}@keyframes loading{1%,100%{content:'🌑'}12.5%{content:'🌒'}25%{content:'🌓'}37.5%{content:'🌔'}50%{content:'🌕'}62.5%{content:'🌖'}75%{content:'🌗'}87.5%{content:'🌘'}}

src/css/app.scss

@@ -89,6 +89,7 @@ body {
         justify-content: center;
         height: 48px;
         padding: 6px;
+        border-bottom: 1px solid rgba(200, 200, 200, 0.3);
         transition: color 0.15s ease-in-out, background 0.15s ease-in-out;
         cursor: pointer;
 
@@ -117,18 +118,26 @@ body {
           }
         }
 
-        &:nth-child(odd) {
-          background: rgba(255, 255, 255, 0.35);
+        &:last-child {
+          border-bottom: 0;
         }
 
         &:hover {
           color: var(--color-blue-1);
-          background: rgba(255, 255, 255, 0.35);
+          background: rgba(255, 255, 255, 0.7);
         }
 
         &.active {
-          color: var(--color-blue-3);
-          background: rgba(255, 255, 255, 0.7);
+          color: var(--color-plain-1);
+          background: var(--color-blue-1);
+
+          cite {
+            color: inherit;
+          }
+
+          .percent {
+            color: #fff;
+          }
         }
       }
     }

src/js/app.js

@@ -28,6 +28,10 @@ function getJsonp(str) {
 }
 
 function getLineStat(str) {
+  str = str.replace(
+    /.*var syl_1n(.*?)var Data_netWorthTrend([^;]*?);.*/,
+    'var syl_1n$1var Data_netWorthTrend$2;'
+  )
   return new Function(`${str}; return {line: Data_netWorthTrend.map(it => ({
     x: ~~(it.x/1000),
     y: +(it.y * 10000).toFixed(0),
@@ -140,6 +144,7 @@ Anot({
         'fetch',
         `https://fundgz.1234567.com.cn/js/${id}.js`
       )
+
       return getJsonp(res)
     },
 
@@ -153,6 +158,11 @@ Anot({
         return
       }
 
+      if (code === 'debug') {
+        this.input = ''
+        return app.dispatch('devtools')
+      }
+
       if (code.length < 6) {
         return
       }
@@ -192,6 +202,11 @@ Anot({
         let info = this.getGayStat(it.code)
         let time, needUpdate
 
+        if (!info) {
+          console.log(it)
+          continue
+        }
+
         it.cm = +info.gsz
         it.cp = +info.gszzl
 

src/js/float.js

@@ -29,13 +29,19 @@ Anot({
       var time = +Anot.ss('last_update') || 0
       var now = Date.now()
 
-      // 如果离上次更新超过15分钟, 则自动更新
-      if (now - time > 15 * 60 * 1000) {
-        this.updateGays()
-        Anot.ss('last_update', now)
-      } else {
-        this.reloadGays()
+      // 有触发小窗口显示时, 更新通知提醒
+      if (Anot.ls('notify') === '1') {
+        app.dispatch('notify')
       }
+
+      this.reloadGays()
+      setTimeout(() => {
+        // 如果离上次更新超过15分钟, 则自动更新
+        if (now - time > 15 * 60 * 1000) {
+          this.updateGays()
+          Anot.ss('last_update', now)
+        }
+      }, 500)
     })
   },
   methods: {

src/main.js

@@ -14,6 +14,7 @@ const {
 } = require('electron')
 const path = require('path')
 const fs = require('iofs')
+const fetch = require('node-fetch')
 
 const { createMainWindow, createFloatWindow } = require('./tools/window')
 const createMenu = require('./tools/menu')
@@ -35,29 +36,6 @@ const ROOT = __dirname
 
 var timer
 
-function fetch(url) {
-  return new Promise((y, n) => {
-    var conn = net.request(url)
-    var r = []
-
-    conn.on('response', res => {
-      res.on('data', c => {
-        r.push(c)
-      })
-
-      res.on('end', _ => {
-        y(Buffer.concat(r).toString())
-      })
-    })
-
-    conn.on('error', e => {
-      n(e)
-    })
-
-    conn.end()
-  })
-}
-
 function ring() {
   var n = 5
   var t = setInterval(() => {
@@ -120,9 +98,14 @@ app.once('ready', () => {
 ipcMain.on('app', (ev, conn) => {
   switch (conn.type) {
     case 'fetch':
-      fetch(conn.data).then(r => {
-        ev.returnValue = r
+      fetch(conn.data, {
+        headers: {
+          'user-agent':
+            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36'
+        }
       })
+        .then(r => r.text())
+        .then(r => (ev.returnValue = r))
       break
 
     case 'notify':
@@ -130,7 +113,7 @@ ipcMain.on('app', (ev, conn) => {
       var t1 = Date.now()
       var t2 = new Date()
       t2.setHours(14)
-      t2.setMinutes(0)
+      t2.setMinutes(30)
       t2.setSeconds(0)
 
       if (t2.getTime() - t1 > 0) {
@@ -144,5 +127,10 @@ ipcMain.on('app', (ev, conn) => {
       app.__main__.webContents.send('app', { type: 'data-reload', data: null })
       ev.returnValue = true
       break
+
+    case 'devtools':
+      app.__main__.openDevTools()
+      ev.returnValue = true
+      break
   }
 })