add extensions

Author: root

Note.md

@@ -154,4 +154,8 @@ crontab list 保存不住
 
 去掉所有与 docker.sock 的强依赖与硬编码
 
-平台metrics 的读取查询与对服务器 metrics 的查询，是不是后端代码应该分离
+平台metrics 的读取查询与对服务器 metrics 的查询，是不是后端代码应该分离
+
+所以 appos 容器內其實完全可以通過 uname -r、/proc/meminfo 等獲取宿主機的內核版本、內存大小、CPU 信息，不需要任何特殊權限。只有 OS 發行版（os-release）是個例外
+
+

backend/docs/openapi/api.yaml

@@ -9735,15 +9735,13 @@ paths:
                     content:
                         application/json:
                             schema:
-                                additionalProperties: true
-                                type: object
+                                $ref: '#/components/schemas/SuccessEnvelope'
                     description: OK
                 "401":
                     content:
                         application/json:
                             schema:
-                                additionalProperties: true
-                                type: object
+                                $ref: '#/components/schemas/ErrorEnvelope'
                     description: Unauthorized
             security:
                 - bearerAuth: []
@@ -10022,7 +10020,7 @@ paths:
                 - Settings
     /api/software/local:
         get:
-            description: Returns AppOS-local software inventory derived from the local catalog and runtime checks.
+            description: Returns AppOS-local built-in component inventory derived from the local runtime registry, with software-catalog metadata attached when available.
             operationId: get_api_software_local
             responses:
                 "200":

backend/docs/openapi/ext-api.yaml

@@ -5045,15 +5045,13 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                additionalProperties: true
+                $ref: '#/components/schemas/SuccessEnvelope'
         "401":
           description: Unauthorized
           content:
             application/json:
               schema:
-                type: object
-                additionalProperties: true
+                $ref: '#/components/schemas/ErrorEnvelope'
   /api/servers/local/docker-bridge:
     get:
       tags: [Servers]
@@ -8337,7 +8335,7 @@ paths:
     get:
       tags: [Software]
       summary: List AppOS-local software components
-      description: "Returns AppOS-local software inventory derived from the local catalog and runtime checks."
+      description: "Returns AppOS-local built-in component inventory derived from the local runtime registry, with software-catalog metadata attached when available."
       operationId: get_api_software_local
       security:
         - bearerAuth: []

backend/domain/config/sysconfig/schema/schema.go

@@ -212,24 +212,22 @@ var entryCatalog = []EntrySchema{
 		Module:  "proxy",
 		Key:     "network",
 		Fields: []FieldSchema{
-			{ID: "httpProxy", Label: "HTTP Proxy", Type: "string"},
-			{ID: "httpsProxy", Label: "HTTPS Proxy", Type: "string"},
-			{ID: "noProxy", Label: "No Proxy", Type: "string"},
-			{ID: "username", Label: "Username", Type: "string"},
-			{ID: "password", Label: "Password", Type: "string", Sensitive: true},
+			{ID: "enabled", Label: "Enable Proxy", Type: "boolean", HelpText: "Enable outbound proxy resolution for platform Docker operations."},
+			{ID: "httpConnectorId", Label: "HTTP Proxy Connector", Type: "relation", HelpText: "Connector used for HTTP proxy traffic."},
+			{ID: "httpsConnectorId", Label: "HTTPS Proxy Connector", Type: "relation", HelpText: "Connector used for HTTPS proxy traffic."},
 		},
 	},
 	{
-		ID:      "docker-mirror",
-		Title:   "Docker Mirrors",
-			Description: "Speed up AppOS image pulls. Does not change server Docker settings.",
-		Section: SectionWorkspace,
-		Source:  SourceCustom,
-		Module:  "docker",
-		Key:     "mirror",
+		ID:          "docker-mirror",
+		Title:       "Docker Mirrors",
+		Description: "Speed up AppOS image pulls. Does not change server Docker settings.",
+		Section:     SectionWorkspace,
+		Source:      SourceCustom,
+		Module:      "docker",
+		Key:         "mirror",
 		Fields: []FieldSchema{
-				{ID: "mirrors", Label: "Pull Sources", Type: "string-list"},
-				{ID: "allowInsecureRegistries", Label: "Allow Insecure Registries", Type: "boolean"},
+			{ID: "mirrors", Label: "Pull Sources", Type: "string-list"},
+			{ID: "allowInsecureRegistries", Label: "Allow Insecure Registries", Type: "boolean"},
 		},
 	},
 	{
@@ -331,7 +329,7 @@ var customSettingDefaults = map[string]map[string]any{
 		"disallowedFolderNames": []string{},
 	},
 	"proxy/network": {
-		"httpProxy": "", "httpsProxy": "", "noProxy": "", "username": "", "password": "",
+		"enabled": false, "httpConnectorId": "", "httpsConnectorId": "",
 	},
 	"docker/mirror": {
 		"mirrors": []any{}, "allowInsecureRegistries": false,
@@ -454,4 +452,4 @@ func cloneMap(input map[string]any) map[string]any {
 		return map[string]any{}
 	}
 	return out
-}
+}

