@journeyapps/cloudcode-build-agent 0.0.0-dev.90a9f01 → 0.0.0-dev.9117f43

package/dist/installer.js

@@ -22,84 +22,113 @@ 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 fs = __importStar(require("node:fs"));
-const path = __importStar(require("node:path"));
+exports.ensureCustomNodeVersion = ensureCustomNodeVersion;
+exports.downloadAndInstallNode = downloadAndInstallNode;
+exports.nodePaths = nodePaths;
+exports.downloadAndExtractTarball = downloadAndExtractTarball;
 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'
+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);
     }
-];
-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;
+    else {
+        console.debug(`[node ${node_version}] Already installed in ${install_path}`);
+    }
+    return nodePaths(install_path);
+}
+/* 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);
+}
+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')
+    };
+}
+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);
+    }
+    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}`);
         }
-        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);
+        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);
+                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: the unlinking 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);
             }
-        }
-        catch (err) {
-            console.error(`ERROR: ${err}`);
-            // todo: check for enoent and skip?
-            // todo: if json error, throw a CC build error?
-        }
-    }
+            catch (err) {
+                reject(err);
+            }
+        });
+    });
 }
-exports.prepareBuildEnvForTasks = prepareBuildEnvForTasks;
 //# 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,3 @@
+import { SpawnStreamEvent } from './spawn-stream';
+import { SpawnOptions } from 'child_process';
+export declare function runCommand(command: string, args: string[], options?: Partial<SpawnOptions>): AsyncIterable<SpawnStreamEvent>;

package/dist/run.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runCommand = runCommand;
+const spawn_stream_1 = require("./spawn-stream");
+async function* runCommand(command, args, options) {
+    const { childProcess, stream } = (0, spawn_stream_1.spawnStream)(command, args, { cwd: options?.cwd, splitLines: true, ...options });
+    let exitCode = null;
+    for await (let event of stream) {
+        yield event;
+        if (event.exitCode != null) {
+            exitCode = event.exitCode;
+        }
+    }
+    if (exitCode != 0) {
+        throw new Error(`Command failed with code ${exitCode}`);
+    }
+}
+//# sourceMappingURL=run.js.map

package/dist/run.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":";;AAGA,gCAmBC;AAtBD,iDAA+D;AAGxD,KAAK,SAAS,CAAC,CAAC,UAAU,CAC/B,OAAe,EACf,IAAc,EACd,OAA+B;IAE/B,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,IAAA,0BAAW,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAEjH,IAAI,QAAQ,GAAkB,IAAI,CAAC;IAEnC,IAAI,KAAK,EAAE,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;QAC/B,MAAM,KAAK,CAAC;QACZ,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC3B,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC"}

package/dist/spawn-stream.d.ts

@@ -0,0 +1,14 @@
+import { SpawnOptions } from 'child_process';
+export interface StreamOptions {
+    splitLines?: boolean;
+}
+export declare function spawnStream(command: string, args: string[], options: SpawnOptions & StreamOptions): {
+    childProcess: import("child_process").ChildProcessWithoutNullStreams;
+    stream: AsyncIterable<SpawnStreamEvent>;
+};
+export interface SpawnStreamEvent {
+    event: 'stdout' | 'stderr' | 'exit';
+    stdout?: string;
+    stderr?: string;
+    exitCode?: number;
+}

package/dist/spawn-stream.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.spawnStream = spawnStream;
+const child_process_1 = require("child_process");
+const stream_1 = require("stream");
+function spawnStream(command, args, options) {
+    const process = (0, child_process_1.spawn)(command, args, {
+        ...options,
+        stdio: 'pipe'
+    });
+    return {
+        childProcess: process,
+        stream: processToStream(process, options)
+    };
+}
+function processToStream(process, options) {
+    const combinedStream = new stream_1.PassThrough({ objectMode: true });
+    async function* transform(stream, key) {
+        stream.setEncoding('utf-8');
+        let iterable = stream;
+        if (options.splitLines) {
+            iterable = splitLines(iterable);
+        }
+        for await (const chunk of iterable) {
+            yield {
+                event: key,
+                [key]: chunk
+            };
+        }
+    }
+    if (process.stdout) {
+        stream_1.Readable.from(transform(process.stdout, 'stdout')).pipe(combinedStream, { end: false });
+    }
+    if (process.stderr) {
+        stream_1.Readable.from(transform(process.stderr, 'stderr')).pipe(combinedStream, { end: false });
+    }
+    process.on('exit', (code) => {
+        combinedStream.write({ exitCode: code }, () => {
+            combinedStream.end();
+        });
+    });
+    return combinedStream;
+}
+async function* splitLines(stream) {
+    let buffer = '';
+    for await (const chunk of stream) {
+        buffer += chunk;
+        const lines = buffer.split('\n');
+        buffer = lines.pop();
+        for (let line of lines) {
+            yield `${line}\n`;
+        }
+    }
+    if (buffer) {
+        yield buffer;
+    }
+}
+//# sourceMappingURL=spawn-stream.js.map

package/dist/spawn-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spawn-stream.js","sourceRoot":"","sources":["../src/spawn-stream.ts"],"names":[],"mappings":";;AAOA,kCAUC;AAjBD,iDAAkE;AAClE,mCAA+C;AAM/C,SAAgB,WAAW,CAAC,OAAe,EAAE,IAAc,EAAE,OAAqC;IAChG,MAAM,OAAO,GAAG,IAAA,qBAAK,EAAC,OAAO,EAAE,IAAI,EAAE;QACnC,GAAG,OAAO;QACV,KAAK,EAAE,MAAM;KACd,CAAC,CAAC;IAEH,OAAO;QACL,YAAY,EAAE,OAAO;QACrB,MAAM,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC;KAC1C,CAAC;AACJ,CAAC;AASD,SAAS,eAAe,CAAC,OAAqB,EAAE,OAAsB;IACpE,MAAM,cAAc,GAAG,IAAI,oBAAW,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAE7D,KAAK,SAAS,CAAC,CAAC,SAAS,CAAC,MAAgB,EAAE,GAAwB;QAClE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,QAAQ,GAA0B,MAAM,CAAC;QAC7C,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YACnC,MAAM;gBACJ,KAAK,EAAE,GAAG;gBACV,CAAC,GAAG,CAAC,EAAE,KAAK;aACb,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,iBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1F,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,iBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAmB,EAAE,EAAE;QACzC,cAAc,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE;YAC5C,cAAc,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,KAAK,SAAS,CAAC,CAAC,UAAU,CAAC,MAA6B;IACtD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC;QAChB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;QACtB,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,GAAG,IAAI,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,CAAC;IACf,CAAC;AACH,CAAC"}

package/package.json

@@ -1,27 +1,37 @@
 {
   "name": "@journeyapps/cloudcode-build-agent",
-  "version": "0.0.0-dev.90a9f01",
-  "description": "",
+  "version": "0.0.0-dev.9117f43",
+  "description": "Detect CloudCode tasks in a JourneyApps App and build them for installation on AWS Lambda",
   "main": "./dist/index",
   "types": "./dist/index",
-  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
   "bin": {
     "cloudcode-build-agent": "./bin.js"
   },
+  "files": [
+    "bin.js",
+    "dist"
+  ],
   "dependencies": {
+    "child-process-promise": "^2.2.1",
     "fs-jetpack": "5.1.0",
+    "lodash": "4.17.21",
     "node-fetch": "<3",
-    "semver": "7.3.8",
-    "tar": "6.1.13",
-    "yargs": "17.6.2"
+    "semver": "7.6.3",
+    "tar": "7.4.3",
+    "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@types/node": "^18.6.3",
+    "@types/child-process-promise": "2.2.6",
+    "@types/lodash": "4.17.7",
+    "@types/node": "22.5.0",
     "@types/node-fetch": "2.6.2",
-    "@types/semver": "7.3.13",
-    "@types/tar": "6.1.4",
-    "@types/yargs": "17.0.22",
-    "typescript": "4.9.5"
+    "@types/semver": "7.5.8",
+    "@types/tar": "6.1.13",
+    "@types/yargs": "17.0.33",
+    "typescript": "5.5.4"
   },
   "scripts": {
     "build": "tsc -b"

package/dist/errors.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="node" />
-import { SpawnSyncReturns } from 'child_process';
-export declare class ProcessError extends Error {
-    result: SpawnSyncReturns<string>;
-    cause?: Error;
-    status: number;
-    constructor(result: SpawnSyncReturns<string>);
-}

package/dist/errors.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProcessError = void 0;
-class ProcessError extends Error {
-    constructor(result) {
-        super(constructMessage(result));
-        this.result = result;
-        if (result.error) {
-            this.cause = result.error;
-        }
-        this.status = result.status || 1;
-    }
-}
-exports.ProcessError = ProcessError;
-function constructMessage(result) {
-    if (result.error) {
-        return result.error.message;
-    }
-    return `${result.stdout}${result.stderr}`.trim();
-}
-//# sourceMappingURL=errors.js.map

package/dist/errors.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAa,SAAQ,KAAK;IAIrC,YAAmB,MAAgC;QACjD,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QADf,WAAM,GAAN,MAAM,CAA0B;QAGjD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;SAC3B;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;IACnC,CAAC;CACF;AAZD,oCAYC;AAED,SAAS,gBAAgB,CAAC,MAAgC;IACxD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,OAAO,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;KAC7B;IACD,OAAO,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;AACnD,CAAC"}

package/dist/utils.d.ts

@@ -1,2 +0,0 @@
-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

@@ -1,83 +0,0 @@
-"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;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-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"));
-const os = __importStar(require("node:os"));
-const URL = __importStar(require("node:url"));
-const tar = __importStar(require("tar"));
-/* 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
-*/
-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`;
-    await downloadAndExtractTarball(node_download_url, destination);
-    // TODO: move binaries into local bin path?
-}
-exports.downloadAndInstallNode = downloadAndInstallNode;
-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);
-    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}`);
-    }
-    // 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;
-//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +0,0 @@
-{"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/src/builder.ts

@@ -1,7 +0,0 @@
-import { spawnSync } from 'child_process';
-
-// Detect tasks in given path and build them.
-export async function buildTasks(src: string, dest: string, only?: string) {}
-
-// Build a single task in the specified subdirectory.
-async function buildTask(src: string, dest: string, config: any) {}

package/src/cli.ts

@@ -1,60 +0,0 @@
-#!/usr/bin/env node
-
-import * as yargs from 'yargs';
-
-import { ProcessError, buildTasks, prepareBuildEnvForTasks } from './';
-
-const DEFAULT_SRC_PATH = './';
-const DEFAULT_OUT_PATH = '';
-
-yargs
-  .command(
-    ['build', '$0'], // $0 means this is the default command
-    'build tasks',
-    (yargs) => {
-      return yargs
-        .option('only', { string: true })
-        .option('path', { default: DEFAULT_SRC_PATH })
-        .option('out', { default: DEFAULT_OUT_PATH });
-    },
-    handled(async (argv) => {
-      // iterate over task directories and run: 'yarn cloudcode-build'.
-      // optionally filtered by `argv.only` to build a single task.
-
-      await 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 prepareBuildEnvForTasks(argv.path, argv.only);
-    })
-  )
-  .option('verbose', {
-    alias: 'v',
-    default: false
-  }).argv;
-
-function handled<T>(fn: (argv: T) => Promise<void>): (argv: T) => Promise<void> {
-  return async (argv: T) => {
-    try {
-      await fn(argv);
-    } catch (err) {
-      if (err instanceof ProcessError) {
-        console.error(err.message);
-        process.exit(err.status);
-      } else {
-        console.error(err.stack);
-        process.exit(1);
-      }
-    }
-  };
-}

package/src/errors.ts

@@ -1,22 +0,0 @@
-import { SpawnSyncReturns } from 'child_process';
-
-export class ProcessError extends Error {
-  cause?: Error;
-  status: number;
-
-  constructor(public result: SpawnSyncReturns<string>) {
-    super(constructMessage(result));
-
-    if (result.error) {
-      this.cause = result.error;
-    }
-    this.status = result.status || 1;
-  }
-}
-
-function constructMessage(result: SpawnSyncReturns<string>): string {
-  if (result.error) {
-    return result.error.message;
-  }
-  return `${result.stdout}${result.stderr}`.trim();
-}

package/src/index.ts

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