@domicile-desktop/system-backlight 0.0.0-alpha-5166c4cfb4be → 0.0.0-alpha-477cb1552fdc

package/dist/watch-brightness.d.ts

@@ -17,6 +17,9 @@ export type BrightnessWatch = {
  *   and comes back is reported again.
  * - Runs `udevadm` from the compositor's `PATH`. Works while the desktop is
  *   locked.
+ * - Runs `udevadm` again under the next compositor when the compositor exits,
+ *   and reads then. See "A compositor restart" in
+ *   docs/architecture/ENGINE-FORK.md.
  */
 export declare const watchBrightness: (host: WatchHost, onLevel: (level: number) => void, every?: typeof everyInterval) => Promise<Result<BrightnessWatch, SystemError>>;
 /** Calls `tick` every `ms`, until the returned function is called. */

package/dist/watch-brightness.js

@@ -23,6 +23,9 @@ const BACKSTOP_MS = 120_000;
  *   and comes back is reported again.
  * - Runs `udevadm` from the compositor's `PATH`. Works while the desktop is
  *   locked.
+ * - Runs `udevadm` again under the next compositor when the compositor exits,
+ *   and reads then. See "A compositor restart" in
+ *   docs/architecture/ENGINE-FORK.md.
  */
 export const watchBrightness = async (host, onLevel, every = everyInterval) => (await host.spawn(UDEVADM)).map((udevadm) => {
     const watch = {
@@ -30,17 +33,18 @@ export const watchBrightness = async (host, onLevel, every = everyInterval) => (
         reading: Promise.resolve(),
         shown: undefined,
         stopped: false,
+        udevadm,
     };
     const reread = () => {
-        watch.reading = watch.reading.then(() => readOnce(host, watch, udevadm, onLevel));
+        watch.reading = watch.reading.then(() => readOnce(host, watch, onLevel));
     };
     reread();
     const stopClock = every(BACKSTOP_MS, reread);
     return {
-        ended: ended(udevadm, watch, reread, stopClock),
+        ended: ended(host, watch, reread, stopClock),
         stop: () => {
             watch.stopped = true;
-            udevadm.kill();
+            watch.udevadm.kill();
         },
     };
 });
@@ -51,13 +55,16 @@ const everyInterval = (ms, tick) => {
         clearInterval(id);
     };
 };
-const readOnce = async (host, watch, udevadm, onLevel) => {
+const readOnce = async (host, watch, onLevel) => {
     const read = await readBacklight(host);
     if (!watch.stopped && watch.failure === undefined) {
         read.match({
+            // udevadm ends with it, and the read after the next one starts stands in.
             Err: (error) => {
-                watch.failure = error;
-                udevadm.kill();
+                if (error.kind !== SystemErrorKind.CompositorGone) {
+                    watch.failure = error;
+                    watch.udevadm.kill();
+                }
             },
             Ok: (backlight) => {
                 const level = backlight.map(levelOf);
@@ -73,14 +80,41 @@ const readOnce = async (host, watch, udevadm, onLevel) => {
         });
     }
 };
-/** Reads `udevadm`'s lines until it exits, then says why it did. */
-const ended = async (udevadm, watch, reread, stopClock) => {
-    await eachLine(udevadm.stdout, (line) => {
-        if (line.startsWith("KERNEL[")) {
-            reread();
+/**
+ * Reads `udevadm`'s lines until it exits, then says why it did. One the
+ * compositor took with it is started again.
+ */
+const ended = async (host, watch, reread, stopClock) => {
+    let exit;
+    for (;;) {
+        await eachLine(watch.udevadm.stdout, (line) => {
+            if (line.startsWith("KERNEL[")) {
+                reread();
+            }
+        });
+        exit = await watch.udevadm.exited;
+        if (watch.stopped || watch.failure !== undefined || !isGone(exit)) {
+            break;
         }
-    });
-    const exit = await udevadm.exited;
+        const next = await respawn(host);
+        const running = next.match({
+            Err: (error) => {
+                exit = Err(error);
+                return false;
+            },
+            Ok: (udevadm) => {
+                watch.udevadm = udevadm;
+                if (watch.stopped) {
+                    udevadm.kill();
+                }
+                reread();
+                return true;
+            },
+        });
+        if (!running) {
+            break;
+        }
+    }
     stopClock();
     await watch.reading;
     if (watch.failure !== undefined) {
@@ -109,6 +143,19 @@ const eachLine = async (stream, onLine) => {
         }
     }
 };
+/** udevadm under the next compositor, past any that exits before it starts. */
+const respawn = async (host) => {
+    for (;;) {
+        const next = await host.spawn(UDEVADM);
+        if (!isGone(next)) {
+            return next;
+        }
+    }
+};
+const isGone = (answer) => answer.match({
+    Err: (error) => error.kind === SystemErrorKind.CompositorGone,
+    Ok: () => false,
+});
 const unexpectedExit = ({ code, signal }) => ({
     kind: SystemErrorKind.Other,
     message: code === undefined

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "@cprussin/option-result": "^2.0.1",
-    "@domicile-desktop/sdk": "0.0.0-alpha-5166c4cfb4be",
+    "@domicile-desktop/sdk": "0.0.0-alpha-477cb1552fdc",
     "zod": "^4.5.4"
   },
   "description": "Screen brightness for a Domicile shell: reads /sys/class/backlight, watches it and sets it through logind, on @domicile-desktop/sdk/system.",
@@ -45,5 +45,5 @@
     "test:unit": "bun test"
   },
   "type": "module",
-  "version": "0.0.0-alpha-5166c4cfb4be"
+  "version": "0.0.0-alpha-477cb1552fdc"
 }