Update modflix.json

.github/scripts/url-checker.js

@@ -1,196 +1,219 @@
-const fs = require('fs');
-const axios = require('axios');
-
-const FILE_PATH = 'modflix.json';
-const updatedProviders = []; // Track updated providers for Discord notification
-
-// Read the modflix.json file
-function readModflixJson() {
-  try {
-    const data = fs.readFileSync(FILE_PATH, 'utf8');
-    return JSON.parse(data);
-  } catch (error) {
-    console.error(`Error reading ${FILE_PATH}:`, error);
-    process.exit(1);
-  }
-}
-
-// Extract domain (origin) from URL without trailing slash
-function getDomain(url) {
-  try {
-    const urlObj = new URL(url);
-    return urlObj.origin;
-  } catch (error) {
-    console.error(`Error parsing URL ${url}:`, error);
-    return url;
-  }
-}
-
-// Check if original URL has a trailing slash in path
-function hasTrailingSlash(url) {
-  return url.endsWith('/') && !url.endsWith('://');
-}
-
-// Check URL and return new URL if domain redirected
-async function checkUrl(url) {
-  try {
-    // Set timeout to 10 seconds to avoid hanging
-    const response = await axios.head(url, {
-      maxRedirects: 0,
-      timeout: 10000,
-      validateStatus: status => true
-    });
-    
-    // If status is 200, no change needed
-    if (response.status === 200) {
-      console.log(`✅ ${url} is valid (200 OK)`);
-      return null;
-    } else if (response.status >= 300 && response.status < 400) {
-      // Handle redirects
-      const newLocation = response.headers.location;
-      if (newLocation) {
-        // If it's a relative redirect, construct the full URL
-        let fullRedirectUrl = newLocation;
-        if (!newLocation.startsWith('http')) {
-          const baseUrl = new URL(url);
-          fullRedirectUrl = new URL(newLocation, baseUrl.origin).toString();
-        }
-        
-        console.log(`🔄 ${url} redirects to ${fullRedirectUrl}`);
-        
-        // Get the new domain
-        const newDomain = getDomain(fullRedirectUrl);
-        
-        // Check if original URL had a trailing slash
-        const needsTrailingSlash = hasTrailingSlash(url);
-        
-        // Create new URL: new domain + trailing slash if the original had one
-        let finalUrl = newDomain;
-        if (needsTrailingSlash) {
-          finalUrl += '/';
-        }
-        
-        console.log(`Will update to: ${finalUrl} (preserved trailing slash: ${needsTrailingSlash})`);
-        return finalUrl;
-      }
-    } else {
-      console.log(`⚠️ ${url} returned status ${response.status}`);
-    }
-  } catch (error) {
-    // Try GET request if HEAD fails
-    try {
-      const response = await axios.get(url, {
-        maxRedirects: 0,
-        timeout: 10000,
-        validateStatus: status => true
-      });
-      
-      if (response.status === 200) {
-        console.log(`✅ ${url} is valid (200 OK)`);
-        return null;
-      } else if (response.status >= 300 && response.status < 400) {
-        // Handle redirects
-        const newLocation = response.headers.location;
-        if (newLocation) {
-          console.log(`🔄 ${url} redirects to ${newLocation}`);
-          
-          let fullRedirectUrl = newLocation;
-          if (!newLocation.startsWith('http')) {
-            const baseUrl = new URL(url);
-            fullRedirectUrl = new URL(newLocation, baseUrl.origin).toString();
-          }
-          
-          // Get the new domain
-          const newDomain = getDomain(fullRedirectUrl);
-          
-          // Check if original URL had a trailing slash
-          const needsTrailingSlash = hasTrailingSlash(url);
-          
-          // Create new URL: new domain + trailing slash if the original had one
-          let finalUrl = newDomain;
-          if (needsTrailingSlash) {
-            finalUrl += '/';
-          }
-          
-          console.log(`Will update to: ${finalUrl} (preserved trailing slash: ${needsTrailingSlash})`);
-          return finalUrl;
-        }
-      } else {
-        console.log(`⚠️ ${url} returned status ${response.status}`);
-      }
-    } catch (getError) {
-      if (getError.response) {
-        console.log(`⚠️ ${url} returned status ${getError.response.status}`);
-      } else if (getError.code === 'ECONNABORTED') {
-        console.log(`⌛ ${url} request timed out`);
-      } else if (getError.code === 'ENOTFOUND') {
-        console.log(`❌ ${url} domain not found`);
-      } else {
-        console.log(`❌ Error checking ${url}: ${getError.message}`);
-      }
-    }
-  }
-  
-  // Return null if no change or error
-  return null;
-}
-
-// Main function
-async function main() {
-  const providers = readModflixJson();
-  let hasChanges = false;
-  
-  // Process each provider
-  for (const [key, provider] of Object.entries(providers)) {
-    const url = provider.url;
-    console.log(`Checking ${provider.name} (${url})...`);
-    
-    try {
-      const newUrl = await checkUrl(url);
-      if (newUrl && newUrl !== url) {
-        // Store the old URL before updating
-        const oldUrl = provider.url;
-        
-        // Update the provider URL
-        provider.url = newUrl;
-        hasChanges = true;
-        console.log(`Updated ${provider.name} URL from ${oldUrl} to ${newUrl}`);
-        
-        // Track updated provider for Discord notification
-        updatedProviders.push({
-          name: provider.name,
-          oldUrl: oldUrl,
-          newUrl: newUrl
-        });
-      }
-    } catch (error) {
-      console.log(`❌ Error processing ${url}: ${error.message}`);
-    }
-  }
-  
-  // Write changes back to file if needed
-  if (hasChanges) {
-    // Use a space-efficient JSON format but with proper formatting
-    const jsonString = JSON.stringify(providers, null, 2);
-    fs.writeFileSync(FILE_PATH, jsonString);
-    console.log(`✅ Updated ${FILE_PATH} with new URLs`);
-    
-    // Output updated providers for Discord notification in a clean format
-    if (updatedProviders.length > 0) {
-      console.log("\n### UPDATED_PROVIDERS_START ###");
-      for (const provider of updatedProviders) {
-        // Format: name|oldUrl|newUrl (pipe-delimited for easy parsing)
-        console.log(`${provider.name}|${provider.oldUrl}|${provider.newUrl}`);
-      }
-      console.log("### UPDATED_PROVIDERS_END ###");
-    }
-  } else {
-    console.log(`ℹ️ No changes needed for ${FILE_PATH}`);
-  }
-}
-
-// Execute main function with error handling
-main().catch(error => {
-  console.error('Unhandled error:', error);
-  process.exit(1);
-});
+const fs = require('fs');
+const axios = require('axios');
+
+const FILE_PATH = 'modflix.json';
+const updatedProviders = []; // Track updated providers for Discord notification
+
+const DEFAULT_HEADERS = {
+  'User-Agent':
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0 Safari/537.36',
+  Accept:
+    'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
+  'Accept-Language': 'en-US,en;q=0.9',
+  'Accept-Encoding': 'gzip, deflate, br',
+  Connection: 'keep-alive',
+  'Upgrade-Insecure-Requests': '1'
+};
+
+// Read the modflix.json file
+function readModflixJson() {
+  try {
+    const data = fs.readFileSync(FILE_PATH, 'utf8');
+    return JSON.parse(data);
+  } catch (error) {
+    console.error(`Error reading ${FILE_PATH}:`, error);
+    process.exit(1);
+  }
+}
+
+// Extract domain (origin) from URL without trailing slash
+function getDomain(url) {
+  try {
+    const urlObj = new URL(url);
+    return urlObj.origin;
+  } catch (error) {
+    console.error(`Error parsing URL ${url}:`, error);
+    return url;
+  }
+}
+
+// Check if original URL has a trailing slash in path
+function hasTrailingSlash(url) {
+  return url.endsWith('/') && !url.endsWith('://');
+}
+
+function getFinalUrl(response, originalUrl) {
+  return (
+    response?.request?.res?.responseUrl ||
+    response?.request?._redirectable?._currentUrl ||
+    response?.config?.url ||
+    originalUrl
+  );
+}
+
+function normalizeOrigin(url) {
+  try {
+    return new URL(url).origin;
+  } catch {
+    return url;
+  }
+}
+
+async function requestUrl(method, url) {
+  return axios({
+    method,
+    url,
+    maxRedirects: 5,
+    timeout: 10000,
+    validateStatus: status => true,
+    headers: DEFAULT_HEADERS
+  });
+}
+
+function logVerboseResult(url, response, finalUrl) {
+  const status = response?.status ?? 'unknown';
+  const locationHeader = response?.headers?.location;
+  console.log(
+    `ℹ️ ${url} -> status=${status} final=${finalUrl}` +
+      (locationHeader ? ` location=${locationHeader}` : '')
+  );
+}
+
+function shouldUpdateFromFinalUrl(originalUrl, finalUrl) {
+  const originalDomain = getDomain(originalUrl);
+  const finalDomain = getDomain(finalUrl);
+  return finalDomain && finalDomain !== originalDomain;
+}
+
+// Check URL and return new URL if domain redirected or resolved elsewhere
+async function checkUrl(url) {
+  try {
+    const response = await requestUrl('get', url);
+    const finalUrl = getFinalUrl(response, url);
+    logVerboseResult(url, response, finalUrl);
+
+    if (shouldUpdateFromFinalUrl(url, finalUrl)) {
+      const updatedUrl = normalizeOrigin(finalUrl) + (hasTrailingSlash(url) ? '/' : '');
+      console.log(`🔄 ${url} resolved to ${finalUrl}`);
+      console.log(`Will update to: ${updatedUrl} (preserved trailing slash: ${hasTrailingSlash(url)})`);
+      return updatedUrl;
+    }
+
+    if (response.status === 200) {
+      console.log(`✅ ${url} is valid (200 OK)`);
+      return null;
+    }
+
+    if (response.status >= 300 && response.status < 400) {
+      const newLocation = response.headers.location;
+      if (newLocation) {
+        let fullRedirectUrl = newLocation;
+        if (!newLocation.startsWith('http')) {
+          const baseUrl = new URL(url);
+          fullRedirectUrl = new URL(newLocation, baseUrl.origin).toString();
+        }
+
+        if (shouldUpdateFromFinalUrl(url, fullRedirectUrl)) {
+          const newDomain = normalizeOrigin(fullRedirectUrl);
+          const needsTrailingSlash = hasTrailingSlash(url);
+          const finalUrlForUpdate = newDomain + (needsTrailingSlash ? '/' : '');
+          console.log(`🔄 ${url} redirects to ${fullRedirectUrl}`);
+          console.log(
+            `Will update to: ${finalUrlForUpdate} (preserved trailing slash: ${needsTrailingSlash})`
+          );
+          return finalUrlForUpdate;
+        }
+      }
+    }
+
+    console.log(`⚠️ ${url} returned status ${response.status}`);
+  } catch (error) {
+    if (error.response) {
+      const finalUrl = getFinalUrl(error.response, url);
+      logVerboseResult(url, error.response, finalUrl);
+
+      // If the request resolves to a different origin even with a non-2xx status,
+      // use that as an update signal. This keeps existing behavior intact while
+      // allowing sites that block HEAD/GET with 403 but still resolve elsewhere.
+      if (shouldUpdateFromFinalUrl(url, finalUrl)) {
+        const updatedUrl = normalizeOrigin(finalUrl) + (hasTrailingSlash(url) ? '/' : '');
+        console.log(`🔄 ${url} resolved to ${finalUrl}`);
+        console.log(
+          `Will update to: ${updatedUrl} (preserved trailing slash: ${hasTrailingSlash(url)})`
+        );
+        return updatedUrl;
+      }
+
+      console.log(`⚠️ ${url} returned status ${error.response.status}`);
+    } else if (error.code === 'ECONNABORTED') {
+      console.log(`⌛ ${url} request timed out`);
+    } else if (error.code === 'ENOTFOUND') {
+      console.log(`❌ ${url} domain not found`);
+    } else {
+      console.log(`❌ Error checking ${url}: ${error.message}`);
+    }
+  }
+
+  // Return null if no change or error
+  return null;
+}
+
+// Main function
+async function main() {
+  const providers = readModflixJson();
+  let hasChanges = false;
+
+  // Process each provider
+  for (const [key, provider] of Object.entries(providers)) {
+    const url = provider.url;
+    console.log(`Checking ${provider.name} (${url})...`);
+
+    try {
+      const newUrl = await checkUrl(url);
+      if (newUrl && newUrl !== url) {
+        // Store the old URL before updating
+        const oldUrl = provider.url;
+
+        // Update the provider URL
+        provider.url = newUrl;
+        hasChanges = true;
+        console.log(`Updated ${provider.name} URL from ${oldUrl} to ${newUrl}`);
+
+        // Track updated provider for Discord notification
+        updatedProviders.push({
+          name: provider.name,
+          oldUrl: oldUrl,
+          newUrl: newUrl
+        });
+      }
+    } catch (error) {
+      console.log(`❌ Error processing ${url}: ${error.message}`);
+    }
+  }
+
+  // Write changes back to file if needed
+  if (hasChanges) {
+    // Use a space-efficient JSON format but with proper formatting
+    const jsonString = JSON.stringify(providers, null, 2);
+    fs.writeFileSync(FILE_PATH, jsonString);
+    console.log(`✅ Updated ${FILE_PATH} with new URLs`);
+
+    // Output updated providers for Discord notification in a clean format
+    if (updatedProviders.length > 0) {
+      console.log("\n### UPDATED_PROVIDERS_START ###");
+      for (const provider of updatedProviders) {
+        // Format: name|oldUrl|newUrl (pipe-delimited for easy parsing)
+        console.log(`${provider.name}|${provider.oldUrl}|${provider.newUrl}`);
+      }
+      console.log("### UPDATED_PROVIDERS_END ###");
+    }
+  } else {
+    console.log(`ℹ️ No changes needed for ${FILE_PATH}`);
+  }
+}
+
+// Execute main function with error handling
+main().catch(error => {
+  console.error('Unhandled error:', error);
+  process.exit(1);
+});

