${window.siyuan.languages.systemLog}
@@ -339,6 +347,12 @@ export const about = {
});
});
});
+ const downloadInstallPkgElement = about.element.querySelector("#downloadInstallPkg") as HTMLInputElement;
+ downloadInstallPkgElement.addEventListener("change", () => {
+ fetchPost("/api/system/setDownloadInstallPkg", {downloadInstallPkg: downloadInstallPkgElement.checked}, () => {
+ window.siyuan.config.system.downloadInstallPkg = downloadInstallPkgElement.checked
+ });
+ });
about.element.querySelector("#aboutConfim").addEventListener("click", () => {
fetchPost("/api/system/setNetworkProxy", {
scheme: (about.element.querySelector("#aboutScheme") as HTMLInputElement).value,
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index 43f2a2373..46579cd3d 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -304,6 +304,7 @@ declare interface IConfig {
xanadu: boolean
udanax: boolean
uploadErrLog: boolean
+ downloadInstallPkg: boolean
networkServe: boolean
useExistingDB: boolean
}
diff --git a/kernel/api/router.go b/kernel/api/router.go
index a207d9100..d6e4f8b6c 100644
--- a/kernel/api/router.go
+++ b/kernel/api/router.go
@@ -40,6 +40,7 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/system/setAccessAuthCode", model.CheckAuth, setAccessAuthCode)
ginServer.Handle("POST", "/api/system/setNetworkServe", model.CheckAuth, setNetworkServe)
ginServer.Handle("POST", "/api/system/setUploadErrLog", model.CheckAuth, setUploadErrLog)
+ ginServer.Handle("POST", "/api/system/setDownloadInstallPkg", model.CheckAuth, setDownloadInstallPkg)
ginServer.Handle("POST", "/api/system/setNetworkProxy", model.CheckAuth, setNetworkProxy)
ginServer.Handle("POST", "/api/system/setWorkspaceDir", model.CheckAuth, setWorkspaceDir)
ginServer.Handle("POST", "/api/system/listWorkspaceDirs", model.CheckAuth, listWorkspaceDirs)
diff --git a/kernel/api/system.go b/kernel/api/system.go
index aaf7d136b..a97c94403 100644
--- a/kernel/api/system.go
+++ b/kernel/api/system.go
@@ -291,6 +291,20 @@ func setUploadErrLog(c *gin.Context) {
time.Sleep(time.Second * 3)
}
+func setDownloadInstallPkg(c *gin.Context) {
+ ret := gulu.Ret.NewResult()
+ defer c.JSON(http.StatusOK, ret)
+
+ arg, ok := util.JsonArg(c, ret)
+ if !ok {
+ return
+ }
+
+ downloadInstallPkg := arg["downloadInstallPkg"].(bool)
+ model.Conf.System.DownloadInstallPkg = downloadInstallPkg
+ model.Conf.Save()
+}
+
func setNetworkProxy(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
diff --git a/kernel/conf/system.go b/kernel/conf/system.go
index 2b2ae2308..9e47bf5b4 100644
--- a/kernel/conf/system.go
+++ b/kernel/conf/system.go
@@ -36,14 +36,16 @@ type System struct {
NetworkServe bool `json:"networkServe"`
NetworkProxy *NetworkProxy `json:"networkProxy"`
- UploadErrLog bool `json:"uploadErrLog"`
+ UploadErrLog bool `json:"uploadErrLog"`
+ DownloadInstallPkg bool `json:"downloadInstallPkg"`
}
func NewSystem() *System {
return &System{
- ID: util.GetDeviceID(),
- KernelVersion: util.Ver,
- NetworkProxy: &NetworkProxy{},
+ ID: util.GetDeviceID(),
+ KernelVersion: util.Ver,
+ NetworkProxy: &NetworkProxy{},
+ DownloadInstallPkg: true,
}
}
diff --git a/kernel/main.go b/kernel/main.go
index aea697819..58f043df6 100644
--- a/kernel/main.go
+++ b/kernel/main.go
@@ -46,7 +46,7 @@ func main() {
go model.HookResident()
util.SetBooted()
util.ClearPushProgress(100)
- go model.AutoRefreshUser()
+ go model.AutoRefreshCheck()
go model.AutoFlushTx()
go sql.AutoFlushTreeQueue()
go treenode.AutoFlushBlockTree()
diff --git a/kernel/mobile/kernel.go b/kernel/mobile/kernel.go
index 24866015d..f63b1148f 100644
--- a/kernel/mobile/kernel.go
+++ b/kernel/mobile/kernel.go
@@ -59,7 +59,7 @@ func StartKernel(container, appDir, workspaceDir, nativeLibDir, privateDataDir,
go model.AutoStat()
util.SetBooted()
util.ClearPushProgress(100)
- go model.AutoRefreshUser()
+ go model.AutoRefreshCheck()
go model.AutoFlushTx()
go sql.AutoFlushTreeQueue()
go treenode.AutoFlushBlockTree()
diff --git a/kernel/model/liandi.go b/kernel/model/liandi.go
index e527774d5..4c9e26166 100644
--- a/kernel/model/liandi.go
+++ b/kernel/model/liandi.go
@@ -144,11 +144,11 @@ func LoadUploadToken() (err error) {
}
var (
- refreshUserTicker = time.NewTicker(2 * time.Hour)
+ refreshCheckTicker = time.NewTicker(2 * time.Hour)
subscriptionExpirationReminded bool
)
-func AutoRefreshUser() {
+func AutoRefreshCheck() {
for {
if !subscriptionExpirationReminded {
subscriptionExpirationReminded = true
@@ -235,7 +235,12 @@ func AutoRefreshUser() {
}
}()
- <-refreshUserTicker.C
+ go func() {
+ defer logging.Recover()
+ checkDownloadInstallPkg()
+ }()
+
+ <-refreshCheckTicker.C
}
}
diff --git a/kernel/model/updater.go b/kernel/model/updater.go
index 3793d8d8c..03d833618 100644
--- a/kernel/model/updater.go
+++ b/kernel/model/updater.go
@@ -17,16 +17,111 @@
package model
import (
+ "bufio"
+ "crypto/sha256"
"fmt"
- "sync"
+ "io"
+ "os"
+ "path/filepath"
+ "runtime"
+ "github.com/88250/gulu"
+ "github.com/imroc/req/v3"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/util"
)
-var (
- checkUpdateLock = &sync.Mutex{}
-)
+func checkDownloadInstallPkg() {
+ if !Conf.System.DownloadInstallPkg {
+ return
+ }
+
+ result, err := util.GetRhyResult(false)
+ if nil != err {
+ return
+ }
+
+ installPkgSite := result["installPkg"].(string)
+ ver := result["ver"].(string)
+ if ver == util.Ver {
+ return
+ }
+
+ var suffix string
+ if gulu.OS.IsWindows() {
+ if "386" == runtime.GOARCH {
+ suffix = "win32.exe"
+ } else {
+ suffix = "win.exe"
+ }
+ } else if gulu.OS.IsDarwin() {
+ if "arm64" == runtime.GOARCH {
+ suffix = "mac-arm64.dmg"
+ } else {
+ suffix = "mac.dmg"
+ }
+ } else if gulu.OS.IsLinux() {
+ suffix = "linux.AppImage"
+ }
+ pkg := "siyuan-" + ver + "-" + suffix
+ installPkg := "siyuan/" + pkg
+ downloadPkgURL := installPkgSite + installPkg
+ localPkgPath := filepath.Join(util.TempDir, "install", pkg)
+ checksums := result["checksums"].(map[string]interface{})
+ checksum := checksums[pkg].(string)
+
+ downloadInstallPkg(downloadPkgURL, checksum, localPkgPath)
+}
+
+func downloadInstallPkg(pkgURL, checksum, savePath string) {
+ if gulu.File.IsExist(savePath) {
+ localChecksum, _ := sha256Hash(savePath)
+ if localChecksum == checksum {
+ return
+ }
+ }
+
+ client := req.C()
+ callback := func(info req.DownloadInfo) {
+ logging.LogInfof("downloading install package from [%s] %.2f%%", pkgURL, float64(info.DownloadedSize)/float64(info.Response.ContentLength)*100.0)
+ }
+ resp, err := client.R().SetOutputFile(savePath).SetDownloadCallback(callback).Get(pkgURL)
+ if nil != err {
+ logging.LogErrorf("download install package failed: %s", err)
+ return
+ }
+ if 200 != resp.StatusCode {
+ logging.LogErrorf("download install package [%s] failed [sc=%d]", pkgURL, resp.StatusCode)
+ return
+ }
+ logging.LogInfof("downloaded install package [%s] to [%s]", pkgURL, savePath)
+ localChecksum, _ := sha256Hash(savePath)
+ if checksum != localChecksum {
+ logging.LogErrorf("verify checksum failed, download install package [%s] checksum [%s] not equal to downloaded [%s] checksum [%s]", pkgURL, checksum, savePath, localChecksum)
+ }
+}
+
+func sha256Hash(filename string) (ret string, err error) {
+ file, err := os.Open(filename)
+ if nil != err {
+ return
+ }
+ defer file.Close()
+
+ hash := sha256.New()
+ reader := bufio.NewReader(file)
+ buf := make([]byte, 1024*1024*4)
+ for {
+ switch n, readErr := reader.Read(buf); readErr {
+ case nil:
+ hash.Write(buf[:n])
+ case io.EOF:
+ return fmt.Sprintf("%x", hash.Sum(nil)), nil
+ default:
+ return "", err
+ }
+ }
+}
type Announcement struct {
Id string `json:"id"`
@@ -58,9 +153,6 @@ func CheckUpdate(showMsg bool) {
return
}
- checkUpdateLock.Lock()
- defer checkUpdateLock.Unlock()
-
result, err := util.GetRhyResult(showMsg)
if nil != err {
return