Merge branch 'master' into classic-protocol

Author: catfromplan9

api.go

@@ -50,13 +50,15 @@ func (app *App) HandleAPIError(err error, c *echo.Context) error {
 		}
 
 		if code == http.StatusNotFound {
-			path_ := (*c).Request().URL.Path
-			if version, ok := IsDeprecatedAPIPath(path_).Get(); ok {
-				switch version {
-				case 1:
-					message = "Version 1 of this API was deprecated in release 3.0.0."
-				default:
-					message = fmt.Sprintf("Version %d of this API is deprecated.", version)
+			baseRelative, err := app.BaseRelativePath((*c).Request().URL.Path)
+			if err == nil {
+				if version, ok := IsDeprecatedAPIPath(baseRelative).Get(); ok {
+					switch version {
+					case 1:
+						message = "Version 1 of this API was deprecated in release 3.0.0."
+					default:
+						message = fmt.Sprintf("Version %d of this API is deprecated.", version)
+					}
 				}
 			}
 		}
@@ -78,25 +80,12 @@ func (app *App) HandleAPIError(err error, c *echo.Context) error {
 	return (*c).JSON(code, APIError{Message: message})
 }
 
-func IsAPIPath(path_ string) bool {
-	if path_ == "/" {
-		return false
-	}
-
-	split := strings.Split(path_, "/")
-	if len(split) >= 3 && split[1] == "drasl" && split[2] == "api" {
-		return true
-	}
-
-	return false
-}
-
-func IsDeprecatedAPIPath(path_ string) mo.Option[int] {
-	if path_ == "/" {
+func IsDeprecatedAPIPath(baseRelative string) mo.Option[int] {
+	if baseRelative == "/" {
 		return mo.None[int]()
 	}
 
-	split := strings.Split(path_, "/")
+	split := strings.Split(baseRelative, "/")
 	if len(split) >= 3 && split[1] == "drasl" && split[2] == "api" {
 		re := regexp.MustCompile(`v(\d+)`)
 		match := re.FindStringSubmatch(split[3])

build_config.go

@@ -2,7 +2,7 @@ package main
 
 // Build constants
 
-const VERSION = "3.4.1"
+const VERSION = "3.4.2"
 
 const REPOSITORY_URL = "https://github.com/unmojang/drasl"
 const SWAGGER_UI_URL = "https://doc.drasl.unmojang.org"

common.go

@@ -270,13 +270,13 @@ const (
 	PathTypeAPI
 )
 
-func GetPathType(path_ string) PathType {
-	if path_ == "/" {
+func (app *App) GetPathType(baseRelative string) PathType {
+	if app.Config.EnableWebFrontEnd && baseRelative == "" {
 		return PathTypeWeb
 	}
 
-	split := strings.Split(path_, "/")
-	if len(split) >= 2 && split[1] == "web" {
+	split := strings.Split(baseRelative, "/")
+	if app.Config.EnableWebFrontEnd && len(split) >= 2 && split[1] == "web" {
 		return PathTypeWeb
 	}
 	if len(split) >= 3 && split[1] == "drasl" && split[2] == "api" {
@@ -1057,4 +1057,10 @@ func (app *App) RunPeriodicTasks() {
 			app.cleanupHeartbeatLRU()
 		}
 	}()
+func (app *App) BaseRelativePath(path_ string) (string, error) {
+	if !strings.HasPrefix(path_, app.BasePath) {
+		return "", fmt.Errorf("path %s is not under base path %s", path_, app.BasePath)
+	}
+	baseRelative := strings.TrimPrefix(path_, app.BasePath)
+	return strings.TrimSuffix(baseRelative, "/"), nil
 }

flake.nix

@@ -131,7 +131,7 @@
         {
           options.services.drasl = {
             enable = mkEnableOption (lib.mdDoc ''drasl'');
-            package = mkPackageOption { drasl = self.defaultPackage.${pkgs.system}; } "drasl" { };
+            package = mkPackageOption { drasl = self.defaultPackage.${pkgs.stdenv.hostPlatform.system}; } "drasl" { };
             settings = mkOption {
               type = format.type;
               default = { };