codify-plugin-lib 1.0.120 → 1.0.122

package/dist/plugin/plugin.js

@@ -101,7 +101,7 @@ export class Plugin {
         // Validate using desired/desired. If the apply was successful, no changes should be reported back.
         // 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.desiredConfig ?? plan.currentConfig, plan.desiredConfig, plan.statefulMode);
+            const result = await resource.plan(plan.desiredConfig, plan.desiredConfig ?? plan.currentConfig, plan.statefulMode);
             await getPty().kill();
             return result;
         });

package/dist/pty/background-pty.js

@@ -1,8 +1,8 @@
+import pty from '@homebridge/node-pty-prebuilt-multiarch';
 import { nanoid } from 'nanoid';
 import * as cp from 'node:child_process';
 import { EventEmitter } from 'node:events';
 import * as fs from 'node:fs/promises';
-import pty from 'node-pty';
 import stripAnsi from 'strip-ansi';
 import { debugLog } from '../utils/debug.js';
 import { SpawnError } from './index.js';
@@ -63,9 +63,6 @@ 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
@@ -84,8 +81,6 @@ export class BackgroundPty {
                 this.basePty.write(`${command}\r`);
             }));
         }).finally(async () => {
-            // console.log('finally');
-            // await fileHandle?.close();
             await fs.rm(`/tmp/${cid}`);
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.120",
+  "version": "1.0.122",
   "description": "Library plugin library",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -19,7 +19,7 @@
     "uuid": "^10.0.0",
     "lodash.isequal": "^4.5.0",
     "nanoid": "^5.0.9",
-    "node-pty": "^1.0.0",
+    "@homebridge/node-pty-prebuilt-multiarch": "^0.12.0-beta.5",
     "strip-ansi": "^7.1.0"
   },
   "devDependencies": {

package/src/plugin/plugin.ts

@@ -155,8 +155,8 @@ 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.desiredConfig ?? plan.currentConfig,
         plan.desiredConfig,
+        plan.desiredConfig ?? plan.currentConfig,
         plan.statefulMode
       );
 

package/src/pty/background-pty.ts

@@ -1,8 +1,8 @@
+import pty from '@homebridge/node-pty-prebuilt-multiarch';
 import { nanoid } from 'nanoid';
 import * as cp from 'node:child_process';
 import { EventEmitter } from 'node:events';
 import * as fs from 'node:fs/promises';
-import pty from 'node-pty';
 import stripAnsi from 'strip-ansi';
 
 import { debugLog } from '../utils/debug.js';
@@ -79,10 +79,6 @@ 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
@@ -105,8 +101,6 @@ export class BackgroundPty implements IPty {
 
       }));
     }).finally(async () => {
-      // console.log('finally');
-      // await fileHandle?.close();
       await fs.rm(`/tmp/${cid}`);
     })
   }