@markwharton/pwa-push 1.5.0 → 1.5.2

package/dist/__tests__/client/renewal.test.js

@@ -81,13 +81,13 @@ const mockRegistration = {
 (0, vitest_1.describe)('Push subscription renewal', () => {
     (0, vitest_1.describe)('handleSubscriptionChange', () => {
         const mockEvent = {};
-        (0, vitest_1.it)('returns false when no stored data', async () => {
+        (0, vitest_1.it)('returns error when no stored data', async () => {
             const { getSubscriptionData } = await Promise.resolve().then(() => __importStar(require('../../client/indexedDb')));
             vitest_1.vi.mocked(getSubscriptionData).mockResolvedValue(null);
             const { handleSubscriptionChange } = await Promise.resolve().then(() => __importStar(require('../../client/renewal')));
             const result = await handleSubscriptionChange(mockEvent, '/api/renew');
-            (0, vitest_1.expect)(result).toBe(false);
-            (0, vitest_1.expect)(console.error).toHaveBeenCalledWith('No subscription data found for renewal');
+            (0, vitest_1.expect)(result.ok).toBe(false);
+            (0, vitest_1.expect)(result.error).toBe('No subscription data found for renewal');
         });
         (0, vitest_1.it)('renews subscription successfully', async () => {
             const { getSubscriptionData } = await Promise.resolve().then(() => __importStar(require('../../client/indexedDb')));
@@ -98,15 +98,14 @@ const mockRegistration = {
             });
             const { handleSubscriptionChange } = await Promise.resolve().then(() => __importStar(require('../../client/renewal')));
             const result = await handleSubscriptionChange(mockEvent, '/api/renew');
-            (0, vitest_1.expect)(result).toBe(true);
+            (0, vitest_1.expect)(result.ok).toBe(true);
             (0, vitest_1.expect)(fetch).toHaveBeenCalledWith('/api/renew', {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: vitest_1.expect.stringContaining('test-device-id')
             });
-            (0, vitest_1.expect)(console.log).toHaveBeenCalledWith('Push subscription renewed successfully');
         });
-        (0, vitest_1.it)('returns false when resubscribe fails', async () => {
+        (0, vitest_1.it)('returns error when resubscribe fails', async () => {
             const { getSubscriptionData } = await Promise.resolve().then(() => __importStar(require('../../client/indexedDb')));
             vitest_1.vi.mocked(getSubscriptionData).mockResolvedValue({
                 publicKey: 'test-key',
@@ -116,10 +115,10 @@ const mockRegistration = {
             mockPushManager.subscribe.mockRejectedValueOnce(new Error('Failed'));
             const { handleSubscriptionChange } = await Promise.resolve().then(() => __importStar(require('../../client/renewal')));
             const result = await handleSubscriptionChange(mockEvent, '/api/renew');
-            (0, vitest_1.expect)(result).toBe(false);
-            (0, vitest_1.expect)(console.error).toHaveBeenCalledWith('Failed to create new subscription');
+            (0, vitest_1.expect)(result.ok).toBe(false);
+            (0, vitest_1.expect)(result.error).toBe('Failed to create new subscription');
         });
-        (0, vitest_1.it)('returns false when backend request fails', async () => {
+        (0, vitest_1.it)('returns error when backend request fails', async () => {
             const { getSubscriptionData } = await Promise.resolve().then(() => __importStar(require('../../client/indexedDb')));
             vitest_1.vi.mocked(getSubscriptionData).mockResolvedValue({
                 publicKey: 'test-key',
@@ -132,8 +131,8 @@ const mockRegistration = {
             });
             const { handleSubscriptionChange } = await Promise.resolve().then(() => __importStar(require('../../client/renewal')));
             const result = await handleSubscriptionChange(mockEvent, '/api/renew');
-            (0, vitest_1.expect)(result).toBe(false);
-            (0, vitest_1.expect)(console.error).toHaveBeenCalledWith('Renewal request failed:', 500);
+            (0, vitest_1.expect)(result.ok).toBe(false);
+            (0, vitest_1.expect)(result.error).toBe('Renewal request failed: 500');
         });
         (0, vitest_1.it)('sends correct renewal request body', async () => {
             const { getSubscriptionData } = await Promise.resolve().then(() => __importStar(require('../../client/indexedDb')));
@@ -164,8 +163,8 @@ const mockRegistration = {
             global.fetch.mockRejectedValueOnce(new Error('Network error'));
             const { handleSubscriptionChange } = await Promise.resolve().then(() => __importStar(require('../../client/renewal')));
             const result = await handleSubscriptionChange(mockEvent, '/api/renew');
-            (0, vitest_1.expect)(result).toBe(false);
-            (0, vitest_1.expect)(console.error).toHaveBeenCalledWith('Subscription renewal failed:', vitest_1.expect.any(Error));
+            (0, vitest_1.expect)(result.ok).toBe(false);
+            (0, vitest_1.expect)(result.error).toBe('Network error');
         });
     });
 });

package/dist/__tests__/client/subscribe.test.js

@@ -40,7 +40,8 @@ function mockClientDependencies() {
         getDeviceId: vitest_1.vi.fn(() => 'mock-device-id')
     }));
     vitest_1.vi.mock('../../client/indexedDb', () => ({
-        saveSubscriptionData: vitest_1.vi.fn(() => Promise.resolve())
+        saveSubscriptionData: vitest_1.vi.fn(() => Promise.resolve()),
+        clearSubscriptionData: vitest_1.vi.fn(() => Promise.resolve())
     }));
     vitest_1.vi.mock('../../client/encoding', () => ({
         urlBase64ToUint8Array: vitest_1.vi.fn(() => new Uint8Array([1, 2, 3]))
@@ -237,11 +238,19 @@ function setupEmptyNavigator() {
             (0, vitest_1.expect)(result.ok).toBe(true);
             (0, vitest_1.expect)(mockSubscription.unsubscribe).toHaveBeenCalled();
         });
+        (0, vitest_1.it)('clears subscription data from IndexedDB', async () => {
+            const { clearSubscriptionData } = await Promise.resolve().then(() => __importStar(require('../../client/indexedDb')));
+            const { unsubscribeFromPush } = await Promise.resolve().then(() => __importStar(require('../../client/subscribe')));
+            await unsubscribeFromPush();
+            (0, vitest_1.expect)(clearSubscriptionData).toHaveBeenCalled();
+        });
         (0, vitest_1.it)('succeeds when no subscription exists', async () => {
             mockPushManager.getSubscription.mockResolvedValueOnce(null);
+            const { clearSubscriptionData } = await Promise.resolve().then(() => __importStar(require('../../client/indexedDb')));
             const { unsubscribeFromPush } = await Promise.resolve().then(() => __importStar(require('../../client/subscribe')));
             const result = await unsubscribeFromPush();
             (0, vitest_1.expect)(result.ok).toBe(true);
+            (0, vitest_1.expect)(clearSubscriptionData).toHaveBeenCalled();
         });
         (0, vitest_1.it)('handles unsubscribe error', async () => {
             mockPushManager.getSubscription.mockRejectedValueOnce(new Error('Failed'));

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 { Result } from '@markwharton/pwa-core/types';
 import { PushSubscription } from '../shared';
 /**
  * Handles the pushsubscriptionchange event in a service worker.
@@ -9,14 +10,14 @@ import { PushSubscription } from '../shared';
  * rotates push subscriptions (typically for security reasons).
  * @param event - The pushsubscriptionchange event from the service worker
  * @param renewEndpoint - The backend endpoint to send the renewal request to
- * @returns True if renewal succeeded, false otherwise
+ * @returns Result with ok=true on success, or error message on failure
  * @example
  * // In your service worker (sw.js):
  * self.addEventListener('pushsubscriptionchange', (event) => {
  *   event.waitUntil(handleSubscriptionChange(event, '/api/push/renew'));
  * });
  */
-export declare function handleSubscriptionChange(event: PushSubscriptionChangeEvent, renewEndpoint: string): Promise<boolean>;
+export declare function handleSubscriptionChange(event: PushSubscriptionChangeEvent, renewEndpoint: string): Promise<Result<void>>;
 /**
  * Type definition for the pushsubscriptionchange event.
  * Fired when the browser rotates push subscriptions.

package/dist/client/renewal.js

@@ -5,6 +5,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleSubscriptionChange = handleSubscriptionChange;
+const types_1 = require("@markwharton/pwa-core/types");
 const encoding_1 = require("./encoding");
 const indexedDb_1 = require("./indexedDb");
 const subscribe_1 = require("./subscribe");
@@ -14,7 +15,7 @@ const subscribe_1 = require("./subscribe");
  * rotates push subscriptions (typically for security reasons).
  * @param event - The pushsubscriptionchange event from the service worker
  * @param renewEndpoint - The backend endpoint to send the renewal request to
- * @returns True if renewal succeeded, false otherwise
+ * @returns Result with ok=true on success, or error message on failure
  * @example
  * // In your service worker (sw.js):
  * self.addEventListener('pushsubscriptionchange', (event) => {
@@ -26,14 +27,12 @@ async function handleSubscriptionChange(event, renewEndpoint) {
         // Get stored data from IndexedDB
         const data = await (0, indexedDb_1.getSubscriptionData)();
         if (!data) {
-            console.error('No subscription data found for renewal');
-            return false;
+            return (0, types_1.err)('No subscription data found for renewal');
         }
         // Resubscribe with same VAPID key
         const newSubscription = await resubscribe(data);
         if (!newSubscription) {
-            console.error('Failed to create new subscription');
-            return false;
+            return (0, types_1.err)('Failed to create new subscription');
         }
         // Build renewal request (uses SubscriptionRequest type)
         const renewalRequest = {
@@ -48,15 +47,13 @@ async function handleSubscriptionChange(event, renewEndpoint) {
             body: JSON.stringify(renewalRequest)
         });
         if (!response.ok) {
-            console.error('Renewal request failed:', response.status);
-            return false;
+            return (0, types_1.err)(`Renewal request failed: ${response.status}`);
         }
-        console.log('Push subscription renewed successfully');
-        return true;
+        return (0, types_1.okVoid)();
     }
     catch (error) {
-        console.error('Subscription renewal failed:', error);
-        return false;
+        const message = error instanceof Error ? error.message : 'Subscription renewal failed';
+        return (0, types_1.err)(message);
     }
 }
 /**

package/dist/client/subscribe.d.ts

@@ -64,7 +64,7 @@ export declare function toPushSubscription(browserSub: globalThis.PushSubscripti
 export declare function subscribeToPush(vapidPublicKey: string, basePath?: string): Promise<Result<SubscriptionRequest>>;
 /**
  * Unsubscribes from push notifications.
- * Removes the browser push subscription if one exists.
+ * Removes the browser push subscription and clears stored subscription data.
  * @returns Result with ok=true on success, or error message on failure
  * @example
  * const result = await unsubscribeFromPush();

package/dist/client/subscribe.js

@@ -124,7 +124,7 @@ async function subscribeToPush(vapidPublicKey, basePath = '/') {
 }
 /**
  * Unsubscribes from push notifications.
- * Removes the browser push subscription if one exists.
+ * Removes the browser push subscription and clears stored subscription data.
  * @returns Result with ok=true on success, or error message on failure
  * @example
  * const result = await unsubscribeFromPush();
@@ -139,6 +139,8 @@ async function unsubscribeFromPush() {
         if (subscription) {
             await subscription.unsubscribe();
         }
+        // Clear stored subscription data from IndexedDB
+        await (0, indexedDb_1.clearSubscriptionData)();
         return (0, types_1.okVoid)();
     }
     catch (error) {

package/dist/pwa-push-sw.js

@@ -37,15 +37,15 @@ var PwaPush = (() => {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.ok = ok2;
-      exports.okVoid = okVoid2;
-      exports.err = err2;
+      exports.okVoid = okVoid3;
+      exports.err = err3;
       function ok2(data) {
         return { ok: true, data };
       }
-      function okVoid2() {
+      function okVoid3() {
         return { ok: true };
       }
-      function err2(error, statusCode) {
+      function err3(error, statusCode) {
         return statusCode !== void 0 ? { ok: false, error, statusCode } : { ok: false, error };
       }
     }
@@ -57,6 +57,9 @@ var PwaPush = (() => {
     handleSubscriptionChange: () => handleSubscriptionChange
   });
 
+  // src/client/renewal.ts
+  var import_types2 = __toESM(require_types());
+
   // src/client/encoding.ts
   function urlBase64ToUint8Array(base64String) {
     const padding = "=".repeat((4 - base64String.length % 4) % 4);
@@ -124,13 +127,11 @@ var PwaPush = (() => {
     try {
       const data = await getSubscriptionData();
       if (!data) {
-        console.error("No subscription data found for renewal");
-        return false;
+        return (0, import_types2.err)("No subscription data found for renewal");
       }
       const newSubscription = await resubscribe(data);
       if (!newSubscription) {
-        console.error("Failed to create new subscription");
-        return false;
+        return (0, import_types2.err)("Failed to create new subscription");
       }
       const renewalRequest = {
         subscription: newSubscription,
@@ -143,14 +144,12 @@ var PwaPush = (() => {
         body: JSON.stringify(renewalRequest)
       });
       if (!response.ok) {
-        console.error("Renewal request failed:", response.status);
-        return false;
+        return (0, import_types2.err)(`Renewal request failed: ${response.status}`);
       }
-      console.log("Push subscription renewed successfully");
-      return true;
+      return (0, import_types2.okVoid)();
     } catch (error) {
-      console.error("Subscription renewal failed:", error);
-      return false;
+      const message = error instanceof Error ? error.message : "Subscription renewal failed";
+      return (0, import_types2.err)(message);
     }
   }
   async function resubscribe(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markwharton/pwa-push",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Web push notifications for Azure PWA projects",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,11 +30,11 @@
     "clean": "rm -rf dist"
   },
   "peerDependencies": {
-    "@markwharton/pwa-core": "^1.1.0",
+    "@markwharton/pwa-core": "^1.7.0",
     "web-push": "^3.6.0"
   },
   "devDependencies": {
-    "@markwharton/pwa-core": "^1.1.0",
+    "@markwharton/pwa-core": "^1.7.0",
     "@types/node": "^20.10.0",
     "@types/web-push": "^3.6.4",
     "esbuild": "^0.27.2",