@tsplc/build 0.2.8 → 0.2.9

package/dist/cli.js

@@ -62,7 +62,7 @@ var readBuild = async (directory) => {
 // packages/build/src/docker-build.ts
 import { execFile } from "node:child_process";
 import { randomUUID } from "node:crypto";
-import { cp as cp3, mkdir as mkdir3, mkdtemp as mkdtemp2, readFile as readFile3, rm as rm3 } from "node:fs/promises";
+import { cp as cp4, mkdir as mkdir3, mkdtemp as mkdtemp2, readFile as readFile3, rm as rm3 } from "node:fs/promises";
 import { tmpdir as tmpdir2 } from "node:os";
 import { resolve as resolve5 } from "node:path";
 import { promisify } from "node:util";
@@ -143,7 +143,7 @@ var buildFailureSchema = z2.strictObject({
 // packages/build/src/docker-run.ts
 import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
-import { mkdir as mkdir2, readFile as readFile2, writeFile as writeFile3 } from "node:fs/promises";
+import { copyFile as copyFile2, cp as cp3, mkdir as mkdir2, readFile as readFile2, writeFile as writeFile3 } from "node:fs/promises";
 import { basename, posix, relative, resolve as resolve4, sep } from "node:path";
 var runDocker = (args, failure) => new Promise((accept, reject) => {
   const child = spawn("docker", args, {
@@ -173,7 +173,7 @@ var runDocker = (args, failure) => new Promise((accept, reject) => {
   });
 });
 var bindMount = (source, target, readonly = false) => `type=bind,"source=${source.replaceAll('"', '""')}",target=${target}${readonly ? ",readonly" : ""}`;
-async function mountLibraries(libraries, directory) {
+async function mountLibraries(libraries, directory, root = "/input") {
   if (!libraries?.length)
     return;
   await mkdir2(resolve4(directory, "libraries"), { recursive: true });
@@ -183,22 +183,23 @@ async function mountLibraries(libraries, directory) {
       throw new Error(`Library changed after installation: ${library.title}`);
     const filename = `${library.sha256}-${basename(library.path)}`;
     await writeFile3(resolve4(directory, "libraries", filename), data);
-    return { ...library, path: `/input/libraries/${filename}` };
+    return { ...library, path: `${root}/libraries/${filename}` };
   }));
 }
+var containerConfig = (config, paths, libraries) => ({
+  ...config,
+  libraries,
+  configFile: undefined,
+  docker: undefined,
+  codesys: undefined,
+  sourceDir: paths.sourceDir,
+  entry: posix.resolve(paths.sourceDir, relative(config.sourceDir, config.entry).split(sep).join("/")),
+  template: paths.template,
+  outDir: "/output",
+  runtime: undefined
+});
 var prepareContainerRun = async (config, requestDirectory, options) => {
-  await writeFile3(resolve4(requestDirectory, "config.json"), JSON.stringify({
-    ...config,
-    libraries: options.sources ? await mountLibraries(config.libraries, requestDirectory) : [],
-    configFile: undefined,
-    docker: undefined,
-    codesys: undefined,
-    sourceDir: "/sources",
-    entry: posix.resolve("/sources", relative(config.sourceDir, config.entry).split(sep).join("/")),
-    template: "/template.project",
-    outDir: "/output",
-    runtime: undefined
-  }));
+  await writeFile3(resolve4(requestDirectory, "config.json"), JSON.stringify(containerConfig(config, { sourceDir: "/sources", template: "/template.project" }, options.sources ? await mountLibraries(config.libraries, requestDirectory) : [])));
   return [
     "--init",
     ...config.docker?.cpuSet ? ["--cpuset-cpus", config.docker.cpuSet] : [],
@@ -269,7 +270,7 @@ ${failure.message}`;
 // packages/build/src/host/codesys-worker.ts
 import {
   access,
-  copyFile as copyFile2,
+  copyFile as copyFile3,
   mkdir as mkdir4,
   open,
   readFile as readFile4,
@@ -980,7 +981,7 @@ 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";
-import { resolve as resolve7 } from "node:path";
+import { posix as posix2, resolve as resolve7 } from "node:path";
 import { promisify as promisify4 } from "node:util";
 import { z as z5 } from "zod";
 var execute4 = promisify4(execFile4);
@@ -1012,6 +1013,17 @@ var controllerResultSchema = z5.strictObject({
   state: z5.string().nonempty(),
   values: z5.record(z5.string(), z5.string())
 });
+var controllerCredentialsSchema = z5.strictObject({
+  username: z5.string().nonempty(),
+  password: z5.string().nonempty()
+});
+var warmOperationSchema = z5.strictObject({
+  operation: z5.enum(["download", "online-change"]),
+  operationId: z5.uuid(),
+  request: z5.string().nonempty(),
+  initializeUser: z5.boolean(),
+  credentials: controllerCredentialsSchema.optional()
+});
 var controllerTarget = (config, online) => ({
   network: online.network,
   gateway: online.gateway,
@@ -1021,28 +1033,37 @@ var controllerTarget = (config, online) => ({
     deviceTree: createHash2("sha256").update(JSON.stringify(config.deviceTree)).digest("hex")
   }
 });
-var controllerConnection = async (config) => {
-  if (!config.docker || !config.online) {
-    throw new Error("Docker image and online gateway/device configuration are required for controller operations");
-  }
-  const environmentNames = config.online.credentials ? [config.online.credentials.usernameEnv, config.online.credentials.passwordEnv] : [];
-  for (const name of environmentNames) {
+var credentialEnvironment = (config) => {
+  const names = config.online?.credentials ? [config.online.credentials.usernameEnv, config.online.credentials.passwordEnv] : [];
+  for (const name of names) {
     if (process.env[name] === undefined) {
       throw new Error(`Controller credential environment variable ${name} is not set`);
     }
   }
+  return names;
+};
+var controllerConnection = async (config) => {
+  if (!config.docker || !config.online) {
+    throw new Error("Docker image and online gateway/device configuration are required for controller operations");
+  }
   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 });
   });
   return {
-    environmentNames,
     imageId: imageIdSchema.parse(stdout.trim()),
     templateHash: createHash2("sha256").update(await readFile5(config.template)).digest("hex"),
     target: controllerTarget(config, config.online)
   };
 };
+var checkReceipt = (result, expected, diagnostics) => {
+  if (result.operationId !== expected.operationId || result.operation !== expected.operation || result.imageId !== expected.imageId || result.templateHash !== expected.templateHash || JSON.stringify(result.target) !== JSON.stringify(expected.target)) {
+    throw new Error(`Controller receipt does not match this operation's image, template or target. Inspect ${diagnostics} for diagnostics`);
+  }
+  return result;
+};
 var controllerOperation = async (config, operation, options) => {
-  const { environmentNames, imageId, templateHash, target } = await controllerConnection(config);
+  const environmentNames = credentialEnvironment(config);
+  const { imageId, templateHash, target } = await controllerConnection(config);
   const operationId = randomUUID2();
   const requestDirectory = await mkdtemp3(resolve7(tmpdir3(), "codesys-controller-"));
   const diagnostics = resolve7(config.outDir, ".codesys/controller");
@@ -1078,10 +1099,7 @@ var controllerOperation = async (config, operation, options) => {
     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 });
     });
-    if (result.operationId !== operationId || result.operation !== operation || result.imageId !== imageId || result.templateHash !== templateHash || JSON.stringify(result.target) !== JSON.stringify(target)) {
-      throw new Error(`Controller receipt does not match this operation's image, template or target. Inspect ${diagnostics} for diagnostics`);
-    }
-    return result;
+    return checkReceipt(result, { operationId, operation, imageId, templateHash, target }, diagnostics);
   } finally {
     await rm5(requestDirectory, { recursive: true, force: true });
   }
@@ -1117,7 +1135,7 @@ var loginReplySchema = z5.discriminatedUnion("ok", [
 
 // packages/build/src/docker-build.ts
 import { execFile as execFile5 } from "node:child_process";
-import { cp as cp4, mkdir as mkdir6, mkdtemp as mkdtemp4, readFile as readFile6, rm as rm6 } from "node:fs/promises";
+import { cp as cp5, mkdir as mkdir6, mkdtemp as mkdtemp4, readFile as readFile6, rm as rm6 } from "node:fs/promises";
 import { tmpdir as tmpdir4 } from "node:os";
 import { resolve as resolve8 } from "node:path";
 import { promisify as promisify5 } from "node:util";
@@ -1159,7 +1177,7 @@ var configureDocker = async () => {
     const cache = resolve8(context, "winetricks");
     await mkdir6(cache);
     if (process.env["CODESYS_WINETRICKS_CACHE"]) {
-      await cp4(process.env["CODESYS_WINETRICKS_CACHE"], cache, {
+      await cp5(process.env["CODESYS_WINETRICKS_CACHE"], cache, {
         recursive: true
       });
     }
@@ -1715,5 +1733,5 @@ try {
   process.exitCode = 1;
 }
 
-//# debugId=C41ADA14BA58D42564756E2164756E21
+//# debugId=4ED16E2EF93604DB64756E2164756E21
 //# sourceMappingURL=cli.js.map