backend/domain/monitor/local_services.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"sync"
 	"strings"
 	"time"
 
@@ -24,10 +25,39 @@ type LocalServiceObservation struct {
 	LogAvailable   bool
 }
 
-func ObserveLocalServices(registry *swcatalog.LocalRegistry) []LocalServiceObservation {
+var localServiceProcessInfoFn = func() ([]supervisor.ProcessInfo, error) {
 	client := supervisor.NewClient(supervisor.DefaultConfig())
-	processes, procErr := client.GetAllProcessInfo()
+	return client.GetAllProcessInfo()
+}
+
+var localServiceResourceFn = supervisor.GetProcessResources
+var localServiceMemoryFn = supervisor.GetProcessMemory
+var localServiceUptimeFn = supervisor.GetProcessUptime
+
+var localServiceObservationCache = struct {
+	mu         sync.Mutex
+	items      []LocalServiceObservation
+	initialized bool
+	refreshing bool
+}{}
+
+func ObserveLocalServices(registry *swcatalog.LocalRegistry) []LocalServiceObservation {
+	if items, ok := loadLocalServiceObservationSnapshot(); ok {
+		startLocalServiceObservationRefresh(registry)
+		return items
+	}
+
+	items := observeLocalServicesSnapshot(registry, false)
+	storeLocalServiceObservationSnapshot(items)
+	startLocalServiceObservationRefresh(registry)
+	return items
+}
+
+func observeLocalServicesSnapshot(registry *swcatalog.LocalRegistry, includeCPU bool) []LocalServiceObservation {
+	processes, procErr := localServiceProcessInfoFn()
 	resources := map[int]supervisor.ResourceInfo{}
+	memoryByPID := map[int]int64{}
+	uptimeByPID := map[int]int64{}
 	processMap := map[string]supervisor.ProcessInfo{}
 	if procErr == nil {
 		pids := make([]int, 0, len(processes))
@@ -37,7 +67,12 @@ func ObserveLocalServices(registry *swcatalog.LocalRegistry) []LocalServiceObser
 				pids = append(pids, process.PID)
 			}
 		}
-		resources = supervisor.GetProcessResources(pids)
+		if includeCPU {
+			resources = localServiceResourceFn(pids)
+		} else {
+			memoryByPID = localServiceMemoryFn(pids)
+		}
+		uptimeByPID = localServiceUptimeFn(pids)
 	}
 
 	now := time.Now().UTC().Format(time.RFC3339)
