codify-plugin-lib 1.0.182-beta14 → 1.0.182-beta16

package/dist/plugin/plugin.d.ts

@@ -1,11 +1,13 @@
 import { ApplyRequestData, GetResourceInfoRequestData, GetResourceInfoResponseData, ImportRequestData, ImportResponseData, InitializeRequestData, InitializeResponseData, MatchRequestData, MatchResponseData, PlanRequestData, PlanResponseData, ResourceConfig, ResourceJson, ValidateRequestData, ValidateResponseData } from 'codify-schemas';
 import { Plan } from '../plan/plan.js';
+import { BackgroundPty } from '../pty/background-pty.js';
 import { Resource } from '../resource/resource.js';
 import { ResourceController } from '../resource/resource-controller.js';
 export declare class Plugin {
     name: string;
     resourceControllers: Map<string, ResourceController<ResourceConfig>>;
     planStorage: Map<string, Plan<any>>;
+    planPty: BackgroundPty;
     constructor(name: string, resourceControllers: Map<string, ResourceController<ResourceConfig>>);
     static create(name: string, resources: Resource<any>[]): Plugin;
     initialize(data: InitializeRequestData): Promise<InitializeResponseData>;

package/dist/plugin/plugin.js

@@ -10,6 +10,7 @@ export class Plugin {
     name;
     resourceControllers;
     planStorage;
+    planPty = new BackgroundPty();
     constructor(name, resourceControllers) {
         this.name = name;
         this.resourceControllers = resourceControllers;
@@ -101,13 +102,9 @@ export class Plugin {
         if (!this.resourceControllers.has(core.type)) {
             throw new Error(`Cannot get info for resource ${core.type}, resource doesn't exist`);
         }
-        const result = await ptyLocalStorage.run(new BackgroundPty(), async () => {
-            const result = await this.resourceControllers
-                .get(core.type)
-                ?.import(core, parameters, autoSearchAll);
-            await getPty().kill();
-            return result;
-        });
+        const result = await ptyLocalStorage.run(this.planPty, () => this.resourceControllers
+            .get(core.type)
+            ?.import(core, parameters, autoSearchAll));
         return {
             request: data,
             result: result ?? [],
@@ -151,11 +148,7 @@ export class Plugin {
         if (!this.resourceControllers.has(type)) {
             throw new Error(`Resource type not found: ${type}`);
         }
-        const plan = await ptyLocalStorage.run(new BackgroundPty(), async () => {
-            const result = await this.resourceControllers.get(type).plan(data.core, data.desired ?? null, data.state ?? null, data.isStateful);
-            await getPty().kill();
-            return result;
-        });
+        const plan = await ptyLocalStorage.run(this.planPty, async () => this.resourceControllers.get(type).plan(data.core, data.desired ?? null, data.state ?? null, data.isStateful));
         this.planStorage.set(plan.id, plan);
         return plan.toResponse();
     }
@@ -173,7 +166,9 @@ export class Plugin {
         // Default back desired back to current if it is not defined (for destroys only)
         const validationPlan = await ptyLocalStorage.run(new BackgroundPty(), async () => {
             const result = await resource.plan(plan.coreParameters, plan.desiredConfig, plan.desiredConfig ?? plan.currentConfig, plan.isStateful, 'validationPlan');
+            process.stdout.write(`Validation plan ${result}`);
             await getPty().kill();
+            process.stdout.write('Killed');
             return result;
         });
         if (validationPlan.requiresChanges()) {
@@ -181,7 +176,7 @@ export class Plugin {
         }
     }
     async kill() {
-        await getPty()?.kill();
+        await this.planPty.kill();
     }
     resolvePlan(data) {
         const { plan: planRequest, planId } = data;

package/dist/pty/background-pty.js

@@ -6,7 +6,6 @@ import * as fs from 'node:fs/promises';
 import stripAnsi from 'strip-ansi';
 import { debugLog } from '../utils/debug.js';
 import { Shell, Utils } from '../utils/index.js';
-import { VerbosityLevel } from '../utils/verbosity-level.js';
 import { SpawnError } from './index.js';
 import { PromiseQueue } from './promise-queue.js';
 EventEmitter.defaultMaxListeners = 1000;
@@ -51,7 +50,9 @@ export class BackgroundPty {
             let output = '';
             cat.stdout.on('data', (data) => {
                 output += data.toString();
+                process.stdout.write(data);
                 if (output.includes('%%%done%%%"')) {
+                    process.stdout.write('Done flag detected');
                     const truncOutput = output.replace('%%%done%%%"\n', '');
                     const [data, exit] = truncOutput.split('%%%');
                     // Clean up trailing \n newline if it exists
@@ -59,6 +60,9 @@ export class BackgroundPty {
                     if (strippedData.endsWith('\n')) {
                         strippedData = strippedData.slice(0, -1);
                     }
+                    process.stdout.write(`Resolved exit ${exit}`);
+                    process.stdout.write(`Raw data ${data}`);
+                    process.stdout.write(`Stripped data ${strippedData}`);
                     resolve({
                         status: Number.parseInt(exit ?? 1, 10) === 0 ? 'success' : 'error',
                         exitCode: Number.parseInt(exit ?? 1, 10),
@@ -67,9 +71,9 @@ export class BackgroundPty {
                 }
                 else {
                     // Print to stdout if the verbosity level is above 0
-                    if (VerbosityLevel.get() > 0) {
-                        process.stdout.write(data);
-                    }
+                    // if (VerbosityLevel.get() > 0) {
+                    //   process.stdout.write(data);
+                    // }
                 }
             });
             this.promiseQueue.run(async () => new Promise((resolve) => {

package/package.json

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

package/src/plugin/plugin.ts

@@ -29,6 +29,7 @@ import { VerbosityLevel } from '../utils/verbosity-level.js';
 
 export class Plugin {
   planStorage: Map<string, Plan<any>>;
+  planPty = new BackgroundPty();
 
   constructor(
     public name: string,
@@ -147,14 +148,11 @@ export class Plugin {
       throw new Error(`Cannot get info for resource ${core.type}, resource doesn't exist`);
     }
 
-    const result = await ptyLocalStorage.run(new BackgroundPty(), async () => {
-      const result = await this.resourceControllers
+    const result = await ptyLocalStorage.run(this.planPty, () =>
+      this.resourceControllers
         .get(core.type!)
         ?.import(core, parameters, autoSearchAll)
-
-      await getPty().kill()
-      return result;
-    })
+    )
 
     return {
       request: data,
@@ -213,17 +211,12 @@ export class Plugin {
       throw new Error(`Resource type not found: ${type}`);
     }
 
-    const plan = await ptyLocalStorage.run(new BackgroundPty(), async () => {
-      const result = await this.resourceControllers.get(type)!.plan(
-        data.core,
-        data.desired ?? null,
-        data.state ?? null,
-        data.isStateful
-      )
-
-      await getPty().kill();
-      return result;
-    })
+    const plan = await ptyLocalStorage.run(this.planPty, async () => this.resourceControllers.get(type)!.plan(
+      data.core,
+      data.desired ?? null,
+      data.state ?? null,
+      data.isStateful
+    ))
 
     this.planStorage.set(plan.id, plan);
 
@@ -255,7 +248,11 @@ export class Plugin {
         'validationPlan'
       );
 
+      process.stdout.write(`Validation plan ${result}`);
+
       await getPty().kill();
+
+      process.stdout.write('Killed')
       return result;
     })
 
@@ -265,7 +262,7 @@ export class Plugin {
   }
 
   async kill() {
-    await getPty()?.kill();
+    await this.planPty.kill();
   }
 
   private resolvePlan(data: ApplyRequestData): Plan<ResourceConfig> {

package/src/pty/background-pty.ts

@@ -10,6 +10,7 @@ import { Shell, Utils } from '../utils/index.js';
 import { VerbosityLevel } from '../utils/verbosity-level.js';
 import { IPty, SpawnError, SpawnOptions, SpawnResult } from './index.js';
 import { PromiseQueue } from './promise-queue.js';
+import { str } from 'ajv';
 
 EventEmitter.defaultMaxListeners = 1000;
 
@@ -64,7 +65,10 @@ export class BackgroundPty implements IPty {
       cat.stdout.on('data', (data) => {
         output += data.toString();
 
+        process.stdout.write(data);
+
         if (output.includes('%%%done%%%"')) {
+          process.stdout.write('Done flag detected')
           const truncOutput = output.replace('%%%done%%%"\n', '');
           const [data, exit] = truncOutput.split('%%%');
 
@@ -74,6 +78,10 @@ export class BackgroundPty implements IPty {
             strippedData = strippedData.slice(0, -1);
           }
 
+          process.stdout.write(`Resolved exit ${exit}`);
+          process.stdout.write(`Raw data ${data}`);
+          process.stdout.write(`Stripped data ${strippedData}`);
+
           resolve(<SpawnResult>{
             status: Number.parseInt(exit ?? 1, 10) === 0 ? 'success' : 'error',
             exitCode: Number.parseInt(exit ?? 1, 10),
@@ -81,9 +89,9 @@ export class BackgroundPty implements IPty {
           });
         } else {
           // Print to stdout if the verbosity level is above 0
-          if (VerbosityLevel.get() > 0) {
-            process.stdout.write(data);
-          }
+          // if (VerbosityLevel.get() > 0) {
+          //   process.stdout.write(data);
+          // }
         }
       })