.github/workflows/check-urls.yml

@@ -27,20 +27,26 @@ jobs:
 
       - name: Run URL checker
         id: url_checker
+        shell: bash
         run: |
-          # Run the URL checker and save output
-          node .github/scripts/url-checker.js > checker_output.log 2>&1
+          set -o pipefail
+          # Run the URL checker and show output in the job logs while also saving it
+          node .github/scripts/url-checker.js 2>&1 | tee checker_output.log
           
           # Check if there are updated providers
           if grep -q "### UPDATED_PROVIDERS_START ###" checker_output.log; then
-            echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
+            echo "CHANGES_DETECTED=true" >> "$GITHUB_ENV"
             
             # Extract only the updated provider lines between the markers
-            sed -n '/### UPDATED_PROVIDERS_START ###/,/### UPDATED_PROVIDERS_END ###/p' checker_output.log | 
+            sed -n '/### UPDATED_PROVIDERS_START ###/,/### UPDATED_PROVIDERS_END ###/p' checker_output.log | \
               grep -v "###" > updated_providers.txt
           else
-            echo "CHANGES_DETECTED=false" >> $GITHUB_ENV
+            echo "CHANGES_DETECTED=false" >> "$GITHUB_ENV"
           fi
+          
+          echo "--- checker_output.log ---"
+          cat checker_output.log
+          echo "--- end checker_output.log ---"
       
       - name: Commit changes if any
         run: |

