🎨 Sync 2026-08-09 00:31:16

daed/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=daed
 PKG_VERSION:=2026.08.05
-PKG_RELEASE:=43
+PKG_RELEASE:=44
 
-PKG_SOURCE:=daed-src-2026.08.05-4cab0ccb366a.tar.gz
+PKG_SOURCE:=daed-src-2026.08.05-c389546b8c1f.tar.gz
 PKG_SOURCE_URL:=https://github.com/kenzok8/openwrt-daede/releases/download/daed-src
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_HASH:=skip
@@ -142,6 +142,9 @@ define Package/daed/install
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) $(CURDIR)/files/daed.init $(1)/etc/init.d/daed
+
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DATA) $(CURDIR)/files/daed.keep $(1)/lib/upgrade/keep.d/daed
 endef
 
 $(eval $(call GoBinPackage,daed))

daed/files/daed.keep

@@ -0,0 +1 @@
+/etc/daed/wing.db-wal

daed/patches/0006-daed-strictly-reconcile-subscription-updates.patch

@@ -1,6 +1,4 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kenzok8 <kenzok8@gmail.com>
-Date: Tue, 21 Jul 2026 02:53:42 +0800
 Subject: [PATCH] daed: strictly reconcile subscription updates
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

daed/patches/0008-daed-open-sqlite-database-in-WAL-mode.patch

