agent-comms 8.15.26 → 9.0.0

package/src/bridges/user/web/dist/sw.js

@@ -1 +1 @@
-(function(){var e=`agent-comms-v1`,t=[{"revision":"54b6380eb850ad9bea50d6ba545eb3c7","url":"mesh-worker.js"},{"revision":"f1ee3afb8c9e8f0d7315fd93d6457316","url":"index.html"},{"revision":"5e3a7f1cbb3fce9cd532609d4d712bd3","url":"bundle.js"}].map(e=>e.url);self.addEventListener(`install`,n=>{n.waitUntil(self.caches.open(e).then(async e=>e.addAll(t)).then(async()=>self.skipWaiting()))}),self.addEventListener(`activate`,t=>{t.waitUntil(self.caches.keys().then(async t=>Promise.all(t.filter(t=>t!==e).map(async e=>self.caches.delete(e)))))});var n=200,r=300;function i(e,t){return e.method===`GET`&&t.status>=n&&t.status<r}self.addEventListener(`fetch`,t=>{if(new URL(t.request.url).pathname.startsWith(`/api/`)){t.respondWith(fetch(t.request).then(n=>{if(i(t.request,n)){let r=n.clone();self.caches.open(e).then(async e=>e.put(t.request,r))}return n}).catch(async()=>self.caches.open(e).then(async e=>e.match(t.request)).then(e=>e??new Response(`Offline`,{status:503}))));return}t.respondWith(self.caches.open(e).then(async e=>e.match(t.request)).then(async n=>n||fetch(t.request).then(n=>{if(i(t.request,n)){let r=n.clone();self.caches.open(e).then(async e=>e.put(t.request,r))}return n})))}),self.addEventListener(`push`,e=>{let t=`Agent Comms`,n=`New message`;if(e.data)try{let r=e.data.json();typeof r.title==`string`&&(t=r.title),typeof r.body==`string`&&(n=r.body)}catch{let t=e.data.text();t&&(n=t)}e.waitUntil(self.registration.showNotification(t,{body:n,data:{url:self.location.origin}}))}),self.addEventListener(`notificationclick`,e=>{e.notification.close();let t=e.notification.data,n=typeof t==`object`&&t&&`url`in t&&typeof t.url==`string`?t.url:self.location.origin;e.waitUntil(self.clients.matchAll({type:`window`,includeUncontrolled:!0}).then(async e=>{for(let t of e)if(t.url===n&&`focus`in t)return t.focus();return self.clients.openWindow(n)}))})})();
+(function(){var e=`agent-comms-v1`,t=[{"revision":"194357f4b022a304e068ddaeeb4cf799","url":"mesh-worker.js"},{"revision":"f1ee3afb8c9e8f0d7315fd93d6457316","url":"index.html"},{"revision":"f1e3596f5e09029800e9862a7cb9335a","url":"bundle.js"}].map(e=>e.url);self.addEventListener(`install`,n=>{n.waitUntil(self.caches.open(e).then(async e=>e.addAll(t)).then(async()=>self.skipWaiting()))}),self.addEventListener(`activate`,t=>{t.waitUntil(self.caches.keys().then(async t=>Promise.all(t.filter(t=>t!==e).map(async e=>self.caches.delete(e)))))});var n=200,r=300;function i(e,t){return e.method===`GET`&&t.status>=n&&t.status<r}self.addEventListener(`fetch`,t=>{if(new URL(t.request.url).pathname.startsWith(`/api/`)){t.respondWith(fetch(t.request).then(n=>{if(i(t.request,n)){let r=n.clone();self.caches.open(e).then(async e=>e.put(t.request,r))}return n}).catch(async()=>self.caches.open(e).then(async e=>e.match(t.request)).then(e=>e??new Response(`Offline`,{status:503}))));return}t.respondWith(self.caches.open(e).then(async e=>e.match(t.request)).then(async n=>n||fetch(t.request).then(n=>{if(i(t.request,n)){let r=n.clone();self.caches.open(e).then(async e=>e.put(t.request,r))}return n})))})})();

package/src/bridges/user/web/router.ts

@@ -5,7 +5,6 @@
  */
 
 import { implement } from "@orpc/server";
