nixamp 0.10.1 → 0.10.2

package/dist/directory.d.ts

@@ -100,6 +100,12 @@ export interface Ended {
     startedAt: number;
     /** The last heartbeat we saw, which is as close to "ended" as we can know. */
     endedAt: number;
+    /**
+     * The codes its channels had, so a server that stops and comes back -- an
+     * update restarts the daemon, and the daemon withdraws its listing on the
+     * way down -- puts each channel back under the code people were given.
+     */
+    channelCodes?: Record<string, string>;
 }
 /** How long an ended stream is still worth telling a caller about. */
 export declare const ENDED_TTL_MS: number;

package/dist/directory.js

@@ -129,8 +129,14 @@ export class Directory {
      */
     seedEnded(items) {
         for (const item of items) {
-            if (!this.ended.has(item.id) && !this.items.has(item.id))
+            if (!this.ended.has(item.id) && !this.items.has(item.id)) {
                 this.ended.set(item.id, item);
+                // Its channels' codes are reserved too, so a server coming back after
+                // the directory restarted still finds them its own.
+                if (item.channelCodes && Object.keys(item.channelCodes).length > 0) {
+                    this.channelHistory.set(item.id, { ...(this.channelHistory.get(item.id) ?? {}), ...item.channelCodes });
+                }
+            }
         }
     }
     constructor(ttl = TTL_MS, now = Date.now, 
@@ -186,7 +192,11 @@ export class Directory {
             // channel that was gone for a heartbeat -- a server restarting puts
             // its channels back a moment after it announces -- comes back to the
             // code people were given, not a new one.
-            { ...(this.channelHistory.get(id) ?? {}), ...(existing?.channelCodes ?? {}) }, id),
+            {
+                ...(previously && "channelCodes" in previously ? previously.channelCodes ?? {} : {}),
+                ...(this.channelHistory.get(id) ?? {}),
+                ...(existing?.channelCodes ?? {}),
+            }, id),
             updatedAt: this.now(),
             // A stream that never stopped keeps its original start. One that did
             // starts again now, because that is what a caller is being told about.
@@ -204,7 +214,7 @@ export class Directory {
         if (item !== undefined)
             this.remember(item);
         this.items.delete(id);
-        this.channelHistory.delete(id);
+        // The channel history stays with the ended record, and goes when it goes.
     }
     list() {
         this.sweep();
@@ -322,6 +332,9 @@ export class Directory {
             nowPlaying: item.nowPlaying,
             startedAt: item.startedAt,
             endedAt: item.updatedAt,
+            // Every code its channels have had, not only the ones on at the end:
+            // a restart announces before its channels are back.
+            channelCodes: { ...(this.channelHistory.get(item.id) ?? {}), ...item.channelCodes },
         };
         this.ended.set(item.id, record);
         this.mirror?.save(record);
@@ -344,13 +357,13 @@ export class Directory {
             if (item.updatedAt < cutoff) {
                 this.remember(item);
                 this.items.delete(id);
-                this.channelHistory.delete(id);
             }
         }
         const forget = this.now() - ENDED_TTL_MS;
         for (const [id, item] of this.ended) {
             if (item.endedAt < forget) {
                 this.ended.delete(id);
+                this.channelHistory.delete(id);
                 this.mirror?.drop(id);
             }
         }

package/dist/durable.d.ts

@@ -34,6 +34,8 @@ export interface StoredEnded {
     nowPlaying: string;
     startedAt: number;
     endedAt: number;
+    /** Each channel's phone code, by name, so a server coming back keeps them. */
+    channelCodes?: Record<string, string>;
 }
 export declare class Durable {
     private readonly db;

package/dist/durable.js

@@ -9,6 +9,7 @@ const SCHEMA = `
     started_at   BIGINT NOT NULL,
     ended_at     BIGINT NOT NULL
   );
+  ALTER TABLE ended_streams ADD COLUMN IF NOT EXISTS channel_codes JSONB NOT NULL DEFAULT '{}'::jsonb;
   CREATE INDEX IF NOT EXISTS ended_streams_code ON ended_streams (code);
 
   CREATE TABLE IF NOT EXISTS stream_reminders (
@@ -18,6 +19,26 @@ const SCHEMA = `
     PRIMARY KEY (code, phone)
   );
 `;
+/** A JSONB column, as pg hands it back: an object already, or a string on an odd driver. */
+function codesFrom(value) {
+    let parsed = value;
+    if (typeof value === "string") {
+        try {
+            parsed = JSON.parse(value);
+        }
+        catch {
+            return {};
+        }
+    }
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+        return {};
+    const codes = {};
+    for (const [name, code] of Object.entries(parsed)) {
+        if (typeof code === "string" && /^\d{6}$/.test(code))
+            codes[name] = code;
+    }
+    return codes;
+}
 export class Durable {
     db;
     onEvent;
@@ -48,8 +69,8 @@ export class Durable {
     }
     async saveEnded(stream) {
         await this.quietly("an ended stream", () => this.db.query(`INSERT INTO ended_streams
-           (id, code, name, owner_id, url, now_playing, started_at, ended_at)
-         VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+           (id, code, name, owner_id, url, now_playing, started_at, ended_at, channel_codes)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9::jsonb)
          ON CONFLICT (id) DO UPDATE
            SET code = EXCLUDED.code,
                name = EXCLUDED.name,
@@ -57,7 +78,8 @@ export class Durable {
                url = EXCLUDED.url,
                now_playing = EXCLUDED.now_playing,
                started_at = EXCLUDED.started_at,
-               ended_at = EXCLUDED.ended_at`, [
+               ended_at = EXCLUDED.ended_at,
+               channel_codes = EXCLUDED.channel_codes`, [
             stream.id,
             stream.code,
             stream.name,
@@ -66,6 +88,7 @@ export class Durable {
             stream.nowPlaying,
             stream.startedAt,
             stream.endedAt,
+            JSON.stringify(stream.channelCodes ?? {}),
         ]));
     }
     /** A stream that came back, or one old enough to forget. */
