web: remove debounce logic

This reverts commit 168dfbfa74.

openapi.yaml

@@ -158,10 +158,10 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Error"
-  /maps/{MapID}/location:
+  /maps/{MapID}/download:
     get:
-      summary: Get location of asset
-      operationId: getMapAssetLocation
+      summary: Download the map asset
+      operationId: downloadMapAsset
       tags:
         - Maps
       parameters:
@@ -176,10 +176,10 @@ paths:
         "200":
           description: Successful response
           content:
-            text/plain:
+            application/octet-stream:
               schema:
                 type: string
-                maxLength: 1024
+                format: binary
         default:
           description: General Error
           content:

pkg/api/oas_client_gen.go

@@ -217,18 +217,18 @@ type Invoker interface {
 	//
 	// DELETE /script-policy/{ScriptPolicyID}
 	DeleteScriptPolicy(ctx context.Context, params DeleteScriptPolicyParams) error
+	// DownloadMapAsset invokes downloadMapAsset operation.
+	//
+	// Download the map asset.
+	//
+	// GET /maps/{MapID}/download
+	DownloadMapAsset(ctx context.Context, params DownloadMapAssetParams) (DownloadMapAssetOK, error)
 	// GetMap invokes getMap operation.
 	//
 	// Retrieve map with ID.
 	//
 	// GET /maps/{MapID}
 	GetMap(ctx context.Context, params GetMapParams) (*Map, error)
-	// GetMapAssetLocation invokes getMapAssetLocation operation.
-	//
-	// Get location of asset.
-	//
-	// GET /maps/{MapID}/location
-	GetMapAssetLocation(ctx context.Context, params GetMapAssetLocationParams) (GetMapAssetLocationOK, error)
 	// GetMapfix invokes getMapfix operation.
 	//
 	// Retrieve map with ID.
@@ -4182,6 +4182,130 @@ func (c *Client) sendDeleteScriptPolicy(ctx context.Context, params DeleteScript
 	return result, nil
 }
 
+// DownloadMapAsset invokes downloadMapAsset operation.
+//
+// Download the map asset.
+//
+// GET /maps/{MapID}/download
+func (c *Client) DownloadMapAsset(ctx context.Context, params DownloadMapAssetParams) (DownloadMapAssetOK, error) {
+	res, err := c.sendDownloadMapAsset(ctx, params)
+	return res, err
+}
+
+func (c *Client) sendDownloadMapAsset(ctx context.Context, params DownloadMapAssetParams) (res DownloadMapAssetOK, err error) {
+	otelAttrs := []attribute.KeyValue{
+		otelogen.OperationID("downloadMapAsset"),
+		semconv.HTTPRequestMethodKey.String("GET"),
+		semconv.HTTPRouteKey.String("/maps/{MapID}/download"),
+	}
+
+	// Run stopwatch.
+	startTime := time.Now()
+	defer func() {
+		// Use floating point division here for higher precision (instead of Millisecond method).
+		elapsedDuration := time.Since(startTime)
+		c.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), metric.WithAttributes(otelAttrs...))
+	}()
+
+	// Increment request counter.
+	c.requests.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+
+	// Start a span for this request.
+	ctx, span := c.cfg.Tracer.Start(ctx, DownloadMapAssetOperation,
+		trace.WithAttributes(otelAttrs...),
+		clientSpanKind,
+	)
+	// Track stage for error reporting.
+	var stage string
+	defer func() {
+		if err != nil {
+			span.RecordError(err)
+			span.SetStatus(codes.Error, stage)
+			c.errors.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+		}
+		span.End()
+	}()
+
+	stage = "BuildURL"
+	u := uri.Clone(c.requestURL(ctx))
+	var pathParts [3]string
+	pathParts[0] = "/maps/"
+	{
+		// Encode "MapID" parameter.
+		e := uri.NewPathEncoder(uri.PathEncoderConfig{
+			Param:   "MapID",
+			Style:   uri.PathStyleSimple,
+			Explode: false,
+		})
+		if err := func() error {
+			return e.EncodeValue(conv.Int64ToString(params.MapID))
+		}(); err != nil {
+			return res, errors.Wrap(err, "encode path")
+		}
+		encoded, err := e.Result()
+		if err != nil {
+			return res, errors.Wrap(err, "encode path")
+		}
+		pathParts[1] = encoded
+	}
+	pathParts[2] = "/download"
+	uri.AddPathParts(u, pathParts[:]...)
+
+	stage = "EncodeRequest"
+	r, err := ht.NewRequest(ctx, "GET", u)
+	if err != nil {
+		return res, errors.Wrap(err, "create request")
+	}
+
+	{
+		type bitset = [1]uint8
+		var satisfied bitset
+		{
+			stage = "Security:CookieAuth"
+			switch err := c.securityCookieAuth(ctx, DownloadMapAssetOperation, r); {
+			case err == nil: // if NO error
+				satisfied[0] |= 1 << 0
+			case errors.Is(err, ogenerrors.ErrSkipClientSecurity):
+				// Skip this security.
+			default:
+				return res, errors.Wrap(err, "security \"CookieAuth\"")
+			}
+		}
+
+		if ok := func() bool {
+		nextRequirement:
+			for _, requirement := range []bitset{
+				{0b00000001},
+			} {
+				for i, mask := range requirement {
+					if satisfied[i]&mask != mask {
+						continue nextRequirement
+					}
+				}
+				return true
+			}
+			return false
+		}(); !ok {
+			return res, ogenerrors.ErrSecurityRequirementIsNotSatisfied
+		}
+	}
+
+	stage = "SendRequest"
+	resp, err := c.cfg.Client.Do(r)
+	if err != nil {
+		return res, errors.Wrap(err, "do request")
+	}
+	defer resp.Body.Close()
+
+	stage = "DecodeResponse"
+	result, err := decodeDownloadMapAssetResponse(resp)
+	if err != nil {
+		return res, errors.Wrap(err, "decode response")
+	}
+
+	return result, nil
+}
+
 // GetMap invokes getMap operation.
 //
 // Retrieve map with ID.
