codify-plugin-lib 1.0.182-beta13 → 1.0.182-beta14

package/dist/plugin/plugin.d.ts

@@ -1,13 +1,11 @@
 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,7 +10,6 @@ export class Plugin {
     name;
     resourceControllers;
     planStorage;
-    planPty = new BackgroundPty();
     constructor(name, resourceControllers) {
         this.name = name;
         this.resourceControllers = resourceControllers;
@@ -102,9 +101,13 @@ 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(this.planPty, () => this.resourceControllers
-            .get(core.type)
-            ?.import(core, parameters, autoSearchAll));
+        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;
+        });
         return {
             request: data,
             result: result ?? [],
@@ -148,7 +151,11 @@ export class Plugin {
         if (!this.resourceControllers.has(type)) {
             throw new Error(`Resource type not found: ${type}`);
         }
-        const plan = await ptyLocalStorage.run(this.planPty, async () => this.resourceControllers.get(type).plan(data.core, data.desired ?? null, data.state ?? null, data.isStateful));
+        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;
+        });
         this.planStorage.set(plan.id, plan);
         return plan.toResponse();
     }
@@ -174,7 +181,7 @@ export class Plugin {
         }
     }
     async kill() {
-        await this.planPty.kill();
+        await getPty()?.kill();
     }
     resolvePlan(data) {
         const { plan: planRequest, planId } = data;

package/dist/pty/background-pty.js

@@ -19,7 +19,7 @@ EventEmitter.defaultMaxListeners = 1000;
 export class BackgroundPty {
     historyIgnore = Utils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };
     basePty = pty.spawn(this.getDefaultShell(), ['-i'], {
-        env: { ...process.env },
+        env: { ...process.env, ...this.historyIgnore },
         name: nanoid(6),
         handleFlowControl: true
     });

package/package.json

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

package/src/plugin/plugin.ts

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

package/src/pty/background-pty.ts

@@ -22,7 +22,7 @@ EventEmitter.defaultMaxListeners = 1000;
 export class BackgroundPty implements IPty {
   private historyIgnore = Utils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };
   private basePty = pty.spawn(this.getDefaultShell(), ['-i'], {
-    env: { ...process.env },
+    env: { ...process.env, ...this.historyIgnore },
     name: nanoid(6),
     handleFlowControl: true
   });