项目文件夹

文件
litiantian03 3c35b26b74 fix(instance): stabilize desktop access and stream defaults
- Reuse desktop direct upstream resolution and include upstream in short external access tokens
- Default and normalize Selkies stream settings for desktop runtimes
- Remove legacy deployments with the same instance-id before ensuring the current deployment
- Preserve the unsaved desktop stream profile state in the frontend
- Add tests for stream profiles, pod envs, and deployment cleanup
2026-06-18 11:28:40 +08:00

151 行
4.1 KiB
Go

package services
import (
"encoding/json"
"fmt"
"regexp"
"strconv"
"strings"
"clawreef/internal/models"
)
const (
defaultInstanceSHMSizeGB = 1
maxInstanceSHMSizeGB = 8
)
// popSHMSizeGB removes SHM_SIZE_GB from extraEnv and returns /dev/shm size in GiB.
// Desktop runtime defaults scale with instance memory. SHM_SIZE_GB=0 disables
// the custom emptyDir /dev/shm mount.
// Values above maxInstanceSHMSizeGB are clamped to protect node memory.
func popSHMSizeGB(extraEnv map[string]string, runtimeType string, memoryGB int) int {
shmSizeGB := defaultSHMSizeGB(runtimeType, memoryGB)
if shmVal, ok := extraEnv["SHM_SIZE_GB"]; ok {
if parsed, err := strconv.Atoi(strings.TrimSpace(shmVal)); err == nil {
if parsed == 0 {
shmSizeGB = 0
} else if parsed > 0 {
shmSizeGB = parsed
if shmSizeGB > maxInstanceSHMSizeGB {
shmSizeGB = maxInstanceSHMSizeGB
}
}
}
delete(extraEnv, "SHM_SIZE_GB")
}
return shmSizeGB
}
func defaultSHMSizeGB(runtimeType string, memoryGB int) int {
if normalizeInstanceRuntimeType(runtimeType) != "desktop" {
return defaultInstanceSHMSizeGB
}
switch {
case memoryGB >= 12:
return 4
case memoryGB >= 8:
return 2
default:
return defaultInstanceSHMSizeGB
}
}
var envNamePattern = regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_]*$`)
func normalizeEnvironmentOverrides(overrides map[string]string) (map[string]string, error) {
if len(overrides) == 0 {
return nil, nil
}
normalized := make(map[string]string, len(overrides))
for rawKey, value := range overrides {
key := strings.TrimSpace(rawKey)
if key == "" {
return nil, fmt.Errorf("environment variable name cannot be empty")
}
if !envNamePattern.MatchString(key) {
return nil, fmt.Errorf("invalid environment variable name: %s", key)
}
if _, exists := normalized[key]; exists {
return nil, fmt.Errorf("duplicate environment variable name: %s", key)
}
normalized[key] = value
}
return normalized, nil
}
func marshalEnvironmentOverrides(overrides map[string]string) (*string, error) {
if len(overrides) == 0 {
return nil, nil
}
raw, err := json.Marshal(overrides)
if err != nil {
return nil, fmt.Errorf("failed to encode environment overrides: %w", err)
}
encoded := string(raw)
return &encoded, nil
}
func parseEnvironmentOverridesJSON(raw *string) (map[string]string, error) {
if raw == nil || strings.TrimSpace(*raw) == "" {
return nil, nil
}
var overrides map[string]string
if err := json.Unmarshal([]byte(strings.TrimSpace(*raw)), &overrides); err != nil {
return nil, fmt.Errorf("failed to decode environment overrides: %w", err)
}
normalized, err := normalizeEnvironmentOverrides(overrides)
if err != nil {
return nil, err
}
return normalized, nil
}
func buildInstancePodEnv(instance *models.Instance, runtimeEnv, gatewayEnv, agentEnv map[string]string) (map[string]string, error) {
if instance == nil {
return nil, fmt.Errorf("instance is required")
}
overrides, err := parseEnvironmentOverridesJSON(instance.EnvironmentOverridesJSON)
if err != nil {
return nil, err
}
overrides = ensureDesktopStreamProfileEnv(overrides, instance.RuntimeType)
resolved := mergeEnvMaps(runtimeEnv, mergeEnvMaps(gatewayEnv, agentEnv))
resolved = withInstanceProxyEnv(instance.Type, instance.ID, resolved)
resolved["CLAWMANAGER_RUNTIME_TYPE"] = normalizeInstanceRuntimeType(instance.RuntimeType)
if normalizeInstanceRuntimeType(instance.RuntimeType) == "shell" {
resolved["CLAWMANAGER_DESKTOP_ENABLED"] = "false"
delete(resolved, "SUBFOLDER")
}
resolved = mergeEnvMaps(resolved, overrides)
return resolved, nil
}
func buildInstanceGatewayEnv(instance *models.Instance, gatewayEnv map[string]string) (map[string]string, error) {
if instance == nil {
return nil, fmt.Errorf("instance is required")
}
overrides, err := parseEnvironmentOverridesJSON(instance.EnvironmentOverridesJSON)
if err != nil {
return nil, err
}
resolved := mergeEnvMaps(gatewayEnv, nil)
resolved = withInstanceProxyEnv(instance.Type, instance.ID, resolved)
resolved["CLAWMANAGER_RUNTIME_TYPE"] = normalizeInstanceRuntimeType(instance.RuntimeType)
resolved = mergeEnvMaps(resolved, overrides)
return resolved, nil
}