Skip to content

Commit 0963c33

Browse files
committed
feat: Add timeout to fetch request in AppController
1 parent a6ce60a commit 0963c33

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

src/app.controller.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ export class AppController extends AbstractController {
5151
data = storage.get(project) as GithubUpdate[] | object
5252
} else {
5353
this.logger.log(`Fetching ${project} tags`)
54-
const update = await fetch(`https://api.github.com/repos/Libertech-FR/${project}/tags`)
54+
const update = await fetch(`https://api.github.com/repos/Libertech-FR/${project}/tags`, {
55+
signal: AbortSignal.timeout(1000),
56+
})
5557
data = await update.json()
5658
storage.set(project, data)
5759
// console.log('this.storage', storage.get(project))

src/core/backends/backends.controller.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { ExecuteJobDto } from './_dto/execute-job.dto';
2020
import { BackendsService } from './backends.service';
2121
import { SyncIdentitiesDto } from './_dto/sync-identities.dto';
2222
import { Types } from 'mongoose';
23+
import { ActionType } from './_enum/action-type.enum';
2324

2425
function fireMessage(observer: Subscriber<MessageEvent>, channel: string, message: any, loggername: string) {
2526
try {
@@ -112,17 +113,18 @@ export class BackendsController {
112113
});
113114

114115
return new Observable((observer) => {
115-
this.backendsService.queueEvents.on('added', (added) =>
116-
fireMessage(observer, 'job:added', added, this.constructor.name),
117-
);
116+
this.backendsService.queueEvents.on('added', (added) => {
117+
if ([ActionType.DUMP_PACKAGE_CONFIG].includes(<ActionType>added.name)) return;
118+
return fireMessage(observer, 'job:added', added, this.constructor.name);
119+
});
118120

119-
this.backendsService.queueEvents.on('completed', (completed) =>
120-
fireMessage(observer, 'job:completed', completed, this.constructor.name),
121-
);
121+
this.backendsService.queueEvents.on('completed', (completed) => {
122+
return fireMessage(observer, 'job:completed', completed, this.constructor.name);
123+
});
122124

123-
this.backendsService.queueEvents.on('failed', (failed) =>
124-
fireMessage(observer, 'job:failed', failed, this.constructor.name),
125-
);
125+
this.backendsService.queueEvents.on('failed', (failed) => {
126+
return fireMessage(observer, 'job:failed', failed, this.constructor.name);
127+
});
126128
});
127129
}
128130
}

0 commit comments

Comments
 (0)