diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c6cda3e..e0808b1 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Feature Request 💡
     url: https://github.com/nodefinity/react-native-music-library/discussions/new?category=ideas
diff --git a/example/ios/MusicLibraryExample.xcodeproj/project.pbxproj b/example/ios/MusicLibraryExample.xcodeproj/project.pbxproj
index 7698db3..300190c 100644
--- a/example/ios/MusicLibraryExample.xcodeproj/project.pbxproj
+++ b/example/ios/MusicLibraryExample.xcodeproj/project.pbxproj
@@ -384,7 +384,10 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -454,7 +457,10 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
diff --git a/example/src/pages/TrackListScreen.tsx b/example/src/pages/TrackListScreen.tsx
index d01f0d3..04f0f53 100644
--- a/example/src/pages/TrackListScreen.tsx
+++ b/example/src/pages/TrackListScreen.tsx
@@ -117,7 +117,7 @@ export default function TrackListScreen({ navigation }: Props) {
         />
 
         <Button
-          title={`${loading ? 'loading...' : ''} get tracks from directory`}
+          title={`${loading ? 'loading...' : ''} get tracks from directory (Android only)`}
           onPress={getTracksFromPickedDirectory}
           disabled={loading}
         />
diff --git a/ios/MusicLibrary.mm b/ios/MusicLibrary.mm
index 4614c44..92b31c8 100644
--- a/ios/MusicLibrary.mm
+++ b/ios/MusicLibrary.mm
@@ -15,99 +15,96 @@ - (instancetype) init {
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
-    return std::make_shared<facebook::react::NativeMusicLibrarySpecJSI>(params);
+  return std::make_shared<facebook::react::NativeMusicLibrarySpecJSI>(params);
 }
 
 - (void)getTracksAsync:(JS::NativeMusicLibrary::InternalTrackOptions &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
-  NSLog(@"🎵 [MusicLibrary.mm] getTracksAsync called from Objective-C");
-  
-  // Extract values from Objective-C types with proper casting
+  // Extract values and create TrackOptions object
   int first = (int)options.first();
   NSString *after = options.after();
   NSString *directory = options.directory();
   NSArray *sortBy = (NSArray *)options.sortBy();
-  
-  // Call Swift function directly
-  NSDictionary *result = [musicLibrary getTracksAsyncWithFirst:first after:after sortBy:sortBy directory:directory];
-  
-  NSLog(@"🎵 [MusicLibrary.mm] getTracksAsync resolved with result: %@", result);
-  resolve(result);
+
+  TrackOptions *trackOptions = [[TrackOptions alloc] initAfter:after first:first sortBy:sortBy directory:directory];
+
+  // Call Swift function with options object
+  [musicLibrary getTracksAsyncWithOptions:trackOptions resolve:resolve reject:reject];
 }
 
-- (void)getTrackMetadataAsync:(nonnull NSString *)trackId resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject { 
+- (void)getTrackMetadataAsync:(nonnull NSString *)trackId resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
   NSLog(@"🎵 [MusicLibrary.mm] getTrackMetadataAsync called with trackId: %@", trackId);
-  
+
   NSDictionary *result = [musicLibrary getTrackMetadataAsync:trackId];
-  
+
   NSLog(@"🎵 [MusicLibrary.mm] getTrackMetadataAsync resolved with result: %@", result);
   resolve(result);
 }
 
-- (void)getTracksByAlbumAsync:(nonnull NSString *)albumId resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject { 
+- (void)getTracksByAlbumAsync:(nonnull NSString *)albumId resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
   NSLog(@"🎵 [MusicLibrary.mm] getTracksByAlbumAsync called with albumId: %@", albumId);
-  
+
   NSArray *result = [musicLibrary getTracksByAlbumAsync:albumId];
-  
+
   NSLog(@"🎵 [MusicLibrary.mm] getTracksByAlbumAsync resolved with result: %@", result);
   resolve(result);
 }
 
-- (void)getTracksByArtistAsync:(nonnull NSString *)artistId options:(JS::NativeMusicLibrary::InternalTrackOptions &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject { 
+- (void)getTracksByArtistAsync:(nonnull NSString *)artistId options:(JS::NativeMusicLibrary::InternalTrackOptions &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
   NSLog(@"🎵 [MusicLibrary.mm] getTracksByArtistAsync called with artistId: %@", artistId);
-  
+
   // Extract values from Objective-C types with proper casting
   int first = (int)options.first();
   NSString *after = options.after();
   NSString *directory = options.directory();
   NSArray *sortBy = (NSArray *)options.sortBy();
-  
+
   // Call Swift function directly
   NSDictionary *result = [musicLibrary getTracksByArtistAsync:artistId first:first after:after sortBy:sortBy directory:directory];
-  
+
   NSLog(@"🎵 [MusicLibrary.mm] getTracksByArtistAsync resolved with result: %@", result);
   resolve(result);
 }
 
-- (void)getAlbumsAsync:(JS::NativeMusicLibrary::InternalAlbumOptions &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject { 
+- (void)getAlbumsAsync:(JS::NativeMusicLibrary::InternalAlbumOptions &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
   NSLog(@"🎵 [MusicLibrary.mm] getAlbumsAsync called from Objective-C");
-  
+
   // Extract values from Objective-C types with proper casting
   int first = (int)options.first();
   NSString *after = options.after();
   NSArray *sortBy = (NSArray *)options.sortBy();
-  
+
   // Call Swift function directly
   NSDictionary *result = [musicLibrary getAlbumsAsyncWithFirst:first after:after sortBy:sortBy];
-  
+
   NSLog(@"🎵 [MusicLibrary.mm] getAlbumsAsync resolved with result: %@", result);
   resolve(result);
 }
 
-- (void)getAlbumsByArtistAsync:(nonnull NSString *)artistId resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject { 
+- (void)getAlbumsByArtistAsync:(nonnull NSString *)artistId resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
   NSLog(@"🎵 [MusicLibrary.mm] getAlbumsByArtistAsync called with artistId: %@", artistId);
-  
+
   NSArray *result = [musicLibrary getAlbumsByArtistAsync:artistId];
-  
+
   NSLog(@"🎵 [MusicLibrary.mm] getAlbumsByArtistAsync resolved with result: %@", result);
   resolve(result);
 }
 
-- (void)getArtistsAsync:(JS::NativeMusicLibrary::InternalArtistOptions &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject { 
+- (void)getArtistsAsync:(JS::NativeMusicLibrary::InternalArtistOptions &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
   NSLog(@"🎵 [MusicLibrary.mm] getArtistsAsync called from Objective-C");
-  
+
   // Extract values from Objective-C types with proper casting
   int first = (int)options.first();
   NSString *after = options.after();
   NSArray *sortBy = (NSArray *)options.sortBy();
-  
+
   // Call Swift function directly
   NSDictionary *result = [musicLibrary getArtistsAsyncWithFirst:first after:after sortBy:sortBy];
-  
+
   NSLog(@"🎵 [MusicLibrary.mm] getArtistsAsync resolved with result: %@", result);
   resolve(result);
 }
 
-+ (NSString *)moduleName { 
++ (NSString *)moduleName {
   return @"MusicLibraryImpl";
 }
 
diff --git a/ios/MusicLibraryImpl.swift b/ios/MusicLibraryImpl.swift
index 000c3dc..e43d96b 100644
--- a/ios/MusicLibraryImpl.swift
+++ b/ios/MusicLibraryImpl.swift
@@ -5,32 +5,31 @@
 //
 
 import Foundation
+import React
+
+@objc(MusicLibraryImpl)
+public class MusicLibraryImpl: NSObject {
+
+  @objc
+  public func getTracksAsync(options: TrackOptions, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    NSLog("🎵 [MusicLibrary] getTracksAsync called with options: %@", options)
 
-@objc public class MusicLibraryImpl: NSObject {
-  
-  @objc public func getTracksAsync(first: Int, after: String?, sortBy: [String], directory: String?) -> [String: Any] {
-    NSLog("🎵 [MusicLibrary] getTracksAsync called with first: %d, after: %@, sortBy: %@, directory: %@", first, after ?? "nil", sortBy, directory ?? "nil")
-    
     do {
-      let trackOptions = TrackOptions(after: after, first: first, sortBy: sortBy, directory: directory)
-      NSLog("🎵 [MusicLibrary] getTracksAsync trackOptions: %@", trackOptions)
-      let result = GetTracksQuery.getTracks(options: trackOptions)
+      let getTracks = GetTracks(options: options)
+      let result = getTracks.execute()
       let resultDict = result.toDictionary()
-      
+
       NSLog("🎵 [MusicLibrary] getTracksAsync returning: %@", resultDict)
-      return resultDict
+      resolve(resultDict)
     } catch {
       NSLog("🎵 [MusicLibrary] getTracksAsync error: %@", error.localizedDescription)
-      return DataConverter.createErrorDictionary(
-        code: "QUERY_ERROR", 
-        message: "Failed to query tracks: \(error.localizedDescription)"
-      )
+      reject("QUERY_ERROR", "Failed to query tracks: \(error.localizedDescription)", error)
     }
   }
-  
+
   @objc public func getTrackMetadataAsync(_ trackId: String) -> [String: Any] {
     NSLog("🎵 [MusicLibrary] getTrackMetadataAsync called with trackId: %@", trackId)
-    
+
     if let metadata = GetTrackMetadataQuery.getTrackMetadata(trackId: trackId) {
       let resultDict = metadata.toDictionary()
       NSLog("🎵 [MusicLibrary] getTrackMetadataAsync returning: %@", resultDict)
@@ -38,7 +37,7 @@ import Foundation
     } else {
       NSLog("🎵 [MusicLibrary] getTrackMetadataAsync: track not found")
       return DataConverter.createErrorDictionary(
-        code: "TRACK_NOT_FOUND", 
+        code: "TRACK_NOT_FOUND",
         message: "Track with id \(trackId) not found"
       )
     }
@@ -46,49 +45,49 @@ import Foundation
 
   @objc public func getTracksByAlbumAsync(_ albumId: String) -> [[String: Any]] {
     NSLog("🎵 [MusicLibrary] getTracksByAlbumAsync called with albumId: %@", albumId)
-    
+
     let tracks = GetTracksByAlbumQuery.getTracksByAlbum(albumId: albumId)
     let result = tracks.map { $0.toDictionary() }
-    
+
     NSLog("🎵 [MusicLibrary] getTracksByAlbumAsync returning: %@", result)
     return result
   }
-  
+
   @objc public func getTracksByArtistAsync(_ artistId: String, first: Int, after: String?, sortBy: [String], directory: String?) -> [String: Any] {
     NSLog("🎵 [MusicLibrary] getTracksByArtistAsync called with artistId: %@, first: %d, after: %@, sortBy: %@, directory: %@", artistId, first, after ?? "nil", sortBy, directory ?? "nil")
-    
+
     let result = PaginatedResult<Track>(items: [], hasNextPage: false)
     let resultDict = result.toDictionary()
-    
+
     NSLog("🎵 [MusicLibrary] getTracksByArtistAsync returning: %@", resultDict)
     return resultDict
   }
-  
+
   @objc public func getAlbumsAsync(first: Int, after: String?, sortBy: [String]) -> [String: Any] {
     NSLog("🎵 [MusicLibrary] getAlbumsAsync called with first: %d, after: %@, sortBy: %@", first, after ?? "nil", sortBy)
-    
+
     let result = PaginatedResult<Album>(items: [], hasNextPage: false)
     let resultDict = result.toDictionary()
-    
+
     NSLog("🎵 [MusicLibrary] getAlbumsAsync returning: %@", resultDict)
     return resultDict
   }
-  
+
   @objc public func getAlbumsByArtistAsync(_ artistId: String) -> [[String: Any]] {
     NSLog("🎵 [MusicLibrary] getAlbumsByArtistAsync called with artistId: %@", artistId)
-    
+
     let result: [[String: Any]] = []
-    
+
     NSLog("🎵 [MusicLibrary] getAlbumsByArtistAsync returning: %@", result)
     return result
   }
-  
+
   @objc public func getArtistsAsync(first: Int, after: String?, sortBy: [String]) -> [String: Any] {
     NSLog("🎵 [MusicLibrary] getArtistsAsync called with first: %d, after: %@, sortBy: %@", first, after ?? "nil", sortBy)
-    
+
     let result = PaginatedResult<Artist>(items: [], hasNextPage: false)
     let resultDict = result.toDictionary()
-    
+
     NSLog("🎵 [MusicLibrary] getArtistsAsync returning: %@", resultDict)
     return resultDict
   }
diff --git a/ios/models/AssetsOptions.swift b/ios/models/AssetsOptions.swift
index cf5a6c6..bcd1e34 100644
--- a/ios/models/AssetsOptions.swift
+++ b/ios/models/AssetsOptions.swift
@@ -8,12 +8,14 @@ import Foundation
 
 // MARK: - Options Models
 
+@objc(TrackOptions)
 public class TrackOptions: NSObject {
   public let after: String?
   public let first: Int
   public let sortBy: [String]
   public let directory: String?
-  
+
+  @objc
   public init(after: String? = nil, first: Int = 20, sortBy: [String] = [], directory: String? = nil) {
     self.after = after
     self.first = first
@@ -21,11 +23,11 @@ public class TrackOptions: NSObject {
     self.directory = directory
     super.init()
   }
-  
+
   public override var description: String {
     return "TrackOptions(after: \(after ?? "nil"), first: \(first), sortBy: \(sortBy), directory: \(directory ?? "nil"))"
   }
-  
+
   public func toDictionary() -> [String: Any] {
     return [
       "after": after ?? NSNull(),
@@ -40,18 +42,18 @@ public class AlbumOptions: NSObject {
   public let after: String?
   public let first: Int
   public let sortBy: [String]
-  
+
   public init(after: String? = nil, first: Int = 20, sortBy: [String] = []) {
     self.after = after
     self.first = first
     self.sortBy = sortBy
     super.init()
   }
-  
+
   public override var description: String {
     return "AlbumOptions(after: \(after ?? "nil"), first: \(first), sortBy: \(sortBy))"
   }
-  
+
   public func toDictionary() -> [String: Any] {
     return [
       "after": after ?? NSNull(),
@@ -65,18 +67,18 @@ public class ArtistOptions: NSObject {
   public let after: String?
   public let first: Int
   public let sortBy: [String]
-  
+
   public init(after: String? = nil, first: Int = 20, sortBy: [String] = []) {
     self.after = after
     self.first = first
     self.sortBy = sortBy
     super.init()
   }
-  
+
   public override var description: String {
     return "ArtistOptions(after: \(after ?? "nil"), first: \(first), sortBy: \(sortBy))"
   }
-  
+
   public func toDictionary() -> [String: Any] {
     return [
       "after": after ?? NSNull(),
diff --git a/ios/tracks/GetTracks.swift b/ios/tracks/GetTracks.swift
index e2adc50..8d060bb 100644
--- a/ios/tracks/GetTracks.swift
+++ b/ios/tracks/GetTracks.swift
@@ -5,19 +5,209 @@
 //
 
 import Foundation
+import MediaPlayer
 
 internal class GetTracks {
   private let options: TrackOptions
-  private let completion: (Result<PaginatedResult<Track>, Error>) -> Void
-  
-  init(options: TrackOptions, completion: @escaping (Result<PaginatedResult<Track>, Error>) -> Void) {
+
+  init(options: TrackOptions) {
     self.options = options
-    self.completion = completion
   }
-  
-  func execute() {
-    let result = GetTracksQuery.getTracks(options: options)
-    completion(.success(result))
+
+  func execute() -> PaginatedResult<Track> {
+    return getTracks(options: options)
   }
-}
 
+  // MARK: - Main Query Logic
+
+  private func getTracks(options: TrackOptions) -> PaginatedResult<Track> {
+    // 检查权限
+    if MPMediaLibrary.authorizationStatus() != .authorized {
+      NSLog("🎵 [MusicLibrary] Music Library permission not authorized")
+      return PaginatedResult<Track>(items: [], hasNextPage: false, totalCount: 0)
+    }
+
+    // iOS 不支持按目录过滤，忽略 directory 参数
+    if let directory = options.directory, !directory.isEmpty {
+      NSLog("🎵 [MusicLibrary] Directory filtering ('%@') is not supported on iOS, ignoring parameter", directory)
+    }
+
+    let query = MPMediaQuery.songs()
+    NSLog("🎵 [MusicLibrary] getTracks query: %@", query)
+
+    // 获取所有项目
+    guard var items = query.items else {
+      NSLog("🎵 [MusicLibrary] No items found in query")
+      return PaginatedResult<Track>(items: [], hasNextPage: false, totalCount: 0)
+    }
+
+    NSLog("🎵 [MusicLibrary] Found %d total items", items.count)
+
+    // 处理排序 - 按照参考实现的方式
+    if !options.sortBy.isEmpty {
+      for sortString in options.sortBy {
+        let components = sortString.components(separatedBy: " ")
+        let key = components[0]
+        let ascending = components.count > 1 && components[1] == "ASC"
+
+        NSLog("🎵 [MusicLibrary] Sorting by: %@ %@", key, ascending ? "ASC" : "DESC")
+
+        switch key.lowercased() {
+        case "title", "default":
+          items.sort { item1, item2 in
+            let title1 = item1.title ?? ""
+            let title2 = item2.title ?? ""
+            return ascending ? title1 < title2 : title1 > title2
+          }
+        case "artist":
+          items.sort { item1, item2 in
+            let artist1 = item1.artist ?? ""
+            let artist2 = item2.artist ?? ""
+            return ascending ? artist1 < artist2 : artist1 > artist2
+          }
+        case "duration":
+          items.sort { item1, item2 in
+            return ascending ? item1.playbackDuration < item2.playbackDuration : item1.playbackDuration > item2.playbackDuration
+          }
+        case "createdat", "creationtime":
+          items.sort { item1, item2 in
+            return ascending ? item1.dateAdded < item2.dateAdded : item1.dateAdded > item2.dateAdded
+          }
+        case "modifiedat", "modificationtime":
+          items.sort { item1, item2 in
+            let date1 = item1.lastPlayedDate ?? Date(timeIntervalSince1970: 0)
+            let date2 = item2.lastPlayedDate ?? Date(timeIntervalSince1970: 0)
+            return ascending ? date1 < date2 : date1 > date2
+          }
+        default:
+          NSLog("🎵 [MusicLibrary] Unknown sort key: %@", key)
+        }
+      }
+    }
+
+    // 处理分页 - 按照参考实现的方式
+    let first = options.first
+    let after = options.after
+
+    var startIndex = 0
+    if let after = after, let afterId = UInt64(after) {
+      if let foundIndex = items.firstIndex(where: { $0.persistentID == afterId }) {
+        startIndex = foundIndex + 1
+      }
+    }
+
+    let endIndex = min(startIndex + first, items.count)
+    let paginatedItems = startIndex < items.count ? Array(items[startIndex..<endIndex]) : []
+
+    NSLog("🎵 [MusicLibrary] Pagination: startIndex=%d, endIndex=%d, paginatedItems=%d",
+          startIndex, endIndex, paginatedItems.count)
+
+    // 转换为Track对象
+    let tracks = paginatedItems.map { item -> Track in
+      // 详细调试 URL 信息
+      NSLog("🎵 [MusicLibrary] Track: '%@'", item.title ?? "Unknown")
+      NSLog("🎵 [MusicLibrary] - assetURL: %@", item.assetURL?.absoluteString ?? "nil")
+      NSLog("🎵 [MusicLibrary] - isCloudItem: %d", item.isCloudItem)
+      NSLog("🎵 [MusicLibrary] - hasProtectedAsset: %d", item.hasProtectedAsset)
+
+      // 尝试不同的 URL 获取方式
+      var urlString = ""
+
+      if let assetURL = item.assetURL {
+        urlString = assetURL.absoluteString
+        NSLog("🎵 [MusicLibrary] - Using assetURL: %@", urlString)
+      } else if item.isCloudItem {
+        // 对于云端项目，我们可以使用 persistentID 作为标识符
+        urlString = "ipod-library://item/item.m4a?id=\(item.persistentID)"
+        NSLog("🎵 [MusicLibrary] - Cloud item, using custom scheme: %@", urlString)
+      } else {
+        // 尝试使用 persistentID 构造URL（某些播放器可能支持）
+        urlString = "ipod-library://item/item.m4a?id=\(item.persistentID)"
+        NSLog("🎵 [MusicLibrary] - No assetURL, using fallback scheme: %@", urlString)
+      }
+
+      let track = Track(
+        id: "\(item.persistentID)",
+        title: item.title ?? "Unknown Title",
+        artist: item.artist,
+        artwork: getArtworkURL(for: item),
+        album: item.albumTitle,
+        duration: item.playbackDuration,
+        url: urlString,
+        createdAt: item.dateAdded.timeIntervalSince1970,
+        modifiedAt: item.dateAdded.timeIntervalSince1970,
+        fileSize: getFileSize(for: item)
+      )
+
+      NSLog("🎵 [MusicLibrary] Created track: %@ with URL: %@", track.title, track.url)
+      return track
+    }
+
+    // 返回结果
+    let hasNextPage = endIndex < items.count
+    let endCursor = paginatedItems.last.map { "\($0.persistentID)" } ?? after ?? ""
+
+    return PaginatedResult<Track>(
+      items: tracks,
+      hasNextPage: hasNextPage,
+      endCursor: endCursor,
+      totalCount: items.count
+    )
+  }
+
+  // MARK: - Private Helper Methods
+
+  private func getArtworkURL(for item: MPMediaItem) -> String? {
+    if let artwork = item.artwork {
+      // 在实际应用中，您可能需要将artwork保存到临时目录并返回文件URL
+      // 这里返回一个占位符URL，实际项目中可以实现artwork缓存
+      return "artwork://\(item.persistentID)"
+    }
+    return nil
+  }
+
+  private func getFileSize(for item: MPMediaItem) -> Int64 {
+    // MediaPlayer框架不直接提供文件大小信息
+    // 可以通过assetURL读取文件属性获取
+    guard let url = item.assetURL else { return 0 }
+
+    do {
+      let attributes = try FileManager.default.attributesOfItem(atPath: url.path)
+      return attributes[.size] as? Int64 ?? 0
+    } catch {
+      return 0
+    }
+  }
+
+  private func buildSortDescriptors(from sortBy: [String]) -> [NSSortDescriptor] {
+    if sortBy.isEmpty {
+      return [NSSortDescriptor(key: MPMediaItemPropertyTitle, ascending: true)]
+    }
+
+    return sortBy.compactMap { sortOption in
+      let parts = sortOption.components(separatedBy: " ")
+      guard parts.count == 2 else { return nil }
+
+      let key: String
+      switch parts[0].lowercased() {
+      case "default", "title":
+        key = MPMediaItemPropertyTitle
+      case "artist":
+        key = MPMediaItemPropertyArtist
+      case "album":
+        key = MPMediaItemPropertyAlbumTitle
+      case "duration":
+        key = MPMediaItemPropertyPlaybackDuration
+      case "createdat":
+        key = MPMediaItemPropertyDateAdded
+      case "modifiedat":
+        key = MPMediaItemPropertyDateAdded
+      default:
+        return nil
+      }
+
+      let ascending = parts[1].uppercased() == "ASC"
+      return NSSortDescriptor(key: key, ascending: ascending)
+    }
+  }
+}
diff --git a/ios/tracks/GetTracksQuery.swift b/ios/tracks/GetTracksQuery.swift
deleted file mode 100644
index ac926c8..0000000
--- a/ios/tracks/GetTracksQuery.swift
+++ /dev/null
@@ -1,197 +0,0 @@
-//
-//  GetTracksQuery.swift
-//  MusicLibrary
-//
-//
-
-import Foundation
-import MediaPlayer
-
-internal class GetTracksQuery {
-  
-  static func getTracks(options: TrackOptions) -> PaginatedResult<Track> {
-    // 检查权限
-    if MPMediaLibrary.authorizationStatus() != .authorized {
-      NSLog("🎵 [MusicLibrary] Music Library permission not authorized")
-      return PaginatedResult<Track>(items: [], hasNextPage: false, totalCount: 0)
-    }
-    
-    let query = MPMediaQuery.songs()
-    NSLog("🎵 [MusicLibrary] getTracks query: %@", query)
-    
-    // 获取所有项目
-    guard var items = query.items else {
-      NSLog("🎵 [MusicLibrary] No items found in query")
-      return PaginatedResult<Track>(items: [], hasNextPage: false, totalCount: 0)
-    }
-    
-    NSLog("🎵 [MusicLibrary] Found %d total items", items.count)
-    
-    // 处理排序 - 按照参考实现的方式
-    if !options.sortBy.isEmpty {
-      for sortString in options.sortBy {
-        let components = sortString.components(separatedBy: " ")
-        let key = components[0]
-        let ascending = components.count > 1 && components[1] == "ASC"
-        
-        NSLog("🎵 [MusicLibrary] Sorting by: %@ %@", key, ascending ? "ASC" : "DESC")
-        
-        switch key.lowercased() {
-        case "title", "default":
-          items.sort { item1, item2 in
-            let title1 = item1.title ?? ""
-            let title2 = item2.title ?? ""
-            return ascending ? title1 < title2 : title1 > title2
-          }
-        case "artist":
-          items.sort { item1, item2 in
-            let artist1 = item1.artist ?? ""
-            let artist2 = item2.artist ?? ""
-            return ascending ? artist1 < artist2 : artist1 > artist2
-          }
-        case "duration":
-          items.sort { item1, item2 in
-            return ascending ? item1.playbackDuration < item2.playbackDuration : item1.playbackDuration > item2.playbackDuration
-          }
-        case "createdat", "creationtime":
-          items.sort { item1, item2 in
-            return ascending ? item1.dateAdded < item2.dateAdded : item1.dateAdded > item2.dateAdded
-          }
-        case "modifiedat", "modificationtime":
-          items.sort { item1, item2 in
-            let date1 = item1.lastPlayedDate ?? Date(timeIntervalSince1970: 0)
-            let date2 = item2.lastPlayedDate ?? Date(timeIntervalSince1970: 0)
-            return ascending ? date1 < date2 : date1 > date2
-          }
-        default:
-          NSLog("🎵 [MusicLibrary] Unknown sort key: %@", key)
-        }
-      }
-    }
-    
-    // 处理分页 - 按照参考实现的方式
-    let first = options.first
-    let after = options.after
-    
-    var startIndex = 0
-    if let after = after, let afterId = UInt64(after) {
-      if let foundIndex = items.firstIndex(where: { $0.persistentID == afterId }) {
-        startIndex = foundIndex + 1
-      }
-    }
-    
-    let endIndex = min(startIndex + first, items.count)
-    let paginatedItems = startIndex < items.count ? Array(items[startIndex..<endIndex]) : []
-    
-    NSLog("🎵 [MusicLibrary] Pagination: startIndex=%d, endIndex=%d, paginatedItems=%d", 
-          startIndex, endIndex, paginatedItems.count)
-    
-    // 转换为Track对象
-    let tracks = paginatedItems.map { item -> Track in
-      // 详细调试 URL 信息
-      NSLog("🎵 [MusicLibrary] Track: '%@'", item.title ?? "Unknown")
-      NSLog("🎵 [MusicLibrary] - assetURL: %@", item.assetURL?.absoluteString ?? "nil")
-      NSLog("🎵 [MusicLibrary] - isCloudItem: %d", item.isCloudItem)
-      NSLog("🎵 [MusicLibrary] - hasProtectedAsset: %d", item.hasProtectedAsset)
-      
-      // 尝试不同的 URL 获取方式
-      var urlString = ""
-      
-      if let assetURL = item.assetURL {
-        urlString = assetURL.absoluteString
-        NSLog("🎵 [MusicLibrary] - Using assetURL: %@", urlString)
-      } else if item.isCloudItem {
-        // 对于云端项目，我们可以使用 persistentID 作为标识符
-        urlString = "ipod-library://item/item.m4a?id=\(item.persistentID)"
-        NSLog("🎵 [MusicLibrary] - Cloud item, using custom scheme: %@", urlString)
-      } else {
-        // 尝试使用 persistentID 构造URL（某些播放器可能支持）
-        urlString = "ipod-library://item/item.m4a?id=\(item.persistentID)"
-        NSLog("🎵 [MusicLibrary] - No assetURL, using fallback scheme: %@", urlString)
-      }
-      
-      let track = Track(
-        id: "\(item.persistentID)",
-        title: item.title ?? "Unknown Title",
-        artist: item.artist,
-        artwork: getArtworkURL(for: item),
-        album: item.albumTitle,
-        duration: item.playbackDuration,
-        url: urlString,
-        createdAt: item.dateAdded.timeIntervalSince1970,
-        modifiedAt: item.dateAdded.timeIntervalSince1970,
-        fileSize: getFileSize(for: item)
-      )
-      
-      NSLog("🎵 [MusicLibrary] Created track: %@ with URL: %@", track.title, track.url)
-      return track
-    }
-    
-    // 返回结果
-    let hasNextPage = endIndex < items.count
-    let endCursor = paginatedItems.last.map { "\($0.persistentID)" } ?? after ?? ""
-    
-    return PaginatedResult<Track>(
-      items: tracks,
-      hasNextPage: hasNextPage,
-      endCursor: endCursor,
-      totalCount: items.count
-    )
-  }
-  
-  // MARK: - Private Helper Methods
-  
-  private static func getArtworkURL(for item: MPMediaItem) -> String? {
-    if let artwork = item.artwork {
-      // 在实际应用中，您可能需要将artwork保存到临时目录并返回文件URL
-      // 这里返回一个占位符URL，实际项目中可以实现artwork缓存
-      return "artwork://\(item.persistentID)"
-    }
-    return nil
-  }
-  
-  private static func getFileSize(for item: MPMediaItem) -> Int64 {
-    // MediaPlayer框架不直接提供文件大小信息
-    // 可以通过assetURL读取文件属性获取
-    guard let url = item.assetURL else { return 0 }
-    
-    do {
-      let attributes = try FileManager.default.attributesOfItem(atPath: url.path)
-      return attributes[.size] as? Int64 ?? 0
-    } catch {
-      return 0
-    }
-  }
-  
-  private static func buildSortDescriptors(from sortBy: [String]) -> [NSSortDescriptor] {
-    if sortBy.isEmpty {
-      return [NSSortDescriptor(key: MPMediaItemPropertyTitle, ascending: true)]
-    }
-    
-    return sortBy.compactMap { sortOption in
-      let parts = sortOption.components(separatedBy: " ")
-      guard parts.count == 2 else { return nil }
-      
-      let key: String
-      switch parts[0].lowercased() {
-      case "default", "title":
-        key = MPMediaItemPropertyTitle
-      case "artist":
-        key = MPMediaItemPropertyArtist
-      case "album":
-        key = MPMediaItemPropertyAlbumTitle
-      case "duration":
-        key = MPMediaItemPropertyPlaybackDuration
-      case "createdat":
-        key = MPMediaItemPropertyDateAdded
-      case "modifiedat":
-        key = MPMediaItemPropertyDateAdded
-      default:
-        return nil
-      }
-      
-      let ascending = parts[1].uppercased() == "ASC"
-      return NSSortDescriptor(key: key, ascending: ascending)
-    }
-  }
-}