@serve.zone/platformclient 1.2.0 → 2.0.1
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 +1 -0
- package/dist_ts/classes.platformclient.js +7 -1
- package/dist_ts/email/classes.emailconnector.d.ts +35 -0
- package/dist_ts/email/classes.emailconnector.js +282 -38
- package/dist_ts/plugins.d.ts +0 -1
- package/dist_ts/plugins.js +1 -2
- package/package.json +3 -4
- package/readme.md +42 -4
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.platformclient.ts +7 -0
- package/ts/email/classes.emailconnector.ts +335 -44
- package/ts/plugins.ts +0 -2
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/platformclient',
|
|
6
|
-
version: '
|
|
6
|
+
version: '2.0.1',
|
|
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,6 +35,7 @@ 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;
|
|
@@ -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":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAYxC,MAAM,OAAO,gBAAgB;IAc3B,YAAY,sBAA0D;QAb/D,cAAS,GAAG,KAAK,CAAC;QAGlB,qBAAgB,GAA4D,EAAE,CAAC;QAC/E,gBAAW,GAAqC,IAAI,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAEtF,iBAAY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAExC,mBAAc,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC5C,iBAAY,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;QACxC,8BAAyB,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAClE,oBAAe,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAGnD,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,sBAA0D;QAC1E,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9B,IAAI,CAAC,mBAAmB,GAAG,MAAM,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAC3E,CAAC;QACD,IAAI,IAAI,CAAC,mBAAmB,KAAK,MAAM,EAAE,CAAC;YACxC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,CAChD,IAAI,CAAC,gBAAgB,EACrB,MAAM,IAAI,CAAC,wBAAwB,EAAE,CACtC,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9B,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,kCAAkC,EAAE,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,mBAAmB;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAClF,IAAI,IAAI,CAAC,mBAAmB,KAAK,MAAM,EAAE,CAAC;YACxC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,YAAY,CACnE,IAAI,CAAC,WAAkB,EACvB,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAClC,CAAC;QACF,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACnC,CAAC;IAEO,iBAAiB;QACvB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACvC,CAAC;IAEM,kBAAkB,CACvB,aAAwE;QAExE,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;YAC/C,OAAO,CACL,UAAU,CAAC,YAAY,KAAK,UAAU;gBACtC,UAAU,CAAC,MAAM,KAAK,QAAQ;gBAC9B,CAAC,CAAC,aAAa,IAAI,UAAU,CAAC,UAAU,KAAK,aAAa,CAAC,CAC5D,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,UAA8C;QACjE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QACD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC;YACtC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,mBAAmB;YACtB,UAAU,CAAC,mBAAmB;gBAC9B,UAAU,CAAC,aAAa;gBACxB,UAAU,CAAC,KAAK;gBAChB,IAAI,CAAC,mBAAmB,CAAC;QAC3B,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,WAAW,IAAI,IAAI,CAAC,iBAAiB,CAAC;QAC5F,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,CAChD,IAAI,CAAC,gBAAgB,EACrB,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CACzD,OAAO,CACmD,CAC7D,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,MAAM,iBAAiB,GACrB,IAAI,CAAC,iBAAiB;YACtB,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,CAAC;YAC1D,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAC1C,IAAI,CAAC,iBAAiB;YAAE,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;QAC3G,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,gCAAgC;QACtC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC5C,IAAI,OAAO,CAAC,YAAY,KAAK,UAAU,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACvE,SAAS;YACX,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC7D,SAAS;YACX,CAAC;YACD,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;gBACvD,OAAO,WAAW,CAAC,QAAQ,KAAK,cAAc,IAAI,WAAW,CAAC,QAAQ,KAAK,MAAM,CAAC;YACpF,CAAC,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,QAAQ,EAAE,WAAW,IAAI,QAAQ,EAAE,WAAW,CAAC;YACnE,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO,WAAW,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAEO,8BAA8B,CACpC,aAAuE;QAEvE,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAChF,CAAC;IAEO,KAAK,CAAC,gCAAgC;QAC5C,OAAO,CACL,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,kCAAkC,CAAC,CAAC;YACpE,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,0BAA0B,CAAC,CAAC,CAC7D,CAAC;IACJ,CAAC;IAEO,kCAAkC;QACxC,MAAM,YAAY,GAAG;YACnB,kCAAkC;YAClC,0BAA0B;YAC1B,qBAAqB;YACrB,eAAe;YACf,OAAO;SACR,CAAC;QACF,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC5C,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;gBACnD,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE,CAAC;oBACnC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;oBACxC,IAAI,KAAK,EAAE,CAAC;wBACV,OAAO,KAAK,CAAC;oBACf,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,eAAsB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAClF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,MAAM,IAAI,CAAC,mBAAmB,CAAC,gCAAgC,CAAC,EAAE,CAAC;gBACrE,OAAO,CAAC,IAAI,CAAC,2CAA2C,EAAG,KAAe,CAAC,OAAO,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,wBAAwB;QACpC,MAAM,QAAQ,GAA4D,EAAE,CAAC;QAC7E,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,6BAA6B,CAAC,CAAC;QAClF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,CAAC;QAEhF,IAAI,WAAW,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC,6BAA6B,EAAE,WAAW,CAAC,CAAC,CAAC;QAC9F,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAC,CAAC;QAC5F,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,wBAAwB,CAAC,UAAkB,EAAE,WAAmB;QACtE,IAAI,WAAoB,CAAC;QACzB,IAAI,CAAC;YACH,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,0BAA0B,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,OAAO,WAAsE,CAAC;QAChF,CAAC;QACD,IAAI,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACnD,OAAO,CAAC,WAAoE,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,kDAAkD,CAAC,CAAC;IACnF,CAAC;IAEO,qBAAqB,CAC3B,mBAA4E,EAC5E,cAAuE;QAEvE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAiE,CAAC;QAC5F,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,mBAAmB,EAAE,GAAG,cAAc,CAAC,EAAE,CAAC;YAClE,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,UAAkB;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IAEO,gBAAgB,CAAC,UAAkB;QACzC,MAAM,UAAU,GAAI,UAElB,CAAC,OAAO,EAAE,GAAG,CAAC;QAChB,OAAO,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;CACF"}
|
|
@@ -10,14 +10,25 @@ export interface IServiceMailSmtpCredentials {
|
|
|
10
10
|
password: string;
|
|
11
11
|
addressToken?: string;
|
|
12
12
|
}
|
|
13
|
+
export interface IServiceMailTypedCredentials {
|
|
14
|
+
from: string;
|
|
15
|
+
typedUrl: string;
|
|
16
|
+
credentialId: string;
|
|
17
|
+
credentialSecret: string;
|
|
18
|
+
addressToken?: string;
|
|
19
|
+
}
|
|
13
20
|
export interface IServiceMailStatus {
|
|
14
21
|
ready: boolean;
|
|
15
22
|
from?: string;
|
|
16
23
|
host?: string;
|
|
17
24
|
port?: number;
|
|
18
25
|
tlsMode?: TServiceMailTlsMode;
|
|
26
|
+
typedUrl?: string;
|
|
27
|
+
transport?: 'typedsocket' | 'smtp' | 'none';
|
|
19
28
|
usernameConfigured: boolean;
|
|
20
29
|
passwordConfigured: boolean;
|
|
30
|
+
typedCredentialConfigured?: boolean;
|
|
31
|
+
smtpReady?: boolean;
|
|
21
32
|
missing: string[];
|
|
22
33
|
}
|
|
23
34
|
export interface IServiceMailAttachment {
|
|
@@ -56,6 +67,16 @@ export type IServiceMailInboundHandleResult = plugins.servezoneInterfaces.reques
|
|
|
56
67
|
export type TServiceMailInboundHandler = (messageArg: IServiceMailInboundMessage) => Promise<IServiceMailInboundHandlerResult | void> | IServiceMailInboundHandlerResult | void;
|
|
57
68
|
export declare class SzEmailConnector {
|
|
58
69
|
platformClientRef: SzPlatformClient;
|
|
70
|
+
private mailTypedSocket?;
|
|
71
|
+
private mailTypedSocketUrl?;
|
|
72
|
+
private mailTypedSocketPromise?;
|
|
73
|
+
private mailTypedSocketAbortController?;
|
|
74
|
+
private mailTypedSocketStatusSubscription?;
|
|
75
|
+
private inboundHandler?;
|
|
76
|
+
private inboundTypedHandlerRegistered;
|
|
77
|
+
private inboundEndpointRegistrations;
|
|
78
|
+
private inboundEndpointReplayPromise?;
|
|
79
|
+
private readonly inboundEndpointReplayRetryDelaysMs;
|
|
59
80
|
constructor(platformClientRefArg: SzPlatformClient);
|
|
60
81
|
/**
|
|
61
82
|
* Legacy platform-service email path. New service-mail code should use sendMail().
|
|
@@ -70,6 +91,8 @@ export declare class SzEmailConnector {
|
|
|
70
91
|
html: string;
|
|
71
92
|
}): Promise<IServiceMailSendResult>;
|
|
72
93
|
sendMail(optionsArg: IServiceMailSendOptions): Promise<IServiceMailSendResult>;
|
|
94
|
+
registerInboundHandler(handlerArg: TServiceMailInboundHandler, addressArg?: string): Promise<plugins.servezoneInterfaces.requests.mail.IReq_RegisterServiceMailEndpoint['response']>;
|
|
95
|
+
stop(): Promise<void>;
|
|
73
96
|
normalizeInboundMessage(payloadArg: unknown): IServiceMailInboundMessage;
|
|
74
97
|
handleInboundPayload(payloadArg: unknown, handlerArg: TServiceMailInboundHandler): Promise<IServiceMailInboundHandleResult>;
|
|
75
98
|
createInboundHandler(handlerArg: TServiceMailInboundHandler): (payloadArg: unknown) => Promise<{
|
|
@@ -77,6 +100,7 @@ export declare class SzEmailConnector {
|
|
|
77
100
|
workAppMessageId?: string;
|
|
78
101
|
message?: string;
|
|
79
102
|
}>;
|
|
103
|
+
private ensureInboundTypedHandler;
|
|
80
104
|
sendNotification(optionsArg: {
|
|
81
105
|
toArg: string;
|
|
82
106
|
subject: string;
|
|
@@ -91,6 +115,17 @@ export declare class SzEmailConnector {
|
|
|
91
115
|
private readMailEnvVar;
|
|
92
116
|
private getCredentialEnvVarFromBindings;
|
|
93
117
|
private hasAnyMailEnvValue;
|
|
118
|
+
private getServiceMailTypedCredentials;
|
|
119
|
+
private getMailTypedSocket;
|
|
120
|
+
private stopMailTypedSocket;
|
|
121
|
+
private watchMailTypedSocketStatus;
|
|
122
|
+
private handleMailTypedSocketStatus;
|
|
123
|
+
private replayInboundEndpointRegistrationsWithRetry;
|
|
124
|
+
private replayInboundEndpointRegistrationsWithRetryInner;
|
|
125
|
+
private replayInboundEndpointRegistrationsOnce;
|
|
126
|
+
private waitForInboundEndpointReplayRetry;
|
|
127
|
+
private registerServiceMailEndpoint;
|
|
128
|
+
private normalizeTypedSocketUrl;
|
|
94
129
|
private normalizeTlsMode;
|
|
95
130
|
private getMailEnvToken;
|
|
96
131
|
private listToArray;
|
|
@@ -2,6 +2,9 @@ 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;
|
|
6
|
+
this.inboundEndpointRegistrations = new Set();
|
|
7
|
+
this.inboundEndpointReplayRetryDelaysMs = [500, 1000, 2000, 5000];
|
|
5
8
|
this.platformClientRef = platformClientRefArg;
|
|
6
9
|
}
|
|
7
10
|
/**
|
|
@@ -34,27 +37,39 @@ export class SzEmailConnector {
|
|
|
34
37
|
const missingPrefix = useDefaultEnv || !token ? undefined : token;
|
|
35
38
|
const port = env.smtpPort ? Number(env.smtpPort) : undefined;
|
|
36
39
|
const tlsMode = this.normalizeTlsMode(env.smtpTlsMode || 'starttls');
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
40
|
+
const typedMissing = [];
|
|
41
|
+
const smtpMissing = [];
|
|
42
|
+
if (!env.typedUrl)
|
|
43
|
+
typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_TYPED_URL` : 'MAIL_TYPED_URL');
|
|
44
|
+
if (!env.apiCredentialId)
|
|
45
|
+
typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_API_CREDENTIAL_ID` : 'MAIL_API_CREDENTIAL_ID');
|
|
46
|
+
if (!env.apiCredentialSecret)
|
|
47
|
+
typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_API_CREDENTIAL_SECRET` : 'MAIL_API_CREDENTIAL_SECRET');
|
|
40
48
|
if (!env.smtpHost)
|
|
41
|
-
|
|
49
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_HOST` : 'SMTP_HOST');
|
|
42
50
|
if (!env.smtpPort || !Number.isInteger(port) || port < 1 || port > 65535) {
|
|
43
|
-
|
|
51
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_PORT` : 'SMTP_PORT');
|
|
44
52
|
}
|
|
45
53
|
if (!env.smtpUsername)
|
|
46
|
-
|
|
54
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_USERNAME` : 'SMTP_USERNAME');
|
|
47
55
|
if (!env.smtpPassword)
|
|
48
|
-
|
|
56
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_PASSWORD` : 'SMTP_PASSWORD');
|
|
57
|
+
const fromMissing = env.from ? [] : [missingPrefix ? `MAIL_${missingPrefix}_FROM` : 'MAIL_FROM'];
|
|
58
|
+
const typedReady = fromMissing.length === 0 && typedMissing.length === 0;
|
|
59
|
+
const smtpReady = fromMissing.length === 0 && smtpMissing.length === 0;
|
|
49
60
|
return {
|
|
50
|
-
ready:
|
|
61
|
+
ready: typedReady,
|
|
51
62
|
from: env.from,
|
|
52
63
|
host: env.smtpHost,
|
|
53
64
|
port,
|
|
54
65
|
tlsMode,
|
|
66
|
+
typedUrl: env.typedUrl,
|
|
67
|
+
transport: typedReady ? 'typedsocket' : smtpReady ? 'smtp' : 'none',
|
|
55
68
|
usernameConfigured: Boolean(env.smtpUsername),
|
|
56
69
|
passwordConfigured: Boolean(env.smtpPassword),
|
|
57
|
-
|
|
70
|
+
typedCredentialConfigured: Boolean(env.apiCredentialId && env.apiCredentialSecret),
|
|
71
|
+
smtpReady,
|
|
72
|
+
missing: typedReady ? [] : [...fromMissing, ...typedMissing],
|
|
58
73
|
};
|
|
59
74
|
}
|
|
60
75
|
async getServiceMailCredentials(addressArg) {
|
|
@@ -103,37 +118,56 @@ export class SzEmailConnector {
|
|
|
103
118
|
logger.log('info', `service mail debug send: ${optionsArg.subject} to ${this.listToArray(optionsArg.to).join(', ')}`);
|
|
104
119
|
return { messageId: 'debug' };
|
|
105
120
|
}
|
|
106
|
-
const credentials = await this.
|
|
107
|
-
const
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
121
|
+
const credentials = await this.getServiceMailTypedCredentials(optionsArg.from);
|
|
122
|
+
const typedSocket = await this.getMailTypedSocket(credentials.typedUrl);
|
|
123
|
+
const request = typedSocket.createTypedRequest('enqueueMail');
|
|
124
|
+
const result = await request.fire({
|
|
125
|
+
auth: {
|
|
126
|
+
credentialId: credentials.credentialId,
|
|
127
|
+
credentialSecret: credentials.credentialSecret,
|
|
128
|
+
},
|
|
129
|
+
outboundIdentityId: credentials.credentialId,
|
|
130
|
+
message: {
|
|
131
|
+
from: credentials.from,
|
|
132
|
+
to: this.listToArray(optionsArg.to),
|
|
133
|
+
cc: optionsArg.cc ? this.listToArray(optionsArg.cc) : undefined,
|
|
134
|
+
bcc: optionsArg.bcc ? this.listToArray(optionsArg.bcc) : undefined,
|
|
135
|
+
subject: optionsArg.subject,
|
|
136
|
+
text: optionsArg.text,
|
|
137
|
+
html: optionsArg.html,
|
|
138
|
+
headers: optionsArg.headers,
|
|
139
|
+
attachments: optionsArg.attachments?.map((attachmentArg) => ({
|
|
140
|
+
filename: attachmentArg.filename,
|
|
141
|
+
contentType: attachmentArg.contentType,
|
|
142
|
+
binaryAttachmentString: this.normalizeAttachmentContent(attachmentArg.content),
|
|
143
|
+
})),
|
|
144
|
+
},
|
|
114
145
|
});
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
cc: optionsArg.cc ? this.listToArray(optionsArg.cc) : undefined,
|
|
119
|
-
bcc: optionsArg.bcc ? this.listToArray(optionsArg.bcc) : undefined,
|
|
120
|
-
subject: optionsArg.subject,
|
|
121
|
-
text: optionsArg.text,
|
|
122
|
-
html: optionsArg.html,
|
|
123
|
-
headers: optionsArg.headers,
|
|
124
|
-
attachments: optionsArg.attachments?.map((attachmentArg) => ({
|
|
125
|
-
filename: attachmentArg.filename,
|
|
126
|
-
contentType: attachmentArg.contentType,
|
|
127
|
-
content: this.normalizeAttachmentContent(attachmentArg.content),
|
|
128
|
-
})),
|
|
129
|
-
}));
|
|
146
|
+
if (!result.accepted) {
|
|
147
|
+
throw new Error(result.message || 'service mail was not accepted by dcrouter');
|
|
148
|
+
}
|
|
130
149
|
return {
|
|
131
|
-
messageId: result.
|
|
132
|
-
accepted:
|
|
133
|
-
rejected:
|
|
134
|
-
response: result.
|
|
150
|
+
messageId: result.spoolItemId,
|
|
151
|
+
accepted: this.listToArray(optionsArg.to),
|
|
152
|
+
rejected: [],
|
|
153
|
+
response: result.message,
|
|
135
154
|
};
|
|
136
155
|
}
|
|
156
|
+
async registerInboundHandler(handlerArg, addressArg) {
|
|
157
|
+
this.inboundHandler = handlerArg;
|
|
158
|
+
this.ensureInboundTypedHandler();
|
|
159
|
+
const credentials = await this.getServiceMailTypedCredentials(addressArg);
|
|
160
|
+
const typedSocket = await this.getMailTypedSocket(credentials.typedUrl);
|
|
161
|
+
const result = await this.registerServiceMailEndpoint(typedSocket, credentials);
|
|
162
|
+
const registeredAddresses = result.addresses?.length ? result.addresses : [credentials.from];
|
|
163
|
+
for (const address of registeredAddresses) {
|
|
164
|
+
this.inboundEndpointRegistrations.add(address.trim().toLowerCase());
|
|
165
|
+
}
|
|
166
|
+
return result;
|
|
167
|
+
}
|
|
168
|
+
async stop() {
|
|
169
|
+
await this.stopMailTypedSocket();
|
|
170
|
+
}
|
|
137
171
|
normalizeInboundMessage(payloadArg) {
|
|
138
172
|
const payload = this.asRecord(payloadArg);
|
|
139
173
|
const deliveryCandidate = this.asRecord(payload.delivery || payload.message || payload);
|
|
@@ -172,6 +206,17 @@ export class SzEmailConnector {
|
|
|
172
206
|
createInboundHandler(handlerArg) {
|
|
173
207
|
return async (payloadArg) => await this.handleInboundPayload(payloadArg, handlerArg);
|
|
174
208
|
}
|
|
209
|
+
ensureInboundTypedHandler() {
|
|
210
|
+
if (this.inboundTypedHandlerRegistered)
|
|
211
|
+
return;
|
|
212
|
+
this.inboundTypedHandlerRegistered = true;
|
|
213
|
+
this.platformClientRef.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('deliverInboundMail', async (dataArg) => {
|
|
214
|
+
if (!this.inboundHandler) {
|
|
215
|
+
return { accepted: false, message: 'No service mail inbound handler registered' };
|
|
216
|
+
}
|
|
217
|
+
return await this.handleInboundPayload(dataArg.delivery, this.inboundHandler);
|
|
218
|
+
}));
|
|
219
|
+
}
|
|
175
220
|
async sendNotification(optionsArg) { }
|
|
176
221
|
async sendActionLink(optionsArg) { }
|
|
177
222
|
async readMailEnv(tokenArg) {
|
|
@@ -183,6 +228,9 @@ export class SzEmailConnector {
|
|
|
183
228
|
smtpTlsMode: await this.readMailEnvVar(`${prefix}SMTP_TLS_MODE`),
|
|
184
229
|
smtpUsername: await this.readMailEnvVar(`${prefix}SMTP_USERNAME`),
|
|
185
230
|
smtpPassword: await this.readMailEnvVar(`${prefix}SMTP_PASSWORD`),
|
|
231
|
+
typedUrl: await this.readMailEnvVar(tokenArg ? `${prefix}TYPED_URL` : 'MAIL_TYPED_URL'),
|
|
232
|
+
apiCredentialId: await this.readMailEnvVar(tokenArg ? `${prefix}API_CREDENTIAL_ID` : 'MAIL_API_CREDENTIAL_ID'),
|
|
233
|
+
apiCredentialSecret: await this.readMailEnvVar(tokenArg ? `${prefix}API_CREDENTIAL_SECRET` : 'MAIL_API_CREDENTIAL_SECRET'),
|
|
186
234
|
};
|
|
187
235
|
}
|
|
188
236
|
async readMailEnvVar(envNameArg) {
|
|
@@ -205,6 +253,202 @@ export class SzEmailConnector {
|
|
|
205
253
|
hasAnyMailEnvValue(envArg) {
|
|
206
254
|
return Boolean(envArg && Object.values(envArg).some(Boolean));
|
|
207
255
|
}
|
|
256
|
+
async getServiceMailTypedCredentials(addressArg) {
|
|
257
|
+
const requestedAddress = addressArg?.trim().toLowerCase();
|
|
258
|
+
const requestedToken = requestedAddress ? this.getMailEnvToken(requestedAddress) : undefined;
|
|
259
|
+
const scopedEnv = requestedToken ? await this.readMailEnv(requestedToken) : undefined;
|
|
260
|
+
const hasScopedConfig = scopedEnv && Object.values(scopedEnv).some(Boolean);
|
|
261
|
+
const env = hasScopedConfig ? scopedEnv : await this.readMailEnv();
|
|
262
|
+
const from = env.from?.trim().toLowerCase();
|
|
263
|
+
if (!from)
|
|
264
|
+
throw new Error('MAIL_FROM is required for typed service mail');
|
|
265
|
+
if (requestedAddress && from !== requestedAddress) {
|
|
266
|
+
throw new Error(`No typed service mail credentials are configured for ${requestedAddress}`);
|
|
267
|
+
}
|
|
268
|
+
if (!env.typedUrl)
|
|
269
|
+
throw new Error('MAIL_TYPED_URL is required for typed service mail');
|
|
270
|
+
if (!env.apiCredentialId)
|
|
271
|
+
throw new Error('MAIL_API_CREDENTIAL_ID is required for typed service mail');
|
|
272
|
+
if (!env.apiCredentialSecret)
|
|
273
|
+
throw new Error('MAIL_API_CREDENTIAL_SECRET is required for typed service mail');
|
|
274
|
+
return {
|
|
275
|
+
from,
|
|
276
|
+
typedUrl: this.normalizeTypedSocketUrl(env.typedUrl),
|
|
277
|
+
credentialId: env.apiCredentialId,
|
|
278
|
+
credentialSecret: env.apiCredentialSecret,
|
|
279
|
+
addressToken: hasScopedConfig ? requestedToken : undefined,
|
|
280
|
+
};
|
|
281
|
+
}
|
|
282
|
+
async getMailTypedSocket(urlArg) {
|
|
283
|
+
const normalizedUrl = this.normalizeTypedSocketUrl(urlArg);
|
|
284
|
+
if (this.mailTypedSocket && this.mailTypedSocketUrl === normalizedUrl) {
|
|
285
|
+
return this.mailTypedSocket;
|
|
286
|
+
}
|
|
287
|
+
if (this.mailTypedSocketPromise && this.mailTypedSocketUrl === normalizedUrl) {
|
|
288
|
+
return await this.mailTypedSocketPromise;
|
|
289
|
+
}
|
|
290
|
+
if (this.mailTypedSocket || this.mailTypedSocketPromise) {
|
|
291
|
+
await this.stopMailTypedSocket();
|
|
292
|
+
}
|
|
293
|
+
this.mailTypedSocketUrl = normalizedUrl;
|
|
294
|
+
const abortController = new AbortController();
|
|
295
|
+
this.mailTypedSocketAbortController = abortController;
|
|
296
|
+
const socketPromise = plugins.typedsocket.TypedSocket.createClient(this.platformClientRef.typedrouter, normalizedUrl, { autoReconnect: true, abortSignal: abortController.signal });
|
|
297
|
+
this.mailTypedSocketPromise = socketPromise;
|
|
298
|
+
try {
|
|
299
|
+
const socket = await socketPromise;
|
|
300
|
+
if (this.mailTypedSocketPromise === socketPromise && this.mailTypedSocketUrl === normalizedUrl) {
|
|
301
|
+
this.mailTypedSocket = socket;
|
|
302
|
+
this.watchMailTypedSocketStatus(socket);
|
|
303
|
+
}
|
|
304
|
+
else {
|
|
305
|
+
await socket.stop();
|
|
306
|
+
}
|
|
307
|
+
return socket;
|
|
308
|
+
}
|
|
309
|
+
catch (error) {
|
|
310
|
+
if (this.mailTypedSocketPromise === socketPromise) {
|
|
311
|
+
this.mailTypedSocketPromise = undefined;
|
|
312
|
+
this.mailTypedSocketUrl = undefined;
|
|
313
|
+
this.mailTypedSocketAbortController = undefined;
|
|
314
|
+
}
|
|
315
|
+
throw error;
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
async stopMailTypedSocket() {
|
|
319
|
+
const socket = this.mailTypedSocket;
|
|
320
|
+
const socketPromise = this.mailTypedSocketPromise;
|
|
321
|
+
const abortController = this.mailTypedSocketAbortController;
|
|
322
|
+
const statusSubscription = this.mailTypedSocketStatusSubscription;
|
|
323
|
+
this.mailTypedSocket = undefined;
|
|
324
|
+
this.mailTypedSocketPromise = undefined;
|
|
325
|
+
this.mailTypedSocketUrl = undefined;
|
|
326
|
+
this.mailTypedSocketAbortController = undefined;
|
|
327
|
+
this.mailTypedSocketStatusSubscription = undefined;
|
|
328
|
+
statusSubscription?.unsubscribe();
|
|
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
|
+
watchMailTypedSocketStatus(socketArg) {
|
|
345
|
+
this.mailTypedSocketStatusSubscription?.unsubscribe();
|
|
346
|
+
this.mailTypedSocketStatusSubscription = socketArg.statusSubject.subscribe((statusArg) => {
|
|
347
|
+
void this.handleMailTypedSocketStatus(socketArg, statusArg);
|
|
348
|
+
});
|
|
349
|
+
}
|
|
350
|
+
async handleMailTypedSocketStatus(socketArg, statusArg) {
|
|
351
|
+
if (statusArg !== 'connected' || this.mailTypedSocket !== socketArg) {
|
|
352
|
+
return;
|
|
353
|
+
}
|
|
354
|
+
try {
|
|
355
|
+
await this.replayInboundEndpointRegistrationsWithRetry(socketArg);
|
|
356
|
+
}
|
|
357
|
+
catch (error) {
|
|
358
|
+
console.warn('Could not re-register service mail endpoint after reconnect:', error.message);
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
async replayInboundEndpointRegistrationsWithRetry(socketArg) {
|
|
362
|
+
if (!this.inboundEndpointRegistrations.size) {
|
|
363
|
+
return;
|
|
364
|
+
}
|
|
365
|
+
if (this.inboundEndpointReplayPromise) {
|
|
366
|
+
return await this.inboundEndpointReplayPromise;
|
|
367
|
+
}
|
|
368
|
+
const replayPromise = this.replayInboundEndpointRegistrationsWithRetryInner(socketArg);
|
|
369
|
+
this.inboundEndpointReplayPromise = replayPromise;
|
|
370
|
+
try {
|
|
371
|
+
await replayPromise;
|
|
372
|
+
}
|
|
373
|
+
finally {
|
|
374
|
+
if (this.inboundEndpointReplayPromise === replayPromise) {
|
|
375
|
+
this.inboundEndpointReplayPromise = undefined;
|
|
376
|
+
}
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
async replayInboundEndpointRegistrationsWithRetryInner(socketArg) {
|
|
380
|
+
let lastError;
|
|
381
|
+
const delays = [0, ...this.inboundEndpointReplayRetryDelaysMs];
|
|
382
|
+
for (let attemptIndex = 0; attemptIndex < delays.length; attemptIndex++) {
|
|
383
|
+
if (this.mailTypedSocket !== socketArg) {
|
|
384
|
+
return;
|
|
385
|
+
}
|
|
386
|
+
if (attemptIndex > 0) {
|
|
387
|
+
const shouldContinue = await this.waitForInboundEndpointReplayRetry(socketArg, delays[attemptIndex]);
|
|
388
|
+
if (!shouldContinue) {
|
|
389
|
+
return;
|
|
390
|
+
}
|
|
391
|
+
}
|
|
392
|
+
try {
|
|
393
|
+
await this.replayInboundEndpointRegistrationsOnce(socketArg);
|
|
394
|
+
return;
|
|
395
|
+
}
|
|
396
|
+
catch (error) {
|
|
397
|
+
lastError = error;
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
throw lastError instanceof Error
|
|
401
|
+
? lastError
|
|
402
|
+
: new Error('Could not re-register service mail endpoint after reconnect');
|
|
403
|
+
}
|
|
404
|
+
async replayInboundEndpointRegistrationsOnce(socketArg) {
|
|
405
|
+
for (const address of this.inboundEndpointRegistrations.values()) {
|
|
406
|
+
if (this.mailTypedSocket !== socketArg) {
|
|
407
|
+
return;
|
|
408
|
+
}
|
|
409
|
+
const credentials = await this.getServiceMailTypedCredentials(address);
|
|
410
|
+
if (this.normalizeTypedSocketUrl(credentials.typedUrl) !== this.mailTypedSocketUrl) {
|
|
411
|
+
continue;
|
|
412
|
+
}
|
|
413
|
+
await this.registerServiceMailEndpoint(socketArg, credentials);
|
|
414
|
+
}
|
|
415
|
+
}
|
|
416
|
+
async waitForInboundEndpointReplayRetry(socketArg, delayMsArg) {
|
|
417
|
+
if (this.mailTypedSocket !== socketArg) {
|
|
418
|
+
return false;
|
|
419
|
+
}
|
|
420
|
+
const abortSignal = this.mailTypedSocketAbortController?.signal;
|
|
421
|
+
if (abortSignal?.aborted) {
|
|
422
|
+
return false;
|
|
423
|
+
}
|
|
424
|
+
return await new Promise((resolve) => {
|
|
425
|
+
const resolveOnce = (resultArg) => {
|
|
426
|
+
clearTimeout(timeout);
|
|
427
|
+
abortSignal?.removeEventListener('abort', abortHandler);
|
|
428
|
+
resolve(resultArg && this.mailTypedSocket === socketArg);
|
|
429
|
+
};
|
|
430
|
+
const abortHandler = () => resolveOnce(false);
|
|
431
|
+
const timeout = setTimeout(() => resolveOnce(true), delayMsArg);
|
|
432
|
+
abortSignal?.addEventListener('abort', abortHandler, { once: true });
|
|
433
|
+
});
|
|
434
|
+
}
|
|
435
|
+
async registerServiceMailEndpoint(typedSocketArg, credentialsArg) {
|
|
436
|
+
const request = typedSocketArg.createTypedRequest('registerServiceMailEndpoint');
|
|
437
|
+
const result = await request.fire({
|
|
438
|
+
auth: {
|
|
439
|
+
credentialId: credentialsArg.credentialId,
|
|
440
|
+
credentialSecret: credentialsArg.credentialSecret,
|
|
441
|
+
},
|
|
442
|
+
addresses: [credentialsArg.from],
|
|
443
|
+
});
|
|
444
|
+
if (!result.success) {
|
|
445
|
+
throw new Error(result.message || 'Could not register service mail endpoint');
|
|
446
|
+
}
|
|
447
|
+
return result;
|
|
448
|
+
}
|
|
449
|
+
normalizeTypedSocketUrl(urlArg) {
|
|
450
|
+
return urlArg.trim().replace(/\/typedrequest\/?$/, '').replace(/\/+$/, '');
|
|
451
|
+
}
|
|
208
452
|
normalizeTlsMode(valueArg) {
|
|
209
453
|
if (valueArg === 'plain' || valueArg === 'starttls' || valueArg === 'implicitTls')
|
|
210
454
|
return valueArg;
|
|
@@ -218,7 +462,7 @@ export class SzEmailConnector {
|
|
|
218
462
|
return Array.isArray(valueArg) ? valueArg : [valueArg];
|
|
219
463
|
}
|
|
220
464
|
normalizeAttachmentContent(contentArg) {
|
|
221
|
-
return
|
|
465
|
+
return Buffer.from(contentArg).toString('base64');
|
|
222
466
|
}
|
|
223
467
|
asRecord(valueArg) {
|
|
224
468
|
return valueArg && typeof valueArg === 'object' ? valueArg : {};
|
|
@@ -248,4 +492,4 @@ export class SzEmailConnector {
|
|
|
248
492
|
}
|
|
249
493
|
}
|
|
250
494
|
}
|
|
251
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.emailconnector.js","sourceRoot":"","sources":["../../ts/email/classes.emailconnector.ts"],"names":[],"mappings":"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"}
|
|
495
|
+
//# 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/plugins.d.ts
CHANGED
|
@@ -3,7 +3,6 @@ export { servezoneInterfaces, };
|
|
|
3
3
|
import * as qenv from '@push.rocks/qenv';
|
|
4
4
|
import * as smartlog from '@push.rocks/smartlog';
|
|
5
5
|
export { qenv, smartlog, };
|
|
6
|
-
export declare const getSmartsmtp: () => Promise<typeof import("@push.rocks/smartsmtp")>;
|
|
7
6
|
import * as typedrequest from '@api.global/typedrequest';
|
|
8
7
|
import * as typedserver from '@api.global/typedserver';
|
|
9
8
|
import * as typedsocket from '@api.global/typedsocket';
|
package/dist_ts/plugins.js
CHANGED
|
@@ -5,10 +5,9 @@ export { servezoneInterfaces, };
|
|
|
5
5
|
import * as qenv from '@push.rocks/qenv';
|
|
6
6
|
import * as smartlog from '@push.rocks/smartlog';
|
|
7
7
|
export { qenv, smartlog, };
|
|
8
|
-
export const getSmartsmtp = async () => await import('@push.rocks/smartsmtp');
|
|
9
8
|
// @api.global scope
|
|
10
9
|
import * as typedrequest from '@api.global/typedrequest';
|
|
11
10
|
import * as typedserver from '@api.global/typedserver';
|
|
12
11
|
import * as typedsocket from '@api.global/typedsocket';
|
|
13
12
|
export { typedrequest, typedserver, typedsocket, };
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxtQkFBbUIsTUFBTSx3QkFBd0IsQ0FBQztBQUU5RCxPQUFPLEVBQ0wsbUJBQW1CLEdBQ3BCLENBQUE7QUFFRCxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLElBQUksTUFBTSxrQkFBa0IsQ0FBQztBQUN6QyxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBRWpELE9BQU8sRUFDTCxJQUFJLEVBQ0osUUFBUSxHQUNULENBQUE7QUFHRCxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsT0FBTyxFQUNMLFlBQVksRUFDWixXQUFXLEVBQ1gsV0FBVyxHQUNaLENBQUEifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/platformclient",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.1",
|
|
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",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
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,8 +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
|
-
"@
|
|
26
|
-
"@serve.zone/interfaces": "^7.27.0"
|
|
25
|
+
"@serve.zone/interfaces": "^7.28.0"
|
|
27
26
|
},
|
|
28
27
|
"repository": {
|
|
29
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` | `getServiceMailStatus()`, `getServiceMailCredentials()`, `sendMail()`, `sendText()`, `sendHtml()`, `normalizeInboundMessage()`, `handleInboundPayload()`, `createInboundHandler()`, `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,7 +57,9 @@ 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. The default sender uses `MAIL_FROM`, `
|
|
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()`.
|
|
61
63
|
|
|
62
64
|
```typescript
|
|
63
65
|
import { SzPlatformClient } from '@serve.zone/platformclient';
|
|
@@ -102,9 +104,32 @@ console.log(verificationCode); // 123456
|
|
|
102
104
|
|
|
103
105
|
The current SMS verification method is spelled `sendSmsVerifcation()` in code. Use that exact method name until the public API changes.
|
|
104
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
|
+
|
|
105
130
|
## Connector Examples
|
|
106
131
|
|
|
107
|
-
Service mail over managed
|
|
132
|
+
Service mail over managed TypedSocket credentials:
|
|
108
133
|
|
|
109
134
|
```typescript
|
|
110
135
|
const status = await client.emailConnector.getServiceMailStatus();
|
|
@@ -118,6 +143,8 @@ if (status.ready) {
|
|
|
118
143
|
}
|
|
119
144
|
```
|
|
120
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
|
+
|
|
121
148
|
Specific sender address:
|
|
122
149
|
|
|
123
150
|
```typescript
|
|
@@ -129,7 +156,18 @@ await client.emailConnector.sendHtml({
|
|
|
129
156
|
});
|
|
130
157
|
```
|
|
131
158
|
|
|
132
|
-
|
|
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:
|
|
133
171
|
|
|
134
172
|
```typescript
|
|
135
173
|
const inboundHandler = client.emailConnector.createInboundHandler(async (message) => {
|
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');
|
|
@@ -15,14 +15,26 @@ export interface IServiceMailSmtpCredentials {
|
|
|
15
15
|
addressToken?: string;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
+
export interface IServiceMailTypedCredentials {
|
|
19
|
+
from: string;
|
|
20
|
+
typedUrl: string;
|
|
21
|
+
credentialId: string;
|
|
22
|
+
credentialSecret: string;
|
|
23
|
+
addressToken?: string;
|
|
24
|
+
}
|
|
25
|
+
|
|
18
26
|
export interface IServiceMailStatus {
|
|
19
27
|
ready: boolean;
|
|
20
28
|
from?: string;
|
|
21
29
|
host?: string;
|
|
22
30
|
port?: number;
|
|
23
31
|
tlsMode?: TServiceMailTlsMode;
|
|
32
|
+
typedUrl?: string;
|
|
33
|
+
transport?: 'typedsocket' | 'smtp' | 'none';
|
|
24
34
|
usernameConfigured: boolean;
|
|
25
35
|
passwordConfigured: boolean;
|
|
36
|
+
typedCredentialConfigured?: boolean;
|
|
37
|
+
smtpReady?: boolean;
|
|
26
38
|
missing: string[];
|
|
27
39
|
}
|
|
28
40
|
|
|
@@ -66,19 +78,22 @@ export interface IServiceMailInboundHandlerResult {
|
|
|
66
78
|
export type IServiceMailInboundHandleResult =
|
|
67
79
|
plugins.servezoneInterfaces.requests.mail.IReq_DeliverInboundMail['response'];
|
|
68
80
|
|
|
69
|
-
interface INodemailerSendResult {
|
|
70
|
-
messageId?: string;
|
|
71
|
-
accepted?: unknown[];
|
|
72
|
-
rejected?: unknown[];
|
|
73
|
-
response?: string;
|
|
74
|
-
}
|
|
75
|
-
|
|
76
81
|
export type TServiceMailInboundHandler = (
|
|
77
82
|
messageArg: IServiceMailInboundMessage,
|
|
78
83
|
) => Promise<IServiceMailInboundHandlerResult | void> | IServiceMailInboundHandlerResult | void;
|
|
79
84
|
|
|
80
85
|
export class SzEmailConnector {
|
|
81
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 mailTypedSocketStatusSubscription?: { unsubscribe: () => void };
|
|
92
|
+
private inboundHandler?: TServiceMailInboundHandler;
|
|
93
|
+
private inboundTypedHandlerRegistered = false;
|
|
94
|
+
private inboundEndpointRegistrations = new Set<string>();
|
|
95
|
+
private inboundEndpointReplayPromise?: Promise<void>;
|
|
96
|
+
private readonly inboundEndpointReplayRetryDelaysMs = [500, 1000, 2000, 5000];
|
|
82
97
|
|
|
83
98
|
constructor(platformClientRefArg: SzPlatformClient) {
|
|
84
99
|
this.platformClientRef = platformClientRefArg;
|
|
@@ -122,23 +137,33 @@ export class SzEmailConnector {
|
|
|
122
137
|
const missingPrefix = useDefaultEnv || !token ? undefined : token;
|
|
123
138
|
const port = env.smtpPort ? Number(env.smtpPort) : undefined;
|
|
124
139
|
const tlsMode = this.normalizeTlsMode(env.smtpTlsMode || 'starttls');
|
|
125
|
-
const
|
|
126
|
-
|
|
127
|
-
if (!env.
|
|
140
|
+
const typedMissing: string[] = [];
|
|
141
|
+
const smtpMissing: string[] = [];
|
|
142
|
+
if (!env.typedUrl) typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_TYPED_URL` : 'MAIL_TYPED_URL');
|
|
143
|
+
if (!env.apiCredentialId) typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_API_CREDENTIAL_ID` : 'MAIL_API_CREDENTIAL_ID');
|
|
144
|
+
if (!env.apiCredentialSecret) typedMissing.push(missingPrefix ? `MAIL_${missingPrefix}_API_CREDENTIAL_SECRET` : 'MAIL_API_CREDENTIAL_SECRET');
|
|
145
|
+
if (!env.smtpHost) smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_HOST` : 'SMTP_HOST');
|
|
128
146
|
if (!env.smtpPort || !Number.isInteger(port) || port! < 1 || port! > 65535) {
|
|
129
|
-
|
|
147
|
+
smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_PORT` : 'SMTP_PORT');
|
|
130
148
|
}
|
|
131
|
-
if (!env.smtpUsername)
|
|
132
|
-
if (!env.smtpPassword)
|
|
149
|
+
if (!env.smtpUsername) smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_USERNAME` : 'SMTP_USERNAME');
|
|
150
|
+
if (!env.smtpPassword) smtpMissing.push(missingPrefix ? `MAIL_${missingPrefix}_SMTP_PASSWORD` : 'SMTP_PASSWORD');
|
|
151
|
+
const fromMissing = env.from ? [] : [missingPrefix ? `MAIL_${missingPrefix}_FROM` : 'MAIL_FROM'];
|
|
152
|
+
const typedReady = fromMissing.length === 0 && typedMissing.length === 0;
|
|
153
|
+
const smtpReady = fromMissing.length === 0 && smtpMissing.length === 0;
|
|
133
154
|
return {
|
|
134
|
-
ready:
|
|
155
|
+
ready: typedReady,
|
|
135
156
|
from: env.from,
|
|
136
157
|
host: env.smtpHost,
|
|
137
158
|
port,
|
|
138
159
|
tlsMode,
|
|
160
|
+
typedUrl: env.typedUrl,
|
|
161
|
+
transport: typedReady ? 'typedsocket' : smtpReady ? 'smtp' : 'none',
|
|
139
162
|
usernameConfigured: Boolean(env.smtpUsername),
|
|
140
163
|
passwordConfigured: Boolean(env.smtpPassword),
|
|
141
|
-
|
|
164
|
+
typedCredentialConfigured: Boolean(env.apiCredentialId && env.apiCredentialSecret),
|
|
165
|
+
smtpReady,
|
|
166
|
+
missing: typedReady ? [] : [...fromMissing, ...typedMissing],
|
|
142
167
|
};
|
|
143
168
|
}
|
|
144
169
|
|
|
@@ -188,38 +213,62 @@ export class SzEmailConnector {
|
|
|
188
213
|
return { messageId: 'debug' };
|
|
189
214
|
}
|
|
190
215
|
|
|
191
|
-
const credentials = await this.
|
|
192
|
-
const
|
|
193
|
-
const
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
216
|
+
const credentials = await this.getServiceMailTypedCredentials(optionsArg.from);
|
|
217
|
+
const typedSocket = await this.getMailTypedSocket(credentials.typedUrl);
|
|
218
|
+
const request = typedSocket.createTypedRequest<plugins.servezoneInterfaces.requests.mail.IReq_EnqueueMail>('enqueueMail');
|
|
219
|
+
const result = await request.fire({
|
|
220
|
+
auth: {
|
|
221
|
+
credentialId: credentials.credentialId,
|
|
222
|
+
credentialSecret: credentials.credentialSecret,
|
|
223
|
+
},
|
|
224
|
+
outboundIdentityId: credentials.credentialId,
|
|
225
|
+
message: {
|
|
226
|
+
from: credentials.from,
|
|
227
|
+
to: this.listToArray(optionsArg.to),
|
|
228
|
+
cc: optionsArg.cc ? this.listToArray(optionsArg.cc) : undefined,
|
|
229
|
+
bcc: optionsArg.bcc ? this.listToArray(optionsArg.bcc) : undefined,
|
|
230
|
+
subject: optionsArg.subject,
|
|
231
|
+
text: optionsArg.text,
|
|
232
|
+
html: optionsArg.html,
|
|
233
|
+
headers: optionsArg.headers,
|
|
234
|
+
attachments: optionsArg.attachments?.map((attachmentArg) => ({
|
|
235
|
+
filename: attachmentArg.filename,
|
|
236
|
+
contentType: attachmentArg.contentType,
|
|
237
|
+
binaryAttachmentString: this.normalizeAttachmentContent(attachmentArg.content),
|
|
238
|
+
})),
|
|
239
|
+
},
|
|
199
240
|
});
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
cc: optionsArg.cc ? this.listToArray(optionsArg.cc) : undefined,
|
|
204
|
-
bcc: optionsArg.bcc ? this.listToArray(optionsArg.bcc) : undefined,
|
|
205
|
-
subject: optionsArg.subject,
|
|
206
|
-
text: optionsArg.text,
|
|
207
|
-
html: optionsArg.html,
|
|
208
|
-
headers: optionsArg.headers,
|
|
209
|
-
attachments: optionsArg.attachments?.map((attachmentArg) => ({
|
|
210
|
-
filename: attachmentArg.filename,
|
|
211
|
-
contentType: attachmentArg.contentType,
|
|
212
|
-
content: this.normalizeAttachmentContent(attachmentArg.content),
|
|
213
|
-
})),
|
|
214
|
-
})) as INodemailerSendResult;
|
|
241
|
+
if (!result.accepted) {
|
|
242
|
+
throw new Error(result.message || 'service mail was not accepted by dcrouter');
|
|
243
|
+
}
|
|
215
244
|
return {
|
|
216
|
-
messageId: result.
|
|
217
|
-
accepted:
|
|
218
|
-
rejected:
|
|
219
|
-
response: result.
|
|
245
|
+
messageId: result.spoolItemId,
|
|
246
|
+
accepted: this.listToArray(optionsArg.to),
|
|
247
|
+
rejected: [],
|
|
248
|
+
response: result.message,
|
|
220
249
|
};
|
|
221
250
|
}
|
|
222
251
|
|
|
252
|
+
public async registerInboundHandler(
|
|
253
|
+
handlerArg: TServiceMailInboundHandler,
|
|
254
|
+
addressArg?: string,
|
|
255
|
+
): Promise<plugins.servezoneInterfaces.requests.mail.IReq_RegisterServiceMailEndpoint['response']> {
|
|
256
|
+
this.inboundHandler = handlerArg;
|
|
257
|
+
this.ensureInboundTypedHandler();
|
|
258
|
+
const credentials = await this.getServiceMailTypedCredentials(addressArg);
|
|
259
|
+
const typedSocket = await this.getMailTypedSocket(credentials.typedUrl);
|
|
260
|
+
const result = await this.registerServiceMailEndpoint(typedSocket, credentials);
|
|
261
|
+
const registeredAddresses = result.addresses?.length ? result.addresses : [credentials.from];
|
|
262
|
+
for (const address of registeredAddresses) {
|
|
263
|
+
this.inboundEndpointRegistrations.add(address.trim().toLowerCase());
|
|
264
|
+
}
|
|
265
|
+
return result;
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
public async stop(): Promise<void> {
|
|
269
|
+
await this.stopMailTypedSocket();
|
|
270
|
+
}
|
|
271
|
+
|
|
223
272
|
public normalizeInboundMessage(payloadArg: unknown): IServiceMailInboundMessage {
|
|
224
273
|
const payload = this.asRecord(payloadArg);
|
|
225
274
|
const deliveryCandidate = this.asRecord(payload.delivery || payload.message || payload);
|
|
@@ -264,6 +313,22 @@ export class SzEmailConnector {
|
|
|
264
313
|
return async (payloadArg: unknown) => await this.handleInboundPayload(payloadArg, handlerArg);
|
|
265
314
|
}
|
|
266
315
|
|
|
316
|
+
private ensureInboundTypedHandler(): void {
|
|
317
|
+
if (this.inboundTypedHandlerRegistered) return;
|
|
318
|
+
this.inboundTypedHandlerRegistered = true;
|
|
319
|
+
this.platformClientRef.typedrouter.addTypedHandler(
|
|
320
|
+
new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.requests.mail.IReq_DeliverInboundMail>(
|
|
321
|
+
'deliverInboundMail',
|
|
322
|
+
async (dataArg) => {
|
|
323
|
+
if (!this.inboundHandler) {
|
|
324
|
+
return { accepted: false, message: 'No service mail inbound handler registered' };
|
|
325
|
+
}
|
|
326
|
+
return await this.handleInboundPayload(dataArg.delivery, this.inboundHandler);
|
|
327
|
+
},
|
|
328
|
+
),
|
|
329
|
+
);
|
|
330
|
+
}
|
|
331
|
+
|
|
267
332
|
public async sendNotification(optionsArg: { toArg: string; subject: string; text: string }) {}
|
|
268
333
|
|
|
269
334
|
public async sendActionLink(optionsArg: { toArg: string; subject: string; text: string }) {}
|
|
@@ -275,6 +340,9 @@ export class SzEmailConnector {
|
|
|
275
340
|
smtpTlsMode?: string;
|
|
276
341
|
smtpUsername?: string;
|
|
277
342
|
smtpPassword?: string;
|
|
343
|
+
typedUrl?: string;
|
|
344
|
+
apiCredentialId?: string;
|
|
345
|
+
apiCredentialSecret?: string;
|
|
278
346
|
}> {
|
|
279
347
|
const prefix = tokenArg ? `MAIL_${tokenArg}_` : '';
|
|
280
348
|
return {
|
|
@@ -284,6 +352,9 @@ export class SzEmailConnector {
|
|
|
284
352
|
smtpTlsMode: await this.readMailEnvVar(`${prefix}SMTP_TLS_MODE`),
|
|
285
353
|
smtpUsername: await this.readMailEnvVar(`${prefix}SMTP_USERNAME`),
|
|
286
354
|
smtpPassword: await this.readMailEnvVar(`${prefix}SMTP_PASSWORD`),
|
|
355
|
+
typedUrl: await this.readMailEnvVar(tokenArg ? `${prefix}TYPED_URL` : 'MAIL_TYPED_URL'),
|
|
356
|
+
apiCredentialId: await this.readMailEnvVar(tokenArg ? `${prefix}API_CREDENTIAL_ID` : 'MAIL_API_CREDENTIAL_ID'),
|
|
357
|
+
apiCredentialSecret: await this.readMailEnvVar(tokenArg ? `${prefix}API_CREDENTIAL_SECRET` : 'MAIL_API_CREDENTIAL_SECRET'),
|
|
287
358
|
};
|
|
288
359
|
}
|
|
289
360
|
|
|
@@ -310,10 +381,230 @@ export class SzEmailConnector {
|
|
|
310
381
|
smtpTlsMode?: string;
|
|
311
382
|
smtpUsername?: string;
|
|
312
383
|
smtpPassword?: string;
|
|
384
|
+
typedUrl?: string;
|
|
385
|
+
apiCredentialId?: string;
|
|
386
|
+
apiCredentialSecret?: string;
|
|
313
387
|
}): boolean {
|
|
314
388
|
return Boolean(envArg && Object.values(envArg).some(Boolean));
|
|
315
389
|
}
|
|
316
390
|
|
|
391
|
+
private async getServiceMailTypedCredentials(addressArg?: string): Promise<IServiceMailTypedCredentials> {
|
|
392
|
+
const requestedAddress = addressArg?.trim().toLowerCase();
|
|
393
|
+
const requestedToken = requestedAddress ? this.getMailEnvToken(requestedAddress) : undefined;
|
|
394
|
+
const scopedEnv = requestedToken ? await this.readMailEnv(requestedToken) : undefined;
|
|
395
|
+
const hasScopedConfig = scopedEnv && Object.values(scopedEnv).some(Boolean);
|
|
396
|
+
const env = hasScopedConfig ? scopedEnv! : await this.readMailEnv();
|
|
397
|
+
const from = env.from?.trim().toLowerCase();
|
|
398
|
+
if (!from) throw new Error('MAIL_FROM is required for typed service mail');
|
|
399
|
+
if (requestedAddress && from !== requestedAddress) {
|
|
400
|
+
throw new Error(`No typed service mail credentials are configured for ${requestedAddress}`);
|
|
401
|
+
}
|
|
402
|
+
if (!env.typedUrl) throw new Error('MAIL_TYPED_URL is required for typed service mail');
|
|
403
|
+
if (!env.apiCredentialId) throw new Error('MAIL_API_CREDENTIAL_ID is required for typed service mail');
|
|
404
|
+
if (!env.apiCredentialSecret) throw new Error('MAIL_API_CREDENTIAL_SECRET is required for typed service mail');
|
|
405
|
+
return {
|
|
406
|
+
from,
|
|
407
|
+
typedUrl: this.normalizeTypedSocketUrl(env.typedUrl),
|
|
408
|
+
credentialId: env.apiCredentialId,
|
|
409
|
+
credentialSecret: env.apiCredentialSecret,
|
|
410
|
+
addressToken: hasScopedConfig ? requestedToken : undefined,
|
|
411
|
+
};
|
|
412
|
+
}
|
|
413
|
+
|
|
414
|
+
private async getMailTypedSocket(urlArg: string): Promise<plugins.typedsocket.TypedSocket> {
|
|
415
|
+
const normalizedUrl = this.normalizeTypedSocketUrl(urlArg);
|
|
416
|
+
if (this.mailTypedSocket && this.mailTypedSocketUrl === normalizedUrl) {
|
|
417
|
+
return this.mailTypedSocket;
|
|
418
|
+
}
|
|
419
|
+
if (this.mailTypedSocketPromise && this.mailTypedSocketUrl === normalizedUrl) {
|
|
420
|
+
return await this.mailTypedSocketPromise;
|
|
421
|
+
}
|
|
422
|
+
if (this.mailTypedSocket || this.mailTypedSocketPromise) {
|
|
423
|
+
await this.stopMailTypedSocket();
|
|
424
|
+
}
|
|
425
|
+
this.mailTypedSocketUrl = normalizedUrl;
|
|
426
|
+
const abortController = new AbortController();
|
|
427
|
+
this.mailTypedSocketAbortController = abortController;
|
|
428
|
+
const socketPromise = plugins.typedsocket.TypedSocket.createClient(
|
|
429
|
+
this.platformClientRef.typedrouter,
|
|
430
|
+
normalizedUrl,
|
|
431
|
+
{ autoReconnect: true, abortSignal: abortController.signal },
|
|
432
|
+
);
|
|
433
|
+
this.mailTypedSocketPromise = socketPromise;
|
|
434
|
+
try {
|
|
435
|
+
const socket = await socketPromise;
|
|
436
|
+
if (this.mailTypedSocketPromise === socketPromise && this.mailTypedSocketUrl === normalizedUrl) {
|
|
437
|
+
this.mailTypedSocket = socket;
|
|
438
|
+
this.watchMailTypedSocketStatus(socket);
|
|
439
|
+
} else {
|
|
440
|
+
await socket.stop();
|
|
441
|
+
}
|
|
442
|
+
return socket;
|
|
443
|
+
} catch (error) {
|
|
444
|
+
if (this.mailTypedSocketPromise === socketPromise) {
|
|
445
|
+
this.mailTypedSocketPromise = undefined;
|
|
446
|
+
this.mailTypedSocketUrl = undefined;
|
|
447
|
+
this.mailTypedSocketAbortController = undefined;
|
|
448
|
+
}
|
|
449
|
+
throw error;
|
|
450
|
+
}
|
|
451
|
+
}
|
|
452
|
+
|
|
453
|
+
private async stopMailTypedSocket(): Promise<void> {
|
|
454
|
+
const socket = this.mailTypedSocket;
|
|
455
|
+
const socketPromise = this.mailTypedSocketPromise;
|
|
456
|
+
const abortController = this.mailTypedSocketAbortController;
|
|
457
|
+
const statusSubscription = this.mailTypedSocketStatusSubscription;
|
|
458
|
+
this.mailTypedSocket = undefined;
|
|
459
|
+
this.mailTypedSocketPromise = undefined;
|
|
460
|
+
this.mailTypedSocketUrl = undefined;
|
|
461
|
+
this.mailTypedSocketAbortController = undefined;
|
|
462
|
+
this.mailTypedSocketStatusSubscription = undefined;
|
|
463
|
+
statusSubscription?.unsubscribe();
|
|
464
|
+
abortController?.abort();
|
|
465
|
+
if (socket) {
|
|
466
|
+
await socket.stop();
|
|
467
|
+
return;
|
|
468
|
+
}
|
|
469
|
+
if (socketPromise) {
|
|
470
|
+
try {
|
|
471
|
+
const pendingSocket = await socketPromise;
|
|
472
|
+
await pendingSocket.stop();
|
|
473
|
+
} catch {
|
|
474
|
+
// The pending connection already failed; there is no socket to stop.
|
|
475
|
+
}
|
|
476
|
+
}
|
|
477
|
+
}
|
|
478
|
+
|
|
479
|
+
private watchMailTypedSocketStatus(socketArg: plugins.typedsocket.TypedSocket): void {
|
|
480
|
+
this.mailTypedSocketStatusSubscription?.unsubscribe();
|
|
481
|
+
this.mailTypedSocketStatusSubscription = socketArg.statusSubject.subscribe((statusArg) => {
|
|
482
|
+
void this.handleMailTypedSocketStatus(socketArg, statusArg);
|
|
483
|
+
});
|
|
484
|
+
}
|
|
485
|
+
|
|
486
|
+
private async handleMailTypedSocketStatus(
|
|
487
|
+
socketArg: plugins.typedsocket.TypedSocket,
|
|
488
|
+
statusArg: plugins.typedsocket.TConnectionStatus,
|
|
489
|
+
): Promise<void> {
|
|
490
|
+
if (statusArg !== 'connected' || this.mailTypedSocket !== socketArg) {
|
|
491
|
+
return;
|
|
492
|
+
}
|
|
493
|
+
try {
|
|
494
|
+
await this.replayInboundEndpointRegistrationsWithRetry(socketArg);
|
|
495
|
+
} catch (error) {
|
|
496
|
+
console.warn('Could not re-register service mail endpoint after reconnect:', (error as Error).message);
|
|
497
|
+
}
|
|
498
|
+
}
|
|
499
|
+
|
|
500
|
+
private async replayInboundEndpointRegistrationsWithRetry(
|
|
501
|
+
socketArg: plugins.typedsocket.TypedSocket,
|
|
502
|
+
): Promise<void> {
|
|
503
|
+
if (!this.inboundEndpointRegistrations.size) {
|
|
504
|
+
return;
|
|
505
|
+
}
|
|
506
|
+
if (this.inboundEndpointReplayPromise) {
|
|
507
|
+
return await this.inboundEndpointReplayPromise;
|
|
508
|
+
}
|
|
509
|
+
|
|
510
|
+
const replayPromise = this.replayInboundEndpointRegistrationsWithRetryInner(socketArg);
|
|
511
|
+
this.inboundEndpointReplayPromise = replayPromise;
|
|
512
|
+
try {
|
|
513
|
+
await replayPromise;
|
|
514
|
+
} finally {
|
|
515
|
+
if (this.inboundEndpointReplayPromise === replayPromise) {
|
|
516
|
+
this.inboundEndpointReplayPromise = undefined;
|
|
517
|
+
}
|
|
518
|
+
}
|
|
519
|
+
}
|
|
520
|
+
|
|
521
|
+
private async replayInboundEndpointRegistrationsWithRetryInner(
|
|
522
|
+
socketArg: plugins.typedsocket.TypedSocket,
|
|
523
|
+
): Promise<void> {
|
|
524
|
+
let lastError: unknown;
|
|
525
|
+
const delays = [0, ...this.inboundEndpointReplayRetryDelaysMs];
|
|
526
|
+
for (let attemptIndex = 0; attemptIndex < delays.length; attemptIndex++) {
|
|
527
|
+
if (this.mailTypedSocket !== socketArg) {
|
|
528
|
+
return;
|
|
529
|
+
}
|
|
530
|
+
if (attemptIndex > 0) {
|
|
531
|
+
const shouldContinue = await this.waitForInboundEndpointReplayRetry(socketArg, delays[attemptIndex]);
|
|
532
|
+
if (!shouldContinue) {
|
|
533
|
+
return;
|
|
534
|
+
}
|
|
535
|
+
}
|
|
536
|
+
try {
|
|
537
|
+
await this.replayInboundEndpointRegistrationsOnce(socketArg);
|
|
538
|
+
return;
|
|
539
|
+
} catch (error) {
|
|
540
|
+
lastError = error;
|
|
541
|
+
}
|
|
542
|
+
}
|
|
543
|
+
throw lastError instanceof Error
|
|
544
|
+
? lastError
|
|
545
|
+
: new Error('Could not re-register service mail endpoint after reconnect');
|
|
546
|
+
}
|
|
547
|
+
|
|
548
|
+
private async replayInboundEndpointRegistrationsOnce(
|
|
549
|
+
socketArg: plugins.typedsocket.TypedSocket,
|
|
550
|
+
): Promise<void> {
|
|
551
|
+
for (const address of this.inboundEndpointRegistrations.values()) {
|
|
552
|
+
if (this.mailTypedSocket !== socketArg) {
|
|
553
|
+
return;
|
|
554
|
+
}
|
|
555
|
+
const credentials = await this.getServiceMailTypedCredentials(address);
|
|
556
|
+
if (this.normalizeTypedSocketUrl(credentials.typedUrl) !== this.mailTypedSocketUrl) {
|
|
557
|
+
continue;
|
|
558
|
+
}
|
|
559
|
+
await this.registerServiceMailEndpoint(socketArg, credentials);
|
|
560
|
+
}
|
|
561
|
+
}
|
|
562
|
+
|
|
563
|
+
private async waitForInboundEndpointReplayRetry(
|
|
564
|
+
socketArg: plugins.typedsocket.TypedSocket,
|
|
565
|
+
delayMsArg: number,
|
|
566
|
+
): Promise<boolean> {
|
|
567
|
+
if (this.mailTypedSocket !== socketArg) {
|
|
568
|
+
return false;
|
|
569
|
+
}
|
|
570
|
+
const abortSignal = this.mailTypedSocketAbortController?.signal;
|
|
571
|
+
if (abortSignal?.aborted) {
|
|
572
|
+
return false;
|
|
573
|
+
}
|
|
574
|
+
return await new Promise<boolean>((resolve) => {
|
|
575
|
+
const resolveOnce = (resultArg: boolean) => {
|
|
576
|
+
clearTimeout(timeout);
|
|
577
|
+
abortSignal?.removeEventListener('abort', abortHandler);
|
|
578
|
+
resolve(resultArg && this.mailTypedSocket === socketArg);
|
|
579
|
+
};
|
|
580
|
+
const abortHandler = () => resolveOnce(false);
|
|
581
|
+
const timeout = setTimeout(() => resolveOnce(true), delayMsArg);
|
|
582
|
+
abortSignal?.addEventListener('abort', abortHandler, { once: true });
|
|
583
|
+
});
|
|
584
|
+
}
|
|
585
|
+
|
|
586
|
+
private async registerServiceMailEndpoint(
|
|
587
|
+
typedSocketArg: plugins.typedsocket.TypedSocket,
|
|
588
|
+
credentialsArg: IServiceMailTypedCredentials,
|
|
589
|
+
): Promise<plugins.servezoneInterfaces.requests.mail.IReq_RegisterServiceMailEndpoint['response']> {
|
|
590
|
+
const request = typedSocketArg.createTypedRequest<plugins.servezoneInterfaces.requests.mail.IReq_RegisterServiceMailEndpoint>('registerServiceMailEndpoint');
|
|
591
|
+
const result = await request.fire({
|
|
592
|
+
auth: {
|
|
593
|
+
credentialId: credentialsArg.credentialId,
|
|
594
|
+
credentialSecret: credentialsArg.credentialSecret,
|
|
595
|
+
},
|
|
596
|
+
addresses: [credentialsArg.from],
|
|
597
|
+
});
|
|
598
|
+
if (!result.success) {
|
|
599
|
+
throw new Error(result.message || 'Could not register service mail endpoint');
|
|
600
|
+
}
|
|
601
|
+
return result;
|
|
602
|
+
}
|
|
603
|
+
|
|
604
|
+
private normalizeTypedSocketUrl(urlArg: string): string {
|
|
605
|
+
return urlArg.trim().replace(/\/typedrequest\/?$/, '').replace(/\/+$/, '');
|
|
606
|
+
}
|
|
607
|
+
|
|
317
608
|
private normalizeTlsMode(valueArg: string): TServiceMailTlsMode {
|
|
318
609
|
if (valueArg === 'plain' || valueArg === 'starttls' || valueArg === 'implicitTls') return valueArg;
|
|
319
610
|
throw new Error(`Invalid SMTP_TLS_MODE: ${valueArg}`);
|
|
@@ -328,8 +619,8 @@ export class SzEmailConnector {
|
|
|
328
619
|
return Array.isArray(valueArg) ? valueArg : [valueArg];
|
|
329
620
|
}
|
|
330
621
|
|
|
331
|
-
private normalizeAttachmentContent(contentArg: string | Uint8Array): string
|
|
332
|
-
return
|
|
622
|
+
private normalizeAttachmentContent(contentArg: string | Uint8Array): string {
|
|
623
|
+
return Buffer.from(contentArg).toString('base64');
|
|
333
624
|
}
|
|
334
625
|
|
|
335
626
|
private asRecord(valueArg: unknown): Record<string, unknown> {
|