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

test encoding support for modules 😭

Browse source
This commit is contained in:
cranci1 2025-06-09 16:50:02 +02:00
parent cf4af358f5
commit 27dbdcbd55
1 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Sora/Utils/Extensions/JavaScriptCore+Extensions.swift
View file

@ -78,7 +78,7 @@ extension JSContext {
} }
func setupFetchV2() { func setupFetchV2() {
let fetchV2NativeFunction: @convention(block) (String, [String: String]?, String?, String?, ObjCBool, JSValue, JSValue) -> Void = { urlString, headers, method, body, redirect, resolve, reject in let fetchV2NativeFunction: @convention(block) (String, [String: String]?, String?, String?, ObjCBool, String?, JSValue, JSValue) -> Void = { urlString, headers, method, body, redirect, encoding, resolve, reject in
guard let url = URL(string: urlString) else { guard let url = URL(string: urlString) else {
Logger.shared.log("Invalid URL", type: "Error") Logger.shared.log("Invalid URL", type: "Error")
DispatchQueue.main.async { DispatchQueue.main.async {
@ -91,7 +91,33 @@ extension JSContext {
var request = URLRequest(url: url) var request = URLRequest(url: url)
request.httpMethod = httpMethod request.httpMethod = httpMethod
Logger.shared.log("FetchV2 Request: URL=\(url), Method=\(httpMethod), Body=\(body ?? "nil")", type: "Debug") Logger.shared.log("FetchV2 Request: URL=\(url), Method=\(httpMethod), Body=\(body ?? "nil"), Encoding=\(encoding ?? "utf-8")", type: "Debug")
func getEncoding(from encodingString: String?) -> String.Encoding {
guard let encodingString = encodingString?.lowercased() else {
return .utf8
}
switch encodingString {
case "utf-8", "utf8":
return .utf8
case "windows-1251", "cp1251":
return .windowsCP1251
case "windows-1252", "cp1252":
return .windowsCP1252
case "iso-8859-1", "latin1":
return .isoLatin1
case "ascii":
return .ascii
case "utf-16", "utf16":
return .utf16
default:
Logger.shared.log("Unknown encoding '\(encodingString)', defaulting to UTF-8", type: "Warning")
return .utf8
}
}
let textEncoding = getEncoding(from: encoding)
if httpMethod == "GET", let body = body, !body.isEmpty, body != "null", body != "undefined" { if httpMethod == "GET", let body = body, !body.isEmpty, body != "null", body != "undefined" {
Logger.shared.log("GET request must not have a body", type: "Error") Logger.shared.log("GET request must not have a body", type: "Error")
@ -164,12 +190,18 @@ extension JSContext {
return return
} }
if let text = String(data: data, encoding: .utf8) { if let text = String(data: data, encoding: textEncoding) {
responseDict["body"] = text responseDict["body"] = text
callResolve(responseDict) callResolve(responseDict)
} else { } else {
Logger.shared.log("Unable to decode data to text", type: "Error") Logger.shared.log("Unable to decode data with encoding \(encoding ?? "utf-8"), trying UTF-8 fallback", type: "Warning")
callResolve(responseDict) if let fallbackText = String(data: data, encoding: .utf8) {
responseDict["body"] = fallbackText
callResolve(responseDict)
} else {
Logger.shared.log("Unable to decode data to text with any encoding", type: "Error")
callResolve(responseDict)
}
} }
} catch { } catch {
@ -184,18 +216,19 @@ extension JSContext {
self.setObject(fetchV2NativeFunction, forKeyedSubscript: "fetchV2Native" as NSString) self.setObject(fetchV2NativeFunction, forKeyedSubscript: "fetchV2Native" as NSString)
let fetchv2Definition = """ let fetchv2Definition = """
function fetchv2(url, headers = {}, method = "GET", body = null, redirect = true ) { function fetchv2(url, headers = {}, method = "GET", body = null, redirect = true, encoding ) {
var processedBody = null; var processedBody = null;
if(method != "GET") if(method != "GET")
{ {
// Ensure body is properly serialized
processedBody = (body && (typeof body === 'object')) ? JSON.stringify(body) : (body || null) processedBody = (body && (typeof body === 'object')) ? JSON.stringify(body) : (body || null)
} }
var finalEncoding = encoding || "utf-8";
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
fetchV2Native(url, headers, method, processedBody, redirect, function(rawText) { fetchV2Native(url, headers, method, processedBody, redirect, finalEncoding, function(rawText) {
const responseObj = { const responseObj = {
headers: rawText.headers, headers: rawText.headers,
status: rawText.status, status: rawText.status,