@resolveio/server-lib 22.2.54 → 22.2.55

package/managers/method.manager.d.ts

@@ -6,6 +6,9 @@ import { WebSocketManager } from './websocket.manager';
 interface SendEmailOptions {
     correlationId?: string;
     meta?: Record<string, any>;
+    waitForCompletion?: boolean;
+    waitForCompletionTimeoutMs?: number;
+    waitForCompletionPollMs?: number;
 }
 export declare class AWS {
     private _s3;
@@ -69,6 +72,7 @@ export declare class MethodManager {
     getCircularReplacer(): (key: any, value: any) => any;
     private finalizeEmailHistoryStorage;
     private tryMergeEmailOccurrence;
+    private waitForEmailCompletion;
     sendEmail(sendTo: string, subject: string, text?: string | null, html?: string | null, attachments?: any[] | null, send_from?: string | null, reply_to?: string | null, force_ses?: boolean, local_override?: boolean, options?: SendEmailOptions): Promise<true | EmailHistoryModel>;
     getAWS(): AWS;
     readFile(fileName: any): string;

package/managers/method.manager.js

@@ -473,6 +473,7 @@ var MethodManager = /** @class */ (function () {
     };
     MethodManager.prototype.initialize = function (websocketManager, monitorManagerFunction, isWorkersEnabled, isWorkerInstance) {
         var _this = this;
+        var _a, _b;
         this._websocketManager = websocketManager;
         this._monitorManagerFunction = monitorManagerFunction;
         this._isWorkersEnabled = isWorkersEnabled;
@@ -550,7 +551,12 @@ var MethodManager = /** @class */ (function () {
             });
         }); });
         this._aws = new AWS();
-        var sesRegion = process.env.AWS_SES_REGION || process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION || 'us-east-1';
+        var sesRegion = process.env.AWS_SES_REGION
+            || ((_a = this.serverConfig) === null || _a === void 0 ? void 0 : _a.AWS_SES_REGION)
+            || ((_b = this.serverConfig) === null || _b === void 0 ? void 0 : _b.AWSSES_REGION)
+            || process.env.AWS_REGION
+            || process.env.AWS_DEFAULT_REGION
+            || 'us-east-1';
         var sesCredentials = process.env.AWS_ACCESS_KEY && process.env.AWS_SECRET_ACCESS_KEY ? {
             accessKeyId: process.env.AWS_ACCESS_KEY,
             secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
@@ -1700,6 +1706,62 @@ var MethodManager = /** @class */ (function () {
             });
         });
     };
+    MethodManager.prototype.waitForEmailCompletion = function (emailHistory, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var timeoutMs, pollMs, deadline, latest;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        timeoutMs = Math.max(1000, Number(options === null || options === void 0 ? void 0 : options.waitForCompletionTimeoutMs) || 30000);
+                        pollMs = Math.max(100, Number(options === null || options === void 0 ? void 0 : options.waitForCompletionPollMs) || 250);
+                        deadline = Date.now() + timeoutMs;
+                        _a.label = 1;
+                    case 1:
+                        if (!(Date.now() <= deadline)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, email_history_collection_1.EmailHistories.findOne({ _id: emailHistory._id }, {
+                                projection: {
+                                    status: 1,
+                                    error: 1,
+                                    date: 1,
+                                    id_user: 1,
+                                    user: 1,
+                                    email: 1,
+                                    subject: 1,
+                                    text: 1,
+                                    html: 1,
+                                    attachments: 1,
+                                    send_from: 1,
+                                    reply_to: 1,
+                                    force_ses: 1,
+                                    correlationId: 1,
+                                    meta: 1,
+                                    occurrences: 1,
+                                    processingAt: 1,
+                                    completedAt: 1
+                                }
+                            })];
+                    case 2:
+                        latest = _a.sent();
+                        if (!latest) {
+                            return [2 /*return*/, __assign(__assign({}, emailHistory), { status: 'completed', error: '', completedAt: new Date() })];
+                        }
+                        if (latest.status === 'completed') {
+                            return [2 /*return*/, latest];
+                        }
+                        if (latest.status === 'failed') {
+                            throw new Error(latest.error || "Email failed to send: ".concat(latest.subject));
+                        }
+                        // eslint-disable-next-line no-restricted-syntax
+                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, pollMs); })];
+                    case 3:
+                        // eslint-disable-next-line no-restricted-syntax
+                        _a.sent();
+                        return [3 /*break*/, 1];
+                    case 4: throw new Error("Email send timed out waiting for completion: ".concat(emailHistory.subject));
+                }
+            });
+        });
+    };
     MethodManager.prototype.sendEmail = function (sendTo_1, subject_1, text_1, html_1, attachments_1, send_from_1, reply_to_1) {
         return __awaiter(this, arguments, void 0, function (sendTo, subject, text, html, attachments, send_from, reply_to, force_ses, local_override, options) {
             var normalizedSubject, correlationId, finalSubject, groupByCorrelationId, normalizedText, normalizedHtml, occurrence, allowGrouping, normalizedAttachments, merged, emailHistory, _a, aggregatedText, aggregatedHtml, history_1, err_7;
@@ -1725,9 +1787,9 @@ var MethodManager = /** @class */ (function () {
                             ? createEmailOccurrence(normalizedSubject, normalizedText, normalizedHtml, options === null || options === void 0 ? void 0 : options.meta)
                             : null;
                         allowGrouping = groupByCorrelationId;
-                        if (!sendTo) return [3 /*break*/, 9];
+                        if (!sendTo) return [3 /*break*/, 11];
                         if (!(resolveio_server_app_1.ResolveIOServer.getServerConfig()['ROOT_URL'] !== 'http://localhost:4200' ||
-                            local_override)) return [3 /*break*/, 7];
+                            local_override)) return [3 /*break*/, 9];
                         normalizedAttachments = [];
                         if (Array.isArray(attachments)) {
                             normalizedAttachments = attachments.slice();
@@ -1792,23 +1854,26 @@ var MethodManager = /** @class */ (function () {
                         }
                         _b.label = 3;
                     case 3:
-                        _b.trys.push([3, 5, , 6]);
+                        _b.trys.push([3, 7, , 8]);
                         return [4 /*yield*/, email_history_collection_1.EmailHistories.insertOne(emailHistory)];
                     case 4:
                         history_1 = _b.sent();
-                        return [2 /*return*/, history_1];
-                    case 5:
+                        if (!(options === null || options === void 0 ? void 0 : options.waitForCompletion)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, this.waitForEmailCompletion(history_1, options)];
+                    case 5: return [2 /*return*/, _b.sent()];
+                    case 6: return [2 /*return*/, history_1];
+                    case 7:
                         err_7 = _b.sent();
                         console.error('Failed to queue email:', err_7);
                         err_7.message = "Failed to queue email: ".concat(err_7.message);
                         throw err_7;
-                    case 6: return [3 /*break*/, 8];
-                    case 7:
+                    case 8: return [3 /*break*/, 10];
+                    case 9:
                         console.log('Send email', sendTo, finalSubject, normalizedText, normalizedHtml, attachments, send_from, force_ses, correlationId);
                         return [2 /*return*/, true];
-                    case 8: return [3 /*break*/, 10];
-                    case 9: return [2 /*return*/, true];
-                    case 10: return [2 /*return*/];
+                    case 10: return [3 /*break*/, 12];
+                    case 11: return [2 /*return*/, true];
+                    case 12: return [2 /*return*/];
                 }
             });
         });