dfx 0.0.5 → 0.1.0

package/DiscordConfig/index.d.ts

@@ -0,0 +1,29 @@
+import * as T from "@effect-ts/core/Effect";
+import { UpdatePresence } from "../types";
+export interface DiscordConfig {
+    _tag: "DiscordConfig";
+    token: string;
+    rest: {
+        baseUrl: string;
+    };
+    gateway: {
+        intents: number;
+        presence?: UpdatePresence;
+    };
+}
+export declare const DiscordConfig: import("@effect-ts/system/Has").Tag<DiscordConfig>;
+export interface MakeOpts {
+    token: string;
+    rest?: Partial<DiscordConfig["rest"]>;
+    gateway?: Partial<DiscordConfig["gateway"]>;
+}
+export declare const make: ({ token, rest, gateway }: MakeOpts) => DiscordConfig;
+export declare const makeLayer: (a_0: MakeOpts) => import("@effect-ts/system/Layer").Layer<{}, never, import("@effect-ts/system/Has").Has<DiscordConfig>>;
+export declare const token: T.Effect<import("@effect-ts/system/Has").Has<DiscordConfig>, never, string>;
+export declare const rest: T.Effect<import("@effect-ts/system/Has").Has<DiscordConfig>, never, {
+    baseUrl: string;
+}>;
+export declare const gateway: T.Effect<import("@effect-ts/system/Has").Has<DiscordConfig>, never, {
+    intents: number;
+    presence?: UpdatePresence | undefined;
+}>;

package/DiscordConfig/index.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gateway = exports.rest = exports.token = exports.makeLayer = exports.make = exports.DiscordConfig = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordConfig/index.ts";
+const Has_1 = require("@effect-ts/system/Has");
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const Function_1 = require("@effect-ts/system/Function");
+const Layer_1 = require("@effect-ts/system/Layer");
+const types_1 = require("../types");
+const VERSION = 9;
+exports.DiscordConfig = (0, Has_1.tag)();
+const make = ({ token, rest, gateway }) => ({
+    _tag: "DiscordConfig",
+    token,
+    rest: {
+        baseUrl: `https://discord.com/api/v${VERSION}`,
+        ...(rest ?? {}),
+    },
+    gateway: {
+        intents: types_1.GatewayIntents.GUILDS,
+        ...(gateway ?? {}),
+    },
+});
+exports.make = make;
+exports.makeLayer = (0, Function_1.flow)(exports.make, (0, Layer_1.fromValue)(exports.DiscordConfig));
+exports.token = T.accessService(exports.DiscordConfig)(({ token }) => token, fileName_1 + ":43:52");
+exports.rest = T.accessService(exports.DiscordConfig)(({ rest }) => rest, fileName_1 + ":44:51");
+exports.gateway = T.accessService(exports.DiscordConfig)(({ gateway }) => gateway, fileName_1 + ":45:54");
+//# sourceMappingURL=index.js.map

package/DiscordConfig/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,+CAA2C;AAC3C,kEAA2C;AAC3C,yDAAiD;AACjD,mDAAmD;AACnD,oCAAyD;AAEzD,MAAM,OAAO,GAAG,CAAC,CAAA;AAaJ,QAAA,aAAa,GAAG,IAAA,SAAG,GAAiB,CAAA;AAQ1C,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAY,EAAiB,EAAE,CAAC,CAAC;IAC1E,IAAI,EAAE,eAAe;IACrB,KAAK;IACL,IAAI,EAAE;QACJ,OAAO,EAAE,4BAA4B,OAAO,EAAE;QAC9C,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;KAChB;IACD,OAAO,EAAE;QACP,OAAO,EAAE,sBAAc,CAAC,MAAM;QAC9B,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACnB;CACF,CAAC,CAAA;AAXW,QAAA,IAAI,QAWf;AAEW,QAAA,SAAS,GAAG,IAAA,eAAI,EAAC,YAAI,EAAE,IAAA,iBAAS,EAAC,qBAAa,CAAC,CAAC,CAAA;AAEhD,QAAA,KAAK,GAAG,CAAC,CAAC,aAAa,CAAC,qBAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,wBAAC,CAAA;AAC5D,QAAA,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,qBAAa,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,wBAAC,CAAA;AACzD,QAAA,OAAO,GAAG,CAAC,CAAC,aAAa,CAAC,qBAAa,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,wBAAC,CAAA"}

package/DiscordConfig/index.ts

