@upyo/sendgrid 0.5.0-dev.168 → 0.5.0-dev.172
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +1 -34
- package/dist/index.js +1 -34
- package/package.json +2 -2
package/dist/index.cjs
CHANGED
|
@@ -134,7 +134,7 @@ var SendGridHttpClient = class {
|
|
|
134
134
|
for (const [key, value] of Object.entries(this.config.headers)) headers.set(key, value);
|
|
135
135
|
const controller = new AbortController();
|
|
136
136
|
const timeoutId = setTimeout(() => controller.abort(), this.config.timeout);
|
|
137
|
-
const combinedSignal = combineSignals(controller.signal, options.signal);
|
|
137
|
+
const combinedSignal = (0, __upyo_core.combineSignals)(controller.signal, options.signal);
|
|
138
138
|
try {
|
|
139
139
|
return await globalThis.fetch(url, {
|
|
140
140
|
...options,
|
|
@@ -222,39 +222,6 @@ function sleep(milliseconds, signal) {
|
|
|
222
222
|
function createAbortError(signal) {
|
|
223
223
|
return signal?.reason ?? new DOMException("The operation was aborted.", "AbortError");
|
|
224
224
|
}
|
|
225
|
-
function combineSignals(timeoutSignal, externalSignal) {
|
|
226
|
-
if (externalSignal == null) return {
|
|
227
|
-
signal: timeoutSignal,
|
|
228
|
-
cleanup: () => {}
|
|
229
|
-
};
|
|
230
|
-
if (typeof AbortSignal.any === "function") return {
|
|
231
|
-
signal: AbortSignal.any([timeoutSignal, externalSignal]),
|
|
232
|
-
cleanup: () => {}
|
|
233
|
-
};
|
|
234
|
-
const controller = new AbortController();
|
|
235
|
-
const cleanup = () => {
|
|
236
|
-
timeoutSignal.removeEventListener("abort", abortFromTimeout);
|
|
237
|
-
externalSignal.removeEventListener("abort", abortFromExternal);
|
|
238
|
-
};
|
|
239
|
-
const abortFromTimeout = () => {
|
|
240
|
-
cleanup();
|
|
241
|
-
controller.abort(timeoutSignal.reason);
|
|
242
|
-
};
|
|
243
|
-
const abortFromExternal = () => {
|
|
244
|
-
cleanup();
|
|
245
|
-
controller.abort(externalSignal.reason);
|
|
246
|
-
};
|
|
247
|
-
if (timeoutSignal.aborted) controller.abort(timeoutSignal.reason);
|
|
248
|
-
else if (externalSignal.aborted) controller.abort(externalSignal.reason);
|
|
249
|
-
else {
|
|
250
|
-
timeoutSignal.addEventListener("abort", abortFromTimeout, { once: true });
|
|
251
|
-
externalSignal.addEventListener("abort", abortFromExternal, { once: true });
|
|
252
|
-
}
|
|
253
|
-
return {
|
|
254
|
-
signal: controller.signal,
|
|
255
|
-
cleanup
|
|
256
|
-
};
|
|
257
|
-
}
|
|
258
225
|
|
|
259
226
|
//#endregion
|
|
260
227
|
//#region src/message-converter.ts
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createFailedReceipt, parseRetryAfter } from "@upyo/core";
|
|
1
|
+
import { combineSignals, createFailedReceipt, parseRetryAfter } from "@upyo/core";
|
|
2
2
|
|
|
3
3
|
//#region src/config.ts
|
|
4
4
|
/**
|
|
@@ -199,39 +199,6 @@ function sleep(milliseconds, signal) {
|
|
|
199
199
|
function createAbortError(signal) {
|
|
200
200
|
return signal?.reason ?? new DOMException("The operation was aborted.", "AbortError");
|
|
201
201
|
}
|
|
202
|
-
function combineSignals(timeoutSignal, externalSignal) {
|
|
203
|
-
if (externalSignal == null) return {
|
|
204
|
-
signal: timeoutSignal,
|
|
205
|
-
cleanup: () => {}
|
|
206
|
-
};
|
|
207
|
-
if (typeof AbortSignal.any === "function") return {
|
|
208
|
-
signal: AbortSignal.any([timeoutSignal, externalSignal]),
|
|
209
|
-
cleanup: () => {}
|
|
210
|
-
};
|
|
211
|
-
const controller = new AbortController();
|
|
212
|
-
const cleanup = () => {
|
|
213
|
-
timeoutSignal.removeEventListener("abort", abortFromTimeout);
|
|
214
|
-
externalSignal.removeEventListener("abort", abortFromExternal);
|
|
215
|
-
};
|
|
216
|
-
const abortFromTimeout = () => {
|
|
217
|
-
cleanup();
|
|
218
|
-
controller.abort(timeoutSignal.reason);
|
|
219
|
-
};
|
|
220
|
-
const abortFromExternal = () => {
|
|
221
|
-
cleanup();
|
|
222
|
-
controller.abort(externalSignal.reason);
|
|
223
|
-
};
|
|
224
|
-
if (timeoutSignal.aborted) controller.abort(timeoutSignal.reason);
|
|
225
|
-
else if (externalSignal.aborted) controller.abort(externalSignal.reason);
|
|
226
|
-
else {
|
|
227
|
-
timeoutSignal.addEventListener("abort", abortFromTimeout, { once: true });
|
|
228
|
-
externalSignal.addEventListener("abort", abortFromExternal, { once: true });
|
|
229
|
-
}
|
|
230
|
-
return {
|
|
231
|
-
signal: controller.signal,
|
|
232
|
-
cleanup
|
|
233
|
-
};
|
|
234
|
-
}
|
|
235
202
|
|
|
236
203
|
//#endregion
|
|
237
204
|
//#region src/message-converter.ts
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@upyo/sendgrid",
|
|
3
|
-
"version": "0.5.0-dev.
|
|
3
|
+
"version": "0.5.0-dev.172",
|
|
4
4
|
"description": "SendGrid transport for Upyo email library",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"email",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
},
|
|
54
54
|
"sideEffects": false,
|
|
55
55
|
"peerDependencies": {
|
|
56
|
-
"@upyo/core": "0.5.0-dev.
|
|
56
|
+
"@upyo/core": "0.5.0-dev.172+1b1248e1"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
59
|
"tsdown": "^0.12.7",
|