@journeyapps/cloudcode-build-agent 0.0.0-dev.6fdb5b1 → 0.0.0-dev.90a9f01

package/dist/builder.d.ts

@@ -1,7 +1 @@
-export type GeneralTaskConfig = {
-    app_id: string;
-    env: string;
-    backend_id: string;
-    backend_url: string;
-};
-export declare function buildTasks(project_path: string, dest: string, config: GeneralTaskConfig, only?: string): Promise<void>;
+export declare function buildTasks(src: string, dest: string, only?: string): Promise<void>;

package/dist/builder.js

@@ -1,110 +1,9 @@
 "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;
-const path = __importStar(require("node:path"));
-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 buildTasks(project_path, dest, config, 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);
-    // FIXME: Maybe refactor this section into an ensureNodeVersion (or something) that returns the relevant toolpaths?
-    const tool_paths = {};
-    // 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')
-    };
-    tool_paths[process.version] = default_tool_paths;
-    for (const required_node_version of install_node_versions) {
-        const custom_node_path = path.resolve(`node-${semver.major(required_node_version)}`);
-        if (!jetpack.exists(path.join(custom_node_path, 'bin/node'))) {
-            console.debug(`installing to ${custom_node_path}`);
-            await jetpack.dirAsync(custom_node_path);
-            await utils.downloadAndInstallNode(required_node_version, custom_node_path);
-        }
-        else {
-            console.debug(`already installed in ${custom_node_path}`);
-        }
-        tool_paths[required_node_version] = utils.nodePaths(custom_node_path);
-    }
-    console.debug('----');
-    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;
-        const { bin_path, node_bin, npm_bin } = tool_paths[node_version];
-        const builder_bin = path.resolve(bin_path, builder_script);
-        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_version}`);
-        // 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) {
-            console.error(`[${task.task_name}] failed to install ${builder_package}`);
-            console.debug(`[${task.task_name}] STDOUT: ${spawnResult.stdout}`);
-            console.debug(`[${task.task_name}] STDERR: ${spawnResult.stderr}`);
-            throw new Error(`Failed to install builder script for task ${task.task_name}`);
-        }
-        if (!jetpack.exists(builder_bin)) {
-            console.error(`[${task.task_name}] ${builder_bin} not found`);
-            throw new Error(`Builder script not found for task ${task.task_name}`);
-        }
-        const builder_args = [];
-        // --src ./ --out ./dist/echo --task echo --appId 'appid' --env 'testing' --backendId 'backendid' --backendUrl 'http://run.journeyapps.test'
-        builder_args.push(builder_bin);
-        builder_args.push('--src', project_path);
-        builder_args.push(`--out`, path.join(dest, task.task_name));
-        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'); // TODO: handle this from feature flags somehow
-        console.debug(`[${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.error(`[${task.task_name}] FAILED TO RUN BUILDER SCRIPT`);
-            console.debug(`[${task.task_name}] STDOUT: ${builderSpawnResult.stdout}`);
-            console.debug(`[${task.task_name}] STDERR: ${builderSpawnResult.stderr}`);
-        }
-        else {
-            // NOTE/FIXME?: a CLOUDCODE/BUILD/BUILD_FAILED build failure (eg. TS error in task) lands here, with the output in stderr.
-            console.debug(`[${task.task_name}] SCRIPT SUCCESS`);
-            console.debug(`[${task.task_name}] STDOUT: ${builderSpawnResult.stdout}`);
-            console.debug(`[${task.task_name}] STDERR: ${builderSpawnResult.stderr}`);
-        }
-        console.debug('----');
-    }
-}
+// Detect tasks in given path and build them.
+async function buildTasks(src, dest, only) { }
 exports.buildTasks = buildTasks;
+// Build a single task in the specified subdirectory.
+async function buildTask(src, dest, config) { }
 //# sourceMappingURL=builder.js.map

package/dist/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":";;;AAEA,6CAA6C;AACtC,KAAK,UAAU,UAAU,CAAC,GAAW,EAAE,IAAY,EAAE,IAAa,IAAG,CAAC;AAA7E,gCAA6E;AAE7E,qDAAqD;AACrD,KAAK,UAAU,SAAS,CAAC,GAAW,EAAE,IAAY,EAAE,MAAW,IAAG,CAAC"}

