Fix/improve error handling

src/background-http.android.ts

@@ -1,24 +1,18 @@
-import application = require("application");
+import * as application from "application";
 import { Observable } from "data/observable";
 import { ad } from "utils/utils";
 import * as fileSystemModule from "file-system";
 import * as common from "./index";
 
-declare const net: any;
-interface UploadInfo {
-    getUploadId(): string;
-    getTotalBytes(): number;
-    getUploadedBytes(): number;
-}
-
-interface ServerResponse {
-    getBodyAsString(): string;
-}
+type Context = android.content.Context;
+type ServerResponse = net.gotev.uploadservice.ServerResponse;
+type UploadInfo = net.gotev.uploadservice.UploadInfo;
+type UploadServiceBroadcastReceiver = net.gotev.uploadservice.UploadServiceBroadcastReceiver;
 
 /* A snapshot-friendly, lazy-loaded class for ProgressReceiver BEGIN */
 let ProgressReceiver: any;
 
-function onProgressReceiverProgress(context: any, uploadInfo: UploadInfo) {
+function onProgressReceiverProgress(context: Context, uploadInfo: UploadInfo) {
     const uploadId = uploadInfo.getUploadId();
     const task = Task.fromId(uploadId);
     const totalBytes = uploadInfo.getTotalBytes();
@@ -29,21 +23,26 @@ function onProgressReceiverProgress(context: any, uploadInfo: UploadInfo) {
     task.notify({ eventName: "progress", object: task, currentBytes: currentBytes, totalBytes: totalBytes });
 }
 
-function onProgressReceiverCancelled(context: any, uploadInfo: UploadInfo) {
+function onProgressReceiverCancelled(context: Context, uploadInfo: UploadInfo) {
     const uploadId = uploadInfo.getUploadId();
     const task = Task.fromId(uploadId);
     task.setStatus("cancelled");
     task.notify({ eventName: "cancelled", object: task });
 }
 
-function onProgressReceiverError(context: any, uploadInfo: UploadInfo, error) {
+function onProgressReceiverError(context: Context, uploadInfo: UploadInfo, response: ServerResponse, error: java.lang.Exception) {
     const uploadId = uploadInfo.getUploadId();
     const task = Task.fromId(uploadId);
     task.setStatus("error");
-    task.notify({ eventName: "error", object: task, error: error });
+    task.notify({
+      eventName: "error",
+      object: task,
+      error,
+      responseCode: response && typeof response.getHttpCode === 'function' ? response.getHttpCode() : -1
+    });
 }
 
-function onProgressReceiverCompleted(context: any, uploadInfo: UploadInfo, serverResponse: ServerResponse) {
+function onProgressReceiverCompleted(context: Context, uploadInfo: UploadInfo, serverResponse: ServerResponse) {
     const uploadId = uploadInfo.getUploadId();
     const task = Task.fromId(uploadId);
 
@@ -70,23 +69,25 @@ function initializeProgressReceiver() {
     const zonedOnError = global.zonedCallback(onProgressReceiverError);
     const zonedOnCompleted = global.zonedCallback(onProgressReceiverCompleted);
 
-    const ProgressReceiverImpl = net.gotev.uploadservice.UploadServiceBroadcastReceiver.extend({
-        onProgress(context: any, uploadInfo: UploadInfo) {
-            zonedOnProgress(context, uploadInfo);
-        },
+    const temp: Partial<UploadServiceBroadcastReceiver> = {
+      onProgress(context: Context, uploadInfo: UploadInfo) {
+        zonedOnProgress(context, uploadInfo);
+      },
 
-        onCancelled(context: any, uploadInfo: UploadInfo) {
-            zonedOnCancelled(context, uploadInfo);
-        },
+      onCancelled(context: Context, uploadInfo: UploadInfo) {
+        zonedOnCancelled(context, uploadInfo);
+      },
 
-        onError(context: any, uploadInfo: UploadInfo, error) {
-            zonedOnError(context, uploadInfo);
-        },
+      onError(context: Context, uploadInfo: UploadInfo, response: ServerResponse, error: java.lang.Exception) {
+        zonedOnError(context, uploadInfo, response, error);
+      },
 
-        onCompleted(context: any, uploadInfo: UploadInfo, serverResponse: ServerResponse) {
-            zonedOnCompleted(context, uploadInfo, serverResponse);
-        }
-    });
+      onCompleted(context: Context, uploadInfo: UploadInfo, serverResponse: ServerResponse) {
+        zonedOnCompleted(context, uploadInfo, serverResponse);
+      }
+    };
+
+    const ProgressReceiverImpl = (<any>net.gotev.uploadservice.UploadServiceBroadcastReceiver).extend(temp);
 
     ProgressReceiver = ProgressReceiverImpl as any;
 }
@@ -309,4 +310,4 @@ class Task extends ObservableBase {
     cancel(): void {
         (<any>net).gotev.uploadservice.UploadService.stopUpload(this._id);
     }
-}
+}

src/background-http.ios.ts

@@ -28,7 +28,7 @@ class BackgroundUploadDelegate extends NSObject implements NSURLSessionDelegate,
 	}
 
 	// NSURLSessionTaskDelegate
-	URLSessionTaskDidCompleteWithError(session, nsTask, error) {
+	URLSessionTaskDidCompleteWithError(session: NSURLSession, nsTask: NSURLSessionTask, error: NSError) {
 		dispatch_async(main_queue, () => {
 			const task = Task.getTask(session, nsTask);
 			if (task._fileToCleanup) {
@@ -37,7 +37,12 @@ class BackgroundUploadDelegate extends NSObject implements NSURLSessionDelegate,
 			}
 			if (error) {
 				task.notifyPropertyChange("status", task.status);
-				task.notify({ eventName: "error", object: task, error: error });
+				task.notify({
+					eventName: "error",
+					object: task,
+					error,
+					responseCode: nsTask && nsTask.response ? (<NSHTTPURLResponse>nsTask.response).statusCode : -1
+				});
 			} else {
 				task.notifyPropertyChange("upload", task.upload);
 				task.notifyPropertyChange("totalUpload", task.totalUpload);
@@ -359,4 +364,4 @@ class MultiMultiPartForm {
 	};
 
 
-}
+}

src/index.d.ts

@@ -13,7 +13,9 @@ export interface ErrorEventData extends observable.EventData {
     /**
      * Provides the underlying error. The value is platform specific.
      */
-    error: any;
+    error: any /*NSError | java.lang.Exception*/;
+    /** HTTP response code if response object is present, otherwise -1 */
+    responseCode: number;
 }
 
 /**
@@ -32,11 +34,11 @@ export interface ProgressEventData extends observable.EventData {
 }
 
 /**
- * Provides the server responce.
+ * Provides the server response.
  */
 export interface ResultEventData extends observable.EventData {
     /**
-     * The string responce of the server.
+     * The string response of the server.
      */
     data: string;
 }
@@ -90,15 +92,15 @@ export interface Task {
     /**
      * Subscribe for progress notifications.
      * @param event
-     * @param handler A handler that will receive a progress event with the current and expected total bytes 
+     * @param handler A handler that will receive a progress event with the current and expected total bytes
      * @event
      */
     on(event: "progress", handler: (e: ProgressEventData) => void): void;
 
     /**
-     * Upon successful upload provides the server responce.
+     * Upon successful upload provides the server response.
      * @param event
-     * @param handler A handler that will receive the responce event. 
+     * @param handler A handler that will receive the response event.
      * @event
      */
     on(event: "responded", handler: (e: ResultEventData) => void): void;