@@ -0,0 +1,45 @@
+import { tag } from "@effect-ts/system/Has"
+import * as T from "@effect-ts/core/Effect"
+import { flow } from "@effect-ts/system/Function"
+import { fromValue } from "@effect-ts/system/Layer"
+import { GatewayIntents, UpdatePresence } from "../types"
+
+const VERSION = 9
+
+export interface DiscordConfig {
+  _tag: "DiscordConfig"
+  token: string
+  rest: {
+    baseUrl: string
+  }
+  gateway: {
+    intents: number
+    presence?: UpdatePresence
+  }
+}
+export const DiscordConfig = tag<DiscordConfig>()
+
+export interface MakeOpts {
+  token: string
+  rest?: Partial<DiscordConfig["rest"]>
+  gateway?: Partial<DiscordConfig["gateway"]>
+}
+
+export const make = ({ token, rest, gateway }: MakeOpts): DiscordConfig => ({
+  _tag: "DiscordConfig",
+  token,
+  rest: {
+    baseUrl: `https://discord.com/api/v${VERSION}`,
+    ...(rest ?? {}),
+  },
+  gateway: {
+    intents: GatewayIntents.GUILDS,
+    ...(gateway ?? {}),
+  },
+})
+
+export const makeLayer = flow(make, fromValue(DiscordConfig))
+
+export const token = T.accessService(DiscordConfig)(({ token }) => token)
+export const rest = T.accessService(DiscordConfig)(({ rest }) => rest)
+export const gateway = T.accessService(DiscordConfig)(({ gateway }) => gateway)

package/DiscordGateway/index.d.ts

@@ -0,0 +1,23 @@
+import * as T from "@effect-ts/core/Effect";
+import * as M from "@effect-ts/core/Effect/Managed";
+import { _A } from "@effect-ts/core/Utils";
+import * as Shard from "../DiscordShard";
+import * as CB from "callbag-effect-ts";
+import { GatewayEvents } from "../types";
+declare const make: M.Managed<import("@effect-ts/system/Has").Has<import("../DiscordConfig").DiscordConfig> & import("@effect-ts/system/Has").Has<Shard.DiscordShard>, never, {
+    readonly fromDispatch: <K extends keyof GatewayEvents>(event: K) => CB.EffectSource<import("@effect-ts/system/Has").Has<import("../DiscordWS").DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, GatewayEvents[K]>;
+    readonly run: T.RIO<import("@effect-ts/system/Has").Has<import("../DiscordWS").DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, void>;
+    readonly raw: CB.EffectSource<import("@effect-ts/system/Has").Has<import("../DiscordWS").DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, import("../types").GatewayPayload<any>>;
+    readonly dispatch: CB.EffectSource<import("@effect-ts/system/Has").Has<import("../DiscordWS").DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, import("../types").GatewayPayload<import("../types").GatewayEvent>>;
+    readonly send: (p: import("../types").GatewayPayload<any>) => T.Effect<unknown, never, boolean>;
+    readonly reconnect: () => T.Effect<unknown, never, boolean>;
+    readonly _tag: "DiscordGatewayService";
+}>;
+export interface DiscordGateway extends _A<typeof make> {
+}
+export declare const DiscordGateway: import("@effect-ts/system/Has").Tag<DiscordGateway>;
+export declare const LiveDiscordGateway: import("@effect-ts/system/Layer").Layer<import("@effect-ts/system/Has").Has<import("../DiscordConfig").DiscordConfig> & import("@effect-ts/system/Has").Has<Shard.DiscordShard>, never, import("@effect-ts/system/Has").Has<DiscordGateway>>;
+export declare const gateway: T.Effect<import("@effect-ts/system/Has").Has<DiscordGateway>, never, DiscordGateway>;
+export declare const run: T.Effect<import("@effect-ts/system/Has").Has<import("../DiscordWS").DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock & import("@effect-ts/system/Has").Has<DiscordGateway>, never, void>;
+export declare const fromDispatch: <K extends keyof GatewayEvents>(event: K) => CB.EffectSource<import("@effect-ts/system/Has").Has<DiscordGateway> & import("@effect-ts/system/Has").Has<import("../DiscordWS").DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, GatewayEvents[K]>;
+export {};

