freeschema 1.0.2 → 1.0.4

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,53 @@ 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)}`);
+  };
+}
+
+// Patches known issues in the local docker-compose.yml so existing installs
+// are automatically healed on start/update without requiring a re-init.
+const COMPOSE_PATCHES = [
+  {
+    find:    /- \.\/mosquitto\/config:\/mosquitto\/config:ro/g,
+    replace: '- ./mosquitto/config:/mosquitto/config',
+    label:   'mosquitto config mount (removed :ro)',
+  },
+  {
+    find:    /(image: eclipse-mosquitto:[^\n]+\n)(?!    user:)/,
+    replace: '$1    user: "1883:1883"\n',
+    label:   'mosquitto user (1883:1883 to skip chown on Windows)',
+  },
+];
+
+function patchComposeFile() {
+  const composePath = path.join(process.cwd(), 'docker-compose.yml');
+  if (!fs.existsSync(composePath)) return;
+  let content  = fs.readFileSync(composePath, 'utf8');
+  let patched  = false;
+  for (const { find, replace, label } of COMPOSE_PATCHES) {
+    if (find.test(content)) {
+      content = content.replace(find, replace);
+      patched = true;
+      console.log(`  Patched docker-compose.yml: ${label}`);
+    }
+    find.lastIndex = 0;
+  }
+  if (patched) fs.writeFileSync(composePath, content);
+}
+
 function runCompose(composeArgs, opts = {}) {
   const cwd = process.cwd();
   if (!fs.existsSync(path.join(cwd, 'docker-compose.yml'))) {
@@ -338,9 +398,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;
@@ -402,6 +464,7 @@ function waitForMySQL(container, user, pass, maxAttempts = 30) {
 }
 
 function cmdStart() {
+  patchComposeFile();
   const cwd     = process.cwd();
   const missing = ['.env', '.env.frontend'].filter(f => !fs.existsSync(path.join(cwd, f)));
   if (missing.length) {
@@ -470,6 +533,7 @@ function cmdPull() {
 
 function cmdUpdate() {
   console.log('Updating FreeSchema…\n');
+  patchComposeFile();
 
   // 1. Update the CLI itself via npm
   console.log('Step 1/2 — Updating freeschema CLI…');
@@ -536,9 +600,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.4",
   "description": "FreeSchema — self-hosted deployment CLI",
   "keywords": [
     "freeschema",

package/templates/docker-compose.yml

@@ -51,10 +51,11 @@ services:
     container_name: ${CONTAINER_PREFIX:-}mqtt-broker
     profiles:
       - local-mqtt
+    user: "1883:1883"
     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:

package/templates/mosquitto/config/mosquitto.conf

@@ -1,11 +1,11 @@
-listener 1883
-allow_anonymous false
-password_file /mosquitto/config/password.txt
-
-listener 9001
-protocol websockets
-allow_anonymous false
-
-persistence true
-persistence_location /mosquitto/data/
-log_dest file /mosquitto/log/mosquitto.log
+listener 1883
+allow_anonymous false
+password_file /mosquitto/config/password.txt
+
+listener 9001
+protocol websockets
+allow_anonymous false
+
+persistence true
+persistence_location /mosquitto/data/
+log_dest file /mosquitto/log/mosquitto.log

package/templates/mosquitto/config/password.txt

@@ -0,0 +1 @@
+freeschema:$7$101$orXdSDv8OTk6tUnW$XhsqgkbuoDKh0PqtwNBfXZxyPVSKkv7zgHrjAKL5uBnl79kX0AXrSn8o4TWbeVYFVEE4q+r2IiadBPAKORw4kQ==