Fix Xmrig/P2Pool mining

Author: everoddandeven

app/process/XmrigProcess.ts

@@ -2,7 +2,7 @@ import { AppChildProcess, sudo } from "./AppChildProcess";
 
 export class XmrigProcess extends AppChildProcess {
 
-  protected static readonly stdoutPattern: string = `READY`;
+  protected static readonly stdoutPattern: string = `* COMMANDS`;
 
   constructor({ cmd, flags, isExe }: { cmd: string, flags?: string[], isExe?: boolean }) {
     super({
@@ -108,12 +108,16 @@ export class XmrigProcess extends AppChildProcess {
             return;
           }
 
-          timeout = setTimeout(() => {
+          timeout = setTimeout(async () => {
             if (this._process && this._process.exitCode == null) {
               this._process.kill();
             }
             timeout = undefined;
 
+            if (this._process) {
+              await this.kill();
+            }
+
             reject(new Error("XmrigProcess.start(): Timed out"));
           }, 60*1000);
         }
@@ -192,24 +196,14 @@ export class XmrigProcess extends AppChildProcess {
     }
   }
 
-  public async stop(): Promise<number | null> {
-    if (this._starting) {
-      throw new Error("Process is starting");
-    }
-
-    if (this._stopping) {
-      throw new Error("Process is already stopping");
-    }
-
-    const proc = this._process;
-
-    if (!this._running || !proc) {
-      throw new Error("Process is not running");
-    }
-
-    this._stopping = true;
-
+  private async kill(): Promise<number | null> {
     const promise = new Promise<number | null>((resolve) => {
+      const proc = this._process;
+      if (!proc) {
+        console.error("Could not kill xmrig process, not found");
+        return;
+      }
+
       proc.on('close', (code: number | null) => {
         this._process = undefined;
         this._running = false;
@@ -232,6 +226,26 @@ export class XmrigProcess extends AppChildProcess {
     return await promise;
   }
 
+  public async stop(): Promise<number | null> {
+    if (this._starting) {
+      throw new Error("Process is starting");
+    }
+
+    if (this._stopping) {
+      throw new Error("Process is already stopping");
+    }
+
+    const proc = this._process;
+
+    if (!this._running || !proc) {
+      throw new Error("Process is not running");
+    }
+
+    this._stopping = true;
+
+    return await this.kill();
+  }
+
   public async getVersion(): Promise<string> {
     const proc = new XmrigProcess({
       cmd: this._command,

src/app/core/services/daemon/daemon-data.service.ts

@@ -339,7 +339,8 @@ export class DaemonDataService {
         const i = this.info;
         await this.xmrigService.refreshMiningStatus(i ? i.difficulty : 0);
         this._miningStatus = this.xmrigService.miningStatus;
-        
+
+        if (this.p2poolService.running) await this.p2poolService.updateData();
       }
       else if (this.p2poolService.running) {
         await this.p2poolService.updateData();

src/app/core/services/daemon/daemon.service.ts

@@ -1436,7 +1436,7 @@ export class DaemonService {
   }
 
   public getGuiVersion(): string {
-    return "1.3.0 Fortitude";
+    return "1.3.1 Fortitude";
   }
 
   public async getProcessStats(): Promise<ProcessStats> {

src/app/core/services/p2pool/p2pool.service.ts

@@ -2,6 +2,7 @@ import { EventEmitter, inject, Injectable } from '@angular/core';
 import { MiningStatus, P2PoolSettings } from '../../../../common';
 import { IDBPDatabase, openDB } from 'idb';
 import { ElectronService } from '../electron/electron.service';
+import { Subscription } from 'rxjs';
 
 type Status = 'running' | 'stopped' | 'starting' | 'restarting' | 'stopping';
 type Pool = 'main' | 'mini';
@@ -170,8 +171,10 @@ export class P2poolService {
   private _loaded: boolean = false;
   private _logs: string[] = [];
   private _startedAt = 0;
+  private _synchronized: boolean = false;
   public readonly onStart: EventEmitter<void> = new EventEmitter<void>();
   public readonly onStop: EventEmitter<void> = new EventEmitter<void>();
+  public readonly onSynced: EventEmitter<void> = new EventEmitter<void>();
 
   // Cached data
 
@@ -354,6 +357,7 @@ export class P2poolService {
         window.electronAPI.onP2PoolOutput(({stdout, stderr} : { stdout?: string, stderr?: string }) => {
           if (stdout) {
             this._logs.push(stdout);
+            if (stdout.includes('SideChain SYNCHRONIZED')) this.onSynced.emit();
             this.std.out.emit(stdout);
           } else if (stderr) {
             this._logs.push(stderr);
@@ -392,6 +396,20 @@ export class P2poolService {
     if (err) throw err;
   }
 
+  public async waitForSidechainSync(): Promise<void> {
+    if (this.status === 'stopped' || this.status === 'stopping') throw new Error("P2Pool service not running")
+    if (this.synchronized) return;
+
+    await new Promise<void>((resolve) => {
+      let sub: Subscription;
+
+      sub = this.onSynced.subscribe(() => {
+        sub.unsubscribe();
+        resolve();
+      });
+    });
+  }
+
   public async stop(): Promise<void> {
     if (this.starting) throw new Error("p2pool is starting");
     if (!this.running) throw new Error("Already stopped p2pool");

src/app/core/services/xmrig/xmrig.service.ts

@@ -1,6 +1,7 @@
-import { EventEmitter, Injectable } from '@angular/core';
+import { EventEmitter, inject, Injectable } from '@angular/core';
 import { MiningStatus, XmrigSettings } from '../../../../common';
 import { IDBPDatabase, openDB } from 'idb';
+import { P2poolService } from '../p2pool/p2pool.service';
 
 type Status = 'running' | 'stopped' | 'starting' | 'restarting' | 'stopping';
 
@@ -16,6 +17,8 @@ export class XmrigService {
 
   // #region Attributes
 
+  private readonly p2poolService = inject(P2poolService);
+
   private readonly openDbPromise: Promise<IDBPDatabase>;
   private readonly dbName = 'XmrigSettingsDB';
   private readonly storeName = 'settingsStore';
@@ -149,18 +152,22 @@ export class XmrigService {
     this._logs = [];
   }
 
-  public async refreshMiningStatus(networkDifficulty: number): Promise<void> {
-    const _config = this._settings;
-    
-    await new Promise<void>((resolve, reject) => {
-      window.electronAPI.xmrigCmd('h', (result: { error?: string}) => {
+  private async sendCommand(cmd: 'h' | 'p' | 'r' | 'c'): Promise<void> {
+    return await new Promise<void>((resolve, reject) => {
+      window.electronAPI.xmrigCmd(cmd, (result: { error?: string}) => {
         if (result.error) reject(new Error(result.error));
         else resolve();
       });
     });
+  }
+
+  public async refreshMiningStatus(networkDifficulty: number): Promise<void> {
+    const _config = this._settings;
+
+    await this.sendCommand('h');
 
     const lastHash = this._lastHashStatus;
-    const info = lastHash.split('\n')[4]
+    const info = lastHash.split('\n').find((line) => line.includes('speed'));
     if (info) {
       const c = info.split(' ').filter(x => x !== '');
       const hash10s = c[5];
@@ -194,7 +201,7 @@ export class XmrigService {
       '');
   }
 
-  public async start(config?: XmrigSettings): Promise<void> {
+  public async start(config?: XmrigSettings, waitForP2Pool: boolean = false): Promise<void> {
     const _config = config ? config : this._settings;
     if (_config.path === '') throw new Error("Xmrig not configured. Go to Settings -> Mining");
     if (this.running) throw new Error("Already running xmrig");
@@ -204,12 +211,14 @@ export class XmrigService {
     this._status = 'starting';
 
     try {
+      if (waitForP2Pool) await this.p2poolService.waitForSidechainSync();
+
       const promise = new Promise<void>((resolve, reject) => {
 
         window.electronAPI.onXmrigOutput(({stdout, stderr} : { stdout?: string, stderr?: string }) => {
           if (stdout) {
             stdout = this.cleanLog(stdout);
-            if (stdout.includes("CPU") && stdout.includes("AFFINITY")) {
+            if (stdout.includes("speed")) {
               this._lastHashStatus = stdout;
             } else {
               this._logs.push(stdout);
@@ -226,6 +235,9 @@ export class XmrigService {
           console.log(code);
           this._status = 'stopped';
           this._startedAt = 0;
+          this._lastHash10s = 0;
+          this._lastHash60s = 0;
+          this._lastHash15m = 0;
           this.onStop.emit();
         });
 

src/app/pages/mining/mining.component.html

@@ -201,14 +201,14 @@ <h4 class="mb-3">Start mining</h4>
 
               <div class="form-check form-switch col-md-4">
                 <label for="start-mining-do-background-mining" class="form-check-label">Do Background Mining</label>
-                <input class="form-control form-check-input" type="checkbox" role="switch" id="start-mining-do-background-mining" [disabled]="startMiningType !== 'solo-mining'" [checked]="startMiningDoBackgroundMining && startMiningType === 'solo-mining'" [(ngModel)]="startMiningDoBackgroundMining" [ngModelOptions]="{standalone: true}">
+                <input class="form-control form-check-input" type="checkbox" role="switch" id="start-mining-do-background-mining" [disabled]="startMiningType !== 'solo-mining' && !xmrigInstalled" [checked]="startMiningDoBackgroundMining && startMiningType === 'solo-mining'" [(ngModel)]="startMiningDoBackgroundMining" [ngModelOptions]="{standalone: true}">
                 <br>
                 <small class="text-body-secondary">States if the mining should run in background (true) or foreground (false)</small>
               </div>
 
               <div class="form-check form-switch col-md-4">
                 <label for="start-mining-ignore-battery" class="form-check-label">Ignore Battery</label>
-                <input class="form-control form-check-input" type="checkbox" role="switch" id="start-mining-ignore-battery" [disabled]="startMiningType !== 'solo-mining'" [checked]="startMiningIgnoreBattery && startMiningType === 'solo-mining'" [(ngModel)]="startMiningIgnoreBattery" [ngModelOptions]="{standalone: true}">
+                <input class="form-control form-check-input" type="checkbox" role="switch" id="start-mining-ignore-battery" [disabled]="startMiningType !== 'solo-mining' && !xmrigInstalled" [checked]="startMiningIgnoreBattery && startMiningType === 'solo-mining'" [(ngModel)]="startMiningIgnoreBattery" [ngModelOptions]="{standalone: true}">
                 <br>
                 <small class="text-body-secondary">States if battery state (on laptop) should be ignored (true) or not (false)</small>
               </div>

src/app/pages/mining/mining.component.ts

@@ -971,6 +971,8 @@ export class MiningComponent extends BasePageComponent implements AfterViewInit,
     }
 
     p2poolConf.wallet = this.startMiningMinerAddress;
+    xmrigConf.url = '127.0.0.1:3333';
+    xmrigConf.daemon = false;
     xmrigConf.user = this.startMiningMinerAddress;
     xmrigConf.background = this.startMiningDoBackgroundMining;
     xmrigConf.pauseOnBattery = this.startMiningIgnoreBattery === false;
@@ -979,7 +981,7 @@ export class MiningComponent extends BasePageComponent implements AfterViewInit,
 
     try {
       await this.p2poolService.start(p2poolConf);
-      if (xmrigInstalled) await this.xmrigService.start(xmrigConf);
+      if (xmrigInstalled) await this.xmrigService.start(xmrigConf, true);
       await this.daemonData.refreshMiningStatus();
     } catch (error: any) {
       err = error;
@@ -1001,6 +1003,7 @@ export class MiningComponent extends BasePageComponent implements AfterViewInit,
     if (this.xmrigInstalled) {
       const xmrigConf = XmrigSettings.fromDaemonSettings(conf);
 
+      xmrigConf.url = '';
       xmrigConf.user = this.startMiningMinerAddress;
       xmrigConf.coin = 'monero';
       xmrigConf.daemon = true;

src/common/XmrigSettings.ts

@@ -14,6 +14,7 @@ export class XmrigSettings extends Comparable<XmrigSettings> {
   public daemonZmqPort: number = 0;
   public background: boolean = false;
   public pauseOnBattery: boolean = false;
+  public noColor: boolean = true;
 
   public override clone(): XmrigSettings {
     const result = Object.assign(new XmrigSettings(), this);
@@ -29,13 +30,15 @@ export class XmrigSettings extends Comparable<XmrigSettings> {
     if (this.threads) cmdList.push(`--threads=${this.threads}`);
     if (this.rigId) cmdList.push(`--rig-id=${this.rigId}`);
     if (this.url) cmdList.push(`--url=${this.url}`);
-    if (this.httpHost) cmdList.push(`--http-host=${this.httpHost}`);
-    if (this.httpPort > 0) cmdList.push(`--http-port=${this.httpPort}`);
+    //if (this.httpHost) cmdList.push(`--http-host=${this.httpHost}`);
+    //if (this.httpPort > 0) cmdList.push(`--http-port=${this.httpPort}`);
     if (this.daemon) cmdList.push('--daemon');
     if (this.daemonZmqPort > 0) cmdList.push(`--daemon-zmq-port=${this.daemonZmqPort}`);
     if (this.coin) cmdList.push(`--coin=${this.coin}`);
     if (this.background) cmdList.push(`--background`);
     if (this.pauseOnBattery) cmdList.push(`--pause-on-battery`);
+    if (this.noColor) cmdList.push(`--no-color`);
+    
     return cmdList;
   }