dfx 0.0.1 → 0.0.4

package/DiscordWS/index.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.open = exports.LiveDiscordWS = exports.DiscordWS = exports.jsonEncoding = void 0;
+const tslib_1 = require("tslib");
+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 S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+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");
+const Log_1 = require("../Log");
+const WS = tslib_1.__importStar(require("../WS"));
+exports.jsonEncoding = {
+    type: "json",
+    encode: (p) => JSON.stringify(p),
+    decode: (p) => JSON.parse(p.toString("utf8")),
+};
+const makeOutgoing = (s, e) => (S.map_(s, (data) => {
+    if (data === WS.Reconnect) {
+        return data;
+    }
+    return e.encode(data);
+}));
+const openImpl = ({ url = "wss://gateway.discord.gg/", version = 9, encoding = exports.jsonEncoding, outgoing, }) => (S.map_(S.retry_(S.onError_(S.unwrap(WS.open(`${url}?v=${version}&encoding=${encoding.type}`, makeOutgoing(outgoing, encoding))), (e) => e._tag === "Fail" ? (0, Log_1.log)(serviceTag, "error", e.value) : T.unit), SC.exponential(250)), encoding.decode));
+// Service definition
+const serviceTag = "DiscordWSService";
+const service = {
+    _tag: serviceTag,
+    open: openImpl,
+};
+exports.DiscordWS = (0, Has_1.tag)();
+exports.LiveDiscordWS = T.toLayer(exports.DiscordWS)(T.succeed(service, fileName_1 + ":75:60"));
+// Helpers
+const open = (opts) => T.accessService(exports.DiscordWS)(({ open }) => open(opts), fileName_1 + ":79:29");
+exports.open = open;
+//# sourceMappingURL=index.js.map

package/DiscordWS/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sFAA+D;AAC/D,4EAAqD;AACrD,uDAA+C;AAC/C,6CAAyC;AAGzC,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,CAAiB,EAAE,CAAW,EAAqB,EAAE,EAGvE,CAAC,MADD,CAAC,EACK,CAAC,IAAI,EAAE,EAAE;IACb,IAAI,IAAI,KAAK,EAAE,CAAC,SAAS,EAAE;QACzB,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC,EACF,CAAA;AAEH,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,CAAC,EACX,QAAQ,GAAG,oBAAY,EACvB,QAAQ,GACC,EAAE,EAAE,EAWX,CAAC,MADD,CAAC,QAHD,CAAC,UADD,CAAC,CAAC,MAAM,CAJR,EAAE,CAAC,IAAI,CACL,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAC/C,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CACjC,GAES,CAAC,CAAC,EAAE,EAAE,CACd,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAA,SAAG,EAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAExD,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GACrB,QAAQ,CAAC,MAAM,EACtB,CAAA;AAIH,qBAAqB;AACrB,MAAM,UAAU,GAAG,kBAA2B,CAAA;AAC9C,MAAM,OAAO,GAAG;IACd,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,QAAQ;CACN,CAAA;AAGG,QAAA,SAAS,GAAG,IAAA,SAAG,GAAa,CAAA;AAC5B,QAAA,aAAa,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,wBAAC,CAAC,CAAA;AAErE,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

