diff --git a/dist/ff-request.js b/dist/ff-request.js index 17cbdc1..30d3ac3 100644 --- a/dist/ff-request.js +++ b/dist/ff-request.js @@ -1,6 +1,6 @@ -var ue = Object.defineProperty; -var fe = (r, e, t) => e in r ? ue(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t; -var p = (r, e, t) => (fe(r, typeof e != "symbol" ? e + "" : e, t), t), ie = (r, e, t) => { +var fe = Object.defineProperty; +var ue = (r, e, t) => e in r ? fe(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t; +var p = (r, e, t) => (ue(r, typeof e != "symbol" ? e + "" : e, t), t), ie = (r, e, t) => { if (!e.has(r)) throw TypeError("Cannot " + t); }; @@ -16,11 +16,11 @@ var ce = {}; (function(r) { (function(e) { e([], function() { - var t = -1, n = -2, s = -3, o = -4, h = -5, R = function(f, l) { + var t = -1, n = -2, s = -3, o = -4, h = -5, R = function(u, l) { l = l || {}; var w = l.verbose || !1; - w && console.log("Normalize the JSON Object"), f = typeof f == "string" ? this.JSON.parse(f) : f, w && console.log("Creating a empty dictionary"); - var u = { + w && console.log("Normalize the JSON Object"), u = typeof u == "string" ? this.JSON.parse(u) : u, w && console.log("Creating a empty dictionary"); + var f = { strings: [], integers: [], floats: [] @@ -40,16 +40,16 @@ var ce = {}; index: h }; if (c instanceof Array) { - var x = ["@"]; + var S = ["@"]; for (var b in c) - c.hasOwnProperty(b) && x.push(T(c[b])); - return x; + c.hasOwnProperty(b) && S.push(T(c[b])); + return S; } if (y === "object") { - var x = ["$"]; + var S = ["$"]; for (var $ in c) - c.hasOwnProperty($) && (x.push(T($)), x.push(T(c[$]))); - return x; + c.hasOwnProperty($) && (S.push(T($)), S.push(T(c[$]))); + return S; } if (c === "") return { @@ -57,22 +57,22 @@ var ce = {}; index: o }; if (y === "string") { - var O = I.call(u.strings, c); - return O == -1 && (u.strings.push(S(c)), O = u.strings.length - 1), { + var O = F.call(f.strings, c); + return O == -1 && (f.strings.push(P(c)), O = f.strings.length - 1), { type: "strings", index: O }; } if (y === "number" && c % 1 === 0) { - var O = I.call(u.integers, c); - return O == -1 && (u.integers.push(_(c)), O = u.integers.length - 1), { + var O = F.call(f.integers, c); + return O == -1 && (f.integers.push(_(c)), O = f.integers.length - 1), { type: "integers", index: O }; } if (y === "number") { - var O = I.call(u.floats, c); - return O == -1 && (u.floats.push(c), O = u.floats.length - 1), { + var O = F.call(f.floats, c); + return O == -1 && (f.floats.push(c), O = f.floats.length - 1), { type: "floats", index: O }; @@ -83,14 +83,14 @@ var ce = {}; index: c ? t : n }; throw new Error("Unexpected argument of type " + typeof c); - }(f), E = u.strings.length, B = u.integers.length; - u.floats.length, w && console.log("Parsing the dictionary"); - var N = u.strings.join("|"); - return N += "^" + u.integers.join("|"), N += "^" + u.floats.join("|"), w && console.log("Parsing the structure"), N += "^" + function T(c) { + }(u), E = f.strings.length, j = f.integers.length; + f.floats.length, w && console.log("Parsing the dictionary"); + var N = f.strings.join("|"); + return N += "^" + f.integers.join("|"), N += "^" + f.floats.join("|"), w && console.log("Parsing the structure"), N += "^" + function T(c) { if (w && console.log("Calling a recursiveParser with " + this.JSON.stringify(c)), c instanceof Array) { var y = c.shift(); - for (var x in c) - c.hasOwnProperty(x) && (y += T(c[x]) + "|"); + for (var S in c) + c.hasOwnProperty(S) && (y += T(c[S]) + "|"); return (y[y.length - 1] === "|" ? y.slice(0, -1) : y) + "]"; } var b = c.type, $ = c.index; @@ -99,7 +99,7 @@ var ce = {}; if (b === "integers") return _(E + $); if (b === "floats") - return _(E + B + $); + return _(E + j + $); if (b === "boolean") return c.index; if (b === "null") @@ -110,40 +110,40 @@ var ce = {}; return o; throw new TypeError("The item is alien!"); }(d), w && console.log("Ending parser"), l.debug ? { - dictionary: u, + dictionary: f, ast: d, packed: N } : N; - }, a = function(f, l) { + }, a = function(u, l) { l = l || {}; - var w = f.split("^"); + var w = u.split("^"); l.verbose && console.log("Building dictionary"); - var u = [], d = w[0]; + var f = [], d = w[0]; if (d !== "") { d = d.split("|"), l.verbose && console.log("Parse the strings dictionary"); - for (var E = 0, B = d.length; E < B; E++) - u.push(M(d[E])); + for (var E = 0, j = d.length; E < j; E++) + f.push(M(d[E])); } if (d = w[1], d !== "") { d = d.split("|"), l.verbose && console.log("Parse the integers dictionary"); - for (var E = 0, B = d.length; E < B; E++) - u.push(F(d[E])); + for (var E = 0, j = d.length; E < j; E++) + f.push(I(d[E])); } if (d = w[2], d !== "") { d = d.split("|"), l.verbose && console.log("Parse the floats dictionary"); - for (var E = 0, B = d.length; E < B; E++) - u.push(parseFloat(d[E])); + for (var E = 0, j = d.length; E < j; E++) + f.push(parseFloat(d[E])); } d = null, l.verbose && console.log("Tokenizing the structure"); for (var N = "", T = [], c = w[3].length, E = 0; E < c; E++) { var y = w[3].charAt(E); - y === "|" || y === "$" || y === "@" || y === "]" ? (N && (T.push(F(N)), N = ""), y !== "|" && T.push(y)) : N += y; + y === "|" || y === "$" || y === "@" || y === "]" ? (N && (T.push(I(N)), N = ""), y !== "|" && T.push(y)) : N += y; } - var x = T.length, b = 0; + var S = T.length, b = 0; return l.verbose && console.log("Starting recursive parser"), function $() { var O = T[b++]; if (l.verbose && console.log("Reading collection type " + (O === "$" ? "object" : "Array")), O === "@") { - for (var g = []; b < x; b++) { + for (var g = []; b < S; b++) { var A = T[b]; if (l.verbose && console.log("Read " + A + " symbol"), A === "]") return g; @@ -167,47 +167,47 @@ var ce = {}; g.push(""); break; default: - g.push(u[A]); + g.push(f[A]); } } return l.verbose && console.log("Parsed " + this.JSON.stringify(g)), g; } if (O === "$") { - for (var g = {}; b < x; b++) { - var P = T[b]; - if (P === "]") + for (var g = {}; b < S; b++) { + var x = T[b]; + if (x === "]") return g; - P === o ? P = "" : P = u[P]; + x === o ? x = "" : x = f[x]; var A = T[++b]; if (A === "@" || A === "$") - g[P] = $(); + g[x] = $(); else switch (A) { case t: - g[P] = !0; + g[x] = !0; break; case n: - g[P] = !1; + g[x] = !1; break; case s: - g[P] = null; + g[x] = null; break; case h: - g[P] = void 0; + g[x] = void 0; break; case o: - g[P] = ""; + g[x] = ""; break; default: - g[P] = u[A]; + g[x] = f[A]; } } return l.verbose && console.log("Parsed " + this.JSON.stringify(g)), g; } throw new TypeError("Bad token " + O + " isn't a type"); }(); - }, S = function(f) { - return typeof f != "string" ? f : f.replace(/[\+ \|\^\%]/g, function(l) { + }, P = function(u) { + return typeof u != "string" ? u : u.replace(/[\+ \|\^\%]/g, function(l) { return { " ": "+", "+": "%2B", @@ -216,8 +216,8 @@ var ce = {}; "%": "%25" }[l]; }); - }, M = function(f) { - return typeof f != "string" ? f : f.replace(/\+|%2B|%7C|%5E|%25/g, function(l) { + }, M = function(u) { + return typeof u != "string" ? u : u.replace(/\+|%2B|%7C|%5E|%25/g, function(l) { return { "+": " ", "%2B": "+", @@ -226,13 +226,13 @@ var ce = {}; "%25": "%" }[l]; }); - }, _ = function(f) { - return Number.prototype.toString.call(f, 36).toUpperCase(); - }, F = function(f) { - return parseInt(f, 36); - }, I = Array.prototype.indexOf || function(f, l) { - for (var w = l || 0, u = this.length; w < u; w++) - if (this[w] === f) + }, _ = function(u) { + return Number.prototype.toString.call(u, 36).toUpperCase(); + }, I = function(u) { + return parseInt(u, 36); + }, F = Array.prototype.indexOf || function(u, l) { + for (var w = l || 0, f = this.length; w < f; w++) + if (this[w] === u) return w; return -1; }; @@ -249,7 +249,7 @@ var ce = {}; }); })(ce); const oe = /* @__PURE__ */ de(ce); -var K, q, j, D, Q, W, L, X, Z; +var H, L, G, D, Q, W, q, X, Z; class ne { constructor(e, t, n, s, o) { p(this, "code", 0); @@ -258,15 +258,15 @@ class ne { p(this, "url", ""); p(this, "res", ""); // static [Symbol.hasInstance](self) { return self?.IS_ECHO_MSG !== undefined } - v(this, K, null); + v(this, H, null); // 判断返回 Response 对象, 还是 Response 中的 data - v(this, q, !0); + v(this, L, !0); // 判罚是否已经给出错误提示 - v(this, j, !0); + v(this, G, !0); v(this, D, { get: (e, t) => i(this, Q).call(this, t), ownKeys: () => Object.keys(i(this, D).getPrototypeOf() || {}), - getPrototypeOf: () => i(this, q) ? this : this.data, + getPrototypeOf: () => i(this, L) ? this : this.data, getOwnPropertyDescriptor: () => ({ configurable: !0, enumerable: !0, @@ -274,17 +274,17 @@ class ne { value: i(this, D).getPrototypeOf() }) }); - v(this, Q, (e) => e === "$echoMsg" ? i(this, L) : e === "msg" ? i(this, W) : e === "then" || e === "resp" ? (C(this, j, !0), C(this, q, e === "resp"), i(this, X)) : e === "catch" ? i(this, Z) : e === "IS_ECHO_MSG" ? i(this, j) : Reflect.get(this, e)); - v(this, W, (e = (n) => n, t = !1) => (i(this, L).call(this), C(this, q, t), Promise.resolve(e == null ? void 0 : e(i(this, D).getPrototypeOf())))); - v(this, L, () => { - i(this, j) && (C(this, j, !1), _e.onMsg(this.code, this.message)); + v(this, Q, (e) => e === "$echoMsg" ? i(this, q) : e === "msg" ? i(this, W) : e === "then" || e === "resp" ? (C(this, G, !0), C(this, L, e === "resp"), i(this, X)) : e === "catch" ? i(this, Z) : e === "IS_ECHO_MSG" ? i(this, G) : Reflect.get(this, e)); + v(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, D).getPrototypeOf())))); + v(this, q, () => { + i(this, G) && (C(this, G, !1), _e.onMsg(this.code, this.message)); }); - v(this, X, (e) => [0, 1].includes(this.code) ? Promise.resolve(e == null ? void 0 : e(i(this, D).getPrototypeOf())) : Promise.reject(i(this, K))); - v(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, D))); + v(this, X, (e) => [0, 1].includes(this.code) ? Promise.resolve(e == null ? void 0 : e(i(this, D).getPrototypeOf())) : Promise.reject(i(this, H))); + v(this, Z, (e) => Promise.resolve(e(i(this, H)))); + return this.code = e, this.message = t, this.data = n, this.url = s, this.res = o, C(this, H, new Proxy(this, i(this, D))); } } -K = new WeakMap(), q = new WeakMap(), j = new WeakMap(), D = new WeakMap(), Q = new WeakMap(), W = new WeakMap(), L = new WeakMap(), X = new WeakMap(), Z = new WeakMap(); +H = new WeakMap(), L = new WeakMap(), G = new WeakMap(), D = 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 le = [ "utf8", @@ -332,7 +332,7 @@ const ve = new he.TextEncoder("utf8"), we = new he.TextDecoder("utf8"), ye = (r) e = e * 33 ^ r.charCodeAt(t); return (e >>> 0).toString(16); }, be = (r, e) => r.replace(new RegExp(`^${e}+|${e}+$`, "g"), ""), Ee = (r) => ve.encode(r || ""), Ce = (r) => we.decode(new DataView(r), {}), Oe = 62, Y = 30, ae = 31, Te = 63; -class xe { +class Se { constructor(e) { p(this, "encodeTable", []); p(this, "decodeMap", new Uint8Array(256).fill(255)); @@ -349,19 +349,19 @@ class xe { encode(e) { if (!e || e.length === 0) return []; - const t = new Pe(this).encodeV2(e); + const t = new xe(this).encodeV2(e); return String.fromCharCode(...t); } // 解码方法 decode(e) { if (!e || e.length === 0) return new Uint8Array(); - const t = new Se(this).decode(e); + const t = new Pe(this).decode(e); return new TextDecoder().decode(t); } } var z; -class Pe { +class xe { constructor(e) { v(this, z, null); C(this, z, e); @@ -384,7 +384,7 @@ class Pe { } z = new WeakMap(); var k; -class Se { +class Pe { constructor(e) { v(this, k, null); C(this, k, e); @@ -408,11 +408,11 @@ Promise.withResolvers || (Promise.withResolvers = function() { r = n, e = s; }), resolve: r, reject: e }; }); -var G, H, ee, m, U, J, te, V; +var J, B, ee, m, U, K, te, V; class se { constructor(e, t, n) { - v(this, G, void 0); - v(this, H, void 0); + v(this, J, void 0); + v(this, B, void 0); v(this, ee, void 0); v(this, m, { "#": /* @__PURE__ */ new Map(), @@ -421,33 +421,33 @@ class se { // 普通缓存 }); v(this, U, /* @__PURE__ */ new Map()); - v(this, J, /* @__PURE__ */ new Set()); + v(this, K, /* @__PURE__ */ new Set()); p(this, "init", (e, t, n) => { - C(this, ee, e), C(this, G, n), C(this, H, new xe(t)), i(this, te).call(this); + e && C(this, ee, e), n && C(this, J, n), t && C(this, B, new Se(t)), i(this, te).call(this); }); v(this, te, () => { - !i(this, J).size || !i(this, G) || (i(this, J).forEach((e) => i(this, V).call(this, ...e)), i(this, J).clear()); + !i(this, K).size || !i(this, J) || (i(this, K).forEach((e) => i(this, V).call(this, ...e)), i(this, K).clear()); }); v(this, V, (e, t, n, s = !1) => { - if (!i(this, G)) - i(this, J).add([e, t, n, s]); + if (!i(this, J)) + i(this, K).add([e, t, n, s]); else { const { url: o, method: h, ...R } = n || {}; - i(this, G).call(this, { url: o, method: h, ...R }).then((a) => { + i(this, J).call(this, { url: o, method: h, ...R }).then((a) => { if (![0, 1].includes(a.code)) throw re(a.code, a.msg, a.data, o, a == null ? void 0 : a.res); return [a.code, a.msg, a.data, o, a == null ? void 0 : a.res]; }).then((a) => ((t == "#" || h == "GET") && i(this, m)[t].set(e, a), t != "#" && h == "GET" && !s && setTimeout(() => { i(this, m)[t].delete(e); }, 300), a)).then((a) => { - var S; - return (S = i(this, U).get(e)) == null ? void 0 : S.forEach((M, _, F) => { - M && M[0](a), delete F[_]; + var P; + return (P = i(this, U).get(e)) == null ? void 0 : P.forEach((M, _, I) => { + M && M[0](a), delete I[_]; }); }).catch((a) => { - var S; - i(this, m)[t].delete(e), (S = i(this, U).get(e)) == null || S.forEach((M, _, F) => { - M && M[1](a instanceof ne ? a : re(-1, a, null, o)), delete F[_]; + var P; + i(this, m)[t].delete(e), (P = i(this, U).get(e)) == null || P.forEach((M, _, I) => { + M && M[1](a instanceof ne ? a : re(-1, a, null, o)), delete I[_]; }); }).finally(() => i(this, U).delete(e)); } @@ -455,12 +455,12 @@ class se { p(this, "request", ({ url: e = "/", method: t = "GET", ...n }, s = !1) => { var _; e = be(e, "/"); - const o = t.toUpperCase(), h = ye(JSON.stringify([e, o, n])), R = (_ = e == null ? void 0 : e.includes) != null && _.call(e, "/_/") ? "#" : "$", { promise: a, resolve: S, reject: M } = Promise.withResolvers(); - return i(this, m)[R].has(h) ? (console.log("cache", e), S(i(this, m)[R].get(h))) : i(this, U).has(h) ? i(this, U).get(h).push([S, M]) : (i(this, U).set(h, [[S, M]]), i(this, V).call(this, h, R, { url: e, method: o, ...n }, s)), new Proxy(a, { - get: (F, I) => (...f) => F.then((l) => re(...l)[I](...f)).catch((l) => { + const o = t.toUpperCase(), h = ye(JSON.stringify([e, o, n])), R = (_ = e == null ? void 0 : e.includes) != null && _.call(e, "/_/") ? "#" : "$", { promise: a, resolve: P, reject: M } = Promise.withResolvers(); + return i(this, m)[R].has(h) ? (console.log("cache", e), P(i(this, m)[R].get(h))) : i(this, U).has(h) ? i(this, U).get(h).push([P, M]) : (i(this, U).set(h, [[P, M]]), i(this, V).call(this, h, R, { url: e, method: o, ...n }, s)), new Proxy(a, { + get: (I, F) => (...u) => I.then((l) => re(...l)[F](...u)).catch((l) => { if (!l instanceof ne) throw l; - return typeof l[I] == "function" ? l[I](...f) : l[I]; + return typeof l[F] == "function" ? l[F](...u) : l[F]; }) }); }); @@ -481,20 +481,24 @@ class se { if (e === void 0 || e === "" || e === null) return t; try { - const n = i(this, H).decode(e); + if (!i(this, B)) + throw new Error("未初始化 appSecret,请先通过 init 设置 appSecret"); + const n = i(this, B).decode(e); return oe.unpack(n); } catch { return console.warn("core.decode", e), t; } }); p(this, "encode", (e = {}) => { + if (!i(this, B)) + throw new Error("未初始化 appSecret,请先通过 init 设置 appSecret"); const t = JSON.stringify(e, (n, s) => s === void 0 ? null : s); - return i(this, H).encode(oe.pack(t)); + return i(this, B).encode(oe.pack(t)); }); this.init(e, t, n); } } -G = new WeakMap(), H = new WeakMap(), ee = new WeakMap(), m = new WeakMap(), U = new WeakMap(), J = new WeakMap(), te = new WeakMap(), V = new WeakMap(); +J = new WeakMap(), B = new WeakMap(), ee = new WeakMap(), m = new WeakMap(), U = new WeakMap(), K = new WeakMap(), te = new WeakMap(), V = new WeakMap(); const _e = se; se.onUnhandledRejection = (r) => { var e, t, n, s, o, h; diff --git a/dist/ff-request.umd.cjs b/dist/ff-request.umd.cjs index 3fa6cd6..9e79d12 100644 --- a/dist/ff-request.umd.cjs +++ b/dist/ff-request.umd.cjs @@ -1,2 +1,2 @@ -(function(u,h){typeof exports=="object"&&typeof module<"u"?h(exports):typeof define=="function"&&define.amd?define(["exports"],h):(u=typeof globalThis<"u"?globalThis:u||self,h(u["ff-request"]={}))})(this,function(u){"use strict";var Ae=Object.defineProperty;var Ce=(u,h,b)=>h in u?Ae(u,h,{enumerable:!0,configurable:!0,writable:!0,value:b}):u[h]=b;var y=(u,h,b)=>(Ce(u,typeof h!="symbol"?h+"":h,b),b),ve=(u,h,b)=>{if(!h.has(u))throw TypeError("Cannot "+b)};var i=(u,h,b)=>(ve(u,h,"read from private field"),b?b.call(u):h.get(u)),w=(u,h,b)=>{if(h.has(u))throw TypeError("Cannot add the same private member more than once");h instanceof WeakSet?h.add(u):h.set(u,b)},N=(u,h,b,V)=>(ve(u,h,"write to private field"),V?V.call(u,b):h.set(u,b),b);var L,z,J,D,ee,te,Y,re,ne,Q,W,K,k,se,$,I,q,ie,X;function h(r){return r&&r.__esModule&&Object.prototype.hasOwnProperty.call(r,"default")?r.default:r}var b={};(function(r){(function(e){e([],function(){var t=-1,n=-2,s=-3,o=-4,f=-5,j=function(g,l){l=l||{};var E=l.verbose||!1;E&&console.log("Normalize the JSON Object"),g=typeof g=="string"?this.JSON.parse(g):g,E&&console.log("Creating a empty dictionary");var d={strings:[],integers:[],floats:[]};E&&console.log("Creating the AST");var p=function x(c){E&&console.log("Calling recursiveAstBuilder with "+this.JSON.stringify(c));var T=typeof c;if(c===null)return{type:"null",index:s};if(typeof c>"u")return{type:"undefined",index:f};if(c instanceof Array){var _=["@"];for(var O in c)c.hasOwnProperty(O)&&_.push(x(c[O]));return _}if(T==="object"){var _=["$"];for(var F in c)c.hasOwnProperty(F)&&(_.push(x(F)),_.push(x(c[F])));return _}if(c==="")return{type:"empty",index:o};if(T==="string"){var S=G.call(d.strings,c);return S==-1&&(d.strings.push(C(c)),S=d.strings.length-1),{type:"strings",index:S}}if(T==="number"&&c%1===0){var S=G.call(d.integers,c);return S==-1&&(d.integers.push(M(c)),S=d.integers.length-1),{type:"integers",index:S}}if(T==="number"){var S=G.call(d.floats,c);return S==-1&&(d.floats.push(c),S=d.floats.length-1),{type:"floats",index:S}}if(T==="boolean")return{type:"boolean",index:c?t:n};throw new Error("Unexpected argument of type "+typeof c)}(g),P=d.strings.length,H=d.integers.length;d.floats.length,E&&console.log("Parsing the dictionary");var U=d.strings.join("|");return U+="^"+d.integers.join("|"),U+="^"+d.floats.join("|"),E&&console.log("Parsing the structure"),U+="^"+function x(c){if(E&&console.log("Calling a recursiveParser with "+this.JSON.stringify(c)),c instanceof Array){var T=c.shift();for(var _ in c)c.hasOwnProperty(_)&&(T+=x(c[_])+"|");return(T[T.length-1]==="|"?T.slice(0,-1):T)+"]"}var O=c.type,F=c.index;if(O==="strings")return M(F);if(O==="integers")return M(P+F);if(O==="floats")return M(P+H+F);if(O==="boolean")return c.index;if(O==="null")return s;if(O==="undefined")return f;if(O==="empty")return o;throw new TypeError("The item is alien!")}(p),E&&console.log("Ending parser"),l.debug?{dictionary:d,ast:p,packed:U}:U},a=function(g,l){l=l||{};var E=g.split("^");l.verbose&&console.log("Building dictionary");var d=[],p=E[0];if(p!==""){p=p.split("|"),l.verbose&&console.log("Parse the strings dictionary");for(var P=0,H=p.length;Pi(this,ee).call(this,t),ownKeys:()=>Object.keys(i(this,D).getPrototypeOf()||{}),getPrototypeOf:()=>i(this,z)?this:this.data,getOwnPropertyDescriptor:()=>({configurable:!0,enumerable:!0,writable:!0,value:i(this,D).getPrototypeOf()})});w(this,ee,e=>e==="$echoMsg"?i(this,Y):e==="msg"?i(this,te):e==="then"||e==="resp"?(N(this,J,!0),N(this,z,e==="resp"),i(this,re)):e==="catch"?i(this,ne):e==="IS_ECHO_MSG"?i(this,J):Reflect.get(this,e));w(this,te,(e=n=>n,t=!1)=>(i(this,Y).call(this),N(this,z,t),Promise.resolve(e==null?void 0:e(i(this,D).getPrototypeOf()))));w(this,Y,()=>{i(this,J)&&(N(this,J,!1),pe.onMsg(this.code,this.message))});w(this,re,e=>[0,1].includes(this.code)?Promise.resolve(e==null?void 0:e(i(this,D).getPrototypeOf())):Promise.reject(i(this,L)));w(this,ne,e=>Promise.resolve(e(i(this,L))));return this.code=e,this.message=t,this.data=n,this.url=s,this.res=o,N(this,L,new Proxy(this,i(this,D)))}}L=new WeakMap,z=new WeakMap,J=new WeakMap,D=new WeakMap,ee=new WeakMap,te=new WeakMap,Y=new WeakMap,re=new WeakMap,ne=new WeakMap;const ae=(r,e,t,n="/",s="")=>new oe(r,e,t,n,s);var le=["utf8","utf-8","unicode-1-1-utf-8"];function ye(r){if(le.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"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),o=new Array(s.length);for(let f=0;f{let e=5381;for(let t=0;t>>0).toString(16)},he=(r,e)=>r.replace(new RegExp(`^${e}+|${e}+$`,"g"),""),de=r=>be.encode(r||""),Te=r=>Ee.decode(new DataView(r),{}),Oe=62,Z=30,ge=31,Pe=63;class Se{constructor(e){y(this,"encodeTable",[]);y(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&Z)===Z&&((this.pos>6||s>ge)&&(n=5),s&=ge),t.push(i(this,Q).encodeTable[s].charCodeAt(0)),this.pos-=n}return t}}Q=new WeakMap;class _e{constructor(e){w(this,W,null);N(this,W,e)}decode(e){const t=new Uint8Array(Math.ceil(e.length*6/8)+1);let n=t.length,s=0,o=0;for(let f=0;f=8&&(n--,t[n]=o&255,s%=8,o>>=8)}return s>0&&(n--,t[n]=o&255),t.slice(n)}}W=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 ce{constructor(e,t,n){w(this,K,void 0);w(this,k,void 0);w(this,se,void 0);w(this,$,{"#":new Map,$:new Map});w(this,I,new Map);w(this,q,new Set);y(this,"init",(e,t,n)=>{N(this,se,e),N(this,K,n),N(this,k,new Se(t)),i(this,ie).call(this)});w(this,ie,()=>{!i(this,q).size||!i(this,K)||(i(this,q).forEach(e=>i(this,X).call(this,...e)),i(this,q).clear())});w(this,X,(e,t,n,s=!1)=>{if(!i(this,K))i(this,q).add([e,t,n,s]);else{const{url:o,method:f,...j}=n||{};i(this,K).call(this,{url:o,method:f,...j}).then(a=>{if(![0,1].includes(a.code))throw ae(a.code,a.msg,a.data,o,a==null?void 0:a.res);return[a.code,a.msg,a.data,o,a==null?void 0:a.res]}).then(a=>((t=="#"||f=="GET")&&i(this,$)[t].set(e,a),t!="#"&&f=="GET"&&!s&&setTimeout(()=>{i(this,$)[t].delete(e)},300),a)).then(a=>{var C;return(C=i(this,I).get(e))==null?void 0:C.forEach((R,M,B)=>{R&&R[0](a),delete B[M]})}).catch(a=>{var C;i(this,$)[t].delete(e),(C=i(this,I).get(e))==null||C.forEach((R,M,B)=>{R&&R[1](a instanceof oe?a:ae(-1,a,null,o)),delete B[M]})}).finally(()=>i(this,I).delete(e))}});y(this,"request",({url:e="/",method:t="GET",...n},s=!1)=>{var M;e=he(e,"/");const o=t.toUpperCase(),f=fe(JSON.stringify([e,o,n])),j=(M=e==null?void 0:e.includes)!=null&&M.call(e,"/_/")?"#":"$",{promise:a,resolve:C,reject:R}=Promise.withResolvers();return i(this,$)[j].has(f)?(console.log("cache",e),C(i(this,$)[j].get(f))):i(this,I).has(f)?i(this,I).get(f).push([C,R]):(i(this,I).set(f,[[C,R]]),i(this,X).call(this,f,j,{url:e,method:o,...n},s)),new Proxy(a,{get:(B,G)=>(...g)=>B.then(l=>ae(...l)[G](...g)).catch(l=>{if(!l instanceof oe)throw l;return typeof l[G]=="function"?l[G](...g):l[G]})})});y(this,"get",(e,t={})=>this.request({url:e,method:"GET",params:t}));y(this,"post",(e,t={},n={})=>this.request({url:e,method:"POST",data:t,params:n}));y(this,"put",(e,t={},n={})=>this.request({url:e,method:"PUT",data:t,params:n}));y(this,"del",(e,t={},n={})=>this.request({url:e,method:"DELETE",data:t,params:n}));y(this,"download",(e,t)=>{});y(this,"cache",(e,t={})=>this.request({url:e,method:"GET",params:t},!0));y(this,"list",(e,t={})=>this.get(`/api/${e}/${this.encode(t)}`));y(this,"getAppInfo",()=>{});y(this,"refreshCache",(e=!1)=>{e&&i(this,$)["#"].clear(),i(this,$).$.clear()});y(this,"decode",(e="",t={})=>{if(e===void 0||e===""||e===null)return t;try{const n=i(this,k).decode(e);return V.unpack(n)}catch{return console.warn("core.decode",e),t}});y(this,"encode",(e={})=>{const t=JSON.stringify(e,(n,s)=>s===void 0?null:s);return i(this,k).encode(V.pack(t))});this.init(e,t,n)}}K=new WeakMap,k=new WeakMap,se=new WeakMap,$=new WeakMap,I=new WeakMap,q=new WeakMap,ie=new WeakMap,X=new WeakMap;const pe=ce;ce.onUnhandledRejection=r=>{var e,t,n,s,o,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&&((o=(s=r.reason)==null?void 0:s.$echoMsg)==null||o.call(s),(f=r==null?void 0:r.preventDefault)==null||f.call(r))},ce.onMsg=(r,e)=>[0,1].includes(r)?console.log(e):console.warn(e),u.default=pe,u.signature=fe,u.str2uint8array=de,u.trim=he,u.uint8array2str=Te,Object.defineProperties(u,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})}); +(function(u,h){typeof exports=="object"&&typeof module<"u"?h(exports):typeof define=="function"&&define.amd?define(["exports"],h):(u=typeof globalThis<"u"?globalThis:u||self,h(u["ff-request"]={}))})(this,function(u){"use strict";var Ae=Object.defineProperty;var Ce=(u,h,b)=>h in u?Ae(u,h,{enumerable:!0,configurable:!0,writable:!0,value:b}):u[h]=b;var w=(u,h,b)=>(Ce(u,typeof h!="symbol"?h+"":h,b),b),ve=(u,h,b)=>{if(!h.has(u))throw TypeError("Cannot "+b)};var i=(u,h,b)=>(ve(u,h,"read from private field"),b?b.call(u):h.get(u)),y=(u,h,b)=>{if(h.has(u))throw TypeError("Cannot add the same private member more than once");h instanceof WeakSet?h.add(u):h.set(u,b)},N=(u,h,b,V)=>(ve(u,h,"write to private field"),V?V.call(u,b):h.set(u,b),b);var z,k,K,D,ee,te,Y,re,ne,Q,W,q,B,se,$,F,H,ie,X;function h(r){return r&&r.__esModule&&Object.prototype.hasOwnProperty.call(r,"default")?r.default:r}var b={};(function(r){(function(e){e([],function(){var t=-1,n=-2,s=-3,o=-4,f=-5,j=function(g,l){l=l||{};var E=l.verbose||!1;E&&console.log("Normalize the JSON Object"),g=typeof g=="string"?this.JSON.parse(g):g,E&&console.log("Creating a empty dictionary");var d={strings:[],integers:[],floats:[]};E&&console.log("Creating the AST");var p=function x(c){E&&console.log("Calling recursiveAstBuilder with "+this.JSON.stringify(c));var T=typeof c;if(c===null)return{type:"null",index:s};if(typeof c>"u")return{type:"undefined",index:f};if(c instanceof Array){var _=["@"];for(var O in c)c.hasOwnProperty(O)&&_.push(x(c[O]));return _}if(T==="object"){var _=["$"];for(var I in c)c.hasOwnProperty(I)&&(_.push(x(I)),_.push(x(c[I])));return _}if(c==="")return{type:"empty",index:o};if(T==="string"){var P=J.call(d.strings,c);return P==-1&&(d.strings.push(C(c)),P=d.strings.length-1),{type:"strings",index:P}}if(T==="number"&&c%1===0){var P=J.call(d.integers,c);return P==-1&&(d.integers.push(M(c)),P=d.integers.length-1),{type:"integers",index:P}}if(T==="number"){var P=J.call(d.floats,c);return P==-1&&(d.floats.push(c),P=d.floats.length-1),{type:"floats",index:P}}if(T==="boolean")return{type:"boolean",index:c?t:n};throw new Error("Unexpected argument of type "+typeof c)}(g),S=d.strings.length,L=d.integers.length;d.floats.length,E&&console.log("Parsing the dictionary");var U=d.strings.join("|");return U+="^"+d.integers.join("|"),U+="^"+d.floats.join("|"),E&&console.log("Parsing the structure"),U+="^"+function x(c){if(E&&console.log("Calling a recursiveParser with "+this.JSON.stringify(c)),c instanceof Array){var T=c.shift();for(var _ in c)c.hasOwnProperty(_)&&(T+=x(c[_])+"|");return(T[T.length-1]==="|"?T.slice(0,-1):T)+"]"}var O=c.type,I=c.index;if(O==="strings")return M(I);if(O==="integers")return M(S+I);if(O==="floats")return M(S+L+I);if(O==="boolean")return c.index;if(O==="null")return s;if(O==="undefined")return f;if(O==="empty")return o;throw new TypeError("The item is alien!")}(p),E&&console.log("Ending parser"),l.debug?{dictionary:d,ast:p,packed:U}:U},a=function(g,l){l=l||{};var E=g.split("^");l.verbose&&console.log("Building dictionary");var d=[],p=E[0];if(p!==""){p=p.split("|"),l.verbose&&console.log("Parse the strings dictionary");for(var S=0,L=p.length;Si(this,ee).call(this,t),ownKeys:()=>Object.keys(i(this,D).getPrototypeOf()||{}),getPrototypeOf:()=>i(this,k)?this:this.data,getOwnPropertyDescriptor:()=>({configurable:!0,enumerable:!0,writable:!0,value:i(this,D).getPrototypeOf()})});y(this,ee,e=>e==="$echoMsg"?i(this,Y):e==="msg"?i(this,te):e==="then"||e==="resp"?(N(this,K,!0),N(this,k,e==="resp"),i(this,re)):e==="catch"?i(this,ne):e==="IS_ECHO_MSG"?i(this,K):Reflect.get(this,e));y(this,te,(e=n=>n,t=!1)=>(i(this,Y).call(this),N(this,k,t),Promise.resolve(e==null?void 0:e(i(this,D).getPrototypeOf()))));y(this,Y,()=>{i(this,K)&&(N(this,K,!1),pe.onMsg(this.code,this.message))});y(this,re,e=>[0,1].includes(this.code)?Promise.resolve(e==null?void 0:e(i(this,D).getPrototypeOf())):Promise.reject(i(this,z)));y(this,ne,e=>Promise.resolve(e(i(this,z))));return this.code=e,this.message=t,this.data=n,this.url=s,this.res=o,N(this,z,new Proxy(this,i(this,D)))}}z=new WeakMap,k=new WeakMap,K=new WeakMap,D=new WeakMap,ee=new WeakMap,te=new WeakMap,Y=new WeakMap,re=new WeakMap,ne=new WeakMap;const ae=(r,e,t,n="/",s="")=>new oe(r,e,t,n,s);var le=["utf8","utf-8","unicode-1-1-utf-8"];function we(r){if(le.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"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),o=new Array(s.length);for(let f=0;f{let e=5381;for(let t=0;t>>0).toString(16)},he=(r,e)=>r.replace(new RegExp(`^${e}+|${e}+$`,"g"),""),de=r=>be.encode(r||""),Te=r=>Ee.decode(new DataView(r),{}),Oe=62,Z=30,ge=31,Se=63;class Pe{constructor(e){w(this,"encodeTable",[]);w(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&Z)===Z&&((this.pos>6||s>ge)&&(n=5),s&=ge),t.push(i(this,Q).encodeTable[s].charCodeAt(0)),this.pos-=n}return t}}Q=new WeakMap;class _e{constructor(e){y(this,W,null);N(this,W,e)}decode(e){const t=new Uint8Array(Math.ceil(e.length*6/8)+1);let n=t.length,s=0,o=0;for(let f=0;f=8&&(n--,t[n]=o&255,s%=8,o>>=8)}return s>0&&(n--,t[n]=o&255),t.slice(n)}}W=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 ce{constructor(e,t,n){y(this,q,void 0);y(this,B,void 0);y(this,se,void 0);y(this,$,{"#":new Map,$:new Map});y(this,F,new Map);y(this,H,new Set);w(this,"init",(e,t,n)=>{e&&N(this,se,e),n&&N(this,q,n),t&&N(this,B,new Pe(t)),i(this,ie).call(this)});y(this,ie,()=>{!i(this,H).size||!i(this,q)||(i(this,H).forEach(e=>i(this,X).call(this,...e)),i(this,H).clear())});y(this,X,(e,t,n,s=!1)=>{if(!i(this,q))i(this,H).add([e,t,n,s]);else{const{url:o,method:f,...j}=n||{};i(this,q).call(this,{url:o,method:f,...j}).then(a=>{if(![0,1].includes(a.code))throw ae(a.code,a.msg,a.data,o,a==null?void 0:a.res);return[a.code,a.msg,a.data,o,a==null?void 0:a.res]}).then(a=>((t=="#"||f=="GET")&&i(this,$)[t].set(e,a),t!="#"&&f=="GET"&&!s&&setTimeout(()=>{i(this,$)[t].delete(e)},300),a)).then(a=>{var C;return(C=i(this,F).get(e))==null?void 0:C.forEach((R,M,G)=>{R&&R[0](a),delete G[M]})}).catch(a=>{var C;i(this,$)[t].delete(e),(C=i(this,F).get(e))==null||C.forEach((R,M,G)=>{R&&R[1](a instanceof oe?a:ae(-1,a,null,o)),delete G[M]})}).finally(()=>i(this,F).delete(e))}});w(this,"request",({url:e="/",method:t="GET",...n},s=!1)=>{var M;e=he(e,"/");const o=t.toUpperCase(),f=fe(JSON.stringify([e,o,n])),j=(M=e==null?void 0:e.includes)!=null&&M.call(e,"/_/")?"#":"$",{promise:a,resolve:C,reject:R}=Promise.withResolvers();return i(this,$)[j].has(f)?(console.log("cache",e),C(i(this,$)[j].get(f))):i(this,F).has(f)?i(this,F).get(f).push([C,R]):(i(this,F).set(f,[[C,R]]),i(this,X).call(this,f,j,{url:e,method:o,...n},s)),new Proxy(a,{get:(G,J)=>(...g)=>G.then(l=>ae(...l)[J](...g)).catch(l=>{if(!l instanceof oe)throw l;return typeof l[J]=="function"?l[J](...g):l[J]})})});w(this,"get",(e,t={})=>this.request({url:e,method:"GET",params:t}));w(this,"post",(e,t={},n={})=>this.request({url:e,method:"POST",data:t,params:n}));w(this,"put",(e,t={},n={})=>this.request({url:e,method:"PUT",data:t,params:n}));w(this,"del",(e,t={},n={})=>this.request({url:e,method:"DELETE",data:t,params:n}));w(this,"download",(e,t)=>{});w(this,"cache",(e,t={})=>this.request({url:e,method:"GET",params:t},!0));w(this,"list",(e,t={})=>this.get(`/api/${e}/${this.encode(t)}`));w(this,"getAppInfo",()=>{});w(this,"refreshCache",(e=!1)=>{e&&i(this,$)["#"].clear(),i(this,$).$.clear()});w(this,"decode",(e="",t={})=>{if(e===void 0||e===""||e===null)return t;try{if(!i(this,B))throw new Error("未初始化 appSecret,请先通过 init 设置 appSecret");const n=i(this,B).decode(e);return V.unpack(n)}catch{return console.warn("core.decode",e),t}});w(this,"encode",(e={})=>{if(!i(this,B))throw new Error("未初始化 appSecret,请先通过 init 设置 appSecret");const t=JSON.stringify(e,(n,s)=>s===void 0?null:s);return i(this,B).encode(V.pack(t))});this.init(e,t,n)}}q=new WeakMap,B=new WeakMap,se=new WeakMap,$=new WeakMap,F=new WeakMap,H=new WeakMap,ie=new WeakMap,X=new WeakMap;const pe=ce;ce.onUnhandledRejection=r=>{var e,t,n,s,o,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&&((o=(s=r.reason)==null?void 0:s.$echoMsg)==null||o.call(s),(f=r==null?void 0:r.preventDefault)==null||f.call(r))},ce.onMsg=(r,e)=>[0,1].includes(r)?console.log(e):console.warn(e),u.default=pe,u.signature=fe,u.str2uint8array=de,u.trim=he,u.uint8array2str=Te,Object.defineProperties(u,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})}); diff --git a/package.json b/package.json index f5accd5..9a75e4f 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ff-request", "private": true, - "version": "0.10.2", + "version": "0.10.3", "type": "module", "files": [ "dist"