@psychout98/tadaima 1.0.3 → 1.0.4

package/dist/{download-handler-H34V5RNF.js → download-handler-R6AJCG4O.js}

@@ -200,7 +200,7 @@ async function downloadFile(url, destPath, onProgress, signal, baseDir) {
 
 // src/organizer.ts
 import { mkdir as mkdir2, rename } from "fs/promises";
-import { dirname as dirname2, extname, join, resolve as resolve2 } from "path";
+import { basename, dirname as dirname2, extname, join, resolve as resolve2 } from "path";
 function assertWithinBase(destPath, baseDir) {
   const resolvedDest = resolve2(destPath);
   const resolvedBase = resolve2(baseDir);
@@ -225,12 +225,24 @@ async function organizeFile(req) {
     return destPath;
   } else {
     const tvBase = config.get("directories.tv");
+    const filename = basename(req.sourcePath);
+    let episodeNum = req.episode;
+    let epTitle = req.episodeTitle;
+    if (episodeNum == null) {
+      const match = filename.match(/[Ss](\d{1,2})[Ee](\d{1,2})/);
+      if (match) {
+        episodeNum = parseInt(match[2], 10);
+      }
+    }
+    if (!epTitle && episodeNum != null) {
+      epTitle = `Episode ${episodeNum}`;
+    }
     relativePath = buildEpisodePath(
       req.title,
       req.tmdbId,
       req.season ?? 1,
-      req.episode ?? 1,
-      req.episodeTitle ?? `Episode ${req.episode ?? 1}`,
+      episodeNum ?? 1,
+      epTitle ?? `Episode ${episodeNum ?? 1}`,
       ext
     );
     const destPath = join(tvBase, relativePath.replace(/^TV\//, ""));
@@ -303,7 +315,12 @@ var DownloadHandler = class {
     };
     this.activeJobs.set(jobId, job);
     this.ws.setActiveJobs(this.activeJobs.size);
-    this.sendMessage("download:accepted", { jobId, requestId });
+    this.sendMessage("download:accepted", {
+      jobId,
+      requestId,
+      title: meta.title,
+      mediaType: meta.mediaType
+    });
     try {
       await this.executeDownload(job);
     } catch (err) {
@@ -345,24 +362,24 @@ var DownloadHandler = class {
     const { meta, abortController } = job;
     const signal = abortController.signal;
     job.phase = "adding";
-    this.sendProgress(job.jobId, "adding", 0);
+    this.sendProgress(job.jobId, "adding", 0, meta);
     console.log(`[${job.jobId}] Adding magnet to RD...`);
     const { id: torrentId } = await rdClient.addMagnet(meta.magnet);
     if (signal.aborted) throw new Error("Cancelled");
     await rdClient.selectFiles(torrentId);
     if (signal.aborted) throw new Error("Cancelled");
     job.phase = "waiting";
-    this.sendProgress(job.jobId, "waiting", 0);
+    this.sendProgress(job.jobId, "waiting", 0, meta);
     console.log(`[${job.jobId}] Waiting for RD to process...`);
     const links = await rdClient.pollUntilReady(
       torrentId,
       void 0,
       void 0,
-      (progress) => this.sendProgress(job.jobId, "waiting", progress),
+      (progress) => this.sendProgress(job.jobId, "waiting", progress, meta),
       signal
     );
     job.phase = "unrestricting";
-    this.sendProgress(job.jobId, "unrestricting", 0);
+    this.sendProgress(job.jobId, "unrestricting", 0, meta);
     console.log(`[${job.jobId}] Unrestricting ${links.length} links...`);
     const unrestricted = await rdClient.unrestrictAll(links);
     if (signal.aborted) throw new Error("Cancelled");
@@ -384,6 +401,8 @@ var DownloadHandler = class {
             jobId: job.jobId,
             phase: "downloading",
             progress: pct,
+            title: meta.title,
+            mediaType: meta.mediaType,
             downloadedBytes: progress.downloadedBytes,
             totalBytes: progress.totalBytes,
             speedBps: progress.speedBps,
@@ -396,33 +415,38 @@ var DownloadHandler = class {
       totalSize += size;
     }
     job.phase = "organizing";
-    this.sendProgress(job.jobId, "organizing", 0);
+    this.sendProgress(job.jobId, "organizing", 0, meta);
     console.log(`[${job.jobId}] Organizing files...`);
-    let finalPath = "";
+    const organizedPaths = [];
     for (const filePath of downloadedFiles) {
-      finalPath = await organizeFile({
+      const organized = await organizeFile({
         title: meta.title,
         year: meta.year,
         tmdbId: meta.tmdbId,
         mediaType: meta.mediaType,
         season: meta.season,
-        episode: meta.episode,
-        episodeTitle: meta.episodeTitle,
         sourcePath: filePath
       });
+      organizedPaths.push(organized);
     }
     await rm(join2(stagingDir, job.jobId), { recursive: true, force: true }).catch(() => {
     });
-    console.log(`[${job.jobId}] Complete: ${finalPath}`);
+    console.log(`[${job.jobId}] Complete: ${organizedPaths.length} file(s)`);
     this.sendMessage("download:completed", {
       jobId: job.jobId,
-      filePath: finalPath,
+      filePath: organizedPaths[organizedPaths.length - 1] ?? "",
+      filePaths: organizedPaths,
       finalSize: totalSize,
       _meta: meta
     });
   }
-  sendProgress(jobId, phase, progress) {
-    this.sendMessage("download:progress", { jobId, phase, progress });
+  sendProgress(jobId, phase, progress, meta) {
+    this.sendMessage("download:progress", {
+      jobId,
+      phase,
+      progress,
+      ...meta && { title: meta.title, mediaType: meta.mediaType }
+    });
   }
   sendMessage(type, payload) {
     this.ws.send({

package/dist/index.js

@@ -25,8 +25,8 @@ async function main() {
         break;
       }
       console.log(`tadaima-agent v${pkg.version}`);
-      const { AgentWebSocket } = await import("./ws-client-TPWC6VZR.js");
-      const { DownloadHandler } = await import("./download-handler-H34V5RNF.js");
+      const { AgentWebSocket } = await import("./ws-client-CLD6QAFC.js");
+      const { DownloadHandler } = await import("./download-handler-R6AJCG4O.js");
       const { TUI } = await import("./tui-ZE4672PT.js");
       const { shouldCheckNow, checkForUpdate, applyUpdate, logUpdateAdvisory } = await import("./updater-HXBNBU36.js");
       const { writeStatus, removeStatus } = await import("./status-writer-RGH2PULB.js");

package/dist/{ws-client-TPWC6VZR.js → ws-client-CLD6QAFC.js}

@@ -9,9 +9,18 @@ import {
 
 // src/ws-client.ts
 import WebSocket from "ws";
-import { platform, freemem } from "os";
+import { platform } from "os";
+import { statfs } from "fs/promises";
 var HEARTBEAT_INTERVAL = 3e4;
 var MAX_BACKOFF = 3e4;
+async function getDiskFreeBytes(dirPath) {
+  try {
+    const stats = await statfs(dirPath);
+    return stats.bavail * stats.bsize;
+  } catch {
+    return 0;
+  }
+}
 var AgentWebSocket = class {
   ws = null;
   backoff = 1e3;
@@ -22,6 +31,10 @@ var AgentWebSocket = class {
   stopped = false;
   startTime = Date.now();
   activeJobs = 0;
+  mediaDir;
+  constructor() {
+    this.mediaDir = config.get("directories.movies") || config.get("directories.tv") || "/";
+  }
   connect() {
     this.stopped = false;
     const relayUrl = config.get("relay");
@@ -36,7 +49,8 @@ var AgentWebSocket = class {
     this.ws.on("open", () => {
       console.log("Connected to relay");
       this.backoff = 1e3;
-      this.sendHello();
+      this.sendHello().catch(() => {
+      });
       this.startHeartbeat();
       this.drainQueue();
     });
@@ -91,7 +105,7 @@ var AgentWebSocket = class {
   setActiveJobs(count) {
     this.activeJobs = count;
   }
-  sendHello() {
+  async sendHello() {
     this.send({
       id: createMessageId(),
       type: "agent:hello",
@@ -100,18 +114,18 @@ var AgentWebSocket = class {
         version: "0.0.0",
         platform: platform(),
         activeJobs: this.activeJobs,
-        diskFreeBytes: freemem()
+        diskFreeBytes: await getDiskFreeBytes(this.mediaDir)
       }
     });
   }
-  sendHeartbeat() {
+  async sendHeartbeat() {
     this.send({
       id: createMessageId(),
       type: "agent:heartbeat",
       timestamp: createTimestamp(),
       payload: {
         activeJobs: this.activeJobs,
-        diskFreeBytes: freemem(),
+        diskFreeBytes: await getDiskFreeBytes(this.mediaDir),
         uptimeSeconds: Math.floor((Date.now() - this.startTime) / 1e3)
       }
     });
@@ -119,7 +133,10 @@ var AgentWebSocket = class {
   startHeartbeat() {
     this.stopHeartbeat();
     this.heartbeatTimer = setInterval(
-      () => this.sendHeartbeat(),
+      () => {
+        this.sendHeartbeat().catch(() => {
+        });
+      },
       HEARTBEAT_INTERVAL
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@psychout98/tadaima",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "CLI download agent for Tadaima — a self-hosted media download orchestrator",
   "type": "module",
   "license": "MIT",