@@ -4272,130 +4396,6 @@ func (c *Client) sendGetMap(ctx context.Context, params GetMapParams) (res *Map,
 	return result, nil
 }
 
-// GetMapAssetLocation invokes getMapAssetLocation operation.
-//
-// Get location of asset.
-//
-// GET /maps/{MapID}/location
-func (c *Client) GetMapAssetLocation(ctx context.Context, params GetMapAssetLocationParams) (GetMapAssetLocationOK, error) {
-	res, err := c.sendGetMapAssetLocation(ctx, params)
-	return res, err
-}
-
-func (c *Client) sendGetMapAssetLocation(ctx context.Context, params GetMapAssetLocationParams) (res GetMapAssetLocationOK, err error) {
-	otelAttrs := []attribute.KeyValue{
-		otelogen.OperationID("getMapAssetLocation"),
-		semconv.HTTPRequestMethodKey.String("GET"),
-		semconv.HTTPRouteKey.String("/maps/{MapID}/location"),
-	}
-
-	// Run stopwatch.
-	startTime := time.Now()
-	defer func() {
-		// Use floating point division here for higher precision (instead of Millisecond method).
-		elapsedDuration := time.Since(startTime)
-		c.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), metric.WithAttributes(otelAttrs...))
-	}()
-
-	// Increment request counter.
-	c.requests.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
-
-	// Start a span for this request.
-	ctx, span := c.cfg.Tracer.Start(ctx, GetMapAssetLocationOperation,
-		trace.WithAttributes(otelAttrs...),
-		clientSpanKind,
-	)
-	// Track stage for error reporting.
-	var stage string
-	defer func() {
-		if err != nil {
-			span.RecordError(err)
-			span.SetStatus(codes.Error, stage)
-			c.errors.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
-		}
-		span.End()
-	}()
-
-	stage = "BuildURL"
-	u := uri.Clone(c.requestURL(ctx))
-	var pathParts [3]string
-	pathParts[0] = "/maps/"
-	{
-		// Encode "MapID" parameter.
-		e := uri.NewPathEncoder(uri.PathEncoderConfig{
-			Param:   "MapID",
-			Style:   uri.PathStyleSimple,
-			Explode: false,
-		})
-		if err := func() error {
-			return e.EncodeValue(conv.Int64ToString(params.MapID))
-		}(); err != nil {
-			return res, errors.Wrap(err, "encode path")
-		}
-		encoded, err := e.Result()
-		if err != nil {
-			return res, errors.Wrap(err, "encode path")
-		}
-		pathParts[1] = encoded
-	}
-	pathParts[2] = "/location"
-	uri.AddPathParts(u, pathParts[:]...)
-
-	stage = "EncodeRequest"
-	r, err := ht.NewRequest(ctx, "GET", u)
-	if err != nil {
-		return res, errors.Wrap(err, "create request")
-	}
-
-	{
-		type bitset = [1]uint8
-		var satisfied bitset
-		{
-			stage = "Security:CookieAuth"
-			switch err := c.securityCookieAuth(ctx, GetMapAssetLocationOperation, r); {
-			case err == nil: // if NO error
-				satisfied[0] |= 1 << 0
-			case errors.Is(err, ogenerrors.ErrSkipClientSecurity):
-				// Skip this security.
-			default:
-				return res, errors.Wrap(err, "security \"CookieAuth\"")
-			}
-		}
-
-		if ok := func() bool {
-		nextRequirement:
-			for _, requirement := range []bitset{
-				{0b00000001},
-			} {
-				for i, mask := range requirement {
-					if satisfied[i]&mask != mask {
-						continue nextRequirement
-					}
-				}
-				return true
-			}
-			return false
-		}(); !ok {
-			return res, ogenerrors.ErrSecurityRequirementIsNotSatisfied
-		}
-	}
-
-	stage = "SendRequest"
-	resp, err := c.cfg.Client.Do(r)
-	if err != nil {
-		return res, errors.Wrap(err, "do request")
-	}
-	defer resp.Body.Close()
-
-	stage = "DecodeResponse"
-	result, err := decodeGetMapAssetLocationResponse(resp)
-	if err != nil {
-		return res, errors.Wrap(err, "decode response")
-	}
-
-	return result, nil
-}
-
 // GetMapfix invokes getMapfix operation.
 //
 // Retrieve map with ID.

pkg/api/oas_handlers_gen.go