@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+Subject: [PATCH] daed: open sqlite database in WAL mode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+订阅自动更新写库时，WebUI 登录查询被锁 5 秒后报 database is locked。
+
+开 WAL 并把 busy_timeout 提到 30 秒，读不再被写事务阻塞；WAL 附带的两个文件跟主库一样收紧到 0640。
+---
+ db/db.go                      | 17 ++++++++++++-----
+ pkg/sqlite/sqlite_mipsarch.go |  4 +++-
+ pkg/sqlite/sqlite_others.go   |  4 +++-
+ 3 files changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/db/db.go b/db/db.go
+index a79022b..6145443 100644
+--- a/db/db.go
++++ b/db/db.go
+@@ -50,13 +50,20 @@ func InitDatabase(configDir string) (err error) {
+ 	); err != nil {
+ 		return err
+ 	}
+-	if fi, err := os.Stat(path); err != nil {
+-		return err
+-	} else if fi.Mode()&0037 > 0 {
+-		// Too open, chmod it to 0640.
+-		if err = os.Chmod(path, 0640); err != nil {
++	for _, p := range []string{path, path + "-wal", path + "-shm"} {
++		fi, err := os.Stat(p)
++		if os.IsNotExist(err) {
++			continue
++		}
++		if err != nil {
+ 			return err
+ 		}
++		if fi.Mode()&0037 > 0 {
++			// Too open, chmod it to 0640.
++			if err = os.Chmod(p, 0640); err != nil {
++				return err
++			}
++		}
+ 	}
+ 
+ 	return nil
+diff --git a/pkg/sqlite/sqlite_mipsarch.go b/pkg/sqlite/sqlite_mipsarch.go
+index 7b8c1b4..8c275e5 100644
+--- a/pkg/sqlite/sqlite_mipsarch.go
++++ b/pkg/sqlite/sqlite_mipsarch.go
+@@ -10,6 +10,8 @@ import (
+ 	"gorm.io/gorm"
+ )
+ 
++const pragmas = "?_journal_mode=WAL&_busy_timeout=30000&_synchronous=FULL"
++
+ func Open(dsn string) gorm.Dialector {
+-	return sqlite.Open(dsn)
++	return sqlite.Open(dsn + pragmas)
+ }
+diff --git a/pkg/sqlite/sqlite_others.go b/pkg/sqlite/sqlite_others.go
+index 4598651..83d8b80 100644
+--- a/pkg/sqlite/sqlite_others.go
++++ b/pkg/sqlite/sqlite_others.go
+@@ -7,6 +7,8 @@ import (
+ 	"gorm.io/gorm"
+ )
+ 
++const pragmas = "?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(FULL)"
++
+ func Open(dsn string) gorm.Dialector {
+-	return sqlite.Open(dsn)
++	return sqlite.Open(dsn + pragmas)
+ }

daed/patches/0009-daed-reload-dae-outside-the-database-transaction.patch

@@ -0,0 +1,166 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+Subject: [PATCH] daed: reload dae outside the database transaction
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+配置生效前先提交读事务，reload 完再用短事务写运行状态。
+
+原来整个 reload 都在事务里，最长可占着数据库锁一百多秒；写状态时按 ID 重查仍存在的分组，避免把 reload 期间被删的分组重新插回去。
+---
+ graphql/service/config/mutation_utils.go | 77 ++++++++++++++++--------
+ 1 file changed, 53 insertions(+), 24 deletions(-)
+
+diff --git a/graphql/service/config/mutation_utils.go b/graphql/service/config/mutation_utils.go
+index feb94d3..59f0ebd 100644
+--- a/graphql/service/config/mutation_utils.go
++++ b/graphql/service/config/mutation_utils.go
+@@ -270,28 +270,12 @@ func restartAfterReloadTimeout() {
+ 	}()
+ }
+ 
+-func runTransaction(ctx context.Context, noLoad bool) (n int32, err error) {
+-	tx := db.BeginTx(ctx)
+-	if tx.Error != nil {
+-		return 0, tx.Error
+-	}
+-	n, err = runLocked(tx, noLoad)
+-	if err != nil {
+-		tx.Rollback()
+-		return 0, err
+-	}
+-	if err = tx.Commit().Error; err != nil {
+-		return 0, err
+-	}
+-	return n, nil
+-}
+-
+ func Run(ctx context.Context, noLoad bool) (n int32, err error) {
+ 	if ok := runLock.TryLock(); !ok {
+ 		return 0, fmt.Errorf("the last request didn't complete; make a cup of tea and take a break")
+ 	}
+ 	defer runLock.Unlock()
+-	return runTransaction(ctx, noLoad)
++	return runLocked(ctx, noLoad)
+ }
+ 
+ func ApplyIfRunning(ctx context.Context) error {
+@@ -307,11 +291,11 @@ func ApplyIfRunning(ctx context.Context) error {
+ 	if err != nil || !modified {
+ 		return err
+ 	}
+-	_, err = runTransaction(ctx, false)
++	_, err = runLocked(ctx, false)
+ 	return err
+ }
+ 
+-func runLocked(d *gorm.DB, noLoad bool) (n int32, err error) {
++func runLocked(ctx context.Context, noLoad bool) (n int32, err error) {
+ 	//// Dry run.
+ 	if noLoad {
+ 		ch := make(chan error)
+@@ -336,18 +320,38 @@ func runLocked(d *gorm.DB, noLoad bool) (n int32, err error) {
+ 		}
+ 
+ 		// Running -> false
++		tx := db.BeginTx(ctx)
++		if tx.Error != nil {
++			return 0, tx.Error
++		}
+ 		var sys db.System
+-		if err = d.Model(&db.System{}).FirstOrCreate(&sys).Error; err != nil {
++		if err = tx.Model(&db.System{}).FirstOrCreate(&sys).Error; err != nil {
++			tx.Rollback()
+ 			return 0, err
+ 		}
+-		if err = d.Model(&sys).Updates(map[string]interface{}{
++		if err = tx.Model(&sys).Updates(map[string]interface{}{
+ 			"running": false,
+ 		}).Error; err != nil {
++			tx.Rollback()
++			return 0, err
++		}
++		if err = tx.Commit().Error; err != nil {
+ 			return 0, err
+ 		}
+ 		return 1, nil
+ 	}
+ 
++	d := db.BeginTx(ctx)
++	if d.Error != nil {
++		return 0, d.Error
++	}
++	readTx := d
++	defer func() {
++		if readTx != nil {
++			readTx.Rollback()
++		}
++	}()
++
+ 	//// Run selected global+dns+routing.
+ 	/// Get them from database and parse them to daeConfig.
+ 	var mConfig db.Config
+@@ -513,6 +517,11 @@ func runLocked(d *gorm.DB, noLoad bool) (n int32, err error) {
+ 		c.Node = append(c.Node, daeConfig.KeyableString(fmt.Sprintf("%v:%v", node.uniqueName, node.dbNode.Link)))
+ 	}
+ 
++	if err = readTx.Commit().Error; err != nil {
++		return 0, err
++	}
++	readTx = nil
++
+ 	/// Reload with current config.
+ 	chReloadCallback := make(chan error)
+ 	reloadMsg := &dae.ReloadMessage{
+@@ -536,20 +545,37 @@ func runLocked(d *gorm.DB, noLoad bool) (n int32, err error) {
+ 	}
+ 
+ 	// Save running status
++	tx := db.BeginTx(context.WithoutCancel(ctx))
++	if tx.Error != nil {
++		return 0, tx.Error
++	}
++	defer func() {
++		if err != nil {
++			tx.Rollback()
++		}
++	}()
+ 	var sys db.System
+-	if err = d.Model(&db.System{}).FirstOrCreate(&sys).Error; err != nil {
++	if err = tx.Model(&db.System{}).FirstOrCreate(&sys).Error; err != nil {
+ 		return 0, err
+ 	}
+ 	var gvs uint
+ 	var gids []string
++	groupIds := make([]uint, 0, len(groups))
+ 	for _, g := range groups {
+ 		gvs += g.Version
+ 		gids = append(gids, fmt.Sprintf("%x", g.ID))
++		groupIds = append(groupIds, g.ID)
++	}
++	liveGroups := make([]db.Group, 0, len(groupIds))
++	if len(groupIds) > 0 {
++		if err = tx.Where("id IN ?", groupIds).Find(&liveGroups).Error; err != nil {
++			return 0, err
++		}
+ 	}
+ 	sort.Slice(gids, func(i, j int) bool {
+ 		return gids[i] < gids[j]
+ 	})
+-	if err = d.Model(&sys).Updates(map[string]interface{}{
++	if err = tx.Model(&sys).Updates(map[string]interface{}{
+ 		"running":                   true,
+ 		"running_config_id":         mConfig.ID,
+ 		"running_config_version":    mConfig.Version,
+@@ -562,7 +588,10 @@ func runLocked(d *gorm.DB, noLoad bool) (n int32, err error) {
+ 	}).Error; err != nil {
+ 		return 0, err
+ 	}
+-	if err = d.Model(&sys).Association("RunningGroups").Replace(groups); err != nil {
++	if err = tx.Model(&sys).Association("RunningGroups").Replace(liveGroups); err != nil {
++		return 0, err
++	}
++	if err = tx.Commit().Error; err != nil {
+ 		return 0, err
+ 	}
+ 

daed/patches/0010-daed-serialize-scheduled-subscription-updates.patch

@@ -0,0 +1,68 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+Subject: [PATCH] daed: serialize scheduled subscription updates
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+订阅更新的入口读也纳入同一把锁，整轮更新串行，排到才开始计时。
+
+多个订阅定时任务撞在同一分钟时会互相锁死。
+---
+ .../service/subscription/mutation_utils.go    | 29 +++++++++++++------
+ 1 file changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/graphql/service/subscription/mutation_utils.go b/graphql/service/subscription/mutation_utils.go
+index c6bc3e1..e2aec32 100644
+--- a/graphql/service/subscription/mutation_utils.go
++++ b/graphql/service/subscription/mutation_utils.go
+@@ -225,12 +225,8 @@ func AddUpdateScheduler(ctx context.Context, id uint) {
+ 		tag = *sub.Tag
+ 	}
+ 	logrus.Info("Subscription " + tag + " update task enabled, with exp " + sub.CronExp)
+-	_, err := s.Cron(sub.CronExp).Do(func() {
+-		ctx, cancel := context.WithTimeout(context.Background(), scheduledUpdateTimeout)
+-		defer cancel()
+-		if _, err := UpdateById(ctx, sub.ID); err != nil {
+-			logrus.Error(err)
+-		}
++	_, err := s.Cron(sub.CronExp).SingletonMode().Do(func() {
++		runScheduledUpdate(sub.ID)
+ 	})
+ 	if err != nil {
+ 		logrus.Errorf("Failed to schedule subscription %d update: invalid cron expression '%s': %v", sub.ID, sub.CronExp, err)
+@@ -364,9 +360,6 @@ func reconcileSubscriptionNodes(tx *gorm.DB, subId uint, links []string) error {
+ }
+ 
+ func updateSubscriptionTx(ctx context.Context, m *db.Subscription, subId uint, links []string) (err error) {
+-	subscriptionUpdateMu.Lock()
+-	defer subscriptionUpdateMu.Unlock()
+-
+ 	tx := db.BeginTx(ctx)
+ 	if tx.Error != nil {
+ 		return tx.Error
+@@ -404,7 +397,25 @@ func updateSubscriptionTx(ctx context.Context, m *db.Subscription, subId uint, l
+ 	return tx.Commit().Error
+ }
+ 
++func runScheduledUpdate(subId uint) {
++	subscriptionUpdateMu.Lock()
++	defer subscriptionUpdateMu.Unlock()
++
++	ctx, cancel := context.WithTimeout(context.Background(), scheduledUpdateTimeout)
++	defer cancel()
++	if _, err := updateByIdLocked(ctx, subId); err != nil {
++		logrus.Error(err)
++	}
++}
++
+ func UpdateById(ctx context.Context, subId uint) (sub *db.Subscription, err error) {
++	subscriptionUpdateMu.Lock()
++	defer subscriptionUpdateMu.Unlock()
++
++	return updateByIdLocked(ctx, subId)
++}
++
++func updateByIdLocked(ctx context.Context, subId uint) (sub *db.Subscription, err error) {
+ 	var m db.Subscription
+ 	if err = db.DB(ctx).Where(&db.Subscription{ID: subId}).First(&m).Error; err != nil {
+ 		return nil, err

daed/patches/0011-daed-apply-subscription-cron-changes-without-restart.patch

@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+Subject: [PATCH] daed: apply subscription cron changes without restart
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+改 cron 后先提交事务再重建调度器。
+
+原来在事务里就去重建，调度器另开连接读到的还是旧表达式，必须重启 daed 才生效。
+---
+ graphql/service/subscription/mutation_utils.go | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/graphql/service/subscription/mutation_utils.go b/graphql/service/subscription/mutation_utils.go
+index e2aec32..4f6bcfc 100644
+--- a/graphql/service/subscription/mutation_utils.go
++++ b/graphql/service/subscription/mutation_utils.go
+@@ -561,10 +561,12 @@ func UpdateCron(ctx context.Context, _id graphql.ID, cronExp string, cronEnable
+ 	}
+ 
+ 	tx := db.BeginTx(ctx)
++	if tx.Error != nil {
++		return nil, tx.Error
++	}
++	committed := false
+ 	defer func() {
+-		if err == nil {
+-			tx.Commit()
+-		} else {
++		if !committed {
+ 			tx.Rollback()
+ 		}
+ 	}()
+@@ -583,6 +585,10 @@ func UpdateCron(ctx context.Context, _id graphql.ID, cronExp string, cronEnable
+ 		}).Error; err != nil {
+ 		return nil, err
+ 	}
++	if err = tx.Commit().Error; err != nil {
++		return nil, err
++	}
++	committed = true
+ 
+ 	// Update scheduler
+ 	RemoveUpdateScheduler(id)