dfx 0.1.0 → 0.3.1

package/DiscordGateway/index.d.ts

@@ -5,12 +5,12 @@ 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 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, never, 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 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, never, 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, never, import("../types").GatewayPayload<import("../types").GatewayEvent>>;
+    readonly send: (p: import("../types").GatewayPayload<any>) => void;
+    readonly reconnect: () => void;
     readonly _tag: "DiscordGatewayService";
 }>;
 export interface DiscordGateway extends _A<typeof make> {
@@ -19,5 +19,5 @@ export declare const DiscordGateway: import("@effect-ts/system/Has").Tag<Discord
 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 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, never, GatewayEvents[K]>;
 export {};

package/DiscordREST/index.d.ts

@@ -1,11 +1,15 @@
 import * as T from "@effect-ts/core/Effect";
-import { AxiosInstance, AxiosRequestConfig } from "axios";
+import { _A } from "@effect-ts/core/Utils";
+import { AxiosRequestConfig } from "axios";
 import * as Config from "../DiscordConfig";
-import { Endpoints } from "../types";
-export interface DiscordREST extends Endpoints<AxiosRequestConfig> {
-    _tag: "DiscordREST";
-    axios: AxiosInstance;
+declare const make: T.Effect<import("@effect-ts/system/Has").Has<Config.DiscordConfig>, never, {
+    _tag: string;
+    axios: import("axios").AxiosInstance;
+    request: <A>(config: AxiosRequestConfig<any>) => import("./types").Response<A>;
+}>;
+export interface DiscordREST extends _A<typeof make> {
 }
 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>;
+export declare const rest: import("../types").Endpoints<AxiosRequestConfig<any>>;
+export {};

package/DiscordREST/index.js

@@ -5,15 +5,14 @@ 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 Has_1 = require("@effect-ts/core/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 token = yield* _(Config.token, fileName_1 + ":15:25");
+    const config = yield* _(Config.rest, fileName_1 + ":16:26");
     const axios = axios_1.default.create({
         baseURL: config.baseUrl,
         headers: {
@@ -21,45 +20,44 @@ const make = T.gen(function* (_) {
         },
     });
     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 = {
+    return {
         _tag: "DiscordREST",
         axios,
-        ...routes,
+        request,
     };
-    return rest;
-}, fileName_1 + ":19:19");
+}, fileName_1 + ":14:19");
+exports.DiscordREST = (0, Has_1.tag)();
 exports.LiveDiscordREST = T.toLayer(exports.DiscordREST)(make);
-exports.rest = T.accessServiceM(exports.DiscordREST);
+exports.rest = (0, types_1.createRoutes)(({ method, url, params = {}, options = {} }) => T.accessServiceM(exports.DiscordREST)(({ request }) => {
+    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);
+}, fileName_1 + ":39:34"));
 //# sourceMappingURL=index.js.map

package/DiscordREST/index.js.map

@@ -1 +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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,6CAAyC;AAEzC,0DAAyD;AACzD,iEAA0C;AAC1C,oCAAuC;AACvC,qDAA8B;AAO9B,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;IAEnC,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK;QACL,OAAO;KACR,CAAA;AACH,CAAC,wBAAC,CAAA;AAGW,QAAA,WAAW,GAAG,IAAA,SAAG,GAAe,CAAA;AAChC,QAAA,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,mBAAW,CAAC,CAAC,IAAI,CAAC,CAAA;AAE9C,QAAA,IAAI,GAAG,IAAA,oBAAY,EAC9B,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,CAC7C,CAAC,CAAC,cAAc,CAAC,mBAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5C,MAAM,OAAO,GAAG,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,CAAA;IACvD,IAAI,WAAW,GAAG,KAAK,CAAA;IAEvB,IAAI,OAAO,OAAO,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,EAAE;QAC9C,WAAW,GAAG,IAAI,CACjB;QAAC,OAAO,CAAC,IAAiB,CAAC,MAAM,CAChC,cAAc,EACd,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB,CAAA;KACF;IAED,MAAM,QAAQ,GAAG,OAAO;QACtB,CAAC,CAAC,OAAO,CAAC,MAAM;QAChB,CAAC,CAAC;YACE,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;YACzB,GAAG,MAAM;SACV,CAAA;IACL,MAAM,IAAI,GACR,WAAW,IAAI,CAAC,OAAO;QACrB,CAAC,CAAC,OAAO,CAAC,IAAI;QACd,CAAC,CAAC;YACE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;YACvB,GAAG,MAAM;SACV,CAAA;IAEP,MAAM,MAAM,GAAG;QACb,GAAG,OAAO;QACV,OAAO,EAAE;YACP,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1C;QACD,MAAM,EAAE,MAAgB;QACxB,GAAG;QACH,MAAM,EAAE,QAAQ;QAChB,IAAI;KACL,CAAA;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAA;AACxB,CAAC,wBAAC,CACL,CAAA"}

package/DiscordREST/index.ts

@@ -1,16 +1,11 @@
 import * as T from "@effect-ts/core/Effect"
-import { tag } from "@effect-ts/system/Has"
-import Axios, { AxiosInstance, AxiosRequestConfig, Method } from "axios"
+import { tag } from "@effect-ts/core/Has"
+import { _A } from "@effect-ts/core/Utils"
+import Axios, { AxiosRequestConfig, Method } from "axios"
 import * as Config from "../DiscordConfig"
-import { createRoutes, Endpoints } from "../types"
+import { createRoutes } 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>
@@ -27,8 +22,21 @@ const make = T.gen(function* (_) {
     },
   })
   const request = Http.request(axios)
