fix url for '

Author: ANKUR DWIVEDI

libs/url/builder.ts

@@ -1,7 +1,7 @@
 /*
     Helper Modules
 */
-import url, { UrlWithStringQuery, URLSearchParams } from "url";
+import { URLSearchParams, URL } from "url";
 import path from "path";
 import crypto from "crypto";
 
@@ -38,32 +38,21 @@ export const encodeStringIfRequired = (str: string) => {
 }
 
 const buildURL = function (opts: FinalUrlOptions): string {
-  //Create correct query parameters
-  var parsedURL: UrlWithStringQuery;
-  var parsedHost: UrlWithStringQuery;
   var isSrcParameterUsedForURL: boolean = false;
 
-  var urlObject: { [key: string]: string | null } = { host: "", pathname: "", search: "" };
+  var urlObject: URL;
 
   if (opts.path) {
-    parsedURL = url.parse(opts.path);
-    parsedHost = url.parse(opts.urlEndpoint);
-
-    urlObject.protocol = parsedHost.protocol;
-    urlObject.host = opts.urlEndpoint.replace(urlObject.protocol + "//", "");
+    urlObject = new URL(opts.urlEndpoint)
   } else if (opts.src) {
-    parsedURL = url.parse(opts.src);
     isSrcParameterUsedForURL = true;
-
-    urlObject.host = [parsedURL.auth, parsedURL.auth ? "@" : "", parsedURL.host].join("");
-    urlObject.protocol = parsedURL.protocol;
+    urlObject = new URL(opts.src)
   } else {
     return "";
   }
 
-  urlObject.pathname = parsedURL.pathname ? parsedURL.pathname : "";
 
-  var queryParameters = new URLSearchParams(parsedURL.query || "");
+  var queryParameters = new URLSearchParams(urlObject.search || "");
   for (var i in opts.queryParameters) {
     queryParameters.set(i, opts.queryParameters[i]);
   }
@@ -75,13 +64,18 @@ const buildURL = function (opts: FinalUrlOptions): string {
     //string should be added only as a query parameter
     if (transformationUtils.addAsQueryParameter(opts) || isSrcParameterUsedForURL) {
       queryParameters.set(TRANSFORMATION_PARAMETER, transformationString);
+      urlObject.pathname= `${urlObject.pathname}${opts.path||''}`;
     } else {
       urlObject.pathname = path.posix.join(
-        [TRANSFORMATION_PARAMETER, transformationString].join(transformationUtils.getChainTransformDelimiter()),
         urlObject.pathname,
+        [TRANSFORMATION_PARAMETER, transformationString].join(transformationUtils.getChainTransformDelimiter()),
+        opts.path || '',
       );
     }
   }
+  else{
+    urlObject.pathname= `${urlObject.pathname}${opts.path||''}`;
+  }
 
   urlObject.host = urlFormatter.removeTrailingSlash(urlObject.host);
   urlObject.pathname = urlFormatter.addLeadingSlash(urlObject.pathname);
@@ -107,7 +101,7 @@ const buildURL = function (opts: FinalUrlOptions): string {
       expiryTimestamp = DEFAULT_TIMESTAMP;
     }
 
-    var intermediateURL = url.format(urlObject);
+    var intermediateURL = urlObject.href;
 
     var urlSignature = getSignature({
       privateKey: opts.privateKey,
@@ -122,8 +116,7 @@ const buildURL = function (opts: FinalUrlOptions): string {
     queryParameters.set(SIGNATURE_PARAMETER, urlSignature);
     urlObject.search = queryParameters.toString();
   }
-
-  return url.format(urlObject);
+  return urlObject.href;
 };
 
 function constructTransformationString(inputTransformation: Array<Transformation> | undefined) {

tests/url-generation.js

@@ -74,7 +74,7 @@ describe("URL generation", function () {
         path: "/test_é_path_alt.jpg",
         signed: true,
       });
-      expect(url).equal(`https://ik.imagekit.io/test_url_endpoint/test_é_path_alt.jpg?ik-s=${signature}`);
+      expect(url).equal(`https://ik.imagekit.io/test_url_endpoint/test_%C3%A9_path_alt.jpg?ik-s=${signature}`);
     });
 
     it("Signed URL with é in filename and path", function () {
@@ -91,7 +91,8 @@ describe("URL generation", function () {
         path: "/aéb/test_é_path_alt.jpg",
         signed: true,
       });
-      expect(url).equal(`https://ik.imagekit.io/test_url_endpoint/aéb/test_é_path_alt.jpg?ik-s=${signature}`);
+      console.log({signature})
+      expect(url).equal(`https://ik.imagekit.io/test_url_endpoint/a%C3%A9b/test_%C3%A9_path_alt.jpg?ik-s=${signature}`);
     });
 
     it("Signed URL with é in filename, path and transformation as path", function () {
@@ -112,7 +113,7 @@ describe("URL generation", function () {
         transformationPosition: "path",
       });
       expect(url).equal(
-        `https://ik.imagekit.io/test_url_endpoint/tr:l-text,i-Imagekité,fs-50,l-end/aéb/test_é_path_alt.jpg?ik-s=${signature}`
+        `https://ik.imagekit.io/test_url_endpoint/tr:l-text,i-Imagekit%C3%A9,fs-50,l-end/a%C3%A9b/test_%C3%A9_path_alt.jpg?ik-s=${signature}`
       );
     });
 
@@ -133,7 +134,7 @@ describe("URL generation", function () {
         transformationPosition: "query",
       });
       expect(url).equal(
-        `https://ik.imagekit.io/test_url_endpoint/aéb/test_é_path_alt.jpg?tr=l-text%2Ci-Imagekit%C3%A9%2Cfs-50%2Cl-end&ik-s=${signature}`
+        `https://ik.imagekit.io/test_url_endpoint/a%C3%A9b/test_%C3%A9_path_alt.jpg?tr=l-text%2Ci-Imagekit%C3%A9%2Cfs-50%2Cl-end&ik-s=${signature}`
       );
     });