nixamp 0.28.2 → 0.28.3

package/README.md

@@ -574,7 +574,7 @@ uses its direct model; it does not first translate the audio into English.
 
 ### Hear it in your language
 
-Every signed-in account gets **five free live-use sessions per UTC day**, shared
+Every signed-in account gets **ten free live-use sessions per UTC day**, shared
 across Nixamp's paid panels and upgrades. There is no timed cutoff: a session
 continues while its listener remains, within the existing API usage limits.
 Reconnects to the same session within 90 seconds reuse it. A stopped session
@@ -614,7 +614,7 @@ multiplied by five. Credentials and balances never travel in checkout URLs.
 New checkout creation is capped at five per account and fifty per account server
 per UTC day, plus IP and request throttles; retries reuse the original invoice.
 
-After the five free sessions, new sessions require purchased credit. Configure `COINPAY_X402_KEY`
+After the ten free sessions, new sessions require purchased credit. Configure `COINPAY_X402_KEY`
 with `payments:create` permission and at least one business wallet; the scoped
 key supplies the merchant identity. Free sessions and existing credit still work during a
 checkout outage. A self-hosted operator explicitly sponsoring API usage may set

package/dist/directory.d.ts

@@ -141,6 +141,8 @@ export interface Announcement {
 export interface LineupEntry {
     id: string;
     name: string;
+    /** Account that put this channel on the air, when known. */
+    startedBy?: string;
     kind: "audio" | "video";
     art: string;
     about: string;

package/dist/directory.js

@@ -112,6 +112,9 @@ export function parseLineupEntry(input) {
     return {
         id,
         name,
+        ...(typeof record["startedBy"] === "string" && /^[a-zA-Z0-9_-]{1,64}$/.test(record["startedBy"])
+            ? { startedBy: record["startedBy"] }
+            : {}),
         kind: record["kind"] === "video" ? "video" : "audio",
         // A picture is somewhere a crawler can go, or nothing: a data: URL is a
         // page in a tag, and javascript: is a page in a tag that runs.

package/dist/owner.js

@@ -132,6 +132,8 @@ export function needsAdmin(path, method = "GET") {
 export function needsMember(path, method = "GET") {
     if (method === "POST" && /^\/api\/tracks\/\d+\/live$/.test(path))
         return true;
+    if (method === "POST" && path === "/api/folders/live")
+        return true;
     if (method === "POST" && /^\/api\/catalogs\/[^/]+\/entries\/[^/]+\/live$/.test(path))
         return true;
     if (method === "POST" && /^\/api\/channels\/[^/]+\/keep$/.test(path))

package/dist/server.js

@@ -1009,6 +1009,7 @@ export function lineupEntry(listenLink, info) {
     return {
         id: info.id,
         name: info.name,
+        ...(info.startedBy ? { startedBy: info.startedBy } : {}),
         kind: info.kind ?? "audio",
         art: absoluteArtOf(listenLink, info),
         about: info.about ?? "",
@@ -3568,7 +3569,15 @@ export function createHandler(engine, options) {
                     redials: one.redials ?? 0,
                     error: one.error ?? "",
                     // For a list: how long it is, and which entry is on, from 0.
-                    ...(one.playlist ? { entries: one.playlist.length, entry: one.playlistAt ?? 0 } : {}),
+                    ...(one.playlist ? {
+                        entries: one.playlist.length,
+                        entry: one.playlistAt ?? 0,
+                        playlist: one.playlist.map((source) => {
+                            const parts = source.split(/[\\/]/).filter(Boolean);
+                            return parts.length > 1 ? parts.slice(-2).join(" / ") : (parts[0] || "Untitled");
+                        }),
+                        live: one.live !== false,
+                    } : {}),
                     // The member who put it on, when one did: theirs to take off.
                     startedBy: one.startedBy ?? "",
                     // A picture of it, and a line about it, where there is one.
@@ -4031,6 +4040,62 @@ export function createHandler(engine, options) {
          * do and which made two files at once impossible for anybody. The owner
          * and any member may; the caps and the throttle above say how much.
          */
+        if (path === "/api/folders/live" && request.method === "POST") {
+            if (!options.channels) {
+                json(response, 503, { error: "this server cannot carry channels" });
+                return;
+            }
+            let body = {};
+            try {
+                body = JSON.parse(await readBody(request));
+            }
+            catch {
+                json(response, 400, { error: "bad JSON" });
+                return;
+            }
+            const indices = Array.isArray(body.indices)
+                ? [...new Set(body.indices.filter((one) => Number.isInteger(one) && one >= 0))]
+                : [];
+            if (indices.length === 0 || indices.length > 10_000) {
+                json(response, 400, { error: "choose a folder with playable files" });
+                return;
+            }
+            const tracks = engine.snapshot().tracks ?? [];
+            const selected = indices
+                .map((index) => ({ index, track: tracks[index], source: engine.trackPath(index) }))
+                .filter((one) => Boolean(one.track && one.source && !isRemote(one.source)));
+            if (selected.length !== indices.length) {
+                json(response, 404, { error: "one or more folder files are no longer available" });
+                return;
+            }
+            selected.sort((a, b) => String(a.track.title ?? a.source).localeCompare(String(b.track.title ?? b.source), undefined, { numeric: true, sensitivity: "base" }));
+            const sources = selected.map((one) => one.source);
+            const channelId = cleanId(`folder-${sha("sha1").update(sources.join("\n")).digest("hex").slice(0, 12)}`);
+            const name = typeof body.name === "string" && body.name.trim() !== ""
+                ? body.name.trim().slice(0, 120)
+                : selected[0]?.track.folder || "folder";
+            if (liveBy && !options.channels.has(channelId)) {
+                const refusal = memberLiveRefusal(options.channels, liveBy);
+                if (refusal) {
+                    json(response, 429, { error: refusal });
+                    return;
+                }
+            }
+            if (!options.channels.has(channelId)) {
+                const started = await pullChannel(options.channels, options.ffprobe ?? ["ffprobe"], channelId, name, sources[0], [], "", { playlist: sources, live: true });
+                if (!started) {
+                    json(response, 409, { error: "that folder is already going on the air" });
+                    return;
+                }
+                if (liveBy)
+                    options.channels.info(channelId).startedBy = liveBy;
+            }
+            options.channels.keep(channelId);
+            options.rememberChannels?.(rememberedNow(options.channels));
+            void options.live?.announce?.();
+            json(response, 200, { channel: channelId, name, video: options.channels.kindOf(channelId) !== "audio" });
+            return;
+        }
         const trackLive = /^\/api\/tracks\/(\d+)\/live$/.exec(path);
         if (trackLive && request.method === "POST") {
             if (!options.channels) {

package/dist/translation-passes.d.ts

@@ -5,17 +5,12 @@ export declare const TRANSLATION_PLANS: readonly [{
     readonly id: "day";
     readonly name: "Day";
     readonly days: 1;
-    readonly priceCents: 500;
-}, {
-    readonly id: "week";
-    readonly name: "Week";
-    readonly days: 7;
-    readonly priceCents: 2500;
+    readonly priceCents: 100;
 }, {
     readonly id: "month";
     readonly name: "Month";
     readonly days: 30;
-    readonly priceCents: 10000;
+    readonly priceCents: 500;
 }];
 export type TranslationPlan = typeof TRANSLATION_PLANS[number];
 export type TranslationUsage = "transcription" | "voice";

package/dist/translation-passes.js

@@ -5,9 +5,8 @@ import { SpeechError } from "./speech.js";
 import { UpgradeAllowances } from "./upgrade-allowance.js";
 export const TRANSLATION_MULTIPLIER = 5;
 export const TRANSLATION_PLANS = [
-    { id: "day", name: "Day", days: 1, priceCents: 500 },
-    { id: "week", name: "Week", days: 7, priceCents: 2500 },
-    { id: "month", name: "Month", days: 30, priceCents: 10000 },
+    { id: "day", name: "Day", days: 1, priceCents: 100 },
+    { id: "month", name: "Month", days: 30, priceCents: 500 },
 ];
 const COINS = ["USDC_POL", "USDC_SOL", "SOL", "POL", "BTC", "ETH", "USDC_ETH", "BCH", "DOGE"];
 const ID = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i;

package/dist/upgrade-allowance.d.ts

@@ -1,5 +1,5 @@
 import type { Queryable } from "./follows.ts";
-export declare const FREE_UPGRADE_SESSIONS = 5;
+export declare const FREE_UPGRADE_SESSIONS = 10;
 export declare const FREE_UPGRADE_RECONNECT_SECONDS = 90;
 export interface UpgradeAllowance {
     limit: number;

package/dist/upgrade-allowance.js

@@ -2,7 +2,7 @@
  * Claim only on explicit use, never from balance polling or provider chunks. */
 import { createHash } from "node:crypto";
 import { SpeechError } from "./speech.js";
-export const FREE_UPGRADE_SESSIONS = 5;
+export const FREE_UPGRADE_SESSIONS = 10;
 export const FREE_UPGRADE_RECONNECT_SECONDS = 90;
 const DAY = 86_400_000;
 export class UpgradeAllowances {
@@ -16,8 +16,11 @@ export class UpgradeAllowances {
     async ensure() {
         this.schema ??= this.db.query(`CREATE TABLE IF NOT EXISTS upgrade_daily_uses (
       by_account TEXT NOT NULL, day BIGINT NOT NULL,
-      uses INTEGER NOT NULL CHECK (uses BETWEEN 1 AND 5),
-      sessions JSONB NOT NULL, PRIMARY KEY (by_account, day))`).then(() => undefined)
+      uses INTEGER NOT NULL CHECK (uses >= 1),
+      sessions JSONB NOT NULL, PRIMARY KEY (by_account, day))`)
+            .then(() => this.db.query(`ALTER TABLE upgrade_daily_uses DROP CONSTRAINT IF EXISTS upgrade_daily_uses_uses_check`))
+            .then(() => this.db.query(`ALTER TABLE upgrade_daily_uses ADD CONSTRAINT upgrade_daily_uses_uses_check CHECK (uses BETWEEN 1 AND 10)`))
+            .then(() => undefined)
             .catch(error => { this.schema = null; throw error; });
         await this.schema;
     }

package/package.json

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

package/src/directory.ts

@@ -149,6 +149,8 @@ export interface Announcement {
 export interface LineupEntry {
   id: string;
   name: string;
+  /** Account that put this channel on the air, when known. */
+  startedBy?: string;
   kind: "audio" | "video";
   art: string;
   about: string;
@@ -247,6 +249,9 @@ export function parseLineupEntry(input: unknown): LineupEntry | null {
   return {
     id,
     name,
+    ...(typeof record["startedBy"] === "string" && /^[a-zA-Z0-9_-]{1,64}$/.test(record["startedBy"])
+      ? { startedBy: record["startedBy"] }
+      : {}),
     kind: record["kind"] === "video" ? "video" : "audio",
     // A picture is somewhere a crawler can go, or nothing: a data: URL is a
     // page in a tag, and javascript: is a page in a tag that runs.

package/src/owner.ts

@@ -146,6 +146,7 @@ export function needsAdmin(path: string, method = "GET"): boolean {
  */
 export function needsMember(path: string, method = "GET"): boolean {
   if (method === "POST" && /^\/api\/tracks\/\d+\/live$/.test(path)) return true;
+  if (method === "POST" && path === "/api/folders/live") return true;
   if (method === "POST" && /^\/api\/catalogs\/[^/]+\/entries\/[^/]+\/live$/.test(path)) return true;
   if (method === "POST" && /^\/api\/channels\/[^/]+\/keep$/.test(path)) return true;
   if (method === "POST" && /^\/api\/channels\/[^/]+\/(?:start|stop|restart)$/.test(path)) return true;

package/src/server.ts

@@ -1253,6 +1253,7 @@ export function lineupEntry(listenLink: string, info: ChannelInfo): LineupEntry
   return {
     id: info.id,
     name: info.name,
+    ...(info.startedBy ? { startedBy: info.startedBy } : {}),
     kind: info.kind ?? "audio",
     art: absoluteArtOf(listenLink, info),
     about: info.about ?? "",
@@ -4014,7 +4015,15 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
           redials: one.redials ?? 0,
           error: one.error ?? "",
           // For a list: how long it is, and which entry is on, from 0.
-          ...(one.playlist ? { entries: one.playlist.length, entry: one.playlistAt ?? 0 } : {}),
+          ...(one.playlist ? {
+            entries: one.playlist.length,
+            entry: one.playlistAt ?? 0,
+            playlist: one.playlist.map((source) => {
+              const parts = source.split(/[\\/]/).filter(Boolean);
+              return parts.length > 1 ? parts.slice(-2).join(" / ") : (parts[0] || "Untitled");
+            }),
+            live: one.live !== false,
+          } : {}),
           // The member who put it on, when one did: theirs to take off.
           startedBy: one.startedBy ?? "",
           // A picture of it, and a line about it, where there is one.
@@ -4492,6 +4501,53 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
      * do and which made two files at once impossible for anybody. The owner
      * and any member may; the caps and the throttle above say how much.
      */
+    if (path === "/api/folders/live" && request.method === "POST") {
+      if (!options.channels) {
+        json(response, 503, { error: "this server cannot carry channels" });
+        return;
+      }
+      let body: { indices?: unknown; name?: unknown } = {};
+      try { body = JSON.parse(await readBody(request)) as typeof body; } catch {
+        json(response, 400, { error: "bad JSON" });
+        return;
+      }
+      const indices = Array.isArray(body.indices)
+        ? [...new Set(body.indices.filter((one): one is number => Number.isInteger(one) && one >= 0))]
+        : [];
+      if (indices.length === 0 || indices.length > 10_000) {
+        json(response, 400, { error: "choose a folder with playable files" });
+        return;
+      }
+      const tracks = engine.snapshot().tracks ?? [];
+      const selected = indices
+        .map((index) => ({ index, track: tracks[index], source: engine.trackPath(index) }))
+        .filter((one): one is { index: number; track: (typeof tracks)[number]; source: string } => Boolean(one.track && one.source && !isRemote(one.source)));
+      if (selected.length !== indices.length) {
+        json(response, 404, { error: "one or more folder files are no longer available" });
+        return;
+      }
+      selected.sort((a, b) => String(a.track.title ?? a.source).localeCompare(String(b.track.title ?? b.source), undefined, { numeric: true, sensitivity: "base" }));
+      const sources = selected.map((one) => one.source);
+      const channelId = cleanId(`folder-${sha("sha1").update(sources.join("\n")).digest("hex").slice(0, 12)}`);
+      const name = typeof body.name === "string" && body.name.trim() !== ""
+        ? body.name.trim().slice(0, 120)
+        : selected[0]?.track.folder || "folder";
+      if (liveBy && !options.channels.has(channelId)) {
+        const refusal = memberLiveRefusal(options.channels, liveBy);
+        if (refusal) { json(response, 429, { error: refusal }); return; }
+      }
+      if (!options.channels.has(channelId)) {
+        const started = await pullChannel(options.channels, options.ffprobe ?? ["ffprobe"], channelId, name, sources[0]!, [], "", { playlist: sources, live: true });
+        if (!started) { json(response, 409, { error: "that folder is already going on the air" }); return; }
+        if (liveBy) options.channels.info(channelId)!.startedBy = liveBy;
+      }
+      options.channels.keep(channelId);
+      options.rememberChannels?.(rememberedNow(options.channels));
+      void options.live?.announce?.();
+      json(response, 200, { channel: channelId, name, video: options.channels.kindOf(channelId) !== "audio" });
+      return;
+    }
+
     const trackLive = /^\/api\/tracks\/(\d+)\/live$/.exec(path);
     if (trackLive && request.method === "POST") {
       if (!options.channels) {

package/src/translation-passes.ts

@@ -7,9 +7,8 @@ import { UpgradeAllowances, type UpgradeAllowance } from "./upgrade-allowance.ts
 
 export const TRANSLATION_MULTIPLIER = 5;
 export const TRANSLATION_PLANS = [
-  { id: "day", name: "Day", days: 1, priceCents: 500 },
-  { id: "week", name: "Week", days: 7, priceCents: 2500 },
-  { id: "month", name: "Month", days: 30, priceCents: 10000 },
+  { id: "day", name: "Day", days: 1, priceCents: 100 },
+  { id: "month", name: "Month", days: 30, priceCents: 500 },
 ] as const;
 export type TranslationPlan = typeof TRANSLATION_PLANS[number];
 export type TranslationUsage = "transcription" | "voice";

package/src/upgrade-allowance.ts

@@ -4,7 +4,7 @@ import { createHash } from "node:crypto";
 import type { Queryable } from "./follows.ts";
 import { SpeechError } from "./speech.ts";
 
-export const FREE_UPGRADE_SESSIONS = 5;
+export const FREE_UPGRADE_SESSIONS = 10;
 export const FREE_UPGRADE_RECONNECT_SECONDS = 90;
 const DAY = 86_400_000;
 export interface UpgradeAllowance {
@@ -18,8 +18,11 @@ export class UpgradeAllowances {
   async ensure(): Promise<void> {
     this.schema ??= this.db.query(`CREATE TABLE IF NOT EXISTS upgrade_daily_uses (
       by_account TEXT NOT NULL, day BIGINT NOT NULL,
-      uses INTEGER NOT NULL CHECK (uses BETWEEN 1 AND 5),
-      sessions JSONB NOT NULL, PRIMARY KEY (by_account, day))`).then(() => undefined)
+      uses INTEGER NOT NULL CHECK (uses >= 1),
+      sessions JSONB NOT NULL, PRIMARY KEY (by_account, day))`)
+      .then(() => this.db.query(`ALTER TABLE upgrade_daily_uses DROP CONSTRAINT IF EXISTS upgrade_daily_uses_uses_check`))
+      .then(() => this.db.query(`ALTER TABLE upgrade_daily_uses ADD CONSTRAINT upgrade_daily_uses_uses_check CHECK (uses BETWEEN 1 AND 10)`))
+      .then(() => undefined)
       .catch(error => { this.schema = null; throw error; });
     await this.schema;
   }

package/web/dist/assets/{hls-3VKVEQE3-Cw5UD-5P.js → hls-3VKVEQE3-B4Sk5BbY.js}

@@ -1 +1 @@
-import{t as e}from"./index-BqcDIh2Q.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};
+import{t as e}from"./index-B33hHbmF.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};