highperfocused/ESP-Miner
1
0
Fork 0
mirror of https://github.com/skot/ESP-Miner.git synced 2025-03-26 17:51:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Sort swarm, dup check, auto add not overwrite

Browse Source
This commit is contained in:
mrv777 2024-11-05 07:32:05 -06:00 committed by Erik Olof Gunnar Andersson
parent 21a8f6408c
commit 378a1e23e1
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main/http_server/axe-os/src/app/components/swarm/swarm.component.ts
View File

@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ToastrService } from 'ngx-toastr';
import { BehaviorSubject, catchError, combineLatest, debounce, debounceTime, forkJoin, from, interval, map, mergeAll, mergeMap, Observable, of, startWith, switchMap, take, timeout, toArray } from 'rxjs';
import { catchError, from, map, mergeMap, of, take, timeout, toArray } from 'rxjs';
import { LocalStorageService } from 'src/app/local-storage.service';
import { SystemService } from 'src/app/services/system.service';
const REFRESH_TIME_SECONDS = 30;
@ -101,12 +101,15 @@ export class SwarmComponent implements OnInit, OnDestroy {
return []; // Return an empty result or handle as desired
})
),
256 // Limit concurrency to avoid overload
128 // Limit concurrency to avoid overload
),
toArray() // Collect all results into a single array
).pipe(take(1)).subscribe({
next: (result) => {
this.swarm = result;
// Merge new results with existing swarm entries
const existingIps = new Set(this.swarm.map(item => item.IP));
const newItems = result.filter(item => !existingIps.has(item.IP));
this.swarm = [...this.swarm, ...newItems].sort(this.sortByIp.bind(this));
this.localStorageService.setObject(SWARM_DATA, this.swarm);
},
complete: () => {
@ -117,10 +120,17 @@ export class SwarmComponent implements OnInit, OnDestroy {
public add() {
const newIp = this.form.value.manualAddIp;
// Check if IP already exists
if (this.swarm.some(item => item.IP === newIp)) {
this.toastr.warning('This IP address already exists in the swarm', 'Duplicate Entry');
return;
}
this.systemService.getInfo(`http://${newIp}`).subscribe((res) => {
if (res.ASICModel) {
this.swarm.push({ IP: newIp, ...res });
this.swarm = this.swarm.sort(this.sortByIp.bind(this));
this.localStorageService.setObject(SWARM_DATA, this.swarm);
}
});
@ -171,7 +181,7 @@ export class SwarmComponent implements OnInit, OnDestroy {
toArray() // Collect all results into a single array
).pipe(take(1)).subscribe({
next: (result) => {
this.swarm = result;
this.swarm = result.sort(this.sortByIp.bind(this));
this.localStorageService.setObject(SWARM_DATA, this.swarm);
},
complete: () => {
@ -180,4 +190,8 @@ export class SwarmComponent implements OnInit, OnDestroy {
}
private sortByIp(a: any, b: any): number {
return this.ipToInt(a.IP) - this.ipToInt(b.IP);
}
}