-import type { PushManager } from "../../../core/push-manager.js";
 import type { ChatController } from "../controller.js";
 import {
   createRoomAction,
@@ -18,8 +17,6 @@ import {
   leaveRoomAction,
   listAgentsAction,
   listRoomsAction,
-  pushSubscribeAction,
-  pushUnsubscribeAction,
   readRoomAction,
   renameAgentAction,
   sendAction,
@@ -37,7 +34,6 @@ import {
 export interface MeshRouterContext {
   controller: ChatController;
   publisher: MeshEventPublisher;
-  pushManager: PushManager | undefined;
 }
 
 /** Drops deliveryQueues -- mesh-internal replay state for offline agents, not something a browser tab needs to see -- from a MeshStore snapshot before it goes out as a state_sync event. */
@@ -110,14 +106,6 @@ export const meshRouter = {
     renameAgentAction(context.controller, input),
   ),
 
-  pushSubscribe: impl.pushSubscribe.handler(({ context, input }) =>
-    pushSubscribeAction(context.controller, context.pushManager, input),
-  ),
-
-  pushUnsubscribe: impl.pushUnsubscribe.handler(({ context, input }) =>
-    pushUnsubscribeAction(context.controller, context.pushManager, input),
-  ),
-
   getRoomMessages: impl.getRoomMessages.handler(async ({ context, input }) =>
     getRoomMessagesRead(context.controller, input),
   ),

package/src/bridges/user/web/server.ts

@@ -12,7 +12,6 @@ import * as http from "node:http";
 import { fileURLToPath } from "node:url";
 import { WebSocketServer } from "ws";
 import { RPCHandler } from "@orpc/server/websocket";
-import { PushManager } from "../../../core/push-manager.js";
 import { ChatController } from "../controller.js";
 import type { MeshStore } from "../../../core/mesh-store.js";
 import { CommsError } from "../../../core/store.js";
@@ -98,19 +97,6 @@ function frontendOrUnavailable(
   }
 }
 
-// ---------------------------------------------------------------------------
-// Active handles — needed so HTTP handlers can reach the PushManager
-// ---------------------------------------------------------------------------
-
-const activeHandles = new Set<WebServerHandle>();
-
-function findHandle(controller: ChatController): WebServerHandle | undefined {
-  for (const handle of activeHandles) {
-    if (handle.controller === controller) return handle;
-  }
-  return undefined;
-}
-
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
@@ -119,7 +105,6 @@ export interface WebServerHandle {
   server: http.Server;
   controller: ChatController;
   wss: WebSocketServer;
-  pushManager: PushManager;
   publisher: MeshEventPublisher;
   /** The address the server is bound to: loopback unless the operator opted into LAN reachability (AGENT_COMMS_WEB_HOST). */
   host: string;
@@ -232,7 +217,6 @@ export async function createWebServer(options?: {
     handleRequest(req, res, controller, webConsoleDist);
   });
 
-  const pushManager = new PushManager();
   const publisher = new MeshEventPublisher();
   ensurePatchListener(controller.meshStore, publisher);
   controller.on("message", (event: DeliveryEvent) => {
@@ -265,7 +249,7 @@ export async function createWebServer(options?: {
 
   wss.on("connection", (ws) => {
     // RPCHandler.upgrade() wants a DOM-shaped WebSocket (addEventListener's overload set), which "ws"'s own type declarations don't structurally satisfy (its addEventListener options param is narrower than DOM's) -- .message()/.close() accept the looser { send } shape "ws" does satisfy, and are the documented manual equivalent to .upgrade().
-    const context = { controller, publisher, pushManager };
+    const context = { controller, publisher };
     ws.on("message", (data, isBinary) => {
       // "ws" types incoming data as Buffer | ArrayBuffer | Buffer[] regardless of frame type; normalise to a real Buffer first so both branches below have a type they can trust rather than calling .toString()/Uint8Array.from() on a union that could be an ArrayBuffer.
       const raw = Array.isArray(data) ? Buffer.concat(data) : data;
@@ -296,7 +280,7 @@ export async function createWebServer(options?: {
     }
   });
 
-  return { server, controller, wss, pushManager, publisher, host, accessToken };
+  return { server, controller, wss, publisher, host, accessToken };
 }
 
 function requestOf(req: http.IncomingMessage): {
@@ -375,25 +359,12 @@ function announceLanAccess(
   });
 }
 
-class HandleRef {
-  constructor(public readonly handle: WebServerHandle) {
-    activeHandles.add(handle);
-  }
-
-  dispose(): void {
-    activeHandles.delete(this.handle);
-  }
-}
-
 // ---------------------------------------------------------------------------
 // Standalone mode — `npx agent-comms chat`
 // ---------------------------------------------------------------------------
 
 export async function runWeb(userName: string, port = 0): Promise<void> {
   const handle = await createWebServer({ port });
-  // Keep handle alive for cleanup — variable is intentionally unused
-  new HandleRef(handle);
-
   handle.server.on("listening", () => {
     console.log(
       `Connected as ${userName} (user) [${handle.controller.agentId}]`,
@@ -515,16 +486,6 @@ function handleRequest(
     }
   }
 
-  // VAPID public key for push subscription
-  if (url.pathname === "/api/push/vapid-key" && req.method === "GET") {
-    // Lazy-initialise PushManager on first request — this endpoint
-    // is only hit from the frontend when push is supported.
-    const handle = findHandle(controller);
-    const key = handle?.pushManager.getPublicKey() ?? "";
-    json(res, { publicKey: key });
-    return;
-  }
-
   // API routes
   if (url.pathname === "/api/agents" && req.method === "GET") {
     void (async () => {

package/src/core/index.ts

@@ -45,10 +45,6 @@ export {
   MCP_TOOL_PARAMS,
 } from "./bridge.js";
 export type { RegistrationResult } from "./bridge.js";
-export { generateVapidKeys } from "./vapid.js";
-export type { VapidKeys } from "./vapid.js";
-export { PushManager } from "./push-manager.js";
-export type { PushSubscription, PushPayload } from "./web-push.js";
 export { DiscoveryManager } from "./discovery.js";
 export type {
   DiscoveredMesh,

package/dist/core/push-manager.d.ts

@@ -1,40 +0,0 @@
-/**
- * Push subscription manager — tracks browser push subscriptions and
- * dispatches Web Push notifications when agents are offline.
- *
- * The PushManager is a standalone module — MeshStore doesn't know about it.
- * The web server bridge checks whether the target agent's WebSocket is
- * disconnected and falls back to push when a subscription exists.
- */
-import { type PushSubscription, type PushPayload } from "./web-push.js";
-export declare class PushManager {
-    private readonly vapidKeys;
-    private readonly subject;
-    private readonly subscriptions;
-    constructor(subject?: string);
-    /**
-     * Register a push subscription for a given agent ID.
-     * Overwrites any existing subscription for the same agent.
-     */
-    addSubscription(agentId: string, subscription: PushSubscription): void;
-    /**
-     * Remove a push subscription.
-     */
-    removeSubscription(agentId: string): void;
-    /**
-     * Check whether a push subscription exists for the given agent.
-     */
-    hasSubscription(agentId: string): boolean;
-    /**
-     * Send a push notification to a subscribed agent.
-     *
-     * No-ops silently if no subscription exists — callers should check
-     * hasSubscription() first if they need to distinguish the two cases.
-     */
-    sendPush(agentId: string, payload: Readonly<PushPayload>): Promise<void>;
-    /**
-     * Get the VAPID public key for the PWA to use in `pushManager.subscribe()`.
-     */
-    getPublicKey(): string;
-}
-//# sourceMappingURL=push-manager.d.ts.map

package/dist/core/push-manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"push-manager.d.ts","sourceRoot":"","sources":["../../src/core/push-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,eAAe,CAAC;AAMvB,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuC;gBAEzD,OAAO,SAAiC;IAKpD;;;OAGG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,gBAAgB,GAAG,IAAI;IAItE;;OAEG;IACH,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIzC;;OAEG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIzC;;;;;OAKG;IACG,QAAQ,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,GAC7B,OAAO,CAAC,IAAI,CAAC;IAOhB;;OAEG;IACH,YAAY,IAAI,MAAM;CAGvB"}

package/dist/core/push-manager.js

@@ -1,60 +0,0 @@
-/**
- * Push subscription manager — tracks browser push subscriptions and
- * dispatches Web Push notifications when agents are offline.
- *
- * The PushManager is a standalone module — MeshStore doesn't know about it.
- * The web server bridge checks whether the target agent's WebSocket is
- * disconnected and falls back to push when a subscription exists.
- */
-import { generateVapidKeys } from "./vapid.js";
-import { sendWebPush, } from "./web-push.js";
-// ---------------------------------------------------------------------------
-// PushManager
-// ---------------------------------------------------------------------------
-export class PushManager {
-    vapidKeys;
-    subject;
-    subscriptions = new Map();
-    constructor(subject = "mailto:agent-comms@localhost") {
-        this.vapidKeys = generateVapidKeys();
-        this.subject = subject;
-    }
-    /**
-     * Register a push subscription for a given agent ID.
-     * Overwrites any existing subscription for the same agent.
-     */
-    addSubscription(agentId, subscription) {
-        this.subscriptions.set(agentId, subscription);
-    }
-    /**
-     * Remove a push subscription.
-     */
-    removeSubscription(agentId) {
-        this.subscriptions.delete(agentId);
-    }
-    /**
-     * Check whether a push subscription exists for the given agent.
-     */
-    hasSubscription(agentId) {
-        return this.subscriptions.has(agentId);
-    }
-    /**
-     * Send a push notification to a subscribed agent.
-     *
-     * No-ops silently if no subscription exists — callers should check
-     * hasSubscription() first if they need to distinguish the two cases.
-     */
-    async sendPush(agentId, payload) {
-        const subscription = this.subscriptions.get(agentId);
-        if (!subscription)
-            return;
-        await sendWebPush(subscription, payload, this.vapidKeys, this.subject);
-    }
-    /**
-     * Get the VAPID public key for the PWA to use in `pushManager.subscribe()`.
-     */
-    getPublicKey() {
-        return this.vapidKeys.publicKey;
-    }
-}
-//# sourceMappingURL=push-manager.js.map

package/dist/core/push-manager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"push-manager.js","sourceRoot":"","sources":["../../src/core/push-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EACL,WAAW,GAGZ,MAAM,eAAe,CAAC;AAEvB,8EAA8E;AAC9E,cAAc;AACd,8EAA8E;AAE9E,MAAM,OAAO,WAAW;IACL,SAAS,CAAY;IACrB,OAAO,CAAS;IAChB,aAAa,GAAG,IAAI,GAAG,EAA4B,CAAC;IAErE,YAAY,OAAO,GAAG,8BAA8B;QAClD,IAAI,CAAC,SAAS,GAAG,iBAAiB,EAAE,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,eAAe,CAAC,OAAe,EAAE,YAA8B;QAC7D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,OAAe;QAChC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,eAAe,CAAC,OAAe;QAC7B,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,QAAQ,CACZ,OAAe,EACf,OAA8B;QAE9B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY;YAAE,OAAO;QAE1B,MAAM,WAAW,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACzE,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;IAClC,CAAC;CACF"}

package/dist/core/vapid.d.ts

@@ -1,22 +0,0 @@
-/**
- * VAPID key generation for Web Push (RFC 8292).
- *
- * Generates a P-256 EC key pair once per process lifetime and caches it
- * in memory. The public key is shared with the PWA client so it can
- * create push subscriptions; the private key signs push requests.
- */
-export interface VapidKeys {
-    /** Base64url-encoded uncompressed P-256 public key (65 bytes). */
-    publicKey: string;
-    /** Base64url-encoded P-256 private key (32 bytes). */
-    privateKey: string;
-}
-/**
- * Generate or return cached VAPID keys.
- *
- * Uses Node.js `crypto.generateKeyPairSync` with P-256, extracts the
- * raw 65-byte uncompressed public point and the 32-byte private scalar,
- * and base64url-encodes both per RFC 8291.
- */
-export declare function generateVapidKeys(): VapidKeys;
-//# sourceMappingURL=vapid.d.ts.map

package/dist/core/vapid.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vapid.d.ts","sourceRoot":"","sources":["../../src/core/vapid.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAQH,MAAM,WAAW,SAAS;IACxB,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,sDAAsD;IACtD,UAAU,EAAE,MAAM,CAAC;CACpB;AAkBD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,IAAI,SAAS,CA4B7C"}

package/dist/core/vapid.js

@@ -1,54 +0,0 @@
-/**
- * VAPID key generation for Web Push (RFC 8292).
- *
- * Generates a P-256 EC key pair once per process lifetime and caches it
- * in memory. The public key is shared with the PWA client so it can
- * create push subscriptions; the private key signs push requests.
- */
-import * as crypto from "node:crypto";
-// ---------------------------------------------------------------------------
-// Cached singleton
-// ---------------------------------------------------------------------------
-let cachedKeys;
-/** Length in bytes of an uncompressed P-256 public key point (0x04 prefix + 32-byte X + 32-byte Y). */
-const P256_PUBLIC_KEY_BYTES = 65;
-/** Length in bytes of a P-256 private scalar. */
-const P256_PRIVATE_KEY_BYTES = 32;
-// ---------------------------------------------------------------------------
-// Implementation
-// ---------------------------------------------------------------------------
-/**
- * Generate or return cached VAPID keys.
- *
- * Uses Node.js `crypto.generateKeyPairSync` with P-256, extracts the
- * raw 65-byte uncompressed public point and the 32-byte private scalar,
- * and base64url-encodes both per RFC 8291.
- */
-export function generateVapidKeys() {
-    if (cachedKeys)
-        return cachedKeys;
-    const { publicKey, privateKey } = crypto.generateKeyPairSync("ec", {
-        namedCurve: "P-256",
-    });
-    // Export public key as raw DER, extract the 65-byte uncompressed point.
-    // SPKI DER for P-256 has a 26-byte header before the 65-byte point.
-    const pubDer = publicKey.export({ type: "spki", format: "der" });
-    const publicKeyBuffer = pubDer.subarray(pubDer.length - P256_PUBLIC_KEY_BYTES);
-    // Export private key as PKCS8 DER, extract the 32-byte private scalar.
-    // PKCS8 DER for P-256 has a 39-byte header before the 32-byte scalar.
-    // The scalar is the last 32 bytes (after the leading zero pad byte).
-    const privDer = privateKey.export({ type: "pkcs8", format: "der" });
-    const privateKeyBuffer = privDer.subarray(privDer.length - P256_PRIVATE_KEY_BYTES);
-    cachedKeys = {
-        publicKey: base64url(publicKeyBuffer),
-        privateKey: base64url(privateKeyBuffer),
-    };
-    return cachedKeys;
-}
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-function base64url(buffer) {
-    return buffer.toString("base64url");
-}
-//# sourceMappingURL=vapid.js.map

package/dist/core/vapid.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"vapid.js","sourceRoot":"","sources":["../../src/core/vapid.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAatC,8EAA8E;AAC9E,mBAAmB;AACnB,8EAA8E;AAE9E,IAAI,UAAiC,CAAC;AAEtC,uGAAuG;AACvG,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC,iDAAiD;AACjD,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAElC,8EAA8E;AAC9E,iBAAiB;AACjB,8EAA8E;AAE9E;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB;IAC/B,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC;IAElC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,mBAAmB,CAAC,IAAI,EAAE;QACjE,UAAU,EAAE,OAAO;KACpB,CAAC,CAAC;IAEH,wEAAwE;IACxE,oEAAoE;IACpE,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CACrC,MAAM,CAAC,MAAM,GAAG,qBAAqB,CACtC,CAAC;IAEF,uEAAuE;IACvE,sEAAsE;IACtE,qEAAqE;IACrE,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACpE,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CACvC,OAAO,CAAC,MAAM,GAAG,sBAAsB,CACxC,CAAC;IAEF,UAAU,GAAG;QACX,SAAS,EAAE,SAAS,CAAC,eAAe,CAAC;QACrC,UAAU,EAAE,SAAS,CAAC,gBAAgB,CAAC;KACxC,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,SAAS,SAAS,CAAC,MAAc;IAC/B,OAAO,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACtC,CAAC"}

package/dist/core/web-push.d.ts

@@ -1,37 +0,0 @@
-/**
- * Web Push encryption and VAPID JWT signing (RFC 8291 + RFC 8292).
- *
- * Implements the Web Push protocol using only Node.js built-in `crypto`
- * and `https` — no external dependencies.
- *
- * Encryption flow (RFC 8291):
- *   1. Derive a shared ECDH secret from the subscription's p256dh key
- *   2. HKDF-derive the encryption key and nonce from the shared secret + auth
- *   3. Encrypt the payload with AES-128-GCM
- *   4. Prepend the sender's public key (65 bytes) to the ciphertext
- *
- * VAPID signing (RFC 8292):
- *   1. Build a JWT with sub, exp, and aud claims
- *   2. Sign with ES256 (ECDSA + P-256 + SHA-256)
- *   3. Append the public key and token to the Crypto-Key header
- */
-import type { VapidKeys } from "./vapid.js";
-export interface PushSubscription {
-    endpoint: string;
-    keys: {
-        p256dh: string;
-        auth: string;
-    };
-}
-export interface PushPayload {
-    title: string;
-    body: string;
-}
-/**
- * Send a Web Push notification.
- *
- * Encrypts the payload per RFC 8291, signs with VAPID per RFC 8292,
- * and POSTs to the push service endpoint.
- */
-export declare function sendWebPush(subscription: PushSubscription, payload: Readonly<PushPayload>, vapidKeys: Readonly<VapidKeys>, subject: string): Promise<void>;
-//# sourceMappingURL=web-push.d.ts.map

package/dist/core/web-push.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"web-push.d.ts","sourceRoot":"","sources":["../../src/core/web-push.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAOH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAM5C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACxC;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AA0BD;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,YAAY,EAAE,gBAAgB,EAC9B,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,EAC9B,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC9B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAmBf"}

package/dist/core/web-push.js

@@ -1,216 +0,0 @@
-/**
- * Web Push encryption and VAPID JWT signing (RFC 8291 + RFC 8292).
- *
- * Implements the Web Push protocol using only Node.js built-in `crypto`
- * and `https` — no external dependencies.
- *
- * Encryption flow (RFC 8291):
- *   1. Derive a shared ECDH secret from the subscription's p256dh key
- *   2. HKDF-derive the encryption key and nonce from the shared secret + auth
- *   3. Encrypt the payload with AES-128-GCM
- *   4. Prepend the sender's public key (65 bytes) to the ciphertext
- *
- * VAPID signing (RFC 8292):
- *   1. Build a JWT with sub, exp, and aud claims
- *   2. Sign with ES256 (ECDSA + P-256 + SHA-256)
- *   3. Append the public key and token to the Crypto-Key header
- */
-import * as crypto from "node:crypto";
-import * as https from "node:https";
-import * as http from "node:http";
-import { URL } from "node:url";
-// ---------------------------------------------------------------------------
-// Constants
-// ---------------------------------------------------------------------------
-const CONTENT_ENCODING = "aes128gcm";
-const KEY_LENGTH = 16;
-const NONCE_LENGTH = 12;
-const SALT_LENGTH = 16;
-const MAX_PAYLOAD_SIZE = 4078;
-const EC_UNCOMPRESSED_POINT_LENGTH = 65;
-const RECORD_SIZE = 4096;
-const RECORD_SIZE_FIELD_LENGTH = 4;
-const VAPID_JWT_EXPIRY_HOURS = 12;
-const MINUTES_PER_HOUR = 60;
-const SECONDS_PER_MINUTE = 60;
-const MS_PER_SECOND = 1000;
-const HTTPS_DEFAULT_PORT = 443;
-const HTTP_DEFAULT_PORT = 80;
-const HTTP_STATUS_OK_MIN = 200;
-const HTTP_STATUS_OK_MAX = 299;
-// ---------------------------------------------------------------------------
-// Public API
-// ---------------------------------------------------------------------------
-/**
- * Send a Web Push notification.
- *
- * Encrypts the payload per RFC 8291, signs with VAPID per RFC 8292,
- * and POSTs to the push service endpoint.
- */
-export async function sendWebPush(subscription, payload, vapidKeys, subject) {
-    const plaintext = JSON.stringify(payload);
-    const plaintextBuf = Buffer.from(plaintext, "utf-8");
-    if (plaintextBuf.length > MAX_PAYLOAD_SIZE) {
-        throw new Error(`Payload too large: ${String(plaintextBuf.length)} bytes (max ${String(MAX_PAYLOAD_SIZE)})`);
-    }
-    const encrypted = encrypt(plaintextBuf, subscription.keys);
-    const headers = buildHeaders(encrypted, subscription.endpoint, vapidKeys, subject);
-    await post(subscription.endpoint, headers, encrypted);
-}
-// ---------------------------------------------------------------------------
-// Encryption (RFC 8291)
-// ---------------------------------------------------------------------------
-function encrypt(plaintext, keys) {
-    // Decode the subscription's p256dh and auth keys
-    const recipientPubKey = base64urlDecode(keys.p256dh);
-    const authKey = base64urlDecode(keys.auth);
-    // Generate an ephemeral ECDH key pair for this message
-    const ecdh = crypto.generateKeyPairSync("ec", { namedCurve: "P-256" });
-    const senderPrivateKey = crypto.createPrivateKey({
-        key: ecdh.privateKey.export({ type: "pkcs8", format: "der" }),
-        format: "der",
-        type: "pkcs8",
-    });
-    const senderPublicDer = ecdh.publicKey.export({
-        type: "spki",
-        format: "der",
-    });
-    const senderPublicKey = senderPublicDer.subarray(senderPublicDer.length - EC_UNCOMPRESSED_POINT_LENGTH);
-    // Derive the shared secret via ECDH
-    const sharedSecret = crypto.diffieHellman({
-        privateKey: senderPrivateKey,
-        publicKey: crypto.createPublicKey({
-            key: concat(Buffer.from("3059301306072a8648ce3d020106082a8648ce3d030107034200", "hex"), recipientPubKey),
-            format: "der",
-            type: "spki",
-        }),
-    });
-    // Derive the pseudo-random key (PRK) using HKDF with auth
-    const prk = hkdfExtract(authKey, sharedSecret);
-    // Derive the encryption key and nonce
-    const keyInfo = concat(Buffer.from("Content-Encoding: aes128gcm\0", "utf-8"), senderPublicKey);
-    const nonceInfo = Buffer.from("Content-Encoding: nonce\0", "utf-8");
-    const encryptionKey = hkdfExpand(prk, keyInfo, KEY_LENGTH);
-    const nonce = hkdfExpand(prk, nonceInfo, NONCE_LENGTH);
-    // Generate a random salt
-    const salt = crypto.randomBytes(SALT_LENGTH);
-    // Pad the plaintext: plaintext + 2-byte padding delimiter (0x02 0x00 for no padding)
-    // RFC 8291 §4: record is plaintext || 0x02 || padding zeros
-    const padded = concat(plaintext, Buffer.from([0x02]));
-    // Encrypt with AES-128-GCM
-    const cipher = crypto.createCipheriv("aes-128-gcm", encryptionKey, nonce);
-    const ciphertext = cipher.update(padded);
-    const authTag = cipher.getAuthTag();
-    // RFC 8291 §4: salt (16) || rs (4, big-endian, 4096) || sender pubkey (65) || ciphertext || tag
-    const rs = Buffer.alloc(RECORD_SIZE_FIELD_LENGTH);
-    rs.writeUInt32BE(RECORD_SIZE);
-    return concat(salt, rs, senderPublicKey, ciphertext, authTag);
-}
-// ---------------------------------------------------------------------------
-// HKDF helpers
-// ---------------------------------------------------------------------------
-function hkdfExtract(salt, ikm) {
-    const hmac = crypto.createHmac("sha256", salt);
-    hmac.update(ikm);
-    return hmac.digest();
-}
-function hkdfExpand(prk, info, length) {
-    const hmac = crypto.createHmac("sha256", prk);
-    hmac.update(concat(info, Buffer.from([0x01])));
-    const t = hmac.digest();
-    return t.subarray(0, length);
-}
-// ---------------------------------------------------------------------------
-// VAPID JWT signing (RFC 8292)
-// ---------------------------------------------------------------------------
-function buildVapidJwt(audience, vapidKeys, subject) {
-    const header = base64url(Buffer.from('{"alg":"ES256","typ":"JWT"}', "utf-8"));
-    const exp = Math.floor(Date.now() / MS_PER_SECOND) +
-        VAPID_JWT_EXPIRY_HOURS * MINUTES_PER_HOUR * SECONDS_PER_MINUTE;
-    const claims = JSON.stringify({ aud: audience, exp, sub: subject });
-    const payload = base64url(Buffer.from(claims, "utf-8"));
-    const signInput = `${header}.${payload}`;
-    // Reconstruct the private key from the raw 32-byte scalar
-    // P-256 PKCS8 DER wrapper: 39 bytes header + 32 bytes scalar (with 0x00 prefix)
-    const privScalar = base64urlDecode(vapidKeys.privateKey);
-    // Build the EC private key in SEC1 DER format
-    const sec1Der = concat(Buffer.from("30770201010420", "hex"), privScalar, Buffer.from("a00a06082a8648ce3d030107a14403420004", "hex"), base64urlDecode(vapidKeys.publicKey));
-    const privateKey = crypto.createPrivateKey({
-        key: sec1Der,
-        format: "der",
-        type: "sec1",
-    });
-    const signature = crypto.sign("sha256", Buffer.from(signInput), privateKey);
-    // ECDSA signature is a DER-encoded SEQUENCE of two INTEGERs.
-    // Web Push requires base64url encoding of the raw DER.
-    const sigB64 = base64url(signature);
-    return `${signInput}.${sigB64}`;
-}
-// ---------------------------------------------------------------------------
-// HTTP headers
-// ---------------------------------------------------------------------------
-function buildHeaders(encrypted, endpoint, vapidKeys, subject) {
-    const audience = new URL(endpoint).origin;
-    const jwt = buildVapidJwt(audience, vapidKeys, subject);
-    return {
-        "Content-Type": "application/octet-stream",
-        "Content-Encoding": CONTENT_ENCODING,
-        "Content-Length": String(encrypted.length),
-        Authorization: `vapid t=${jwt}, k=${vapidKeys.publicKey}`,
-        TTL: "86400",
-        Urgency: "high",
-    };
-}
-// ---------------------------------------------------------------------------
-// HTTP POST
-// ---------------------------------------------------------------------------
-async function post(endpoint, headers, body) {
-    return new Promise((resolve, reject) => {
-        const url = new URL(endpoint);
-        const isHttps = url.protocol === "https:";
-        const mod = isHttps ? https : http;
-        const port = url.port !== ""
-            ? url.port
-            : String(isHttps ? HTTPS_DEFAULT_PORT : HTTP_DEFAULT_PORT);
-        const req = mod.request({
-            hostname: url.hostname,
-            port,
-            path: url.pathname + url.search,
-            method: "POST",
-            headers,
-        }, (res) => {
-            // Drain the response body
-            const chunks = [];
-            res.on("data", (chunk) => {
-                chunks.push(chunk);
-            });
-            res.on("end", () => {
-                if (res.statusCode !== undefined &&
-                    (res.statusCode < HTTP_STATUS_OK_MIN ||
-                        res.statusCode > HTTP_STATUS_OK_MAX)) {
-                    const responseBody = Buffer.concat(chunks).toString("utf-8");
-                    reject(new Error(`Push service returned ${String(res.statusCode)}: ${responseBody}`));
-                }
-                else {
-                    resolve();
-                }
-            });
-        });
-        req.on("error", reject);
-        req.write(body);
-        req.end();
-    });
-}
-// ---------------------------------------------------------------------------
-// Utilities
-// ---------------------------------------------------------------------------
-function base64urlDecode(input) {
-    return Buffer.from(input, "base64url");
-}
-function base64url(input) {
-    return input.toString("base64url");
-}
-function concat(...buffers) {
-    return Buffer.concat(buffers);
-}
-//# sourceMappingURL=web-push.js.map

package/dist/core/web-push.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"web-push.js","sourceRoot":"","sources":["../../src/core/web-push.ts"],"names":[],"mappings":"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"}