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

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,105 @@
 "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 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);
+    builder_args.push(`--runInstallScripts`, 'true');
+    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.js

@@ -3,46 +3,35 @@ 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: '16.19.1',
+    //   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',
+        builder_package: '@journeyapps/cloudcode-build-legacy',
         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',
+        builder_package: '@journeyapps/cloudcode-build-legacy',
         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',
+        builder_package: '@journeyapps/cloudcode-build-legacy',
         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',
+        builder_package: '@journeyapps/cloudcode-build-legacy',
         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,4DAA4D;IAC5D,sCAAsC;IACtC,KAAK;IACL;QACE,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,qCAAqC;QACtD,cAAc,EAAE,wBAAwB;KACzC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,qCAAqC;QACtD,cAAc,EAAE,wBAAwB;KACzC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,qCAAqC;QACtD,cAAc,EAAE,wBAAwB;KACzC;IACD;QACE,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,qCAAqC;QACtD,cAAc,EAAE,wBAAwB;KACzC;CACF,CAAC"}

package/dist/detect_tasks.d.ts

@@ -1,8 +1,9 @@
-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;
+    required_node_version?: string;
     builder_package: string;
     builder_script: string;
-}[]>;
+};
+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' });
@@ -61,6 +60,7 @@ async function detectTasks(project_path, only) {
         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;
+        // FIXME: Do we want to filter out disabled tasks from the build process?
         console.debug(`Detected task version ${task_version}`);
         const matching = defs.SUPPORTED_VERSIONS.find((v) => {
             return semver.satisfies(v.version, task_version);
@@ -71,9 +71,8 @@ async function detectTasks(project_path, only) {
         console.debug(`Matching versions: ${JSON.stringify(matching)}`);
         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 {

package/dist/detect_tasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"detect_tasks.js","sourceRoot":"","sources":["../src/detect_tasks.ts"],"names":[],"mappings":"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"}
+{"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>;

package/dist/installer.js

@@ -22,71 +22,118 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareBuildEnvForTasks = void 0;
-const path = __importStar(require("node:path"));
+exports.downloadAndExtractTarball = exports.nodePaths = exports.downloadAndInstallNode = exports.ensureCustomNodeVersion = void 0;
 const jetpack = __importStar(require("fs-jetpack"));
-const semver = __importStar(require("semver"));
-const utils = __importStar(require("./utils"));
-const child_process_1 = require("child_process");
-const detect_tasks_1 = require("./detect_tasks");
-const _ = __importStar(require("lodash"));
-async function prepareBuildEnvForTasks(project_path, only) {
-    const tasks = await (0, detect_tasks_1.detectTasks)(project_path, only);
-    const required_node_versions = _.compact(tasks.map((t) => t.required_node_version));
-    const install_node_versions = _.uniq(required_node_versions);
-    const tool_paths = {};
-    for (const required_node_version of install_node_versions) {
-        // FIXME: maybe a path prefix.
-        const custom_node_path = path.resolve(`node-${semver.major(required_node_version)}`);
-        if (!jetpack.exists(custom_node_path)) {
-            console.log(`installing to ${custom_node_path}`);
-            await jetpack.dirAsync(custom_node_path);
-            await utils.downloadAndInstallNode(required_node_version, custom_node_path);
-        }
-        else {
-            console.log(`already installed in ${custom_node_path}`);
-        }
-        tool_paths[required_node_version] = utils.nodePaths(custom_node_path);
+const path = __importStar(require("node:path"));
+const URL = __importStar(require("node:url"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const fs = __importStar(require("node:fs"));
+const os = __importStar(require("node:os"));
+const tar = __importStar(require("tar"));
+async function ensureCustomNodeVersion(node_version, install_path) {
+    if (!jetpack.exists(path.join(install_path, 'bin/node'))) {
+        console.debug(`[node ${node_version}] Installing to ${install_path}`);
+        await jetpack.dirAsync(install_path);
+        await downloadAndInstallNode(node_version, install_path);
+    }
+    else {
+        console.debug(`[node ${node_version}] Already installed in ${install_path}`);
+    }
+    return nodePaths(install_path);
+}
+exports.ensureCustomNodeVersion = ensureCustomNodeVersion;
+/* Basically this, but for different dirs.
+    curl https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${PLATFORM}64.tar.gz -L | tar -xzC /node-dedicated && \
+    mv /node-dedicated/node-v${NODE_VERSION}-linux-${PLATFORM}64/bin/node /node-dedicated/node
+*/
+// TODO: feature to find the latest minor and patch for a given major version?
+async function downloadAndInstallNode(node_version, destination) {
+    // eg. https://nodejs.org/dist/v18.14.2/node-v18.14.2-linux-x64.tar.xz
+    const ARCH = os.arch();
+    const PLATFORM = os.platform();
+    const node_download_url = `https://nodejs.org/dist/v${node_version}/node-v${node_version}-${PLATFORM}-${ARCH}.tar.gz`;
+    await downloadAndExtractTarball(node_download_url, destination);
+    return nodePaths(destination);
+}
+exports.downloadAndInstallNode = downloadAndInstallNode;
+function nodePaths(destination) {
+    return {
+        bin_path: path.resolve(destination, 'bin'),
+        node_bin: path.resolve(destination, 'bin', 'node'),
+        npm_bin: path.resolve(destination, 'bin', 'npm'),
+        npx_bin: path.resolve(destination, 'bin', 'npx')
+    };
+}
+exports.nodePaths = nodePaths;
+async function downloadAndExtractTarball(url, dest) {
+    const tmpdir = os.tmpdir();
+    const filename = path.basename(URL.parse(url).pathname);
+    const base = path.basename(filename, '.tar.gz');
+    const download = path.join(tmpdir, filename);
+    if (fs.existsSync(download)) {
+        console.debug(`deleting old ${download}`);
+        fs.unlinkSync(download);
     }
-    console.log('----');
-    for (const task of tasks) {
-        const node_version = task.required_node_version ?? process.version;
-        const builder_package = task.builder_package;
-        const builder_script = task.builder_script;
-        console.log(`[${task.task_name}] Installing builder script "${builder_package}" for node ${node_version}`);
-        const { bin_path, node_bin, npm_bin } = tool_paths[node_version];
-        const builder_bin = path.resolve(bin_path, builder_script);
-        // TODO: This may need to be replaced with the something like the spawn-stream stuff in build-agent? OR what to do with the stdout/stderr and errorhandling?
-        const spawnResult = (0, child_process_1.spawnSync)(node_bin, [npm_bin, '--global', 'install', builder_package], { cwd: project_path });
-        if (spawnResult.status == 0 && jetpack.exists(builder_bin)) {
-            // DEV HACK: this needs to move to the build thingie.
-            const builder_args = [];
-            // --src ~/src/cool-app-bro-master --out ~/src/dist --task echo --appId 'appid' --env 'testing' --backendId 'backendid' --backendUrl 'http://run.journeyapps.test'
-            builder_args.push(builder_bin);
-            // // builder_args.push('--version')
-            builder_args.push('--src', './');
-            builder_args.push(`--out`, `./dist/${task.task_name}`);
-            builder_args.push(`--task`, `${task.task_name}`);
-            builder_args.push(`--appId`, 'appid', `--env`, 'testing', `--backendId`, 'backendid', `--backendUrl`, 'http://run.journeyapps.test');
-            console.log(`[${task.task_name}] Trying: ${node_bin} ${builder_args.join(' ')}`);
-            const builderSpawnResult = (0, child_process_1.spawnSync)(node_bin, builder_args, { cwd: project_path });
-            if (builderSpawnResult.status !== 0) {
-                console.log(`[${task.task_name}] FAILED TO RUN BUILDER SCRIPT`);
-                console.log(`[${task.task_name}] OUTPUT: ${builderSpawnResult.stdout}`);
-                console.log(`[${task.task_name}] ERROR: ${builderSpawnResult.stderr}`);
+    await new Promise(async (resolve, reject) => {
+        console.debug(`fetching ${url} into ${download}`);
+        const response = await (0, node_fetch_1.default)(url);
+        if (!response.ok) {
+            const errorBody = await response.statusText;
+            throw new Error(`Failed to download: ${errorBody}`);
+        }
+        const file = fs.createWriteStream(download); // Sink the download stream into a file, so it can be extracted.
+        response.body.pipe(file);
+        file.on('finish', async () => {
+            try {
+                console.debug('Extracting...', download);
+                tar.extract({
+                    cwd: tmpdir,
+                    file: download,
+                    sync: true
+                });
+                const uncomp = path.join(tmpdir, base);
+                const dist = path.resolve(dest);
+                // FIXME: dangerous. Add protection or replace.
+                // if (fs.existsSync(dist)) {
+                //   fs.rmSync(dist, { recursive: true });
+                // }
+                if (fs.existsSync(uncomp)) {
+                    console.debug(`Moving extracted files from ${uncomp} to ${dist}`);
+                    fs.renameSync(uncomp, dist);
+                }
+                else {
+                    console.debug(`Can't find extract dir ${uncomp}`);
+                }
+                /*
+                  FIXME: this seems to sometimes cause errors: eg.
+                  ```
+                    node:events:505
+                          throw er; // Unhandled 'error' event
+                          ^
+        
+                    Error: ENOENT: no such file or directory, open '/var/folders/kc/h6m4zpmd23v13s63mygvkslm0000gn/T/node-v16.19.1-darwin-arm64.tar.gz'
+                    Emitted 'error' event on ReadStream instance at:
+                        at emitErrorNT (node:internal/streams/destroy:157:8)
+                        at emitErrorCloseNT (node:internal/streams/destroy:122:3)
+                        at processTicksAndRejections (node:internal/process/task_queues:83:21) {
+                      errno: -2,
+                      code: 'ENOENT',
+                      syscall: 'open',
+                      path: '/var/folders/kc/h6m4zpmd23v13s63mygvkslm0000gn/T/node-v16.19.1-darwin-arm64.tar.gz'
+                  ```
+                */
+                // fs.unlinkSync(file.path);
+                resolve(null);
             }
-            else {
-                console.log(`[${task.task_name}] SCRIPT SUCCESS?`);
-                console.log(`[${task.task_name}] OUTPUT: ${builderSpawnResult.stdout}`);
-                console.log(`[${task.task_name}] ERROR: ${builderSpawnResult.stderr}`);
+            catch (err) {
+                reject(err);
             }
-            console.log('----');
-        }
-        else {
-            console.log(`[${task.task_name}] failed to install ${builder_package}`);
-        }
-    }
+        });
+    });
 }
-exports.prepareBuildEnvForTasks = prepareBuildEnvForTasks;
+exports.downloadAndExtractTarball = downloadAndExtractTarball;
 //# sourceMappingURL=installer.js.map

package/dist/installer.js.map

@@ -1 +1 @@
-{"version":3,"file":"installer.js","sourceRoot":"","sources":["../src/installer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"installer.js","sourceRoot":"","sources":["../src/installer.ts"],"names":[],"mappings":"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"}

package/dist/run.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="node" />
+import { SpawnStreamEvent } from './spawn-stream';
+import { SpawnOptions } from 'child_process';
+export declare function runCommand(command: string, args: string[], options?: Partial<SpawnOptions>): AsyncIterable<SpawnStreamEvent>;