@@ -6107,6 +6107,201 @@ func (s *Server) handleDeleteScriptPolicyRequest(args [1]string, argsEscaped boo
 	}
 }
 
+// handleDownloadMapAssetRequest handles downloadMapAsset operation.
+//
+// Download the map asset.
+//
+// GET /maps/{MapID}/download
+func (s *Server) handleDownloadMapAssetRequest(args [1]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
+	statusWriter := &codeRecorder{ResponseWriter: w}
+	w = statusWriter
+	otelAttrs := []attribute.KeyValue{
+		otelogen.OperationID("downloadMapAsset"),
+		semconv.HTTPRequestMethodKey.String("GET"),
+		semconv.HTTPRouteKey.String("/maps/{MapID}/download"),
+	}
+
+	// Start a span for this request.
+	ctx, span := s.cfg.Tracer.Start(r.Context(), DownloadMapAssetOperation,
+		trace.WithAttributes(otelAttrs...),
+		serverSpanKind,
+	)
+	defer span.End()
+
+	// Add Labeler to context.
+	labeler := &Labeler{attrs: otelAttrs}
+	ctx = contextWithLabeler(ctx, labeler)
+
+	// Run stopwatch.
+	startTime := time.Now()
+	defer func() {
+		elapsedDuration := time.Since(startTime)
+
+		attrSet := labeler.AttributeSet()
+		attrs := attrSet.ToSlice()
+		code := statusWriter.status
+		if code != 0 {
+			codeAttr := semconv.HTTPResponseStatusCode(code)
+			attrs = append(attrs, codeAttr)
+			span.SetAttributes(codeAttr)
+		}
+		attrOpt := metric.WithAttributes(attrs...)
+
+		// Increment request counter.
+		s.requests.Add(ctx, 1, attrOpt)
+
+		// Use floating point division here for higher precision (instead of Millisecond method).
+		s.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), attrOpt)
+	}()
+
+	var (
+		recordError = func(stage string, err error) {
+			span.RecordError(err)
+
+			// https://opentelemetry.io/docs/specs/semconv/http/http-spans/#status
+			// Span Status MUST be left unset if HTTP status code was in the 1xx, 2xx or 3xx ranges,
+			// unless there was another error (e.g., network error receiving the response body; or 3xx codes with
+			// max redirects exceeded), in which case status MUST be set to Error.
+			code := statusWriter.status
+			if code >= 100 && code < 500 {
+				span.SetStatus(codes.Error, stage)
+			}
+
+			attrSet := labeler.AttributeSet()
+			attrs := attrSet.ToSlice()
+			if code != 0 {
+				attrs = append(attrs, semconv.HTTPResponseStatusCode(code))
+			}
+
+			s.errors.Add(ctx, 1, metric.WithAttributes(attrs...))
+		}
+		err          error
+		opErrContext = ogenerrors.OperationContext{
+			Name: DownloadMapAssetOperation,
+			ID:   "downloadMapAsset",
+		}
+	)
+	{
+		type bitset = [1]uint8
+		var satisfied bitset
+		{
+			sctx, ok, err := s.securityCookieAuth(ctx, DownloadMapAssetOperation, r)
+			if err != nil {
+				err = &ogenerrors.SecurityError{
+					OperationContext: opErrContext,
+					Security:         "CookieAuth",
+					Err:              err,
+				}
+				if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
+					defer recordError("Security:CookieAuth", err)
+				}
+				return
+			}
+			if ok {
+				satisfied[0] |= 1 << 0
+				ctx = sctx
+			}
+		}
+
+		if ok := func() bool {
+		nextRequirement:
+			for _, requirement := range []bitset{
+				{0b00000001},
+			} {
+				for i, mask := range requirement {
+					if satisfied[i]&mask != mask {
+						continue nextRequirement
+					}
+				}
+				return true
+			}
+			return false
+		}(); !ok {
+			err = &ogenerrors.SecurityError{
+				OperationContext: opErrContext,
+				Err:              ogenerrors.ErrSecurityRequirementIsNotSatisfied,
+			}
+			if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
+				defer recordError("Security", err)
+			}
+			return
+		}
+	}
+	params, err := decodeDownloadMapAssetParams(args, argsEscaped, r)
+	if err != nil {
+		err = &ogenerrors.DecodeParamsError{
+			OperationContext: opErrContext,
+			Err:              err,
+		}
+		defer recordError("DecodeParams", err)
+		s.cfg.ErrorHandler(ctx, w, r, err)
+		return
+	}
+
+	var response DownloadMapAssetOK
+	if m := s.cfg.Middleware; m != nil {
+		mreq := middleware.Request{
+			Context:          ctx,
+			OperationName:    DownloadMapAssetOperation,
+			OperationSummary: "Download the map asset",
+			OperationID:      "downloadMapAsset",
+			Body:             nil,
+			Params: middleware.Parameters{
+				{
+					Name: "MapID",
+					In:   "path",
+				}: params.MapID,
+			},
+			Raw: r,
+		}
+
+		type (
+			Request  = struct{}
+			Params   = DownloadMapAssetParams
+			Response = DownloadMapAssetOK
+		)
+		response, err = middleware.HookMiddleware[
+			Request,
+			Params,
+			Response,
+		](
+			m,
+			mreq,
+			unpackDownloadMapAssetParams,
+			func(ctx context.Context, request Request, params Params) (response Response, err error) {
+				response, err = s.h.DownloadMapAsset(ctx, params)
+				return response, err
+			},
+		)
+	} else {
+		response, err = s.h.DownloadMapAsset(ctx, params)
+	}
+	if err != nil {
+		if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
+			if err := encodeErrorResponse(errRes, w, span); err != nil {
+				defer recordError("Internal", err)
+			}
+			return
+		}
+		if errors.Is(err, ht.ErrNotImplemented) {
+			s.cfg.ErrorHandler(ctx, w, r, err)
+			return
+		}
+		if err := encodeErrorResponse(s.h.NewError(ctx, err), w, span); err != nil {
+			defer recordError("Internal", err)
+		}
+		return
+	}
+
+	if err := encodeDownloadMapAssetResponse(response, w, span); err != nil {
+		defer recordError("EncodeResponse", err)
+		if !errors.Is(err, ht.ErrInternalServerErrorResponse) {
+			s.cfg.ErrorHandler(ctx, w, r, err)
+		}
+		return
+	}
+}
+
 // handleGetMapRequest handles getMap operation.
 //
 // Retrieve map with ID.