-  const routes = createRoutes<AxiosRequestConfig>(
-    ({ method, url, params = {}, options = {} }) => {
+
+  return {
+    _tag: "DiscordREST",
+    axios,
+    request,
+  }
+})
+
+export interface DiscordREST extends _A<typeof make> {}
+export const DiscordREST = tag<DiscordREST>()
+export const LiveDiscordREST = T.toLayer(DiscordREST)(make)
+
+export const rest = createRoutes<AxiosRequestConfig>(
+  ({ method, url, params = {}, options = {} }) =>
+    T.accessServiceM(DiscordREST)(({ request }) => {
       const hasBody = method !== "GET" && method !== "DELETE"
       let hasFormData = false
 
@@ -65,19 +73,7 @@ const make = T.gen(function* (_) {
         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)
+      return request(config)
+    }),
+)

package/DiscordREST/types.d.ts

@@ -1,5 +1,7 @@
 import * as T from "@effect-ts/core/Effect";
+import { Has } from "@effect-ts/core/Has";
 import { AxiosError, AxiosRequestConfig } from "axios";
+import { DiscordREST } from ".";
 export declare type RESTError = {
     _tag: "http";
     config: AxiosRequestConfig<unknown>;
@@ -9,4 +11,4 @@ export declare type RESTError = {
     _tag: "axios";
     cause: AxiosError<never>;
 };
-export declare type Response<T> = T.IO<RESTError, T>;
+export declare type Response<T> = T.Effect<Has<DiscordREST>, RESTError, T>;

package/DiscordREST/types.ts

@@ -1,5 +1,7 @@
 import * as T from "@effect-ts/core/Effect"
+import { Has } from "@effect-ts/core/Has"
 import { AxiosError, AxiosRequestConfig } from "axios"
+import { DiscordREST } from "."
 
 export type RESTError =
   | {
@@ -10,4 +12,4 @@ export type RESTError =
     }
   | { _tag: "axios"; cause: AxiosError<never> }
 
-export type Response<T> = T.IO<RESTError, T>
+export type Response<T> = T.Effect<Has<DiscordREST>, RESTError, T>

package/DiscordShard/index.d.ts

@@ -12,10 +12,10 @@ declare const makeService: () => {
     readonly _tag: "DiscordShardService";
     readonly make: (shard: [id: number, count: number]) => M.Managed<import("@effect-ts/system/Has").Has<Config.DiscordConfig>, never, {
         readonly run: T.RIO<import("@effect-ts/system/Has").Has<DWS.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<DWS.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, GatewayPayload<any>>;
-        readonly dispatch: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.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, GatewayPayload<GatewayEvent>>;
-        readonly send: (p: GatewayPayload) => T.Effect<unknown, never, boolean>;
-        readonly reconnect: () => T.Effect<unknown, never, boolean>;
+        readonly raw: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.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, never, GatewayPayload<any>>;
+        readonly dispatch: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.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, never, GatewayPayload<GatewayEvent>>;
+        readonly send: (p: GatewayPayload) => void;
+        readonly reconnect: () => void;
     }>;
 };
 export interface DiscordShard extends ReturnType<typeof makeService> {
@@ -24,9 +24,9 @@ export declare const DiscordShard: import("@effect-ts/system/Has").Tag<DiscordSh
 export declare const LiveDiscordShard: L.Layer<unknown, never, import("@effect-ts/system/Has").Has<DiscordShard>>;
 export declare const make: (shard: [number, number]) => M.Managed<import("@effect-ts/system/Has").Has<Config.DiscordConfig> & import("@effect-ts/system/Has").Has<DiscordShard>, never, {
     readonly run: T.RIO<import("@effect-ts/system/Has").Has<DWS.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<DWS.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, GatewayPayload<any>>;
-    readonly dispatch: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.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, GatewayPayload<GatewayEvent>>;
-    readonly send: (p: GatewayPayload) => T.Effect<unknown, never, boolean>;
-    readonly reconnect: () => T.Effect<unknown, never, boolean>;
+    readonly raw: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.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, never, GatewayPayload<any>>;
+    readonly dispatch: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.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, never, GatewayPayload<GatewayEvent>>;
+    readonly send: (p: GatewayPayload) => void;
+    readonly reconnect: () => void;
 }>;
 export {};

package/DiscordShard/index.js

@@ -7,7 +7,6 @@ const fileName_1 = "DiscordShard/index.ts";
 const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
 const L = tslib_1.__importStar(require("@effect-ts/core/Effect/Layer"));
 const M = tslib_1.__importStar(require("@effect-ts/core/Effect/Managed"));
-const Q = tslib_1.__importStar(require("@effect-ts/core/Effect/Queue"));
 const Function_1 = require("@effect-ts/core/Function");
 const Has_1 = require("@effect-ts/core/Has");
 const O = tslib_1.__importStar(require("@effect-ts/core/Option"));
@@ -21,35 +20,38 @@ const Identify = tslib_1.__importStar(require("./identify"));
 const Invalid = tslib_1.__importStar(require("./invalidSession"));
 const Utils = tslib_1.__importStar(require("./utils"));
 const makeImpl = (shard) => M.gen(function* (_) {
-    const token = yield* _(Config.token, fileName_1 + ":29:27");
-    const gateway = yield* _(Config.gateway, fileName_1 + ":30:29");
-    const outbound = yield* _(Q.makeUnbounded(), fileName_1 + ":31:30");
-    const [latestReady, updateLatestReady] = yield* _(Utils.latest((0, Function_1.flow)(O.fromPredicate((p) => p.op === types_1.GatewayOpcode.DISPATCH && p.t === "READY"), O.map((p) => p.d))), fileName_1 + ":33:54");
-    const [latestSequence, updateLatestSequence] = yield* _(Utils.latest((p) => O.fromNullable(p.s)), fileName_1 + ":44:60");
+    const token = yield* _(Config.token, fileName_1 + ":28:27");
+    const gateway = yield* _(Config.gateway, fileName_1 + ":29:29");
+    const [emit, outbound] = CB.asyncEmitter();
+    const sendMessages = CB.forEach((p) => T.succeedWith(() => {
+        emit.data(p);
+    }, fileName_1 + ":33:20"));
+    const [latestReady, updateLatestReady] = yield* _(Utils.latest((0, Function_1.flow)(O.fromPredicate((p) => p.op === types_1.GatewayOpcode.DISPATCH && p.t === "READY"), O.map((p) => p.d))), fileName_1 + ":38:54");
+    const [latestSequence, updateLatestSequence] = yield* _(Utils.latest((p) => O.fromNullable(p.s)), fileName_1 + ":49:60");
     const raw = (CB.share(CB.unwrap(DWS.open({
         outgoingQueue: outbound,
     }))));
     const updateRefs = (CB.runDrain(updateLatestReady(updateLatestSequence(raw))));
     const dispatch = (CB.share(CB.filter_(raw, (p) => p.op === types_1.GatewayOpcode.DISPATCH)));
     // heartbeats
-    const heartbeatEffects = (CB.forEach_(Heartbeats.fromRaw(raw, latestSequence), (p) => Q.offer_(outbound, p)));
+    const heartbeatEffects = (sendMessages(Heartbeats.fromRaw(raw, latestSequence)));
     // identify
-    const identifyEffects = (CB.forEach_(Identify.fromRaw(raw, {
+    const identifyEffects = (sendMessages(Identify.fromRaw(raw, {
         token,
         shard,
         intents: gateway.intents,
         presence: gateway.presence,
         latestSequence,
         latestReady,
-    }), (p) => Q.offer_(outbound, p)));
+    })));
     // invalid session
-    const invalidEffects = (CB.forEach_(Invalid.fromRaw(raw, latestReady), (p) => Q.offer_(outbound, p)));
+    const invalidEffects = (sendMessages(Invalid.fromRaw(raw, latestReady)));
     return {
-        run: (T.ignore(T.zipPar(invalidEffects, fileName_1 + ":101:17")(T.zipPar(identifyEffects, fileName_1 + ":100:17")(T.zipPar(heartbeatEffects, fileName_1 + ":99:17")(updateRefs))), fileName_1 + ":102:17")),
+        run: (T.ignore(T.zipPar(invalidEffects, fileName_1 + ":103:17")(T.zipPar(identifyEffects, fileName_1 + ":102:17")(T.zipPar(heartbeatEffects, fileName_1 + ":101:17")(updateRefs))), fileName_1 + ":104:17")),
         raw,
         dispatch,
-        send: (p) => Q.offer_(outbound, p),
-        reconnect: () => Q.offer_(outbound, WS_1.Reconnect),
+        send: (p) => emit.data(p),
+        reconnect: () => emit.data(WS_1.Reconnect),
     };
 });
 const makeService = () => ({

package/DiscordShard/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,wEAAiD;AACjD,0EAAmD;AACnD,wEAAiD;AACjD,uDAAqD;AACrD,6CAAyC;AACzC,kEAA2C;AAC3C,8DAAuC;AACvC,iEAA0C;AAC1C,0DAAmC;AACnC,oCAKiB;AACjB,8BAAiC;AACjC,iEAA0C;AAC1C,6DAAsC;AACtC,kEAA2C;AAC3C,uDAAgC;AAMhC,MAAM,QAAQ,GAAG,CAAC,KAAkC,EAAE,EAAE,CACtD,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAChB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,wBAAC,CAAA;IACpC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,wBAAC,CAAA;IACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,EAAe,wBAAC,CAAA;IAEzD,MAAM,CAAC,WAAW,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAC/C,KAAK,CAAC,MAAM,CACV,IAAA,eAAI,EACF,CAAC,CAAC,aAAa,CACb,CAAC,CAAC,EAAmC,EAAE,CACrC,CAAC,CAAC,EAAE,KAAK,qBAAa,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,CACrD,EACD,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,CACnB,CACF,wBACF,CAAA;IACD,MAAM,CAAC,cAAc,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CACrD,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,wBACzC,CAAA;IAED,MAAM,GAAG,IAKP,EAAE,CAAC,KAAK,CADR,EAAE,CAAC,MAAM,CAHT,GAAG,CAAC,IAAI,CAAC;QACP,aAAa,EAAE,QAAQ;KACxB,CAAC,GAGH,CAAA;IACD,MAAM,UAAU,IAId,EAAE,CAAC,QAAQ,CADX,iBAAiB,CADjB,oBAAoB,CADpB,GAAG,IAIJ,CAAA;IAED,MAAM,QAAQ,IAMZ,EAAE,CAAC,KAAK,CAJR,EAAE,SADF,GAAG,EAED,CAAC,CAAC,EAAqC,EAAE,CACvC,CAAC,CAAC,EAAE,KAAK,qBAAa,CAAC,QAAQ,GAGpC,CAAA;IAED,aAAa;IACb,MAAM,gBAAgB,IAEpB,EAAE,UADF,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,EAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EACxC,CAAA;IAED,WAAW;IACX,MAAM,eAAe,IASnB,EAAE,UARF,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE;QACpB,KAAK;QACL,KAAK;QACL,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,cAAc;QACd,WAAW;KACZ,CAAC,EACS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EACxC,CAAA;IAED,kBAAkB;IAClB,MAAM,cAAc,IAElB,EAAE,UADF,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,EACtB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EACxC,CAAA;IAED,OAAO;QACL,GAAG,GAKD,CAAC,CAAC,MAAM,CADR,CAAC,CAAC,MAAM,CAAC,cAAc,yBAAC,CADxB,CAAC,CAAC,MAAM,CAAC,eAAe,yBAAC,CADzB,CAAC,CAAC,MAAM,CAAC,gBAAgB,wBAAC,CAD1B,UAAU,6BAKX;QACD,GAAG;QACH,QAAQ;QACR,IAAI,EAAE,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,cAAS,CAAC;KACtC,CAAA;AACZ,CAAC,CAAC,CAAA;AAEJ,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,CAAC;IACC,IAAI,EAAE,qBAAqB;IAC3B,IAAI,EAAE,QAAQ;CACL,CAAA,CAAA;AAGA,QAAA,YAAY,GAAG,IAAA,SAAG,GAAgB,CAAA;AAClC,QAAA,gBAAgB,GAAG,CAAC,CAAC,YAAY,CAAC,oBAAY,CAAC,CAAC,WAAW,CAAC,CAAA;AAElE,MAAM,IAAI,GAAG,CAAC,KAAuB,EAAE,EAAE,CAC9C,CAAC,CAAC,cAAc,CAAC,oBAAY,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;AAD9C,QAAA,IAAI,QAC0C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}

package/DiscordShard/index.ts

@@ -1,7 +1,6 @@
 import * as T from "@effect-ts/core/Effect"
 import * as L from "@effect-ts/core/Effect/Layer"
 import * as M from "@effect-ts/core/Effect/Managed"
-import * as Q from "@effect-ts/core/Effect/Queue"
 import { flow, pipe } from "@effect-ts/core/Function"
 import { tag } from "@effect-ts/core/Has"
 import * as O from "@effect-ts/core/Option"
@@ -28,7 +27,13 @@ const makeImpl = (shard: [id: number, count: number]) =>
   M.gen(function* (_) {
     const token = yield* _(Config.token)
     const gateway = yield* _(Config.gateway)
-    const outbound = yield* _(Q.makeUnbounded<DWS.Message>())
+    const [emit, outbound] = CB.asyncEmitter<never, DWS.Message>()
+
+    const sendMessages = CB.forEach((p: DWS.Message) =>
+      T.succeedWith(() => {
+        emit.data(p)
+      }),
+    )
 
     const [latestReady, updateLatestReady] = yield* _(
       Utils.latest(
@@ -71,7 +76,7 @@ const makeImpl = (shard: [id: number, count: number]) =>
     // heartbeats
     const heartbeatEffects = pipe(
       Heartbeats.fromRaw(raw, latestSequence),
-      CB.forEach((p) => Q.offer_(outbound, p)),
+      sendMessages,
     )
 
     // identify
@@ -84,14 +89,11 @@ const makeImpl = (shard: [id: number, count: number]) =>
         latestSequence,
         latestReady,
       }),
-      CB.forEach((p) => Q.offer_(outbound, p)),
+      sendMessages,
     )
 
     // invalid session
-    const invalidEffects = pipe(
-      Invalid.fromRaw(raw, latestReady),
-      CB.forEach((p) => Q.offer_(outbound, p)),
-    )
+    const invalidEffects = pipe(Invalid.fromRaw(raw, latestReady), sendMessages)
 
     return {
       run: pipe(
@@ -103,8 +105,8 @@ const makeImpl = (shard: [id: number, count: number]) =>
       ),
       raw,
       dispatch,
-      send: (p: GatewayPayload) => Q.offer_(outbound, p),
-      reconnect: () => Q.offer_(outbound, Reconnect),
+      send: (p: GatewayPayload) => emit.data(p),
+      reconnect: () => emit.data(Reconnect),
     } as const
   })
 

package/DiscordWS/index.d.ts

@@ -1,9 +1,12 @@
 /// <reference types="node" />
 import * as T from "@effect-ts/core/Effect";
 import * as L from "@effect-ts/core/Effect/Layer";
-import * as Q from "@effect-ts/core/Effect/Queue";
+import { Has } from "@effect-ts/core/Has";
+import { HasClock } from "@effect-ts/system/Clock";
 import * as CB from "callbag-effect-ts";
+import { EffectSource } from "callbag-effect-ts";
 import { RawData } from "ws";
+import { Log } from "../Log";
 import { GatewayPayload } from "../types";
 import * as WS from "../WS";
 export declare type Message = GatewayPayload | WS.Reconnect;
@@ -11,7 +14,7 @@ export interface OpenOpts {
     url?: string;
     version?: number;
     encoding?: Encoding;
-    outgoingQueue: Q.Queue<Message>;
+    outgoingQueue: EffectSource<unknown, never, Message>;
 }
 export interface Encoding {
     type: "json" | "etf";
@@ -19,15 +22,15 @@ export interface Encoding {
     decode: (p: RawData) => GatewayPayload;
 }
 export declare const jsonEncoding: Encoding;
-declare const openImpl: ({ url, version, encoding, outgoingQueue: outgoing, }: OpenOpts) => CB.EffectSource<import("@effect-ts/system/Has").Has<WS.WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, GatewayPayload<any>>;
+declare const openImpl: ({ url, version, encoding, outgoingQueue: outgoing, }: OpenOpts) => CB.EffectSource<Has<WS.WS> & Has<Log> & HasClock, never, GatewayPayload<any>>;
 export declare type Connection = ReturnType<typeof openImpl>;
 declare const makeService: () => {
     readonly _tag: "DiscordWSService";
-    readonly open: ({ url, version, encoding, outgoingQueue: outgoing, }: OpenOpts) => CB.EffectSource<import("@effect-ts/system/Has").Has<WS.WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, GatewayPayload<any>>;
+    readonly open: ({ url, version, encoding, outgoingQueue: outgoing, }: OpenOpts) => CB.EffectSource<Has<WS.WS> & Has<Log> & HasClock, never, GatewayPayload<any>>;
 };
 export interface DiscordWS extends ReturnType<typeof makeService> {
 }
 export declare const DiscordWS: import("@effect-ts/system/Has").Tag<DiscordWS>;
-export declare const LiveDiscordWS: L.Layer<unknown, never, import("@effect-ts/system/Has").Has<DiscordWS>>;
-export declare const open: (opts: OpenOpts) => T.Effect<import("@effect-ts/system/Has").Has<DiscordWS>, never, CB.EffectSource<import("@effect-ts/system/Has").Has<WS.WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, GatewayPayload<any>>>;
+export declare const LiveDiscordWS: L.Layer<unknown, never, Has<DiscordWS>>;
+export declare const open: (opts: OpenOpts) => T.Effect<Has<DiscordWS>, never, CB.EffectSource<Has<WS.WS> & Has<Log> & HasClock, never, GatewayPayload<any>>>;
 export {};

package/DiscordWS/index.js

@@ -6,7 +6,6 @@ const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
 const fileName_1 = "DiscordWS/index.ts";
 const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
 const L = tslib_1.__importStar(require("@effect-ts/core/Effect/Layer"));
-const Q = tslib_1.__importStar(require("@effect-ts/core/Effect/Queue"));
 const SC = tslib_1.__importStar(require("@effect-ts/core/Effect/Schedule"));
 const Function_1 = require("@effect-ts/core/Function");
 const Has_1 = require("@effect-ts/core/Has");
@@ -18,12 +17,7 @@ exports.jsonEncoding = {
     encode: (p) => JSON.stringify(p),
     decode: (p) => JSON.parse(p.toString("utf8")),
 };
-const makeOutgoing = (q, e) => Q.map_(q, (data) => {
-    if (data === WS.Reconnect) {
-        return data;
-    }
-    return e.encode(data);
-});
+const makeOutgoing = (out, e) => CB.map_(out, (data) => (data === WS.Reconnect ? data : e.encode(data)));
 const openImpl = ({ url = "wss://gateway.discord.gg/", version = 9, encoding = exports.jsonEncoding, outgoingQueue: outgoing, }) => (CB.map_(CB.retry_(CB.tapError_(CB.unwrap(WS.open(`${url}?v=${version}&encoding=${encoding.type}`, makeOutgoing(outgoing, encoding))), (e) => (0, Log_1.log)(serviceTag, "error", e)), SC.exponential(500)), encoding.decode));
 // Service definition
 const serviceTag = "DiscordWSService";
@@ -34,6 +28,6 @@ const makeService = () => ({
 exports.DiscordWS = (0, Has_1.tag)();
 exports.LiveDiscordWS = L.fromFunction(exports.DiscordWS)(makeService);
 // Helpers
-const open = (opts) => T.accessService(exports.DiscordWS)(({ open }) => open(opts), fileName_1 + ":76:29");
+const open = (opts) => T.accessService(exports.DiscordWS)(({ open }) => open(opts), fileName_1 + ":78:29");
 exports.open = open;
 //# sourceMappingURL=index.js.map

package/DiscordWS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,wEAAiD;AACjD,wEAAiD;AACjD,4EAAqD;AACrD,uDAA+C;AAC/C,6CAAyC;AACzC,8DAAuC;AAEvC,gCAA4B;AAE5B,kDAA2B;AAiBd,QAAA,YAAY,GAAa;IACpC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,CAAmB,EAAE,CAAW,EAAoB,EAAE,CAC1E,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,EAAc,EAAE;IAC7B,IAAI,IAAI,KAAK,EAAE,CAAC,SAAS,EAAE;QACzB,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC,CAAC,CAAA;AAEJ,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,CAAC,EACX,QAAQ,GAAG,oBAAY,EACvB,aAAa,EAAE,QAAQ,GACd,EAAE,EAAE,EASX,EAAE,MADF,EAAE,QADF,EAAE,WADF,EAAE,CAAC,MAAM,CAJT,EAAE,CAAC,IAAI,CACL,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAC/C,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CACjC,GAEW,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,GACrC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GACrB,QAAQ,CAAC,MAAM,EACvB,CAAA;AAIH,qBAAqB;AACrB,MAAM,UAAU,GAAG,kBAA2B,CAAA;AAC9C,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,CAAC;IACC,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,QAAQ;CACL,CAAA,CAAA;AAGA,QAAA,SAAS,GAAG,IAAA,SAAG,GAAa,CAAA;AAC5B,QAAA,aAAa,GAAG,CAAC,CAAC,YAAY,CAAC,iBAAS,CAAC,CAAC,WAAW,CAAC,CAAA;AAEnE,UAAU;AACH,MAAM,IAAI,GAAG,CAAC,IAAc,EAAE,EAAE,CACrC,CAAC,CAAC,aAAa,CAAC,iBAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAC,CAAA;AADzC,QAAA,IAAI,QACqC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,wEAAiD;AACjD,4EAAqD;AACrD,uDAA+C;AAC/C,6CAA8C;AAE9C,8DAAuC;AAGvC,gCAAiC;AAEjC,kDAA2B;AAiBd,QAAA,YAAY,GAAa;IACpC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,GAA0C,EAC1C,CAAW,EACE,EAAE,CACf,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAEzE,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,CAAC,EACX,QAAQ,GAAG,oBAAY,EACvB,aAAa,EAAE,QAAQ,GACd,EAAE,EAAE,CACb,CAQE,EAAE,MADF,EAAE,QADF,EAAE,WADF,EAAE,CAAC,MAAM,CAJT,EAAE,CAAC,IAAI,CACL,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAC/C,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CACjC,GAEW,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,GACrC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GACrB,QAAQ,CAAC,MAAM,EAKvB,CAAA;AAIH,qBAAqB;AACrB,MAAM,UAAU,GAAG,kBAA2B,CAAA;AAC9C,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,CAAC;IACC,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,QAAQ;CACL,CAAA,CAAA;AAGA,QAAA,SAAS,GAAG,IAAA,SAAG,GAAa,CAAA;AAC5B,QAAA,aAAa,GAAG,CAAC,CAAC,YAAY,CAAC,iBAAS,CAAC,CAAC,WAAW,CAAC,CAAA;AAEnE,UAAU;AACH,MAAM,IAAI,GAAG,CAAC,IAAc,EAAE,EAAE,CACrC,CAAC,CAAC,aAAa,CAAC,iBAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAC,CAAA;AADzC,QAAA,IAAI,QACqC"}

package/DiscordWS/index.ts

@@ -1,12 +1,13 @@
 import * as T from "@effect-ts/core/Effect"
 import * as L from "@effect-ts/core/Effect/Layer"
-import * as Q from "@effect-ts/core/Effect/Queue"
 import * as SC from "@effect-ts/core/Effect/Schedule"
 import { pipe } from "@effect-ts/core/Function"
-import { tag } from "@effect-ts/core/Has"
+import { Has, tag } from "@effect-ts/core/Has"
+import { HasClock } from "@effect-ts/system/Clock"
 import * as CB from "callbag-effect-ts"
+import { EffectSource } from "callbag-effect-ts"
 import { RawData } from "ws"
-import { log } from "../Log"
+import { log, Log } from "../Log"
 import { GatewayPayload } from "../types"
 import * as WS from "../WS"
 
@@ -16,7 +17,7 @@ export interface OpenOpts {
   url?: string
   version?: number
   encoding?: Encoding
-  outgoingQueue: Q.Queue<Message>
+  outgoingQueue: EffectSource<unknown, never, Message>
 }
 
 export interface Encoding {
@@ -31,14 +32,11 @@ export const jsonEncoding: Encoding = {
   decode: (p) => JSON.parse(p.toString("utf8")),
 }
 
-const makeOutgoing = (q: Q.Queue<Message>, e: Encoding): WS.OutboundQueue =>
-  Q.map_(q, (data): WS.Message => {
-    if (data === WS.Reconnect) {
-      return data
-    }
-
-    return e.encode(data)
-  })
+const makeOutgoing = (
+  out: EffectSource<unknown, never, Message>,
+  e: Encoding,
+): WS.Outbound =>
+  CB.map_(out, (data) => (data === WS.Reconnect ? data : e.encode(data)))
 
 const openImpl = ({
   url = "wss://gateway.discord.gg/",
@@ -55,7 +53,11 @@ const openImpl = ({
     CB.tapError((e) => log(serviceTag, "error", e)),
     CB.retry(SC.exponential(500)),
     CB.map(encoding.decode),
-  )
+  ) as EffectSource<
+    Has<WS.WS> & Has<Log> & HasClock,
+    never,
+    GatewayPayload<any>
+  >
 
 export type Connection = ReturnType<typeof openImpl>
 

package/WS/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import * as T from "@effect-ts/core/Effect";
-import * as Q from "@effect-ts/core/Effect/Queue";
 import * as CB from "callbag-effect-ts";
+import { EffectSource } from "callbag-effect-ts";
 import * as Ws from "ws";
 export declare type WsError = {
     _tag: "close";
@@ -17,14 +17,14 @@ export declare type WsError = {
 export declare const Reconnect: unique symbol;
 export declare type Reconnect = typeof Reconnect;
 export declare type Message = string | Buffer | ArrayBuffer | Reconnect;
-export declare type OutboundQueue = Q.Dequeue<Message>;
+export declare type Outbound = EffectSource<unknown, never, Message>;
 declare const makeService: () => {
     readonly _tag: "WSService";
-    readonly open: (url: string, out: OutboundQueue, options?: Ws.ClientOptions | undefined) => CB.EffectSource<import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, WsError, Ws.RawData>;
+    readonly open: (url: string, out: Outbound, options?: Ws.ClientOptions | undefined) => CB.EffectSource<import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, WsError, Ws.RawData>;
 };
 export interface WS extends ReturnType<typeof makeService> {
 }
 export declare const WS: import("@effect-ts/system/Has").Tag<WS>;
 export declare const LiveWS: import("@effect-ts/system/Layer").Layer<unknown, never, import("@effect-ts/system/Has").Has<WS>>;
-export declare const open: (url: string, out: OutboundQueue, options?: Ws.ClientOptions | undefined) => T.Effect<import("@effect-ts/system/Has").Has<WS>, never, CB.EffectSource<import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, WsError, Ws.RawData>>;
+export declare const open: (url: string, out: Outbound, options?: Ws.ClientOptions | undefined) => T.Effect<import("@effect-ts/system/Has").Has<WS>, never, CB.EffectSource<import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, WsError, Ws.RawData>>;
 export {};

package/WS/index.js

@@ -7,9 +7,9 @@ const fileName_1 = "WS/index.ts";
 const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
 const M = tslib_1.__importStar(require("@effect-ts/core/Effect/Managed"));
 const SC = tslib_1.__importStar(require("@effect-ts/core/Effect/Schedule"));
-const CB = tslib_1.__importStar(require("callbag-effect-ts"));
 const Function_1 = require("@effect-ts/core/Function");
 const Has_1 = require("@effect-ts/core/Has");
+const CB = tslib_1.__importStar(require("callbag-effect-ts"));
 const Ws = tslib_1.__importStar(require("ws"));
 const Log_1 = require("../Log");
 exports.Reconnect = Symbol();
@@ -40,7 +40,7 @@ const send = (ws, out) => (CB.drain(CB.tap_(CB.tap_(CB.unwrap(T.map_(T.effectAsy
             cb(T.unit);
         });
     }
-}, fileName_1 + ":52:18"), () => CB.fromQueue(out), fileName_1 + ":61:10")), (p) => (0, Log_1.logDebug)("WSService", "send", p)), (data) => T.effectAsync((cb) => {
+}, fileName_1 + ":52:18"), () => out, fileName_1 + ":61:10")), (p) => (0, Log_1.logDebug)("WSService", "send", p)), (data) => T.effectAsync((cb) => {
     if (data === exports.Reconnect) {
         ws.close(1012, "reconnecting");
         cb(T.unit);
@@ -57,14 +57,14 @@ const send = (ws, out) => (CB.drain(CB.tap_(CB.tap_(CB.unwrap(T.map_(T.effectAsy
     }
 }, fileName_1 + ":65:20"))));
 const duplex = (out) => (ws) => CB.merge_(recv(ws), send(ws, out));
-const openDuplex = (url, out, options) => (CB.retry_(CB.unwrapManaged(M.map_(openSocket(url, options), duplex(out), fileName_1 + ":93:10")), SC.recurWhile((e) => e._tag === "close" && e.code === 1012)));
+const openDuplex = (url, out, options) => (CB.retry_(CB.unwrapManaged(M.map_(openSocket(url, options), duplex(out), fileName_1 + ":89:10")), SC.recurWhile((e) => e._tag === "close" && e.code === 1012)));
 const makeService = () => ({
     _tag: "WSService",
     open: openDuplex,
 });
 exports.WS = (0, Has_1.tag)();
-exports.LiveWS = T.toLayer(exports.WS)(T.succeedWith(makeService, fileName_1 + ":106:50"));
+exports.LiveWS = T.toLayer(exports.WS)(T.succeedWith(makeService, fileName_1 + ":102:50"));
 // Helpers
-const open = (url, out, options) => T.accessService(exports.WS)(({ open }) => open(url, out, options), fileName_1 + ":113:25");
+const open = (url, out, options) => T.accessService(exports.WS)(({ open }) => open(url, out, options), fileName_1 + ":106:22");
 exports.open = open;
 //# sourceMappingURL=index.js.map

package/WS/index.js.map

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

package/WS/index.ts

@@ -1,10 +1,10 @@
 import * as T from "@effect-ts/core/Effect"
 import * as M from "@effect-ts/core/Effect/Managed"
-import * as Q from "@effect-ts/core/Effect/Queue"
 import * as SC from "@effect-ts/core/Effect/Schedule"
-import * as CB from "callbag-effect-ts"
 import { pipe } from "@effect-ts/core/Function"
 import { tag } from "@effect-ts/core/Has"
+import * as CB from "callbag-effect-ts"
+import { EffectSource } from "callbag-effect-ts"
 import * as Ws from "ws"
 import { logDebug } from "../Log"
 
@@ -16,7 +16,7 @@ export type WsError =
 export const Reconnect = Symbol()
 export type Reconnect = typeof Reconnect
 export type Message = string | Buffer | ArrayBuffer | Reconnect
-export type OutboundQueue = Q.Dequeue<Message>
+export type Outbound = EffectSource<unknown, never, Message>
 
 const openSocket = (url: string, options?: Ws.ClientOptions) =>
   pipe(
@@ -30,7 +30,7 @@ const openSocket = (url: string, options?: Ws.ClientOptions) =>
   )
 
 const recv = (ws: Ws.WebSocket) =>
-  CB.async<unknown, WsError, Ws.RawData>((emit) => {
+  CB.async<WsError, Ws.RawData>((emit) => {
     ws.on("message", (message) => emit.data(message))
     ws.on("error", (cause) => {
       emit.fail({
@@ -47,7 +47,7 @@ const recv = (ws: Ws.WebSocket) =>
     )
   })
 
-const send = (ws: Ws.WebSocket, out: OutboundQueue) =>
+const send = (ws: Ws.WebSocket, out: Outbound) =>
   pipe(
     T.effectAsync<unknown, WsError, void>((cb) => {
       if (ws.readyState & ws.OPEN) {
@@ -58,7 +58,7 @@ const send = (ws: Ws.WebSocket, out: OutboundQueue) =>
         })
       }
     }),
-    T.map(() => CB.fromQueue(out)),
+    T.map(() => out),
     CB.unwrap,
     CB.tap((p) => logDebug("WSService", "send", p)),
     CB.tap((data) =>
@@ -80,14 +80,10 @@ const send = (ws: Ws.WebSocket, out: OutboundQueue) =>
     CB.drain,
   )
 
-const duplex = (out: OutboundQueue) => (ws: Ws.WebSocket) =>
+const duplex = (out: Outbound) => (ws: Ws.WebSocket) =>
   CB.merge_(recv(ws), send(ws, out))
 
-const openDuplex = (
-  url: string,
-  out: OutboundQueue,
-  options?: Ws.ClientOptions,
-) =>
+const openDuplex = (url: string, out: Outbound, options?: Ws.ClientOptions) =>
   pipe(
     openSocket(url, options),
     M.map(duplex(out)),
@@ -106,8 +102,5 @@ export const WS = tag<WS>()
 export const LiveWS = T.toLayer(WS)(T.succeedWith(makeService))
 
 // Helpers
-export const open = (
-  url: string,
-  out: OutboundQueue,
-  options?: Ws.ClientOptions,
-) => T.accessService(WS)(({ open }) => open(url, out, options))
+export const open = (url: string, out: Outbound, options?: Ws.ClientOptions) =>
+  T.accessService(WS)(({ open }) => open(url, out, options))

package/bot.js

@@ -21,8 +21,8 @@ const Config = (0, mod_1.makeConfigLayer)({
 // logger
 const logger = T.chain_(mod_1.gateway, ({ raw }) => CB.forEach_(raw, (p) => (0, Log_1.log)(p)), fileName_1 + ":27:24");
 // ping command
-const pingPong = (CB.forEach_(CB.filter_((0, mod_1.fromDispatch)("MESSAGE_CREATE"), (msg) => msg.content.startsWith("!ping")), (msg) => (0, mod_1.rest)((r) => r.createMessage(msg.channel_id, {
+const pingPong = (CB.forEach_(CB.filter_((0, mod_1.fromDispatch)("MESSAGE_CREATE"), (msg) => msg.content.startsWith("!ping")), (msg) => mod_1.rest.createMessage(msg.channel_id, {
     content: "Pong!",
-}), fileName_1 + ":34:9")));
-(R.runMain(T.provideSomeLayer(Config)(T.provideSomeLayer(mod_1.DebugEnv)(T.zipPar(pingPong, fileName_1 + ":45:11")(T.zipPar(logger, fileName_1 + ":44:11")(mod_1.run))))));
+})));
+(R.runMain(T.provideSomeLayer(Config)(T.provideSomeLayer(mod_1.DebugEnv)(T.zipPar(pingPong, fileName_1 + ":43:11")(T.zipPar(logger, fileName_1 + ":42:11")(mod_1.run))))));
 //# sourceMappingURL=bot.js.map

package/bot.js.map

@@ -1 +1 @@
-{"version":3,"file":"bot.js","sourceRoot":"","sources":["bot.ts"],"names":[],"mappings":";;;;;AAAA,kEAA2C;AAC3C,uDAA+C;AAC/C,mEAA4C;AAC5C,8DAAuC;AACvC,uDAAgC;AAChC,+BAA2B;AAC3B,+BAOc;AACd,mCAAwC;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,MAAM,GAAG,IAAA,qBAAe,EAAC;IAC7B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,sBAAc,CAAC,MAAM,GAAG,sBAAc,CAAC,cAAc;KAC/D;CACF,CAAC,CAAA;AAEF,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,aAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,CAAC,CAAC,CAAC,wBAAC,CAAA;AAE9E,eAAe;AACf,MAAM,QAAQ,IAGZ,EAAE,UADF,EAAE,SADF,IAAA,kBAAY,EAAC,gBAAgB,CAAC,EACpB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GACvC,CAAC,GAAG,EAAE,EAAE,CACjB,IAAA,UAAI,EAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE;IAC9B,OAAO,EAAE,OAAO;CACjB,CAAC,uBACH,EAEJ,CAAA;AAED,CAOE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAD1B,CAAC,CAAC,gBAAgB,CAAC,cAAQ,CAAC,CAF5B,CAAC,CAAC,MAAM,CAAC,QAAQ,wBAAC,CADlB,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,SAAG,OAOJ"}
+{"version":3,"file":"bot.js","sourceRoot":"","sources":["bot.ts"],"names":[],"mappings":";;;;;AAAA,kEAA2C;AAC3C,uDAA+C;AAC/C,mEAA4C;AAC5C,8DAAuC;AACvC,uDAAgC;AAChC,+BAA2B;AAC3B,+BAOc;AACd,mCAAwC;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,MAAM,GAAG,IAAA,qBAAe,EAAC;IAC7B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,sBAAc,CAAC,MAAM,GAAG,sBAAc,CAAC,cAAc;KAC/D;CACF,CAAC,CAAA;AAEF,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,aAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,CAAC,CAAC,CAAC,wBAAC,CAAA;AAE9E,eAAe;AACf,MAAM,QAAQ,IAGZ,EAAE,UADF,EAAE,SADF,IAAA,kBAAY,EAAC,gBAAgB,CAAC,EACpB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GACvC,CAAC,GAAG,EAAE,EAAE,CACjB,UAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE;IACjC,OAAO,EAAE,OAAO;CACjB,CAAC,EAEL,CAAA;AAED,CAOE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAD1B,CAAC,CAAC,gBAAgB,CAAC,cAAQ,CAAC,CAF5B,CAAC,CAAC,MAAM,CAAC,QAAQ,wBAAC,CADlB,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,SAAG,OAOJ"}

package/bot.ts

@@ -31,11 +31,9 @@ const pingPong = pipe(
   fromDispatch("MESSAGE_CREATE"),
   CB.filter((msg) => msg.content.startsWith("!ping")),
   CB.forEach((msg) =>
-    rest((r) =>
-      r.createMessage(msg.channel_id, {
-        content: "Pong!",
-      }),
-    ),
+    rest.createMessage(msg.channel_id, {
+      content: "Pong!",
+    }),
   ),
 )
 

package/esm/DiscordREST/index.js

@@ -1,15 +1,14 @@
 import * as tracing_1 from "@effect-ts/core/Tracing";
 const fileName_1 = "DiscordREST/index.ts";
 import * as T from "@effect-ts/core/Effect";
-import { tag } from "@effect-ts/system/Has";
+import { tag } from "@effect-ts/core/Has";
 import Axios from "axios";
 import * as Config from "../DiscordConfig";
 import { createRoutes } from "../types";
 import * as Http from "./http";
-export const DiscordREST = 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 token = yield* _(Config.token, fileName_1 + ":15:25");
+    const config = yield* _(Config.rest, fileName_1 + ":16:26");
     const axios = Axios.create({
         baseURL: config.baseUrl,
         headers: {
@@ -17,45 +16,44 @@ const make = T.gen(function* (_) {
         },
     });
     const request = Http.request(axios);
-    const routes = 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 = {
+    return {
         _tag: "DiscordREST",
         axios,
-        ...routes,
+        request,
     };
-    return rest;
-}, fileName_1 + ":19:19");
+}, fileName_1 + ":14:19");
+export const DiscordREST = tag();
 export const LiveDiscordREST = T.toLayer(DiscordREST)(make);
-export const rest = T.accessServiceM(DiscordREST);
+export const rest = createRoutes(({ method, url, params = {}, options = {} }) => T.accessServiceM(DiscordREST)(({ request }) => {
+    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);
+}, fileName_1 + ":39:34"));
 //# sourceMappingURL=index.js.map

package/esm/DiscordREST/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../DiscordREST/index.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAC3C,OAAO,KAAoD,MAAM,OAAO,CAAA;AACxE,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAa,MAAM,UAAU,CAAA;AAClD,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAA;AAM9B,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAe,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,KAAK,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,YAAY,CACzB,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;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAA;AAE3D,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../DiscordREST/index.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAEzC,OAAO,KAAqC,MAAM,OAAO,CAAA;AACzD,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAA;AAO9B,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,KAAK,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;IAEnC,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK;QACL,OAAO;KACR,CAAA;AACH,CAAC,wBAAC,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAe,CAAA;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAA;AAE3D,MAAM,CAAC,MAAM,IAAI,GAAG,YAAY,CAC9B,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,CAC7C,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5C,MAAM,OAAO,GAAG,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,CAAA;IACvD,IAAI,WAAW,GAAG,KAAK,CAAA;IAEvB,IAAI,OAAO,OAAO,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,EAAE;QAC9C,WAAW,GAAG,IAAI,CACjB;QAAC,OAAO,CAAC,IAAiB,CAAC,MAAM,CAChC,cAAc,EACd,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB,CAAA;KACF;IAED,MAAM,QAAQ,GAAG,OAAO;QACtB,CAAC,CAAC,OAAO,CAAC,MAAM;QAChB,CAAC,CAAC;YACE,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;YACzB,GAAG,MAAM;SACV,CAAA;IACL,MAAM,IAAI,GACR,WAAW,IAAI,CAAC,OAAO;QACrB,CAAC,CAAC,OAAO,CAAC,IAAI;QACd,CAAC,CAAC;YACE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;YACvB,GAAG,MAAM;SACV,CAAA;IAEP,MAAM,MAAM,GAAG;QACb,GAAG,OAAO;QACV,OAAO,EAAE;YACP,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1C;QACD,MAAM,EAAE,MAAgB;QACxB,GAAG;QACH,MAAM,EAAE,QAAQ;QAChB,IAAI;KACL,CAAA;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAA;AACxB,CAAC,wBAAC,CACL,CAAA"}

package/esm/DiscordShard/index.js

@@ -3,7 +3,6 @@ const fileName_1 = "DiscordShard/index.ts";
 import * as T from "@effect-ts/core/Effect";
 import * as L from "@effect-ts/core/Effect/Layer";
 import * as M from "@effect-ts/core/Effect/Managed";
-import * as Q from "@effect-ts/core/Effect/Queue";
 import { flow, pipe } from "@effect-ts/core/Function";
 import { tag } from "@effect-ts/core/Has";
 import * as O from "@effect-ts/core/Option";
@@ -17,35 +16,38 @@ import * as Identify from "./identify";
 import * as Invalid from "./invalidSession";
 import * as Utils from "./utils";
 const makeImpl = (shard) => M.gen(function* (_) {
-    const token = yield* _(Config.token, fileName_1 + ":29:27");
-    const gateway = yield* _(Config.gateway, fileName_1 + ":30:29");
-    const outbound = yield* _(Q.makeUnbounded(), fileName_1 + ":31:30");
-    const [latestReady, updateLatestReady] = yield* _(Utils.latest(flow(O.fromPredicate((p) => p.op === GatewayOpcode.DISPATCH && p.t === "READY"), O.map((p) => p.d))), fileName_1 + ":33:54");
-    const [latestSequence, updateLatestSequence] = yield* _(Utils.latest((p) => O.fromNullable(p.s)), fileName_1 + ":44:60");
+    const token = yield* _(Config.token, fileName_1 + ":28:27");
+    const gateway = yield* _(Config.gateway, fileName_1 + ":29:29");
+    const [emit, outbound] = CB.asyncEmitter();
+    const sendMessages = CB.forEach((p) => T.succeedWith(() => {
+        emit.data(p);
+    }, fileName_1 + ":33:20"));
+    const [latestReady, updateLatestReady] = yield* _(Utils.latest(flow(O.fromPredicate((p) => p.op === GatewayOpcode.DISPATCH && p.t === "READY"), O.map((p) => p.d))), fileName_1 + ":38:54");
+    const [latestSequence, updateLatestSequence] = yield* _(Utils.latest((p) => O.fromNullable(p.s)), fileName_1 + ":49:60");
     const raw = (CB.share(CB.unwrap(DWS.open({
         outgoingQueue: outbound,
     }))));
     const updateRefs = (CB.runDrain(updateLatestReady(updateLatestSequence(raw))));
     const dispatch = (CB.share(CB.filter_(raw, (p) => p.op === GatewayOpcode.DISPATCH)));
     // heartbeats
-    const heartbeatEffects = (CB.forEach_(Heartbeats.fromRaw(raw, latestSequence), (p) => Q.offer_(outbound, p)));
+    const heartbeatEffects = (sendMessages(Heartbeats.fromRaw(raw, latestSequence)));
     // identify
-    const identifyEffects = (CB.forEach_(Identify.fromRaw(raw, {
+    const identifyEffects = (sendMessages(Identify.fromRaw(raw, {
         token,
         shard,
         intents: gateway.intents,
         presence: gateway.presence,
         latestSequence,
         latestReady,
-    }), (p) => Q.offer_(outbound, p)));
+    })));
     // invalid session
-    const invalidEffects = (CB.forEach_(Invalid.fromRaw(raw, latestReady), (p) => Q.offer_(outbound, p)));
+    const invalidEffects = (sendMessages(Invalid.fromRaw(raw, latestReady)));
     return {
-        run: (T.ignore(T.zipPar(invalidEffects, fileName_1 + ":101:17")(T.zipPar(identifyEffects, fileName_1 + ":100:17")(T.zipPar(heartbeatEffects, fileName_1 + ":99:17")(updateRefs))), fileName_1 + ":102:17")),
+        run: (T.ignore(T.zipPar(invalidEffects, fileName_1 + ":103:17")(T.zipPar(identifyEffects, fileName_1 + ":102:17")(T.zipPar(heartbeatEffects, fileName_1 + ":101:17")(updateRefs))), fileName_1 + ":104:17")),
         raw,
         dispatch,
-        send: (p) => Q.offer_(outbound, p),
-        reconnect: () => Q.offer_(outbound, Reconnect),
+        send: (p) => emit.data(p),
+        reconnect: () => emit.data(Reconnect),
     };
 });
 const makeService = () => ({

package/esm/DiscordShard/index.js.map

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

package/esm/DiscordWS/index.js

@@ -2,7 +2,6 @@ import * as tracing_1 from "@effect-ts/core/Tracing";
 const fileName_1 = "DiscordWS/index.ts";
 import * as T from "@effect-ts/core/Effect";
 import * as L from "@effect-ts/core/Effect/Layer";
-import * as Q from "@effect-ts/core/Effect/Queue";
 import * as SC from "@effect-ts/core/Effect/Schedule";
 import { pipe } from "@effect-ts/core/Function";
 import { tag } from "@effect-ts/core/Has";
@@ -14,12 +13,7 @@ export const jsonEncoding = {
     encode: (p) => JSON.stringify(p),
     decode: (p) => JSON.parse(p.toString("utf8")),
 };
-const makeOutgoing = (q, e) => Q.map_(q, (data) => {
-    if (data === WS.Reconnect) {
-        return data;
-    }
-    return e.encode(data);
-});
+const makeOutgoing = (out, e) => CB.map_(out, (data) => (data === WS.Reconnect ? data : e.encode(data)));
 const openImpl = ({ url = "wss://gateway.discord.gg/", version = 9, encoding = jsonEncoding, outgoingQueue: outgoing, }) => (CB.map_(CB.retry_(CB.tapError_(CB.unwrap(WS.open(`${url}?v=${version}&encoding=${encoding.type}`, makeOutgoing(outgoing, encoding))), (e) => log(serviceTag, "error", e)), SC.exponential(500)), encoding.decode));
 // Service definition
 const serviceTag = "DiscordWSService";
@@ -30,5 +24,5 @@ const makeService = () => ({
 export const DiscordWS = tag();
 export const LiveDiscordWS = L.fromFunction(DiscordWS)(makeService);
 // Helpers
-export const open = (opts) => T.accessService(DiscordWS)(({ open }) => open(opts), fileName_1 + ":76:29");
+export const open = (opts) => T.accessService(DiscordWS)(({ open }) => open(opts), fileName_1 + ":78:29");
 //# sourceMappingURL=index.js.map

package/esm/DiscordWS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../DiscordWS/index.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,KAAK,CAAC,MAAM,8BAA8B,CAAA;AACjD,OAAO,KAAK,CAAC,MAAM,8BAA8B,CAAA;AACjD,OAAO,KAAK,EAAE,MAAM,iCAAiC,CAAA;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEvC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAE5B,OAAO,KAAK,EAAE,MAAM,OAAO,CAAA;AAiB3B,MAAM,CAAC,MAAM,YAAY,GAAa;IACpC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,CAAmB,EAAE,CAAW,EAAoB,EAAE,CAC1E,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,EAAc,EAAE;IAC7B,IAAI,IAAI,KAAK,EAAE,CAAC,SAAS,EAAE;QACzB,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC,CAAC,CAAA;AAEJ,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,CAAC,EACX,QAAQ,GAAG,YAAY,EACvB,aAAa,EAAE,QAAQ,GACd,EAAE,EAAE,EASX,EAAE,MADF,EAAE,QADF,EAAE,WADF,EAAE,CAAC,MAAM,CAJT,EAAE,CAAC,IAAI,CACL,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAC/C,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CACjC,GAEW,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,GACrC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GACrB,QAAQ,CAAC,MAAM,EACvB,CAAA;AAIH,qBAAqB;AACrB,MAAM,UAAU,GAAG,kBAA2B,CAAA;AAC9C,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,CAAC;IACC,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,QAAQ;CACL,CAAA,CAAA;AAGb,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAa,CAAA;AACzC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAA;AAEnE,UAAU;AACV,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,IAAc,EAAE,EAAE,CACrC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../DiscordWS/index.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,KAAK,CAAC,MAAM,8BAA8B,CAAA;AACjD,OAAO,KAAK,EAAE,MAAM,iCAAiC,CAAA;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,EAAO,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAE9C,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGvC,OAAO,EAAE,GAAG,EAAO,MAAM,QAAQ,CAAA;AAEjC,OAAO,KAAK,EAAE,MAAM,OAAO,CAAA;AAiB3B,MAAM,CAAC,MAAM,YAAY,GAAa;IACpC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,GAA0C,EAC1C,CAAW,EACE,EAAE,CACf,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAEzE,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,CAAC,EACX,QAAQ,GAAG,YAAY,EACvB,aAAa,EAAE,QAAQ,GACd,EAAE,EAAE,CACb,CAQE,EAAE,MADF,EAAE,QADF,EAAE,WADF,EAAE,CAAC,MAAM,CAJT,EAAE,CAAC,IAAI,CACL,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAC/C,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CACjC,GAEW,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,GACrC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GACrB,QAAQ,CAAC,MAAM,EAKvB,CAAA;AAIH,qBAAqB;AACrB,MAAM,UAAU,GAAG,kBAA2B,CAAA;AAC9C,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,CAAC;IACC,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,QAAQ;CACL,CAAA,CAAA;AAGb,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAa,CAAA;AACzC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAA;AAEnE,UAAU;AACV,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,IAAc,EAAE,EAAE,CACrC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAC,CAAA"}

package/esm/WS/index.js

@@ -3,9 +3,9 @@ const fileName_1 = "WS/index.ts";
 import * as T from "@effect-ts/core/Effect";
 import * as M from "@effect-ts/core/Effect/Managed";
 import * as SC from "@effect-ts/core/Effect/Schedule";
-import * as CB from "callbag-effect-ts";
 import { pipe } from "@effect-ts/core/Function";
 import { tag } from "@effect-ts/core/Has";
+import * as CB from "callbag-effect-ts";
 import * as Ws from "ws";
 import { logDebug } from "../Log";
 export const Reconnect = Symbol();
@@ -36,7 +36,7 @@ const send = (ws, out) => (CB.drain(CB.tap_(CB.tap_(CB.unwrap(T.map_(T.effectAsy
             cb(T.unit);
         });
     }
-}, fileName_1 + ":52:18"), () => CB.fromQueue(out), fileName_1 + ":61:10")), (p) => logDebug("WSService", "send", p)), (data) => T.effectAsync((cb) => {
+}, fileName_1 + ":52:18"), () => out, fileName_1 + ":61:10")), (p) => logDebug("WSService", "send", p)), (data) => T.effectAsync((cb) => {
     if (data === Reconnect) {
         ws.close(1012, "reconnecting");
         cb(T.unit);
@@ -53,13 +53,13 @@ const send = (ws, out) => (CB.drain(CB.tap_(CB.tap_(CB.unwrap(T.map_(T.effectAsy
     }
 }, fileName_1 + ":65:20"))));
 const duplex = (out) => (ws) => CB.merge_(recv(ws), send(ws, out));
-const openDuplex = (url, out, options) => (CB.retry_(CB.unwrapManaged(M.map_(openSocket(url, options), duplex(out), fileName_1 + ":93:10")), SC.recurWhile((e) => e._tag === "close" && e.code === 1012)));
+const openDuplex = (url, out, options) => (CB.retry_(CB.unwrapManaged(M.map_(openSocket(url, options), duplex(out), fileName_1 + ":89:10")), SC.recurWhile((e) => e._tag === "close" && e.code === 1012)));
 const makeService = () => ({
     _tag: "WSService",
     open: openDuplex,
 });
 export const WS = tag();
-export const LiveWS = T.toLayer(WS)(T.succeedWith(makeService, fileName_1 + ":106:50"));
+export const LiveWS = T.toLayer(WS)(T.succeedWith(makeService, fileName_1 + ":102:50"));
 // Helpers
-export const open = (url, out, options) => T.accessService(WS)(({ open }) => open(url, out, options), fileName_1 + ":113:25");
+export const open = (url, out, options) => T.accessService(WS)(({ open }) => open(url, out, options), fileName_1 + ":106:22");
 //# sourceMappingURL=index.js.map

package/esm/WS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../WS/index.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,KAAK,CAAC,MAAM,gCAAgC,CAAA;AAEnD,OAAO,KAAK,EAAE,MAAM,iCAAiC,CAAA;AACrD,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAOjC,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,EAAE,CAAA;AAKjC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,OAA0B,EAAE,EAAE,EAG3D,CAAC,WADD,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,wBAAC,EACxC,CAAC,EAAE,EAAE,EAAE,CAChB,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE;IACjB,EAAE,CAAC,kBAAkB,EAAE,CAAA;IACvB,EAAE,CAAC,KAAK,EAAE,CAAA;AACZ,CAAC,wBAAC,yBAEL,CAAA;AAEH,MAAM,IAAI,GAAG,CAAC,EAAgB,EAAE,EAAE,CAChC,EAAE,CAAC,KAAK,CAA+B,CAAC,IAAI,EAAE,EAAE;IAC9C,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;IACjD,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,CAAC,IAAI,CAAC;YACR,IAAI,EAAE,OAAO;YACb,KAAK;SACN,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAC9B,IAAI,CAAC,IAAI,CAAC;QACR,IAAI,EAAE,OAAO;QACb,IAAI;QACJ,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;KAChC,CAAC,CACH,CAAA;AACH,CAAC,CAAC,CAAA;AAEJ,MAAM,IAAI,GAAG,CAAC,EAAgB,EAAE,GAAkB,EAAE,EAAE,EA8BlD,EAAE,CAAC,KAAK,CAhBR,EAAE,MADF,EAAE,MADF,EAAE,CAAC,MAAM,CADT,CAAC,MATD,CAAC,CAAC,WAAW,CAAyB,CAAC,EAAE,EAAE,EAAE;IAC3C,IAAI,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,IAAI,EAAE;QAC3B,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;KACX;SAAM;QACL,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACnB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACZ,CAAC,CAAC,CAAA;KACH;AACH,CAAC,wBAAC,EACI,GAAG,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,2BAEtB,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC,GACvC,CAAC,IAAI,EAAE,EAAE,CACd,CAAC,CAAC,WAAW,CAAyB,CAAC,EAAE,EAAE,EAAE;IAC3C,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QAC9B,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;KACX;SAAM;QACL,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;YACpB,IAAI,GAAG,EAAE;gBACP,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,wBAAC,CAAC,CAAA;aAC1C;iBAAM;gBACL,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;aACX;QACH,CAAC,CAAC,CAAA;KACH;AACH,CAAC,wBAAC,GAGL,CAAA;AAEH,MAAM,MAAM,GAAG,CAAC,GAAkB,EAAE,EAAE,CAAC,CAAC,EAAgB,EAAE,EAAE,CAC1D,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;AAEpC,MAAM,UAAU,GAAG,CACjB,GAAW,EACX,GAAkB,EAClB,OAA0B,EAC1B,EAAE,EAKA,EAAE,QADF,EAAE,CAAC,aAAa,CADhB,CAAC,MADD,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,EAClB,MAAM,CAAC,GAAG,CAAC,2BAER,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,EACrE,CAAA;AAEH,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,CAAC;IACC,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,UAAU;CACP,CAAA,CAAA;AAGb,MAAM,CAAC,MAAM,EAAE,GAAG,GAAG,EAAM,CAAA;AAC3B,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,yBAAC,CAAC,CAAA;AAE/D,UAAU;AACV,MAAM,CAAC,MAAM,IAAI,GAAG,CAClB,GAAW,EACX,GAAkB,EAClB,OAA0B,EAC1B,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,yBAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../WS/index.ts"],"names":[],"mappings":"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"}

package/esm/bot.js

@@ -18,8 +18,8 @@ const Config = makeConfigLayer({
 // logger
 const logger = T.chain_(gateway, ({ raw }) => CB.forEach_(raw, (p) => log(p)), fileName_1 + ":27:24");
 // ping command
-const pingPong = (CB.forEach_(CB.filter_(fromDispatch("MESSAGE_CREATE"), (msg) => msg.content.startsWith("!ping")), (msg) => rest((r) => r.createMessage(msg.channel_id, {
+const pingPong = (CB.forEach_(CB.filter_(fromDispatch("MESSAGE_CREATE"), (msg) => msg.content.startsWith("!ping")), (msg) => rest.createMessage(msg.channel_id, {
     content: "Pong!",
-}), fileName_1 + ":34:9")));
-(R.runMain(T.provideSomeLayer(Config)(T.provideSomeLayer(DebugEnv)(T.zipPar(pingPong, fileName_1 + ":45:11")(T.zipPar(logger, fileName_1 + ":44:11")(run))))));
+})));
+(R.runMain(T.provideSomeLayer(Config)(T.provideSomeLayer(DebugEnv)(T.zipPar(pingPong, fileName_1 + ":43:11")(T.zipPar(logger, fileName_1 + ":42:11")(run))))));
 //# sourceMappingURL=bot.js.map

package/esm/bot.js.map

@@ -1 +1 @@
-{"version":3,"file":"bot.js","sourceRoot":"","sources":["../bot.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,yBAAyB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAC3B,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,eAAe,EACf,IAAI,EACJ,GAAG,GACJ,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,MAAM,GAAG,eAAe,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,cAAc;KAC/D;CACF,CAAC,CAAA;AAEF,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAC,CAAA;AAE9E,eAAe;AACf,MAAM,QAAQ,IAGZ,EAAE,UADF,EAAE,SADF,YAAY,CAAC,gBAAgB,CAAC,EACpB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GACvC,CAAC,GAAG,EAAE,EAAE,CACjB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE;IAC9B,OAAO,EAAE,OAAO;CACjB,CAAC,uBACH,EAEJ,CAAA;AAED,CAOE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAD1B,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAF5B,CAAC,CAAC,MAAM,CAAC,QAAQ,wBAAC,CADlB,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,GAAG,OAOJ"}
+{"version":3,"file":"bot.js","sourceRoot":"","sources":["../bot.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,yBAAyB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAC3B,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,eAAe,EACf,IAAI,EACJ,GAAG,GACJ,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,MAAM,GAAG,eAAe,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,cAAc;KAC/D;CACF,CAAC,CAAA;AAEF,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAC,CAAA;AAE9E,eAAe;AACf,MAAM,QAAQ,IAGZ,EAAE,UADF,EAAE,SADF,YAAY,CAAC,gBAAgB,CAAC,EACpB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GACvC,CAAC,GAAG,EAAE,EAAE,CACjB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE;IACjC,OAAO,EAAE,OAAO;CACjB,CAAC,EAEL,CAAA;AAED,CAOE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAD1B,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAF5B,CAAC,CAAC,MAAM,CAAC,QAAQ,wBAAC,CADlB,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,GAAG,OAOJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.1.0",
+  "version": "0.3.1",
   "description": "Effect-TS discord library",
   "main": "mod.js",
   "author": "Tim Smart <tim.smart@arisechurch.com>",
@@ -24,7 +24,7 @@
     "@effect-ts/tracing-plugin": "^0.19.0",
     "@tim-smart/discord-api-docs-parser": "^0.3.0",
     "@types/ws": "^8.5.3",
-    "callbag-effect-ts": "^0.9.3",
+    "callbag-effect-ts": "^0.10.2",
     "dotenv": "^16.0.0",
     "lerna": "^4.0.0",
     "prettier": "^2.5.1",
@@ -41,7 +41,7 @@
     "ws": "^8.5.0"
   },
   "peerDependencies": {
-    "callbag-effect-ts": "^0.9"
+    "callbag-effect-ts": "^0.10"
   },
   "exports": {
     ".": {
@@ -63,5 +63,5 @@
       "require": "./WS/index.js"
     }
   },
-  "gitHead": "52e532e1a72dda52c83e2b4923c362bfeaaf23dc"
+  "gitHead": "c88abef23929178b1774bf243d6ba3c3e42d523e"
 }

package/types.d.ts

@@ -151,7 +151,7 @@ export interface Application {
     privacy_policy_url?: string;
     /** partial user object containing info on the owner of the application */
     owner?: User;
-    /** if this application is a game sold on Discord, this field will be the summary field for the store page of its primary sku */
+    /** deprecated: previously if this application was a game sold on Discord, this field would be the summary field for the store page of its primary SKU; now an empty string */
     summary: string;
     /** the hex encoded key for verification in interactions and the GameSDK's GetTicket */
     verify_key: string;
@@ -2186,7 +2186,7 @@ export interface InteractionCallbackMessage {
 export interface InteractionCallbackModal {
     /** a developer-defined identifier for the component, max 100 characters */
     custom_id: string;
-    /** the title of the popup modal */
+    /** the title of the popup modal, max 45 characters */
     title: string;
     /** between 1 and 5 (inclusive) components that make up the modal */
     components: Component[];

package/types.ts

@@ -151,7 +151,7 @@ export interface Application {
   privacy_policy_url?: string
   /** partial user object containing info on the owner of the application */
   owner?: User
-  /** if this application is a game sold on Discord, this field will be the summary field for the store page of its primary sku */
+  /** deprecated: previously if this application was a game sold on Discord, this field would be the summary field for the store page of its primary SKU; now an empty string */
   summary: string
   /** the hex encoded key for verification in interactions and the GameSDK's GetTicket */
   verify_key: string
@@ -3940,7 +3940,7 @@ export interface InteractionCallbackMessage {
 export interface InteractionCallbackModal {
   /** a developer-defined identifier for the component, max 100 characters */
   custom_id: string
-  /** the title of the popup modal */
+  /** the title of the popup modal, max 45 characters */
   title: string
   /** between 1 and 5 (inclusive) components that make up the modal */
   components: Component[]