modflix.json

@@ -9,11 +9,11 @@
   },
   "Topmovies": {
     "name": "Topmovies",
-    "url": "https://moviesleech.link"
+    "url": "https://moviesleech.bar"
   },
   "UhdMovies": {
     "name": "UhdMovies",
-    "url": "https://uhdmovies.pink"
+    "url": "https://uhdmovies.food"
   },
   "filepress": {
     "name": "filepress",
@@ -21,23 +21,23 @@
   },
   "Vega": {
     "name": "vegamovies",
-    "url": "https://vegamovies.vodka"
+    "url": "https://vegamovies.mq"
   },
   "lux": {
     "name": "luxmovies",
-    "url": "https://rogmovies.blog"
+    "url": "https://rogmovies.work"
   },
   "drive": {
     "name": "moviesDrive",
-    "url": "https://new2.moviesdrives.my/"
+    "url": "https://new3.moviesdrives.my/"
   },
   "multi": {
     "name": "multimovies",
-    "url": "https://multimovies.autos"
+    "url": "https://multimovies.fyi"
   },
   "w4u": {
     "name": "world4ufree",
-    "url": "https://world4ufree.tw"
+    "url": "https://world4ufree.cl"
   },
   "extra": {
     "name": "extraMovies",
@@ -45,11 +45,11 @@
   },
   "hdhub": {
     "name": "hdhub4u",
-    "url": "https://new1.hdhub4u.limo"
+    "url": "https://new1.hdhub4u.cl"
   },
   "kat": {
     "name": "katmovieshd",
-    "url": "https://katmoviehd.pictures"
+    "url": "https://new1.katmoviehd.cymru"
   },
   "dc": {
     "name": "dramacool",
@@ -141,11 +141,11 @@
   },
   "4khdhub": {
     "name": "4khdhub",
-    "url": "https://4khdhub.dad"
+    "url": "https://4khdhub.one"
   },
   "moviezwap": {
     "name": "moviezwap",
-    "url": "https://www.moviezwap.love/"
+    "url": "https://www.moviezwap.onl/"
   },
   "9xflix": {
     "name": "9xflix",
@@ -173,7 +173,7 @@
   },
   "movies4u": {
     "name": "movies4u",
-    "url": "https://movies4u.ee"
+    "url": "https://movies4u.as"
   },
   "joya9tv": {
     "name": "joya9tv1",
@@ -181,10 +181,10 @@
   },
   "skymovieshd": {
     "name": "skyMovesHd",
-    "url": "https://skymovieshd.free"
+    "url": "https://skymovieshd.spot"
   },
   "1cinevood": {
     "name": "cinewood",
-    "url": "https://proxy01.cvproxy.workers.dev"
+    "url": "https://1cinevood.in"
   }
-}
+}