@@ -0,0 +1,79 @@
+import * as T from "@effect-ts/core/Effect"
+import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+import * as SC from "@effect-ts/core/Effect/Schedule"
+import { pipe } from "@effect-ts/core/Function"
+import { tag } from "@effect-ts/core/Has"
+import { _A } from "@effect-ts/core/Utils"
+import { RawData } from "ws"
+import { log } from "../Log"
+import { GatewayPayload } from "../types"
+import * as WS from "../WS"
+
+export type Message = GatewayPayload | WS.Reconnect
+
+export interface OpenOpts {
+  url?: string
+  version?: number
+  encoding?: Encoding
+  outgoing: WS.OutboundStream<Message>
+}
+
+export interface Encoding {
+  type: "json" | "etf"
+  encode: (p: GatewayPayload) => string | Buffer | ArrayBuffer
+  decode: (p: RawData) => GatewayPayload
+}
+
+export const jsonEncoding: Encoding = {
+  type: "json",
+  encode: (p) => JSON.stringify(p),
+  decode: (p) => JSON.parse(p.toString("utf8")),
+}
+
+const makeOutgoing = (s: S.UIO<Message>, e: Encoding): WS.OutboundStream =>
+  pipe(
+    s,
+    S.map((data) => {
+      if (data === WS.Reconnect) {
+        return data
+      }
+
+      return e.encode(data)
+    })
+  )
+
+const openImpl = ({
+  url = "wss://gateway.discord.gg/",
+  version = 9,
+  encoding = jsonEncoding,
+  outgoing,
+}: OpenOpts) =>
+  pipe(
+    WS.open(
+      `${url}?v=${version}&encoding=${encoding.type}`,
+      makeOutgoing(outgoing, encoding)
+    ),
+    S.unwrap,
+    S.onError((e) =>
+      e._tag === "Fail" ? log(serviceTag, "error", e.value) : T.unit
+    ),
+    S.retry(SC.exponential(250)),
+    S.map(encoding.decode)
+  )
+
+export type Connection = ReturnType<typeof openImpl>
+
+// Service definition
+const serviceTag = "DiscordWSService" as const
+const service = {
+  _tag: serviceTag,
+  open: openImpl,
+} as const
+type Service = typeof service
+export interface DiscordWS extends Service {}
+export const DiscordWS = tag<DiscordWS>()
+export const LiveDiscordWS = T.toLayer(DiscordWS)(T.succeed(service))
+
+// Helpers
+export const open = (opts: OpenOpts) =>
+  T.accessService(DiscordWS)(({ open }) => open(opts))

package/Log/index.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.log = exports.LiveLog = exports.Log = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "Log/index.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const Has_1 = require("@effect-ts/core/Has");
+const service = {
+    _tag: "LogService",
+    log: (...args) => T.succeedWith(() => {
+        console.error(...args);
+    }, fileName_1 + ":8:18"),
+};
+exports.Log = (0, Has_1.tag)();
+exports.LiveLog = T.toLayer(exports.Log)(T.succeed(service, fileName_1 + ":17:48"));
+const log = (...args) => T.accessServiceM(exports.Log)(({ log }) => log(...args), fileName_1 + ":20:24");
+exports.log = log;
+//# sourceMappingURL=index.js.map

package/Log/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,6CAAyC;AAGzC,MAAM,OAAO,GAAG;IACd,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACtB,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;IACxB,CAAC,uBAAC;CACI,CAAA;AAKG,QAAA,GAAG,GAAG,IAAA,SAAG,GAAO,CAAA;AAChB,QAAA,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,WAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,wBAAC,CAAC,CAAA;AAElD,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACpC,CAAC,CAAC,cAAc,CAAC,WAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,wBAAC,CAAA;AADrC,QAAA,GAAG,OACkC"}

package/Log/index.ts

@@ -0,0 +1,20 @@
+import * as T from "@effect-ts/core/Effect"
+import { tag } from "@effect-ts/core/Has"
+import { _A } from "@effect-ts/core/Utils"
+
+const service = {
+  _tag: "LogService",
+  log: (...args: any[]) =>
+    T.succeedWith(() => {
+      console.error(...args)
+    }),
+} as const
+
+type Service = typeof service
+
+export interface Log extends Service {}
+export const Log = tag<Log>()
+export const LiveLog = T.toLayer(Log)(T.succeed(service))
+
+export const log = (...args: any[]) =>
+  T.accessServiceM(Log)(({ log }) => log(...args))

package/README.md

@@ -0,0 +1,3 @@
+# dfx
+
+A Discord library for effect-ts

