freeschema 1.0.2 → 1.0.3

package/bin/freeschema.js

@@ -114,7 +114,14 @@ function generateJwt() {
   return crypto.randomBytes(32).toString('hex');
 }
 
-function httpsDownload(url, destStream) {
+function fmtBytes(b) {
+  if (b >= 1073741824) return (b / 1073741824).toFixed(1) + ' GB';
+  if (b >= 1048576)    return (b / 1048576).toFixed(1)    + ' MB';
+  if (b >= 1024)       return (b / 1024).toFixed(1)       + ' KB';
+  return b + ' B';
+}
+
+function httpsDownload(url, destStream, onProgress) {
   return new Promise((resolve, reject) => {
     const follow = (u, redirects) => {
       if (redirects > 10) return reject(new Error('Too many redirects'));
@@ -123,6 +130,12 @@ function httpsDownload(url, destStream) {
           return follow(res.headers.location, redirects + 1);
         }
         if (res.statusCode !== 200) return reject(new Error(`HTTP ${res.statusCode}`));
+        const total    = parseInt(res.headers['content-length'], 10) || 0;
+        let received   = 0;
+        res.on('data', chunk => {
+          received += chunk.length;
+          if (onProgress) onProgress(received, total);
+        });
         res.pipe(destStream);
         destStream.on('finish', resolve);
         destStream.on('error', reject);
@@ -132,6 +145,22 @@ function httpsDownload(url, destStream) {
   });
 }
 
+function makeProgressBar(label) {
+  const BAR = 25;
+  return function onProgress(received, total) {
+    let line;
+    if (total) {
+      const pct    = Math.min(100, Math.floor((received / total) * 100));
+      const filled = Math.floor((pct / 100) * BAR);
+      const bar    = '█'.repeat(filled) + '░'.repeat(BAR - filled);
+      line = `  ${label} [${bar}] ${pct}%  ${fmtBytes(received)} / ${fmtBytes(total)}`;
+    } else {
+      line = `  ${label} ${fmtBytes(received)} downloaded`;
+    }
+    process.stdout.write(`\r${line.padEnd(72)}`);
+  };
+}
+
 function runCompose(composeArgs, opts = {}) {
   const cwd = process.cwd();
   if (!fs.existsSync(path.join(cwd, 'docker-compose.yml'))) {
@@ -338,9 +367,11 @@ async function cmdInit() {
       const dest = path.join(seedDir, seedFileName);
       console.log(`  Downloading → seed-db/${seedFileName}…`);
       try {
-        await httpsDownload(seedUrl, fs.createWriteStream(dest));
+        await httpsDownload(seedUrl, fs.createWriteStream(dest), makeProgressBar('Downloading'));
+        process.stdout.write('\n');
         console.log(`  Seed data    seed-db/${seedFileName} ✓`);
       } catch (e) {
+        process.stdout.write('\n');
         try { fs.unlinkSync(dest); } catch {}
         console.log(`  Seed data    download failed (${e.message}) — skipped`);
         seedFileName = null;
@@ -536,9 +567,9 @@ function cmdDbSeed() {
     const name = path.basename(new URL(url.replace('%2540', '%40')).pathname) || 'seed.sql';
     const dest = path.join(seedDir, name);
     console.log(`Downloading → seed-db/${name}…`);
-    httpsDownload(url, fs.createWriteStream(dest))
-      .then(() => console.log('Done. Run `freeschema start --local-db` to apply on first boot.'))
-      .catch(e => { try { fs.unlinkSync(dest); } catch {} die(e.message); });
+    httpsDownload(url, fs.createWriteStream(dest), makeProgressBar('Downloading'))
+      .then(() => { process.stdout.write('\n'); console.log('Done. Run `freeschema start --local-db` to apply on first boot.'); })
+      .catch(e => { process.stdout.write('\n'); try { fs.unlinkSync(dest); } catch {} die(e.message); });
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freeschema",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "FreeSchema — self-hosted deployment CLI",
   "keywords": [
     "freeschema",

package/templates/docker-compose.yml

@@ -54,7 +54,7 @@ services:
     ports:
       - "${MQTT_EXTERNAL_PORT:-1884}:1883"
     volumes:
-      - ./mosquitto/config:/mosquitto/config:ro
+      - ./mosquitto/config:/mosquitto/config
       - ./mosquitto/data:/mosquitto/data
       - ./mosquitto/log:/mosquitto/log
     networks: