@serve.zone/dcrouter 17.7.0 → 17.8.0

package/dist_ts/opsserver/handlers/webpush-app.handler.js

@@ -0,0 +1,66 @@
+import * as plugins from '../../plugins.js';
+export class WebPushAppHandler {
+    opsServerRef;
+    typedrouter = new plugins.typedrequest.TypedRouter();
+    constructor(opsServerRef) {
+        this.opsServerRef = opsServerRef;
+        this.opsServerRef.typedrouter.addTypedRouter(this.typedrouter);
+        this.registerHandlers();
+    }
+    registerHandlers() {
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getWebPushServiceStatus', async (dataArg) => {
+            const manager = this.opsServerRef.dcRouterRef.webPushManager;
+            if (!manager.isReady)
+                return manager.getUnavailableServiceStatus();
+            return await manager.getServiceStatus(dataArg.auth);
+        }));
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('enqueueWebPush', async (dataArg) => {
+            try {
+                return await this.opsServerRef.dcRouterRef.webPushManager.enqueue(dataArg.auth, {
+                    idempotencyKey: dataArg.idempotencyKey,
+                    subscriptionId: dataArg.subscriptionId,
+                    subscription: dataArg.subscription,
+                    vapidKeyId: dataArg.vapidKeyId,
+                    payload: dataArg.payload,
+                    ttlSeconds: dataArg.ttlSeconds,
+                    urgency: dataArg.urgency,
+                    collapseKey: dataArg.collapseKey,
+                });
+            }
+            catch (error) {
+                return {
+                    accepted: false,
+                    message: this.safeMessage(error),
+                };
+            }
+        }));
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('cancelWebPush', async (dataArg) => {
+            try {
+                const result = await this.opsServerRef.dcRouterRef.webPushManager.cancel(dataArg.auth, dataArg.target);
+                return {
+                    success: true,
+                    ...result,
+                };
+            }
+            catch (error) {
+                return {
+                    success: false,
+                    cancelledCount: 0,
+                    alreadyTerminalCount: 0,
+                    message: this.safeMessage(error),
+                };
+            }
+        }));
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getWebPushDeliveryStatus', async (dataArg) => {
+            return {
+                delivery: await this.opsServerRef.dcRouterRef.webPushManager.getDeliveryStatus(dataArg.auth, dataArg.spoolItemId),
+            };
+        }));
+    }
+    safeMessage(errorArg) {
+        return errorArg instanceof plugins.typedrequest.TypedResponseError
+            ? errorArg.message
+            : 'Web Push delivery operation failed';
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2VicHVzaC1hcHAuaGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL29wc3NlcnZlci9oYW5kbGVycy93ZWJwdXNoLWFwcC5oYW5kbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFHNUMsTUFBTSxPQUFPLGlCQUFpQjtJQUdRO0lBRjdCLFdBQVcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLENBQUM7SUFFNUQsWUFBb0MsWUFBdUI7UUFBdkIsaUJBQVksR0FBWixZQUFZLENBQVc7UUFDekQsSUFBSSxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMvRCxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztJQUMxQixDQUFDO0lBRU8sZ0JBQWdCO1FBQ3RCLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUM5QixJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUduQyx5QkFBeUIsRUFDekIsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQ2hCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQztZQUM3RCxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU87Z0JBQUUsT0FBTyxPQUFPLENBQUMsMkJBQTJCLEVBQUUsQ0FBQztZQUNuRSxPQUFPLE1BQU0sT0FBTyxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN0RCxDQUFDLENBQ0YsQ0FDRixDQUFDO1FBRUYsSUFBSSxDQUFDLFdBQVcsQ0FBQyxlQUFlLENBQzlCLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxZQUFZLENBR25DLGdCQUFnQixFQUNoQixLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7WUFDaEIsSUFBSSxDQUFDO2dCQUNILE9BQU8sTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUMvRCxPQUFPLENBQUMsSUFBSSxFQUNaO29CQUNFLGNBQWMsRUFBRSxPQUFPLENBQUMsY0FBYztvQkFDdEMsY0FBYyxFQUFFLE9BQU8sQ0FBQyxjQUFjO29CQUN0QyxZQUFZLEVBQUUsT0FBTyxDQUFDLFlBQVk7b0JBQ2xDLFVBQVUsRUFBRSxPQUFPLENBQUMsVUFBVTtvQkFDOUIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxPQUFPO29CQUN4QixVQUFVLEVBQUUsT0FBTyxDQUFDLFVBQVU7b0JBQzlCLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTztvQkFDeEIsV0FBVyxFQUFFLE9BQU8sQ0FBQyxXQUFXO2lCQUNqQyxDQUNGLENBQUM7WUFDSixDQUFDO1lBQUMsT0FBTyxLQUFjLEVBQUUsQ0FBQztnQkFDeEIsT0FBTztvQkFDTCxRQUFRLEVBQUUsS0FBSztvQkFDZixPQUFPLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUM7aUJBQ2pDLENBQUM7WUFDSixDQUFDO1FBQ0gsQ0FBQyxDQUNGLENBQ0YsQ0FBQztRQUVGLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUM5QixJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUduQyxlQUFlLEVBQ2YsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQ2hCLElBQUksQ0FBQztnQkFDSCxNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQ3RFLE9BQU8sQ0FBQyxJQUFJLEVBQ1osT0FBTyxDQUFDLE1BQU0sQ0FDZixDQUFDO2dCQUNGLE9BQU87b0JBQ0wsT0FBTyxFQUFFLElBQUk7b0JBQ2IsR0FBRyxNQUFNO2lCQUNWLENBQUM7WUFDSixDQUFDO1lBQUMsT0FBTyxLQUFjLEVBQUUsQ0FBQztnQkFDeEIsT0FBTztvQkFDTCxPQUFPLEVBQUUsS0FBSztvQkFDZCxjQUFjLEVBQUUsQ0FBQztvQkFDakIsb0JBQW9CLEVBQUUsQ0FBQztvQkFDdkIsT0FBTyxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDO2lCQUNqQyxDQUFDO1lBQ0osQ0FBQztRQUNILENBQUMsQ0FDRixDQUNGLENBQUM7UUFFRixJQUFJLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FDOUIsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLFlBQVksQ0FHbkMsMEJBQTBCLEVBQzFCLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUNoQixPQUFPO2dCQUNMLFFBQVEsRUFBRSxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxpQkFBaUIsQ0FDNUUsT0FBTyxDQUFDLElBQUksRUFDWixPQUFPLENBQUMsV0FBVyxDQUNwQjthQUNGLENBQUM7UUFDSixDQUFDLENBQ0YsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVPLFdBQVcsQ0FBQyxRQUFpQjtRQUNuQyxPQUFPLFFBQVEsWUFBWSxPQUFPLENBQUMsWUFBWSxDQUFDLGtCQUFrQjtZQUNoRSxDQUFDLENBQUMsUUFBUSxDQUFDLE9BQU87WUFDbEIsQ0FBQyxDQUFDLG9DQUFvQyxDQUFDO0lBQzNDLENBQUM7Q0FDRiJ9

package/dist_ts/opsserver/handlers/webpush-control.handler.d.ts

@@ -0,0 +1,14 @@
+import * as plugins from '../../plugins.js';
+import type { OpsServer } from '../classes.opsserver.js';
+export declare class WebPushControlHandler {
+    private readonly opsServerRef;
+    typedrouter: plugins.typedrequest.TypedRouter<import("@api.global/typedrequest-interfaces").ITypedRequest>;
+    constructor(opsServerRef: OpsServer);
+    private registerHandlers;
+    private requireControlAuth;
+    private scopeOwnerFilter;
+    private assertExactOwner;
+    private requireAuthorizedBinding;
+    private bindingOwner;
+    private safeMessage;
+}

package/dist_ts/opsserver/handlers/webpush-control.handler.js

@@ -0,0 +1,163 @@
+import * as plugins from '../../plugins.js';
+import { requireGatewayMachineAuth, } from '../helpers/gateway-client-auth.js';
+export class WebPushControlHandler {
+    opsServerRef;
+    typedrouter = new plugins.typedrequest.TypedRouter();
+    constructor(opsServerRef) {
+        this.opsServerRef = opsServerRef;
+        this.opsServerRef.typedrouter.addTypedRouter(this.typedrouter);
+        this.registerHandlers();
+    }
+    registerHandlers() {
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('listWebPushBindings', async (dataArg) => {
+            const auth = await this.requireControlAuth(dataArg.auth, 'readWebPush');
+            const owner = this.scopeOwnerFilter(auth, dataArg.owner);
+            const manager = this.opsServerRef.dcRouterRef.webPushManager;
+            return {
+                bindings: await manager.listBindings(owner),
+            };
+        }));
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('syncWebPushBinding', async (dataArg) => {
+            try {
+                const request = dataArg;
+                const auth = await this.requireControlAuth(dataArg.auth, 'manageWebPush');
+                this.assertExactOwner(auth, dataArg.binding.owner);
+                const result = await this.opsServerRef.dcRouterRef.webPushManager.syncBinding(dataArg.binding, request.controller, auth.userId);
+                return {
+                    success: true,
+                    binding: result.binding,
+                    credential: result.credential,
+                };
+            }
+            catch (error) {
+                return {
+                    success: false,
+                    message: this.safeMessage(error),
+                };
+            }
+        }));
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('deleteWebPushBinding', async (dataArg) => {
+            try {
+                const request = dataArg;
+                const auth = await this.requireControlAuth(dataArg.auth, 'manageWebPush');
+                this.assertExactOwner(auth, request.owner);
+                return {
+                    success: await this.opsServerRef.dcRouterRef.webPushManager.deleteBinding({
+                        ...(request.id !== undefined ? { id: request.id } : {}),
+                        owner: request.owner,
+                        controller: request.controller,
+                    }, auth.userId),
+                };
+            }
+            catch (error) {
+                return {
+                    success: false,
+                    message: this.safeMessage(error),
+                };
+            }
+        }));
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('rotateWebPushCredential', async (dataArg) => {
+            try {
+                const auth = await this.requireControlAuth(dataArg.auth, 'manageWebPush');
+                const manager = this.opsServerRef.dcRouterRef.webPushManager;
+                const binding = await manager.getBindingByCredentialId(dataArg.credentialId);
+                if (!binding) {
+                    throw new plugins.typedrequest.TypedResponseError('Web Push binding not found');
+                }
+                this.assertExactOwner(auth, this.bindingOwner(binding));
+                return {
+                    success: true,
+                    credential: await manager.rotateCredential(dataArg.credentialId),
+                };
+            }
+            catch (error) {
+                return {
+                    success: false,
+                    message: this.safeMessage(error),
+                };
+            }
+        }));
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('rotateWebPushVapidKey', async (dataArg) => {
+            try {
+                const auth = await this.requireControlAuth(dataArg.auth, 'manageWebPush');
+                const binding = await this.requireAuthorizedBinding(auth, dataArg.bindingId);
+                return {
+                    success: true,
+                    binding: await this.opsServerRef.dcRouterRef.webPushManager.rotateVapidKey(binding.id),
+                };
+            }
+            catch (error) {
+                return {
+                    success: false,
+                    message: this.safeMessage(error),
+                };
+            }
+        }));
+    }
+    async requireControlAuth(authArg, capabilityArg) {
+        const auth = await requireGatewayMachineAuth(this.opsServerRef, authArg, capabilityArg === 'manageWebPush'
+            ? 'gateway-clients:write'
+            : 'gateway-clients:read');
+        if (auth.isAdmin)
+            return auth;
+        if (auth.policy?.role !== 'gatewayClient'
+            || auth.policy.capabilities?.[capabilityArg] !== true) {
+            throw new plugins.typedrequest.TypedResponseError(`token capability missing: ${capabilityArg}`);
+        }
+        return auth;
+    }
+    scopeOwnerFilter(authArg, requestedArg) {
+        if (authArg.isAdmin)
+            return requestedArg || {};
+        const gatewayClient = authArg.gatewayClient;
+        if (!gatewayClient) {
+            throw new plugins.typedrequest.TypedResponseError('gateway-client credential required');
+        }
+        if (requestedArg?.gatewayClientType !== undefined
+            && requestedArg.gatewayClientType !== gatewayClient.type) {
+            throw new plugins.typedrequest.TypedResponseError('gateway-client credential cannot access another Web Push owner');
+        }
+        if (requestedArg?.gatewayClientId !== undefined
+            && requestedArg.gatewayClientId !== gatewayClient.id) {
+            throw new plugins.typedrequest.TypedResponseError('gateway-client credential cannot access another Web Push owner');
+        }
+        return {
+            gatewayClientType: gatewayClient.type,
+            gatewayClientId: gatewayClient.id,
+            ...(requestedArg?.appInstanceId !== undefined
+                ? { appInstanceId: requestedArg.appInstanceId }
+                : {}),
+        };
+    }
+    assertExactOwner(authArg, ownerArg) {
+        if (authArg.isAdmin)
+            return;
+        const gatewayClient = authArg.gatewayClient;
+        if (!gatewayClient
+            || ownerArg.gatewayClientType !== gatewayClient.type
+            || ownerArg.gatewayClientId !== gatewayClient.id) {
+            throw new plugins.typedrequest.TypedResponseError('gateway-client credential cannot access another Web Push owner');
+        }
+    }
+    async requireAuthorizedBinding(authArg, bindingIdArg) {
+        const binding = await this.opsServerRef.dcRouterRef.webPushManager.getBindingById(bindingIdArg);
+        if (!binding) {
+            throw new plugins.typedrequest.TypedResponseError('Web Push binding not found');
+        }
+        this.assertExactOwner(authArg, this.bindingOwner(binding));
+        return binding;
+    }
+    bindingOwner(bindingArg) {
+        return {
+            gatewayClientType: bindingArg.ownerGatewayClientType,
+            gatewayClientId: bindingArg.ownerGatewayClientId,
+            appInstanceId: bindingArg.ownerAppInstanceId,
+        };
+    }
+    safeMessage(errorArg) {
+        return errorArg instanceof plugins.typedrequest.TypedResponseError
+            ? errorArg.message
+            : 'Web Push control operation failed';
+    }
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"webpush-control.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/webpush-control.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAI5C,OAAO,EACL,yBAAyB,GAE1B,MAAM,mCAAmC,CAAC;AAI3C,MAAM,OAAO,qBAAqB;IAGI;IAF7B,WAAW,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAE5D,YAAoC,YAAuB;QAAvB,iBAAY,GAAZ,YAAY,CAAW;QACzD,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/D,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAEO,gBAAgB;QACtB,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9B,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY,CAGnC,qBAAqB,EACrB,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YACxE,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YACzD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC;YAC7D,OAAO;gBACL,QAAQ,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;aAC5C,CAAC;QACJ,CAAC,CACF,CACF,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9B,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY,CAGnC,oBAAoB,EACpB,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,OAEf,CAAC;gBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBAC1E,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAC3E,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,UAAU,EAClB,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,UAAU,EAAE,MAAM,CAAC,UAAU;iBAC9B,CAAC;YACJ,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;iBACjC,CAAC;YACJ,CAAC;QACH,CAAC,CACF,CACF,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9B,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY,CAGnC,sBAAsB,EACtB,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,OAIf,CAAC;gBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBAC1E,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC3C,OAAO;oBACL,OAAO,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,aAAa,CAAC;wBACxE,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACvD,KAAK,EAAE,OAAO,CAAC,KAAK;wBACpB,UAAU,EAAE,OAAO,CAAC,UAAU;qBAC/B,EAAE,IAAI,CAAC,MAAM,CAAC;iBAChB,CAAC;YACJ,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;iBACjC,CAAC;YACJ,CAAC;QACH,CAAC,CACF,CACF,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9B,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY,CAGnC,yBAAyB,EACzB,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC;gBAC7D,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,wBAAwB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAC7E,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,4BAA4B,CAAC,CAAC;gBAClF,CAAC;gBACD,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;gBACxD,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC;iBACjE,CAAC;YACJ,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;iBACjC,CAAC;YACJ,CAAC;QACH,CAAC,CACF,CACF,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9B,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY,CAGnC,uBAAuB,EACvB,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBAC1E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC7E,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,cAAc,CACxE,OAAO,CAAC,EAAE,CACX;iBACF,CAAC;YACJ,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;iBACjC,CAAC;YACJ,CAAC;QACH,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,OAAgF,EAChF,aAA8C;QAE9C,MAAM,IAAI,GAAG,MAAM,yBAAyB,CAC1C,IAAI,CAAC,YAAY,EACjB,OAAO,EACP,aAAa,KAAK,eAAe;YAC/B,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,sBAAsB,CAC3B,CAAC;QACF,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC9B,IACE,IAAI,CAAC,MAAM,EAAE,IAAI,KAAK,eAAe;eAClC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,KAAK,IAAI,EACrD,CAAC;YACD,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAC/C,6BAA6B,aAAa,EAAE,CAC7C,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,gBAAgB,CACtB,OAAmC,EACnC,YAAwD;QAExD,IAAI,OAAO,CAAC,OAAO;YAAE,OAAO,YAAY,IAAI,EAAE,CAAC;QAC/C,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAC/C,oCAAoC,CACrC,CAAC;QACJ,CAAC;QACD,IACE,YAAY,EAAE,iBAAiB,KAAK,SAAS;eAC1C,YAAY,CAAC,iBAAiB,KAAK,aAAa,CAAC,IAAI,EACxD,CAAC;YACD,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAC/C,gEAAgE,CACjE,CAAC;QACJ,CAAC;QACD,IACE,YAAY,EAAE,eAAe,KAAK,SAAS;eACxC,YAAY,CAAC,eAAe,KAAK,aAAa,CAAC,EAAE,EACpD,CAAC;YACD,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAC/C,gEAAgE,CACjE,CAAC;QACJ,CAAC;QACD,OAAO;YACL,iBAAiB,EAAE,aAAa,CAAC,IAAI;YACrC,eAAe,EAAE,aAAa,CAAC,EAAE;YACjC,GAAG,CAAC,YAAY,EAAE,aAAa,KAAK,SAAS;gBAC3C,CAAC,CAAC,EAAE,aAAa,EAAE,YAAY,CAAC,aAAa,EAAE;gBAC/C,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;IACJ,CAAC;IAEO,gBAAgB,CACtB,OAAmC,EACnC,QAA+B;QAE/B,IAAI,OAAO,CAAC,OAAO;YAAE,OAAO;QAC5B,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,IACE,CAAC,aAAa;eACX,QAAQ,CAAC,iBAAiB,KAAK,aAAa,CAAC,IAAI;eACjD,QAAQ,CAAC,eAAe,KAAK,aAAa,CAAC,EAAE,EAChD,CAAC;YACD,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAC/C,gEAAgE,CACjE,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,wBAAwB,CACpC,OAAmC,EACnC,YAAoB;QAEpB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,cAAc,CAC/E,YAAY,CACb,CAAC;QACF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,4BAA4B,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,YAAY,CAAC,UAA6B;QAChD,OAAO;YACL,iBAAiB,EAAE,UAAU,CAAC,sBAAsB;YACpD,eAAe,EAAE,UAAU,CAAC,oBAAoB;YAChD,aAAa,EAAE,UAAU,CAAC,kBAAkB;SAC7C,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,QAAiB;QACnC,OAAO,QAAQ,YAAY,OAAO,CAAC,YAAY,CAAC,kBAAkB;YAChE,CAAC,CAAC,QAAQ,CAAC,OAAO;YAClB,CAAC,CAAC,mCAAmC,CAAC;IAC1C,CAAC;CACF"}

