nixamp 0.10.0 → 0.10.1

package/dist/directory.d.ts

@@ -149,6 +149,8 @@ export declare class Directory {
      */
     private readonly onLive;
     private readonly items;
+    /** Every code a channel has had on each listing, so a returning channel keeps its own. */
+    private readonly channelHistory;
     /** Streams that stopped, so the phone line can say when. */
     private readonly ended;
     private sequence;

package/dist/directory.js

@@ -104,6 +104,8 @@ export class Directory {
     randomCode;
     onLive;
     items = new Map();
+    /** Every code a channel has had on each listing, so a returning channel keeps its own. */
+    channelHistory = new Map();
     /** Streams that stopped, so the phone line can say when. */
     ended = new Map();
     sequence = 0;
@@ -179,13 +181,19 @@ export class Directory {
             // listing always meant, and no channels is the honest empty list.
             playing: announcement.playing ?? true,
             channels: announcement.channels ?? [],
-            channelCodes: this.codesFor(announcement.channels ?? [], existing?.channelCodes ?? (previously && "channelCodes" in previously ? previously.channelCodes : undefined), id),
+            channelCodes: this.codesFor(announcement.channels ?? [], 
+            // What each channel has been called before, on this listing: a
+            // 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),
             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.
             startedAt: existing?.startedAt ?? this.now(),
         };
         this.items.set(id, listing);
+        this.channelHistory.set(id, { ...(this.channelHistory.get(id) ?? {}), ...listing.channelCodes });
         // The transition, not the heartbeat: existing means it was already live.
         if (existing === undefined)
             this.onLive(listing);
@@ -196,6 +204,7 @@ export class Directory {
         if (item !== undefined)
             this.remember(item);
         this.items.delete(id);
+        this.channelHistory.delete(id);
     }
     list() {
         this.sweep();
@@ -250,7 +259,11 @@ export class Directory {
         for (const item of this.items.values()) {
             if (item.code === code)
                 return true;
-            if (item.id !== own && Object.values(item.channelCodes).includes(code))
+        }
+        // Every code a channel has ever had on a listing that is still up is
+        // that channel's to come back to, on every listing but the one asking.
+        for (const [id, codes] of this.channelHistory) {
+            if (id !== own && Object.values(codes).includes(code))
                 return true;
         }
         return [...this.ended.values()].some((i) => i.code === code);
@@ -331,6 +344,7 @@ 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;

package/dist/server.js

@@ -2256,6 +2256,9 @@ export function createHandler(engine, options) {
                         return;
                     }
                     options.channels.ephemeral(channelId);
+                    // Told to the directory now, so the room code arrives with the
+                    // channel rather than at the next heartbeat, ninety seconds on.
+                    void options.live?.announce?.();
                 }
                 json(response, 200, { kind: "live", channel: channelId, name: entry.title });
                 return;
@@ -2354,6 +2357,9 @@ export function createHandler(engine, options) {
                     return;
                 }
                 options.channels.ephemeral(channelId);
+                // Told to the directory now, so the room code arrives with the
+                // channel rather than at the next heartbeat, ninety seconds on.
+                void options.live?.announce?.();
             }
             json(response, 200, shownLink(channelId, resolved));
             return;

package/package.json

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

package/src/directory.ts

@@ -210,6 +210,8 @@ export function parseAnnouncement(input: unknown): Announcement | null {
  */
 export class Directory {
   private readonly items = new Map<string, Listing>();
+  /** Every code a channel has had on each listing, so a returning channel keeps its own. */
+  private readonly channelHistory = new Map<string, Record<string, string>>();
   /** Streams that stopped, so the phone line can say when. */
   private readonly ended = new Map<string, Ended>();
   private sequence = 0;
@@ -291,7 +293,11 @@ export class Directory {
       channels: announcement.channels ?? [],
       channelCodes: this.codesFor(
         announcement.channels ?? [],
-        existing?.channelCodes ?? (previously && "channelCodes" in previously ? previously.channelCodes : undefined),
+        // What each channel has been called before, on this listing: a
+        // 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,
       ),
       updatedAt: this.now(),
@@ -300,6 +306,7 @@ export class Directory {
       startedAt: existing?.startedAt ?? this.now(),
     };
     this.items.set(id, listing);
+    this.channelHistory.set(id, { ...(this.channelHistory.get(id) ?? {}), ...listing.channelCodes });
     // The transition, not the heartbeat: existing means it was already live.
     if (existing === undefined) this.onLive(listing);
     return listing;
@@ -309,6 +316,7 @@ export class Directory {
     const item = this.items.get(id);
     if (item !== undefined) this.remember(item);
     this.items.delete(id);
+    this.channelHistory.delete(id);
   }
 
   list(): Listing[] {
@@ -362,7 +370,11 @@ export class Directory {
     if (Object.values(besides).includes(code)) return true;
     for (const item of this.items.values()) {
       if (item.code === code) return true;
-      if (item.id !== own && Object.values(item.channelCodes).includes(code)) return true;
+    }
+    // Every code a channel has ever had on a listing that is still up is
+    // that channel's to come back to, on every listing but the one asking.
+    for (const [id, codes] of this.channelHistory) {
+      if (id !== own && Object.values(codes).includes(code)) return true;
     }
     return [...this.ended.values()].some((i) => i.code === code);
   }
@@ -445,6 +457,7 @@ 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;

package/src/server.ts

@@ -2721,6 +2721,9 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
             return;
           }
           options.channels.ephemeral(channelId);
+          // Told to the directory now, so the room code arrives with the
+          // channel rather than at the next heartbeat, ninety seconds on.
+          void options.live?.announce?.();
         }
         json(response, 200, { kind: "live", channel: channelId, name: entry.title });
         return;
@@ -2826,6 +2829,9 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
           return;
         }
         options.channels.ephemeral(channelId);
+        // Told to the directory now, so the room code arrives with the
+        // channel rather than at the next heartbeat, ninety seconds on.
+        void options.live?.announce?.();
       }
       json(response, 200, shownLink(channelId, resolved));
       return;

package/web/dist/sw.js

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