mphttpx 2.1.0 → 2.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/fetch-api/RequestP.js +2 -2
- package/dist/cjs/fetch-api/fetchP.js +1 -3
- package/dist/cjs/file-system/BlobP.js +0 -1
- package/dist/cjs/helpers/normalizeMethod.js +11 -0
- package/dist/cjs/mini-program/WebSocketImpl.js +1 -3
- package/dist/cjs/mini-program/XMLHttpRequestImpl.js +3 -5
- package/dist/esm/fetch-api/RequestP.js +2 -2
- package/dist/esm/fetch-api/fetchP.js +1 -3
- package/dist/esm/file-system/BlobP.js +0 -1
- package/dist/esm/helpers/normalizeMethod.js +9 -0
- package/dist/esm/mini-program/WebSocketImpl.js +1 -3
- package/dist/esm/mini-program/XMLHttpRequestImpl.js +3 -5
- package/package.json +1 -1
- package/dist/cjs/helpers/Method.js +0 -13
- package/dist/esm/helpers/Method.js +0 -11
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
var HeadersP = require('./HeadersP.js');
|
|
4
4
|
var BodyImpl = require('./BodyImpl.js');
|
|
5
|
-
var Method = require('../helpers/Method.js');
|
|
6
5
|
var Payload = require('../helpers/Payload.js');
|
|
7
6
|
var isEventTarget = require('../helpers/isEventTarget.js');
|
|
7
|
+
var normalizeMethod = require('../helpers/normalizeMethod.js');
|
|
8
8
|
var AbortSignalP = require('../event-system/AbortSignalP.js');
|
|
9
9
|
var utils = require('../utils.js');
|
|
10
10
|
|
|
@@ -51,7 +51,7 @@ class RequestP extends BodyImpl.BodyImpl {
|
|
|
51
51
|
state(this).headers = new HeadersP.HeadersP(_init.headers);
|
|
52
52
|
}
|
|
53
53
|
if (_init.method) {
|
|
54
|
-
s.method =
|
|
54
|
+
s.method = normalizeMethod.normalizeMethod(_init.method);
|
|
55
55
|
}
|
|
56
56
|
if (_init.mode) {
|
|
57
57
|
s.mode = _init.mode;
|
|
@@ -6,9 +6,7 @@ var utils = require('../utils.js');
|
|
|
6
6
|
var XMLHttpRequestImpl = require('../mini-program/XMLHttpRequestImpl.js');
|
|
7
7
|
var HeadersP = require('./HeadersP.js');
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
}
|
|
11
|
-
mp.XMLHttpRequest = XMLHttpRequestImpl.XMLHttpRequest;
|
|
9
|
+
const mp = { XMLHttpRequest: XMLHttpRequestImpl.XMLHttpRequest };
|
|
12
10
|
function setXMLHttpRequest(XHR) { mp.XMLHttpRequest = XHR; }
|
|
13
11
|
function fetchP(input, init) {
|
|
14
12
|
utils.checkArgsLength(arguments.length, 1, "Window", "fetch");
|
|
@@ -109,7 +109,6 @@ function calcSlicedSize(originalSize, start, end) {
|
|
|
109
109
|
}
|
|
110
110
|
return num;
|
|
111
111
|
};
|
|
112
|
-
console.log(normalizeNumer(start), normalizeNumer(end));
|
|
113
112
|
return Math.max(0, normalizeNumer(end) - normalizeNumer(start));
|
|
114
113
|
}
|
|
115
114
|
const BlobE = (typeof Blob !== "undefined" && Blob) || BlobP;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
// HTTP methods whose capitalization should be normalized
|
|
4
|
+
const methods = ["CONNECT", "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", "TRACE"];
|
|
5
|
+
/** @internal */
|
|
6
|
+
function normalizeMethod(method) {
|
|
7
|
+
let upcased = method.toUpperCase();
|
|
8
|
+
return methods.indexOf(upcased) > -1 ? upcased : method;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
exports.normalizeMethod = normalizeMethod;
|
|
@@ -14,9 +14,7 @@ var isArrayBuffer = require('../helpers/isArrayBuffer.js');
|
|
|
14
14
|
var utils = require('../utils.js');
|
|
15
15
|
var connectSocket = require('./connectSocket.js');
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
}
|
|
19
|
-
mp.connectSocket = connectSocket.getConnectSocket();
|
|
17
|
+
const mp = { connectSocket: connectSocket.getConnectSocket() };
|
|
20
18
|
function setConnectSocket(connectSocket) { mp.connectSocket = connectSocket; }
|
|
21
19
|
class WebSocketImpl extends EventTargetP.EventTargetP {
|
|
22
20
|
static get CONNECTING() { return 0; }
|
|
@@ -4,12 +4,12 @@ var BlobP = require('../file-system/BlobP.js');
|
|
|
4
4
|
var HeadersP = require('../fetch-api/HeadersP.js');
|
|
5
5
|
var encode = require('../helpers/encode.js');
|
|
6
6
|
var decode = require('../helpers/decode.js');
|
|
7
|
-
var Method = require('../helpers/Method.js');
|
|
8
7
|
var Payload = require('../helpers/Payload.js');
|
|
9
8
|
var isArrayBuffer = require('../helpers/isArrayBuffer.js');
|
|
10
9
|
var statusTextMap = require('../helpers/statusTextMap.js');
|
|
11
10
|
var toBase64 = require('../helpers/toBase64.js');
|
|
12
11
|
var handlers = require('../helpers/handlers.js');
|
|
12
|
+
var normalizeMethod = require('../helpers/normalizeMethod.js');
|
|
13
13
|
var emitEvent = require('../helpers/emitEvent.js');
|
|
14
14
|
var emitProgressEvent = require('../helpers/emitProgressEvent.js');
|
|
15
15
|
var request = require('./request.js');
|
|
@@ -17,9 +17,7 @@ var utils = require('../utils.js');
|
|
|
17
17
|
var XMLHttpRequestUploadP = require('../network/XMLHttpRequestUploadP.js');
|
|
18
18
|
var XMLHttpRequestEventTargetP = require('../network/XMLHttpRequestEventTargetP.js');
|
|
19
19
|
|
|
20
|
-
|
|
21
|
-
}
|
|
22
|
-
mp.request = request.getRequest();
|
|
20
|
+
const mp = { request: request.getRequest() };
|
|
23
21
|
function setRequest(request) { mp.request = request; }
|
|
24
22
|
class XMLHttpRequestImpl extends XMLHttpRequestEventTargetP.XMLHttpRequestEventTargetP {
|
|
25
23
|
static get UNSENT() { return 0; }
|
|
@@ -106,7 +104,7 @@ class XMLHttpRequestImpl extends XMLHttpRequestEventTargetP.XMLHttpRequestEventT
|
|
|
106
104
|
if (!async) {
|
|
107
105
|
console.warn("Synchronous XMLHttpRequest is not supported because of its detrimental effects to the end user's experience.");
|
|
108
106
|
}
|
|
109
|
-
let _method =
|
|
107
|
+
let _method = normalizeMethod.normalizeMethod(method);
|
|
110
108
|
let _url = "" + url;
|
|
111
109
|
let _username = "" + (username !== null && username !== void 0 ? username : "");
|
|
112
110
|
let _password = "" + (password !== null && password !== void 0 ? password : "");
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { HeadersP } from './HeadersP.js';
|
|
2
2
|
import { BodyImpl, Body_init } from './BodyImpl.js';
|
|
3
|
-
import { Method } from '../helpers/Method.js';
|
|
4
3
|
import { Payload } from '../helpers/Payload.js';
|
|
5
4
|
import { isEventTarget } from '../helpers/isEventTarget.js';
|
|
5
|
+
import { normalizeMethod } from '../helpers/normalizeMethod.js';
|
|
6
6
|
import { createAbortSignal } from '../event-system/AbortSignalP.js';
|
|
7
7
|
import { checkArgsLength, setState, SymbolP, isPolyfillType } from '../utils.js';
|
|
8
8
|
|
|
@@ -49,7 +49,7 @@ class RequestP extends BodyImpl {
|
|
|
49
49
|
state(this).headers = new HeadersP(_init.headers);
|
|
50
50
|
}
|
|
51
51
|
if (_init.method) {
|
|
52
|
-
s.method =
|
|
52
|
+
s.method = normalizeMethod(_init.method);
|
|
53
53
|
}
|
|
54
54
|
if (_init.mode) {
|
|
55
55
|
s.mode = _init.mode;
|
|
@@ -4,9 +4,7 @@ import { checkArgsLength, DOMExceptionP } from '../utils.js';
|
|
|
4
4
|
import { XMLHttpRequest as XMLHttpRequestE } from '../mini-program/XMLHttpRequestImpl.js';
|
|
5
5
|
import { isHeaders, normalizeName, normalizeValue, HeadersP } from './HeadersP.js';
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
}
|
|
9
|
-
mp.XMLHttpRequest = XMLHttpRequestE;
|
|
7
|
+
const mp = { XMLHttpRequest: XMLHttpRequestE };
|
|
10
8
|
function setXMLHttpRequest(XHR) { mp.XMLHttpRequest = XHR; }
|
|
11
9
|
function fetchP(input, init) {
|
|
12
10
|
checkArgsLength(arguments.length, 1, "Window", "fetch");
|
|
@@ -107,7 +107,6 @@ function calcSlicedSize(originalSize, start, end) {
|
|
|
107
107
|
}
|
|
108
108
|
return num;
|
|
109
109
|
};
|
|
110
|
-
console.log(normalizeNumer(start), normalizeNumer(end));
|
|
111
110
|
return Math.max(0, normalizeNumer(end) - normalizeNumer(start));
|
|
112
111
|
}
|
|
113
112
|
const BlobE = (typeof Blob !== "undefined" && Blob) || BlobP;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
// HTTP methods whose capitalization should be normalized
|
|
2
|
+
const methods = ["CONNECT", "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", "TRACE"];
|
|
3
|
+
/** @internal */
|
|
4
|
+
function normalizeMethod(method) {
|
|
5
|
+
let upcased = method.toUpperCase();
|
|
6
|
+
return methods.indexOf(upcased) > -1 ? upcased : method;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export { normalizeMethod };
|
|
@@ -12,9 +12,7 @@ import { isArrayBuffer } from '../helpers/isArrayBuffer.js';
|
|
|
12
12
|
import { checkArgsLength, setState, DOMExceptionP, SymbolP } from '../utils.js';
|
|
13
13
|
import { getConnectSocket } from './connectSocket.js';
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
mp.connectSocket = getConnectSocket();
|
|
15
|
+
const mp = { connectSocket: getConnectSocket() };
|
|
18
16
|
function setConnectSocket(connectSocket) { mp.connectSocket = connectSocket; }
|
|
19
17
|
class WebSocketImpl extends EventTargetP {
|
|
20
18
|
static get CONNECTING() { return 0; }
|
|
@@ -2,12 +2,12 @@ import { BlobP } from '../file-system/BlobP.js';
|
|
|
2
2
|
import { HeadersP } from '../fetch-api/HeadersP.js';
|
|
3
3
|
import { encode } from '../helpers/encode.js';
|
|
4
4
|
import { decode } from '../helpers/decode.js';
|
|
5
|
-
import { Method } from '../helpers/Method.js';
|
|
6
5
|
import { Payload } from '../helpers/Payload.js';
|
|
7
6
|
import { isArrayBuffer } from '../helpers/isArrayBuffer.js';
|
|
8
7
|
import { statusTextMap } from '../helpers/statusTextMap.js';
|
|
9
8
|
import { Uint8Array_toBase64 } from '../helpers/toBase64.js';
|
|
10
9
|
import { attachFn, executeFn } from '../helpers/handlers.js';
|
|
10
|
+
import { normalizeMethod } from '../helpers/normalizeMethod.js';
|
|
11
11
|
import { emitEvent } from '../helpers/emitEvent.js';
|
|
12
12
|
import { emitProgressEvent } from '../helpers/emitProgressEvent.js';
|
|
13
13
|
import { getRequest } from './request.js';
|
|
@@ -15,9 +15,7 @@ import { setState, DOMExceptionP, checkArgsLength, SymbolP } from '../utils.js';
|
|
|
15
15
|
import { createXMLHttpRequestUpload } from '../network/XMLHttpRequestUploadP.js';
|
|
16
16
|
import { XMLHttpRequestEventTargetP } from '../network/XMLHttpRequestEventTargetP.js';
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
}
|
|
20
|
-
mp.request = getRequest();
|
|
18
|
+
const mp = { request: getRequest() };
|
|
21
19
|
function setRequest(request) { mp.request = request; }
|
|
22
20
|
class XMLHttpRequestImpl extends XMLHttpRequestEventTargetP {
|
|
23
21
|
static get UNSENT() { return 0; }
|
|
@@ -104,7 +102,7 @@ class XMLHttpRequestImpl extends XMLHttpRequestEventTargetP {
|
|
|
104
102
|
if (!async) {
|
|
105
103
|
console.warn("Synchronous XMLHttpRequest is not supported because of its detrimental effects to the end user's experience.");
|
|
106
104
|
}
|
|
107
|
-
let _method =
|
|
105
|
+
let _method = normalizeMethod(method);
|
|
108
106
|
let _url = "" + url;
|
|
109
107
|
let _username = "" + (username !== null && username !== void 0 ? username : "");
|
|
110
108
|
let _password = "" + (password !== null && password !== void 0 ? password : "");
|
package/package.json
CHANGED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
/** @internal */
|
|
4
|
-
class Method {
|
|
5
|
-
static normalizeMethod(method) {
|
|
6
|
-
let upcased = method.toUpperCase();
|
|
7
|
-
return Method.methods.indexOf(upcased) > -1 ? upcased : method;
|
|
8
|
-
}
|
|
9
|
-
}
|
|
10
|
-
// HTTP methods whose capitalization should be normalized
|
|
11
|
-
Method.methods = ["CONNECT", "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", "TRACE"];
|
|
12
|
-
|
|
13
|
-
exports.Method = Method;
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
/** @internal */
|
|
2
|
-
class Method {
|
|
3
|
-
static normalizeMethod(method) {
|
|
4
|
-
let upcased = method.toUpperCase();
|
|
5
|
-
return Method.methods.indexOf(upcased) > -1 ? upcased : method;
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
|
-
// HTTP methods whose capitalization should be normalized
|
|
9
|
-
Method.methods = ["CONNECT", "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", "TRACE"];
|
|
10
|
-
|
|
11
|
-
export { Method };
|