Make starter project delivery-ready
This commit is contained in:
1 parent
5b300dee0d
commit
d7bfde754b
22 files changed
+695
-71
No files matched your search
@@ -0,0 +1,41 @@
|
||||
import type { EChartsOption } from 'echarts'
|
||||
import type { ReactNode } from 'react'
|
||||
import { EChart } from './EChart'
|
||||
|
||||
type ChartPanelProps = {
|
||||
title: string
|
||||
option?: EChartsOption | null
|
||||
loading?: boolean
|
||||
error?: string | null
|
||||
empty?: boolean
|
||||
emptyText?: string
|
||||
className?: string
|
||||
extra?: ReactNode
|
||||
}
|
||||
|
||||
export function ChartPanel({
|
||||
title,
|
||||
option,
|
||||
loading = false,
|
||||
error,
|
||||
empty,
|
||||
emptyText = '暂无数据',
|
||||
className = '',
|
||||
extra
|
||||
}: ChartPanelProps) {
|
||||
const isEmpty = empty ?? !option
|
||||
|
||||
return (
|
||||
<section className={`screen-panel chart-panel ${className}`}>
|
||||
<header>
|
||||
<span>{title}</span>
|
||||
{extra ? <div className="chart-panel-extra">{extra}</div> : null}
|
||||
</header>
|
||||
<div className="screen-panel-body chart-panel-body">
|
||||
{error ? <div className="chart-panel-state is-error">{error}</div> : null}
|
||||
{!error && isEmpty ? <div className="chart-panel-state">{emptyText}</div> : null}
|
||||
{!error && !isEmpty && option ? <EChart option={option} loading={loading} /> : null}
|
||||
</div>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
export * from './EChart'
|
||||
export * from './ChartPanel'
|
||||
export * from './chartTheme'
|
||||
export * from './optionFactories'
|
||||
@@ -29,17 +29,35 @@ export type MockDataSource<Result> = BaseDataSource<Result, Result> & {
|
||||
export type HttpDataSource<Result, Raw = unknown> = BaseDataSource<Result, Raw> & {
|
||||
type: 'http'
|
||||
url: string
|
||||
baseUrl?: string
|
||||
query?: Record<string, string | number | boolean | null | undefined>
|
||||
headers?: HeadersInit | (() => HeadersInit)
|
||||
authToken?: string | (() => string | null | undefined)
|
||||
timeoutMs?: number
|
||||
init?: RequestInit
|
||||
intervalMs?: number
|
||||
immediate?: boolean
|
||||
}
|
||||
|
||||
export type ReconnectOptions = {
|
||||
enabled?: boolean
|
||||
maxRetries?: number
|
||||
delayMs?: number
|
||||
}
|
||||
|
||||
export type HeartbeatOptions = {
|
||||
message: string
|
||||
intervalMs: number
|
||||
}
|
||||
|
||||
export type WebSocketDataSource<Result, Raw = unknown> = BaseDataSource<Result, Raw> & {
|
||||
type: 'websocket'
|
||||
url: string
|
||||
protocols?: string | string[]
|
||||
mode?: RealtimeUpdateMode
|
||||
maxItems?: number
|
||||
reconnect?: boolean | ReconnectOptions
|
||||
heartbeat?: string | HeartbeatOptions
|
||||
}
|
||||
|
||||
export type SignalRDataSource<Result, Raw = unknown> = BaseDataSource<Result, Raw> & {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useEffect, useMemo, useState } from 'react'
|
||||
import { requestJson } from './request'
|
||||
import type { DataSource, DataSourceMap, DataState, DataStates, RealtimeUpdateMode } from './types'
|
||||
import type { DataSource, DataSourceMap, DataState, DataStates, HeartbeatOptions, RealtimeUpdateMode } from './types'
|
||||
|
||||
function createInitialState(source: DataSource<unknown, unknown>): DataState<unknown> {
|
||||
return {
|
||||
@@ -56,6 +56,46 @@ function toErrorMessage(error: unknown): string {
|
||||
return error instanceof Error ? error.message : String(error)
|
||||
}
|
||||
|
||||
function resolveHeaders(sourceHeaders?: HeadersInit | (() => HeadersInit), authToken?: string | (() => string | null | undefined)): HeadersInit {
|
||||
const headers = new Headers(typeof sourceHeaders === 'function' ? sourceHeaders() : sourceHeaders)
|
||||
const token = typeof authToken === 'function' ? authToken() : authToken
|
||||
|
||||
if (token && !headers.has('authorization')) {
|
||||
headers.set('authorization', `Bearer ${token}`)
|
||||
}
|
||||
|
||||
return headers
|
||||
}
|
||||
|
||||
function resolveHttpUrl(url: string, baseUrl?: string, query?: Record<string, string | number | boolean | null | undefined>): string {
|
||||
const resolved = baseUrl ? new URL(url, baseUrl).toString() : url
|
||||
|
||||
if (!query) {
|
||||
return resolved
|
||||
}
|
||||
|
||||
const parsed = new URL(resolved, window.location.origin)
|
||||
for (const [key, value] of Object.entries(query)) {
|
||||
if (value !== null && value !== undefined) {
|
||||
parsed.searchParams.set(key, String(value))
|
||||
}
|
||||
}
|
||||
|
||||
if (!baseUrl && url.startsWith('/')) {
|
||||
return `${parsed.pathname}${parsed.search}`
|
||||
}
|
||||
|
||||
return parsed.toString()
|
||||
}
|
||||
|
||||
function resolveHeartbeat(heartbeat: string | HeartbeatOptions | undefined): HeartbeatOptions | null {
|
||||
if (!heartbeat) {
|
||||
return null
|
||||
}
|
||||
|
||||
return typeof heartbeat === 'string' ? { message: heartbeat, intervalMs: 30000 } : heartbeat
|
||||
}
|
||||
|
||||
export function useScreenDataSources<TSources extends DataSourceMap>(sources: TSources): DataStates<TSources> {
|
||||
const sourceEntries = useMemo(() => Object.entries(sources), [sources])
|
||||
|
||||
@@ -124,10 +164,14 @@ export function useScreenDataSources<TSources extends DataSourceMap>(sources: TS
|
||||
abortController?.abort()
|
||||
abortController = new AbortController()
|
||||
updateState({ loading: true, error: null, status: 'connecting' })
|
||||
const timeout = source.timeoutMs
|
||||
? window.setTimeout(() => abortController?.abort(), source.timeoutMs)
|
||||
: null
|
||||
|
||||
try {
|
||||
const raw = await requestJson<unknown>(source.url, {
|
||||
const raw = await requestJson<unknown>(resolveHttpUrl(source.url, source.baseUrl, source.query), {
|
||||
...source.init,
|
||||
headers: resolveHeaders(source.headers ?? source.init?.headers, source.authToken),
|
||||
signal: abortController.signal
|
||||
})
|
||||
|
||||
@@ -138,6 +182,10 @@ export function useScreenDataSources<TSources extends DataSourceMap>(sources: TS
|
||||
if (active && !(error instanceof DOMException && error.name === 'AbortError')) {
|
||||
updateState({ loading: false, error: toErrorMessage(error), status: 'error' })
|
||||
}
|
||||
} finally {
|
||||
if (timeout) {
|
||||
window.clearTimeout(timeout)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,17 +210,69 @@ export function useScreenDataSources<TSources extends DataSourceMap>(sources: TS
|
||||
continue
|
||||
}
|
||||
|
||||
updateState({ status: 'connecting', error: null })
|
||||
const socket = new WebSocket(source.url, source.protocols)
|
||||
let closedByCleanup = false
|
||||
let retryCount = 0
|
||||
let reconnectTimer: number | null = null
|
||||
let heartbeatTimer: number | null = null
|
||||
let socket: WebSocket | null = null
|
||||
const reconnect = source.reconnect === undefined ? { enabled: true, maxRetries: 5, delayMs: 3000 } : source.reconnect
|
||||
const reconnectOptions = typeof reconnect === 'boolean'
|
||||
? { enabled: reconnect, maxRetries: 5, delayMs: 3000 }
|
||||
: { enabled: reconnect.enabled ?? true, maxRetries: reconnect.maxRetries ?? 5, delayMs: reconnect.delayMs ?? 3000 }
|
||||
const heartbeat = resolveHeartbeat(source.heartbeat)
|
||||
|
||||
socket.addEventListener('open', () => updateState({ loading: false, status: 'open', error: null }))
|
||||
socket.addEventListener('message', (event) => {
|
||||
commitData(parsePayload(event.data), source.mode, source.maxItems)
|
||||
const clearHeartbeat = () => {
|
||||
if (heartbeatTimer) {
|
||||
window.clearInterval(heartbeatTimer)
|
||||
heartbeatTimer = null
|
||||
}
|
||||
}
|
||||
|
||||
const connect = () => {
|
||||
updateState({ status: 'connecting', error: null })
|
||||
socket = new WebSocket(source.url, source.protocols)
|
||||
|
||||
socket.addEventListener('open', () => {
|
||||
retryCount = 0
|
||||
updateState({ loading: false, status: 'open', error: null })
|
||||
|
||||
if (heartbeat) {
|
||||
clearHeartbeat()
|
||||
heartbeatTimer = window.setInterval(() => {
|
||||
if (socket?.readyState === WebSocket.OPEN) {
|
||||
socket.send(heartbeat.message)
|
||||
}
|
||||
}, heartbeat.intervalMs)
|
||||
}
|
||||
})
|
||||
|
||||
socket.addEventListener('message', (event) => {
|
||||
commitData(parsePayload(event.data), source.mode, source.maxItems)
|
||||
})
|
||||
|
||||
socket.addEventListener('close', () => {
|
||||
clearHeartbeat()
|
||||
updateState({ loading: false, status: 'closed' })
|
||||
|
||||
if (!closedByCleanup && reconnectOptions.enabled && retryCount < reconnectOptions.maxRetries) {
|
||||
retryCount += 1
|
||||
reconnectTimer = window.setTimeout(connect, reconnectOptions.delayMs)
|
||||
}
|
||||
})
|
||||
|
||||
socket.addEventListener('error', () => updateState({ loading: false, status: 'error', error: 'WebSocket connection error.' }))
|
||||
}
|
||||
|
||||
connect()
|
||||
|
||||
cleanups.push(() => {
|
||||
closedByCleanup = true
|
||||
clearHeartbeat()
|
||||
if (reconnectTimer) {
|
||||
window.clearTimeout(reconnectTimer)
|
||||
}
|
||||
socket?.close()
|
||||
})
|
||||
socket.addEventListener('close', () => updateState({ loading: false, status: 'closed' }))
|
||||
socket.addEventListener('error', () => updateState({ loading: false, status: 'error', error: 'WebSocket connection error.' }))
|
||||
|
||||
cleanups.push(() => socket.close())
|
||||
}
|
||||
|
||||
if (source.type === 'signalr' || source.type === 'mqtt') {
|
||||
|
||||
Reference in new issue
Block a user