package/dist/cli.js

@@ -27,27 +27,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const yargs = __importStar(require("yargs"));
 const _1 = require("./");
 const DEFAULT_SRC_PATH = './';
-const DEFAULT_OUT_PATH = './dist';
+const DEFAULT_OUT_PATH = '';
 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 })
-        // 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 }));
+        .option('out', { default: DEFAULT_OUT_PATH });
 }, handled(async (argv) => {
-    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, argv.only);
+    // 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);
 }))
     .option('verbose', {
     alias: 'v',

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAA+B;AAE/B,yBAA8C;AAE9C,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,MAAM,gBAAgB,GAAG,QAAQ,CAAC;AAElC,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;QAC7C,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,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3D,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,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"}

package/dist/index.d.ts

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

package/dist/index.js

@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B;AAC1B,8CAA4B"}

package/dist/installer.d.ts

@@ -0,0 +1 @@
+export declare function prepareBuildEnvForTasks(project_path: string, only?: string): Promise<void>;

package/dist/installer.js

@@ -0,0 +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.prepareBuildEnvForTasks = void 0;
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const jetpack = __importStar(require("fs-jetpack"));
+const semver = __importStar(require("semver"));
+const utils = __importStar(require("./utils"));
+const SUPPORTED_VERSIONS = [
+    {
+        version: '1.12.0',
+        node: '16.19.1' // FIXME: this is maybe brittle?
+    },
+    {
+        version: '1.11.2',
+        node: '14.21.3'
+    },
+    {
+        version: '1.11.1',
+        node: '14.21.3'
+    },
+    {
+        version: '1.11.0',
+        node: '14.21.3'
+    }
+];
+async function prepareBuildEnvForTasks(project_path, only) {
+    const package_files = await jetpack.findAsync(path.join(project_path, 'cloudcode'), { 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);
+        if (!pm) {
+            return false;
+        }
+        const taskName = pm[1];
+        if (only != null && only != taskName) {
+            // !(only.indexOf(taskName) >= 0)
+            return false;
+        }
+        return true;
+    });
+    // FIXME: Would it be better to map out required node_versions and subsequently install them, or is this in-line approach okay?
+    /* TODO:
+         How to install and execute custom node version in a portable way?
+            - install to predictable path inside project dir, which is writeable in the container.
+                But how to run it from inside task dirs? local bin? ENV?
+                What about yarn for each node version?
+    */
+    for (const pkg_path of filtered_package_files) {
+        try {
+            const content = await fs.promises.readFile(pkg_path, { encoding: 'utf-8' });
+            const task_package = JSON.parse(content);
+            const task_version = task_package?.cloudcode?.runtime;
+            // check task version against supported versions, install relevant node version and yarn
+            console.log(`Detected task version ${task_version}`);
+            const matching = SUPPORTED_VERSIONS.find((v) => {
+                return semver.satisfies(v.version, task_version);
+            });
+            if (!matching) {
+                console.error('FIXME: unsupported version');
+            }
+            console.log(`Matching versions: ${JSON.stringify(matching)}`);
+            const running_node_version = process.versions.node;
+            if (matching?.node && semver.major(matching.node) !== semver.major(running_node_version)) {
+                console.log(`Task requires different node version: v${matching.node}`);
+                const NODE_VERSION = matching.node;
+                const custom_node_path = path.resolve(`node-${semver.major(NODE_VERSION)}`);
+                if (!jetpack.exists(custom_node_path)) {
+                    await jetpack.dirAsync(custom_node_path);
+                    await utils.downloadAndInstallNode(NODE_VERSION, custom_node_path);
+                }
+            }
+        }
+        catch (err) {
+            console.error(`ERROR: ${err}`);
+            // todo: check for enoent and skip?
+            // todo: if json error, throw a CC build error?
+        }
+    }
+}
+exports.prepareBuildEnvForTasks = prepareBuildEnvForTasks;
+//# sourceMappingURL=installer.js.map

package/dist/installer.js.map

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

package/dist/utils.d.ts

@@ -1,11 +1,2 @@
-export declare function downloadAndInstallNode(node_version: string, destination: string): Promise<{
-    bin_path: string;
-    node_bin: string;
-    npm_bin: string;
-}>;
-export declare function nodePaths(destination: string): {
-    bin_path: string;
-    node_bin: string;
-    npm_bin: string;
-};
+export declare function downloadAndInstallNode(node_version: string, destination: string): Promise<void>;
 export declare function downloadAndExtractTarball(url: string, dest: string): Promise<void>;

package/dist/utils.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadAndExtractTarball = exports.nodePaths = exports.downloadAndInstallNode = void 0;
+exports.downloadAndExtractTarball = exports.downloadAndInstallNode = void 0;
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const path = __importStar(require("node:path"));
 const fs = __importStar(require("node:fs"));
@@ -37,93 +37,46 @@ const tar = __importStar(require("tar"));
     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 PLATFORM = 'x';
-    // const node_download_url = `https://nodejs.org/dist/v${node_version}/node-v${node_version}-linux-${PLATFORM}64.tar.gz`;
-    // TODO: this is just for dev for now. Find a better fix.
-    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`;
+    const PLATFORM = 'x';
+    const node_download_url = `https://nodejs.org/dist/v${node_version}/node-v${node_version}-linux-${PLATFORM}64.tar.gz`;
     await downloadAndExtractTarball(node_download_url, destination);
     // TODO: move binaries into local bin path?
-    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')
-    };
-}
-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);
+    const file = fs.createWriteStream(download);
+    const response = await (0, node_fetch_1.default)(url);
+    if (!response.ok) {
+        const errorBody = await response.text();
+        throw new Error(`Failed to download: ${errorBody}`);
     }
