taglib-wasm 0.2.8 → 0.3.1

package/src/workers.ts

@@ -28,22 +28,22 @@ export class AudioFileWorkers {
   constructor(module: TagLibModule, fileId: number) {
     this.module = module;
     this.fileId = fileId;
-    this.tagPtr = module._taglib_file_tag(fileId);
-    this.propsPtr = module._taglib_file_audioproperties(fileId);
+    this.tagPtr = module._taglib_file_tag?.(fileId) || 0;
+    this.propsPtr = module._taglib_file_audioproperties?.(fileId) || 0;
   }
 
   /**
    * Check if the file is valid and was loaded successfully
    */
   isValid(): boolean {
-    return this.module._taglib_file_is_valid(this.fileId) !== 0;
+    return this.module._taglib_file_is_valid?.(this.fileId) !== 0;
   }
 
   /**
    * Get the file format
    */
   format(): AudioFormat {
-    const formatPtr = this.module._taglib_file_format(this.fileId);
+    const formatPtr = this.module._taglib_file_format?.(this.fileId) || 0;
     if (formatPtr === 0) return "MP3"; // fallback
     const formatStr = cStringToJS(this.module, formatPtr);
     return formatStr as AudioFormat;
@@ -55,13 +55,13 @@ export class AudioFileWorkers {
   tag(): Tag {
     if (this.tagPtr === 0) return {};
 
-    const title = this.module._taglib_tag_title(this.tagPtr);
-    const artist = this.module._taglib_tag_artist(this.tagPtr);
-    const album = this.module._taglib_tag_album(this.tagPtr);
-    const comment = this.module._taglib_tag_comment(this.tagPtr);
-    const genre = this.module._taglib_tag_genre(this.tagPtr);
-    const year = this.module._taglib_tag_year(this.tagPtr);
-    const track = this.module._taglib_tag_track(this.tagPtr);
+    const title = this.module._taglib_tag_title?.(this.tagPtr) || 0;
+    const artist = this.module._taglib_tag_artist?.(this.tagPtr) || 0;
+    const album = this.module._taglib_tag_album?.(this.tagPtr) || 0;
+    const comment = this.module._taglib_tag_comment?.(this.tagPtr) || 0;
+    const genre = this.module._taglib_tag_genre?.(this.tagPtr) || 0;
+    const year = this.module._taglib_tag_year?.(this.tagPtr) || 0;
+    const track = this.module._taglib_tag_track?.(this.tagPtr) || 0;
 
     return {
       title: title ? cStringToJS(this.module, title) : undefined,
@@ -80,14 +80,14 @@ export class AudioFileWorkers {
   audioProperties(): AudioProperties | null {
     if (this.propsPtr === 0) return null;
 
-    const length = this.module._taglib_audioproperties_length(this.propsPtr);
-    const bitrate = this.module._taglib_audioproperties_bitrate(this.propsPtr);
-    const sampleRate = this.module._taglib_audioproperties_samplerate(
+    const length = this.module._taglib_audioproperties_length?.(this.propsPtr) || 0;
+    const bitrate = this.module._taglib_audioproperties_bitrate?.(this.propsPtr) || 0;
+    const sampleRate = this.module._taglib_audioproperties_samplerate?.(
       this.propsPtr,
-    );
-    const channels = this.module._taglib_audioproperties_channels(
+    ) || 0;
+    const channels = this.module._taglib_audioproperties_channels?.(
       this.propsPtr,
-    );
+    ) || 0;
 
     return {
       length,
@@ -104,7 +104,7 @@ export class AudioFileWorkers {
   setTitle(title: string): void {
     if (this.tagPtr === 0) return;
     const titlePtr = jsToCString(this.module, title);
-    this.module._taglib_tag_set_title(this.tagPtr, titlePtr);
+    this.module._taglib_tag_set_title?.(this.tagPtr, titlePtr);
     this.module._free(titlePtr);
   }
 
@@ -114,7 +114,7 @@ export class AudioFileWorkers {
   setArtist(artist: string): void {
     if (this.tagPtr === 0) return;
     const artistPtr = jsToCString(this.module, artist);
-    this.module._taglib_tag_set_artist(this.tagPtr, artistPtr);
+    this.module._taglib_tag_set_artist?.(this.tagPtr, artistPtr);
     this.module._free(artistPtr);
   }
 
@@ -124,7 +124,7 @@ export class AudioFileWorkers {
   setAlbum(album: string): void {
     if (this.tagPtr === 0) return;
     const albumPtr = jsToCString(this.module, album);
-    this.module._taglib_tag_set_album(this.tagPtr, albumPtr);
+    this.module._taglib_tag_set_album?.(this.tagPtr, albumPtr);
     this.module._free(albumPtr);
   }
 
@@ -134,7 +134,7 @@ export class AudioFileWorkers {
   setComment(comment: string): void {
     if (this.tagPtr === 0) return;
     const commentPtr = jsToCString(this.module, comment);
-    this.module._taglib_tag_set_comment(this.tagPtr, commentPtr);
+    this.module._taglib_tag_set_comment?.(this.tagPtr, commentPtr);
     this.module._free(commentPtr);
   }
 
@@ -144,7 +144,7 @@ export class AudioFileWorkers {
   setGenre(genre: string): void {
     if (this.tagPtr === 0) return;
     const genrePtr = jsToCString(this.module, genre);
-    this.module._taglib_tag_set_genre(this.tagPtr, genrePtr);
+    this.module._taglib_tag_set_genre?.(this.tagPtr, genrePtr);
     this.module._free(genrePtr);
   }
 
@@ -153,7 +153,7 @@ export class AudioFileWorkers {
    */
   setYear(year: number): void {
     if (this.tagPtr === 0) return;
-    this.module._taglib_tag_set_year(this.tagPtr, year);
+    this.module._taglib_tag_set_year?.(this.tagPtr, year);
   }
 
   /**
@@ -161,18 +161,29 @@ export class AudioFileWorkers {
    */
   setTrack(track: number): void {
     if (this.tagPtr === 0) return;
-    this.module._taglib_tag_set_track(this.tagPtr, track);
+    this.module._taglib_tag_set_track?.(this.tagPtr, track);
   }
 
   /**
-   * Save changes to the file (read-only in Workers context)
-   * Note: This would require returning modified buffer data
+   * Save changes to the file
+   * Note: In Workers context, this saves to the in-memory buffer only
    */
   save(): boolean {
-    console.warn("save(): File saving not implemented in Workers context");
+    if (this.fileId !== 0) {
+      return this.module._taglib_file_save?.(this.fileId) !== 0;
+    }
     return false;
   }
 
+  /**
+   * Get the current file buffer after modifications
+   * Note: This is not implemented in the Workers API
+   */
+  getFileBuffer(): Uint8Array {
+    console.warn("getFileBuffer() is not implemented in Workers API. Use Core API for this functionality.");
+    return new Uint8Array(0);
+  }
+
   /**
    * Get extended metadata with format-agnostic field names
    */
@@ -224,7 +235,7 @@ export class AudioFileWorkers {
    */
   dispose(): void {
     if (this.fileId !== 0) {
-      this.module._taglib_file_delete(this.fileId);
+      this.module._taglib_file_delete?.(this.fileId);
       this.fileId = 0;
     }
   }
@@ -273,8 +284,18 @@ export class TagLibWorkers {
     }
 
     // Use Emscripten's allocate function for proper memory management
-    const dataPtr = this.module.allocate(buffer, this.module.ALLOC_NORMAL);
+    let dataPtr: number;
+    if (this.module.allocate && this.module.ALLOC_NORMAL !== undefined) {
+      dataPtr = this.module.allocate(buffer, this.module.ALLOC_NORMAL);
+    } else {
+      dataPtr = this.module._malloc(buffer.length);
+      this.module.HEAPU8.set(buffer, dataPtr);
+    }
 
+    if (!this.module._taglib_file_new_from_buffer) {
+      throw new Error("Workers API requires C-style functions. Use Core API instead.");
+    }
+    
     const fileId = this.module._taglib_file_new_from_buffer(
       dataPtr,
       buffer.length,

package/src/simple-jsr.ts

@@ -1,204 +0,0 @@
-/**
- * @fileoverview JSR-compatible simple API (uses taglib-jsr.ts instead of taglib.ts)
- */
-
-import { TagLibJSR, AudioFileJSR } from "./taglib-jsr.ts";
-import type { AudioProperties, Tag } from "./types.ts";
-
-// Track TagLib instance
-let taglib: TagLibJSR | null = null;
-
-/**
- * Ensure TagLib is initialized
- */
-async function ensureInitialized(): Promise<TagLibJSR> {
-  if (!taglib) {
-    await TagLibJSR.initialize();
-    taglib = await TagLibJSR.getInstance();
-  }
-  return taglib;
-}
-
-/**
- * Read a file's data from various sources
- */
-async function readFileData(file: string | Uint8Array | ArrayBuffer | File): Promise<Uint8Array> {
-  // Already a Uint8Array
-  if (file instanceof Uint8Array) {
-    return file;
-  }
-  
-  // ArrayBuffer - convert to Uint8Array
-  if (file instanceof ArrayBuffer) {
-    return new Uint8Array(file);
-  }
-  
-  // File object (browser)
-  if (typeof File !== 'undefined' && file instanceof File) {
-    return new Uint8Array(await file.arrayBuffer());
-  }
-  
-  // String path - read from filesystem
-  if (typeof file === 'string') {
-    // Deno
-    if (typeof Deno !== 'undefined') {
-      return await Deno.readFile(file);
-    }
-    
-    throw new Error('File path reading not supported in this environment');
-  }
-  
-  throw new Error('Invalid file input type');
-}
-
-/**
- * Read metadata tags from an audio file
- */
-export async function readTags(file: string | Uint8Array | ArrayBuffer | File): Promise<Tag> {
-  const taglib = await ensureInitialized();
-  const audioData = await readFileData(file);
-  
-  const audioFile = await taglib.openFile(audioData.buffer as ArrayBuffer);
-  try {
-    if (!audioFile.isValid()) {
-      throw new Error('Invalid audio file');
-    }
-    
-    return audioFile.tag();
-  } finally {
-    audioFile.dispose();
-  }
-}
-
-/**
- * Write metadata tags to an audio file
- */
-export async function writeTags(
-  file: string | Uint8Array | ArrayBuffer | File, 
-  tags: Partial<Tag>, 
-  options?: number
-): Promise<Uint8Array> {
-  const taglib = await ensureInitialized();
-  const audioData = await readFileData(file);
-  
-  const audioFile = await taglib.openFile(audioData.buffer as ArrayBuffer);
-  try {
-    if (!audioFile.isValid()) {
-      throw new Error('Invalid audio file');
-    }
-    
-    // Set the tags
-    const tag = audioFile.tag();
-    if (tags.title !== undefined) tag.setTitle(tags.title);
-    if (tags.artist !== undefined) tag.setArtist(tags.artist);
-    if (tags.album !== undefined) tag.setAlbum(tags.album);
-    if (tags.comment !== undefined) tag.setComment(tags.comment);
-    if (tags.genre !== undefined) tag.setGenre(tags.genre);
-    if (tags.year !== undefined) tag.setYear(tags.year);
-    if (tags.track !== undefined) tag.setTrack(tags.track);
-    
-    // Save changes
-    const success = audioFile.save();
-    if (!success) {
-      throw new Error('Failed to save tags');
-    }
-    
-    // TODO: Return the modified file data
-    // For now, return the original data
-    return audioData;
-  } finally {
-    audioFile.dispose();
-  }
-}
-
-/**
- * Read audio properties from a file
- */
-export async function readProperties(file: string | Uint8Array | ArrayBuffer | File): Promise<AudioProperties> {
-  const taglib = await ensureInitialized();
-  const audioData = await readFileData(file);
-  
-  const audioFile = await taglib.openFile(audioData.buffer as ArrayBuffer);
-  try {
-    if (!audioFile.isValid()) {
-      throw new Error('Invalid audio file');
-    }
-    
-    const props = audioFile.audioProperties();
-    if (!props) {
-      throw new Error('Failed to read audio properties');
-    }
-    return props;
-  } finally {
-    audioFile.dispose();
-  }
-}
-
-/**
- * Tag field constants for go-taglib compatibility
- */
-export const Title = "title";
-export const Artist = "artist";
-export const Album = "album";
-export const Comment = "comment";
-export const Genre = "genre";
-export const Year = "year";
-export const Track = "track";
-export const AlbumArtist = "albumartist";
-export const Composer = "composer";
-export const DiscNumber = "discnumber";
-
-/**
- * Check if a file is a valid audio file
- */
-export async function isValidAudioFile(file: string | Uint8Array | ArrayBuffer | File): Promise<boolean> {
-  try {
-    const taglib = await ensureInitialized();
-    const audioData = await readFileData(file);
-    
-    const audioFile = await taglib.openFile(audioData.buffer as ArrayBuffer);
-    const valid = audioFile.isValid();
-    audioFile.dispose();
-    
-    return valid;
-  } catch {
-    return false;
-  }
-}
-
-/**
- * Get the audio format of a file
- */
-export async function getFormat(file: string | Uint8Array | ArrayBuffer | File): Promise<string | undefined> {
-  const taglib = await ensureInitialized();
-  const audioData = await readFileData(file);
-  
-  const audioFile = await taglib.openFile(audioData.buffer as ArrayBuffer);
-  try {
-    if (!audioFile.isValid()) {
-      return undefined;
-    }
-    
-    return audioFile.getFormat();
-  } finally {
-    audioFile.dispose();
-  }
-}
-
-/**
- * Clear all tags from a file
- */
-export async function clearTags(file: string | Uint8Array | ArrayBuffer | File): Promise<Uint8Array> {
-  return writeTags(file, {
-    title: "",
-    artist: "",
-    album: "",
-    comment: "",
-    genre: "",
-    year: 0,
-    track: 0,
-  });
-}
-
-// Type exports for convenience
-export type { Tag, AudioProperties } from "./types.ts";

package/src/taglib-jsr.ts

@@ -1,48 +0,0 @@
-/**
- * @fileoverview JSR-compatible TagLib implementation
- *
- * This version uses direct WASM loading without Emscripten's JS file
- * to be compatible with JSR publishing requirements.
- */
-
-import { AudioFileImpl, TagLib as TagLibBase, createTagLib } from "./taglib.ts";
-import type { AudioFile, Tag, AudioProperties, FileType, PropertyMap } from "./taglib.ts";
-import type { TagLibConfig } from "./types.ts";
-import type { WasmModule } from "./wasm-jsr.ts";
-
-// Re-export types and implementations
-export { AudioFileImpl as AudioFileJSR } from "./taglib.ts";
-export type { Tag, AudioProperties, FileType, PropertyMap } from "./taglib.ts";
-
-/**
- * JSR-compatible TagLib singleton for WASM module management
- */
-export class TagLibJSR extends TagLibBase {
-  private static instance: TagLibJSR | null = null;
-  private static initialized = false;
-
-  static async getInstance(): Promise<TagLibJSR> {
-    if (!TagLibJSR.instance) {
-      // For JSR, we need to load the module directly without Node.js dependencies
-      // This is a placeholder - the actual implementation would need to load WASM directly
-      throw new Error("JSR version requires direct WASM loading implementation. Please use the NPM version for now.");
-    }
-    return TagLibJSR.instance;
-  }
-
-  static async initialize(config?: TagLibConfig): Promise<void> {
-    if (!TagLibJSR.initialized) {
-      await TagLibJSR.getInstance();
-    }
-  }
-
-  /**
-   * Open a file from a buffer (JSR-compatible version)
-   */
-  override async openFile(buffer: ArrayBuffer): Promise<AudioFile> {
-    return super.openFile(buffer);
-  }
-}
-
-// Export alias for compatibility
-export { TagLibJSR as TagLib };

package/src/wasm-jsr.ts

@@ -1,13 +0,0 @@
-/**
- * @fileoverview JSR-compatible WASM module interface (no Node.js dependencies)
- */
-
-// Re-export types only (no implementation imports)
-export type {
-  EmscriptenModule,
-  FileHandle,
-  TagWrapper,
-  AudioPropertiesWrapper,
-  TagLibModule,
-  WasmModule,
-} from "./wasm.ts";