@journeyapps/cloudcode-build-agent 0.0.0-dev.55699c3 → 0.0.0-dev.65d5db0

package/dist/builder.d.ts

@@ -1 +1,22 @@
-export declare function buildTasks(project_path: string, dest: string, config: any, only?: string): Promise<void>;
+import { DetectedTask } from './detect_tasks';
+export type GeneralTaskConfig = {
+    app_id: string;
+    env: string;
+    backend_id: string;
+    backend_url: string;
+};
+export type BuildOptions = {
+    only?: string;
+    custom_node_installation_path?: string;
+};
+type ToolPaths = {
+    bin_path: string;
+    node_bin: string;
+    npm_bin: string;
+    npx_bin: string;
+};
+export declare function buildTasks(project_path: string, dest: string, config: GeneralTaskConfig, options?: BuildOptions): Promise<void>;
+export declare function buildTask(task: DetectedTask, project_path: string, dest: string, config: GeneralTaskConfig, node_context: {
+    node_version: string;
+} & ToolPaths): Promise<void>;
+export {};

package/dist/builder.js

@@ -1,13 +1,111 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTasks = void 0;
+exports.buildTask = exports.buildTasks = void 0;
+const path = __importStar(require("node:path"));
+const jetpack = __importStar(require("fs-jetpack"));
+const semver = __importStar(require("semver"));
+const installer_1 = require("./installer");
 const detect_tasks_1 = require("./detect_tasks");