package/DiscordGateway/index.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromDispatch = exports.run = exports.gateway = exports.LiveDiscordGateway = exports.DiscordGateway = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordGateway/index.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const M = tslib_1.__importStar(require("@effect-ts/core/Effect/Managed"));
+const Function_1 = require("@effect-ts/core/Function");
+const Has_1 = require("@effect-ts/core/Has");
+const Shard = tslib_1.__importStar(require("../DiscordShard"));
+const Utils = tslib_1.__importStar(require("./utils"));
+const CB = tslib_1.__importStar(require("callbag-effect-ts"));
+const make = (M.map_(Shard.make([0, 1]), (shard) => ({
+    _tag: "DiscordGatewayService",
+    ...shard,
+    fromDispatch: Utils.fromDispatch(shard.dispatch),
+}), fileName_1 + ":13:8"));
+exports.DiscordGateway = (0, Has_1.tag)();
+exports.LiveDiscordGateway = M.toLayer_(make, exports.DiscordGateway);
+exports.gateway = T.accessService(exports.DiscordGateway)(Function_1.identity, fileName_1 + ":27:55");
+exports.run = T.accessServiceM(exports.DiscordGateway)(({ run }) => run, fileName_1 + ":28:52");
+const fromDispatch = (event) => (CB.unwrap(T.accessService(exports.DiscordGateway)(({ fromDispatch }) => fromDispatch(event), fileName_1 + ":32:36")));
+exports.fromDispatch = fromDispatch;
+//# sourceMappingURL=index.js.map

package/DiscordGateway/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,0EAAmD;AACnD,uDAAyD;AACzD,6CAAyC;AAEzC,+DAAwC;AACxC,uDAAgC;AAChC,8DAAuC;AAGvC,MAAM,IAAI,IAER,CAAC,MADD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAEhB,CAAC,KAAK,EAAE,EAAE,CACR,CAAC;IACC,IAAI,EAAE,uBAAuB;IAC7B,GAAG,KAAK;IACR,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC;CACvC,CAAA,wBAEhB,CAAA;AAGY,QAAA,cAAc,GAAG,IAAA,SAAG,GAAkB,CAAA;AACtC,QAAA,kBAAkB,GAAG,CAAC,UAAyB,IAAI,EAApB,sBAAc,EAAO;AAEpD,QAAA,OAAO,GAAG,CAAC,CAAC,aAAa,CAAC,sBAAc,CAAC,CAAC,mBAAQ,wBAAC,CAAA;AACnD,QAAA,GAAG,GAAG,CAAC,CAAC,cAAc,CAAC,sBAAc,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,wBAAC,CAAA;AAE9D,MAAM,YAAY,GAAG,CAAgC,KAAQ,EAAE,EAAE,EAGpE,EAAE,CAAC,MAAM,CADT,CAAC,CAAC,aAAa,CAAC,sBAAc,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,wBAAC,EAE3E,CAAA;AAJU,QAAA,YAAY,gBAItB"}

package/DiscordGateway/index.ts

@@ -0,0 +1,34 @@
+import * as T from "@effect-ts/core/Effect"
+import * as M from "@effect-ts/core/Effect/Managed"
+import { identity, pipe } from "@effect-ts/core/Function"
+import { tag } from "@effect-ts/core/Has"
+import { _A } from "@effect-ts/core/Utils"
+import * as Shard from "../DiscordShard"
+import * as Utils from "./utils"
+import * as CB from "callbag-effect-ts"
+import { GatewayEvents } from "../types"
+
+const make = pipe(
+  Shard.make([0, 1]),
+  M.map(
+    (shard) =>
+      ({
+        _tag: "DiscordGatewayService",
+        ...shard,
+        fromDispatch: Utils.fromDispatch(shard.dispatch),
+      } as const),
+  ),
+)
+
+export interface DiscordGateway extends _A<typeof make> {}
+export const DiscordGateway = tag<DiscordGateway>()
+export const LiveDiscordGateway = M.toLayer(DiscordGateway)(make)
+
+export const gateway = T.accessService(DiscordGateway)(identity)
+export const run = T.accessServiceM(DiscordGateway)(({ run }) => run)
+
+export const fromDispatch = <K extends keyof GatewayEvents>(event: K) =>
+  pipe(
+    T.accessService(DiscordGateway)(({ fromDispatch }) => fromDispatch(event)),
+    CB.unwrap,
+  )

package/DiscordGateway/utils.d.ts

@@ -0,0 +1,3 @@
+import * as CB from "callbag-effect-ts";
+import { GatewayEvent, GatewayEvents, GatewayPayload } from "../types";
+export declare const fromDispatch: <R, E>(source: CB.EffectSource<R, E, GatewayPayload<GatewayEvent>>) => <K extends keyof GatewayEvents>(event: K) => CB.EffectSource<R, E, GatewayEvents[K]>;

package/DiscordGateway/utils.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromDispatch = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordGateway/utils.ts";
+const Function_1 = require("@effect-ts/core/Function");
+const CB = tslib_1.__importStar(require("callbag-effect-ts"));
+const memoize_1 = require("../Utils/memoize");
+const fromDispatch = (source) => (0, memoize_1.memoize)((event) => (CB.share(CB.map_(CB.filter_(source, (p) => p.t === event), (p) => p.d))));
+exports.fromDispatch = fromDispatch;
+//# sourceMappingURL=utils.js.map

package/DiscordGateway/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+C;AAC/C,8DAAuC;AAEvC,8CAA0C;AAEnC,MAAM,YAAY,GAAG,CAC1B,MAA2D,EAGf,EAAE,CAC9C,IAAA,iBAAO,EAAC,CAAC,KAAK,EAAE,EAAE,EAId,EAAE,CAAC,KAAK,CADR,EAAE,MADF,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,EACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAQ,GAEzB,CACF,CAAA;AAXU,QAAA,YAAY,gBAWtB"}

package/DiscordGateway/utils.ts

@@ -0,0 +1,17 @@
+import { pipe } from "@effect-ts/core/Function"
+import * as CB from "callbag-effect-ts"
+import { GatewayEvent, GatewayEvents, GatewayPayload } from "../types"
+import { memoize } from "../Utils/memoize"
+
+export const fromDispatch = <R, E>(
+  source: CB.EffectSource<R, E, GatewayPayload<GatewayEvent>>,
+): (<K extends keyof GatewayEvents>(
+  event: K,
+) => CB.EffectSource<R, E, GatewayEvents[K]>) =>
+  memoize((event) =>
+    pipe(
+      CB.filter_(source, (p) => p.t === event),
+      CB.map((p) => p.d as any),
+      CB.share,
+    ),
+  )

package/DiscordREST/http.d.ts

@@ -0,0 +1,3 @@
+import * as Axios from "axios";
+import { Response } from "./types";
+export declare const request: (axios: Axios.AxiosInstance) => <A>(config: Axios.AxiosRequestConfig) => Response<A>;

package/DiscordREST/http.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.request = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordREST/http.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const request = (axios) => (config) => T.tryCatchPromise(() => axios.request(config).then((r) => r.data), (err) => {
+    const axiosErr = err;
+    return axiosErr.response
+        ? {
+            _tag: "http",
+            config: axiosErr.config,
+            code: axiosErr.response.status,
+            body: axiosErr.response.data,
+        }
+        : { _tag: "axios", cause: axiosErr };
+}, fileName_1 + ":8:22");
+exports.request = request;
+//# sourceMappingURL=http.js.map

package/DiscordREST/http.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.js","sourceRoot":"","sources":["http.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAIpC,MAAM,OAAO,GAClB,CAAC,KAA0B,EAAE,EAAE,CAC/B,CAAI,MAAgC,EAAe,EAAE,CACnD,CAAC,CAAC,eAAe,CACf,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAI,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAClD,CAAC,GAAG,EAAE,EAAE;IACN,MAAM,QAAQ,GAAG,GAA0B,CAAA;IAC3C,OAAO,QAAQ,CAAC,QAAQ;QACtB,CAAC,CAAC;YACE,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM;YAC9B,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI;SAC7B;QACH,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAmC,EAAE,CAAA;AACnE,CAAC,uBACF,CAAA;AAhBQ,QAAA,OAAO,WAgBf"}

package/DiscordREST/http.ts

@@ -0,0 +1,21 @@
+import * as T from "@effect-ts/core/Effect"
+import * as Axios from "axios"
+import { RESTError, Response } from "./types"
+
+export const request =
+  (axios: Axios.AxiosInstance) =>
+  <A>(config: Axios.AxiosRequestConfig): Response<A> =>
+    T.tryCatchPromise<RESTError, A>(
+      () => axios.request<A>(config).then((r) => r.data),
+      (err) => {
+        const axiosErr = err as Axios.AxiosError<A>
+        return axiosErr.response
+          ? {
+              _tag: "http",
+              config: axiosErr.config,
+              code: axiosErr.response.status,
+              body: axiosErr.response.data,
+            }
+          : { _tag: "axios", cause: axiosErr as Axios.AxiosError<never> }
+      },
+    )

