@shivaedev/discord 0.3.0 → 0.4.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.4.1 - 2026-11-07
+
+### Changed
+
+- Require Effect 4.1.1 and its matching platform packages.
+
+## 0.4.0 - 2026-11-05
+
+### Changed
+
+- REST operations yield their declared dependencies; a dedicated rate-limit service owns pacing state for the registered Layer's lifetime. REST and gateway operations have named tracing spans.
+
+### Breaking
+
+- Import `DiscordRest` from `@shivaedev/discord/rest/service.ts` and provide `layer` from `@shivaedev/discord/rest/layer.ts` in place of `DiscordRest.layer`. The composed Layer supplies the rate-limit service; continue supplying the native HTTP client, bot token and optional config once at registration.
+- Import `DiscordGateway` from `@shivaedev/discord/gateway/service.ts`. Its Layer and `run(handler)` signature stay the same.
+- Replace direct uses of the removed `restClient.ts` and `rateLimits.ts` factories with the composed REST Layer and `DiscordRest.request`. Direct gateway integrations import `run` from `gateway/run.ts` and `gatewayConnection` from `adapters/gatewayConnection.ts` instead of `runGateway.ts` and `gatewayConnection.ts`.
+
 ## 0.3.0 - 2026-11-05
 
 ### Breaking

package/README.md

@@ -19,20 +19,19 @@ REST and gateway are independent services sharing a redacted `DiscordToken`. Pro
 
 ### Bot REST
 
-Provide `DiscordRest.layer`, a native `HttpClient` and the token:
+Provide `layer` from `rest/layer.ts`, a native `HttpClient` and the token:
 
 ```ts
 import { Layer, Redacted } from "effect";
 import { FetchHttpClient } from "effect/http";
-import { DiscordRest } from "@shivaedev/discord/DiscordRest.ts";
+import { layer } from "@shivaedev/discord/rest/layer.ts";
 import { DiscordToken } from "@shivaedev/discord/DiscordToken.ts";
 
-const restLayer = DiscordRest.layer.pipe(
-	Layer.provide(FetchHttpClient.layer),
-	Layer.provide(Layer.succeed(DiscordToken)(Redacted.make("bot-token"))),
-);
+const restLayer = layer.pipe(Layer.provide(FetchHttpClient.layer), Layer.provide(Layer.succeed(DiscordToken)(Redacted.make("bot-token"))));
 ```
 
+The composed REST Layer provides `DiscordRest` from `rest/service.ts` and its `DiscordRestLimits` dependency. Its registration chooses their lifetime: share one build for a bot, or build a fresh Layer for independent pacing state. Operations yield the HTTP client, token, config and limits from the environment; REST initializer state owns only a semaphore, and the limits service owns the bucket maps and reset times.
+
 `request(method, path, schema, body?)` reads the service and decodes the result. `DiscordRest.request(method, path, body?)` returns decoded JSON as `unknown`; a 204 response returns `undefined`. Paths start with `/` and are relative to Discord's API v10 base. Request bodies use native HTTP JSON encoding, and response reads use `@shivaedev/http` with a 1 MiB limit.
 
 One service instance serializes calls for its bot. It tracks Discord's bucket ids, major channel/guild identifiers, remaining count and relative reset time. An exhausted bucket delays the next matching call. A 429 reads Discord's `retry_after` seconds and `global` flag, releases the response, waits on Effect's clock and retries up to three times. Exhaustion fails with `DiscordRateLimited`, carrying the final delay in seconds. Transport failures become `DiscordTransportError`; other HTTP statuses retain `@shivaedev/http`'s typed failures. Schema decoding failures remain in the error channel.