@@ -6256,201 +6451,6 @@ func (s *Server) handleGetMapRequest(args [1]string, argsEscaped bool, w http.Re
 	}
 }
 
-// handleGetMapAssetLocationRequest handles getMapAssetLocation operation.
-//
-// Get location of asset.
-//
-// GET /maps/{MapID}/location
-func (s *Server) handleGetMapAssetLocationRequest(args [1]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
-	statusWriter := &codeRecorder{ResponseWriter: w}
-	w = statusWriter
-	otelAttrs := []attribute.KeyValue{
-		otelogen.OperationID("getMapAssetLocation"),
-		semconv.HTTPRequestMethodKey.String("GET"),
-		semconv.HTTPRouteKey.String("/maps/{MapID}/location"),
-	}
-
-	// Start a span for this request.
-	ctx, span := s.cfg.Tracer.Start(r.Context(), GetMapAssetLocationOperation,
-		trace.WithAttributes(otelAttrs...),
-		serverSpanKind,
-	)
-	defer span.End()
-
-	// Add Labeler to context.
-	labeler := &Labeler{attrs: otelAttrs}
-	ctx = contextWithLabeler(ctx, labeler)
-
-	// Run stopwatch.
-	startTime := time.Now()
-	defer func() {
-		elapsedDuration := time.Since(startTime)
-
-		attrSet := labeler.AttributeSet()
-		attrs := attrSet.ToSlice()
-		code := statusWriter.status
-		if code != 0 {
-			codeAttr := semconv.HTTPResponseStatusCode(code)
-			attrs = append(attrs, codeAttr)
-			span.SetAttributes(codeAttr)
-		}
-		attrOpt := metric.WithAttributes(attrs...)
-
-		// Increment request counter.
-		s.requests.Add(ctx, 1, attrOpt)
-
-		// Use floating point division here for higher precision (instead of Millisecond method).
-		s.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), attrOpt)
-	}()
-
-	var (
-		recordError = func(stage string, err error) {
-			span.RecordError(err)
-
-			// https://opentelemetry.io/docs/specs/semconv/http/http-spans/#status
-			// Span Status MUST be left unset if HTTP status code was in the 1xx, 2xx or 3xx ranges,
-			// unless there was another error (e.g., network error receiving the response body; or 3xx codes with
-			// max redirects exceeded), in which case status MUST be set to Error.
-			code := statusWriter.status
-			if code >= 100 && code < 500 {
-				span.SetStatus(codes.Error, stage)
-			}
-
-			attrSet := labeler.AttributeSet()
-			attrs := attrSet.ToSlice()
-			if code != 0 {
-				attrs = append(attrs, semconv.HTTPResponseStatusCode(code))
-			}
-
-			s.errors.Add(ctx, 1, metric.WithAttributes(attrs...))
-		}
-		err          error
-		opErrContext = ogenerrors.OperationContext{
-			Name: GetMapAssetLocationOperation,
-			ID:   "getMapAssetLocation",
-		}
-	)
-	{
-		type bitset = [1]uint8
-		var satisfied bitset
-		{
-			sctx, ok, err := s.securityCookieAuth(ctx, GetMapAssetLocationOperation, r)
-			if err != nil {
-				err = &ogenerrors.SecurityError{
-					OperationContext: opErrContext,
-					Security:         "CookieAuth",
-					Err:              err,
-				}
-				if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
-					defer recordError("Security:CookieAuth", err)
-				}
-				return
-			}
-			if ok {
-				satisfied[0] |= 1 << 0
-				ctx = sctx
-			}
-		}
-
-		if ok := func() bool {
-		nextRequirement:
-			for _, requirement := range []bitset{
-				{0b00000001},
-			} {
-				for i, mask := range requirement {
-					if satisfied[i]&mask != mask {
-						continue nextRequirement
-					}
-				}
-				return true
-			}
-			return false
-		}(); !ok {
-			err = &ogenerrors.SecurityError{
-				OperationContext: opErrContext,
-				Err:              ogenerrors.ErrSecurityRequirementIsNotSatisfied,
-			}
-			if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
-				defer recordError("Security", err)
-			}
-			return
-		}
-	}
-	params, err := decodeGetMapAssetLocationParams(args, argsEscaped, r)
-	if err != nil {
-		err = &ogenerrors.DecodeParamsError{
-			OperationContext: opErrContext,
-			Err:              err,
-		}
-		defer recordError("DecodeParams", err)
-		s.cfg.ErrorHandler(ctx, w, r, err)
-		return
-	}
-
-	var response GetMapAssetLocationOK
-	if m := s.cfg.Middleware; m != nil {
-		mreq := middleware.Request{
-			Context:          ctx,
-			OperationName:    GetMapAssetLocationOperation,
-			OperationSummary: "Get location of asset",
-			OperationID:      "getMapAssetLocation",
-			Body:             nil,
-			Params: middleware.Parameters{
-				{
-					Name: "MapID",
-					In:   "path",
-				}: params.MapID,
-			},
-			Raw: r,
-		}
-
-		type (
-			Request  = struct{}
-			Params   = GetMapAssetLocationParams
-			Response = GetMapAssetLocationOK
-		)
-		response, err = middleware.HookMiddleware[
-			Request,
-			Params,
-			Response,
-		](
-			m,
-			mreq,
-			unpackGetMapAssetLocationParams,
-			func(ctx context.Context, request Request, params Params) (response Response, err error) {
-				response, err = s.h.GetMapAssetLocation(ctx, params)
-				return response, err
-			},
-		)
-	} else {
-		response, err = s.h.GetMapAssetLocation(ctx, params)
-	}
-	if err != nil {
-		if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
-			if err := encodeErrorResponse(errRes, w, span); err != nil {
-				defer recordError("Internal", err)
-			}
-			return
-		}
-		if errors.Is(err, ht.ErrNotImplemented) {
-			s.cfg.ErrorHandler(ctx, w, r, err)
-			return
-		}
-		if err := encodeErrorResponse(s.h.NewError(ctx, err), w, span); err != nil {
-			defer recordError("Internal", err)
-		}
-		return
-	}
-
-	if err := encodeGetMapAssetLocationResponse(response, w, span); err != nil {
-		defer recordError("EncodeResponse", err)
-		if !errors.Is(err, ht.ErrInternalServerErrorResponse) {
-			s.cfg.ErrorHandler(ctx, w, r, err)
-		}
-		return
-	}
-}
-
 // handleGetMapfixRequest handles getMapfix operation.
 //
 // Retrieve map with ID.

