chore: support deploy in cloudflare with opennext and fix android build

apps/readest-app/src/pages/api/storage/delete.ts

@@ -2,8 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { corsAllMethods, runMiddleware } from '@/utils/cors';
 import { createSupabaseClient } from '@/utils/supabase';
 import { validateUserAndToken } from '@/utils/access';
-import { DeleteObjectCommand } from '@aws-sdk/client-s3';
-import { s3Client } from '@/utils/s3';
+import { deleteObject } from '@/utils/r2';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   await runMiddleware(req, res, corsAllMethods);
@@ -41,13 +40,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       return res.status(403).json({ error: 'Unauthorized access to the file' });
     }
 
-    const deleteCommand = new DeleteObjectCommand({
-      Bucket: process.env['R2_BUCKET_NAME'] || '',
-      Key: fileKey,
-    });
-
     try {
-      await s3Client.send(deleteCommand);
+      await deleteObject(process.env['R2_BUCKET_NAME'] || '', fileKey);
       const { error: deleteError } = await supabase.from('files').delete().eq('id', fileRecord.id);
 
       if (deleteError) {

apps/readest-app/src/pages/api/storage/download.ts

@@ -1,9 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { supabase, createSupabaseClient } from '@/utils/supabase';
 import { corsAllMethods, runMiddleware } from '@/utils/cors';
-import { GetObjectCommand } from '@aws-sdk/client-s3';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
-import { s3Client } from '@/utils/s3';
+import { getDownloadSignedUrl } from '@/utils/r2';
 
 const getUserAndToken = async (authHeader: string | undefined) => {
   if (!authHeader) return {};
@@ -56,15 +54,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       return res.status(403).json({ error: 'Unauthorized access to the file' });
     }
 
-    const getCommand = new GetObjectCommand({
-      Bucket: process.env['R2_BUCKET_NAME'] || '',
-      Key: fileKey,
-    });
-
     try {
-      const downloadUrl = await getSignedUrl(s3Client, getCommand, {
-        expiresIn: 1800,
-      });
+      const bucketName = process.env['R2_BUCKET_NAME'] || '';
+      const downloadUrl = await getDownloadSignedUrl(bucketName, fileKey, 1800);
 
       res.status(200).json({
         downloadUrl,

apps/readest-app/src/pages/api/storage/upload.ts

@@ -1,10 +1,8 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { supabase, createSupabaseClient } from '@/utils/supabase';
 import { corsAllMethods, runMiddleware } from '@/utils/cors';
-import { PutObjectCommand } from '@aws-sdk/client-s3';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { getStoragePlanData } from '@/utils/access';
-import { s3Client } from '@/utils/s3';
+import { getUploadSignedUrl } from '@/utils/r2';
 
 const getUserAndToken = async (authHeader: string | undefined) => {
   if (!authHeader) return {};
@@ -75,19 +73,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       if (insertError) return res.status(500).json({ error: insertError.message });
     }
 
-    const signableHeaders = new Set<string>();
-    signableHeaders.add('content-length');
-    const putCommand = new PutObjectCommand({
-      Bucket: process.env['R2_BUCKET_NAME'] || '',
-      Key: objectKey,
-      ContentLength: objSize,
-    });
-
     try {
-      const uploadUrl = await getSignedUrl(s3Client, putCommand, {
-        expiresIn: 1800,
-        signableHeaders,
-      });
+      const uploadUrl = await getUploadSignedUrl(
+        process.env['R2_BUCKET_NAME'] || '',
+        objectKey,
+        objSize,
+        1800,
+      );
 
       res.status(200).json({
         uploadUrl,