-// Detect tasks in given path and build them.
-async function buildTasks(project_path, dest, config, only) {
-    const tasks = await (0, detect_tasks_1.detectTasks)(project_path, only);
-    for (const t of tasks) {
-        // await t.drink()
+const run_1 = require("./run");
+async function buildTasks(project_path, dest, config, options) {
+    const tasks = await (0, detect_tasks_1.detectTasks)(project_path, options?.only);
+    // Use the version of nodejs that's running this script as the default.
+    const default_tool_paths = {
+        bin_path: path.dirname(process.execPath),
+        node_bin: process.execPath,
+        npm_bin: path.join(path.dirname(process.execPath), 'npm'),
+        npx_bin: path.join(path.dirname(process.execPath), 'npx')
+    };
+    for (const task of tasks) {
+        let custom_tool_paths;
+        if (task.required_node_version) {
+            // FIXME: when defaulting to project_path, the custom node installation is copied into the builder's workdir as well.
+            const custom_node_installation_path = options?.custom_node_installation_path ?? project_path;
+            const custom_node_path = path.resolve(custom_node_installation_path, `node-${semver.major(task.required_node_version)}`);
+            custom_tool_paths = await (0, installer_1.ensureCustomNodeVersion)(task.required_node_version, custom_node_path);
+        }
+        const node_version = task.required_node_version ?? process.version;
+        await buildTask(task, project_path, dest, config, {
+            node_version,
+            ...(custom_tool_paths ?? default_tool_paths)
+        });
     }
 }
 exports.buildTasks = buildTasks;
+async function buildTask(task, project_path, dest, config, node_context) {
+    const builder_package = task.builder_package;
+    const builder_script = task.builder_script;
+    const { node_bin, npm_bin, npx_bin } = node_context;
+    if (!jetpack.exists(node_bin)) {
+        throw new Error(`Node binary not found: ${node_bin}`);
+    }
+    console.debug(`[${task.task_name}] Installing builder script "${builder_package}" for node ${node_context.node_version}`);
+    /*
+     *  The builder package is installed locally so as to not require write access to the global node installation,
+     *  and executed with npx to handle the path resoluton, etc.
+     */
+    const stream1 = (0, run_1.runCommand)(node_bin, [npm_bin, '--no-save', '--no-fund', '--no-audit', 'install', builder_package], {
+        cwd: project_path,
+        env: {
+            npm_config_loglevel: 'error',
+            ...process.env
+        }
+    });
+    for await (let event of stream1) {
+        const log = event.stdout ?? event.stderr;
+        if (log) {
+            console.log(`[${task.task_name} - install]`, log.trimRight());
+        }
+    }
+    const build_metadata = {
+        name: task.task_name,
+        version: task.task_version,
+        lambda_runtime: task.task_runtime,
+        user_config: task.user_task_config
+    };
+    await jetpack.writeAsync(path.join(dest, `${task.task_name}-metadata.json`), JSON.stringify(build_metadata));
+    const builder_args = [];
+    builder_args.push(builder_script);
+    builder_args.push('--src', project_path);
+    builder_args.push(`--out`, path.join(dest, task.task_name));
+    builder_args.push(`--zip`, path.join(dest, `${task.task_name}.zip`));
+    builder_args.push(`--task`, `${task.task_name}`);
+    builder_args.push(`--appId`, config.app_id);
+    builder_args.push(`--env`, config.env);
+    builder_args.push(`--backendId`, config.backend_id);
+    builder_args.push(`--backendUrl`, config.backend_url);
+    console.debug(`[${task.task_name}] Trying: ${node_bin} ${builder_args.join(' ')}`);
+    const stream2 = (0, run_1.runCommand)(npx_bin, ['--no-install', ...builder_args], { cwd: project_path, env: process.env });
+    for await (let event of stream2) {
+        const log = event.stdout ?? event.stderr;
+        if (log) {
+            console.log(`[${task.task_name} - build]`, log.trimRight());
+        }
+    }
+    console.log(`[${task.task_name} - build]`, `Finished.`);
+}
+exports.buildTask = buildTask;
 //# sourceMappingURL=builder.js.map

package/dist/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":";;;AACA,iDAA6C;AAE7C,6CAA6C;AACtC,KAAK,UAAU,UAAU,CAAC,YAAoB,EAAE,IAAY,EAAE,MAAW,EAAE,IAAa;IAC7F,MAAM,KAAK,GAAG,MAAM,IAAA,0BAAW,EAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAEpD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;QACrB,kBAAkB;KACnB;AACH,CAAC;AAND,gCAMC"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"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"}

package/dist/cli.js

@@ -27,26 +27,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const yargs = __importStar(require("yargs"));
 const _1 = require("./");
 const DEFAULT_SRC_PATH = './';
-const DEFAULT_OUT_PATH = '';
+const DEFAULT_OUT_PATH = './dist/cloudcode';
+const DEFAULT_TMP_PATH = '/tmp/cloudcode-build-agent/node';
 yargs
     .command(['build', '$0'], // $0 means this is the default command
 'build tasks', (yargs) => {
-    return yargs
+    return (yargs
         .option('only', { string: true })
         .option('path', { default: DEFAULT_SRC_PATH })
-        .option('out', { default: DEFAULT_OUT_PATH });
+        .option('out', { default: DEFAULT_OUT_PATH })
+        .option('node_work_dir', { default: DEFAULT_TMP_PATH })
+        // TODO: investigate yargs.config() for reading task config blob from a file. But how to ensure required args?
+        .option('appId', { string: true, demandOption: true, describe: "CloudCode's reference id" })
+        .option('env', { string: true, demandOption: true })
+        .option('backendId', { string: true, demandOption: true })
+        .option('backendUrl', { string: true, demandOption: true }));
 }, handled(async (argv) => {
-    // iterate over task directories and run: 'yarn cloudcode-build'.
-    // optionally filtered by `argv.only` to build a single task.
-    await (0, _1.buildTasks)(argv.path, argv.out, argv.only);
-}))
-    .command('prepare-env', 'Install node environments and packages for each task', (yargs) => {
-    return yargs.option('only', { string: true }).option('path', { default: DEFAULT_SRC_PATH });
-}, handled(async (argv) => {
-    // iterate over task directories:
-    //   ensure required node version for task CC version is installed - What if too old - error?
-    //   run yarn install
-    await (0, _1.prepareBuildEnvForTasks)(argv.path, argv.only);
+    const config = {
+        app_id: argv.appId,
+        env: argv.env,
+        backend_id: argv.backendId,
+        backend_url: argv.backendUrl
+    };
+    await (0, _1.buildTasks)(argv.path, argv.out, config, {
+        only: argv.only,
+        custom_node_installation_path: argv.node_work_dir
+    });
 }))
     .option('verbose', {
     alias: 'v',
@@ -58,14 +64,8 @@ function handled(fn) {
             await fn(argv);
         }
         catch (err) {
-            if (err instanceof _1.ProcessError) {
-                console.error(err.message);
-                process.exit(err.status);
-            }
-            else {
-                console.error(err.stack);
-                process.exit(1);
-            }
+            console.error(err.stack);
+            process.exit(1);
         }
     };
 }

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAA+B;AAE/B,yBAAuE;AAEvE,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAE5B,KAAK;KACF,OAAO,CACN,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,uCAAuC;AACxD,aAAa,EACb,CAAC,KAAK,EAAE,EAAE;IACR,OAAO,KAAK;SACT,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAChC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;SAC7C,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAClD,CAAC,EACD,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACrB,iEAAiE;IACjE,6DAA6D;IAE7D,MAAM,IAAA,aAAU,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC,CAAC,CACH;KACA,OAAO,CACN,aAAa,EACb,sDAAsD,EACtD,CAAC,KAAK,EAAE,EAAE;IACR,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAC9F,CAAC,EACD,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACrB,iCAAiC;IACjC,6FAA6F;IAC7F,qBAAqB;IAErB,MAAM,IAAA,0BAAuB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;AACtD,CAAC,CAAC,CACH;KACA,MAAM,CAAC,SAAS,EAAE;IACjB,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,KAAK;CACf,CAAC,CAAC,IAAI,CAAC;AAEV,SAAS,OAAO,CAAI,EAA8B;IAChD,OAAO,KAAK,EAAE,IAAO,EAAE,EAAE;QACvB,IAAI;YACF,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;SAChB;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,GAAG,YAAY,eAAY,EAAE;gBAC/B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;aAC1B;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;SACF;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAA+B;AAE/B,yBAAgC;AAEhC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAC5C,MAAM,gBAAgB,GAAG,iCAAiC,CAAC;AAE3D,KAAK;KACF,OAAO,CACN,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,uCAAuC;AACxD,aAAa,EACb,CAAC,KAAK,EAAE,EAAE;IACR,OAAO,CACL,KAAK;SACF,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAChC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;SAC7C,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;SAC5C,MAAM,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;QACvD,8GAA8G;SAC7G,MAAM,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,0BAA0B,EAAE,CAAC;SAC3F,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;SACnD,MAAM,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;SACzD,MAAM,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAC9D,CAAC;AACJ,CAAC,EACD,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACrB,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,IAAI,CAAC,KAAK;QAClB,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,UAAU,EAAE,IAAI,CAAC,SAAS;QAC1B,WAAW,EAAE,IAAI,CAAC,UAAU;KAC7B,CAAC;IACF,MAAM,IAAA,aAAU,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE;QAC5C,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,6BAA6B,EAAE,IAAI,CAAC,aAAa;KAClD,CAAC,CAAC;AACL,CAAC,CAAC,CACH;KACA,MAAM,CAAC,SAAS,EAAE;IACjB,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,KAAK;CACf,CAAC,CAAC,IAAI,CAAC;AAEV,SAAS,OAAO,CAAI,EAA8B;IAChD,OAAO,KAAK,EAAE,IAAO,EAAE,EAAE;QACvB,IAAI;YACF,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;SAChB;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/defs.d.ts

@@ -1,6 +1,7 @@
 export declare const SUPPORTED_VERSIONS: {
     version: string;
     node: string;
+    runtime: string;
     builder_package: string;
     builder_script: string;
 }[];

package/dist/defs.js

@@ -3,46 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SUPPORTED_VERSIONS = void 0;
 // TODO: maybe publish (some of) this from the CC service?
 exports.SUPPORTED_VERSIONS = [
-    {
-        // proposed
-        version: '1.13.0',
-        node: '16.19.1',
-        builder_package: '@journeyapps/cloudcode-build@1.13.0',
-        builder_script: 'cloudcode-build'
-    },
+    // {
+    //   // proposed
+    //   version: '1.13.0',
+    //   node: '18.14.2',
+    //   runtime: 'nodejs18.x',
+    //   builder_package: '@journeyapps/cloudcode-build@1.13.0',
+    //   builder_script: 'cloudcode-build'
+    // },
     {
         version: '1.12.0',
         node: '16.19.1',
-        // builder_package: '@journeyapps/cloudcode-build-legacy@1.12.0'
-        // DEV HACK:
-        builder_package: '~/src/journey-cloudcode/packages/cloudcode-build-legacy',
+        runtime: 'nodejs16.x',
+        builder_package: '@journeyapps/cloudcode-build-legacy@1.12.0-alpha.1',
         builder_script: 'cloudcode-build-legacy'
     },
     {
         version: '1.11.2',
-        // node: '14.21.3',
-        // builder_package: '@journeyapps/cloudcode-build-legacy@1.12.0'
-        // DEV HACK:
-        node: '16.19.1',
-        builder_package: '~/src/journey-cloudcode/packages/cloudcode-build-legacy',
+        node: '14.21.3',
+        runtime: 'nodejs14.x',
+        builder_package: '@journeyapps/cloudcode-build-legacy@1.12.0-alpha.1',
         builder_script: 'cloudcode-build-legacy'
     },
     {
         version: '1.11.1',
-        // node: '14.21.3',
-        // builder_package: '@journeyapps/cloudcode-build-legacy@1.12.0'
-        // DEV HACK:
-        node: '16.19.1',
-        builder_package: '~/src/journey-cloudcode/packages/cloudcode-build-legacy',
+        node: '14.21.3',
+        runtime: 'nodejs14.x',
+        builder_package: '@journeyapps/cloudcode-build-legacy@1.12.0-alpha.1',
         builder_script: 'cloudcode-build-legacy'
     },
     {
         version: '1.11.0',
-        // node: '14.21.3',
-        // builder_package: '@journeyapps/cloudcode-build-legacy@1.12.0'
-        // DEV HACK:
-        node: '16.19.1',
-        builder_package: '~/src/journey-cloudcode/packages/cloudcode-build-legacy',
+        node: '14.21.3',
+        runtime: 'nodejs14.x',
+        builder_package: '@journeyapps/cloudcode-build-legacy@1.12.0-alpha.1',
         builder_script: 'cloudcode-build-legacy'
     }
 ];

package/dist/defs.js.map

@@ -1 +1 @@
-{"version":3,"file":"defs.js","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":";;;AAAA,0DAA0D;AAC7C,QAAA,kBAAkB,GAAG;IAChC;QACE,WAAW;QACX,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,qCAAqC;QACtD,cAAc,EAAE,iBAAiB;KAClC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,gEAAgE;QAChE,YAAY;QACZ,eAAe,EAAE,yDAAyD;QAC1E,cAAc,EAAE,wBAAwB;KACzC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,mBAAmB;QACnB,gEAAgE;QAChE,YAAY;QACZ,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,yDAAyD;QAC1E,cAAc,EAAE,wBAAwB;KACzC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,mBAAmB;QACnB,gEAAgE;QAChE,YAAY;QACZ,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,yDAAyD;QAC1E,cAAc,EAAE,wBAAwB;KACzC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,mBAAmB;QACnB,gEAAgE;QAChE,YAAY;QACZ,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,yDAAyD;QAC1E,cAAc,EAAE,wBAAwB;KACzC;CACF,CAAC"}
+{"version":3,"file":"defs.js","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":";;;AAAA,0DAA0D;AAC7C,QAAA,kBAAkB,GAAG;IAChC,IAAI;IACJ,gBAAgB;IAChB,uBAAuB;IACvB,qBAAqB;IACrB,2BAA2B;IAC3B,4DAA4D;IAC5D,sCAAsC;IACtC,KAAK;IACL;QACE,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,YAAY;QACrB,eAAe,EAAE,oDAAoD;QACrE,cAAc,EAAE,wBAAwB;KACzC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,YAAY;QACrB,eAAe,EAAE,oDAAoD;QACrE,cAAc,EAAE,wBAAwB;KACzC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,YAAY;QACrB,eAAe,EAAE,oDAAoD;QACrE,cAAc,EAAE,wBAAwB;KACzC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,YAAY;QACrB,eAAe,EAAE,oDAAoD;QACrE,cAAc,EAAE,wBAAwB;KACzC;CACF,CAAC"}

package/dist/detect_tasks.d.ts

@@ -1,8 +1,20 @@
-export declare function detectTasks(project_path: string, only?: string): Promise<{
+export type DetectedTask = {
     pkg_path: string;
-    task_name: any;
-    task_version: any;
-    required_node_version: string | undefined;
+    task_name: string;
+    task_version: string;
+    task_runtime: string;
+    required_node_version?: string;
     builder_package: string;
     builder_script: string;
-}[]>;
+    user_task_config: {
+        runtime: string;
+        enabled: boolean;
+        shared?: boolean;
+        serial?: boolean;
+        app?: boolean;
+        web?: boolean;
+        webhook?: boolean;
+        schedule?: any;
+    };
+};
+export declare function detectTasks(project_path: string, only?: string): Promise<DetectedTask[]>;

package/dist/detect_tasks.js

@@ -29,7 +29,6 @@ const path = __importStar(require("node:path"));
 const jetpack = __importStar(require("fs-jetpack"));
 const semver = __importStar(require("semver"));
 const defs = __importStar(require("./defs"));
-// TODO: validations for cloudcode specific keys and structure?
 async function readPackage(path) {
     try {
         const content = await fs.promises.readFile(path, { encoding: 'utf-8' });
@@ -42,8 +41,16 @@ async function readPackage(path) {
         // todo: if json error, throw a CC build error?
     }
 }
+const UserTaskConfigDefaults = {
+    runtime: null,
+    enabled: true
+};
 async function detectTasks(project_path, only) {
-    const package_files = await jetpack.findAsync(path.join(project_path, 'cloudcode'), { matching: '**/package.json' });
+    const cloudcode_path = path.join(project_path, 'cloudcode');
+    if (!jetpack.exists(cloudcode_path)) {
+        return Promise.resolve([]);
+    }
+    const package_files = await jetpack.findAsync(cloudcode_path, { matching: '**/package.json' });
     const filtered_package_files = package_files.filter((pkg_path) => {
         // FIXME: this is kinda clunky.
         const pm = /^\/?cloudcode\/([^\/]+)\/package\.json$/.exec(pkg_path);
@@ -60,7 +67,14 @@ async function detectTasks(project_path, only) {
     return Promise.all(filtered_package_files.map(async (pkg_path) => {
         const task_package = await readPackage(pkg_path);
         const task_name = task_package.name; // CAVEAT: the pkg name _must_ match the dir.
-        const task_version = task_package?.cloudcode?.runtime;
+        const task_version = task_package.cloudcode.runtime;
+        const user_task_config = {
+            ...UserTaskConfigDefaults,
+            ...task_package.cloud_code
+        };
+        /* CAVEAT: We do not exclude disabled tasks from the build process, because this is a special case where the
+           processing for a task is disabled, but the resources for the task are not destroyed.
+         */
         console.debug(`Detected task version ${task_version}`);
         const matching = defs.SUPPORTED_VERSIONS.find((v) => {
             return semver.satisfies(v.version, task_version);
@@ -69,17 +83,19 @@ async function detectTasks(project_path, only) {
             throw new Error('FIXME: unsupported version');
         }
         console.debug(`Matching versions: ${JSON.stringify(matching)}`);
+        const task_runtime = matching.runtime;
         const running_node_version = process.versions.node;
         let required_node_version;
-        // if (matching?.node && semver.major(matching.node) !== semver.major(running_node_version)) {
-        if (matching?.node && semver.parse(matching.node) !== semver.parse(running_node_version)) {
-            console.debug(`Task requires different node version: v${matching.node}`);
+        if (matching?.node && semver.major(matching.node) !== semver.major(running_node_version)) {
+            console.debug(`Task requires different node version: v${matching.node}. Running: ${running_node_version}`);
             required_node_version = matching.node;
         }
         return {
             pkg_path,
             task_name,
             task_version,
+            task_runtime,
+            user_task_config,
             required_node_version,
             builder_package: matching.builder_package,
             builder_script: matching.builder_script

package/dist/detect_tasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"detect_tasks.js","sourceRoot":"","sources":["../src/detect_tasks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA8B;AAC9B,gDAAkC;AAClC,oDAAsC;AACtC,+CAAiC;AACjC,6CAA+B;AAE/B,+DAA+D;AAC/D,KAAK,UAAU,WAAW,CAAC,IAAY;IACrC,IAAI;QACF,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KAC5B;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC;QAC/B,MAAM,GAAG,CAAC;QACV,mCAAmC;QACnC,+CAA+C;KAChD;AACH,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,YAAoB,EAAE,IAAa;IACnE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACrH,MAAM,sBAAsB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC/D,+BAA+B;QAC/B,MAAM,EAAE,GAAG,yCAAyC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpE,IAAI,CAAC,EAAE,EAAE;YACP,OAAO,KAAK,CAAC;SACd;QACD,MAAM,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAEvB,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,QAAQ,EAAE;YACpC,qFAAqF;YACrF,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,CAChB,sBAAsB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC5C,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEjD,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,6CAA6C;QAClF,MAAM,YAAY,GAAG,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC;QAEtD,OAAO,CAAC,KAAK,CAAC,yBAAyB,YAAY,EAAE,CAAC,CAAC;QAEvD,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YAClD,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;SAC/C;QAED,OAAO,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEhE,MAAM,oBAAoB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QACnD,IAAI,qBAAqB,CAAC;QAC1B,8FAA8F;QAC9F,IAAI,QAAQ,EAAE,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;YACxF,OAAO,CAAC,KAAK,CAAC,0CAA0C,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YAEzE,qBAAqB,GAAG,QAAQ,CAAC,IAAI,CAAC;SACvC;QACD,OAAO;YACL,QAAQ;YACR,SAAS;YACT,YAAY;YACZ,qBAAqB;YACrB,eAAe,EAAE,QAAQ,CAAC,eAAe;YACzC,cAAc,EAAE,QAAQ,CAAC,cAAc;SACxC,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AArDD,kCAqDC"}
+{"version":3,"file":"detect_tasks.js","sourceRoot":"","sources":["../src/detect_tasks.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,3 +1 @@
-export * from './errors';
 export * from './builder';
-export * from './installer';

package/dist/index.js

@@ -14,7 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./errors"), exports);
 __exportStar(require("./builder"), exports);
-__exportStar(require("./installer"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B;AAC1B,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B"}

package/dist/installer.d.ts

@@ -1 +1,19 @@
-export declare function prepareBuildEnvForTasks(project_path: string, only?: string): Promise<void>;
+export declare function ensureCustomNodeVersion(node_version: string, install_path: string): Promise<{
+    bin_path: string;
+    node_bin: string;
+    npm_bin: string;
+    npx_bin: string;
+}>;
+export declare function downloadAndInstallNode(node_version: string, destination: string): Promise<{
+    bin_path: string;
+    node_bin: string;
+    npm_bin: string;
+    npx_bin: string;
+}>;
+export declare function nodePaths(destination: string): {
+    bin_path: string;
+    node_bin: string;
+    npm_bin: string;
+    npx_bin: string;
+};
+export declare function downloadAndExtractTarball(url: string, dest: string): Promise<void>;