package/dist_ts/plugins.d.ts

@@ -2,6 +2,7 @@ import * as dns from 'node:dns';
 import * as fs from 'node:fs';
 import * as crypto from 'node:crypto';
 import * as http from 'node:http';
+import * as https from 'node:https';
 import * as net from 'node:net';
 import * as buffer from 'node:buffer';
 import * as os from 'node:os';
@@ -9,7 +10,7 @@ import * as path from 'node:path';
 import * as tls from 'node:tls';
 import * as util from 'node:util';
 import * as url from 'node:url';
-export { dns, fs, crypto, http, net, buffer, os, path, tls, util, url, };
+export { dns, fs, crypto, http, https, net, buffer, os, path, tls, util, url, };
 import * as servezoneInterfaces from '@serve.zone/interfaces';
 import * as remoteingress from '@serve.zone/remoteingress';
 export { servezoneInterfaces, remoteingress, };
@@ -50,5 +51,7 @@ import * as cloudflare from '@apiclient.xyz/cloudflare';
 export { cloudflare, };
 import * as tsclass from '@tsclass/tsclass';
 export { tsclass, };
+import ipaddr from 'ipaddr.js';
 import * as uuid from 'uuid';
-export { uuid, };
+import webpush from 'web-push';
+export { ipaddr, uuid, webpush, };