pkg/api/oas_operations_gen.go

@@ -37,8 +37,8 @@ const (
 	CreateSubmissionAuditCommentOperation           OperationName = "CreateSubmissionAuditComment"
 	DeleteScriptOperation                           OperationName = "DeleteScript"
 	DeleteScriptPolicyOperation                     OperationName = "DeleteScriptPolicy"
+	DownloadMapAssetOperation                       OperationName = "DownloadMapAsset"
 	GetMapOperation                                 OperationName = "GetMap"
-	GetMapAssetLocationOperation                    OperationName = "GetMapAssetLocation"
 	GetMapfixOperation                              OperationName = "GetMapfix"
 	GetOperationOperation                           OperationName = "GetOperation"
 	GetScriptOperation                              OperationName = "GetScript"

pkg/api/oas_parameters_gen.go

@@ -2173,13 +2173,12 @@ func decodeDeleteScriptPolicyParams(args [1]string, argsEscaped bool, r *http.Re
 	return params, nil
 }
 
-// GetMapParams is parameters of getMap operation.
-type GetMapParams struct {
-	// The unique identifier for a map.
+// DownloadMapAssetParams is parameters of downloadMapAsset operation.
+type DownloadMapAssetParams struct {
 	MapID int64
 }
 
-func unpackGetMapParams(packed middleware.Parameters) (params GetMapParams) {
+func unpackDownloadMapAssetParams(packed middleware.Parameters) (params DownloadMapAssetParams) {
 	{
 		key := middleware.ParameterKey{
 			Name: "MapID",
@@ -2190,7 +2189,7 @@ func unpackGetMapParams(packed middleware.Parameters) (params GetMapParams) {
 	return params
 }
 
-func decodeGetMapParams(args [1]string, argsEscaped bool, r *http.Request) (params GetMapParams, _ error) {
+func decodeDownloadMapAssetParams(args [1]string, argsEscaped bool, r *http.Request) (params DownloadMapAssetParams, _ error) {
 	// Decode path: MapID.
 	if err := func() error {
 		param := args[0]
@@ -2256,12 +2255,13 @@ func decodeGetMapParams(args [1]string, argsEscaped bool, r *http.Request) (para
 	return params, nil
 }
 
-// GetMapAssetLocationParams is parameters of getMapAssetLocation operation.
-type GetMapAssetLocationParams struct {
+// GetMapParams is parameters of getMap operation.
+type GetMapParams struct {
+	// The unique identifier for a map.
 	MapID int64
 }
 
-func unpackGetMapAssetLocationParams(packed middleware.Parameters) (params GetMapAssetLocationParams) {
+func unpackGetMapParams(packed middleware.Parameters) (params GetMapParams) {
 	{
 		key := middleware.ParameterKey{
 			Name: "MapID",
@@ -2272,7 +2272,7 @@ func unpackGetMapAssetLocationParams(packed middleware.Parameters) (params GetMa
 	return params
 }
 
-func decodeGetMapAssetLocationParams(args [1]string, argsEscaped bool, r *http.Request) (params GetMapAssetLocationParams, _ error) {
+func decodeGetMapParams(args [1]string, argsEscaped bool, r *http.Request) (params GetMapParams, _ error) {
 	// Decode path: MapID.
 	if err := func() error {
 		param := args[0]

pkg/api/oas_response_decoders_gen.go

@@ -2081,7 +2081,7 @@ func decodeDeleteScriptPolicyResponse(resp *http.Response) (res *DeleteScriptPol
 	return res, errors.Wrap(defRes, "error")
 }
 
-func decodeGetMapResponse(resp *http.Response) (res *Map, _ error) {
+func decodeDownloadMapAssetResponse(resp *http.Response) (res DownloadMapAssetOK, _ error) {
 	switch resp.StatusCode {
 	case 200:
 		// Code 200.
@@ -2090,40 +2090,15 @@ func decodeGetMapResponse(resp *http.Response) (res *Map, _ error) {
 			return res, errors.Wrap(err, "parse media type")
 		}
 		switch {
-		case ct == "application/json":
-			buf, err := io.ReadAll(resp.Body)
+		case ct == "application/octet-stream":
+			reader := resp.Body
+			b, err := io.ReadAll(reader)
 			if err != nil {
 				return res, err
 			}
-			d := jx.DecodeBytes(buf)
 
-			var response Map
-			if err := func() error {
-				if err := response.Decode(d); err != nil {
-					return err
-				}
-				if err := d.Skip(); err != io.EOF {
-					return errors.New("unexpected trailing data")
-				}
-				return nil
-			}(); err != nil {
-				err = &ogenerrors.DecodeBodyError{
-					ContentType: ct,
-					Body:        buf,
-					Err:         err,
-				}
-				return res, err
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			return &response, nil
+			response := DownloadMapAssetOK{Data: bytes.NewReader(b)}
+			return response, nil
 		default:
 			return res, validate.InvalidContentType(ct)
 		}
@@ -2182,7 +2157,7 @@ func decodeGetMapResponse(resp *http.Response) (res *Map, _ error) {
 	return res, errors.Wrap(defRes, "error")
 }
 
-func decodeGetMapAssetLocationResponse(resp *http.Response) (res GetMapAssetLocationOK, _ error) {
+func decodeGetMapResponse(resp *http.Response) (res *Map, _ error) {
 	switch resp.StatusCode {
 	case 200:
 		// Code 200.
@@ -2191,15 +2166,40 @@ func decodeGetMapAssetLocationResponse(resp *http.Response) (res GetMapAssetLoca
 			return res, errors.Wrap(err, "parse media type")
 		}
 		switch {
-		case ct == "text/plain":
-			reader := resp.Body
-			b, err := io.ReadAll(reader)
+		case ct == "application/json":
+			buf, err := io.ReadAll(resp.Body)
 			if err != nil {
 				return res, err
 			}
+			d := jx.DecodeBytes(buf)
 
-			response := GetMapAssetLocationOK{Data: bytes.NewReader(b)}
-			return response, nil
+			var response Map
+			if err := func() error {
+				if err := response.Decode(d); err != nil {
+					return err
+				}
+				if err := d.Skip(); err != io.EOF {
+					return errors.New("unexpected trailing data")
+				}
+				return nil
+			}(); err != nil {
+				err = &ogenerrors.DecodeBodyError{
+					ContentType: ct,
+					Body:        buf,
+					Err:         err,
+				}
+				return res, err
+			}
+			// Validate response.
+			if err := func() error {
+				if err := response.Validate(); err != nil {
+					return err
+				}
+				return nil
+			}(); err != nil {
+				return res, errors.Wrap(err, "validate")
+			}
+			return &response, nil
 		default:
 			return res, validate.InvalidContentType(ct)
 		}

pkg/api/oas_response_encoders_gen.go

@@ -266,22 +266,8 @@ func encodeDeleteScriptPolicyResponse(response *DeleteScriptPolicyNoContent, w h
 	return nil
 }
 
-func encodeGetMapResponse(response *Map, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeGetMapAssetLocationResponse(response GetMapAssetLocationOK, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+func encodeDownloadMapAssetResponse(response DownloadMapAssetOK, w http.ResponseWriter, span trace.Span) error {
+	w.Header().Set("Content-Type", "application/octet-stream")
 	w.WriteHeader(200)
 	span.SetStatus(codes.Ok, http.StatusText(200))
 
@@ -296,6 +282,20 @@ func encodeGetMapAssetLocationResponse(response GetMapAssetLocationOK, w http.Re
 	return nil
 }
 
+func encodeGetMapResponse(response *Map, w http.ResponseWriter, span trace.Span) error {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	w.WriteHeader(200)
+	span.SetStatus(codes.Ok, http.StatusText(200))
+
+	e := new(jx.Encoder)
+	response.Encode(e)
+	if _, err := e.WriteTo(w); err != nil {
+		return errors.Wrap(err, "write")
+	}
+
+	return nil
+}
+
 func encodeGetMapfixResponse(response *Mapfix, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(200)

pkg/api/oas_router_gen.go

@@ -592,9 +592,9 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 							return
 						}
 						switch elem[0] {
-						case '/': // Prefix: "/location"
+						case '/': // Prefix: "/download"
 
-							if l := len("/location"); len(elem) >= l && elem[0:l] == "/location" {
+							if l := len("/download"); len(elem) >= l && elem[0:l] == "/download" {
 								elem = elem[l:]
 							} else {
 								break
@@ -604,7 +604,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 								// Leaf node.
 								switch r.Method {
 								case "GET":
-									s.handleGetMapAssetLocationRequest([1]string{
+									s.handleDownloadMapAssetRequest([1]string{
 										args[0],
 									}, elemIsEscaped, w, r)
 								default:
@@ -2060,9 +2060,9 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) {
 							}
 						}
 						switch elem[0] {
-						case '/': // Prefix: "/location"
+						case '/': // Prefix: "/download"
 
-							if l := len("/location"); len(elem) >= l && elem[0:l] == "/location" {
+							if l := len("/download"); len(elem) >= l && elem[0:l] == "/download" {
 								elem = elem[l:]
 							} else {
 								break
@@ -2072,10 +2072,10 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) {
 								// Leaf node.
 								switch method {
 								case "GET":
-									r.name = GetMapAssetLocationOperation
-									r.summary = "Get location of asset"
-									r.operationID = "getMapAssetLocation"
-									r.pathPattern = "/maps/{MapID}/location"
+									r.name = DownloadMapAssetOperation
+									r.summary = "Download the map asset"
+									r.operationID = "downloadMapAsset"
+									r.pathPattern = "/maps/{MapID}/download"
 									r.args = args
 									r.count = 1
 									return r, true

pkg/api/oas_schemas_gen.go

@@ -251,6 +251,20 @@ type DeleteScriptNoContent struct{}
 // DeleteScriptPolicyNoContent is response for DeleteScriptPolicy operation.
 type DeleteScriptPolicyNoContent struct{}
 
+type DownloadMapAssetOK struct {
+	Data io.Reader
+}
+
+// Read reads data from the Data reader.
+//
+// Kept to satisfy the io.Reader interface.
+func (s DownloadMapAssetOK) Read(p []byte) (n int, err error) {
+	if s.Data == nil {
+		return 0, io.EOF
+	}
+	return s.Data.Read(p)
+}
+
 // Represents error object.
 // Ref: #/components/schemas/Error
 type Error struct {
@@ -304,20 +318,6 @@ func (s *ErrorStatusCode) SetResponse(val Error) {
 	s.Response = val
 }
 
-type GetMapAssetLocationOK struct {
-	Data io.Reader
-}
-
-// Read reads data from the Data reader.
-//
-// Kept to satisfy the io.Reader interface.
-func (s GetMapAssetLocationOK) Read(p []byte) (n int, err error) {
-	if s.Data == nil {
-		return 0, io.EOF
-	}
-	return s.Data.Read(p)
-}
-
 // Ref: #/components/schemas/Map
 type Map struct {
 	ID          int64  `json:"ID"`

pkg/api/oas_security_gen.go

@@ -65,7 +65,7 @@ var operationRolesCookieAuth = map[string][]string{
 	CreateSubmissionAuditCommentOperation:           []string{},
 	DeleteScriptOperation:                           []string{},
 	DeleteScriptPolicyOperation:                     []string{},
-	GetMapAssetLocationOperation:                    []string{},
+	DownloadMapAssetOperation:                       []string{},
 	GetOperationOperation:                           []string{},
 	ReleaseSubmissionsOperation:                     []string{},
 	SessionRolesOperation:                           []string{},

pkg/api/oas_server_gen.go

@@ -196,18 +196,18 @@ type Handler interface {
 	//
 	// DELETE /script-policy/{ScriptPolicyID}
 	DeleteScriptPolicy(ctx context.Context, params DeleteScriptPolicyParams) error
+	// DownloadMapAsset implements downloadMapAsset operation.
+	//
+	// Download the map asset.
+	//
+	// GET /maps/{MapID}/download
+	DownloadMapAsset(ctx context.Context, params DownloadMapAssetParams) (DownloadMapAssetOK, error)
 	// GetMap implements getMap operation.
 	//
 	// Retrieve map with ID.
 	//
 	// GET /maps/{MapID}
 	GetMap(ctx context.Context, params GetMapParams) (*Map, error)
-	// GetMapAssetLocation implements getMapAssetLocation operation.
-	//
-	// Get location of asset.
-	//
-	// GET /maps/{MapID}/location
-	GetMapAssetLocation(ctx context.Context, params GetMapAssetLocationParams) (GetMapAssetLocationOK, error)
 	// GetMapfix implements getMapfix operation.
 	//
 	// Retrieve map with ID.

pkg/api/oas_unimplemented_gen.go

@@ -294,6 +294,15 @@ func (UnimplementedHandler) DeleteScriptPolicy(ctx context.Context, params Delet
 	return ht.ErrNotImplemented
 }
 
+// DownloadMapAsset implements downloadMapAsset operation.
+//
+// Download the map asset.
+//
+// GET /maps/{MapID}/download
+func (UnimplementedHandler) DownloadMapAsset(ctx context.Context, params DownloadMapAssetParams) (r DownloadMapAssetOK, _ error) {
+	return r, ht.ErrNotImplemented
+}
+
 // GetMap implements getMap operation.
 //
 // Retrieve map with ID.
@@ -303,15 +312,6 @@ func (UnimplementedHandler) GetMap(ctx context.Context, params GetMapParams) (r
 	return r, ht.ErrNotImplemented
 }
 
-// GetMapAssetLocation implements getMapAssetLocation operation.
-//
-// Get location of asset.
-//
-// GET /maps/{MapID}/location
-func (UnimplementedHandler) GetMapAssetLocation(ctx context.Context, params GetMapAssetLocationParams) (r GetMapAssetLocationOK, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
 // GetMapfix implements getMapfix operation.
 //
 // Retrieve map with ID.

pkg/roblox/asset_location.go

@@ -50,7 +50,7 @@ func (c *Client) GetAssetLocation(config GetAssetLatestRequest) (*AssetLocationI
 
 	resp, err := c.HttpClient.Do(req)
 	if err != nil {
-		return nil, GetError("ReqwestError: " + err.Error())
+		return nil, GetError("RequestError: " + err.Error())
 	}
 	defer resp.Body.Close()
 
@@ -70,3 +70,21 @@ func (c *Client) GetAssetLocation(config GetAssetLatestRequest) (*AssetLocationI
 
 	return &info, nil
 }
+
+func (c *Client) DownloadAsset(info *AssetLocationInfo) (io.Reader, error) {
+	req, err := http.NewRequest("GET", info.Location, nil)
+	if err != nil {
+		return nil, GetError("RequestCreationError: " + err.Error())
+	}
+
+	resp, err := c.HttpClient.Do(req)
+	if err != nil {
+		return nil, GetError("ReqwestError: " + err.Error())
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, GetError(fmt.Sprintf("ResponseError: status code %d", resp.StatusCode))
+	}
+
+	return resp.Body, nil
+}

pkg/service/maps.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"strings"
 
 	"git.itzana.me/strafesnet/go-grpc/maps"
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
@@ -74,12 +73,12 @@ func (svc *Service) GetMap(ctx context.Context, params api.GetMapParams) (*api.M
 	}, nil
 }
 
-// GetMapAssetLocation invokes getMapAssetLocation operation.
+// DownloadMapAsset invokes downloadMapAsset operation.
 //
-// Get location of map asset.
+// Download the map asset
 //
-// GET /maps/{MapID}/location
-func (svc *Service) GetMapAssetLocation(ctx context.Context, params api.GetMapAssetLocationParams) (ok api.GetMapAssetLocationOK, err error) {
+// GET /maps/{MapID}/download
+func (svc *Service) DownloadMapAsset(ctx context.Context, params api.DownloadMapAssetParams) (ok api.DownloadMapAssetOK, err error) {
 	userInfo, success := ctx.Value("UserInfo").(UserInfoHandle)
 	if !success {
 		return ok, ErrUserInfo
@@ -110,6 +109,9 @@ func (svc *Service) GetMapAssetLocation(ctx context.Context, params api.GetMapAs
 		return ok, err
 	}
 
-	ok.Data = strings.NewReader(info.Location)
+	// download the complete file
+	asset, err := svc.Roblox.DownloadAsset(info)
+
+	ok.Data = asset
 	return ok, nil
 }

web/src/app/maps/[mapId]/page.tsx

@@ -45,7 +45,6 @@ export default function MapDetails() {
   const [error, setError] = useState<string | null>(null);
   const [copySuccess, setCopySuccess] = useState(false);
   const [roles, setRoles] = useState(RolesConstants.Empty);
-  const [downloading, setDownloading] = useState(false);
   const [mapfixes, setMapfixes] = useState<MapfixInfo[]>([]);
 
   useTitle(map ? `${map.DisplayName}` : 'Loading Map...');
@@ -159,28 +158,6 @@ export default function MapDetails() {
     setCopySuccess(true);
   };
 
-
-  const handleDownload = async () => {
-    setDownloading(true);
-    try {
-      // Fetch the download URL
-      const res = await fetch(`/api/maps/${mapId}/location`);
-      if (!res.ok) throw new Error('Failed to fetch download location');
-
-      const location = await res.text();
-
-      // open in new window
-      window.open(location.trim(), '_blank');
-
-    } catch (err) {
-      console.error('Download error:', err);
-      // Optional: Show user-friendly error message
-      alert('Download failed. Please try again.');
-    } finally {
-      setDownloading(false);
-    }
-  };
-
   const handleCloseSnackbar = () => {
     setCopySuccess(false);
   };
@@ -318,12 +295,13 @@ export default function MapDetails() {
                             <Typography variant="body1">
                               Download
                             </Typography>
-                            <Tooltip title="File extension must be changed to .rbxm manually">
+                            <Tooltip title="Download .rbxm">
                               <IconButton
                                 size="small"
-                                onClick={handleDownload}
+                                component="a"
+                                href={`/api/maps/${mapId}/download`}
+                                download={`${map?.DisplayName}.rbxm`}
                                 sx={{ ml: 1 }}
-                                disabled={downloading}
                               >
                                 <DownloadIcon fontSize="small" />
                               </IconButton>