@tsplc/build 0.2.6 → 0.2.8

package/src/controller-session.ts

@@ -1,5 +1,5 @@
 import { createHash, randomUUID } from "node:crypto";
-import { copyFile, cp, mkdir, readdir, readFile, rm, writeFile } from "node:fs/promises";
+import { cp, mkdir, readdir, readFile, rm, writeFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import { z } from "zod";
 import type { ResolvedConfig } from "./config";
@@ -123,12 +123,11 @@ export const runControllerSession = async (
   const candidate = resolve(root, "generations", generation);
   const project = resolve(candidate, "project", "Application.project");
   await mkdir(resolve(candidate, "project"), { recursive: true });
+  // A download saves the template here, with its controller and device tree.
   if (previous) {
     await cp(previous.project, resolve(candidate, "project"), {
       recursive: true,
     });
-  } else {
-    await copyFile(config.template, project);
   }
   const jobConfig = {
     ...config,
@@ -140,11 +139,16 @@ export const runControllerSession = async (
   const request = {
     libraryReferences: config.libraryReferences,
     // A download starts from the template; an online change keeps the downloaded project's tree.
-    ...(config.deviceTree &&
-      operation === "download" && {
+    ...(operation === "download" && {
+      template: await toWindowsPath(config.template, config.codesys.wine),
+      templateHash,
+      // Kept across jobs: generating a device tree takes minutes, and the same inputs make the same one.
+      caches: await toWindowsPath(root, config.codesys.wine),
+      ...(config.deviceTree && {
         deviceTree: await writeDeviceTree(config.deviceTree, requestDirectory),
         devices: await toWindowsPath(requestDirectory, config.codesys.wine),
       }),
+    }),
     libraries: await Promise.all(
       (config.libraries ?? []).map(async (library) => ({
         ...library,

package/src/host/codesys-worker.ts

@@ -218,6 +218,7 @@ export const createCodesysWorker = (config: ResolvedConfig) => {
       .update(
         JSON.stringify({
           builder: await readFile(resolve(pythonDirectory, "build.py"), "utf8"),
+          hardware: await readFile(resolve(pythonDirectory, "hardware.py"), "utf8"),
           online: await readFile(resolve(pythonDirectory, "codesys_online.py"), "utf8"),
           login: await readFile(resolve(pythonDirectory, "codesys_login.py"), "utf8"),
           command: codesysCommand,
@@ -244,9 +245,13 @@ export const createCodesysWorker = (config: ResolvedConfig) => {
     const directory = resolve(config.outDir, ".codesys/worker");
     await rm(directory, { recursive: true, force: true });
     await mkdir(directory, { recursive: true });
-    await copyFile(resolve(pythonDirectory, "build.py"), resolve(directory, "build.py"));
-    await copyFile(resolve(pythonDirectory, "worker.py"), resolve(directory, "worker.py"));
-    for (const script of ["codesys_online.py", "codesys_login.py"]) {
+    for (const script of [
+      "build.py",
+      "hardware.py",
+      "worker.py",
+      "codesys_online.py",
+      "codesys_login.py",
+    ]) {
       await copyFile(resolve(pythonDirectory, script), resolve(directory, script));
     }
     console.log(`Starting CODESYS. Log: ${directory}/codesys.log`);