react-native-cloud-storage 1.2.2 → 1.2.4

package/src/google-drive/index.ts

@@ -1,4 +1,3 @@
-import { GDrive, HttpError, MimeTypes } from 'react-native-google-drive-api-wrapper-js';
 import type NativeRNCloudStorage from '../types/native';
 import {
   CloudStorageErrorCode,
@@ -6,23 +5,27 @@ import {
   type NativeRNCloudCloudStorageScope,
 } from '../types/native';
 import CloudStorageError from '../utils/CloudStorageError';
-import type { GoogleDriveDetailedFile, GoogleDriveFile, GoogleDriveListOperationResponse } from './types';
+import { MimeTypes, type GoogleDriveFile, type GoogleDriveFileSpace } from './types';
 import { DeviceEventEmitter } from 'react-native';
-
-export default class GoogleDriveApiClient implements NativeRNCloudStorage {
-  private static drive: GDrive = new GDrive();
+import GoogleDriveApiClient, { GoogleDriveHttpError } from './client';
+
+// TODO: replace legacyDrive fully with new drive implementation
+/**
+ * A proxy class that wraps the Google Drive API client implementation to match the native iOS interface.
+ */
+export default class GoogleDrive implements NativeRNCloudStorage {
+  private static drive: GoogleDriveApiClient = new GoogleDriveApiClient();
   public static throwOnFilesWithSameName = false;
   public filesWithSameNameSubscribers: (({ path, fileIds }: { path: string; fileIds: string[] }) => void)[];
 
   constructor() {
     this.filesWithSameNameSubscribers = [];
-    GoogleDriveApiClient.drive.fetchTimeout = 3000;
     return new Proxy(this, {
       // before calling any function, check if the access token is set
-      get(target: GoogleDriveApiClient, prop: keyof GoogleDriveApiClient) {
+      get(target: GoogleDrive, prop: keyof GoogleDrive) {
         const allowedFunctions = ['isCloudAvailable', 'subscribeToFilesWithSameName'];
         if (typeof target[prop] === 'function' && !allowedFunctions.includes(prop.toString())) {
-          if (!GoogleDriveApiClient.drive.accessToken) {
+          if (!GoogleDrive.drive.accessToken.length) {
             throw new CloudStorageError(
               `Google Drive access token is not set, cannot call function ${prop.toString()}`,
               CloudStorageErrorCode.GOOGLE_DRIVE_ACCESS_TOKEN_MISSING
@@ -36,8 +39,8 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
   }
 
   // when setting accessToken, set it on the GDrive instance
-  public static set accessToken(accessToken: string | undefined) {
-    GoogleDriveApiClient.drive.accessToken = accessToken;
+  public static set accessToken(accessToken: string | null) {
+    GoogleDrive.drive.accessToken = accessToken ?? '';
 
     // emit an event for the useIsCloudAvailable hook
     DeviceEventEmitter.emit('RNCloudStorage.cloud.availability-changed', {
@@ -45,8 +48,8 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
     });
   }
 
-  public static get accessToken(): string | undefined {
-    return GoogleDriveApiClient.drive.accessToken;
+  public static get accessToken(): string | null {
+    return GoogleDrive.drive.accessToken.length ? GoogleDrive.drive.accessToken : null;
   }
 
   public subscribeToFilesWithSameName(subscriber: ({ path, fileIds }: { path: string; fileIds: string[] }) => void): {
@@ -61,9 +64,9 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
     };
   }
 
-  public isCloudAvailable: () => Promise<boolean> = async () => !!GoogleDriveApiClient.accessToken?.length;
+  public isCloudAvailable: () => Promise<boolean> = async () => !!GoogleDrive.drive.accessToken.length;
 
-  private getRootDirectory(scope: NativeRNCloudCloudStorageScope): 'drive' | 'appDataFolder' {
+  private getRootDirectory(scope: NativeRNCloudCloudStorageScope): GoogleDriveFileSpace {
     switch (scope) {
       case 'documents':
         return 'drive';
@@ -135,7 +138,7 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
    * @returns A promise that resolves to the ID of the root directory or null if it could not be found.
    */
   private async getRootDirectoryId(scope: NativeRNCloudCloudStorageScope): Promise<string | null> {
-    const files = await this.listInternalFiles(scope);
+    const files = await GoogleDrive.drive.listFiles(this.getRootDirectory(scope));
     for (const file of files) {
       if (!files.find((f) => f.id === file.parents![0])) return file.parents![0] ?? null;
     }
@@ -143,15 +146,6 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
     return null;
   }
 
-  private async listInternalFiles(scope: NativeRNCloudCloudStorageScope): Promise<GoogleDriveFile[]> {
-    const files: GoogleDriveListOperationResponse = await GoogleDriveApiClient.drive.files.list({
-      spaces: [this.getRootDirectory(scope)],
-      fields: 'files(id,kind,mimeType,name,parents,spaces)',
-    });
-
-    return files.files;
-  }
-
   private checkIfMultipleFilesWithSameName(
     path: string,
     files: GoogleDriveFile[],
@@ -167,7 +161,7 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
 
     if (possibleFiles.length <= 1) return;
 
-    if (GoogleDriveApiClient.throwOnFilesWithSameName) {
+    if (GoogleDrive.throwOnFilesWithSameName) {
       throw new CloudStorageError(
         `Multiple files with the same name found at path ${path}: ${possibleFiles.map((f) => f.id).join(', ')}`,
         CloudStorageErrorCode.MULTIPLE_FILES_SAME_NAME
@@ -183,7 +177,7 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
     throwIfDirectory = true
   ): Promise<string> {
     try {
-      const files = await this.listInternalFiles(scope);
+      const files = await GoogleDrive.drive.listFiles(this.getRootDirectory(scope));
 
       if (path === '' || path === '/') {
         const rootDirectoryId = await this.getRootDirectoryId(scope);
@@ -213,7 +207,7 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
       }
       return file.id;
     } catch (e: unknown) {
-      if (e instanceof HttpError && e.json?.error?.status === 'UNAUTHENTICATED') {
+      if (e instanceof GoogleDriveHttpError && e.json?.error?.status === 'UNAUTHENTICATED') {
         throw new CloudStorageError(
           `Could not authenticate with Google Drive`,
           CloudStorageErrorCode.AUTHENTICATION_FAILED,
@@ -241,7 +235,7 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
     let prevContent = '';
     try {
       fileId = await this.getFileId(path, scope);
-      prevContent = await GoogleDriveApiClient.drive.files.getText(fileId);
+      prevContent = await GoogleDrive.drive.getFileText(fileId);
     } catch (e: any) {
       if (e instanceof CloudStorageError && e.code === CloudStorageErrorCode.FILE_NOT_FOUND) {
         /* do nothing, simply create the file */
@@ -250,24 +244,30 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
       }
     }
 
-    const uploader = GoogleDriveApiClient.drive.files
-      .newMultipartUploader()
-      .setData(prevContent + data, MimeTypes.TEXT);
-    if (fileId) uploader.setIdOfFileToUpdate(fileId);
-    else {
-      const files = await this.listInternalFiles(scope);
+    if (fileId) {
+      await GoogleDrive.drive.updateFile(fileId, {
+        body: prevContent + data,
+        mimeType: MimeTypes.TEXT,
+      });
+    } else {
+      const files = await GoogleDrive.drive.listFiles(this.getRootDirectory(scope));
       const { directories, filename } = this.resolvePathToDirectories(path);
       const parentDirectoryId = this.findParentDirectoryId(files, directories);
-      uploader.setRequestBody({
-        name: filename,
-        parents: parentDirectoryId
-          ? [parentDirectoryId]
-          : scope === 'app_data'
-          ? [this.getRootDirectory(scope)]
-          : undefined,
-      });
+      await GoogleDrive.drive.createFile(
+        {
+          name: filename,
+          parents: parentDirectoryId
+            ? [parentDirectoryId]
+            : scope === 'app_data'
+            ? [this.getRootDirectory(scope)]
+            : undefined,
+        },
+        {
+          body: data,
+          mimeType: MimeTypes.TEXT,
+        }
+      );
     }
-    await uploader.execute();
   }
 
   async createFile(
@@ -300,26 +300,34 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
       }
     }
 
-    const uploader = GoogleDriveApiClient.drive.files.newMultipartUploader().setData(data, MimeTypes.TEXT);
-    if (fileId) uploader.setIdOfFileToUpdate(fileId);
-    else {
-      const files = await this.listInternalFiles(scope);
+    if (fileId) {
+      await GoogleDrive.drive.updateFile(fileId, {
+        body: data,
+        mimeType: MimeTypes.TEXT,
+      });
+    } else {
+      const files = await GoogleDrive.drive.listFiles(this.getRootDirectory(scope));
       const { directories, filename } = this.resolvePathToDirectories(path);
       const parentDirectoryId = this.findParentDirectoryId(files, directories);
-      uploader.setRequestBody({
-        name: filename,
-        parents: parentDirectoryId
-          ? [parentDirectoryId]
-          : scope === 'app_data'
-          ? [this.getRootDirectory(scope)]
-          : undefined,
-      });
+      await GoogleDrive.drive.createFile(
+        {
+          name: filename,
+          parents: parentDirectoryId
+            ? [parentDirectoryId]
+            : scope === 'app_data'
+            ? [this.getRootDirectory(scope)]
+            : undefined,
+        },
+        {
+          body: data,
+          mimeType: MimeTypes.TEXT,
+        }
+      );
     }
-    await uploader.execute();
   }
 
   async listFiles(path: string, scope: NativeRNCloudCloudStorageScope): Promise<string[]> {
-    const allFiles = await this.listInternalFiles(scope);
+    const allFiles = await GoogleDrive.drive.listFiles(this.getRootDirectory(scope));
     if (path !== '') {
       const fileId = await this.getFileId(path, scope, false);
       const files = allFiles.filter((f) => (f.parents ?? [])[0] === fileId);
@@ -345,25 +353,23 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
       }
     }
 
-    const uploader = GoogleDriveApiClient.drive.files.newMetadataOnlyUploader();
-    const files = await this.listInternalFiles(scope);
+    const files = await GoogleDrive.drive.listFiles(this.getRootDirectory(scope));
     const { directories, filename } = this.resolvePathToDirectories(path);
     const parentDirectoryId = this.findParentDirectoryId(files, directories);
-    uploader.setRequestBody({
+
+    await GoogleDrive.drive.createDirectory({
       name: filename,
-      mimeType: MimeTypes.FOLDER,
       parents: parentDirectoryId
         ? [parentDirectoryId]
         : scope === 'app_data'
         ? [this.getRootDirectory(scope)]
         : undefined,
     });
-    await uploader.execute();
   }
 
   async readFile(path: string, scope: NativeRNCloudCloudStorageScope): Promise<string> {
     const fileId = await this.getFileId(path, scope);
-    const content = await GoogleDriveApiClient.drive.files.getText(fileId);
+    const content = await GoogleDrive.drive.getFileText(fileId);
     return content;
   }
 
@@ -374,16 +380,12 @@ export default class GoogleDriveApiClient implements NativeRNCloudStorage {
 
   async deleteFile(path: string, scope: NativeRNCloudCloudStorageScope): Promise<void> {
     const fileId = await this.getFileId(path, scope);
-    await GoogleDriveApiClient.drive.files.delete(fileId);
+    await GoogleDrive.drive.deleteFile(fileId);
   }
 
   async statFile(path: string, scope: NativeRNCloudCloudStorageScope): Promise<NativeRNCloudCloudStorageFileStat> {
     const fileId = await this.getFileId(path, scope, false);
-    const file: GoogleDriveDetailedFile = await (
-      await GoogleDriveApiClient.drive.files.get(fileId!, {
-        fields: 'id,kind,mimeType,name,parents,spaces,size,createdTime,modifiedTime',
-      })
-    ).json();
+    const file = await GoogleDrive.drive.getFile(fileId!);
 
     return {
       size: file.size ?? 0,

package/src/google-drive/types.ts

@@ -1,13 +1,21 @@
+export type GoogleDriveFileSpace = 'appDataFolder' | 'drive';
+
+export enum MimeTypes {
+  BINARY = 'application/octet-stream',
+  CSV = 'text/csv',
+  FOLDER = 'application/vnd.google-apps.folder',
+  JSON = 'application/json',
+  PDF = 'application/pdf',
+  TEXT = 'text/plain',
+}
+
 export interface GoogleDriveFile {
   id: string;
   kind: 'drive#file';
   mimeType: string;
   name: string;
   parents: string[];
-  spaces: ('appDataFolder' | 'drive')[];
-}
-
-export interface GoogleDriveDetailedFile extends GoogleDriveFile {
+  spaces: GoogleDriveFileSpace[];
   createdTime: string;
   modifiedTime: string;
   size?: number;