dfx 0.0.4 → 0.2.0

package/DiscordShard/utils.ts

@@ -1,47 +1,32 @@
 import * as T from "@effect-ts/core/Effect"
-import * as S from "@effect-ts/core/Effect/Experimental/Stream"
-import * as H from "@effect-ts/core/Effect/Hub"
 import * as R from "@effect-ts/core/Effect/Ref"
 import { flow, pipe } from "@effect-ts/core/Function"
 import * as O from "@effect-ts/core/Option"
-import {
-  GatewayEvent,
-  GatewayEvents,
-  GatewayOpcode,
-  GatewayPayload,
-} from "../types"
+import * as CB from "callbag-effect-ts"
+import { GatewayOpcode, GatewayPayload } from "../types"
 
 export const opCode =
-  (hub: H.Hub<GatewayPayload>) =>
-  <T = any>(code: GatewayOpcode): S.UIO<GatewayPayload<T>> =>
+  <R, E>(source: CB.EffectSource<R, E, GatewayPayload>) =>
+  <T = any>(code: GatewayOpcode) =>
     pipe(
-      S.fromHub_(hub),
-      S.filter((p) => p.op === code)
+      source,
+      CB.filter((p): p is GatewayPayload<T> => p.op === code),
     )
 
-export const latest = <T>(f: (p: GatewayPayload) => O.Option<T>) =>
-  T.gen(function* (_) {
-    const ref = yield* _(R.makeRef<O.Option<T>>(O.none))
-
-    return [
-      ref,
-      S.tap(
-        flow(
-          f,
-          O.fold(
-            () => T.unit,
-            (a) => R.set_(ref, O.some(a))
-          )
-        )
-      ),
-    ] as const
-  })
+const maybeUpdateRef = <T>(
+  f: (p: GatewayPayload) => O.Option<T>,
+  ref: R.Ref<O.Option<T>>,
+) =>
+  flow(
+    f,
+    O.fold(
+      () => T.unit,
+      (a) => R.set_(ref, O.some(a)),
+    ),
+  )
 
-export const fromDispatch =
-  (hub: H.Hub<GatewayPayload<GatewayEvent>>) =>
-  <K extends keyof GatewayEvents>(event: K) =>
-    pipe(
-      S.fromHub_(hub),
-      S.filter((p): p is GatewayPayload<GatewayEvents[K]> => p.t === event),
-      S.map((p) => p.d as GatewayEvents[K])
-    )
+export const latest = <T>(f: (p: GatewayPayload) => O.Option<T>) =>
+  pipe(
+    R.makeRef<O.Option<T>>(O.none),
+    T.map((ref) => [ref, CB.tap(maybeUpdateRef(f, ref))] as const),
+  )

package/DiscordWS/index.d.ts

@@ -0,0 +1,36 @@
+/// <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 { RawData } from "ws";
+import { Log } from "../Log";
+import { GatewayPayload } from "../types";
+import * as WS from "../WS";
+export declare type Message = GatewayPayload | WS.Reconnect;
+export interface OpenOpts {
+    url?: string;
+    version?: number;
+    encoding?: Encoding;
+    outgoingQueue: Q.Queue<Message>;
+}
+export interface Encoding {
+    type: "json" | "etf";
+    encode: (p: GatewayPayload) => string | Buffer | ArrayBuffer;
+    decode: (p: RawData) => GatewayPayload;
+}
+export declare const jsonEncoding: Encoding;
+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<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, 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