@@ -88,6 +111,7 @@ export class Durable {
                 // nothing like a number.
                 startedAt: Number(r["started_at"] ?? 0),
                 endedAt: Number(r["ended_at"] ?? 0),
+                channelCodes: codesFrom(r["channel_codes"]),
             }));
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nixamp",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "It really whips the terminal's ass. A Winamp-shaped audio player for your terminal.",
   "license": "MIT",
   "type": "module",

package/src/directory.ts

@@ -105,6 +105,12 @@ export interface Ended {
   startedAt: number;
   /** The last heartbeat we saw, which is as close to "ended" as we can know. */
   endedAt: number;
+  /**
+   * The codes its channels had, so a server that stops and comes back -- an
+   * update restarts the daemon, and the daemon withdraws its listing on the
+   * way down -- puts each channel back under the code people were given.
+   */
+  channelCodes?: Record<string, string>;
 }
 
 /** How long an ended stream is still worth telling a caller about. */
@@ -237,7 +243,14 @@ export class Directory {
    */
   seedEnded(items: readonly Ended[]): void {
     for (const item of items) {
-      if (!this.ended.has(item.id) && !this.items.has(item.id)) this.ended.set(item.id, item);
+      if (!this.ended.has(item.id) && !this.items.has(item.id)) {
+        this.ended.set(item.id, item);
+        // Its channels' codes are reserved too, so a server coming back after
+        // the directory restarted still finds them its own.
+        if (item.channelCodes && Object.keys(item.channelCodes).length > 0) {
+          this.channelHistory.set(item.id, { ...(this.channelHistory.get(item.id) ?? {}), ...item.channelCodes });
+        }
+      }
     }
   }
 
@@ -297,7 +310,11 @@ export class Directory {
         // channel that was gone for a heartbeat -- a server restarting puts
         // its channels back a moment after it announces -- comes back to the
         // code people were given, not a new one.
-        { ...(this.channelHistory.get(id) ?? {}), ...(existing?.channelCodes ?? {}) },
+        {
+          ...(previously && "channelCodes" in previously ? previously.channelCodes ?? {} : {}),
+          ...(this.channelHistory.get(id) ?? {}),
+          ...(existing?.channelCodes ?? {}),
+        },
         id,
       ),
       updatedAt: this.now(),
@@ -316,7 +333,7 @@ export class Directory {
     const item = this.items.get(id);
     if (item !== undefined) this.remember(item);
     this.items.delete(id);
-    this.channelHistory.delete(id);
+    // The channel history stays with the ended record, and goes when it goes.
   }
 
   list(): Listing[] {
@@ -435,6 +452,9 @@ export class Directory {
       nowPlaying: item.nowPlaying,
       startedAt: item.startedAt,
       endedAt: item.updatedAt,
+      // Every code its channels have had, not only the ones on at the end:
+      // a restart announces before its channels are back.
+      channelCodes: { ...(this.channelHistory.get(item.id) ?? {}), ...item.channelCodes },
     };
     this.ended.set(item.id, record);
     this.mirror?.save(record);
@@ -457,13 +477,13 @@ export class Directory {
       if (item.updatedAt < cutoff) {
         this.remember(item);
         this.items.delete(id);
-        this.channelHistory.delete(id);
       }
     }
     const forget = this.now() - ENDED_TTL_MS;
     for (const [id, item] of this.ended) {
       if (item.endedAt < forget) {
         this.ended.delete(id);
+        this.channelHistory.delete(id);
         this.mirror?.drop(id);
       }
     }

package/src/durable.ts

@@ -35,6 +35,8 @@ export interface StoredEnded {
   nowPlaying: string;
   startedAt: number;
   endedAt: number;
+  /** Each channel's phone code, by name, so a server coming back keeps them. */
+  channelCodes?: Record<string, string>;
 }
 
 const SCHEMA = `
@@ -48,6 +50,7 @@ const SCHEMA = `
     started_at   BIGINT NOT NULL,
     ended_at     BIGINT NOT NULL
   );
+  ALTER TABLE ended_streams ADD COLUMN IF NOT EXISTS channel_codes JSONB NOT NULL DEFAULT '{}'::jsonb;
   CREATE INDEX IF NOT EXISTS ended_streams_code ON ended_streams (code);
 
   CREATE TABLE IF NOT EXISTS stream_reminders (
@@ -58,6 +61,24 @@ const SCHEMA = `
   );
 `;
 
+/** A JSONB column, as pg hands it back: an object already, or a string on an odd driver. */
+function codesFrom(value: unknown): Record<string, string> {
+  let parsed: unknown = value;
+  if (typeof value === "string") {
+    try {
+      parsed = JSON.parse(value);
+    } catch {
+      return {};
+    }
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+  const codes: Record<string, string> = {};
+  for (const [name, code] of Object.entries(parsed as Record<string, unknown>)) {
+    if (typeof code === "string" && /^\d{6}$/.test(code)) codes[name] = code;
+  }
+  return codes;
+}
+
 export class Durable {
   private ready: Promise<void> | null = null;
 
@@ -91,8 +112,8 @@ export class Durable {
     await this.quietly("an ended stream", () =>
       this.db.query(
         `INSERT INTO ended_streams
-           (id, code, name, owner_id, url, now_playing, started_at, ended_at)
-         VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+           (id, code, name, owner_id, url, now_playing, started_at, ended_at, channel_codes)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9::jsonb)
          ON CONFLICT (id) DO UPDATE
            SET code = EXCLUDED.code,
                name = EXCLUDED.name,
@@ -100,7 +121,8 @@ export class Durable {
                url = EXCLUDED.url,
                now_playing = EXCLUDED.now_playing,
                started_at = EXCLUDED.started_at,
-               ended_at = EXCLUDED.ended_at`,
+               ended_at = EXCLUDED.ended_at,
+               channel_codes = EXCLUDED.channel_codes`,
         [
           stream.id,
           stream.code,
@@ -110,6 +132,7 @@ export class Durable {
           stream.nowPlaying,
           stream.startedAt,
           stream.endedAt,
+          JSON.stringify(stream.channelCodes ?? {}),
         ],
       ),
     );
@@ -141,6 +164,7 @@ export class Durable {
         // nothing like a number.
         startedAt: Number(r["started_at"] ?? 0),
         endedAt: Number(r["ended_at"] ?? 0),
+        channelCodes: codesFrom(r["channel_codes"]),
       }));
     } catch (error) {
       this.onEvent(`  could not read ended streams: ${(error as Error).message}`);

package/web/dist/sw.js

@@ -1,5 +1,5 @@
 /* nixamp service worker — generated, do not edit */
-const CACHE = "nixamp-1789044172172";
+const CACHE = "nixamp-1789044699569";
 const PRECACHE = [
   "/",
   "/apple-touch-icon.png",