tsoft-cli 3.12.2 → 3.12.4

package/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to T-Soft CLI will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.12.4] - 2026-08-11
+
+### Fixed
+- `theme pull` no longer fails on Windows with `EBUSY: resource busy or locked`. Putting a finished download in place moved the existing theme directory aside first, and Windows refuses to rename a directory that a terminal is sitting in or that has a file open in an editor — so the command failed for anyone whose editor had the theme open, which is the normal case. The theme directory now stays where it is: fresh files are copied in and files no longer present in the archive are removed afterwards, so nothing has to be renamed. macOS and Linux were unaffected because they allow renaming a directory that is in use.
+
+## [3.12.3] - 2026-08-11
+
+### Fixed
+- A failed download no longer destroys the theme you already had on disk. `theme pull`, `theme create` and `theme init` deleted the target directory *before* fetching anything, so a download that arrived truncated or died mid-transfer left nothing behind but a `theme.zip` that could not be opened — the files you had been working on were already gone. Downloads now land in a temporary directory next to the target and are only put in place once the archive has been received and read successfully; if anything goes wrong the existing files stay exactly as they were.
+- A download cut off mid-transfer is now reported instead of hanging. Only the file being written was watched for errors, not the incoming data, so a dropped connection could leave the command waiting indefinitely or crash it outside its own error handling.
+- `theme section` no longer risks the theme it is updating: a corrupt archive is detected before any file in the theme is touched.
+
 ## [3.12.2] - 2026-08-11
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsoft-cli",
-  "version": "3.12.2",
+  "version": "3.12.4",
   "description": "Command-line tool for tsoft360 theme development and management",
   "type": "module",
   "main": "src/index.js",

package/src/commands/theme-dev.js

@@ -1,8 +1,6 @@
 import chalk from 'chalk';
 import fs from 'fs/promises';
-import {createWriteStream} from 'fs';
 import path from 'path';
-import AdmZip from 'adm-zip';
 import chokidar from 'chokidar';
 import {createApiClient} from '../api-client.js';
 import open from 'open';
@@ -12,6 +10,7 @@ import {brandedConfirm, brandedSelect, showWarning, showError, showInfo} from '.
 import {themeSectionMenuCommand} from './theme-section.js';
 import {fetchAllThemes} from '../theme-list.js';
 import { t } from '../i18n.js';
