@appwrite.io/console 0.6.2 → 0.7.0-rc.1

package/src/services/storage.ts

@@ -1,48 +1,49 @@
-import { Service } from '../service';
-import { AppwriteException, Client } from '../client';
+import { AppwriteException, Client, type Payload, UploadProgress } from '../client';
 import type { Models } from '../models';
-import type { UploadProgress, Payload } from '../client';
 import { Compression } from '../enums/compression';
 import { ImageGravity } from '../enums/image-gravity';
 import { ImageFormat } from '../enums/image-format';
 import { StorageUsageRange } from '../enums/storage-usage-range';
 
-export class Storage extends Service {
+export class Storage {
+    client: Client;
 
-     constructor(client: Client)
-     {
-        super(client);
-     }
+    constructor(client: Client) {
+        this.client = client;
+    }
 
     /**
      * List buckets
      *
-     * Get a list of all the storage buckets. You can use the query params to
-     * filter your results.
+     * Get a list of all the storage buckets. You can use the query params to filter your results.
      *
      * @param {string[]} queries
      * @param {string} search
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.BucketList>}
+     */
     async listBuckets(queries?: string[], search?: string): Promise<Models.BucketList> {
         const apiPath = '/storage/buckets';
         const payload: Payload = {};
-
         if (typeof queries !== 'undefined') {
             payload['queries'] = queries;
         }
-
         if (typeof search !== 'undefined') {
             payload['search'] = search;
         }
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('get', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'get',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * Create bucket
      *
@@ -59,90 +60,88 @@ export class Storage extends Service {
      * @param {boolean} encryption
      * @param {boolean} antivirus
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.Bucket>}
+     */
     async createBucket(bucketId: string, name: string, permissions?: string[], fileSecurity?: boolean, enabled?: boolean, maximumFileSize?: number, allowedFileExtensions?: string[], compression?: Compression, encryption?: boolean, antivirus?: boolean): Promise<Models.Bucket> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         if (typeof name === 'undefined') {
             throw new AppwriteException('Missing required parameter: "name"');
         }
-
         const apiPath = '/storage/buckets';
         const payload: Payload = {};
-
         if (typeof bucketId !== 'undefined') {
             payload['bucketId'] = bucketId;
         }
-
         if (typeof name !== 'undefined') {
             payload['name'] = name;
         }
-
         if (typeof permissions !== 'undefined') {
             payload['permissions'] = permissions;
         }
-
         if (typeof fileSecurity !== 'undefined') {
             payload['fileSecurity'] = fileSecurity;
         }
-
         if (typeof enabled !== 'undefined') {
             payload['enabled'] = enabled;
         }
-
         if (typeof maximumFileSize !== 'undefined') {
             payload['maximumFileSize'] = maximumFileSize;
         }
-
         if (typeof allowedFileExtensions !== 'undefined') {
             payload['allowedFileExtensions'] = allowedFileExtensions;
         }
-
         if (typeof compression !== 'undefined') {
             payload['compression'] = compression;
         }
-
         if (typeof encryption !== 'undefined') {
             payload['encryption'] = encryption;
         }
-
         if (typeof antivirus !== 'undefined') {
             payload['antivirus'] = antivirus;
         }
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('post', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'post',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * Get bucket
      *
-     * Get a storage bucket by its unique ID. This endpoint response returns a
-     * JSON object with the storage bucket metadata.
+     * Get a storage bucket by its unique ID. This endpoint response returns a JSON object with the storage bucket metadata.
      *
      * @param {string} bucketId
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.Bucket>}
+     */
     async getBucket(bucketId: string): Promise<Models.Bucket> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}'.replace('{bucketId}', bucketId);
         const payload: Payload = {};
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('get', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'get',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * Update bucket
      *
@@ -159,62 +158,57 @@ export class Storage extends Service {
      * @param {boolean} encryption
      * @param {boolean} antivirus
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.Bucket>}
+     */
     async updateBucket(bucketId: string, name: string, permissions?: string[], fileSecurity?: boolean, enabled?: boolean, maximumFileSize?: number, allowedFileExtensions?: string[], compression?: Compression, encryption?: boolean, antivirus?: boolean): Promise<Models.Bucket> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         if (typeof name === 'undefined') {
             throw new AppwriteException('Missing required parameter: "name"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}'.replace('{bucketId}', bucketId);
         const payload: Payload = {};
-
         if (typeof name !== 'undefined') {
             payload['name'] = name;
         }
-
         if (typeof permissions !== 'undefined') {
             payload['permissions'] = permissions;
         }
-
         if (typeof fileSecurity !== 'undefined') {
             payload['fileSecurity'] = fileSecurity;
         }
-
         if (typeof enabled !== 'undefined') {
             payload['enabled'] = enabled;
         }
-
         if (typeof maximumFileSize !== 'undefined') {
             payload['maximumFileSize'] = maximumFileSize;
         }
-
         if (typeof allowedFileExtensions !== 'undefined') {
             payload['allowedFileExtensions'] = allowedFileExtensions;
         }
-
         if (typeof compression !== 'undefined') {
             payload['compression'] = compression;
         }
-
         if (typeof encryption !== 'undefined') {
             payload['encryption'] = encryption;
         }
-
         if (typeof antivirus !== 'undefined') {
             payload['antivirus'] = antivirus;
         }
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('put', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'put',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * Delete bucket
      *
@@ -222,306 +216,258 @@ export class Storage extends Service {
      *
      * @param {string} bucketId
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<{}>}
+     */
     async deleteBucket(bucketId: string): Promise<{}> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}'.replace('{bucketId}', bucketId);
         const payload: Payload = {};
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('delete', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'delete',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * List files
      *
-     * Get a list of all the user files. You can use the query params to filter
-     * your results.
+     * Get a list of all the user files. You can use the query params to filter your results.
      *
      * @param {string} bucketId
      * @param {string[]} queries
      * @param {string} search
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.FileList>}
+     */
     async listFiles(bucketId: string, queries?: string[], search?: string): Promise<Models.FileList> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}/files'.replace('{bucketId}', bucketId);
         const payload: Payload = {};
-
         if (typeof queries !== 'undefined') {
             payload['queries'] = queries;
         }
-
         if (typeof search !== 'undefined') {
             payload['search'] = search;
         }
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('get', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'get',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * Create file
      *
-     * Create a new file. Before using this route, you should create a new bucket
-     * resource using either a [server
-     * integration](https://appwrite.io/docs/server/storage#storageCreateBucket)
-     * API or directly from your Appwrite console.
-     * 
-     * Larger files should be uploaded using multiple requests with the
-     * [content-range](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Range)
-     * header to send a partial request with a maximum supported chunk of `5MB`.
-     * The `content-range` header values should always be in bytes.
-     * 
-     * When the first request is sent, the server will return the **File** object,
-     * and the subsequent part request must include the file's **id** in
-     * `x-appwrite-id` header to allow the server to know that the partial upload
-     * is for the existing file and not for a new one.
-     * 
-     * If you're creating a new file using one of the Appwrite SDKs, all the
-     * chunking logic will be managed by the SDK internally.
-     * 
+     * Create a new file. Before using this route, you should create a new bucket resource using either a [server integration](https://appwrite.io/docs/server/storage#storageCreateBucket) API or directly from your Appwrite console.
+
+Larger files should be uploaded using multiple requests with the [content-range](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Range) header to send a partial request with a maximum supported chunk of `5MB`. The `content-range` header values should always be in bytes.
+
+When the first request is sent, the server will return the **File** object, and the subsequent part request must include the file&#039;s **id** in `x-appwrite-id` header to allow the server to know that the partial upload is for the existing file and not for a new one.
+
+If you&#039;re creating a new file using one of the Appwrite SDKs, all the chunking logic will be managed by the SDK internally.
+
      *
      * @param {string} bucketId
      * @param {string} fileId
      * @param {File} file
      * @param {string[]} permissions
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.File>}
+     */
     async createFile(bucketId: string, fileId: string, file: File, permissions?: string[], onProgress = (progress: UploadProgress) => {}): Promise<Models.File> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         if (typeof fileId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "fileId"');
         }
-
         if (typeof file === 'undefined') {
             throw new AppwriteException('Missing required parameter: "file"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}/files'.replace('{bucketId}', bucketId);
         const payload: Payload = {};
-
         if (typeof fileId !== 'undefined') {
             payload['fileId'] = fileId;
         }
-
         if (typeof file !== 'undefined') {
             payload['file'] = file;
         }
-
         if (typeof permissions !== 'undefined') {
             payload['permissions'] = permissions;
         }
-
         const uri = new URL(this.client.config.endpoint + apiPath);
 
-        if(!(file instanceof File)) {
-            throw new AppwriteException('Parameter "file" has to be a File.');
-        }
-
-        const size = file.size;
-
-        if (size <= Service.CHUNK_SIZE) {
-            return await this.client.call('post', uri, {
-                'content-type': 'multipart/form-data',
-            }, payload);
-        }
-
         const apiHeaders: { [header: string]: string } = {
             'content-type': 'multipart/form-data',
         }
 
-        let offset = 0;
-        let response = undefined;
-        if(fileId != 'unique()') {
-            try {
-                response = await this.client.call('GET', new URL(this.client.config.endpoint + apiPath + '/' + fileId), apiHeaders);
-                offset = response.chunksUploaded * Service.CHUNK_SIZE;
-            } catch(e) {
-            }
-        }
-
-        while (offset < size) {
-            let end = Math.min(offset + Service.CHUNK_SIZE - 1, size - 1);
-
-            apiHeaders['content-range'] = 'bytes ' + offset + '-' + end + '/' + size;
-            if (response && response.$id) {
-                apiHeaders['x-appwrite-id'] = response.$id;
-            }
-
-            const chunk = file.slice(offset, end + 1);
-            payload['file'] = new File([chunk], file.name);
-            response = await this.client.call('post', uri, apiHeaders, payload);
-
-            if (onProgress) {
-                onProgress({
-                    $id: response.$id,
-                    progress: (offset / size) * 100,
-                    sizeUploaded: offset,
-                    chunksTotal: response.chunksTotal,
-                    chunksUploaded: response.chunksUploaded
-                });
-            }
-            offset += Service.CHUNK_SIZE;
-        }
-        return response;
+        return await this.client.chunkedUpload(
+            'post',
+            uri,
+            apiHeaders,
+            payload,
+            onProgress
+        );
     }
-
     /**
      * Get file
      *
-     * Get a file by its unique ID. This endpoint response returns a JSON object
-     * with the file metadata.
+     * Get a file by its unique ID. This endpoint response returns a JSON object with the file metadata.
      *
      * @param {string} bucketId
      * @param {string} fileId
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.File>}
+     */
     async getFile(bucketId: string, fileId: string): Promise<Models.File> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         if (typeof fileId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "fileId"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}/files/{fileId}'.replace('{bucketId}', bucketId).replace('{fileId}', fileId);
         const payload: Payload = {};
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('get', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'get',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * Update file
      *
-     * Update a file by its unique ID. Only users with write permissions have
-     * access to update this resource.
+     * Update a file by its unique ID. Only users with write permissions have access to update this resource.
      *
      * @param {string} bucketId
      * @param {string} fileId
      * @param {string} name
      * @param {string[]} permissions
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.File>}
+     */
     async updateFile(bucketId: string, fileId: string, name?: string, permissions?: string[]): Promise<Models.File> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         if (typeof fileId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "fileId"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}/files/{fileId}'.replace('{bucketId}', bucketId).replace('{fileId}', fileId);
         const payload: Payload = {};
-
         if (typeof name !== 'undefined') {
             payload['name'] = name;
         }
-
         if (typeof permissions !== 'undefined') {
             payload['permissions'] = permissions;
         }
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('put', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'put',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * Delete File
      *
-     * Delete a file by its unique ID. Only users with write permissions have
-     * access to delete this resource.
+     * Delete a file by its unique ID. Only users with write permissions have access to delete this resource.
      *
      * @param {string} bucketId
      * @param {string} fileId
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<{}>}
+     */
     async deleteFile(bucketId: string, fileId: string): Promise<{}> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         if (typeof fileId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "fileId"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}/files/{fileId}'.replace('{bucketId}', bucketId).replace('{fileId}', fileId);
         const payload: Payload = {};
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('delete', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'delete',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * Get file for download
      *
-     * Get a file content by its unique ID. The endpoint response return with a
-     * 'Content-Disposition: attachment' header that tells the browser to start
-     * downloading the file to user downloads directory.
+     * Get a file content by its unique ID. The endpoint response return with a &#039;Content-Disposition: attachment&#039; header that tells the browser to start downloading the file to user downloads directory.
      *
      * @param {string} bucketId
      * @param {string} fileId
      * @throws {AppwriteException}
-     * @returns {URL}
-    */
-    getFileDownload(bucketId: string, fileId: string): URL {
+     * @returns {string}
+     */
+    getFileDownload(bucketId: string, fileId: string): string {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         if (typeof fileId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "fileId"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}/files/{fileId}/download'.replace('{bucketId}', bucketId).replace('{fileId}', fileId);
         const payload: Payload = {};
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        payload['project'] = this.client.config.project;
 
+        const apiHeaders: { [header: string]: string } = {
+            'content-type': 'application/json',
+        }
+
+        payload['project'] = this.client.config.project;
 
-        for (const [key, value] of Object.entries(Service.flatten(payload))) {
+        for (const [key, value] of Object.entries(Client.flatten(payload))) {
             uri.searchParams.append(key, value);
         }
-        return uri;
-    }
 
+        return uri.toString();
+    }
     /**
      * Get file preview
      *
-     * Get a file preview image. Currently, this method supports preview for image
-     * files (jpg, png, and gif), other supported formats, like pdf, docs, slides,
-     * and spreadsheets, will return the file icon image. You can also pass query
-     * string arguments for cutting and resizing your preview image. Preview is
-     * supported only for image files smaller than 10MB.
+     * Get a file preview image. Currently, this method supports preview for image files (jpg, png, and gif), other supported formats, like pdf, docs, slides, and spreadsheets, will return the file icon image. You can also pass query string arguments for cutting and resizing your preview image. Preview is supported only for image files smaller than 10MB.
      *
      * @param {string} bucketId
      * @param {string} fileId
@@ -537,130 +483,124 @@ export class Storage extends Service {
      * @param {string} background
      * @param {ImageFormat} output
      * @throws {AppwriteException}
-     * @returns {URL}
-    */
-    getFilePreview(bucketId: string, fileId: string, width?: number, height?: number, gravity?: ImageGravity, quality?: number, borderWidth?: number, borderColor?: string, borderRadius?: number, opacity?: number, rotation?: number, background?: string, output?: ImageFormat): URL {
+     * @returns {string}
+     */
+    getFilePreview(bucketId: string, fileId: string, width?: number, height?: number, gravity?: ImageGravity, quality?: number, borderWidth?: number, borderColor?: string, borderRadius?: number, opacity?: number, rotation?: number, background?: string, output?: ImageFormat): string {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         if (typeof fileId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "fileId"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}/files/{fileId}/preview'.replace('{bucketId}', bucketId).replace('{fileId}', fileId);
         const payload: Payload = {};
-
         if (typeof width !== 'undefined') {
             payload['width'] = width;
         }
-
         if (typeof height !== 'undefined') {
             payload['height'] = height;
         }
-
         if (typeof gravity !== 'undefined') {
             payload['gravity'] = gravity;
         }
-
         if (typeof quality !== 'undefined') {
             payload['quality'] = quality;
         }
-
         if (typeof borderWidth !== 'undefined') {
             payload['borderWidth'] = borderWidth;
         }
-
         if (typeof borderColor !== 'undefined') {
             payload['borderColor'] = borderColor;
         }
-
         if (typeof borderRadius !== 'undefined') {
             payload['borderRadius'] = borderRadius;
         }
-
         if (typeof opacity !== 'undefined') {
             payload['opacity'] = opacity;
         }
-
         if (typeof rotation !== 'undefined') {
             payload['rotation'] = rotation;
         }
-
         if (typeof background !== 'undefined') {
             payload['background'] = background;
         }
-
         if (typeof output !== 'undefined') {
             payload['output'] = output;
         }
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        payload['project'] = this.client.config.project;
 
+        const apiHeaders: { [header: string]: string } = {
+            'content-type': 'application/json',
+        }
 
-        for (const [key, value] of Object.entries(Service.flatten(payload))) {
+        payload['project'] = this.client.config.project;
+
+        for (const [key, value] of Object.entries(Client.flatten(payload))) {
             uri.searchParams.append(key, value);
         }
-        return uri;
-    }
 
+        return uri.toString();
+    }
     /**
      * Get file for view
      *
-     * Get a file content by its unique ID. This endpoint is similar to the
-     * download method but returns with no  'Content-Disposition: attachment'
-     * header.
+     * Get a file content by its unique ID. This endpoint is similar to the download method but returns with no  &#039;Content-Disposition: attachment&#039; header.
      *
      * @param {string} bucketId
      * @param {string} fileId
      * @throws {AppwriteException}
-     * @returns {URL}
-    */
-    getFileView(bucketId: string, fileId: string): URL {
+     * @returns {string}
+     */
+    getFileView(bucketId: string, fileId: string): string {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         if (typeof fileId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "fileId"');
         }
-
         const apiPath = '/storage/buckets/{bucketId}/files/{fileId}/view'.replace('{bucketId}', bucketId).replace('{fileId}', fileId);
         const payload: Payload = {};
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        payload['project'] = this.client.config.project;
 
+        const apiHeaders: { [header: string]: string } = {
+            'content-type': 'application/json',
+        }
 
-        for (const [key, value] of Object.entries(Service.flatten(payload))) {
+        payload['project'] = this.client.config.project;
+
+        for (const [key, value] of Object.entries(Client.flatten(payload))) {
             uri.searchParams.append(key, value);
         }
-        return uri;
-    }
 
+        return uri.toString();
+    }
     /**
      * Get storage usage stats
      *
      *
      * @param {StorageUsageRange} range
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.UsageStorage>}
+     */
     async getUsage(range?: StorageUsageRange): Promise<Models.UsageStorage> {
         const apiPath = '/storage/usage';
         const payload: Payload = {};
-
         if (typeof range !== 'undefined') {
             payload['range'] = range;
         }
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('get', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
-    }
+        }
 
+        return await this.client.call(
+            'get',
+            uri,
+            apiHeaders,
+            payload
+        );
+    }
     /**
      * Get bucket usage stats
      *
@@ -668,23 +608,28 @@ export class Storage extends Service {
      * @param {string} bucketId
      * @param {StorageUsageRange} range
      * @throws {AppwriteException}
-     * @returns {Promise}
-    */
+     * @returns {Promise<Models.UsageBuckets>}
+     */
     async getBucketUsage(bucketId: string, range?: StorageUsageRange): Promise<Models.UsageBuckets> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
-
         const apiPath = '/storage/{bucketId}/usage'.replace('{bucketId}', bucketId);
         const payload: Payload = {};
-
         if (typeof range !== 'undefined') {
             payload['range'] = range;
         }
-
         const uri = new URL(this.client.config.endpoint + apiPath);
-        return await this.client.call('get', uri, {
+
+        const apiHeaders: { [header: string]: string } = {
             'content-type': 'application/json',
-        }, payload);
+        }
+
+        return await this.client.call(
+            'get',
+            uri,
+            apiHeaders,
+            payload
+        );
     }
-};
+}