dfx 0.99.0 → 0.99.1
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/DiscordREST.d.ts +1 -1
- package/DiscordREST.js +7 -7
- package/DiscordREST.js.map +1 -1
- package/mjs/DiscordREST.mjs +7 -7
- package/mjs/DiscordREST.mjs.map +1 -1
- package/mjs/version.mjs +1 -1
- package/package.json +2 -2
- package/src/DiscordREST.ts +10 -10
- package/src/version.ts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
package/DiscordREST.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ declare const DiscordRESTError_base: new <A extends Record<string, any>>(args: i
|
|
|
13
13
|
readonly _tag: "DiscordRESTError";
|
|
14
14
|
} & Readonly<A>;
|
|
15
15
|
export declare class DiscordRESTError extends DiscordRESTError_base<{
|
|
16
|
-
|
|
16
|
+
cause: HttpError.HttpClientError;
|
|
17
17
|
body?: unknown;
|
|
18
18
|
}> {
|
|
19
19
|
get message(): string;
|
package/DiscordREST.js
CHANGED
|
@@ -28,7 +28,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
|
|
|
28
28
|
const DiscordRESTErrorTypeId = exports.DiscordRESTErrorTypeId = /*#__PURE__*/Symbol.for("dfx/DiscordREST/DiscordRESTError");
|
|
29
29
|
class DiscordRESTError extends (0, _Error.TypeIdError)(DiscordRESTErrorTypeId, "DiscordRESTError") {
|
|
30
30
|
get message() {
|
|
31
|
-
const httpMessage = this.
|
|
31
|
+
const httpMessage = this.cause.message;
|
|
32
32
|
return this.body !== undefined ? `${httpMessage}: ${JSON.stringify(this.body)}` : httpMessage;
|
|
33
33
|
}
|
|
34
34
|
}
|
|
@@ -85,19 +85,19 @@ const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
85
85
|
const httpExecutor = (0, _Function.pipe)(HttpClient.filterStatusOk(http), HttpClient.mapRequest(req => (0, _Function.pipe)(HttpRequest.prependUrl(req, rest.baseUrl), HttpRequest.setHeaders({
|
|
86
86
|
Authorization: `Bot ${Redacted.value(token)}`,
|
|
87
87
|
"User-Agent": `DiscordBot (https://github.com/tim-smart/dfx, ${_version.LIB_VERSION})`
|
|
88
|
-
}))), HttpClient.catchAll(
|
|
89
|
-
|
|
88
|
+
}))), HttpClient.catchAll(cause => cause.reason === "StatusCode" ? cause.response.json.pipe(Effect.mapError(_ => new DiscordRESTError({
|
|
89
|
+
cause
|
|
90
90
|
})), Effect.flatMap(body => Effect.fail(new DiscordRESTError({
|
|
91
|
-
|
|
91
|
+
cause,
|
|
92
92
|
body
|
|
93
93
|
})))) : Effect.fail(new DiscordRESTError({
|
|
94
|
-
|
|
94
|
+
cause
|
|
95
95
|
}))));
|
|
96
96
|
const executor = request => requestRateLimit(request.url, request).pipe(Effect.zipLeft(globalRateLimit), Effect.zipRight(httpExecutor(request)), Effect.tap(response => updateBuckets(request, response)), Effect.catchTag("DiscordRESTError", e => {
|
|
97
|
-
if (e.
|
|
97
|
+
if (e.cause.reason !== "StatusCode") {
|
|
98
98
|
return Effect.fail(e);
|
|
99
99
|
}
|
|
100
|
-
const response = e.
|
|
100
|
+
const response = e.cause.response;
|
|
101
101
|
switch (response.status) {
|
|
102
102
|
case 403:
|
|
103
103
|
return Effect.zipRight(Effect.all([Effect.annotateLogs(Effect.logDebug("403"), "url", request.url), addBadRoute((0, _utils.routeFromConfig)(request.url, request.method)), updateBuckets(request, response)], {
|
package/DiscordREST.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.js","names":["_Error","require","HttpClient","_interopRequireWildcard","HttpRequest","_DiscordConfig","_utils","_RateLimit","Discord","_version","_Context","_Duration","Duration","Effect","Effectable","_Function","HashSet","Layer","Option","Ref","Redacted","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","DiscordRESTErrorTypeId","exports","Symbol","for","DiscordRESTError","TypeIdError","message","httpMessage","error","body","undefined","JSON","stringify","make","gen","rest","token","DiscordConfig","http","store","RateLimitStore","maybeWait","RateLimiter","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","logDebug","pipe","zipRight","update","add","incrementCounter","annotateLogs","isBadRoute","map","removeBadRoute","remove","invalidRateLimit","tap","invalid","void","asVoid","requestRateLimit","path","request","Do","let","routeFromConfig","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","key","millis","resetAfter","updateBuckets","response","url","rateLimitFromHeaders","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","retryAfter","all","concurrency","discard","ignore","httpExecutor","filterStatusOk","mapRequest","req","prependUrl","baseUrl","setHeaders","Authorization","value","LIB_VERSION","catchAll","reason","json","mapError","_","fail","executor","zipLeft","catchTag","status","sleep","getOrElse","seconds","package","module","routes","createRoutes","options","params","hasBody","appendUrlParams","_tag","formData","append","unsafeJsonBody","RestResponseImpl","Class","effect","constructor","commit","scoped","DiscordREST","GenericTag","DiscordRESTLive","provide","RateLimiterLive"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,MAAA,gBAAAC,OAAA;AACA,IAAAC,UAAA,gBAAAC,uBAAA,eAAAF,OAAA;AACA,IAAAG,WAAA,gBAAAD,uBAAA,eAAAF,OAAA;AAGA,IAAAI,cAAA,gBAAAJ,OAAA;AAEA,IAAAK,MAAA,gBAAAL,OAAA;AAKA,IAAAM,UAAA,gBAAAN,OAAA;AACA,IAAAO,OAAA,gBAAAL,uBAAA,eAAAF,OAAA;AACA,IAAAQ,QAAA,gBAAAR,OAAA;AACA,IAAAS,QAAA,gBAAAT,OAAA;AACA,IAAAU,SAAA,gBAAAR,uBAAA,eAAAF,OAAA;AAA2C,IAAAW,QAAA,GAAAD,SAAA;AAE3C,IAAAE,MAAA,gBAAAV,uBAAA,eAAAF,OAAA;AACA,IAAAa,UAAA,gBAAAX,uBAAA,eAAAF,OAAA;AACA,IAAAc,SAAA,gBAAAd,OAAA;AACA,IAAAe,OAAA,gBAAAb,uBAAA,eAAAF,OAAA;AACA,IAAAgB,KAAA,gBAAAd,uBAAA,eAAAF,OAAA;AACA,IAAAiB,MAAA,gBAAAf,uBAAA,eAAAF,OAAA;AACA,IAAAkB,GAAA,gBAAAhB,uBAAA,eAAAF,OAAA;AAEA,IAAAmB,QAAA,gBAAAjB,uBAAA,eAAAF,OAAA;AAA2C,SAAAoB,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAnB,wBAAAmB,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAEpC,MAAMW,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,gBAAGE,MAAM,CAACC,GAAG,CAC9C,kCAAkC,CACnC;AAEK,MAAOC,gBAAiB,SAAQ,IAAAC,kBAAW,EAC/CL,sBAAsB,EACtB,kBAAkB,CAIlB;EACA,IAAIM,OAAOA,CAAA;IACT,MAAMC,WAAW,GAAG,IAAI,CAACC,KAAK,CAACF,OAAO;IACtC,OAAO,IAAI,CAACG,IAAI,KAAKC,SAAS,GAC1B,GAAGH,WAAW,KAAKI,IAAI,CAACC,SAAS,CAAC,IAAI,CAACH,IAAI,CAAC,EAAE,GAC9CF,WAAW;EACjB;;AACDN,OAAA,CAAAG,gBAAA,GAAAA,gBAAA;AAED,MAAMS,IAAI,gBAAGzC,MAAM,CAAC0C,GAAG,CAAC,aAAS;EAC/B,MAAM;IAAEC,IAAI;IAAEC;EAAK,CAAE,GAAG,OAAOC,4BAAa;EAE5C,MAAMC,IAAI,GAAG,OAAOzD,UAAU,CAACA,UAAU;EACzC,MAAM0D,KAAK,GAAG,OAAOC,yBAAc;EACnC,MAAM;IAAEC;EAAS,CAAE,GAAG,OAAOC,sBAAW;EAExC,MAAMC,eAAe,GAAGF,SAAS,CAC/B,iBAAiB,EACjBlD,QAAQ,CAACqD,MAAM,CAACT,IAAI,CAACQ,eAAe,CAACE,MAAM,CAAC,EAC5CV,IAAI,CAACQ,eAAe,CAACG,KAAK,CAC3B;EAED;EACA,MAAMC,YAAY,GAAG,OAAOjD,GAAG,CAACmC,IAAI,CAACtC,OAAO,CAACqD,KAAK,EAAU,CAAC;EAC7D,MAAMC,UAAU,GAAG1D,QAAQ,CAAC2D,QAAQ,CAAC3D,QAAQ,CAAC4D,OAAO,CAAC,EAAE,CAAC,CAAC;EAC1D,MAAMC,WAAW,GAAIC,KAAa,IAChC7D,MAAM,CAAC8D,QAAQ,CAAC,WAAW,CAAC,CAACC,IAAI,CAC/B/D,MAAM,CAACgE,QAAQ,CAAC1D,GAAG,CAAC2D,MAAM,CAACV,YAAY,EAAEpD,OAAO,CAAC+D,GAAG,CAACL,KAAK,CAAC,CAAC,CAAC,EAC7D7D,MAAM,CAACgE,QAAQ,CACbjB,KAAK,CAACoB,gBAAgB,CAAC,kBAAkB,EAAEV,UAAU,EAAE,KAAK,CAAC,CAC9D,EACDzD,MAAM,CAACoE,YAAY,CAAC,OAAO,EAAEP,KAAK,CAAC,CACpC;EACH,MAAMQ,UAAU,GAAIR,KAAa,IAC/B7D,MAAM,CAACsE,GAAG,CAAChE,GAAG,CAACU,GAAG,CAACuC,YAAY,CAAC,EAAEpD,OAAO,CAACY,GAAG,CAAC8C,KAAK,CAAC,CAAC;EACvD,MAAMU,cAAc,GAAIV,KAAa,IACnCvD,GAAG,CAAC2D,MAAM,CAACV,YAAY,EAAEpD,OAAO,CAACqE,MAAM,CAACX,KAAK,CAAC,CAAC;EAEjD,MAAMY,gBAAgB,GAAIZ,KAAa,IACrCQ,UAAU,CAACR,KAAK,CAAC,CAACE,IAAI,CACpB/D,MAAM,CAAC0E,GAAG,CAACC,OAAO,IAChBA,OAAO,GACH1B,SAAS,CAAC,kBAAkB,EAAElD,QAAQ,CAAC4D,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAC1D3D,MAAM,CAAC4E,IAAI,CAChB,EACD5E,MAAM,CAAC6E,MAAM,CACd;EAEH;EACA,MAAMC,gBAAgB,GAAGA,CACvBC,IAAY,EACZC,OAAsC,KAEtChF,MAAM,CAACiF,EAAE,CAAClB,IAAI,CACZ/D,MAAM,CAACkF,GAAG,CAAC,OAAO,EAAE,MAAM,IAAAC,sBAAe,EAACJ,IAAI,EAAEC,OAAO,CAACI,MAAM,CAAC,CAAC,EAChEpF,MAAM,CAACqF,IAAI,CAAC,aAAa,EAAE,CAAC;IAAExB;EAAK,CAAE,KAAKd,KAAK,CAACuC,iBAAiB,CAACzB,KAAK,CAAC,CAAC,EACzE7D,MAAM,CAACuF,OAAO,CAAC,CAAC;IAAEC,WAAW;IAAE3B;EAAK,CAAE,KACpCxD,MAAM,CAACoF,KAAK,CAACD,WAAW,EAAE;IACxBE,MAAM,EAAEA,CAAA,KAAMjB,gBAAgB,CAACZ,KAAK,CAAC;IACrC8B,MAAM,EAAEC,MAAM,IACZ5F,MAAM,CAACgE,QAAQ,CACbS,gBAAgB,CAACZ,KAAK,CAAC,EACvBZ,SAAS,CACP,YAAY2C,MAAM,CAACC,GAAG,EAAE,EACxB,IAAAC,gBAAM,EAACF,MAAM,CAACG,UAAU,CAAC,EACzBH,MAAM,CAACtC,KAAK,CACb;GAEN,CAAC,CACH,CACF;EAEH;EACA,MAAM0C,aAAa,GAAGA,CACpBhB,OAAsC,EACtCiB,QAAyC,KAEzCjG,MAAM,CAACiF,EAAE,CAAClB,IAAI,CACZ/D,MAAM,CAACkF,GAAG,CAAC,OAAO,EAAE,MAAM,IAAAC,sBAAe,EAACH,OAAO,CAACkB,GAAG,EAAElB,OAAO,CAACI,MAAM,CAAC,CAAC,EACvEpF,MAAM,CAACqF,IAAI,CAAC,WAAW,EAAE,MAAM,IAAAc,2BAAoB,EAACF,QAAQ,CAACG,OAAO,CAAC,CAAC,EACtEpG,MAAM,CAACqF,IAAI,CAAC,WAAW,EAAE,CAAC;IAAEgB;EAAS,CAAE,KACrCtD,KAAK,CAACuD,SAAS,CAACD,SAAS,CAACT,MAAM,CAAC,CAClC,EACD5F,MAAM,CAACuF,OAAO,CAAC,CAAC;IAAEe,SAAS;IAAED,SAAS;IAAExC;EAAK,CAAE,KAAI;IACjD,MAAM0C,YAAY,GAAG,CACnBhC,cAAc,CAACV,KAAK,CAAC,EACrBd,KAAK,CAACyD,cAAc,CAAC3C,KAAK,EAAEwC,SAAS,CAACT,MAAM,CAAC,CAC9C;IAED,IAAI,CAACU,SAAS,IAAID,SAAS,CAAC/C,KAAK,GAAG,CAAC,KAAK+C,SAAS,CAACI,SAAS,EAAE;MAC7DF,YAAY,CAACG,IAAI,CACf3D,KAAK,CAAC4D,aAAa,CAAC,cAAc9C,KAAK,EAAE,CAAC,EAC1Cd,KAAK,CAAC6D,SAAS,CAAC;QACdf,GAAG,EAAEQ,SAAS,CAACT,MAAM;QACrBG,UAAU,EAAEhG,QAAQ,CAAC2D,QAAQ,CAAC2C,SAAS,CAACQ,UAAU,CAAC;QACnDvD,KAAK,EACH,CAACgD,SAAS,IAAID,SAAS,CAACI,SAAS,GAAG,CAAC,GACjCJ,SAAS,CAACI,SAAS,GACnBJ,SAAS,CAAC/C;OACjB,CAAC,CACH;IACH;IAEA,OAAOtD,MAAM,CAAC8G,GAAG,CAACP,YAAY,EAAE;MAC9BQ,WAAW,EAAE,WAAW;MACxBC,OAAO,EAAE;KACV,CAAC;EACJ,CAAC,CAAC,EACFhH,MAAM,CAACiH,MAAM,CACd;EAEH,MAAMC,YAAY,GAAG,IAAAnD,cAAI,EACvB1E,UAAU,CAAC8H,cAAc,CAACrE,IAAI,CAAC,EAC/BzD,UAAU,CAAC+H,UAAU,CAACC,GAAG,IACvB,IAAAtD,cAAI,EACFxE,WAAW,CAAC+H,UAAU,CAACD,GAAG,EAAE1E,IAAI,CAAC4E,OAAO,CAAC,EACzChI,WAAW,CAACiI,UAAU,CAAC;IACrBC,aAAa,EAAE,OAAOlH,QAAQ,CAACmH,KAAK,CAAC9E,KAAK,CAAC,EAAE;IAC7C,YAAY,EAAE,iDAAiD+E,oBAAW;GAC3E,CAAC,CACH,CACF,EACDtI,UAAU,CAACuI,QAAQ,CAACxF,KAAK,IACvBA,KAAK,CAACyF,MAAM,KAAK,YAAY,GACzBzF,KAAK,CAAC6D,QAAQ,CAAC6B,IAAI,CAAC/D,IAAI,CACtB/D,MAAM,CAAC+H,QAAQ,CAACC,CAAC,IAAI,IAAIhG,gBAAgB,CAAC;IAAEI;EAAK,CAAE,CAAC,CAAC,EACrDpC,MAAM,CAACuF,OAAO,CAAClD,IAAI,IACjBrC,MAAM,CAACiI,IAAI,CAAC,IAAIjG,gBAAgB,CAAC;IAAEI,KAAK;IAAEC;EAAI,CAAE,CAAC,CAAC,CACnD,CACF,GACDrC,MAAM,CAACiI,IAAI,CAAC,IAAIjG,gBAAgB,CAAC;IAAEI;EAAK,CAAE,CAAC,CAAC,CACjD,CACF;EAED,MAAM8F,QAAQ,GACZlD,OAAsC,IAEtCF,gBAAgB,CAACE,OAAO,CAACkB,GAAG,EAAElB,OAAO,CAAC,CAACjB,IAAI,CACzC/D,MAAM,CAACmI,OAAO,CAAChF,eAAe,CAAC,EAC/BnD,MAAM,CAACgE,QAAQ,CACbkD,YAAY,CAAClC,OAAO,CAInB,CACF,EACDhF,MAAM,CAAC0E,GAAG,CAACuB,QAAQ,IAAID,aAAa,CAAChB,OAAO,EAAEiB,QAAQ,CAAC,CAAC,EACxDjG,MAAM,CAACoI,QAAQ,CAAC,kBAAkB,EAAE3H,CAAC,IAAG;IACtC,IAAIA,CAAC,CAAC2B,KAAK,CAACyF,MAAM,KAAK,YAAY,EAAE;MACnC,OAAO7H,MAAM,CAACiI,IAAI,CAACxH,CAAC,CAAC;IACvB;IAEA,MAAMwF,QAAQ,GAAGxF,CAAC,CAAC2B,KAAK,CAAC6D,QAAQ;IAEjC,QAAQA,QAAQ,CAACoC,MAAM;MACrB,KAAK,GAAG;QACN,OAAOrI,MAAM,CAACgE,QAAQ,CACpBhE,MAAM,CAAC8G,GAAG,CACR,CACE9G,MAAM,CAACoE,YAAY,CACjBpE,MAAM,CAAC8D,QAAQ,CAAC,KAAK,CAAC,EACtB,KAAK,EACLkB,OAAO,CAACkB,GAAG,CACZ,EACDtC,WAAW,CAAC,IAAAuB,sBAAe,EAACH,OAAO,CAACkB,GAAG,EAAElB,OAAO,CAACI,MAAM,CAAC,CAAC,EACzDY,aAAa,CAAChB,OAAO,EAAEiB,QAAQ,CAAC,CACjC,EACD;UAAEc,WAAW,EAAE,WAAW;UAAEC,OAAO,EAAE;QAAI,CAAE,CAC5C,EACDhH,MAAM,CAACiI,IAAI,CAACxH,CAAC,CAAC,CACf;MAEH,KAAK,GAAG;QACN,OAAOT,MAAM,CAACoE,YAAY,CACxBpE,MAAM,CAAC8D,QAAQ,CAAC,KAAK,CAAC,EACtB,KAAK,EACLkB,OAAO,CAACkB,GAAG,CACZ,CAACnC,IAAI,CACJ/D,MAAM,CAACgE,QAAQ,CACbJ,WAAW,CAAC,IAAAuB,sBAAe,EAACH,OAAO,CAACkB,GAAG,EAAElB,OAAO,CAACI,MAAM,CAAC,CAAC,CAC1D,EACDpF,MAAM,CAACgE,QAAQ,CAACgC,aAAa,CAAChB,OAAO,EAAEiB,QAAQ,CAAC,CAAC,EACjDjG,MAAM,CAACgE,QAAQ,CACbhE,MAAM,CAACsI,KAAK,CACVjI,MAAM,CAACkI,SAAS,CAAC,IAAA1B,iBAAU,EAACZ,QAAQ,CAACG,OAAO,CAAC,EAAE,MAC7CrG,QAAQ,CAACyI,OAAO,CAAC,CAAC,CAAC,CACpB,CACF,CACF,EACDxI,MAAM,CAACgE,QAAQ,CAACkE,QAAQ,CAAIlD,OAAO,CAAC,CAAC,CACtC;IACL;IAEA,OAAOhF,MAAM,CAACiI,IAAI,CAACxH,CAAC,CAAC;EACvB,CAAC,CAAC,EACFT,MAAM,CAACoE,YAAY,CAAC;IAClBqE,OAAO,EAAE,KAAK;IACdC,MAAM,EAAE;GACT,CAAC,CACH;EAEH,MAAMC,MAAM,GAAGhJ,OAAO,CAACiJ,YAAY,CACjC,CAAO;IACLxD,MAAM;IACNyD,OAAO,GAAG,EAAE;IACZC,MAAM;IACN5C;EAAG,CAIJ,KAAqB;IACpB,MAAM6C,OAAO,GAAG3D,MAAM,KAAK,KAAK,IAAIA,MAAM,KAAK,QAAQ;IACvD,IAAIJ,OAAO,GAAGzF,WAAW,CAACkD,IAAI,CAAC2C,MAAa,CAAC,CAACc,GAAG,EAAE2C,OAAO,CAAC;IAE3D,IAAI,CAACE,OAAO,EAAE;MACZ,IAAID,MAAM,EAAE;QACV9D,OAAO,GAAGzF,WAAW,CAACyJ,eAAe,CAAChE,OAAO,EAAE8D,MAAa,CAAC;MAC/D;IACF,CAAC,MAAM,IAAIA,MAAM,IAAI9D,OAAO,CAAC3C,IAAI,CAAC4G,IAAI,KAAK,UAAU,EAAE;MACrDjE,OAAO,CAAC3C,IAAI,CAAC6G,QAAQ,CAACC,MAAM,CAAC,cAAc,EAAE5G,IAAI,CAACC,SAAS,CAACsG,MAAM,CAAC,CAAC;IACtE,CAAC,MAAM,IAAIA,MAAM,EAAE;MACjB9D,OAAO,GAAGzF,WAAW,CAAC6J,cAAc,CAACpE,OAAO,EAAE8D,MAAM,CAAC;IACvD;IAEA,OAAO,IAAIO,gBAAgB,CAACnB,QAAQ,CAAClD,OAAO,CAAC,CAAC;EAChD,CAAC,CACF;EAED,OAAO;IACL,GAAG2D,MAAM;IACTT;GACD;AACH,CAAC,CAAC;AAEF,MAAMmB,gBACJ,SAAQpJ,UAAU,CAACqJ,KAA4C;EAIpDC,MAAA;EADXC,YACWD,MAIR;IAED,KAAK,EAAE;IANE,KAAAA,MAAM,GAANA,MAAM;EAOjB;EAEAE,MAAMA,CAAA;IACJ,OAAOzJ,MAAM,CAAC0J,MAAM,CAAC,IAAI,CAACH,MAAM,CAAC;EACnC;EAEA,IAAIzB,IAAIA,CAAA;IACN,OAAO9H,MAAM,CAAC0J,MAAM,CAAC1J,MAAM,CAACuF,OAAO,CAAC,IAAI,CAACgE,MAAM,EAAEvB,CAAC,IAAIA,CAAC,CAACF,IAAI,CAAC,CAAC;EAChE;EAEA,IAAI7B,QAAQA,CAAA;IACV,OAAO,IAAI,CAACsD,MAAM;EACpB;;AAcK,MAAMI,WAAW,GAAA9H,OAAA,CAAA8H,WAAA,gBAAG,IAAAC,mBAAU,EACnC,iBAAiB,CAClB;AACM,MAAMC,eAAe,GAAAhI,OAAA,CAAAgI,eAAA,gBAAGzJ,KAAK,CAACmJ,MAAM,CAACI,WAAW,EAAElH,IAAI,CAAC,CAACsB,IAAI,eACjE3D,KAAK,CAAC0J,OAAO,CAACC,0BAAe,CAAC,CAC/B","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"DiscordREST.js","names":["_Error","require","HttpClient","_interopRequireWildcard","HttpRequest","_DiscordConfig","_utils","_RateLimit","Discord","_version","_Context","_Duration","Duration","Effect","Effectable","_Function","HashSet","Layer","Option","Ref","Redacted","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","DiscordRESTErrorTypeId","exports","Symbol","for","DiscordRESTError","TypeIdError","message","httpMessage","cause","body","undefined","JSON","stringify","make","gen","rest","token","DiscordConfig","http","store","RateLimitStore","maybeWait","RateLimiter","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","logDebug","pipe","zipRight","update","add","incrementCounter","annotateLogs","isBadRoute","map","removeBadRoute","remove","invalidRateLimit","tap","invalid","void","asVoid","requestRateLimit","path","request","Do","let","routeFromConfig","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","key","millis","resetAfter","updateBuckets","response","url","rateLimitFromHeaders","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","retryAfter","all","concurrency","discard","ignore","httpExecutor","filterStatusOk","mapRequest","req","prependUrl","baseUrl","setHeaders","Authorization","value","LIB_VERSION","catchAll","reason","json","mapError","_","fail","executor","zipLeft","catchTag","status","sleep","getOrElse","seconds","package","module","routes","createRoutes","options","params","hasBody","appendUrlParams","_tag","formData","append","unsafeJsonBody","RestResponseImpl","Class","effect","constructor","commit","scoped","DiscordREST","GenericTag","DiscordRESTLive","provide","RateLimiterLive"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/mjs/DiscordREST.mjs
CHANGED
|
@@ -20,7 +20,7 @@ import * as Redacted from "effect/Redacted";
|
|
|
20
20
|
export const DiscordRESTErrorTypeId = /*#__PURE__*/Symbol.for("dfx/DiscordREST/DiscordRESTError");
|
|
21
21
|
export class DiscordRESTError extends TypeIdError(DiscordRESTErrorTypeId, "DiscordRESTError") {
|
|
22
22
|
get message() {
|
|
23
|
-
const httpMessage = this.
|
|
23
|
+
const httpMessage = this.cause.message;
|
|
24
24
|
return this.body !== undefined ? `${httpMessage}: ${JSON.stringify(this.body)}` : httpMessage;
|
|
25
25
|
}
|
|
26
26
|
}
|
|
@@ -76,19 +76,19 @@ const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
76
76
|
const httpExecutor = pipe(HttpClient.filterStatusOk(http), HttpClient.mapRequest(req => pipe(HttpRequest.prependUrl(req, rest.baseUrl), HttpRequest.setHeaders({
|
|
77
77
|
Authorization: `Bot ${Redacted.value(token)}`,
|
|
78
78
|
"User-Agent": `DiscordBot (https://github.com/tim-smart/dfx, ${LIB_VERSION})`
|
|
79
|
-
}))), HttpClient.catchAll(
|
|
80
|
-
|
|
79
|
+
}))), HttpClient.catchAll(cause => cause.reason === "StatusCode" ? cause.response.json.pipe(Effect.mapError(_ => new DiscordRESTError({
|
|
80
|
+
cause
|
|
81
81
|
})), Effect.flatMap(body => Effect.fail(new DiscordRESTError({
|
|
82
|
-
|
|
82
|
+
cause,
|
|
83
83
|
body
|
|
84
84
|
})))) : Effect.fail(new DiscordRESTError({
|
|
85
|
-
|
|
85
|
+
cause
|
|
86
86
|
}))));
|
|
87
87
|
const executor = request => requestRateLimit(request.url, request).pipe(Effect.zipLeft(globalRateLimit), Effect.zipRight(httpExecutor(request)), Effect.tap(response => updateBuckets(request, response)), Effect.catchTag("DiscordRESTError", e => {
|
|
88
|
-
if (e.
|
|
88
|
+
if (e.cause.reason !== "StatusCode") {
|
|
89
89
|
return Effect.fail(e);
|
|
90
90
|
}
|
|
91
|
-
const response = e.
|
|
91
|
+
const response = e.cause.response;
|
|
92
92
|
switch (response.status) {
|
|
93
93
|
case 403:
|
|
94
94
|
return Effect.zipRight(Effect.all([Effect.annotateLogs(Effect.logDebug("403"), "url", request.url), addBadRoute(routeFromConfig(request.url, request.method)), updateBuckets(request, response)], {
|
package/mjs/DiscordREST.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.mjs","names":["TypeIdError","HttpClient","HttpRequest","DiscordConfig","rateLimitFromHeaders","retryAfter","routeFromConfig","RateLimitStore","RateLimiter","RateLimiterLive","Discord","LIB_VERSION","GenericTag","Duration","millis","Effect","Effectable","pipe","HashSet","Layer","Option","Ref","Redacted","DiscordRESTErrorTypeId","Symbol","for","DiscordRESTError","message","httpMessage","
|
|
1
|
+
{"version":3,"file":"DiscordREST.mjs","names":["TypeIdError","HttpClient","HttpRequest","DiscordConfig","rateLimitFromHeaders","retryAfter","routeFromConfig","RateLimitStore","RateLimiter","RateLimiterLive","Discord","LIB_VERSION","GenericTag","Duration","millis","Effect","Effectable","pipe","HashSet","Layer","Option","Ref","Redacted","DiscordRESTErrorTypeId","Symbol","for","DiscordRESTError","message","httpMessage","cause","body","undefined","JSON","stringify","make","gen","rest","token","http","store","maybeWait","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","logDebug","zipRight","update","add","incrementCounter","annotateLogs","isBadRoute","map","get","has","removeBadRoute","remove","invalidRateLimit","tap","invalid","void","asVoid","requestRateLimit","path","request","Do","let","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","key","resetAfter","updateBuckets","response","url","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","all","concurrency","discard","ignore","httpExecutor","filterStatusOk","mapRequest","req","prependUrl","baseUrl","setHeaders","Authorization","value","catchAll","reason","json","mapError","_","fail","executor","zipLeft","catchTag","e","status","sleep","getOrElse","seconds","package","module","routes","createRoutes","options","params","hasBody","appendUrlParams","_tag","formData","append","unsafeJsonBody","RestResponseImpl","Class","effect","constructor","commit","scoped","DiscordREST","DiscordRESTLive","provide"],"sources":["../src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/mjs/version.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.99.
|
|
1
|
+
export const LIB_VERSION = "0.99.1";
|
|
2
2
|
//# sourceMappingURL=version.mjs.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dfx",
|
|
3
|
-
"version": "0.99.
|
|
3
|
+
"version": "0.99.1",
|
|
4
4
|
"description": "Effect-TS discord library",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -41,6 +41,6 @@
|
|
|
41
41
|
"optionalDependencies": {
|
|
42
42
|
"discord-verify": "^1.2.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "1aa4042b1d16d57d11bab60326299f0ef8ff6c20",
|
|
45
45
|
"main": "./index.js"
|
|
46
46
|
}
|
package/src/DiscordREST.ts
CHANGED
|
@@ -34,11 +34,11 @@ export class DiscordRESTError extends TypeIdError(
|
|
|
34
34
|
DiscordRESTErrorTypeId,
|
|
35
35
|
"DiscordRESTError",
|
|
36
36
|
)<{
|
|
37
|
-
|
|
37
|
+
cause: HttpError.HttpClientError
|
|
38
38
|
body?: unknown
|
|
39
39
|
}> {
|
|
40
40
|
get message() {
|
|
41
|
-
const httpMessage = this.
|
|
41
|
+
const httpMessage = this.cause.message
|
|
42
42
|
return this.body !== undefined
|
|
43
43
|
? `${httpMessage}: ${JSON.stringify(this.body)}`
|
|
44
44
|
: httpMessage
|
|
@@ -158,15 +158,15 @@ const make = Effect.gen(function* () {
|
|
|
158
158
|
}),
|
|
159
159
|
),
|
|
160
160
|
),
|
|
161
|
-
HttpClient.catchAll(
|
|
162
|
-
|
|
163
|
-
?
|
|
164
|
-
Effect.mapError(_ => new DiscordRESTError({
|
|
161
|
+
HttpClient.catchAll(cause =>
|
|
162
|
+
cause.reason === "StatusCode"
|
|
163
|
+
? cause.response.json.pipe(
|
|
164
|
+
Effect.mapError(_ => new DiscordRESTError({ cause })),
|
|
165
165
|
Effect.flatMap(body =>
|
|
166
|
-
Effect.fail(new DiscordRESTError({
|
|
166
|
+
Effect.fail(new DiscordRESTError({ cause, body })),
|
|
167
167
|
),
|
|
168
168
|
)
|
|
169
|
-
: Effect.fail(new DiscordRESTError({
|
|
169
|
+
: Effect.fail(new DiscordRESTError({ cause })),
|
|
170
170
|
),
|
|
171
171
|
)
|
|
172
172
|
|
|
@@ -184,11 +184,11 @@ const make = Effect.gen(function* () {
|
|
|
184
184
|
),
|
|
185
185
|
Effect.tap(response => updateBuckets(request, response)),
|
|
186
186
|
Effect.catchTag("DiscordRESTError", e => {
|
|
187
|
-
if (e.
|
|
187
|
+
if (e.cause.reason !== "StatusCode") {
|
|
188
188
|
return Effect.fail(e)
|
|
189
189
|
}
|
|
190
190
|
|
|
191
|
-
const response = e.
|
|
191
|
+
const response = e.cause.response
|
|
192
192
|
|
|
193
193
|
switch (response.status) {
|
|
194
194
|
case 403:
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.99.
|
|
1
|
+
export const LIB_VERSION = "0.99.1";
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "0.99.
|
|
1
|
+
export declare const LIB_VERSION = "0.99.1";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/version.js
CHANGED