@extrahorizon/exh-cli 1.12.0-dev-141-b72e89f → 1.12.0-dev-142-82cc6de

package/build/commands/tasks/createrepo.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
-const promises_1 = require("fs/promises");
-const chalk = require("chalk");
 const util_1 = require("../../helpers/util");
+const tasksService = require("../../services/tasks");
 exports.command = 'create-repo <name>';
 exports.desc = 'Create a new task repository';
-const builder = (yargs) => (0, util_1.epilogue)(yargs).positional('name', {
+const builder = (yargs) => (0, util_1.epilogue)(yargs)
+    .positional('name', {
     demandOption: true,
     description: 'The name of the new repo/task',
     type: 'string',
-}).options({
+})
+    .options({
     repo: {
         description: 'repository template to clone',
         type: 'string',
@@ -23,49 +24,7 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs).positional('name', {
     },
 });
 exports.builder = builder;
-async function changePackageFile(name) {
-    try {
-        const pkg = JSON.parse((await (0, promises_1.readFile)(`${name}/package.json`)).toString());
-        pkg.name = name;
-        await (0, promises_1.writeFile)(`${name}/package.json`, JSON.stringify(pkg, null, 2));
-    }
-    catch (err) {
-        console.log('WARN: package.json not found. (possibly not a javascript repository');
-    }
-    try {
-        const taskConfig = JSON.parse((await (0, promises_1.readFile)(`${name}/task-config.json`)).toString());
-        taskConfig.$schema = (0, util_1.getSwaggerDocumentationUrl)('config-json-schemas/TaskConfig.json');
-        taskConfig.name = name;
-        taskConfig.description = `${name} task`;
-        await (0, promises_1.writeFile)(`${name}/task-config.json`, JSON.stringify(taskConfig, null, 2));
-    }
-    catch (err) { }
-}
 const handler = async ({ name, repo, git }) => {
-    try {
-        await (0, util_1.asyncExec)('git --version');
-    }
-    catch (err) {
-        console.log(chalk.red('Git is not installed. Please install git first.'));
-    }
-    console.log(`Creating new repo ${chalk.green(name)}...`);
-    try {
-        await (0, util_1.asyncExec)(`git clone ${repo} ${name}`);
-        try {
-            await changePackageFile(name);
-        }
-        catch (err) { }
-        await (0, util_1.asyncExec)(`cd ${name} && rm -rf .git`);
-        if (git) {
-            console.log('Initializing git');
-            await (0, util_1.asyncExec)(`cd ${name} && git init . && git add . && git commit -m "First commit"`);
-        }
-        console.log('Done! 🎉');
-    }
-    catch (err) {
-        await (0, util_1.asyncExec)(`rm -rf ${name}`);
-        console.log(chalk.red('Failed to create repo'));
-        console.log(err);
-    }
+    await tasksService.createRepo({ name, repo, git });
 };
 exports.handler = handler;

package/build/commands/tasks/delete.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
-const chalk = require("chalk");
 const util_1 = require("../../helpers/util");
-const functionRepository = require("../../repositories/functions");
+const tasksService = require("../../services/tasks");
 exports.command = 'delete';
 exports.desc = 'Delete a task';
 const builder = (yargs) => (0, util_1.epilogue)(yargs).option('name', {
@@ -13,17 +12,6 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs).option('name', {
 });
 exports.builder = builder;
 const handler = async ({ name }) => {
-    try {
-        const response = await functionRepository.remove(name);
-        if (response?.affectedRecords) {
-            console.log(chalk.green('Successfully deleted task', name));
-        }
-        else {
-            console.log(chalk.red('Failed to delete task', name));
-        }
-    }
-    catch (err) {
-        console.log(chalk.red('Failed to delete task:', err.message));
-    }
+    await tasksService.remove(name);
 };
 exports.handler = handler;

package/build/commands/tasks/list.js

@@ -2,32 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const util_1 = require("../../helpers/util");
-const functionRepository = require("../../repositories/functions");
+const taskService = require("../../services/tasks");
 exports.command = 'list';
 exports.desc = 'List all tasks';
 const builder = (yargs) => (0, util_1.epilogue)(yargs);
 exports.builder = builder;
 const handler = async function list({ isTTY }) {
-    let functions;
-    try {
-        functions = await functionRepository.find();
-    }
-    catch (err) {
-        console.log(err);
-        return;
-    }
-    if (functions.length < 1) {
-        return;
-    }
-    if (isTTY) {
-        console.table(functions.map((c) => ({
-            Name: c.name,
-            Description: c.description || '<none>',
-            'Last updated': c.updateTimestamp.toISOString(),
-        })));
-    }
-    else {
-        functions.forEach((f) => (console.log(f.name)));
-    }
+    await taskService.list(isTTY);
 };
 exports.handler = handler;

package/build/commands/tasks/sync.js

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
-const fs = require("fs/promises");
-const chalk = require("chalk");
 const constants_1 = require("../../constants");
 const util_1 = require("../../helpers/util");
-const functionRepository = require("../../repositories/functions");
-const taskConfig_1 = require("./taskConfig");
-const util_2 = require("./util");
+const tasksService = require("../../services/tasks");
+const taskConfig_1 = require("../../services/tasks/taskConfig");
 exports.command = 'sync';
 exports.desc = 'Sync a task. Will create the task first if it doesn\'t exist yet';
-const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
+const builder = (yargs) => (0, util_1.epilogue)(yargs)
+    .options({
     path: {
         demandOption: false,
         describe: `Path of the configuration json file containing task parameters. If a directory is given instead, all sub-directories will be searched for a task-config.json file & synced. 
-    If this option is not used, each parameter (name, code, entryPoint, runtime, ...) will need to be supplied separately`,
+      If this option is not used, each parameter (name, code, entryPoint, runtime, ...) will need to be supplied separately`,
         type: 'string',
     },
     name: {
@@ -72,78 +70,6 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
 });
 exports.builder = builder;
 const handler = async ({ ...cmdLineParams }) => {
-    for await (const config of (0, taskConfig_1.getValidatedConfigIterator)(cmdLineParams)) {
-        console.log('Syncing task', config.name, '...');
-        await syncSingleTask(config);
-    }
+    await tasksService.sync(cmdLineParams);
 };
 exports.handler = handler;
-async function syncSingleTask(config) {
-    const uploadFilePath = await (0, util_2.zipFileFromDirectory)(config.path);
-    const file = await fs.readFile(uploadFilePath);
-    const allFunctions = await functionRepository.find();
-    const myFunction = allFunctions.find((f) => f.name === config.name);
-    const request = {
-        name: config.name,
-        description: config.description || 'none',
-        entryPoint: config.entryPoint,
-        code: file.toString('base64'),
-        runtime: config.runtime,
-    };
-    if (config.executionPermission || config.defaultPriority) {
-        request.executionOptions = {};
-    }
-    if (config.defaultPriority) {
-        request.executionOptions.defaultPriority = config.defaultPriority;
-    }
-    if (config.executionPermission) {
-        request.executionOptions.permissionMode = config.executionPermission;
-    }
-    if (config.timeLimit) {
-        request.timeLimit = config.timeLimit;
-    }
-    if (config.memoryLimit) {
-        request.memoryLimit = config.memoryLimit;
-    }
-    if (config.retryPolicy) {
-        request.retryPolicy = config.retryPolicy;
-    }
-    if (config.executionCredentials) {
-        const credentials = await (0, util_2.syncFunctionUser)({
-            taskName: config.name,
-            targetEmail: config.executionCredentials.email,
-            targetPermissions: config.executionCredentials.permissions,
-        });
-        config.environment = {
-            ...config.environment,
-            API_HOST: process.env.API_HOST,
-            API_OAUTH_CONSUMER_KEY: process.env.API_OAUTH_CONSUMER_KEY,
-            API_OAUTH_CONSUMER_SECRET: process.env.API_OAUTH_CONSUMER_SECRET,
-            API_OAUTH_TOKEN: credentials.token,
-            API_OAUTH_TOKEN_SECRET: credentials.tokenSecret,
-        };
-    }
-    if (config.environment) {
-        const environmentVariables = {};
-        for (const [key, value] of Object.entries(config.environment)) {
-            environmentVariables[key] = { value };
-        }
-        request.environmentVariables = environmentVariables;
-    }
-    if (myFunction === undefined) {
-        await functionRepository.create(request);
-        console.log(chalk.green('Successfully created task', config.name));
-    }
-    else {
-        const existingFunction = await functionRepository.findByName(myFunction.name);
-        if (request.runtime === existingFunction.runtime) {
-            delete request.runtime;
-        }
-        const updateResponse = await functionRepository.update(request);
-        if (!updateResponse?.affectedRecords) {
-            throw new Error(`Failed to update task ${request.name}`);
-        }
-        console.log(chalk.green('Successfully updated task', config.name));
-    }
-    await fs.unlink(uploadFilePath);
-}

package/build/repositories/functions.d.ts

@@ -1,4 +1,4 @@
-import { permissionModes } from '../commands/tasks/taskConfig';
+import { permissionModes } from '../services/tasks/taskConfig';
 export interface FunctionCreation {
     name: string;
     description: string;

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

@@ -0,0 +1,5 @@
+export declare function createRepo({ name, repo, git }: {
+    name: any;
+    repo: any;
+    git: any;
+}): Promise<void>;

package/build/services/tasks/createRepo.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRepo = void 0;
+const promises_1 = require("fs/promises");
+const chalk = require("chalk");
+const util_1 = require("../../helpers/util");
+async function createRepo({ name, repo, git }) {
+    try {
+        await (0, util_1.asyncExec)('git --version');
+    }
+    catch (err) {
+        console.log(chalk.red('Git is not installed. Please install git first.'));
+    }
+    console.log(`Creating new repo ${chalk.green(name)}...`);
+    try {
+        await (0, util_1.asyncExec)(`git clone ${repo} ${name}`);
+        try {
+            await changePackageFile(name);
+        }
+        catch (err) { }
+        await (0, util_1.asyncExec)(`cd ${name} && rm -rf .git`);
+        if (git) {
+            console.log('Initializing git');
+            await (0, util_1.asyncExec)(`cd ${name} && git init . && git add . && git commit -m "First commit"`);
+        }
+        console.log('Done! 🎉');
+    }
+    catch (err) {
+        await (0, util_1.asyncExec)(`rm -rf ${name}`);
+        console.log(chalk.red('Failed to create repo'));
+        console.log(err);
+    }
+}
+exports.createRepo = createRepo;
+async function changePackageFile(name) {
+    try {
+        const pkg = JSON.parse((await (0, promises_1.readFile)(`${name}/package.json`)).toString());
+        pkg.name = name;
+        await (0, promises_1.writeFile)(`${name}/package.json`, JSON.stringify(pkg, null, 2));
+    }
+    catch (err) {
+        console.log('WARN: package.json not found. (possibly not a javascript repository');
+    }
+    try {
+        const taskConfig = JSON.parse((await (0, promises_1.readFile)(`${name}/task-config.json`)).toString());
+        taskConfig.$schema = (0, util_1.getSwaggerDocumentationUrl)('config-json-schemas/TaskConfig.json');
+        taskConfig.name = name;
+        taskConfig.description = `${name} task`;
+        await (0, promises_1.writeFile)(`${name}/task-config.json`, JSON.stringify(taskConfig, null, 2));
+    }
+    catch (err) { }
+}

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

@@ -0,0 +1,5 @@
+export { sync } from './sync';
+export { createRepo } from './createRepo';
+export { assertExecutionPermission } from './taskConfig';
+export declare function list(isTTY: boolean): Promise<void>;
+export declare function remove(name: string): Promise<void>;

package/build/services/tasks/index.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.remove = exports.list = exports.assertExecutionPermission = exports.createRepo = exports.sync = void 0;
+const chalk = require("chalk");
+const functionRepository = require("../../repositories/functions");
+var sync_1 = require("./sync");
+Object.defineProperty(exports, "sync", { enumerable: true, get: function () { return sync_1.sync; } });
+var createRepo_1 = require("./createRepo");
+Object.defineProperty(exports, "createRepo", { enumerable: true, get: function () { return createRepo_1.createRepo; } });
+var taskConfig_1 = require("./taskConfig");
+Object.defineProperty(exports, "assertExecutionPermission", { enumerable: true, get: function () { return taskConfig_1.assertExecutionPermission; } });
+async function list(isTTY) {
+    let functions;
+    try {
+        functions = await functionRepository.find();
+    }
+    catch (err) {
+        console.log(err);
+        return;
+    }
+    if (functions.length < 1) {
+        return;
+    }
+    if (isTTY) {
+        console.table(functions.map((c) => ({
+            Name: c.name,
+            Description: c.description || '<none>',
+            'Last updated': c.updateTimestamp.toISOString(),
+        })));
+    }
+    else {
+        functions.forEach((f) => (console.log(f.name)));
+    }
+}
+exports.list = list;
+async function remove(name) {
+    try {
+        const response = await functionRepository.remove(name);
+        if (response?.affectedRecords) {
+            console.log(chalk.green('Successfully deleted task', name));
+        }
+        else {
+            console.log(chalk.red('Failed to delete task', name));
+        }
+    }
+    catch (err) {
+        console.log(chalk.red('Failed to delete task:', err.message));
+    }
+}
+exports.remove = remove;

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

@@ -0,0 +1 @@
+export declare function sync(cmdLineParams: any): Promise<void>;

package/build/services/tasks/sync.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sync = void 0;
+const fs = require("fs/promises");
+const chalk = require("chalk");
+const functionRepository = require("../../repositories/functions");
+const taskConfig_1 = require("../../services/tasks/taskConfig");
+const util_1 = require("../../services/tasks/util");
+async function sync(cmdLineParams) {
+    for await (const config of (0, taskConfig_1.getValidatedConfigIterator)(cmdLineParams)) {
+        console.log('Syncing task', config.name, '...');
+        await syncSingleTask(config);
+    }
+}
+exports.sync = sync;
+async function syncSingleTask(config) {
+    const uploadFilePath = await (0, util_1.zipFileFromDirectory)(config.path);
+    const file = await fs.readFile(uploadFilePath);
+    const request = {
+        name: config.name,
+        description: config.description || 'none',
+        entryPoint: config.entryPoint,
+        code: file.toString('base64'),
+        runtime: config.runtime,
+    };
+    if (config.executionPermission || config.defaultPriority) {
+        request.executionOptions = {};
+    }
+    if (config.defaultPriority) {
+        request.executionOptions.defaultPriority = config.defaultPriority;
+    }
+    if (config.executionPermission) {
+        request.executionOptions.permissionMode = config.executionPermission;
+    }
+    if (config.timeLimit) {
+        request.timeLimit = config.timeLimit;
+    }
+    if (config.memoryLimit) {
+        request.memoryLimit = config.memoryLimit;
+    }
+    if (config.retryPolicy) {
+        request.retryPolicy = config.retryPolicy;
+    }
+    if (config.executionCredentials) {
+        const credentials = await (0, util_1.syncFunctionUser)({
+            taskName: config.name,
+            targetEmail: config.executionCredentials.email,
+            targetPermissions: config.executionCredentials.permissions,
+        });
+        config.environment = {
+            ...config.environment,
+            API_HOST: process.env.API_HOST,
+            API_OAUTH_CONSUMER_KEY: process.env.API_OAUTH_CONSUMER_KEY,
+            API_OAUTH_CONSUMER_SECRET: process.env.API_OAUTH_CONSUMER_SECRET,
+            API_OAUTH_TOKEN: credentials.token,
+            API_OAUTH_TOKEN_SECRET: credentials.tokenSecret,
+        };
+    }
+    if (config.environment) {
+        const environmentVariables = {};
+        for (const [key, value] of Object.entries(config.environment)) {
+            environmentVariables[key] = { value };
+        }
+        request.environmentVariables = environmentVariables;
+    }
+    const allFunctions = await functionRepository.find();
+    const myFunction = allFunctions.find((f) => f.name === config.name);
+    if (myFunction === undefined) {
+        await functionRepository.create(request);
+        console.log(chalk.green('Successfully created task', config.name));
+    }
+    else {
+        const existingFunction = await functionRepository.findByName(myFunction.name);
+        if (request.runtime === existingFunction.runtime) {
+            delete request.runtime;
+        }
+        const updateResponse = await functionRepository.update(request);
+        if (!updateResponse?.affectedRecords) {
+            throw new Error(`Failed to update task ${request.name}`);
+        }
+        console.log(chalk.green('Successfully updated task', config.name));
+    }
+    await fs.unlink(uploadFilePath);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.12.0-dev-141-b72e89f",
+  "version": "1.12.0-dev-142-82cc6de",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",