added test case and updated logic

Author: ANKUR DWIVEDI

libs/url/builder.ts

@@ -29,8 +29,22 @@ const hasMoreThanAscii = (str: string) => {
 	return str.split('').some((char) => char.charCodeAt(0) > 127);
 }
 
+const customEncodeURIComponent = (str: string) => {
+  const parts = str.includes("?") ? str.split("?")[0] : str;
+  const segments = parts.split("/");
+  const encodedSegments = segments.map((segment) => {
+    if (segment === "/") return "/";
+    if(segment.includes('https:') || segment.includes('http:') || segment.includes('tr:'))
+    return segment;
+    return encodeURIComponent(segment);
+  });
+  return str.includes("?") ? `${encodedSegments.join("/")}?${str.split("?")[1]}` : encodedSegments.join("/");
+  // return str.includes("?") ? `${encodeURI(parts)}?${str.split("?")[1]}` : encodeURI(parts);
+};
+
 const encodeStringIfRequired = (str: string) => {
-	return hasMoreThanAscii(str) ? encodeURI(str) : str;
+  console.log({str})
+	return hasMoreThanAscii(str) ? customEncodeURIComponent(str) : str;
 }
 
 const buildURL = function (opts: FinalUrlOptions): string {
@@ -170,6 +184,7 @@ function getSignatureTimestamp(seconds: number): string {
 }
 
 function getSignature(opts: any) {
+  console.log({opts})
   if (!opts.privateKey || !opts.url || !opts.urlEndpoint) return "";
   var stringToSign = opts.url.replace(urlFormatter.addTrailingSlash(opts.urlEndpoint), "") + opts.expiryTimestamp;
   return crypto.createHmac("sha1", opts.privateKey).update(stringToSign).digest("hex");

tests/url-generation.js

@@ -59,18 +59,33 @@ describe("URL generation", function () {
         expect(url).includes(`ik-s=`);
     });
 
-    it('Signed URL with expireSeconds and é in url', function () {
+    it('Signed URL with é in filename', function () {
         const url = imagekit.url({
             path: "/test_é_path_alt.jpg",
             signed: true,
-            expireSeconds: 100
         });
+        expect(url).equal(`https://ik.imagekit.io/test_url_endpoint/test_é_path_alt.jpg?ik-s=09a329f06a5106a8b9c43de8fb6a64948fff7c59`);
+    });
 
-        expect(url).includes(`https://ik.imagekit.io/test_url_endpoint/test_é_path_alt.jpg`);
-        expect(url).includes(`ik-s=`);
-        expect(url).includes(`ik-t=`);
+    it('Signed URL with é in filename and path', function () {
+        const url = imagekit.url({
+            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=fca91582138ac65694425d52f0710b7ae2c3d7cf`);
     });
 
+    it('Signed URL with é in filename, path and query', function () {
+        const url = imagekit.url({
+            path: "/aéb/test_é_path_alt.jpg",
+            signed: true,
+            transformation: [ { raw: "l-text,i-Imagekité,fs-50,l-end"}]
+        });
+        console.log({url})
+        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=38539311889a0721b46ebe30b5f297773d01d960`);
+    });
+
+
     it('should generate the correct url with path param', function () {
         const url = imagekit.url({
             path: "/test_path.jpg",