@serve.zone/platformclient 1.1.5 → 2.0.0
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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.platformclient.d.ts +2 -1
- package/dist_ts/classes.platformclient.js +7 -1
- package/dist_ts/email/classes.emailconnector.d.ts +108 -0
- package/dist_ts/email/classes.emailconnector.js +366 -1
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/package.json +4 -4
- package/readme.md +77 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.platformclient.ts +8 -1
- package/ts/email/classes.emailconnector.ts +486 -0
- package/ts/index.ts +1 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/platformclient',
|
|
6
|
-
version: '
|
|
6
|
+
version: '2.0.0',
|
|
7
7
|
description: 'a module that makes it really easy to use the serve.zone platform inside your app'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSw0QkFBNEI7SUFDbEMsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLG1GQUFtRjtDQUNqRyxDQUFBIn0=
|
|
@@ -35,9 +35,10 @@ export declare class SzPlatformClient {
|
|
|
35
35
|
private getConfiguredAuthorizationString;
|
|
36
36
|
private getAuthorizationStringFromBindings;
|
|
37
37
|
private setAuthorizationTag;
|
|
38
|
+
stop(): Promise<void>;
|
|
38
39
|
private discoverPlatformBindings;
|
|
39
40
|
private parsePlatformBindingsEnv;
|
|
40
41
|
private mergePlatformBindings;
|
|
41
|
-
|
|
42
|
+
getConfiguredEnvVar(envNameArg: string): Promise<string | undefined>;
|
|
42
43
|
private getProcessEnvVar;
|
|
43
44
|
}
|
|
@@ -128,6 +128,12 @@ export class SzPlatformClient {
|
|
|
128
128
|
}
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
|
+
async stop() {
|
|
132
|
+
await this.emailConnector.stop();
|
|
133
|
+
if (this.typedsocket) {
|
|
134
|
+
await this.typedsocket.stop();
|
|
135
|
+
}
|
|
136
|
+
}
|
|
131
137
|
async discoverPlatformBindings() {
|
|
132
138
|
const bindings = [];
|
|
133
139
|
const envBindings = await this.getConfiguredEnvVar('SERVEZONE_PLATFORM_BINDINGS');
|
|
@@ -175,4 +181,4 @@ export class SzPlatformClient {
|
|
|
175
181
|
return processEnv?.[envNameArg];
|
|
176
182
|
}
|
|
177
183
|
}
|
|
178
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
184
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.platformclient.js","sourceRoot":"","sources":["../ts/classes.platformclient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,102 @@
|
|
|
1
1
|
import type { SzPlatformClient } from '../classes.platformclient.js';
|
|
2
2
|
import * as plugins from '../plugins.js';
|
|
3
|
+
export type TServiceMailTlsMode = 'plain' | 'starttls' | 'implicitTls';
|
|
4
|
+
export interface IServiceMailSmtpCredentials {
|
|
5
|
+
from: string;
|
|
6
|
+
host: string;
|
|
7
|
+
port: number;
|
|
8
|
+
tlsMode: TServiceMailTlsMode;
|
|
9
|
+
username: string;
|
|
10
|
+
password: string;
|
|
11
|
+
addressToken?: string;
|
|
12
|
+
}
|
|
13
|
+
export interface IServiceMailTypedCredentials {
|
|
14
|
+
from: string;
|
|
15
|
+
typedUrl: string;
|
|
16
|
+
credentialId: string;
|
|
17
|
+
credentialSecret: string;
|
|
18
|
+
addressToken?: string;
|
|
19
|
+
}
|
|
20
|
+
export interface IServiceMailStatus {
|
|
21
|
+
ready: boolean;
|
|
22
|
+
from?: string;
|
|
23
|
+
host?: string;
|
|
24
|
+
port?: number;
|
|
25
|
+
tlsMode?: TServiceMailTlsMode;
|
|
26
|
+
typedUrl?: string;
|
|
27
|
+
transport?: 'typedsocket' | 'smtp' | 'none';
|
|
28
|
+
usernameConfigured: boolean;
|
|
29
|
+
passwordConfigured: boolean;
|
|
30
|
+
typedCredentialConfigured?: boolean;
|
|
31
|
+
smtpReady?: boolean;
|
|
32
|
+
missing: string[];
|
|
33
|
+
}
|
|
34
|
+
export interface IServiceMailAttachment {
|
|
35
|
+
filename: string;
|
|
36
|
+
contentType?: string;
|
|
37
|
+
content: string | Uint8Array;
|
|
38
|
+
}
|
|
39
|
+
export interface IServiceMailSendOptions {
|
|
40
|
+
from?: string;
|
|
41
|
+
to: string | string[];
|
|
42
|
+
cc?: string | string[];
|
|
43
|
+
bcc?: string | string[];
|
|
44
|
+
subject: string;
|
|
45
|
+
text?: string;
|
|
46
|
+
html?: string;
|
|
47
|
+
headers?: Record<string, string>;
|
|
48
|
+
attachments?: IServiceMailAttachment[];
|
|
49
|
+
}
|
|
50
|
+
export interface IServiceMailSendResult {
|
|
51
|
+
messageId?: string;
|
|
52
|
+
accepted?: string[];
|
|
53
|
+
rejected?: string[];
|
|
54
|
+
response?: string;
|
|
55
|
+
}
|
|
56
|
+
export interface IServiceMailInboundMessage extends plugins.servezoneInterfaces.data.IMailInboundMessagePayload {
|
|
57
|
+
from: string;
|
|
58
|
+
to: string[];
|
|
59
|
+
receivedAtIso: string;
|
|
60
|
+
}
|
|
61
|
+
export interface IServiceMailInboundHandlerResult {
|
|
62
|
+
accepted?: boolean;
|
|
63
|
+
workAppMessageId?: string;
|
|
64
|
+
message?: string;
|
|
65
|
+
}
|
|
66
|
+
export type IServiceMailInboundHandleResult = plugins.servezoneInterfaces.requests.mail.IReq_DeliverInboundMail['response'];
|
|
67
|
+
export type TServiceMailInboundHandler = (messageArg: IServiceMailInboundMessage) => Promise<IServiceMailInboundHandlerResult | void> | IServiceMailInboundHandlerResult | void;
|
|
3
68
|
export declare class SzEmailConnector {
|
|
4
69
|
platformClientRef: SzPlatformClient;
|
|
70
|
+
private mailTypedSocket?;
|
|
71
|
+
private mailTypedSocketUrl?;
|
|
72
|
+
private mailTypedSocketPromise?;
|
|
73
|
+
private mailTypedSocketAbortController?;
|
|
74
|
+
private inboundHandler?;
|
|
75
|
+
private inboundTypedHandlerRegistered;
|
|
5
76
|
constructor(platformClientRefArg: SzPlatformClient);
|
|
77
|
+
/**
|
|
78
|
+
* Legacy platform-service email path. New service-mail code should use sendMail().
|
|
79
|
+
*/
|
|
6
80
|
sendEmail(optionsArg: plugins.servezoneInterfaces.platform.email.IReq_SendEmail['request']): Promise<string | undefined>;
|
|
81
|
+
getServiceMailStatus(addressArg?: string): Promise<IServiceMailStatus>;
|
|
82
|
+
getServiceMailCredentials(addressArg?: string): Promise<IServiceMailSmtpCredentials>;
|
|
83
|
+
sendText(optionsArg: Omit<IServiceMailSendOptions, 'html'> & {
|
|
84
|
+
text: string;
|
|
85
|
+
}): Promise<IServiceMailSendResult>;
|
|
86
|
+
sendHtml(optionsArg: Omit<IServiceMailSendOptions, 'text'> & {
|
|
87
|
+
html: string;
|
|
88
|
+
}): Promise<IServiceMailSendResult>;
|
|
89
|
+
sendMail(optionsArg: IServiceMailSendOptions): Promise<IServiceMailSendResult>;
|
|
90
|
+
registerInboundHandler(handlerArg: TServiceMailInboundHandler, addressArg?: string): Promise<plugins.servezoneInterfaces.requests.mail.IReq_RegisterServiceMailEndpoint['response']>;
|
|
91
|
+
stop(): Promise<void>;
|
|
92
|
+
normalizeInboundMessage(payloadArg: unknown): IServiceMailInboundMessage;
|
|
93
|
+
handleInboundPayload(payloadArg: unknown, handlerArg: TServiceMailInboundHandler): Promise<IServiceMailInboundHandleResult>;
|
|
94
|
+
createInboundHandler(handlerArg: TServiceMailInboundHandler): (payloadArg: unknown) => Promise<{
|
|
95
|
+
accepted: boolean;
|
|
96
|
+
workAppMessageId?: string;
|
|
97
|
+
message?: string;
|
|
98
|
+
}>;
|
|
99
|
+
private ensureInboundTypedHandler;
|
|
7
100
|
sendNotification(optionsArg: {
|
|
8
101
|
toArg: string;
|
|
9
102
|
subject: string;
|
|
@@ -14,4 +107,19 @@ export declare class SzEmailConnector {
|
|
|
14
107
|
subject: string;
|
|
15
108
|
text: string;
|
|
16
109
|
}): Promise<void>;
|
|
110
|
+
private readMailEnv;
|
|
111
|
+
private readMailEnvVar;
|
|
112
|
+
private getCredentialEnvVarFromBindings;
|
|
113
|
+
private hasAnyMailEnvValue;
|
|
114
|
+
private getServiceMailTypedCredentials;
|
|
115
|
+
private getMailTypedSocket;
|
|
116
|
+
private stopMailTypedSocket;
|
|
117
|
+
private normalizeTypedSocketUrl;
|
|
118
|
+
private normalizeTlsMode;
|
|
119
|
+
private getMailEnvToken;
|
|
120
|
+
private listToArray;
|
|
121
|
+
private normalizeAttachmentContent;
|
|
122
|
+
private asRecord;
|
|
123
|
+
private normalizeHeaders;
|
|
124
|
+
private extractHeader;
|
|
17
125
|
}
|
|
@@ -2,8 +2,12 @@ import * as plugins from '../plugins.js';
|
|
|
2
2
|
import { logger } from '../logger.js';
|
|
3
3
|
export class SzEmailConnector {
|
|
4
4
|
constructor(platformClientRefArg) {
|
|
5
|
+
this.inboundTypedHandlerRegistered = false;
|
|
5
6
|
this.platformClientRef = platformClientRefArg;
|
|
6
7
|
}
|
|
8
|
+
/**
|
|
9
|
+
* Legacy platform-service email path. New service-mail code should use sendMail().
|
|
10
|
+
*/
|
|
7
11
|
async sendEmail(optionsArg) {
|
|
8
12
|
if (this.platformClientRef.debugMode) {
|
|
9
13
|
logger.log('info', `sent email with subject ${optionsArg.title} to ${optionsArg.to}
|
|
@@ -19,7 +23,368 @@ export class SzEmailConnector {
|
|
|
19
23
|
const response = await typedRequest.fire(optionsArg);
|
|
20
24
|
return response.responseId;
|
|
21
25
|
}
|
|
26
|
+
async getServiceMailStatus(addressArg) {
|
|
27
|
+
const requestedAddress = addressArg?.trim().toLowerCase();
|
|
28
|
+
const token = requestedAddress ? this.getMailEnvToken(requestedAddress) : undefined;
|
|
29
|
+
const scopedEnv = token ? await this.readMailEnv(token) : undefined;
|
|
30
|
+
const defaultEnv = token ? await this.readMailEnv() : undefined;
|
|
31
|
+
const useDefaultEnv = requestedAddress
|
|
32
|
+
&& !this.hasAnyMailEnvValue(scopedEnv)
|
|
33
|
+
&& defaultEnv?.from?.trim().toLowerCase() === requestedAddress;
|
|
34
|
+
const env = useDefaultEnv ? defaultEnv : scopedEnv || await this.readMailEnv();
|
|
35
|
+
const missingPrefix = useDefaultEnv || !token ? undefined : token;
|
|
36
|
+
const port = env.smtpPort ? Number(env.smtpPort) : undefined;
|
|
37
|
+
const tlsMode = this.normalizeTlsMode(env.smtpTlsMode || 'starttls');
|
|
38
|
+
const typedMissing = [];
|
|
39
|
+
const smtpMissing = [];
|
|
40
|
+
if (!env.typedUrl)
|
|
41
|
+
typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_TYPED_URL` : 'MAIL_TYPED_URL');
|
|
42
|
+
if (!env.apiCredentialId)
|
|
43
|
+
typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_API_CREDENTIAL_ID` : 'MAIL_API_CREDENTIAL_ID');
|
|
44
|
+
if (!env.apiCredentialSecret)
|
|
45
|
+
typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_API_CREDENTIAL_SECRET` : 'MAIL_API_CREDENTIAL_SECRET');
|
|
46
|
+
if (!env.smtpHost)
|
|
47
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_HOST` : 'SMTP_HOST');
|
|
48
|
+
if (!env.smtpPort || !Number.isInteger(port) || port < 1 || port > 65535) {
|
|
49
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_PORT` : 'SMTP_PORT');
|
|
50
|
+
}
|
|
51
|
+
if (!env.smtpUsername)
|
|
52
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_USERNAME` : 'SMTP_USERNAME');
|
|
53
|
+
if (!env.smtpPassword)
|
|
54
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_PASSWORD` : 'SMTP_PASSWORD');
|
|
55
|
+
const fromMissing = env.from ? [] : [missingPrefix ? `MAIL_${missingPrefix}_FROM` : 'MAIL_FROM'];
|
|
56
|
+
const typedReady = fromMissing.length === 0 && typedMissing.length === 0;
|
|
57
|
+
const smtpReady = fromMissing.length === 0 && smtpMissing.length === 0;
|
|
58
|
+
return {
|
|
59
|
+
ready: typedReady,
|
|
60
|
+
from: env.from,
|
|
61
|
+
host: env.smtpHost,
|
|
62
|
+
port,
|
|
63
|
+
tlsMode,
|
|
64
|
+
typedUrl: env.typedUrl,
|
|
65
|
+
transport: typedReady ? 'typedsocket' : smtpReady ? 'smtp' : 'none',
|
|
66
|
+
usernameConfigured: Boolean(env.smtpUsername),
|
|
67
|
+
passwordConfigured: Boolean(env.smtpPassword),
|
|
68
|
+
typedCredentialConfigured: Boolean(env.apiCredentialId && env.apiCredentialSecret),
|
|
69
|
+
smtpReady,
|
|
70
|
+
missing: typedReady ? [] : [...fromMissing, ...typedMissing],
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
async getServiceMailCredentials(addressArg) {
|
|
74
|
+
const requestedAddress = addressArg?.trim().toLowerCase();
|
|
75
|
+
const requestedToken = requestedAddress ? this.getMailEnvToken(requestedAddress) : undefined;
|
|
76
|
+
const scopedEnv = requestedToken ? await this.readMailEnv(requestedToken) : undefined;
|
|
77
|
+
const hasScopedConfig = scopedEnv && Object.values(scopedEnv).some(Boolean);
|
|
78
|
+
const env = hasScopedConfig ? scopedEnv : await this.readMailEnv();
|
|
79
|
+
const from = env.from?.trim().toLowerCase();
|
|
80
|
+
if (!from)
|
|
81
|
+
throw new Error('MAIL_FROM is required for service mail');
|
|
82
|
+
if (requestedAddress && from !== requestedAddress) {
|
|
83
|
+
throw new Error(`No service mail credentials are configured for ${requestedAddress}`);
|
|
84
|
+
}
|
|
85
|
+
const port = Number(env.smtpPort);
|
|
86
|
+
if (!env.smtpHost)
|
|
87
|
+
throw new Error('SMTP_HOST is required for service mail');
|
|
88
|
+
if (!Number.isInteger(port) || port < 1 || port > 65535) {
|
|
89
|
+
throw new Error('SMTP_PORT must be an integer between 1 and 65535');
|
|
90
|
+
}
|
|
91
|
+
if (!env.smtpUsername)
|
|
92
|
+
throw new Error('SMTP_USERNAME is required for service mail');
|
|
93
|
+
if (!env.smtpPassword)
|
|
94
|
+
throw new Error('SMTP_PASSWORD is required for service mail');
|
|
95
|
+
return {
|
|
96
|
+
from,
|
|
97
|
+
host: env.smtpHost,
|
|
98
|
+
port,
|
|
99
|
+
tlsMode: this.normalizeTlsMode(env.smtpTlsMode || 'starttls'),
|
|
100
|
+
username: env.smtpUsername,
|
|
101
|
+
password: env.smtpPassword,
|
|
102
|
+
addressToken: hasScopedConfig ? requestedToken : undefined,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
async sendText(optionsArg) {
|
|
106
|
+
return await this.sendMail(optionsArg);
|
|
107
|
+
}
|
|
108
|
+
async sendHtml(optionsArg) {
|
|
109
|
+
return await this.sendMail(optionsArg);
|
|
110
|
+
}
|
|
111
|
+
async sendMail(optionsArg) {
|
|
112
|
+
if (!optionsArg.text && !optionsArg.html) {
|
|
113
|
+
throw new Error('Either text or html is required for service mail');
|
|
114
|
+
}
|
|
115
|
+
if (this.platformClientRef.debugMode) {
|
|
116
|
+
logger.log('info', `service mail debug send: ${optionsArg.subject} to ${this.listToArray(optionsArg.to).join(', ')}`);
|
|
117
|
+
return { messageId: 'debug' };
|
|
118
|
+
}
|
|
119
|
+
const credentials = await this.getServiceMailTypedCredentials(optionsArg.from);
|
|
120
|
+
const typedSocket = await this.getMailTypedSocket(credentials.typedUrl);
|
|
121
|
+
const request = typedSocket.createTypedRequest('enqueueMail');
|
|
122
|
+
const result = await request.fire({
|
|
123
|
+
auth: {
|
|
124
|
+
credentialId: credentials.credentialId,
|
|
125
|
+
credentialSecret: credentials.credentialSecret,
|
|
126
|
+
},
|
|
127
|
+
outboundIdentityId: credentials.credentialId,
|
|
128
|
+
message: {
|
|
129
|
+
from: credentials.from,
|
|
130
|
+
to: this.listToArray(optionsArg.to),
|
|
131
|
+
cc: optionsArg.cc ? this.listToArray(optionsArg.cc) : undefined,
|
|
132
|
+
bcc: optionsArg.bcc ? this.listToArray(optionsArg.bcc) : undefined,
|
|
133
|
+
subject: optionsArg.subject,
|
|
134
|
+
text: optionsArg.text,
|
|
135
|
+
html: optionsArg.html,
|
|
136
|
+
headers: optionsArg.headers,
|
|
137
|
+
attachments: optionsArg.attachments?.map((attachmentArg) => ({
|
|
138
|
+
filename: attachmentArg.filename,
|
|
139
|
+
contentType: attachmentArg.contentType,
|
|
140
|
+
binaryAttachmentString: this.normalizeAttachmentContent(attachmentArg.content),
|
|
141
|
+
})),
|
|
142
|
+
},
|
|
143
|
+
});
|
|
144
|
+
if (!result.accepted) {
|
|
145
|
+
throw new Error(result.message || 'service mail was not accepted by dcrouter');
|
|
146
|
+
}
|
|
147
|
+
return {
|
|
148
|
+
messageId: result.spoolItemId,
|
|
149
|
+
accepted: this.listToArray(optionsArg.to),
|
|
150
|
+
rejected: [],
|
|
151
|
+
response: result.message,
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
async registerInboundHandler(handlerArg, addressArg) {
|
|
155
|
+
this.inboundHandler = handlerArg;
|
|
156
|
+
this.ensureInboundTypedHandler();
|
|
157
|
+
const credentials = await this.getServiceMailTypedCredentials(addressArg);
|
|
158
|
+
const typedSocket = await this.getMailTypedSocket(credentials.typedUrl);
|
|
159
|
+
const request = typedSocket.createTypedRequest('registerServiceMailEndpoint');
|
|
160
|
+
const result = await request.fire({
|
|
161
|
+
auth: {
|
|
162
|
+
credentialId: credentials.credentialId,
|
|
163
|
+
credentialSecret: credentials.credentialSecret,
|
|
164
|
+
},
|
|
165
|
+
addresses: [credentials.from],
|
|
166
|
+
});
|
|
167
|
+
if (!result.success) {
|
|
168
|
+
throw new Error(result.message || 'Could not register service mail endpoint');
|
|
169
|
+
}
|
|
170
|
+
return result;
|
|
171
|
+
}
|
|
172
|
+
async stop() {
|
|
173
|
+
await this.stopMailTypedSocket();
|
|
174
|
+
}
|
|
175
|
+
normalizeInboundMessage(payloadArg) {
|
|
176
|
+
const payload = this.asRecord(payloadArg);
|
|
177
|
+
const deliveryCandidate = this.asRecord(payload.delivery || payload.message || payload);
|
|
178
|
+
const envelope = this.asRecord(deliveryCandidate.envelope);
|
|
179
|
+
const rawMessage = typeof deliveryCandidate.rawMessage === 'string' ? deliveryCandidate.rawMessage : '';
|
|
180
|
+
const rcptTo = Array.isArray(envelope.rcptTo) ? envelope.rcptTo.map(String) : [];
|
|
181
|
+
const receivedAt = typeof deliveryCandidate.receivedAt === 'number' ? deliveryCandidate.receivedAt : Date.now();
|
|
182
|
+
return {
|
|
183
|
+
spoolItemId: String(deliveryCandidate.spoolItemId || deliveryCandidate.id || ''),
|
|
184
|
+
owner: deliveryCandidate.owner,
|
|
185
|
+
envelope: {
|
|
186
|
+
mailFrom: String(envelope.mailFrom || deliveryCandidate.from || ''),
|
|
187
|
+
rcptTo,
|
|
188
|
+
},
|
|
189
|
+
rawMessage,
|
|
190
|
+
sizeBytes: typeof deliveryCandidate.sizeBytes === 'number' ? deliveryCandidate.sizeBytes : rawMessage.length,
|
|
191
|
+
messageId: deliveryCandidate.messageId ? String(deliveryCandidate.messageId) : undefined,
|
|
192
|
+
subject: deliveryCandidate.subject ? String(deliveryCandidate.subject) : this.extractHeader(rawMessage, 'subject'),
|
|
193
|
+
headers: this.normalizeHeaders(deliveryCandidate.headers),
|
|
194
|
+
source: deliveryCandidate.source,
|
|
195
|
+
receivedAt,
|
|
196
|
+
from: String(envelope.mailFrom || deliveryCandidate.from || ''),
|
|
197
|
+
to: rcptTo,
|
|
198
|
+
receivedAtIso: new Date(receivedAt).toISOString(),
|
|
199
|
+
};
|
|
200
|
+
}
|
|
201
|
+
async handleInboundPayload(payloadArg, handlerArg) {
|
|
202
|
+
const message = this.normalizeInboundMessage(payloadArg);
|
|
203
|
+
const result = await handlerArg(message);
|
|
204
|
+
return {
|
|
205
|
+
accepted: result?.accepted !== false,
|
|
206
|
+
workAppMessageId: result?.workAppMessageId,
|
|
207
|
+
message: result?.message,
|
|
208
|
+
};
|
|
209
|
+
}
|
|
210
|
+
createInboundHandler(handlerArg) {
|
|
211
|
+
return async (payloadArg) => await this.handleInboundPayload(payloadArg, handlerArg);
|
|
212
|
+
}
|
|
213
|
+
ensureInboundTypedHandler() {
|
|
214
|
+
if (this.inboundTypedHandlerRegistered)
|
|
215
|
+
return;
|
|
216
|
+
this.inboundTypedHandlerRegistered = true;
|
|
217
|
+
this.platformClientRef.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('deliverInboundMail', async (dataArg) => {
|
|
218
|
+
if (!this.inboundHandler) {
|
|
219
|
+
return { accepted: false, message: 'No service mail inbound handler registered' };
|
|
220
|
+
}
|
|
221
|
+
return await this.handleInboundPayload(dataArg.delivery, this.inboundHandler);
|
|
222
|
+
}));
|
|
223
|
+
}
|
|
22
224
|
async sendNotification(optionsArg) { }
|
|
23
225
|
async sendActionLink(optionsArg) { }
|
|
226
|
+
async readMailEnv(tokenArg) {
|
|
227
|
+
const prefix = tokenArg ? `MAIL_${tokenArg}_` : '';
|
|
228
|
+
return {
|
|
229
|
+
from: await this.readMailEnvVar(tokenArg ? `${prefix}FROM` : 'MAIL_FROM'),
|
|
230
|
+
smtpHost: await this.readMailEnvVar(`${prefix}SMTP_HOST`),
|
|
231
|
+
smtpPort: await this.readMailEnvVar(`${prefix}SMTP_PORT`),
|
|
232
|
+
smtpTlsMode: await this.readMailEnvVar(`${prefix}SMTP_TLS_MODE`),
|
|
233
|
+
smtpUsername: await this.readMailEnvVar(`${prefix}SMTP_USERNAME`),
|
|
234
|
+
smtpPassword: await this.readMailEnvVar(`${prefix}SMTP_PASSWORD`),
|
|
235
|
+
typedUrl: await this.readMailEnvVar(tokenArg ? `${prefix}TYPED_URL` : 'MAIL_TYPED_URL'),
|
|
236
|
+
apiCredentialId: await this.readMailEnvVar(tokenArg ? `${prefix}API_CREDENTIAL_ID` : 'MAIL_API_CREDENTIAL_ID'),
|
|
237
|
+
apiCredentialSecret: await this.readMailEnvVar(tokenArg ? `${prefix}API_CREDENTIAL_SECRET` : 'MAIL_API_CREDENTIAL_SECRET'),
|
|
238
|
+
};
|
|
239
|
+
}
|
|
240
|
+
async readMailEnvVar(envNameArg) {
|
|
241
|
+
return await this.platformClientRef.getConfiguredEnvVar(envNameArg)
|
|
242
|
+
|| this.getCredentialEnvVarFromBindings(envNameArg);
|
|
243
|
+
}
|
|
244
|
+
getCredentialEnvVarFromBindings(envNameArg) {
|
|
245
|
+
for (const binding of this.platformClientRef.platformBindings || []) {
|
|
246
|
+
if (binding.desiredState === 'disabled' || binding.status === 'failed')
|
|
247
|
+
continue;
|
|
248
|
+
if (binding.capability !== 'email')
|
|
249
|
+
continue;
|
|
250
|
+
for (const credential of binding.credentials || []) {
|
|
251
|
+
const value = credential.env?.[envNameArg];
|
|
252
|
+
if (value)
|
|
253
|
+
return value;
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
hasAnyMailEnvValue(envArg) {
|
|
258
|
+
return Boolean(envArg && Object.values(envArg).some(Boolean));
|
|
259
|
+
}
|
|
260
|
+
async getServiceMailTypedCredentials(addressArg) {
|
|
261
|
+
const requestedAddress = addressArg?.trim().toLowerCase();
|
|
262
|
+
const requestedToken = requestedAddress ? this.getMailEnvToken(requestedAddress) : undefined;
|
|
263
|
+
const scopedEnv = requestedToken ? await this.readMailEnv(requestedToken) : undefined;
|
|
264
|
+
const hasScopedConfig = scopedEnv && Object.values(scopedEnv).some(Boolean);
|
|
265
|
+
const env = hasScopedConfig ? scopedEnv : await this.readMailEnv();
|
|
266
|
+
const from = env.from?.trim().toLowerCase();
|
|
267
|
+
if (!from)
|
|
268
|
+
throw new Error('MAIL_FROM is required for typed service mail');
|
|
269
|
+
if (requestedAddress && from !== requestedAddress) {
|
|
270
|
+
throw new Error(`No typed service mail credentials are configured for ${requestedAddress}`);
|
|
271
|
+
}
|
|
272
|
+
if (!env.typedUrl)
|
|
273
|
+
throw new Error('MAIL_TYPED_URL is required for typed service mail');
|
|
274
|
+
if (!env.apiCredentialId)
|
|
275
|
+
throw new Error('MAIL_API_CREDENTIAL_ID is required for typed service mail');
|
|
276
|
+
if (!env.apiCredentialSecret)
|
|
277
|
+
throw new Error('MAIL_API_CREDENTIAL_SECRET is required for typed service mail');
|
|
278
|
+
return {
|
|
279
|
+
from,
|
|
280
|
+
typedUrl: this.normalizeTypedSocketUrl(env.typedUrl),
|
|
281
|
+
credentialId: env.apiCredentialId,
|
|
282
|
+
credentialSecret: env.apiCredentialSecret,
|
|
283
|
+
addressToken: hasScopedConfig ? requestedToken : undefined,
|
|
284
|
+
};
|
|
285
|
+
}
|
|
286
|
+
async getMailTypedSocket(urlArg) {
|
|
287
|
+
const normalizedUrl = this.normalizeTypedSocketUrl(urlArg);
|
|
288
|
+
if (this.mailTypedSocket && this.mailTypedSocketUrl === normalizedUrl) {
|
|
289
|
+
return this.mailTypedSocket;
|
|
290
|
+
}
|
|
291
|
+
if (this.mailTypedSocketPromise && this.mailTypedSocketUrl === normalizedUrl) {
|
|
292
|
+
return await this.mailTypedSocketPromise;
|
|
293
|
+
}
|
|
294
|
+
if (this.mailTypedSocket || this.mailTypedSocketPromise) {
|
|
295
|
+
await this.stopMailTypedSocket();
|
|
296
|
+
}
|
|
297
|
+
this.mailTypedSocketUrl = normalizedUrl;
|
|
298
|
+
const abortController = new AbortController();
|
|
299
|
+
this.mailTypedSocketAbortController = abortController;
|
|
300
|
+
const socketPromise = plugins.typedsocket.TypedSocket.createClient(this.platformClientRef.typedrouter, normalizedUrl, { autoReconnect: true, abortSignal: abortController.signal });
|
|
301
|
+
this.mailTypedSocketPromise = socketPromise;
|
|
302
|
+
try {
|
|
303
|
+
const socket = await socketPromise;
|
|
304
|
+
if (this.mailTypedSocketPromise === socketPromise && this.mailTypedSocketUrl === normalizedUrl) {
|
|
305
|
+
this.mailTypedSocket = socket;
|
|
306
|
+
}
|
|
307
|
+
else {
|
|
308
|
+
await socket.stop();
|
|
309
|
+
}
|
|
310
|
+
return socket;
|
|
311
|
+
}
|
|
312
|
+
catch (error) {
|
|
313
|
+
if (this.mailTypedSocketPromise === socketPromise) {
|
|
314
|
+
this.mailTypedSocketPromise = undefined;
|
|
315
|
+
this.mailTypedSocketUrl = undefined;
|
|
316
|
+
this.mailTypedSocketAbortController = undefined;
|
|
317
|
+
}
|
|
318
|
+
throw error;
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
async stopMailTypedSocket() {
|
|
322
|
+
const socket = this.mailTypedSocket;
|
|
323
|
+
const socketPromise = this.mailTypedSocketPromise;
|
|
324
|
+
const abortController = this.mailTypedSocketAbortController;
|
|
325
|
+
this.mailTypedSocket = undefined;
|
|
326
|
+
this.mailTypedSocketPromise = undefined;
|
|
327
|
+
this.mailTypedSocketUrl = undefined;
|
|
328
|
+
this.mailTypedSocketAbortController = undefined;
|
|
329
|
+
abortController?.abort();
|
|
330
|
+
if (socket) {
|
|
331
|
+
await socket.stop();
|
|
332
|
+
return;
|
|
333
|
+
}
|
|
334
|
+
if (socketPromise) {
|
|
335
|
+
try {
|
|
336
|
+
const pendingSocket = await socketPromise;
|
|
337
|
+
await pendingSocket.stop();
|
|
338
|
+
}
|
|
339
|
+
catch {
|
|
340
|
+
// The pending connection already failed; there is no socket to stop.
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
normalizeTypedSocketUrl(urlArg) {
|
|
345
|
+
return urlArg.trim().replace(/\/typedrequest\/?$/, '').replace(/\/+$/, '');
|
|
346
|
+
}
|
|
347
|
+
normalizeTlsMode(valueArg) {
|
|
348
|
+
if (valueArg === 'plain' || valueArg === 'starttls' || valueArg === 'implicitTls')
|
|
349
|
+
return valueArg;
|
|
350
|
+
throw new Error(`Invalid SMTP_TLS_MODE: ${valueArg}`);
|
|
351
|
+
}
|
|
352
|
+
getMailEnvToken(addressArg) {
|
|
353
|
+
const token = addressArg.trim().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/^_+|_+$/g, '').toUpperCase();
|
|
354
|
+
return /^\d/.test(token) ? `ADDR_${token}` : token;
|
|
355
|
+
}
|
|
356
|
+
listToArray(valueArg) {
|
|
357
|
+
return Array.isArray(valueArg) ? valueArg : [valueArg];
|
|
358
|
+
}
|
|
359
|
+
normalizeAttachmentContent(contentArg) {
|
|
360
|
+
return Buffer.from(contentArg).toString('base64');
|
|
361
|
+
}
|
|
362
|
+
asRecord(valueArg) {
|
|
363
|
+
return valueArg && typeof valueArg === 'object' ? valueArg : {};
|
|
364
|
+
}
|
|
365
|
+
normalizeHeaders(headersArg) {
|
|
366
|
+
if (!headersArg || typeof headersArg !== 'object')
|
|
367
|
+
return undefined;
|
|
368
|
+
const result = {};
|
|
369
|
+
for (const [key, value] of Object.entries(headersArg)) {
|
|
370
|
+
if (Array.isArray(value)) {
|
|
371
|
+
result[key] = value.map(String);
|
|
372
|
+
}
|
|
373
|
+
else if (value !== undefined && value !== null) {
|
|
374
|
+
result[key] = String(value);
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
return result;
|
|
378
|
+
}
|
|
379
|
+
extractHeader(rawMessageArg, headerNameArg) {
|
|
380
|
+
const lowerName = `${headerNameArg.toLowerCase()}:`;
|
|
381
|
+
for (const line of rawMessageArg.split(/\r?\n/)) {
|
|
382
|
+
if (!line)
|
|
383
|
+
return undefined;
|
|
384
|
+
if (line.toLowerCase().startsWith(lowerName)) {
|
|
385
|
+
return line.slice(lowerName.length).trim();
|
|
386
|
+
}
|
|
387
|
+
}
|
|
388
|
+
}
|
|
24
389
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5lbWFpbGNvbm5lY3Rvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2VtYWlsL2NsYXNzZXMuZW1haWxjb25uZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUM7QUFFekMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV0QyxNQUFNLE9BQU8sZ0JBQWdCO0lBRzNCLFlBQVksb0JBQXNDO1FBQ2hELElBQUksQ0FBQyxpQkFBaUIsR0FBRyxvQkFBb0IsQ0FBQztJQUNoRCxDQUFDO0lBRU0sS0FBSyxDQUFDLFNBQVMsQ0FDcEIsVUFBZ0Y7UUFFaEYsSUFBSSxJQUFJLENBQUMsaUJBQWlCLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDckMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsMkJBQTJCLFVBQVUsQ0FBQyxLQUFLLE9BQU8sVUFBVSxDQUFDLEVBQUU7O1VBRTlFLFVBQVUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDOztTQUVyRSxDQUFDLENBQUM7UUFDUCxDQUFDO1FBRUQsSUFBSSxJQUFJLENBQUMsaUJBQWlCLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDckMsT0FBTztRQUNULENBQUM7UUFFRCxNQUFNLFlBQVksR0FDaEIsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxrQkFBa0IsQ0FDbkQsV0FBVyxDQUNaLENBQUM7UUFDSixNQUFNLFFBQVEsR0FBRyxNQUFNLFlBQVksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDckQsT0FBTyxRQUFRLENBQUMsVUFBVSxDQUFDO0lBQzdCLENBQUM7SUFFTSxLQUFLLENBQUMsZ0JBQWdCLENBQUMsVUFBNEQsSUFBRyxDQUFDO0lBRXZGLEtBQUssQ0FBQyxjQUFjLENBQUMsVUFBNEQsSUFBRyxDQUFDO0NBQzdGIn0=
|
|
390
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.emailconnector.js","sourceRoot":"","sources":["../../ts/email/classes.emailconnector.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/index.d.ts
CHANGED
package/dist_ts/index.js
CHANGED
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export * from './classes.platformclient.js';
|
|
2
|
-
|
|
2
|
+
export * from './email/classes.emailconnector.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsbUNBQW1DLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/platformclient",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "a module that makes it really easy to use the serve.zone platform inside your app",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -10,10 +10,10 @@
|
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"devDependencies": {
|
|
12
12
|
"@git.zone/tsbuild": "^4.4.2",
|
|
13
|
-
"@git.zone/tsbundle": "^2.
|
|
13
|
+
"@git.zone/tsbundle": "^2.11.0",
|
|
14
14
|
"@git.zone/tsrun": "^2.0.4",
|
|
15
15
|
"@git.zone/tstest": "^3.6.6",
|
|
16
|
-
"@types/node": "^25.9.
|
|
16
|
+
"@types/node": "^25.9.3"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@api.global/typedrequest": "^3.3.0",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"@push.rocks/qenv": "^6.1.4",
|
|
23
23
|
"@push.rocks/smartlog": "^3.2.2",
|
|
24
24
|
"@push.rocks/smartntml": "^2.0.9",
|
|
25
|
-
"@serve.zone/interfaces": "^
|
|
25
|
+
"@serve.zone/interfaces": "^7.28.0"
|
|
26
26
|
},
|
|
27
27
|
"repository": {
|
|
28
28
|
"type": "git",
|
package/readme.md
CHANGED
|
@@ -38,7 +38,7 @@ await platformClient.emailConnector.sendEmail({
|
|
|
38
38
|
|
|
39
39
|
| Connector | Main methods | Platform capability |
|
|
40
40
|
| --- | --- | --- |
|
|
41
|
-
| `emailConnector` | `sendEmail()` | `email` |
|
|
41
|
+
| `emailConnector` | `getServiceMailStatus()`, `getServiceMailCredentials()`, `sendMail()`, `sendText()`, `sendHtml()`, `registerInboundHandler()`, `normalizeInboundMessage()`, `handleInboundPayload()`, `createInboundHandler()`, `sendEmail()` | `email` |
|
|
42
42
|
| `smsConnector` | `sendSms()`, `sendSmsVerifcation()` | `sms` |
|
|
43
43
|
| `pushNotificationConnector` | `sendPushNotification()` | `pushnotification` |
|
|
44
44
|
| `letterConnector` | `sendLetter()` | `letter` |
|
|
@@ -57,6 +57,10 @@ The client needs an authorization string and a platform endpoint. You can provid
|
|
|
57
57
|
|
|
58
58
|
Binding environment variables must contain JSON encoded `IPlatformBinding` objects from `@serve.zone/interfaces`.
|
|
59
59
|
|
|
60
|
+
Service mail credentials can be provided directly as environment variables or through `email` platform binding credentials. Standard platformclient mail uses dcrouter TypedSocket/TypedRequest service credentials. The default sender uses `MAIL_FROM`, `MAIL_TYPED_URL`, `MAIL_API_CREDENTIAL_ID`, and `MAIL_API_CREDENTIAL_SECRET`. Additional configured sender addresses use scoped variables such as `MAIL_TEST_SERVICE_GATED_ONE_FROM`, `MAIL_TEST_SERVICE_GATED_ONE_TYPED_URL`, `MAIL_TEST_SERVICE_GATED_ONE_API_CREDENTIAL_ID`, and `MAIL_TEST_SERVICE_GATED_ONE_API_CREDENTIAL_SECRET`.
|
|
61
|
+
|
|
62
|
+
SMTP compatibility credentials are still discoverable with `getServiceMailCredentials()` for applications that explicitly implement SMTP themselves. Those compatibility variables are `SMTP_HOST`, `SMTP_PORT`, `SMTP_TLS_MODE`, `SMTP_USERNAME`, and `SMTP_PASSWORD`, plus scoped `MAIL_<TOKEN>_SMTP_*` variants. They are not used by `sendMail()`, `sendText()`, `sendHtml()`, or `registerInboundHandler()`.
|
|
63
|
+
|
|
60
64
|
```typescript
|
|
61
65
|
import { SzPlatformClient } from '@serve.zone/platformclient';
|
|
62
66
|
|
|
@@ -100,9 +104,79 @@ console.log(verificationCode); // 123456
|
|
|
100
104
|
|
|
101
105
|
The current SMS verification method is spelled `sendSmsVerifcation()` in code. Use that exact method name until the public API changes.
|
|
102
106
|
|
|
107
|
+
## Lifecycle
|
|
108
|
+
|
|
109
|
+
`SzPlatformClient` keeps TypedSocket connections open for platform requests and typed service-mail delivery. Call `stop()` when a short-lived process, worker, or test is done with the client.
|
|
110
|
+
|
|
111
|
+
```typescript
|
|
112
|
+
const client = new SzPlatformClient({
|
|
113
|
+
token: process.env.SERVEZONE_PLATFORM_TOKEN,
|
|
114
|
+
platformUrl: process.env.SERVEZONE_PLATFORM_URL,
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
await client.init();
|
|
118
|
+
|
|
119
|
+
try {
|
|
120
|
+
await client.emailConnector.sendText({
|
|
121
|
+
to: 'user@example.com',
|
|
122
|
+
subject: 'Done',
|
|
123
|
+
text: 'The job has finished.',
|
|
124
|
+
});
|
|
125
|
+
} finally {
|
|
126
|
+
await client.stop();
|
|
127
|
+
}
|
|
128
|
+
```
|
|
129
|
+
|
|
103
130
|
## Connector Examples
|
|
104
131
|
|
|
105
|
-
|
|
132
|
+
Service mail over managed TypedSocket credentials:
|
|
133
|
+
|
|
134
|
+
```typescript
|
|
135
|
+
const status = await client.emailConnector.getServiceMailStatus();
|
|
136
|
+
|
|
137
|
+
if (status.ready) {
|
|
138
|
+
await client.emailConnector.sendText({
|
|
139
|
+
to: 'user@example.com',
|
|
140
|
+
subject: 'Service mail ready',
|
|
141
|
+
text: 'This message was sent through the managed service mail identity.',
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
```
|
|
145
|
+
|
|
146
|
+
`getServiceMailStatus().ready` means the typed service-mail path is configured. The status also exposes `transport`, `typedUrl`, `typedCredentialConfigured`, and `smtpReady` so applications can distinguish standard TypedSocket mail from explicit SMTP compatibility configuration.
|
|
147
|
+
|
|
148
|
+
Specific sender address:
|
|
149
|
+
|
|
150
|
+
```typescript
|
|
151
|
+
await client.emailConnector.sendHtml({
|
|
152
|
+
from: 'test-service@gated.one',
|
|
153
|
+
to: 'user@example.com',
|
|
154
|
+
subject: 'Platform capability test',
|
|
155
|
+
html: '<p>The service mail identity is working.</p>',
|
|
156
|
+
});
|
|
157
|
+
```
|
|
158
|
+
|
|
159
|
+
Typed inbound mail registration:
|
|
160
|
+
|
|
161
|
+
```typescript
|
|
162
|
+
await client.emailConnector.registerInboundHandler(async (message) => {
|
|
163
|
+
console.log(message.from, message.to, message.subject);
|
|
164
|
+
return { accepted: true, workAppMessageId: message.messageId };
|
|
165
|
+
});
|
|
166
|
+
```
|
|
167
|
+
|
|
168
|
+
`registerInboundHandler()` registers this client connection as the typed endpoint for the configured service mail address. dcrouter then delivers inbound messages through the shared `deliverInboundMail` TypedRequest contract.
|
|
169
|
+
|
|
170
|
+
Inbound message normalization for webhook or direct TypedRequest-style delivery:
|
|
171
|
+
|
|
172
|
+
```typescript
|
|
173
|
+
const inboundHandler = client.emailConnector.createInboundHandler(async (message) => {
|
|
174
|
+
console.log(message.from, message.to, message.subject);
|
|
175
|
+
return { accepted: true };
|
|
176
|
+
});
|
|
177
|
+
```
|
|
178
|
+
|
|
179
|
+
Legacy platform-service email request:
|
|
106
180
|
|
|
107
181
|
```typescript
|
|
108
182
|
await client.emailConnector.sendEmail({
|
|
@@ -144,7 +218,7 @@ await client.letterConnector.sendLetter({
|
|
|
144
218
|
});
|
|
145
219
|
```
|
|
146
220
|
|
|
147
|
-
|
|
221
|
+
Service-mail helper option and result types are exported from `@serve.zone/platformclient`. The legacy platform-service request fields are defined in `@serve.zone/interfaces` under `platform.email`, `platform.sms`, `platform.pushnotification`, and `platform.letter`.
|
|
148
222
|
|
|
149
223
|
## Platform Bindings
|
|
150
224
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -174,6 +174,13 @@ export class SzPlatformClient {
|
|
|
174
174
|
}
|
|
175
175
|
}
|
|
176
176
|
|
|
177
|
+
public async stop(): Promise<void> {
|
|
178
|
+
await this.emailConnector.stop();
|
|
179
|
+
if (this.typedsocket) {
|
|
180
|
+
await this.typedsocket.stop();
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
|
|
177
184
|
private async discoverPlatformBindings() {
|
|
178
185
|
const bindings: plugins.servezoneInterfaces.platform.IPlatformBinding[] = [];
|
|
179
186
|
const envBindings = await this.getConfiguredEnvVar('SERVEZONE_PLATFORM_BINDINGS');
|
|
@@ -217,7 +224,7 @@ export class SzPlatformClient {
|
|
|
217
224
|
return Array.from(bindingMap.values());
|
|
218
225
|
}
|
|
219
226
|
|
|
220
|
-
|
|
227
|
+
public async getConfiguredEnvVar(envNameArg: string) {
|
|
221
228
|
const processValue = this.getProcessEnvVar(envNameArg);
|
|
222
229
|
if (processValue) {
|
|
223
230
|
return processValue;
|
|
@@ -3,13 +3,101 @@ import * as plugins from '../plugins.js';
|
|
|
3
3
|
|
|
4
4
|
import { logger } from '../logger.js';
|
|
5
5
|
|
|
6
|
+
export type TServiceMailTlsMode = 'plain' | 'starttls' | 'implicitTls';
|
|
7
|
+
|
|
8
|
+
export interface IServiceMailSmtpCredentials {
|
|
9
|
+
from: string;
|
|
10
|
+
host: string;
|
|
11
|
+
port: number;
|
|
12
|
+
tlsMode: TServiceMailTlsMode;
|
|
13
|
+
username: string;
|
|
14
|
+
password: string;
|
|
15
|
+
addressToken?: string;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export interface IServiceMailTypedCredentials {
|
|
19
|
+
from: string;
|
|
20
|
+
typedUrl: string;
|
|
21
|
+
credentialId: string;
|
|
22
|
+
credentialSecret: string;
|
|
23
|
+
addressToken?: string;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export interface IServiceMailStatus {
|
|
27
|
+
ready: boolean;
|
|
28
|
+
from?: string;
|
|
29
|
+
host?: string;
|
|
30
|
+
port?: number;
|
|
31
|
+
tlsMode?: TServiceMailTlsMode;
|
|
32
|
+
typedUrl?: string;
|
|
33
|
+
transport?: 'typedsocket' | 'smtp' | 'none';
|
|
34
|
+
usernameConfigured: boolean;
|
|
35
|
+
passwordConfigured: boolean;
|
|
36
|
+
typedCredentialConfigured?: boolean;
|
|
37
|
+
smtpReady?: boolean;
|
|
38
|
+
missing: string[];
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export interface IServiceMailAttachment {
|
|
42
|
+
filename: string;
|
|
43
|
+
contentType?: string;
|
|
44
|
+
content: string | Uint8Array;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export interface IServiceMailSendOptions {
|
|
48
|
+
from?: string;
|
|
49
|
+
to: string | string[];
|
|
50
|
+
cc?: string | string[];
|
|
51
|
+
bcc?: string | string[];
|
|
52
|
+
subject: string;
|
|
53
|
+
text?: string;
|
|
54
|
+
html?: string;
|
|
55
|
+
headers?: Record<string, string>;
|
|
56
|
+
attachments?: IServiceMailAttachment[];
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
export interface IServiceMailSendResult {
|
|
60
|
+
messageId?: string;
|
|
61
|
+
accepted?: string[];
|
|
62
|
+
rejected?: string[];
|
|
63
|
+
response?: string;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
export interface IServiceMailInboundMessage extends plugins.servezoneInterfaces.data.IMailInboundMessagePayload {
|
|
67
|
+
from: string;
|
|
68
|
+
to: string[];
|
|
69
|
+
receivedAtIso: string;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
export interface IServiceMailInboundHandlerResult {
|
|
73
|
+
accepted?: boolean;
|
|
74
|
+
workAppMessageId?: string;
|
|
75
|
+
message?: string;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
export type IServiceMailInboundHandleResult =
|
|
79
|
+
plugins.servezoneInterfaces.requests.mail.IReq_DeliverInboundMail['response'];
|
|
80
|
+
|
|
81
|
+
export type TServiceMailInboundHandler = (
|
|
82
|
+
messageArg: IServiceMailInboundMessage,
|
|
83
|
+
) => Promise<IServiceMailInboundHandlerResult | void> | IServiceMailInboundHandlerResult | void;
|
|
84
|
+
|
|
6
85
|
export class SzEmailConnector {
|
|
7
86
|
public platformClientRef: SzPlatformClient;
|
|
87
|
+
private mailTypedSocket?: plugins.typedsocket.TypedSocket;
|
|
88
|
+
private mailTypedSocketUrl?: string;
|
|
89
|
+
private mailTypedSocketPromise?: Promise<plugins.typedsocket.TypedSocket>;
|
|
90
|
+
private mailTypedSocketAbortController?: AbortController;
|
|
91
|
+
private inboundHandler?: TServiceMailInboundHandler;
|
|
92
|
+
private inboundTypedHandlerRegistered = false;
|
|
8
93
|
|
|
9
94
|
constructor(platformClientRefArg: SzPlatformClient) {
|
|
10
95
|
this.platformClientRef = platformClientRefArg;
|
|
11
96
|
}
|
|
12
97
|
|
|
98
|
+
/**
|
|
99
|
+
* Legacy platform-service email path. New service-mail code should use sendMail().
|
|
100
|
+
*/
|
|
13
101
|
public async sendEmail(
|
|
14
102
|
optionsArg: plugins.servezoneInterfaces.platform.email.IReq_SendEmail['request']
|
|
15
103
|
) {
|
|
@@ -33,7 +121,405 @@ export class SzEmailConnector {
|
|
|
33
121
|
return response.responseId;
|
|
34
122
|
}
|
|
35
123
|
|
|
124
|
+
public async getServiceMailStatus(addressArg?: string): Promise<IServiceMailStatus> {
|
|
125
|
+
const requestedAddress = addressArg?.trim().toLowerCase();
|
|
126
|
+
const token = requestedAddress ? this.getMailEnvToken(requestedAddress) : undefined;
|
|
127
|
+
const scopedEnv = token ? await this.readMailEnv(token) : undefined;
|
|
128
|
+
const defaultEnv = token ? await this.readMailEnv() : undefined;
|
|
129
|
+
const useDefaultEnv = requestedAddress
|
|
130
|
+
&& !this.hasAnyMailEnvValue(scopedEnv)
|
|
131
|
+
&& defaultEnv?.from?.trim().toLowerCase() === requestedAddress;
|
|
132
|
+
const env = useDefaultEnv ? defaultEnv! : scopedEnv || await this.readMailEnv();
|
|
133
|
+
const missingPrefix = useDefaultEnv || !token ? undefined : token;
|
|
134
|
+
const port = env.smtpPort ? Number(env.smtpPort) : undefined;
|
|
135
|
+
const tlsMode = this.normalizeTlsMode(env.smtpTlsMode || 'starttls');
|
|
136
|
+
const typedMissing: string[] = [];
|
|
137
|
+
const smtpMissing: string[] = [];
|
|
138
|
+
if (!env.typedUrl) typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_TYPED_URL` : 'MAIL_TYPED_URL');
|
|
139
|
+
if (!env.apiCredentialId) typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_API_CREDENTIAL_ID` : 'MAIL_API_CREDENTIAL_ID');
|
|
140
|
+
if (!env.apiCredentialSecret) typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_API_CREDENTIAL_SECRET` : 'MAIL_API_CREDENTIAL_SECRET');
|
|
141
|
+
if (!env.smtpHost) smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_HOST` : 'SMTP_HOST');
|
|
142
|
+
if (!env.smtpPort || !Number.isInteger(port) || port! < 1 || port! > 65535) {
|
|
143
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_PORT` : 'SMTP_PORT');
|
|
144
|
+
}
|
|
145
|
+
if (!env.smtpUsername) smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_USERNAME` : 'SMTP_USERNAME');
|
|
146
|
+
if (!env.smtpPassword) smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_PASSWORD` : 'SMTP_PASSWORD');
|
|
147
|
+
const fromMissing = env.from ? [] : [missingPrefix ? `MAIL_${missingPrefix}_FROM` : 'MAIL_FROM'];
|
|
148
|
+
const typedReady = fromMissing.length === 0 && typedMissing.length === 0;
|
|
149
|
+
const smtpReady = fromMissing.length === 0 && smtpMissing.length === 0;
|
|
150
|
+
return {
|
|
151
|
+
ready: typedReady,
|
|
152
|
+
from: env.from,
|
|
153
|
+
host: env.smtpHost,
|
|
154
|
+
port,
|
|
155
|
+
tlsMode,
|
|
156
|
+
typedUrl: env.typedUrl,
|
|
157
|
+
transport: typedReady ? 'typedsocket' : smtpReady ? 'smtp' : 'none',
|
|
158
|
+
usernameConfigured: Boolean(env.smtpUsername),
|
|
159
|
+
passwordConfigured: Boolean(env.smtpPassword),
|
|
160
|
+
typedCredentialConfigured: Boolean(env.apiCredentialId && env.apiCredentialSecret),
|
|
161
|
+
smtpReady,
|
|
162
|
+
missing: typedReady ? [] : [...fromMissing, ...typedMissing],
|
|
163
|
+
};
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
public async getServiceMailCredentials(addressArg?: string): Promise<IServiceMailSmtpCredentials> {
|
|
167
|
+
const requestedAddress = addressArg?.trim().toLowerCase();
|
|
168
|
+
const requestedToken = requestedAddress ? this.getMailEnvToken(requestedAddress) : undefined;
|
|
169
|
+
const scopedEnv = requestedToken ? await this.readMailEnv(requestedToken) : undefined;
|
|
170
|
+
const hasScopedConfig = scopedEnv && Object.values(scopedEnv).some(Boolean);
|
|
171
|
+
const env = hasScopedConfig ? scopedEnv! : await this.readMailEnv();
|
|
172
|
+
const from = env.from?.trim().toLowerCase();
|
|
173
|
+
if (!from) throw new Error('MAIL_FROM is required for service mail');
|
|
174
|
+
if (requestedAddress && from !== requestedAddress) {
|
|
175
|
+
throw new Error(`No service mail credentials are configured for ${requestedAddress}`);
|
|
176
|
+
}
|
|
177
|
+
const port = Number(env.smtpPort);
|
|
178
|
+
if (!env.smtpHost) throw new Error('SMTP_HOST is required for service mail');
|
|
179
|
+
if (!Number.isInteger(port) || port < 1 || port > 65535) {
|
|
180
|
+
throw new Error('SMTP_PORT must be an integer between 1 and 65535');
|
|
181
|
+
}
|
|
182
|
+
if (!env.smtpUsername) throw new Error('SMTP_USERNAME is required for service mail');
|
|
183
|
+
if (!env.smtpPassword) throw new Error('SMTP_PASSWORD is required for service mail');
|
|
184
|
+
return {
|
|
185
|
+
from,
|
|
186
|
+
host: env.smtpHost,
|
|
187
|
+
port,
|
|
188
|
+
tlsMode: this.normalizeTlsMode(env.smtpTlsMode || 'starttls'),
|
|
189
|
+
username: env.smtpUsername,
|
|
190
|
+
password: env.smtpPassword,
|
|
191
|
+
addressToken: hasScopedConfig ? requestedToken : undefined,
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
public async sendText(optionsArg: Omit<IServiceMailSendOptions, 'html'> & { text: string }) {
|
|
196
|
+
return await this.sendMail(optionsArg);
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
public async sendHtml(optionsArg: Omit<IServiceMailSendOptions, 'text'> & { html: string }) {
|
|
200
|
+
return await this.sendMail(optionsArg);
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
public async sendMail(optionsArg: IServiceMailSendOptions): Promise<IServiceMailSendResult> {
|
|
204
|
+
if (!optionsArg.text && !optionsArg.html) {
|
|
205
|
+
throw new Error('Either text or html is required for service mail');
|
|
206
|
+
}
|
|
207
|
+
if (this.platformClientRef.debugMode) {
|
|
208
|
+
logger.log('info', `service mail debug send: ${optionsArg.subject} to ${this.listToArray(optionsArg.to).join(', ')}`);
|
|
209
|
+
return { messageId: 'debug' };
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
const credentials = await this.getServiceMailTypedCredentials(optionsArg.from);
|
|
213
|
+
const typedSocket = await this.getMailTypedSocket(credentials.typedUrl);
|
|
214
|
+
const request = typedSocket.createTypedRequest<plugins.servezoneInterfaces.requests.mail.IReq_EnqueueMail>('enqueueMail');
|
|
215
|
+
const result = await request.fire({
|
|
216
|
+
auth: {
|
|
217
|
+
credentialId: credentials.credentialId,
|
|
218
|
+
credentialSecret: credentials.credentialSecret,
|
|
219
|
+
},
|
|
220
|
+
outboundIdentityId: credentials.credentialId,
|
|
221
|
+
message: {
|
|
222
|
+
from: credentials.from,
|
|
223
|
+
to: this.listToArray(optionsArg.to),
|
|
224
|
+
cc: optionsArg.cc ? this.listToArray(optionsArg.cc) : undefined,
|
|
225
|
+
bcc: optionsArg.bcc ? this.listToArray(optionsArg.bcc) : undefined,
|
|
226
|
+
subject: optionsArg.subject,
|
|
227
|
+
text: optionsArg.text,
|
|
228
|
+
html: optionsArg.html,
|
|
229
|
+
headers: optionsArg.headers,
|
|
230
|
+
attachments: optionsArg.attachments?.map((attachmentArg) => ({
|
|
231
|
+
filename: attachmentArg.filename,
|
|
232
|
+
contentType: attachmentArg.contentType,
|
|
233
|
+
binaryAttachmentString: this.normalizeAttachmentContent(attachmentArg.content),
|
|
234
|
+
})),
|
|
235
|
+
},
|
|
236
|
+
});
|
|
237
|
+
if (!result.accepted) {
|
|
238
|
+
throw new Error(result.message || 'service mail was not accepted by dcrouter');
|
|
239
|
+
}
|
|
240
|
+
return {
|
|
241
|
+
messageId: result.spoolItemId,
|
|
242
|
+
accepted: this.listToArray(optionsArg.to),
|
|
243
|
+
rejected: [],
|
|
244
|
+
response: result.message,
|
|
245
|
+
};
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
public async registerInboundHandler(
|
|
249
|
+
handlerArg: TServiceMailInboundHandler,
|
|
250
|
+
addressArg?: string,
|
|
251
|
+
): Promise<plugins.servezoneInterfaces.requests.mail.IReq_RegisterServiceMailEndpoint['response']> {
|
|
252
|
+
this.inboundHandler = handlerArg;
|
|
253
|
+
this.ensureInboundTypedHandler();
|
|
254
|
+
const credentials = await this.getServiceMailTypedCredentials(addressArg);
|
|
255
|
+
const typedSocket = await this.getMailTypedSocket(credentials.typedUrl);
|
|
256
|
+
const request = typedSocket.createTypedRequest<plugins.servezoneInterfaces.requests.mail.IReq_RegisterServiceMailEndpoint>('registerServiceMailEndpoint');
|
|
257
|
+
const result = await request.fire({
|
|
258
|
+
auth: {
|
|
259
|
+
credentialId: credentials.credentialId,
|
|
260
|
+
credentialSecret: credentials.credentialSecret,
|
|
261
|
+
},
|
|
262
|
+
addresses: [credentials.from],
|
|
263
|
+
});
|
|
264
|
+
if (!result.success) {
|
|
265
|
+
throw new Error(result.message || 'Could not register service mail endpoint');
|
|
266
|
+
}
|
|
267
|
+
return result;
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
public async stop(): Promise<void> {
|
|
271
|
+
await this.stopMailTypedSocket();
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
public normalizeInboundMessage(payloadArg: unknown): IServiceMailInboundMessage {
|
|
275
|
+
const payload = this.asRecord(payloadArg);
|
|
276
|
+
const deliveryCandidate = this.asRecord(payload.delivery || payload.message || payload);
|
|
277
|
+
const envelope = this.asRecord(deliveryCandidate.envelope);
|
|
278
|
+
const rawMessage = typeof deliveryCandidate.rawMessage === 'string' ? deliveryCandidate.rawMessage : '';
|
|
279
|
+
const rcptTo = Array.isArray(envelope.rcptTo) ? envelope.rcptTo.map(String) : [];
|
|
280
|
+
const receivedAt = typeof deliveryCandidate.receivedAt === 'number' ? deliveryCandidate.receivedAt : Date.now();
|
|
281
|
+
return {
|
|
282
|
+
spoolItemId: String(deliveryCandidate.spoolItemId || deliveryCandidate.id || ''),
|
|
283
|
+
owner: deliveryCandidate.owner as plugins.servezoneInterfaces.data.IMailResourceOwner | undefined,
|
|
284
|
+
envelope: {
|
|
285
|
+
mailFrom: String(envelope.mailFrom || deliveryCandidate.from || ''),
|
|
286
|
+
rcptTo,
|
|
287
|
+
},
|
|
288
|
+
rawMessage,
|
|
289
|
+
sizeBytes: typeof deliveryCandidate.sizeBytes === 'number' ? deliveryCandidate.sizeBytes : rawMessage.length,
|
|
290
|
+
messageId: deliveryCandidate.messageId ? String(deliveryCandidate.messageId) : undefined,
|
|
291
|
+
subject: deliveryCandidate.subject ? String(deliveryCandidate.subject) : this.extractHeader(rawMessage, 'subject'),
|
|
292
|
+
headers: this.normalizeHeaders(deliveryCandidate.headers),
|
|
293
|
+
source: deliveryCandidate.source as plugins.servezoneInterfaces.data.IMailConnectionInfo | undefined,
|
|
294
|
+
receivedAt,
|
|
295
|
+
from: String(envelope.mailFrom || deliveryCandidate.from || ''),
|
|
296
|
+
to: rcptTo,
|
|
297
|
+
receivedAtIso: new Date(receivedAt).toISOString(),
|
|
298
|
+
};
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
public async handleInboundPayload(
|
|
302
|
+
payloadArg: unknown,
|
|
303
|
+
handlerArg: TServiceMailInboundHandler,
|
|
304
|
+
): Promise<IServiceMailInboundHandleResult> {
|
|
305
|
+
const message = this.normalizeInboundMessage(payloadArg);
|
|
306
|
+
const result = await handlerArg(message);
|
|
307
|
+
return {
|
|
308
|
+
accepted: result?.accepted !== false,
|
|
309
|
+
workAppMessageId: result?.workAppMessageId,
|
|
310
|
+
message: result?.message,
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
public createInboundHandler(handlerArg: TServiceMailInboundHandler) {
|
|
315
|
+
return async (payloadArg: unknown) => await this.handleInboundPayload(payloadArg, handlerArg);
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
private ensureInboundTypedHandler(): void {
|
|
319
|
+
if (this.inboundTypedHandlerRegistered) return;
|
|
320
|
+
this.inboundTypedHandlerRegistered = true;
|
|
321
|
+
this.platformClientRef.typedrouter.addTypedHandler(
|
|
322
|
+
new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.requests.mail.IReq_DeliverInboundMail>(
|
|
323
|
+
'deliverInboundMail',
|
|
324
|
+
async (dataArg) => {
|
|
325
|
+
if (!this.inboundHandler) {
|
|
326
|
+
return { accepted: false, message: 'No service mail inbound handler registered' };
|
|
327
|
+
}
|
|
328
|
+
return await this.handleInboundPayload(dataArg.delivery, this.inboundHandler);
|
|
329
|
+
},
|
|
330
|
+
),
|
|
331
|
+
);
|
|
332
|
+
}
|
|
333
|
+
|
|
36
334
|
public async sendNotification(optionsArg: { toArg: string; subject: string; text: string }) {}
|
|
37
335
|
|
|
38
336
|
public async sendActionLink(optionsArg: { toArg: string; subject: string; text: string }) {}
|
|
337
|
+
|
|
338
|
+
private async readMailEnv(tokenArg?: string): Promise<{
|
|
339
|
+
from?: string;
|
|
340
|
+
smtpHost?: string;
|
|
341
|
+
smtpPort?: string;
|
|
342
|
+
smtpTlsMode?: string;
|
|
343
|
+
smtpUsername?: string;
|
|
344
|
+
smtpPassword?: string;
|
|
345
|
+
typedUrl?: string;
|
|
346
|
+
apiCredentialId?: string;
|
|
347
|
+
apiCredentialSecret?: string;
|
|
348
|
+
}> {
|
|
349
|
+
const prefix = tokenArg ? `MAIL_${tokenArg}_` : '';
|
|
350
|
+
return {
|
|
351
|
+
from: await this.readMailEnvVar(tokenArg ? `${prefix}FROM` : 'MAIL_FROM'),
|
|
352
|
+
smtpHost: await this.readMailEnvVar(`${prefix}SMTP_HOST`),
|
|
353
|
+
smtpPort: await this.readMailEnvVar(`${prefix}SMTP_PORT`),
|
|
354
|
+
smtpTlsMode: await this.readMailEnvVar(`${prefix}SMTP_TLS_MODE`),
|
|
355
|
+
smtpUsername: await this.readMailEnvVar(`${prefix}SMTP_USERNAME`),
|
|
356
|
+
smtpPassword: await this.readMailEnvVar(`${prefix}SMTP_PASSWORD`),
|
|
357
|
+
typedUrl: await this.readMailEnvVar(tokenArg ? `${prefix}TYPED_URL` : 'MAIL_TYPED_URL'),
|
|
358
|
+
apiCredentialId: await this.readMailEnvVar(tokenArg ? `${prefix}API_CREDENTIAL_ID` : 'MAIL_API_CREDENTIAL_ID'),
|
|
359
|
+
apiCredentialSecret: await this.readMailEnvVar(tokenArg ? `${prefix}API_CREDENTIAL_SECRET` : 'MAIL_API_CREDENTIAL_SECRET'),
|
|
360
|
+
};
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
private async readMailEnvVar(envNameArg: string): Promise<string | undefined> {
|
|
364
|
+
return await this.platformClientRef.getConfiguredEnvVar(envNameArg)
|
|
365
|
+
|| this.getCredentialEnvVarFromBindings(envNameArg);
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
private getCredentialEnvVarFromBindings(envNameArg: string): string | undefined {
|
|
369
|
+
for (const binding of this.platformClientRef.platformBindings || []) {
|
|
370
|
+
if (binding.desiredState === 'disabled' || binding.status === 'failed') continue;
|
|
371
|
+
if (binding.capability !== 'email') continue;
|
|
372
|
+
for (const credential of binding.credentials || []) {
|
|
373
|
+
const value = credential.env?.[envNameArg];
|
|
374
|
+
if (value) return value;
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
}
|
|
378
|
+
|
|
379
|
+
private hasAnyMailEnvValue(envArg?: {
|
|
380
|
+
from?: string;
|
|
381
|
+
smtpHost?: string;
|
|
382
|
+
smtpPort?: string;
|
|
383
|
+
smtpTlsMode?: string;
|
|
384
|
+
smtpUsername?: string;
|
|
385
|
+
smtpPassword?: string;
|
|
386
|
+
typedUrl?: string;
|
|
387
|
+
apiCredentialId?: string;
|
|
388
|
+
apiCredentialSecret?: string;
|
|
389
|
+
}): boolean {
|
|
390
|
+
return Boolean(envArg && Object.values(envArg).some(Boolean));
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
private async getServiceMailTypedCredentials(addressArg?: string): Promise<IServiceMailTypedCredentials> {
|
|
394
|
+
const requestedAddress = addressArg?.trim().toLowerCase();
|
|
395
|
+
const requestedToken = requestedAddress ? this.getMailEnvToken(requestedAddress) : undefined;
|
|
396
|
+
const scopedEnv = requestedToken ? await this.readMailEnv(requestedToken) : undefined;
|
|
397
|
+
const hasScopedConfig = scopedEnv && Object.values(scopedEnv).some(Boolean);
|
|
398
|
+
const env = hasScopedConfig ? scopedEnv! : await this.readMailEnv();
|
|
399
|
+
const from = env.from?.trim().toLowerCase();
|
|
400
|
+
if (!from) throw new Error('MAIL_FROM is required for typed service mail');
|
|
401
|
+
if (requestedAddress && from !== requestedAddress) {
|
|
402
|
+
throw new Error(`No typed service mail credentials are configured for ${requestedAddress}`);
|
|
403
|
+
}
|
|
404
|
+
if (!env.typedUrl) throw new Error('MAIL_TYPED_URL is required for typed service mail');
|
|
405
|
+
if (!env.apiCredentialId) throw new Error('MAIL_API_CREDENTIAL_ID is required for typed service mail');
|
|
406
|
+
if (!env.apiCredentialSecret) throw new Error('MAIL_API_CREDENTIAL_SECRET is required for typed service mail');
|
|
407
|
+
return {
|
|
408
|
+
from,
|
|
409
|
+
typedUrl: this.normalizeTypedSocketUrl(env.typedUrl),
|
|
410
|
+
credentialId: env.apiCredentialId,
|
|
411
|
+
credentialSecret: env.apiCredentialSecret,
|
|
412
|
+
addressToken: hasScopedConfig ? requestedToken : undefined,
|
|
413
|
+
};
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
private async getMailTypedSocket(urlArg: string): Promise<plugins.typedsocket.TypedSocket> {
|
|
417
|
+
const normalizedUrl = this.normalizeTypedSocketUrl(urlArg);
|
|
418
|
+
if (this.mailTypedSocket && this.mailTypedSocketUrl === normalizedUrl) {
|
|
419
|
+
return this.mailTypedSocket;
|
|
420
|
+
}
|
|
421
|
+
if (this.mailTypedSocketPromise && this.mailTypedSocketUrl === normalizedUrl) {
|
|
422
|
+
return await this.mailTypedSocketPromise;
|
|
423
|
+
}
|
|
424
|
+
if (this.mailTypedSocket || this.mailTypedSocketPromise) {
|
|
425
|
+
await this.stopMailTypedSocket();
|
|
426
|
+
}
|
|
427
|
+
this.mailTypedSocketUrl = normalizedUrl;
|
|
428
|
+
const abortController = new AbortController();
|
|
429
|
+
this.mailTypedSocketAbortController = abortController;
|
|
430
|
+
const socketPromise = plugins.typedsocket.TypedSocket.createClient(
|
|
431
|
+
this.platformClientRef.typedrouter,
|
|
432
|
+
normalizedUrl,
|
|
433
|
+
{ autoReconnect: true, abortSignal: abortController.signal },
|
|
434
|
+
);
|
|
435
|
+
this.mailTypedSocketPromise = socketPromise;
|
|
436
|
+
try {
|
|
437
|
+
const socket = await socketPromise;
|
|
438
|
+
if (this.mailTypedSocketPromise === socketPromise && this.mailTypedSocketUrl === normalizedUrl) {
|
|
439
|
+
this.mailTypedSocket = socket;
|
|
440
|
+
} else {
|
|
441
|
+
await socket.stop();
|
|
442
|
+
}
|
|
443
|
+
return socket;
|
|
444
|
+
} catch (error) {
|
|
445
|
+
if (this.mailTypedSocketPromise === socketPromise) {
|
|
446
|
+
this.mailTypedSocketPromise = undefined;
|
|
447
|
+
this.mailTypedSocketUrl = undefined;
|
|
448
|
+
this.mailTypedSocketAbortController = undefined;
|
|
449
|
+
}
|
|
450
|
+
throw error;
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
private async stopMailTypedSocket(): Promise<void> {
|
|
455
|
+
const socket = this.mailTypedSocket;
|
|
456
|
+
const socketPromise = this.mailTypedSocketPromise;
|
|
457
|
+
const abortController = this.mailTypedSocketAbortController;
|
|
458
|
+
this.mailTypedSocket = undefined;
|
|
459
|
+
this.mailTypedSocketPromise = undefined;
|
|
460
|
+
this.mailTypedSocketUrl = undefined;
|
|
461
|
+
this.mailTypedSocketAbortController = undefined;
|
|
462
|
+
abortController?.abort();
|
|
463
|
+
if (socket) {
|
|
464
|
+
await socket.stop();
|
|
465
|
+
return;
|
|
466
|
+
}
|
|
467
|
+
if (socketPromise) {
|
|
468
|
+
try {
|
|
469
|
+
const pendingSocket = await socketPromise;
|
|
470
|
+
await pendingSocket.stop();
|
|
471
|
+
} catch {
|
|
472
|
+
// The pending connection already failed; there is no socket to stop.
|
|
473
|
+
}
|
|
474
|
+
}
|
|
475
|
+
}
|
|
476
|
+
|
|
477
|
+
private normalizeTypedSocketUrl(urlArg: string): string {
|
|
478
|
+
return urlArg.trim().replace(/\/typedrequest\/?$/, '').replace(/\/+$/, '');
|
|
479
|
+
}
|
|
480
|
+
|
|
481
|
+
private normalizeTlsMode(valueArg: string): TServiceMailTlsMode {
|
|
482
|
+
if (valueArg === 'plain' || valueArg === 'starttls' || valueArg === 'implicitTls') return valueArg;
|
|
483
|
+
throw new Error(`Invalid SMTP_TLS_MODE: ${valueArg}`);
|
|
484
|
+
}
|
|
485
|
+
|
|
486
|
+
private getMailEnvToken(addressArg: string): string {
|
|
487
|
+
const token = addressArg.trim().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/^_+|_+$/g, '').toUpperCase();
|
|
488
|
+
return /^\d/.test(token) ? `ADDR_${token}` : token;
|
|
489
|
+
}
|
|
490
|
+
|
|
491
|
+
private listToArray(valueArg: string | string[]): string[] {
|
|
492
|
+
return Array.isArray(valueArg) ? valueArg : [valueArg];
|
|
493
|
+
}
|
|
494
|
+
|
|
495
|
+
private normalizeAttachmentContent(contentArg: string | Uint8Array): string {
|
|
496
|
+
return Buffer.from(contentArg).toString('base64');
|
|
497
|
+
}
|
|
498
|
+
|
|
499
|
+
private asRecord(valueArg: unknown): Record<string, unknown> {
|
|
500
|
+
return valueArg && typeof valueArg === 'object' ? valueArg as Record<string, unknown> : {};
|
|
501
|
+
}
|
|
502
|
+
|
|
503
|
+
private normalizeHeaders(headersArg: unknown): Record<string, string | string[]> | undefined {
|
|
504
|
+
if (!headersArg || typeof headersArg !== 'object') return undefined;
|
|
505
|
+
const result: Record<string, string | string[]> = {};
|
|
506
|
+
for (const [key, value] of Object.entries(headersArg as Record<string, unknown>)) {
|
|
507
|
+
if (Array.isArray(value)) {
|
|
508
|
+
result[key] = value.map(String);
|
|
509
|
+
} else if (value !== undefined && value !== null) {
|
|
510
|
+
result[key] = String(value);
|
|
511
|
+
}
|
|
512
|
+
}
|
|
513
|
+
return result;
|
|
514
|
+
}
|
|
515
|
+
|
|
516
|
+
private extractHeader(rawMessageArg: string, headerNameArg: string): string | undefined {
|
|
517
|
+
const lowerName = `${headerNameArg.toLowerCase()}:`;
|
|
518
|
+
for (const line of rawMessageArg.split(/\r?\n/)) {
|
|
519
|
+
if (!line) return undefined;
|
|
520
|
+
if (line.toLowerCase().startsWith(lowerName)) {
|
|
521
|
+
return line.slice(lowerName.length).trim();
|
|
522
|
+
}
|
|
523
|
+
}
|
|
524
|
+
}
|
|
39
525
|
}
|
package/ts/index.ts
CHANGED