package/WS/index.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.open = exports.LiveWS = exports.WS = exports.Reconnect = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "WS/index.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+const M = tslib_1.__importStar(require("@effect-ts/core/Effect/Managed"));
+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");
+const Ws = tslib_1.__importStar(require("ws"));
+exports.Reconnect = Symbol();
+const openSocket = (url, options) => (M.makeExit_(T.succeedWith(() => new Ws.WebSocket(url, options), fileName_1 + ":25:18"), (ws) => T.succeedWith(() => {
+    ws.removeAllListeners();
+    ws.close();
+}, fileName_1 + ":27:20"), fileName_1 + ":26:15"));
+const recv = (ws) => S.async((emit) => {
+    ws.on("message", (message) => emit.single(message));
+    ws.on("error", (cause) => {
+        emit.fail({
+            _tag: "error",
+            cause,
+        });
+    });
+    ws.on("close", (code, reason) => emit.fail({
+        _tag: "close",
+        code,
+        reason: reason.toString("utf8"),
+    }));
+});
+const send = (out) => (ws) => (S.drain(S.tap_(S.unwrap(T.map_(T.effectAsync((cb) => {
+    if (ws.readyState & ws.OPEN) {
+        cb(T.unit);
+    }
+    else {
+        ws.once("open", () => {
+            cb(T.unit);
+        });
+    }
+}, fileName_1 + ":54:18"), () => out, fileName_1 + ":63:10")), (data) => T.effectAsync((cb) => {
+    if (data === exports.Reconnect) {
+        ws.close(1012, "reconnecting");
+        cb(T.unit);
+    }
+    else {
+        console.error(data);
+        ws.send(data, (err) => {
+            if (err) {
+                cb(T.fail({ _tag: "write", cause: err }, fileName_1 + ":74:24"));
+            }
+            else {
+                cb(T.unit);
+            }
+        });
+    }
+}, fileName_1 + ":66:20"))));
+const duplex = (out) => (ws) => (S.mergeTerminateLeft_(recv(ws), send(out)(ws)));
+const openDuplex = (url, out, options) => (S.retry_(S.unwrapManaged(M.map_(openSocket(url, options), duplex(out), fileName_1 + ":95:10")), SC.recurWhile((e) => e._tag === "close" && e.code === 1012)));
+const makeWS = T.succeed({
+    _tag: "WSService",
+    open: openDuplex,
+}, fileName_1 + ":100:25");
+exports.WS = (0, Has_1.tag)();
+exports.LiveWS = T.toLayer(exports.WS)(makeWS);
+// Helpers
+const open = (url, out, options) => T.accessService(exports.WS)(({ open }) => open(url, out, options), fileName_1 + ":114:25");
+exports.open = open;
+//# sourceMappingURL=index.js.map

package/WS/index.js.map

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

package/WS/index.ts

@@ -1,7 +1,6 @@
 import * as T from "@effect-ts/core/Effect"
 import * as S from "@effect-ts/core/Effect/Experimental/Stream"
 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 { pipe } from "@effect-ts/core/Function"
 import { tag } from "@effect-ts/core/Has"
@@ -14,17 +13,14 @@ export type WsError =
   | { _tag: "error"; cause: unknown }
   | { _tag: "write"; cause: unknown }
 
-type WebSocketStream = S.Stream<HasClock, WsError, Ws.RawData>
+export type WebSocketStream<T = Ws.RawData> = S.Stream<HasClock, WsError, T>
 
 export const Reconnect = Symbol()
-export type Message = Ws.RawData | typeof Reconnect
+export type Reconnect = typeof Reconnect
+export type Message = string | Buffer | ArrayBuffer | Reconnect
+export type OutboundStream<T = Message> = S.UIO<T>
 
-export interface WebSocketConnection {
-  read: WebSocketStream
-  write: Q.Queue<Message>
-}
-
-const open = (url: string, options?: Ws.ClientOptions) =>
+const openSocket = (url: string, options?: Ws.ClientOptions) =>
   pipe(
     T.succeedWith(() => new Ws.WebSocket(url, options)),
     M.makeExit((ws) =>
@@ -53,7 +49,7 @@ const recv = (ws: Ws.WebSocket): WebSocketStream =>
     )
   })
 
