dfx 1.0.15 → 1.0.16

package/src/DiscordGateway/DiscordWS.ts

@@ -60,10 +60,9 @@ const make = Effect.gen(function* () {
         Ref.set(urlRef, `${nextUrl}?v=${version}&encoding=${encoding.type}`)
       const messages = yield* Queue.make<Message>()
       const socket = yield* Socket.makeWebSocket(Ref.get(urlRef), {
-        closeCodeIsError: _ => true,
         openTimeout: 5000,
       })
-      const writeRaw = yield* socket.writer
+      const writer = yield* socket.writer
       const logWriteError = (cause: Cause.Cause<Socket.SocketError>) =>
         Effect.annotateLogs(Effect.logDebug(cause), {
           module: "DiscordGateway/DiscordWS",
@@ -72,12 +71,12 @@ const make = Effect.gen(function* () {
       const write = (message: MessageSend): Effect.Effect<void> => {
         if (message === Reconnect) {
           return Effect.catchCause(
-            writeRaw(new Socket.CloseEvent(3000, "reconnecting")),
+            writer.write(new Socket.CloseEvent(3000, "reconnecting")),
             logWriteError,
           )
         }
         return Effect.catchCause(
-          writeRaw(encoding.encode(message)),
+          writer.write(encoding.encode(message)),
           logWriteError,
         )
       }
@@ -86,27 +85,35 @@ const make = Effect.gen(function* () {
         "Trace",
       )
       const loggers = yield* CurrentLoggers
-      yield* onConnecting.pipe(
-        Effect.andThen(
-          Effect.withFiber<void, Socket.SocketError>(fiber =>
-            socket.runRaw(_ => {
-              const message = encoding.decode(_)
-              Queue.offerUnsafe(messages, message)
-              if (!traceEnabled) return
-              loggers.forEach(logger => {
+      yield* Effect.gen(function* () {
+        const fiber = yield* Effect.fiber
+        yield* onConnecting
+        const reader = yield* socket.reader
+        return yield* Effect.whileLoop({
+          while: () => true,
+          body: () => reader.pull,
+          step(chunk) {
+            const decoded = chunk.map(encoding.decode)
+            Queue.offerAllUnsafe(messages, decoded)
+            Queue.flushUnsafe(messages)
+            if (!traceEnabled) return
+            loggers.forEach(logger => {
+              for (let i = 0; i < decoded.length; i++) {
                 logger.log({
-                  message,
+                  message: decoded[i],
                   cause: Cause.empty,
                   fiber,
                   logLevel: "Trace",
                   date: new Date(),
                 })
-              })
-            }),
-          ),
-        ),
+              }
+            })
+          },
+        })
+      }).pipe(
         Effect.retry({
           while: e =>
+            // oxlint-disable-next-line no-underscore-dangle
             e.reason._tag === "SocketCloseError" && e.reason.code === 3000,
         }),
         Effect.catchCause(cause =>

package/src/utils/Effect.ts

@@ -5,6 +5,7 @@ import * as Fiber from "effect/Fiber"
 import * as PubSub from "effect/PubSub"
 import * as Scope from "effect/Scope"
 import * as Exit from "effect/Exit"
+import type { NonEmptyArray } from "effect/Array"
 
 export const subscribeForEachPar = <R, E, A, X>(
   self: PubSub.PubSub<A>,
@@ -22,7 +23,7 @@ export const subscribeForEachPar = <R, E, A, X>(
           Deferred.doneUnsafe(deferred, exit as Exit.Exit<never, E>)
         }
       }
-      yield* Effect.whileLoop<[A, ...A[]], never, never>({
+      yield* Effect.whileLoop<NonEmptyArray<A>, never, never>({
         while: constTrue,
         body: constant(PubSub.takeAll(sub)),
         step(items) {

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.15";
+export const LIB_VERSION = "1.0.16";