package/DiscordREST/index.d.ts

@@ -0,0 +1,11 @@
+import * as T from "@effect-ts/core/Effect";
+import { AxiosInstance, AxiosRequestConfig } from "axios";
+import * as Config from "../DiscordConfig";
+import { Endpoints } from "../types";
+export interface DiscordREST extends Endpoints<AxiosRequestConfig> {
+    _tag: "DiscordREST";
+    axios: AxiosInstance;
+}
+export declare const DiscordREST: import("@effect-ts/system/Has").Tag<DiscordREST>;
+export declare const LiveDiscordREST: import("@effect-ts/system/Layer").Layer<import("@effect-ts/system/Has").Has<Config.DiscordConfig>, never, import("@effect-ts/system/Has").Has<DiscordREST>>;
+export declare const rest: <R, E, B>(f: (a: DiscordREST) => T.Effect<R, E, B>, __trace?: string | undefined) => T.Effect<R & import("@effect-ts/system/Has").Has<DiscordREST>, E, B>;

package/DiscordREST/index.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rest = exports.LiveDiscordREST = exports.DiscordREST = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordREST/index.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const Has_1 = require("@effect-ts/system/Has");
+const axios_1 = tslib_1.__importDefault(require("axios"));
+const Config = tslib_1.__importStar(require("../DiscordConfig"));
+const types_1 = require("../types");
+const Http = tslib_1.__importStar(require("./http"));
+exports.DiscordREST = (0, Has_1.tag)();
+const make = T.gen(function* (_) {
+    const token = yield* _(Config.token, fileName_1 + ":20:25");
+    const config = yield* _(Config.rest, fileName_1 + ":21:26");
+    const axios = axios_1.default.create({
+        baseURL: config.baseUrl,
+        headers: {
+            Authorization: `Bot ${token}`,
+        },
+    });
+    const request = Http.request(axios);
+    const routes = (0, types_1.createRoutes)(({ method, url, params = {}, options = {} }) => {
+        const hasBody = method !== "GET" && method !== "DELETE";
+        let hasFormData = false;
+        if (typeof options.data?.append === "function") {
+            hasFormData = true;
+            options.data.append("payload_json", JSON.stringify(params));
+        }
+        const qsParams = hasBody
+            ? options.params
+            : {
+                ...(options.params || {}),
+                ...params,
+            };
+        const data = hasFormData || !hasBody
+            ? options.data
+            : {
+                ...(options.data || {}),
+                ...params,
+            };
+        const config = {
+            ...options,
+            headers: {
+                ...(options.headers || {}),
+                ...(hasFormData ? data.getHeaders() : {}),
+            },
+            method: method,
+            url,
+            params: qsParams,
+            data,
+        };
+        return request(config);
+    });
+    const rest = {
+        _tag: "DiscordREST",
+        axios,
+        ...routes,
+    };
+    return rest;
+}, fileName_1 + ":19:19");
+exports.LiveDiscordREST = T.toLayer(exports.DiscordREST)(make);
+exports.rest = T.accessServiceM(exports.DiscordREST);
+//# sourceMappingURL=index.js.map

