zizi-al/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unblock the merged Muse relay path by separating helper names

Browse Source 
The local merge brought Task 4 and Task 6 helpers into the same middleware package, and both introduced a generic firstNonBlank helper. Renaming the Muse-specific helper keeps the merged branch buildable without changing behavior.

Constraint: This fix is on top of the local merge to home and must avoid altering the request-context logic itself
Rejected: Rolling back the Muse relay context feature | merge target should stay functional after the requested local merge
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Keep package-local helper names specific enough to survive future feature merges
Tested: go test ./service ./middleware ./relay/common ./controller -count=1
Not-tested: Live relay request after the local merge
This commit is contained in:
zizi 2026-04-16 22:14:05 +08:00
parent e8642f4bba
commit 0f90d2b725
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
middleware/muse_request_context.go
View File

@ -26,24 +26,24 @@ func MuseRequestContext() gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
metadata := extractMuseMetadata(c) metadata := extractMuseMetadata(c)
museUserID := firstNonBlank( museUserID := museFirstNonBlank(
c.GetHeader(museHeaderUserID), c.GetHeader(museHeaderUserID),
stringifyMetadata(metadata["muse_user_id"]), stringifyMetadata(metadata["muse_user_id"]),
) )
museWorkID := firstNonBlank( museWorkID := museFirstNonBlank(
c.GetHeader(museHeaderWorkID), c.GetHeader(museHeaderWorkID),
stringifyMetadata(metadata["work_id"]), stringifyMetadata(metadata["work_id"]),
stringifyMetadata(metadata["muse_work_id"]), stringifyMetadata(metadata["muse_work_id"]),
) )
museScene := firstNonBlank( museScene := museFirstNonBlank(
c.GetHeader(museHeaderScene), c.GetHeader(museHeaderScene),
stringifyMetadata(metadata["scene"]), stringifyMetadata(metadata["scene"]),
) )
requestID := firstNonBlank( requestID := museFirstNonBlank(
c.GetHeader(museHeaderRequest), c.GetHeader(museHeaderRequest),
stringifyMetadata(metadata["request_id"]), stringifyMetadata(metadata["request_id"]),
) )
traceID := firstNonBlank( traceID := museFirstNonBlank(
c.GetHeader(museHeaderTraceID), c.GetHeader(museHeaderTraceID),
stringifyMetadata(metadata["trace_id"]), stringifyMetadata(metadata["trace_id"]),
) )
@ -92,7 +92,7 @@ func needsMuseMetadataRead(c *gin.Context) bool {
c.GetHeader(museHeaderScene) == "" c.GetHeader(museHeaderScene) == ""
} }
func firstNonBlank(values ...string) string { func museFirstNonBlank(values ...string) string {
for _, value := range values { for _, value := range values {
if strings.TrimSpace(value) != "" { if strings.TrimSpace(value) != "" {
return strings.TrimSpace(value) return strings.TrimSpace(value)