@codifycli/plugin-core 1.1.0-beta18 → 1.1.0-beta20

package/dist/messages/handlers.js

@@ -1,4 +1,4 @@
-import { ApplyRequestDataSchema, EmptyResponseDataSchema, ErrorCode, GetResourceInfoRequestDataSchema, GetResourceInfoResponseDataSchema, ImportRequestDataSchema, ImportResponseDataSchema, InitializeRequestDataSchema, InitializeResponseDataSchema, IpcMessageSchema, IpcMessageV2Schema, MatchRequestDataSchema, MatchResponseDataSchema, MessageStatus, PlanRequestDataSchema, PlanResponseDataSchema, ResourceSchema, SetVerbosityRequestDataSchema, ValidateRequestDataSchema, ValidateResponseDataSchema } from '@codifycli/schemas';
+import { ApplyRequestDataSchema, EmptyResponseDataSchema, GetResourceInfoRequestDataSchema, GetResourceInfoResponseDataSchema, ImportRequestDataSchema, ImportResponseDataSchema, InitializeRequestDataSchema, InitializeResponseDataSchema, IpcMessageSchema, IpcMessageV2Schema, MatchRequestDataSchema, MatchResponseDataSchema, MessageStatus, PlanRequestDataSchema, PlanResponseDataSchema, ResourceSchema, SetVerbosityRequestDataSchema, ValidateRequestDataSchema, ValidateResponseDataSchema } from '@codifycli/schemas';
 import { Ajv } from 'ajv';
 import addFormats from 'ajv-formats';
 import { ApplyValidationError } from '../common/errors.js';
@@ -114,37 +114,30 @@ export class MessageHandler {
         }
         // @ts-expect-error TS2239
         const cmd = message.cmd + '_Response';
+        // @ts-expect-error TS2239
+        const requestId = message.requestId || undefined;
+        let errorPayload;
         if (e instanceof SudoError) {
-            return process.send?.({
-                cmd,
-                // @ts-expect-error TS2239
-                requestId: message.requestId || undefined,
-                data: `Plugin: '${this.plugin.name}'. Forbidden usage of sudo for command '${e.command}'. Please contact the plugin developer to fix this.`,
-                status: MessageStatus.ERROR,
-            });
+            errorPayload = {
+                errorType: 'sudo_error',
+                message: `Plugin: '${this.plugin.name}'. Forbidden usage of sudo for command '${e.command}'. Please contact the plugin developer to fix this.`,
+                data: { command: e.command, pluginName: this.plugin.name },
+            };
         }
-        if (e instanceof ApplyValidationError) {
-            return process.send?.({
-                cmd,
-                // @ts-expect-error TS2239
-                requestId: message.requestId || undefined,
-                data: {
-                    errorCode: ErrorCode.APPLY_VALIDATION,
-                    plan: e.plan.toResponse(),
-                },
-                status: MessageStatus.ERROR,
-            });
+        else if (e instanceof ApplyValidationError) {
+            errorPayload = {
+                errorType: 'apply_validation',
+                message: e.message,
+                data: { plan: e.plan.toResponse() },
+            };
         }
-        const isDebug = process.env.DEBUG?.includes('*') ?? false;
-        process.send?.({
-            cmd,
-            // @ts-expect-error TS2239
-            requestId: message.requestId || undefined,
-            data: {
-                errorCode: ErrorCode.UNKNOWN,
+        else {
+            const isDebug = process.env.DEBUG?.includes('*') ?? false;
+            errorPayload = {
+                errorType: 'unknown',
                 message: isDebug ? (e.stack ?? e.message) : e.message,
-            },
-            status: MessageStatus.ERROR,
-        });
+            };
+        }
+        process.send?.({ cmd, requestId, data: errorPayload, status: MessageStatus.ERROR });
     }
 }

package/dist/plugin/plugin.js

