From: DongHyun Song <dh81.song@samsung.com>
Date: Fri, 16 Jul 2021 08:56:04 +0000 (+0900)
Subject: [Service][AppManifest] Fix start url concatination
X-Git-Tag: submit/tizen/20210719.160022^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61382c0a50ed2c8ffbb551f97b0c1f16f7f95f0a;p=platform%2Fframework%2Fweb%2Fwrtjs.git

[Service][AppManifest] Fix start url concatination

Make correct URL with relative path.

Change-Id: I27a96c40e21d5b0fb6393b224e0414f542514546
Signed-off-by: DongHyun Song <dh81.song@samsung.com>
---

diff --git a/wrt_app/service/builtins/appmanifest_loader.ts b/wrt_app/service/builtins/appmanifest_loader.ts
index dbf6bbfc..c143a5d6 100644
--- a/wrt_app/service/builtins/appmanifest_loader.ts
+++ b/wrt_app/service/builtins/appmanifest_loader.ts
@@ -1,6 +1,7 @@
 import '../../common/init';
 import { isMainThread, workerData } from 'worker_threads';
 import { wrt } from '../../browser/wrt';
+import { URL } from 'url';
 import * as fs from 'fs';
 import * as https from 'https';
 import * as XWalkExtension from '../../common/wrt_xwalk_extension';
@@ -52,7 +53,8 @@ function makeFileSync(file: string, data: string) {
 
 function concatWithBaseUrl(path: string, baseUrl: string) {
   if (path.substr(0, 1) === '/') {
-    return baseUrl.substr(0, baseUrl.indexOf('/') + 1) + path;
+    const url = new URL(path, baseUrl);
+    return url.toString();
   } else if (path.indexOf('http:') == -1 && path.indexOf('https:') == -1) {
     return baseUrl.substr(0, baseUrl.lastIndexOf('/') + 1) + path;
   }