Error => FirebaseStorageError

Author: hsubox76

packages/storage/compat/task.ts

@@ -18,11 +18,17 @@
 import { UploadTask } from '../src/task';
 import { UploadTaskSnapshotCompat } from './tasksnapshot';
 import { TaskEvent } from '../src/implementation/taskenums';
-import { ErrorFn, CompleteFn, Unsubscribe, Subscribe } from '@firebase/util';
 import * as types from '@firebase/storage-types';
-import { StorageObserver } from '../src/implementation/observer';
+import {
+  StorageObserver,
+  ErrorFn,
+  CompleteFn,
+  Subscribe,
+  Unsubscribe
+} from '../src/implementation/observer';
 import { UploadTaskSnapshot } from '../src/tasksnapshot';
 import { ReferenceCompat } from './reference';
+import { FirebaseStorageError } from '../src/implementation/error';
 
 export class UploadTaskCompat implements types.UploadTask {
   constructor(
@@ -43,7 +49,7 @@ export class UploadTaskCompat implements types.UploadTask {
 
   then(
     onFulfilled?: ((a: UploadTaskSnapshotCompat) => unknown) | null,
-    onRejected?: ((a: Error) => unknown) | null
+    onRejected?: ((a: FirebaseStorageError) => unknown) | null
   ): Promise<unknown> {
     return this.delegate.then(snapshot => {
       if (onFulfilled) {

packages/storage/src/implementation/error.ts

@@ -97,7 +97,8 @@ export const Code = {
   APP_DELETED: 'app-deleted',
   INVALID_ROOT_OPERATION: 'invalid-root-operation',
   INVALID_FORMAT: 'invalid-format',
-  INTERNAL_ERROR: 'internal-error'
+  INTERNAL_ERROR: 'internal-error',
+  UNSUPPORTED_ENVIRONMENT: 'unsupported-environment'
 };
 
 export function prependCode(code: Code): string {

packages/storage/src/implementation/fs.ts

@@ -20,6 +20,7 @@
  * bloats the size of the released binary.
  */
 import * as type from './type';
+import { Code, FirebaseStorageError } from './error';
 
 function getBlobBuilder(): typeof IBlobBuilder | undefined {
   if (typeof BlobBuilder !== 'undefined') {
@@ -49,7 +50,10 @@ export function getBlob(...args: Array<string | Blob | ArrayBuffer>): Blob {
     if (type.isNativeBlobDefined()) {
       return new Blob(args);
     } else {
-      throw Error("This browser doesn't seem to support creating Blobs");
+      throw new FirebaseStorageError(
+        Code.UNSUPPORTED_ENVIRONMENT,
+        "This browser doesn't seem to support creating Blobs"
+      );
     }
   }
 }

packages/storage/src/implementation/observer.ts

@@ -18,7 +18,7 @@ import * as type from './type';
 import { FirebaseStorageError } from './error';
 
 export type NextFn<T> = (value: T) => void;
-export type ErrorFn = (error: Error | FirebaseStorageError) => void;
+export type ErrorFn = (error: FirebaseStorageError) => void;
 export type CompleteFn = () => void;
 export type Unsubscribe = () => void;
 

packages/storage/src/task.ts

@@ -67,14 +67,14 @@ export class UploadTask {
   private observers_: Array<StorageObserver<UploadTaskSnapshot>> = [];
   private resumable_: boolean;
   state_: InternalTaskState;
-  private error_: Error | null = null;
+  private error_: FirebaseStorageError | null = null;
   private uploadUrl_: string | null = null;
   private request_: Request<unknown> | null = null;
   private chunkMultiplier_: number = 1;
   private errorHandler_: (p1: FirebaseStorageError) => void;
   private metadataErrorHandler_: (p1: FirebaseStorageError) => void;
   private resolve_: ((p1: UploadTaskSnapshot) => void) | null = null;
-  private reject_: ((p1: Error) => void) | null = null;
+  private reject_: ((p1: FirebaseStorageError) => void) | null = null;
   private promise_: Promise<UploadTaskSnapshot>;
 
   /**
@@ -599,8 +599,8 @@ export class UploadTask {
           break;
         case TaskState.CANCELED:
         case TaskState.ERROR:
-          const toCall = this.reject_ as (p1: Error) => void;
-          fbsAsync(toCall.bind(null, this.error_ as Error))();
+          const toCall = this.reject_ as (p1: FirebaseStorageError) => void;
+          fbsAsync(toCall.bind(null, this.error_ as FirebaseStorageError))();
           break;
         default:
           triggered = false;
@@ -630,13 +630,17 @@ export class UploadTask {
       case TaskState.CANCELED:
       case TaskState.ERROR:
         if (observer.error) {
-          fbsAsync(observer.error.bind(observer, this.error_ as Error))();
+          fbsAsync(
+            observer.error.bind(observer, this.error_ as FirebaseStorageError)
+          )();
         }
         break;
       default:
         // TODO(andysoto): assert(false);
         if (observer.error) {
-          fbsAsync(observer.error.bind(observer, this.error_ as Error))();
+          fbsAsync(
+            observer.error.bind(observer, this.error_ as FirebaseStorageError)
+          )();
         }
     }
   }

packages/storage/test/unit/xhrio.ts

@@ -16,6 +16,7 @@
  */
 import * as type from '../../src/implementation/type';
 import { ErrorCode, Headers, XhrIo } from '../../src/implementation/xhrio';
+import { FirebaseStorageError, Code } from '../../src/implementation/error';
 
 export type SendHook = (
   xhrio: TestingXhrIo,
@@ -64,7 +65,8 @@ export class TestingXhrIo implements XhrIo {
     headers?: Headers
   ): Promise<XhrIo> {
     if (this.state !== State.START) {
-      throw new Error("Can't send again");
+      //TODO: Make a code.
+      throw new FirebaseStorageError(Code.UNKNOWN, "Can't send again");
     }
 
     this.state = State.SENT;
@@ -81,7 +83,11 @@ export class TestingXhrIo implements XhrIo {
     headers: { [key: string]: string }
   ): void {
     if (this.state !== State.SENT) {
-      throw new Error("Can't simulate response before send/more than once");
+      //TODO: Make a code.
+      throw new FirebaseStorageError(
+        Code.UNKNOWN,
+        "Can't simulate response before send/more than once"
+      );
     }
 
     this.status = status;