package/DiscordREST/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,+CAA2C;AAC3C,0DAAwE;AACxE,iEAA0C;AAC1C,oCAAkD;AAClD,qDAA8B;AAMjB,QAAA,WAAW,GAAG,IAAA,SAAG,GAAe,CAAA;AAO7C,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,wBAAC,CAAA;IACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,wBAAC,CAAA;IAEpC,MAAM,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC;QACzB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE;YACP,aAAa,EAAE,OAAO,KAAK,EAAE;SAC9B;KACF,CAAC,CAAA;IACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACnC,MAAM,MAAM,GAAG,IAAA,oBAAY,EACzB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE;QAC7C,MAAM,OAAO,GAAG,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,CAAA;QACvD,IAAI,WAAW,GAAG,KAAK,CAAA;QAEvB,IAAI,OAAO,OAAO,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,EAAE;YAC9C,WAAW,GAAG,IAAI,CACjB;YAAC,OAAO,CAAC,IAAiB,CAAC,MAAM,CAChC,cAAc,EACd,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB,CAAA;SACF;QAED,MAAM,QAAQ,GAAG,OAAO;YACtB,CAAC,CAAC,OAAO,CAAC,MAAM;YAChB,CAAC,CAAC;gBACE,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;gBACzB,GAAG,MAAM;aACV,CAAA;QACL,MAAM,IAAI,GACR,WAAW,IAAI,CAAC,OAAO;YACrB,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC;gBACE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;gBACvB,GAAG,MAAM;aACV,CAAA;QAEP,MAAM,MAAM,GAAG;YACb,GAAG,OAAO;YACV,OAAO,EAAE;gBACP,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;gBAC1B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC1C;YACD,MAAM,EAAE,MAAgB;YACxB,GAAG;YACH,MAAM,EAAE,QAAQ;YAChB,IAAI;SACL,CAAA;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAA;IACxB,CAAC,CACF,CAAA;IAED,MAAM,IAAI,GAAgB;QACxB,IAAI,EAAE,aAAa;QACnB,KAAK;QACL,GAAG,MAAM;KACV,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC,wBAAC,CAAA;AAEW,QAAA,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,mBAAW,CAAC,CAAC,IAAI,CAAC,CAAA;AAE9C,QAAA,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,mBAAW,CAAC,CAAA"}

package/DiscordREST/index.ts

@@ -0,0 +1,83 @@
+import * as T from "@effect-ts/core/Effect"
+import { tag } from "@effect-ts/system/Has"
+import Axios, { AxiosInstance, AxiosRequestConfig, Method } from "axios"
+import * as Config from "../DiscordConfig"
+import { createRoutes, Endpoints } from "../types"
+import * as Http from "./http"
+
+export interface DiscordREST extends Endpoints<AxiosRequestConfig> {
+  _tag: "DiscordREST"
+  axios: AxiosInstance
+}
+export const DiscordREST = tag<DiscordREST>()
+
+interface FormData {
+  append: (key: string, value: unknown) => void
+  getHeaders: () => Record<string, string>
+}
+
+const make = T.gen(function* (_) {
+  const token = yield* _(Config.token)
+  const config = yield* _(Config.rest)
+
+  const axios = Axios.create({
+    baseURL: config.baseUrl,
+    headers: {
+      Authorization: `Bot ${token}`,
+    },
+  })
+  const request = Http.request(axios)
+  const routes = createRoutes<AxiosRequestConfig>(
+    ({ method, url, params = {}, options = {} }) => {
+      const hasBody = method !== "GET" && method !== "DELETE"
+      let hasFormData = false
+
+      if (typeof options.data?.append === "function") {
+        hasFormData = true
+        ;(options.data as FormData).append(
+          "payload_json",
+          JSON.stringify(params),
+        )
+      }
+
+      const qsParams = hasBody
+        ? options.params
+        : {
+            ...(options.params || {}),
+            ...params,
+          }
+      const data =
+        hasFormData || !hasBody
+          ? options.data
+          : {
+              ...(options.data || {}),
+              ...params,
+            }
+
+      const config = {
+        ...options,
+        headers: {
+          ...(options.headers || {}),
+          ...(hasFormData ? data.getHeaders() : {}),
+        },
+        method: method as Method,
+        url,
+        params: qsParams,
+        data,
+      }
+      return request(config)
+    },
+  )
+
+  const rest: DiscordREST = {
+    _tag: "DiscordREST",
+    axios,
+    ...routes,
+  }
+
+  return rest
+})
+
+export const LiveDiscordREST = T.toLayer(DiscordREST)(make)
+
+export const rest = T.accessServiceM(DiscordREST)

package/DiscordREST/types.d.ts

@@ -1,7 +1,12 @@
 import * as T from "@effect-ts/core/Effect";
+import { AxiosError, AxiosRequestConfig } from "axios";
 export declare type RESTError = {
     _tag: "http";
+    config: AxiosRequestConfig<unknown>;
     code: number;
     body?: unknown;
+} | {
+    _tag: "axios";
+    cause: AxiosError<never>;
 };
 export declare type Response<T> = T.IO<RESTError, T>;

package/DiscordREST/types.ts

@@ -1,5 +1,13 @@
 import * as T from "@effect-ts/core/Effect"
+import { AxiosError, AxiosRequestConfig } from "axios"
 
-export type RESTError = { _tag: "http"; code: number; body?: unknown }
+export type RESTError =
+  | {
+      _tag: "http"
+      config: AxiosRequestConfig<unknown>
+      code: number
+      body?: unknown
+    }
+  | { _tag: "axios"; cause: AxiosError<never> }
 
 export type Response<T> = T.IO<RESTError, T>

