fluxy-bot 0.6.0 → 0.6.2

package/bin/cli.js

@@ -32,6 +32,18 @@ function needsSudo() {
   return process.getuid() !== 0;
 }
 
+function sudoReExec() {
+  const nodePath = process.env.FLUXY_NODE_PATH || process.execPath;
+  const realHome = getRealHome();
+  const args = process.argv.slice(1);
+  const result = spawnSync('sudo', [
+    `FLUXY_NODE_PATH=${nodePath}`,
+    `FLUXY_REAL_HOME=${realHome}`,
+    nodePath, ...args,
+  ], { stdio: 'inherit' });
+  process.exit(result.status ?? 1);
+}
+
 function getRealUser() {
   return process.env.SUDO_USER || os.userInfo().username;
 }
@@ -933,7 +945,9 @@ async function init() {
 
     stepper.advance();
     stepper.finish();
-    if (tunnelFailed) {
+    if (!hasTunnelInit) {
+      privateNetworkMessage(config.port);
+    } else if (tunnelFailed) {
       tunnelFailedMessage(tunnelUrl);
     } else {
       finalMessage(tunnelUrl, relayUrl);
@@ -1476,17 +1490,7 @@ async function daemon(sub) {
       }
 
       // Re-exec with sudo if needed
-      if (needsSudo()) {
-        const nodePath = process.env.FLUXY_NODE_PATH || process.execPath;
-        const realHome = getRealHome();
-        const args = process.argv.slice(1);
-        const result = spawnSync('sudo', [
-          `FLUXY_NODE_PATH=${nodePath}`,
-          `FLUXY_REAL_HOME=${realHome}`,
-          nodePath, ...args,
-        ], { stdio: 'inherit' });
-        process.exit(result.status ?? 1);
-      }
+      if (needsSudo()) sudoReExec();
 
       const user = getRealUser();
       const home = getRealHome();
@@ -1516,30 +1520,21 @@ async function daemon(sub) {
     }
 
     case 'stop': {
-      if (needsSudo()) {
-        const result = spawnSync('sudo', [process.execPath, ...process.argv.slice(1)], { stdio: 'inherit' });
-        process.exit(result.status ?? 1);
-      }
+      if (needsSudo()) sudoReExec();
       execSync(`systemctl stop ${SERVICE_NAME}`, { stdio: 'inherit' });
       console.log(`\n  ${c.blue}✔${c.reset}  Fluxy daemon stopped.\n`);
       break;
     }
 
     case 'start': {
-      if (needsSudo()) {
-        const result = spawnSync('sudo', [process.execPath, ...process.argv.slice(1)], { stdio: 'inherit' });
-        process.exit(result.status ?? 1);
-      }
+      if (needsSudo()) sudoReExec();
       execSync(`systemctl start ${SERVICE_NAME}`, { stdio: 'inherit' });
       console.log(`\n  ${c.blue}✔${c.reset}  Fluxy daemon started.\n`);
       break;
     }
 
     case 'restart': {
-      if (needsSudo()) {
-        const result = spawnSync('sudo', [process.execPath, ...process.argv.slice(1)], { stdio: 'inherit' });
-        process.exit(result.status ?? 1);
-      }
+      if (needsSudo()) sudoReExec();
       execSync(`systemctl restart ${SERVICE_NAME}`, { stdio: 'inherit' });
       console.log(`\n  ${c.blue}✔${c.reset}  Fluxy daemon restarted.\n`);
       break;
@@ -1556,10 +1551,7 @@ async function daemon(sub) {
     }
 
     case 'uninstall': {
-      if (needsSudo()) {
-        const result = spawnSync('sudo', [process.execPath, ...process.argv.slice(1)], { stdio: 'inherit' });
-        process.exit(result.status ?? 1);
-      }
+      if (needsSudo()) sudoReExec();
       try { execSync(`systemctl stop ${SERVICE_NAME}`, { stdio: 'ignore' }); } catch {}
       try { execSync(`systemctl disable ${SERVICE_NAME}`, { stdio: 'ignore' }); } catch {}
       if (fs.existsSync(SERVICE_PATH)) fs.unlinkSync(SERVICE_PATH);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "releaseNotes": [
     "Fixed some bugs to iOs ",
     "2. ",