Tentacle enhancements.
This commit is contained in:
1 parent
4f9b89e38b
commit
9e15f8652d
12 files changed
+619
-22
No files matched your search
@@ -0,0 +1,106 @@
|
||||
// Copyright (c) 2026 Storm Dragon
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
package tentaclewire
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"unicode/utf8"
|
||||
)
|
||||
|
||||
// Leave room for lease metadata inside the existing 8192-byte call bound.
|
||||
const MaxRemoteSpeechBytes = 6144
|
||||
const RemoteSpeechQueueSize = 64
|
||||
|
||||
// RemoteSpeechPart carries resolved character/language state for each fragment.
|
||||
// End is an utterance boundary, not text. Whitespace is significant.
|
||||
type RemoteSpeechPart struct {
|
||||
Text string `json:"text,omitempty"`
|
||||
Characters bool `json:"characters,omitempty"`
|
||||
Language string `json:"language,omitempty"`
|
||||
End bool `json:"end,omitempty"`
|
||||
}
|
||||
|
||||
type RemoteSpeech struct {
|
||||
Kind string `json:"kind"` // speak, cancel, pause
|
||||
Priority int `json:"priority,omitempty"` // normal=0, next=1, now=2
|
||||
Parts []RemoteSpeechPart `json:"parts,omitempty"`
|
||||
Paused *bool `json:"paused,omitempty"`
|
||||
}
|
||||
|
||||
type RemotePresentation struct {
|
||||
RemoteOperation
|
||||
Speech RemoteSpeech `json:"speech"`
|
||||
}
|
||||
|
||||
func reject_speech_nulls(data []byte) error {
|
||||
var fields map[string]json.RawMessage
|
||||
if json.Unmarshal(data, &fields) != nil || fields == nil {
|
||||
return ErrProtocol
|
||||
}
|
||||
for _, value := range fields {
|
||||
if bytes.Equal(bytes.TrimSpace(value), []byte("null")) {
|
||||
return ErrProtocol
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (part *RemoteSpeechPart) UnmarshalJSON(data []byte) error {
|
||||
type plain RemoteSpeechPart
|
||||
var value plain
|
||||
if reject_speech_nulls(data) != nil || DecodeStrict(data, &value) != nil {
|
||||
return ErrProtocol
|
||||
}
|
||||
*part = RemoteSpeechPart(value)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (speech *RemoteSpeech) UnmarshalJSON(data []byte) error {
|
||||
type plain RemoteSpeech
|
||||
var value plain
|
||||
if reject_speech_nulls(data) != nil || DecodeStrict(data, &value) != nil || !ValidRemoteSpeech(RemoteSpeech(value)) {
|
||||
return ErrProtocol
|
||||
}
|
||||
*speech = RemoteSpeech(value)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ValidRemoteSpeech also limits encoded bytes: escaped text must fit in IPC.
|
||||
func ValidRemoteSpeech(speech RemoteSpeech) bool {
|
||||
switch speech.Kind {
|
||||
case "speak":
|
||||
if speech.Priority < 0 || speech.Priority > 2 || speech.Paused != nil || len(speech.Parts) == 0 || len(speech.Parts) > 128 {
|
||||
return false
|
||||
}
|
||||
for _, part := range speech.Parts {
|
||||
if part.End {
|
||||
if part.Text != "" || part.Characters || part.Language != "" {
|
||||
return false
|
||||
}
|
||||
continue
|
||||
}
|
||||
if part.Text == "" || !utf8.ValidString(part.Text) || len(part.Language) > 64 {
|
||||
return false
|
||||
}
|
||||
for _, char := range part.Language {
|
||||
if !(char >= 'a' && char <= 'z' || char >= 'A' && char <= 'Z' || char >= '0' && char <= '9' || char == '-' || char == '_') {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
case "cancel":
|
||||
if speech.Priority != 0 || len(speech.Parts) != 0 || speech.Paused != nil {
|
||||
return false
|
||||
}
|
||||
case "pause":
|
||||
if speech.Priority != 0 || len(speech.Parts) != 0 || speech.Paused == nil {
|
||||
return false
|
||||
}
|
||||
default:
|
||||
return false
|
||||
}
|
||||
data, err := json.Marshal(speech)
|
||||
return err == nil && len(data) <= MaxRemoteSpeechBytes
|
||||
}
|
||||
Reference in new issue
Block a user