diff --git a/lib/request/httpsProxyAgentMod.js b/lib/request/httpsProxyAgentMod.js index 6b95843..c57c1bc 100644 --- a/lib/request/httpsProxyAgentMod.js +++ b/lib/request/httpsProxyAgentMod.js @@ -1,6 +1,6 @@ import HttpsProxyAgentOrig from 'https-proxy-agent' -export class HttpsProxyAgent extends HttpsProxyAgentOrig { +export class HttpsProxyAgent extends HttpsProxyAgentOrig.HttpsProxyAgent { constructor (opts) { super(opts) this.tlsConnectionOptions = opts.tls diff --git a/model/State.js b/model/State.js index 1e0f043..48a5ecc 100644 --- a/model/State.js +++ b/model/State.js @@ -4,13 +4,7 @@ import fs from 'fs' import { common } from './index.js' import { Config, Data } from '../components/index.js' -let valueObject = { - networkStats: 'rx_sec,tx_sec,iface', - currentLoad: 'currentLoad', - mem: 'active', - fsStats: 'wx_sec,rx_sec' -} -export default new class OSUtils { +export default new class { constructor () { this.si = null // 是否可以获取gpu @@ -40,6 +34,14 @@ export default new class OSUtils { // 主题 echarts_theme: Data.readJSON('resources/state/theme_westeros.json') } + + this.valueObject = { + networkStats: 'rx_sec,tx_sec,iface', + currentLoad: 'currentLoad', + mem: 'active', + fsStats: 'wx_sec,rx_sec' + } + this.init() } @@ -101,11 +103,11 @@ export default new class OSUtils { // 网速 const Timer = setInterval(async () => { - let data = await this.si.get(valueObject) + let data = await this.si.get(this.valueObject) _.forIn(data, (value, key) => { if (_.isEmpty(value)) { logger.debug(`获取${key}数据失败,停止获取对应数据`) - delete valueObject[key] + delete this.valueObject[key] } })