tcjlj/MeBox
1
0
Fork 0
mirror of https://github.com/truewhile/MeBox.git synced 2026-09-29 19:36:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix notification event toggles and license heartbeat

Browse Source
This commit is contained in:
ShukeBta
2026-06-17 20:35:11 +08:00
parent b128b4d11e
commit a0aeb07f03
12 changed files with 164 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/handler/license.go
+27 -7
View File
@@ -113,13 +113,28 @@ func licenseStatusHandler(svc *service.Container) gin.HandlerFunc {
if err == nil {
deviceID, idErr := ensureLicenseDeviceID(c.Request.Context(), svc, "")
if idErr == nil {
var upstream licenseServerStatusResp
if getErr := client.get(c.Request.Context(), "/api/v1/status/"+url.PathEscape(deviceID), &upstream); getErr == nil && upstream.Valid {
applyLicenseStatus(&state, upstream, deviceID)
_ = persistLicenseState(c.Request.Context(), svc, state)
} else if getErr == nil && !upstream.Valid {
state.Valid = false
deviceName, _ := svc.Repo.Setting.Get(c.Request.Context(), licenseDeviceNameSetting)
if strings.TrimSpace(deviceName) == "" {
deviceName = defaultLicenseDeviceName()
_ = svc.Repo.Setting.Set(c.Request.Context(), licenseDeviceNameSetting, deviceName)
}
var signed licenseServerSignedResp
if heartbeatErr := client.post(c.Request.Context(), "/api/v1/heartbeat", map[string]any{
"fingerprint": deviceID,
"instance_id": deviceID,
"device_name": deviceName,
}, &signed); heartbeatErr == nil && client.verifySigned(&signed) == nil {
state = licenseStateFromSigned(signed, deviceID, deviceName)
_ = persistLicenseState(c.Request.Context(), svc, state)
} else {
var upstream licenseServerStatusResp
if getErr := client.get(c.Request.Context(), "/api/v1/status/"+url.PathEscape(deviceID), &upstream); getErr == nil && upstream.Valid {
applyLicenseStatus(&state, upstream, deviceID)
_ = persistLicenseState(c.Request.Context(), svc, state)
} else if getErr == nil && !upstream.Valid {
state.Valid = false
_ = persistLicenseState(c.Request.Context(), svc, state)
}
}
}
}
@@ -146,10 +161,16 @@ func licenseHeartbeatHandler(svc *service.Container) gin.HandlerFunc {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
deviceName, _ := svc.Repo.Setting.Get(c.Request.Context(), licenseDeviceNameSetting)
if strings.TrimSpace(deviceName) == "" {
deviceName = defaultLicenseDeviceName()
_ = svc.Repo.Setting.Set(c.Request.Context(), licenseDeviceNameSetting, deviceName)
}
var upstream licenseServerSignedResp
if err := client.post(c.Request.Context(), "/api/v1/heartbeat", map[string]any{
"fingerprint": deviceID,
"instance_id": deviceID,
"device_name": deviceName,
}, &upstream); err != nil {
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
return
@@ -158,7 +179,6 @@ func licenseHeartbeatHandler(svc *service.Container) gin.HandlerFunc {
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
return
}
deviceName, _ := svc.Repo.Setting.Get(c.Request.Context(), licenseDeviceNameSetting)
state := licenseStateFromSigned(upstream, deviceID, deviceName)
if err := persistLicenseState(c.Request.Context(), svc, state); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})