mphttpx 2.1.2 → 2.1.5-beta.2

package/dist/cjs/mini-program/XMLHttpRequestImpl.js

@@ -39,50 +39,55 @@ class XMLHttpRequestImpl extends XMLHttpRequestEventTargetP.XMLHttpRequestEventT
     get responseText() { return state(this).responseText; }
     get responseType() { return state(this).responseType; }
     set responseType(value) {
-        if (state(this).pos > 15 /* XHRCycle.RESPONSE_BODY_WAITING */) {
+        if (state(this).pos > 9 /* XHRCycle.HEADERS_RECEIVED */)
             throw new utils.DOMExceptionP("Failed to set the 'responseType' property on 'XMLHttpRequest': The response type cannot be set if the object's state is LOADING or DONE.", "InvalidStateError");
-        }
-        state(this).responseType = XMLHttpRequestState.responseTypes.indexOf(value) > -1 ? value : "";
+        if (responseTypes.indexOf(value) > -1)
+            state(this).responseType = value;
     }
     get responseURL() { return state(this).responseURL; }
     get responseXML() { return null; }
     get status() { return state(this).status; }
     get statusText() {
-        if (state(this).pos < 14 /* XHRCycle.RESPONSE_HEADERS_RECEIVED */)
+        if (state(this).pos < 9 /* XHRCycle.HEADERS_RECEIVED */)
             return "";
         return state(this).statusText || statusTextMap.statusTextMap[this.status] || "unknown";
     }
     get timeout() { return state(this).timeout; }
     set timeout(value) { state(this).timeout = value >= 0 ? value : 0; }
     get upload() {
-        if (!state(this).upload) {
+        if (!state(this).upload)
             state(this).upload = XMLHttpRequestUploadP.createXMLHttpRequestUpload();
-        }
         return state(this).upload;
     }
     get withCredentials() { return state(this).withCredentials; }
