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

package/dist/messages/handlers.js

@@ -1,6 +1,7 @@
-import { ApplyRequestDataSchema, EmptyResponseDataSchema, GetResourceInfoRequestDataSchema, GetResourceInfoResponseDataSchema, ImportRequestDataSchema, ImportResponseDataSchema, InitializeRequestDataSchema, InitializeResponseDataSchema, IpcMessageSchema, IpcMessageV2Schema, MatchRequestDataSchema, MatchResponseDataSchema, MessageStatus, PlanRequestDataSchema, PlanResponseDataSchema, ResourceSchema, SetVerbosityRequestDataSchema, ValidateRequestDataSchema, ValidateResponseDataSchema } from '@codifycli/schemas';
+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 { Ajv } from 'ajv';
 import addFormats from 'ajv-formats';
+import { ApplyValidationError } from '../common/errors.js';
 import { SudoError } from '../errors.js';
 const SupportedRequests = {
     'initialize': {
@@ -122,12 +123,27 @@ export class MessageHandler {
                 status: MessageStatus.ERROR,
             });
         }
+        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,
+            });
+        }
         const isDebug = process.env.DEBUG?.includes('*') ?? false;
         process.send?.({
             cmd,
             // @ts-expect-error TS2239
             requestId: message.requestId || undefined,
-            data: isDebug ? e.stack : e.message,
+            data: {
+                errorCode: ErrorCode.UNKNOWN,
+                message: isDebug ? (e.stack ?? e.message) : e.message,
+            },
             status: MessageStatus.ERROR,
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codifycli/plugin-core",
-  "version": "1.1.0-beta17",
+  "version": "1.1.0-beta18",
   "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-beta6",
+    "@codifycli/schemas": "^1.1.0-beta7",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
     "ajv": "^8.18.0",
     "ajv-formats": "^2.1.1",

package/src/messages/handlers.ts

@@ -1,6 +1,7 @@
 import {
   ApplyRequestDataSchema,
   EmptyResponseDataSchema,
+  ErrorCode,
   GetResourceInfoRequestDataSchema,
   GetResourceInfoResponseDataSchema,
   ImportRequestDataSchema,
@@ -24,6 +25,7 @@ import {
 import { Ajv, SchemaObject, ValidateFunction } from 'ajv';
 import addFormats from 'ajv-formats';
 
+import { ApplyValidationError } from '../common/errors.js';
 import { SudoError } from '../errors.js';
 import { Plugin } from '../plugin/plugin.js';
 
@@ -168,13 +170,29 @@ export class MessageHandler {
       })
     }
 
+    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,
+      });
+    }
+
     const isDebug = process.env.DEBUG?.includes('*') ?? false;
 
     process.send?.({
       cmd,
       // @ts-expect-error TS2239
       requestId: message.requestId || undefined,
-      data: isDebug ? e.stack : e.message,
+      data: {
+        errorCode: ErrorCode.UNKNOWN,
+        message: isDebug ? (e.stack ?? e.message) : e.message,
+      },
       status: MessageStatus.ERROR,
     })
   }