@dagger.io/dagger 0.1.0 → 0.2.0

package/dist/api/utils.js

@@ -1,40 +1,112 @@
-export function queryBuilder(q) {
-    const args = (item) => {
-        const regex = /\{"[a-zA-Z]+"/gi;
-        const entries = Object.entries(item.args)
-            .filter((value) => value[1] !== undefined)
-            .map((value) => {
-            if (typeof value[1] === "object") {
-                return `${value[0]}: ${JSON.stringify(value[1]).replace(regex, (str) => str.replace(/"/g, ""))}`;
-            }
-            if (typeof value[1] === "number") {
-                return `${value[0]}: ${value[1]}`;
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { gql } from "graphql-request";
+function buildArgs(item) {
+    const entries = Object.entries(item.args)
+        .filter((value) => value[1] !== undefined)
+        .map((value) => {
+        return `${value[0]}: ${JSON.stringify(value[1]).replace(/\{"[a-zA-Z]+"/gi, (str) => str.replace(/"/g, ""))}`;
+    });
+    if (entries.length === 0) {
+        return "";
+    }
+    return "(" + entries + ")";
+}
+/**
+ * Find querytree, convert them into GraphQl query
+ * then compute and return the result to the appropriate field
+ */
+function computeNestedQuery(query, client) {
+    return __awaiter(this, void 0, void 0, function* () {
+        /**
+         * Check if there is a nested queryTree to be executed
+         */
+        const isQueryTree = (value) => Object.keys(value).find((val) => val === "_queryTree");
+        for (const q of query) {
+            if (q.args !== undefined) {
+                yield Promise.all(Object.entries(q.args).map((val) => __awaiter(this, void 0, void 0, function* () {
+                    if (val[1] instanceof Object && isQueryTree(val[1])) {
+                        // push an id that will be used by the container
+                        val[1]["_queryTree"].push({ operation: "id" });
+                        const getQueryTree = buildQuery(val[1]["_queryTree"]);
+                        const result = yield compute(getQueryTree, client);
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        //@ts-ignore
+                        q.args[val[0]] = result;
+                    }
+                })));
             }
-            return `${value[0]}: "${value[1]}"`;
-        });
-        if (entries.length === 0) {
-            return "";
         }
-        return "(" + entries + ")";
-    };
+    });
+}
+/**
+ * Convert the queryTree into a GraphQL query
+ * @param q
+ * @returns
+ */
+export function buildQuery(q) {
     let query = "{";
     q.forEach((item, index) => {
         query += `
-        ${item.operation} ${item.args ? `${args(item)}` : ""} ${q.length - 1 !== index ? "{" : "}".repeat(q.length - 1)}
+        ${item.operation} ${item.args ? `${buildArgs(item)}` : ""} ${q.length - 1 !== index ? "{" : "}".repeat(q.length - 1)}
       `;
     });
     query += "}";
-    return query.replace(/\s+/g, "");
+    return query;
+}
+/**
+ * Convert querytree into a Graphql query then compute it
+ * @param q | QueryTree[]
+ * @param client | GraphQLClient
+ * @returns
+ */
+export function queryBuilder(q, client) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield computeNestedQuery(q, client);
+        const query = buildQuery(q);
+        const result = yield compute(query, client);
+        return result;
+    });
 }
-export function queryFlatten(res) {
-    if (res.errors)
-        throw res.errors[0];
-    return Object.assign({}, ...(function _flatten(o) {
-        return [].concat(...Object.keys(o).map((k) => {
-            if (typeof o[k] === "object" && !(o[k] instanceof Array))
-                return _flatten(o[k]);
-            else
-                return { [k]: o[k] };
-        }));
-    })(res));
+/**
+ * Return a Graphql query result flattened
+ * @param response any
+ * @returns
+ */
+export function queryFlatten(response) {
+    // Recursion break condition
+    // If our response is not an object or an array we assume we reached the value
+    if (!(response instanceof Object) || Array.isArray(response)) {
+        return response;
+    }
+    const keys = Object.keys(response);
+    if (keys.length != 1) {
+        // Dagger is currently expecting to only return one value
+        // If the response is nested in a way were more than one object is nested inside throw an error
+        // TODO Throw sensible Error
+        throw new Error("Too many Graphql nested objects");
+    }
+    const nestedKey = keys[0];
+    return queryFlatten(response[nestedKey]);
+}
+/**
+ * Send a GraphQL document to the server
+ * return a flatten result
+ * @hidden
+ */
+export function compute(query, client) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const computeQuery = yield client.request(gql `
+      ${query}
+    `);
+        return queryFlatten(computeQuery);
+    });
 }

package/dist/provisioning/bin/bin.d.ts

