@linxin666/dsh-usage 0.3.7 → 0.3.10

package/src/index.ts

@@ -1,6 +1,6 @@
 import type { Context } from '@deepseek-ai/cordis'
 import type {} from '@deepseek-ai/dsh-host-webserver'
-import { installSettingsSection, settingsNamespace } from '@deepseek-ai/dsh-settings'
+import type { SettingsNamespace } from '@deepseek-ai/dsh-settings'
 import z from 'schemastery'
 import { mountOnce } from './mount-once.ts'
 import { UsageService, type UsageServiceOptions } from './host/usage-service.ts'
@@ -8,7 +8,7 @@ import { makeUsageOverviewRoute, makeUsageRefreshRoute } from './host/routes.ts'
 
 export const name = 'dsh-usage'
 export const inject = ['webServer']
-export const USAGE_SETTINGS_NAMESPACE = settingsNamespace('dsh-usage')
+export const USAGE_SETTINGS_NAMESPACE = 'dsh-usage' as SettingsNamespace
 
 export interface Config {
   enabled?: boolean
@@ -44,46 +44,59 @@ export function resolveConfig(config?: Config): ResolvedConfig {
 export const apply = mountOnce('@linxin666/dsh-usage', (ctx: Context, config?: Config): void => {
   let source: () => Config = () => config ?? {}
   let service: UsageService | undefined
+  let pendingStop: Promise<void> | undefined
   let disposeRoutes: (() => void) | undefined
 
   const rearm = (): void => {
     const value = resolveConfig(source())
     if (!value.enabled) {
-      service?.stop()
+      pendingStop = service?.stop()
       service = undefined
       disposeRoutes?.()
       disposeRoutes = undefined
       return
     }
     if (service === undefined) {
-      service = new UsageService(ctx, value)
-      service.start()
-      const disposers = [makeUsageOverviewRoute(service), makeUsageRefreshRoute(service)]
-        .map((route) => ctx.webServer.register(route))
-      disposeRoutes = () => {
-        for (const dispose of disposers) {
-          try {
-            dispose()
-          } catch {
-            // Route fiber already gone during shutdown.
+      const next = new UsageService(ctx, value)
+      service = next
+      const begin = (): void => {
+        // A disable may have landed while the predecessor's final flush was
+        // still pending; only start if this instance is still the live one.
+        if (service !== next) return
+        next.start()
+        const disposers = [makeUsageOverviewRoute(next), makeUsageRefreshRoute(next)]
+          .map((route) => ctx.webServer.register(route))
+        disposeRoutes = () => {
+          for (const dispose of disposers) {
+            try {
+              dispose()
+            } catch {
+              // Route fiber already gone during shutdown.
+            }
           }
         }
       }
+      // Serialize the start behind a just-stopped predecessor: its final
+      // ledger flush must land on disk before this instance loads the file.
+      if (pendingStop !== undefined) pendingStop.then(begin, begin)
+      else begin()
     } else {
       service.applyOptions(value)
     }
   }
 
-  installSettingsSection(ctx, USAGE_SETTINGS_NAMESPACE, Config, config ?? {}, {
-    setSource: (next) => { source = next; rearm() },
-    onChange: rearm,
+  ctx.inject(['settings'], (settingsCtx) => {
+    settingsCtx.settings.installSection(ctx, USAGE_SETTINGS_NAMESPACE, Config, config ?? {}, {
+      setSource: (next) => { source = next; rearm() },
+      onChange: rearm,
+    })
   })
 
   ctx.effect(() => {
     rearm()
     return () => {
       disposeRoutes?.()
-      service?.stop()
+      void service?.stop()
       service = undefined
     }
   }, 'dsh-usage: runtime')