Creepso/Sora
1
0
Fork 0
mirror of https://github.com/cranci1/Sora.git synced 2026-03-11 17:45:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

yesyesyes

Browse source
This commit is contained in:
cranci1 2025-01-28 18:14:19 +01:00
parent ac500c58ac
commit 69cd035ba1
2 changed files with 73 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
Sora/Utils/Loader/JSController.swift
View file

@ -430,4 +430,68 @@ class JSController: ObservableObject {
promise.invokeMethod("then", withArguments: [thenFunction as Any])
promise.invokeMethod("catch", withArguments: [catchFunction as Any])
}
func fetchStreamUrlJSSecond(episodeUrl: String, completion: @escaping (String?) -> Void) {
let url = URL(string: episodeUrl)!
let task = URLSession.shared.dataTask(with: url) { data, response, error in
if let error = error {
Logger.shared.log("URLSession error: \(error.localizedDescription)", type: "Error")
DispatchQueue.main.async {
completion(nil)
}
return
}
guard let data = data, let htmlString = String(data: data, encoding: .utf8) else {
Logger.shared.log("Failed to fetch HTML data", type: "Error")
DispatchQueue.main.async {
completion(nil)
}
return
}
DispatchQueue.main.async {
if let exception = self.context.exception {
Logger.shared.log("JavaScript exception: \(exception)", type: "Error")
completion(nil)
return
}
guard let extractStreamUrlFunction = self.context.objectForKeyedSubscript("extractStreamUrl") else {
Logger.shared.log("No JavaScript function extractStreamUrl found", type: "Error")
completion(nil)
return
}
let promiseValue = extractStreamUrlFunction.call(withArguments: [htmlString])
guard let promise = promiseValue else {
Logger.shared.log("extractStreamUrl did not return a Promise", type: "Error")
completion(nil)
return
}
let thenBlock: @convention(block) (JSValue) -> Void = { result in
let streamUrl = result.toString()
Logger.shared.log("Starting stream from: \(streamUrl ?? "nil")", type: "Stream")
DispatchQueue.main.async {
completion(streamUrl)
}
}
let catchBlock: @convention(block) (JSValue) -> Void = { error in
Logger.shared.log("Promise rejected: \(String(describing: error.toString()))", type: "Error")
DispatchQueue.main.async {
completion(nil)
}
}
let thenFunction = JSValue(object: thenBlock, in: self.context)
let catchFunction = JSValue(object: catchBlock, in: self.context)
promise.invokeMethod("then", withArguments: [thenFunction as Any])
promise.invokeMethod("catch", withArguments: [catchFunction as Any])
}
}
task.resume()
}
}

10
Sora/Views/MediaInfoView/MediaInfoView.swift
View file

@ -324,7 +324,7 @@ struct MediaInfoView: View {
let jsContent = try moduleManager.getModuleContent(module)
jsController.loadScript(jsContent)
if module.metadata.asyncJS == true || module.metadata.streamAsyncJS == true {
if module.metadata.asyncJS == true {
jsController.fetchStreamUrlJS(episodeUrl: href) { streamUrl in
guard let url = streamUrl, url != "null" else {
handleStreamFailure()
@ -332,6 +332,14 @@ struct MediaInfoView: View {
}
playStream(url: url, fullURL: href)
}
} else if module.metadata.streamAsyncJS == true {
jsController.fetchStreamUrlJSSecond(episodeUrl: href) { streamUrl in
guard let url = streamUrl, url != "null" else {
handleStreamFailure()
return
}
playStream(url: url, fullURL: href)
}
} else {
jsController.fetchStreamUrl(episodeUrl: href) { streamUrl in
guard let url = streamUrl, url != "null" else {