admin343/browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AI config approval flow

Browse Source
This commit is contained in:
npc0-hue
2026-09-22 15:33:32 +08:00
parent 20008b4043
commit a8b5d483a3
54 changed files with 364 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/api/log_events_handlers.go
+69 -21
View File
@@ -25,7 +25,8 @@ func (h *coreHandlers) serverLogEvents(w http.ResponseWriter, r *http.Request) {
writeMethodNotAllowed(w, http.MethodGet)
return
}
instance, streams, subscription, err := h.openLogEventSubscription(r)
jobID := strings.TrimSpace(r.URL.Query().Get("jobId"))
instance, streams, subscription, err := h.openLogEventSubscription(r, jobID)
if err != nil {
writeServiceError(w, err)
return
@@ -45,7 +46,9 @@ func (h *coreHandlers) serverLogEvents(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
active := supervisedLogSession{}
if isComponentLogRequest(r) {
if jobID != "" {
active = activeJobLogSession(jobID, streams)
} else if isComponentLogRequest(r) {
active = activeComponentLogSession(streams)
} else {
active = activeSupervisedLogSession(streams)
@@ -72,6 +75,9 @@ func (h *coreHandlers) serverLogEvents(w http.ResponseWriter, r *http.Request) {
return
}
if subscriptionEvent.Kind == service.LogEventSubscriptionEventProcessState {
if jobID != "" {
continue
}
if isComponentLogRequest(r) {
continue
}
@@ -90,7 +96,7 @@ func (h *coreHandlers) serverLogEvents(w http.ResponseWriter, r *http.Request) {
flusher.Flush()
continue
}
streams, err = h.loadLiveLogSnapshot(instance.ID, isComponentLogRequest(r))
streams, err = h.loadLiveLogSnapshot(instance.ID, isComponentLogRequest(r), jobID)
if err != nil {
return
}
@@ -111,10 +117,16 @@ func (h *coreHandlers) serverLogEvents(w http.ResponseWriter, r *http.Request) {
}
event := subscriptionEvent.LogEvent
candidate := activeSupervisedLogSession([]domain.LogStream{event.Stream})
if jobID != "" {
if !strings.HasPrefix(event.Stream.ID, "job."+jobID+".") {
continue
}
candidate = activeJobLogSession(jobID, []domain.LogStream{event.Stream})
}
if active.allStreams {
candidate = supervisedLogSession{}
}
if candidate.sessionID != "" && newerLogSession(candidate, active) {
if jobID == "" && candidate.sessionID != "" && newerLogSession(candidate, active) {
next := candidate
if !sameSupervisedLogSession(active, next) {
active = next
@@ -129,7 +141,11 @@ func (h *coreHandlers) serverLogEvents(w http.ResponseWriter, r *http.Request) {
}
}
if !active.contains(event.Stream) {
if !active.allStreams || event.Stream.ServerInstanceID != instance.ID {
if jobID == "" {
if !active.allStreams || event.Stream.ServerInstanceID != instance.ID {
continue
}
} else if !strings.HasPrefix(event.Stream.ID, "job."+jobID+".") {
continue
}
active.streams = append(active.streams, event.Stream)
@@ -161,6 +177,7 @@ func (h *coreHandlers) serverLogEvents(w http.ResponseWriter, r *http.Request) {
}
type supervisedLogSession struct {
jobID string
sessionID string
startedAt time.Time
streams []domain.LogStream
@@ -193,6 +210,11 @@ func activeSupervisedLogSession(streams []domain.LogStream) supervisedLogSession
return active
}
func activeJobLogSession(jobID string, streams []domain.LogStream) supervisedLogSession {
active := supervisedLogSession{jobID: jobID, sessionID: "job:" + jobID, streams: append([]domain.LogStream(nil), streams...)}
return active
}
func newerLogSession(candidate supervisedLogSession, current supervisedLogSession) bool {
if candidate.sessionID == "" || candidate.sessionID == current.sessionID {
return false
@@ -207,10 +229,13 @@ func newerLogSession(candidate supervisedLogSession, current supervisedLogSessio
}
func sameSupervisedLogSession(left supervisedLogSession, right supervisedLogSession) bool {
return left.sessionID == right.sessionID && left.startedAt.Equal(right.startedAt)
return left.jobID == right.jobID && left.sessionID == right.sessionID && left.startedAt.Equal(right.startedAt)
}
func (session supervisedLogSession) contains(stream domain.LogStream) bool {
if session.jobID != "" {
return strings.HasPrefix(stream.ID, "job."+session.jobID+".") && session.hasStream(stream.ID)
}
if session.allStreams {
return session.hasStream(stream.ID)
}
@@ -240,7 +265,7 @@ func (h *coreHandlers) writeCurrentLogSession(w http.ResponseWriter, serverInsta
return emittedThrough, nil
}
func (h *coreHandlers) openLogEventSubscription(r *http.Request) (domain.ServerInstance, []domain.LogStream, service.LogEventSubscription, error) {
func (h *coreHandlers) openLogEventSubscription(r *http.Request, jobID string) (domain.ServerInstance, []domain.LogStream, service.LogEventSubscription, error) {
var instance domain.ServerInstance
var streams []domain.LogStream
var subscription service.LogEventSubscription
@@ -270,8 +295,23 @@ func (h *coreHandlers) openLogEventSubscription(r *http.Request) (domain.ServerI
return domain.ServerInstance{}, nil, subscription, err
}
}
if err == nil && jobID != "" {
if h.enforceAuthorization && isComponentLogRequest(r) {
err = fmt.Errorf("job log streams require session authorization")
} else {
var job domain.Job
if h.enforceAuthorization {
job, err = h.core.GetJobForSession(bearerToken(r), jobID)
} else {
job, err = h.core.GetJob(jobID)
}
if err == nil && job.ServerInstanceID != instance.ID {
err = service.ErrForbidden
}
}
}
if err == nil {
streams, err = h.loadLiveLogSnapshot(instance.ID, isComponentLogRequest(r))
streams, err = h.loadLiveLogSnapshot(instance.ID, isComponentLogRequest(r), jobID)
}
if err != nil && subscription.Close != nil {
subscription.Close()
@@ -288,23 +328,25 @@ func isComponentLogRequest(r *http.Request) bool {
return ok
}
func (h *coreHandlers) loadLiveLogSnapshot(serverInstanceID string, includeDeclaredStreams bool) ([]domain.LogStream, error) {
func (h *coreHandlers) loadLiveLogSnapshot(serverInstanceID string, includeDeclaredStreams bool, jobID string) ([]domain.LogStream, error) {
instance, err := h.core.GetServerInstance(serverInstanceID)
if err != nil {
return nil, err
}
if strings.TrimSpace(instance.RunEndpointID) == "" {
return nil, nil
}
if !includeDeclaredStreams && instance.State != domain.ServerInstanceStateRunning {
return nil, nil
}
endpoint, err := h.core.GetRunEndpoint(instance.RunEndpointID)
if err != nil {
return nil, err
}
if endpoint.Status != domain.RunEndpointStatusOnline {
return nil, nil
if jobID == "" {
if strings.TrimSpace(instance.RunEndpointID) == "" {
return nil, nil
}
if !includeDeclaredStreams && instance.State != domain.ServerInstanceStateRunning {
return nil, nil
}
endpoint, err := h.core.GetRunEndpoint(instance.RunEndpointID)
if err != nil {
return nil, err
}
if endpoint.Status != domain.RunEndpointStatusOnline {
return nil, nil
}
}
streams, err := h.core.ListLogStreams(domain.LogStreamFilter{ServerInstanceID: instance.ID})
if err != nil {
@@ -312,6 +354,12 @@ func (h *coreHandlers) loadLiveLogSnapshot(serverInstanceID string, includeDecla
}
current := make([]domain.LogStream, 0, len(streams))
for _, stream := range streams {
if jobID != "" {
if strings.HasPrefix(stream.ID, "job."+jobID+".") {
current = append(current, stream)
}
continue
}
if includeDeclaredStreams {
if stream.Source != domain.LogStreamSourceProcess && stream.Source != domain.LogStreamSourceFile && stream.Source != domain.LogStreamSourceManagementProgram {
continue