+import {extractThemeArchive} from '../theme-download.js';
 
 function resolveSectionFolder(relativePath) {
     if (!relativePath) {
@@ -61,20 +60,7 @@ async function pullAndSync(themeUuid, themePath) {
     console.log(chalk.yellow(t('dev.sync_pulling')));
     const response = await apiClient.download(`/theme/${themeUuid}/download`, {});
 
-    await fs.mkdir(themePath, {recursive: true});
-    const zipPath = path.join(themePath, 'theme.zip');
-    const writer = createWriteStream(zipPath);
-
-    response.data.pipe(writer);
-
-    await new Promise((resolve, reject) => {
-        writer.on('finish', resolve);
-        writer.on('error', reject);
-    });
-
-    const zip = new AdmZip(zipPath);
-    zip.extractAllTo(themePath, true);
-    await fs.unlink(zipPath);
+    await extractThemeArchive(response.data, themePath);
 
     console.log(chalk.green(t('dev.sync_updated')));
 

package/src/commands/theme-init.js

@@ -1,8 +1,6 @@
 import chalk from 'chalk';
 import fs from 'fs/promises';
-import {createWriteStream} from 'fs';
 import path from 'path';
-import AdmZip from 'adm-zip';
 import {createApiClient} from '../api-client.js';
 import {slugify, getActiveStore, getWorkspaceRoot} from '../storage.js';
 import {brandedConfirm, brandedSelect, showWarning, showInfo, showError} from '../ui/prompt-wrapper.js';
@@ -11,6 +9,7 @@ import {normalizeStoreDomain} from '../storage.js';
 import {isJsonMode, jsonOut} from '../output-mode.js';
 import {mapError} from '../errors/error-mapper.js';
 import { t } from '../i18n.js';
+import {extractThemeArchive} from '../theme-download.js';
 
 export async function themeInitCommand(fromSlug) {
     try {
@@ -83,21 +82,15 @@ export async function themeInitCommand(fromSlug) {
 
         // Check if directory exists
         const exists = await fs.access(themePath).then(() => true).catch(() => false);
-        if (exists) {
-            if (isJsonMode()) {
-                // JSON modda otomatik overwrite
-                await fs.rm(themePath, { recursive: true, force: true });
-            } else {
-                const overwrite = await brandedConfirm({
-                    message: t('init.dir_exists_prompt', { path: themePath }),
-                    default: false,
-                }, t('init.dir_exists_title'));
-
-                if (!overwrite) {
-                    showWarning(t('init.dir_cancelled'));
-                    return;
-                }
-                await fs.rm(themePath, { recursive: true, force: true });
+        if (exists && !isJsonMode()) {
+            const overwrite = await brandedConfirm({
+                message: t('init.dir_exists_prompt', { path: themePath }),
+                default: false,
+            }, t('init.dir_exists_title'));
+
+            if (!overwrite) {
+                showWarning(t('init.dir_cancelled'));
+                return;
             }
         }
 
@@ -105,19 +98,9 @@ export async function themeInitCommand(fromSlug) {
         if (!isJsonMode()) {
             console.log(chalk.yellow(t('init.downloading')));
         }
-        await fs.mkdir(themePath, { recursive: true });
         const downloadResponse = await apiClient.download(`/theme/${forkedData.uuid}/download`, {});
-        const zipPath = path.join(themePath, 'theme.zip');
-        const writer = createWriteStream(zipPath);
-        downloadResponse.data.pipe(writer);
-        await new Promise((resolve, reject) => {
-            writer.on('finish', resolve);
-            writer.on('error', reject);
-        });
-
-        const zip = new AdmZip(zipPath);
-        zip.extractAllTo(themePath, true);
-        await fs.unlink(zipPath);
+
+        await extractThemeArchive(downloadResponse.data, themePath);
 
         // JSON mode success output
         if (isJsonMode()) {

package/src/commands/theme-section.js

@@ -1,13 +1,12 @@
 import chalk from 'chalk';
 import {checkbox} from '@inquirer/prompts';
 import fs from 'fs/promises';
-import {createWriteStream} from 'fs';
 import path from 'path';
-import AdmZip from 'adm-zip';
 import {createApiClient} from '../api-client.js';
 import {getActiveTheme, getThemeUuidBySlug, normalizeStoreDomain, getActiveStore, getWorkspaceRoot} from '../storage.js';
 import {brandedConfirm, brandedSelect, brandedSearch, brandedInput, showWarning, showSuccess, showInfo} from '../ui/prompt-wrapper.js';
 import { t } from '../i18n.js';
+import {mergeThemeArchive} from '../theme-download.js';
 
 const SECTION_NAME_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
 
@@ -294,31 +293,13 @@ export async function themeSectionAddCommand() {
             const themePath = path.join(getWorkspaceRoot(), storeSlug, activeTheme);
 
             try {
-                // Tema klasörü henüz lokalde yoksa (theme dev/pull yapılmamışsa)
-                // createWriteStream ENOENT verir — önce dizini garantiye al.
-                await fs.mkdir(themePath, { recursive: true });
-
                 // Temayı indir
                 const downloadResponse = await apiClient.download(`/theme/${themeInfo.uuid}/download`, {});
 
-                const zipPath = path.join(themePath, 'theme-update.zip');
-                const writer = createWriteStream(zipPath);
-
-                downloadResponse.data.pipe(writer);
-
-                await new Promise((resolve, reject) => {
-                    writer.on('finish', resolve);
-                    writer.on('error', reject);
-                });
-
                 console.log(chalk.green(t('section.add.files_downloaded')));
                 console.log(chalk.yellow(t('section.add.files_updating')));
 
-                // Extract
-                const zip = new AdmZip(zipPath);
-                zip.extractAllTo(themePath, true);
-
-                await fs.unlink(zipPath);
+                await mergeThemeArchive(downloadResponse.data, themePath);
 
                 console.log(chalk.green(t('section.add.files_updated') + '\n'));
                 console.log(chalk.bold.green(t('section.add.complete')));
@@ -337,24 +318,9 @@ export async function themeSectionAddCommand() {
 }
 
 async function downloadThemeFiles(apiClient, themeUuid, themePath) {
-    await fs.mkdir(themePath, { recursive: true });
-
     const downloadResponse = await apiClient.download(`/theme/${themeUuid}/download`, {});
 
-    const zipPath = path.join(themePath, 'theme-update.zip');
-    const writer = createWriteStream(zipPath);
-
-    downloadResponse.data.pipe(writer);
-
-    await new Promise((resolve, reject) => {
-        writer.on('finish', resolve);
-        writer.on('error', reject);
-    });
-
-    const zip = new AdmZip(zipPath);
-    zip.extractAllTo(themePath, true);
-
-    await fs.unlink(zipPath);
+    await mergeThemeArchive(downloadResponse.data, themePath);
 }
 
 export async function themeSectionCreateCommand() {

package/src/commands/theme.js

@@ -1,9 +1,7 @@
 import chalk from 'chalk';
 import {input} from '@inquirer/prompts';
 import fs from 'fs/promises';
-import {createWriteStream} from 'fs';
 import path from 'path';
-import AdmZip from 'adm-zip';
 import {createApiClient} from '../api-client.js';
 import {normalizeStoreDomain, slugify, setActiveTheme, getActiveTheme, getActiveStore, getWorkspaceRoot, getWorkspaceContext} from '../storage.js';
 import {brandedConfirm, brandedSelect, brandedSearch, showWarning} from '../ui/prompt-wrapper.js';
@@ -12,6 +10,7 @@ import {themeLabels, decorateThemeName} from '../ui/theme-choice.js';
 import { isJsonMode, jsonOut } from '../output-mode.js';
 import { mapError } from '../errors/error-mapper.js';
 import { t } from '../i18n.js';
+import {extractThemeArchive} from '../theme-download.js';
 
 const THEME_SEARCH_THRESHOLD = 7;
 
@@ -289,37 +288,20 @@ export async function themeCreateCommand(themeName) {
 
         const response = await apiClient.download('/theme/default/download', downloadParams);
 
-        await fs.mkdir(themePath, {recursive: true});
-
-        const zipPath = path.join(themePath, 'theme.zip');
-        const writer = createWriteStream(zipPath);
-
-        response.data.pipe(writer);
-
-        writer.on('finish', async () => {
-            console.log(chalk.green(t('theme.files_downloaded')));
-            console.log(chalk.yellow(t('theme.extracting')));
-
-            const zip = new AdmZip(zipPath);
-            zip.extractAllTo(themePath, true);
-
-            await fs.unlink(zipPath);
+        console.log(chalk.green(t('theme.files_downloaded')));
+        console.log(chalk.yellow(t('theme.extracting')));
 
-            console.log(chalk.green(t('theme.extracted', { path: `${storeSlug}/${themeSlug}/` })));
+        await extractThemeArchive(response.data, themePath);
 
-            await setActiveTheme(themeSlug);
-            console.log(chalk.green(t('theme.active_set') + '\n'));
+        console.log(chalk.green(t('theme.extracted', { path: `${storeSlug}/${themeSlug}/` })));
 
-            console.log(chalk.bold.green(t('theme.create_success')));
-            console.log(chalk.gray('   ' + t('theme.create_location', { path: `${storeSlug}/${themeSlug}/` }) + '\n'));
-            console.log(chalk.cyan(t('theme.dev_start_tip')));
-            console.log(chalk.white('  tsoft theme dev\n'));
-        });
+        await setActiveTheme(themeSlug);
+        console.log(chalk.green(t('theme.active_set') + '\n'));
 
-        writer.on('error', (error) => {
-            console.error(chalk.red('❌ Hata: ' + t('theme.file_write_error')), error.message);
-            process.exit(1);
-        });
+        console.log(chalk.bold.green(t('theme.create_success')));
+        console.log(chalk.gray('   ' + t('theme.create_location', { path: `${storeSlug}/${themeSlug}/` }) + '\n'));
+        console.log(chalk.cyan(t('theme.dev_start_tip')));
+        console.log(chalk.white('  tsoft theme dev\n'));
 
     } catch (error) {
         console.error(chalk.red('\n❌ Hata: ') + error.message);
@@ -385,33 +367,16 @@ export async function themePullCommand() {
                 showWarning(t('theme.cancelled'));
                 return;
             }
-
-            await fs.rm(themePath, {recursive: true, force: true});
         }
 
         console.log(chalk.yellow(t('theme.downloading_files')));
 
         const downloadResponse = await apiClient.download(`/theme/${themeUuid}/download`, {});
 
-        await fs.mkdir(themePath, {recursive: true});
-
-        const zipPath = path.join(themePath, 'theme.zip');
-        const writer = createWriteStream(zipPath);
-
-        downloadResponse.data.pipe(writer);
-
-        await new Promise((resolve, reject) => {
-            writer.on('finish', resolve);
-            writer.on('error', reject);
-        });
-
         console.log(chalk.green(t('theme.files_downloaded')));
         console.log(chalk.yellow(t('theme.extracting')));
 
-        const zip = new AdmZip(zipPath);
-        zip.extractAllTo(themePath, true);
-
-        await fs.unlink(zipPath);
+        await extractThemeArchive(downloadResponse.data, themePath);
 
         console.log(chalk.green(t('theme.extracted', { path: `${storeSlug}/${themeSlug}/` })));
 

package/src/theme-download.js

@@ -0,0 +1,105 @@
+import fs from 'fs/promises';
+import { createWriteStream } from 'fs';
+import path from 'path';
+import { pipeline } from 'stream/promises';
+import AdmZip from 'adm-zip';
+
+async function stageArchive(stream, stagingPath) {
+    const zipPath = path.join(stagingPath, 'theme.zip');
+
+    await pipeline(stream, createWriteStream(zipPath));
+
+    const { size } = await fs.stat(zipPath);
+
+    if (size === 0) {
+        throw new Error('EMPTY_ARCHIVE');
+    }
+
+    const zip = new AdmZip(zipPath);
+    zip.extractAllTo(stagingPath, true);
+
+    await fs.rm(zipPath, { force: true });
+}
+
+async function withStaging(themePath, apply) {
+    const parent = path.dirname(themePath);
+    await fs.mkdir(parent, { recursive: true });
+
+    const staging = await fs.mkdtemp(path.join(parent, `.${path.basename(themePath)}-`));
+
+    try {
+        return await apply(staging);
+    } finally {
+        await fs.rm(staging, { recursive: true, force: true });
+    }
+}
+
+async function copyInto(sourceDir, targetDir) {
+    for (const entry of await fs.readdir(sourceDir)) {
+        await fs.cp(path.join(sourceDir, entry), path.join(targetDir, entry), {
+            recursive: true,
+            force: true,
+        });
+    }
+}
+
+/**
+ * Arşivde bulunmayan girdileri hedeften siler.
+ *
+ * Dizini yeniden adlandırmak Windows'ta içine girilmişse veya içindeki bir
+ * dosya açıksa EBUSY verir; bu yüzden hedef dizin yerinde bırakılır ve yalnızca
+ * fazlalık girdiler kaldırılır. Kalıcı bir kilit tek bir dosyayı geride
+ * bırakabilir, ama temanın geri kalanı yine güncellenmiş olur.
+ */
+async function removeStaleEntries(themePath, stagingPath) {
+    const fresh = new Set(await fs.readdir(stagingPath));
+
+    for (const entry of await fs.readdir(themePath)) {
+        if (!fresh.has(entry)) {
+            await fs.rm(path.join(themePath, entry), { recursive: true, force: true });
+        }
+    }
+}
+
+/**
+ * Tema arşivini indirir, doğrular ve ancak ondan sonra hedefe yerleştirir.
+ *
+ * Arşiv hedefin yanındaki geçici dizine açılır; indirme yarıda koparsa veya
+ * arşiv bozuksa hedef dizine dokunulmaz. Hedef dizinin kendisi taşınmaz,
+ * yalnızca içeriği değiştirilir — dizin bir editörde veya kabukta açıkken de
+ * çalışır.
+ *
+ * @param {import('stream').Readable} stream - Arşiv veri akışı
+ * @param {string} themePath - Temanın açılacağı hedef dizin
+ * @returns {Promise<void>}
+ */
+export async function extractThemeArchive(stream, themePath) {
+    await withStaging(themePath, async (staging) => {
+        await stageArchive(stream, staging);
+
+        await fs.mkdir(themePath, { recursive: true });
+
+        await copyInto(staging, themePath);
+        await removeStaleEntries(themePath, staging);
+    });
+}
+
+/**
+ * Tema arşivini indirir, doğrular ve ancak ondan sonra hedefin üzerine açar.
+ *
+ * Hedefteki dosyalar silinmez; arşivdekiler üzerine yazılır. Bozuk veya yarım
+ * inen bir arşiv hedefe hiç dokunmaz.
+ *
+ * @param {import('stream').Readable} stream - Arşiv veri akışı
+ * @param {string} themePath - Arşivin açılacağı dizin
+ * @returns {Promise<void>}
+ */
+export async function mergeThemeArchive(stream, themePath) {
+    await withStaging(themePath, async (staging) => {
+        await stageArchive(stream, staging);
+
+        await fs.mkdir(themePath, { recursive: true });
+
+        await copyInto(staging, themePath);
+    });
+}