@@ -0,0 +1,21 @@
+import { ConnectOpts, EngineConn } from "../engineconn.js";
+import Client from "../../api/client.gen.js";
+/**
+ * Bin runs an engine session from a specified binary
+ */
+export declare class Bin implements EngineConn {
+    private subProcess?;
+    private path;
+    constructor(u: URL);
+    Addr(): string;
+    Connect(opts: ConnectOpts): Promise<Client>;
+    /**
+     * runEngineSession execute the engine binary and set up a GraphQL client that
+     * target this engine.
+     * TODO:(sipsma) dedupe this with equivalent code in image.ts
+     */
+    private runEngineSession;
+    private readPort;
+    Close(): Promise<void>;
+}
+//# sourceMappingURL=bin.d.ts.map

package/dist/provisioning/bin/bin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../../../provisioning/bin/bin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAG1D,OAAO,MAAM,MAAM,yBAAyB,CAAA;AAE5C;;GAEG;AACH,qBAAa,GAAI,YAAW,UAAU;IACpC,OAAO,CAAC,UAAU,CAAC,CAAmB;IAEtC,OAAO,CAAC,IAAI,CAAQ;gBAER,CAAC,EAAE,GAAG;IAQlB,IAAI,IAAI,MAAM;IAIR,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjD;;;;OAIG;YACW,gBAAgB;YAqChB,QAAQ;IAShB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B"}

package/dist/provisioning/bin/bin.js

@@ -0,0 +1,112 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+import readline from "readline";
+import { execaCommand } from "execa";
+import Client from "../../api/client.gen.js";
+/**
+ * Bin runs an engine session from a specified binary
+ */
+export class Bin {
+    constructor(u) {
+        this.path = u.host + u.pathname;
+        if (this.path == "") {
+            // this results in execa looking for it in the $PATH
+            this.path = "dagger-engine-session";
+        }
+    }
+    Addr() {
+        return "http://dagger";
+    }
+    Connect(opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.runEngineSession(this.path, opts);
+        });
+    }
+    /**
+     * runEngineSession execute the engine binary and set up a GraphQL client that
+     * target this engine.
+     * TODO:(sipsma) dedupe this with equivalent code in image.ts
+     */
+    runEngineSession(engineSessionBinPath, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const engineSessionArgs = [engineSessionBinPath];
+            if (opts.Workdir) {
+                engineSessionArgs.push("--workdir", opts.Workdir);
+            }
+            if (opts.Project) {
+                engineSessionArgs.push("--project", opts.Project);
+            }
+            this.subProcess = execaCommand(engineSessionArgs.join(" "), {
+                stderr: opts.LogOutput || "ignore",
+                // Kill the process if parent exit.
+                cleanup: true,
+            });
+            const stdoutReader = readline.createInterface({
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                input: this.subProcess.stdout,
+            });
+            const port = yield Promise.race([
+                this.readPort(stdoutReader),
+                new Promise((_, reject) => {
+                    setTimeout(() => {
+                        reject(new Error("timeout reading port from engine session"));
+                    }, 300000).unref(); // long timeout to account for extensions, though that should be optimized in future
+                }),
+            ]);
+            return new Client({ host: `127.0.0.1:${port}` });
+        });
+    }
+    readPort(stdoutReader) {
+        var _a, stdoutReader_1, stdoutReader_1_1;
+        var _b, e_1, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                for (_a = true, stdoutReader_1 = __asyncValues(stdoutReader); stdoutReader_1_1 = yield stdoutReader_1.next(), _b = stdoutReader_1_1.done, !_b;) {
+                    _d = stdoutReader_1_1.value;
+                    _a = false;
+                    try {
+                        const line = _d;
+                        // Read line as a port number
+                        const port = parseInt(line);
+                        return port;
+                    }
+                    finally {
+                        _a = true;
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_a && !_b && (_c = stdoutReader_1.return)) yield _c.call(stdoutReader_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            throw new Error("failed to read port from engine session");
+        });
+    }
+    Close() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if ((_a = this.subProcess) === null || _a === void 0 ? void 0 : _a.pid) {
+                this.subProcess.kill("SIGTERM", {
+                    forceKillAfterTimeout: 2000,
+                });
+            }
+        });
+    }
+}

package/dist/provisioning/bin/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./bin.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/provisioning/bin/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../provisioning/bin/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA"}

package/dist/provisioning/bin/index.js

@@ -0,0 +1 @@
+export * from "./bin.js";

