@invintusmedia/tomp4 1.0.3 → 1.0.5

package/README.md

@@ -66,6 +66,22 @@ info.videoCodec    // "H.264/AVC"
 info.audioCodec    // "AAC"
 ```
 
+### progress callback
+
+```js
+const mp4 = await toMp4(url, {
+  onProgress: (msg, info) => {
+    if (info?.percent !== undefined) {
+      console.log(`${info.percent}% - ${msg}`)
+    }
+  }
+})
+// 10% - Downloading: 10%
+// 50% - Downloaded 5.2 MB
+// 60% - Frames: 300 video, 450 audio
+// 100% - Complete
+```
+
 ### use the result
 
 ```js

package/dist/tomp4.js

@@ -1,5 +1,5 @@
 /**
- * toMp4.js v1.0.3
+ * toMp4.js v1.0.5
  * Convert MPEG-TS and fMP4 to standard MP4
  * https://github.com/TVWIT/toMp4.js
  * MIT License
@@ -1214,6 +1214,7 @@
   function convertTsToMp4(tsData, options = {}) {
     const log = options.onProgress || (() => {});
     
+    log(`Parsing...`, { phase: 'convert', percent: 52 });
     const parser = new TSParser();
     parser.parse(tsData);
     parser.finalize();
@@ -1223,7 +1224,7 @@
     const audioInfo = getCodecInfo(parser.audioStreamType);
     
     // Log parsing results
-    log(`Parsed ${debug.packets} TS packets`);
+    log(`Parsed ${debug.packets} TS packets`, { phase: 'convert', percent: 55 });
     log(`PAT: ${debug.patFound ? '✓' : '✗'}, PMT: ${debug.pmtFound ? '✓' : '✗'}`);
     log(`Video: ${parser.videoPid ? `PID ${parser.videoPid}` : 'none'} → ${videoInfo.name}`);
     const audioDetails = [];
@@ -1266,7 +1267,7 @@
       );
     }
     
-    log(`Frames: ${parser.videoAccessUnits.length} video, ${parser.audioAccessUnits.length} audio`);
+    log(`Frames: ${parser.videoAccessUnits.length} video, ${parser.audioAccessUnits.length} audio`, { phase: 'convert', percent: 60 });
     if (debug.audioPesStarts) {
       log(`Audio: ${debug.audioPesStarts} PES starts → ${debug.audioPesCount || 0} processed → ${debug.audioFramesInPes || 0} ADTS frames${debug.audioSkipped ? ` (${debug.audioSkipped} skipped)` : ''}`);
     }
@@ -1281,6 +1282,8 @@
       log(`Timestamps normalized: -${offsetMs}ms offset`);
     }
     
+    log(`Processing...`, { phase: 'convert', percent: 70 });
+    
     // Apply time range clipping if specified
     if (options.startTime !== undefined || options.endTime !== undefined) {
       const startTime = options.startTime || 0;
@@ -1301,14 +1304,17 @@
       parser.videoDts = clipResult.video.map(au => au.dts);
       parser.audioPts = clipResult.audio.map(au => au.pts);
       
-      log(`Clipped: ${clipResult.actualStartTime.toFixed(2)}s - ${clipResult.actualEndTime.toFixed(2)}s (${clipResult.video.length} video, ${clipResult.audio.length} audio frames)`);
+      log(`Clipped: ${clipResult.actualStartTime.toFixed(2)}s - ${clipResult.actualEndTime.toFixed(2)}s (${clipResult.video.length} video, ${clipResult.audio.length} audio frames)`, { phase: 'convert', percent: 80 });
     }
     
+    log(`Building MP4...`, { phase: 'convert', percent: 85 });
     const builder = new MP4Builder(parser);
     const { width, height } = builder.getVideoDimensions();
     log(`Dimensions: ${width}x${height}`);
     
-    return builder.build();
+    const result = builder.build();
+    log(`Complete`, { phase: 'convert', percent: 100 });
+    return result;
   }
   
   default convertTsToMp4;
@@ -1751,7 +1757,7 @@
   toMp4.isMpegTs = isMpegTs;
   toMp4.isFmp4 = isFmp4;
   toMp4.isStandardMp4 = isStandardMp4;
-  toMp4.version = '1.0.3';
+  toMp4.version = '1.0.5';
 
   return toMp4;
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@invintusmedia/tomp4",
-  "version": "1.0.3",
-  "description": "Convert MPEG-TS and fMP4 streams to standard MP4 - pure JavaScript, zero dependencies",
+  "version": "1.0.5",
+  "description": "Convert MPEG-TS, fMP4, and HLS streams to MP4 with clipping support - pure JavaScript, zero dependencies",
   "main": "src/index.js",
   "module": "src/index.js",
   "types": "src/index.d.ts",
@@ -39,7 +39,10 @@
     "converter",
     "transmux",
     "hls",
-    "streaming"
+    "streaming",
+    "clip",
+    "trim",
+    "cut"
   ],
   "author": "Invintus Media",
   "license": "MIT",

package/src/hls.js

@@ -280,9 +280,11 @@ async function downloadHls(source, options = {}) {
     toDownload = toDownload.slice(0, options.maxSegments);
   }
   
-  log(`Downloading ${toDownload.length} segment${toDownload.length > 1 ? 's' : ''}...`);
+  const totalSegments = toDownload.length;
+  log(`Downloading ${totalSegments} segment${totalSegments > 1 ? 's' : ''}...`);
 
-  // Download all segments in parallel
+  // Download segments with progress tracking
+  let completedSegments = 0;
   const buffers = await Promise.all(
     toDownload.map(async (seg, i) => {
       const url = seg.url || seg; // Handle both HlsSegment objects and plain URLs
@@ -290,7 +292,11 @@ async function downloadHls(source, options = {}) {
       if (!resp.ok) {
         throw new Error(`Segment ${i + 1} failed: ${resp.status}`);
       }
-      return new Uint8Array(await resp.arrayBuffer());
+      const buffer = new Uint8Array(await resp.arrayBuffer());
+      completedSegments++;
+      const percent = Math.round((completedSegments / totalSegments) * 50); // Download is 0-50%
+      log(`Downloading: ${percent}%`, { phase: 'download', percent, segment: completedSegments, totalSegments });
+      return buffer;
     })
   );
 
@@ -303,7 +309,7 @@ async function downloadHls(source, options = {}) {
     offset += buf.length;
   }
 
-  log(`Downloaded ${(totalSize / 1024 / 1024).toFixed(2)} MB`);
+  log(`Downloaded ${(totalSize / 1024 / 1024).toFixed(2)} MB`, { phase: 'download', percent: 50 });
   
   // Return with metadata for precise clipping
   combined._hlsTimeRange = hasTimeRange ? {

package/src/index.d.ts

@@ -37,9 +37,20 @@ declare module '@invintusmedia/tomp4' {
     segments: string[];
   }
 
+  export interface ProgressInfo {
+    /** Current phase: 'download' or 'convert' */
+    phase: 'download' | 'convert';
+    /** Progress percentage (0-100) */
+    percent: number;
+    /** Current segment (download phase only) */
+    segment?: number;
+    /** Total segments (download phase only) */
+    totalSegments?: number;
+  }
+
   export interface ToMp4Options {
-    /** Progress callback */
-    onProgress?: (message: string) => void;
+    /** Progress callback - receives message string and optional progress info */
+    onProgress?: (message: string, info?: ProgressInfo) => void;
     /** Suggested filename for downloads */
     filename?: string;
     /** HLS quality: 'highest', 'lowest', or bandwidth number */

package/src/index.js

@@ -269,9 +269,24 @@ async function toMp4(input, options = {}) {
     throw new Error('Input must be a URL string, HlsStream, Uint8Array, ArrayBuffer, or Blob');
   }
   
+  // Adjust clip times if we downloaded HLS with a time range
+  // The downloaded segments have been normalized to start at 0,
+  // so we need to adjust the requested clip times accordingly
+  let convertOptions = { ...options };
+  if (data._hlsTimeRange && (options.startTime !== undefined || options.endTime !== undefined)) {
+    const segmentStart = data._hlsTimeRange.actualStart;
+    if (options.startTime !== undefined) {
+      convertOptions.startTime = Math.max(0, options.startTime - segmentStart);
+    }
+    if (options.endTime !== undefined) {
+      convertOptions.endTime = options.endTime - segmentStart;
+    }
+    log(`Adjusted clip: ${convertOptions.startTime?.toFixed(2) || 0}s - ${convertOptions.endTime?.toFixed(2) || '∞'}s (offset: -${segmentStart.toFixed(2)}s)`);
+  }
+  
   // Convert
   log('Converting...');
-  const mp4Data = convertData(data, options);
+  const mp4Data = convertData(data, convertOptions);
   
   return new Mp4Result(mp4Data, filename);
 }
