pyre-cli 3.11.0 → 3.12.0

package/dist/index.js

@@ -2301,10 +2301,7 @@ var P2PServer = class {
       this.sendSigned(peer, signMessage("disconnect", { reason }, this.hmacKey));
     } catch {
     }
-    try {
-      peer.socket.end();
-    } catch {
-    }
+    peer.socket.destroy();
   }
   cleanupPeer(peer) {
     if (peer.intervalHandle) {
@@ -2362,11 +2359,12 @@ var P2PClient = class {
         console.log(chalk7.yellow("Warning: could not open audit log"));
       }
     }
+    const host = sanitizeHost(this.options.host);
     return new Promise((resolve, reject) => {
       const useTLS = !!this.options.tls;
       if (useTLS) {
         const tlsOptions = {
-          host: this.options.host,
+          host,
           port: this.options.port,
           rejectUnauthorized: !this.options.tlsInsecure
         };
@@ -2381,7 +2379,7 @@ var P2PClient = class {
       } else {
         this.socket = new net2.Socket();
         this.socket.setTimeout(1e4);
-        this.socket.connect(this.options.port, this.options.host, () => {
+        this.socket.connect(this.options.port, host, () => {
           this.running = true;
           this.status("Connected");
           resolve();
@@ -2553,6 +2551,9 @@ var P2PClient = class {
 `);
   }
 };
+function sanitizeHost(host) {
+  return host.trim().replace(/%$/, "");
+}
 function deriveHMACKey2(password) {
   return crypto3.createHash("sha256").update(password).digest("hex").slice(0, 32);
 }
@@ -3218,6 +3219,9 @@ function isExportMode() {
 function stripAnsi(s) {
   return s.replace(/\x1b\[[0-9;]*m/g, "");
 }
+function sanitizeHost2(host) {
+  return host.trim().replace(/%$/, "");
+}
 async function main() {
   const cmd = program.args[0];
   if (cmd === "live" || !isExportMode() && !opts.once && cmd !== "p2p") {
@@ -3341,7 +3345,7 @@ async function runP2PServer() {
   });
 }
 async function runP2PConnect() {
-  const host = opts.p2pHost || "127.0.0.1";
+  const host = sanitizeHost2(opts.p2pHost || "127.0.0.1");
   const port = parseInt(opts.p2pPort, 10) || 9876;
   const password = opts.p2pPassword || "";
   const useTLS = !!opts.p2pTls;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pyre-cli",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "description": "CLI Mac monitoring tool: temps, system stats, live dashboard, packet monitor, battery predictor, export",
   "main": "dist/index.js",
   "type": "module",

package/src/index.ts

@@ -65,6 +65,10 @@ function stripAnsi(s: string): string {
   return s.replace(/\x1b\[[0-9;]*m/g, '');
 }
 
+function sanitizeHost(host: string): string {
+  return host.trim().replace(/%$/, '');
+}
+
 async function main() {
   const cmd = program.args[0];
 
@@ -205,7 +209,7 @@ async function runP2PServer(): Promise<void> {
 }
 
 async function runP2PConnect(): Promise<void> {
-  const host = opts.p2pHost || '127.0.0.1';
+  const host = sanitizeHost(opts.p2pHost || '127.0.0.1');
   const port = parseInt(opts.p2pPort, 10) || 9876;
   const password = opts.p2pPassword || '';
   const useTLS = !!opts.p2pTls;

package/src/p2p/client.ts

@@ -50,12 +50,14 @@ export class P2PClient {
       }
     }
 
+    const host = sanitizeHost(this.options.host);
+
     return new Promise((resolve, reject) => {
       const useTLS = !!this.options.tls;
 
       if (useTLS) {
         const tlsOptions: tls.ConnectionOptions = {
-          host: this.options.host,
+          host,
           port: this.options.port,
           rejectUnauthorized: !this.options.tlsInsecure,
         };
@@ -70,7 +72,7 @@ export class P2PClient {
       } else {
         this.socket = new net.Socket();
         this.socket.setTimeout(10000);
-        this.socket.connect(this.options.port, this.options.host, () => {
+        this.socket.connect(this.options.port, host, () => {
           this.running = true;
           this.status('Connected');
           resolve();
@@ -266,6 +268,10 @@ export class P2PClient {
   }
 }
 
+function sanitizeHost(host: string): string {
+  return host.trim().replace(/%$/, '');
+}
+
 function deriveHMACKey(password: string): string {
   return crypto.createHash('sha256').update(password).digest('hex').slice(0, 32);
 }

package/src/p2p/server.ts

@@ -421,11 +421,7 @@ export class P2PServer {
     } catch {
       // socket may already be closed
     }
-    try {
-      peer.socket.end();
-    } catch {
-      // ignore end errors
-    }
+    peer.socket.destroy();
   }
 
   private cleanupPeer(peer: Peer): void {