dfx 0.61.0 → 0.61.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/Cache/prelude.d.ts +7 -7
- package/DiscordGateway/DiscordWS.d.ts +1 -1
- package/DiscordGateway/Shard.d.ts +2 -2
- package/DiscordGateway/Sharder.d.ts +2 -2
- package/DiscordGateway.d.ts +1 -1
- package/DiscordREST/types.d.ts +3 -3
- package/DiscordREST/types.d.ts.map +1 -1
- package/DiscordREST/utils.d.ts +4 -3
- package/DiscordREST/utils.d.ts.map +1 -1
- package/DiscordREST/utils.js +3 -2
- package/DiscordREST/utils.js.map +1 -1
- package/DiscordREST.d.ts +6 -7
- package/DiscordREST.d.ts.map +1 -1
- package/DiscordREST.js +12 -18
- package/DiscordREST.js.map +1 -1
- package/Interactions/builder.d.ts +2 -2
- package/Interactions/builder.d.ts.map +1 -1
- package/Interactions/builder.js +1 -1
- package/Interactions/builder.js.map +1 -1
- package/Interactions/context.d.ts +1 -1
- package/Interactions/definitions.d.ts +3 -3
- package/Interactions/gateway.d.ts +3 -3
- package/Interactions/gateway.d.ts.map +1 -1
- package/Interactions/gateway.js +1 -1
- package/Interactions/gateway.js.map +1 -1
- package/RateLimit.d.ts +2 -2
- package/gateway.d.ts +1 -3
- package/gateway.d.ts.map +1 -1
- package/gateway.js +2 -5
- package/gateway.js.map +1 -1
- package/index.d.ts +1 -2
- package/index.d.ts.map +1 -1
- package/index.js +1 -3
- package/index.js.map +1 -1
- package/mjs/DiscordREST/utils.mjs +3 -2
- package/mjs/DiscordREST/utils.mjs.map +1 -1
- package/mjs/DiscordREST.mjs +12 -13
- package/mjs/DiscordREST.mjs.map +1 -1
- package/mjs/Interactions/builder.mjs +1 -1
- package/mjs/Interactions/builder.mjs.map +1 -1
- package/mjs/Interactions/gateway.mjs +1 -1
- package/mjs/Interactions/gateway.mjs.map +1 -1
- package/mjs/gateway.mjs +1 -3
- package/mjs/gateway.mjs.map +1 -1
- package/mjs/index.mjs +1 -2
- package/mjs/index.mjs.map +1 -1
- package/mjs/version.mjs +1 -1
- package/mjs/webhooks.mjs +2 -11
- package/mjs/webhooks.mjs.map +1 -1
- package/package.json +3 -3
- package/src/DiscordREST/types.ts +3 -3
- package/src/DiscordREST/utils.ts +7 -5
- package/src/DiscordREST.ts +37 -33
- package/src/Interactions/builder.ts +1 -1
- package/src/Interactions/gateway.ts +3 -3
- package/src/gateway.ts +2 -17
- package/src/index.ts +0 -2
- package/src/version.ts +1 -1
- package/src/webhooks.ts +19 -32
- package/tsconfig.tsbuildinfo +1 -0
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/webhooks.d.ts +2 -4
- package/webhooks.d.ts.map +1 -1
- package/webhooks.js +4 -14
- package/webhooks.js.map +1 -1
package/src/DiscordREST.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import * as Http from "@effect-http/client"
|
|
2
1
|
import { Tag } from "@effect/data/Context"
|
|
3
2
|
import * as Duration from "@effect/data/Duration"
|
|
4
3
|
import { millis } from "@effect/data/Duration"
|
|
@@ -9,6 +8,7 @@ import * as ConfigSecret from "@effect/io/Config/Secret"
|
|
|
9
8
|
import * as Effect from "@effect/io/Effect"
|
|
10
9
|
import * as Layer from "@effect/io/Layer"
|
|
11
10
|
import * as Ref from "@effect/io/Ref"
|
|
11
|
+
import * as Http from "@effect/platform/HttpClient"
|
|
12
12
|
import { DiscordConfig } from "dfx/DiscordConfig"
|
|
13
13
|
import type { ResponseWithData, RestResponse } from "dfx/DiscordREST/types"
|
|
14
14
|
import {
|
|
@@ -23,15 +23,16 @@ import { LIB_VERSION } from "dfx/version"
|
|
|
23
23
|
|
|
24
24
|
export class DiscordRESTError {
|
|
25
25
|
readonly _tag = "DiscordRESTError"
|
|
26
|
-
constructor(
|
|
26
|
+
constructor(
|
|
27
|
+
readonly error: Http.error.HttpClientError,
|
|
28
|
+
readonly body?: unknown,
|
|
29
|
+
) {}
|
|
27
30
|
}
|
|
28
31
|
|
|
29
|
-
export { ResponseDecodeError } from "@effect-http/client"
|
|
30
|
-
|
|
31
32
|
const make = Effect.gen(function*(_) {
|
|
32
33
|
const { rest, token } = yield* _(DiscordConfig)
|
|
33
34
|
|
|
34
|
-
const http = yield* _(Http.
|
|
35
|
+
const http = yield* _(Http.client.Client)
|
|
35
36
|
const log = yield* _(Log)
|
|
36
37
|
const store = yield* _(RateLimitStore)
|
|
37
38
|
const { maybeWait } = yield* _(RateLimiter)
|
|
@@ -70,7 +71,10 @@ const make = Effect.gen(function*(_) {
|
|
|
70
71
|
)
|
|
71
72
|
|
|
72
73
|
// Request rate limiting
|
|
73
|
-
const requestRateLimit = (
|
|
74
|
+
const requestRateLimit = (
|
|
75
|
+
path: string,
|
|
76
|
+
request: Http.request.ClientRequest,
|
|
77
|
+
) =>
|
|
74
78
|
Effect.Do.pipe(
|
|
75
79
|
Effect.let("route", () => routeFromConfig(path, request.method)),
|
|
76
80
|
Effect.bind("maybeBucket", ({ route }) => store.getBucketForRoute(route)),
|
|
@@ -91,7 +95,10 @@ const make = Effect.gen(function*(_) {
|
|
|
91
95
|
)
|
|
92
96
|
|
|
93
97
|
// Update rate limit buckets
|
|
94
|
-
const updateBuckets = (
|
|
98
|
+
const updateBuckets = (
|
|
99
|
+
request: Http.request.ClientRequest,
|
|
100
|
+
response: Http.response.ClientResponse,
|
|
101
|
+
) =>
|
|
95
102
|
Effect.Do.pipe(
|
|
96
103
|
Effect.let("route", () => routeFromConfig(request.url, request.method)),
|
|
97
104
|
Effect.bind("rateLimit", () => rateLimitFromHeaders(response.headers)),
|
|
@@ -127,20 +134,19 @@ const make = Effect.gen(function*(_) {
|
|
|
127
134
|
)
|
|
128
135
|
|
|
129
136
|
const httpExecutor = pipe(
|
|
130
|
-
http
|
|
131
|
-
Http.
|
|
132
|
-
Http.executor.contramap(req =>
|
|
137
|
+
Http.client.filterStatusOk(http),
|
|
138
|
+
Http.client.mapRequest(req =>
|
|
133
139
|
pipe(
|
|
134
|
-
Http.
|
|
135
|
-
Http.setHeaders({
|
|
140
|
+
Http.request.prependUrl(req, rest.baseUrl),
|
|
141
|
+
Http.request.setHeaders({
|
|
136
142
|
Authorization: `Bot ${ConfigSecret.value(token)}`,
|
|
137
143
|
"User-Agent":
|
|
138
144
|
`DiscordBot (https://github.com/tim-smart/dfx, ${LIB_VERSION})`,
|
|
139
145
|
}),
|
|
140
146
|
)
|
|
141
147
|
),
|
|
142
|
-
Http.
|
|
143
|
-
error.
|
|
148
|
+
Http.client.catchAll(error =>
|
|
149
|
+
error.reason === "StatusCode"
|
|
144
150
|
? error.response.json.pipe(
|
|
145
151
|
Effect.mapError(_ => new DiscordRESTError(_)),
|
|
146
152
|
Effect.flatMap(body =>
|
|
@@ -152,7 +158,7 @@ const make = Effect.gen(function*(_) {
|
|
|
152
158
|
)
|
|
153
159
|
|
|
154
160
|
const executor = <A = unknown>(
|
|
155
|
-
request: Http.
|
|
161
|
+
request: Http.request.ClientRequest,
|
|
156
162
|
): Effect.Effect<never, DiscordRESTError, ResponseWithData<A>> =>
|
|
157
163
|
requestRateLimit(request.url, request).pipe(
|
|
158
164
|
Effect.zipLeft(globalRateLimit),
|
|
@@ -165,13 +171,13 @@ const make = Effect.gen(function*(_) {
|
|
|
165
171
|
),
|
|
166
172
|
Effect.tap(response => updateBuckets(request, response)),
|
|
167
173
|
Effect.catchTag("DiscordRESTError", e => {
|
|
168
|
-
if (e.error.
|
|
174
|
+
if (e.error.reason !== "StatusCode") {
|
|
169
175
|
return Effect.fail(e)
|
|
170
176
|
}
|
|
171
177
|
|
|
172
178
|
const response = e.error.response
|
|
173
179
|
|
|
174
|
-
switch (
|
|
180
|
+
switch (response.status) {
|
|
175
181
|
case 403:
|
|
176
182
|
return Effect.zipRight(
|
|
177
183
|
Effect.all(
|
|
@@ -209,28 +215,26 @@ const make = Effect.gen(function*(_) {
|
|
|
209
215
|
}),
|
|
210
216
|
)
|
|
211
217
|
|
|
212
|
-
const routes = Discord.createRoutes<Partial<Http.
|
|
218
|
+
const routes = Discord.createRoutes<Partial<Http.request.Options.NoUrl>>(
|
|
213
219
|
<R, P>({
|
|
214
220
|
method,
|
|
215
221
|
options = {},
|
|
216
222
|
params,
|
|
217
223
|
url,
|
|
218
|
-
}: Discord.Route<P, Partial<Http.
|
|
224
|
+
}: Discord.Route<P, Partial<Http.request.Options.NoUrl>>): RestResponse<
|
|
225
|
+
R
|
|
226
|
+
> => {
|
|
219
227
|
const hasBody = method !== "GET" && method !== "DELETE"
|
|
220
|
-
let request = Http.make(method as any)(url, options)
|
|
228
|
+
let request = Http.request.make(method as any)(url, options)
|
|
221
229
|
|
|
222
230
|
if (!hasBody) {
|
|
223
231
|
if (params) {
|
|
224
|
-
request = Http.
|
|
232
|
+
request = Http.request.appendUrlParams(request, params as any)
|
|
225
233
|
}
|
|
226
|
-
} else if (
|
|
227
|
-
params
|
|
228
|
-
&& request.body._tag === "Some"
|
|
229
|
-
&& request.body.value._tag === "FormDataBody"
|
|
230
|
-
) {
|
|
231
|
-
request.body.value.value.append("payload_json", JSON.stringify(params))
|
|
234
|
+
} else if (params && request.body._tag === "FormData") {
|
|
235
|
+
request.body.formData.append("payload_json", JSON.stringify(params))
|
|
232
236
|
} else if (params) {
|
|
233
|
-
request = Http.jsonBody(request, params)
|
|
237
|
+
request = Http.request.jsonBody(request, params)
|
|
234
238
|
}
|
|
235
239
|
|
|
236
240
|
return executor(request)
|
|
@@ -244,15 +248,15 @@ const make = Effect.gen(function*(_) {
|
|
|
244
248
|
})
|
|
245
249
|
|
|
246
250
|
export interface DiscordREST
|
|
247
|
-
extends Discord.Endpoints<Partial<Http.
|
|
251
|
+
extends Discord.Endpoints<Partial<Http.request.Options.NoUrl>>
|
|
248
252
|
{
|
|
249
253
|
readonly executor: <A = unknown>(
|
|
250
|
-
request: Http.
|
|
254
|
+
request: Http.request.ClientRequest,
|
|
251
255
|
) => Effect.Effect<never, DiscordRESTError, ResponseWithData<A>>
|
|
252
256
|
}
|
|
253
257
|
|
|
254
258
|
export const DiscordREST = Tag<DiscordREST>()
|
|
255
|
-
export const LiveDiscordREST = Layer.
|
|
256
|
-
LiveRateLimiter,
|
|
257
|
-
Layer.
|
|
259
|
+
export const LiveDiscordREST = Layer.effect(DiscordREST, make).pipe(
|
|
260
|
+
Layer.use(LiveRateLimiter),
|
|
261
|
+
Layer.use(Http.client.fetchLayer),
|
|
258
262
|
)
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import * as Http from "@effect-http/client"
|
|
2
1
|
import * as Chunk from "@effect/data/Chunk"
|
|
3
2
|
import { identity } from "@effect/data/Function"
|
|
4
3
|
import type * as Cause from "@effect/io/Cause"
|
|
5
4
|
import * as Effect from "@effect/io/Effect"
|
|
6
5
|
import { catchTag } from "@effect/io/Effect"
|
|
6
|
+
import * as Http from "@effect/platform/HttpClient"
|
|
7
7
|
import { DiscordREST, type DiscordRESTError } from "dfx/DiscordREST"
|
|
8
8
|
import type * as D from "dfx/Interactions/definitions"
|
|
9
9
|
import type * as Discord from "dfx/types"
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import * as Http from "@effect-http/client"
|
|
2
1
|
import * as Chunk from "@effect/data/Chunk"
|
|
3
2
|
import { Tag } from "@effect/data/Context"
|
|
4
3
|
import * as Duration from "@effect/data/Duration"
|
|
@@ -8,6 +7,7 @@ import * as Effect from "@effect/io/Effect"
|
|
|
8
7
|
import * as Layer from "@effect/io/Layer"
|
|
9
8
|
import * as Queue from "@effect/io/Queue"
|
|
10
9
|
import * as Ref from "@effect/io/Ref"
|
|
10
|
+
import * as Http from "@effect/platform/HttpClient"
|
|
11
11
|
import { DiscordGateway } from "dfx/DiscordGateway"
|
|
12
12
|
import type { DiscordRESTError } from "dfx/DiscordREST"
|
|
13
13
|
import { DiscordREST } from "dfx/DiscordREST"
|
|
@@ -43,7 +43,7 @@ export const run = <R, R2, E, TE, E2>(
|
|
|
43
43
|
ix: InteractionBuilder<R, E, TE>,
|
|
44
44
|
): Effect.Effect<
|
|
45
45
|
DiscordREST | DiscordGateway | Exclude<R2, Discord.Interaction>,
|
|
46
|
-
E2 | DiscordRESTError | Http.
|
|
46
|
+
E2 | DiscordRESTError | Http.error.ResponseError,
|
|
47
47
|
never
|
|
48
48
|
> =>
|
|
49
49
|
Effect.gen(function*(_) {
|
|
@@ -147,7 +147,7 @@ export interface InteractionsRegistry {
|
|
|
147
147
|
opts?: RunOpts,
|
|
148
148
|
) => Effect.Effect<
|
|
149
149
|
DiscordREST | DiscordGateway | Exclude<R, Discord.Interaction>,
|
|
150
|
-
DiscordRESTError | Http.
|
|
150
|
+
DiscordRESTError | Http.error.ResponseError | E,
|
|
151
151
|
never
|
|
152
152
|
>
|
|
153
153
|
}
|
package/src/gateway.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import type { HttpRequestExecutor } from "@effect-http/client"
|
|
2
|
-
import { LiveFetchRequestExecutor } from "@effect-http/client"
|
|
3
1
|
import * as Config from "@effect/io/Config"
|
|
4
2
|
import type * as ConfigError from "@effect/io/Config/Error"
|
|
5
3
|
import * as Effect from "@effect/io/Effect"
|
|
@@ -49,10 +47,10 @@ export const MemoryBot = Layer.provide(
|
|
|
49
47
|
),
|
|
50
48
|
)
|
|
51
49
|
|
|
52
|
-
export const
|
|
50
|
+
export const gatewayLayer = (
|
|
53
51
|
config: Config.Config.Wrap<DiscordConfig.MakeOpts>,
|
|
54
52
|
): Layer.Layer<
|
|
55
|
-
|
|
53
|
+
never,
|
|
56
54
|
ConfigError.ConfigError,
|
|
57
55
|
| RateLimiter
|
|
58
56
|
| Log.Log
|
|
@@ -71,16 +69,3 @@ export const gatewayLayerWithoutHttp = (
|
|
|
71
69
|
}),
|
|
72
70
|
),
|
|
73
71
|
)
|
|
74
|
-
|
|
75
|
-
export const gatewayLayer = (
|
|
76
|
-
config: Config.Config.Wrap<DiscordConfig.MakeOpts>,
|
|
77
|
-
): Layer.Layer<
|
|
78
|
-
never,
|
|
79
|
-
ConfigError.ConfigError,
|
|
80
|
-
| RateLimiter
|
|
81
|
-
| Log.Log
|
|
82
|
-
| InteractionsRegistry
|
|
83
|
-
| DiscordREST
|
|
84
|
-
| DiscordGateway
|
|
85
|
-
| DiscordConfig.DiscordConfig
|
|
86
|
-
> => Layer.provide(LiveFetchRequestExecutor, gatewayLayerWithoutHttp(config))
|
package/src/index.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import * as Http from "@effect-http/client"
|
|
2
1
|
import * as Cache from "dfx/Cache"
|
|
3
2
|
import * as DiscordConfig from "dfx/DiscordConfig"
|
|
4
3
|
import * as Flags from "dfx/Helpers/flags"
|
|
@@ -26,7 +25,6 @@ export {
|
|
|
26
25
|
Discord,
|
|
27
26
|
DiscordConfig,
|
|
28
27
|
Flags,
|
|
29
|
-
Http,
|
|
30
28
|
Intents,
|
|
31
29
|
Ix,
|
|
32
30
|
IxHelpers,
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.61.
|
|
1
|
+
export const LIB_VERSION = "0.61.1";
|
package/src/webhooks.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import type { HttpRequestExecutor } from "@effect-http/client"
|
|
2
|
-
import { LiveFetchRequestExecutor } from "@effect-http/client"
|
|
3
1
|
import * as Config from "@effect/io/Config"
|
|
4
2
|
import type * as ConfigError from "@effect/io/Config/Error"
|
|
5
3
|
import * as Effect from "@effect/io/Effect"
|
|
@@ -32,39 +30,13 @@ export const MemoryREST = Layer.provide(
|
|
|
32
30
|
LiveDiscordREST,
|
|
33
31
|
)
|
|
34
32
|
|
|
35
|
-
export const
|
|
36
|
-
options:
|
|
37
|
-
): Layer.Layer<
|
|
38
|
-
HttpRequestExecutor,
|
|
39
|
-
ConfigError.ConfigError,
|
|
40
|
-
RateLimiter | DiscordREST | WebhookConfig
|
|
41
|
-
> =>
|
|
42
|
-
Layer.unwrapEffect(
|
|
43
|
-
Effect.map(Effect.config(Config.unwrap(options)), options => {
|
|
44
|
-
const config = DiscordConfig.make(options)
|
|
45
|
-
const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config)
|
|
46
|
-
const LiveWebhook = makeConfigLayer(options)
|
|
47
|
-
const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog
|
|
48
|
-
const LiveEnv = Layer.provide(
|
|
49
|
-
Layer.merge(LiveLog, LiveConfig),
|
|
50
|
-
Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit),
|
|
51
|
-
)
|
|
52
|
-
|
|
53
|
-
return LiveEnv
|
|
54
|
-
}),
|
|
55
|
-
)
|
|
56
|
-
|
|
57
|
-
export const webhookLayerConfig = (
|
|
58
|
-
config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
|
|
33
|
+
export const webhookLayer = (
|
|
34
|
+
options: DiscordConfig.MakeOpts & MakeConfigOpts,
|
|
59
35
|
): Layer.Layer<
|
|
60
36
|
never,
|
|
61
37
|
ConfigError.ConfigError,
|
|
62
38
|
RateLimiter | DiscordREST | WebhookConfig
|
|
63
|
-
> =>
|
|
64
|
-
|
|
65
|
-
export const webhookLayer = (
|
|
66
|
-
options: DiscordConfig.MakeOpts & MakeConfigOpts,
|
|
67
|
-
): Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig> => {
|
|
39
|
+
> => {
|
|
68
40
|
const config = DiscordConfig.make(options)
|
|
69
41
|
const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config)
|
|
70
42
|
const LiveWebhook = makeConfigLayer(options)
|
|
@@ -73,5 +45,20 @@ export const webhookLayer = (
|
|
|
73
45
|
Layer.merge(LiveLog, LiveConfig),
|
|
74
46
|
Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit),
|
|
75
47
|
)
|
|
76
|
-
|
|
48
|
+
|
|
49
|
+
return LiveEnv
|
|
77
50
|
}
|
|
51
|
+
|
|
52
|
+
export const webhookLayerConfig = (
|
|
53
|
+
config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
|
|
54
|
+
): Layer.Layer<
|
|
55
|
+
never,
|
|
56
|
+
ConfigError.ConfigError,
|
|
57
|
+
RateLimiter | DiscordREST | WebhookConfig
|
|
58
|
+
> =>
|
|
59
|
+
Layer.unwrapEffect(
|
|
60
|
+
Effect.map(
|
|
61
|
+
Effect.config(Config.unwrap(config)),
|
|
62
|
+
webhookLayer,
|
|
63
|
+
),
|
|
64
|
+
)
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"program":{"fileNames":[],"fileInfos":[],"root":[],"options":{"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"emitDecoratorMetadata":true,"esModuleInterop":true,"experimentalDecorators":true,"module":7,"noEmitOnError":false,"noErrorTruncation":false,"noFallthroughCasesInSwitch":true,"noImplicitAny":true,"noImplicitReturns":false,"noImplicitThis":true,"noUncheckedIndexedAccess":false,"noUnusedLocals":true,"noUnusedParameters":false,"removeComments":false,"skipLibCheck":true,"sourceMap":true,"strict":true,"strictNullChecks":true,"stripInternal":true,"target":99},"referencedMap":[],"exportedModulesMap":[]},"version":"5.1.6"}
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "0.61.
|
|
1
|
+
export declare const LIB_VERSION = "0.61.1";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/version.js
CHANGED
package/webhooks.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { HttpRequestExecutor } from "@effect-http/client";
|
|
2
1
|
import * as Config from "@effect/io/Config";
|
|
3
2
|
import type * as ConfigError from "@effect/io/Config/Error";
|
|
4
3
|
import * as Layer from "@effect/io/Layer";
|
|
@@ -9,8 +8,7 @@ import * as Log from "dfx/Log";
|
|
|
9
8
|
import type { RateLimiter } from "dfx/RateLimit";
|
|
10
9
|
export { BadWebhookSignature, makeConfigLayer, makeHandler, makeSimpleHandler, WebhookConfig, WebhookParseError, } from "dfx/Interactions/webhook";
|
|
11
10
|
export declare const MemoryRateLimit: Layer.Layer<Log.Log, never, RateLimiter>;
|
|
12
|
-
export declare const MemoryREST: Layer.Layer<
|
|
13
|
-
export declare const
|
|
11
|
+
export declare const MemoryREST: Layer.Layer<Log.Log | DiscordConfig.DiscordConfig, never, DiscordREST>;
|
|
12
|
+
export declare const webhookLayer: (options: DiscordConfig.MakeOpts & MakeConfigOpts) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
|
|
14
13
|
export declare const webhookLayerConfig: (config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
|
|
15
|
-
export declare const webhookLayer: (options: DiscordConfig.MakeOpts & MakeConfigOpts) => Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig>;
|
|
16
14
|
//# sourceMappingURL=webhooks.d.ts.map
|
package/webhooks.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,aAAa,EACb,iBAAiB,GAClB,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,UAAU,wEAGtB,CAAA;AAED,eAAO,MAAM,YAAY,YACd,cAAc,QAAQ,GAAG,cAAc,KAC/C,WAAW,CACZ,KAAK,EACL,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CAY1C,CAAA;AAED,eAAO,MAAM,kBAAkB,WACrB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KAClE,WAAW,CACZ,KAAK,EACL,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CAOxC,CAAA"}
|
package/webhooks.js
CHANGED
|
@@ -40,8 +40,7 @@ Object.defineProperty(exports, "makeSimpleHandler", {
|
|
|
40
40
|
return _webhook.makeSimpleHandler;
|
|
41
41
|
}
|
|
42
42
|
});
|
|
43
|
-
exports.
|
|
44
|
-
var _client = /*#__PURE__*/require("@effect-http/client");
|
|
43
|
+
exports.webhookLayerConfig = exports.webhookLayer = void 0;
|
|
45
44
|
var Config = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Config"));
|
|
46
45
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
47
46
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
|
|
@@ -56,24 +55,15 @@ const MemoryRateLimit = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimi
|
|
|
56
55
|
exports.MemoryRateLimit = MemoryRateLimit;
|
|
57
56
|
const MemoryREST = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimitStore, _DiscordREST.LiveDiscordREST);
|
|
58
57
|
exports.MemoryREST = MemoryREST;
|
|
59
|
-
const webhookLayerWithoutHttp = options => Layer.unwrapEffect(Effect.map(Effect.config(Config.unwrap(options)), options => {
|
|
60
|
-
const config = DiscordConfig.make(options);
|
|
61
|
-
const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
|
|
62
|
-
const LiveWebhook = (0, _webhook.makeConfigLayer)(options);
|
|
63
|
-
const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog;
|
|
64
|
-
const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
|
|
65
|
-
return LiveEnv;
|
|
66
|
-
}));
|
|
67
|
-
exports.webhookLayerWithoutHttp = webhookLayerWithoutHttp;
|
|
68
|
-
const webhookLayerConfig = config => Layer.provide(_client.LiveFetchRequestExecutor, webhookLayerWithoutHttp(config));
|
|
69
|
-
exports.webhookLayerConfig = webhookLayerConfig;
|
|
70
58
|
const webhookLayer = options => {
|
|
71
59
|
const config = DiscordConfig.make(options);
|
|
72
60
|
const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
|
|
73
61
|
const LiveWebhook = (0, _webhook.makeConfigLayer)(options);
|
|
74
62
|
const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog;
|
|
75
63
|
const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
|
|
76
|
-
return
|
|
64
|
+
return LiveEnv;
|
|
77
65
|
};
|
|
78
66
|
exports.webhookLayer = webhookLayer;
|
|
67
|
+
const webhookLayerConfig = config => Layer.unwrapEffect(Effect.map(Effect.config(Config.unwrap(config)), webhookLayer));
|
|
68
|
+
exports.webhookLayerConfig = webhookLayerConfig;
|
|
79
69
|
//# sourceMappingURL=webhooks.js.map
|
package/webhooks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhooks.js","names":["
|
|
1
|
+
{"version":3,"file":"webhooks.js","names":["Config","_interopRequireWildcard","require","Effect","Layer","DiscordConfig","_DiscordREST","_webhook","Log","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","exports","MemoryREST","LiveDiscordREST","webhookLayer","options","config","make","LiveConfig","succeed","LiveWebhook","makeConfigLayer","LiveLog","debug","LiveLogDebug","LiveEnv","merge","mergeAll","webhookLayerConfig","unwrapEffect","map","unwrap"],"sources":["./src/webhooks.ts"],"sourcesContent":[null],"mappings":"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"}
|