@@ -43,7 +42,7 @@ Provide `DiscordGateway.layer`, the same token, `DiscordConfig` with your intent
 
 ```ts
 import { Effect } from "effect";
-import { DiscordGateway } from "@shivaedev/discord/DiscordGateway.ts";
+import { DiscordGateway } from "@shivaedev/discord/gateway/service.ts";
 
 const listen = Effect.gen(function* () {
 	const gateway = yield* DiscordGateway;

package/dist/{gatewayConnection.d.ts → adapters/gatewayConnection.d.ts}

@@ -2,5 +2,5 @@ import { Effect } from "effect";
 import { Socket } from "effect/socket";
 import { DiscordToken } from "#DiscordToken.ts";
 import { type GatewayDispatch, type GatewaySession } from "#gatewayProtocol.ts";
-export declare function gatewayConnection(session: GatewaySession, dispatch: (event: GatewayDispatch) => Effect.Effect<void>): Effect.Effect<never, import("./errors.ts").DiscordGatewayProtocolError | Socket.SocketError, DiscordToken | Socket.Socket>;
+export declare function gatewayConnection(session: GatewaySession, dispatch: (event: GatewayDispatch) => Effect.Effect<void>): Effect.Effect<never, import("../errors.ts").DiscordGatewayProtocolError | Socket.SocketError, DiscordToken | Socket.Socket>;
 //# sourceMappingURL=gatewayConnection.d.ts.map

package/dist/adapters/gatewayConnection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gatewayConnection.d.ts","sourceRoot":"","sources":["../../src/adapters/gatewayConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAA2B,KAAK,eAAe,EAAqB,KAAK,cAAc,EAA2B,MAAM,qBAAqB,CAAC;AAErJ,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,+HAkFnH"}

package/dist/adapters/gatewayConnection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gatewayConnection.js","sourceRoot":"","sources":["../../src/adapters/gatewayConnection.ts"],"names":[],"mappings":"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"}

package/dist/gateway/run.d.ts

@@ -0,0 +1,6 @@
+import { Effect } from "effect";
+import { DiscordGatewayClosed } from "#errors.ts";
+import { GatewayTransport } from "#GatewayTransport.ts";
+import type { GatewayDispatch } from "#gatewayProtocol.ts";
+export declare const run: (dispatch: (event: GatewayDispatch) => Effect.Effect<void>) => Effect.Effect<never, DiscordGatewayClosed | import("#errors.ts").DiscordGatewayProtocolError, import("../DiscordToken.ts").DiscordToken | GatewayTransport>;
+//# sourceMappingURL=run.d.ts.map

package/dist/gateway/run.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/gateway/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,qBAAqB,CAAC;AAE3E,eAAO,MAAM,GAAG,qBAAgE,eAAe,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gKAuBrH,CAAC"}

package/dist/{runGateway.js → gateway/run.js}

@@ -1,10 +1,10 @@
 import { Effect } from "effect";
 import { Socket } from "effect/socket";
+import { gatewayConnection } from "#adapters/gatewayConnection.ts";
 import { DiscordConfig } from "#DiscordConfig.ts";
 import { DiscordGatewayClosed } from "#errors.ts";
 import { GatewayTransport } from "#GatewayTransport.ts";
-import { gatewayConnection } from "#gatewayConnection.ts";
-export const runGateway = Effect.fnUntraced(function* (dispatch) {
+export const run = Effect.fn("DiscordGateway.run")(function* (dispatch) {
     const config = yield* DiscordConfig;
     const transport = yield* GatewayTransport;
     const session = { resumeUrl: undefined, sequence: null, sessionId: undefined };
@@ -26,4 +26,4 @@ export const runGateway = Effect.fnUntraced(function* (dispatch) {
         }));
     }
 });
-//# sourceMappingURL=runGateway.js.map
+//# sourceMappingURL=run.js.map

package/dist/gateway/run.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/gateway/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,MAAM,CAAC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,EAAE,QAAyD;IACtH,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC;IAC1C,MAAM,OAAO,GAAmB,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IAC/F,OAAO,IAAI,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,UAAU,sBAAsB,CAAC,CAAC;QACtG,KAAK,CAAC,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC;aACzC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aAClD,IAAI,CACJ,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YACxC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACtF,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;gBAC3E,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,oBAAoB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBACpC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC9B,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC9B,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;YACzB,CAAC;YACD,OAAO,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACjC,CAAC,CAAC,CACF,CAAC;IACJ,CAAC;AACF,CAAC,CAAC,CAAC"}

package/dist/{DiscordGateway.d.ts → gateway/service.d.ts}

@@ -2,8 +2,8 @@ import { Effect } from "effect";
 import { DiscordToken } from "#DiscordToken.ts";
 import { GatewayTransport } from "#GatewayTransport.ts";
 export declare const DiscordGateway: import("effect/Context").Service<"@shivaedev/discord/DiscordGateway", Readonly<{
-    readonly run: (dispatch: (event: import("./gatewayProtocol.ts").GatewayDispatch) => Effect.Effect<void>) => Effect.Effect<never, import("./errors.ts").DiscordGatewayClosed | import("./errors.ts").DiscordGatewayProtocolError, never>;
+    readonly run: (dispatch: (event: import("../gatewayProtocol.ts").GatewayDispatch) => Effect.Effect<void>) => Effect.Effect<never, import("../errors.ts").DiscordGatewayClosed | import("../errors.ts").DiscordGatewayProtocolError, never>;
 }>> & {
     readonly layer: import("effect/Layer").Layer<"@shivaedev/discord/DiscordGateway", never, DiscordToken | GatewayTransport>;
 };
-//# sourceMappingURL=DiscordGateway.d.ts.map
+//# sourceMappingURL=service.d.ts.map

package/dist/gateway/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/gateway/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,eAAO,MAAM,cAAc;;;;CAKzB,CAAC"}

package/dist/{DiscordGateway.js → gateway/service.js}

@@ -3,11 +3,11 @@ import { defineService } from "@shivaedev/service/defineService.ts";
 import { DiscordConfig } from "#DiscordConfig.ts";
 import { DiscordToken } from "#DiscordToken.ts";
 import { GatewayTransport } from "#GatewayTransport.ts";
-import { runGateway } from "#runGateway.ts";
+import { run } from "#gateway/run.ts";
 export const DiscordGateway = defineService({
     id: "@shivaedev/discord/DiscordGateway",
     initialize: Effect.void,
-    methods: () => ({ run: runGateway }),
+    methods: () => ({ run }),
     requires: [DiscordConfig, DiscordToken, GatewayTransport],
 });
-//# sourceMappingURL=DiscordGateway.js.map
+//# sourceMappingURL=service.js.map

package/dist/gateway/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/gateway/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,MAAM,CAAC,MAAM,cAAc,GAAG,aAAa,CAAC;IAC3C,EAAE,EAAE,mCAAmC;IACvC,UAAU,EAAE,MAAM,CAAC,IAAI;IACvB,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;IACxB,QAAQ,EAAE,CAAC,aAAa,EAAE,YAAY,EAAE,gBAAgB,CAAC;CACzD,CAAC,CAAC"}

package/dist/request.js

@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect";
-import { DiscordRest } from "#DiscordRest.ts";
+import { DiscordRest } from "#rest/service.ts";
 export function request(method, path, schema, body) {
     return Effect.flatMap(DiscordRest, (rest) => rest.request(method, path, body)).pipe(Effect.flatMap(Schema.decodeUnknownEffect(schema)));
 }

package/dist/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,UAAU,OAAO,CAAoD,MAAkB,EAAE,IAAY,EAAE,MAAe,EAAE,IAAc;IAC3I,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACzI,CAAC"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,UAAU,OAAO,CAAoD,MAAkB,EAAE,IAAY,EAAE,MAAe,EAAE,IAAc;IAC3I,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACzI,CAAC"}

package/dist/rest/initialize.d.ts

@@ -0,0 +1,3 @@
+import { Semaphore } from "effect";
+export declare const initialize: import("effect/Effect").Effect<Semaphore.Semaphore, never, never>;
+//# sourceMappingURL=initialize.d.ts.map

package/dist/rest/initialize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/rest/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,eAAO,MAAM,UAAU,mEAAoB,CAAC"}

package/dist/rest/initialize.js

@@ -0,0 +1,3 @@
+import { Semaphore } from "effect";
+export const initialize = Semaphore.make(1);
+//# sourceMappingURL=initialize.js.map

package/dist/rest/initialize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../src/rest/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC"}

package/dist/rest/layer.d.ts

@@ -0,0 +1,3 @@
+import { Layer } from "effect";
+export declare const layer: Layer.Layer<"@shivaedev/discord/DiscordRest", never, import("../DiscordToken.ts").DiscordToken | import("effect/http/HttpClient").HttpClient>;
+//# sourceMappingURL=layer.d.ts.map

package/dist/rest/layer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer.d.ts","sourceRoot":"","sources":["../../src/rest/layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAI/B,eAAO,MAAM,KAAK,+IAAiE,CAAC"}

package/dist/rest/layer.js

@@ -0,0 +1,5 @@
+import { Layer } from "effect";
+import { DiscordRest } from "#rest/service.ts";
+import { DiscordRestLimits } from "#rest-limits/service.ts";
+export const layer = DiscordRest.layer.pipe(Layer.provide(DiscordRestLimits.layer));
+//# sourceMappingURL=layer.js.map

package/dist/rest/layer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../src/rest/layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,CAAC,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC"}

package/dist/rest/request.d.ts

@@ -0,0 +1,8 @@
+import { Effect, Schema } from "effect";
+import { HttpClient } from "effect/http";
+import type { HttpMethod } from "effect/http/HttpMethod";
+import { DiscordToken } from "#DiscordToken.ts";
+import { DiscordRateLimited, DiscordTransportError } from "#errors.ts";
+import type { initialize } from "#rest/initialize.ts";
+export declare function request(lock: Effect.Success<typeof initialize>): (method: HttpMethod, path: string, body?: unknown) => Effect.Effect<unknown, DiscordRateLimited | DiscordTransportError | import("effect/http/HttpBody").HttpBodyError | import("@shivaedev/http/errors.ts").InvalidBodyLimit | import("@shivaedev/http/errors.ts").RemoteGone | import("@shivaedev/http/errors.ts").RemoteHttpError | import("@shivaedev/http/errors.ts").RemoteNotFound | import("@shivaedev/http/errors.ts").RemoteRateLimited | import("@shivaedev/http/errors.ts").RemoteUnauthorized | import("@shivaedev/http/errors.ts").ResponseBodyTooLarge | Schema.SchemaError, "@shivaedev/discord/DiscordRestLimits" | DiscordToken | HttpClient.HttpClient>;
+//# sourceMappingURL=request.d.ts.map

package/dist/rest/request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/rest/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMzD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAOtD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,UAAU,CAAC,8oBAuC9D"}

package/dist/{restClient.js → rest/request.js}

@@ -1,4 +1,4 @@
-import { Effect, Redacted, Schema, Semaphore } from "effect";
+import { Effect, Redacted, Schema } from "effect";
 import { HttpClient, HttpClientRequest } from "effect/http";
 import { readBoundedJson } from "@shivaedev/http/body.ts";
 import { checkStatus } from "@shivaedev/http/checkStatus.ts";
@@ -7,15 +7,14 @@ import { routeKey } from "#adapters/routeKey.ts";
 import { DiscordConfig } from "#DiscordConfig.ts";
 import { DiscordToken } from "#DiscordToken.ts";
 import { DiscordRateLimited, DiscordTransportError } from "#errors.ts";
-import { rateLimits } from "#rateLimits.ts";
+import { DiscordRestLimits } from "#rest-limits/service.ts";
 const Limited = Schema.Struct({ global: Schema.optional(Schema.Boolean), retryAfter: Schema.Number }).pipe(Schema.encodeKeys({ retryAfter: "retry_after" }));
-export const initializeRest = Effect.gen(function* () {
-    const client = HttpClient.withScope(yield* HttpClient.HttpClient);
-    const token = yield* DiscordToken;
-    const config = yield* DiscordConfig;
-    const rates = rateLimits();
-    const lock = yield* Semaphore.make(1);
-    const request = Effect.fnUntraced(function* (method, path, body) {
+export function request(lock) {
+    return Effect.fn("DiscordRest.request")(function* (method, path, body) {
+        const client = HttpClient.withScope(yield* HttpClient.HttpClient);
+        const token = yield* DiscordToken;
+        const config = yield* DiscordConfig;
+        const rates = yield* DiscordRestLimits;
         const { major, route } = routeKey(method, path);
         let input = HttpClientRequest.make(method)(`${config.apiUrl}${path}`).pipe(HttpClientRequest.setHeader("Authorization", `Bot ${Redacted.value(token)}`));
         if (body !== undefined) {
@@ -23,7 +22,7 @@ export const initializeRest = Effect.gen(function* () {
         }
         for (let attempt = 0;; attempt += 1) {
             yield* rates.wait(route, major);
-            const answer = yield* Effect.scoped(Effect.gen(function* () {
+            const answer = yield* Effect.gen(function* () {
                 const response = yield* client.execute(input);
                 yield* rates.observe(route, major, response.headers);
                 if (isRateLimited(response.status)) {
@@ -37,15 +36,11 @@ export const initializeRest = Effect.gen(function* () {
                 yield* checkStatus(response);
                 const value = isEmpty(response.status) ? undefined : yield* readBoundedJson(response, 1024 * 1024, Schema.Unknown);
                 return { retry: false, value };
-            }));
+            }).pipe(Effect.scoped);
             if (!answer.retry) {
                 return answer.value;
             }
         }
-    });
-    return { lock, request };
-});
-export function restRequest(state) {
-    return (method, path, body) => state.request(method, path, body).pipe(state.lock.withPermit, Effect.catchTag("HttpClientError", () => Effect.fail(new DiscordTransportError({}))));
+    }, lock.withPermit, Effect.catchTag("HttpClientError", () => Effect.fail(new DiscordTransportError({}))));
 }
-//# sourceMappingURL=restClient.js.map
+//# sourceMappingURL=request.js.map

package/dist/rest/request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/rest/request.ts"],"names":[],"mappings":"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"}

package/dist/rest/service.d.ts

@@ -0,0 +1,8 @@
+import { HttpClient } from "effect/http";
+import { DiscordToken } from "#DiscordToken.ts";
+export declare const DiscordRest: import("effect/Context").Service<"@shivaedev/discord/DiscordRest", Readonly<{
+    readonly request: (method: import("effect/http/HttpMethod").HttpMethod, path: string, body?: unknown) => import("effect/Effect").Effect<unknown, import("../errors.ts").DiscordRateLimited | import("../errors.ts").DiscordTransportError | import("effect/http/HttpBody").HttpBodyError | import("@shivaedev/http/errors.ts").InvalidBodyLimit | import("@shivaedev/http/errors.ts").RemoteGone | import("@shivaedev/http/errors.ts").RemoteHttpError | import("@shivaedev/http/errors.ts").RemoteNotFound | import("@shivaedev/http/errors.ts").RemoteRateLimited | import("@shivaedev/http/errors.ts").RemoteUnauthorized | import("@shivaedev/http/errors.ts").ResponseBodyTooLarge | import("effect/Schema").SchemaError, never>;
+}>> & {
+    readonly layer: import("effect/Layer").Layer<"@shivaedev/discord/DiscordRest", never, "@shivaedev/discord/DiscordRestLimits" | DiscordToken | HttpClient.HttpClient>;
+};
+//# sourceMappingURL=service.d.ts.map

package/dist/rest/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/rest/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAKhD,eAAO,MAAM,WAAW;;;;CAKtB,CAAC"}

package/dist/{DiscordRest.js → rest/service.js}

@@ -2,11 +2,13 @@ import { HttpClient } from "effect/http";
 import { defineService } from "@shivaedev/service/defineService.ts";
 import { DiscordConfig } from "#DiscordConfig.ts";
 import { DiscordToken } from "#DiscordToken.ts";
-import { initializeRest, restRequest } from "#restClient.ts";
+import { initialize } from "#rest/initialize.ts";
+import { request } from "#rest/request.ts";
+import { DiscordRestLimits } from "#rest-limits/service.ts";
 export const DiscordRest = defineService({
     id: "@shivaedev/discord/DiscordRest",
-    initialize: initializeRest,
-    methods: (state) => ({ request: restRequest(state) }),
-    requires: [HttpClient.HttpClient, DiscordToken, DiscordConfig],
+    initialize,
+    methods: (state) => ({ request: request(state) }),
+    requires: [HttpClient.HttpClient, DiscordToken, DiscordConfig, DiscordRestLimits],
 });
-//# sourceMappingURL=DiscordRest.js.map
+//# sourceMappingURL=service.js.map

package/dist/rest/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/rest/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC;IACxC,EAAE,EAAE,gCAAgC;IACpC,UAAU;IACV,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;IACjD,QAAQ,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,CAAC;CACjF,CAAC,CAAC"}

package/dist/rest-limits/initialize.d.ts

@@ -0,0 +1,7 @@
+import { Effect, Ref } from "effect";
+export declare const initialize: Effect.Effect<{
+    blocked: Map<string, number>;
+    globalReset: Ref.Ref<number>;
+    routes: Map<string, string>;
+}, never, never>;
+//# sourceMappingURL=initialize.d.ts.map

package/dist/rest-limits/initialize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/rest-limits/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAErC,eAAO,MAAM,UAAU;;;;gBAMrB,CAAC"}

package/dist/rest-limits/initialize.js

@@ -0,0 +1,9 @@
+import { Effect, Ref } from "effect";
+export const initialize = Effect.gen(function* () {
+    return {
+        blocked: new Map(),
+        globalReset: yield* Ref.make(0),
+        routes: new Map(),
+    };
+});
+//# sourceMappingURL=initialize.js.map

package/dist/rest-limits/initialize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../src/rest-limits/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAErC,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC7C,OAAO;QACN,OAAO,EAAE,IAAI,GAAG,EAAkB;QAClC,WAAW,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/B,MAAM,EAAE,IAAI,GAAG,EAAkB;KACjC,CAAC;AACH,CAAC,CAAC,CAAC"}

package/dist/rest-limits/observe.d.ts

@@ -0,0 +1,5 @@
+import { Effect } from "effect";
+import type { Headers } from "effect/http";
+import type { initialize } from "#rest-limits/initialize.ts";
+export declare function observe(state: Effect.Success<typeof initialize>): (route: string, major: string, headers: Headers.Headers) => Effect.Effect<void, never, never>;
+//# sourceMappingURL=observe.d.ts.map

package/dist/rest-limits/observe.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"observe.d.ts","sourceRoot":"","sources":["../../src/rest-limits/observe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,UAAU,CAAC,iGAa/D"}

package/dist/rest-limits/observe.js

@@ -0,0 +1,13 @@
+import { Clock, Effect } from "effect";
+export function observe(state) {
+    return Effect.fn("DiscordRestLimits.observe")(function* (route, major, headers) {
+        const bucket = headers["x-ratelimit-bucket"];
+        if (bucket !== undefined) {
+            state.routes.set(route, bucket);
+        }
+        if (headers["x-ratelimit-remaining"] === "0") {
+            state.blocked.set(`${state.routes.get(route) ?? route}:${major}`, (yield* Clock.currentTimeMillis) + Number(headers["x-ratelimit-reset-after"] ?? 0) * 1000);
+        }
+    });
+}
+//# sourceMappingURL=observe.js.map

package/dist/rest-limits/observe.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"observe.js","sourceRoot":"","sources":["../../src/rest-limits/observe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIvC,MAAM,UAAU,OAAO,CAAC,KAAwC;IAC/D,OAAO,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAa,EAAE,KAAa,EAAE,OAAwB;QAC9G,MAAM,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAC7C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,OAAO,CAAC,uBAAuB,CAAC,KAAK,GAAG,EAAE,CAAC;YAC9C,KAAK,CAAC,OAAO,CAAC,GAAG,CAChB,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,KAAK,EAAE,EAC9C,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CACzF,CAAC;QACH,CAAC;IACF,CAAC,CAAC,CAAC;AACJ,CAAC"}

package/dist/rest-limits/refuse.d.ts

@@ -0,0 +1,4 @@
+import { Effect } from "effect";
+import type { initialize } from "#rest-limits/initialize.ts";
+export declare function refuse(state: Effect.Success<typeof initialize>): (route: string, major: string, seconds: number, global: boolean) => Effect.Effect<void, never, never>;
+//# sourceMappingURL=refuse.d.ts.map

package/dist/rest-limits/refuse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refuse.d.ts","sourceRoot":"","sources":["../../src/rest-limits/refuse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,UAAU,CAAC,yGAS9D"}

package/dist/rest-limits/refuse.js

@@ -0,0 +1,13 @@
+import { Clock, Effect, Ref } from "effect";
+export function refuse(state) {
+    return Effect.fn("DiscordRestLimits.refuse")(function* (route, major, seconds, global) {
+        const reset = (yield* Clock.currentTimeMillis) + seconds * 1000;
+        if (global) {
+            yield* Ref.update(state.globalReset, (previous) => Math.max(previous, reset));
+        }
+        else {
+            state.blocked.set(`${state.routes.get(route) ?? route}:${major}`, reset);
+        }
+    });
+}
+//# sourceMappingURL=refuse.js.map

package/dist/rest-limits/refuse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refuse.js","sourceRoot":"","sources":["../../src/rest-limits/refuse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAG5C,MAAM,UAAU,MAAM,CAAC,KAAwC;IAC9D,OAAO,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAa,EAAE,KAAa,EAAE,OAAe,EAAE,MAAe;QACrH,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC;QAChE,IAAI,MAAM,EAAE,CAAC;YACZ,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACP,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;QAC1E,CAAC;IACF,CAAC,CAAC,CAAC;AACJ,CAAC"}

package/dist/rest-limits/service.d.ts

@@ -0,0 +1,8 @@
+export declare const DiscordRestLimits: import("effect/Context").Service<"@shivaedev/discord/DiscordRestLimits", Readonly<{
+    readonly observe: (route: string, major: string, headers: import("effect/http/Headers").Headers) => import("effect/Effect").Effect<void, never, never>;
+    readonly refuse: (route: string, major: string, seconds: number, global: boolean) => import("effect/Effect").Effect<void, never, never>;
+    readonly wait: (route: string, major: string) => import("effect/Effect").Effect<void, never, never>;
+}>> & {
+    readonly layer: import("effect/Layer").Layer<"@shivaedev/discord/DiscordRestLimits", never, never>;
+};
+//# sourceMappingURL=service.d.ts.map

package/dist/rest-limits/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/rest-limits/service.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,iBAAiB;;;;;;CAK5B,CAAC"}

package/dist/rest-limits/service.js

@@ -0,0 +1,12 @@
+import { defineService } from "@shivaedev/service/defineService.ts";
+import { initialize } from "#rest-limits/initialize.ts";
+import { observe } from "#rest-limits/observe.ts";
+import { refuse } from "#rest-limits/refuse.ts";
+import { wait } from "#rest-limits/wait.ts";
+export const DiscordRestLimits = defineService({
+    id: "@shivaedev/discord/DiscordRestLimits",
+    initialize,
+    methods: (state) => ({ observe: observe(state), refuse: refuse(state), wait: wait(state) }),
+    requires: [],
+});
+//# sourceMappingURL=service.js.map

package/dist/rest-limits/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/rest-limits/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,CAAC;IAC9C,EAAE,EAAE,sCAAsC;IAC1C,UAAU;IACV,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IAC3F,QAAQ,EAAE,EAAE;CACZ,CAAC,CAAC"}

package/dist/rest-limits/wait.d.ts

@@ -0,0 +1,4 @@
+import { Effect } from "effect";
+import type { initialize } from "#rest-limits/initialize.ts";
+export declare function wait(state: Effect.Success<typeof initialize>): (route: string, major: string) => Effect.Effect<void, never, never>;
+//# sourceMappingURL=wait.d.ts.map

package/dist/rest-limits/wait.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../src/rest-limits/wait.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,wBAAgB,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,UAAU,CAAC,uEAQ5D"}

package/dist/rest-limits/wait.js

@@ -0,0 +1,11 @@
+import { Clock, Effect, Ref } from "effect";
+export function wait(state) {
+    return Effect.fn("DiscordRestLimits.wait")(function* (route, major) {
+        const reset = Math.max(yield* Ref.get(state.globalReset), state.blocked.get(`${state.routes.get(route) ?? route}:${major}`) ?? 0);
+        const delay = reset - (yield* Clock.currentTimeMillis);
+        if (delay > 0) {
+            yield* Effect.sleep(delay);
+        }
+    });
+}
+//# sourceMappingURL=wait.js.map

package/dist/rest-limits/wait.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/rest-limits/wait.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAG5C,MAAM,UAAU,IAAI,CAAC,KAAwC;IAC5D,OAAO,MAAM,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAa,EAAE,KAAa;QACjF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAClI,MAAM,KAAK,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACvD,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACf,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/discord",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Discord integrations for Effect applications",
   "homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/discord#readme",
   "bugs": {
@@ -40,20 +40,20 @@
     "README.md"
   ],
   "dependencies": {
-    "@shivaedev/http": "0.8.0",
-    "@shivaedev/service": "0.8.0"
+    "@shivaedev/http": "0.8.1",
+    "@shivaedev/service": "0.8.1"
   },
   "devDependencies": {
-    "@shivaedev/quality": "0.65.0",
-    "@shivaedev/test-kits": "0.8.0",
-    "@shivaedev/test-story": "0.42.0",
+    "@shivaedev/quality": "0.70.1",
+    "@shivaedev/test-kits": "0.10.2",
+    "@shivaedev/test-story": "0.45.2",
     "@types/node": "24.19.2",
-    "effect": "4.1.0",
+    "effect": "4.1.1",
     "typescript": "7.0.2",
     "vitest": "5.0.5"
   },
   "peerDependencies": {
-    "effect": "4.1.0"
+    "effect": "4.1.1"
   },
   "engines": {
     "node": ">=24"

package/src/{runGateway.ts → gateway/run.ts}

@@ -1,12 +1,12 @@
 import { Effect } from "effect";
 import { Socket } from "effect/socket";
+import { gatewayConnection } from "#adapters/gatewayConnection.ts";
 import { DiscordConfig } from "#DiscordConfig.ts";
 import { DiscordGatewayClosed } from "#errors.ts";
 import { GatewayTransport } from "#GatewayTransport.ts";
-import { gatewayConnection } from "#gatewayConnection.ts";
 import type { GatewayDispatch, GatewaySession } from "#gatewayProtocol.ts";
 
-export const runGateway = Effect.fnUntraced(function* (dispatch: (event: GatewayDispatch) => Effect.Effect<void>) {
+export const run = Effect.fn("DiscordGateway.run")(function* (dispatch: (event: GatewayDispatch) => Effect.Effect<void>) {
 	const config = yield* DiscordConfig;
 	const transport = yield* GatewayTransport;
 	const session: GatewaySession = { resumeUrl: undefined, sequence: null, sessionId: undefined };

package/src/{DiscordGateway.ts → gateway/service.ts}

@@ -3,11 +3,11 @@ import { defineService } from "@shivaedev/service/defineService.ts";
 import { DiscordConfig } from "#DiscordConfig.ts";
 import { DiscordToken } from "#DiscordToken.ts";
 import { GatewayTransport } from "#GatewayTransport.ts";
-import { runGateway } from "#runGateway.ts";
+import { run } from "#gateway/run.ts";
 
 export const DiscordGateway = defineService({
 	id: "@shivaedev/discord/DiscordGateway",
 	initialize: Effect.void,
-	methods: () => ({ run: runGateway }),
+	methods: () => ({ run }),
 	requires: [DiscordConfig, DiscordToken, GatewayTransport],
 });

package/src/request.ts

@@ -1,6 +1,6 @@
 import { Effect, Schema } from "effect";
 import type { HttpMethod } from "effect/http/HttpMethod";
-import { DiscordRest } from "#DiscordRest.ts";
+import { DiscordRest } from "#rest/service.ts";
 
 export function request<TSchema extends Schema.ConstraintDecoder<unknown>>(method: HttpMethod, path: string, schema: TSchema, body?: unknown) {
 	return Effect.flatMap(DiscordRest, (rest) => rest.request(method, path, body)).pipe(Effect.flatMap(Schema.decodeUnknownEffect(schema)));

package/src/rest/initialize.ts

@@ -0,0 +1,3 @@
+import { Semaphore } from "effect";
+
+export const initialize = Semaphore.make(1);

package/src/rest/layer.ts

@@ -0,0 +1,5 @@
+import { Layer } from "effect";
+import { DiscordRest } from "#rest/service.ts";
+import { DiscordRestLimits } from "#rest-limits/service.ts";
+
+export const layer = DiscordRest.layer.pipe(Layer.provide(DiscordRestLimits.layer));

package/src/{restClient.ts → rest/request.ts}

@@ -1,4 +1,4 @@
-import { Effect, Redacted, Schema, Semaphore } from "effect";
+import { Effect, Redacted, Schema } from "effect";
 import { HttpClient, HttpClientRequest } from "effect/http";
 import type { HttpMethod } from "effect/http/HttpMethod";
 import { readBoundedJson } from "@shivaedev/http/body.ts";
@@ -8,30 +8,30 @@ import { routeKey } from "#adapters/routeKey.ts";
 import { DiscordConfig } from "#DiscordConfig.ts";
 import { DiscordToken } from "#DiscordToken.ts";
 import { DiscordRateLimited, DiscordTransportError } from "#errors.ts";
-import { rateLimits } from "#rateLimits.ts";
+import type { initialize } from "#rest/initialize.ts";
+import { DiscordRestLimits } from "#rest-limits/service.ts";
 
 const Limited = Schema.Struct({ global: Schema.optional(Schema.Boolean), retryAfter: Schema.Number }).pipe(
 	Schema.encodeKeys({ retryAfter: "retry_after" }),
 );
 
-export const initializeRest = Effect.gen(function* () {
-	const client = HttpClient.withScope(yield* HttpClient.HttpClient);
-	const token = yield* DiscordToken;
-	const config = yield* DiscordConfig;
-	const rates = rateLimits();
-	const lock = yield* Semaphore.make(1);
-	const request = Effect.fnUntraced(function* (method: HttpMethod, path: string, body?: unknown) {
-		const { major, route } = routeKey(method, path);
-		let input = HttpClientRequest.make(method)(`${config.apiUrl}${path}`).pipe(
-			HttpClientRequest.setHeader("Authorization", `Bot ${Redacted.value(token)}`),
-		);
-		if (body !== undefined) {
-			input = yield* HttpClientRequest.bodyJson(input, body);
-		}
-		for (let attempt = 0; ; attempt += 1) {
-			yield* rates.wait(route, major);
-			const answer = yield* Effect.scoped(
-				Effect.gen(function* () {
+export function request(lock: Effect.Success<typeof initialize>) {
+	return Effect.fn("DiscordRest.request")(
+		function* (method: HttpMethod, path: string, body?: unknown) {
+			const client = HttpClient.withScope(yield* HttpClient.HttpClient);
+			const token = yield* DiscordToken;
+			const config = yield* DiscordConfig;
+			const rates = yield* DiscordRestLimits;
+			const { major, route } = routeKey(method, path);
+			let input = HttpClientRequest.make(method)(`${config.apiUrl}${path}`).pipe(
+				HttpClientRequest.setHeader("Authorization", `Bot ${Redacted.value(token)}`),
+			);
+			if (body !== undefined) {
+				input = yield* HttpClientRequest.bodyJson(input, body);
+			}
+			for (let attempt = 0; ; attempt += 1) {
+				yield* rates.wait(route, major);
+				const answer = yield* Effect.gen(function* () {
 					const response = yield* client.execute(input);
 					yield* rates.observe(route, major, response.headers);
 					if (isRateLimited(response.status)) {
@@ -45,20 +45,13 @@ export const initializeRest = Effect.gen(function* () {
 					yield* checkStatus(response);
 					const value = isEmpty(response.status) ? undefined : yield* readBoundedJson(response, 1024 * 1024, Schema.Unknown);
 					return { retry: false, value };
-				}),
-			);
-			if (!answer.retry) {
-				return answer.value;
+				}).pipe(Effect.scoped);
+				if (!answer.retry) {
+					return answer.value;
+				}
 			}
-		}
-	});
-	return { lock, request };
-});
-
-export function restRequest(state: Effect.Success<typeof initializeRest>) {
-	return (method: HttpMethod, path: string, body?: unknown) =>
-		state.request(method, path, body).pipe(
-			state.lock.withPermit,
-			Effect.catchTag("HttpClientError", () => Effect.fail(new DiscordTransportError({}))),
-		);
+		},
+		lock.withPermit,
+		Effect.catchTag("HttpClientError", () => Effect.fail(new DiscordTransportError({}))),
+	);
 }

package/src/rest/service.ts

@@ -0,0 +1,14 @@
+import { HttpClient } from "effect/http";
+import { defineService } from "@shivaedev/service/defineService.ts";
+import { DiscordConfig } from "#DiscordConfig.ts";
+import { DiscordToken } from "#DiscordToken.ts";
+import { initialize } from "#rest/initialize.ts";
+import { request } from "#rest/request.ts";
+import { DiscordRestLimits } from "#rest-limits/service.ts";
+
+export const DiscordRest = defineService({
+	id: "@shivaedev/discord/DiscordRest",
+	initialize,
+	methods: (state) => ({ request: request(state) }),
+	requires: [HttpClient.HttpClient, DiscordToken, DiscordConfig, DiscordRestLimits],
+});

package/src/rest-limits/initialize.ts

@@ -0,0 +1,9 @@
+import { Effect, Ref } from "effect";
+
+export const initialize = Effect.gen(function* () {
+	return {
+		blocked: new Map<string, number>(),
+		globalReset: yield* Ref.make(0),
+		routes: new Map<string, string>(),
+	};
+});

package/src/rest-limits/observe.ts

@@ -0,0 +1,18 @@
+import { Clock, Effect } from "effect";
+import type { Headers } from "effect/http";
+import type { initialize } from "#rest-limits/initialize.ts";
+
+export function observe(state: Effect.Success<typeof initialize>) {
+	return Effect.fn("DiscordRestLimits.observe")(function* (route: string, major: string, headers: Headers.Headers) {
+		const bucket = headers["x-ratelimit-bucket"];
+		if (bucket !== undefined) {
+			state.routes.set(route, bucket);
+		}
+		if (headers["x-ratelimit-remaining"] === "0") {
+			state.blocked.set(
+				`${state.routes.get(route) ?? route}:${major}`,
+				(yield* Clock.currentTimeMillis) + Number(headers["x-ratelimit-reset-after"] ?? 0) * 1000,
+			);
+		}
+	});
+}

package/src/rest-limits/refuse.ts

@@ -0,0 +1,13 @@
+import { Clock, Effect, Ref } from "effect";
+import type { initialize } from "#rest-limits/initialize.ts";
+
+export function refuse(state: Effect.Success<typeof initialize>) {
+	return Effect.fn("DiscordRestLimits.refuse")(function* (route: string, major: string, seconds: number, global: boolean) {
+		const reset = (yield* Clock.currentTimeMillis) + seconds * 1000;
+		if (global) {
+			yield* Ref.update(state.globalReset, (previous) => Math.max(previous, reset));
+		} else {
+			state.blocked.set(`${state.routes.get(route) ?? route}:${major}`, reset);
+		}
+	});
+}

package/src/rest-limits/service.ts

@@ -0,0 +1,12 @@
+import { defineService } from "@shivaedev/service/defineService.ts";
+import { initialize } from "#rest-limits/initialize.ts";
+import { observe } from "#rest-limits/observe.ts";
+import { refuse } from "#rest-limits/refuse.ts";
+import { wait } from "#rest-limits/wait.ts";
+
+export const DiscordRestLimits = defineService({
+	id: "@shivaedev/discord/DiscordRestLimits",
+	initialize,
+	methods: (state) => ({ observe: observe(state), refuse: refuse(state), wait: wait(state) }),
+	requires: [],
+});

package/src/rest-limits/wait.ts

@@ -0,0 +1,12 @@
+import { Clock, Effect, Ref } from "effect";
+import type { initialize } from "#rest-limits/initialize.ts";
+
+export function wait(state: Effect.Success<typeof initialize>) {
+	return Effect.fn("DiscordRestLimits.wait")(function* (route: string, major: string) {
+		const reset = Math.max(yield* Ref.get(state.globalReset), state.blocked.get(`${state.routes.get(route) ?? route}:${major}`) ?? 0);
+		const delay = reset - (yield* Clock.currentTimeMillis);
+		if (delay > 0) {
+			yield* Effect.sleep(delay);
+		}
+	});
+}

package/dist/DiscordGateway.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DiscordGateway.d.ts","sourceRoot":"","sources":["../src/DiscordGateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,eAAO,MAAM,cAAc;;;;CAKzB,CAAC"}

package/dist/DiscordGateway.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DiscordGateway.js","sourceRoot":"","sources":["../src/DiscordGateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,CAAC,MAAM,cAAc,GAAG,aAAa,CAAC;IAC3C,EAAE,EAAE,mCAAmC;IACvC,UAAU,EAAE,MAAM,CAAC,IAAI;IACvB,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;IACpC,QAAQ,EAAE,CAAC,aAAa,EAAE,YAAY,EAAE,gBAAgB,CAAC;CACzD,CAAC,CAAC"}

package/dist/DiscordRest.d.ts

@@ -1,8 +0,0 @@
-import { HttpClient } from "effect/http";
-import { DiscordToken } from "#DiscordToken.ts";
-export declare const DiscordRest: import("effect/Context").Service<"@shivaedev/discord/DiscordRest", Readonly<{
-    readonly request: (method: import("effect/http/HttpMethod").HttpMethod, path: string, body?: unknown) => import("effect/Effect").Effect<unknown, import("./errors.ts").DiscordRateLimited | import("./errors.ts").DiscordTransportError | import("effect/http/HttpBody").HttpBodyError | import("@shivaedev/http/errors.ts").InvalidBodyLimit | import("@shivaedev/http/errors.ts").RemoteGone | import("@shivaedev/http/errors.ts").RemoteHttpError | import("@shivaedev/http/errors.ts").RemoteNotFound | import("@shivaedev/http/errors.ts").RemoteRateLimited | import("@shivaedev/http/errors.ts").RemoteUnauthorized | import("@shivaedev/http/errors.ts").ResponseBodyTooLarge | import("effect/Schema").SchemaError, never>;
-}>> & {
-    readonly layer: import("effect/Layer").Layer<"@shivaedev/discord/DiscordRest", never, DiscordToken | HttpClient.HttpClient>;
-};
-//# sourceMappingURL=DiscordRest.d.ts.map

package/dist/DiscordRest.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DiscordRest.d.ts","sourceRoot":"","sources":["../src/DiscordRest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,eAAO,MAAM,WAAW;;;;CAKtB,CAAC"}

package/dist/DiscordRest.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DiscordRest.js","sourceRoot":"","sources":["../src/DiscordRest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC;IACxC,EAAE,EAAE,gCAAgC;IACpC,UAAU,EAAE,cAAc;IAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;IACrD,QAAQ,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,EAAE,aAAa,CAAC;CAC9D,CAAC,CAAC"}

package/dist/gatewayConnection.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"gatewayConnection.d.ts","sourceRoot":"","sources":["../src/gatewayConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAA2B,KAAK,eAAe,EAAqB,KAAK,cAAc,EAA2B,MAAM,qBAAqB,CAAC;AAErJ,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,8HAkFnH"}

package/dist/gatewayConnection.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"gatewayConnection.js","sourceRoot":"","sources":["../src/gatewayConnection.ts"],"names":[],"mappings":"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"}

package/dist/rateLimits.d.ts

@@ -1,8 +0,0 @@
-import { Effect } from "effect";
-import type { Headers } from "effect/http";
-export declare function rateLimits(): {
-    observe: (route: string, major: string, headers: Headers.Headers) => Effect.Effect<void, never, never>;
-    refuse: (route: string, major: string, seconds: number, global: boolean) => Effect.Effect<void, never, never>;
-    wait: (route: string, major: string) => Effect.Effect<void, never, never>;
-};
-//# sourceMappingURL=rateLimits.d.ts.map

package/dist/rateLimits.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rateLimits.d.ts","sourceRoot":"","sources":["../src/rateLimits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,wBAAgB,UAAU;IAQxB,OAAO,UAAU,MAAM,SAAS,MAAM,WAAW,OAAO,CAAC,OAAO;IAUhE,MAAM,UAAU,MAAM,SAAS,MAAM,WAAW,MAAM,UAAU,OAAO;IASvE,IAAI,UAAU,MAAM,SAAS,MAAM;EAQpC"}

package/dist/rateLimits.js

@@ -1,36 +0,0 @@
-import { Clock, Effect } from "effect";
-export function rateLimits() {
-    const routes = new Map();
-    const blocked = new Map();
-    let globalReset = 0;
-    function key(route, major) {
-        return `${routes.get(route) ?? route}:${major}`;
-    }
-    return {
-        observe: (route, major, headers) => Effect.gen(function* () {
-            const bucket = headers["x-ratelimit-bucket"];
-            if (bucket !== undefined) {
-                routes.set(route, bucket);
-            }
-            if (headers["x-ratelimit-remaining"] === "0") {
-                blocked.set(key(route, major), (yield* Clock.currentTimeMillis) + Number(headers["x-ratelimit-reset-after"] ?? 0) * 1000);
-            }
-        }),
-        refuse: (route, major, seconds, global) => Effect.gen(function* () {
-            const reset = (yield* Clock.currentTimeMillis) + seconds * 1000;
-            if (global) {
-                globalReset = Math.max(globalReset, reset);
-            }
-            else {
-                blocked.set(key(route, major), reset);
-            }
-        }),
-        wait: (route, major) => Effect.gen(function* () {
-            const delay = Math.max(globalReset, blocked.get(key(route, major)) ?? 0) - (yield* Clock.currentTimeMillis);
-            if (delay > 0) {
-                yield* Effect.sleep(delay);
-            }
-        }),
-    };
-}
-//# sourceMappingURL=rateLimits.js.map

package/dist/rateLimits.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rateLimits.js","sourceRoot":"","sources":["../src/rateLimits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGvC,MAAM,UAAU,UAAU;IACzB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC1C,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,SAAS,GAAG,CAAC,KAAa,EAAE,KAAa;QACxC,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;IACjD,CAAC;IACD,OAAO;QACN,OAAO,EAAE,CAAC,KAAa,EAAE,KAAa,EAAE,OAAwB,EAAE,EAAE,CACnE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAC7C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC1B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC3B,CAAC;YACD,IAAI,OAAO,CAAC,uBAAuB,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC9C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAC3H,CAAC;QACF,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,KAAa,EAAE,KAAa,EAAE,OAAe,EAAE,MAAe,EAAE,EAAE,CAC1E,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC;YAChE,IAAI,MAAM,EAAE,CAAC;gBACZ,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACP,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;YACvC,CAAC;QACF,CAAC,CAAC;QACH,IAAI,EAAE,CAAC,KAAa,EAAE,KAAa,EAAE,EAAE,CACtC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC5G,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACf,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC,CAAC;KACH,CAAC;AACH,CAAC"}

package/dist/restClient.d.ts

@@ -1,11 +0,0 @@
-import { Effect, Schema, Semaphore } from "effect";
-import { HttpClient } from "effect/http";
-import type { HttpMethod } from "effect/http/HttpMethod";
-import { DiscordToken } from "#DiscordToken.ts";
-import { DiscordRateLimited, DiscordTransportError } from "#errors.ts";
-export declare const initializeRest: Effect.Effect<{
-    lock: Semaphore.Semaphore;
-    request: (method: HttpMethod, path: string, body?: unknown) => Effect.Effect<unknown, DiscordRateLimited | import("effect/http/HttpBody").HttpBodyError | import("effect/http/HttpClientError").HttpClientError | import("@shivaedev/http/errors.ts").InvalidBodyLimit | import("@shivaedev/http/errors.ts").RemoteGone | import("@shivaedev/http/errors.ts").RemoteHttpError | import("@shivaedev/http/errors.ts").RemoteNotFound | import("@shivaedev/http/errors.ts").RemoteRateLimited | import("@shivaedev/http/errors.ts").RemoteUnauthorized | import("@shivaedev/http/errors.ts").ResponseBodyTooLarge | Schema.SchemaError, never>;
-}, never, DiscordToken | HttpClient.HttpClient>;
-export declare function restRequest(state: Effect.Success<typeof initializeRest>): (method: HttpMethod, path: string, body?: unknown) => Effect.Effect<unknown, DiscordRateLimited | DiscordTransportError | import("effect/http/HttpBody").HttpBodyError | import("@shivaedev/http/errors.ts").InvalidBodyLimit | import("@shivaedev/http/errors.ts").RemoteGone | import("@shivaedev/http/errors.ts").RemoteHttpError | import("@shivaedev/http/errors.ts").RemoteNotFound | import("@shivaedev/http/errors.ts").RemoteRateLimited | import("@shivaedev/http/errors.ts").RemoteUnauthorized | import("@shivaedev/http/errors.ts").ResponseBodyTooLarge | Schema.SchemaError, never>;
-//# sourceMappingURL=restClient.d.ts.map

package/dist/restClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"restClient.d.ts","sourceRoot":"","sources":["../src/restClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMzD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAOvE,eAAO,MAAM,cAAc;;;+CAuCzB,CAAC;AAEH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,YACvD,UAAU,QAAQ,MAAM,SAAS,OAAO,khBAKxD"}

package/dist/restClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"restClient.js","sourceRoot":"","sources":["../src/restClient.ts"],"names":[],"mappings":"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"}

package/dist/runGateway.d.ts

@@ -1,6 +0,0 @@
-import { Effect } from "effect";
-import { DiscordGatewayClosed } from "#errors.ts";
-import { GatewayTransport } from "#GatewayTransport.ts";
-import type { GatewayDispatch } from "#gatewayProtocol.ts";
-export declare const runGateway: (dispatch: (event: GatewayDispatch) => Effect.Effect<void>) => Effect.Effect<never, DiscordGatewayClosed | import("#errors.ts").DiscordGatewayProtocolError, import("./DiscordToken.ts").DiscordToken | GatewayTransport>;
-//# sourceMappingURL=runGateway.d.ts.map

package/dist/runGateway.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"runGateway.d.ts","sourceRoot":"","sources":["../src/runGateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,qBAAqB,CAAC;AAE3E,eAAO,MAAM,UAAU,qBAAkD,eAAe,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,+JAuB9G,CAAC"}

package/dist/runGateway.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"runGateway.js","sourceRoot":"","sources":["../src/runGateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,QAAyD;IAC/G,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC;IAC1C,MAAM,OAAO,GAAmB,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IAC/F,OAAO,IAAI,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,UAAU,sBAAsB,CAAC,CAAC;QACtG,KAAK,CAAC,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC;aACzC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aAClD,IAAI,CACJ,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YACxC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACtF,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;gBAC3E,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,oBAAoB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBACpC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC9B,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC9B,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;YACzB,CAAC;YACD,OAAO,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACjC,CAAC,CAAC,CACF,CAAC;IACJ,CAAC;AACF,CAAC,CAAC,CAAC"}

package/src/DiscordRest.ts

@@ -1,12 +0,0 @@
-import { HttpClient } from "effect/http";
-import { defineService } from "@shivaedev/service/defineService.ts";
-import { DiscordConfig } from "#DiscordConfig.ts";
-import { DiscordToken } from "#DiscordToken.ts";
-import { initializeRest, restRequest } from "#restClient.ts";
-
-export const DiscordRest = defineService({
-	id: "@shivaedev/discord/DiscordRest",
-	initialize: initializeRest,
-	methods: (state) => ({ request: restRequest(state) }),
-	requires: [HttpClient.HttpClient, DiscordToken, DiscordConfig],
-});

package/src/rateLimits.ts

@@ -1,39 +0,0 @@
-import { Clock, Effect } from "effect";
-import type { Headers } from "effect/http";
-
-export function rateLimits() {
-	const routes = new Map<string, string>();
-	const blocked = new Map<string, number>();
-	let globalReset = 0;
-	function key(route: string, major: string) {
-		return `${routes.get(route) ?? route}:${major}`;
-	}
-	return {
-		observe: (route: string, major: string, headers: Headers.Headers) =>
-			Effect.gen(function* () {
-				const bucket = headers["x-ratelimit-bucket"];
-				if (bucket !== undefined) {
-					routes.set(route, bucket);
-				}
-				if (headers["x-ratelimit-remaining"] === "0") {
-					blocked.set(key(route, major), (yield* Clock.currentTimeMillis) + Number(headers["x-ratelimit-reset-after"] ?? 0) * 1000);
-				}
-			}),
-		refuse: (route: string, major: string, seconds: number, global: boolean) =>
-			Effect.gen(function* () {
-				const reset = (yield* Clock.currentTimeMillis) + seconds * 1000;
-				if (global) {
-					globalReset = Math.max(globalReset, reset);
-				} else {
-					blocked.set(key(route, major), reset);
-				}
-			}),
-		wait: (route: string, major: string) =>
-			Effect.gen(function* () {
-				const delay = Math.max(globalReset, blocked.get(key(route, major)) ?? 0) - (yield* Clock.currentTimeMillis);
-				if (delay > 0) {
-					yield* Effect.sleep(delay);
-				}
-			}),
-	};
-}