@@ -52,10 +87,14 @@ func ObserveLocalServices(registry *swcatalog.LocalRegistry) []LocalServiceObser
 		if ok {
 			state = strings.ToLower(process.StateName)
 			pid = process.PID
-			uptime = process.Uptime
+			if observedUptime, exists := uptimeByPID[process.PID]; exists {
+				uptime = observedUptime
+			}
 			if resource, exists := resources[process.PID]; exists {
 				cpu = resource.CPU
 				memory = resource.Memory
+			} else if fastMemory, exists := memoryByPID[process.PID]; exists {
+				memory = fastMemory
 			}
 		} else if procErr == nil {
 			state = "missing"
@@ -76,6 +115,50 @@ func ObserveLocalServices(registry *swcatalog.LocalRegistry) []LocalServiceObser
 	return items
 }
 
+func loadLocalServiceObservationSnapshot() ([]LocalServiceObservation, bool) {
+	localServiceObservationCache.mu.Lock()
+	defer localServiceObservationCache.mu.Unlock()
+	if !localServiceObservationCache.initialized {
+		return nil, false
+	}
+	return cloneLocalServiceObservations(localServiceObservationCache.items), true
+}
+
+func storeLocalServiceObservationSnapshot(items []LocalServiceObservation) {
+	localServiceObservationCache.mu.Lock()
+	localServiceObservationCache.items = cloneLocalServiceObservations(items)
+	localServiceObservationCache.initialized = true
+	localServiceObservationCache.mu.Unlock()
+}
+
+func startLocalServiceObservationRefresh(registry *swcatalog.LocalRegistry) {
+	localServiceObservationCache.mu.Lock()
+	if localServiceObservationCache.refreshing {
+		localServiceObservationCache.mu.Unlock()
+		return
+	}
+	localServiceObservationCache.refreshing = true
+	localServiceObservationCache.mu.Unlock()
+
+	go func() {
+		items := observeLocalServicesSnapshot(registry, true)
+		localServiceObservationCache.mu.Lock()
+		localServiceObservationCache.items = cloneLocalServiceObservations(items)
+		localServiceObservationCache.initialized = true
+		localServiceObservationCache.refreshing = false
+		localServiceObservationCache.mu.Unlock()
+	}()
+}
+
+func cloneLocalServiceObservations(items []LocalServiceObservation) []LocalServiceObservation {
+	if len(items) == 0 {
+		return []LocalServiceObservation{}
+	}
+	cloned := make([]LocalServiceObservation, len(items))
+	copy(cloned, items)
+	return cloned
+}
+
 func LoadLocalServiceLog(service swcatalog.LocalService, stream string, maxBytes int) (string, bool, error) {
 	switch service.LogAccess.Type {
 	case "supervisor":

backend/domain/monitor/local_services_test.go

@@ -0,0 +1,95 @@
+package monitor
+
+import (
+	"sync"
+	"testing"
+	"time"
+
+	swcatalog "github.com/websoft9/appos/backend/domain/software/catalog"
+	"github.com/websoft9/appos/backend/infra/supervisor"
+)
+
+func TestObserveLocalServicesReturnsFastSnapshotThenBackgroundCPU(t *testing.T) {
+	originalProcessInfoFn := localServiceProcessInfoFn
+	originalResourceFn := localServiceResourceFn
+	originalMemoryFn := localServiceMemoryFn
+	originalUptimeFn := localServiceUptimeFn
+	originalCache := localServiceObservationCache
+
+	localServiceObservationCache = struct {
+		mu          sync.Mutex
+		items       []LocalServiceObservation
+		initialized bool
+		refreshing  bool
+	}{}
+
+	t.Cleanup(func() {
+		localServiceProcessInfoFn = originalProcessInfoFn
+		localServiceResourceFn = originalResourceFn
+		localServiceMemoryFn = originalMemoryFn
+		localServiceUptimeFn = originalUptimeFn
+		localServiceObservationCache = originalCache
+	})
+
+	registry := &swcatalog.LocalRegistry{
+		Version: 1,
+		Components: []swcatalog.LocalComponent{
+			{ID: "appos", Name: "AppOS", Enabled: true},
+		},
+		Services: []swcatalog.LocalService{
+			{Name: "appos", ComponentID: "appos", Enabled: true, Lifecycle: "always_on", Visibility: "default"},
+		},
+	}
+
+	refreshed := make(chan struct{}, 1)
+	localServiceProcessInfoFn = func() ([]supervisor.ProcessInfo, error) {
+		return []supervisor.ProcessInfo{{Name: "appos", PID: 123, Uptime: 60, StateName: "RUNNING"}}, nil
+	}
+	localServiceMemoryFn = func([]int) map[int]int64 {
+		return map[int]int64{123: 1024}
+	}
+	localServiceUptimeFn = func([]int) map[int]int64 {
+		return map[int]int64{123: 60}
+	}
+	localServiceResourceFn = func([]int) map[int]supervisor.ResourceInfo {
+		select {
+		case refreshed <- struct{}{}:
+		default:
+		}
+		return map[int]supervisor.ResourceInfo{123: {PID: 123, CPU: 1.5, Memory: 2048}}
+	}
+
+	first := ObserveLocalServices(registry)
+	if len(first) != 1 {
+		t.Fatalf("expected 1 service, got %d", len(first))
+	}
+	if first[0].CPU != 0 {
+		t.Fatalf("expected fast snapshot CPU 0 before background refresh, got %v", first[0].CPU)
+	}
+	if first[0].Memory != 1024 {
+		t.Fatalf("expected fast snapshot memory 1024, got %d", first[0].Memory)
+	}
+	if first[0].Uptime != 60 {
+		t.Fatalf("expected fast snapshot uptime 60, got %d", first[0].Uptime)
+	}
+
+	select {
+	case <-refreshed:
+	case <-time.After(2 * time.Second):
+		t.Fatal("expected background CPU refresh to complete")
+	}
+
+	second := ObserveLocalServices(registry)
+	if len(second) != 1 {
+		t.Fatalf("expected 1 service after refresh, got %d", len(second))
+	}
+	if second[0].CPU != 1.5 {
+		t.Fatalf("expected cached CPU 1.5 after background refresh, got %v", second[0].CPU)
+	}
+	if second[0].Memory != 2048 {
+		t.Fatalf("expected refreshed memory 2048 after background refresh, got %d", second[0].Memory)
+	}
+	if second[0].Uptime != 60 {
+		t.Fatalf("expected cached uptime 60 after background refresh, got %d", second[0].Uptime)
+	}
+}

backend/domain/resource/connectors/compat_test.go

@@ -37,7 +37,7 @@ func TestResolveLLMTemplate(t *testing.T) {
 }
 
 func TestDeclaredConnectorKindsHaveTemplates(t *testing.T) {
-	declaredKinds := []string{KindRESTAPI, KindWebhook, KindMCP, KindSMTP, KindDNS, KindRegistry}
+	declaredKinds := []string{KindRESTAPI, KindWebhook, KindMCP, KindSMTP, KindDNS, KindRegistry, KindProxy}
 	for _, kind := range declaredKinds {
 		t.Run(kind, func(t *testing.T) {
 			templates := TemplatesByKind(kind)
@@ -56,6 +56,8 @@ func TestFindTemplateLoadsGenericNonLLMTemplates(t *testing.T) {
 		{id: "generic-smtp", kind: KindSMTP},
 		{id: "generic-dns", kind: KindDNS},
 		{id: "generic-registry", kind: KindRegistry},
+		{id: "http-proxy", kind: KindProxy},
+		{id: "socks5-proxy", kind: KindProxy},
 	}
 
 	for _, tc := range testCases {

backend/domain/resource/connectors/model.go

@@ -13,6 +13,7 @@ const (
 	KindSMTP     = "smtp"
 	KindDNS      = "dns"
 	KindRegistry = "registry"
+	KindProxy    = "proxy"
 )
 
 const (
@@ -27,6 +28,7 @@ var declaredKinds = []string{
 	KindSMTP,
 	KindDNS,
 	KindRegistry,
+	KindProxy,
 }
 
 func AllowedKinds() []string {