@@ -5,10 +5,12 @@ 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 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");
+const CB = tslib_1.__importStar(require("callbag-effect-ts"));
 const Log_1 = require("../Log");
 const WS = tslib_1.__importStar(require("../WS"));
 exports.jsonEncoding = {
@@ -16,22 +18,22 @@ exports.jsonEncoding = {
     encode: (p) => JSON.stringify(p),
     decode: (p) => JSON.parse(p.toString("utf8")),
 };
-const makeOutgoing = (s, e) => (S.map_(s, (data) => {
+const makeOutgoing = (q, e) => Q.map_(q, (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));
+});
+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";
-const service = {
+const makeService = () => ({
     _tag: serviceTag,
     open: openImpl,
-};
+});
 exports.DiscordWS = (0, Has_1.tag)();
-exports.LiveDiscordWS = T.toLayer(exports.DiscordWS)(T.succeed(service, fileName_1 + ":75:60"));
+exports.LiveDiscordWS = L.fromFunction(exports.DiscordWS)(makeService);
 // Helpers
-const open = (opts) => T.accessService(exports.DiscordWS)(({ open }) => open(opts), fileName_1 + ":79:29");
+const open = (opts) => T.accessService(exports.DiscordWS)(({ open }) => open(opts), fileName_1 + ":82: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,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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,wEAAiD;AACjD,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,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,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,11 +1,14 @@
 import * as T from "@effect-ts/core/Effect"
-import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+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 { _A } from "@effect-ts/core/Utils"
+import { tag, 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 { log, Log } from "../Log"
 import { GatewayPayload } from "../types"
 import * as WS from "../WS"
 
@@ -15,7 +18,7 @@ export interface OpenOpts {
   url?: string
   version?: number
   encoding?: Encoding
-  outgoing: WS.OutboundStream<Message>
+  outgoingQueue: Q.Queue<Message>
 }
 
 export interface Encoding {
@@ -30,49 +33,49 @@ export const jsonEncoding: Encoding = {
   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
-      }
+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)
-    })
-  )
+    return e.encode(data)
+  })
 
 const openImpl = ({
   url = "wss://gateway.discord.gg/",
   version = 9,
   encoding = jsonEncoding,
-  outgoing,
+  outgoingQueue: 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
+      makeOutgoing(outgoing, encoding),
     ),
-    S.retry(SC.exponential(250)),
-    S.map(encoding.decode)
-  )
+    CB.unwrap,
+    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>
 
 // Service definition
 const serviceTag = "DiscordWSService" as const
-const service = {
-  _tag: serviceTag,
-  open: openImpl,
-} as const
-type Service = typeof service
-export interface DiscordWS extends Service {}
+const makeService = () =>
+  ({
+    _tag: serviceTag,
+    open: openImpl,
+  } as const)
+
+export interface DiscordWS extends ReturnType<typeof makeService> {}
 export const DiscordWS = tag<DiscordWS>()
-export const LiveDiscordWS = T.toLayer(DiscordWS)(T.succeed(service))
+export const LiveDiscordWS = L.fromFunction(DiscordWS)(makeService)
 
 // Helpers
 export const open = (opts: OpenOpts) =>

package/Log/index.d.ts

@@ -0,0 +1,15 @@
+import * as L from "@effect-ts/core/Effect/Layer";
+import * as T from "@effect-ts/core/Effect";
+declare const make: (debug?: boolean) => {
+    readonly _tag: "LogService";
+    readonly log: (...args: any[]) => T.UIO<void>;
+    readonly debug: (...args: any[]) => T.UIO<void>;
+};
+export interface Log extends ReturnType<typeof make> {
+}
+export declare const Log: import("@effect-ts/system/Has").Tag<Log>;
+export declare const LiveLog: L.Layer<{}, never, import("@effect-ts/system/Has").Has<Log>>;
+export declare const LiveLogDebug: L.Layer<{}, never, import("@effect-ts/system/Has").Has<Log>>;
+export declare const log: (...args: any[]) => T.Effect<import("@effect-ts/system/Has").Has<Log>, never, void>;
+export declare const logDebug: (...args: any[]) => T.Effect<import("@effect-ts/system/Has").Has<Log>, never, void>;
+export {};

package/Log/index.js

@@ -1,19 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.log = exports.LiveLog = exports.Log = void 0;
+exports.logDebug = exports.log = exports.LiveLogDebug = 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 L = tslib_1.__importStar(require("@effect-ts/core/Effect/Layer"));
 const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
 const Has_1 = require("@effect-ts/core/Has");
