@markwharton/pwa-push 1.0.0 → 1.1.0

package/dist/client/deviceId.js

@@ -8,14 +8,14 @@ exports.getDeviceId = getDeviceId;
 exports.clearDeviceId = clearDeviceId;
 const DEVICE_ID_KEY = 'push_device_id';
 /**
- * Generate a UUID v4
+ * Generate a cryptographically secure UUID v4
  */
 function generateUUID() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
-        const r = (Math.random() * 16) | 0;
-        const v = c === 'x' ? r : (r & 0x3) | 0x8;
-        return v.toString(16);
-    });
+    const bytes = crypto.getRandomValues(new Uint8Array(16));
+    bytes[6] = (bytes[6] & 0x0f) | 0x40; // version 4
+    bytes[8] = (bytes[8] & 0x3f) | 0x80; // variant 1
+    const hex = [...bytes].map(b => b.toString(16).padStart(2, '0')).join('');
+    return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 }
 /**
  * Get or create a persistent device ID

package/dist/client/encoding.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Encoding utilities for push notification client
+ */
+/**
+ * Convert base64 URL-encoded string to Uint8Array
+ * Used to convert VAPID public keys for the PushManager API
+ * Works in both main thread and service worker contexts
+ */
+export declare function urlBase64ToUint8Array(base64String: string): Uint8Array<ArrayBuffer>;

package/dist/client/encoding.js

@@ -0,0 +1,24 @@
+"use strict";
+/**
+ * Encoding utilities for push notification client
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.urlBase64ToUint8Array = urlBase64ToUint8Array;
+/**
+ * Convert base64 URL-encoded string to Uint8Array
+ * Used to convert VAPID public keys for the PushManager API
+ * Works in both main thread and service worker contexts
+ */
+function urlBase64ToUint8Array(base64String) {
+    const padding = '='.repeat((4 - (base64String.length % 4)) % 4);
+    const base64 = (base64String + padding)
+        .replace(/-/g, '+')
+        .replace(/_/g, '/');
+    const rawData = atob(base64);
+    const buffer = new ArrayBuffer(rawData.length);
+    const outputArray = new Uint8Array(buffer);
+    for (let i = 0; i < rawData.length; ++i) {
+        outputArray[i] = rawData.charCodeAt(i);
+    }
+    return outputArray;
+}

package/dist/client/index.d.ts

@@ -1,4 +1,4 @@
 export { getDeviceId, clearDeviceId } from './deviceId';
 export { saveSubscriptionData, getSubscriptionData, clearSubscriptionData } from './indexedDb';
-export { getPermissionState, requestPermission, isPushSupported, subscribeToPush, unsubscribeFromPush, getCurrentSubscription } from './subscribe';
+export { getPermissionState, requestPermission, isPushSupported, toPushSubscription, subscribeToPush, unsubscribeFromPush, getCurrentSubscription } from './subscribe';
 export { handleSubscriptionChange } from './renewal';

package/dist/client/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleSubscriptionChange = exports.getCurrentSubscription = exports.unsubscribeFromPush = exports.subscribeToPush = exports.isPushSupported = exports.requestPermission = exports.getPermissionState = exports.clearSubscriptionData = exports.getSubscriptionData = exports.saveSubscriptionData = exports.clearDeviceId = exports.getDeviceId = void 0;
+exports.handleSubscriptionChange = exports.getCurrentSubscription = exports.unsubscribeFromPush = exports.subscribeToPush = exports.toPushSubscription = exports.isPushSupported = exports.requestPermission = exports.getPermissionState = exports.clearSubscriptionData = exports.getSubscriptionData = exports.saveSubscriptionData = exports.clearDeviceId = exports.getDeviceId = void 0;
 var deviceId_1 = require("./deviceId");
 Object.defineProperty(exports, "getDeviceId", { enumerable: true, get: function () { return deviceId_1.getDeviceId; } });
 Object.defineProperty(exports, "clearDeviceId", { enumerable: true, get: function () { return deviceId_1.clearDeviceId; } });
