From 5b908e914ebfeedb2895f5de1b9167a6ce12c136 Mon Sep 17 00:00:00 2001
From: RblSb <msrblsb@gmail.com>
Date: Fri, 13 Aug 2021 06:28:13 +0300
Subject: Fix local subs

closes #28
---
 src/client/players/RawSubs.hx | 5 ++++-
 src/server/HttpServer.hx      | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/client/players/RawSubs.hx b/src/client/players/RawSubs.hx
index a8cbc98..aa77bf8 100644
--- a/src/client/players/RawSubs.hx
+++ b/src/client/players/RawSubs.hx
@@ -22,7 +22,10 @@ class RawSubs {
 		final ext = PathTools.urlExtension(item.subs);
 		// do not load subs if there is custom plugin
 		if (JsApi.hasSubtitleSupport(ext)) return;
-		final url = '/proxy?url=${encodeURI(item.subs)}';
+		var url = encodeURI(item.subs);
+		if (!url.startsWith("/")) {
+			url = '/proxy?url=$url';
+		}
 
 		switch ext {
 			case "ass":
diff --git a/src/server/HttpServer.hx b/src/server/HttpServer.hx
index 2076336..1198ca1 100644
--- a/src/server/HttpServer.hx
+++ b/src/server/HttpServer.hx
@@ -50,7 +50,7 @@ class HttpServer {
 	}
 
 	public static function serveFiles(req:IncomingMessage, res:ServerResponse):Void {
-		var url = req.url;
+		var url = decodeURI(req.url);
 		if (url == "/") url = "/index.html";
 		var filePath = dir + url;
 		final ext = Path.extension(filePath).toLowerCase();
@@ -183,7 +183,7 @@ class HttpServer {
 		fn:(req:IncomingMessage) -> Bool
 	):Null<ClientRequest> {
 		final url = try {
-			new URL(js.Node.global.decodeURI(url));
+			new URL(decodeURI(url));
 		} catch (e) return null;
 		if (url.host == req.headers["host"]) return null;
 		final options = {
@@ -215,4 +215,8 @@ class HttpServer {
 		if (contentType == null) return "application/octet-stream";
 		return contentType;
 	}
+
+	static inline function decodeURI(data:String):String {
+		return js.Syntax.code("decodeURI({0})", data);
+	}
 }
-- 
cgit v1.2.3