package/dist/provisioning/default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../provisioning/default.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY,QAAwC,CAAA"}
+{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../provisioning/default.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,QAAwC,CAAA"}

package/dist/provisioning/default.js

@@ -1,2 +1,3 @@
-const DEFAULT_IMAGE_REF = "ghcr.io/dagger/engine:v0.3.4@sha256:666b958a2f716c0d6b22d869c585d6fe07954133ec769bb3d1f310e931cb118f";
+// Code generated by dagger. DO NOT EDIT.
+const DEFAULT_IMAGE_REF = "ghcr.io/dagger/engine:v0.3.6@sha256:d124de285773409fd83d203d3f46364e20149ee46842c50eec6cc51c50fffb62";
 export const DEFAULT_HOST = `docker-image://${DEFAULT_IMAGE_REF}`;

package/dist/provisioning/docker-provision/image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../provisioning/docker-provision/image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAM1D,OAAO,MAAM,MAAM,yBAAyB,CAAA;AAqD5C;;;GAGG;AACH,qBAAa,WAAY,YAAW,UAAU;IAC5C,OAAO,CAAC,QAAQ,CAAU;IAE1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAGxB;IAED,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA0B;IAEvE,OAAO,CAAC,UAAU,CAAC,CAAmB;gBAE1B,CAAC,EAAE,GAAG;IAIlB;;OAEG;IACH,OAAO,CAAC,WAAW;IAInB,IAAI,IAAI,MAAM;IAIR,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAWjD;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAItB;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAWpB;;OAEG;IACH,OAAO,CAAC,cAAc;IAStB;;OAEG;IACH,OAAO,CAAC,YAAY;IASpB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IA+D5B;;;OAGG;YACW,gBAAgB;YAyChB,QAAQ;IAShB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../provisioning/docker-provision/image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAM1D,OAAO,MAAM,MAAM,yBAAyB,CAAA;AAqD5C;;;GAGG;AACH,qBAAa,WAAY,YAAW,UAAU;IAC5C,OAAO,CAAC,QAAQ,CAAU;IAE1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAGxB;IAED,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA0B;IAEvE,OAAO,CAAC,UAAU,CAAC,CAAmB;gBAE1B,CAAC,EAAE,GAAG;IAIlB;;OAEG;IACH,OAAO,CAAC,WAAW;IAInB,IAAI,IAAI,MAAM;IAIR,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAWjD;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAItB;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAWpB;;OAEG;IACH,OAAO,CAAC,cAAc;IAStB;;OAEG;IACH,OAAO,CAAC,YAAY;IASpB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IA+D5B;;;OAGG;YACW,gBAAgB;YA4ChB,QAAQ;IAShB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B"}

package/dist/provisioning/docker-provision/image.js

@@ -195,11 +195,11 @@ export class DockerImage {
      */
     runEngineSession(engineSessionBinPath, opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            const engineSessionArgs = [
-                engineSessionBinPath,
-                "--remote",
-                `docker-image://${this.imageRef.Ref}`,
-            ];
+            const env = process.env;
+            if (!env.DAGGER_RUNNER_HOST) {
+                env.DAGGER_RUNNER_HOST = `docker-image://${this.imageRef.Ref}`;
+            }
+            const engineSessionArgs = [engineSessionBinPath];
             if (opts.Workdir) {
                 engineSessionArgs.push("--workdir", opts.Workdir);
             }
@@ -210,6 +210,7 @@ export class DockerImage {
                 stderr: opts.LogOutput || "ignore",
                 // Kill the process if parent exit.
                 cleanup: true,
+                env: env,
             });
             const stdoutReader = readline.createInterface({
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/dist/provisioning/provisioner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisioner.d.ts","sourceRoot":"","sources":["../../provisioning/provisioner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAW5C;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAWvD"}
+{"version":3,"file":"provisioner.d.ts","sourceRoot":"","sources":["../../provisioning/provisioner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAa5C;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAWvD"}

package/dist/provisioning/provisioner.js

@@ -1,8 +1,10 @@
 import { DockerImage } from "./docker-provision/image.js";
 import { HTTP } from "./http/http.js";
+import { Bin } from "./bin/bin.js";
 const provisioners = {
     "docker-image": (u) => new DockerImage(u),
     http: (u) => new HTTP(u),
+    bin: (u) => new Bin(u),
 };
 /**
  * getProvisioner returns a ready to use Engine connector.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dagger.io/dagger",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "author": "hello@dagger.io",
   "license": "Apache-2.0",
   "types": "./dist/index.d.ts",
@@ -17,7 +17,7 @@
   "main": "dist/index.js",
   "dependencies": {
     "@lifeomic/axios-fetch": "^3.0.1",
-    "axios": "^1.1.2",
+    "axios": "^1.2.0",
     "execa": "^6.1.0",
     "graphql": "^16.5.0",
     "graphql-request": "^5.0.0",
@@ -29,18 +29,18 @@
     "test": "mocha",
     "gen:typedoc": "yarn typedoc",
     "lint": "yarn eslint --max-warnings=0 .",
-    "fmt": "yarn eslint --fix ."
+    "fmt": "yarn eslint --fix"
   },
   "devDependencies": {
     "@types/mocha": "latest",
     "@types/node": "~16",
-    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.42.1",
-    "eslint": "^8.27.0",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.1.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.0",
     "ts-node": "^10.9.1",
     "typedoc": "^0.23.21",
     "typedoc-plugin-markdown": "^3.13.6",