@serve.zone/platformclient 2.2.0 → 2.4.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 -0
- package/dist_ts/classes.platformclient.js +7 -2
- package/dist_ts/email/classes.emailconnector.d.ts +7 -0
- package/dist_ts/email/classes.emailconnector.js +14 -2
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/webpush/classes.webpushconnector.d.ts +47 -0
- package/dist_ts/webpush/classes.webpushconnector.js +260 -0
- package/package.json +2 -2
- package/readme.md +80 -4
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.platformclient.ts +6 -1
- package/ts/email/classes.emailconnector.ts +21 -1
- package/ts/index.ts +1 -0
- package/ts/webpush/classes.webpushconnector.ts +341 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/platformclient',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.4.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=
|
|
@@ -2,6 +2,7 @@ import { SzEmailConnector } from './email/classes.emailconnector.js';
|
|
|
2
2
|
import { SzSmsConnector } from './email/classes.smsconnector.js';
|
|
3
3
|
import { SzPushNotificationConnector } from './email/classes.pushnotificationconnector.js';
|
|
4
4
|
import { SzLetterConnector } from './email/classes.letterconnector.js';
|
|
5
|
+
import { SzWebPushConnector } from './webpush/classes.webpushconnector.js';
|
|
5
6
|
import * as plugins from './plugins.js';
|
|
6
7
|
export interface ISzPlatformClientOptions {
|
|
7
8
|
authorizationString?: string;
|
|
@@ -23,6 +24,7 @@ export declare class SzPlatformClient {
|
|
|
23
24
|
emailConnector: SzEmailConnector;
|
|
24
25
|
smsConnector: SzSmsConnector;
|
|
25
26
|
pushNotificationConnector: SzPushNotificationConnector;
|
|
27
|
+
webPushConnector: SzWebPushConnector;
|
|
26
28
|
letterConnector: SzLetterConnector;
|
|
27
29
|
constructor(authorizationStringArg?: string | ISzPlatformClientOptions);
|
|
28
30
|
init(authorizationStringArg?: string | ISzPlatformClientOptions): Promise<void>;
|
|
@@ -2,6 +2,7 @@ import { SzEmailConnector } from './email/classes.emailconnector.js';
|
|
|
2
2
|
import { SzSmsConnector } from './email/classes.smsconnector.js';
|
|
3
3
|
import { SzPushNotificationConnector } from './email/classes.pushnotificationconnector.js';
|
|
4
4
|
import { SzLetterConnector } from './email/classes.letterconnector.js';
|
|
5
|
+
import { SzWebPushConnector } from './webpush/classes.webpushconnector.js';
|
|
5
6
|
import * as plugins from './plugins.js';
|
|
6
7
|
export class SzPlatformClient {
|
|
7
8
|
constructor(authorizationStringArg) {
|
|
@@ -12,6 +13,7 @@ export class SzPlatformClient {
|
|
|
12
13
|
this.emailConnector = new SzEmailConnector(this);
|
|
13
14
|
this.smsConnector = new SzSmsConnector(this);
|
|
14
15
|
this.pushNotificationConnector = new SzPushNotificationConnector(this);
|
|
16
|
+
this.webPushConnector = new SzWebPushConnector(this);
|
|
15
17
|
this.letterConnector = new SzLetterConnector(this);
|
|
16
18
|
this.applyOptions(authorizationStringArg);
|
|
17
19
|
}
|
|
@@ -129,7 +131,10 @@ export class SzPlatformClient {
|
|
|
129
131
|
}
|
|
130
132
|
}
|
|
131
133
|
async stop() {
|
|
132
|
-
await
|
|
134
|
+
await Promise.all([
|
|
135
|
+
this.emailConnector.stop(),
|
|
136
|
+
this.webPushConnector.stop(),
|
|
137
|
+
]);
|
|
133
138
|
if (this.typedsocket) {
|
|
134
139
|
await this.typedsocket.stop();
|
|
135
140
|
}
|
|
@@ -181,4 +186,4 @@ export class SzPlatformClient {
|
|
|
181
186
|
return processEnv?.[envNameArg];
|
|
182
187
|
}
|
|
183
188
|
}
|
|
184
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
189
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.platformclient.js","sourceRoot":"","sources":["../ts/classes.platformclient.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,12 +43,19 @@ export interface IServiceMailSendOptions {
|
|
|
43
43
|
to: string | string[];
|
|
44
44
|
cc?: string | string[];
|
|
45
45
|
bcc?: string | string[];
|
|
46
|
+
/** One bare mailbox address rendered as the authoritative Reply-To header by dcrouter. */
|
|
47
|
+
replyTo?: string;
|
|
46
48
|
subject: string;
|
|
47
49
|
text?: string;
|
|
48
50
|
html?: string;
|
|
49
51
|
headers?: Record<string, string>;
|
|
50
52
|
attachments?: IServiceMailAttachment[];
|
|
51
53
|
}
|
|
54
|
+
export type TServiceMailSubmissionErrorCode = plugins.servezoneInterfaces.data.TMailSubmissionErrorCode;
|
|
55
|
+
export declare class ServiceMailSubmissionError extends Error {
|
|
56
|
+
readonly code: TServiceMailSubmissionErrorCode;
|
|
57
|
+
constructor(code: TServiceMailSubmissionErrorCode, messageArg: string);
|
|
58
|
+
}
|
|
52
59
|
export interface IServiceMailSendResult {
|
|
53
60
|
messageId?: string;
|
|
54
61
|
spoolItemId?: string;
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import { logger } from '../logger.js';
|
|
3
|
+
export class ServiceMailSubmissionError extends Error {
|
|
4
|
+
constructor(code, messageArg) {
|
|
5
|
+
super(messageArg);
|
|
6
|
+
this.code = code;
|
|
7
|
+
this.name = 'ServiceMailSubmissionError';
|
|
8
|
+
}
|
|
9
|
+
}
|
|
3
10
|
export class SzEmailConnector {
|
|
4
11
|
constructor(platformClientRefArg) {
|
|
5
12
|
this.inboundTypedHandlerRegistered = false;
|
|
@@ -133,6 +140,7 @@ export class SzEmailConnector {
|
|
|
133
140
|
to: this.listToArray(optionsArg.to),
|
|
134
141
|
cc: optionsArg.cc ? this.listToArray(optionsArg.cc) : undefined,
|
|
135
142
|
bcc: optionsArg.bcc ? this.listToArray(optionsArg.bcc) : undefined,
|
|
143
|
+
...(optionsArg.replyTo !== undefined ? { replyTo: optionsArg.replyTo } : {}),
|
|
136
144
|
subject: optionsArg.subject,
|
|
137
145
|
text: optionsArg.text,
|
|
138
146
|
html: optionsArg.html,
|
|
@@ -145,7 +153,11 @@ export class SzEmailConnector {
|
|
|
145
153
|
},
|
|
146
154
|
});
|
|
147
155
|
if (!result.accepted) {
|
|
148
|
-
|
|
156
|
+
const message = result.message || 'service mail was not accepted by dcrouter';
|
|
157
|
+
if (result.errorCode) {
|
|
158
|
+
throw new ServiceMailSubmissionError(result.errorCode, message);
|
|
159
|
+
}
|
|
160
|
+
throw new Error(message);
|
|
149
161
|
}
|
|
150
162
|
return {
|
|
151
163
|
messageId: result.spoolItemId,
|
|
@@ -510,4 +522,4 @@ export class SzEmailConnector {
|
|
|
510
522
|
}
|
|
511
523
|
}
|
|
512
524
|
}
|
|
513
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.emailconnector.js","sourceRoot":"","sources":["../../ts/email/classes.emailconnector.ts"],"names":[],"mappings":"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"}
|
|
525
|
+
//# 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,3 +1,4 @@
|
|
|
1
1
|
export * from './classes.platformclient.js';
|
|
2
2
|
export * from './email/classes.emailconnector.js';
|
|
3
|
-
|
|
3
|
+
export * from './webpush/classes.webpushconnector.js';
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsbUNBQW1DLENBQUM7QUFDbEQsY0FBYyx1Q0FBdUMsQ0FBQyJ9
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import type { SzPlatformClient } from '../classes.platformclient.js';
|
|
2
|
+
import * as plugins from '../plugins.js';
|
|
3
|
+
export interface IServiceWebPushCredentials {
|
|
4
|
+
typedUrl: string;
|
|
5
|
+
credentialId: string;
|
|
6
|
+
credentialSecret: string;
|
|
7
|
+
}
|
|
8
|
+
export interface IServiceWebPushConfigurationStatus {
|
|
9
|
+
configured: boolean;
|
|
10
|
+
typedUrl?: string;
|
|
11
|
+
credentialIdConfigured: boolean;
|
|
12
|
+
credentialSecretConfigured: boolean;
|
|
13
|
+
missing: string[];
|
|
14
|
+
}
|
|
15
|
+
export interface IServiceWebPushEnqueueOptions extends Omit<plugins.servezoneInterfaces.requests.webpush.IReq_EnqueueWebPush['request'], 'auth' | 'owner'> {
|
|
16
|
+
}
|
|
17
|
+
export type TServiceWebPushCancellationTarget = plugins.servezoneInterfaces.data.TWebPushCancellationTarget;
|
|
18
|
+
/**
|
|
19
|
+
* Credential-scoped Web Push delivery for a deployed service.
|
|
20
|
+
*
|
|
21
|
+
* This connector is separate from the legacy device-token push connector. It
|
|
22
|
+
* only accepts the service credential injected into the workload and never
|
|
23
|
+
* sends a caller-provided owner scope.
|
|
24
|
+
*/
|
|
25
|
+
export declare class SzWebPushConnector {
|
|
26
|
+
platformClientRef: SzPlatformClient;
|
|
27
|
+
private webPushTypedSocket?;
|
|
28
|
+
private webPushTypedSocketUrl?;
|
|
29
|
+
private webPushTypedSocketPromise?;
|
|
30
|
+
private webPushTypedSocketAbortController?;
|
|
31
|
+
constructor(platformClientRefArg: SzPlatformClient);
|
|
32
|
+
getConfigurationStatus(): Promise<IServiceWebPushConfigurationStatus>;
|
|
33
|
+
getWebPushServiceStatus(): Promise<plugins.servezoneInterfaces.data.IWebPushServiceStatus>;
|
|
34
|
+
getWebPushPublicKey(): Promise<string>;
|
|
35
|
+
enqueueWebPush(optionsArg: IServiceWebPushEnqueueOptions): Promise<plugins.servezoneInterfaces.requests.webpush.IReq_EnqueueWebPush['response']>;
|
|
36
|
+
cancelWebPush(targetArg: TServiceWebPushCancellationTarget): Promise<plugins.servezoneInterfaces.requests.webpush.IReq_CancelWebPush['response']>;
|
|
37
|
+
getWebPushDeliveryStatus(spoolItemIdArg: string): Promise<plugins.servezoneInterfaces.data.IWebPushDeliveryStatus | undefined>;
|
|
38
|
+
stop(): Promise<void>;
|
|
39
|
+
private getAuthenticatedClient;
|
|
40
|
+
private getCredentials;
|
|
41
|
+
private readWebPushEnv;
|
|
42
|
+
private normalizeCredentialBundle;
|
|
43
|
+
private hasCredentialBundleValue;
|
|
44
|
+
private normalizeConfigValue;
|
|
45
|
+
private getWebPushTypedSocket;
|
|
46
|
+
private normalizeTypedSocketUrl;
|
|
47
|
+
}
|
|
@@ -0,0 +1,260 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
/**
|
|
3
|
+
* Credential-scoped Web Push delivery for a deployed service.
|
|
4
|
+
*
|
|
5
|
+
* This connector is separate from the legacy device-token push connector. It
|
|
6
|
+
* only accepts the service credential injected into the workload and never
|
|
7
|
+
* sends a caller-provided owner scope.
|
|
8
|
+
*/
|
|
9
|
+
export class SzWebPushConnector {
|
|
10
|
+
constructor(platformClientRefArg) {
|
|
11
|
+
this.platformClientRef = platformClientRefArg;
|
|
12
|
+
}
|
|
13
|
+
async getConfigurationStatus() {
|
|
14
|
+
const env = await this.readWebPushEnv();
|
|
15
|
+
const missing = [];
|
|
16
|
+
if (!env.typedUrl)
|
|
17
|
+
missing.push('WEB_PUSH_TYPED_URL');
|
|
18
|
+
if (!env.credentialId)
|
|
19
|
+
missing.push('WEB_PUSH_API_CREDENTIAL_ID');
|
|
20
|
+
if (!env.credentialSecret)
|
|
21
|
+
missing.push('WEB_PUSH_API_CREDENTIAL_SECRET');
|
|
22
|
+
return {
|
|
23
|
+
configured: missing.length === 0,
|
|
24
|
+
typedUrl: env.typedUrl ? this.normalizeTypedSocketUrl(env.typedUrl) : undefined,
|
|
25
|
+
credentialIdConfigured: Boolean(env.credentialId),
|
|
26
|
+
credentialSecretConfigured: Boolean(env.credentialSecret),
|
|
27
|
+
missing,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
async getWebPushServiceStatus() {
|
|
31
|
+
if (this.platformClientRef.debugMode) {
|
|
32
|
+
return {
|
|
33
|
+
ready: false,
|
|
34
|
+
bindingId: 'debug',
|
|
35
|
+
bindingStatus: 'disabled',
|
|
36
|
+
retiringVapidKeys: [],
|
|
37
|
+
maxPayloadBytes: 0,
|
|
38
|
+
maxTtlSeconds: 0,
|
|
39
|
+
contentEncoding: 'aes128gcm',
|
|
40
|
+
message: 'Web Push is disabled in platformclient debug mode',
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
const { typedSocket, auth } = await this.getAuthenticatedClient();
|
|
44
|
+
const request = typedSocket.createTypedRequest('getWebPushServiceStatus');
|
|
45
|
+
return await request.fire({ auth });
|
|
46
|
+
}
|
|
47
|
+
async getWebPushPublicKey() {
|
|
48
|
+
const status = await this.getWebPushServiceStatus();
|
|
49
|
+
if (!status.ready || !status.activeVapidKey?.publicKey) {
|
|
50
|
+
throw new Error(status.message || 'Web Push is not ready');
|
|
51
|
+
}
|
|
52
|
+
return status.activeVapidKey.publicKey;
|
|
53
|
+
}
|
|
54
|
+
async enqueueWebPush(optionsArg) {
|
|
55
|
+
if (!optionsArg.idempotencyKey?.trim()) {
|
|
56
|
+
throw new Error('idempotencyKey is required');
|
|
57
|
+
}
|
|
58
|
+
if (!optionsArg.subscriptionId?.trim()) {
|
|
59
|
+
throw new Error('subscriptionId is required');
|
|
60
|
+
}
|
|
61
|
+
if (this.platformClientRef.debugMode) {
|
|
62
|
+
return {
|
|
63
|
+
accepted: true,
|
|
64
|
+
spoolItemId: 'debug',
|
|
65
|
+
message: 'Web Push accepted in platformclient debug mode',
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
const { typedSocket, auth } = await this.getAuthenticatedClient();
|
|
69
|
+
const request = typedSocket.createTypedRequest('enqueueWebPush');
|
|
70
|
+
return await request.fire({
|
|
71
|
+
auth,
|
|
72
|
+
idempotencyKey: optionsArg.idempotencyKey.trim(),
|
|
73
|
+
subscriptionId: optionsArg.subscriptionId.trim(),
|
|
74
|
+
subscription: optionsArg.subscription,
|
|
75
|
+
vapidKeyId: optionsArg.vapidKeyId,
|
|
76
|
+
payload: optionsArg.payload,
|
|
77
|
+
ttlSeconds: optionsArg.ttlSeconds,
|
|
78
|
+
urgency: optionsArg.urgency,
|
|
79
|
+
collapseKey: optionsArg.collapseKey,
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
async cancelWebPush(targetArg) {
|
|
83
|
+
if (targetArg.type === 'spoolItem' && !targetArg.spoolItemId?.trim()) {
|
|
84
|
+
throw new Error('spoolItemId is required');
|
|
85
|
+
}
|
|
86
|
+
if (targetArg.type === 'subscription' && !targetArg.subscriptionId?.trim()) {
|
|
87
|
+
throw new Error('subscriptionId is required');
|
|
88
|
+
}
|
|
89
|
+
const target = targetArg.type === 'spoolItem'
|
|
90
|
+
? { type: 'spoolItem', spoolItemId: targetArg.spoolItemId.trim() }
|
|
91
|
+
: { type: 'subscription', subscriptionId: targetArg.subscriptionId.trim() };
|
|
92
|
+
if (this.platformClientRef.debugMode) {
|
|
93
|
+
return {
|
|
94
|
+
success: true,
|
|
95
|
+
cancelledCount: 0,
|
|
96
|
+
alreadyTerminalCount: 0,
|
|
97
|
+
message: 'Web Push cancellation accepted in platformclient debug mode',
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
const { typedSocket, auth } = await this.getAuthenticatedClient();
|
|
101
|
+
const request = typedSocket.createTypedRequest('cancelWebPush');
|
|
102
|
+
return await request.fire({ auth, target });
|
|
103
|
+
}
|
|
104
|
+
async getWebPushDeliveryStatus(spoolItemIdArg) {
|
|
105
|
+
const spoolItemId = String(spoolItemIdArg || '').trim();
|
|
106
|
+
if (!spoolItemId) {
|
|
107
|
+
throw new Error('spoolItemId is required');
|
|
108
|
+
}
|
|
109
|
+
if (this.platformClientRef.debugMode) {
|
|
110
|
+
return {
|
|
111
|
+
spoolItemId,
|
|
112
|
+
state: 'queued',
|
|
113
|
+
attempts: 0,
|
|
114
|
+
acceptedAt: 0,
|
|
115
|
+
updatedAt: 0,
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
const { typedSocket, auth } = await this.getAuthenticatedClient();
|
|
119
|
+
const request = typedSocket.createTypedRequest('getWebPushDeliveryStatus');
|
|
120
|
+
const result = await request.fire({ auth, spoolItemId });
|
|
121
|
+
return result.delivery;
|
|
122
|
+
}
|
|
123
|
+
async stop() {
|
|
124
|
+
const socket = this.webPushTypedSocket;
|
|
125
|
+
const socketPromise = this.webPushTypedSocketPromise;
|
|
126
|
+
this.webPushTypedSocket = undefined;
|
|
127
|
+
this.webPushTypedSocketPromise = undefined;
|
|
128
|
+
this.webPushTypedSocketUrl = undefined;
|
|
129
|
+
this.webPushTypedSocketAbortController?.abort();
|
|
130
|
+
this.webPushTypedSocketAbortController = undefined;
|
|
131
|
+
if (socket) {
|
|
132
|
+
await socket.stop();
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
if (socketPromise) {
|
|
136
|
+
try {
|
|
137
|
+
const pendingSocket = await socketPromise;
|
|
138
|
+
await pendingSocket.stop();
|
|
139
|
+
}
|
|
140
|
+
catch {
|
|
141
|
+
// A failed or aborted connection leaves no socket to close.
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
async getAuthenticatedClient() {
|
|
146
|
+
const credentials = await this.getCredentials();
|
|
147
|
+
return {
|
|
148
|
+
typedSocket: await this.getWebPushTypedSocket(credentials.typedUrl),
|
|
149
|
+
auth: {
|
|
150
|
+
credentialId: credentials.credentialId,
|
|
151
|
+
credentialSecret: credentials.credentialSecret,
|
|
152
|
+
},
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
async getCredentials() {
|
|
156
|
+
const env = await this.readWebPushEnv();
|
|
157
|
+
if (!env.typedUrl)
|
|
158
|
+
throw new Error('WEB_PUSH_TYPED_URL is required for Web Push');
|
|
159
|
+
if (!env.credentialId) {
|
|
160
|
+
throw new Error('WEB_PUSH_API_CREDENTIAL_ID is required for Web Push');
|
|
161
|
+
}
|
|
162
|
+
if (!env.credentialSecret) {
|
|
163
|
+
throw new Error('WEB_PUSH_API_CREDENTIAL_SECRET is required for Web Push');
|
|
164
|
+
}
|
|
165
|
+
return {
|
|
166
|
+
typedUrl: env.typedUrl,
|
|
167
|
+
credentialId: env.credentialId,
|
|
168
|
+
credentialSecret: env.credentialSecret,
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
async readWebPushEnv() {
|
|
172
|
+
const directEnv = this.normalizeCredentialBundle({
|
|
173
|
+
typedUrl: await this.platformClientRef.getConfiguredEnvVar('WEB_PUSH_TYPED_URL'),
|
|
174
|
+
credentialId: await this.platformClientRef.getConfiguredEnvVar('WEB_PUSH_API_CREDENTIAL_ID'),
|
|
175
|
+
credentialSecret: await this.platformClientRef.getConfiguredEnvVar('WEB_PUSH_API_CREDENTIAL_SECRET'),
|
|
176
|
+
});
|
|
177
|
+
if (this.hasCredentialBundleValue(directEnv)) {
|
|
178
|
+
return directEnv;
|
|
179
|
+
}
|
|
180
|
+
const bindingCredentialBundles = [];
|
|
181
|
+
for (const binding of this.platformClientRef.platformBindings || []) {
|
|
182
|
+
if (binding.capability !== 'pushnotification'
|
|
183
|
+
|| binding.desiredState !== 'enabled'
|
|
184
|
+
|| binding.status !== 'ready') {
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
for (const credential of binding.credentials || []) {
|
|
188
|
+
const credentialBundle = this.normalizeCredentialBundle({
|
|
189
|
+
typedUrl: credential.env?.WEB_PUSH_TYPED_URL,
|
|
190
|
+
credentialId: credential.env?.WEB_PUSH_API_CREDENTIAL_ID,
|
|
191
|
+
credentialSecret: credential.env?.WEB_PUSH_API_CREDENTIAL_SECRET,
|
|
192
|
+
});
|
|
193
|
+
if (this.hasCredentialBundleValue(credentialBundle)) {
|
|
194
|
+
bindingCredentialBundles.push(credentialBundle);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
if (bindingCredentialBundles.length > 1) {
|
|
199
|
+
throw new Error('Multiple ready Web Push credential bundles are configured; exactly one is required');
|
|
200
|
+
}
|
|
201
|
+
return bindingCredentialBundles[0] || {};
|
|
202
|
+
}
|
|
203
|
+
normalizeCredentialBundle(bundleArg) {
|
|
204
|
+
const typedUrl = this.normalizeConfigValue(bundleArg.typedUrl);
|
|
205
|
+
return {
|
|
206
|
+
typedUrl: typedUrl ? this.normalizeTypedSocketUrl(typedUrl) || undefined : undefined,
|
|
207
|
+
credentialId: this.normalizeConfigValue(bundleArg.credentialId),
|
|
208
|
+
credentialSecret: this.normalizeConfigValue(bundleArg.credentialSecret),
|
|
209
|
+
};
|
|
210
|
+
}
|
|
211
|
+
hasCredentialBundleValue(bundleArg) {
|
|
212
|
+
return Boolean(bundleArg.typedUrl
|
|
213
|
+
|| bundleArg.credentialId
|
|
214
|
+
|| bundleArg.credentialSecret);
|
|
215
|
+
}
|
|
216
|
+
normalizeConfigValue(valueArg) {
|
|
217
|
+
const value = valueArg?.trim();
|
|
218
|
+
return value || undefined;
|
|
219
|
+
}
|
|
220
|
+
async getWebPushTypedSocket(urlArg) {
|
|
221
|
+
const normalizedUrl = this.normalizeTypedSocketUrl(urlArg);
|
|
222
|
+
if (this.webPushTypedSocket && this.webPushTypedSocketUrl === normalizedUrl) {
|
|
223
|
+
return this.webPushTypedSocket;
|
|
224
|
+
}
|
|
225
|
+
if (this.webPushTypedSocketPromise && this.webPushTypedSocketUrl === normalizedUrl) {
|
|
226
|
+
return await this.webPushTypedSocketPromise;
|
|
227
|
+
}
|
|
228
|
+
if (this.webPushTypedSocket || this.webPushTypedSocketPromise) {
|
|
229
|
+
await this.stop();
|
|
230
|
+
}
|
|
231
|
+
this.webPushTypedSocketUrl = normalizedUrl;
|
|
232
|
+
const abortController = new AbortController();
|
|
233
|
+
this.webPushTypedSocketAbortController = abortController;
|
|
234
|
+
const socketPromise = plugins.typedsocket.TypedSocket.createClient(this.platformClientRef.typedrouter, normalizedUrl, { autoReconnect: true, abortSignal: abortController.signal });
|
|
235
|
+
this.webPushTypedSocketPromise = socketPromise;
|
|
236
|
+
try {
|
|
237
|
+
const socket = await socketPromise;
|
|
238
|
+
if (this.webPushTypedSocketPromise === socketPromise
|
|
239
|
+
&& this.webPushTypedSocketUrl === normalizedUrl) {
|
|
240
|
+
this.webPushTypedSocket = socket;
|
|
241
|
+
}
|
|
242
|
+
else {
|
|
243
|
+
await socket.stop();
|
|
244
|
+
}
|
|
245
|
+
return socket;
|
|
246
|
+
}
|
|
247
|
+
catch (error) {
|
|
248
|
+
if (this.webPushTypedSocketPromise === socketPromise) {
|
|
249
|
+
this.webPushTypedSocketPromise = undefined;
|
|
250
|
+
this.webPushTypedSocketUrl = undefined;
|
|
251
|
+
this.webPushTypedSocketAbortController = undefined;
|
|
252
|
+
}
|
|
253
|
+
throw error;
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
normalizeTypedSocketUrl(urlArg) {
|
|
257
|
+
return urlArg.trim().replace(/\/typedrequest\/?$/, '').replace(/\/+$/, '');
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.webpushconnector.js","sourceRoot":"","sources":["../../ts/webpush/classes.webpushconnector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/platformclient",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.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",
|
|
@@ -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": "^19.7.0"
|
|
26
26
|
},
|
|
27
27
|
"repository": {
|
|
28
28
|
"type": "git",
|
package/readme.md
CHANGED
|
@@ -41,6 +41,7 @@ await platformClient.emailConnector.sendEmail({
|
|
|
41
41
|
| `emailConnector` | `getServiceMailStatus()`, `getServiceMailCredentials()`, `sendMail()`, `sendText()`, `sendHtml()`, `getMailDeliveryStatus()`, `registerInboundHandler()`, `normalizeInboundMessage()`, `handleInboundPayload()`, `createInboundHandler()`, `sendEmail()` | `email` |
|
|
42
42
|
| `smsConnector` | `sendSms()`, `sendSmsVerifcation()` | `sms` |
|
|
43
43
|
| `pushNotificationConnector` | `sendPushNotification()` | `pushnotification` |
|
|
44
|
+
| `webPushConnector` | `getConfigurationStatus()`, `getWebPushServiceStatus()`, `getWebPushPublicKey()`, `enqueueWebPush()`, `cancelWebPush()`, `getWebPushDeliveryStatus()` | `pushnotification` |
|
|
44
45
|
| `letterConnector` | `sendLetter()` | `letter` |
|
|
45
46
|
|
|
46
47
|
The request and response payloads come from `@serve.zone/interfaces`, so TypeScript stays aligned with the serve.zone platform contracts.
|
|
@@ -59,6 +60,8 @@ Binding environment variables must contain JSON encoded `IPlatformBinding` objec
|
|
|
59
60
|
|
|
60
61
|
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
|
|
|
63
|
+
Managed Web Push uses a separate, credential-scoped TypedSocket connection configured with `WEB_PUSH_TYPED_URL`, `WEB_PUSH_API_CREDENTIAL_ID`, and `WEB_PUSH_API_CREDENTIAL_SECRET`. These values form one atomic bundle: if any direct variable is present, all three direct variables are required; otherwise exactly one credential object from a ready `pushnotification` binding must provide the bundle. Partial or ambiguous bundles fail closed and are never combined. `webPushConnector` never accepts or sends caller-provided authentication or resource-owner fields; dcrouter derives the service scope from the injected credential.
|
|
64
|
+
|
|
62
65
|
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
66
|
|
|
64
67
|
```typescript
|
|
@@ -106,7 +109,7 @@ The current SMS verification method is spelled `sendSmsVerifcation()` in code. U
|
|
|
106
109
|
|
|
107
110
|
## Lifecycle
|
|
108
111
|
|
|
109
|
-
`SzPlatformClient` keeps TypedSocket connections open for platform requests
|
|
112
|
+
`SzPlatformClient` keeps TypedSocket connections open for platform requests, typed service-mail delivery, and managed Web Push delivery. Call `stop()` when a short-lived process, worker, or test is done with the client.
|
|
110
113
|
|
|
111
114
|
```typescript
|
|
112
115
|
const client = new SzPlatformClient({
|
|
@@ -137,6 +140,7 @@ const status = await client.emailConnector.getServiceMailStatus();
|
|
|
137
140
|
if (status.ready) {
|
|
138
141
|
const sendResult = await client.emailConnector.sendText({
|
|
139
142
|
to: 'user@example.com',
|
|
143
|
+
replyTo: 'customer@example.com',
|
|
140
144
|
subject: 'Service mail ready',
|
|
141
145
|
text: 'This message was sent through the managed service mail identity.',
|
|
142
146
|
});
|
|
@@ -148,7 +152,7 @@ if (status.ready) {
|
|
|
148
152
|
}
|
|
149
153
|
```
|
|
150
154
|
|
|
151
|
-
`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. Send helpers return `spoolItemId`, which can be passed to `getMailDeliveryStatus()` to inspect accepted, queued, deferred, delivered, or failed delivery state.
|
|
155
|
+
`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. Send helpers return `spoolItemId`, which can be passed to `getMailDeliveryStatus()` to inspect accepted, queued, deferred, delivered, or failed delivery state. Set `replyTo` to one bare mailbox address when replies should go somewhere other than the managed sender. Dcrouter validates that field and renders the authoritative `Reply-To` header; do not supply `Reply-To` through the free-form `headers` object.
|
|
152
156
|
|
|
153
157
|
Specific sender address:
|
|
154
158
|
|
|
@@ -202,7 +206,57 @@ const status = await client.smsConnector.sendSms({
|
|
|
202
206
|
});
|
|
203
207
|
```
|
|
204
208
|
|
|
205
|
-
Push
|
|
209
|
+
Managed Web Push:
|
|
210
|
+
|
|
211
|
+
```typescript
|
|
212
|
+
const serviceStatus = await client.webPushConnector.getWebPushServiceStatus();
|
|
213
|
+
if (!serviceStatus.ready || !serviceStatus.activeVapidKey) {
|
|
214
|
+
throw new Error(serviceStatus.message || 'Web Push is not ready');
|
|
215
|
+
}
|
|
216
|
+
const activeVapidKey = serviceStatus.activeVapidKey;
|
|
217
|
+
const applicationServerKey = activeVapidKey.publicKey;
|
|
218
|
+
|
|
219
|
+
const browserSubscription = await serviceWorkerRegistration.pushManager.subscribe({
|
|
220
|
+
userVisibleOnly: true,
|
|
221
|
+
applicationServerKey,
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
const enqueueResult = await client.webPushConnector.enqueueWebPush({
|
|
225
|
+
idempotencyKey: 'notification-delivery-42',
|
|
226
|
+
subscriptionId: 'opaque-application-subscription-id',
|
|
227
|
+
subscription: browserSubscription.toJSON(),
|
|
228
|
+
vapidKeyId: activeVapidKey.id,
|
|
229
|
+
payload: {
|
|
230
|
+
schemaVersion: 1,
|
|
231
|
+
event: 'notificationAvailable',
|
|
232
|
+
eventId: 'notification-event-42',
|
|
233
|
+
route: '/notifications',
|
|
234
|
+
},
|
|
235
|
+
ttlSeconds: 300,
|
|
236
|
+
urgency: 'normal',
|
|
237
|
+
collapseKey: 'notification-inbox',
|
|
238
|
+
});
|
|
239
|
+
|
|
240
|
+
if (enqueueResult.spoolItemId) {
|
|
241
|
+
const delivery = await client.webPushConnector.getWebPushDeliveryStatus(
|
|
242
|
+
enqueueResult.spoolItemId,
|
|
243
|
+
);
|
|
244
|
+
console.log(delivery?.state);
|
|
245
|
+
}
|
|
246
|
+
```
|
|
247
|
+
|
|
248
|
+
The active VAPID key ID and public key come from one service-status snapshot, so a rotation cannot mismatch the subscription key and enqueue key ID. Store browser subscriptions as sensitive application data and only send the privacy-minimal `notificationAvailable` payload shown above. `enqueueWebPush().accepted` means dcrouter accepted the item into its delivery spool; it does not prove browser receipt or display. A terminal `pushServiceAccepted` state means the remote push service accepted the encrypted request.
|
|
249
|
+
|
|
250
|
+
Pending delivery can be cancelled by spool item or by opaque application subscription ID:
|
|
251
|
+
|
|
252
|
+
```typescript
|
|
253
|
+
await client.webPushConnector.cancelWebPush({
|
|
254
|
+
type: 'subscription',
|
|
255
|
+
subscriptionId: 'opaque-application-subscription-id',
|
|
256
|
+
});
|
|
257
|
+
```
|
|
258
|
+
|
|
259
|
+
Legacy device-token push:
|
|
206
260
|
|
|
207
261
|
```typescript
|
|
208
262
|
const status = await client.pushNotificationConnector.sendPushNotification({
|
|
@@ -223,7 +277,29 @@ await client.letterConnector.sendLetter({
|
|
|
223
277
|
});
|
|
224
278
|
```
|
|
225
279
|
|
|
226
|
-
Service-mail
|
|
280
|
+
Service-mail and managed Web Push helper types are exported from `@serve.zone/platformclient`. `IServiceMailSendResult.spoolItemId` identifies the dcrouter delivery spool item for follow-up status queries through `getMailDeliveryStatus(spoolItemId, address?)`. `IServiceWebPushEnqueueOptions` and `TServiceWebPushCancellationTarget` mirror the credential-scoped Web Push delivery contract without exposing auth or owner fields. The legacy platform-service request fields remain under `platform.email`, `platform.sms`, `platform.pushnotification`, and `platform.letter`.
|
|
281
|
+
|
|
282
|
+
Dcrouter rejections with a stable submission code are exposed as `ServiceMailSubmissionError`. Uncoded rejections remain plain `Error` instances:
|
|
283
|
+
|
|
284
|
+
```typescript
|
|
285
|
+
import { ServiceMailSubmissionError } from '@serve.zone/platformclient';
|
|
286
|
+
|
|
287
|
+
try {
|
|
288
|
+
await client.emailConnector.sendText({
|
|
289
|
+
to: 'user@example.com',
|
|
290
|
+
replyTo: 'customer@example.com',
|
|
291
|
+
subject: 'Service mail',
|
|
292
|
+
text: 'Hello',
|
|
293
|
+
});
|
|
294
|
+
} catch (error) {
|
|
295
|
+
if (error instanceof ServiceMailSubmissionError) {
|
|
296
|
+
console.error(error.code);
|
|
297
|
+
}
|
|
298
|
+
throw error;
|
|
299
|
+
}
|
|
300
|
+
```
|
|
301
|
+
|
|
302
|
+
The exported `TServiceMailSubmissionErrorCode` type contains the supported dcrouter rejection codes.
|
|
227
303
|
|
|
228
304
|
## Platform Bindings
|
|
229
305
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { SzEmailConnector } from './email/classes.emailconnector.js';
|
|
|
2
2
|
import { SzSmsConnector } from './email/classes.smsconnector.js';
|
|
3
3
|
import { SzPushNotificationConnector } from './email/classes.pushnotificationconnector.js';
|
|
4
4
|
import { SzLetterConnector } from './email/classes.letterconnector.js';
|
|
5
|
+
import { SzWebPushConnector } from './webpush/classes.webpushconnector.js';
|
|
5
6
|
import * as plugins from './plugins.js';
|
|
6
7
|
|
|
7
8
|
export interface ISzPlatformClientOptions {
|
|
@@ -26,6 +27,7 @@ export class SzPlatformClient {
|
|
|
26
27
|
public emailConnector = new SzEmailConnector(this);
|
|
27
28
|
public smsConnector = new SzSmsConnector(this);
|
|
28
29
|
public pushNotificationConnector = new SzPushNotificationConnector(this);
|
|
30
|
+
public webPushConnector = new SzWebPushConnector(this);
|
|
29
31
|
public letterConnector = new SzLetterConnector(this);
|
|
30
32
|
|
|
31
33
|
constructor(authorizationStringArg?: string | ISzPlatformClientOptions) {
|
|
@@ -175,7 +177,10 @@ export class SzPlatformClient {
|
|
|
175
177
|
}
|
|
176
178
|
|
|
177
179
|
public async stop(): Promise<void> {
|
|
178
|
-
await
|
|
180
|
+
await Promise.all([
|
|
181
|
+
this.emailConnector.stop(),
|
|
182
|
+
this.webPushConnector.stop(),
|
|
183
|
+
]);
|
|
179
184
|
if (this.typedsocket) {
|
|
180
185
|
await this.typedsocket.stop();
|
|
181
186
|
}
|
|
@@ -51,6 +51,8 @@ export interface IServiceMailSendOptions {
|
|
|
51
51
|
to: string | string[];
|
|
52
52
|
cc?: string | string[];
|
|
53
53
|
bcc?: string | string[];
|
|
54
|
+
/** One bare mailbox address rendered as the authoritative Reply-To header by dcrouter. */
|
|
55
|
+
replyTo?: string;
|
|
54
56
|
subject: string;
|
|
55
57
|
text?: string;
|
|
56
58
|
html?: string;
|
|
@@ -58,6 +60,19 @@ export interface IServiceMailSendOptions {
|
|
|
58
60
|
attachments?: IServiceMailAttachment[];
|
|
59
61
|
}
|
|
60
62
|
|
|
63
|
+
export type TServiceMailSubmissionErrorCode =
|
|
64
|
+
plugins.servezoneInterfaces.data.TMailSubmissionErrorCode;
|
|
65
|
+
|
|
66
|
+
export class ServiceMailSubmissionError extends Error {
|
|
67
|
+
constructor(
|
|
68
|
+
public readonly code: TServiceMailSubmissionErrorCode,
|
|
69
|
+
messageArg: string,
|
|
70
|
+
) {
|
|
71
|
+
super(messageArg);
|
|
72
|
+
this.name = 'ServiceMailSubmissionError';
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
61
76
|
export interface IServiceMailSendResult {
|
|
62
77
|
messageId?: string;
|
|
63
78
|
spoolItemId?: string;
|
|
@@ -231,6 +246,7 @@ export class SzEmailConnector {
|
|
|
231
246
|
to: this.listToArray(optionsArg.to),
|
|
232
247
|
cc: optionsArg.cc ? this.listToArray(optionsArg.cc) : undefined,
|
|
233
248
|
bcc: optionsArg.bcc ? this.listToArray(optionsArg.bcc) : undefined,
|
|
249
|
+
...(optionsArg.replyTo !== undefined ? { replyTo: optionsArg.replyTo } : {}),
|
|
234
250
|
subject: optionsArg.subject,
|
|
235
251
|
text: optionsArg.text,
|
|
236
252
|
html: optionsArg.html,
|
|
@@ -243,7 +259,11 @@ export class SzEmailConnector {
|
|
|
243
259
|
},
|
|
244
260
|
});
|
|
245
261
|
if (!result.accepted) {
|
|
246
|
-
|
|
262
|
+
const message = result.message || 'service mail was not accepted by dcrouter';
|
|
263
|
+
if (result.errorCode) {
|
|
264
|
+
throw new ServiceMailSubmissionError(result.errorCode, message);
|
|
265
|
+
}
|
|
266
|
+
throw new Error(message);
|
|
247
267
|
}
|
|
248
268
|
return {
|
|
249
269
|
messageId: result.spoolItemId,
|
package/ts/index.ts
CHANGED
|
@@ -0,0 +1,341 @@
|
|
|
1
|
+
import type { SzPlatformClient } from '../classes.platformclient.js';
|
|
2
|
+
import * as plugins from '../plugins.js';
|
|
3
|
+
|
|
4
|
+
export interface IServiceWebPushCredentials {
|
|
5
|
+
typedUrl: string;
|
|
6
|
+
credentialId: string;
|
|
7
|
+
credentialSecret: string;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export interface IServiceWebPushConfigurationStatus {
|
|
11
|
+
configured: boolean;
|
|
12
|
+
typedUrl?: string;
|
|
13
|
+
credentialIdConfigured: boolean;
|
|
14
|
+
credentialSecretConfigured: boolean;
|
|
15
|
+
missing: string[];
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export interface IServiceWebPushEnqueueOptions extends Omit<
|
|
19
|
+
plugins.servezoneInterfaces.requests.webpush.IReq_EnqueueWebPush['request'],
|
|
20
|
+
'auth' | 'owner'
|
|
21
|
+
> {}
|
|
22
|
+
|
|
23
|
+
export type TServiceWebPushCancellationTarget =
|
|
24
|
+
plugins.servezoneInterfaces.data.TWebPushCancellationTarget;
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Credential-scoped Web Push delivery for a deployed service.
|
|
28
|
+
*
|
|
29
|
+
* This connector is separate from the legacy device-token push connector. It
|
|
30
|
+
* only accepts the service credential injected into the workload and never
|
|
31
|
+
* sends a caller-provided owner scope.
|
|
32
|
+
*/
|
|
33
|
+
export class SzWebPushConnector {
|
|
34
|
+
public platformClientRef: SzPlatformClient;
|
|
35
|
+
private webPushTypedSocket?: plugins.typedsocket.TypedSocket;
|
|
36
|
+
private webPushTypedSocketUrl?: string;
|
|
37
|
+
private webPushTypedSocketPromise?: Promise<plugins.typedsocket.TypedSocket>;
|
|
38
|
+
private webPushTypedSocketAbortController?: AbortController;
|
|
39
|
+
|
|
40
|
+
constructor(platformClientRefArg: SzPlatformClient) {
|
|
41
|
+
this.platformClientRef = platformClientRefArg;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
public async getConfigurationStatus(): Promise<IServiceWebPushConfigurationStatus> {
|
|
45
|
+
const env = await this.readWebPushEnv();
|
|
46
|
+
const missing: string[] = [];
|
|
47
|
+
if (!env.typedUrl) missing.push('WEB_PUSH_TYPED_URL');
|
|
48
|
+
if (!env.credentialId) missing.push('WEB_PUSH_API_CREDENTIAL_ID');
|
|
49
|
+
if (!env.credentialSecret) missing.push('WEB_PUSH_API_CREDENTIAL_SECRET');
|
|
50
|
+
return {
|
|
51
|
+
configured: missing.length === 0,
|
|
52
|
+
typedUrl: env.typedUrl ? this.normalizeTypedSocketUrl(env.typedUrl) : undefined,
|
|
53
|
+
credentialIdConfigured: Boolean(env.credentialId),
|
|
54
|
+
credentialSecretConfigured: Boolean(env.credentialSecret),
|
|
55
|
+
missing,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
public async getWebPushServiceStatus():
|
|
60
|
+
Promise<plugins.servezoneInterfaces.data.IWebPushServiceStatus> {
|
|
61
|
+
if (this.platformClientRef.debugMode) {
|
|
62
|
+
return {
|
|
63
|
+
ready: false,
|
|
64
|
+
bindingId: 'debug',
|
|
65
|
+
bindingStatus: 'disabled',
|
|
66
|
+
retiringVapidKeys: [],
|
|
67
|
+
maxPayloadBytes: 0,
|
|
68
|
+
maxTtlSeconds: 0,
|
|
69
|
+
contentEncoding: 'aes128gcm',
|
|
70
|
+
message: 'Web Push is disabled in platformclient debug mode',
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
const { typedSocket, auth } = await this.getAuthenticatedClient();
|
|
74
|
+
const request = typedSocket.createTypedRequest<
|
|
75
|
+
plugins.servezoneInterfaces.requests.webpush.IReq_GetWebPushServiceStatus
|
|
76
|
+
>('getWebPushServiceStatus');
|
|
77
|
+
return await request.fire({ auth });
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
public async getWebPushPublicKey(): Promise<string> {
|
|
81
|
+
const status = await this.getWebPushServiceStatus();
|
|
82
|
+
if (!status.ready || !status.activeVapidKey?.publicKey) {
|
|
83
|
+
throw new Error(status.message || 'Web Push is not ready');
|
|
84
|
+
}
|
|
85
|
+
return status.activeVapidKey.publicKey;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
public async enqueueWebPush(
|
|
89
|
+
optionsArg: IServiceWebPushEnqueueOptions,
|
|
90
|
+
): Promise<plugins.servezoneInterfaces.requests.webpush.IReq_EnqueueWebPush['response']> {
|
|
91
|
+
if (!optionsArg.idempotencyKey?.trim()) {
|
|
92
|
+
throw new Error('idempotencyKey is required');
|
|
93
|
+
}
|
|
94
|
+
if (!optionsArg.subscriptionId?.trim()) {
|
|
95
|
+
throw new Error('subscriptionId is required');
|
|
96
|
+
}
|
|
97
|
+
if (this.platformClientRef.debugMode) {
|
|
98
|
+
return {
|
|
99
|
+
accepted: true,
|
|
100
|
+
spoolItemId: 'debug',
|
|
101
|
+
message: 'Web Push accepted in platformclient debug mode',
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
const { typedSocket, auth } = await this.getAuthenticatedClient();
|
|
105
|
+
const request = typedSocket.createTypedRequest<
|
|
106
|
+
plugins.servezoneInterfaces.requests.webpush.IReq_EnqueueWebPush
|
|
107
|
+
>('enqueueWebPush');
|
|
108
|
+
return await request.fire({
|
|
109
|
+
auth,
|
|
110
|
+
idempotencyKey: optionsArg.idempotencyKey.trim(),
|
|
111
|
+
subscriptionId: optionsArg.subscriptionId.trim(),
|
|
112
|
+
subscription: optionsArg.subscription,
|
|
113
|
+
vapidKeyId: optionsArg.vapidKeyId,
|
|
114
|
+
payload: optionsArg.payload,
|
|
115
|
+
ttlSeconds: optionsArg.ttlSeconds,
|
|
116
|
+
urgency: optionsArg.urgency,
|
|
117
|
+
collapseKey: optionsArg.collapseKey,
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
public async cancelWebPush(
|
|
122
|
+
targetArg: TServiceWebPushCancellationTarget,
|
|
123
|
+
): Promise<plugins.servezoneInterfaces.requests.webpush.IReq_CancelWebPush['response']> {
|
|
124
|
+
if (targetArg.type === 'spoolItem' && !targetArg.spoolItemId?.trim()) {
|
|
125
|
+
throw new Error('spoolItemId is required');
|
|
126
|
+
}
|
|
127
|
+
if (targetArg.type === 'subscription' && !targetArg.subscriptionId?.trim()) {
|
|
128
|
+
throw new Error('subscriptionId is required');
|
|
129
|
+
}
|
|
130
|
+
const target = targetArg.type === 'spoolItem'
|
|
131
|
+
? { type: 'spoolItem' as const, spoolItemId: targetArg.spoolItemId.trim() }
|
|
132
|
+
: { type: 'subscription' as const, subscriptionId: targetArg.subscriptionId.trim() };
|
|
133
|
+
if (this.platformClientRef.debugMode) {
|
|
134
|
+
return {
|
|
135
|
+
success: true,
|
|
136
|
+
cancelledCount: 0,
|
|
137
|
+
alreadyTerminalCount: 0,
|
|
138
|
+
message: 'Web Push cancellation accepted in platformclient debug mode',
|
|
139
|
+
};
|
|
140
|
+
}
|
|
141
|
+
const { typedSocket, auth } = await this.getAuthenticatedClient();
|
|
142
|
+
const request = typedSocket.createTypedRequest<
|
|
143
|
+
plugins.servezoneInterfaces.requests.webpush.IReq_CancelWebPush
|
|
144
|
+
>('cancelWebPush');
|
|
145
|
+
return await request.fire({ auth, target });
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
public async getWebPushDeliveryStatus(
|
|
149
|
+
spoolItemIdArg: string,
|
|
150
|
+
): Promise<plugins.servezoneInterfaces.data.IWebPushDeliveryStatus | undefined> {
|
|
151
|
+
const spoolItemId = String(spoolItemIdArg || '').trim();
|
|
152
|
+
if (!spoolItemId) {
|
|
153
|
+
throw new Error('spoolItemId is required');
|
|
154
|
+
}
|
|
155
|
+
if (this.platformClientRef.debugMode) {
|
|
156
|
+
return {
|
|
157
|
+
spoolItemId,
|
|
158
|
+
state: 'queued',
|
|
159
|
+
attempts: 0,
|
|
160
|
+
acceptedAt: 0,
|
|
161
|
+
updatedAt: 0,
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
const { typedSocket, auth } = await this.getAuthenticatedClient();
|
|
165
|
+
const request = typedSocket.createTypedRequest<
|
|
166
|
+
plugins.servezoneInterfaces.requests.webpush.IReq_GetWebPushDeliveryStatus
|
|
167
|
+
>('getWebPushDeliveryStatus');
|
|
168
|
+
const result = await request.fire({ auth, spoolItemId });
|
|
169
|
+
return result.delivery;
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
public async stop(): Promise<void> {
|
|
173
|
+
const socket = this.webPushTypedSocket;
|
|
174
|
+
const socketPromise = this.webPushTypedSocketPromise;
|
|
175
|
+
this.webPushTypedSocket = undefined;
|
|
176
|
+
this.webPushTypedSocketPromise = undefined;
|
|
177
|
+
this.webPushTypedSocketUrl = undefined;
|
|
178
|
+
this.webPushTypedSocketAbortController?.abort();
|
|
179
|
+
this.webPushTypedSocketAbortController = undefined;
|
|
180
|
+
if (socket) {
|
|
181
|
+
await socket.stop();
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
184
|
+
if (socketPromise) {
|
|
185
|
+
try {
|
|
186
|
+
const pendingSocket = await socketPromise;
|
|
187
|
+
await pendingSocket.stop();
|
|
188
|
+
} catch {
|
|
189
|
+
// A failed or aborted connection leaves no socket to close.
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
private async getAuthenticatedClient(): Promise<{
|
|
195
|
+
typedSocket: plugins.typedsocket.TypedSocket;
|
|
196
|
+
auth: plugins.servezoneInterfaces.requests.webpush.IWebPushAppCredentialAuth;
|
|
197
|
+
}> {
|
|
198
|
+
const credentials = await this.getCredentials();
|
|
199
|
+
return {
|
|
200
|
+
typedSocket: await this.getWebPushTypedSocket(credentials.typedUrl),
|
|
201
|
+
auth: {
|
|
202
|
+
credentialId: credentials.credentialId,
|
|
203
|
+
credentialSecret: credentials.credentialSecret,
|
|
204
|
+
},
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
private async getCredentials(): Promise<IServiceWebPushCredentials> {
|
|
209
|
+
const env = await this.readWebPushEnv();
|
|
210
|
+
if (!env.typedUrl) throw new Error('WEB_PUSH_TYPED_URL is required for Web Push');
|
|
211
|
+
if (!env.credentialId) {
|
|
212
|
+
throw new Error('WEB_PUSH_API_CREDENTIAL_ID is required for Web Push');
|
|
213
|
+
}
|
|
214
|
+
if (!env.credentialSecret) {
|
|
215
|
+
throw new Error('WEB_PUSH_API_CREDENTIAL_SECRET is required for Web Push');
|
|
216
|
+
}
|
|
217
|
+
return {
|
|
218
|
+
typedUrl: env.typedUrl,
|
|
219
|
+
credentialId: env.credentialId,
|
|
220
|
+
credentialSecret: env.credentialSecret,
|
|
221
|
+
};
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
private async readWebPushEnv(): Promise<{
|
|
225
|
+
typedUrl?: string;
|
|
226
|
+
credentialId?: string;
|
|
227
|
+
credentialSecret?: string;
|
|
228
|
+
}> {
|
|
229
|
+
const directEnv = this.normalizeCredentialBundle({
|
|
230
|
+
typedUrl: await this.platformClientRef.getConfiguredEnvVar('WEB_PUSH_TYPED_URL'),
|
|
231
|
+
credentialId: await this.platformClientRef.getConfiguredEnvVar(
|
|
232
|
+
'WEB_PUSH_API_CREDENTIAL_ID',
|
|
233
|
+
),
|
|
234
|
+
credentialSecret: await this.platformClientRef.getConfiguredEnvVar(
|
|
235
|
+
'WEB_PUSH_API_CREDENTIAL_SECRET',
|
|
236
|
+
),
|
|
237
|
+
});
|
|
238
|
+
if (this.hasCredentialBundleValue(directEnv)) {
|
|
239
|
+
return directEnv;
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
const bindingCredentialBundles: Array<Partial<IServiceWebPushCredentials>> = [];
|
|
243
|
+
for (const binding of this.platformClientRef.platformBindings || []) {
|
|
244
|
+
if (
|
|
245
|
+
binding.capability !== 'pushnotification'
|
|
246
|
+
|| binding.desiredState !== 'enabled'
|
|
247
|
+
|| binding.status !== 'ready'
|
|
248
|
+
) {
|
|
249
|
+
continue;
|
|
250
|
+
}
|
|
251
|
+
for (const credential of binding.credentials || []) {
|
|
252
|
+
const credentialBundle = this.normalizeCredentialBundle({
|
|
253
|
+
typedUrl: credential.env?.WEB_PUSH_TYPED_URL,
|
|
254
|
+
credentialId: credential.env?.WEB_PUSH_API_CREDENTIAL_ID,
|
|
255
|
+
credentialSecret: credential.env?.WEB_PUSH_API_CREDENTIAL_SECRET,
|
|
256
|
+
});
|
|
257
|
+
if (this.hasCredentialBundleValue(credentialBundle)) {
|
|
258
|
+
bindingCredentialBundles.push(credentialBundle);
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
if (bindingCredentialBundles.length > 1) {
|
|
264
|
+
throw new Error(
|
|
265
|
+
'Multiple ready Web Push credential bundles are configured; exactly one is required',
|
|
266
|
+
);
|
|
267
|
+
}
|
|
268
|
+
return bindingCredentialBundles[0] || {};
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
private normalizeCredentialBundle(bundleArg: {
|
|
272
|
+
typedUrl?: string;
|
|
273
|
+
credentialId?: string;
|
|
274
|
+
credentialSecret?: string;
|
|
275
|
+
}): Partial<IServiceWebPushCredentials> {
|
|
276
|
+
const typedUrl = this.normalizeConfigValue(bundleArg.typedUrl);
|
|
277
|
+
return {
|
|
278
|
+
typedUrl: typedUrl ? this.normalizeTypedSocketUrl(typedUrl) || undefined : undefined,
|
|
279
|
+
credentialId: this.normalizeConfigValue(bundleArg.credentialId),
|
|
280
|
+
credentialSecret: this.normalizeConfigValue(bundleArg.credentialSecret),
|
|
281
|
+
};
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
private hasCredentialBundleValue(bundleArg: Partial<IServiceWebPushCredentials>): boolean {
|
|
285
|
+
return Boolean(
|
|
286
|
+
bundleArg.typedUrl
|
|
287
|
+
|| bundleArg.credentialId
|
|
288
|
+
|| bundleArg.credentialSecret,
|
|
289
|
+
);
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
private normalizeConfigValue(valueArg?: string): string | undefined {
|
|
293
|
+
const value = valueArg?.trim();
|
|
294
|
+
return value || undefined;
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
private async getWebPushTypedSocket(urlArg: string): Promise<plugins.typedsocket.TypedSocket> {
|
|
298
|
+
const normalizedUrl = this.normalizeTypedSocketUrl(urlArg);
|
|
299
|
+
if (this.webPushTypedSocket && this.webPushTypedSocketUrl === normalizedUrl) {
|
|
300
|
+
return this.webPushTypedSocket;
|
|
301
|
+
}
|
|
302
|
+
if (this.webPushTypedSocketPromise && this.webPushTypedSocketUrl === normalizedUrl) {
|
|
303
|
+
return await this.webPushTypedSocketPromise;
|
|
304
|
+
}
|
|
305
|
+
if (this.webPushTypedSocket || this.webPushTypedSocketPromise) {
|
|
306
|
+
await this.stop();
|
|
307
|
+
}
|
|
308
|
+
this.webPushTypedSocketUrl = normalizedUrl;
|
|
309
|
+
const abortController = new AbortController();
|
|
310
|
+
this.webPushTypedSocketAbortController = abortController;
|
|
311
|
+
const socketPromise = plugins.typedsocket.TypedSocket.createClient(
|
|
312
|
+
this.platformClientRef.typedrouter,
|
|
313
|
+
normalizedUrl,
|
|
314
|
+
{ autoReconnect: true, abortSignal: abortController.signal },
|
|
315
|
+
);
|
|
316
|
+
this.webPushTypedSocketPromise = socketPromise;
|
|
317
|
+
try {
|
|
318
|
+
const socket = await socketPromise;
|
|
319
|
+
if (
|
|
320
|
+
this.webPushTypedSocketPromise === socketPromise
|
|
321
|
+
&& this.webPushTypedSocketUrl === normalizedUrl
|
|
322
|
+
) {
|
|
323
|
+
this.webPushTypedSocket = socket;
|
|
324
|
+
} else {
|
|
325
|
+
await socket.stop();
|
|
326
|
+
}
|
|
327
|
+
return socket;
|
|
328
|
+
} catch (error) {
|
|
329
|
+
if (this.webPushTypedSocketPromise === socketPromise) {
|
|
330
|
+
this.webPushTypedSocketPromise = undefined;
|
|
331
|
+
this.webPushTypedSocketUrl = undefined;
|
|
332
|
+
this.webPushTypedSocketAbortController = undefined;
|
|
333
|
+
}
|
|
334
|
+
throw error;
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
|
|
338
|
+
private normalizeTypedSocketUrl(urlArg: string): string {
|
|
339
|
+
return urlArg.trim().replace(/\/typedrequest\/?$/, '').replace(/\/+$/, '');
|
|
340
|
+
}
|
|
341
|
+
}
|