codify-plugin-lib 1.0.182-beta7 → 1.0.182-beta9

package/dist/pty/background-pty.d.ts

@@ -6,6 +6,7 @@ import { IPty, SpawnOptions, SpawnResult } from './index.js';
  * without a tty (or even a stdin) attached so interactive commands will not work.
  */
 export declare class BackgroundPty implements IPty {
+    private historyIgnore;
     private basePty;
     private promiseQueue;
     constructor();

package/dist/pty/background-pty.js

@@ -17,8 +17,10 @@ EventEmitter.defaultMaxListeners = 1000;
  * without a tty (or even a stdin) attached so interactive commands will not work.
  */
 export class BackgroundPty {
+    historyIgnore = Utils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };
     basePty = pty.spawn(this.getDefaultShell(), ['-i'], {
-        env: process.env, name: nanoid(6),
+        env: { ...process.env, ...this.historyIgnore },
+        name: nanoid(6),
         handleFlowControl: true
     });
     promiseQueue = new PromiseQueue();
@@ -105,16 +107,17 @@ export class BackgroundPty {
             let outputBuffer = '';
             return new Promise(resolve => {
                 // zsh-specific commands
-                switch (Utils.getShell()) {
-                    case Shell.ZSH: {
-                        this.basePty.write('setopt HIST_NO_STORE;\n');
-                        break;
-                    }
-                    default: {
-                        this.basePty.write('export HISTIGNORE=\'history*\';\n');
-                        break;
-                    }
-                }
+                // switch (Utils.getShell()) {
+                //   case Shell.ZSH: {
+                //     this.basePty.write('setopt HIST_NO_STORE;\n');
+                //     break;
+                //   }
+                //
+                //   default: {
+                //     this.basePty.write('export HISTIGNORE=\'history*\';\n');
+                //     break;
+                //   }
+                // }
                 this.basePty.write(' unset PS1;\n');
                 this.basePty.write(' unset PS0;\n');
                 this.basePty.write(' echo setup complete\\"\n');

package/dist/pty/index.d.ts

@@ -26,6 +26,7 @@ export interface SpawnOptions {
     cwd?: string;
     env?: Record<string, unknown>;
     interactive?: boolean;
+    requiresRoot?: boolean;
 }
 export declare class SpawnError extends Error {
     data: string;

package/dist/pty/seqeuntial-pty.d.ts

@@ -12,5 +12,6 @@ export declare class SequentialPty implements IPty {
         exitCode: number;
         signal?: number | undefined;
     }>;
+    externalSpawn(cmd: string, opts: SpawnOptions): Promise<SpawnResult>;
     private getDefaultShell;
 }

package/dist/pty/seqeuntial-pty.js

@@ -1,10 +1,17 @@
 import pty from '@homebridge/node-pty-prebuilt-multiarch';
+import { Ajv } from 'ajv';
+import { CommandRequestResponseDataSchema, MessageCmd } from 'codify-schemas';
+import { nanoid } from 'nanoid';
 import { EventEmitter } from 'node:events';
 import stripAnsi from 'strip-ansi';
 import { Shell, Utils } from '../utils/index.js';
 import { VerbosityLevel } from '../utils/verbosity-level.js';
 import { SpawnError, SpawnStatus } from './index.js';
 EventEmitter.defaultMaxListeners = 1000;
+const ajv = new Ajv({
+    strict: true,
+});
+const validateSudoRequestResponse = ajv.compile(CommandRequestResponseDataSchema);
 /**
  * The background pty is a specialized pty designed for speed. It can launch multiple tasks
  * in parallel by moving them to the background. It attaches unix FIFO pipes to each process
@@ -20,6 +27,10 @@ export class SequentialPty {
         return spawnResult;
     }
     async spawnSafe(cmd, options) {
+        // If sudo is required, we must delegate to the main codify process.
+        if (options?.interactive || options?.requiresRoot) {
+            return this.externalSpawn(cmd, options);
+        }
         console.log(`Running command: ${cmd}` + (options?.cwd ? `(${options?.cwd})` : ''));
         return new Promise((resolve) => {
             const output = [];
@@ -30,14 +41,14 @@ export class SequentialPty {
                 ...process.env, ...options?.env,
                 TERM_PROGRAM: 'codify',
                 COMMAND_MODE: 'unix2003',
-                COLORTERM: 'truecolor', ...historyIgnore
+                COLORTERM: 'truecolor',
+                ...historyIgnore
             };
             // Initial terminal dimensions
             const initialCols = process.stdout.columns ?? 80;
             const initialRows = process.stdout.rows ?? 24;
-            const args = (options?.interactive ?? false) ? ['-i', '-c', cmd] : ['-c', cmd];
             // Run the command in a pty for interactivity
-            const mPty = pty.spawn(this.getDefaultShell(), args, {
+            const mPty = pty.spawn(this.getDefaultShell(), ['-c', cmd], {
                 ...options,
                 cols: initialCols,
                 rows: initialRows,
@@ -49,20 +60,14 @@ export class SequentialPty {
                 }
                 output.push(data.toString());
             });
-            const stdinListener = (data) => {
-                mPty.write(data.toString());
-            };
             const resizeListener = () => {
                 const { columns, rows } = process.stdout;
                 mPty.resize(columns, rows);
             };
             // Listen to resize events for the terminal window;
             process.stdout.on('resize', resizeListener);
-            // Listen for user input
-            process.stdin.on('data', stdinListener);
             mPty.onExit((result) => {
                 process.stdout.off('resize', resizeListener);
-                process.stdin.off('data', stdinListener);
                 resolve({
                     status: result.exitCode === 0 ? SpawnStatus.SUCCESS : SpawnStatus.ERROR,
                     exitCode: result.exitCode,
@@ -78,6 +83,30 @@ export class SequentialPty {
             signal: 0,
         };
     }
+    // For safety reasons, requests that require sudo or are interactive must be run via the main client
+    async externalSpawn(cmd, opts) {
+        return new Promise((resolve) => {
+            const requestId = nanoid(8);
+            const listener = (data) => {
+                if (data.requestId === requestId) {
+                    process.removeListener('message', listener);
+                    if (!validateSudoRequestResponse(data.data)) {
+                        throw new Error(`Invalid response for sudo request: ${JSON.stringify(validateSudoRequestResponse.errors, null, 2)}`);
+                    }
+                    resolve(data.data);
+                }
+            };
+            process.on('message', listener);
+            process.send({
+                cmd: MessageCmd.COMMAND_REQUEST,
+                data: {
+                    command: cmd,
+                    options: opts ?? {},
+                },
+                requestId
+            });
+        });
+    }
     getDefaultShell() {
         return process.env.SHELL;
     }

package/dist/test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test.js

@@ -0,0 +1,5 @@
+import { SequentialPty } from './pty/seqeuntial-pty.js';
+import { VerbosityLevel } from './utils/verbosity-level.js';
+VerbosityLevel.set(1);
+const $ = new SequentialPty();
+await $.spawn('sudo ls', { interactive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.182-beta7",
+  "version": "1.0.182-beta9",
   "description": "Library plugin library",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "clean-deep": "^3.4.0",
-    "codify-schemas": "1.0.86",
+    "codify-schemas": "1.0.86-beta4",
     "lodash.isequal": "^4.5.0",
     "nanoid": "^5.0.9",
     "strip-ansi": "^7.1.0",

package/src/pty/background-pty.ts

@@ -20,8 +20,10 @@ EventEmitter.defaultMaxListeners = 1000;
  * without a tty (or even a stdin) attached so interactive commands will not work.
  */
 export class BackgroundPty implements IPty {
+  private historyIgnore = Utils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };
   private basePty = pty.spawn(this.getDefaultShell(), ['-i'], {
-    env: process.env, name: nanoid(6),
+    env: { ...process.env, ...this.historyIgnore },
+    name: nanoid(6),
     handleFlowControl: true
   });
 
@@ -129,17 +131,17 @@ export class BackgroundPty implements IPty {
 
       return new Promise(resolve => {
         // zsh-specific commands
-        switch (Utils.getShell()) {
-          case Shell.ZSH: {
-            this.basePty.write('setopt HIST_NO_STORE;\n');
-            break;
-          }
-
-          default: {
-            this.basePty.write('export HISTIGNORE=\'history*\';\n');
-            break;
-          }
-        }
+        // switch (Utils.getShell()) {
+        //   case Shell.ZSH: {
+        //     this.basePty.write('setopt HIST_NO_STORE;\n');
+        //     break;
+        //   }
+        //
+        //   default: {
+        //     this.basePty.write('export HISTIGNORE=\'history*\';\n');
+        //     break;
+        //   }
+        // }
 
         this.basePty.write(' unset PS1;\n');
         this.basePty.write(' unset PS0;\n')

package/src/pty/index.ts

@@ -30,6 +30,7 @@ export interface SpawnOptions {
   cwd?: string;
   env?: Record<string, unknown>,
   interactive?: boolean,
+  requiresRoot?: boolean,
 }
 
 export class SpawnError extends Error {

package/src/pty/seqeuntial-pty.ts

@@ -1,4 +1,12 @@
 import pty from '@homebridge/node-pty-prebuilt-multiarch';
+import { Ajv } from 'ajv';
+import {
+  CommandRequestResponseData,
+  CommandRequestResponseDataSchema,
+  IpcMessageV2,
+  MessageCmd
+} from 'codify-schemas';
+import { nanoid } from 'nanoid';
 import { EventEmitter } from 'node:events';
 import stripAnsi from 'strip-ansi';
 
@@ -8,6 +16,11 @@ import { IPty, SpawnError, SpawnOptions, SpawnResult, SpawnStatus } from './inde
 
 EventEmitter.defaultMaxListeners = 1000;
 
+const ajv = new Ajv({
+  strict: true,
+});
+const validateSudoRequestResponse = ajv.compile(CommandRequestResponseDataSchema);
+
 /**
  * The background pty is a specialized pty designed for speed. It can launch multiple tasks
  * in parallel by moving them to the background. It attaches unix FIFO pipes to each process
@@ -26,11 +39,15 @@ export class SequentialPty implements IPty {
   }
 
   async spawnSafe(cmd: string, options?: SpawnOptions): Promise<SpawnResult> {
+    // If sudo is required, we must delegate to the main codify process.
+    if (options?.interactive || options?.requiresRoot) {
+      return this.externalSpawn(cmd, options);
+    }
+
     console.log(`Running command: ${cmd}` + (options?.cwd ? `(${options?.cwd})` : ''))
 
     return new Promise((resolve) => {
       const output: string[] = [];
-
       const historyIgnore = Utils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };
 
       // If TERM_PROGRAM=Apple_Terminal is set then ANSI escape characters may be included
@@ -39,17 +56,16 @@ export class SequentialPty implements IPty {
         ...process.env, ...options?.env,
         TERM_PROGRAM: 'codify',
         COMMAND_MODE: 'unix2003',
-        COLORTERM: 'truecolor', ...historyIgnore
+        COLORTERM: 'truecolor',
+        ...historyIgnore
       }
 
       // Initial terminal dimensions
       const initialCols = process.stdout.columns ?? 80;
       const initialRows = process.stdout.rows ?? 24;
 
-      const args = (options?.interactive ?? false) ? ['-i', '-c', cmd] : ['-c', cmd]
-
       // Run the command in a pty for interactivity
-      const mPty = pty.spawn(this.getDefaultShell(), args, {
+      const mPty = pty.spawn(this.getDefaultShell(), ['-c', cmd], {
         ...options,
         cols: initialCols,
         rows: initialRows,
@@ -64,10 +80,6 @@ export class SequentialPty implements IPty {
         output.push(data.toString());
       })
 
-      const stdinListener = (data: any) => {
-        mPty.write(data.toString());
-      };
-
       const resizeListener = () => {
         const { columns, rows } = process.stdout;
         mPty.resize(columns, rows);
@@ -75,12 +87,9 @@ export class SequentialPty implements IPty {
 
       // Listen to resize events for the terminal window;
       process.stdout.on('resize', resizeListener);
-      // Listen for user input
-      process.stdin.on('data', stdinListener);
 
       mPty.onExit((result) => {
         process.stdout.off('resize', resizeListener);
-        process.stdin.off('data', stdinListener);
 
         resolve({
           status: result.exitCode === 0 ? SpawnStatus.SUCCESS : SpawnStatus.ERROR,
@@ -99,6 +108,39 @@ export class SequentialPty implements IPty {
     }
   }
 
+  // For safety reasons, requests that require sudo or are interactive must be run via the main client
+  async externalSpawn(
+    cmd: string,
+    opts: SpawnOptions
+  ): Promise<SpawnResult> {
+    return new Promise((resolve) => {
+      const requestId = nanoid(8);
+
+      const listener = (data: IpcMessageV2)=> {
+        if (data.requestId === requestId) {
+          process.removeListener('message', listener);
+
+          if (!validateSudoRequestResponse(data.data)) {
+            throw new Error(`Invalid response for sudo request: ${JSON.stringify(validateSudoRequestResponse.errors, null, 2)}`);
+          }
+
+          resolve(data.data as unknown as CommandRequestResponseData);
+        }
+      }
+
+      process.on('message', listener);
+
+      process.send!(<IpcMessageV2>{
+        cmd: MessageCmd.COMMAND_REQUEST,
+        data: {
+          command: cmd,
+          options: opts ?? {},
+        },
+        requestId
+      })
+    });
+  }
+
   private getDefaultShell(): string {
     return process.env.SHELL!;
   }

package/src/pty/sequential-pty.test.ts

@@ -1,6 +1,8 @@
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
 import { SequentialPty } from './seqeuntial-pty.js';
 import { VerbosityLevel } from '../utils/verbosity-level.js';
+import { MessageStatus, SpawnStatus } from 'codify-schemas/src/types/index.js';
+import { IpcMessageV2, MessageCmd } from 'codify-schemas';
 
 describe('SequentialPty tests', () => {
   it('Can launch a simple command', async () => {
@@ -33,8 +35,8 @@ describe('SequentialPty tests', () => {
     const resultFailed = await pty.spawnSafe('which sjkdhsakjdhjkash');
     expect(resultFailed).toMatchObject({
       status: 'error',
-      exitCode: 127,
-      data: 'zsh:1: command not found: which sjkdhsakjdhjkash' // This might change on different os or shells. Keep for now.
+      exitCode: 1,
+      data: 'sjkdhsakjdhjkash not found' // This might change on different os or shells. Keep for now.
     })
   });
 
@@ -50,12 +52,128 @@ describe('SequentialPty tests', () => {
   });
 
   it('It can launch a command in interactive mode', async () => {
-    const pty = new SequentialPty();
+    const originalSend = process.send;
+    process.send = (req: IpcMessageV2) => {
+      expect(req).toMatchObject({
+        cmd: MessageCmd.COMMAND_REQUEST,
+        requestId: expect.any(String),
+        data: {
+          command: 'ls',
+          options: {
+            cwd: '/tmp',
+            interactive: true,
+          }
+        }
+      })
+
+      // This may look confusing but what we're doing here is directly finding the process listener and calling it without going through serialization
+      const listeners = process.listeners('message');
+      listeners[2](({
+        cmd: MessageCmd.COMMAND_REQUEST,
+        requestId: req.requestId,
+        status: MessageStatus.SUCCESS,
+        data: {
+          status: SpawnStatus.SUCCESS,
+          exitCode: 0,
+          data: 'My data',
+        }
+      }))
+
+      return true;
+    }
+
+    const $ = new SequentialPty();
+    const resultSuccess = await $.spawnSafe('ls', { interactive: true, cwd: '/tmp' });
 
-    const resultSuccess = await pty.spawnSafe('ls', { interactive: true });
     expect(resultSuccess).toMatchObject({
       status: 'success',
       exitCode: 0,
-    })
+    });
+
+    process.send = originalSend;
   });
+
+  it('It can work with root (sudo)', async () => {
+    const originalSend = process.send;
+    process.send = (req: IpcMessageV2) => {
+      expect(req).toMatchObject({
+        cmd: MessageCmd.COMMAND_REQUEST,
+        requestId: expect.any(String),
+        data: {
+          command: 'ls',
+          options: {
+            interactive: true,
+            requiresRoot: true,
+          }
+        }
+      })
+
+      // This may look confusing but what we're doing here is directly finding the process listener and calling it without going through serialization
+      const listeners = process.listeners('message');
+      listeners[2](({
+        cmd: MessageCmd.COMMAND_REQUEST,
+        requestId: req.requestId,
+        status: MessageStatus.SUCCESS,
+        data: {
+          status: SpawnStatus.SUCCESS,
+          exitCode: 0,
+          data: 'My data',
+        }
+      }))
+
+      return true;
+    }
+
+    const $ = new SequentialPty();
+    const resultSuccess = await $.spawn('ls', { interactive: true, requiresRoot: true });
+
+    expect(resultSuccess).toMatchObject({
+      status: 'success',
+      exitCode: 0,
+    });
+
+    process.send = originalSend;
+  })
+
+  it('It can handle errors when in sudo', async () => {
+    const originalSend = process.send;
+    process.send = (req: IpcMessageV2) => {
+      expect(req).toMatchObject({
+        cmd: MessageCmd.COMMAND_REQUEST,
+        requestId: expect.any(String),
+        data: {
+          command: 'ls',
+          options: {
+            requiresRoot: true,
+            interactive: true,
+          }
+        }
+      })
+
+      // This may look confusing but what we're doing here is directly finding the process listener and calling it without going through serialization
+      const listeners = process.listeners('message');
+      listeners[2](({
+        cmd: MessageCmd.COMMAND_REQUEST,
+        requestId: req.requestId,
+        status: MessageStatus.SUCCESS,
+        data: {
+          status: SpawnStatus.ERROR,
+          exitCode: 127,
+          data: 'My data',
+        }
+      }))
+
+      return true;
+    }
+
+    const $ = new SequentialPty();
+    const resultSuccess = await $.spawnSafe('ls', { interactive: true, requiresRoot: true });
+
+    expect(resultSuccess).toMatchObject({
+      status: SpawnStatus.ERROR,
+      exitCode: 127,
+    });
+
+    process.send = originalSend;
+  })
 })

package/src/test.ts

@@ -0,0 +1,6 @@
+import { SequentialPty } from './pty/seqeuntial-pty.js';
+import { VerbosityLevel } from './utils/verbosity-level.js';
+
+VerbosityLevel.set(1);
+const $ = new SequentialPty();
+await $.spawn('sudo ls', { interactive: true });

package/src/utils/file-utils.test.ts

@@ -0,0 +1,9 @@
+import { describe, it } from 'vitest';
+import { FileUtils } from './file-utils.js';
+import path from 'node:path';
+
+describe('File utils tests', { timeout: 100_000_000 }, () => {
+  it('Can download a file', async () => {
+    // await FileUtils.downloadFile('https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.dmg?_gl=1*1huoi7o*_gcl_aw*R0NMLjE3NjU3NDAwMTcuQ2p3S0NBaUEzZm5KQmhBZ0Vpd0F5cW1ZNVhLVENlbHJOcTk2YXdjZVlfMS1wdE91MXc0WDk2bFJkVDM3QURhUFNJMUtwNVVSVUhxWTJob0NuZ0FRQXZEX0J3RQ..*_gcl_au*MjA0MDQ0MjE2My4xNzYzNjQzNzMz*FPAU*MjA0MDQ0MjE2My4xNzYzNjQzNzMz*_ga*MTYxMDg4MTkzMi4xNzYzNjQzNzMz*_ga_9J976DJZ68*czE3NjYzNjI5ODAkbzEyJGcxJHQxNzY2MzYzMDQwJGo2MCRsMCRoMA..', path.join(process.cwd(), 'google.html'));
+  })
+})