package/dist_ts/plugins.js

@@ -3,6 +3,7 @@ import * as dns from 'node:dns';
 import * as fs from 'node:fs';
 import * as crypto from 'node:crypto';
 import * as http from 'node:http';
+import * as https from 'node:https';
 import * as net from 'node:net';
 import * as buffer from 'node:buffer';
 import * as os from 'node:os';
@@ -10,7 +11,7 @@ import * as path from 'node:path';
 import * as tls from 'node:tls';
 import * as util from 'node:util';
 import * as url from 'node:url';
-export { dns, fs, crypto, http, net, buffer, os, path, tls, util, url, };
+export { dns, fs, crypto, http, https, net, buffer, os, path, tls, util, url, };
 // @serve.zone scope
 import * as servezoneInterfaces from '@serve.zone/interfaces';
 import * as remoteingress from '@serve.zone/remoteingress';
@@ -57,6 +58,8 @@ export { cloudflare, };
 import * as tsclass from '@tsclass/tsclass';
 export { tsclass, };
 // third party
+import ipaddr from 'ipaddr.js';
 import * as uuid from 'uuid';
-export { uuid, };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYztBQUNkLE9BQU8sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDO0FBQ2hDLE9BQU8sS0FBSyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzlCLE9BQU8sS0FBSyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDO0FBQ2hDLE9BQU8sS0FBSyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzlCLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDO0FBQ2hDLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDO0FBRWhDLE9BQU8sRUFDTCxHQUFHLEVBQ0gsRUFBRSxFQUNGLE1BQU0sRUFDTixJQUFJLEVBQ0osR0FBRyxFQUNILE1BQU0sRUFDTixFQUFFLEVBQ0YsSUFBSSxFQUNKLEdBQUcsRUFDSCxJQUFJLEVBQ0osR0FBRyxHQUNKLENBQUE7QUFFRCxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLG1CQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQzlELE9BQU8sS0FBSyxhQUFhLE1BQU0sMkJBQTJCLENBQUM7QUFFM0QsT0FBTyxFQUNMLG1CQUFtQixFQUNuQixhQUFhLEdBQ2QsQ0FBQTtBQUVELG9CQUFvQjtBQUNwQixPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FB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
+import webpush from 'web-push';
+export { ipaddr, uuid, webpush, };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYztBQUNkLE9BQU8sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDO0FBQ2hDLE9BQU8sS0FBSyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzlCLE9BQU8sS0FBSyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxLQUFLLE1BQU0sWUFBWSxDQUFDO0FBQ3BDLE9BQU8sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDO0FBQ2hDLE9BQU8sS0FBSyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzlCLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDO0FBQ2hDLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDO0FBRWhDLE9BQU8sRUFDTCxHQUFHLEVBQ0gsRUFBRSxFQUNGLE1BQU0sRUFDTixJQUFJLEVBQ0osS0FBSyxFQUNMLEdBQUcsRUFDSCxNQUFNLEVBQ04sRUFBRSxFQUNGLElBQUksRUFDSixHQUFHLEVBQ0gsSUFBSSxFQUNKLEdBQUcsR0FDSixDQUFBO0FBRUQsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxtQkFBbUIsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssYUFBYSxNQUFNLDJCQUEyQixDQUFDO0FBRTNELE9BQU8sRUFDTCxtQkFBbUIsRUFDbkIsYUFBYSxHQUNkLENBQUE7QUFFRCxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHlC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

package/dist_ts/webpush/classes.webpush-crypto.d.ts

@@ -0,0 +1,38 @@
+export interface IWebPushKeyRing {
+    currentKeyId: string;
+    keys: ReadonlyMap<string, Buffer>;
+}
+export interface IWebPushEncryptedEnvelope {
+    version: 1;
+    algorithm: 'aes-256-gcm';
+    keyId: string;
+    nonce: string;
+    ciphertext: string;
+    tag: string;
+}
+export interface IWebPushAadContext {
+    gatewayClientId: string;
+    appInstanceId: string;
+    bindingId: string;
+    documentType: string;
+    documentId: string;
+}
+export type TWebPushHmacDomain = 'credential' | 'idempotency-key' | 'request' | 'endpoint' | 'topic';
+export declare function parseWebPushKeyRing(rawValueArg: unknown, labelArg: string): IWebPushKeyRing;
+export declare function assertDistinctWebPushKeyRings(encryptionRingArg: IWebPushKeyRing, hmacRingArg: IWebPushKeyRing): void;
+export declare function buildWebPushAad(contextArg: IWebPushAadContext): Buffer;
+export declare function canonicalJson(valueArg: unknown): string;
+export declare class WebPushCrypto {
+    private readonly encryptionRing;
+    private readonly hmacRing;
+    constructor(encryptionRing: IWebPushKeyRing, hmacRing: IWebPushKeyRing);
+    get currentEncryptionKeyId(): string;
+    get currentHmacKeyId(): string;
+    encryptJson(valueArg: unknown, aadContextArg: IWebPushAadContext): IWebPushEncryptedEnvelope;
+    decryptJson<T>(envelopeArg: IWebPushEncryptedEnvelope, aadContextArg: IWebPushAadContext): T;
+    hmac(domainArg: TWebPushHmacDomain, valueArg: string, keyIdArg?: string): {
+        keyId: string;
+        digest: string;
+    };
+    verifyHmac(domainArg: TWebPushHmacDomain, valueArg: string, keyIdArg: string, expectedDigestArg: string): boolean;
+}

