diff --git a/ff-request.js b/ff-request.js index 3c67015..165865e 100644 --- a/ff-request.js +++ b/ff-request.js @@ -1,51 +1,51 @@ -var ue = Object.defineProperty; -var ie = (r) => { +var de = Object.defineProperty; +var oe = (r) => { throw TypeError(r); }; -var de = (r, e, t) => e in r ? ue(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t; -var g = (r, e, t) => de(r, typeof e != "symbol" ? e + "" : e, t), oe = (r, e, t) => e.has(r) || ie("Cannot " + t); -var i = (r, e, t) => (oe(r, e, "read from private field"), t ? t.call(r) : e.get(r)), w = (r, e, t) => e.has(r) ? ie("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(r) : e.set(r, t), C = (r, e, t, n) => (oe(r, e, "write to private field"), n ? n.call(r, t) : e.set(r, t), t); -function ge(r) { +var ge = (r, e, t) => e in r ? de(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t; +var g = (r, e, t) => ge(r, typeof e != "symbol" ? e + "" : e, t), ae = (r, e, t) => e.has(r) || oe("Cannot " + t); +var s = (r, e, t) => (ae(r, e, "read from private field"), t ? t.call(r) : e.get(r)), w = (r, e, t) => e.has(r) ? oe("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(r) : e.set(r, t), C = (r, e, t, n) => (ae(r, e, "write to private field"), n ? n.call(r, t) : e.set(r, t), t); +function pe(r) { return r && r.__esModule && Object.prototype.hasOwnProperty.call(r, "default") ? r.default : r; } var he = {}; (function(r) { (function(e) { e([], function() { - var t = -1, n = -2, s = -3, o = -4, h = -5, R = function(l, u) { - u = u || {}; - var f = u.verbose || !1; - f && console.log("Normalize the JSON Object"), l = typeof l == "string" ? this.JSON.parse(l) : l, f && console.log("Creating a empty dictionary"); + var t = -1, n = -2, i = -3, o = -4, l = -5, R = function(u, f) { + f = f || {}; + var h = f.verbose || !1; + h && console.log("Normalize the JSON Object"), u = typeof u == "string" ? this.JSON.parse(u) : u, h && console.log("Creating a empty dictionary"); var d = { strings: [], integers: [], floats: [] }; - f && console.log("Creating the AST"); - var p = function S(a) { - f && console.log("Calling recursiveAstBuilder with " + this.JSON.stringify(a)); + h && console.log("Creating the AST"); + var p = function P(a) { + h && console.log("Calling recursiveAstBuilder with " + this.JSON.stringify(a)); var y = typeof a; if (a === null) return { type: "null", - index: s + index: i }; if (typeof a > "u") return { type: "undefined", - index: h + index: l }; if (a instanceof Array) { - var x = ["@"]; + var S = ["@"]; for (var b in a) - a.hasOwnProperty(b) && x.push(S(a[b])); - return x; + a.hasOwnProperty(b) && S.push(P(a[b])); + return S; } if (y === "object") { - var x = ["$"]; - for (var $ in a) - a.hasOwnProperty($) && (x.push(S($)), x.push(S(a[$]))); - return x; + var S = ["$"]; + for (var m in a) + a.hasOwnProperty(m) && (S.push(P(m)), S.push(P(a[m]))); + return S; } if (a === "") return { @@ -79,72 +79,72 @@ var he = {}; index: a ? t : n }; throw new Error("Unexpected argument of type " + typeof a); - }(l), E = d.strings.length, B = d.integers.length; - d.floats.length, f && console.log("Parsing the dictionary"); + }(u), E = d.strings.length, j = d.integers.length; + d.floats.length, h && console.log("Parsing the dictionary"); var N = d.strings.join("|"); - return N += "^" + d.integers.join("|"), N += "^" + d.floats.join("|"), f && console.log("Parsing the structure"), N += "^" + function S(a) { - if (f && console.log("Calling a recursiveParser with " + this.JSON.stringify(a)), a instanceof Array) { + return N += "^" + d.integers.join("|"), N += "^" + d.floats.join("|"), h && console.log("Parsing the structure"), N += "^" + function P(a) { + if (h && console.log("Calling a recursiveParser with " + this.JSON.stringify(a)), a instanceof Array) { var y = a.shift(); - for (var x in a) - a.hasOwnProperty(x) && (y += S(a[x]) + "|"); + for (var S in a) + a.hasOwnProperty(S) && (y += P(a[S]) + "|"); return (y[y.length - 1] === "|" ? y.slice(0, -1) : y) + "]"; } - var b = a.type, $ = a.index; + var b = a.type, m = a.index; if (b === "strings") - return _($); + return _(m); if (b === "integers") - return _(E + $); + return _(E + m); if (b === "floats") - return _(E + B + $); + return _(E + j + m); if (b === "boolean") return a.index; if (b === "null") - return s; + return i; if (b === "undefined") - return h; + return l; if (b === "empty") return o; throw new TypeError("The item is alien!"); - }(p), f && console.log("Ending parser"), u.debug ? { + }(p), h && console.log("Ending parser"), f.debug ? { dictionary: d, ast: p, packed: N } : N; - }, c = function(l, u) { - u = u || {}; - var f = l.split("^"); - u.verbose && console.log("Building dictionary"); - var d = [], p = f[0]; + }, c = function(u, f) { + f = f || {}; + var h = u.split("^"); + f.verbose && console.log("Building dictionary"); + var d = [], p = h[0]; if (p !== "") { - p = p.split("|"), u.verbose && console.log("Parse the strings dictionary"); - for (var E = 0, B = p.length; E < B; E++) + p = p.split("|"), f.verbose && console.log("Parse the strings dictionary"); + for (var E = 0, j = p.length; E < j; E++) d.push(M(p[E])); } - if (p = f[1], p !== "") { - p = p.split("|"), u.verbose && console.log("Parse the integers dictionary"); - for (var E = 0, B = p.length; E < B; E++) + if (p = h[1], p !== "") { + p = p.split("|"), f.verbose && console.log("Parse the integers dictionary"); + for (var E = 0, j = p.length; E < j; E++) d.push(U(p[E])); } - if (p = f[2], p !== "") { - p = p.split("|"), u.verbose && console.log("Parse the floats dictionary"); - for (var E = 0, B = p.length; E < B; E++) + if (p = h[2], p !== "") { + p = p.split("|"), f.verbose && console.log("Parse the floats dictionary"); + for (var E = 0, j = p.length; E < j; E++) d.push(parseFloat(p[E])); } - p = null, u.verbose && console.log("Tokenizing the structure"); - for (var N = "", S = [], a = f[3].length, E = 0; E < a; E++) { - var y = f[3].charAt(E); - y === "|" || y === "$" || y === "@" || y === "]" ? (N && (S.push(U(N)), N = ""), y !== "|" && S.push(y)) : N += y; + p = null, f.verbose && console.log("Tokenizing the structure"); + for (var N = "", P = [], a = h[3].length, E = 0; E < a; E++) { + var y = h[3].charAt(E); + y === "|" || y === "$" || y === "@" || y === "]" ? (N && (P.push(U(N)), N = ""), y !== "|" && P.push(y)) : N += y; } - var x = S.length, b = 0; - return u.verbose && console.log("Starting recursive parser"), function $() { - var O = S[b++]; - if (u.verbose && console.log("Reading collection type " + (O === "$" ? "object" : "Array")), O === "@") { - for (var v = []; b < x; b++) { - var A = S[b]; - if (u.verbose && console.log("Read " + A + " symbol"), A === "]") + var S = P.length, b = 0; + return f.verbose && console.log("Starting recursive parser"), function m() { + var O = P[b++]; + if (f.verbose && console.log("Reading collection type " + (O === "$" ? "object" : "Array")), O === "@") { + for (var v = []; b < S; b++) { + var A = P[b]; + if (f.verbose && console.log("Read " + A + " symbol"), A === "]") return v; if (A === "@" || A === "$") - v.push($()); + v.push(m()); else switch (A) { case t: @@ -153,10 +153,10 @@ var he = {}; case n: v.push(!1); break; - case s: + case i: v.push(null); break; - case h: + case l: v.push(void 0); break; case o: @@ -166,70 +166,70 @@ var he = {}; v.push(d[A]); } } - return u.verbose && console.log("Parsed " + this.JSON.stringify(v)), v; + return f.verbose && console.log("Parsed " + this.JSON.stringify(v)), v; } if (O === "$") { - for (var v = {}; b < x; b++) { - var P = S[b]; - if (P === "]") + for (var v = {}; b < S; b++) { + var x = P[b]; + if (x === "]") return v; - P === o ? P = "" : P = d[P]; - var A = S[++b]; + x === o ? x = "" : x = d[x]; + var A = P[++b]; if (A === "@" || A === "$") - v[P] = $(); + v[x] = m(); else switch (A) { case t: - v[P] = !0; + v[x] = !0; break; case n: - v[P] = !1; + v[x] = !1; break; - case s: - v[P] = null; + case i: + v[x] = null; break; - case h: - v[P] = void 0; + case l: + v[x] = void 0; break; case o: - v[P] = ""; + v[x] = ""; break; default: - v[P] = d[A]; + v[x] = d[A]; } } - return u.verbose && console.log("Parsed " + this.JSON.stringify(v)), v; + return f.verbose && console.log("Parsed " + this.JSON.stringify(v)), v; } throw new TypeError("Bad token " + O + " isn't a type"); }(); - }, T = function(l) { - return typeof l != "string" ? l : l.replace(/[\+ \|\^\%]/g, function(u) { + }, T = function(u) { + return typeof u != "string" ? u : u.replace(/[\+ \|\^\%]/g, function(f) { return { " ": "+", "+": "%2B", "|": "%7C", "^": "%5E", "%": "%25" - }[u]; + }[f]; }); - }, M = function(l) { - return typeof l != "string" ? l : l.replace(/\+|%2B|%7C|%5E|%25/g, function(u) { + }, M = function(u) { + return typeof u != "string" ? u : u.replace(/\+|%2B|%7C|%5E|%25/g, function(f) { return { "+": " ", "%2B": "+", "%7C": "|", "%5E": "^", "%25": "%" - }[u]; + }[f]; }); - }, _ = function(l) { - return Number.prototype.toString.call(l, 36).toUpperCase(); - }, U = function(l) { - return parseInt(l, 36); - }, H = Array.prototype.indexOf || function(l, u) { - for (var f = u || 0, d = this.length; f < d; f++) - if (this[f] === l) - return f; + }, _ = function(u) { + return Number.prototype.toString.call(u, 36).toUpperCase(); + }, U = function(u) { + return parseInt(u, 36); + }, H = Array.prototype.indexOf || function(u, f) { + for (var h = f || 0, d = this.length; h < d; h++) + if (this[h] === u) + return h; return -1; }; return { @@ -240,13 +240,13 @@ var he = {}; }); })(function(e, t) { var n = t(); - for (var s in n) - r[s] = n[s]; + for (var i in n) + r[i] = n[i]; }); })(he); -const ae = /* @__PURE__ */ ge(he); -var K, L, j, F, Q, W, q, X, Z; -class ne { +const ce = /* @__PURE__ */ pe(he); +var B, L, G, I, Q, W, q, X, Z, ee; +class se { /** * @param {number} code * @param {string} message @@ -254,7 +254,7 @@ class ne { * @param {string} url * @param {string} res */ - constructor(e, t, n, s, o) { + constructor(e, t, n, i, o) { /** @type {number} */ g(this, "code", 0); /** @type {string} */ @@ -266,77 +266,82 @@ class ne { /** @type {string} */ g(this, "res", ""); /** @type {HttpResponse} */ - w(this, K); + w(this, B); // 判断返回 Response 对象, 还是 Response 中的 data /** @type {boolean} */ w(this, L, !0); // 判断是否已经给出错误提示 /** @type {boolean} */ - w(this, j, !0); - w(this, F, { + w(this, G, !0); + w(this, I, { /** @param {any} __ @param {string} key */ - get: (e, t) => i(this, Q).call(this, t), + get: (e, t) => s(this, Q).call(this, t), /** @returns {string[]} */ - ownKeys: () => Object.keys(i(this, F).getPrototypeOf() || {}), + ownKeys: () => Object.keys(s(this, I).getPrototypeOf() || {}), /** @returns {HttpResponse | unknown} */ - getPrototypeOf: () => i(this, L) ? this : this.data, + getPrototypeOf: () => s(this, L) ? this : this.data, /** @returns {PropertyDescriptor} */ getOwnPropertyDescriptor: () => ({ configurable: !0, enumerable: !0, writable: !0, - value: i(this, F).getPrototypeOf() + value: s(this, I).getPrototypeOf() }) }); /** * @param {string} key * @returns {unknown} */ - w(this, Q, (e) => e === "$echoMsg" ? i(this, q) : e === "msg" ? i(this, W) : e === "then" || e === "resp" ? (C(this, j, !0), C(this, L, e === "resp"), i(this, X)) : e === "catch" ? i(this, Z) : e === "IS_ECHO_MSG" ? i(this, j) : Reflect.get(this, e)); + w(this, Q, (e) => e === "$echoMsg" ? s(this, q) : e === "msg" ? s(this, W) : e === "then" || e === "resp" ? (C(this, G, !0), C(this, L, e === "resp"), s(this, X)) : e === "catch" ? s(this, Z) : e === "finally" ? s(this, ee) : e === "IS_ECHO_MSG" ? s(this, G) : Reflect.get(this, e)); /** * @param {(value: unknown) => unknown} [fn] * @param {boolean} [isResp] * @returns {Promise} */ - w(this, W, (e = (n) => n, t = !1) => (i(this, q).call(this), C(this, L, t), Promise.resolve(e == null ? void 0 : e(i(this, F).getPrototypeOf())))); + w(this, W, (e = (n) => n, t = !1) => (s(this, q).call(this), C(this, L, t), Promise.resolve(e == null ? void 0 : e(s(this, I).getPrototypeOf())))); w(this, q, () => { - i(this, j) && (C(this, j, !1), se.onMsg(this.code, this.message)); + s(this, G) && (C(this, G, !1), ie.onMsg(this.code, this.message)); }); /** * @param {(value: unknown) => unknown} [fn] * @returns {Promise} */ - w(this, X, (e) => [0, 1].includes(this.code) ? Promise.resolve(e == null ? void 0 : e(i(this, F).getPrototypeOf())) : Promise.reject(i(this, K))); + w(this, X, (e) => [0, 1].includes(this.code) ? Promise.resolve(e == null ? void 0 : e(s(this, I).getPrototypeOf())) : Promise.reject(s(this, B))); /** * @param {(reason: HttpResponse) => unknown} fn * @returns {Promise} */ - w(this, Z, (e) => Promise.resolve(e(i(this, K)))); - return this.code = e, this.message = t, this.data = n, this.url = s, this.res = o, C(this, K, new Proxy(this, i(this, F))); + w(this, Z, (e) => Promise.resolve(e(s(this, B)))); + /** + * @param {(() => void) | undefined} [fn] + * @returns {Promise} + */ + w(this, ee, (e) => (e == null || e(), [0, 1].includes(this.code) ? Promise.resolve(s(this, I).getPrototypeOf()) : Promise.reject(s(this, B)))); + return this.code = e, this.message = t, this.data = n, this.url = i, this.res = o, C(this, B, new Proxy(this, s(this, I))); } } -K = new WeakMap(), L = new WeakMap(), j = new WeakMap(), F = new WeakMap(), Q = new WeakMap(), W = new WeakMap(), q = new WeakMap(), X = new WeakMap(), Z = new WeakMap(); -const re = (r, e, t, n = "/", s = "") => new ne(r, e, t, n, s); -var fe = [ +B = new WeakMap(), L = new WeakMap(), G = new WeakMap(), I = new WeakMap(), Q = new WeakMap(), W = new WeakMap(), q = new WeakMap(), X = new WeakMap(), Z = new WeakMap(), ee = new WeakMap(); +const ne = (r, e, t, n = "/", i = "") => new se(r, e, t, n, i); +var ue = [ "utf8", "utf-8", "unicode-1-1-utf-8" ]; -function pe(r) { - if (fe.indexOf(r) < 0 && typeof r < "u" && r != null) +function ve(r) { + if (ue.indexOf(r) < 0 && typeof r < "u" && r != null) throw new RangeError("Invalid encoding type. Only utf-8 is supported"); this.encoding = "utf-8", this.encode = function(e) { if (typeof e != "string") throw new TypeError("passed argument must be of tye string"); var t = unescape(encodeURIComponent(e)), n = new Uint8Array(t.length); - const s = t.split(""); - for (let o = 0; o < s.length; o++) - n[o] = s[o].charCodeAt(0); + const i = t.split(""); + for (let o = 0; o < i.length; o++) + n[o] = i[o].charCodeAt(0); return n; }; } -function ve(r) { - if (fe.indexOf(r) < 0 && typeof r < "u" && r != null) +function we(r) { + if (ue.indexOf(r) < 0 && typeof r < "u" && r != null) throw new RangeError("Invalid encoding type. Only utf-8 is supported"); this.encoding = "utf-8", this.decode = function(e, t) { if (typeof e > "u") @@ -345,35 +350,35 @@ function ve(r) { if (typeof n != "boolean") throw new TypeError("stream option must be boolean"); if (ArrayBuffer.isView(e)) { - var s = new Uint8Array(e.buffer, e.byteOffset, e.byteLength), o = new Array(s.length); - for (let h = 0; h < s.length; h++) - o[h] = String.fromCharCode(s[h]); + var i = new Uint8Array(e.buffer, e.byteOffset, e.byteLength), o = new Array(i.length); + for (let l = 0; l < i.length; l++) + o[l] = String.fromCharCode(i[l]); return decodeURIComponent(escape(o.join(""))); } else throw new TypeError("passed argument must be an array buffer view"); }; } -var le = { - TextEncoder: pe, - TextDecoder: ve +var fe = { + TextEncoder: ve, + TextDecoder: we }; -const we = new le.TextEncoder("utf8"), ye = new le.TextDecoder("utf8"); -function be(r) { +const ye = new fe.TextEncoder("utf8"), be = new fe.TextDecoder("utf8"); +function Ee(r) { let e = 5381; for (let t = 0; t < r.length; t++) e = e * 33 ^ r.charCodeAt(t); return (e >>> 0).toString(16); } -function Ee(r, e) { +function Oe(r, e) { return r.replace(new RegExp(`^${e}+|${e}+$`, "g"), ""); } -function Oe(r) { - return we.encode(r || ""); +function Te(r) { + return ye.encode(r || ""); } -function Ce(r) { - return ye.decode(new DataView(r), {}); +function Me(r) { + return be.decode(new DataView(r), {}); } -const Te = 62, Y = 30, ce = 31, Se = 63; +const Pe = 62, Y = 30, le = 31, Se = 63; class xe { /** * @param {string} alphabet 62 位编码字母表 @@ -383,7 +388,7 @@ class xe { g(this, "encodeTable", []); /** @type {Uint8Array} */ g(this, "decodeMap", new Uint8Array(256).fill(255)); - if (e.length !== Te) + if (e.length !== Pe) throw new Error("Encoding alphabet must be 62 characters long"); if (e.includes(` `) || e.includes("\r")) @@ -399,7 +404,7 @@ class xe { */ encode(e) { if (!e || e.length === 0) return ""; - const t = new Pe(this).encodeV2(e); + const t = new _e(this).encodeV2(e); return String.fromCharCode(...t); } /** @@ -409,12 +414,12 @@ class xe { */ decode(e) { if (!e || e.length === 0) return ""; - const t = new _e(this).decode(e); + const t = new Ae(this).decode(e); return new TextDecoder().decode(t); } } var z; -class Pe { +class _e { /** * @param {Base62} b62 */ @@ -439,25 +444,25 @@ class Pe { * @returns {number[]} */ encodeV2(e) { - this.src = Oe(e), this.pos = this.src.length * 8; + this.src = Te(e), this.pos = this.src.length * 8; const t = []; for (; this.pos > 0; ) { - let n = 6, s = this.get6bits(); - (s & Y) === Y && ((this.pos > 6 || s > ce) && (n = 5), s &= ce), t.push(i(this, z).encodeTable[s].charCodeAt(0)), this.pos -= n; + let n = 6, i = this.get6bits(); + (i & Y) === Y && ((this.pos > 6 || i > le) && (n = 5), i &= le), t.push(s(this, z).encodeTable[i].charCodeAt(0)), this.pos -= n; } return t; } } z = new WeakMap(); -var k; -class _e { +var V; +class Ae { /** * @param {Base62} b62 */ constructor(e) { /** @type {Base62} */ - w(this, k); - C(this, k, e); + w(this, V); + C(this, V, e); } /** * @param {string} src @@ -465,26 +470,25 @@ class _e { */ decode(e) { const t = new Uint8Array(Math.ceil(e.length * 6 / 8) + 1); - let n = t.length, s = 0, o = 0; - for (let h = 0; h < e.length; h++) { - const R = e[h].charCodeAt(0), c = i(this, k).decodeMap[R]; + let n = t.length, i = 0, o = 0; + for (let l = 0; l < e.length; l++) { + const R = e[l].charCodeAt(0), c = s(this, V).decodeMap[R]; if (c === 255) - throw new Error(`CorruptInputError at index ${h}`); - h === e.length - 1 ? (o |= c << s, s += Math.ceil(Math.log2(c + 1))) : (c & Y) === Y ? (o |= c << s, s += 5) : (o |= c << s, s += 6), s >= 8 && (n--, t[n] = o & 255, s %= 8, o >>= 8); + throw new Error(`CorruptInputError at index ${l}`); + l === e.length - 1 ? (o |= c << i, i += Math.ceil(Math.log2(c + 1))) : (c & Y) === Y ? (o |= c << i, i += 5) : (o |= c << i, i += 6), i >= 8 && (n--, t[n] = o & 255, i %= 8, o >>= 8); } - return s > 0 && (n--, t[n] = o & 255), t.slice(n); + return i > 0 && (n--, t[n] = o & 255), t.slice(n); } } -k = new WeakMap(); -Promise.withResolvers || (Promise.withResolvers = /** @type {typeof Promise.withResolvers} */ -function() { +V = new WeakMap(); +Promise.withResolvers || (Promise.withResolvers = function() { let r, e; - return { promise: new Promise((n, s) => { - r = n, e = s; + return { promise: new Promise((n, i) => { + r = n, e = i; }), resolve: r, reject: e }; }); -var G, D, ee, m, I, J, te, V; -class se { +var J, D, te, $, F, K, re, k; +class ie { /** * @param {string} [appKey] * @param {string} [appSecret] @@ -492,21 +496,21 @@ class se { */ constructor(e, t, n) { /** @type {RequestFn | undefined} */ - w(this, G); + w(this, J); /** @type {Base62 | undefined} */ w(this, D); /** @type {string | undefined} */ - w(this, ee); - w(this, m, { + w(this, te); + w(this, $, { /** @type {Map} */ "#": /* @__PURE__ */ new Map(), /** @type {Map} */ $: /* @__PURE__ */ new Map() }); /** @type {Map>} */ - w(this, I, /* @__PURE__ */ new Map()); + w(this, F, /* @__PURE__ */ new Map()); /** @type {Set<[string, '#' | '$', RequestOptions & { method: string }, boolean]>} */ - w(this, J, /* @__PURE__ */ new Set()); + w(this, K, /* @__PURE__ */ new Set()); /** * 初始化请求实例 * @param {string} [appKey] @@ -514,10 +518,10 @@ class se { * @param {RequestFn} [reqFn] */ g(this, "init", (e, t, n) => { - e && C(this, ee, e), n && C(this, G, n), t && C(this, D, new xe(t)), i(this, te).call(this); + e && C(this, te, e), n && C(this, J, n), t && C(this, D, new xe(t)), s(this, re).call(this); }); - w(this, te, () => { - !i(this, J).size || !i(this, G) || (i(this, J).forEach((e) => i(this, V).call(this, ...e)), i(this, J).clear()); + w(this, re, () => { + !s(this, K).size || !s(this, J) || (s(this, K).forEach((e) => s(this, k).call(this, ...e)), s(this, K).clear()); }); /** * @param {string} hash @@ -525,34 +529,34 @@ class se { * @param {RequestOptions & { method: string }} params * @param {boolean} [isCacheRequest] */ - w(this, V, (e, t, n, s = !1) => { - if (!i(this, G)) - i(this, J).add([e, t, n, s]); + w(this, k, (e, t, n, i = !1) => { + if (!s(this, J)) + s(this, K).add([e, t, n, i]); else { - const { url: o, method: h, ...R } = n || {}; - i(this, G).call(this, { url: o, method: h, ...R }).then((c) => { + const { url: o, method: l, ...R } = n || {}; + s(this, J).call(this, { url: o, method: l, ...R }).then((c) => { if (![0, 1].includes(c.code)) - throw re(c.code, c.msg, c.data, o, c == null ? void 0 : c.res); + throw ne(c.code, c.msg, c.data, o, c == null ? void 0 : c.res); return [c.code, c.msg, c.data, o, (c == null ? void 0 : c.res) ?? ""]; }).then((c) => { const T = ( /** @type {CacheEntry} */ c ); - return (t == "#" || h == "GET") && i(this, m)[t].set(e, T), t != "#" && h == "GET" && !s && setTimeout(() => { - i(this, m)[t].delete(e); + return (t == "#" || l == "GET") && s(this, $)[t].set(e, T), t != "#" && l == "GET" && !i && setTimeout(() => { + s(this, $)[t].delete(e); }, 300), T; }).then((c) => { var T; - return (T = i(this, I).get(e)) == null ? void 0 : T.forEach((M, _, U) => { + return (T = s(this, F).get(e)) == null ? void 0 : T.forEach((M, _, U) => { M && M[0](c), delete U[_]; }); }).catch((c) => { var T; - i(this, m)[t].delete(e), (T = i(this, I).get(e)) == null || T.forEach((M, _, U) => { - M && M[1](c instanceof ne ? c : re(-1, c, null, o)), delete U[_]; + s(this, $)[t].delete(e), (T = s(this, F).get(e)) == null || T.forEach((M, _, U) => { + M && M[1](c instanceof se ? c : ne(-1, c, null, o)), delete U[_]; }); - }).finally(() => i(this, I).delete(e)); + }).finally(() => s(this, F).delete(e)); } }); /** @@ -561,31 +565,32 @@ class se { * @param {boolean} [isCacheRequest] * @returns {any} 返回 Proxy 包裹的 Promise，支持链式调用 .then / .catch / .msg / .resp */ - g(this, "request", ({ url: e = "/", method: t = "GET", ...n }, s = !1) => { + g(this, "request", ({ url: e = "/", method: t = "GET", ...n }, i = !1) => { var _, U; - e = Ee(e, "/"); + e = Oe(e, "/"); const o = ( /** @type {HttpMethod} */ t.toUpperCase() - ), h = be(JSON.stringify([e, o, n])), R = ( + ), l = Ee(JSON.stringify([e, o, n])), R = ( /** @type {'#' | '$'} */ (_ = e == null ? void 0 : e.includes) != null && _.call(e, "/_/") ? "#" : "$" ), { promise: c, resolve: T, reject: M } = Promise.withResolvers(); - return i(this, m)[R].has(h) ? (console.log("cache", e), T(i(this, m)[R].get(h))) : i(this, I).has(h) ? (U = i(this, I).get(h)) == null || U.push([T, M]) : (i(this, I).set(h, [[T, M]]), i(this, V).call(this, h, R, { url: e, method: o, ...n }, s)), new Proxy(c, { - get: (H, l) => (...u) => H.then((f) => ( + return s(this, $)[R].has(l) ? (console.log("cache", e), T(s(this, $)[R].get(l))) : s(this, F).has(l) ? (U = s(this, F).get(l)) == null || U.push([T, M]) : (s(this, F).set(l, [[T, M]]), s(this, k).call(this, l, R, { url: e, method: o, ...n }, i)), new Proxy(c, { + get: (H, u) => (...f) => H.then((h) => ( /** @type {any} */ - re(.../** @type {[number, string, unknown, string, string]} */ - /** @type {unknown} */ - f)[l](...u) - )).catch((f) => { - if (!(f instanceof ne)) throw f; + ne( + .../** @type {[number, string, unknown, string, string]} */ + h + )[u](...f) + )).catch((h) => { + if (!(h instanceof se)) throw h; return typeof /** @type {any} */ - f[l] == "function" ? ( + h[u] == "function" ? ( /** @type {any} */ - f[l](...u) + h[u](...f) ) : ( /** @type {any} */ - f[l] + h[u] ); }) }); @@ -633,9 +638,12 @@ class se { /** * 通过 Base62 编码参数请求列表接口 * @param {string} code - * @param {Record} [base62param] + * @param {Base62Param} [base62param] */ - g(this, "list", (e, t = {}) => this.get(`/api/${e}/${this.encode(t)}`)); + g(this, "list", (e, t = {}) => this.get(`/api/${e}/${this.encode( + /** @type {Record} */ + t + )}`)); g(this, "getAppInfo", () => { }); /** @@ -643,7 +651,7 @@ class se { * @param {boolean} [isSystem] 是否同时清除系统缓存（`/_/` 路由） */ g(this, "refreshCache", (e = !1) => { - e && i(this, m)["#"].clear(), i(this, m).$.clear(); + e && s(this, $)["#"].clear(), s(this, $).$.clear(); }); /** * 解码 Base62 字符串为 JSON 对象 @@ -655,38 +663,38 @@ class se { if (e === void 0 || e === "" || e === null) return t; try { - if (!i(this, D)) throw new Error("未初始化 appSecret，请先通过 init 设置 appSecret"); - const n = i(this, D).decode(e); - return ae.unpack(n); + if (!s(this, D)) throw new Error("未初始化 appSecret，请先通过 init 设置 appSecret"); + const n = s(this, D).decode(e); + return ce.unpack(n); } catch { return console.warn("core.decode", e), t; } }); /** * 将 JSON 对象编码为 Base62 字符串 - * @param {Record} [json] + * @param {Record | unknown[]} [json] * @returns {string} */ g(this, "encode", (e = {}) => { - if (!i(this, D)) throw new Error("未初始化 appSecret，请先通过 init 设置 appSecret"); - const t = JSON.stringify(e, (n, s) => s === void 0 ? null : s); - return i(this, D).encode(ae.pack(t)); + if (!s(this, D)) throw new Error("未初始化 appSecret，请先通过 init 设置 appSecret"); + const t = JSON.stringify(e, (n, i) => i === void 0 ? null : i); + return s(this, D).encode(ce.pack(t)); }); this.init(e, t, n); } } -G = new WeakMap(), D = new WeakMap(), ee = new WeakMap(), m = new WeakMap(), I = new WeakMap(), J = new WeakMap(), te = new WeakMap(), V = new WeakMap(); -se.onUnhandledRejection = (r) => { - var e, t, n, s, o, h; - r != null && r.IS_ECHO_MSG ? ((e = r == null ? void 0 : r.$echoMsg) == null || e.call(r), (t = r == null ? void 0 : r.preventDefault) == null || t.call(r)) : (n = r.reason) != null && n.IS_ECHO_MSG && ((o = (s = r.reason) == null ? void 0 : s.$echoMsg) == null || o.call(s), (h = r == null ? void 0 : r.preventDefault) == null || h.call(r)); +J = new WeakMap(), D = new WeakMap(), te = new WeakMap(), $ = new WeakMap(), F = new WeakMap(), K = new WeakMap(), re = new WeakMap(), k = new WeakMap(); +ie.onUnhandledRejection = (r) => { + var e, t, n, i, o, l; + r != null && r.IS_ECHO_MSG ? ((e = r == null ? void 0 : r.$echoMsg) == null || e.call(r), (t = r == null ? void 0 : r.preventDefault) == null || t.call(r)) : (n = r.reason) != null && n.IS_ECHO_MSG && ((o = (i = r.reason) == null ? void 0 : i.$echoMsg) == null || o.call(i), (l = r == null ? void 0 : r.preventDefault) == null || l.call(r)); }; -se.onMsg = (r, e) => [0, 1].includes(r) ? console.log(e) : console.warn(e); +ie.onMsg = (r, e) => [0, 1].includes(r) ? console.log(e) : console.warn(e); export { - ne as HttpResponse, - re as NewHttpResponse, - se as default, - be as signature, - Oe as str2uint8array, - Ee as trim, - Ce as uint8array2str + se as HttpResponse, + ne as NewHttpResponse, + ie as default, + Ee as signature, + Te as str2uint8array, + Oe as trim, + Me as uint8array2str }; diff --git a/ff-request.umd.cjs b/ff-request.umd.cjs index 544f8f7..af51181 100644 --- a/ff-request.umd.cjs +++ b/ff-request.umd.cjs @@ -1,2 +1,2 @@ -(function(o,h){typeof exports=="object"&&typeof module<"u"?h(exports):typeof define=="function"&&define.amd?define(["exports"],h):(o=typeof globalThis<"u"?globalThis:o||self,h(o["ff-request"]={}))})(this,function(o){"use strict";var Ae=Object.defineProperty;var pe=o=>{throw TypeError(o)};var Ce=(o,h,O)=>h in o?Ae(o,h,{enumerable:!0,configurable:!0,writable:!0,value:O}):o[h]=O;var v=(o,h,O)=>Ce(o,typeof h!="symbol"?h+"":h,O),ve=(o,h,O)=>h.has(o)||pe("Cannot "+O);var i=(o,h,O)=>(ve(o,h,"read from private field"),O?O.call(o):h.get(o)),b=(o,h,O)=>h.has(o)?pe("Cannot add the same private member more than once"):h instanceof WeakSet?h.add(o):h.set(o,O),m=(o,h,O,k)=>(ve(o,h,"write to private field"),k?k.call(o,O):h.set(o,O),O);var q,z,J,B,ne,se,V,ie,oe,Y,Q,H,G,ae,R,F,K,ce,W;function h(r){return r&&r.__esModule&&Object.prototype.hasOwnProperty.call(r,"default")?r.default:r}var O={};(function(r){(function(e){e([],function(){var t=-1,n=-2,s=-3,a=-4,f=-5,j=function(d,g){g=g||{};var l=g.verbose||!1;l&&console.log("Normalize the JSON Object"),d=typeof d=="string"?this.JSON.parse(d):d,l&&console.log("Creating a empty dictionary");var p={strings:[],integers:[],floats:[]};l&&console.log("Creating the AST");var w=function _(c){l&&console.log("Calling recursiveAstBuilder with "+this.JSON.stringify(c));var E=typeof c;if(c===null)return{type:"null",index:s};if(typeof c>"u")return{type:"undefined",index:f};if(c instanceof Array){var A=["@"];for(var T in c)c.hasOwnProperty(T)&&A.push(_(c[T]));return A}if(E==="object"){var A=["$"];for(var I in c)c.hasOwnProperty(I)&&(A.push(_(I)),A.push(_(c[I])));return A}if(c==="")return{type:"empty",index:a};if(E==="string"){var P=X.call(p.strings,c);return P==-1&&(p.strings.push(x(c)),P=p.strings.length-1),{type:"strings",index:P}}if(E==="number"&&c%1===0){var P=X.call(p.integers,c);return P==-1&&(p.integers.push(M(c)),P=p.integers.length-1),{type:"integers",index:P}}if(E==="number"){var P=X.call(p.floats,c);return P==-1&&(p.floats.push(c),P=p.floats.length-1),{type:"floats",index:P}}if(E==="boolean")return{type:"boolean",index:c?t:n};throw new Error("Unexpected argument of type "+typeof c)}(d),S=p.strings.length,L=p.integers.length;p.floats.length,l&&console.log("Parsing the dictionary");var U=p.strings.join("|");return U+="^"+p.integers.join("|"),U+="^"+p.floats.join("|"),l&&console.log("Parsing the structure"),U+="^"+function _(c){if(l&&console.log("Calling a recursiveParser with "+this.JSON.stringify(c)),c instanceof Array){var E=c.shift();for(var A in c)c.hasOwnProperty(A)&&(E+=_(c[A])+"|");return(E[E.length-1]==="|"?E.slice(0,-1):E)+"]"}var T=c.type,I=c.index;if(T==="strings")return M(I);if(T==="integers")return M(S+I);if(T==="floats")return M(S+L+I);if(T==="boolean")return c.index;if(T==="null")return s;if(T==="undefined")return f;if(T==="empty")return a;throw new TypeError("The item is alien!")}(w),l&&console.log("Ending parser"),g.debug?{dictionary:p,ast:w,packed:U}:U},u=function(d,g){g=g||{};var l=d.split("^");g.verbose&&console.log("Building dictionary");var p=[],w=l[0];if(w!==""){w=w.split("|"),g.verbose&&console.log("Parse the strings dictionary");for(var S=0,L=w.length;Si(this,ne).call(this,t),ownKeys:()=>Object.keys(i(this,B).getPrototypeOf()||{}),getPrototypeOf:()=>i(this,z)?this:this.data,getOwnPropertyDescriptor:()=>({configurable:!0,enumerable:!0,writable:!0,value:i(this,B).getPrototypeOf()})});b(this,ne,e=>e==="$echoMsg"?i(this,V):e==="msg"?i(this,se):e==="then"||e==="resp"?(m(this,J,!0),m(this,z,e==="resp"),i(this,ie)):e==="catch"?i(this,oe):e==="IS_ECHO_MSG"?i(this,J):Reflect.get(this,e));b(this,se,(e=n=>n,t=!1)=>(i(this,V).call(this),m(this,z,t),Promise.resolve(e==null?void 0:e(i(this,B).getPrototypeOf()))));b(this,V,()=>{i(this,J)&&(m(this,J,!1),re.onMsg(this.code,this.message))});b(this,ie,e=>[0,1].includes(this.code)?Promise.resolve(e==null?void 0:e(i(this,B).getPrototypeOf())):Promise.reject(i(this,q)));b(this,oe,e=>Promise.resolve(e(i(this,q))));return this.code=e,this.message=t,this.data=n,this.url=s,this.res=a,m(this,q,new Proxy(this,i(this,B)))}}q=new WeakMap,z=new WeakMap,J=new WeakMap,B=new WeakMap,ne=new WeakMap,se=new WeakMap,V=new WeakMap,ie=new WeakMap,oe=new WeakMap;const ee=(r,e,t,n="/",s="")=>new Z(r,e,t,n,s);var ue=["utf8","utf-8","unicode-1-1-utf-8"];function we(r){if(ue.indexOf(r)<0&&typeof r<"u"&&r!=null)throw new RangeError("Invalid encoding type. Only utf-8 is supported");this.encoding="utf-8",this.encode=function(e){if(typeof e!="string")throw new TypeError("passed argument must be of tye string");var t=unescape(encodeURIComponent(e)),n=new Uint8Array(t.length);const s=t.split("");for(let a=0;a"u")return"";var n=typeof t<"u"&&n in t?t.stream:!1;if(typeof n!="boolean")throw new TypeError("stream option must be boolean");if(ArrayBuffer.isView(e)){var s=new Uint8Array(e.buffer,e.byteOffset,e.byteLength),a=new Array(s.length);for(let f=0;f>>0).toString(16)}function he(r,e){return r.replace(new RegExp(`^${e}+|${e}+$`,"g"),"")}function de(r){return be.encode(r||"")}function Te(r){return Ee.decode(new DataView(r),{})}const Oe=62,te=30,ge=31,Se=63;class Pe{constructor(e){v(this,"encodeTable",[]);v(this,"decodeMap",new Uint8Array(256).fill(255));if(e.length!==Oe)throw new Error("Encoding alphabet must be 62 characters long");if(e.includes(` -`)||e.includes("\r"))throw new Error("Encoding alphabet contains newline character");this.encodeTable=e.split(""),this.decodeMap=new Uint8Array(256).fill(255);for(let t=0;t>3;e===0&&(t-=1,e=8);let n=this.src[t]>>8-e;return e<6&&t>0&&(n|=this.src[t-1]<0;){let n=6,s=this.get6bits();(s&te)===te&&((this.pos>6||s>ge)&&(n=5),s&=ge),t.push(i(this,Y).encodeTable[s].charCodeAt(0)),this.pos-=n}return t}}Y=new WeakMap;class _e{constructor(e){b(this,Q);m(this,Q,e)}decode(e){const t=new Uint8Array(Math.ceil(e.length*6/8)+1);let n=t.length,s=0,a=0;for(let f=0;f=8&&(n--,t[n]=a&255,s%=8,a>>=8)}return s>0&&(n--,t[n]=a&255),t.slice(n)}}Q=new WeakMap,Promise.withResolvers||(Promise.withResolvers=function(){let r,e;return{promise:new Promise((n,s)=>{r=n,e=s}),resolve:r,reject:e}});class re{constructor(e,t,n){b(this,H);b(this,G);b(this,ae);b(this,R,{"#":new Map,$:new Map});b(this,F,new Map);b(this,K,new Set);v(this,"init",(e,t,n)=>{e&&m(this,ae,e),n&&m(this,H,n),t&&m(this,G,new Pe(t)),i(this,ce).call(this)});b(this,ce,()=>{!i(this,K).size||!i(this,H)||(i(this,K).forEach(e=>i(this,W).call(this,...e)),i(this,K).clear())});b(this,W,(e,t,n,s=!1)=>{if(!i(this,H))i(this,K).add([e,t,n,s]);else{const{url:a,method:f,...j}=n||{};i(this,H).call(this,{url:a,method:f,...j}).then(u=>{if(![0,1].includes(u.code))throw ee(u.code,u.msg,u.data,a,u==null?void 0:u.res);return[u.code,u.msg,u.data,a,(u==null?void 0:u.res)??""]}).then(u=>{const x=u;return(t=="#"||f=="GET")&&i(this,R)[t].set(e,x),t!="#"&&f=="GET"&&!s&&setTimeout(()=>{i(this,R)[t].delete(e)},300),x}).then(u=>{var x;return(x=i(this,F).get(e))==null?void 0:x.forEach(($,M,D)=>{$&&$[0](u),delete D[M]})}).catch(u=>{var x;i(this,R)[t].delete(e),(x=i(this,F).get(e))==null||x.forEach(($,M,D)=>{$&&$[1](u instanceof Z?u:ee(-1,u,null,a)),delete D[M]})}).finally(()=>i(this,F).delete(e))}});v(this,"request",({url:e="/",method:t="GET",...n},s=!1)=>{var M,D;e=he(e,"/");const a=t.toUpperCase(),f=le(JSON.stringify([e,a,n])),j=(M=e==null?void 0:e.includes)!=null&&M.call(e,"/_/")?"#":"$",{promise:u,resolve:x,reject:$}=Promise.withResolvers();return i(this,R)[j].has(f)?(console.log("cache",e),x(i(this,R)[j].get(f))):i(this,F).has(f)?(D=i(this,F).get(f))==null||D.push([x,$]):(i(this,F).set(f,[[x,$]]),i(this,W).call(this,f,j,{url:e,method:a,...n},s)),new Proxy(u,{get:(X,d)=>(...g)=>X.then(l=>ee(...l)[d](...g)).catch(l=>{if(!(l instanceof Z))throw l;return typeof l[d]=="function"?l[d](...g):l[d]})})});v(this,"get",(e,t={})=>this.request({url:e,method:"GET",params:t}));v(this,"post",(e,t={},n={})=>this.request({url:e,method:"POST",data:t,params:n}));v(this,"put",(e,t={},n={})=>this.request({url:e,method:"PUT",data:t,params:n}));v(this,"del",(e,t={},n={})=>this.request({url:e,method:"DELETE",data:t,params:n}));v(this,"download",(e,t)=>{});v(this,"cache",(e,t={})=>this.request({url:e,method:"GET",params:t},!0));v(this,"list",(e,t={})=>this.get(`/api/${e}/${this.encode(t)}`));v(this,"getAppInfo",()=>{});v(this,"refreshCache",(e=!1)=>{e&&i(this,R)["#"].clear(),i(this,R).$.clear()});v(this,"decode",(e="",t={})=>{if(e===void 0||e===""||e===null)return t;try{if(!i(this,G))throw new Error("未初始化 appSecret，请先通过 init 设置 appSecret");const n=i(this,G).decode(e);return k.unpack(n)}catch{return console.warn("core.decode",e),t}});v(this,"encode",(e={})=>{if(!i(this,G))throw new Error("未初始化 appSecret，请先通过 init 设置 appSecret");const t=JSON.stringify(e,(n,s)=>s===void 0?null:s);return i(this,G).encode(k.pack(t))});this.init(e,t,n)}}H=new WeakMap,G=new WeakMap,ae=new WeakMap,R=new WeakMap,F=new WeakMap,K=new WeakMap,ce=new WeakMap,W=new WeakMap,re.onUnhandledRejection=r=>{var e,t,n,s,a,f;r!=null&&r.IS_ECHO_MSG?((e=r==null?void 0:r.$echoMsg)==null||e.call(r),(t=r==null?void 0:r.preventDefault)==null||t.call(r)):(n=r.reason)!=null&&n.IS_ECHO_MSG&&((a=(s=r.reason)==null?void 0:s.$echoMsg)==null||a.call(s),(f=r==null?void 0:r.preventDefault)==null||f.call(r))},re.onMsg=(r,e)=>[0,1].includes(r)?console.log(e):console.warn(e),o.HttpResponse=Z,o.NewHttpResponse=ee,o.default=re,o.signature=le,o.str2uint8array=de,o.trim=he,o.uint8array2str=Te,Object.defineProperties(o,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})}); +(function(o,h){typeof exports=="object"&&typeof module<"u"?h(exports):typeof define=="function"&&define.amd?define(["exports"],h):(o=typeof globalThis<"u"?globalThis:o||self,h(o["ff-request"]={}))})(this,function(o){"use strict";var Ce=Object.defineProperty;var ve=o=>{throw TypeError(o)};var Me=(o,h,O)=>h in o?Ce(o,h,{enumerable:!0,configurable:!0,writable:!0,value:O}):o[h]=O;var v=(o,h,O)=>Me(o,typeof h!="symbol"?h+"":h,O),we=(o,h,O)=>h.has(o)||ve("Cannot "+O);var s=(o,h,O)=>(we(o,h,"read from private field"),O?O.call(o):h.get(o)),b=(o,h,O)=>h.has(o)?ve("Cannot add the same private member more than once"):h instanceof WeakSet?h.add(o):h.set(o,O),N=(o,h,O,V)=>(we(o,h,"write to private field"),V?V.call(o,O):h.set(o,O),O);var J,z,H,j,ne,se,k,ie,oe,ae,Y,Q,K,G,ce,R,F,L,ue,W;function h(r){return r&&r.__esModule&&Object.prototype.hasOwnProperty.call(r,"default")?r.default:r}var O={};(function(r){(function(e){e([],function(){var t=-1,n=-2,i=-3,a=-4,f=-5,D=function(d,g){g=g||{};var l=g.verbose||!1;l&&console.log("Normalize the JSON Object"),d=typeof d=="string"?this.JSON.parse(d):d,l&&console.log("Creating a empty dictionary");var p={strings:[],integers:[],floats:[]};l&&console.log("Creating the AST");var w=function _(c){l&&console.log("Calling recursiveAstBuilder with "+this.JSON.stringify(c));var E=typeof c;if(c===null)return{type:"null",index:i};if(typeof c>"u")return{type:"undefined",index:f};if(c instanceof Array){var A=["@"];for(var T in c)c.hasOwnProperty(T)&&A.push(_(c[T]));return A}if(E==="object"){var A=["$"];for(var I in c)c.hasOwnProperty(I)&&(A.push(_(I)),A.push(_(c[I])));return A}if(c==="")return{type:"empty",index:a};if(E==="string"){var S=X.call(p.strings,c);return S==-1&&(p.strings.push(x(c)),S=p.strings.length-1),{type:"strings",index:S}}if(E==="number"&&c%1===0){var S=X.call(p.integers,c);return S==-1&&(p.integers.push(M(c)),S=p.integers.length-1),{type:"integers",index:S}}if(E==="number"){var S=X.call(p.floats,c);return S==-1&&(p.floats.push(c),S=p.floats.length-1),{type:"floats",index:S}}if(E==="boolean")return{type:"boolean",index:c?t:n};throw new Error("Unexpected argument of type "+typeof c)}(d),P=p.strings.length,q=p.integers.length;p.floats.length,l&&console.log("Parsing the dictionary");var U=p.strings.join("|");return U+="^"+p.integers.join("|"),U+="^"+p.floats.join("|"),l&&console.log("Parsing the structure"),U+="^"+function _(c){if(l&&console.log("Calling a recursiveParser with "+this.JSON.stringify(c)),c instanceof Array){var E=c.shift();for(var A in c)c.hasOwnProperty(A)&&(E+=_(c[A])+"|");return(E[E.length-1]==="|"?E.slice(0,-1):E)+"]"}var T=c.type,I=c.index;if(T==="strings")return M(I);if(T==="integers")return M(P+I);if(T==="floats")return M(P+q+I);if(T==="boolean")return c.index;if(T==="null")return i;if(T==="undefined")return f;if(T==="empty")return a;throw new TypeError("The item is alien!")}(w),l&&console.log("Ending parser"),g.debug?{dictionary:p,ast:w,packed:U}:U},u=function(d,g){g=g||{};var l=d.split("^");g.verbose&&console.log("Building dictionary");var p=[],w=l[0];if(w!==""){w=w.split("|"),g.verbose&&console.log("Parse the strings dictionary");for(var P=0,q=w.length;Ps(this,ne).call(this,t),ownKeys:()=>Object.keys(s(this,j).getPrototypeOf()||{}),getPrototypeOf:()=>s(this,z)?this:this.data,getOwnPropertyDescriptor:()=>({configurable:!0,enumerable:!0,writable:!0,value:s(this,j).getPrototypeOf()})});b(this,ne,e=>e==="$echoMsg"?s(this,k):e==="msg"?s(this,se):e==="then"||e==="resp"?(N(this,H,!0),N(this,z,e==="resp"),s(this,ie)):e==="catch"?s(this,oe):e==="finally"?s(this,ae):e==="IS_ECHO_MSG"?s(this,H):Reflect.get(this,e));b(this,se,(e=n=>n,t=!1)=>(s(this,k).call(this),N(this,z,t),Promise.resolve(e==null?void 0:e(s(this,j).getPrototypeOf()))));b(this,k,()=>{s(this,H)&&(N(this,H,!1),re.onMsg(this.code,this.message))});b(this,ie,e=>[0,1].includes(this.code)?Promise.resolve(e==null?void 0:e(s(this,j).getPrototypeOf())):Promise.reject(s(this,J)));b(this,oe,e=>Promise.resolve(e(s(this,J))));b(this,ae,e=>(e==null||e(),[0,1].includes(this.code)?Promise.resolve(s(this,j).getPrototypeOf()):Promise.reject(s(this,J))));return this.code=e,this.message=t,this.data=n,this.url=i,this.res=a,N(this,J,new Proxy(this,s(this,j)))}}J=new WeakMap,z=new WeakMap,H=new WeakMap,j=new WeakMap,ne=new WeakMap,se=new WeakMap,k=new WeakMap,ie=new WeakMap,oe=new WeakMap,ae=new WeakMap;const ee=(r,e,t,n="/",i="")=>new Z(r,e,t,n,i);var fe=["utf8","utf-8","unicode-1-1-utf-8"];function ye(r){if(fe.indexOf(r)<0&&typeof r<"u"&&r!=null)throw new RangeError("Invalid encoding type. Only utf-8 is supported");this.encoding="utf-8",this.encode=function(e){if(typeof e!="string")throw new TypeError("passed argument must be of tye string");var t=unescape(encodeURIComponent(e)),n=new Uint8Array(t.length);const i=t.split("");for(let a=0;a"u")return"";var n=typeof t<"u"&&n in t?t.stream:!1;if(typeof n!="boolean")throw new TypeError("stream option must be boolean");if(ArrayBuffer.isView(e)){var i=new Uint8Array(e.buffer,e.byteOffset,e.byteLength),a=new Array(i.length);for(let f=0;f>>0).toString(16)}function de(r,e){return r.replace(new RegExp(`^${e}+|${e}+$`,"g"),"")}function ge(r){return Ee.encode(r||"")}function Oe(r){return Te.decode(new DataView(r),{})}const Pe=62,te=30,pe=31,Se=63;class xe{constructor(e){v(this,"encodeTable",[]);v(this,"decodeMap",new Uint8Array(256).fill(255));if(e.length!==Pe)throw new Error("Encoding alphabet must be 62 characters long");if(e.includes(` +`)||e.includes("\r"))throw new Error("Encoding alphabet contains newline character");this.encodeTable=e.split(""),this.decodeMap=new Uint8Array(256).fill(255);for(let t=0;t>3;e===0&&(t-=1,e=8);let n=this.src[t]>>8-e;return e<6&&t>0&&(n|=this.src[t-1]<0;){let n=6,i=this.get6bits();(i&te)===te&&((this.pos>6||i>pe)&&(n=5),i&=pe),t.push(s(this,Y).encodeTable[i].charCodeAt(0)),this.pos-=n}return t}}Y=new WeakMap;class Ae{constructor(e){b(this,Q);N(this,Q,e)}decode(e){const t=new Uint8Array(Math.ceil(e.length*6/8)+1);let n=t.length,i=0,a=0;for(let f=0;f=8&&(n--,t[n]=a&255,i%=8,a>>=8)}return i>0&&(n--,t[n]=a&255),t.slice(n)}}Q=new WeakMap,Promise.withResolvers||(Promise.withResolvers=function(){let r,e;return{promise:new Promise((n,i)=>{r=n,e=i}),resolve:r,reject:e}});class re{constructor(e,t,n){b(this,K);b(this,G);b(this,ce);b(this,R,{"#":new Map,$:new Map});b(this,F,new Map);b(this,L,new Set);v(this,"init",(e,t,n)=>{e&&N(this,ce,e),n&&N(this,K,n),t&&N(this,G,new xe(t)),s(this,ue).call(this)});b(this,ue,()=>{!s(this,L).size||!s(this,K)||(s(this,L).forEach(e=>s(this,W).call(this,...e)),s(this,L).clear())});b(this,W,(e,t,n,i=!1)=>{if(!s(this,K))s(this,L).add([e,t,n,i]);else{const{url:a,method:f,...D}=n||{};s(this,K).call(this,{url:a,method:f,...D}).then(u=>{if(![0,1].includes(u.code))throw ee(u.code,u.msg,u.data,a,u==null?void 0:u.res);return[u.code,u.msg,u.data,a,(u==null?void 0:u.res)??""]}).then(u=>{const x=u;return(t=="#"||f=="GET")&&s(this,R)[t].set(e,x),t!="#"&&f=="GET"&&!i&&setTimeout(()=>{s(this,R)[t].delete(e)},300),x}).then(u=>{var x;return(x=s(this,F).get(e))==null?void 0:x.forEach(($,M,B)=>{$&&$[0](u),delete B[M]})}).catch(u=>{var x;s(this,R)[t].delete(e),(x=s(this,F).get(e))==null||x.forEach(($,M,B)=>{$&&$[1](u instanceof Z?u:ee(-1,u,null,a)),delete B[M]})}).finally(()=>s(this,F).delete(e))}});v(this,"request",({url:e="/",method:t="GET",...n},i=!1)=>{var M,B;e=de(e,"/");const a=t.toUpperCase(),f=he(JSON.stringify([e,a,n])),D=(M=e==null?void 0:e.includes)!=null&&M.call(e,"/_/")?"#":"$",{promise:u,resolve:x,reject:$}=Promise.withResolvers();return s(this,R)[D].has(f)?(console.log("cache",e),x(s(this,R)[D].get(f))):s(this,F).has(f)?(B=s(this,F).get(f))==null||B.push([x,$]):(s(this,F).set(f,[[x,$]]),s(this,W).call(this,f,D,{url:e,method:a,...n},i)),new Proxy(u,{get:(X,d)=>(...g)=>X.then(l=>ee(...l)[d](...g)).catch(l=>{if(!(l instanceof Z))throw l;return typeof l[d]=="function"?l[d](...g):l[d]})})});v(this,"get",(e,t={})=>this.request({url:e,method:"GET",params:t}));v(this,"post",(e,t={},n={})=>this.request({url:e,method:"POST",data:t,params:n}));v(this,"put",(e,t={},n={})=>this.request({url:e,method:"PUT",data:t,params:n}));v(this,"del",(e,t={},n={})=>this.request({url:e,method:"DELETE",data:t,params:n}));v(this,"download",(e,t)=>{});v(this,"cache",(e,t={})=>this.request({url:e,method:"GET",params:t},!0));v(this,"list",(e,t={})=>this.get(`/api/${e}/${this.encode(t)}`));v(this,"getAppInfo",()=>{});v(this,"refreshCache",(e=!1)=>{e&&s(this,R)["#"].clear(),s(this,R).$.clear()});v(this,"decode",(e="",t={})=>{if(e===void 0||e===""||e===null)return t;try{if(!s(this,G))throw new Error("未初始化 appSecret，请先通过 init 设置 appSecret");const n=s(this,G).decode(e);return V.unpack(n)}catch{return console.warn("core.decode",e),t}});v(this,"encode",(e={})=>{if(!s(this,G))throw new Error("未初始化 appSecret，请先通过 init 设置 appSecret");const t=JSON.stringify(e,(n,i)=>i===void 0?null:i);return s(this,G).encode(V.pack(t))});this.init(e,t,n)}}K=new WeakMap,G=new WeakMap,ce=new WeakMap,R=new WeakMap,F=new WeakMap,L=new WeakMap,ue=new WeakMap,W=new WeakMap,re.onUnhandledRejection=r=>{var e,t,n,i,a,f;r!=null&&r.IS_ECHO_MSG?((e=r==null?void 0:r.$echoMsg)==null||e.call(r),(t=r==null?void 0:r.preventDefault)==null||t.call(r)):(n=r.reason)!=null&&n.IS_ECHO_MSG&&((a=(i=r.reason)==null?void 0:i.$echoMsg)==null||a.call(i),(f=r==null?void 0:r.preventDefault)==null||f.call(r))},re.onMsg=(r,e)=>[0,1].includes(r)?console.log(e):console.warn(e),o.HttpResponse=Z,o.NewHttpResponse=ee,o.default=re,o.signature=he,o.str2uint8array=ge,o.trim=de,o.uint8array2str=Oe,Object.defineProperties(o,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})}); diff --git a/package.json b/package.json index bdb014e..620c2ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ff-request", - "version": "0.11.1", + "version": "0.11.2", "type": "module", "main": "./ff-request.umd.cjs", "module": "./ff-request.js", diff --git a/types/index.d.ts b/types/index.d.ts index c883540..5e9295d 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -1,23 +1,20 @@ -declare type HttpMethod = "GET" | "POST" | "PUT" | "DELETE"; +declare interface Base62Param { + /** 当前选中的 tab 标识 */ + tab?: string + /** 当前页码 */ + page?: number + /** 每页条数 */ + pageSize?: number + /** 筛选条件 */ + condition?: Record + /** 侧边栏选中项标识 */ + sider?: string + /** 搜索关键词 */ + keyword?: string +} + +declare type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' -/** - * @typedef {'GET' | 'POST' | 'PUT' | 'DELETE'} HttpMethod - */ -/** - * @typedef {Object} RequestOptions@typedef {Object} RequestOptions - * @property {string} [url] - * @property {HttpMethod} [method] - * @property {Record} [params] - * @property {unknown} [data] - */ -/** - * 底层请求函数类型（兼容 axios 等） - * @typedef {(config: RequestOptions & Record) => Promise<{ code: number, msg: string, data: unknown, res?: string }>} RequestFn - */ -/** - * 缓存条目：[code, msg, data, url, res] - * @typedef {[number, string, unknown, string, string]} CacheEntry - */ declare class HttpRequest { /** * @param {string} [appKey] @@ -81,9 +78,9 @@ declare class HttpRequest { /** * 通过 Base62 编码参数请求列表接口 * @param {string} code - * @param {Record} [base62param] + * @param {Base62Param} [base62param] */ - list: (code: string, base62param?: Record) => any; + list: (code: string, base62param?: Base62Param) => any; getAppInfo: () => void; /** * 清除缓存 @@ -99,10 +96,10 @@ declare class HttpRequest { decode: (str?: string, defaultValue?: object) => unknown; /** * 将 JSON 对象编码为 Base62 字符串 - * @param {Record} [json] + * @param {Record | unknown[]} [json] * @returns {string} */ - encode: (json?: Record) => string; + encode: (json?: Record | unknown[]) => string; #private; } @@ -153,22 +150,16 @@ export declare class HttpResponse { export declare function NewHttpResponse(code: number, message: string, data: unknown, url?: string, res?: string): HttpResponse; -/** - * 底层请求函数类型（兼容 axios 等） - */ -declare type RequestFn = (config: RequestOptions & Record) => Promise<{ - code: number; - msg: string; - data: unknown; - res?: string; -}>; +declare type RequestFn = ( +config: RequestOptions & Record +) => Promise<{ code: number; msg: string; data: unknown; res?: string }> -declare type RequestOptions = { - url?: string | undefined; - method?: HttpMethod | undefined; - params?: Record | undefined; - data?: unknown; -}; +declare interface RequestOptions { + url?: string + method?: HttpMethod + params?: Record + data?: unknown +} /** * DJB2 算法 —— 将字符串散列为十六进制字符串