Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix/improve error handling #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 25, 2018
Merged

Fix/improve error handling #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b6fbaa
Fix/improve error handling
Apr 17, 2018
b4d4435
Per request, adding `responseCode` to `ResultEventData`
Apr 23, 2018
b2f214a
Per Request, creating interface for CompleteEventData
Apr 23, 2018
517cf63
Fix
Apr 23, 2018
e72ce73
Add back response object for Android.
Apr 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 56 additions & 35 deletions src/background-http.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,54 @@
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();
const currentBytes = uploadInfo.getUploadedBytes();
task.setTotalUpload(totalBytes);
task.setUpload(currentBytes);
task.setStatus("uploading");
task.notify({ eventName: "progress", object: task, currentBytes: currentBytes, totalBytes: totalBytes });
task.notify(<common.ProgressEventData>{
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(<common.ErrorEventData>{
eventName: "error",
object: task,
error,
responseCode: response && typeof response.getHttpCode === 'function' ? response.getHttpCode() : -1,
response
});
}

function onProgressReceiverCompleted(context: any, uploadInfo: UploadInfo, serverResponse: ServerResponse) {
function onProgressReceiverCompleted(context: Context, uploadInfo: UploadInfo, response: ServerResponse) {
const uploadId = uploadInfo.getUploadId();
const task = Task.fromId(uploadId);

Expand All @@ -55,9 +60,23 @@ function onProgressReceiverCompleted(context: any, uploadInfo: UploadInfo, serve
task.setTotalUpload(totalUpload);
task.setStatus("complete");

task.notify({ eventName: "progress", object: task, currentBytes: totalUpload, totalBytes: totalUpload });
task.notify({ eventName: "responded", object: task, data: serverResponse.getBodyAsString() });
task.notify({ eventName: "complete", object: task, response: serverResponse });
task.notify(<common.ProgressEventData>{
eventName: "progress",
object: task,
currentBytes: totalUpload,
totalBytes: totalUpload
});
task.notify(<common.ResultEventData>{
eventName: "responded",
object: task,
data: response.getBodyAsString(),
responseCode: response && typeof response.getHttpCode === 'function' ? response.getHttpCode() : -1
});
task.notify(<common.CompleteEventData>{
eventName: "complete",
object: task,
responseCode: response && typeof response.getHttpCode === 'function' ? response.getHttpCode() : -1
});
}

function initializeProgressReceiver() {
Expand All @@ -70,23 +89,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;
}
Expand Down Expand Up @@ -309,4 +330,4 @@ class Task extends ObservableBase {
cancel(): void {
(<any>net).gotev.uploadservice.UploadService.stopUpload(this._id);
}
}
}
Loading