@@ -12,6 +12,7 @@ var subscribe_1 = require("./subscribe");
 Object.defineProperty(exports, "getPermissionState", { enumerable: true, get: function () { return subscribe_1.getPermissionState; } });
 Object.defineProperty(exports, "requestPermission", { enumerable: true, get: function () { return subscribe_1.requestPermission; } });
 Object.defineProperty(exports, "isPushSupported", { enumerable: true, get: function () { return subscribe_1.isPushSupported; } });
+Object.defineProperty(exports, "toPushSubscription", { enumerable: true, get: function () { return subscribe_1.toPushSubscription; } });
 Object.defineProperty(exports, "subscribeToPush", { enumerable: true, get: function () { return subscribe_1.subscribeToPush; } });
 Object.defineProperty(exports, "unsubscribeFromPush", { enumerable: true, get: function () { return subscribe_1.unsubscribeFromPush; } });
 Object.defineProperty(exports, "getCurrentSubscription", { enumerable: true, get: function () { return subscribe_1.getCurrentSubscription; } });

package/dist/client/indexedDb.js

@@ -27,44 +27,35 @@ function openDatabase() {
     });
 }
 /**
- * Save subscription data to IndexedDB (for service worker access)
+ * Execute an IndexedDB operation within a transaction
  */
-async function saveSubscriptionData(data) {
+async function withTransaction(mode, operation) {
     const db = await openDatabase();
     return new Promise((resolve, reject) => {
-        const transaction = db.transaction(STORE_NAME, 'readwrite');
+        const transaction = db.transaction(STORE_NAME, mode);
         const store = transaction.objectStore(STORE_NAME);
-        const request = store.put(data, DATA_KEY);
+        const request = operation(store);
         request.onerror = () => reject(request.error);
-        request.onsuccess = () => resolve();
+        request.onsuccess = () => resolve(request.result);
         transaction.oncomplete = () => db.close();
     });
 }
+/**
+ * Save subscription data to IndexedDB (for service worker access)
+ */
+function saveSubscriptionData(data) {
+    return withTransaction('readwrite', (store) => store.put(data, DATA_KEY));
+}
 /**
  * Get subscription data from IndexedDB
  */
 async function getSubscriptionData() {
-    const db = await openDatabase();
-    return new Promise((resolve, reject) => {
-        const transaction = db.transaction(STORE_NAME, 'readonly');
-        const store = transaction.objectStore(STORE_NAME);
-        const request = store.get(DATA_KEY);
-        request.onerror = () => reject(request.error);
-        request.onsuccess = () => resolve(request.result || null);
-        transaction.oncomplete = () => db.close();
-    });
+    const result = await withTransaction('readonly', (store) => store.get(DATA_KEY));
+    return result || null;
 }
 /**
  * Clear subscription data from IndexedDB
  */
-async function clearSubscriptionData() {
-    const db = await openDatabase();
-    return new Promise((resolve, reject) => {
-        const transaction = db.transaction(STORE_NAME, 'readwrite');
-        const store = transaction.objectStore(STORE_NAME);
-        const request = store.delete(DATA_KEY);
-        request.onerror = () => reject(request.error);
-        request.onsuccess = () => resolve();
-        transaction.oncomplete = () => db.close();
-    });
+function clearSubscriptionData() {
+    return withTransaction('readwrite', (store) => store.delete(DATA_KEY));
 }

package/dist/client/renewal.d.ts

@@ -2,6 +2,7 @@
  * Push subscription renewal handler for service worker
  * Handles the 'pushsubscriptionchange' event when browser rotates subscriptions
  */
+import { PushSubscription } from '../types';
 /**
  * Handle pushsubscriptionchange event in service worker
  * Call this from your service worker's event listener

package/dist/client/renewal.js

@@ -5,7 +5,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleSubscriptionChange = handleSubscriptionChange;
+const encoding_1 = require("./encoding");
 const indexedDb_1 = require("./indexedDb");
+const subscribe_1 = require("./subscribe");
 /**
  * Handle pushsubscriptionchange event in service worker
  * Call this from your service worker's event listener
@@ -31,7 +33,7 @@ async function handleSubscriptionChange(event, renewEndpoint) {
             console.error('Failed to create new subscription');
             return false;
         }
-        // Build renewal request
+        // Build renewal request (uses SubscriptionRequest type)
         const renewalRequest = {
             subscription: newSubscription,
             deviceId: data.deviceId,
@@ -62,38 +64,15 @@ async function resubscribe(data) {
     try {
         const self = globalThis;
         const registration = self.registration;
-        const applicationServerKey = urlBase64ToUint8Array(data.publicKey);
+        const applicationServerKey = (0, encoding_1.urlBase64ToUint8Array)(data.publicKey);
         const subscription = await registration.pushManager.subscribe({
             userVisibleOnly: true,
             applicationServerKey
         });
-        const json = subscription.toJSON();
-        return {
-            endpoint: subscription.endpoint,
-            keys: {
-                p256dh: json.keys?.p256dh || '',
-                auth: json.keys?.auth || ''
-            }
-        };
+        return (0, subscribe_1.toPushSubscription)(subscription);
     }
     catch (error) {
         console.error('Resubscribe failed:', error);
         return null;
     }
 }
-/**
- * Convert base64 URL-encoded string to Uint8Array (service worker version)
- */
-function urlBase64ToUint8Array(base64String) {
-    const padding = '='.repeat((4 - (base64String.length % 4)) % 4);
-    const base64 = (base64String + padding)
-        .replace(/-/g, '+')
-        .replace(/_/g, '/');
-    const rawData = atob(base64);
-    const buffer = new ArrayBuffer(rawData.length);
-    const outputArray = new Uint8Array(buffer);
-    for (let i = 0; i < rawData.length; ++i) {
-        outputArray[i] = rawData.charCodeAt(i);
-    }
-    return outputArray;
-}

package/dist/client/subscribe.d.ts

@@ -1,7 +1,7 @@
 /**
  * Push subscription helpers for main thread
  */
-import { PushSubscription, SubscriptionRequest, PushPermissionState } from '../types';
+import { PushSubscription, SubscriptionRequest, PushPermissionState, ClientResult } from '../types';
 /**
  * Check current notification permission state
  */
@@ -14,16 +14,26 @@ export declare function requestPermission(): Promise<PushPermissionState>;
  * Check if push notifications are supported
  */
 export declare function isPushSupported(): boolean;
+/**
+ * Convert browser PushSubscription to our format
+ * Works in both main thread and service worker contexts
+ */
+export declare function toPushSubscription(browserSub: globalThis.PushSubscription): PushSubscription;
 /**
  * Subscribe to push notifications
- * Returns subscription request ready to send to backend
+ *
+ * @returns Result with subscription request ready to send to backend
  */
-export declare function subscribeToPush(vapidPublicKey: string, basePath?: string): Promise<SubscriptionRequest | null>;
+export declare function subscribeToPush(vapidPublicKey: string, basePath?: string): Promise<ClientResult<SubscriptionRequest>>;
 /**
  * Unsubscribe from push notifications
+ *
+ * @returns Result indicating success or failure
  */
-export declare function unsubscribeFromPush(): Promise<boolean>;
+export declare function unsubscribeFromPush(): Promise<ClientResult<void>>;
 /**
  * Get current push subscription if exists
+ *
+ * @returns Result with current subscription, or error if not subscribed
  */
-export declare function getCurrentSubscription(): Promise<PushSubscription | null>;
+export declare function getCurrentSubscription(): Promise<ClientResult<PushSubscription>>;

package/dist/client/subscribe.js

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPermissionState = getPermissionState;
 exports.requestPermission = requestPermission;
 exports.isPushSupported = isPushSupported;
+exports.toPushSubscription = toPushSubscription;
 exports.subscribeToPush = subscribeToPush;
 exports.unsubscribeFromPush = unsubscribeFromPush;
 exports.getCurrentSubscription = getCurrentSubscription;
 const deviceId_1 = require("./deviceId");
 const indexedDb_1 = require("./indexedDb");
+const encoding_1 = require("./encoding");
 /**
  * Check current notification permission state
  */
@@ -32,6 +34,7 @@ function isPushSupported() {
 }
 /**
  * Convert browser PushSubscription to our format
+ * Works in both main thread and service worker contexts
  */
 function toPushSubscription(browserSub) {
     const json = browserSub.toJSON();
@@ -45,40 +48,50 @@ function toPushSubscription(browserSub) {
 }
 /**
  * Subscribe to push notifications
- * Returns subscription request ready to send to backend
+ *
+ * @returns Result with subscription request ready to send to backend
  */
 async function subscribeToPush(vapidPublicKey, basePath = '/') {
     if (!isPushSupported()) {
-        console.error('Push notifications not supported');
-        return null;
+        return { ok: false, error: 'Push notifications not supported' };
     }
     const permission = await requestPermission();
     if (permission !== 'granted') {
-        console.warn('Push permission denied');
-        return null;
+        return { ok: false, error: 'Push permission denied' };
+    }
+    try {
+        const registration = await navigator.serviceWorker.ready;
+        const deviceId = (0, deviceId_1.getDeviceId)();
+        // Convert VAPID key to Uint8Array
+        const applicationServerKey = (0, encoding_1.urlBase64ToUint8Array)(vapidPublicKey);
+        const browserSub = await registration.pushManager.subscribe({
+            userVisibleOnly: true,
+            applicationServerKey
+        });
+        // Save data for service worker renewal
+        await (0, indexedDb_1.saveSubscriptionData)({
+            publicKey: vapidPublicKey,
+            deviceId,
+            basePath
+        });
+        return {
+            ok: true,
+            data: {
+                subscription: toPushSubscription(browserSub),
+                deviceId,
+                basePath
+            }
+        };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'Subscription failed';
+        return { ok: false, error: message };
     }
-    const registration = await navigator.serviceWorker.ready;
-    const deviceId = (0, deviceId_1.getDeviceId)();
-    // Convert VAPID key to Uint8Array
-    const applicationServerKey = urlBase64ToUint8Array(vapidPublicKey);
-    const browserSub = await registration.pushManager.subscribe({
-        userVisibleOnly: true,
-        applicationServerKey
-    });
-    // Save data for service worker renewal
-    await (0, indexedDb_1.saveSubscriptionData)({
-        publicKey: vapidPublicKey,
-        deviceId,
-        basePath
-    });
-    return {
-        subscription: toPushSubscription(browserSub),
-        deviceId,
-        basePath
-    };
 }
 /**
  * Unsubscribe from push notifications
+ *
+ * @returns Result indicating success or failure
  */
 async function unsubscribeFromPush() {
     try {
@@ -87,42 +100,29 @@ async function unsubscribeFromPush() {
         if (subscription) {
             await subscription.unsubscribe();
         }
-        return true;
+        return { ok: true };
     }
     catch (error) {
-        console.error('Unsubscribe failed:', error);
-        return false;
+        const message = error instanceof Error ? error.message : 'Unsubscribe failed';
+        return { ok: false, error: message };
     }
 }
 /**
  * Get current push subscription if exists
+ *
+ * @returns Result with current subscription, or error if not subscribed
  */
 async function getCurrentSubscription() {
     try {
         const registration = await navigator.serviceWorker.ready;
         const subscription = await registration.pushManager.getSubscription();
         if (!subscription) {
-            return null;
+            return { ok: false, error: 'No active subscription' };
         }
-        return toPushSubscription(subscription);
-    }
-    catch {
-        return null;
+        return { ok: true, data: toPushSubscription(subscription) };
     }
-}
-/**
- * Convert base64 URL-encoded string to Uint8Array
- */
-function urlBase64ToUint8Array(base64String) {
-    const padding = '='.repeat((4 - (base64String.length % 4)) % 4);
-    const base64 = (base64String + padding)
-        .replace(/-/g, '+')
-        .replace(/_/g, '/');
-    const rawData = window.atob(base64);
-    const buffer = new ArrayBuffer(rawData.length);
-    const outputArray = new Uint8Array(buffer);
-    for (let i = 0; i < rawData.length; ++i) {
-        outputArray[i] = rawData.charCodeAt(i);
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'Failed to get subscription';
+        return { ok: false, error: message };
     }
-    return outputArray;
 }

package/dist/server/send.d.ts

@@ -18,15 +18,18 @@ export declare function initPushFromEnv(): void;
 export declare function getVapidPublicKey(): string;
 /**
  * Send a push notification to a single subscription
+ *
+ * @returns Result with ok status, or error details on failure
  */
-export declare function sendPushNotification(subscription: PushSubscription, payload: NotificationPayload): Promise<boolean>;
+export declare function sendPushNotification(subscription: PushSubscription, payload: NotificationPayload): Promise<SendResult>;
 /**
  * Send a push notification to multiple subscriptions
- * Returns array of results
+ * Returns array of results, one per subscription
  */
 export declare function sendPushToAll(subscriptions: PushSubscription[], payload: NotificationPayload): Promise<SendResult[]>;
 /**
  * Send push notification with detailed error information
+ * Auto-injects basePath from subscription to payload if not already set
  */
 export declare function sendPushWithDetails(subscription: PushSubscription, payload: NotificationPayload): Promise<SendResult>;
 /**

package/dist/server/send.js

@@ -51,14 +51,15 @@ function getVapidPublicKey() {
 }
 /**
  * Send a push notification to a single subscription
+ *
+ * @returns Result with ok status, or error details on failure
  */
 async function sendPushNotification(subscription, payload) {
-    const result = await sendPushWithDetails(subscription, payload);
-    return result.success;
+    return sendPushWithDetails(subscription, payload);
 }
 /**
  * Send a push notification to multiple subscriptions
- * Returns array of results
+ * Returns array of results, one per subscription
  */
 async function sendPushToAll(subscriptions, payload) {
     const results = await Promise.all(subscriptions.map(sub => sendPushWithDetails(sub, payload)));
@@ -66,19 +67,25 @@ async function sendPushToAll(subscriptions, payload) {
 }
 /**
  * Send push notification with detailed error information
+ * Auto-injects basePath from subscription to payload if not already set
  */
 async function sendPushWithDetails(subscription, payload) {
     if (!vapidConfig) {
-        return { success: false, error: 'Push not initialized' };
+        return { ok: false, error: 'Push not initialized' };
     }
+    // Auto-inject basePath from subscription if not set in payload
+    const payloadWithBasePath = {
+        ...payload,
+        basePath: payload.basePath ?? subscription.basePath ?? '/'
+    };
     try {
-        await web_push_1.default.sendNotification(subscription, JSON.stringify(payload));
-        return { success: true };
+        await web_push_1.default.sendNotification(subscription, JSON.stringify(payloadWithBasePath));
+        return { ok: true };
     }
     catch (error) {
         const webPushError = error;
         return {
-            success: false,
+            ok: false,
             error: webPushError.message || 'Unknown error',
             statusCode: webPushError.statusCode
         };

package/dist/types.d.ts

@@ -7,6 +7,7 @@ export interface PushSubscription {
         p256dh: string;
         auth: string;
     };
+    basePath?: string;
 }
 export interface NotificationPayload {
     title: string;
@@ -15,23 +16,34 @@ export interface NotificationPayload {
     url?: string;
     tag?: string;
     data?: Record<string, unknown>;
+    id?: string;
+    timestamp?: string;
+    basePath?: string;
 }
 export interface VapidConfig {
     publicKey: string;
     privateKey: string;
     subject: string;
 }
+/**
+ * Result type for push operations.
+ * Aligned with Result<T> pattern from @markwharton/pwa-core
+ */
 export interface SendResult {
-    success: boolean;
+    ok: boolean;
     error?: string;
     statusCode?: number;
 }
-export interface SubscriptionRequest {
-    subscription: PushSubscription;
-    deviceId: string;
-    basePath?: string;
+/**
+ * Generic result type for client operations.
+ * Aligned with Result<T> pattern from @markwharton/pwa-core
+ */
+export interface ClientResult<T> {
+    ok: boolean;
+    data?: T;
+    error?: string;
 }
-export interface RenewalRequest {
+export interface SubscriptionRequest {
     subscription: PushSubscription;
     deviceId: string;
     basePath?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markwharton/pwa-push",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Web push notifications for Azure PWA projects",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",