From f524c33ee6213b3b836f0b4821f6824871d67073 Mon Sep 17 00:00:00 2001
From: lihan <lihan@apache.org>
Date: Mon, 13 May 2024 17:36:12 +0800
Subject: [PATCH] fix: use `map` to cache all `Available` results, not only
 AvailableHookResults

---
 internal/plugin.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/plugin.go b/internal/plugin.go
index 59c2e117..55b02c83 100644
--- a/internal/plugin.go
+++ b/internal/plugin.go
@@ -20,6 +20,7 @@ import (
 	_ "embed"
 	"errors"
 	"fmt"
+	"os"
 	"path/filepath"
 	"regexp"
 
@@ -541,12 +542,17 @@ func NewLuaPlugin(pluginDirPath string, manager *Manager) (*LuaPlugin, error) {
 		source.pluginObj.RawSetString("Available", vm.Instance.NewFunction(func(L *lua.LState) int {
 			ctxTable := L.CheckTable(2)
 
+			cachePath := filepath.Join(pluginDirPath, "available.cache")
 			invokeAvailableHook := func() int {
 				logger.Debugf("Calling the original Available hook. \n")
 				if err := vm.CallFunction(targetHook, PLUGIN, ctxTable); err != nil {
 					L.RaiseError(err.Error())
 					return 0
 				}
+				if util.FileExists(cachePath) {
+					logger.Debugf("Removing the old cache file: %s \n", cachePath)
+					_ = os.Remove(cachePath)
+				}
 				table := source.vm.ReturnedValue()
 				L.Push(table)
 				return 1
@@ -568,14 +574,14 @@ func NewLuaPlugin(pluginDirPath string, manager *Manager) (*LuaPlugin, error) {
 			if cacheKey == "" {
 				cacheKey = "empty"
 			}
-			fileCache, err := cache.NewFileCache(filepath.Join(pluginDirPath, "available.cache"))
+			fileCache, err := cache.NewFileCache(cachePath)
 			if err != nil {
 				return invokeAvailableHook()
 			}
 			cacheValue, ok := fileCache.Get(cacheKey)
 			logger.Debugf("Available hook cache key: %s, hit: %v \n", cacheKey, ok)
 			if ok {
-				hookResult := AvailableHookResult{}
+				var hookResult []map[string]interface{}
 				if err = cacheValue.Unmarshal(&hookResult); err != nil {
 					return invokeAvailableHook()
 				}
@@ -595,7 +601,7 @@ func NewLuaPlugin(pluginDirPath string, manager *Manager) (*LuaPlugin, error) {
 					fileCache.Set(cacheKey, nil, cache.ExpireTime(config.Cache.AvailableHookDuration))
 					_ = fileCache.Close()
 				} else {
-					hookResult := AvailableHookResult{}
+					var hookResult []map[string]interface{}
 					if err = luai.Unmarshal(table, &hookResult); err == nil {
 						if value, err := cache.NewValue(hookResult); err == nil {
 							fileCache.Set(cacheKey, value, cache.ExpireTime(config.Cache.AvailableHookDuration))