@extrahorizon/exh-cli 1.12.0-dev-145-36d98c7 → 1.12.0-dev-147-8845ed1

package/build/config-json-schemas/Dispatchers.json

@@ -0,0 +1,120 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "allOf": [
+        {
+            "oneOf": [
+                { "type": "array" },
+                { "type": "object" }
+            ]
+        },
+        {
+            "if": { "type": "object" },
+            "then": { "$ref": "#/definitions/Wrapper" }
+        },
+        {
+            "if": { "type": "array" },
+            "then": {
+                "type": "array",
+                "items": { "$ref": "#/definitions/Dispatcher" }
+            }
+        }
+    ],
+    "definitions": {
+        "Wrapper": {
+            "type": "object",
+            "required": ["dispatchers"],
+            "properties": {
+                "dispatchers": {
+                    "type": "array",
+                    "items": { "$ref": "#/definitions/Dispatcher" }
+                },
+                "$schema": { "type": "string" }
+            }
+        },
+        "Dispatcher": {
+            "type": "object",
+            "required": ["eventType", "name", "actions"],
+            "properties": {
+                "eventType": { "type": "string" },
+                "name": { "type": "string" },
+                "description": { "type": "string" },
+                "actions": {
+                    "type": "array",
+                    "minItems": 1,
+                    "items": { "$ref": "#/definitions/Action" }
+                },
+                "tags": {
+                    "type": "array",
+                    "items": { "type": "string" }
+                }
+            }
+        },
+        "Action": {
+            "type": "object",
+            "required": ["type"],
+            "properties": {
+                "type": {
+                    "type": "string",
+                    "enum": ["mail", "task"]
+                }
+            },
+            "allOf": [
+                {
+                    "if": { "properties": { "type": { "const": "mail" } } },
+                    "then": { "$ref": "#/definitions/MailAction" }
+                },
+                {
+                    "if": { "properties": { "type": { "const": "task" } } },
+                    "then": { "$ref": "#/definitions/TaskAction" }
+                }
+            ]
+        },
+        "MailAction": {
+            "type": "object",
+            "required": ["type", "name", "recipients", "templateId"],
+            "properties": {
+                "type": { "const": "mail" },
+                "name": { "type": "string" },
+                "description": { "type": "string" },
+                "recipients": {
+                    "type": "object",
+                    "required": ["to"],
+                    "properties": {
+                        "to": {
+                            "type": "array",
+                            "items": { "type": "string" }
+                        },
+                        "cc": {
+                            "type": "array",
+                            "items": { "type": "string" }
+                        },
+                        "bcc": {
+                            "type": "array",
+                            "items": { "type": "string" }
+                        }
+                    }
+                },
+                "templateId": { "type": "string" }
+            }
+        },
+        "TaskAction": {
+            "type": "object",
+            "required": ["type", "name", "functionName"],
+            "properties": {
+                "type": { "const": "task" },
+                "name": { "type": "string" },
+                "description": { "type": "string" },
+                "functionName": { "type": "string" },
+                "data": {
+                    "type": "object",
+                    "additionalProperties": true
+                },
+                "tags": {
+                    "type": "array",
+                    "items": { "type": "string" }
+                },
+                "startTimestamp": { "type": "string" }
+            }
+        }
+    }
+}

package/build/helpers/util.d.ts

@@ -3,4 +3,5 @@ export declare function epilogue(y: yargs.Argv): yargs.Argv;
 export declare function asyncExec(cmd: string): Promise<string>;
 export declare function loadAndAssertCredentials(): void;
 export declare function getSwaggerDocumentationUrl(subPath: string): string;
+export declare function ajvValidate<T>(schema: any, data: any): asserts data is T;
 export declare function getAjvErrorStrings(errors: any[]): string[];

package/build/helpers/util.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAjvErrorStrings = exports.getSwaggerDocumentationUrl = exports.loadAndAssertCredentials = exports.asyncExec = exports.epilogue = void 0;
+exports.getAjvErrorStrings = exports.ajvValidate = exports.getSwaggerDocumentationUrl = exports.loadAndAssertCredentials = exports.asyncExec = exports.epilogue = void 0;
 const child_process_1 = require("child_process");
 const fs = require("fs");
 const path = require("path");
+const ajv_1 = require("ajv");
 const chalk = require("chalk");
 const constants_1 = require("../constants");
 const error_1 = require("./error");
@@ -80,6 +81,15 @@ function getSwaggerDocumentationUrl(subPath) {
     throw new Error(`Unknown CLI version format: ${packageVersion}`);
 }
 exports.getSwaggerDocumentationUrl = getSwaggerDocumentationUrl;
