codify-plugin-lib 1.0.112 → 1.0.114

package/dist/pty/background-pty.js

@@ -2,12 +2,11 @@ import { nanoid } from 'nanoid';
 import * as cp from 'node:child_process';
 import { EventEmitter } from 'node:events';
 import * as fs from 'node:fs/promises';
-import * as net from 'node:net';
 import pty from 'node-pty';
 import stripAnsi from 'strip-ansi';
+import { debugLog } from '../utils/debug.js';
 import { SpawnError } from './index.js';
 import { PromiseQueue } from './promise-queue.js';
-import { debugLog } from '../utils/debug.js';
 EventEmitter.defaultMaxListeners = 1000;
 /**
  * The background pty is a specialized pty designed for speed. It can launch multiple tasks
@@ -43,14 +42,11 @@ export class BackgroundPty {
                 resolve(null);
             });
         });
-        // Use read and write so that the pipe doesn't close
-        const fileHandle = await fs.open(`/tmp/${cid}`, fs.constants.O_RDWR | fs.constants.O_NONBLOCK);
-        let pipe;
         return new Promise((resolve) => {
-            pipe = new net.Socket({ fd: fileHandle.fd });
-            // pipe.pipe(process.stdout);
+            const cat = cp.spawn('cat', [`/tmp/${cid}`]);
+            cat.stdout.pipe(process.stdout);
             let output = '';
-            pipe.on('data', (data) => {
+            cat.stdout.on('data', (data) => {
                 output += data.toString();
                 if (output.includes('%%%done%%%"')) {
                     const truncOutput = output.replace('%%%done%%%"\n', '');
@@ -67,6 +63,9 @@ export class BackgroundPty {
                     });
                 }
             });
+            cat.on('close', () => {
+                console.log('close');
+            });
             this.promiseQueue.run(async () => new Promise((resolve) => {
                 const cdCommand = options?.cwd ? `cd ${options.cwd}; ` : '';
                 // Redirecting everything to the pipe and running in theb background avoids most if not all back-pressure problems
@@ -81,7 +80,7 @@ export class BackgroundPty {
                         resolve(null);
                     }
                 });
-                // console.log(`Running command ${cmd}`)
+                console.log(`Running command ${cmd}`);
                 this.basePty.write(`${command}\r`);
             }));
         }).finally(async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.112",
+  "version": "1.0.114",
   "description": "Library plugin library",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/plugin/plugin.ts

@@ -123,7 +123,7 @@ export class Plugin {
     }
 
     const plan = await ptyLocalStorage.run(this.planPty, async () => {
-       return this.resourceControllers.get(type)!.plan(
+      return this.resourceControllers.get(type)!.plan(
         data.desired ?? null,
         data.state ?? null,
         data.isStateful

package/src/pty/background-pty.ts

@@ -2,13 +2,12 @@ import { nanoid } from 'nanoid';
 import * as cp from 'node:child_process';
 import { EventEmitter } from 'node:events';
 import * as fs from 'node:fs/promises';
-import * as net from 'node:net';
 import pty from 'node-pty';
 import stripAnsi from 'strip-ansi';
 
+import { debugLog } from '../utils/debug.js';
 import { IPty, SpawnError, SpawnOptions, SpawnResult } from './index.js';
 import { PromiseQueue } from './promise-queue.js';
-import { debugLog } from '../utils/debug.js';
 
 EventEmitter.defaultMaxListeners = 1000;
 
@@ -54,17 +53,12 @@ export class BackgroundPty implements IPty {
       })
     })
 
-    // Use read and write so that the pipe doesn't close
-    const fileHandle = await fs.open(`/tmp/${cid}`, fs.constants.O_RDWR | fs.constants.O_NONBLOCK);
-    let pipe: net.Socket;
-
     return new Promise<SpawnResult>((resolve) => {
-      pipe = new net.Socket({ fd: fileHandle.fd });
-
-      // pipe.pipe(process.stdout);
+      const cat = cp.spawn('cat', [`/tmp/${cid}`])
+      cat.stdout.pipe(process.stdout);
 
       let output = '';
-      pipe.on('data', (data) => {
+      cat.stdout.on('data', (data) => {
         output += data.toString();
 
         if (output.includes('%%%done%%%"')) {
@@ -85,6 +79,10 @@ export class BackgroundPty implements IPty {
         }
       })
 
+      cat.on('close', () => {
+        console.log('close');
+      })
+
       this.promiseQueue.run(async () => new Promise((resolve) => {
         const cdCommand = options?.cwd ? `cd ${options.cwd}; ` : '';
         // Redirecting everything to the pipe and running in theb background avoids most if not all back-pressure problems
@@ -102,7 +100,7 @@ export class BackgroundPty implements IPty {
           }
         });
 
-        // console.log(`Running command ${cmd}`)
+        console.log(`Running command ${cmd}`)
         this.basePty.write(`${command}\r`);
 
       }));