Rewrite rhy to call github direct

Signed-off-by: Jacob Abel <[e-mail]>

kernel/util/cloud.go

···
 	return northAmericaForumAssetsServer
 }
 
+func GetGitHubApiEndpoint() string {
+	return GitHubApiEndpoint
+}
+
+func GetGitHubSiyuanRepo() string {
+	return GitHubSiyuanRepo
+}
+
+func GetGitHubBazaarRepo() string {
+	return GitHubBazaarRepo
+}
+
+func GetGitHubBazaarBranch() string {
+	return GitHubBazaarBranch
+}
+
 const (
 	chinaServer            = "https://chinaServer.invalid"             // 中国大陆云端服务地址，阿里云负载均衡，用于接口（数据同步文件上传、下载会走七牛云 OSS ChinaSyncServer）
 	chinaWebSocketServer   = "wss://chinaWebSocketServer.invalid"      // 中国大陆云端服务地址，阿里云负载均衡，用于接口（数据同步文件上传、下载会走七牛云 OSS ChinaSyncServer）
···
 	northAmericaCloudAssetsServer = "https://northAmericaCloudAssetsServer.invalid/" // 北美云端图床服务地址，用于导出预览模式下订阅会员渲染图床
 	northAmericaAccountServer     = "https://northAmericaAccountServer.invalid"      // 流云服务地址，用于账号登录、分享发布帖子
 	northAmericaForumAssetsServer = "https://northAmericaForumAssetsServer.invalid/" // 北美云端图床服务地址，用于发布文章到社区
+
+	GitHubApiEndpoint = "https://api.github.com"
+	GitHubSiyuanRepo = "siyuan-note/siyuan"
+	GitHubBazaarRepo = "siyuan-note/bazaar"
+	GitHubBazaarBranch = "main"
 
 	BazaarStatServer = "https://bazaar.b3logfile.com" // 集市包统计服务地址，七牛云，全球 CDN
 	BazaarOSSServer  = "https://oss.b3logfile.com"    // 云端对象存储地址，七牛云，仅用于读取集市包，全球 CDN

kernel/util/rhy.go

···
 	"sync"
 	"time"
 
+	"github.com/imroc/req/v3"
 	"github.com/siyuan-note/httpclient"
 	"github.com/siyuan-note/logging"
 )
 
+
+var cachedBazaarResult = map[string]interface{}{}
+var bazaarResultCacheTime int64
+
+//var cachedReleaseResult = map[string]interface{}{}
+//var releaseResultCacheTime int64
+
+var aggregateResultCacheTime int64
+var rhyResultLock = sync.Mutex{}
 var cachedRhyResult = map[string]interface{}{}
-var rhyResultCacheTime int64
-var rhyResultLock = sync.Mutex{}
+
+func NewGitHubApiRequest() *req.Request {
+	return httpclient.NewCloudRequest30s().SetHeader("Accept", "application/vnd.github+json").SetHeader("X-GitHub-Api-Version", "2022-11-28")
+}
+
+// Query GitHub Releases for the Client
+//func GetReleaseResult(force bool, cacheDuration int64) (map[string]interface{}, error) {
+//
+//	now := time.Now().Unix()
+//	if cacheDuration >= now - releaseResultCacheTime && !force && 0 < len(cachedReleaseResult) {
+//		return cachedRhyResult, nil
+//	}
+//
+//	request := NewGitHubApiRequest()
+//	resp, err := request.SetSuccessResult(&cachedReleaseResult).Get(GetGitHubApiEndpoint() + "/repo/" + GetGitHubSiyuanRepo() + "/releases/tags/v" + Ver)
+//	if err != nil {
+//		logging.LogErrorf("GitHub Release: query failed: %s", err)
+//		return nil, err
+//	}
+//	if 200 != resp.StatusCode {
+//		msg := fmt.Sprintf("GitHub Release: query failed: %d", resp.StatusCode)
+//		logging.LogErrorf(msg)
+//		return nil, errors.New(msg)
+//	}
+//	releaseResultCacheTime = now
+//	return cachedReleaseResult, nil
+//}
+
+// Query the GitHub Bazaar Repo's Main Branch
+func GetBazaarResult(force bool, cacheDuration int64) (map[string]interface{}, error) {
+
+	now := time.Now().Unix()
+	if cacheDuration >= now - bazaarResultCacheTime && !force && 0 < len(cachedBazaarResult) {
+		return cachedBazaarResult, nil
+	}
+
+	uri := GetGitHubApiEndpoint() + "/repos/" + GetGitHubBazaarRepo() + "/branches/" + GetGitHubBazaarBranch()
+	request := NewGitHubApiRequest()
+	resp, err := request.SetSuccessResult(&cachedBazaarResult).Get(uri)
+	if err != nil {
+		logging.LogErrorf("GitHub Bazaar: query failed: %s", err)
+		return nil, err
+	}
+	if 200 != resp.StatusCode {
+		msg := fmt.Sprintf("GitHub Bazaar: query failed with code: %d", resp.StatusCode)
+		logging.LogErrorf(msg)
+		return nil, errors.New(msg)
+	}
+	bazaarResultCacheTime = now
+	return cachedBazaarResult, nil
+}
 
+// Function Replaced to Directly Query Github.
 func GetRhyResult(force bool) (map[string]interface{}, error) {
+
 	rhyResultLock.Lock()
 	defer rhyResultLock.Unlock()
 
···
 	if ContainerDocker == Container {
 		cacheDuration = int64(3600 * 24)
 	}
-
 	now := time.Now().Unix()
-	if cacheDuration >= now-rhyResultCacheTime && !force && 0 < len(cachedRhyResult) {
+	if cacheDuration >= now - aggregateResultCacheTime && !force && 0 < len(cachedBazaarResult) {
 		return cachedRhyResult, nil
 	}
 
-	request := httpclient.NewCloudRequest30s()
-	resp, err := request.SetSuccessResult(&cachedRhyResult).Get(GetCloudServer() + "/apis/siyuan/version?ver=" + Ver)
-	if err != nil {
-		logging.LogErrorf("get version info failed: %s", err)
-		return nil, err
+	//respRelease, errRelease := GetReleaseResult(force, cacheDuration)
+	//if errRelease != nil {
+	//	nil, errRelease
+	//}
+
+	respBazaar, errBazaar := GetBazaarResult(force, cacheDuration)
+	if errBazaar != nil {
+		return nil, errBazaar
 	}
-	if 200 != resp.StatusCode {
-		msg := fmt.Sprintf("get rhy result failed: %d", resp.StatusCode)
-		logging.LogErrorf(msg)
-		return nil, errors.New(msg)
-	}
-	rhyResultCacheTime = now
+
+	cachedRhyResult = make(map[string]interface{})
+	cachedRhyResult["bazaar"] = respBazaar["commit"].(map[string]interface{})["sha"]
+
+	//aggregateResultCacheTime = min(releaseResultCacheTime, bazaarResultCacheTime)
+	aggregateResultCacheTime = bazaarResultCacheTime
 	return cachedRhyResult, nil
 }