seriesHandler use DataSeries

Author: anyongjin

web/base/biz_com.go

@@ -110,10 +110,6 @@ func seriesHandler(msg *data.SeriesMsg) {
 	if len(msg.Rows) == 0 {
 		return
 	}
-	bars, convErr := orm.SeriesToBars(orm.GetExSymbol2(msg.ExgName, msg.Market, msg.Pair), msg.Rows)
-	if convErr != nil {
-		return
-	}
 	wsSubLock.Lock()
 	defer wsSubLock.Unlock()
 	key := fmt.Sprintf("%s_%s_%s", msg.ExgName, msg.Market, msg.Pair)
@@ -122,10 +118,10 @@ func seriesHandler(msg *data.SeriesMsg) {
 		return
 	}
 	wsMsg := map[string]interface{}{
-		"a":    "subscribe",
-		"bars": ArrSeriesBars(bars),
-		"secs": msg.TFSecs,
-		"upd":  msg.Interval,
+		"a":      "subscribe",
+		"series": msg.Rows,
+		"secs":   msg.TFSecs,
+		"upd":    msg.Interval,
 	}
 	raw, marshalErr := utils2.Marshal(wsMsg)
 	if marshalErr != nil {

web/ui/src/lib/kline/mydatafeed.ts

@@ -3,6 +3,18 @@ import {getApi} from "../netio";
 import {site} from "$lib/stores/site";
 import {get} from "svelte/store";
 
+function seriesToBar(row: any): BarArr {
+  const values = row.Values ?? row.values ?? {}
+  return [
+    row.TimeMS ?? row.timeMS ?? row.time_ms,
+    values.open,
+    values.high,
+    values.low,
+    values.close,
+    values.volume ?? 0
+  ]
+}
+
 export default class MyDatafeed implements Datafeed {
 
   private _prevSymbol?: SymbolInfo
@@ -74,7 +86,8 @@ export default class MyDatafeed implements Datafeed {
     this._ws.onmessage = event => {
       const result = JSON.parse(event.data)
       const action = result.a as string
-      if (action == 'subscribe' && result.bars && result.bars.length) {
+      if (action == 'subscribe' && result.series && result.series.length) {
+        result.bars = result.series.map(seriesToBar)
         const first = result.bars[0] as BarArr
         if (last_bar && first[0] == last_bar[0]) {
           // 如果和上一个推送的bar时间戳相同，则认为是其更新，减去上一个的volume，避免调用方错误累加
@@ -103,4 +116,4 @@ export default class MyDatafeed implements Datafeed {
     }))
   }
 
-}
+}