@tsplc/build 0.1.0 → 0.2.0

package/dist/cli.js

@@ -133,6 +133,7 @@ class CodesysCompilerError extends Error {
   }
 }
 var buildFailureFile = ".codesys/docker/failure.json";
+var controllerFailureFile = ".codesys/controller/failure.txt";
 var buildFailureSchema = z2.strictObject({
   operationId: z2.uuid(),
   message: z2.string(),
@@ -199,8 +200,6 @@ var prepareContainerRun = async (config, requestDirectory, options) => {
     runtime: undefined
   }));
   return [
-    "run",
-    "--rm",
     "--init",
     ...config.docker?.cpuSet ? ["--cpuset-cpus", config.docker.cpuSet] : [],
     "--network",
@@ -228,6 +227,8 @@ var buildInDocker = async (config, image) => {
     const failurePath = resolve5(config.outDir, buildFailureFile);
     await rm3(failurePath, { force: true });
     const args = [
+      "run",
+      "--rm",
       ...await prepareContainerRun(config, requestDirectory, { network: "none", sources: true }),
       image,
       "--request",
@@ -975,6 +976,7 @@ import {
 
 // packages/build/src/controller-online.ts
 import { execFile as execFile4 } from "node:child_process";
+import { existsSync } from "node:fs";
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 import { mkdir as mkdir5, mkdtemp as mkdtemp3, readFile as readFile5, rm as rm5 } from "node:fs/promises";
 import { tmpdir as tmpdir3 } from "node:os";
@@ -1009,7 +1011,7 @@ var controllerResultSchema = z5.strictObject({
   state: z5.string().nonempty(),
   values: z5.record(z5.string(), z5.string())
 });
-var controllerOperation = async (config, operation, options) => {
+var controllerConnection = async (config) => {
   if (!config.docker || !config.online) {
     throw new Error("Docker image and online gateway/device configuration are required for controller operations");
   }
@@ -1022,20 +1024,30 @@ var controllerOperation = async (config, operation, options) => {
   const { stdout } = await execute4("docker", ["image", "inspect", "--format", "{{.Id}}", dockerImage], { timeout: config.timeouts.hostCommand }).catch((cause) => {
     throw new Error(`Cannot inspect Docker builder image ${dockerImage}. Install and start Docker, then run tsplc-build configure if the image is missing`, { cause });
   });
-  const imageId = imageIdSchema.parse(stdout.trim());
-  const templateHash = createHash2("sha256").update(await readFile5(config.template)).digest("hex");
-  const operationId = randomUUID2();
-  const target = {
-    network: config.online.network,
-    gateway: config.online.gateway,
-    device: config.online.device,
-    controller: config.controller
+  return {
+    environmentNames,
+    imageId: imageIdSchema.parse(stdout.trim()),
+    templateHash: createHash2("sha256").update(await readFile5(config.template)).digest("hex"),
+    target: {
+      network: config.online.network,
+      gateway: config.online.gateway,
+      device: config.online.device,
+      controller: config.controller
+    }
   };
+};
+var controllerOperation = async (config, operation, options) => {
+  const { environmentNames, imageId, templateHash, target } = await controllerConnection(config);
+  const operationId = randomUUID2();
   const requestDirectory = await mkdtemp3(resolve7(tmpdir3(), "codesys-controller-"));
   const diagnostics = resolve7(config.outDir, ".codesys/controller");
+  const failure = resolve7(config.outDir, controllerFailureFile);
   try {
     await mkdir5(config.outDir, { recursive: true });
+    await rm5(failure, { force: true });
     await runDocker([
+      "run",
+      "--rm",
       ...await prepareContainerRun(config, requestDirectory, {
         network: target.network,
         environment: environmentNames,
@@ -1051,7 +1063,13 @@ var controllerOperation = async (config, operation, options) => {
       imageId,
       ...options.initializeUser ? ["--initialize-user"] : [],
       ...options.read ? ["--read", JSON.stringify(options.read)] : []
-    ], (status) => `Docker controller operation failed (${status}). Inspect ${diagnostics} for diagnostics`);
+    ], (status) => `Docker controller operation failed (${status}). Inspect ${diagnostics} for diagnostics`).catch(async (cause) => {
+      if (!existsSync(failure))
+        throw cause;
+      const reason = (await readFile5(failure, "utf8")).trim().split(`
+`).at(-1);
+      throw new Error(`${reason}. Inspect ${diagnostics} for diagnostics`, { cause });
+    });
     const result = await readFile5(resolve7(diagnostics, "result.json"), "utf8").then((content) => controllerResultSchema.parse(JSON.parse(content))).catch((cause) => {
       throw new Error(`Docker did not produce a valid controller receipt. Inspect ${diagnostics} for diagnostics`, { cause });
     });
@@ -1065,6 +1083,32 @@ var controllerOperation = async (config, operation, options) => {
 };
 var updateController = (config, operation, options = {}) => controllerOperation(config, operation, options);
 var inspectController = (config, read) => controllerOperation(config, "inspect", { read });
+var loginCommandSchema = z5.discriminatedUnion("command", [
+  z5.strictObject({ command: z5.literal("state") }),
+  z5.strictObject({
+    command: z5.literal("read"),
+    expressions: z5.array(z5.string().nonempty()).nonempty()
+  }),
+  z5.strictObject({
+    command: z5.enum(["write", "force"]),
+    values: z5.record(z5.string().nonempty(), z5.string().nonempty())
+  }),
+  z5.strictObject({
+    command: z5.literal("unforce"),
+    expressions: z5.array(z5.string().nonempty()),
+    restore: z5.boolean()
+  }),
+  z5.strictObject({ command: z5.enum(["start", "stop"]) }),
+  z5.strictObject({ command: z5.literal("reset"), kind: z5.enum(["Warm", "Cold"]) })
+]);
+var loginResultSchema = z5.union([
+  z5.strictObject({ values: z5.record(z5.string(), z5.string()) }),
+  z5.strictObject({ state: z5.string(), forced: z5.array(z5.string()) })
+]);
+var loginReplySchema = z5.discriminatedUnion("ok", [
+  z5.strictObject({ ok: z5.literal(true), result: z5.unknown() }),
+  z5.strictObject({ ok: z5.literal(false), error: z5.string() })
+]);
 
 // packages/build/src/docker-build.ts
 import { execFile as execFile5 } from "node:child_process";
@@ -1648,5 +1692,5 @@ try {
   process.exitCode = 1;
 }
 
-//# debugId=B5CDCE065D7E468A64756E2164756E21
+//# debugId=C865C1ABFC6D750A64756E2164756E21
 //# sourceMappingURL=cli.js.map