react-native-cloud-storage 2.2.1 → 2.3.0

package/src/{google-drive → storages/google-drive}/client.ts

@@ -1,4 +1,4 @@
-import { type CloudStorageProviderOptions, type DeepRequired } from '../types/main';
+import { type CloudStorageProviderOptions, type DeepRequired } from '../../types/main';
 import {
   MimeTypes,
   type GoogleDriveFile,
@@ -6,6 +6,7 @@ import {
   type GoogleDriveListOperationQueryParameters,
   type GoogleDriveListOperationResponse,
 } from './types';
+import { localFileSystem } from '../../utils/local-fs';
 
 const BASE_URL = 'https://www.googleapis.com/drive/v3';
 const BASE_UPLOAD_URL = 'https://www.googleapis.com/upload/drive/v3';
@@ -13,19 +14,19 @@ const MULTIPART_BOUNDARY = 'foo_bar_baz';
 
 export class GoogleDriveHttpError extends Error {
   public status: number;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   public json: any;
 
-  constructor(message: string, status: number, json: any) {
+  constructor(message: string, status: number, json: unknown) {
     super(message);
     this.status = status;
     this.json = json;
   }
 }
 
-// TODO: fetch timeout
 // TODO: properly handle errors
 export default class GoogleDriveApiClient {
-  private _fetchTimeout: any;
+  private _fetchTimeout: NodeJS.Timeout | null = null;
   private options: DeepRequired<CloudStorageProviderOptions['googledrive']>;
 
   constructor(options: DeepRequired<CloudStorageProviderOptions['googledrive']>) {
@@ -33,7 +34,7 @@ export default class GoogleDriveApiClient {
   }
 
   private buildQueryString(query: object): string {
-    let res = Object.entries(query)
+    let result = Object.entries(query)
       .filter(([, value]) => value !== undefined)
       .map(([key, value]) => {
         if (typeof value === 'boolean') return `${encodeURIComponent(key)}=${value ? 'true' : 'false'}`;
@@ -41,13 +42,13 @@ export default class GoogleDriveApiClient {
       })
       .join('&');
 
-    if (res) {
-      res = `?${res}`;
+    if (result) {
+      result = `?${result}`;
     }
-    return res;
+    return result;
   }
 
-  private async request<T extends Record<string, any> | string | void = void>(
+  private async request<T extends object | string | void = void>(
     operation: `/${string}`,
     { queryParameters, baseUrl, ...options }: RequestInit & { queryParameters?: object; baseUrl?: string } = {}
   ): Promise<T> {
@@ -57,7 +58,7 @@ export default class GoogleDriveApiClient {
     if (queryParameters) {
       path += this.buildQueryString(queryParameters);
     }
-    clearTimeout(this._fetchTimeout);
+    if (this._fetchTimeout !== null) clearTimeout(this._fetchTimeout);
     const abortController: AbortController = new AbortController();
     this._fetchTimeout = setTimeout(() => {
       abortController.abort();
@@ -72,11 +73,20 @@ export default class GoogleDriveApiClient {
     });
     if (!response.ok) {
       let errorMessage: string;
-      let json: any = null;
+      let json: unknown = null;
       try {
         json = await response.json();
-        errorMessage = json.error?.message ?? `Request failed with status ${response.status}`;
-      } catch (e) {
+        errorMessage =
+          typeof json === 'object' &&
+          json !== null &&
+          'error' in json &&
+          typeof json.error === 'object' &&
+          json.error !== null &&
+          'message' in json.error &&
+          typeof json.error.message === 'string'
+            ? json.error.message
+            : `Request failed with status ${response.status}`;
+      } catch {
         errorMessage = `Request failed with status ${response.status}`;
       }
       throw new GoogleDriveHttpError(errorMessage, response.status, json);
@@ -93,13 +103,15 @@ export default class GoogleDriveApiClient {
 
   private buildMultiPartBody(metadata: object, media: { mimeType: string; body: string }): string {
     const body: string[] = [];
-    body.push(`--${MULTIPART_BOUNDARY}\r\n`);
-    body.push(`Content-Type: ${MimeTypes.JSON}; charset=UTF-8\r\n\r\n`);
-    body.push(`${JSON.stringify(metadata)}\r\n`);
-    body.push(`--${MULTIPART_BOUNDARY}\r\n`);
-    body.push(`Content-Type: ${media.mimeType}\r\n\r\n`);
-    body.push(`${media.body}\r\n`);
-    body.push(`--${MULTIPART_BOUNDARY}--`);
+    body.push(
+      `--${MULTIPART_BOUNDARY}\r\n`,
+      `Content-Type: ${MimeTypes.JSON}; charset=UTF-8\r\n\r\n`,
+      `${JSON.stringify(metadata)}\r\n`,
+      `--${MULTIPART_BOUNDARY}\r\n`,
+      `Content-Type: ${media.mimeType}\r\n\r\n`,
+      `${media.body}\r\n`,
+      `--${MULTIPART_BOUNDARY}--`
+    );
 
     return body.join('');
   }
@@ -112,6 +124,7 @@ export default class GoogleDriveApiClient {
       const queryParameters: GoogleDriveListOperationQueryParameters = {
         fields: `files(${fields.join(',')}),nextPageToken`,
         spaces: space,
+        pageToken,
       };
       const response = await this.request<GoogleDriveListOperationResponse>(`/files`, {
         queryParameters,
@@ -148,20 +161,42 @@ export default class GoogleDriveApiClient {
 
   public async createFile(
     metadata: { name: string; parents?: string[] },
-    media: { mimeType: string; body: string }
+    media: { mimeType: string; body: string } | { mimeType: string; localPath: string }
   ): Promise<void> {
-    const multipartRequestBody = this.buildMultiPartBody(metadata, media);
+    if ('body' in media) {
+      const multipartRequestBody = this.buildMultiPartBody(metadata, media);
+
+      await this.request(`/files`, {
+        queryParameters: { uploadType: 'multipart' },
+        method: 'POST',
+        headers: {
+          'Content-Type': `multipart/related; boundary=${MULTIPART_BOUNDARY}`,
+          'Content-Length': multipartRequestBody.length.toString(),
+        },
+        body: multipartRequestBody,
+        baseUrl: BASE_UPLOAD_URL,
+      });
+    } else {
+      // First, create an empty file with the required metadata
+      const file = await this.request<{ id: string }>(`/files`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': MimeTypes.JSON,
+        },
+        body: JSON.stringify({ ...metadata, mimeType: media.mimeType }),
+      });
 
-    await this.request(`/files`, {
-      queryParameters: { uploadType: 'multipart' },
-      method: 'POST',
-      headers: {
-        'Content-Type': `multipart/related; boundary=${MULTIPART_BOUNDARY}`,
-        'Content-Length': multipartRequestBody.length.toString(),
-      },
-      body: multipartRequestBody,
-      baseUrl: BASE_UPLOAD_URL,
-    });
+      // Then, upload the binary content via the native helper module
+      const remoteUri = `${BASE_UPLOAD_URL}/files/${file.id}?uploadType=media`;
+      await localFileSystem.uploadFile(media.localPath, remoteUri, {
+        method: 'PATCH',
+        uploadType: 'binary',
+        headers: {
+          'Authorization': `Bearer ${this.options.accessToken}`,
+          'Content-Type': media.mimeType,
+        },
+      });
+    }
   }
 
   public async createDirectory(metadata: { name: string; parents?: string[] }): Promise<void> {
@@ -174,16 +209,40 @@ export default class GoogleDriveApiClient {
     });
   }
 
-  public async updateFile(fileId: string, media: { mimeType: string; body: string }): Promise<void> {
-    await this.request(`/files/${fileId}`, {
-      queryParameters: { uploadType: 'media' },
-      method: 'PATCH',
+  public async updateFile(
+    fileId: string,
+    media: { mimeType: string; body: string } | { mimeType: string; localPath: string }
+  ): Promise<void> {
+    if ('body' in media) {
+      await this.request(`/files/${fileId}`, {
+        queryParameters: { uploadType: 'media' },
+        method: 'PATCH',
+        headers: {
+          'Content-Type': media.mimeType,
+          'Content-Length': media.body.length.toString(),
+        },
+        body: media.body,
+        baseUrl: BASE_UPLOAD_URL,
+      });
+    } else {
+      const remoteUri = `${BASE_UPLOAD_URL}/files/${fileId}?uploadType=media`;
+      await localFileSystem.uploadFile(media.localPath, remoteUri, {
+        method: 'PATCH',
+        uploadType: 'binary',
+        headers: {
+          'Authorization': `Bearer ${this.options.accessToken}`,
+          'Content-Type': media.mimeType,
+        },
+      });
+    }
+  }
+
+  public async downloadFile(fileId: string, localPath: string): Promise<void> {
+    const remoteUri = `${BASE_URL}/files/${fileId}?alt=media`;
+    await localFileSystem.downloadFile(remoteUri, localPath, {
       headers: {
-        'Content-Type': media.mimeType,
-        'Content-Length': media.body.length.toString(),
+        Authorization: `Bearer ${this.options.accessToken}`,
       },
-      body: media.body,
-      baseUrl: BASE_UPLOAD_URL,
     });
   }
 }