-const service = {
+const make = (debug = false) => ({
     _tag: "LogService",
     log: (...args) => T.succeedWith(() => {
-        console.error(...args);
-    }, fileName_1 + ":8:18"),
-};
+        console.error("INFO", ...args);
+    }, fileName_1 + ":10:20"),
+    debug: (...args) => debug
+        ? T.succeedWith(() => {
+            console.error("DEBUG", ...args);
+        }, fileName_1 + ":15:24")
+        : T.unit,
+});
 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.LiveLog = L.fromValue(exports.Log)(make(false));
+exports.LiveLogDebug = L.fromValue(exports.Log)(make(true));
+const log = (...args) => T.accessServiceM(exports.Log)(({ log }) => log(...args), fileName_1 + ":27:24");
 exports.log = log;
+const logDebug = (...args) => T.accessServiceM(exports.Log)(({ debug }) => debug(...args), fileName_1 + ":30:24");
+exports.logDebug = logDebug;
 //# sourceMappingURL=index.js.map

package/Log/index.js.map

@@ -1 +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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAiD;AACjD,kEAA2C;AAC3C,6CAAyC;AAGzC,MAAM,IAAI,GAAG,CAAC,KAAK,GAAG,KAAK,EAAE,EAAE,CAC7B,CAAC;IACC,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACtB,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAA;IAChC,CAAC,wBAAC;IACJ,KAAK,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACxB,KAAK;QACH,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;QACjC,CAAC,wBAAC;QACJ,CAAC,CAAC,CAAC,CAAC,IAAI;CACH,CAAA,CAAA;AAGA,QAAA,GAAG,GAAG,IAAA,SAAG,GAAO,CAAA;AAChB,QAAA,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,WAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;AACvC,QAAA,YAAY,GAAG,CAAC,CAAC,SAAS,CAAC,WAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;AAEjD,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;AAE3C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACzC,CAAC,CAAC,cAAc,CAAC,WAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,wBAAC,CAAA;AADzC,QAAA,QAAQ,YACiC"}

package/Log/index.ts

@@ -1,20 +1,30 @@
+import * as L from "@effect-ts/core/Effect/Layer"
 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
+const make = (debug = false) =>
+  ({
+    _tag: "LogService",
+    log: (...args: any[]) =>
+      T.succeedWith(() => {
+        console.error("INFO", ...args)
+      }),
+    debug: (...args: any[]) =>
+      debug
+        ? T.succeedWith(() => {
+            console.error("DEBUG", ...args)
+          })
+        : T.unit,
+  } as const)
 
-type Service = typeof service
-
-export interface Log extends Service {}
+export interface Log extends ReturnType<typeof make> {}
 export const Log = tag<Log>()
-export const LiveLog = T.toLayer(Log)(T.succeed(service))
+export const LiveLog = L.fromValue(Log)(make(false))
+export const LiveLogDebug = L.fromValue(Log)(make(true))
 
 export const log = (...args: any[]) =>
   T.accessServiceM(Log)(({ log }) => log(...args))
+
+export const logDebug = (...args: any[]) =>
+  T.accessServiceM(Log)(({ debug }) => debug(...args))

package/Utils/memoize.d.ts

@@ -0,0 +1,3 @@
+declare type Primitive = string | number | boolean;
+export declare function memoize<A extends Primitive, T>(f: (a: A) => T): (a: A) => T;
+export {};

package/Utils/memoize.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.memoize = void 0;
+function memoize(f) {
+    const cache = new Map();
+    return (a) => {
+        if (cache.has(a)) {
+            return cache.get(a);
+        }
+        const value = f(a);
+        cache.set(a, value);
+        return value;
+    };
+}
+exports.memoize = memoize;
+//# sourceMappingURL=memoize.js.map

