@6qat/tcp-connection 0.1.0 → 0.2.1

package/dist/tcp-stream.js

@@ -1,24 +1,42 @@
-import { Effect, Stream, Queue, pipe, Fiber, Duration } from "effect";
+import { Effect, Stream, Queue, pipe, Fiber, Duration, Ref } from "effect";
 export const createTcpConnection = (options) => {
-    return Effect.gen(function* () {
+    return Effect.scoped(Effect.gen(function* () {
         // Create queues for incoming and outgoing data
         const incomingQueue = yield* Queue.unbounded();
         const outgoingQueue = yield* Queue.unbounded();
+        // Track error count
+        const writeErrorCount = yield* Ref.make(0);
+        // Use refs for coordinated cleanup
+        const isClosing = yield* Ref.make(false);
+        // Safely shut down once
+        const performShutdown = Effect.gen(function* () {
+            const alreadyClosing = yield* Ref.getAndSet(isClosing, true);
+            if (alreadyClosing)
+                return;
+            bunSocket.end();
+            // Allow socket events to propagate
+            yield* Effect.sleep(Duration.millis(10));
+            // Interrupt writer fiber before shutting down queues
+            yield* Fiber.interrupt(writerFiber);
+            yield* Effect.all([
+                Queue.shutdown(incomingQueue),
+                Queue.shutdown(outgoingQueue),
+            ]);
+        });
         // Create deferred for connection cleanup
-        const socketEffect = yield* Effect.tryPromise(() => Bun.connect({
+        const bunSocket = yield* Effect.tryPromise(() => Bun.connect({
             port: options.port,
             hostname: options.host,
             socket: {
                 data(_socket, data) {
                     Queue.unsafeOffer(incomingQueue, data);
                 },
-                error(_socket, error) {
+                error(_socket, _error) {
                     //Queue.unsafeOffer(incomingQueue, error)
-                    Queue.shutdown(outgoingQueue);
+                    Effect.runPromise(performShutdown);
                 },
                 close(_socket) {
-                    Queue.shutdown(incomingQueue);
-                    Queue.shutdown(outgoingQueue);
+                    Effect.runPromise(performShutdown);
                 },
             },
         })).pipe(Effect.timeout(options.timeout ?? Duration.millis(3000)), Effect.flatMap((maybeSocket) => maybeSocket
@@ -29,21 +47,29 @@ export const createTcpConnection = (options) => {
             while: () => true,
             body: () => pipe(Queue.take(outgoingQueue), Effect.flatMap((data) => Effect.try({
                 try: () => {
-                    const bytesWritten = socketEffect.write(data);
+                    const bytesWritten = bunSocket.write(data);
                     if (bytesWritten !== data.length) {
                         throw new Error("Partial write");
                     }
+                    // Reset error count on success
+                    Effect.runSync(Ref.set(writeErrorCount, 0));
+                },
+                catch: (error) => {
+                    const currentErrors = Effect.runSync(Ref.updateAndGet(writeErrorCount, (n) => n + 1));
+                    if (currentErrors > 3) {
+                        // Too many errors, close the socket
+                        Effect.runSync(performShutdown);
+                        return Effect.fail(new Error(`Write failed after ${currentErrors} attempts: ${error}`));
+                    }
+                    // Retry with the same data after a delay
+                    return Effect.sleep(Duration.millis(100)).pipe(Effect.flatMap(() => Queue.offer(outgoingQueue, data)));
                 },
-                catch: (error) => new Error(`Write failed: ${error}`),
             }))),
         }), Effect.fork);
         // Cleanup procedure
         const close = Effect.gen(function* () {
             console.log("Closing connection");
-            socketEffect.end();
-            yield* Queue.shutdown(incomingQueue);
-            yield* Queue.shutdown(outgoingQueue);
-            yield* Fiber.interrupt(writerFiber);
+            yield* performShutdown;
         });
         // returns TCPConnection
         return {
@@ -52,5 +78,5 @@ export const createTcpConnection = (options) => {
             sendText: (data) => Queue.offer(outgoingQueue, new TextEncoder().encode(data)),
             close,
         };
-    });
+    }));
 };

package/package.json

@@ -1,28 +1,28 @@
 {
-	"name": "@6qat/tcp-connection",
-	"version": "0.1.0",
-	"description": "TCP connection library with Effect.js integration",
-	"module": "dist/index.js",
-	"main": "dist/index.js",
-	"types": "dist/index.d.ts",
-	"type": "module",
-	"files": ["dist", "README.md"],
-	"scripts": {
-		"build": "tsc",
-		"prepublishOnly": "npm run build",
-		"test": "echo \"Error: no test specified\" && exit 1"
-	},
-	"keywords": ["tcp", "connection", "effect", "bun"],
-	"author": "Your Name",
-	"license": "MIT",
-	"devDependencies": {
-		"@types/bun": "latest",
-		"typescript": "^5"
-	},
-	"peerDependencies": {
-		"effect": "^2.0.0"
-	},
-	"publishConfig": {
-		"access": "public"
-	}
+  "name": "@6qat/tcp-connection",
+  "version": "0.2.1",
+  "description": "TCP connection library with Effect.js integration",
+  "module": "dist/index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "type": "module",
+  "files": ["dist", "README.md"],
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm run build",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": ["tcp", "connection", "effect", "bun"],
+  "author": "Your Name",
+  "license": "MIT",
+  "devDependencies": {
+    "@types/bun": "latest",
+    "typescript": "^5"
+  },
+  "peerDependencies": {
+    "effect": "^2.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }