chore: remove unused extra files from goreleaser configuration

.gitea/workflows/release-tag.yaml

@@ -1,4 +1,4 @@
-name: Release Tag
+name: Release
 on:
   push:
     tags:
@@ -6,16 +6,17 @@ on:
 
 jobs:
   release:
+    name: Build versioned release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@main
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - run: git fetch --force --tags
-      - uses: actions/setup-go@main
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
-      - uses: goreleaser/goreleaser-action@master
+      - uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
           version: 'latest'

.gitea/workflows/test-pr.yaml

@@ -1,4 +1,4 @@
-name: PR Check
+name: CI
 on:
   - pull_request
 
@@ -6,10 +6,14 @@ jobs:
   check-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@main
+      - uses: actions/checkout@v4
-      - uses: actions/setup-go@main
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - run: go mod tidy  
+      - uses: golangci/golangci-lint-action@v3
+        with:
+          args: -D errcheck
+          version: latest
       - run: go build ./...
       - run: go test -race -v -shuffle=on ./...

.gitignore

@@ -1,5 +1,2 @@
-dist/
 tmp/
-*.exe
+__*.exe
-.smashed.txt
-.smashignore

.goreleaser.yaml

@@ -2,42 +2,29 @@ version: 2
 
 before:
   hooks:
-    - go mod tidy -v
+    - go mod tidy
 
 builds:
-  - id: default
+- env:
-    binary: steamcache2
-    ldflags:
-      - -s
-      - -w
-      - -extldflags "-static"
-      - -X s1d3sw1ped/SteamCache2/version.Version={{.Version}}
-      - -X s1d3sw1ped/SteamCache2/version.Date={{.Date}}
-    env:
   - CGO_ENABLED=0
   goos:
   - linux
   - windows
   goarch:
   - amd64
-      - arm64
-    ignore:
-      - goos: windows
-        goarch: arm64
-
-checksum:
-  name_template: "checksums.txt"
 
 archives:
-  - id: default
+  - format: tar.gz
-    name_template: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"
+    name_template: >- 
-    formats: tar.gz
+      {{ .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
     format_overrides:
       - goos: windows
-        formats: zip
+        format: zip
-    files:
-      - README.md
-      - LICENSE
 
 changelog:
   sort: asc
@@ -47,7 +34,11 @@ changelog:
       - "^test:"
 
 release:
-  name_template: "{{ .ProjectName }}-{{ .Version }}"
+  footer: >-
+
+    ---
+
+    Released by [GoReleaser](https://github.com/goreleaser/goreleaser).
 
 gitea_urls:
   api: https://git.s1d3sw1ped.com/api/v1

.vscode/launch.json

@@ -5,56 +5,15 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Memory & Disk",
+            "name": "Launch Package",
             "type": "go",
             "request": "launch",
             "mode": "auto",
             "program": "${workspaceFolder}/main.go",
             "args": [
-                "--memory",
+                "--memory", "1G",
-                "1G",
+                "--disk", "10G",
-                "--disk",
+                "--disk-path", "tmp/disk",
-                "10G",
-                "--disk-path",
-                "tmp/disk",
-                "--memory-gc",
-                "lfu",
-                "--disk-gc",
-                "lru",
-                "--log-level",
-                "debug",
-            ],
-        },
-        {
-            "name": "Launch Disk Only",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${workspaceFolder}/main.go",
-            "args": [
-                "--disk",
-                "10G",
-                "--disk-path",
-                "tmp/disk",
-                "--disk-gc",
-                "hybrid",
-                "--log-level",
-                "debug",
-            ],
-        },
-        {
-            "name": "Launch Memory Only",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${workspaceFolder}/main.go",
-            "args": [
-                "--memory",
-                "1G",
-                "--memory-gc",
-                "lfu",
-                "--log-level",
-                "debug",
             ],
         }
     ]

README.md

@@ -17,38 +17,6 @@ SteamCache2 is a blazing fast download cache for Steam, designed to reduce bandw
     ```sh
     ./SteamCache2 --memory 1G --disk 10G --disk-path tmp/disk
     ```
-
-### Advanced Configuration
-
-#### Garbage Collection Algorithms
-
-SteamCache2 supports multiple garbage collection algorithms for both memory and disk caches:
-
-```sh
-# Use LFU for memory cache (good for long-running servers)
-./SteamCache2 --memory 4G --memory-gc lfu --disk 100G --disk-gc lru
-
-# Use FIFO for predictable eviction (good for testing)
-./SteamCache2 --memory 2G --memory-gc fifo --disk 50G --disk-gc fifo
-
-# Use size-based eviction for disk cache
-./SteamCache2 --memory 1G --disk 200G --disk-gc largest
-```
-
-**Available GC Algorithms:**
-
-- **`lru`** (default): Least Recently Used - evicts oldest accessed files
-- **`lfu`**: Least Frequently Used - evicts least accessed files (good for popular content)
-- **`fifo`**: First In, First Out - evicts oldest created files (predictable)
-- **`largest`**: Size-based - evicts largest files first (maximizes file count)
-- **`smallest`**: Size-based - evicts smallest files first (maximizes cache hit rate)
-- **`hybrid`**: Combines access time and file size for optimal eviction
-
-**Use Cases:**
-- **LAN Events**: Use `lfu` for memory caches to keep popular games
-- **Gaming Cafes**: Use `hybrid` for balanced performance
-- **Testing**: Use `fifo` for predictable behavior
-- **Large Files**: Use `largest` to prioritize keeping many small files
 2. Configure your DNS:
     - If your on Windows and don't want a whole network implementation (THIS)[#windows-hosts-file-override]
 
@@ -87,8 +55,7 @@ This will direct any requests to `lancache.steamcontent.com` to your SteamCache2
 
 ## License
 
-See the [LICENSE](LICENSE) file for details.
+This project is licensed. See the [LICENSE](LICENSE) file for details.
-But just for clarity this covers all files in this project unless stated in the individual file.
 
 ## Acknowledgements
 

cmd/root.go

@@ -1,30 +1,39 @@
-// cmd/root.go
+/*
+Copyright © 2025 s1d3sw1ped
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
 package cmd
 
 import (
 	"os"
-	"runtime"
 	"s1d3sw1ped/SteamCache2/steamcache"
-	"s1d3sw1ped/SteamCache2/steamcache/logger"
-	"s1d3sw1ped/SteamCache2/version"
 
-	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
 )
 
 var (
-	threads int
-
 	memory           string
+	memorymultiplier int
 	disk             string
+	diskmultiplier   int
 	diskpath         string
-	upstream string
-
-	memoryGC string
-	diskGC   string
-
-	logLevel  string
-	logFormat string
 )
 
 var rootCmd = &cobra.Command{
@@ -36,54 +45,15 @@ var rootCmd = &cobra.Command{
 	By caching game files, SteamCache2 ensures that subsequent downloads of the same files are served from the local cache, 
 	significantly improving download times and reducing the load on the internet connection.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		// Configure logging
-		switch logLevel {
-		case "debug":
-			zerolog.SetGlobalLevel(zerolog.DebugLevel)
-		case "error":
-			zerolog.SetGlobalLevel(zerolog.ErrorLevel)
-		case "info":
-			zerolog.SetGlobalLevel(zerolog.InfoLevel)
-		default:
-			zerolog.SetGlobalLevel(zerolog.InfoLevel) // Default to info level if not specified
-		}
-		var writer zerolog.ConsoleWriter
-		if logFormat == "json" {
-			writer = zerolog.ConsoleWriter{Out: os.Stderr, NoColor: true}
-		} else {
-			writer = zerolog.ConsoleWriter{Out: os.Stderr}
-		}
-		logger.Logger = zerolog.New(writer).With().Timestamp().Logger()
-
-		logger.Logger.Info().
-			Msg("SteamCache2 " + version.Version + " " + version.Date + " starting...")
-
-		address := ":80"
-
-		if runtime.GOMAXPROCS(-1) != threads {
-			runtime.GOMAXPROCS(threads)
-			logger.Logger.Info().
-				Int("threads", threads).
-				Msg("Maximum number of threads set")
-		}
-
 		sc := steamcache.New(
-			address,
+			":80",
 			memory,
+			memorymultiplier,
 			disk,
+			diskmultiplier,
 			diskpath,
-			upstream,
-			memoryGC,
-			diskGC,
 		)
-
-		logger.Logger.Info().
-			Msg("SteamCache2 " + version.Version + " started on " + address)
-
 		sc.Run()
-
-		logger.Logger.Info().Msg("SteamCache2 stopped")
-		os.Exit(0)
 	},
 }
 
@@ -97,17 +67,9 @@ func Execute() {
 }
 
 func init() {
-	rootCmd.Flags().IntVarP(&threads, "threads", "t", runtime.GOMAXPROCS(-1), "Number of worker threads to use for processing requests")
+	rootCmd.Flags().StringVarP(&memory, "memory", "m", "100MB", "The size of the memory cache")
-
+	rootCmd.Flags().IntVarP(&memorymultiplier, "memory-multiplier", "M", 10, "The multiplier for the memory cache")
-	rootCmd.Flags().StringVarP(&memory, "memory", "m", "0", "The size of the memory cache")
+	rootCmd.Flags().StringVarP(&disk, "disk", "d", "10GB", "The size of the disk cache")
-	rootCmd.Flags().StringVarP(&disk, "disk", "d", "0", "The size of the disk cache")
+	rootCmd.Flags().IntVarP(&diskmultiplier, "disk-multiplier", "D", 10, "The multiplier for the disk cache")
-	rootCmd.Flags().StringVarP(&diskpath, "disk-path", "p", "", "The path to the disk cache")
+	rootCmd.Flags().StringVarP(&diskpath, "disk-path", "p", "tmp/steamcache2-disk", "The path to the disk cache")
-
-	rootCmd.Flags().StringVarP(&upstream, "upstream", "u", "", "The upstream server to proxy requests overrides the host header from the client but forwards the original host header to the upstream server")
-
-	rootCmd.Flags().StringVarP(&memoryGC, "memory-gc", "", "lru", "Memory cache GC algorithm: lru, lfu, fifo, largest, smallest, hybrid")
-	rootCmd.Flags().StringVarP(&diskGC, "disk-gc", "", "lru", "Disk cache GC algorithm: lru, lfu, fifo, largest, smallest, hybrid")
-
-	rootCmd.Flags().StringVarP(&logLevel, "log-level", "l", "info", "Logging level: debug, info, error")
-	rootCmd.Flags().StringVarP(&logFormat, "log-format", "f", "console", "Logging format: json, console")
 }

cmd/version.go

@@ -1,24 +0,0 @@
-// cmd/version.go
-package cmd
-
-import (
-	"fmt"
-	"os"
-	"s1d3sw1ped/SteamCache2/version"
-
-	"github.com/spf13/cobra"
-)
-
-// versionCmd represents the version command
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "prints the version of SteamCache2",
-	Long:  `Prints the version of SteamCache2. This command is useful for checking the version of the application.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Fprintln(os.Stderr, "SteamCache2", version.Version, version.Date)
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(versionCmd)
-}

go.mod

@@ -4,22 +4,15 @@ go 1.23.0
 
 require (
 	github.com/docker/go-units v0.5.0
-	github.com/prometheus/client_golang v1.22.0
 	github.com/rs/zerolog v1.33.0
 	github.com/spf13/cobra v1.8.1
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
 )
 
 require (
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
 )

go.sum

@@ -1,40 +1,16 @@
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
-github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
-github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
 github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
@@ -43,15 +19,11 @@ github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
 github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -1,10 +1,27 @@
-// main.go
+/*
+Copyright © 2025 s1d3sw1ped
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
 package main
 
-import (
+import "s1d3sw1ped/SteamCache2/cmd"
-	"s1d3sw1ped/SteamCache2/cmd"
-	_ "s1d3sw1ped/SteamCache2/version" // Import the version package for global version variable
-)
 
 func main() {
 	cmd.Execute()

steamcache/avgcachestate/avgcachestate.go

@@ -0,0 +1,60 @@
+package avgcachestate
+
+import (
+	"s1d3sw1ped/SteamCache2/vfs/cachestate"
+	"sync"
+)
+
+// AvgCacheState is a cache state that averages the last N cache states.
+type AvgCacheState struct {
+	size int
+	avgs []cachestate.CacheState
+	mu   sync.Mutex
+}
+
+// New creates a new average cache state with the given size.
+func New(size int) *AvgCacheState {
+	return &AvgCacheState{
+		size: size,
+		avgs: make([]cachestate.CacheState, size),
+		mu:   sync.Mutex{},
+	}
+}
+
+// Clear resets the average cache state to zero.
+func (a *AvgCacheState) Clear() {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+
+	a.avgs = make([]cachestate.CacheState, a.size) // zeroed
+}
+
+// Add adds a cache state to the average cache state.
+func (a *AvgCacheState) Add(cs cachestate.CacheState) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+
+	a.avgs = append(a.avgs, cs)
+	if len(a.avgs) > a.size {
+		a.avgs = a.avgs[1:]
+	}
+}
+
+// Avg returns the average cache state.
+func (a *AvgCacheState) Avg() float64 {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+
+	var hits, misses int
+	for _, cs := range a.avgs {
+		switch cs {
+		case cachestate.CacheStateHit:
+			hits++
+		case cachestate.CacheStateMiss:
+			misses++
+		}
+	}
+	total := hits + misses
+
+	return float64(hits) / float64(total)
+}

steamcache/gc.go

@@ -0,0 +1,75 @@
+package steamcache
+
+import (
+	"s1d3sw1ped/SteamCache2/steamcache/logger"
+	"s1d3sw1ped/SteamCache2/vfs"
+	"s1d3sw1ped/SteamCache2/vfs/cachestate"
+	"time"
+
+	"github.com/docker/go-units"
+	"golang.org/x/exp/rand"
+)
+
+func randomgc(vfss vfs.VFS, stats []*vfs.FileInfo) int64 {
+	// Pick a random file to delete
+	randfile := stats[rand.Intn(len(stats))]
+	sz := randfile.Size()
+	err := vfss.Delete(randfile.Name())
+	if err != nil {
+		// If we failed to delete the file, log it and return 0
+		// logger.Logger.Error().Err(err).Msgf("Failed to delete %s", randfile.Name())
+		return 0
+	}
+
+	return sz
+}
+
+func memorygc(vfss vfs.VFS, size int) {
+	tstart := time.Now()
+	deletions := 0
+	targetreclaim := int64(size)
+	var reclaimed int64
+
+	stats := vfss.StatAll()
+	for {
+		reclaimed += randomgc(vfss, stats)
+		deletions++
+		if reclaimed >= targetreclaim {
+			break
+		}
+	}
+
+	logger.Logger.Info().
+		Str("name", vfss.Name()).
+		Str("duration", time.Since(tstart).String()).
+		Str("reclaimed", units.HumanSize(float64(reclaimed))).
+		Int("deletions", deletions).
+		Msgf("GC")
+}
+
+func diskgc(vfss vfs.VFS, size int) {
+	tstart := time.Now()
+	deletions := 0
+	targetreclaim := int64(size)
+	var reclaimed int64
+
+	stats := vfss.StatAll()
+	for {
+		reclaimed += randomgc(vfss, stats)
+		deletions++
+		if reclaimed >= targetreclaim {
+			break
+		}
+	}
+
+	logger.Logger.Info().
+		Str("name", vfss.Name()).
+		Str("duration", time.Since(tstart).String()).
+		Str("reclaimed", units.HumanSize(float64(reclaimed))).
+		Int("deletions", deletions).
+		Msgf("GC")
+}
+
+func cachehandler(fi *vfs.FileInfo, cs cachestate.CacheState) bool {
+	return time.Since(fi.AccessTime()) < time.Minute*10 // Put files in the cache if they've been accessed twice in the last 10 minutes
+}

steamcache/logger/logger.go

@@ -1,8 +1,9 @@
-// steamcache/logger/logger.go
 package logger
 
 import (
+	"os"
+
 	"github.com/rs/zerolog"
 )
 
-var Logger zerolog.Logger
+var Logger = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).With().Timestamp().Logger()

steamcache/steamcache.go

@@ -1,170 +1,41 @@
-// steamcache/steamcache.go
 package steamcache
 
 import (
-	"context"
-	"crypto/sha1"
-	"encoding/hex"
 	"fmt"
 	"io"
-	"net"
 	"net/http"
 	"net/url"
 	"os"
-	"path/filepath"
+	"s1d3sw1ped/SteamCache2/steamcache/avgcachestate"
-	"regexp"
 	"s1d3sw1ped/SteamCache2/steamcache/logger"
 	"s1d3sw1ped/SteamCache2/vfs"
 	"s1d3sw1ped/SteamCache2/vfs/cache"
+	"s1d3sw1ped/SteamCache2/vfs/cachestate"
 	"s1d3sw1ped/SteamCache2/vfs/disk"
 	"s1d3sw1ped/SteamCache2/vfs/gc"
 	"s1d3sw1ped/SteamCache2/vfs/memory"
-	"sort"
+	syncfs "s1d3sw1ped/SteamCache2/vfs/sync"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/docker/go-units"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
-// min returns the minimum of two integers
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-var (
-	requestsTotal = promauto.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "http_requests_total",
-			Help: "Total number of HTTP requests",
-		},
-		[]string{"method", "status"},
-	)
-
-	cacheStatusTotal = promauto.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "cache_status_total",
-			Help: "Total cache status counts",
-		},
-		[]string{"status"},
-	)
-
-	responseTime = promauto.NewHistogramVec(
-		prometheus.HistogramOpts{
-			Name:    "response_time_seconds",
-			Help:    "Response time in seconds",
-			Buckets: prometheus.DefBuckets,
-		},
-		[]string{"cache_status"},
-	)
-)
-
-// hashVerificationTotal tracks hash verification attempts
-var hashVerificationTotal = promauto.NewCounterVec(
-	prometheus.CounterOpts{
-		Name: "hash_verification_total",
-		Help: "Total hash verification attempts",
-	},
-	[]string{"result"},
-)
-
-// extractHashFromFilename extracts a hash from a filename if present
-// Steam depot files often have hashes in their names like: filename_hash.ext
-func extractHashFromFilename(filename string) (string, bool) {
-	// Common patterns for Steam depot files with hashes
-	patterns := []*regexp.Regexp{
-		regexp.MustCompile(`^([a-fA-F0-9]{40})$`),  // Standalone SHA1 hash (40 hex chars)
-		regexp.MustCompile(`^([a-fA-F0-9]{40})\.`), // SHA1 hash with extension
-	}
-
-	for _, pattern := range patterns {
-		if matches := pattern.FindStringSubmatch(filename); len(matches) > 1 {
-			return strings.ToLower(matches[1]), true
-		}
-	}
-
-	// Debug: log when we don't find a hash pattern
-	if strings.Contains(filename, "manifest") {
-		logger.Logger.Debug().
-			Str("filename", filename).
-			Msg("No hash pattern found in manifest filename")
-	}
-
-	return "", false
-}
-
-// calculateFileHash calculates the SHA1 hash of the given data
-func calculateFileHash(data []byte) string {
-	hash := sha1.Sum(data)
-	return hex.EncodeToString(hash[:])
-}
-
-// calculateResponseHash calculates the SHA1 hash of the full HTTP response
-func calculateResponseHash(resp *http.Response, bodyData []byte) string {
-	hash := sha1.New()
-
-	// Include status line
-	statusLine := fmt.Sprintf("HTTP/1.1 %d %s\n", resp.StatusCode, resp.Status)
-	hash.Write([]byte(statusLine))
-
-	// Include headers (sorted for consistency)
-	headers := make([]string, 0, len(resp.Header))
-	for key, values := range resp.Header {
-		for _, value := range values {
-			headers = append(headers, fmt.Sprintf("%s: %s\n", key, value))
-		}
-	}
-	sort.Strings(headers)
-	for _, header := range headers {
-		hash.Write([]byte(header))
-	}
-
-	// Include empty line between headers and body
-	hash.Write([]byte("\n"))
-
-	// Include body
-	hash.Write(bodyData)
-
-	return hex.EncodeToString(hash.Sum(nil))
-}
-
-// verifyFileHash verifies that the file content matches the expected hash
-func verifyFileHash(data []byte, expectedHash string) bool {
-	actualHash := calculateFileHash(data)
-	return strings.EqualFold(actualHash, expectedHash)
-}
-
-// verifyResponseHash verifies that the full HTTP response matches the expected hash
-func verifyResponseHash(resp *http.Response, bodyData []byte, expectedHash string) bool {
-	actualHash := calculateResponseHash(resp, bodyData)
-	return strings.EqualFold(actualHash, expectedHash)
-}
-
 type SteamCache struct {
 	address string
-	upstream string
-
 	vfs     vfs.VFS
 
 	memory *memory.MemoryFS
 	disk   *disk.DiskFS
 
-	memorygc *gc.GCFS
+	hits *avgcachestate.AvgCacheState
-	diskgc   *gc.GCFS
 
-	server *http.Server
+	dirty bool
-	client *http.Client
+	mu    sync.Mutex
-	cancel context.CancelFunc
-	wg     sync.WaitGroup
 }
 
-func New(address string, memorySize string, diskSize string, diskPath, upstream, memoryGC, diskGC string) *SteamCache {
+func New(address string, memorySize string, memoryMultiplier int, diskSize string, diskMultiplier int, diskPath string) *SteamCache {
 	memorysize, err := units.FromHumanSize(memorySize)
 	if err != nil {
 		panic(err)
@@ -175,151 +46,81 @@ func New(address string, memorySize string, diskSize string, diskPath, upstream,
 		panic(err)
 	}
 
-	c := cache.New(
+	m := memory.New(memorysize)
-		gc.AdaptivePromotionDeciderFunc,
+	d := disk.New(diskPath, disksize)
-	)
-
-	var m *memory.MemoryFS
-	var mgc *gc.GCFS
-	if memorysize > 0 {
-		m = memory.New(memorysize)
-		memoryGCAlgo := gc.GCAlgorithm(memoryGC)
-		if memoryGCAlgo == "" {
-			memoryGCAlgo = gc.LRU // default to LRU
-		}
-		mgc = gc.New(m, gc.GetGCAlgorithm(memoryGCAlgo))
-	}
-
-	var d *disk.DiskFS
-	var dgc *gc.GCFS
-	if disksize > 0 {
-		d = disk.New(diskPath, disksize)
-		diskGCAlgo := gc.GCAlgorithm(diskGC)
-		if diskGCAlgo == "" {
-			diskGCAlgo = gc.LRU // default to LRU
-		}
-		dgc = gc.New(d, gc.GetGCAlgorithm(diskGCAlgo))
-	}
-
-	// configure the cache to match the specified mode (memory only, disk only, or memory and disk) based on the provided sizes
-	if disksize == 0 && memorysize != 0 {
-		//memory only mode - no disk
-
-		c.SetSlow(mgc)
-	} else if disksize != 0 && memorysize == 0 {
-		// disk only mode
-
-		c.SetSlow(dgc)
-	} else if disksize != 0 && memorysize != 0 {
-		// memory and disk mode
-
-		c.SetFast(mgc)
-		c.SetSlow(dgc)
-	} else {
-		// no memory or disk isn't a valid configuration
-		logger.Logger.Error().Bool("memory", false).Bool("disk", false).Msg("configuration invalid :( exiting")
-		os.Exit(1)
-	}
-
-	transport := &http.Transport{
-		MaxIdleConns:        200,               // Increased from 100
-		MaxIdleConnsPerHost: 50,                // Increased from 10
-		IdleConnTimeout:     120 * time.Second, // Increased from 90s
-		DialContext: (&net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: 30 * time.Second,
-		}).DialContext,
-		TLSHandshakeTimeout:   15 * time.Second, // Increased from 10s
-		ResponseHeaderTimeout: 30 * time.Second, // Increased from 10s
-		ExpectContinueTimeout: 5 * time.Second,  // Increased from 1s
-		DisableCompression:    true,             // Steam doesn't use compression
-		ForceAttemptHTTP2:     true,             // Enable HTTP/2 if available
-	}
-
-	client := &http.Client{
-		Transport: transport,
-		Timeout:   60 * time.Second,
-	}
 
 	sc := &SteamCache{
-		upstream: upstream,
 		address: address,
-		vfs:      c,
+		vfs: syncfs.New(
+			cache.New(
+				gc.New(
+					m,
+					memoryMultiplier,
+					memorygc,
+				),
+				gc.New(
+					d,
+					diskMultiplier,
+					diskgc,
+				),
+				cachehandler,
+			),
+		),
+
 		memory: m,
 		disk:   d,
-		memorygc: mgc,
+
-		diskgc:   dgc,
+		hits: avgcachestate.New(10000),
-		client:   client,
-		server: &http.Server{
-			Addr:         address,
-			ReadTimeout:  5 * time.Second,
-			WriteTimeout: 10 * time.Second,
-			IdleTimeout:  120 * time.Second,
-		},
 	}
 
-	// Log GC algorithm configuration
-	if m != nil {
-		logger.Logger.Info().Str("memory_gc", memoryGC).Msg("Memory cache GC algorithm configured")
-	}
-	if d != nil {
-		logger.Logger.Info().Str("disk_gc", diskGC).Msg("Disk cache GC algorithm configured")
-	}
-
-	if d != nil {
 	if d.Size() > d.Capacity() {
-			gc.LRUGC(d, uint(d.Size()-d.Capacity()))
+		diskgc(d, int(d.Size()-d.Capacity()))
-		}
 	}
 
 	return sc
 }
 
 func (sc *SteamCache) Run() {
-	if sc.upstream != "" {
+	logger.Logger.Info().Str("address", sc.address).Msg("listening")
-		resp, err := sc.client.Get(sc.upstream)
-		if err != nil || resp.StatusCode != http.StatusOK {
-			logger.Logger.Error().Err(err).Str("upstream", sc.upstream).Msg("Failed to connect to upstream server")
-			os.Exit(1)
-		}
-		resp.Body.Close()
-	}
 
-	sc.server.Handler = sc
+	sc.mu.Lock()
-	ctx, cancel := context.WithCancel(context.Background())
+	sc.dirty = true
-	sc.cancel = cancel
+	sc.mu.Unlock()
 
-	sc.wg.Add(1)
+	sc.LogStats()
+	t := time.NewTicker(10 * time.Second)
 	go func() {
-		defer sc.wg.Done()
+		for range t.C {
-		err := sc.server.ListenAndServe()
+			sc.LogStats()
-		if err != nil && err != http.ErrServerClosed {
-			logger.Logger.Error().Err(err).Msg("Failed to start SteamCache2")
-			os.Exit(1)
 		}
 	}()
 
-	<-ctx.Done()
+	err := http.ListenAndServe(sc.address, sc)
-	sc.server.Shutdown(ctx)
+	if err != nil {
-	sc.wg.Wait()
+		if err == http.ErrServerClosed {
+			logger.Logger.Info().Msg("shutdown")
+			return
+		}
+		logger.Logger.Error().Err(err).Msg("Failed to start SteamCache2")
+		os.Exit(1)
+	}
 }
 
-func (sc *SteamCache) Shutdown() {
+func (sc *SteamCache) LogStats() {
-	if sc.cancel != nil {
+	sc.mu.Lock()
-		sc.cancel()
+	defer sc.mu.Unlock()
+	if sc.dirty {
+		logger.Logger.Info().
+			Str("memory", fmt.Sprintf("%s/%s", units.HumanSize(float64(sc.memory.Size())), units.HumanSize(float64(sc.memory.Capacity())))).Int("memory-files", len(sc.memory.StatAll())).
+			Str("disk", fmt.Sprintf("%s/%s", units.HumanSize(float64(sc.disk.Size())), units.HumanSize(float64(sc.disk.Capacity())))).Int("disk-files", len(sc.disk.StatAll())).
+			Str("hitrate", fmt.Sprintf("%.2f%%", sc.hits.Avg()*100)).
+			Msg("stats")
+		sc.dirty = false
 	}
-	sc.wg.Wait()
 }
 
 func (sc *SteamCache) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path == "/metrics" {
-		promhttp.Handler().ServeHTTP(w, r)
-		return
-	}
-
 	if r.Method != http.MethodGet {
-		requestsTotal.WithLabelValues(r.Method, "405").Inc()
-		logger.Logger.Warn().Str("method", r.Method).Msg("Only GET method is supported")
 		http.Error(w, "Only GET method is supported", http.StatusMethodNotAllowed)
 		return
 	}
@@ -331,210 +132,110 @@ func (sc *SteamCache) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if strings.HasPrefix(r.URL.String(), "/depot/") {
+	if r.Header.Get("User-Agent") != "Valve/Steam HTTP Client 1.0" {
-		// trim the query parameters from the URL path
+		http.Error(w, "Only Valve/Steam HTTP Client 1.0 is supported", http.StatusForbidden)
-		// this is necessary because the cache key should not include query parameters
-		path := strings.Split(r.URL.String(), "?")[0]
-
-		tstart := time.Now()
-
-		cacheKey := strings.ReplaceAll(path[1:], "\\", "/") // replace all backslashes with forward slashes shouldn't be necessary but just in case
-
-		if cacheKey == "" {
-			requestsTotal.WithLabelValues(r.Method, "400").Inc()
-			logger.Logger.Warn().Str("url", path).Msg("Invalid URL")
-			http.Error(w, "Invalid URL", http.StatusBadRequest)
 		return
 	}
 
+	if strings.Contains(r.URL.String(), "manifest") {
+		w.Header().Add("X-LanCache-Processed-By", "SteamCache2")
+		forward(w, r)
+		return
+	}
+
+	// tstart := time.Now()
+	// defer func() {
+	// logger.Logger.Info().Str("method", r.Method).Str("url", r.URL.String()).Str("status", w.Header().Get("X-LanCache-Status")).Dur("duration", time.Since(tstart)).Msg("Request")
+	// }()
+
+	sc.mu.Lock()
+	sc.dirty = true
+	sc.mu.Unlock()
+
 	w.Header().Add("X-LanCache-Processed-By", "SteamCache2") // SteamPrefill uses this header to determine if the request was processed by the cache maybe steam uses it too
 
-		reader, err := sc.vfs.Open(cacheKey)
+	cacheKey := r.URL.String()
+
+	// if vfs is also a vfs.GetSer, we can use it to get the cache state
+
+	data, err := sc.vfs.Get(cacheKey)
 	if err == nil {
-			defer reader.Close()
+		sc.hits.Add(cachestate.CacheStateHit)
 		w.Header().Add("X-LanCache-Status", "HIT")
-
+		w.Write(data)
-			io.Copy(w, reader)
-
-			logger.Logger.Info().
-				Str("key", cacheKey).
-				Str("host", r.Host).
-				Str("status", "HIT").
-				Dur("duration", time.Since(tstart)).
-				Msg("request")
-
-			requestsTotal.WithLabelValues(r.Method, "200").Inc()
-			cacheStatusTotal.WithLabelValues("HIT").Inc()
-			responseTime.WithLabelValues("HIT").Observe(time.Since(tstart).Seconds())
-
 		return
 	}
 
-		var req *http.Request
+	htt := "http://"
-		if sc.upstream != "" { // if an upstream server is configured, proxy the request to the upstream server
-			ur, err := url.JoinPath(sc.upstream, path)
-			if err != nil {
-				requestsTotal.WithLabelValues(r.Method, "500").Inc()
-				logger.Logger.Error().Err(err).Str("upstream", sc.upstream).Msg("Failed to join URL path")
-				http.Error(w, "Failed to join URL path", http.StatusInternalServerError)
-				return
-			}
-
-			req, err = http.NewRequest(http.MethodGet, ur, nil)
-			if err != nil {
-				requestsTotal.WithLabelValues(r.Method, "500").Inc()
-				logger.Logger.Error().Err(err).Str("upstream", sc.upstream).Msg("Failed to create request")
-				http.Error(w, "Failed to create request", http.StatusInternalServerError)
-				return
-			}
-			req.Host = r.Host
-		} else { // if no upstream server is configured, proxy the request to the host specified in the request
-			host := r.Host
 	if r.Header.Get("X-Sls-Https") == "enable" {
-				host = "https://" + host
+		htt = "https://"
-			} else {
-				host = "http://" + host
 	}
 
-			ur, err := url.JoinPath(host, path)
+	base := htt + r.Host
+
+	hosturl, err := url.JoinPath(base, cacheKey)
 	if err != nil {
-				requestsTotal.WithLabelValues(r.Method, "500").Inc()
-				logger.Logger.Error().Err(err).Str("host", host).Msg("Failed to join URL path")
 		http.Error(w, "Failed to join URL path", http.StatusInternalServerError)
 		return
 	}
 
-			req, err = http.NewRequest(http.MethodGet, ur, nil)
+	resp, err := http.Get(hosturl)
 	if err != nil {
-				requestsTotal.WithLabelValues(r.Method, "500").Inc()
-				logger.Logger.Error().Err(err).Str("host", host).Msg("Failed to create request")
-				http.Error(w, "Failed to create request", http.StatusInternalServerError)
-				return
-			}
-		}
-
-		// Copy headers from the original request to the new request
-		for key, values := range r.Header {
-			for _, value := range values {
-				req.Header.Add(key, value)
-			}
-		}
-
-		// Retry logic
-		backoffSchedule := []time.Duration{1 * time.Second, 3 * time.Second, 10 * time.Second}
-		var resp *http.Response
-		for i, backoff := range backoffSchedule {
-			resp, err = sc.client.Do(req)
-			if err == nil && resp.StatusCode == http.StatusOK {
-				break
-			}
-			if i < len(backoffSchedule)-1 {
-				time.Sleep(backoff)
-			}
-		}
-		if err != nil || resp.StatusCode != http.StatusOK {
-			requestsTotal.WithLabelValues(r.Method, "500 upstream host "+r.Host).Inc()
-			logger.Logger.Error().Err(err).Str("url", req.URL.String()).Msg("Failed to fetch the requested URL")
 		http.Error(w, "Failed to fetch the requested URL", http.StatusInternalServerError)
 		return
 	}
 	defer resp.Body.Close()
 
-		size := resp.ContentLength
+	if resp.StatusCode != http.StatusOK {
+		http.Error(w, "Failed to fetch the requested URL", resp.StatusCode)
+		return
+	}
 
-		// Read the entire response body into memory for hash verification
+	body, err := io.ReadAll(resp.Body)
-		bodyData, err := io.ReadAll(resp.Body)
 	if err != nil {
-			requestsTotal.WithLabelValues(r.Method, "500").Inc()
-			logger.Logger.Error().Err(err).Str("url", req.URL.String()).Msg("Failed to read response body")
 		http.Error(w, "Failed to read response body", http.StatusInternalServerError)
 		return
 	}
 
-		// Extract filename from cache key for hash verification
+	sc.vfs.Set(cacheKey, body)
-		filename := filepath.Base(cacheKey)
+	sc.hits.Add(cachestate.CacheStateMiss)
-		expectedHash, hasHash := extractHashFromFilename(filename)
-
-		// Hash verification using Steam's X-Content-Sha header and content length verification
-		hashVerified := true
-		if hasHash {
-			// Get the hash from Steam's X-Content-Sha header
-			steamHash := resp.Header.Get("X-Content-Sha")
-
-			// Verify using Steam's hash
-			if strings.EqualFold(steamHash, expectedHash) {
-				hashVerificationTotal.WithLabelValues("success").Inc()
-			} else {
-				hashVerificationTotal.WithLabelValues("failed").Inc()
-				logger.Logger.Error().
-					Str("key", cacheKey).
-					Str("expected_hash", expectedHash).
-					Str("steam_hash", steamHash).
-					Int("content_length", len(bodyData)).
-					Msg("Steam hash verification failed - Steam's hash doesn't match filename")
-				hashVerified = false
-			}
-		} else {
-			hashVerificationTotal.WithLabelValues("no_hash").Inc()
-		}
-
-		// Always verify content length as an additional safety check
-		if resp.ContentLength > 0 && int64(len(bodyData)) != resp.ContentLength {
-			hashVerificationTotal.WithLabelValues("content_length_failed").Inc()
-			logger.Logger.Error().
-				Str("key", cacheKey).
-				Int("actual_content_length", len(bodyData)).
-				Int64("expected_content_length", resp.ContentLength).
-				Msg("Content length verification failed")
-			hashVerified = false
-		} else if resp.ContentLength > 0 {
-			hashVerificationTotal.WithLabelValues("content_length_success").Inc()
-		}
-
-		// Write to response (always serve the file)
 	w.Header().Add("X-LanCache-Status", "MISS")
-		w.Write(bodyData)
+	w.Write(body)
-
+}
-		// Only cache the file if hash verification passed (or no hash was present)
+
-		if hashVerified {
+func forward(w http.ResponseWriter, r *http.Request) {
-			writer, _ := sc.vfs.Create(cacheKey, size)
+	htt := "http://"
-			if writer != nil {
+	if r.Header.Get("X-Sls-Https") == "enable" {
-				defer writer.Close()
+		htt = "https://"
-				writer.Write(bodyData)
+	}
-			}
+
-		} else {
+	base := htt + r.Host
-			logger.Logger.Warn().
+
-				Str("key", cacheKey).
+	cacheKey := r.URL.String()
-				Msg("File served but not cached due to hash verification failure")
+
-		}
+	hosturl, err := url.JoinPath(base, cacheKey)
-
+	if err != nil {
-		logger.Logger.Info().
+		http.Error(w, "Failed to join URL path", http.StatusInternalServerError)
-			Str("key", cacheKey).
+		return
-			Str("host", r.Host).
+	}
-			Str("status", "MISS").
+
-			Dur("duration", time.Since(tstart)).
+	resp, err := http.Get(hosturl)
-			Msg("request")
+	if err != nil {
-
+		http.Error(w, "Failed to fetch the requested URL", http.StatusInternalServerError)
-		requestsTotal.WithLabelValues(r.Method, "200").Inc()
+		return
-		cacheStatusTotal.WithLabelValues("MISS").Inc()
+	}
-		responseTime.WithLabelValues("MISS").Observe(time.Since(tstart).Seconds())
+	defer resp.Body.Close()
-
+
-		return
+	if resp.StatusCode != http.StatusOK {
-	}
+		http.Error(w, "Failed to fetch the requested URL", resp.StatusCode)
-
+		return
-	if r.URL.Path == "/favicon.ico" {
+	}
-		w.WriteHeader(http.StatusNoContent)
+
-		return
+	body, err := io.ReadAll(resp.Body)
-	}
+	if err != nil {
-
+		http.Error(w, "Failed to read response body", http.StatusInternalServerError)
-	if r.URL.Path == "/robots.txt" {
+		return
-		w.Header().Set("Content-Type", "text/plain")
+	}
-		w.WriteHeader(http.StatusOK)
+
-		w.Write([]byte("User-agent: *\nDisallow: /\n"))
+	w.Write(body)
-		return
-	}
-
-	requestsTotal.WithLabelValues(r.Method, "404").Inc()
-	logger.Logger.Warn().Str("url", r.URL.String()).Msg("Not found")
-	http.Error(w, "Not found", http.StatusNotFound)
 }

steamcache/steamcache_test.go

@@ -1,245 +0,0 @@
-// steamcache/steamcache_test.go
-package steamcache
-
-import (
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestCaching(t *testing.T) {
-	td := t.TempDir()
-
-	os.WriteFile(filepath.Join(td, "key2"), []byte("value2"), 0644)
-
-	sc := New("localhost:8080", "1G", "1G", td, "", "lru", "lru")
-
-	w, err := sc.vfs.Create("key", 5)
-	if err != nil {
-		t.Errorf("Create failed: %v", err)
-	}
-	w.Write([]byte("value"))
-	w.Close()
-
-	w, err = sc.vfs.Create("key1", 6)
-	if err != nil {
-		t.Errorf("Create failed: %v", err)
-	}
-	w.Write([]byte("value1"))
-	w.Close()
-
-	if sc.diskgc.Size() != 17 {
-		t.Errorf("Size failed: got %d, want %d", sc.diskgc.Size(), 17)
-	}
-
-	if sc.vfs.Size() != 17 {
-		t.Errorf("Size failed: got %d, want %d", sc.vfs.Size(), 17)
-	}
-
-	rc, err := sc.vfs.Open("key")
-	if err != nil {
-		t.Errorf("Open failed: %v", err)
-	}
-	d, _ := io.ReadAll(rc)
-	rc.Close()
-	if string(d) != "value" {
-		t.Errorf("Get failed: got %s, want %s", d, "value")
-	}
-
-	rc, err = sc.vfs.Open("key1")
-	if err != nil {
-		t.Errorf("Open failed: %v", err)
-	}
-	d, _ = io.ReadAll(rc)
-	rc.Close()
-	if string(d) != "value1" {
-		t.Errorf("Get failed: got %s, want %s", d, "value1")
-	}
-
-	rc, err = sc.vfs.Open("key2")
-	if err != nil {
-		t.Errorf("Open failed: %v", err)
-	}
-	d, _ = io.ReadAll(rc)
-	rc.Close()
-	if string(d) != "value2" {
-		t.Errorf("Get failed: got %s, want %s", d, "value2")
-	}
-
-	if sc.diskgc.Size() != 17 {
-		t.Errorf("Size failed: got %d, want %d", sc.diskgc.Size(), 17)
-	}
-
-	if sc.vfs.Size() != 17 {
-		t.Errorf("Size failed: got %d, want %d", sc.vfs.Size(), 17)
-	}
-
-	sc.memory.Delete("key2")
-	os.Remove(filepath.Join(td, "key2"))
-
-	if _, err := sc.vfs.Open("key2"); err == nil {
-		t.Errorf("Open failed: got nil, want error")
-	}
-}
-
-func TestCacheMissAndHit(t *testing.T) {
-	sc := New("localhost:8080", "0", "1G", t.TempDir(), "", "lru", "lru")
-
-	key := "testkey"
-	value := []byte("testvalue")
-
-	// Simulate miss: but since no upstream, skip full ServeHTTP, test VFS
-	w, err := sc.vfs.Create(key, int64(len(value)))
-	if err != nil {
-		t.Fatal(err)
-	}
-	w.Write(value)
-	w.Close()
-
-	rc, err := sc.vfs.Open(key)
-	if err != nil {
-		t.Fatal(err)
-	}
-	got, _ := io.ReadAll(rc)
-	rc.Close()
-
-	if string(got) != string(value) {
-		t.Errorf("expected %s, got %s", value, got)
-	}
-}
-
-func TestHashExtraction(t *testing.T) {
-	// Test the specific key from the user's issue
-	testCases := []struct {
-		filename       string
-		expectedHash   string
-		shouldHaveHash bool
-	}{
-		{
-			filename:       "e89c81a1a926eb4732e146bc806491da8a7d89ca",
-			expectedHash:   "e89c81a1a926eb4732e146bc806491da8a7d89ca",
-			shouldHaveHash: true, // Now it should work with the new standalone hash pattern
-		},
-		{
-			filename:       "chunk_e89c81a1a926eb4732e146bc806491da8a7d89ca",
-			expectedHash:   "",
-			shouldHaveHash: false, // No longer supported with simplified patterns
-		},
-		{
-			filename:       "file.e89c81a1a926eb4732e146bc806491da8a7d89ca.chunk",
-			expectedHash:   "",
-			shouldHaveHash: false, // No longer supported with simplified patterns
-		},
-		{
-			filename:       "chunk_abc123def456",
-			expectedHash:   "",
-			shouldHaveHash: false, // Not 40 chars
-		},
-	}
-
-	for _, tc := range testCases {
-		hash, hasHash := extractHashFromFilename(tc.filename)
-		if hasHash != tc.shouldHaveHash {
-			t.Errorf("filename: %s, expected hasHash: %v, got: %v", tc.filename, tc.shouldHaveHash, hasHash)
-		}
-		if hasHash && hash != tc.expectedHash {
-			t.Errorf("filename: %s, expected hash: %s, got: %s", tc.filename, tc.expectedHash, hash)
-		}
-	}
-}
-
-func TestHashCalculation(t *testing.T) {
-	// Test data
-	testData := []byte("Hello, World!")
-
-	// Calculate hash
-	hash := calculateFileHash(testData)
-
-	// Expected SHA1 hash of "Hello, World!"
-	expectedHash := "0a0a9f2a6772942557ab5355d76af442f8f65e01"
-
-	if hash != expectedHash {
-		t.Errorf("Hash calculation failed: expected %s, got %s", expectedHash, hash)
-	}
-
-	// Test verification
-	if !verifyFileHash(testData, expectedHash) {
-		t.Error("Hash verification failed for correct hash")
-	}
-
-	if verifyFileHash(testData, "wronghash") {
-		t.Error("Hash verification passed for wrong hash")
-	}
-}
-
-func TestHashVerificationWithRealData(t *testing.T) {
-	// Test with some real data to ensure our hash calculation is correct
-	testCases := []struct {
-		data     string
-		expected string
-	}{
-		{"", "da39a3ee5e6b4b0d3255bfef95601890afd80709"},              // SHA1 of empty string
-		{"test", "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3"},          // SHA1 of "test"
-		{"Hello, World!", "0a0a9f2a6772942557ab5355d76af442f8f65e01"}, // SHA1 of "Hello, World!"
-	}
-
-	for _, tc := range testCases {
-		data := []byte(tc.data)
-		hash := calculateFileHash(data)
-		if hash != tc.expected {
-			t.Errorf("Hash calculation failed for '%s': expected %s, got %s", tc.data, tc.expected, hash)
-		}
-
-		if !verifyFileHash(data, tc.expected) {
-			t.Errorf("Hash verification failed for '%s'", tc.data)
-		}
-	}
-}
-
-func TestResponseHashCalculation(t *testing.T) {
-	// Create a mock HTTP response
-	resp := &http.Response{
-		StatusCode: 200,
-		Status:     "200 OK",
-		Header: http.Header{
-			"Content-Type":   []string{"application/octet-stream"},
-			"Content-Length": []string{"13"},
-			"Cache-Control":  []string{"public, max-age=3600"},
-		},
-	}
-
-	bodyData := []byte("Hello, World!")
-	
-	// Calculate response hash
-	responseHash := calculateResponseHash(resp, bodyData)
-	
-	// The hash should be different from just the body hash
-	bodyHash := calculateFileHash(bodyData)
-	
-	if responseHash == bodyHash {
-		t.Error("Response hash should be different from body hash when headers are present")
-	}
-	
-	// Test that the same response produces the same hash
-	responseHash2 := calculateResponseHash(resp, bodyData)
-	if responseHash != responseHash2 {
-		t.Error("Response hash should be consistent for the same response")
-	}
-	
-	// Test with different headers
-	resp2 := &http.Response{
-		StatusCode: 200,
-		Status:     "200 OK",
-		Header: http.Header{
-			"Content-Type":   []string{"text/plain"},
-			"Content-Length": []string{"13"},
-		},
-	}
-	
-	responseHash3 := calculateResponseHash(resp2, bodyData)
-	if responseHash == responseHash3 {
-		t.Error("Response hash should be different for different headers")
-	}
-}

version/version.go

@@ -1,16 +0,0 @@
-// version/version.go
-package version
-
-import "time"
-
-var Version string
-var Date string
-
-func init() {
-	if Version == "" {
-		Version = "0.0.0-dev"
-	}
-	if Date == "" {
-		Date = time.Now().Format("2006-01-02 15:04:05")
-	}
-}

vfs/cache/cache.go

@@ -1,14 +1,10 @@
-// vfs/cache/cache.go
 package cache
 
 import (
 	"fmt"
-	"io"
 	"s1d3sw1ped/SteamCache2/vfs"
 	"s1d3sw1ped/SteamCache2/vfs/cachestate"
-	"s1d3sw1ped/SteamCache2/vfs/gc"
 	"s1d3sw1ped/SteamCache2/vfs/vfserror"
-	"sync"
 )
 
 // Ensure CacheFS implements VFS.
@@ -20,38 +16,28 @@ type CacheFS struct {
 	slow vfs.VFS
 
 	cacheHandler CacheHandler
-
-	keyLocks sync.Map // map[string]*sync.RWMutex for per-key locks
 }
 
 type CacheHandler func(*vfs.FileInfo, cachestate.CacheState) bool
 
 // New creates a new CacheFS. fast is used for caching, and slow is used for storage. fast should obviously be faster than slow.
-func New(cacheHandler CacheHandler) *CacheFS {
+func New(fast, slow vfs.VFS, cacheHandler CacheHandler) *CacheFS {
+	if slow == nil {
+		panic("slow is nil")
+	}
+
+	if fast == slow {
+		panic("fast and slow are the same")
+	}
+
 	return &CacheFS{
+		fast: fast,
+		slow: slow,
+
 		cacheHandler: cacheHandler,
-		keyLocks:     sync.Map{},
 	}
 }
 
-func (c *CacheFS) SetSlow(vfs vfs.VFS) {
-	if vfs == nil {
-		panic("vfs is nil") // panic if the vfs is nil
-	}
-
-	c.slow = vfs
-}
-
-func (c *CacheFS) SetFast(vfs vfs.VFS) {
-	c.fast = vfs
-}
-
-// getKeyLock returns a RWMutex for the given key, creating it if necessary.
-func (c *CacheFS) getKeyLock(key string) *sync.RWMutex {
-	mu, _ := c.keyLocks.LoadOrStore(key, &sync.RWMutex{})
-	return mu.(*sync.RWMutex)
-}
-
 // cacheState returns the state of the file at key.
 func (c *CacheFS) cacheState(key string) cachestate.CacheState {
 	if c.fast != nil {
@@ -76,78 +62,65 @@ func (c *CacheFS) Size() int64 {
 	return c.slow.Size()
 }
 
+// Set sets the file at key to src. If the file is already in the cache, it is replaced.
+func (c *CacheFS) Set(key string, src []byte) error {
+	state := c.cacheState(key)
+
+	switch state {
+	case cachestate.CacheStateHit:
+		if c.fast != nil {
+			c.fast.Delete(key)
+		}
+		return c.slow.Set(key, src)
+	case cachestate.CacheStateMiss, cachestate.CacheStateNotFound:
+		return c.slow.Set(key, src)
+	}
+
+	panic(vfserror.ErrUnreachable)
+}
+
 // Delete deletes the file at key from the cache.
 func (c *CacheFS) Delete(key string) error {
-	mu := c.getKeyLock(key)
-	mu.Lock()
-	defer mu.Unlock()
-
 	if c.fast != nil {
 		c.fast.Delete(key)
 	}
 	return c.slow.Delete(key)
 }
 
-// Open returns the file at key. If the file is not in the cache, it is fetched from the storage.
+// Get returns the file at key. If the file is not in the cache, it is fetched from the storage.
-func (c *CacheFS) Open(key string) (io.ReadCloser, error) {
+func (c *CacheFS) Get(key string) ([]byte, error) {
-	mu := c.getKeyLock(key)
+	src, _, err := c.GetS(key)
-	mu.RLock()
+	return src, err
-	defer mu.RUnlock()
+}
 
+// GetS returns the file at key. If the file is not in the cache, it is fetched from the storage. It also returns the cache state.
+func (c *CacheFS) GetS(key string) ([]byte, cachestate.CacheState, error) {
 	state := c.cacheState(key)
 
 	switch state {
 	case cachestate.CacheStateHit:
 		// if c.fast == nil then cacheState cannot be CacheStateHit so we can safely ignore the check
-		// Record fast storage access for adaptive promotion
+		src, err := c.fast.Get(key)
-		if c.fast != nil {
+		return src, state, err
-			gc.RecordFastStorageAccess()
-		}
-		return c.fast.Open(key)
 	case cachestate.CacheStateMiss:
-		slowReader, err := c.slow.Open(key)
+		src, err := c.slow.Get(key)
 		if err != nil {
-			return nil, err
+			return nil, state, err
 		}
 
 		sstat, _ := c.slow.Stat(key)
 		if sstat != nil && c.fast != nil { // file found in slow storage and fast storage is available
 			// We are accessing the file from the slow storage, and the file has been accessed less then a minute ago so it popular, so we should update the fast storage with the latest file.
 			if c.cacheHandler != nil && c.cacheHandler(sstat, state) {
-				fastWriter, err := c.fast.Create(key, sstat.Size())
+				if err := c.fast.Set(key, src); err != nil {
-				if err == nil {
+					return nil, state, err
-					return &teeReadCloser{
-						Reader:  io.TeeReader(slowReader, fastWriter),
-						closers: []io.Closer{slowReader, fastWriter},
-					}, nil
 				}
 			}
 		}
 
-		return slowReader, nil
+		return src, state, nil
 	case cachestate.CacheStateNotFound:
-		return nil, vfserror.ErrNotFound
+		return nil, state, vfserror.ErrNotFound
-	}
-
-	panic(vfserror.ErrUnreachable)
-}
-
-// Create creates a new file at key. If the file is already in the cache, it is replaced.
-func (c *CacheFS) Create(key string, size int64) (io.WriteCloser, error) {
-	mu := c.getKeyLock(key)
-	mu.Lock()
-	defer mu.Unlock()
-
-	state := c.cacheState(key)
-
-	switch state {
-	case cachestate.CacheStateHit:
-		if c.fast != nil {
-			c.fast.Delete(key)
-		}
-		return c.slow.Create(key, size)
-	case cachestate.CacheStateMiss, cachestate.CacheStateNotFound:
-		return c.slow.Create(key, size)
 	}
 
 	panic(vfserror.ErrUnreachable)
@@ -156,10 +129,6 @@ func (c *CacheFS) Create(key string, size int64) (io.WriteCloser, error) {
 // Stat returns information about the file at key.
 // Warning: This will return information about the file in the fastest storage its in.
 func (c *CacheFS) Stat(key string) (*vfs.FileInfo, error) {
-	mu := c.getKeyLock(key)
-	mu.RLock()
-	defer mu.RUnlock()
-
 	state := c.cacheState(key)
 
 	switch state {
@@ -180,18 +149,3 @@ func (c *CacheFS) Stat(key string) (*vfs.FileInfo, error) {
 func (c *CacheFS) StatAll() []*vfs.FileInfo {
 	return c.slow.StatAll()
 }
-
-type teeReadCloser struct {
-	io.Reader
-	closers []io.Closer
-}
-
-func (t *teeReadCloser) Close() error {
-	var err error
-	for _, c := range t.closers {
-		if e := c.Close(); e != nil {
-			err = e
-		}
-	}
-	return err
-}

vfs/cache/cache_test.go

@@ -1,9 +1,7 @@
-// vfs/cache/cache_test.go
 package cache
 
 import (
 	"errors"
-	"io"
 	"testing"
 
 	"s1d3sw1ped/SteamCache2/vfs"
@@ -17,175 +15,184 @@ func testMemory() vfs.VFS {
 }
 
 func TestNew(t *testing.T) {
+	t.Parallel()
+
 	fast := testMemory()
 	slow := testMemory()
 
-	cache := New(nil)
+	cache := New(fast, slow, nil)
-	cache.SetFast(fast)
-	cache.SetSlow(slow)
 	if cache == nil {
 		t.Fatal("expected cache to be non-nil")
 	}
 }
 
 func TestNewPanics(t *testing.T) {
+	t.Parallel()
+
 	defer func() {
 		if r := recover(); r == nil {
 			t.Fatal("expected panic but did not get one")
 		}
 	}()
 
-	cache := New(nil)
+	New(nil, nil, nil)
-	cache.SetFast(nil)
-	cache.SetSlow(nil)
 }
 
-func TestCreateAndOpen(t *testing.T) {
+func TestSetAndGet(t *testing.T) {
+	t.Parallel()
+
 	fast := testMemory()
 	slow := testMemory()
-	cache := New(nil)
+	cache := New(fast, slow, nil)
-	cache.SetFast(fast)
-	cache.SetSlow(slow)
 
 	key := "test"
 	value := []byte("value")
 
-	w, err := cache.Create(key, int64(len(value)))
+	if err := cache.Set(key, value); err != nil {
-	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	w.Write(value)
-	w.Close()
 
-	rc, err := cache.Open(key)
+	got, err := cache.Get(key)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	got, _ := io.ReadAll(rc)
-	rc.Close()
 
 	if string(got) != string(value) {
 		t.Fatalf("expected %s, got %s", value, got)
 	}
 }
 
-func TestCreateAndOpenNoFast(t *testing.T) {
+func TestSetAndGetNoFast(t *testing.T) {
+	t.Parallel()
+
 	slow := testMemory()
-	cache := New(nil)
+	cache := New(nil, slow, nil)
-	cache.SetSlow(slow)
 
 	key := "test"
 	value := []byte("value")
 
-	w, err := cache.Create(key, int64(len(value)))
+	if err := cache.Set(key, value); err != nil {
-	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	w.Write(value)
-	w.Close()
 
-	rc, err := cache.Open(key)
+	got, err := cache.Get(key)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	got, _ := io.ReadAll(rc)
-	rc.Close()
 
 	if string(got) != string(value) {
 		t.Fatalf("expected %s, got %s", value, got)
 	}
 }
+func TestCaching(t *testing.T) {
+	t.Parallel()
 
-func TestCachingPromotion(t *testing.T) {
 	fast := testMemory()
 	slow := testMemory()
-	cache := New(func(fi *vfs.FileInfo, cs cachestate.CacheState) bool {
+	cache := New(fast, slow, func(fi *vfs.FileInfo, cs cachestate.CacheState) bool {
 		return true
 	})
-	cache.SetFast(fast)
-	cache.SetSlow(slow)
 
 	key := "test"
 	value := []byte("value")
 
-	ws, _ := slow.Create(key, int64(len(value)))
+	if err := fast.Set(key, value); err != nil {
-	ws.Write(value)
+		t.Fatalf("unexpected error: %v", err)
-	ws.Close()
+	}
 
-	rc, err := cache.Open(key)
+	if err := slow.Set(key, value); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	_, state, err := cache.GetS(key)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	got, _ := io.ReadAll(rc)
+	if state != cachestate.CacheStateHit {
-	rc.Close()
+		t.Fatalf("expected %v, got %v", cachestate.CacheStateHit, state)
+	}
+
+	err = fast.Delete(key)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got, state, err := cache.GetS(key)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if state != cachestate.CacheStateMiss {
+		t.Fatalf("expected %v, got %v", cachestate.CacheStateMiss, state)
+	}
 
 	if string(got) != string(value) {
 		t.Fatalf("expected %s, got %s", value, got)
 	}
 
-	// Check if promoted to fast
+	err = cache.Delete(key)
-	_, err = fast.Open(key)
 	if err != nil {
-		t.Error("Expected promotion to fast cache")
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	_, state, err = cache.GetS(key)
+	if !errors.Is(err, vfserror.ErrNotFound) {
+		t.Fatalf("expected %v, got %v", vfserror.ErrNotFound, err)
+	}
+	if state != cachestate.CacheStateNotFound {
+		t.Fatalf("expected %v, got %v", cachestate.CacheStateNotFound, state)
 	}
 }
 
-func TestOpenNotFound(t *testing.T) {
+func TestGetNotFound(t *testing.T) {
+	t.Parallel()
+
 	fast := testMemory()
 	slow := testMemory()
-	cache := New(nil)
+	cache := New(fast, slow, nil)
-	cache.SetFast(fast)
-	cache.SetSlow(slow)
 
-	_, err := cache.Open("nonexistent")
+	_, err := cache.Get("nonexistent")
 	if !errors.Is(err, vfserror.ErrNotFound) {
 		t.Fatalf("expected %v, got %v", vfserror.ErrNotFound, err)
 	}
 }
 
 func TestDelete(t *testing.T) {
+	t.Parallel()
+
 	fast := testMemory()
 	slow := testMemory()
-	cache := New(nil)
+	cache := New(fast, slow, nil)
-	cache.SetFast(fast)
-	cache.SetSlow(slow)
 
 	key := "test"
 	value := []byte("value")
 
-	w, err := cache.Create(key, int64(len(value)))
+	if err := cache.Set(key, value); err != nil {
-	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	w.Write(value)
-	w.Close()
 
 	if err := cache.Delete(key); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	_, err = cache.Open(key)
+	_, err := cache.Get(key)
 	if !errors.Is(err, vfserror.ErrNotFound) {
 		t.Fatalf("expected %v, got %v", vfserror.ErrNotFound, err)
 	}
 }
 
 func TestStat(t *testing.T) {
+	t.Parallel()
+
 	fast := testMemory()
 	slow := testMemory()
-	cache := New(nil)
+	cache := New(fast, slow, nil)
-	cache.SetFast(fast)
-	cache.SetSlow(slow)
 
 	key := "test"
 	value := []byte("value")
 
-	w, err := cache.Create(key, int64(len(value)))
+	if err := cache.Set(key, value); err != nil {
-	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	w.Write(value)
-	w.Close()
 
 	info, err := cache.Stat(key)
 	if err != nil {
@@ -195,7 +202,4 @@ func TestStat(t *testing.T) {
 	if info == nil {
 		t.Fatal("expected file info to be non-nil")
 	}
-	if info.Size() != int64(len(value)) {
-		t.Errorf("expected size %d, got %d", len(value), info.Size())
-	}
 }

vfs/cachestate/cachestate.go

@@ -1,4 +1,3 @@
-// vfs/cachestate/cachestate.go
 package cachestate
 
 import "s1d3sw1ped/SteamCache2/vfs/vfserror"

vfs/disk/disk.go

@@ -1,52 +1,15 @@
-// vfs/disk/disk.go
 package disk
 
 import (
-	"container/list"
-	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"s1d3sw1ped/SteamCache2/steamcache/logger"
 	"s1d3sw1ped/SteamCache2/vfs"
 	"s1d3sw1ped/SteamCache2/vfs/vfserror"
-	"strings"
 	"sync"
 	"time"
 
 	"github.com/docker/go-units"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-)
-
-var (
-	diskCapacityBytes = promauto.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "disk_cache_capacity_bytes",
-			Help: "Total capacity of the disk cache in bytes",
-		},
-	)
-
-	diskSizeBytes = promauto.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "disk_cache_size_bytes",
-			Help: "Total size of the disk cache in bytes",
-		},
-	)
-
-	diskReadBytes = promauto.NewCounter(
-		prometheus.CounterOpts{
-			Name: "disk_cache_read_bytes_total",
-			Help: "Total number of bytes read from the disk cache",
-		},
-	)
-
-	diskWriteBytes = promauto.NewCounter(
-		prometheus.CounterOpts{
-			Name: "disk_cache_write_bytes_total",
-			Help: "Total number of bytes written to the disk cache",
-		},
-	)
 )
 
 // Ensure DiskFS implements VFS.
@@ -58,92 +21,24 @@ type DiskFS struct {
 
 	info     map[string]*vfs.FileInfo
 	capacity int64
-	size     int64
+	mu       sync.Mutex
-	mu       sync.RWMutex
+	sg       sync.WaitGroup
-	keyLocks sync.Map // map[string]*sync.RWMutex
-	LRU      *lruList
-}
-
-// lruList for LRU eviction
-type lruList struct {
-	list *list.List
-	elem map[string]*list.Element
-}
-
-func newLruList() *lruList {
-	return &lruList{
-		list: list.New(),
-		elem: make(map[string]*list.Element),
-	}
-}
-
-func (l *lruList) MoveToFront(key string) {
-	if e, ok := l.elem[key]; ok {
-		l.list.MoveToFront(e)
-	}
-}
-
-func (l *lruList) Add(key string, fi *vfs.FileInfo) *list.Element {
-	e := l.list.PushFront(fi)
-	l.elem[key] = e
-	return e
-}
-
-func (l *lruList) Remove(key string) {
-	if e, ok := l.elem[key]; ok {
-		l.list.Remove(e)
-		delete(l.elem, key)
-	}
-}
-
-func (l *lruList) Back() *vfs.FileInfo {
-	if e := l.list.Back(); e != nil {
-		return e.Value.(*vfs.FileInfo)
-	}
-	return nil
 }
 
 // New creates a new DiskFS.
 func new(root string, capacity int64, skipinit bool) *DiskFS {
-	if capacity <= 0 {
-		panic("disk capacity must be greater than 0") // panic if the capacity is less than or equal to 0
-	}
-
-	if root == "" {
-		panic("disk root must not be empty") // panic if the root is empty
-	}
-
-	fi, err := os.Stat(root)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			panic(err) // panic if the error is something other than not found
-		}
-		os.Mkdir(root, 0755)    // create the root directory if it does not exist
-		fi, err = os.Stat(root) // re-stat to get the file info
-		if err != nil {
-			panic(err) // panic if the re-stat fails
-		}
-	}
-	if !fi.IsDir() {
-		panic("disk root must be a directory") // panic if the root is not a directory
-	}
-
 	dfs := &DiskFS{
 		root:     root,
 		info:     make(map[string]*vfs.FileInfo),
 		capacity: capacity,
-		mu:       sync.RWMutex{},
+		mu:       sync.Mutex{},
-		keyLocks: sync.Map{},
+		sg:       sync.WaitGroup{},
-		LRU:      newLruList(),
 	}
 
 	os.MkdirAll(dfs.root, 0755)
 
-	diskCapacityBytes.Set(float64(dfs.capacity))
-
 	if !skipinit {
 		dfs.init()
-		diskSizeBytes.Set(float64(dfs.Size()))
 	}
 
 	return dfs
@@ -158,39 +53,43 @@ func NewSkipInit(root string, capacity int64) *DiskFS {
 }
 
 func (d *DiskFS) init() {
+	// logger.Logger.Info().Str("name", d.Name()).Str("root", d.root).Str("capacity", units.HumanSize(float64(d.capacity))).Msg("init")
+
 	tstart := time.Now()
 
-	err := filepath.Walk(d.root, func(npath string, info os.FileInfo, err error) error {
+	d.walk(d.root)
+	d.sg.Wait()
+
+	logger.Logger.Info().Str("name", d.Name()).Str("root", d.root).Str("capacity", units.HumanSize(float64(d.capacity))).Str("duration", time.Since(tstart).String()).Msg("init")
+}
+
+func (d *DiskFS) walk(path string) {
+	d.sg.Add(1)
+	go func() {
+		defer d.sg.Done()
+		filepath.Walk(path, func(npath string, info os.FileInfo, err error) error {
+			if path == npath {
+				return nil
+			}
+
 			if err != nil {
 				return err
 			}
 
 			if info.IsDir() {
-			return nil
+				d.walk(npath)
+				return filepath.SkipDir
 			}
 
 			d.mu.Lock()
-		k := strings.ReplaceAll(npath[len(d.root)+1:], "\\", "/")
+			k := npath[len(d.root)+1:]
-		fi := vfs.NewFileInfoFromOS(info, k)
+			d.info[k] = vfs.NewFileInfoFromOS(info, k)
-		d.info[k] = fi
-		d.LRU.Add(k, fi)
-		d.size += info.Size()
 			d.mu.Unlock()
 
+			// logger.Logger.Debug().Str("name", d.Name()).Str("root", d.root).Str("capacity", units.HumanSize(float64(d.capacity))).Str("path", npath).Msg("init")
 			return nil
 		})
-	if err != nil {
+	}()
-		logger.Logger.Error().Err(err).Msg("Walk failed")
-	}
-
-	logger.Logger.Info().
-		Str("name", d.Name()).
-		Str("root", d.root).
-		Str("capacity", units.HumanSize(float64(d.capacity))).
-		Str("size", units.HumanSize(float64(d.Size()))).
-		Str("files", fmt.Sprint(len(d.info))).
-		Str("duration", time.Since(tstart).String()).
-		Msg("init")
 }
 
 func (d *DiskFS) Capacity() int64 {
@@ -202,259 +101,108 @@ func (d *DiskFS) Name() string {
 }
 
 func (d *DiskFS) Size() int64 {
-	d.mu.RLock()
+	var size int64
-	defer d.mu.RUnlock()
-	return d.size
-}
-
-func (d *DiskFS) getKeyLock(key string) *sync.RWMutex {
-	mu, _ := d.keyLocks.LoadOrStore(key, &sync.RWMutex{})
-	return mu.(*sync.RWMutex)
-}
-
-func (d *DiskFS) Create(key string, size int64) (io.WriteCloser, error) {
-	if key == "" {
-		return nil, vfserror.ErrInvalidKey
-	}
-	if key[0] == '/' {
-		return nil, vfserror.ErrInvalidKey
-	}
-
-	// Sanitize key to prevent path traversal
-	key = filepath.Clean(key)
-	key = strings.ReplaceAll(key, "\\", "/") // Ensure forward slashes for consistency
-	if strings.Contains(key, "..") {
-		return nil, vfserror.ErrInvalidKey
-	}
-
-	d.mu.RLock()
-	if d.capacity > 0 {
-		if d.size+size > d.capacity {
-			d.mu.RUnlock()
-			return nil, vfserror.ErrDiskFull
-		}
-	}
-	d.mu.RUnlock()
-
-	keyMu := d.getKeyLock(key)
-	keyMu.Lock()
-	defer keyMu.Unlock()
-
-	// Check again after lock
 	d.mu.Lock()
-	if fi, exists := d.info[key]; exists {
+	defer d.mu.Unlock()
-		d.size -= fi.Size()
+	for _, v := range d.info {
-		d.LRU.Remove(key)
+		size += v.Size()
-		delete(d.info, key)
-		path := filepath.Join(d.root, key)
-		os.Remove(path) // Ignore error, as file might not exist or other issues
 	}
-	d.mu.Unlock()
+	return size
+}
 
-	path := filepath.Join(d.root, key)
+func (d *DiskFS) Set(key string, src []byte) error {
-	path = strings.ReplaceAll(path, "\\", "/") // Ensure forward slashes for consistency
+	if d.capacity > 0 {
-	dir := filepath.Dir(path)
+		if size := d.Size() + int64(len(src)); size > d.capacity {
-	if err := os.MkdirAll(dir, 0755); err != nil {
+			return vfserror.ErrDiskFull
-		return nil, err
+		}
 	}
 
-	file, err := os.Create(path)
+	if _, err := d.Stat(key); err == nil {
-	if err != nil {
+		d.Delete(key)
-		return nil, err
 	}
 
-	return &diskWriteCloser{
+	d.mu.Lock()
-		Writer: file,
+	defer d.mu.Unlock()
-		onClose: func(n int64) error {
+	os.MkdirAll(filepath.Join(d.root, filepath.Dir(key)), 0755)
-			fi, err := os.Stat(path)
+	if err := os.WriteFile(filepath.Join(d.root, key), src, 0644); err != nil {
-			if err != nil {
-				os.Remove(path)
 		return err
 	}
 
-			d.mu.Lock()
+	fi, err := os.Stat(filepath.Join(d.root, key))
-			finfo := vfs.NewFileInfoFromOS(fi, key)
+	if err != nil {
-			d.info[key] = finfo
+		panic(err)
-			d.LRU.Add(key, finfo)
+	}
-			d.size += n
-			d.mu.Unlock()
 
-			diskWriteBytes.Add(float64(n))
+	d.info[key] = vfs.NewFileInfoFromOS(fi, key)
-			diskSizeBytes.Set(float64(d.Size()))
 
 	return nil
-		},
-		key:  key,
-		file: file,
-	}, nil
-}
-
-type diskWriteCloser struct {
-	io.Writer
-	onClose func(int64) error
-	n       int64
-	key     string
-	file    *os.File
-}
-
-func (wc *diskWriteCloser) Write(p []byte) (int, error) {
-	n, err := wc.Writer.Write(p)
-	wc.n += int64(n)
-	return n, err
-}
-
-func (wc *diskWriteCloser) Close() error {
-	err := wc.file.Close()
-	if e := wc.onClose(wc.n); e != nil {
-		os.Remove(wc.file.Name())
-		return e
-	}
-	return err
 }
 
 // Delete deletes the value of key.
 func (d *DiskFS) Delete(key string) error {
-	if key == "" {
+	_, err := d.Stat(key)
-		return vfserror.ErrInvalidKey
+	if err != nil {
-	}
-	if key[0] == '/' {
-		return vfserror.ErrInvalidKey
-	}
-
-	// Sanitize key to prevent path traversal
-	key = filepath.Clean(key)
-	key = strings.ReplaceAll(key, "\\", "/") // Ensure forward slashes for consistency
-	if strings.Contains(key, "..") {
-		return vfserror.ErrInvalidKey
-	}
-
-	keyMu := d.getKeyLock(key)
-	keyMu.Lock()
-	defer keyMu.Unlock()
-
-	d.mu.Lock()
-	fi, exists := d.info[key]
-	if !exists {
-		d.mu.Unlock()
-		return vfserror.ErrNotFound
-	}
-	d.size -= fi.Size()
-	d.LRU.Remove(key)
-	delete(d.info, key)
-	d.mu.Unlock()
-
-	path := filepath.Join(d.root, key)
-	path = strings.ReplaceAll(path, "\\", "/") // Ensure forward slashes for consistency
-	if err := os.Remove(path); err != nil {
 		return err
 	}
 
-	diskSizeBytes.Set(float64(d.Size()))
+	d.mu.Lock()
+	defer d.mu.Unlock()
+	delete(d.info, key)
+	if err := os.Remove(filepath.Join(d.root, key)); err != nil {
+		return err
+	}
 
 	return nil
 }
 
-// Open opens the file at key and returns it.
+// Get gets the value of key and returns it.
-func (d *DiskFS) Open(key string) (io.ReadCloser, error) {
+func (d *DiskFS) Get(key string) ([]byte, error) {
-	if key == "" {
+	_, err := d.Stat(key)
-		return nil, vfserror.ErrInvalidKey
-	}
-	if key[0] == '/' {
-		return nil, vfserror.ErrInvalidKey
-	}
-
-	// Sanitize key to prevent path traversal
-	key = filepath.Clean(key)
-	key = strings.ReplaceAll(key, "\\", "/") // Ensure forward slashes for consistency
-	if strings.Contains(key, "..") {
-		return nil, vfserror.ErrInvalidKey
-	}
-
-	keyMu := d.getKeyLock(key)
-	keyMu.RLock()
-	defer keyMu.RUnlock()
-
-	d.mu.Lock()
-	fi, exists := d.info[key]
-	if !exists {
-		d.mu.Unlock()
-		return nil, vfserror.ErrNotFound
-	}
-	fi.ATime = time.Now()
-	d.LRU.MoveToFront(key)
-	d.mu.Unlock()
-
-	path := filepath.Join(d.root, key)
-	path = strings.ReplaceAll(path, "\\", "/") // Ensure forward slashes for consistency
-	file, err := os.Open(path)
 	if err != nil {
 		return nil, err
 	}
 
-	// Update metrics on close
+	d.mu.Lock()
-	return &readCloser{
+	defer d.mu.Unlock()
-		ReadCloser: file,
-		onClose: func(n int64) {
-			diskReadBytes.Add(float64(n))
-		},
-	}, nil
-}
 
-type readCloser struct {
+	data, err := os.ReadFile(filepath.Join(d.root, key))
-	io.ReadCloser
+	if err != nil {
-	onClose func(int64)
+		return nil, err
-	n       int64
+	}
-}
 
-func (rc *readCloser) Read(p []byte) (int, error) {
+	return data, nil
-	n, err := rc.ReadCloser.Read(p)
-	rc.n += int64(n)
-	return n, err
-}
-
-func (rc *readCloser) Close() error {
-	err := rc.ReadCloser.Close()
-	rc.onClose(rc.n)
-	return err
 }
 
 // Stat returns the FileInfo of key. If key is not found in the cache, it will stat the file on disk. If the file is not found on disk, it will return vfs.ErrNotFound.
 func (d *DiskFS) Stat(key string) (*vfs.FileInfo, error) {
-	if key == "" {
+	d.mu.Lock()
-		return nil, vfserror.ErrInvalidKey
+	fi, ok := d.info[key]
-	}
+	d.mu.Unlock() // unlock before statting the file
-	if key[0] == '/' {
-		return nil, vfserror.ErrInvalidKey
-	}
 
-	// Sanitize key to prevent path traversal
+	if !ok {
-	key = filepath.Clean(key)
+		fii, err := os.Stat(filepath.Join(d.root, key))
-	key = strings.ReplaceAll(key, "\\", "/") // Ensure forward slashes for consistency
+		if err != nil {
-	if strings.Contains(key, "..") {
-		return nil, vfserror.ErrInvalidKey
-	}
-
-	keyMu := d.getKeyLock(key)
-	keyMu.RLock()
-	defer keyMu.RUnlock()
-
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if fi, ok := d.info[key]; !ok {
 			return nil, vfserror.ErrNotFound
-	} else {
-		return fi, nil
 		}
+
+		d.mu.Lock()         // relock to update the info map
+		defer d.mu.Unlock() // nothing else needs to unlock before returning
+
+		d.info[key] = vfs.NewFileInfoFromOS(fii, key)
+		fi = d.info[key]
+		// fallthrough to return fi with shiny new info
+	}
+
+	return fi, nil
 }
 
-func (d *DiskFS) StatAll() []*vfs.FileInfo {
+func (m *DiskFS) StatAll() []*vfs.FileInfo {
-	d.mu.RLock()
+	m.mu.Lock()
-	defer d.mu.RUnlock()
+	defer m.mu.Unlock()
 
 	// hard copy the file info to prevent modification of the original file info or the other way around
-	files := make([]*vfs.FileInfo, 0, len(d.info))
+	files := make([]*vfs.FileInfo, 0, len(m.info))
-	for _, v := range d.info {
+	for _, v := range m.info {
 		fi := *v
 		files = append(files, &fi)
 	}

vfs/disk/disk_test.go

@@ -1,181 +1,87 @@
-// vfs/disk/disk_test.go
 package disk
 
 import (
-	"errors"
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"s1d3sw1ped/SteamCache2/vfs/vfserror"
 	"testing"
 )
 
-func TestCreateAndOpen(t *testing.T) {
+func TestAllDisk(t *testing.T) {
+	t.Parallel()
+
 	m := NewSkipInit(t.TempDir(), 1024)
-	key := "key"
+	if err := m.Set("key", []byte("value")); err != nil {
-	value := []byte("value")
+		t.Errorf("Set failed: %v", err)
-
-	w, err := m.Create(key, int64(len(value)))
-	if err != nil {
-		t.Fatalf("Create failed: %v", err)
 	}
-	w.Write(value)
-	w.Close()
 
-	rc, err := m.Open(key)
+	if err := m.Set("key", []byte("value1")); err != nil {
-	if err != nil {
+		t.Errorf("Set failed: %v", err)
-		t.Fatalf("Open failed: %v", err)
 	}
-	got, _ := io.ReadAll(rc)
-	rc.Close()
 
-	if string(got) != string(value) {
+	if d, err := m.Get("key"); err != nil {
-		t.Fatalf("expected %s, got %s", value, got)
+		t.Errorf("Get failed: %v", err)
+	} else if string(d) != "value1" {
+		t.Errorf("Get failed: got %s, want %s", d, "value1")
+	}
+
+	if err := m.Delete("key"); err != nil {
+		t.Errorf("Delete failed: %v", err)
+	}
+
+	if _, err := m.Get("key"); err == nil {
+		t.Errorf("Get failed: got nil, want %v", vfserror.ErrNotFound)
+	}
+
+	if err := m.Delete("key"); err == nil {
+		t.Errorf("Delete failed: got nil, want %v", vfserror.ErrNotFound)
+	}
+
+	if _, err := m.Stat("key"); err == nil {
+		t.Errorf("Stat failed: got nil, want %v", vfserror.ErrNotFound)
+	}
+
+	if err := m.Set("key", []byte("value")); err != nil {
+		t.Errorf("Set failed: %v", err)
+	}
+
+	if _, err := m.Stat("key"); err != nil {
+		t.Errorf("Stat failed: %v", err)
 	}
 }
 
-func TestOverwrite(t *testing.T) {
+func TestLimited(t *testing.T) {
-	m := NewSkipInit(t.TempDir(), 1024)
+	t.Parallel()
-	key := "key"
-	value1 := []byte("value1")
-	value2 := []byte("value2")
 
-	w, err := m.Create(key, int64(len(value1)))
-	if err != nil {
-		t.Fatalf("Create failed: %v", err)
-	}
-	w.Write(value1)
-	w.Close()
-
-	w, err = m.Create(key, int64(len(value2)))
-	if err != nil {
-		t.Fatalf("Create failed: %v", err)
-	}
-	w.Write(value2)
-	w.Close()
-
-	rc, err := m.Open(key)
-	if err != nil {
-		t.Fatalf("Open failed: %v", err)
-	}
-	got, _ := io.ReadAll(rc)
-	rc.Close()
-
-	if string(got) != string(value2) {
-		t.Fatalf("expected %s, got %s", value2, got)
-	}
-}
-
-func TestDelete(t *testing.T) {
-	m := NewSkipInit(t.TempDir(), 1024)
-	key := "key"
-	value := []byte("value")
-
-	w, err := m.Create(key, int64(len(value)))
-	if err != nil {
-		t.Fatalf("Create failed: %v", err)
-	}
-	w.Write(value)
-	w.Close()
-
-	if err := m.Delete(key); err != nil {
-		t.Fatalf("Delete failed: %v", err)
-	}
-
-	_, err = m.Open(key)
-	if !errors.Is(err, vfserror.ErrNotFound) {
-		t.Fatalf("expected %v, got %v", vfserror.ErrNotFound, err)
-	}
-}
-
-func TestCapacityLimit(t *testing.T) {
 	m := NewSkipInit(t.TempDir(), 10)
 	for i := 0; i < 11; i++ {
-		w, err := m.Create(fmt.Sprintf("key%d", i), 1)
+		if err := m.Set(fmt.Sprintf("key%d", i), []byte("1")); err != nil && i < 10 {
-		if err != nil && i < 10 {
+			t.Errorf("Set failed: %v", err)
-			t.Errorf("Create failed: %v", err)
 		} else if i == 10 && err == nil {
-			t.Errorf("Create succeeded: got nil, want %v", vfserror.ErrDiskFull)
+			t.Errorf("Set succeeded: got nil, want %v", vfserror.ErrDiskFull)
-		}
-		if i < 10 {
-			w.Write([]byte("1"))
-			w.Close()
 		}
 	}
 }
 
-func TestInitExistingFiles(t *testing.T) {
+func TestInit(t *testing.T) {
+	t.Parallel()
+
 	td := t.TempDir()
 
 	path := filepath.Join(td, "test", "key")
+
 	os.MkdirAll(filepath.Dir(path), 0755)
+
 	os.WriteFile(path, []byte("value"), 0644)
 
 	m := New(td, 10)
-	rc, err := m.Open("test/key")
+	if _, err := m.Get("test/key"); err != nil {
-	if err != nil {
+		t.Errorf("Get failed: %v", err)
-		t.Fatalf("Open failed: %v", err)
-	}
-	got, _ := io.ReadAll(rc)
-	rc.Close()
-
-	if string(got) != "value" {
-		t.Errorf("expected value, got %s", got)
 	}
 
-	s, err := m.Stat("test/key")
+	s, _ := m.Stat("test/key")
-	if err != nil {
+	if s.Name() != "test/key" {
-		t.Fatalf("Stat failed: %v", err)
+		t.Errorf("Stat failed: got %s, want %s", s.Name(), "key")
-	}
-	if s == nil {
-		t.Error("Stat returned nil")
-	}
-	if s != nil && s.Name() != "test/key" {
-		t.Errorf("Stat failed: got %s, want %s", s.Name(), "test/key")
-	}
-}
-
-func TestSizeConsistency(t *testing.T) {
-	td := t.TempDir()
-	os.WriteFile(filepath.Join(td, "key2"), []byte("value2"), 0644)
-
-	m := New(td, 1024)
-	if m.Size() != 6 {
-		t.Errorf("Size failed: got %d, want 6", m.Size())
-	}
-
-	w, err := m.Create("key", 5)
-	if err != nil {
-		t.Errorf("Create failed: %v", err)
-	}
-	w.Write([]byte("value"))
-	w.Close()
-
-	w, err = m.Create("key1", 6)
-	if err != nil {
-		t.Errorf("Create failed: %v", err)
-	}
-	w.Write([]byte("value1"))
-	w.Close()
-
-	assumedSize := int64(6 + 5 + 6)
-	if assumedSize != m.Size() {
-		t.Errorf("Size failed: got %d, want %d", m.Size(), assumedSize)
-	}
-
-	rc, err := m.Open("key")
-	if err != nil {
-		t.Errorf("Open failed: %v", err)
-	}
-	d, _ := io.ReadAll(rc)
-	rc.Close()
-	if string(d) != "value" {
-		t.Errorf("Get failed: got %s, want value", d)
-	}
-
-	m = New(td, 1024)
-	if assumedSize != m.Size() {
-		t.Errorf("Size failed: got %d, want %d", m.Size(), assumedSize)
 	}
 }

vfs/fileinfo.go

@@ -1,4 +1,3 @@
-// vfs/fileinfo.go
 package vfs
 
 import (
@@ -13,9 +12,9 @@ type FileInfo struct {
 	ATime time.Time
 }
 
-func NewFileInfo(key string, size int64, modTime time.Time) *FileInfo {
+func NewFileInfo(name string, size int64, modTime time.Time) *FileInfo {
 	return &FileInfo{
-		name:  key,
+		name:  name,
 		size:  size,
 		MTime: modTime,
 		ATime: time.Now(),

vfs/gc/gc.go

@@ -1,728 +1,42 @@
-// vfs/gc/gc.go
 package gc
 
 import (
 	"fmt"
-	"io"
-	"s1d3sw1ped/SteamCache2/steamcache/logger"
 	"s1d3sw1ped/SteamCache2/vfs"
-	"s1d3sw1ped/SteamCache2/vfs/cachestate"
-	"s1d3sw1ped/SteamCache2/vfs/disk"
-	"s1d3sw1ped/SteamCache2/vfs/memory"
 	"s1d3sw1ped/SteamCache2/vfs/vfserror"
-	"sort"
-	"sync"
-	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
-var (
-	// ErrInsufficientSpace is returned when there are no files to delete in the VFS.
-	ErrInsufficientSpace = fmt.Errorf("no files to delete")
-)
-
-// Prometheus metrics for adaptive promotion
-var (
-	promotionThresholds = promauto.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Name: "promotion_thresholds_bytes",
-			Help: "Current promotion thresholds in bytes",
-		},
-		[]string{"threshold_type"},
-	)
-
-	promotionWindows = promauto.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Name: "promotion_windows_seconds",
-			Help: "Current promotion time windows in seconds",
-		},
-		[]string{"window_type"},
-	)
-
-	promotionStats = promauto.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Name: "promotion_stats",
-			Help: "Promotion statistics",
-		},
-		[]string{"metric_type"},
-	)
-
-	promotionAdaptations = promauto.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "promotion_adaptations_total",
-			Help: "Total number of promotion threshold adaptations",
-		},
-		[]string{"direction"},
-	)
-)
-
-// GCAlgorithm represents different garbage collection strategies
-type GCAlgorithm string
-
-const (
-	LRU      GCAlgorithm = "lru"
-	LFU      GCAlgorithm = "lfu"
-	FIFO     GCAlgorithm = "fifo"
-	Largest  GCAlgorithm = "largest"
-	Smallest GCAlgorithm = "smallest"
-	Hybrid   GCAlgorithm = "hybrid"
-)
-
-// LRUGC deletes files in LRU order until enough space is reclaimed.
-func LRUGC(vfss vfs.VFS, size uint) error {
-	logger.Logger.Debug().Uint("target", size).Msg("Attempting to reclaim space using LRU GC")
-
-	var reclaimed uint // reclaimed space in bytes
-
-	for {
-		switch fs := vfss.(type) {
-		case *disk.DiskFS:
-			fi := fs.LRU.Back()
-			if fi == nil {
-				return ErrInsufficientSpace // No files to delete
-			}
-			sz := uint(fi.Size())
-			err := fs.Delete(fi.Name())
-			if err != nil {
-				continue // If delete fails, try the next file
-			}
-			reclaimed += sz
-		case *memory.MemoryFS:
-			fi := fs.LRU.Back()
-			if fi == nil {
-				return ErrInsufficientSpace // No files to delete
-			}
-			sz := uint(fi.Size())
-			err := fs.Delete(fi.Name())
-			if err != nil {
-				continue // If delete fails, try the next file
-			}
-			reclaimed += sz
-		default:
-			panic("unreachable: unsupported VFS type for LRU GC") // panic if the VFS is not disk or memory
-		}
-
-		if reclaimed >= size {
-			logger.Logger.Debug().Uint("target", size).Uint("achieved", reclaimed).Msg("Reclaimed enough space using LRU GC")
-			return nil // stop if enough space is reclaimed
-		}
-	}
-}
-
-// LFUGC deletes files in LFU (Least Frequently Used) order until enough space is reclaimed.
-func LFUGC(vfss vfs.VFS, size uint) error {
-	logger.Logger.Debug().Uint("target", size).Msg("Attempting to reclaim space using LFU GC")
-
-	// Get all files and sort by access count (frequency)
-	files := getAllFiles(vfss)
-	if len(files) == 0 {
-		return ErrInsufficientSpace
-	}
-
-	// Sort by access count (ascending - least frequently used first)
-	sort.Slice(files, func(i, j int) bool {
-		return files[i].AccessCount < files[j].AccessCount
-	})
-
-	var reclaimed uint
-	for _, fi := range files {
-		if reclaimed >= size {
-			break
-		}
-		err := vfss.Delete(fi.Name)
-		if err != nil {
-			continue
-		}
-		reclaimed += uint(fi.Size)
-	}
-
-	if reclaimed >= size {
-		logger.Logger.Debug().Uint("target", size).Uint("achieved", reclaimed).Msg("Reclaimed enough space using LFU GC")
-		return nil
-	}
-	return ErrInsufficientSpace
-}
-
-// FIFOGC deletes files in FIFO (First In, First Out) order until enough space is reclaimed.
-func FIFOGC(vfss vfs.VFS, size uint) error {
-	logger.Logger.Debug().Uint("target", size).Msg("Attempting to reclaim space using FIFO GC")
-
-	// Get all files and sort by creation time (oldest first)
-	files := getAllFiles(vfss)
-	if len(files) == 0 {
-		return ErrInsufficientSpace
-	}
-
-	// Sort by creation time (ascending - oldest first)
-	sort.Slice(files, func(i, j int) bool {
-		return files[i].MTime.Before(files[j].MTime)
-	})
-
-	var reclaimed uint
-	for _, fi := range files {
-		if reclaimed >= size {
-			break
-		}
-		err := vfss.Delete(fi.Name)
-		if err != nil {
-			continue
-		}
-		reclaimed += uint(fi.Size)
-	}
-
-	if reclaimed >= size {
-		logger.Logger.Debug().Uint("target", size).Uint("achieved", reclaimed).Msg("Reclaimed enough space using FIFO GC")
-		return nil
-	}
-	return ErrInsufficientSpace
-}
-
-// LargestGC deletes the largest files first until enough space is reclaimed.
-func LargestGC(vfss vfs.VFS, size uint) error {
-	logger.Logger.Debug().Uint("target", size).Msg("Attempting to reclaim space using Largest GC")
-
-	// Get all files and sort by size (largest first)
-	files := getAllFiles(vfss)
-	if len(files) == 0 {
-		return ErrInsufficientSpace
-	}
-
-	// Sort by size (descending - largest first)
-	sort.Slice(files, func(i, j int) bool {
-		return files[i].Size > files[j].Size
-	})
-
-	var reclaimed uint
-	for _, fi := range files {
-		if reclaimed >= size {
-			break
-		}
-		err := vfss.Delete(fi.Name)
-		if err != nil {
-			continue
-		}
-		reclaimed += uint(fi.Size)
-	}
-
-	if reclaimed >= size {
-		logger.Logger.Debug().Uint("target", size).Uint("achieved", reclaimed).Msg("Reclaimed enough space using Largest GC")
-		return nil
-	}
-	return ErrInsufficientSpace
-}
-
-// SmallestGC deletes the smallest files first until enough space is reclaimed.
-func SmallestGC(vfss vfs.VFS, size uint) error {
-	logger.Logger.Debug().Uint("target", size).Msg("Attempting to reclaim space using Smallest GC")
-
-	// Get all files and sort by size (smallest first)
-	files := getAllFiles(vfss)
-	if len(files) == 0 {
-		return ErrInsufficientSpace
-	}
-
-	// Sort by size (ascending - smallest first)
-	sort.Slice(files, func(i, j int) bool {
-		return files[i].Size < files[j].Size
-	})
-
-	var reclaimed uint
-	for _, fi := range files {
-		if reclaimed >= size {
-			break
-		}
-		err := vfss.Delete(fi.Name)
-		if err != nil {
-			continue
-		}
-		reclaimed += uint(fi.Size)
-	}
-
-	if reclaimed >= size {
-		logger.Logger.Debug().Uint("target", size).Uint("achieved", reclaimed).Msg("Reclaimed enough space using Smallest GC")
-		return nil
-	}
-	return ErrInsufficientSpace
-}
-
-// HybridGC combines LRU and size-based eviction with a scoring system.
-func HybridGC(vfss vfs.VFS, size uint) error {
-	logger.Logger.Debug().Uint("target", size).Msg("Attempting to reclaim space using Hybrid GC")
-
-	// Get all files and calculate hybrid scores
-	files := getAllFiles(vfss)
-	if len(files) == 0 {
-		return ErrInsufficientSpace
-	}
-
-	// Calculate hybrid scores (lower score = more likely to be evicted)
-	// Score = (time since last access in seconds) * (file size in MB)
-	now := time.Now()
-	for i := range files {
-		timeSinceAccess := now.Sub(files[i].ATime).Seconds()
-		sizeMB := float64(files[i].Size) / (1024 * 1024)
-		files[i].HybridScore = timeSinceAccess * sizeMB
-	}
-
-	// Sort by hybrid score (ascending - lowest scores first)
-	sort.Slice(files, func(i, j int) bool {
-		return files[i].HybridScore < files[j].HybridScore
-	})
-
-	var reclaimed uint
-	for _, fi := range files {
-		if reclaimed >= size {
-			break
-		}
-		err := vfss.Delete(fi.Name)
-		if err != nil {
-			continue
-		}
-		reclaimed += uint(fi.Size)
-	}
-
-	if reclaimed >= size {
-		logger.Logger.Debug().Uint("target", size).Uint("achieved", reclaimed).Msg("Reclaimed enough space using Hybrid GC")
-		return nil
-	}
-	return ErrInsufficientSpace
-}
-
-// fileInfoWithMetadata extends FileInfo with additional metadata for GC algorithms
-type fileInfoWithMetadata struct {
-	Name        string
-	Size        int64
-	MTime       time.Time
-	ATime       time.Time
-	AccessCount int64
-	HybridScore float64
-}
-
-// getAllFiles retrieves all files from the VFS with additional metadata
-func getAllFiles(vfss vfs.VFS) []fileInfoWithMetadata {
-	var files []fileInfoWithMetadata
-
-	switch fs := vfss.(type) {
-	case *disk.DiskFS:
-		allFiles := fs.StatAll()
-		for _, fi := range allFiles {
-			// For disk, we can't easily track access count, so we'll use 1 as default
-			files = append(files, fileInfoWithMetadata{
-				Name:        fi.Name(),
-				Size:        fi.Size(),
-				MTime:       fi.ModTime(),
-				ATime:       fi.AccessTime(),
-				AccessCount: 1,
-			})
-		}
-	case *memory.MemoryFS:
-		allFiles := fs.StatAll()
-		for _, fi := range allFiles {
-			// For memory, we can't easily track access count, so we'll use 1 as default
-			files = append(files, fileInfoWithMetadata{
-				Name:        fi.Name(),
-				Size:        fi.Size(),
-				MTime:       fi.ModTime(),
-				ATime:       fi.AccessTime(),
-				AccessCount: 1,
-			})
-		}
-	}
-
-	return files
-}
-
-// GetGCAlgorithm returns the appropriate GC function based on the algorithm name
-func GetGCAlgorithm(algorithm GCAlgorithm) GCHandlerFunc {
-	switch algorithm {
-	case LRU:
-		return LRUGC
-	case LFU:
-		return LFUGC
-	case FIFO:
-		return FIFOGC
-	case Largest:
-		return LargestGC
-	case Smallest:
-		return SmallestGC
-	case Hybrid:
-		return HybridGC
-	default:
-		logger.Logger.Warn().Str("algorithm", string(algorithm)).Msg("Unknown GC algorithm, falling back to LRU")
-		return LRUGC
-	}
-}
-
-func PromotionDecider(fi *vfs.FileInfo, cs cachestate.CacheState) bool {
-	return time.Since(fi.AccessTime()) < time.Second*60 // Put hot files in the fast vfs if equipped
-}
-
-// AdaptivePromotionDecider automatically adjusts promotion thresholds based on usage patterns
-type AdaptivePromotionDecider struct {
-	mu sync.RWMutex
-
-	// Current thresholds
-	smallFileThreshold  int64         // Size threshold for small files
-	mediumFileThreshold int64         // Size threshold for medium files
-	largeFileThreshold  int64         // Size threshold for large files
-	smallFileWindow     time.Duration // Time window for small files
-	mediumFileWindow    time.Duration // Time window for medium files
-	largeFileWindow     time.Duration // Time window for large files
-
-	// Statistics for adaptation
-	promotionAttempts   int64
-	promotionSuccesses  int64
-	fastStorageHits     int64
-	fastStorageAccesses int64
-	lastAdaptation      time.Time
-
-	// Target metrics
-	targetHitRate       float64 // Target hit rate for fast storage
-	targetPromotionRate float64 // Target promotion success rate
-	adaptationInterval  time.Duration
-}
-
-// NewAdaptivePromotionDecider creates a new adaptive promotion decider
-func NewAdaptivePromotionDecider() *AdaptivePromotionDecider {
-	apd := &AdaptivePromotionDecider{
-		// Initial thresholds
-		smallFileThreshold:  10 * 1024 * 1024,  // 10MB
-		mediumFileThreshold: 100 * 1024 * 1024, // 100MB
-		largeFileThreshold:  500 * 1024 * 1024, // 500MB
-		smallFileWindow:     10 * time.Minute,
-		mediumFileWindow:    2 * time.Minute,
-		largeFileWindow:     30 * time.Second,
-
-		// Target metrics
-		targetHitRate:       0.8, // 80% hit rate
-		targetPromotionRate: 0.7, // 70% promotion success rate
-		adaptationInterval:  5 * time.Minute,
-	}
-
-	// Initialize Prometheus metrics
-	apd.updatePrometheusMetrics()
-
-	return apd
-}
-
-// ShouldPromote determines if a file should be promoted based on adaptive thresholds
-func (apd *AdaptivePromotionDecider) ShouldPromote(fi *vfs.FileInfo, cs cachestate.CacheState) bool {
-	apd.mu.Lock()
-	defer apd.mu.Unlock()
-
-	// Check if it's time to adapt thresholds
-	if time.Since(apd.lastAdaptation) > apd.adaptationInterval {
-		apd.adaptThresholds()
-	}
-
-	size := fi.Size()
-	timeSinceAccess := time.Since(fi.AccessTime())
-
-	// Record promotion attempt
-	apd.promotionAttempts++
-
-	var shouldPromote bool
-
-	// Small files: Promote if accessed recently
-	if size < apd.smallFileThreshold {
-		shouldPromote = timeSinceAccess < apd.smallFileWindow
-	} else if size < apd.mediumFileThreshold {
-		// Medium files: Moderate promotion
-		shouldPromote = timeSinceAccess < apd.mediumFileWindow
-	} else if size < apd.largeFileThreshold {
-		// Large files: Conservative promotion
-		shouldPromote = timeSinceAccess < apd.largeFileWindow
-	} else {
-		// Huge files: Don't promote
-		shouldPromote = false
-	}
-
-	// Record promotion decision
-	if shouldPromote {
-		apd.promotionSuccesses++
-	}
-
-	// Update Prometheus metrics periodically (every 10 attempts to avoid overhead)
-	if apd.promotionAttempts%10 == 0 {
-		apd.updatePrometheusMetrics()
-	}
-
-	return shouldPromote
-}
-
-// RecordFastStorageAccess records when fast storage is accessed
-func (apd *AdaptivePromotionDecider) RecordFastStorageAccess() {
-	apd.mu.Lock()
-	defer apd.mu.Unlock()
-	apd.fastStorageAccesses++
-
-	// Update Prometheus metrics periodically
-	if apd.fastStorageAccesses%10 == 0 {
-		apd.updatePrometheusMetrics()
-	}
-}
-
-// RecordFastStorageHit records when fast storage has a hit
-func (apd *AdaptivePromotionDecider) RecordFastStorageHit() {
-	apd.mu.Lock()
-	defer apd.mu.Unlock()
-	apd.fastStorageHits++
-
-	// Update Prometheus metrics periodically
-	if apd.fastStorageHits%10 == 0 {
-		apd.updatePrometheusMetrics()
-	}
-}
-
-// adaptThresholds adjusts thresholds based on current performance
-func (apd *AdaptivePromotionDecider) adaptThresholds() {
-	if apd.promotionAttempts < 10 || apd.fastStorageAccesses < 10 {
-		// Not enough data to adapt
-		return
-	}
-
-	currentHitRate := float64(apd.fastStorageHits) / float64(apd.fastStorageAccesses)
-	currentPromotionRate := float64(apd.promotionSuccesses) / float64(apd.promotionAttempts)
-
-	logger.Logger.Debug().
-		Float64("hit_rate", currentHitRate).
-		Float64("promotion_rate", currentPromotionRate).
-		Float64("target_hit_rate", apd.targetHitRate).
-		Float64("target_promotion_rate", apd.targetPromotionRate).
-		Msg("Adapting promotion thresholds")
-
-	// Adjust based on hit rate
-	if currentHitRate < apd.targetHitRate {
-		// Hit rate too low - be more aggressive with promotion
-		apd.adjustThresholdsMoreAggressive()
-	} else if currentHitRate > apd.targetHitRate+0.1 {
-		// Hit rate too high - be more conservative
-		apd.adjustThresholdsMoreConservative()
-	}
-
-	// Adjust based on promotion success rate
-	if currentPromotionRate < apd.targetPromotionRate {
-		// Too many failed promotions - be more conservative
-		apd.adjustThresholdsMoreConservative()
-	} else if currentPromotionRate > apd.targetPromotionRate+0.1 {
-		// High promotion success - can be more aggressive
-		apd.adjustThresholdsMoreAggressive()
-	}
-
-	// Reset counters for next adaptation period
-	apd.promotionAttempts = 0
-	apd.promotionSuccesses = 0
-	apd.fastStorageHits = 0
-	apd.fastStorageAccesses = 0
-	apd.lastAdaptation = time.Now()
-
-	logger.Logger.Info().
-		Int64("small_threshold_mb", apd.smallFileThreshold/(1024*1024)).
-		Int64("medium_threshold_mb", apd.mediumFileThreshold/(1024*1024)).
-		Int64("large_threshold_mb", apd.largeFileThreshold/(1024*1024)).
-		Dur("small_window", apd.smallFileWindow).
-		Dur("medium_window", apd.mediumFileWindow).
-		Dur("large_window", apd.largeFileWindow).
-		Msg("Updated promotion thresholds")
-}
-
-// updatePrometheusMetrics updates all Prometheus metrics with current values
-func (apd *AdaptivePromotionDecider) updatePrometheusMetrics() {
-	// Update threshold metrics
-	promotionThresholds.WithLabelValues("small").Set(float64(apd.smallFileThreshold))
-	promotionThresholds.WithLabelValues("medium").Set(float64(apd.mediumFileThreshold))
-	promotionThresholds.WithLabelValues("large").Set(float64(apd.largeFileThreshold))
-
-	// Update window metrics
-	promotionWindows.WithLabelValues("small").Set(apd.smallFileWindow.Seconds())
-	promotionWindows.WithLabelValues("medium").Set(apd.mediumFileWindow.Seconds())
-	promotionWindows.WithLabelValues("large").Set(apd.largeFileWindow.Seconds())
-
-	// Update statistics metrics
-	hitRate := 0.0
-	if apd.fastStorageAccesses > 0 {
-		hitRate = float64(apd.fastStorageHits) / float64(apd.fastStorageAccesses)
-	}
-	promotionRate := 0.0
-	if apd.promotionAttempts > 0 {
-		promotionRate = float64(apd.promotionSuccesses) / float64(apd.promotionAttempts)
-	}
-
-	promotionStats.WithLabelValues("hit_rate").Set(hitRate)
-	promotionStats.WithLabelValues("promotion_rate").Set(promotionRate)
-	promotionStats.WithLabelValues("promotion_attempts").Set(float64(apd.promotionAttempts))
-	promotionStats.WithLabelValues("promotion_successes").Set(float64(apd.promotionSuccesses))
-	promotionStats.WithLabelValues("fast_storage_accesses").Set(float64(apd.fastStorageAccesses))
-	promotionStats.WithLabelValues("fast_storage_hits").Set(float64(apd.fastStorageHits))
-}
-
-// adjustThresholdsMoreAggressive makes promotion more aggressive
-func (apd *AdaptivePromotionDecider) adjustThresholdsMoreAggressive() {
-	// Increase size thresholds (promote larger files)
-	apd.smallFileThreshold = minInt64(apd.smallFileThreshold*11/10, 50*1024*1024)    // Max 50MB
-	apd.mediumFileThreshold = minInt64(apd.mediumFileThreshold*11/10, 200*1024*1024) // Max 200MB
-	apd.largeFileThreshold = minInt64(apd.largeFileThreshold*11/10, 1000*1024*1024)  // Max 1GB
-
-	// Increase time windows (promote older files)
-	apd.smallFileWindow = minDuration(apd.smallFileWindow*11/10, 20*time.Minute)
-	apd.mediumFileWindow = minDuration(apd.mediumFileWindow*11/10, 5*time.Minute)
-	apd.largeFileWindow = minDuration(apd.largeFileWindow*11/10, 2*time.Minute)
-
-	// Record adaptation in Prometheus
-	promotionAdaptations.WithLabelValues("aggressive").Inc()
-
-	// Update Prometheus metrics
-	apd.updatePrometheusMetrics()
-}
-
-// adjustThresholdsMoreConservative makes promotion more conservative
-func (apd *AdaptivePromotionDecider) adjustThresholdsMoreConservative() {
-	// Decrease size thresholds (promote smaller files)
-	apd.smallFileThreshold = maxInt64(apd.smallFileThreshold*9/10, 5*1024*1024)    // Min 5MB
-	apd.mediumFileThreshold = maxInt64(apd.mediumFileThreshold*9/10, 50*1024*1024) // Min 50MB
-	apd.largeFileThreshold = maxInt64(apd.largeFileThreshold*9/10, 200*1024*1024)  // Min 200MB
-
-	// Decrease time windows (promote only recent files)
-	apd.smallFileWindow = maxDuration(apd.smallFileWindow*9/10, 5*time.Minute)
-	apd.mediumFileWindow = maxDuration(apd.mediumFileWindow*9/10, 1*time.Minute)
-	apd.largeFileWindow = maxDuration(apd.largeFileWindow*9/10, 15*time.Second)
-
-	// Record adaptation in Prometheus
-	promotionAdaptations.WithLabelValues("conservative").Inc()
-
-	// Update Prometheus metrics
-	apd.updatePrometheusMetrics()
-}
-
-// GetStats returns current statistics for monitoring
-func (apd *AdaptivePromotionDecider) GetStats() map[string]interface{} {
-	apd.mu.RLock()
-	defer apd.mu.RUnlock()
-
-	hitRate := 0.0
-	if apd.fastStorageAccesses > 0 {
-		hitRate = float64(apd.fastStorageHits) / float64(apd.fastStorageAccesses)
-	}
-
-	promotionRate := 0.0
-	if apd.promotionAttempts > 0 {
-		promotionRate = float64(apd.promotionSuccesses) / float64(apd.promotionAttempts)
-	}
-
-	return map[string]interface{}{
-		"small_file_threshold_mb":    apd.smallFileThreshold / (1024 * 1024),
-		"medium_file_threshold_mb":   apd.mediumFileThreshold / (1024 * 1024),
-		"large_file_threshold_mb":    apd.largeFileThreshold / (1024 * 1024),
-		"small_file_window_minutes":  apd.smallFileWindow.Minutes(),
-		"medium_file_window_minutes": apd.mediumFileWindow.Minutes(),
-		"large_file_window_seconds":  apd.largeFileWindow.Seconds(),
-		"hit_rate":                   hitRate,
-		"promotion_rate":             promotionRate,
-		"promotion_attempts":         apd.promotionAttempts,
-		"promotion_successes":        apd.promotionSuccesses,
-		"fast_storage_accesses":      apd.fastStorageAccesses,
-		"fast_storage_hits":          apd.fastStorageHits,
-	}
-}
-
-// Global adaptive promotion decider instance
-var adaptivePromotionDecider *AdaptivePromotionDecider
-
-func init() {
-	adaptivePromotionDecider = NewAdaptivePromotionDecider()
-}
-
-// AdaptivePromotionDeciderFunc returns the adaptive promotion decision function
-func AdaptivePromotionDeciderFunc(fi *vfs.FileInfo, cs cachestate.CacheState) bool {
-	return adaptivePromotionDecider.ShouldPromote(fi, cs)
-}
-
-// RecordFastStorageAccess records fast storage access for adaptation
-func RecordFastStorageAccess() {
-	adaptivePromotionDecider.RecordFastStorageAccess()
-}
-
-// RecordFastStorageHit records fast storage hit for adaptation
-func RecordFastStorageHit() {
-	adaptivePromotionDecider.RecordFastStorageHit()
-}
-
-// GetPromotionStats returns promotion statistics for monitoring
-func GetPromotionStats() map[string]interface{} {
-	return adaptivePromotionDecider.GetStats()
-}
-
-// Helper functions for min/max operations
-func minInt64(a, b int64) int64 {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func maxInt64(a, b int64) int64 {
-	if a > b {
-		return a
-	}
-	return b
-}
-
-func minDuration(a, b time.Duration) time.Duration {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func maxDuration(a, b time.Duration) time.Duration {
-	if a > b {
-		return a
-	}
-	return b
-}
-
 // Ensure GCFS implements VFS.
 var _ vfs.VFS = (*GCFS)(nil)
 
 // GCFS is a virtual file system that calls a GC handler when the disk is full. The GC handler is responsible for freeing up space on the disk. The GCFS is a wrapper around another VFS.
 type GCFS struct {
 	vfs.VFS
-
+	multiplier   int
 	gcHanderFunc GCHandlerFunc
 }
 
 // GCHandlerFunc is a function that is called when the disk is full and the GCFS needs to free up space. It is passed the VFS and the size of the file that needs to be written. Its up to the implementation to free up space. How much space is freed is also up to the implementation.
-type GCHandlerFunc func(vfs vfs.VFS, size uint) error
+type GCHandlerFunc func(vfs vfs.VFS, size int)
 
-func New(vfs vfs.VFS, gcHandlerFunc GCHandlerFunc) *GCFS {
+func New(vfs vfs.VFS, multiplier int, gcHandlerFunc GCHandlerFunc) *GCFS {
 	return &GCFS{
 		VFS:          vfs,
+		multiplier:   multiplier,
 		gcHanderFunc: gcHandlerFunc,
 	}
 }
 
-// Create overrides the Create method of the VFS interface. It tries to create the key, if it fails due to disk full error, it calls the GC handler and tries again. If it still fails it returns the error.
+// Set overrides the Set method of the VFS interface. It tries to set the key and src, if it fails due to disk full error, it calls the GC handler and tries again. If it still fails it returns the error.
-func (g *GCFS) Create(key string, size int64) (io.WriteCloser, error) {
+func (g *GCFS) Set(key string, src []byte) error {
-	w, err := g.VFS.Create(key, size)                          // try to create the key
+	err := g.VFS.Set(key, src) // try to set the key and src
-	for err == vfserror.ErrDiskFull && g.gcHanderFunc != nil { // if the error is disk full and there is a GC handler
+
-		errr := g.gcHanderFunc(g.VFS, uint(size)) // call the GC handler
+	if err == vfserror.ErrDiskFull && g.gcHanderFunc != nil { // if the error is disk full and there is a GC handler
-		if errr == ErrInsufficientSpace {
+		g.gcHanderFunc(g.VFS, len(src)*g.multiplier) // call the GC handler
-			return nil, errr // if the GC handler returns no files to delete, return the error
+		err = g.VFS.Set(key, src)                    // try again after GC if it still fails return the error
-		}
-		w, err = g.VFS.Create(key, size)
 	}
 
-	if err != nil {
+	return err
-		if err == vfserror.ErrDiskFull {
-			logger.Logger.Error().Str("key", key).Int64("size", size).Msg("Failed to create file due to disk full, even after GC")
-		} else {
-			logger.Logger.Error().Str("key", key).Int64("size", size).Err(err).Msg("Failed to create file")
-		}
-	}
-
-	return w, err
 }
 
 func (g *GCFS) Name() string {

vfs/gc/gc_test.go

@@ -1,42 +1,111 @@
-// vfs/gc/gc_test.go
 package gc
 
 import (
+	"fmt"
+	"s1d3sw1ped/SteamCache2/vfs"
+	"s1d3sw1ped/SteamCache2/vfs/memory"
+	"sort"
 	"testing"
+	"time"
+
+	"golang.org/x/exp/rand"
 )
 
-func TestGetGCAlgorithm(t *testing.T) {
+func TestGCSmallRandom(t *testing.T) {
-	tests := []struct {
+	t.Parallel()
-		name      string
-		algorithm GCAlgorithm
-		expected  bool // true if we expect a non-nil function
-	}{
-		{"LRU", LRU, true},
-		{"LFU", LFU, true},
-		{"FIFO", FIFO, true},
-		{"Largest", Largest, true},
-		{"Smallest", Smallest, true},
-		{"Hybrid", Hybrid, true},
-		{"Unknown", "unknown", true}, // should fall back to LRU
-		{"Empty", "", true},          // should fall back to LRU
-	}
 
-	for _, tt := range tests {
+	m := memory.New(1024 * 1024 * 16)
-		t.Run(tt.name, func(t *testing.T) {
+	gc := New(m, 10, func(vfs vfs.VFS, size int) {
-			fn := GetGCAlgorithm(tt.algorithm)
+		tstart := time.Now()
-			if fn == nil {
+		deletions := 0
-				t.Errorf("GetGCAlgorithm(%s) returned nil, expected non-nil function", tt.algorithm)
+		targetreclaim := int64(size)
-			}
+		var reclaimed int64
+
+		t.Logf("GC starting to reclaim %d bytes", targetreclaim)
+
+		stats := vfs.StatAll()
+		sort.Slice(stats, func(i, j int) bool {
+			// Sort by access time so we can remove the oldest files first.
+			return stats[i].AccessTime().Before(stats[j].AccessTime())
 		})
+
+		// Delete the oldest files until we've reclaimed enough space.
+		for _, s := range stats {
+			sz := s.Size() // Get the size of the file
+			err := vfs.Delete(s.Name())
+			if err != nil {
+				panic(err)
+			}
+			reclaimed += sz // Track how much space we've reclaimed
+			deletions++     // Track how many files we've deleted
+
+			// t.Logf("GC deleting %s, %v", s.Name(), s.AccessTime().Format(time.RFC3339Nano))
+
+			if reclaimed >= targetreclaim { // We've reclaimed enough space
+				break
+			}
+		}
+
+		t.Logf("GC took %v to reclaim %d bytes by deleting %d files", time.Since(tstart), reclaimed, deletions)
+	})
+
+	for i := 0; i < 10000; i++ {
+		if err := gc.Set(fmt.Sprintf("key:%d", i), genRandomData(1024*1, 1024*4)); err != nil {
+			t.Errorf("Set failed: %v", err)
+		}
+	}
+
+	if gc.Size() > 1024*1024*16 {
+		t.Errorf("MemoryFS size is %d, want <= 1024", m.Size())
 	}
 }
 
-func TestGCAlgorithmConstants(t *testing.T) {
+func genRandomData(min int, max int) []byte {
-	expectedAlgorithms := []GCAlgorithm{LRU, LFU, FIFO, Largest, Smallest, Hybrid}
+	data := make([]byte, rand.Intn(max-min)+min)
+	rand.Read(data)
+	return data
+}
 
-	for _, algo := range expectedAlgorithms {
+func TestGCLargeRandom(t *testing.T) {
-		if algo == "" {
+	t.Parallel()
-			t.Errorf("GC algorithm constant is empty")
+
+	m := memory.New(1024 * 1024 * 16) // 16MB
+	gc := New(m, 10, func(vfs vfs.VFS, size int) {
+		tstart := time.Now()
+		deletions := 0
+		targetreclaim := int64(size)
+		var reclaimed int64
+
+		t.Logf("GC starting to reclaim %d bytes", targetreclaim)
+
+		stats := vfs.StatAll()
+		sort.Slice(stats, func(i, j int) bool {
+			// Sort by access time so we can remove the oldest files first.
+			return stats[i].AccessTime().Before(stats[j].AccessTime())
+		})
+
+		// Delete the oldest files until we've reclaimed enough space.
+		for _, s := range stats {
+			sz := s.Size() // Get the size of the file
+			vfs.Delete(s.Name())
+			reclaimed += sz // Track how much space we've reclaimed
+			deletions++     // Track how many files we've deleted
+
+			if reclaimed >= targetreclaim { // We've reclaimed enough space
+				break
 			}
 		}
+
+		t.Logf("GC took %v to reclaim %d bytes by deleting %d files", time.Since(tstart), reclaimed, deletions)
+	})
+
+	for i := 0; i < 10000; i++ {
+		if err := gc.Set(fmt.Sprintf("key:%d", i), genRandomData(1024, 1024*1024)); err != nil {
+			t.Errorf("Set failed: %v", err)
+		}
+	}
+
+	if gc.Size() > 1024*1024*16 {
+		t.Errorf("MemoryFS size is %d, want <= 1024", m.Size())
+	}
 }

vfs/memory/memory.go

@@ -1,49 +1,10 @@
-// vfs/memory/memory.go
 package memory
 
 import (
-	"bytes"
-	"container/list"
-	"io"
-	"s1d3sw1ped/SteamCache2/steamcache/logger"
 	"s1d3sw1ped/SteamCache2/vfs"
 	"s1d3sw1ped/SteamCache2/vfs/vfserror"
 	"sync"
 	"time"
-
-	"github.com/docker/go-units"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-)
-
-var (
-	memoryCapacityBytes = promauto.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "memory_cache_capacity_bytes",
-			Help: "Total capacity of the memory cache in bytes",
-		},
-	)
-
-	memorySizeBytes = promauto.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "memory_cache_size_bytes",
-			Help: "Total size of the memory cache in bytes",
-		},
-	)
-
-	memoryReadBytes = promauto.NewCounter(
-		prometheus.CounterOpts{
-			Name: "memory_cache_read_bytes_total",
-			Help: "Total number of bytes read from the memory cache",
-		},
-	)
-
-	memoryWriteBytes = promauto.NewCounter(
-		prometheus.CounterOpts{
-			Name: "memory_cache_write_bytes_total",
-			Help: "Total number of bytes written to the memory cache",
-		},
-	)
 )
 
 // Ensure MemoryFS implements VFS.
@@ -59,74 +20,16 @@ type file struct {
 type MemoryFS struct {
 	files    map[string]*file
 	capacity int64
-	size     int64
+	mu       sync.Mutex
-	mu       sync.RWMutex
-	keyLocks sync.Map // map[string]*sync.RWMutex
-	LRU      *lruList
-}
-
-// lruList for LRU eviction
-type lruList struct {
-	list *list.List
-	elem map[string]*list.Element
-}
-
-func newLruList() *lruList {
-	return &lruList{
-		list: list.New(),
-		elem: make(map[string]*list.Element),
-	}
-}
-
-func (l *lruList) MoveToFront(key string) {
-	if e, ok := l.elem[key]; ok {
-		l.list.MoveToFront(e)
-	}
-}
-
-func (l *lruList) Add(key string, fi *vfs.FileInfo) *list.Element {
-	e := l.list.PushFront(fi)
-	l.elem[key] = e
-	return e
-}
-
-func (l *lruList) Remove(key string) {
-	if e, ok := l.elem[key]; ok {
-		l.list.Remove(e)
-		delete(l.elem, key)
-	}
-}
-
-func (l *lruList) Back() *vfs.FileInfo {
-	if e := l.list.Back(); e != nil {
-		return e.Value.(*vfs.FileInfo)
-	}
-	return nil
 }
 
 // New creates a new MemoryFS.
 func New(capacity int64) *MemoryFS {
-	if capacity <= 0 {
+	return &MemoryFS{
-		panic("memory capacity must be greater than 0") // panic if the capacity is less than or equal to 0
-	}
-
-	logger.Logger.Info().
-		Str("name", "MemoryFS").
-		Str("capacity", units.HumanSize(float64(capacity))).
-		Msg("init")
-
-	mfs := &MemoryFS{
 		files:    make(map[string]*file),
 		capacity: capacity,
-		mu:       sync.RWMutex{},
+		mu:       sync.Mutex{},
-		keyLocks: sync.Map{},
-		LRU:      newLruList(),
 	}
-
-	memoryCapacityBytes.Set(float64(capacity))
-	memorySizeBytes.Set(float64(mfs.Size()))
-
-	return mfs
 }
 
 func (m *MemoryFS) Capacity() int64 {
@@ -138,118 +41,74 @@ func (m *MemoryFS) Name() string {
 }
 
 func (m *MemoryFS) Size() int64 {
-	m.mu.RLock()
+	var size int64
-	defer m.mu.RUnlock()
-	return m.size
-}
 
-func (m *MemoryFS) getKeyLock(key string) *sync.RWMutex {
-	mu, _ := m.keyLocks.LoadOrStore(key, &sync.RWMutex{})
-	return mu.(*sync.RWMutex)
-}
-
-func (m *MemoryFS) Create(key string, size int64) (io.WriteCloser, error) {
-	m.mu.RLock()
-	if m.capacity > 0 {
-		if m.size+size > m.capacity {
-			m.mu.RUnlock()
-			return nil, vfserror.ErrDiskFull
-		}
-	}
-	m.mu.RUnlock()
-
-	keyMu := m.getKeyLock(key)
-	keyMu.Lock()
-	defer keyMu.Unlock()
-
-	buf := &bytes.Buffer{}
-
-	return &memWriteCloser{
-		Writer: buf,
-		onClose: func() error {
-			data := buf.Bytes()
 	m.mu.Lock()
-			if f, exists := m.files[key]; exists {
+	defer m.mu.Unlock()
-				m.size -= int64(len(f.data))
-				m.LRU.Remove(key)
-			}
-			fi := vfs.NewFileInfo(key, int64(len(data)), time.Now())
-			m.files[key] = &file{
-				fileinfo: fi,
-				data:     data,
-			}
-			m.LRU.Add(key, fi)
-			m.size += int64(len(data))
-			m.mu.Unlock()
 
-			memoryWriteBytes.Add(float64(len(data)))
+	for _, v := range m.files {
-			memorySizeBytes.Set(float64(m.Size()))
+		size += int64(len(v.data))
+	}
+
+	return size
+}
+
+func (m *MemoryFS) Set(key string, src []byte) error {
+	if m.capacity > 0 {
+		if size := m.Size() + int64(len(src)); size > m.capacity {
+			return vfserror.ErrDiskFull
+		}
+	}
+
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	m.files[key] = &file{
+		fileinfo: vfs.NewFileInfo(
+			key,
+			int64(len(src)),
+			time.Now(),
+		),
+		data: make([]byte, len(src)),
+	}
+	copy(m.files[key].data, src)
 
 	return nil
-		},
-	}, nil
-}
-
-type memWriteCloser struct {
-	io.Writer
-	onClose func() error
-}
-
-func (wc *memWriteCloser) Close() error {
-	return wc.onClose()
 }
 
 func (m *MemoryFS) Delete(key string) error {
-	keyMu := m.getKeyLock(key)
+	_, err := m.Stat(key)
-	keyMu.Lock()
+	if err != nil {
-	defer keyMu.Unlock()
+		return err
+	}
 
 	m.mu.Lock()
-	f, exists := m.files[key]
+	defer m.mu.Unlock()
-	if !exists {
-		m.mu.Unlock()
-		return vfserror.ErrNotFound
-	}
-	m.size -= int64(len(f.data))
-	m.LRU.Remove(key)
-	delete(m.files, key)
-	m.mu.Unlock()
 
-	memorySizeBytes.Set(float64(m.Size()))
+	delete(m.files, key)
 
 	return nil
 }
 
-func (m *MemoryFS) Open(key string) (io.ReadCloser, error) {
+func (m *MemoryFS) Get(key string) ([]byte, error) {
-	keyMu := m.getKeyLock(key)
+	_, err := m.Stat(key)
-	keyMu.RLock()
+	if err != nil {
-	defer keyMu.RUnlock()
+		return nil, err
+	}
 
 	m.mu.Lock()
-	f, exists := m.files[key]
+	defer m.mu.Unlock()
-	if !exists {
-		m.mu.Unlock()
-		return nil, vfserror.ErrNotFound
-	}
-	f.fileinfo.ATime = time.Now()
-	m.LRU.MoveToFront(key)
-	dataCopy := make([]byte, len(f.data))
-	copy(dataCopy, f.data)
-	m.mu.Unlock()
 
-	memoryReadBytes.Add(float64(len(dataCopy)))
+	m.files[key].fileinfo.ATime = time.Now()
-	memorySizeBytes.Set(float64(m.Size()))
+	dst := make([]byte, len(m.files[key].data))
+	copy(dst, m.files[key].data)
 
-	return io.NopCloser(bytes.NewReader(dataCopy)), nil
+	return dst, nil
 }
 
 func (m *MemoryFS) Stat(key string) (*vfs.FileInfo, error) {
-	keyMu := m.getKeyLock(key)
+	m.mu.Lock()
-	keyMu.RLock()
+	defer m.mu.Unlock()
-	defer keyMu.RUnlock()
-
-	m.mu.RLock()
-	defer m.mu.RUnlock()
 
 	f, ok := m.files[key]
 	if !ok {
@@ -260,8 +119,8 @@ func (m *MemoryFS) Stat(key string) (*vfs.FileInfo, error) {
 }
 
 func (m *MemoryFS) StatAll() []*vfs.FileInfo {
-	m.mu.RLock()
+	m.mu.Lock()
-	defer m.mu.RUnlock()
+	defer m.mu.Unlock()
 
 	// hard copy the file info to prevent modification of the original file info or the other way around
 	files := make([]*vfs.FileInfo, 0, len(m.files))

vfs/memory/memory_test.go

@@ -1,129 +1,63 @@
-// vfs/memory/memory_test.go
 package memory
 
 import (
-	"errors"
 	"fmt"
-	"io"
 	"s1d3sw1ped/SteamCache2/vfs/vfserror"
 	"testing"
 )
 
-func TestCreateAndOpen(t *testing.T) {
+func TestAllMemory(t *testing.T) {
+	t.Parallel()
+
 	m := New(1024)
-	key := "key"
+	if err := m.Set("key", []byte("value")); err != nil {
-	value := []byte("value")
+		t.Errorf("Set failed: %v", err)
-
-	w, err := m.Create(key, int64(len(value)))
-	if err != nil {
-		t.Fatalf("Create failed: %v", err)
 	}
-	w.Write(value)
-	w.Close()
 
-	rc, err := m.Open(key)
+	if err := m.Set("key", []byte("value1")); err != nil {
-	if err != nil {
+		t.Errorf("Set failed: %v", err)
-		t.Fatalf("Open failed: %v", err)
 	}
-	got, _ := io.ReadAll(rc)
-	rc.Close()
 
-	if string(got) != string(value) {
+	if d, err := m.Get("key"); err != nil {
-		t.Fatalf("expected %s, got %s", value, got)
+		t.Errorf("Get failed: %v", err)
+	} else if string(d) != "value1" {
+		t.Errorf("Get failed: got %s, want %s", d, "value1")
+	}
+
+	if err := m.Delete("key"); err != nil {
+		t.Errorf("Delete failed: %v", err)
+	}
+
+	if _, err := m.Get("key"); err == nil {
+		t.Errorf("Get failed: got nil, want %v", vfserror.ErrNotFound)
+	}
+
+	if err := m.Delete("key"); err == nil {
+		t.Errorf("Delete failed: got nil, want %v", vfserror.ErrNotFound)
+	}
+
+	if _, err := m.Stat("key"); err == nil {
+		t.Errorf("Stat failed: got nil, want %v", vfserror.ErrNotFound)
+	}
+
+	if err := m.Set("key", []byte("value")); err != nil {
+		t.Errorf("Set failed: %v", err)
+	}
+
+	if _, err := m.Stat("key"); err != nil {
+		t.Errorf("Stat failed: %v", err)
 	}
 }
 
-func TestOverwrite(t *testing.T) {
+func TestLimited(t *testing.T) {
-	m := New(1024)
+	t.Parallel()
-	key := "key"
-	value1 := []byte("value1")
-	value2 := []byte("value2")
 
-	w, err := m.Create(key, int64(len(value1)))
-	if err != nil {
-		t.Fatalf("Create failed: %v", err)
-	}
-	w.Write(value1)
-	w.Close()
-
-	w, err = m.Create(key, int64(len(value2)))
-	if err != nil {
-		t.Fatalf("Create failed: %v", err)
-	}
-	w.Write(value2)
-	w.Close()
-
-	rc, err := m.Open(key)
-	if err != nil {
-		t.Fatalf("Open failed: %v", err)
-	}
-	got, _ := io.ReadAll(rc)
-	rc.Close()
-
-	if string(got) != string(value2) {
-		t.Fatalf("expected %s, got %s", value2, got)
-	}
-}
-
-func TestDelete(t *testing.T) {
-	m := New(1024)
-	key := "key"
-	value := []byte("value")
-
-	w, err := m.Create(key, int64(len(value)))
-	if err != nil {
-		t.Fatalf("Create failed: %v", err)
-	}
-	w.Write(value)
-	w.Close()
-
-	if err := m.Delete(key); err != nil {
-		t.Fatalf("Delete failed: %v", err)
-	}
-
-	_, err = m.Open(key)
-	if !errors.Is(err, vfserror.ErrNotFound) {
-		t.Fatalf("expected %v, got %v", vfserror.ErrNotFound, err)
-	}
-}
-
-func TestCapacityLimit(t *testing.T) {
 	m := New(10)
 	for i := 0; i < 11; i++ {
-		w, err := m.Create(fmt.Sprintf("key%d", i), 1)
+		if err := m.Set(fmt.Sprintf("key%d", i), []byte("1")); err != nil && i < 10 {
-		if err != nil && i < 10 {
+			t.Errorf("Set failed: %v", err)
-			t.Errorf("Create failed: %v", err)
 		} else if i == 10 && err == nil {
-			t.Errorf("Create succeeded: got nil, want %v", vfserror.ErrDiskFull)
+			t.Errorf("Set succeeded: got nil, want %v", vfserror.ErrDiskFull)
-		}
-		if i < 10 {
-			w.Write([]byte("1"))
-			w.Close()
 		}
 	}
 }
-
-func TestStat(t *testing.T) {
-	m := New(1024)
-	key := "key"
-	value := []byte("value")
-
-	w, err := m.Create(key, int64(len(value)))
-	if err != nil {
-		t.Fatalf("Create failed: %v", err)
-	}
-	w.Write(value)
-	w.Close()
-
-	info, err := m.Stat(key)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if info == nil {
-		t.Fatal("expected file info to be non-nil")
-	}
-	if info.Size() != int64(len(value)) {
-		t.Errorf("expected size %d, got %d", len(value), info.Size())
-	}
-}

vfs/sync/sync.go

@@ -0,0 +1,76 @@
+package sync
+
+import (
+	"fmt"
+	"s1d3sw1ped/SteamCache2/vfs"
+	"sync"
+)
+
+// Ensure SyncFS implements VFS.
+var _ vfs.VFS = (*SyncFS)(nil)
+
+type SyncFS struct {
+	vfs vfs.VFS
+	mu  sync.RWMutex
+}
+
+func New(vfs vfs.VFS) *SyncFS {
+	return &SyncFS{
+		vfs: vfs,
+		mu:  sync.RWMutex{},
+	}
+}
+
+// Name returns the name of the file system.
+func (sfs *SyncFS) Name() string {
+	return fmt.Sprintf("SyncFS(%s)", sfs.vfs.Name())
+}
+
+// Size returns the total size of all files in the file system.
+func (sfs *SyncFS) Size() int64 {
+	sfs.mu.RLock()
+	defer sfs.mu.RUnlock()
+
+	return sfs.vfs.Size()
+}
+
+// Set sets the value of key as src.
+// Setting the same key multiple times, the last set call takes effect.
+func (sfs *SyncFS) Set(key string, src []byte) error {
+	sfs.mu.Lock()
+	defer sfs.mu.Unlock()
+
+	return sfs.vfs.Set(key, src)
+}
+
+// Delete deletes the value of key.
+func (sfs *SyncFS) Delete(key string) error {
+	sfs.mu.Lock()
+	defer sfs.mu.Unlock()
+
+	return sfs.vfs.Delete(key)
+}
+
+// Get gets the value of key to dst, and returns dst no matter whether or not there is an error.
+func (sfs *SyncFS) Get(key string) ([]byte, error) {
+	sfs.mu.RLock()
+	defer sfs.mu.RUnlock()
+
+	return sfs.vfs.Get(key)
+}
+
+// Stat returns the FileInfo of key.
+func (sfs *SyncFS) Stat(key string) (*vfs.FileInfo, error) {
+	sfs.mu.RLock()
+	defer sfs.mu.RUnlock()
+
+	return sfs.vfs.Stat(key)
+}
+
+// StatAll returns the FileInfo of all keys.
+func (sfs *SyncFS) StatAll() []*vfs.FileInfo {
+	sfs.mu.RLock()
+	defer sfs.mu.RUnlock()
+
+	return sfs.vfs.StatAll()
+}

vfs/vfs.go

@@ -1,8 +1,5 @@
-// vfs/vfs.go
 package vfs
 
-import "io"
-
 // VFS is the interface that wraps the basic methods of a virtual file system.
 type VFS interface {
 	// Name returns the name of the file system.
@@ -11,14 +8,15 @@ type VFS interface {
 	// Size returns the total size of all files in the file system.
 	Size() int64
 
-	// Create creates a new file at key with expected size.
+	// Set sets the value of key as src.
-	Create(key string, size int64) (io.WriteCloser, error)
+	// Setting the same key multiple times, the last set call takes effect.
+	Set(key string, src []byte) error
 
 	// Delete deletes the value of key.
 	Delete(key string) error
 
-	// Open opens the file at key.
+	// Get gets the value of key to dst, and returns dst no matter whether or not there is an error.
-	Open(key string) (io.ReadCloser, error)
+	Get(key string) ([]byte, error)
 
 	// Stat returns the FileInfo of key.
 	Stat(key string) (*FileInfo, error)

vfs/vfserror/vfserror.go

@@ -1,12 +1,8 @@
-// vfs/vfserror/vfserror.go
 package vfserror
 
 import "errors"
 
 var (
-	// ErrInvalidKey is returned when a key is invalid.
-	ErrInvalidKey = errors.New("vfs: invalid key")
-
 	// ErrUnreachable is returned when a code path is unreachable.
 	ErrUnreachable = errors.New("unreachable")