@@ -177,7 +177,7 @@ export class Plugin {
             return result;
         });
         if (validationPlan.requiresChanges()) {
-            throw new ApplyValidationError(plan);
+            throw new ApplyValidationError(validationPlan);
         }
     }
     async setVerbosityLevel(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codifycli/plugin-core",
-  "version": "1.1.0-beta18",
+  "version": "1.1.0-beta20",
   "description": "TypeScript library for building Codify plugins to manage system resources (applications, CLI tools, settings) through infrastructure-as-code",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -35,7 +35,7 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@codifycli/schemas": "^1.1.0-beta7",
+    "@codifycli/schemas": "^1.1.0-beta8",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
     "ajv": "^8.18.0",
     "ajv-formats": "^2.1.1",

package/src/messages/handlers.ts

@@ -1,7 +1,6 @@
 import {
   ApplyRequestDataSchema,
   EmptyResponseDataSchema,
-  ErrorCode,
   GetResourceInfoRequestDataSchema,
   GetResourceInfoResponseDataSchema,
   ImportRequestDataSchema,
@@ -15,6 +14,7 @@ import {
   MatchRequestDataSchema,
   MatchResponseDataSchema,
   MessageStatus,
+  PluginErrorData,
   PlanRequestDataSchema,
   PlanResponseDataSchema,
   ResourceSchema,
@@ -159,41 +159,31 @@ export class MessageHandler {
 
     // @ts-expect-error TS2239
     const cmd = message.cmd + '_Response';
+    // @ts-expect-error TS2239
+    const requestId = message.requestId || undefined;
 
-    if (e instanceof SudoError) {
-      return process.send?.({
-        cmd,
-        // @ts-expect-error TS2239
-        requestId: message.requestId || undefined,
-        data: `Plugin: '${this.plugin.name}'. Forbidden usage of sudo for command '${e.command}'. Please contact the plugin developer to fix this.`,
-        status: MessageStatus.ERROR,
-      })
-    }
+    let errorPayload: PluginErrorData;
 
-    if (e instanceof ApplyValidationError) {
-      return process.send?.({
-        cmd,
-        // @ts-expect-error TS2239
-        requestId: message.requestId || undefined,
-        data: {
-          errorCode: ErrorCode.APPLY_VALIDATION,
-          plan: e.plan.toResponse(),
-        },
-        status: MessageStatus.ERROR,
-      });
+    if (e instanceof SudoError) {
+      errorPayload = {
+        errorType: 'sudo_error',
+        message: `Plugin: '${this.plugin.name}'. Forbidden usage of sudo for command '${e.command}'. Please contact the plugin developer to fix this.`,
+        data: { command: e.command, pluginName: this.plugin.name },
+      };
+    } else if (e instanceof ApplyValidationError) {
+      errorPayload = {
+        errorType: 'apply_validation',
+        message: e.message,
+        data: { plan: e.plan.toResponse() },
+      };
+    } else {
+      const isDebug = process.env.DEBUG?.includes('*') ?? false;
+      errorPayload = {
+        errorType: 'unknown',
+        message: isDebug ? (e.stack ?? e.message) : e.message,
+      };
     }
 
-    const isDebug = process.env.DEBUG?.includes('*') ?? false;
-
-    process.send?.({
-      cmd,
-      // @ts-expect-error TS2239
-      requestId: message.requestId || undefined,
-      data: {
-        errorCode: ErrorCode.UNKNOWN,
-        message: isDebug ? (e.stack ?? e.message) : e.message,
-      },
-      status: MessageStatus.ERROR,
-    })
+    process.send?.({ cmd, requestId, data: errorPayload, status: MessageStatus.ERROR });
   }
 }

package/src/plugin/plugin.ts

@@ -268,7 +268,7 @@ export class Plugin {
     })
 
     if (validationPlan.requiresChanges()) {
-      throw new ApplyValidationError(plan);
+      throw new ApplyValidationError(validationPlan);
     }
   }