update cloudflare worker proxy configuration for new account txasoftdev

.env

@@ -3,4 +3,4 @@ PUBLIC_SUPABASE_ANON_KEY=sb_publishable_p45xwwJNPMFAzp9K8YQlkA_2oc87I1u
 
 # TPhimX Cloudflare Worker HLS Proxy URL
 # Triển khai worker trong thư mục `cloudflare-worker/` trước rồi dán link vào đây
-PUBLIC_CLOUDFLARE_PROXY_URL=https://tphimx-r2-proxy.txagt145.workers.dev
+PUBLIC_CLOUDFLARE_PROXY_URL=https://tphimx-r2-proxy.txasoftdev.workers.dev

.gitignore

@@ -17,3 +17,4 @@ yarn-error.log*
 Thumbs.db
 
 .vercel
+*.pdf

cloudflare-worker/index.js

@@ -14,11 +14,18 @@ export default {
   async fetch(request, env, ctx) {
     const urlObj = new URL(request.url);
     const targetUrlStr = urlObj.searchParams.get('url');
+    const hasR2 = env.tphimx_movie !== undefined;
 
     if (!targetUrlStr) {
       // Direct R2 Path-based Request: e.g. /fbi-part-one/360p/index.m3u8
       const pathname = urlObj.pathname;
       if (pathname && pathname !== '/') {
+        if (!hasR2) {
+          return new Response('R2 Cache storage is not enabled on this Worker account yet.', {
+            status: 400,
+            headers: { 'Access-Control-Allow-Origin': '*' }
+          });
+        }
         const r2Key = pathname.replace(/^\/+/, ''); // Convert leading slash to relative key
         try {
           const object = await env.tphimx_movie.get(r2Key);
@@ -106,47 +113,49 @@ export default {
     const cleanPath = targetUrl.pathname.replace(/^\/+/, '');
     const r2Key = `cache/${targetUrl.hostname}/${cleanPath}`;
 
-    // 1. Check if file already exists in Cloudflare R2 bucket
-    try {
-      const object = await env.tphimx_movie.get(r2Key);
-      if (object !== null) {
-        // Cache HIT - Serve directly from R2
-        const headers = new Headers();
-        object.writeHttpMetadata(headers);
-        headers.set('Access-Control-Allow-Origin', '*');
-        headers.set('X-TPhimX-Cache', 'HIT (Cloudflare R2)');
-        
-        // Handle Range Requests for seekability
-        const rangeHeader = request.headers.get('Range');
-        if (rangeHeader && object.size > 0) {
-          const parts = rangeHeader.replace(/bytes=/, "").split("-");
-          const start = parseInt(parts[0], 10);
-          const end = parts[1] ? parseInt(parts[1], 10) : object.size - 1;
+    // 1. Check if file already exists in Cloudflare R2 bucket (Only check if R2 is enabled)
+    if (hasR2) {
+      try {
+        const object = await env.tphimx_movie.get(r2Key);
+        if (object !== null) {
+          // Cache HIT - Serve directly from R2
+          const headers = new Headers();
+          object.writeHttpMetadata(headers);
+          headers.set('Access-Control-Allow-Origin', '*');
+          headers.set('X-TPhimX-Cache', 'HIT (Cloudflare R2)');
           
-          if (start >= 0 && end < object.size && start <= end) {
-            // Slice the R2 object
-            const slicedObject = await env.tphimx_movie.get(r2Key, {
-              range: { offset: start, length: end - start + 1 }
-            });
-            
-            headers.set('Content-Range', `bytes ${start}-${end}/${object.size}`);
-            headers.set('Content-Length', String(end - start + 1));
+          // Handle Range Requests for seekability
+          const rangeHeader = request.headers.get('Range');
+          if (rangeHeader && object.size > 0) {
+            const parts = rangeHeader.replace(/bytes=/, "").split("-");
+            const start = parseInt(parts[0], 10);
+            const end = parts[1] ? parseInt(parts[1], 10) : object.size - 1;
             
-            return new Response(slicedObject.body, {
-              status: 206,
-              headers
-            });
+            if (start >= 0 && end < object.size && start <= end) {
+              // Slice the R2 object
+              const slicedObject = await env.tphimx_movie.get(r2Key, {
+                range: { offset: start, length: end - start + 1 }
+              });
+              
+              headers.set('Content-Range', `bytes ${start}-${end}/${object.size}`);
+              headers.set('Content-Length', String(end - start + 1));
+              
+              return new Response(slicedObject.body, {
+                status: 206,
+                headers
+              });
+            }
           }
+          
+          return new Response(object.body, {
+            status: 200,
+            headers
+          });
         }
-        
-        return new Response(object.body, {
-          status: 200,
-          headers
-        });
+      } catch (err) {
+        // Log error but fallback to fetching from source to prevent playback interruption
+        console.error('R2 read error:', err.message);
       }
-    } catch (err) {
-      // Log error but fallback to fetching from source to prevent playback interruption
-      console.error('R2 read error:', err.message);
     }
 
     // Cache MISS - Fetch from original media source server
@@ -218,31 +227,35 @@ export default {
         const rewrittenPlaylist = rewrittenLines.join('\n');
         const playlistBuffer = new TextEncoder().encode(rewrittenPlaylist);
 
-        // Save the rewritten playlist into Cloudflare R2 bucket
-        ctx.waitUntil(
-          env.tphimx_movie.put(r2Key, playlistBuffer, {
-            httpMetadata: { contentType: 'application/x-mpegURL' }
-          }).catch(e => console.error('R2 Put Error:', e.message))
-        );
+        // Save the rewritten playlist into Cloudflare R2 bucket (only if R2 is enabled)
+        if (hasR2) {
+          ctx.waitUntil(
+            env.tphimx_movie.put(r2Key, playlistBuffer, {
+              httpMetadata: { contentType: 'application/x-mpegURL' }
+            }).catch(e => console.error('R2 Put Error:', e.message))
+          );
+        }
 
         return new Response(rewrittenPlaylist, {
           status: 200,
           headers: {
             'Content-Type': 'application/x-mpegURL',
             'Access-Control-Allow-Origin': '*',
-            'X-TPhimX-Cache': 'MISS (Rewritten & Cached)'
+            'X-TPhimX-Cache': hasR2 ? 'MISS (Rewritten & Cached)' : 'MISS (Rewritten)'
           }
         });
       } else {
         // Fetch raw binary segment file (.ts)
         const segmentData = await response.arrayBuffer();
 
-        // Save the segment file into Cloudflare R2 bucket asynchronously
-        ctx.waitUntil(
-          env.tphimx_movie.put(r2Key, segmentData, {
-            httpMetadata: { contentType: contentType }
-          }).catch(e => console.error('R2 Put Error:', e.message))
-        );
+        // Save the segment file into Cloudflare R2 bucket asynchronously (only if R2 is enabled)
+        if (hasR2) {
+          ctx.waitUntil(
+            env.tphimx_movie.put(r2Key, segmentData, {
+              httpMetadata: { contentType: contentType }
+            }).catch(e => console.error('R2 Put Error:', e.message))
+          );
+        }
 
         // Build Response
         const headers = new Headers();

cloudflare-worker/wrangler.toml

@@ -2,8 +2,10 @@ name = "tphimx-r2-proxy"
 main = "index.js"
 compatibility_date = "2024-03-01"
 
-# Cloudflare R2 Bucket Binding
-[[r2_buckets]]
-binding = "tphimx_movie"
-bucket_name = "tphimx-movie"
-preview_bucket_name = "tphimx-movie"
+# Cloudflare R2 Bucket Binding (Commented out because R2 is not enabled on this account yet. 
+# Once you link a payment method in Cloudflare and enable R2, you can uncomment these lines)
+# [[r2_buckets]]
+# binding = "tphimx_movie"
+# bucket_name = "tphimx-movie"
+# preview_bucket_name = "tphimx-movie"
+