-    set withCredentials(value) { state(this).withCredentials = !!value; }
+    set withCredentials(value) {
+        if (state(this).pos < 2 /* XHRCycle.LOADSTART */)
+            state(this).withCredentials = !!value;
+        else
+            throw new TypeError("Failed to set the 'withCredentials' property on 'XMLHttpRequest': The value may only be set if the object's state is UNSENT or OPENED.");
+    }
     abort() {
-        const requestTask = state(this).requestTask;
-        clearRequest(state(this));
-        switch (state(this).pos) {
-            case 3 /* XHRCycle.SUSPEND */:
-                state(this).requestHeaders = new HeadersP.HeadersP();
+        const s = state(this);
+        const requestTask = s.requestTask;
+        switch (s.pos) {
+            case 1 /* XHRCycle.OPENED */:
+                s.requestHeaders = new HeadersP.HeadersP();
                 break;
-            case 6 /* XHRCycle.UPLOAD_UPLOADING */:
+            case 2 /* XHRCycle.LOADSTART */:
+            case 3 /* XHRCycle.UPLOAD_LOADSTART */:
                 execUploadAbort(this);
-                execIdle(this);
+                execUnset(this);
                 break;
-            case 11 /* XHRCycle.UPLOAD_FINISHING */:
-            case 13 /* XHRCycle.RESPONSE_HEADERS_WAITING */:
-            case 15 /* XHRCycle.RESPONSE_BODY_WAITING */:
-            case 17 /* XHRCycle.RESPONSE_BODY_RECEIVING */:
+            case 4 /* XHRCycle.UPLOAD_LOAD */:
+            case 8 /* XHRCycle.UPLOAD_LOADEND */:
+            case 9 /* XHRCycle.HEADERS_RECEIVED */:
+            case 10 /* XHRCycle.LOADING */:
                 execAbort(this);
-            case 19 /* XHRCycle.REQUEST_FINISHING */:
-            case 25 /* XHRCycle.END */:
-                execIdle(this);
+            case 11 /* XHRCycle.DONE */:
+                execUnset(this);
                 break;
         }
+        clearRequest(s);
         safeAbort(requestTask);
     }
     getAllResponseHeaders() {
@@ -99,7 +104,7 @@ class XMLHttpRequestImpl extends XMLHttpRequestEventTargetP.XMLHttpRequestEventT
             return null;
         return state(this).responseHeaders.get(name);
     }
-    open(method, url, async, username, password) {
+    open(method, url, async = true, username = null, password = null) {
         utils.checkArgsLength(arguments.length, 2, "XMLHttpRequest", "open");
         if (!async) {
             console.warn("Synchronous XMLHttpRequest is not supported because of its detrimental effects to the end user's experience.");
@@ -117,18 +122,18 @@ class XMLHttpRequestImpl extends XMLHttpRequestEventTargetP.XMLHttpRequestEventT
             let auth = `Basic ${toBase64.Uint8Array_toBase64(encode.encode(_username + ":" + _password))}`;
             this.setRequestHeader("Authorization", auth);
         }
-        execRequestOpened(this);
+        execOpened(this);
     }
     overrideMimeType(mime) {
         utils.checkArgsLength(arguments.length, 1, "XMLHttpRequest", "overrideMimeType");
-        if (state(this).pos === 3 /* XHRCycle.SUSPEND */) {
+        if (state(this).pos === 1 /* XHRCycle.OPENED */) {
             console.error(`TypeError: Failed to execute 'overrideMimeType' on 'XMLHttpRequest': mimeType ('${mime}') not implemented.`);
         }
     }
     send(body) {
         const s = state(this);
         const requestId = s.requestId;
-        if (s.pos !== 3 /* XHRCycle.SUSPEND */) {
+        if (s.pos !== 1 /* XHRCycle.OPENED */) {
             throw new utils.DOMExceptionP("Failed to execute 'send' on 'XMLHttpRequest': The object's state must be OPENED.", "InvalidStateError");
         }
         const options = {
@@ -141,29 +146,30 @@ class XMLHttpRequestImpl extends XMLHttpRequestEventTargetP.XMLHttpRequestEventT
             success: requestSuccess.bind(this, requestId),
             fail: requestFail.bind(this, requestId),
         };
-        const launch = (function (data) {
+        const payload = (s.method !== "GET" && s.method !== "HEAD" && body !== null && body !== undefined) && new Payload.Payload(body);
+        if (payload && payload.type && !s.requestHeaders.has("Content-Type")) {
+            options.header["Content-Type"] = payload.type;
+        }
+        const request = (function (data) {
             if (requestId !== s.requestId)
                 return;
+            if (s.pos !== 2 /* XHRCycle.LOADSTART */ && s.pos !== 8 /* XHRCycle.UPLOAD_LOADEND */)
+                return;
             options.data = data !== "" ? data : undefined;
             options.headers = options.header; // Alipay Mini Program
             s.requestTask = mp.request(options);
         }).bind(this);
-        execLoadstart(this);
-        if (s.method !== "GET" && s.method !== "HEAD" && body !== null && body !== undefined) {
-            const payload = new Payload.Payload(body);
-            if (!s.requestHeaders.has("Content-Type") && payload.type) {
-                options.header["Content-Type"] = payload.type;
-            }
-            execUploadLoadstart(this, payload, launch);
-        }
-        else {
-            thenExec(() => execResponseHeadersWaiting(this, "", launch));
-        }
-        checkRequestTimeout(this, requestId);
+        checkRequestTimeout(this);
+        const task = execLoadstart(this, payload || undefined);
+        if (!task)
+            request();
+        else
+            task.then(data => { if (data !== undefined)
+                request(data); });
     }
     setRequestHeader(name, value) {
         utils.checkArgsLength(arguments.length, 2, "XMLHttpRequest", "setRequestHeader");
-        if (state(this).pos !== 3 /* XHRCycle.SUSPEND */) {
+        if (state(this).pos !== 1 /* XHRCycle.OPENED */) {
             throw new utils.DOMExceptionP("Failed to execute 'setRequestHeader' on 'XMLHttpRequest': The object's state must be OPENED.", "InvalidStateError");
         }
         let _name = "" + name;
@@ -183,7 +189,7 @@ class XMLHttpRequestImpl extends XMLHttpRequestEventTargetP.XMLHttpRequestEventT
 }
 class XMLHttpRequestState {
     constructor(target) {
-        this.pos = 1 /* XHRCycle.IDLE */;
+        this.pos = 0 /* XHRCycle.UNSET */;
         this.readyState = 0 /* UNSENT */;
         this.response = "";
         this.responseText = "";
@@ -204,7 +210,6 @@ class XMLHttpRequestState {
         this.attach = handlers.attachFn(target, getHandlers(target));
     }
 }
-XMLHttpRequestState.responseTypes = ["", "arraybuffer", "blob", "document", "json", "text"];
 function getHandlers(t) {
     return {
         onreadystatechange: (ev) => { handlers.executeFn(t, t.onreadystatechange, ev); },
@@ -218,38 +223,10 @@ function Headers_toDict(headers) {
     headers.forEach((value, name) => { dict[name] = value; });
     return dict;
 }
+const responseTypes = ["", "arraybuffer", "blob", "document", "json", "text"];
 function normalizeDataType(responseType) {
     return (responseType === "blob" || responseType === "arraybuffer") ? "arraybuffer" : "text";
 }
-// Alipay Mini Program
-function safeAbort(task) {
-    if (task && typeof task === "object") {
-        if ("abort" in task && typeof task.abort === "function")
-            task.abort();
-    }
-}
-function checkRequestTimeout(xhr, requestId) {
-    const whenTimeout = () => {
-        if (state(xhr).requestId !== requestId)
-            return;
-        const requestTask = state(xhr).requestTask;
-        switch (state(xhr).pos) {
-            case 6 /* XHRCycle.UPLOAD_UPLOADING */:
-                execUploadTimeout(xhr);
-                break;
-            case 11 /* XHRCycle.UPLOAD_FINISHING */:
-            case 13 /* XHRCycle.RESPONSE_HEADERS_WAITING */:
-            case 15 /* XHRCycle.RESPONSE_BODY_WAITING */:
-            case 17 /* XHRCycle.RESPONSE_BODY_RECEIVING */:
-                execTimeout(xhr);
-                break;
-        }
-        safeAbort(requestTask);
-    };
-    if (xhr.timeout) {
-        state(xhr).timeoutId = setTimeout(() => { whenTimeout(); }, xhr.timeout);
-    }
-}
 function clearRequest(state) {
     state.requestTask = null;
     clearRequestTimeout(state);
@@ -267,14 +244,29 @@ function clearRequestTimeout(state) {
         state.timeoutId = 0;
     }
 }
+function checkRequestTimeout(xhr) {
+    if (!xhr.timeout)
+        return;
+    const s = state(xhr);
+    const whenTimeout = () => {
+        switch (s.pos) {
+            case 2 /* XHRCycle.LOADSTART */:
+            case 3 /* XHRCycle.UPLOAD_LOADSTART */:
+                execUploadTimeout(xhr);
+                break;
+            case 8 /* XHRCycle.UPLOAD_LOADEND */:
+                execTimeout(xhr);
+                break;
+        }
+    };
+    s.timeoutId = setTimeout(() => { let task = s.requestTask; whenTimeout(); safeAbort(task); }, xhr.timeout);
+}
 function requestSuccess(requestId, res) {
     if (requestId !== state(this).requestId)
         return;
-    execResponseHeadersReceived(this, res);
+    execHeadersReceived(this, res);
 }
 function requestFail(requestId, err) {
-    if (requestId !== state(this).requestId)
-        return;
     // Alipay Mini Program
     if (("header" in err && "statusCode" in err) || ("headers" in err && "status" in err)) {
         return requestSuccess.call(this, requestId, {
@@ -283,6 +275,8 @@ function requestFail(requestId, err) {
             data: "data" in err ? err.data || "" : "",
         });
     }
+    if (requestId !== state(this).requestId)
+        return;
     execError(this, err);
 }
 function setReadyStateAndNotify(xhr, value) {
@@ -292,243 +286,205 @@ function setReadyStateAndNotify(xhr, value) {
     }
 }
 function getResponse(type, data) {
-    if (type === "json") {
-        return typeof data === "string"
-            ? JSON.parse(data)
-            : isArrayBuffer.isArrayBuffer(data)
-                ? JSON.parse(convertBack("text", data))
-                : data;
+    let temp = (typeof data === "string" || isArrayBuffer.isArrayBuffer(data))
+        ? data
+        : JSON.stringify(data);
+    switch (type) {
+        case "":
+        case "text":
+            return typeof temp === "string" ? temp : decode.decode(temp);
+        case "arraybuffer":
+            return isArrayBuffer.isArrayBuffer(temp) ? temp : encode.encode(temp).buffer;
+        case "json":
+            return typeof data === "string"
+                ? JSON.parse(data)
+                : isArrayBuffer.isArrayBuffer(data)
+                    ? JSON.parse(decode.decode(data))
+                    : data;
+        case "blob":
+            return new BlobP.BlobP([temp]);
+        default:
+            return temp;
     }
-    return convertBack(type, (typeof data === "string" || isArrayBuffer.isArrayBuffer(data)) ? data : JSON.stringify(data));
 }
-function convertBack(type, data) {
-    if (!type || type === "text") {
-        return typeof data === "string" ? data : decode.decode(data);
-    }
-    else if (type === "arraybuffer") {
-        return isArrayBuffer.isArrayBuffer(data) ? data : encode.encode(data).buffer;
-    }
-    else if (type === "blob") {
-        return new BlobP.BlobP([data !== null && data !== void 0 ? data : ""]);
-    }
-    else {
-        return data !== null && data !== void 0 ? data : "";
+// Alipay Mini Program
+function safeAbort(task) {
+    if (task && typeof task === "object") {
+        if ("abort" in task && typeof task.abort === "function")
+            task.abort();
     }
 }
-function thenExec(fn) {
-    Promise.resolve().then(fn);
+function execUnset(xhr) {
+    state(xhr).pos = 0 /* XHRCycle.UNSET */;
+    state(xhr).readyState = 0 /* UNSENT */;
 }
-function execIdle(xhr) {
-    state(xhr).pos = 1 /* XHRCycle.IDLE */;
-    state(xhr).readyState = 0 /* UNSET */;
-}
-function execRequestOpened(xhr) {
-    state(xhr).pos = 2 /* XHRCycle.REQUEST_OPENED */;
+function execOpened(xhr) {
+    state(xhr).pos = 1 /* XHRCycle.OPENED */;
     state(xhr).requestId += 1;
     setReadyStateAndNotify(xhr, 1 /* OPENED */);
-    execSuspend(xhr);
-}
-function execSuspend(xhr) {
-    state(xhr).pos = 3 /* XHRCycle.SUSPEND */;
 }
-// external call
-function execLoadstart(xhr) {
-    state(xhr).pos = 4 /* XHRCycle.LOADSTART */;
+function execLoadstart(xhr, payload) {
+    state(xhr).pos = 2 /* XHRCycle.LOADSTART */;
     emitProgressEvent.emitProgressEvent(xhr, "loadstart");
+    return payload && execUploadLoadstart(xhr, payload);
 }
-// external call
-function execUploadLoadstart(xhr, payload, callback) {
-    state(xhr).pos = 5 /* XHRCycle.UPLOAD_LOADSTART */;
-    execUploadUploading(xhr, payload, callback);
-    if (state(xhr).upload)
+function execUploadLoadstart(xhr, payload) {
+    let s = state(xhr);
+    let requestId = s.requestId;
+    if (s.pos !== 2 /* XHRCycle.LOADSTART */)
+        return;
+    s.pos = 3 /* XHRCycle.UPLOAD_LOADSTART */;
+    if (s.upload)
         emitProgressEvent.emitProgressEvent(xhr.upload, "loadstart", 0, payload.size);
-}
-function execUploadUploading(xhr, payload, callback) {
-    state(xhr).pos = 6 /* XHRCycle.UPLOAD_UPLOADING */;
-    const requestId = state(xhr).requestId;
-    payload.promise
-        .then(data => {
-        if (requestId !== state(xhr).requestId)
-            return;
-        execUploadLoad(xhr, payload, data, callback);
-    })
-        .catch(e => {
-        if (requestId !== state(xhr).requestId)
-            return;
+    return payload.promise
+        .then(r => { if (requestId === s.requestId) {
+        return execUploadLoad(xhr, payload, r);
+    } })
+        .catch(e => { if (requestId === s.requestId) {
         execUploadError(xhr);
         console.error(e);
-    });
+    } });
 }
-function execUploadLoad(xhr, payload, data, callback) {
-    if (state(xhr).pos !== 6 /* XHRCycle.UPLOAD_UPLOADING */)
+function execUploadLoad(xhr, payload, data) {
+    let s = state(xhr);
+    if (s.pos !== 3 /* XHRCycle.UPLOAD_LOADSTART */)
         return;
-    state(xhr).pos = 7 /* XHRCycle.UPLOAD_LOAD */;
-    execUploadFinishing(xhr, payload, data, callback);
-    if (state(xhr).upload && payload.size > 0)
+    s.pos = 4 /* XHRCycle.UPLOAD_LOAD */;
+    if (s.upload && payload.size > 0)
         emitProgressEvent.emitProgressEvent(xhr.upload, "load", payload.size, payload.size);
+    return execUploadLoadend(xhr, "load", { payload, data });
 }
 function execUploadAbort(xhr) {
-    state(xhr).pos = 8 /* XHRCycle.UPLOAD_ABORT */;
+    state(xhr).pos = 5 /* XHRCycle.UPLOAD_ABORT */;
     setReadyStateAndNotify(xhr, 4 /* DONE */);
     if (state(xhr).upload)
         emitProgressEvent.emitProgressEvent(xhr.upload, "abort");
     execUploadLoadend(xhr, "abort");
 }
 function execUploadError(xhr) {
-    if (state(xhr).pos !== 6 /* XHRCycle.UPLOAD_UPLOADING */)
+    let s = state(xhr);
+    if (s.pos !== 3 /* XHRCycle.UPLOAD_LOADSTART */)
         return;
-    state(xhr).pos = 9 /* XHRCycle.UPLOAD_ERROR */;
+    s.pos = 6 /* XHRCycle.UPLOAD_ERROR */;
     setReadyStateAndNotify(xhr, 4 /* DONE */);
-    if (state(xhr).upload)
+    if (s.upload)
         emitProgressEvent.emitProgressEvent(xhr.upload, "error");
     execUploadLoadend(xhr, "error");
 }
 function execUploadTimeout(xhr) {
-    state(xhr).pos = 10 /* XHRCycle.UPLOAD_TIMEOUT */;
+    state(xhr).pos = 7 /* XHRCycle.UPLOAD_TIMEOUT */;
     setReadyStateAndNotify(xhr, 4 /* DONE */);
     if (state(xhr).upload)
         emitProgressEvent.emitProgressEvent(xhr.upload, "timeout");
     execUploadLoadend(xhr, "timeout");
 }
-function execUploadFinishing(xhr, payload, data, callback) {
-    state(xhr).pos = 11 /* XHRCycle.UPLOAD_FINISHING */;
-    thenExec(() => execUploadLoadend(xhr, "load", payload, data, callback));
-}
-function execUploadLoadend(xhr, type, payload, data, callback) {
-    if (type === "load") {
-        if (state(xhr).pos === 11 /* XHRCycle.UPLOAD_FINISHING */) {
-            state(xhr).pos = 12 /* XHRCycle.UPLOAD_LOADEND */;
-            execResponseHeadersWaiting(xhr, data, callback);
-        }
-        if (state(xhr).upload && payload.size > 0) {
-            emitProgressEvent.emitProgressEvent(xhr.upload, "loadend", payload.size, payload.size);
-        }
-    }
-    else {
-        state(xhr).pos = 12 /* XHRCycle.UPLOAD_LOADEND */;
-        if (state(xhr).upload) {
-            emitProgressEvent.emitProgressEvent(xhr.upload, "loadend");
-        }
-        switch (type) {
-            case "abort":
-                execAbort(xhr);
-                break;
-            case "error":
-                execError(xhr);
-                break;
-            case "timeout":
-                execTimeout(xhr);
-                break;
-        }
-    }
-}
-function execResponseHeadersWaiting(xhr, data, callback) {
-    if (state(xhr).pos !== 4 /* XHRCycle.LOADSTART */ && state(xhr).pos !== 12 /* XHRCycle.UPLOAD_LOADEND */)
-        return;
-    state(xhr).pos = 13 /* XHRCycle.RESPONSE_HEADERS_WAITING */;
-    try {
-        callback(data);
+function execUploadLoadend(xhr, type, ctx) {
+    let s = state(xhr);
+    if ((type === "load" && s.pos === 4 /* XHRCycle.UPLOAD_LOAD */) || type !== "load")
+        s.pos = 8 /* XHRCycle.UPLOAD_LOADEND */;
+    if (s.upload) {
+        let l = ctx ? ctx.payload.size : 0;
+        emitProgressEvent.emitProgressEvent(xhr.upload, "loadend", l, l);
     }
-    catch (e) {
-        execError(xhr);
-        console.error(e);
+    switch (type) {
+        case "load": return ctx && ctx.data;
+        case "abort":
+            execAbort(xhr);
+            break;
+        case "error":
+            execError(xhr);
+            break;
+        case "timeout":
+            execTimeout(xhr);
+            break;
     }
 }
-// external call
-function execResponseHeadersReceived(xhr, res) {
-    if (state(xhr).pos !== 13 /* XHRCycle.RESPONSE_HEADERS_WAITING */)
+function execHeadersReceived(xhr, res) {
+    let s = state(xhr);
+    if (s.pos !== 2 /* XHRCycle.LOADSTART */ && s.pos !== 8 /* XHRCycle.UPLOAD_LOADEND */)
         return;
-    state(xhr).pos = 14 /* XHRCycle.RESPONSE_HEADERS_RECEIVED */;
-    state(xhr).responseURL = state(xhr).requestURL;
-    state(xhr).status = "statusCode" in res ? res.statusCode : "status" in res ? res.status : 200;
-    state(xhr).responseHeaders = new HeadersP.HeadersP(("header" in res ? res.header : "headers" in res ? res.headers : {}));
-    execResponseBodyWaiting(xhr, res);
+    s.pos = 9 /* XHRCycle.HEADERS_RECEIVED */;
+    s.responseURL = s.requestURL;
+    s.status = "statusCode" in res ? res.statusCode : "status" in res ? res.status : 200;
+    s.responseHeaders = new HeadersP.HeadersP(("header" in res ? res.header : "headers" in res ? res.headers : {}));
     setReadyStateAndNotify(xhr, 2 /* HEADERS_RECEIVED */);
+    execLoading(xhr, res);
 }
-function execResponseBodyWaiting(xhr, res) {
-    state(xhr).pos = 15 /* XHRCycle.RESPONSE_BODY_WAITING */;
-    thenExec(() => execResponseBodyLoading(xhr, res));
-}
-function execResponseBodyLoading(xhr, res) {
-    if (state(xhr).pos !== 15 /* XHRCycle.RESPONSE_BODY_WAITING */)
+function execLoading(xhr, res) {
+    if (state(xhr).pos !== 9 /* XHRCycle.HEADERS_RECEIVED */)
         return;
-    state(xhr).pos = 16 /* XHRCycle.RESPONSE_BODY_LOADING */;
-    execResponseBodyReceiving(xhr, res);
+    state(xhr).pos = 10 /* XHRCycle.LOADING */;
     setReadyStateAndNotify(xhr, 3 /* LOADING */);
+    execDone(xhr, res);
 }
-function execResponseBodyReceiving(xhr, res) {
-    state(xhr).pos = 17 /* XHRCycle.RESPONSE_BODY_RECEIVING */;
+function execDone(xhr, res) {
+    let s = state(xhr);
+    if (s.pos !== 10 /* XHRCycle.LOADING */)
+        return;
+    s.pos = 11 /* XHRCycle.DONE */;
     const setResponse = () => {
         var _a;
-        if (state(xhr).pos !== 17 /* XHRCycle.RESPONSE_BODY_RECEIVING */)
-            return;
-        state(xhr).response = getResponse(xhr.responseType, (_a = res.data) !== null && _a !== void 0 ? _a : "");
+        s.response = getResponse(xhr.responseType, (_a = res.data) !== null && _a !== void 0 ? _a : "");
         if (!xhr.responseType || xhr.responseType === "text")
-            state(xhr).responseText = xhr.response;
-        thenExec(() => execRequestDone(xhr));
+            s.responseText = xhr.response;
+        setReadyStateAndNotify(xhr, 4 /* DONE */);
+        execLoad(xhr);
     };
-    thenExec(() => {
-        try {
-            setResponse();
-        }
-        catch (e) {
-            execError(xhr);
-            console.error(e);
-        }
-    });
-}
-function execRequestDone(xhr) {
-    if (state(xhr).pos !== 17 /* XHRCycle.RESPONSE_BODY_RECEIVING */)
-        return;
-    state(xhr).pos = 18 /* XHRCycle.REQUEST_DONE */;
-    execRequestFinishing(xhr);
-    setReadyStateAndNotify(xhr, 4 /* DONE */);
-}
-function execRequestFinishing(xhr) {
-    state(xhr).pos = 19 /* XHRCycle.REQUEST_FINISHING */;
-    thenExec(() => execLoad(xhr));
+    try {
+        setResponse();
+    }
+    catch (e) {
+        execError(xhr);
+        console.error(e);
+    }
 }
 function execLoad(xhr) {
-    if (state(xhr).pos !== 19 /* XHRCycle.REQUEST_FINISHING */)
+    let s = state(xhr);
+    if (s.pos !== 11 /* XHRCycle.DONE */)
         return;
-    state(xhr).pos = 20 /* XHRCycle.LOAD */;
-    let contentLength = parseInt(state(xhr).responseHeaders.get("Content-Length") || "0");
+    s.pos = 12 /* XHRCycle.LOAD */;
+    let lstr = s.responseHeaders.get("Content-Length");
+    let contentLength = lstr ? (parseInt(lstr) || 0) : 0;
     emitProgressEvent.emitProgressEvent(xhr, "load", contentLength, contentLength);
     execLoadend(xhr, contentLength);
 }
 function execAbort(xhr) {
-    state(xhr).pos = 21 /* XHRCycle.ABORT */;
+    state(xhr).pos = 13 /* XHRCycle.ABORT */;
     setReadyStateAndNotify(xhr, 4 /* DONE */);
     emitProgressEvent.emitProgressEvent(xhr, "abort");
     execLoadend(xhr);
 }
 function execError(xhr, err) {
-    if (state(xhr).pos !== 12 /* XHRCycle.UPLOAD_LOADEND */ && state(xhr).pos !== 13 /* XHRCycle.RESPONSE_HEADERS_WAITING */ && state(xhr).pos !== 17 /* XHRCycle.RESPONSE_BODY_RECEIVING */)
-        return;
-    state(xhr).pos = 22 /* XHRCycle.ERROR */;
+    let s = state(xhr);
+    switch (s.pos) {
+        case 2 /* XHRCycle.LOADSTART */:
+        case 8 /* XHRCycle.UPLOAD_LOADEND */:
+        case 11 /* XHRCycle.DONE */:
+            break;
+        default:
+            return;
+    }
+    s.pos = 14 /* XHRCycle.ERROR */;
     if (err) {
-        state(xhr).status = 0;
-        state(xhr).statusText = "errMsg" in err ? err.errMsg : "errorMessage" in err ? err.errorMessage : "";
+        s.status = 0;
+        s.statusText = "errMsg" in err ? err.errMsg : "errorMessage" in err ? err.errorMessage : "";
     }
     setReadyStateAndNotify(xhr, 4 /* DONE */);
     emitProgressEvent.emitProgressEvent(xhr, "error");
     execLoadend(xhr);
 }
 function execTimeout(xhr) {
-    state(xhr).pos = 23 /* XHRCycle.TIMEOUT */;
+    state(xhr).pos = 15 /* XHRCycle.TIMEOUT */;
     setReadyStateAndNotify(xhr, 4 /* DONE */);
     emitProgressEvent.emitProgressEvent(xhr, "timeout");
     execLoadend(xhr);
 }
 function execLoadend(xhr, contentLength = 0) {
-    state(xhr).pos = 24 /* XHRCycle.LOADEND */;
+    let s = state(xhr);
+    s.pos = 16 /* XHRCycle.LOADEND */;
+    s.requestTask = null;
+    clearRequestTimeout(s);
     emitProgressEvent.emitProgressEvent(xhr, "loadend", contentLength, contentLength);
-    execEnd(xhr);
-}
-function execEnd(xhr) {
-    state(xhr).pos = 25 /* XHRCycle.END */;
-    state(xhr).requestTask = null;
-    clearRequestTimeout(state(xhr));
 }
 const XMLHttpRequestE = (typeof XMLHttpRequest !== "undefined" && XMLHttpRequest) || XMLHttpRequestImpl;
 

package/dist/cjs/network/XMLHttpRequestEventTargetP.js

@@ -33,9 +33,7 @@ class XMLHttpRequestEventTargetP extends EventTargetP.EventTargetP {
 }
 /** @internal */
 class XMLHttpRequestEventTargetState {
-    /**
-     * @param target XMLHttpRequestEventTarget
-     */
+    /** @param target XMLHttpRequestEventTarget */
     constructor(target) {
         this.onabort = null;
         this.onerror = null;