@markwharton/pwa-core 1.0.0 → 1.1.0

package/dist/auth/apiKey.d.ts

@@ -1,3 +1,4 @@
+import { Result } from '../types';
 /**
  * API Key utilities for machine-to-machine authentication
  */
@@ -16,8 +17,10 @@ export declare function extractApiKey(request: {
 export declare function hashApiKey(apiKey: string): string;
 /**
  * Validate API key against stored hash
+ *
+ * @returns Result indicating success or failure with error message
  */
-export declare function validateApiKey(apiKey: string, storedHash: string): boolean;
+export declare function validateApiKey(apiKey: string, storedHash: string): Result<void>;
 /**
  * Generate a new API key (random 32-byte hex string)
  */

package/dist/auth/apiKey.js

@@ -5,6 +5,7 @@ exports.hashApiKey = hashApiKey;
 exports.validateApiKey = validateApiKey;
 exports.generateApiKey = generateApiKey;
 const crypto_1 = require("crypto");
+const types_1 = require("../types");
 /**
  * API Key utilities for machine-to-machine authentication
  */
@@ -23,10 +24,15 @@ function hashApiKey(apiKey) {
 }
 /**
  * Validate API key against stored hash
+ *
+ * @returns Result indicating success or failure with error message
  */
 function validateApiKey(apiKey, storedHash) {
     const keyHash = hashApiKey(apiKey);
-    return keyHash === storedHash;
+    if (keyHash === storedHash) {
+        return (0, types_1.okVoid)();
+    }
+    return (0, types_1.err)('Invalid API key');
 }
 /**
  * Generate a new API key (random 32-byte hex string)

package/dist/auth/token.d.ts

@@ -1,3 +1,4 @@
+import { Result } from '../types';
 /**
  * Initialize JWT secret - call once at startup
  * Fails fast if secret is missing or too short
@@ -14,8 +15,10 @@ export declare function extractToken(authHeader: string | null): string | null;
 /**
  * Validate and decode a JWT token
  * Generic type allows project-specific payload shapes
+ *
+ * @returns Result with decoded payload or error message
  */
-export declare function validateToken<T extends object>(token: string): T | null;
+export declare function validateToken<T extends object>(token: string): Result<T>;
 /**
  * Generate a JWT token with custom payload
  */

package/dist/auth/token.js

@@ -10,6 +10,7 @@ exports.validateToken = validateToken;
 exports.generateToken = generateToken;
 exports.generateLongLivedToken = generateLongLivedToken;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const types_1 = require("../types");
 /**
  * JWT token utilities - works with any payload structure
  * Use BaseJwtPayload or extend it for type safety
@@ -46,17 +47,20 @@ function extractToken(authHeader) {
 /**
  * Validate and decode a JWT token
  * Generic type allows project-specific payload shapes
+ *
+ * @returns Result with decoded payload or error message
  */
 function validateToken(token) {
     try {
         const payload = jsonwebtoken_1.default.verify(token, getJwtSecret());
         if (typeof payload === 'object' && payload !== null) {
-            return payload;
+            return (0, types_1.ok)(payload);
         }
-        return null;
+        return (0, types_1.err)('Invalid token payload');
     }
-    catch {
-        return null;
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'Token validation failed';
+        return (0, types_1.err)(message);
     }
 }
 /**

package/dist/client/api.d.ts

@@ -1,3 +1,4 @@
+import { ApiResponse } from './types';
 /**
  * Initialize the API client
  */
@@ -5,15 +6,6 @@ export declare function initApiClient(config: {
     getToken: () => string | null;
     onUnauthorized?: () => void;
 }): void;
-/**
- * API response wrapper
- */
-export interface ApiResponse<T> {
-    ok: boolean;
-    status: number;
-    data?: T;
-    error?: string;
-}
 /**
  * Make an authenticated API call
  */
@@ -40,5 +32,6 @@ export declare function apiPatch<T>(url: string, body?: unknown): Promise<T>;
 export declare function apiDelete<T>(url: string): Promise<T>;
 /**
  * Alternative: Response wrapper style (like financial-tracker's authJsonFetch)
+ * Preserves actual HTTP status code on success
  */
 export declare function apiCallSafe<T>(url: string, options?: RequestInit): Promise<ApiResponse<T>>;

package/dist/client/api.js

@@ -8,7 +8,7 @@ exports.apiPut = apiPut;
 exports.apiPatch = apiPatch;
 exports.apiDelete = apiDelete;
 exports.apiCallSafe = apiCallSafe;
-const ApiError_1 = require("./ApiError");
+const apiError_1 = require("./apiError");
 /**
  * Client-side API utilities for authenticated requests
  */
@@ -51,7 +51,7 @@ async function apiCall(url, options = {}) {
         catch {
             // Ignore JSON parse errors
         }
-        throw new ApiError_1.ApiError(response.status, errorMessage);
+        throw new apiError_1.ApiError(response.status, errorMessage);
     }
     // Handle empty responses
     const text = await response.text();
@@ -101,16 +101,42 @@ async function apiDelete(url) {
 }
 /**
  * Alternative: Response wrapper style (like financial-tracker's authJsonFetch)
+ * Preserves actual HTTP status code on success
  */
 async function apiCallSafe(url, options = {}) {
-    try {
-        const data = await apiCall(url, options);
-        return { ok: true, status: 200, data };
+    const token = getToken?.();
+    const headers = {
+        'Content-Type': 'application/json',
+        ...options.headers
+    };
+    if (token) {
+        headers['Authorization'] = `Bearer ${token}`;
     }
-    catch (error) {
-        if (error instanceof ApiError_1.ApiError) {
-            return { ok: false, status: error.status, error: error.message };
+    try {
+        const response = await fetch(url, {
+            ...options,
+            headers
+        });
+        if (!response.ok) {
+            if (response.status === 401 && onUnauthorized) {
+                onUnauthorized();
+            }
+            let errorMessage = 'Request failed';
+            try {
+                const errorData = (await response.json());
+                errorMessage = errorData.error || errorMessage;
+            }
+            catch {
+                // Ignore JSON parse errors
+            }
+            return { ok: false, status: response.status, error: errorMessage };
         }
+        // Handle empty responses
+        const text = await response.text();
+        const data = text ? JSON.parse(text) : undefined;
+        return { ok: true, status: response.status, data };
+    }
+    catch {
         return { ok: false, status: 0, error: 'Network error' };
     }
 }

package/dist/client/index.d.ts

@@ -1,2 +1,3 @@
-export { ApiError } from './ApiError';
-export { initApiClient, type ApiResponse, apiCall, apiGet, apiPost, apiPut, apiPatch, apiDelete, apiCallSafe } from './api';
+export { ApiError } from './apiError';
+export { type ApiResponse } from './types';
+export { initApiClient, apiCall, apiGet, apiPost, apiPut, apiPatch, apiDelete, apiCallSafe } from './api';

package/dist/client/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiCallSafe = exports.apiDelete = exports.apiPatch = exports.apiPut = exports.apiPost = exports.apiGet = exports.apiCall = exports.initApiClient = exports.ApiError = void 0;
-var ApiError_1 = require("./ApiError");
-Object.defineProperty(exports, "ApiError", { enumerable: true, get: function () { return ApiError_1.ApiError; } });
+var apiError_1 = require("./apiError");
+Object.defineProperty(exports, "ApiError", { enumerable: true, get: function () { return apiError_1.ApiError; } });
 var api_1 = require("./api");
 Object.defineProperty(exports, "initApiClient", { enumerable: true, get: function () { return api_1.initApiClient; } });
 Object.defineProperty(exports, "apiCall", { enumerable: true, get: function () { return api_1.apiCall; } });

package/dist/client/types.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Client module type definitions
+ */
+/**
+ * API response wrapper for safe calls
+ */
+export interface ApiResponse<T> {
+    ok: boolean;
+    status: number;
+    data?: T;
+    error?: string;
+}

package/dist/client/types.js

@@ -0,0 +1,5 @@
+"use strict";
+/**
+ * Client module type definitions
+ */
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/http/index.d.ts

@@ -1,2 +1,3 @@
 export { HTTP_STATUS, type HttpStatus } from './status';
-export { type ErrorResponse, badRequestResponse, unauthorizedResponse, forbiddenResponse, notFoundResponse, conflictResponse, handleFunctionError, isNotFoundError, isConflictError } from './responses';
+export { type ErrorResponse } from './types';
+export { badRequestResponse, unauthorizedResponse, forbiddenResponse, notFoundResponse, conflictResponse, handleFunctionError, isNotFoundError, isConflictError } from './responses';

package/dist/http/responses.d.ts

@@ -1,11 +1,4 @@
 import { HttpResponseInit, InvocationContext } from '@azure/functions';
-/**
- * Standard error response structure
- */
-export interface ErrorResponse {
-    error: string;
-    details?: string;
-}
 /**
  * Create a 400 Bad Request response
  */

package/dist/http/types.d.ts

@@ -0,0 +1,10 @@
+/**
+ * HTTP module type definitions
+ */
+/**
+ * Standard error response structure
+ */
+export interface ErrorResponse {
+    error: string;
+    details?: string;
+}

package/dist/http/types.js

@@ -0,0 +1,5 @@
+"use strict";
+/**
+ * HTTP module type definitions
+ */
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export * from './types';
 export * from './auth';
 export * from './http';
 export * from './storage';

package/dist/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // Main entry point - re-export everything
+__exportStar(require("./types"), exports);
 __exportStar(require("./auth"), exports);
 __exportStar(require("./http"), exports);
 __exportStar(require("./storage"), exports);

package/dist/storage/index.d.ts

@@ -1,2 +1,2 @@
 export { initStorage, initStorageFromEnv, useManagedIdentity, getTableClient, clearTableClientCache } from './client';
-export { generateRowKey } from './helpers';
+export { generateRowKey } from './keys';

package/dist/storage/index.js

@@ -7,5 +7,5 @@ Object.defineProperty(exports, "initStorageFromEnv", { enumerable: true, get: fu
 Object.defineProperty(exports, "useManagedIdentity", { enumerable: true, get: function () { return client_1.useManagedIdentity; } });
 Object.defineProperty(exports, "getTableClient", { enumerable: true, get: function () { return client_1.getTableClient; } });
 Object.defineProperty(exports, "clearTableClientCache", { enumerable: true, get: function () { return client_1.clearTableClientCache; } });
-var helpers_1 = require("./helpers");
-Object.defineProperty(exports, "generateRowKey", { enumerable: true, get: function () { return helpers_1.generateRowKey; } });
+var keys_1 = require("./keys");
+Object.defineProperty(exports, "generateRowKey", { enumerable: true, get: function () { return keys_1.generateRowKey; } });

package/dist/types.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Shared types for pwa-core
+ */
+/**
+ * Standard result type for operations that can fail.
+ * Used consistently across all modules (auth, push, client).
+ *
+ * @example
+ * // Success
+ * { ok: true, data: user }
+ *
+ * // Failure
+ * { ok: false, error: 'Token expired' }
+ *
+ * // With status code (HTTP/push operations)
+ * { ok: false, error: 'Subscription expired', statusCode: 410 }
+ */
+export interface Result<T> {
+    ok: boolean;
+    data?: T;
+    error?: string;
+    statusCode?: number;
+}
+/**
+ * Helper to create a success result
+ */
+export declare function ok<T>(data: T): Result<T>;
+/**
+ * Helper to create a success result with no data
+ */
+export declare function okVoid(): Result<void>;
+/**
+ * Helper to create a failure result
+ */
+export declare function err<T>(error: string, statusCode?: number): Result<T>;

package/dist/types.js

@@ -0,0 +1,28 @@
+"use strict";
+/**
+ * Shared types for pwa-core
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ok = ok;
+exports.okVoid = okVoid;
+exports.err = err;
+/**
+ * Helper to create a success result
+ */
+function ok(data) {
+    return { ok: true, data };
+}
+/**
+ * Helper to create a success result with no data
+ */
+function okVoid() {
+    return { ok: true };
+}
+/**
+ * Helper to create a failure result
+ */
+function err(error, statusCode) {
+    return statusCode !== undefined
+        ? { ok: false, error, statusCode }
+        : { ok: false, error };
+}

package/package.json

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