freeschema 1.0.4 → 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';
@@ -340,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:');
@@ -476,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;

package/package.json

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