dfx 0.118.8 → 0.118.10
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/DiscordGateway/Sharder.d.ts +1 -1
- package/DiscordREST.d.ts.map +1 -1
- package/DiscordREST.js +5 -9
- package/DiscordREST.js.map +1 -1
- package/mjs/DiscordREST.mjs +5 -9
- package/mjs/DiscordREST.mjs.map +1 -1
- package/mjs/version.mjs +1 -1
- package/mjs/version.mjs.map +1 -1
- package/package.json +2 -2
- package/src/DiscordREST.ts +5 -10
- package/src/version.ts +1 -1
- package/version.d.ts +1 -1
- package/version.d.ts.map +1 -1
- package/version.js +1 -1
- package/version.js.map +1 -1
|
@@ -10,5 +10,5 @@ export interface Sharder {
|
|
|
10
10
|
export declare const Sharder: import("effect/Context").Tag<Sharder, {
|
|
11
11
|
readonly shards: Effect.Effect<HashSet.HashSet<RunningShard>, never, never>;
|
|
12
12
|
}>;
|
|
13
|
-
export declare const SharderLive: Layer.Layer<Sharder, never, import("@effect/platform/HttpClient").HttpClient |
|
|
13
|
+
export declare const SharderLive: Layer.Layer<Sharder, never, DiscordConfig | import("@effect/platform/HttpClient").HttpClient | import("dfx/RateLimit").RateLimitStore | ShardStore | import("./Shard/StateStore").ShardStateStore | import("./DiscordWS").DiscordWSCodec | import("@effect/platform/Socket").WebSocketConstructor>;
|
|
14
14
|
//# sourceMappingURL=Sharder.d.ts.map
|
package/DiscordREST.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.d.ts","sourceRoot":"","sources":["./src/DiscordREST.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAA;AAGzD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAMjD,OAAO,EAAE,cAAc,EAAgC,MAAM,eAAe,CAAA;AAC5E,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAOpC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"DiscordREST.d.ts","sourceRoot":"","sources":["./src/DiscordREST.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAA;AAGzD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAMjD,OAAO,EAAE,cAAc,EAAgC,MAAM,eAAe,CAAA;AAC5E,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAOpC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AA4KrC,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAED,eAAO,MAAM,WAAW,gEAEvB,CAAA;AACD,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,KAAK,CACvC,WAAW,EACX,KAAK,EACL,aAAa,GAAG,UAAU,CAAC,UAAU,GAAG,cAAc,CACgB,CAAA"}
|
package/DiscordREST.js
CHANGED
|
@@ -74,22 +74,18 @@ const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
74
74
|
"User-Agent": `DiscordBot (https://github.com/tim-smart/dfx, ${_version.LIB_VERSION})`
|
|
75
75
|
}));
|
|
76
76
|
return requestRateLimit(request.url, request).pipe(Effect.zipLeft(globalRateLimit), Effect.as(request));
|
|
77
|
-
}), HttpClient.transformResponse((0, _Function.flow)(Effect.tap(response => updateBuckets(response.request, response)), Effect.
|
|
78
|
-
|
|
79
|
-
return Effect.fail(e);
|
|
80
|
-
}
|
|
81
|
-
const request = e.request;
|
|
82
|
-
const response = e.response;
|
|
77
|
+
}), HttpClient.transformResponse((0, _Function.flow)(Effect.tap(response => updateBuckets(response.request, response)), Effect.flatMap(response => {
|
|
78
|
+
const request = response.request;
|
|
83
79
|
switch (response.status) {
|
|
84
80
|
case 403:
|
|
85
|
-
return Effect.
|
|
81
|
+
return Effect.as(Effect.all([Effect.annotateLogs(Effect.logDebug("403"), "url", request.url), addBadRoute((0, _utils.routeFromConfig)(request.url, request.method)), updateBuckets(request, response)], {
|
|
86
82
|
concurrency: "unbounded",
|
|
87
83
|
discard: true
|
|
88
|
-
}),
|
|
84
|
+
}), response);
|
|
89
85
|
case 429:
|
|
90
86
|
return Effect.annotateLogs(Effect.logDebug("429"), "url", request.url).pipe(Effect.zipRight(addBadRoute((0, _utils.routeFromConfig)(request.url, request.method))), Effect.zipRight(updateBuckets(request, response)), Effect.zipRight(Effect.sleep(Option.getOrElse((0, _utils.retryAfter)(response.headers), () => Duration.seconds(5)))), Effect.zipRight(httpClient.execute(request)));
|
|
91
87
|
}
|
|
92
|
-
return Effect.
|
|
88
|
+
return Effect.succeed(response);
|
|
93
89
|
}), Effect.annotateLogs({
|
|
94
90
|
package: "dfx",
|
|
95
91
|
module: "DiscordREST"
|
package/DiscordREST.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.js","names":["HttpClient","_interopRequireWildcard","require","HttpRequest","_DiscordConfig","_utils","_RateLimit","Discord","_version","_Context","_Duration","Duration","Effect","HashSet","Layer","Option","Ref","Redacted","_Function","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","make","gen","rest","token","DiscordConfig","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","fnUntraced","path","request","routeFromConfig","method","maybeBucket","getBucketForRoute","isNone","bucket","value","key","millis","resetAfter","updateBuckets","response","url","rateLimitOption","rateLimitFromHeaders","headers","rateLimit","hasBucket","fibers","push","fork","putBucketRoute","remaining","removeCounter","putBucket","retryAfter","fiber","await","httpClient","mapRequestEffect","req","prependUrl","baseUrl","setHeaders","Authorization","LIB_VERSION","zipLeft","as","transformResponse","flow","
|
|
1
|
+
{"version":3,"file":"DiscordREST.js","names":["HttpClient","_interopRequireWildcard","require","HttpRequest","_DiscordConfig","_utils","_RateLimit","Discord","_version","_Context","_Duration","Duration","Effect","HashSet","Layer","Option","Ref","Redacted","_Function","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","make","gen","rest","token","DiscordConfig","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","fnUntraced","path","request","routeFromConfig","method","maybeBucket","getBucketForRoute","isNone","bucket","value","key","millis","resetAfter","updateBuckets","response","url","rateLimitOption","rateLimitFromHeaders","headers","rateLimit","hasBucket","fibers","push","fork","putBucketRoute","remaining","removeCounter","putBucket","retryAfter","fiber","await","httpClient","mapRequestEffect","req","prependUrl","baseUrl","setHeaders","Authorization","LIB_VERSION","zipLeft","as","transformResponse","flow","flatMap","status","all","concurrency","discard","sleep","getOrElse","seconds","execute","succeed","package","module","DiscordREST","exports","GenericTag","DiscordRESTLive","effect","provide","RateLimiterLive"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/mjs/DiscordREST.mjs
CHANGED
|
@@ -67,22 +67,18 @@ const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
67
67
|
"User-Agent": `DiscordBot (https://github.com/tim-smart/dfx, ${LIB_VERSION})`
|
|
68
68
|
}));
|
|
69
69
|
return requestRateLimit(request.url, request).pipe(Effect.zipLeft(globalRateLimit), Effect.as(request));
|
|
70
|
-
}), HttpClient.transformResponse(flow(Effect.tap(response => updateBuckets(response.request, response)), Effect.
|
|
71
|
-
|
|
72
|
-
return Effect.fail(e);
|
|
73
|
-
}
|
|
74
|
-
const request = e.request;
|
|
75
|
-
const response = e.response;
|
|
70
|
+
}), HttpClient.transformResponse(flow(Effect.tap(response => updateBuckets(response.request, response)), Effect.flatMap(response => {
|
|
71
|
+
const request = response.request;
|
|
76
72
|
switch (response.status) {
|
|
77
73
|
case 403:
|
|
78
|
-
return Effect.
|
|
74
|
+
return Effect.as(Effect.all([Effect.annotateLogs(Effect.logDebug("403"), "url", request.url), addBadRoute(routeFromConfig(request.url, request.method)), updateBuckets(request, response)], {
|
|
79
75
|
concurrency: "unbounded",
|
|
80
76
|
discard: true
|
|
81
|
-
}),
|
|
77
|
+
}), response);
|
|
82
78
|
case 429:
|
|
83
79
|
return Effect.annotateLogs(Effect.logDebug("429"), "url", request.url).pipe(Effect.zipRight(addBadRoute(routeFromConfig(request.url, request.method))), Effect.zipRight(updateBuckets(request, response)), Effect.zipRight(Effect.sleep(Option.getOrElse(retryAfter(response.headers), () => Duration.seconds(5)))), Effect.zipRight(httpClient.execute(request)));
|
|
84
80
|
}
|
|
85
|
-
return Effect.
|
|
81
|
+
return Effect.succeed(response);
|
|
86
82
|
}), Effect.annotateLogs({
|
|
87
83
|
package: "dfx",
|
|
88
84
|
module: "DiscordREST"
|
package/mjs/DiscordREST.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.mjs","names":["HttpClient","HttpRequest","DiscordConfig","rateLimitFromHeaders","retryAfter","routeFromConfig","RateLimitStore","RateLimiter","RateLimiterLive","Discord","LIB_VERSION","GenericTag","Duration","millis","Effect","HashSet","Layer","Option","Ref","Redacted","flow","make","gen","rest","token","store","maybeWait","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","logDebug","pipe","zipRight","update","add","incrementCounter","annotateLogs","isBadRoute","map","get","has","removeBadRoute","remove","invalidRateLimit","tap","invalid","void","asVoid","requestRateLimit","fnUntraced","path","request","method","maybeBucket","getBucketForRoute","isNone","bucket","value","key","resetAfter","updateBuckets","response","url","rateLimitOption","headers","rateLimit","hasBucket","fibers","push","fork","putBucketRoute","remaining","removeCounter","putBucket","fiber","await","httpClient","mapRequestEffect","req","prependUrl","baseUrl","setHeaders","Authorization","zipLeft","as","transformResponse","
|
|
1
|
+
{"version":3,"file":"DiscordREST.mjs","names":["HttpClient","HttpRequest","DiscordConfig","rateLimitFromHeaders","retryAfter","routeFromConfig","RateLimitStore","RateLimiter","RateLimiterLive","Discord","LIB_VERSION","GenericTag","Duration","millis","Effect","HashSet","Layer","Option","Ref","Redacted","flow","make","gen","rest","token","store","maybeWait","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","logDebug","pipe","zipRight","update","add","incrementCounter","annotateLogs","isBadRoute","map","get","has","removeBadRoute","remove","invalidRateLimit","tap","invalid","void","asVoid","requestRateLimit","fnUntraced","path","request","method","maybeBucket","getBucketForRoute","isNone","bucket","value","key","resetAfter","updateBuckets","response","url","rateLimitOption","headers","rateLimit","hasBucket","fibers","push","fork","putBucketRoute","remaining","removeCounter","putBucket","fiber","await","httpClient","mapRequestEffect","req","prependUrl","baseUrl","setHeaders","Authorization","zipLeft","as","transformResponse","flatMap","status","all","concurrency","discard","sleep","getOrElse","seconds","execute","succeed","package","module","DiscordREST","DiscordRESTLive","effect","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.118.
|
|
1
|
+
export const LIB_VERSION = "0.118.10";
|
|
2
2
|
//# sourceMappingURL=version.mjs.map
|
package/mjs/version.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.mjs","names":["LIB_VERSION"],"sources":["../src/version.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,MAAMA,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"version.mjs","names":["LIB_VERSION"],"sources":["../src/version.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,MAAMA,WAAW,GAAG,UAAU","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dfx",
|
|
3
|
-
"version": "0.118.
|
|
3
|
+
"version": "0.118.10",
|
|
4
4
|
"description": "Effect-TS discord library",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -44,6 +44,6 @@
|
|
|
44
44
|
"optionalDependencies": {
|
|
45
45
|
"discord-verify": "^1.2.0"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "c1cbbe4e82c3e2e14ff8cb9bf1facdb006a64de0",
|
|
48
48
|
"main": "./index.js"
|
|
49
49
|
}
|
package/src/DiscordREST.ts
CHANGED
|
@@ -132,17 +132,12 @@ const make = Effect.gen(function* () {
|
|
|
132
132
|
HttpClient.transformResponse(
|
|
133
133
|
flow(
|
|
134
134
|
Effect.tap(response => updateBuckets(response.request, response)),
|
|
135
|
-
Effect.
|
|
136
|
-
|
|
137
|
-
return Effect.fail(e)
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
const request = e.request
|
|
141
|
-
const response = e.response
|
|
135
|
+
Effect.flatMap(response => {
|
|
136
|
+
const request = response.request
|
|
142
137
|
|
|
143
138
|
switch (response.status) {
|
|
144
139
|
case 403:
|
|
145
|
-
return Effect.
|
|
140
|
+
return Effect.as(
|
|
146
141
|
Effect.all(
|
|
147
142
|
[
|
|
148
143
|
Effect.annotateLogs(
|
|
@@ -155,7 +150,7 @@ const make = Effect.gen(function* () {
|
|
|
155
150
|
],
|
|
156
151
|
{ concurrency: "unbounded", discard: true },
|
|
157
152
|
),
|
|
158
|
-
|
|
153
|
+
response,
|
|
159
154
|
)
|
|
160
155
|
|
|
161
156
|
case 429:
|
|
@@ -179,7 +174,7 @@ const make = Effect.gen(function* () {
|
|
|
179
174
|
)
|
|
180
175
|
}
|
|
181
176
|
|
|
182
|
-
return Effect.
|
|
177
|
+
return Effect.succeed(response)
|
|
183
178
|
}),
|
|
184
179
|
Effect.annotateLogs({
|
|
185
180
|
package: "dfx",
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.118.
|
|
1
|
+
export const LIB_VERSION = "0.118.10";
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "0.118.
|
|
1
|
+
export declare const LIB_VERSION = "0.118.10";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/version.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["./src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["./src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,aAAa,CAAC"}
|
package/version.js
CHANGED
package/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","names":["LIB_VERSION","exports"],"sources":["./src/version.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAO,MAAMA,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","names":["LIB_VERSION","exports"],"sources":["./src/version.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAO,MAAMA,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG,UAAU","ignoreList":[]}
|