nixamp 0.5.7 → 0.5.9

package/dist/daemon.d.ts

@@ -49,8 +49,8 @@ export declare function status(): {
 /** The URL an admin client should talk to. */
 export declare function daemonUrl(state: DaemonState): string;
 /**
- * What `nixamp daemon start` prints, as lines, so it can be tested without
- * starting a daemon.
+ * What `nixamp daemon start` and `nixamp daemon status` print, as lines, so it
+ * can be tested without starting a daemon.
  *
  * Every address the server found, not one loopback link: the point of a daemon
  * is the phone in the other room, and 127.0.0.1 is the single address that
@@ -58,7 +58,7 @@ export declare function daemonUrl(state: DaemonState): string;
  * server writes that into a log file nobody reads, not to the person who just
  * typed the command.
  */
-export declare function daemonLines(state: DaemonState): string[];
+export declare function daemonLines(state: DaemonState, uptimeMs?: number): string[];
 /**
  * Start one, detached, and wait until it is actually answering before saying
  * it started. Reporting success and leaving the user to discover a crash in a

package/dist/daemon.js

@@ -65,8 +65,25 @@ export function daemonUrl(state) {
     return `http://${host.includes(":") ? `[${host}]` : host}:${state.port}`;
 }
 /**
- * What `nixamp daemon start` prints, as lines, so it can be tested without
- * starting a daemon.
+ * How long it has been up, as a person would say it. Written here rather than
+ * borrowed from admin.ts, which would drag the whole terminal UI into a code
+ * path that only prints four lines.
+ */
+function spell(ms) {
+    const seconds = Math.max(0, Math.round(ms / 1000));
+    if (seconds < 60)
+        return `${seconds}s`;
+    const minutes = Math.floor(seconds / 60);
+    if (minutes < 60)
+        return `${minutes}m ${seconds % 60}s`;
+    const hours = Math.floor(minutes / 60);
+    if (hours < 24)
+        return `${hours}h ${minutes % 60}m`;
+    return `${Math.floor(hours / 24)}d ${hours % 24}h`;
+}
+/**
+ * What `nixamp daemon start` and `nixamp daemon status` print, as lines, so it
+ * can be tested without starting a daemon.
  *
  * Every address the server found, not one loopback link: the point of a daemon
  * is the phone in the other room, and 127.0.0.1 is the single address that
@@ -74,7 +91,7 @@ export function daemonUrl(state) {
  * server writes that into a log file nobody reads, not to the person who just
  * typed the command.
  */
-export function daemonLines(state) {
+export function daemonLines(state, uptimeMs) {
     const link = (url) => (state.key ? `${url}/s/${state.key}` : url);
     // A state file written by an older nixamp has no list, so host and port
     // still stand in rather than printing nothing at all.
@@ -84,6 +101,8 @@ export function daemonLines(state) {
     for (const { label, url } of addresses)
         lines.push(`  ${label.padEnd(width)}  ${link(url)}`);
     lines.push(`  ${"source".padEnd(width)}  ${state.source}`);
+    if (uptimeMs !== undefined)
+        lines.push(`  ${"up".padEnd(width)}  ${spell(uptimeMs)}`);
     if (state.guessedPublic) {
         lines.push("", "  That internet address is this machine's router, not this port.", `  Nothing outside reaches it until ${state.port} is forwarded here.`);
     }

package/dist/main.js

@@ -223,11 +223,11 @@ async function runDaemon(argv) {
             console.log(`nixamp: the daemon (pid ${state.pid}) is gone. See ${state.log}`);
             return 1;
         }
-        const url = d.daemonUrl(state);
-        console.log(`nixamp daemon running (pid ${state.pid})`);
-        console.log(`  ${state.key ? `${url}/s/${state.key}` : url}`);
-        console.log(`  ${state.source}`);
-        console.log(`  up ${Math.round((Date.now() - state.startedAt) / 1000)}s`);
+        // The same lines start prints, because the question "where is it" has the
+        // same answer however you ask it -- and printing loopback alone was the
+        // one address that cannot be handed to anybody.
+        for (const line of d.daemonLines(state, Date.now() - state.startedAt))
+            console.log(line);
         return 0;
     }
     // `nixamp daemon attach` is what people try before `nixamp attach`, so it is

package/dist/protocol.d.ts

@@ -12,6 +12,14 @@ export interface RemoteTrack {
     album: string;
     /** Seconds; 0 when ffprobe could not tell us. */
     duration: number;
+    /**
+     * Whether this is a film rather than a song.
+     *
+     * The server knows, because it has the path; a remote had been guessing, and
+     * guessing wrong -- every remote track went to the audio element, so a video
+     * a browser could show played its soundtrack over a blank panel.
+     */
+    video?: boolean;
 }
 /** Everything a remote needs to draw the player. */
 export interface Snapshot {

package/dist/server.d.ts

@@ -135,6 +135,7 @@ export interface Engine {
     stop(): void;
 }
 export declare function toRemoteTracks(tracks: Track[]): RemoteTrack[];
+export declare function hasPicture(path: string): boolean;
 /**
  * The headless player: the terminal app's engine without the terminal.
  * One ffmpeg decodes, ffplay makes the sound, and every sample is measured on

package/dist/server.js

@@ -269,8 +269,18 @@ export function toRemoteTracks(tracks) {
         artist: t.artist,
         album: t.album,
         duration: t.duration,
+        // Said out loud, because a remote cannot see the path and had been sending
+        // every track to the audio element -- a film's soundtrack over a blank
+        // panel, which is exactly what it looked like.
+        ...(hasPicture(t.path) ? { video: true } : {}),
     }));
 }
+/** Video containers, as opposed to the songs that are most of a library. */
+const PICTURE = new Set([".mp4", ".mkv", ".avi", ".mov", ".m4v", ".webm", ".mpg", ".mpeg", ".wmv", ".flv"]);
+export function hasPicture(path) {
+    const dot = path.lastIndexOf(".");
+    return dot > 0 && PICTURE.has(path.slice(dot).toLowerCase());
+}
 /**
  * The headless player: the terminal app's engine without the terminal.
  * One ffmpeg decodes, ffplay makes the sound, and every sample is measured on

package/package.json

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

package/src/daemon.ts

@@ -100,8 +100,23 @@ export function daemonUrl(state: DaemonState): string {
 }
 
 /**
- * What `nixamp daemon start` prints, as lines, so it can be tested without
- * starting a daemon.
+ * How long it has been up, as a person would say it. Written here rather than
+ * borrowed from admin.ts, which would drag the whole terminal UI into a code
+ * path that only prints four lines.
+ */
+function spell(ms: number): string {
+  const seconds = Math.max(0, Math.round(ms / 1000));
+  if (seconds < 60) return `${seconds}s`;
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60) return `${minutes}m ${seconds % 60}s`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) return `${hours}h ${minutes % 60}m`;
+  return `${Math.floor(hours / 24)}d ${hours % 24}h`;
+}
+
+/**
+ * What `nixamp daemon start` and `nixamp daemon status` print, as lines, so it
+ * can be tested without starting a daemon.
  *
  * Every address the server found, not one loopback link: the point of a daemon
  * is the phone in the other room, and 127.0.0.1 is the single address that
@@ -109,7 +124,7 @@ export function daemonUrl(state: DaemonState): string {
  * server writes that into a log file nobody reads, not to the person who just
  * typed the command.
  */
-export function daemonLines(state: DaemonState): string[] {
+export function daemonLines(state: DaemonState, uptimeMs?: number): string[] {
   const link = (url: string): string => (state.key ? `${url}/s/${state.key}` : url);
   // A state file written by an older nixamp has no list, so host and port
   // still stand in rather than printing nothing at all.
@@ -119,6 +134,7 @@ export function daemonLines(state: DaemonState): string[] {
   const lines = [`nixamp daemon running (pid ${state.pid})`];
   for (const { label, url } of addresses) lines.push(`  ${label.padEnd(width)}  ${link(url)}`);
   lines.push(`  ${"source".padEnd(width)}  ${state.source}`);
+  if (uptimeMs !== undefined) lines.push(`  ${"up".padEnd(width)}  ${spell(uptimeMs)}`);
 
   if (state.guessedPublic) {
     lines.push(

package/src/main.ts

@@ -252,11 +252,10 @@ async function runDaemon(argv: string[]): Promise<number> {
       console.log(`nixamp: the daemon (pid ${state.pid}) is gone. See ${state.log}`);
       return 1;
     }
-    const url = d.daemonUrl(state);
-    console.log(`nixamp daemon running (pid ${state.pid})`);
-    console.log(`  ${state.key ? `${url}/s/${state.key}` : url}`);
-    console.log(`  ${state.source}`);
-    console.log(`  up ${Math.round((Date.now() - state.startedAt) / 1000)}s`);
+    // The same lines start prints, because the question "where is it" has the
+    // same answer however you ask it -- and printing loopback alone was the
+    // one address that cannot be handed to anybody.
+    for (const line of d.daemonLines(state, Date.now() - state.startedAt)) console.log(line);
     return 0;
   }
 

package/src/protocol.ts

@@ -13,6 +13,14 @@ export interface RemoteTrack {
   album: string;
   /** Seconds; 0 when ffprobe could not tell us. */
   duration: number;
+  /**
+   * Whether this is a film rather than a song.
+   *
+   * The server knows, because it has the path; a remote had been guessing, and
+   * guessing wrong -- every remote track went to the audio element, so a video
+   * a browser could show played its soundtrack over a blank panel.
+   */
+  video?: boolean;
 }
 
 /** Everything a remote needs to draw the player. */

package/src/server.ts

@@ -391,9 +391,21 @@ export function toRemoteTracks(tracks: Track[]): RemoteTrack[] {
     artist: t.artist,
     album: t.album,
     duration: t.duration,
+    // Said out loud, because a remote cannot see the path and had been sending
+    // every track to the audio element -- a film's soundtrack over a blank
+    // panel, which is exactly what it looked like.
+    ...(hasPicture(t.path) ? { video: true } : {}),
   }));
 }
 
+/** Video containers, as opposed to the songs that are most of a library. */
+const PICTURE = new Set([".mp4", ".mkv", ".avi", ".mov", ".m4v", ".webm", ".mpg", ".mpeg", ".wmv", ".flv"]);
+
+export function hasPicture(path: string): boolean {
+  const dot = path.lastIndexOf(".");
+  return dot > 0 && PICTURE.has(path.slice(dot).toLowerCase());
+}
+
 /**
  * The headless player: the terminal app's engine without the terminal.
  * One ffmpeg decodes, ffplay makes the sound, and every sample is measured on

package/web/dist/assets/hls-3VKVEQE3-Cj5Lwh7A.js

@@ -0,0 +1 @@
+import{t as e}from"./index-ABOb54bx.js";var t=3;async function n(n){let{media:r,src:i,isTv:a}=n,{default:o}=await e(async()=>{let{default:e}=await import(`./hls-n74Cnh8A.js`);return{default:e}},[]);if(!o.isSupported())return n.onError(`This browser cannot play HLS streams.`),{destroy:()=>void 0,levels:()=>[]};let s=new o({...a?{maxBufferLength:60,maxMaxBufferLength:120,backBufferLength:30,liveSyncDurationCount:4}:{backBufferLength:90},enableWorker:!0}),c=0,l=!1;s.on(o.Events.ERROR,(e,r)=>{if(!l&&r.fatal){if(c>=t){n.onError(`This stream kept failing and has been stopped.`),s.destroy();return}switch(c+=1,r.type){case o.ErrorTypes.NETWORK_ERROR:n.onNotice(`Reconnecting…`),s.startLoad();break;case o.ErrorTypes.MEDIA_ERROR:n.onNotice(`Recovering…`),s.recoverMediaError();break;default:n.onError(`This stream could not be played.`),s.destroy()}}}),s.on(o.Events.MANIFEST_PARSED,()=>{l||(n.onNotice(null),n.onReady?.({live:s.levels.length>0&&!Number.isFinite(r.duration),levels:u()}))}),s.on(o.Events.LEVEL_LOADED,(e,t)=>{l||n.onReady?.({live:t.details.live,levels:u()})}),s.on(o.Events.FRAG_BUFFERED,()=>{l||n.onNotice(null)});function u(){return s.levels.map((e,t)=>({index:t,height:e.height||null,bitrate:e.bitrate||null,label:e.height?`${String(e.height)}p`:`${String(Math.round((e.bitrate||0)/1e3))}k`}))}return s.loadSource(i),s.attachMedia(r),{destroy(){l=!0,s.destroy()},levels:u,setLevel(e){s.currentLevel=e},currentLevel:()=>s.autoLevelEnabled?-1:s.currentLevel}}export{n as createHlsEngine};