@@ -293,7 +308,7 @@ toMp4.isHlsUrl = isHlsUrl;
 toMp4.analyze = analyzeTsData;
 
 // Version (injected at build time for dist, read from package.json for ESM)
-toMp4.version = '1.0.3';
+toMp4.version = '1.0.5';
 
 // Export
 export { 

package/src/ts-to-mp4.js

@@ -1193,6 +1193,7 @@ export function analyzeTsData(tsData) {
 export function convertTsToMp4(tsData, options = {}) {
   const log = options.onProgress || (() => {});
   
+  log(`Parsing...`, { phase: 'convert', percent: 52 });
   const parser = new TSParser();
   parser.parse(tsData);
   parser.finalize();
@@ -1202,7 +1203,7 @@ export function convertTsToMp4(tsData, options = {}) {
   const audioInfo = getCodecInfo(parser.audioStreamType);
   
   // Log parsing results
-  log(`Parsed ${debug.packets} TS packets`);
+  log(`Parsed ${debug.packets} TS packets`, { phase: 'convert', percent: 55 });
   log(`PAT: ${debug.patFound ? '✓' : '✗'}, PMT: ${debug.pmtFound ? '✓' : '✗'}`);
   log(`Video: ${parser.videoPid ? `PID ${parser.videoPid}` : 'none'} → ${videoInfo.name}`);
   const audioDetails = [];
@@ -1245,7 +1246,7 @@ export function convertTsToMp4(tsData, options = {}) {
     );
   }
   
-  log(`Frames: ${parser.videoAccessUnits.length} video, ${parser.audioAccessUnits.length} audio`);
+  log(`Frames: ${parser.videoAccessUnits.length} video, ${parser.audioAccessUnits.length} audio`, { phase: 'convert', percent: 60 });
   if (debug.audioPesStarts) {
     log(`Audio: ${debug.audioPesStarts} PES starts → ${debug.audioPesCount || 0} processed → ${debug.audioFramesInPes || 0} ADTS frames${debug.audioSkipped ? ` (${debug.audioSkipped} skipped)` : ''}`);
   }
@@ -1260,6 +1261,8 @@ export function convertTsToMp4(tsData, options = {}) {
     log(`Timestamps normalized: -${offsetMs}ms offset`);
   }
   
+  log(`Processing...`, { phase: 'convert', percent: 70 });
+  
   // Apply time range clipping if specified
   if (options.startTime !== undefined || options.endTime !== undefined) {
     const startTime = options.startTime || 0;
@@ -1280,14 +1283,17 @@ export function convertTsToMp4(tsData, options = {}) {
     parser.videoDts = clipResult.video.map(au => au.dts);
     parser.audioPts = clipResult.audio.map(au => au.pts);
     
-    log(`Clipped: ${clipResult.actualStartTime.toFixed(2)}s - ${clipResult.actualEndTime.toFixed(2)}s (${clipResult.video.length} video, ${clipResult.audio.length} audio frames)`);
+    log(`Clipped: ${clipResult.actualStartTime.toFixed(2)}s - ${clipResult.actualEndTime.toFixed(2)}s (${clipResult.video.length} video, ${clipResult.audio.length} audio frames)`, { phase: 'convert', percent: 80 });
   }
   
+  log(`Building MP4...`, { phase: 'convert', percent: 85 });
   const builder = new MP4Builder(parser);
   const { width, height } = builder.getVideoDimensions();
   log(`Dimensions: ${width}x${height}`);
   
-  return builder.build();
+  const result = builder.build();
+  log(`Complete`, { phase: 'convert', percent: 100 });
+  return result;
 }
 
 export default convertTsToMp4;