@haibun/utils 1.59.0 → 1.59.1

package/build/walkthrough-container/index.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=index.d.ts.map

package/build/walkthrough-container/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/walkthrough-container/index.ts"],"names":[],"mappings":""}

package/build/walkthrough-container/index.js

@@ -0,0 +1,94 @@
+#!/usr/bin/env node
+import { getPackageLocation } from '@haibun/core/build/lib/util/workspace-lib.js';
+import { execSync } from 'child_process';
+import { resolve } from 'path';
+import { writeFileSync, unlinkSync, readFileSync, mkdirSync, existsSync } from 'fs';
+import { tmpdir } from 'os';
+import { HOST_PROJECT_DIR } from '@haibun/core/build/lib/defs.js';
+const runContainer = (testToRun, filter, includeDirs = [], recreate) => {
+    try {
+        const utilDir = resolve(getPackageLocation(import.meta), '..', '..', 'walkthrough-container');
+        const projectDir = process.cwd();
+        const tmpFile = resolve(tmpdir(), `docker-compose.override-${Date.now()}.yml`);
+        const envs = existsSync(`${projectDir}/.env`) ? readFileSync(`${projectDir}/.env`, 'utf8').split('\n').filter(l => l.length > 0) : [];
+        const haibunEnvc = (envs.length > 0) ? `HAIBUN_ENV=${envs.join(',')} ` : '';
+        // Ensure capture directory exists
+        const captureDir = resolve(projectDir, 'capture');
+        if (!existsSync(captureDir)) {
+            console.log('Creating capture directory');
+            mkdirSync(captureDir, { recursive: true });
+        }
+        // Add capture to directories to mount
+        const dirsToMount = [...includeDirs, 'capture'];
+        // Create docker compose config file with volumes
+        const volumeConfig = dirsToMount.map(dir => {
+            const sourcePath = resolve(projectDir, dir);
+            return `      - ${sourcePath}:/app/${dir}`;
+        }).join('\n');
+        const buildContextDir = resolve(tmpdir(), `build-context-${Date.now()}`);
+        mkdirSync(buildContextDir, { recursive: true });
+        // Copy project's package files to build context
+        execSync(`cp ${projectDir}/package*.json ${buildContextDir}/`);
+        // Copy container files to build context
+        execSync(`cp ${utilDir}/speak-to-wav.sh ${utilDir}/kokoro-speak.cjs ${utilDir}/entrypoint.sh ${buildContextDir}/`);
+        const composeFile = `
+services:
+  haibun-recorder:
+    build:
+      context: ${buildContextDir}
+      dockerfile: ${utilDir}/Dockerfile
+    volumes:
+      - ${projectDir}/capture:/app/capture
+      - ${projectDir}:/app/output
+${volumeConfig}
+    environment:
+      - DISPLAY=:99
+      - HAIBUN_O_HAIBUN_TTS_CMD=/app/speak-to-wav.sh @WHAT@
+      - HAIBUN_O_HAIBUN_TTS_PLAY=aplay @WHAT@
+      - ${HOST_PROJECT_DIR}=${projectDir}
+      - COMMAND_TO_RECORD=${HOST_PROJECT_DIR}="${projectDir}" HAIBUN_LOG_LEVEL=log ${haibunEnvc} npm run ${testToRun} ${filter}
+`;
+        writeFileSync(tmpFile, composeFile);
+        console.log(`Building then starting walkthrough container using ${utilDir}`);
+        console.log(`Mounting directories:\n${volumeConfig}`);
+        try {
+            execSync(`docker compose -f docker-compose.yml -f ${tmpFile} up --build ${recreate ? '--force-recreate' : ''}`, {
+                cwd: utilDir,
+                stdio: 'inherit',
+                env: {
+                    ...process.env,
+                    CURRENT_DIR: projectDir,
+                }
+            });
+        }
+        finally {
+            unlinkSync(tmpFile);
+            execSync(`rm -rf ${buildContextDir}`);
+        }
+    }
+    catch (error) {
+        console.error('Error:', error.stderr?.toString() || error.message);
+        process.exit(1);
+    }
+};
+let recreate = false;
+const args = process.argv.slice(2).reduce((acc, arg) => {
+    if (arg === '--recreate') {
+        recreate = true;
+        return acc;
+    }
+    else if (arg === '--help') {
+        printHelp();
+    }
+    return [...acc, arg];
+}, []);
+const [testToRun, filter, ...includeDirs] = args;
+if (!testToRun || includeDirs.length === 0) {
+    printHelp();
+}
+runContainer(testToRun, filter, includeDirs, recreate);
+function printHelp() {
+    console.error(`Usage: ${process.argv[1]} [--rebuild] script filter features files ...`);
+    process.exit(1);
+}
+//# sourceMappingURL=index.js.map

package/build/walkthrough-container/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/walkthrough-container/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@haibun/utils",
   "type": "module",
-  "version": "1.59.0",
+  "version": "1.59.1",
   "description": "",
   "main": "index.js",
   "files": ["ref.package.json", "build/**", "scaffold/**", "vcapture/**"],

package/vcapture/Dockerfile

@@ -27,6 +27,9 @@ RUN apt-get update && apt-get install -y \
     pipewire-audio-client-libraries \
     pulseaudio-utils \
     libportaudio2 \
+    xfce4 \
+    xfce4-terminal \
+    xterm \
     && rm -rf /var/lib/apt/lists/*
 
 RUN git clone https://github.com/novnc/noVNC.git /opt/noVNC && \
@@ -43,4 +46,11 @@ RUN npm i # && npm install kokoro-js # kokoro-js is installed on demand in captu
 
 RUN mkdir -p /run/user/1000 && chmod 700 /run/user/1000
 
+# Set xfce4 as the default desktop environment
+ENV DISPLAY=:1
+RUN echo "xfce4-session" > ~/.xsession
+
+# Start xfce4 session in the background
+RUN echo "xfce4-session &" >> /etc/profile
+
 ENTRYPOINT ["./entrypoint.sh"]