freeschema 1.0.3 → 1.0.5

package/bin/freeschema.js

@@ -114,6 +114,44 @@ function generateJwt() {
   return crypto.randomBytes(32).toString('hex');
 }
 
+// Mosquitto 2.0 $7$ PBKDF2-HMAC-SHA512 password entry
+function generateMosquittoPassword(username, password) {
+  const iterations = 101;
+  const salt       = crypto.randomBytes(12);
+  const hash       = crypto.pbkdf2Sync(password, salt, iterations, 64, 'sha512');
+  return `${username}:$7$${iterations}$${salt.toString('base64')}$${hash.toString('base64')}\n`;
+}
+
+function ensureMosquittoConfig(cwd) {
+  const dir = (sub) => path.join(cwd, 'mosquitto', sub);
+  ['config', 'data', 'log'].forEach(d => {
+    if (!fs.existsSync(dir(d))) fs.mkdirSync(dir(d), { recursive: true });
+  });
+
+  const confDest = path.join(dir('config'), 'mosquitto.conf');
+  if (!fs.existsSync(confDest)) {
+    const confSrc = path.join(TEMPLATES_DIR, 'mosquitto', 'config', 'mosquitto.conf');
+    if (fs.existsSync(confSrc)) fs.copyFileSync(confSrc, confDest);
+    else fs.writeFileSync(confDest, [
+      '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', '',
+    ].join('\n'));
+    console.log('  Created mosquitto/config/mosquitto.conf');
+  }
+
+  const pwDest = path.join(dir('config'), 'password.txt');
+  if (!fs.existsSync(pwDest)) {
+    const env      = readEnv();
+    const mqttUser = env.MQTT_USERNAME || 'freeschema';
+    const mqttPass = env.MQTT_PASSWORD || 'freeschema';
+    fs.writeFileSync(pwDest, generateMosquittoPassword(mqttUser, mqttPass));
+    console.log('  Created mosquitto/config/password.txt');
+  }
+}
+
 function fmtBytes(b) {
   if (b >= 1073741824) return (b / 1073741824).toFixed(1) + ' GB';
   if (b >= 1048576)    return (b / 1048576).toFixed(1)    + ' MB';
@@ -161,6 +199,37 @@ function makeProgressBar(label) {
   };
 }
 
+// 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'))) {
@@ -309,6 +378,10 @@ async function cmdInit() {
     const mqttPass = await prompt('  MQTT password', readEnvVar(envPath, 'MQTT_PASSWORD') || 'freeschema');
     setEnvVar(envPath, 'MQTT_USERNAME', mqttUser);
     setEnvVar(envPath, 'MQTT_PASSWORD', mqttPass);
+    // Write password.txt with correct hash for the chosen credentials
+    const pwDir  = path.join(target, 'mosquitto', 'config');
+    if (!fs.existsSync(pwDir)) fs.mkdirSync(pwDir, { recursive: true });
+    fs.writeFileSync(path.join(pwDir, 'password.txt'), generateMosquittoPassword(mqttUser, mqttPass));
     console.log('  MQTT         configured (local) ✓');
   } else {
     console.log('\n  External MQTT broker:');
@@ -433,6 +506,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) {
@@ -444,7 +518,10 @@ function cmdStart() {
   const profiles = [];
   const flags    = args.slice(1);
   if (flags.includes('--local-db')   || flags.includes('--db'))   profiles.push('--profile', 'local-db');
-  if (flags.includes('--local-mqtt') || flags.includes('--mqtt')) profiles.push('--profile', 'local-mqtt');
+  if (flags.includes('--local-mqtt') || flags.includes('--mqtt')) {
+    profiles.push('--profile', 'local-mqtt');
+    ensureMosquittoConfig(cwd);
+  }
 
   const seedIdx  = args.indexOf('--seed');
   const seedFile = seedIdx !== -1 ? args[seedIdx + 1] : null;
@@ -501,6 +578,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…');

package/package.json

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

package/templates/docker-compose.yml

@@ -51,6 +51,7 @@ services:
     container_name: ${CONTAINER_PREFIX:-}mqtt-broker
     profiles:
       - local-mqtt
+    user: "1883:1883"
     ports:
       - "${MQTT_EXTERNAL_PORT:-1884}:1883"
     volumes:

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==