wood/clash-and-dashboard
1
0
Fork 0
mirror of https://github.com/woodchen-ink/clash-and-dashboard.git synced 2025-07-18 14:01:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: semver pkg bug

Browse Source
This commit is contained in:
Dreamacro 2019-12-27 16:08:20 +08:00
parent a818264407
commit 906d2b6143
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package-lock.json generated
View File

@ -1465,12 +1465,6 @@
"@types/react": "*" "@types/react": "*"
} }
}, },
"@types/semver": {
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.2.0.tgz",
"integrity": "sha512-1OzrNb4RuAzIT7wHSsgZRlMBlNsJl+do6UblR7JMW4oB7bbR+uBEYtUh7gEc/jM84GGilh68lSOokyM/zNUlBA==",
"dev": true
},
"@types/unist": { "@types/unist": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
@ -10733,11 +10727,6 @@
"node-forge": "0.9.0" "node-forge": "0.9.0"
} }
}, },
"semver": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.1.1.tgz",
"integrity": "sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A=="
},
"semver-regex": { "semver-regex": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz", "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",

2
package.json
View File

@ -41,7 +41,6 @@
"@types/react-router-dom": "^5.1.3", "@types/react-router-dom": "^5.1.3",
"@types/react-virtualized-auto-sizer": "^1.0.0", "@types/react-virtualized-auto-sizer": "^1.0.0",
"@types/react-window": "^1.8.1", "@types/react-window": "^1.8.1",
"@types/semver": "^6.2.0",
"autoprefixer": "^9.7.3", "autoprefixer": "^9.7.3",
"awesome-typescript-loader": "^5.2.1", "awesome-typescript-loader": "^5.2.1",
"babel-loader": "^8.0.6", "babel-loader": "^8.0.6",
@ -85,7 +84,6 @@
"react-table": "^7.0.0-beta.12", "react-table": "^7.0.0-beta.12",
"react-virtualized-auto-sizer": "^1.0.2", "react-virtualized-auto-sizer": "^1.0.2",
"react-window": "^1.8.5", "react-window": "^1.8.5",
"semver": "^7.1.1",
"swr": "^0.1.15", "swr": "^0.1.15",
"unstated-next": "^1.1.0", "unstated-next": "^1.1.0",
"use-immer": "^0.3.5" "use-immer": "^0.3.5"

3
src/lib/request.ts
View File

@ -1,5 +1,4 @@
import axios from 'axios' import axios from 'axios'
import semver from 'semver'
import { Partial, getLocalStorageItem, to } from '@lib/helper' import { Partial, getLocalStorageItem, to } from '@lib/helper'
import { isClashX, jsBridge } from '@lib/jsBridge' import { isClashX, jsBridge } from '@lib/jsBridge'
import { createAsyncSingleton } from '@lib/asyncSingleton' import { createAsyncSingleton } from '@lib/asyncSingleton'
@ -210,8 +209,8 @@ export const getLogsStreamReader = createAsyncSingleton(async function () {
const { data: config } = await getConfig() const { data: config } = await getConfig()
const [data, err] = await to(getVersion()) const [data, err] = await to(getVersion())
const version = err ? 'unkonwn version' : data.data.version const version = err ? 'unkonwn version' : data.data.version
const useWebsocket = !!version || true
const useWebsocket = semver.valid(version) && semver.gt(version, 'v0.15.0-52-gc384693')
const logUrl = `${location.protocol}//${externalController.hostname}:${externalController.port}/logs?level=${config['log-level']}` const logUrl = `${location.protocol}//${externalController.hostname}:${externalController.port}/logs?level=${config['log-level']}`
return new StreamReader<Log>({ url: logUrl, bufferLength: 200, token: externalController.secret, useWebsocket }) return new StreamReader<Log>({ url: logUrl, bufferLength: 200, token: externalController.secret, useWebsocket })
}) })