package/Utils/memoize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memoize.js","sourceRoot":"","sources":["memoize.ts"],"names":[],"mappings":";;;AAEA,SAAgB,OAAO,CAAyB,CAAc;IAC5D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAQ,CAAA;IAE7B,OAAO,CAAC,CAAI,EAAK,EAAE;QACjB,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAChB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAM,CAAA;SACzB;QAED,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAClB,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACnB,OAAO,KAAK,CAAA;IACd,CAAC,CAAA;AACH,CAAC;AAZD,0BAYC"}

package/Utils/memoize.ts

@@ -0,0 +1,15 @@
+type Primitive = string | number | boolean
+
+export function memoize<A extends Primitive, T>(f: (a: A) => T) {
+  const cache = new Map<A, T>()
+
+  return (a: A): T => {
+    if (cache.has(a)) {
+      return cache.get(a) as T
+    }
+
+    const value = f(a)
+    cache.set(a, value)
+    return value
+  }
+}

package/WS/index.d.ts

@@ -0,0 +1,30 @@
+/// <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 * as Ws from "ws";
+export declare type WsError = {
+    _tag: "close";
+    code: number;
+    reason: string;
+} | {
+    _tag: "error";
+    cause: unknown;
+} | {
+    _tag: "write";
+    cause: unknown;
+};
+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>;
+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>;
+};
+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 {};

package/WS/index.js

@@ -5,19 +5,20 @@ 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 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 Ws = tslib_1.__importStar(require("ws"));
+const Log_1 = require("../Log");
 exports.Reconnect = Symbol();
-const openSocket = (url, options) => (M.makeExit_(T.succeedWith(() => new Ws.WebSocket(url, options), fileName_1 + ":25:18"), (ws) => T.succeedWith(() => {
+const openSocket = (url, options) => (M.makeExit_(T.succeedWith(() => new Ws.WebSocket(url, options), fileName_1 + ":23: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));
+}, fileName_1 + ":25:20"), fileName_1 + ":24:15"));
+const recv = (ws) => CB.async((emit) => {
+    ws.on("message", (message) => emit.data(message));
     ws.on("error", (cause) => {
         emit.fail({
             _tag: "error",
@@ -30,7 +31,7 @@ const recv = (ws) => S.async((emit) => {
         reason: reason.toString("utf8"),
     }));
 });
-const send = (out) => (ws) => (S.drain(S.tap_(S.unwrap(T.map_(T.effectAsync((cb) => {
+const send = (ws, out) => (CB.drain(CB.tap_(CB.tap_(CB.unwrap(T.map_(T.effectAsync((cb) => {
     if (ws.readyState & ws.OPEN) {
         cb(T.unit);
     }
@@ -39,32 +40,31 @@ const send = (out) => (ws) => (S.drain(S.tap_(S.unwrap(T.map_(T.effectAsync((cb)
             cb(T.unit);
         });
     }
-}, fileName_1 + ":54:18"), () => out, fileName_1 + ":63:10")), (data) => T.effectAsync((cb) => {
+}, fileName_1 + ":52:18"), () => CB.fromQueue(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);
     }
     else {
-        console.error(data);
         ws.send(data, (err) => {
             if (err) {
-                cb(T.fail({ _tag: "write", cause: err }, fileName_1 + ":74:24"));
+                cb(T.fail({ _tag: "write", cause: err }, fileName_1 + ":72: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({
+}, 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 makeService = () => ({
     _tag: "WSService",
     open: openDuplex,
-}, fileName_1 + ":100:25");
+});
 exports.WS = (0, Has_1.tag)();
-exports.LiveWS = T.toLayer(exports.WS)(makeWS);
+exports.LiveWS = T.toLayer(exports.WS)(T.succeedWith(makeService, fileName_1 + ":106:50"));
 // Helpers
-const open = (url, out, options) => T.accessService(exports.WS)(({ open }) => open(url, out, options), fileName_1 + ":114:25");
+const open = (url, out, options) => T.accessService(exports.WS)(({ open }) => open(url, out, options), fileName_1 + ":113:25");
 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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"}