Skip to content

Fix: use new helper to get task speeds to avoid memory and performance problems on task detail page #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gluafamichl wants to merge 1 commit into from
Closed

Fix: use new helper to get task speeds to avoid memory and performance problems on task detail page #450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 9 additions & 35 deletions src/app/tasks/edit-tasks/edit-tasks.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import { Subscription, finalize } from 'rxjs';
import { Subscription, finalize, forkJoin } from 'rxjs';

import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { MatButtonToggleChange } from '@angular/material/button-toggle';
import { MatSlideToggle } from '@angular/material/slide-toggle';
import { ActivatedRoute, Params, Router } from '@angular/router';

import { JAgentAssignment } from '@models/agent-assignment.model';
import { JAgent } from '@models/agent.model';
import { JChunk } from '@models/chunk.model';
import { JCrackerBinary } from '@models/cracker-binary.model';
import { JHashlist } from '@models/hashlist.model';
import { JHashtype } from '@models/hashtype.model';
import { FilterType } from '@models/request-params.model';
import { ResponseWrapper } from '@models/response.model';
import { SpeedStat } from '@models/speed-stat.model';
import { JTask } from '@models/task.model';

import { JsonAPISerializer } from '@services/api/serializer-service';
Expand All @@ -23,7 +22,6 @@ import { GlobalService } from '@services/main.service';
import { RequestParamBuilder } from '@services/params/builder-implementation.service';
import { AlertService } from '@services/shared/alert.service';
import { AutoTitleService } from '@services/shared/autotitle.service';
import { UIConfigService } from '@services/shared/storage.service';

import { TasksAgentsTableComponent } from '@components/tables/tasks-agents-table/tasks-agents-table.component';
import { TasksChunksTableComponent } from '@components/tables/tasks-chunks-table/tasks-chunks-table.component';
Expand Down Expand Up @@ -56,7 +54,6 @@ export class EditTasksComponent implements OnInit, OnDestroy {
tkeyspace: number;

@ViewChild('assignedAgentsTable') agentsTable: TasksAgentsTableComponent;
@ViewChild('slideToggle', { static: false }) slideToggle: MatSlideToggle;
@ViewChild(TasksChunksTableComponent) chunkTable!: TasksChunksTableComponent;

//Time calculation
Expand All @@ -75,11 +72,9 @@ export class EditTasksComponent implements OnInit, OnDestroy {

constructor(
private titleService: AutoTitleService,
private uiService: UIConfigService,
private route: ActivatedRoute,
private alertService: AlertService,
private gs: GlobalService,
private fs: FileSizePipe,
private router: Router,
private serializer: JsonAPISerializer,
private confirmDialog: ConfirmDialogService
Expand Down Expand Up @@ -175,15 +170,17 @@ export class EditTasksComponent implements OnInit, OnDestroy {
if (this.editMode) {
const params = new RequestParamBuilder()
.addInclude('hashlist')
.addInclude('speeds')
.addInclude('crackerBinary')
.addInclude('crackerBinaryType')
.addInclude('files')
.create();

this.gs.get(SERV.TASKS, this.editedTaskIndex, params).subscribe((response: ResponseWrapper) => {
const responseBody = { data: response.data, included: response.included };
const task = this.serializer.deserialize<JTask>(responseBody);
forkJoin([
this.gs.get(SERV.TASKS, this.editedTaskIndex, params),
this.gs.ghelper(SERV.HELPER, 'getTaskSpeeds?task=' + this.editedTaskIndex)
]).subscribe((result: [ResponseWrapper, ResponseWrapper]) => {
const task = this.serializer.deserialize<JTask>({ data: result[0].data, included: result[0].included });
task.speeds = this.serializer.deserialize<SpeedStat[]>({ data: result[1].data, included: result[1].included });

this.originalValue = task;
this.searched = task.searched;
Expand All @@ -209,6 +206,7 @@ export class EditTasksComponent implements OnInit, OnDestroy {
}
this.tkeyspace = task.keyspace;
this.tusepreprocessor = task.preprocessorId;

this.updateForm.setValue({
taskId: task.id,
forcePipe: task.forcePipe === true ? 'Yes' : 'No',
Expand Down Expand Up @@ -283,30 +281,6 @@ export class EditTasksComponent implements OnInit, OnDestroy {
}
}

/**
* This function calculates Keyspace searched, Time Spent and Estimated Time
*
**/
timeCalc(chunks: JChunk[]) {
const cprogress = [];
const timespent = [];
const current = 0;
for (let i = 0; i < chunks.length; i++) {
cprogress.push(chunks[i].checkpoint - chunks[i].skip);
if (chunks[i].dispatchTime > current) {
timespent.push(chunks[i].solveTime - chunks[i].dispatchTime);
} else if (chunks[i].solveTime > current) {
timespent.push(chunks[i].solveTime - current);
}
}
if (cprogress.length > 0) {
this.cprogress = cprogress.reduce((a, i) => a + i);
}
if (timespent.length > 0) {
this.ctimespent = timespent.reduce((a, i) => a + i);
}
}

assignChunksInit() {
this.route.data.subscribe((data) => {
switch (data['kind']) {
Expand Down