-const send = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
+const send = (out: OutboundStream) => (ws: Ws.WebSocket) =>
   pipe(
     T.effectAsync<unknown, WsError, void>((cb) => {
       if (ws.readyState & ws.OPEN) {
@@ -64,7 +60,7 @@ const send = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
         })
       }
     }),
-    T.map(() => S.fromQueue()(out)),
+    T.map(() => out),
     S.unwrap,
     S.tap((data) =>
       T.effectAsync<unknown, WsError, void>((cb) => {
@@ -72,6 +68,7 @@ const send = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
           ws.close(1012, "reconnecting")
           cb(T.unit)
         } else {
+          console.error(data)
           ws.send(data, (err) => {
             if (err) {
               cb(T.fail({ _tag: "write", cause: err }))
@@ -85,33 +82,21 @@ const send = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
     S.drain
   )
 
-const duplex = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
+const duplex = (out: OutboundStream) => (ws: Ws.WebSocket) =>
   pipe(recv(ws), S.mergeTerminateLeft(send(out)(ws)))
 
-const openDuplexWithQueue = (
+const openDuplex = (
   url: string,
-  out: Q.Queue<Message>,
+  out: OutboundStream,
   options?: Ws.ClientOptions
 ): WebSocketStream =>
   pipe(
-    open(url, options),
+    openSocket(url, options),
     M.map(duplex(out)),
     S.unwrapManaged,
     S.retry(SC.recurWhile((e) => e._tag === "close" && e.code === 1012))
   )
 
-const openDuplex = (
-  url: string,
-  options?: Ws.ClientOptions
-): T.UIO<WebSocketConnection> =>
-  pipe(
-    Q.makeUnbounded<Message>(),
-    T.map((write) => ({
-      read: openDuplexWithQueue(url, write, options),
-      write,
-    }))
-  )
-
 const makeWS = T.succeed({
   _tag: "WSService",
   open: openDuplex,
@@ -120,3 +105,10 @@ const makeWS = T.succeed({
 export interface WS extends _A<typeof makeWS> {}
 export const WS = tag<WS>()
 export const LiveWS = T.toLayer(WS)(makeWS)
+
+// Helpers
+export const open = (
+  url: string,
+  out: OutboundStream,
+  options?: Ws.ClientOptions
+) => T.accessService(WS)(({ open }) => open(url, out, options))

package/bot.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "bot.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+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 R = tslib_1.__importStar(require("@effect-ts/node/Runtime"));
+const Dotemv = tslib_1.__importStar(require("dotenv"));
+const _1 = require(".");
+const Shard = tslib_1.__importStar(require("./DiscordShard"));
+const Log_1 = require("./Log");
+const types_1 = require("./types");
+Dotemv.config();
+const makeBot = (M.map_(Shard.make({
+    token: process.env.DISCORD_BOT_TOKEN,
+    intents: types_1.GatewayIntents.GUILDS | types_1.GatewayIntents.GUILD_MESSAGES,
+    shard: [0, 1],
+}), (bot) => ({
+    _tag: "BotService",
+    bot,
+}), fileName_1 + ":22:8"));
+const Bot = (0, Has_1.tag)();
+const LiveBot = M.toLayer_(makeBot, Bot);
+const bot = T.accessService(Bot)(({ bot }) => bot, fileName_1 + ":34:33");
+const runBot = T.accessServiceM(Bot)(({ bot }) => bot.run, fileName_1 + ":35:37");
+// logger
+const logger = T.chain_(bot, ({ raw }) => (S.forEach_(S.fromHub_(raw), (p) => (0, Log_1.log)(p))), fileName_1 + ":38:24");
+(R.runMain(T.provideSomeLayer(_1.DefaultEnv[">+>"](LiveBot))(T.zipPar(runBot, fileName_1 + ":47:11")(logger))));
+//# sourceMappingURL=bot.js.map

package/bot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bot.js","sourceRoot":"","sources":["bot.ts"],"names":[],"mappings":";;;;;AAAA,kEAA2C;AAC3C,sFAA+D;AAC/D,0EAAmD;AACnD,uDAA+C;AAC/C,6CAAyC;AAEzC,mEAA4C;AAC5C,uDAAgC;AAChC,wBAA8B;AAC9B,8DAAuC;AACvC,+BAA2B;AAC3B,mCAAwC;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,OAAO,IAMX,CAAC,MALD,KAAK,CAAC,IAAI,CAAC;IACT,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE,sBAAc,CAAC,MAAM,GAAG,sBAAc,CAAC,cAAc;IAC9D,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;CACd,CAAC,EAEA,CAAC,GAAG,EAAE,EAAE,CACN,CAAC;IACC,IAAI,EAAE,YAAY;IAClB,GAAG;CACM,CAAA,wBAEhB,CAAA;AAGD,MAAM,GAAG,GAAG,IAAA,SAAG,GAAO,CAAA;AACtB,MAAM,OAAO,GAAG,CAAC,UAAc,OAAO,EAAZ,GAAG,CAAU,CAAA;AACvC,MAAM,GAAG,GAAG,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,wBAAC,CAAA;AAClD,MAAM,MAAM,GAAG,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,wBAAC,CAAA;AAE1D,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAGrC,CAAC,UADD,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACL,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,CAAC,CAAC,EACxB,wBACF,CAAA;AAED,CAKE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,aAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAF9C,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,MAAM,KAKP"}

package/bot.ts

@@ -0,0 +1,51 @@
+import * as T from "@effect-ts/core/Effect"
+import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+import * as M from "@effect-ts/core/Effect/Managed"
+import { pipe } from "@effect-ts/core/Function"
+import { tag } from "@effect-ts/core/Has"
+import { _A } from "@effect-ts/core/Utils"
+import * as R from "@effect-ts/node/Runtime"
+import * as Dotemv from "dotenv"
+import { DefaultEnv } from "."
+import * as Shard from "./DiscordShard"
+import { log } from "./Log"
+import { GatewayIntents } from "./types"
+
+Dotemv.config()
+
+const makeBot = pipe(
+  Shard.make({
+    token: process.env.DISCORD_BOT_TOKEN!,
+    intents: GatewayIntents.GUILDS | GatewayIntents.GUILD_MESSAGES,
+    shard: [0, 1],
+  }),
+  M.map(
+    (bot) =>
+      ({
+        _tag: "BotService",
+        bot,
+      } as const)
+  )
+)
+
+interface Bot extends _A<typeof makeBot> {}
+const Bot = tag<Bot>()
+const LiveBot = M.toLayer(Bot)(makeBot)
+const bot = T.accessService(Bot)(({ bot }) => bot)
+const runBot = T.accessServiceM(Bot)(({ bot }) => bot.run)
+
+// logger
+const logger = T.chain_(bot, ({ raw }) =>
+  pipe(
+    S.fromHub_(raw),
+    S.forEach((p) => log(p))
+  )
+)
+
+pipe(
+  logger,
+  T.zipPar(runBot),
+
+  T.provideSomeLayer(DefaultEnv[">+>"](LiveBot)),
+  R.runMain
+)

package/mod.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultEnv = void 0;
 const tslib_1 = require("tslib");
 const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
 const fileName_1 = "mod.ts";
-const core_1 = require("@effect-ts/core");
-const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
-const Schedule_1 = require("@effect-ts/core/Effect/Schedule");
-const R = tslib_1.__importStar(require("@effect-ts/node/Runtime"));
+const Shard = tslib_1.__importStar(require("./DiscordShard"));
+const DiscordWS_1 = require("./DiscordWS");
+const Log_1 = require("./Log");
 const WS = tslib_1.__importStar(require("./WS"));
-(R.runMain(core_1.Effect.provideSomeLayer(WS.LiveWS)(core_1.Effect.chain_(core_1.Effect.accessServiceM(WS.WS)(({ open }) => open("wss://gateway.discord.gg/?v=9&encoding=json"), fileName_1 + ":8:26"), ({ read, write }) => (S.forEach_(S.retry_(read, (0, Schedule_1.exponential)(10)), (data) => core_1.Effect.succeedWith(() => {
-    console.error(data.toString("utf8"));
-}, fileName_1 + ":16:22"))), fileName_1 + ":11:10"))));
+exports.DefaultEnv = WS.LiveWS[">+>"](DiscordWS_1.LiveDiscordWS)[">+>"](Shard.LiveDiscordShard)["+++"](Log_1.LiveLog);
 //# sourceMappingURL=mod.js.map

package/mod.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["mod.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAuC;AACvC,2CAA2C;AAC3C,+BAA+B;AAC/B,iDAA0B;AAEb,QAAA,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,yBAAa,CAAC,CACtD,KAAK,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAC9B,KAAK,CAAC,CAAC,aAAO,CAAC,CAAA"}

package/mod.ts

@@ -1,24 +1,8 @@
-import { Effect as T, pipe } from "@effect-ts/core"
-import * as S from "@effect-ts/core/Effect/Experimental/Stream"
-import { exponential } from "@effect-ts/core/Effect/Schedule"
-import * as R from "@effect-ts/node/Runtime"
+import * as Shard from "./DiscordShard"
+import { LiveDiscordWS } from "./DiscordWS"
+import { LiveLog } from "./Log"
 import * as WS from "./WS"
 
-pipe(
-  T.accessServiceM(WS.WS)(({ open }) =>
-    open("wss://gateway.discord.gg/?v=9&encoding=json")
-  ),
-  T.chain(({ read, write }) =>
-    pipe(
-      read,
-      S.retry(exponential(10)),
-      S.forEach((data) =>
-        T.succeedWith(() => {
-          console.error(data.toString("utf8"))
-        })
-      )
-    )
-  ),
-  T.provideSomeLayer(WS.LiveWS),
-  R.runMain
-)
+export const DefaultEnv = WS.LiveWS[">+>"](LiveDiscordWS)
+  [">+>"](Shard.LiveDiscordShard)
+  ["+++"](LiveLog)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.0.1",
+  "version": "0.0.4",
   "description": "Effect-TS discord library",
   "main": "mod.js",
   "author": "Tim Smart <tim.smart@arisechurch.com>",
@@ -8,13 +8,21 @@
   "scripts": {
     "prepare": "ttsc",
     "types": "discord-api-codegen ./discord-api-docs -l typescript -o 'imports=Response|./DiscordREST/types' 'endpointReturnType=Response' > types.ts && prettier -w types.ts",
-    "clean": "git clean -fxd -e node_modules/ -e .env"
+    "clean": "git clean -fxd -e node_modules/ -e .env",
+    "dev": "ts-node -C ttypescript mod.ts"
   },
+  "files": [
+    "**/*.ts",
+    "**/*.js",
+    "**/*.js.map",
+    "!discord-api-docs/**/*"
+  ],
   "devDependencies": {
     "@effect-ts/tracing-plugin": "^0.19.0",
     "@tim-smart/discord-api-docs-parser": "^0.3.0",
     "@types/ws": "^8.5.3",
     "prettier": "^2.5.1",
+    "ts-node": "^10.7.0",
     "ttypescript": "^1.5.13",
     "typescript": "^4.6.2"
   },
@@ -22,7 +30,22 @@
     "@effect-ts/core": "^0.58.0",
     "@effect-ts/node": "^0.38.3",
     "@effect-ts/system": "^0.55.0",
+    "dotenv": "^16.0.0",
     "tslib": "^2.3.1",
     "ws": "^8.5.0"
+  },
+  "exports": {
+    ".": {
+      "require": "./mod.js"
+    },
+    "./WS": {
+      "require": "./WS/index.js"
+    },
+    "./DiscordShard": {
+      "require": "./DiscordShard/index.js"
+    },
+    "./DiscordWS": {
+      "require": "./DiscordWS/index.js"
+    }
   }
 }