package/DiscordShard/heartbeats.d.ts

@@ -1,7 +1,6 @@
-import * as S from "@effect-ts/core/Effect/Experimental/Stream";
-import * as H from "@effect-ts/core/Effect/Hub";
 import * as R from "@effect-ts/core/Effect/Ref";
 import * as O from "@effect-ts/core/Option";
+import * as CB from "callbag-effect-ts";
 import * as DWS from "../DiscordWS";
 import { GatewayPayload } from "../types";
-export declare const fromHub: (hub: H.Hub<GatewayPayload<any>>, seqRef: R.Ref<O.Option<number>>) => S.Stream<import("@effect-ts/system/Has").Has<import("@effect-ts/system/Clock").Clock>, never, DWS.Message>;
+export declare const fromRaw: <R, E>(source: CB.EffectSource<R, E, GatewayPayload<any>>, seqRef: R.Ref<O.Option<number>>) => CB.EffectSource<R & import("@effect-ts/system/Clock").HasClock, E, DWS.Message>;

package/DiscordShard/heartbeats.js

@@ -1,33 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromHub = void 0;
+exports.fromRaw = void 0;
 const tslib_1 = require("tslib");
 const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
 const fileName_1 = "DiscordShard/heartbeats.ts";
 const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
-const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
 const R = tslib_1.__importStar(require("@effect-ts/core/Effect/Ref"));
+const SC = tslib_1.__importStar(require("@effect-ts/core/Effect/Schedule"));
 const Function_1 = require("@effect-ts/core/Function");
 const O = tslib_1.__importStar(require("@effect-ts/core/Option"));
+const CB = tslib_1.__importStar(require("callbag-effect-ts"));
 const types_1 = require("../types");
 const WS_1 = require("../WS");
 const Commands = tslib_1.__importStar(require("./commands"));
 const Utils = tslib_1.__importStar(require("./utils"));
 const send = (ref, seqRef) => (T.tap_(T.map_(R.get(seqRef), (o) => Commands.heartbeat(O.toNullable(o)), fileName_1 + ":16:10"), () => R.set_(ref, false), fileName_1 + ":17:10"));
 const maybeSend = (ref, seqRef) => (T.chain_(R.get(ref), (acked) => acked ? send(ref, seqRef) : T.succeed(WS_1.Reconnect, fileName_1 + ":25:46"), fileName_1 + ":23:12"));
