Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/GenTradeAgent/src/renderer/src/components/FootBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,16 @@ const onClickNetwork = () => {
showServerModal.value = true
}

const callbackPing = (latency: number) => {
store.commit('updateServerConnection', latency)
}

const onPositiveClick = () => {
console.log('ok')
agentServer.serverAddress = serverAddress.value
agentServer.pingInterval = pingInterval.value * 1000
showServerModal.value = false
agentServer.ping(callbackPing)
}
</script>
<style lang="scss" scoped>
Expand Down
7 changes: 5 additions & 2 deletions src/GenTradeAgent/src/renderer/src/components/TradingMain.vue
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,12 @@ const handleUpdateCurrentInterval = (value: string) => {
store.commit('updateCurrentInterval', value)
}

agentServer.store = useStore()
const callbackPing = (latency: number) => {
store.commit('updateServerConnection', latency)
}

const handlerPingServer = () => {
agentServer.ping()
agentServer.ping(callbackPing)
setTimeout(handlerPingServer, agentServer.pingInterval)
}
handlerPingServer()
Expand Down
29 changes: 16 additions & 13 deletions src/GenTradeAgent/src/renderer/src/server.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
import axios, { AxiosError } from 'axios'
import { IState } from '@renderer/store'
import { Store } from 'vuex'

class AgentServer {
serverAddress: string = 'http://47.100.216.225:8000/api/v1'
//serverAddress: string = 'http://127.0.0.1:8000/api/v1'
static DEFAULT_SERVER_ADDRESS = 'http://47.100.216.225:8000/api/v1'
apiKey: string = 'e54d4431-5dab-474e-b71a-0db1fcb9e659'
tzName: string = ''
tzOffset: number = 0
store: Store<IState> | null = null
pingInterval: number = 10000

ping() {
get serverAddress() {
const retval = localStorage.getItem('serverAddress')
if (retval == null) {
return AgentServer.DEFAULT_SERVER_ADDRESS
}
return retval
}

set serverAddress(newVal) {
localStorage.setItem('serverAddress', newVal)
}

ping(callback: (lantecy: number) => void) {
const tsStart = new Date().getTime()
const address = this.serverAddress + '/public/server_time'

Expand All @@ -21,16 +29,11 @@ class AgentServer {
const tsEnd = new Date().getTime()
this.tzName = response.data['timezone_name']
this.tzOffset = response.data['timezone_offset']

if (this.store) {
this.store.commit('updateServerConnection', (tsEnd - tsStart) / 2)
}
callback((tsEnd - tsStart) / 2)
})
.catch((err: AxiosError) => {
console.log(err)
if (this.store) {
this.store.commit('updateServerConnection', -1)
}
callback(-1)
})
}

Expand Down
Loading