Merge pull request #6 from dAppCore/dev

chore: promote dev to main — api v0.13.0 (Mantis #1217, audit COMPLIANT)

Author: Snider

go/brotli.go

@@ -126,7 +126,7 @@ func (b *brotliWriter) Write(data []byte) (
 	b.Header().Del("Content-Length")
 
 	if !b.statusWritten {
-			b.status = b.Status()
+		b.status = b.Status()
 	}
 
 	if b.status >= http.StatusBadRequest {
@@ -172,7 +172,7 @@ func (b *brotliWriter) WriteHeaderNow() {
 	}
 
 	if !b.statusWritten {
-			b.status = b.Status()
+		b.status = b.Status()
 		b.statusWritten = true
 	}
 	b.Header().Del("Content-Length")
@@ -210,15 +210,15 @@ func (b *brotliWriter) release(pool *sync.Pool) {
 		b.Header().Del("Content-Encoding")
 		b.Header().Del("Vary")
 		b.writer.Reset(io.Discard)
-		} else if b.Size() < 0 {
+	} else if b.Size() < 0 {
 		b.writer.Reset(io.Discard)
 	}
 	if err := b.writer.Close(); err != nil {
 		b.Header().Del("Content-Length")
 	}
-		if b.Size() > -1 {
-			b.Header().Set("Content-Length", core.Sprintf("%d", b.Size()))
-		}
+	if b.Size() > -1 {
+		b.Header().Set("Content-Length", core.Sprintf("%d", b.Size()))
+	}
 	b.writer.Reset(io.Discard)
 	pool.Put(b.writer)
 	b.writer = nil

go/chat_completions.go

@@ -833,9 +833,9 @@ func (h *chatCompletionsHandler) serveStreaming(c *gin.Context, model inference.
 				},
 			},
 		}
-	encoded := core.JSONMarshalString(primingChunk)
-	_, _ = c.Writer.WriteString(core.Sprintf("data: %s\n\n", encoded))
-	c.Writer.Flush()
+		encoded := core.JSONMarshalString(primingChunk)
+		_, _ = c.Writer.WriteString(core.Sprintf("data: %s\n\n", encoded))
+		c.Writer.Flush()
 
 		streamStarted = true
 	}
@@ -880,9 +880,9 @@ func (h *chatCompletionsHandler) serveStreaming(c *gin.Context, model inference.
 			chunk.Thought = &t
 		}
 
-	encoded := core.JSONMarshalString(chunk)
-	_, _ = c.Writer.WriteString(core.Sprintf("data: %s\n\n", encoded))
-	c.Writer.Flush()
+		encoded := core.JSONMarshalString(chunk)
+		_, _ = c.Writer.WriteString(core.Sprintf("data: %s\n\n", encoded))
+		c.Writer.Flush()
 		if stopHit {
 			emittedContent = candidateContent[:stopCut]
 		} else {

go/client.go

@@ -362,7 +362,9 @@ func (c *OpenAPIClient) Call(operationID string, params any) (
 		return nil, err
 	}
 	defer func() {
-		_ = resp.Body.Close()
+		if closeErr := resp.Body.Close(); closeErr != nil {
+			core.Error("openapi response body close failed", "err", closeErr)
+		}
 	}()
 
 	payload, err := io.ReadAll(resp.Body)

go/cmd/gateway/main.go

@@ -82,7 +82,9 @@ func run(args []string, stdout io.Writer, stderr io.Writer) int {
 	logger := slog.New(slog.NewTextHandler(stderr, nil))
 	c := core.New()
 	defer func() {
-		_ = c.ServiceShutdown(context.Background())
+		if r := c.ServiceShutdown(context.Background()); !r.OK {
+			logger.Error("gateway core shutdown failed", "err", r.Error())
+		}
 	}()
 
 	bind := core.Trim(core.Getenv(envGatewayBind))
@@ -351,7 +353,9 @@ func displayBasePath(path string) string {
 func forwardSignalsToCore(c *core.Core, logger *slog.Logger) func() {
 	return func() {
 		if c != nil {
-			_ = c.ServiceShutdown(context.Background())
+			if r := c.ServiceShutdown(context.Background()); !r.OK && logger != nil {
+				logger.Error("gateway signal shutdown failed", "err", r.Error())
+			}
 		}
 		if logger != nil {
 			logger.Debug("gateway signal bridge stopped")

go/entitlements.go

@@ -102,7 +102,9 @@ func (b *EntitlementBridge) Check(ctx context.Context, workspaceID, feature stri
 		return false, core.E(op, "call entitlement service", err)
 	}
 	defer func() {
-		_ = resp.Body.Close()
+		if closeErr := resp.Body.Close(); closeErr != nil {
+			core.Error("entitlement response body close failed", "err", closeErr)
+		}
 	}()
 
 	data, err := io.ReadAll(io.LimitReader(resp.Body, maxEntitlementResponseBytes))

go/transport_client.go

@@ -241,7 +241,9 @@ func (c *SSEClient) Connect(ctx context.Context) (
 	}
 	if resp.StatusCode != http.StatusOK {
 		defer func() {
-			_ = resp.Body.Close()
+			if closeErr := resp.Body.Close(); closeErr != nil {
+				core.Error("sse response body close failed", "err", closeErr)
+			}
 		}()
 		return nil, coreerr.E("", core.Sprintf("unexpected SSE status %d", resp.StatusCode), nil)
 	}
@@ -269,7 +271,9 @@ func (c *SSEClient) Events(ctx context.Context) (
 	go func() {
 		defer close(out)
 		defer func() {
-			_ = resp.Body.Close()
+			if closeErr := resp.Body.Close(); closeErr != nil {
+				core.Error("sse stream body close failed", "err", closeErr)
+			}
 		}()
 		parseSSEStream(ctx, resp.Body, out)
 	}()