-const fromHub = (hub, seqRef) => (S.unwrap(T.map_(R.makeRef(true), (ackedRef) => {
+const fromRaw = (source, seqRef) => (CB.unwrap(T.map_(R.makeRef(true), (ackedRef) => {
     const heartbeats = (
     // Map to gateway message depending on ack state
-    S.mapEffect_(S.chainParSwitch_(
+    CB.mapEffect_(CB.switchMap_(
     // Reset ack state for each hello
-    S.tap_(Utils.opCode(hub)(types_1.GatewayOpcode.HELLO), () => R.set_(ackedRef, true)), (p) => {
-        const initial = p.d.heartbeat_interval * Math.random();
-        return S.merge_(
-        // First random heartbeat
-        S.fromEffect(T.sleep(initial, fileName_1 + ":47:33")), (S.chain_(S.fromEffect(T.sleep(initial, fileName_1 + ":50:35")), () => S.repeatEffect(T.sleep(p.d.heartbeat_interval, fileName_1 + ":51:51")))));
-    }, 1), () => maybeSend(ackedRef, seqRef)));
-    const acks = (S.drain(S.tap_(Utils.opCode(hub)(types_1.GatewayOpcode.HEARTBEAT_ACK), () => R.set_(ackedRef, true))));
-    return S.merge_(heartbeats, acks);
+    CB.tap_(Utils.opCode(source)(types_1.GatewayOpcode.HELLO), () => R.set_(ackedRef, true)), (p) => CB.fromSchedule(SC.duration(p.d.heartbeat_interval * Math.random())["++"](SC.spaced(p.d.heartbeat_interval)))), () => maybeSend(ackedRef, seqRef)));
+    const acks = (CB.drain(CB.tap_(Utils.opCode(source)(types_1.GatewayOpcode.HEARTBEAT_ACK), () => R.set_(ackedRef, true))));
+    return CB.merge_(heartbeats, acks);
 }, fileName_1 + ":36:10")));
-exports.fromHub = fromHub;
+exports.fromRaw = fromRaw;
 //# sourceMappingURL=heartbeats.js.map

package/DiscordShard/heartbeats.js.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["heartbeats.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sFAA+D;AAE/D,sEAA+C;AAC/C,uDAA+C;AAC/C,kEAA2C;AAE3C,oCAAoE;AACpE,8BAAiC;AACjC,6DAAsC;AACtC,uDAAgC;AAEhC,MAAM,IAAI,GAAG,CAAC,GAAmB,EAAE,MAA+B,EAAE,EAAE,EAIlE,CAAC,MADD,CAAC,MADD,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EACP,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,0BAC1C,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,yBAC/B,CAAA;AAEH,MAAM,SAAS,GAAG,CAAC,GAAmB,EAAE,MAA+B,EAAE,EAAE,EAGvE,CAAC,QADD,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAER,CAAC,KAAK,EAAsB,EAAE,CAC5B,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAS,wBAAC,yBAErD,CAAA;AAEI,MAAM,OAAO,GAAG,CACrB,GAA0B,EAC1B,MAA+B,EAC/B,EAAE,EAqCA,CAAC,CAAC,MAAM,CAjCR,CAAC,MAFD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAET,CAAC,QAAQ,EAAE,EAAE;IACjB,MAAM,UAAU;IAmBd,gDAAgD;IAChD,CAAC,YAdD,CAAC;IAHD,iCAAiC;IACjC,CAAC,MAHD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAa,qBAAa,CAAC,KAAK,CAAC,EAG5C,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAEjB,CAAC,CAAC,EAAE,EAAE;QACrB,MAAM,OAAO,GAAG,CAAC,CAAC,CAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QACvD,OAAO,CAAC,CAAC,MAAM;QACb,yBAAyB;QACzB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAC,CAAC,GAI5B,CAAC,QADD,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAC,CAAC,EACtB,GAAG,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,wBAAC,CAAC,GAEjE,CAAA;IACH,CAAC,EAAE,CAAC,GAGQ,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAC9C,CAAA;IAED,MAAM,IAAI,IAGR,CAAC,CAAC,KAAK,CADP,CAAC,MADD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAa,CAAC,aAAa,CAAC,EACxC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAEnC,CAAA;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AACnC,CAAC,0BAGF,CAAA;AAzCU,QAAA,OAAO,WAyCjB"}
+{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["heartbeats.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sEAA+C;AAC/C,4EAAqD;AACrD,uDAA+C;AAC/C,kEAA2C;AAC3C,8DAAuC;AAEvC,oCAAoE;AACpE,8BAAiC;AACjC,6DAAsC;AACtC,uDAAgC;AAEhC,MAAM,IAAI,GAAG,CAAC,GAAmB,EAAE,MAA+B,EAAE,EAAE,EAIlE,CAAC,MADD,CAAC,MADD,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EACP,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,0BAC1C,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,yBAC/B,CAAA;AAEH,MAAM,SAAS,GAAG,CAAC,GAAmB,EAAE,MAA+B,EAAE,EAAE,EAGvE,CAAC,QADD,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAER,CAAC,KAAK,EAAsB,EAAE,CAC5B,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAS,wBAAC,yBAErD,CAAA;AAEI,MAAM,OAAO,GAAG,CACrB,MAA6C,EAC7C,MAA+B,EAC/B,EAAE,EAgCA,EAAE,CAAC,MAAM,CA5BT,CAAC,MAFD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAET,CAAC,QAAQ,EAAE,EAAE;IACjB,MAAM,UAAU;IAcd,gDAAgD;IAChD,EAAE,YATF,EAAE;IAHF,iCAAiC;IACjC,EAAE,MAHF,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAa,qBAAa,CAAC,KAAK,CAAC,EAG9C,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAEtB,CAAC,CAAC,EAAE,EAAE,CACjB,EAAE,CAAC,YAAY,CACb,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CACxD,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,CAAC,CACnC,CACF,GAIU,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAC/C,CAAA;IAED,MAAM,IAAI,IAGR,EAAE,CAAC,KAAK,CADR,EAAE,MADF,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAa,CAAC,aAAa,CAAC,EAC1C,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAEpC,CAAA;IAED,OAAO,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AACpC,CAAC,0BAGF,CAAA;AApCU,QAAA,OAAO,WAoCjB"}