+function ajvValidate(schema, data) {
+    const validate = new ajv_1.default().compile(schema);
+    const valid = validate(data);
+    if (!valid) {
+        const errors = getAjvErrorStrings(validate.errors);
+        throw new Error(errors[0] || 'Unknown config validation error');
+    }
+}
+exports.ajvValidate = ajvValidate;
 function getAjvErrorStrings(errors) {
     return errors.map(error => {
         let message = '';

package/build/services/dispatchers.js

@@ -4,14 +4,15 @@ exports.sync = exports.cliManagedTag = void 0;
 const promises_1 = require("fs/promises");
 const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
 const chalk_1 = require("chalk");
+const dispatcherSchema = require("../config-json-schemas/Dispatchers.json");
+const util_1 = require("../helpers/util");
 const dispatcherRepository = require("../repositories/dispatchers");
 exports.cliManagedTag = 'EXH_CLI_MANAGED';
 async function sync(path, clean = false) {
     console.log((0, chalk_1.yellow)(`Synchronizing Dispatchers from ${path}`));
-    const localDispatchers = await extractDispatchersFromFile(path);
+    const localDispatchers = await readAndValidateDispatcherConfig(path);
     const rql = (0, javascript_sdk_1.rqlBuilder)().eq('tags', exports.cliManagedTag).build();
     const exhDispatchers = await dispatcherRepository.findAll(rql);
-    validateDispatchers(localDispatchers);
     console.group((0, chalk_1.blue)('Synchronizing Dispatchers:'));
     for (const localDispatcher of localDispatchers) {
         const exhDispatcher = exhDispatchers.find(({ name }) => name === localDispatcher.name);
@@ -86,47 +87,18 @@ async function synchronizeActions(localDispatcher, exhDispatcher) {
         }
     }
 }
-async function extractDispatchersFromFile(path) {
+async function readAndValidateDispatcherConfig(path) {
+    let config;
     try {
-        const data = await (0, promises_1.readFile)(path);
-        return JSON.parse(data.toString());
+        const buffer = await (0, promises_1.readFile)(path);
+        config = JSON.parse(buffer.toString());
     }
     catch (error) {
         throw new Error(`Failed to read Dispatchers from ${path}: ${error.message}`);
     }
-}
-function validateDispatchers(dispatchers) {
-    let hasErrors = false;
-    console.group((0, chalk_1.blue)('Validating Dispatchers:'));
-    dispatchers.forEach((dispatcher, index) => {
-        const displayName = dispatcher.name ? `[${index}]: ${dispatcher.name}` : `[${index}]: NO_NAME`;
-        const errors = [];
-        if (!dispatcher.name) {
-            errors.push('No name');
-        }
-        const hasActions = Array.isArray(dispatcher.actions) && dispatcher.actions.length > 0;
-        if (!hasActions) {
-            errors.push('The actions value need to be an array with at least one object in it');
-        }
-        else {
-            dispatcher.actions.forEach((action, actionIndex) => {
-                if (!action.name) {
-                    errors.push(`Action [${actionIndex}] does not have a name`);
-                }
-            });
-        }
-        if (errors.length === 0) {
-            console.log((0, chalk_1.green)(`✓ Valid Dispatcher: ${displayName}`));
-        }
-        else {
-            hasErrors = true;
-            console.group((0, chalk_1.red)(`𝖷 Invalid Dispatcher: ${displayName}`));
-            errors.forEach(error => console.log((0, chalk_1.red)(`- ${error}`)));
-            console.groupEnd();
-        }
-    });
-    console.groupEnd();
-    if (hasErrors) {
-        throw new Error('\nThe dispatchers file is invalid');
+    (0, util_1.ajvValidate)(dispatcherSchema, config);
+    if (Array.isArray(config)) {
+        return config;
     }
+    return config.dispatchers;
 }

package/build/services/tasks/taskConfig.d.ts

@@ -24,6 +24,6 @@ export interface TaskConfig {
     };
 }
 export declare function assertExecutionPermission(mode: string): asserts mode is permissionModes | undefined;
-export declare function validateConfig(config: TaskConfig): Promise<boolean>;
+export declare function validateConfig(config: any): Promise<boolean>;
 export declare function loadSingleConfigFile(path: string): Promise<TaskConfig>;
 export declare function getValidatedConfigIterator({ path, name, code, entryPoint, runtime, description, timeLimit, memoryLimit, executionPermission, env, defaultPriority }: any): AsyncGenerator<TaskConfig>;

package/build/services/tasks/taskConfig.js

@@ -4,7 +4,6 @@ exports.getValidatedConfigIterator = exports.loadSingleConfigFile = exports.vali
 const assert_1 = require("assert");
 const fs = require("fs/promises");
 const ospath = require("path");
-const ajv_1 = require("ajv");
 const taskConfigSchema = require("../../config-json-schemas/TaskConfig.json");
 const util_1 = require("../../helpers/util");
 var permissionModes;
@@ -52,12 +51,7 @@ function replaceConfigVariables(config) {
     return result;
 }
 async function validateConfig(config) {
-    const validate = new ajv_1.default().compile(taskConfigSchema);
-    const valid = validate(config);
-    if (!valid) {
-        const errors = (0, util_1.getAjvErrorStrings)(validate.errors);
-        throw new Error(errors[0] || 'Unknown config validation error');
-    }
+    (0, util_1.ajvValidate)(taskConfigSchema, config);
     try {
         await fs.access(config.path);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.12.0-dev-145-36d98c7",
+  "version": "1.12.0-dev-147-8845ed1",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",