Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix: Handling of Graph API throttling #12

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

Merged
RoelVB merged 2 commits into from
Jun 2, 2024
Merged

Fix: Handling of Graph API throttling #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
330a2f5
Fix: Handling of Graph API throttling
RoelVB Jun 2, 2024
b2a67ec
CI: Attach release assets as zip files
RoelVB Jun 2, 2024
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
14 changes: 13 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,23 @@ jobs:
name: installer
path: dist

- name: Create ZIP files
run: |
for file in dist/*; do
if [ -f "$file" ]; then
zip "${file%.*}.zip" "$file"
fi
done

if [ -f "dist/server.zip" ]; then
mv "dist/server.zip" "dist/NodeJS.zip"
fi

- name: Create release
uses: softprops/action-gh-release@v2
with:
name: v${{ inputs.version }}
tag_name: v${{ inputs.version }}
draft: true
files: dist/**
files: dist/*.zip
fail_on_unmatched_files: true
31 changes: 10 additions & 21 deletions src/classes/Mailer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'fs';
import readline from 'readline';
import { Mutex, Semaphore } from 'async-mutex';
import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
import axios, { AxiosError, AxiosRequestConfig, AxiosResponse, isAxiosError } from 'axios';
import { Base64Encode } from 'base64-stream';
import addressparser from 'nodemailer/lib/addressparser';
import { ConfidentialClientApplication } from '@azure/msal-node';
Expand Down Expand Up @@ -86,42 +86,31 @@ export class Mailer
static async #retryableRequest<RequestData = any, ReponseData = any>(request: AxiosRequestConfig<RequestData>): Promise<AxiosResponse<RequestData, ReponseData>>
{
const retryLimit = 3;
let response: AxiosResponse<RequestData, ReponseData>|undefined;
let retryCount = 0;
let lastError: Error|undefined;
let wait = 200;

const retry = async (): Promise<AxiosResponse<RequestData, ReponseData>> =>
{
if(retryCount >= retryLimit) // We've reached our retry limit
throw lastError;
else
retryCount++;

// If we don't have a response yet, or status 429, 503 or 504 we can try the request (again)
if(typeof response === "undefined" || response?.status === 429 || response?.status === 503 || response?.status === 504)
{
if(typeof response !== 'undefined') // This is NOT our first try?
try {
return await axios(request);
} catch(error) {
if(++retryCount > retryLimit) // We've reached our retry limit?
throw error;
else if(isAxiosError(error) && (error.response?.status === 429 || error.response?.status === 503 || error.response?.status === 504)) // We got a retryable response?
{
const retryAfter = response.headers['Retry-After'];
const retryAfter = error.response.headers['Retry-After'];
if(retryAfter && !isNaN(retryAfter)) // We got throttled
wait = parseInt(retryAfter) * 1000;
else
wait *= 2;

await this.#sleep(wait);
}

try {
response = await axios(request);
return response!;
} catch(error: any) {
lastError = error;
return retry();
}
else // Unknown error response, throw the error
throw error;
}
else
return response;
};

return retry();
Expand Down