Creepso/Sora
1
0
Fork 0
mirror of https://github.com/cranci1/Sora.git synced 2026-04-19 23:52:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

yeah no, idk tf im doing

Browse source
This commit is contained in:
cranci1 2025-02-15 17:17:00 +01:00
parent 1f48612a67
commit be1a156c37
4 changed files with 134 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
Sora/Utils/JSLoader/JSController.swift
View file

@ -174,9 +174,9 @@ class JSController: ObservableObject {
}.resume()
}
func fetchStreamUrl(episodeUrl: String, completion: @escaping (String?) -> Void) {
func fetchStreamUrl(episodeUrl: String, softsub: Bool = false, completion: @escaping ((stream: String?, subtitles: String?)) -> Void) {
guard let url = URL(string: episodeUrl) else {
completion(nil)
completion((nil, nil))
return
}
@ -184,27 +184,40 @@ class JSController: ObservableObject {
guard let self = self else { return }
if let error = error {
Logger.shared.log("Network error: \(error)",type: "Error")
DispatchQueue.main.async { completion(nil) }
Logger.shared.log("Network error: \(error)", type: "Error")
DispatchQueue.main.async { completion((nil, nil)) }
return
}
guard let data = data, let html = String(data: data, encoding: .utf8) else {
Logger.shared.log("Failed to decode HTML",type: "Error")
DispatchQueue.main.async { completion(nil) }
Logger.shared.log("Failed to decode HTML", type: "Error")
DispatchQueue.main.async { completion((nil, nil)) }
return
}
Logger.shared.log(html,type: "HTMLStrings")
Logger.shared.log(html, type: "HTMLStrings")
if let parseFunction = self.context.objectForKeyedSubscript("extractStreamUrl"),
let streamUrl = parseFunction.call(withArguments: [html]).toString() {
Logger.shared.log("Staring stream from: \(streamUrl)", type: "Stream")
DispatchQueue.main.async {
completion(streamUrl)
let resultString = parseFunction.call(withArguments: [html]).toString() {
if softsub {
if let data = resultString.data(using: .utf8),
let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
let streamUrl = json["stream"] as? String
let subtitlesUrl = json["subtitles"] as? String
Logger.shared.log("Starting stream from: \(streamUrl ?? "nil") with subtitles: \(subtitlesUrl ?? "nil")", type: "Stream")
DispatchQueue.main.async {
completion((streamUrl, subtitlesUrl))
}
} else {
Logger.shared.log("Failed to parse softsub JSON", type: "Error")
DispatchQueue.main.async { completion((nil, nil)) }
}
} else {
Logger.shared.log("Starting stream from: \(resultString)", type: "Stream")
DispatchQueue.main.async { completion((resultString, nil)) }
}
} else {
Logger.shared.log("Failed to extract stream URL",type: "Error")
DispatchQueue.main.async { completion(nil) }
Logger.shared.log("Failed to extract stream URL", type: "Error")
DispatchQueue.main.async { completion((nil, nil)) }
}
}.resume()
}
@ -402,38 +415,56 @@ class JSController: ObservableObject {
}
}
func fetchStreamUrlJS(episodeUrl: String, completion: @escaping (String?) -> Void) {
func fetchStreamUrlJS(episodeUrl: String, softsub: Bool = false, completion: @escaping ((stream: String?, subtitles: String?)) -> Void) {
if let exception = context.exception {
Logger.shared.log("JavaScript exception: \(exception)", type: "Error")
completion(nil)
completion((nil, nil))
return
}
guard let extractStreamUrlFunction = context.objectForKeyedSubscript("extractStreamUrl") else {
Logger.shared.log("No JavaScript function extractStreamUrl found", type: "Error")
completion(nil)
completion((nil, nil))
return
}
let promiseValue = extractStreamUrlFunction.call(withArguments: [episodeUrl])
guard let promise = promiseValue else {
Logger.shared.log("extractStreamUrl did not return a Promise", type: "Error")
completion(nil)
completion((nil, 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)
if softsub {
if let jsonString = result.toString(),
let data = jsonString.data(using: .utf8),
let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
let streamUrl = json["stream"] as? String
let subtitlesUrl = json["subtitles"] as? String
Logger.shared.log("Starting stream from: \(streamUrl ?? "nil") with subtitles: \(subtitlesUrl ?? "nil")", type: "Stream")
DispatchQueue.main.async {
completion((streamUrl, subtitlesUrl))
}
} else {
Logger.shared.log("Failed to parse softsub JSON in JS", type: "Error")
DispatchQueue.main.async {
completion((nil, nil))
}
}
} else {
let streamUrl = result.toString()
Logger.shared.log("Starting stream from: \(streamUrl ?? "nil")", type: "Stream")
DispatchQueue.main.async {
completion((streamUrl, nil))
}
}
}
let catchBlock: @convention(block) (JSValue) -> Void = { error in
Logger.shared.log("Promise rejected: \(String(describing: error.toString()))", type: "Error")
DispatchQueue.main.async {
completion(nil)
completion((nil, nil))
}
}
@ -444,57 +475,71 @@ class JSController: ObservableObject {
promise.invokeMethod("catch", withArguments: [catchFunction as Any])
}
func fetchStreamUrlJSSecond(episodeUrl: String, completion: @escaping (String?) -> Void) {
func fetchStreamUrlJSSecond(episodeUrl: String, softsub: Bool = false, completion: @escaping ((stream: String?, subtitles: String?)) -> Void) {
let url = URL(string: episodeUrl)!
let task = URLSession.custom.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)
}
DispatchQueue.main.async { completion((nil, 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)
}
DispatchQueue.main.async { completion((nil, nil)) }
return
}
DispatchQueue.main.async {
if let exception = self.context.exception {
Logger.shared.log("JavaScript exception: \(exception)", type: "Error")
completion(nil)
completion((nil, nil))
return
}
guard let extractStreamUrlFunction = self.context.objectForKeyedSubscript("extractStreamUrl") else {
Logger.shared.log("No JavaScript function extractStreamUrl found", type: "Error")
completion(nil)
completion((nil, 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)
completion((nil, 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)
if softsub {
if let jsonString = result.toString(),
let data = jsonString.data(using: .utf8),
let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
let streamUrl = json["stream"] as? String
let subtitlesUrl = json["subtitles"] as? String
Logger.shared.log("Starting stream from: \(streamUrl ?? "nil") with subtitles: \(subtitlesUrl ?? "nil")", type: "Stream")
DispatchQueue.main.async {
completion((streamUrl, subtitlesUrl))
}
} else {
Logger.shared.log("Failed to parse softsub JSON in JSSecond", type: "Error")
DispatchQueue.main.async {
completion((nil, nil))
}
}
} else {
let streamUrl = result.toString()
Logger.shared.log("Starting stream from: \(streamUrl ?? "nil")", type: "Stream")
DispatchQueue.main.async {
completion((streamUrl, nil))
}
}
}
let catchBlock: @convention(block) (JSValue) -> Void = { error in
Logger.shared.log("Promise rejected: \(String(describing: error.toString()))", type: "Error")
DispatchQueue.main.async {
completion(nil)
completion((nil, nil))
}
}

2
Sora/Utils/Modules/Modules.swift
View file

@ -20,7 +20,7 @@ struct ModuleMetadata: Codable, Hashable {
let scriptUrl: String
let asyncJS: Bool?
let streamAsyncJS: Bool?
let softSub: Bool?
let softsub: Bool?
struct Author: Codable, Hashable {
let name: String

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

@ -391,36 +391,61 @@ struct MediaInfoView: View {
let jsContent = try moduleManager.getModuleContent(module)
jsController.loadScript(jsContent)
if module.metadata.asyncJS == true {
jsController.fetchStreamUrlJS(episodeUrl: href) { streamUrl in
guard let url = streamUrl, url != "null" else {
handleStreamFailure()
return
if module.metadata.softsub == true {
if module.metadata.asyncJS == true {
jsController.fetchStreamUrlJS(episodeUrl: href, softsub: true) { result in
if let streamUrl = result.stream {
self.playStream(url: streamUrl, fullURL: streamUrl, subtitles: result.subtitles)
} else {
self.handleStreamFailure(error: nil)
}
}
isFetchingEpisode = false
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
} else if module.metadata.streamAsyncJS == true {
jsController.fetchStreamUrlJSSecond(episodeUrl: href, softsub: true) { result in
if let streamUrl = result.stream {
self.playStream(url: streamUrl, fullURL: streamUrl, subtitles: result.subtitles)
} else {
self.handleStreamFailure(error: nil)
}
}
} else {
jsController.fetchStreamUrl(episodeUrl: href, softsub: true) { result in
if let streamUrl = result.stream {
self.playStream(url: streamUrl, fullURL: streamUrl, subtitles: result.subtitles)
} else {
self.handleStreamFailure(error: nil)
}
}
isFetchingEpisode = false
playStream(url: url, fullURL: href)
}
} else {
jsController.fetchStreamUrl(episodeUrl: href) { streamUrl in
guard let url = streamUrl, url != "null" else {
handleStreamFailure()
return
if module.metadata.asyncJS == true {
jsController.fetchStreamUrlJS(episodeUrl: href) { result in
if let streamUrl = result.stream {
self.playStream(url: streamUrl, fullURL: streamUrl)
} else {
self.handleStreamFailure(error: nil)
}
}
} else if module.metadata.streamAsyncJS == true {
jsController.fetchStreamUrlJSSecond(episodeUrl: href) { result in
if let streamUrl = result.stream {
self.playStream(url: streamUrl, fullURL: streamUrl)
} else {
self.handleStreamFailure(error: nil)
}
}
} else {
jsController.fetchStreamUrl(episodeUrl: href) { result in
if let streamUrl = result.stream {
self.playStream(url: streamUrl, fullURL: streamUrl)
} else {
self.handleStreamFailure(error: nil)
}
}
isFetchingEpisode = false
playStream(url: url, fullURL: href)
}
}
} catch {
handleStreamFailure(error: error)
self.handleStreamFailure(error: error)
}
}
}
@ -437,7 +462,7 @@ struct MediaInfoView: View {
self.isLoading = false
}
func playStream(url: String, fullURL: String) {
func playStream(url: String, fullURL: String, subtitles: String? = nil) {
DispatchQueue.main.async {
let externalPlayer = UserDefaults.standard.string(forKey: "externalPlayer") ?? "Default"
var scheme: String?
@ -460,7 +485,8 @@ struct MediaInfoView: View {
episodeNumber: selectedEpisodeNumber,
onWatchNext: {
selectNextEpisode()
}
},
subtitlesURL: subtitles
)
let hostingController = UIHostingController(rootView: customMediaPlayer)
hostingController.modalPresentationStyle = .fullScreen

2
Sora/Views/SettingsView/SettingsView.swift
View file

@ -101,7 +101,7 @@ class Settings: ObservableObject {
init() {
if let colorData = UserDefaults.standard.data(forKey: "accentColor"),
let uiColor = try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(colorData) as? UIColor {
let uiColor = try? NSKeyedUnarchiver.unarchivedObject(ofClass: UIColor.self, from: colorData) {
self.accentColor = Color(uiColor)
} else {
self.accentColor = .accentColor