From e37f2f8c75422c5d4aec1caed70c6b95408a6186 Mon Sep 17 00:00:00 2001 From: Chengxun Lee <24319042+bclswl0827@users.noreply.github.com> Date: Mon, 11 Mar 2024 22:02:51 +0800 Subject: [PATCH] v2.11.3 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- build/assets/config.json | 2 +- driver/seedlink/data.go | 10 +--------- frontend/dist/asset-manifest.json | 4 ++-- frontend/dist/index.html | 2 +- .../static/js/{main.83154c56.js => main.7c7ab17f.js} | 4 ++-- ...c56.js.LICENSE.txt => main.7c7ab17f.js.LICENSE.txt} | 0 frontend/src/.env | 4 ++-- 9 files changed, 14 insertions(+), 18 deletions(-) rename frontend/dist/static/js/{main.83154c56.js => main.7c7ab17f.js} (99%) rename frontend/dist/static/js/{main.83154c56.js.LICENSE.txt => main.7c7ab17f.js.LICENSE.txt} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c074e90a..a55d986b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Starting from v2.2.5, all notable changes to this project will be documented in this file. +## v2.11.3 + +- Response with OK when SeedLink DATA command has no extra argument + ## v2.11.2 - Code style improvements again diff --git a/VERSION b/VERSION index 49f8cce5..fb256718 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.11.2 +v2.11.3 diff --git a/build/assets/config.json b/build/assets/config.json index f5fce6f1..31dce63c 100644 --- a/build/assets/config.json +++ b/build/assets/config.json @@ -54,7 +54,7 @@ "lifecycle": 10 }, "seedlink_settings": { - "enable": true, + "enable": false, "host": "0.0.0.0", "port": 18000, "duration": 86400 diff --git a/driver/seedlink/data.go b/driver/seedlink/data.go index 298f6f11..6c38e279 100644 --- a/driver/seedlink/data.go +++ b/driver/seedlink/data.go @@ -12,12 +12,7 @@ type DATA struct{} // Callback of "DATA" command, implements SeedLinkCommandCallback interface func (*DATA) Callback(sl *SeedLinkGlobal, cl *SeedLinkClient, options *feature.FeatureOptions, streamer SeedLinkStreamer, conn net.Conn, args ...string) error { - switch len(args) { - case 3: - fallthrough - case 2: - fallthrough - case 1: + if len(args) > 0 { seq, err := strconv.ParseInt(args[0], 16, 64) if err != nil { conn.Write([]byte(RES_ERR)) @@ -25,9 +20,6 @@ func (*DATA) Callback(sl *SeedLinkGlobal, cl *SeedLinkClient, options *feature.F } cl.Sequence = seq + 1 cl.StartTime, _ = duration.Timestamp(options.Status.System.Offset) - default: - _, err := conn.Write([]byte(RES_ERR)) - return err } _, err := conn.Write([]byte(RES_OK)) return err diff --git a/frontend/dist/asset-manifest.json b/frontend/dist/asset-manifest.json index 0598b503..661a6711 100644 --- a/frontend/dist/asset-manifest.json +++ b/frontend/dist/asset-manifest.json @@ -1,7 +1,7 @@ { "files": { "main.css": "./static/css/main.7a040865.css", - "main.js": "./static/js/main.83154c56.js", + "main.js": "./static/js/main.7c7ab17f.js", "static/css/594.d6bfd15f.chunk.css": "./static/css/594.d6bfd15f.chunk.css", "static/js/594.ef2a52fb.chunk.js": "./static/js/594.ef2a52fb.chunk.js", "static/js/846.a985bbed.chunk.js": "./static/js/846.a985bbed.chunk.js", @@ -49,6 +49,6 @@ }, "entrypoints": [ "static/css/main.7a040865.css", - "static/js/main.83154c56.js" + "static/js/main.7c7ab17f.js" ] } \ No newline at end of file diff --git a/frontend/dist/index.html b/frontend/dist/index.html index e7a2c13d..99070c6c 100644 --- a/frontend/dist/index.html +++ b/frontend/dist/index.html @@ -1 +1 @@ -