package/dist_ts/webpush/classes.webpush-crypto.js

@@ -0,0 +1,231 @@
+import * as plugins from '../plugins.js';
+const KEY_ID_PATTERN = /^[A-Za-z0-9._-]{1,64}$/;
+const BASE64URL_KEY_PATTERN = /^[A-Za-z0-9_-]{43}$/;
+const BASE64URL_VALUE_PATTERN = /^[A-Za-z0-9_-]+$/;
+const KEY_RING_LIMIT = 8;
+const AAD_SCHEMA_VERSION = 1;
+function requirePlainObject(valueArg, labelArg) {
+    if (valueArg === null
+        || typeof valueArg !== 'object'
+        || Array.isArray(valueArg)
+        || Object.getPrototypeOf(valueArg) !== Object.prototype) {
+        throw new Error(`${labelArg} must be a plain object`);
+    }
+    return valueArg;
+}
+function decodeBase64UrlExact(valueArg, lengthArg, labelArg) {
+    if (typeof valueArg !== 'string' || !BASE64URL_VALUE_PATTERN.test(valueArg)) {
+        throw new Error(`${labelArg} must be unpadded base64url`);
+    }
+    const decoded = Buffer.from(valueArg, 'base64url');
+    if (decoded.length !== lengthArg || decoded.toString('base64url') !== valueArg) {
+        throw new Error(`${labelArg} has an invalid encoded length`);
+    }
+    return decoded;
+}
+function parseKeyRingSource(rawValueArg, labelArg) {
+    if (typeof rawValueArg === 'string') {
+        const trimmed = rawValueArg.trim();
+        if (!trimmed) {
+            throw new Error(`${labelArg} is empty`);
+        }
+        const jsonText = trimmed.startsWith('base64Object:')
+            ? Buffer.from(trimmed.slice('base64Object:'.length), 'base64').toString('utf8')
+            : trimmed;
+        try {
+            return requirePlainObject(JSON.parse(jsonText), labelArg);
+        }
+        catch (error) {
+            if (error.message.startsWith(`${labelArg} `))
+                throw error;
+            throw new Error(`${labelArg} must be valid JSON`, { cause: error });
+        }
+    }
+    return requirePlainObject(rawValueArg, labelArg);
+}
+export function parseWebPushKeyRing(rawValueArg, labelArg) {
+    const source = parseKeyRingSource(rawValueArg, labelArg);
+    const currentKeyId = source.currentKeyId;
+    if (typeof currentKeyId !== 'string' || !KEY_ID_PATTERN.test(currentKeyId)) {
+        throw new Error(`${labelArg}.currentKeyId is invalid`);
+    }
+    const rawKeys = requirePlainObject(source.keys, `${labelArg}.keys`);
+    const entries = Object.entries(rawKeys);
+    if (entries.length === 0 || entries.length > KEY_RING_LIMIT) {
+        throw new Error(`${labelArg}.keys must contain 1 to ${KEY_RING_LIMIT} keys`);
+    }
+    const keys = new Map();
+    const fingerprints = new Set();
+    for (const [keyId, encodedKey] of entries) {
+        if (!KEY_ID_PATTERN.test(keyId)) {
+            throw new Error(`${labelArg}.keys contains an invalid key id`);
+        }
+        if (typeof encodedKey !== 'string' || !BASE64URL_KEY_PATTERN.test(encodedKey)) {
+            throw new Error(`${labelArg}.keys.${keyId} must be a 32-byte unpadded base64url key`);
+        }
+        const key = decodeBase64UrlExact(encodedKey, 32, `${labelArg}.keys.${keyId}`);
+        const fingerprint = key.toString('hex');
+        if (fingerprints.has(fingerprint)) {
+            throw new Error(`${labelArg}.keys must not contain duplicate key material`);
+        }
+        fingerprints.add(fingerprint);
+        keys.set(keyId, key);
+    }
+    if (!keys.has(currentKeyId)) {
+        throw new Error(`${labelArg}.currentKeyId does not name a configured key`);
+    }
+    return {
+        currentKeyId,
+        keys,
+    };
+}
+export function assertDistinctWebPushKeyRings(encryptionRingArg, hmacRingArg) {
+    const encryptionFingerprints = new Set([...encryptionRingArg.keys.values()].map((keyArg) => keyArg.toString('hex')));
+    if ([...hmacRingArg.keys.values()]
+        .some((keyArg) => encryptionFingerprints.has(keyArg.toString('hex')))) {
+        throw new Error('Web Push encryption and HMAC key rings must use distinct key material');
+    }
+}
+export function buildWebPushAad(contextArg) {
+    for (const [name, value] of Object.entries(contextArg)) {
+        if (typeof value !== 'string' || !value.trim()) {
+            throw new Error(`Web Push AAD ${name} is missing`);
+        }
+    }
+    return Buffer.from(canonicalJson({
+        schemaVersion: AAD_SCHEMA_VERSION,
+        gatewayClientId: contextArg.gatewayClientId,
+        appInstanceId: contextArg.appInstanceId,
+        bindingId: contextArg.bindingId,
+        documentType: contextArg.documentType,
+        documentId: contextArg.documentId,
+    }), 'utf8');
+}
+function canonicalize(valueArg) {
+    if (valueArg === null
+        || typeof valueArg === 'string'
+        || typeof valueArg === 'boolean') {
+        return valueArg;
+    }
+    if (typeof valueArg === 'number') {
+        if (!Number.isFinite(valueArg))
+            throw new Error('Canonical JSON does not support non-finite numbers');
+        return valueArg;
+    }
+    if (Array.isArray(valueArg)) {
+        return valueArg.map((entryArg) => canonicalize(entryArg));
+    }
+    const value = requirePlainObject(valueArg, 'Canonical JSON value');
+    const result = {};
+    for (const key of Object.keys(value).sort()) {
+        if (value[key] === undefined) {
+            throw new Error('Canonical JSON does not support undefined values');
+        }
+        result[key] = canonicalize(value[key]);
+    }
+    return result;
+}
+export function canonicalJson(valueArg) {
+    return JSON.stringify(canonicalize(valueArg));
+}
+export class WebPushCrypto {
+    encryptionRing;
+    hmacRing;
+    constructor(encryptionRing, hmacRing) {
+        this.encryptionRing = encryptionRing;
+        this.hmacRing = hmacRing;
+        assertDistinctWebPushKeyRings(encryptionRing, hmacRing);
+    }
+    get currentEncryptionKeyId() {
+        return this.encryptionRing.currentKeyId;
+    }
+    get currentHmacKeyId() {
+        return this.hmacRing.currentKeyId;
+    }
+    encryptJson(valueArg, aadContextArg) {
+        const keyId = this.encryptionRing.currentKeyId;
+        const key = this.encryptionRing.keys.get(keyId);
+        if (!key)
+            throw new Error('Current Web Push encryption key is unavailable');
+        const nonce = plugins.crypto.randomBytes(12);
+        const cipher = plugins.crypto.createCipheriv('aes-256-gcm', key, nonce);
+        cipher.setAAD(buildWebPushAad(aadContextArg));
+        const ciphertext = Buffer.concat([
+            cipher.update(canonicalJson(valueArg), 'utf8'),
+            cipher.final(),
+        ]);
+        const tag = cipher.getAuthTag();
+        return {
+            version: 1,
+            algorithm: 'aes-256-gcm',
+            keyId,
+            nonce: nonce.toString('base64url'),
+            ciphertext: ciphertext.toString('base64url'),
+            tag: tag.toString('base64url'),
+        };
+    }
+    decryptJson(envelopeArg, aadContextArg) {
+        if (envelopeArg?.version !== 1
+            || envelopeArg.algorithm !== 'aes-256-gcm'
+            || typeof envelopeArg.keyId !== 'string'
+            || !KEY_ID_PATTERN.test(envelopeArg.keyId)) {
+            throw new Error('Web Push encrypted envelope is malformed');
+        }
+        const key = this.encryptionRing.keys.get(envelopeArg.keyId);
+        if (!key)
+            throw new Error('Web Push encrypted envelope references an unavailable key');
+        const nonce = decodeBase64UrlExact(envelopeArg.nonce, 12, 'Web Push envelope nonce');
+        const tag = decodeBase64UrlExact(envelopeArg.tag, 16, 'Web Push envelope tag');
+        if (typeof envelopeArg.ciphertext !== 'string'
+            || !envelopeArg.ciphertext
+            || !BASE64URL_VALUE_PATTERN.test(envelopeArg.ciphertext)) {
+            throw new Error('Web Push envelope ciphertext is malformed');
+        }
+        const ciphertext = Buffer.from(envelopeArg.ciphertext, 'base64url');
+        if (ciphertext.toString('base64url') !== envelopeArg.ciphertext) {
+            throw new Error('Web Push envelope ciphertext is malformed');
+        }
+        try {
+            const decipher = plugins.crypto.createDecipheriv('aes-256-gcm', key, nonce);
+            decipher.setAAD(buildWebPushAad(aadContextArg));
+            decipher.setAuthTag(tag);
+            const plaintext = Buffer.concat([
+                decipher.update(ciphertext),
+                decipher.final(),
+            ]).toString('utf8');
+            return JSON.parse(plaintext);
+        }
+        catch (error) {
+            throw new Error('Web Push encrypted envelope authentication failed', { cause: error });
+        }
+    }
+    hmac(domainArg, valueArg, keyIdArg = this.hmacRing.currentKeyId) {
+        const key = this.hmacRing.keys.get(keyIdArg);
+        if (!key)
+            throw new Error('Web Push HMAC key is unavailable');
+        const digest = plugins.crypto
+            .createHmac('sha256', key)
+            .update(`dcrouter:webpush:v1:${domainArg}\0`, 'utf8')
+            .update(valueArg, 'utf8')
+            .digest('base64url');
+        return {
+            keyId: keyIdArg,
+            digest,
+        };
+    }
+    verifyHmac(domainArg, valueArg, keyIdArg, expectedDigestArg) {
+        let actualDigest;
+        try {
+            actualDigest = this.hmac(domainArg, valueArg, keyIdArg).digest;
+        }
+        catch {
+            return false;
+        }
+        const actual = Buffer.from(actualDigest, 'base64url');
+        const expected = Buffer.from(expectedDigestArg, 'base64url');
+        return actual.length === expected.length
+            && actual.length > 0
+            && plugins.crypto.timingSafeEqual(actual, expected);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.webpush-crypto.js","sourceRoot":"","sources":["../../../ts/webpush/classes.webpush-crypto.ts"],"names":[],"mappings":"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"}