-    await new Promise(async (resolve, reject) => {
-        console.log(`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}`);
-        }
-        // FIXME: replace with webstreams? but according to the types package webstreams aren't available in node 16?!??
-        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.log('Extracting...', download);
-                // const comp = fs.createReadStream(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.log(`Moving extracted files from ${uncomp} to ${dist}`);
-                    fs.renameSync(uncomp, dist);
-                }
-                else {
-                    console.log(`Can't find extract dir ${uncomp}`);
-                }
-                // FIXME: this seems to sometimes cause errors
-                /*
-                ----
-        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);
-            }
-            catch (err) {
-                reject(err);
-            }
+    // FIXME: replace with webstreams?
+    response.body.pipe(file);
+    file.on('finish', async () => {
+        console.log('Extracting...', download);
+        const comp = fs.createReadStream(download);
+        tar.extract({
+            cwd: tmpdir,
+            file: comp.path,
+            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.log(`Moving extracted files from ${uncomp} to ${dist}`);
+            fs.renameSync(uncomp, dist);
+        }
+        fs.unlinkSync(file.path);
     });
 }
 exports.downloadAndExtractTarball = downloadAndExtractTarball;

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA+B;AAC/B,gDAAkC;AAClC,4CAA8B;AAC9B,4CAA8B;AAC9B,8CAAgC;AAChC,yCAA2B;AAE3B;;;EAGE;AACF,8EAA8E;AACvE,KAAK,UAAU,sBAAsB,CAAC,YAAoB,EAAE,WAAmB;IACpF,sEAAsE;IAEtE,wBAAwB;IACxB,yHAAyH;IAEzH,yDAAyD;IACzD,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;IACvB,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC/B,MAAM,iBAAiB,GAAG,4BAA4B,YAAY,UAAU,YAAY,IAAI,QAAQ,IAAI,IAAI,SAAS,CAAC;IAEtH,MAAM,yBAAyB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAChE,2CAA2C;IAC3C,OAAO,SAAS,CAAC,WAAW,CAAC,CAAC;AAChC,CAAC;AAdD,wDAcC;AAED,SAAgB,SAAS,CAAC,WAAmB;IAC3C,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;QAC1C,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC;QAClD,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC;KACjD,CAAC;AACJ,CAAC;AAND,8BAMC;AAEM,KAAK,UAAU,yBAAyB,CAAC,GAAW,EAAE,IAAY;IACvE,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;IAE3B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAkB,CAAC,CAAC;IAClE,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE7C,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC3B,OAAO,CAAC,KAAK,CAAC,gBAAgB,QAAQ,EAAE,CAAC,CAAC;QAC1C,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;KACzB;IAED,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,SAAS,QAAQ,EAAE,CAAC,CAAC;QAEhD,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;YAChB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;SACrD;QAED,gHAAgH;QAChH,MAAM,IAAI,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,gEAAgE;QAC7G,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC3B,IAAI;gBACF,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;gBAEvC,8CAA8C;gBAE9C,GAAG,CAAC,OAAO,CAAC;oBACV,GAAG,EAAE,MAAM;oBACX,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,IAAI;iBACX,CAAC,CAAC;gBAEH,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAEvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChC,+CAA+C;gBAC/C,6BAA6B;gBAC7B,0CAA0C;gBAC1C,IAAI;gBACJ,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;oBACzB,OAAO,CAAC,GAAG,CAAC,+BAA+B,MAAM,OAAO,IAAI,EAAE,CAAC,CAAC;oBAChE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;iBAC7B;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;iBACjD;gBAED,8CAA8C;gBAC9C;;;;;;;;;;;;;;;kBAeE;gBACF,4BAA4B;gBAE5B,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA5ED,8DA4EC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA+B;AAC/B,gDAAkC;AAClC,4CAA8B;AAC9B,4CAA8B;AAC9B,8CAAgC;AAChC,yCAA2B;AAE3B;;;EAGE;AACK,KAAK,UAAU,sBAAsB,CAAC,YAAoB,EAAE,WAAmB;IACpF,sEAAsE;IACtE,MAAM,QAAQ,GAAG,GAAG,CAAC;IACrB,MAAM,iBAAiB,GAAG,4BAA4B,YAAY,UAAU,YAAY,UAAU,QAAQ,WAAW,CAAC;IAEtH,MAAM,yBAAyB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAChE,2CAA2C;AAC7C,CAAC;AAPD,wDAOC;AAEM,KAAK,UAAU,yBAAyB,CAAC,GAAW,EAAE,IAAY;IACvE,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;IAE3B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAkB,CAAC,CAAC;IAClE,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE7C,MAAM,IAAI,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QAChB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;KACrD;IAED,kCAAkC;IAClC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEzB,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAC3B,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAEvC,MAAM,IAAI,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAE3C,GAAG,CAAC,OAAO,CAAC;YACV,GAAG,EAAE,MAAM;YACX,IAAI,EAAE,IAAI,CAAC,IAAc;YACzB,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChC,+CAA+C;QAC/C,6BAA6B;QAC7B,0CAA0C;QAC1C,IAAI;QACJ,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACzB,OAAO,CAAC,GAAG,CAAC,+BAA+B,MAAM,OAAO,IAAI,EAAE,CAAC,CAAC;YAChE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SAC7B;QAED,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC;AA1CD,8DA0CC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@journeyapps/cloudcode-build-agent",
-  "version": "0.0.0-dev.6fdb5b1",
+  "version": "0.0.0-dev.90a9f01",
   "description": "",
   "main": "./dist/index",
   "types": "./dist/index",
@@ -10,15 +10,13 @@
   },
   "dependencies": {
     "fs-jetpack": "5.1.0",
-    "lodash": "4.17.21",
     "node-fetch": "<3",
     "semver": "7.3.8",
     "tar": "6.1.13",
     "yargs": "17.6.2"
   },
   "devDependencies": {
-    "@types/lodash": "4.14.191",
-    "@types/node": "16.11.7",
+    "@types/node": "^18.6.3",
     "@types/node-fetch": "2.6.2",
     "@types/semver": "7.3.13",
     "@types/tar": "6.1.4",

package/src/builder.ts

@@ -1,101 +1,7 @@
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as jetpack from 'fs-jetpack';
-import * as semver from 'semver';
-import * as utils from './utils';
 import { spawnSync } from 'child_process';
-import { detectTasks } from './detect_tasks';
 
-import * as _ from 'lodash';
+// Detect tasks in given path and build them.
+export async function buildTasks(src: string, dest: string, only?: string) {}
 
-export type GeneralTaskConfig = {
-  app_id: string;
-  env: string;
-  backend_id: string;
-  backend_url: string;
-};
-
-export async function buildTasks(project_path: string, dest: string, config: GeneralTaskConfig, only?: string) {
-  const tasks = await detectTasks(project_path, only);
-
-  const required_node_versions = _.compact(tasks.map((t) => t.required_node_version));
-  const install_node_versions = _.uniq(required_node_versions);
-
-  // FIXME: Maybe refactor this section into an ensureNodeVersion (or something) that returns the relevant toolpaths?
-  const tool_paths: Record<string, { bin_path: string; node_bin: string; npm_bin: string }> = {};
-  // 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')
-  };
-  tool_paths[process.version] = default_tool_paths;
-
-  for (const required_node_version of install_node_versions) {
-    const custom_node_path = path.resolve(`node-${semver.major(required_node_version)}`);
-
-    if (!jetpack.exists(path.join(custom_node_path, 'bin/node'))) {
-      console.debug(`installing to ${custom_node_path}`);
-      await jetpack.dirAsync(custom_node_path);
-      await utils.downloadAndInstallNode(required_node_version, custom_node_path);
-    } else {
-      console.debug(`already installed in ${custom_node_path}`);
-    }
-    tool_paths[required_node_version] = utils.nodePaths(custom_node_path);
-  }
-  console.debug('----');
-
-  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;
-    const { bin_path, node_bin, npm_bin } = tool_paths[node_version];
-    const builder_bin = path.resolve(bin_path, builder_script);
-
-    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_version}`);
-    // 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 = spawnSync(node_bin, [npm_bin, '--global', 'install', builder_package], { cwd: project_path });
-    if (spawnResult.status != 0) {
-      console.error(`[${task.task_name}] failed to install ${builder_package}`);
-      console.debug(`[${task.task_name}] STDOUT: ${spawnResult.stdout}`);
-      console.debug(`[${task.task_name}] STDERR: ${spawnResult.stderr}`);
-      throw new Error(`Failed to install builder script for task ${task.task_name}`);
-    }
-    if (!jetpack.exists(builder_bin)) {
-      console.error(`[${task.task_name}] ${builder_bin} not found`);
-      throw new Error(`Builder script not found for task ${task.task_name}`);
-    }
-
-    const builder_args: string[] = [];
-    // --src ./ --out ./dist/echo --task echo --appId 'appid' --env 'testing' --backendId 'backendid' --backendUrl 'http://run.journeyapps.test'
-    builder_args.push(builder_bin);
-    builder_args.push('--src', project_path);
-    builder_args.push(`--out`, path.join(dest, task.task_name));
-    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'); // TODO: handle this from feature flags somehow
-
-    console.debug(`[${task.task_name}] Trying: ${node_bin} ${builder_args.join(' ')}`);
-
-    const builderSpawnResult = spawnSync(node_bin, builder_args, { cwd: project_path });
-
-    if (builderSpawnResult.status !== 0) {
-      console.error(`[${task.task_name}] FAILED TO RUN BUILDER SCRIPT`);
-      console.debug(`[${task.task_name}] STDOUT: ${builderSpawnResult.stdout}`);
-      console.debug(`[${task.task_name}] STDERR: ${builderSpawnResult.stderr}`);
-    } else {
-      // NOTE/FIXME?: a CLOUDCODE/BUILD/BUILD_FAILED build failure (eg. TS error in task) lands here, with the output in stderr.
-      console.debug(`[${task.task_name}] SCRIPT SUCCESS`);
-      console.debug(`[${task.task_name}] STDOUT: ${builderSpawnResult.stdout}`);
-      console.debug(`[${task.task_name}] STDERR: ${builderSpawnResult.stderr}`);
-    }
-    console.debug('----');
-  }
-}
+// Build a single task in the specified subdirectory.
+async function buildTask(src: string, dest: string, config: any) {}