addHealthCheck instead of additionalHealthChecks for Daemons (#2962)

* addHealthCheck on Daemons

* fix bug that prevents domains without protocols from being deleted

* fixes from testing

* version bump

* add sdk version to UI

* fix useEntrypoint

* fix dependency health check error display

* minor fixes

* beta.29

* fixes from testing

* beta.30

* set /etc/os-release (#2918)

* remove check-monitor from kiosk (#2059)

* add units for progress (#2693)

* use new progress type

* alpha.7

* fix up pwa stuff

* fix wormhole-squashfs and prune boot (#2964)

* don't exit on expected errors

* use bash

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>

sdk/package/lib/util/Drop.ts

@@ -5,18 +5,18 @@ export abstract class Drop {
     if (weak) weak.drop()
   })
   private static idCtr: number = 0
-  private id: number
-  private ref: { id: number } | WeakRef<{ id: number }>
+  private dropId?: number
+  private dropRef?: { id: number } | WeakRef<{ id: number }>
   protected constructor() {
-    this.id = Drop.idCtr++
-    this.ref = { id: this.id }
+    this.dropId = Drop.idCtr++
+    this.dropRef = { id: this.dropId }
     const weak = this.weak()
-    Drop.weak[this.id] = weak
-    Drop.registry.register(this.ref, this.id, this.ref)
+    Drop.weak[this.dropId] = weak
+    Drop.registry.register(this.dropRef, this.dropId, this.dropRef)
 
     return new Proxy(this, {
       set(target: any, prop, value) {
-        if (prop === "ref") return false
+        if (prop === "dropRef" || prop == "dropId") return false
         target[prop] = value
         ;(weak as any)[prop] = value
         return true
@@ -26,13 +26,21 @@ export abstract class Drop {
   protected register() {}
   protected weak(): this {
     const weak = Object.assign(Object.create(Object.getPrototypeOf(this)), this)
-    weak.ref = new WeakRef(this.ref)
+    if (this.dropRef) weak.ref = new WeakRef(this.dropRef)
     return weak
   }
   abstract onDrop(): void
   drop(): void {
+    if (!this.dropRef || !this.dropId) return
     this.onDrop()
-    Drop.registry.unregister(this.ref)
-    delete Drop.weak[this.id]
+    this.leak()
+  }
+  leak(): this {
+    if (!this.dropRef || !this.dropId) return this
+    Drop.registry.unregister(this.dropRef)
+    delete Drop.weak[this.dropId]
+    delete this.dropRef
+    delete this.dropId
+    return this
   }
 }

sdk/package/lib/util/fileHelper.ts

@@ -340,9 +340,17 @@ export class FileHelper<A> {
   /**
    * Accepts full structured data and overwrites the existing file on disk if it exists.
    */
-  async write(effects: T.Effects, data: T.AllowReadonly<A> | A) {
+  async write(
+    effects: T.Effects,
+    data: T.AllowReadonly<A> | A,
+    options: { allowWriteAfterConst?: boolean } = {},
+  ) {
     await this.writeFile(this.validate(data))
-    if (effects.constRetry && this.consts.includes(effects.constRetry))
+    if (
+      !options.allowWriteAfterConst &&
+      effects.constRetry &&
+      this.consts.includes(effects.constRetry)
+    )
       throw new Error(`Canceled: write after const: ${this.path}`)
     return null
   }
@@ -350,7 +358,11 @@ export class FileHelper<A> {
   /**
    * Accepts partial structured data and performs a merge with the existing file on disk.
    */
-  async merge(effects: T.Effects, data: T.AllowReadonly<T.DeepPartial<A>>) {
+  async merge(
+    effects: T.Effects,
+    data: T.AllowReadonly<T.DeepPartial<A>>,
+    options: { allowWriteAfterConst?: boolean } = {},
+  ) {
     const fileDataRaw = await this.readFileRaw()
     let fileData: any = fileDataRaw === null ? null : this.readData(fileDataRaw)
     try {
@@ -360,7 +372,11 @@ export class FileHelper<A> {
     const toWrite = this.writeData(mergeData)
     if (toWrite !== fileDataRaw) {
       this.writeFile(mergeData)
-      if (effects.constRetry && this.consts.includes(effects.constRetry)) {
+      if (
+        !options.allowWriteAfterConst &&
+        effects.constRetry &&
+        this.consts.includes(effects.constRetry)
+      ) {
         const diff = partialDiff(fileData, mergeData as any)
         if (!diff) {
           return null