fix lamba function URI encoding issues

Chaphasilor · Aug 2, 2021 · 4ddf004 · 4ddf004
1 parent 7a345ce
commit 4ddf004
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/public/netlify-functions/checkLinkAlive.js b/public/netlify-functions/checkLinkAlive.js
@@ -24,9 +24,20 @@ const fetchTimeout = (url, ms, options = {}) => {
   return promise.finally(() => clearTimeout(timeout));
 };
 
+function encodeUriOnce(url, useURIComponent = false) {
+
+  let decoder = useURIComponent ? decodeURIComponent : decodeURI
+  while(url !== decoder(url)) {
+    url = decoder(url);
+  }
+
+  return encodeURI(url);
+
+}
+
 function resolveLink(url) {
 
-  let resolvedUrl = url;
+  let resolvedUrl = encodeUriOnce(url);
   let resolvedHeaders = {};
 
   if (url.includes(`driveindex.ga/`)) {
@@ -48,7 +59,7 @@ function checkLink(urlData) {
   return new Promise((resolve) => {
 
     const startTime = performance.now()
-    urlData.url = encodeURI(urlData.url);
+    urlData.url = encodeUriOnce(urlData.url);
 
     fetchTimeout(urlData.url, REQUEST_TIMEOUT, {
       method: `HEAD`,