@devmoods/express-extras 0.72.1 → 0.73.0

package/dist/auth.js

@@ -5,7 +5,7 @@ import { InvalidToken, PermissionDenied } from './auth/errors.js';
 import { createAccessToken, decodeAccessToken, extractAccessTokenFromRequest, setAccessTokenCookie, tokenSchema, } from './auth/token.js';
 import {} from './auth/types.js';
 import { setRequestContext, useRequestContext } from './context.js';
-import { Forbidden, NotFound, Unauthorized } from './errors.js';
+import { Forbidden, Unauthorized } from './errors.js';
 import { getLogger } from './logger.js';
 import { createRouter } from './router.js';
 import { jsonSchema } from './validate.js';
@@ -77,33 +77,22 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
             const user = useCurrentUser();
             return filterUser(user);
         });
-        router.get('/logout', {}, async (req, res) => {
+        router.post('/logout', {}, async (req, res) => {
             await logout(req, res);
             res.redirect(loginUrl);
         });
-        /**
-         * Check that a reset token is valid.
-         */
         router.get('/reset/:token', {
             params: jsonSchema({
                 type: 'object',
                 properties: { token: tokenSchema },
                 required: ['token'],
             }),
-        }, async (req) => {
-            const { token } = req.params;
-            const value = await tokenStorage.get(token);
-            if (!value) {
-                logger.info('invalid reset token', { token });
-                throw NotFound();
-            }
-            return 200;
-        });
-        router.get('/token/refresh', {}, middleware(false), async (req, res) => {
+        }, async () => 200);
+        router.post('/token/refresh', {}, middleware(false), async (req, res) => {
             const user = useCurrentUser();
             if (!user) {
                 setAccessTokenCookie(res, null);
-                throw Unauthorized();
+                return { token: null, user: null };
             }
             const { token } = await providerContext.login(req, res, user, true);
             logger.info('refreshed token');

package/dist/config.js

@@ -14,7 +14,7 @@ const app = define({
     SENTRY_DSN: t.string(),
     SENTRY_TRACES_SAMPLE_RATE: t.number(0.3),
     SENTRY_PROFILES_SAMPLE_RATE: t.number(0.3),
-    SENTRY_EVENT_LOOP_THRESHOLD: t.number(300),
+    SENTRY_EVENT_LOOP_THRESHOLD: t.number(750),
     LOG_LEVEL: t.string(),
     LOG_SQL: t.boolean(),
     NODE_ENV: t.string(),

package/dist/errors.d.ts

@@ -35,8 +35,6 @@ export interface ErrorHandlerOptions {
 }
 /**
  * Generic error handler for JSON-based apps.
- *
- * Composed together with the Sentry error handler.
  */
 export declare function errorHandler({ onError }?: ErrorHandlerOptions): ErrorHandler<any, any, void>;
 export {};

package/dist/errors.js

@@ -1,6 +1,5 @@
 import { STATUS_CODES } from 'node:http';
 import { DoesNotExistError, IntegrityError } from '@devmoods/postgres';
-import * as Sentry from '@sentry/node';
 import {} from 'express';
 import { InvalidToken } from './auth/errors.js';
 import { errors } from './composeMiddleware.js';
@@ -66,8 +65,6 @@ function _errorHandler({ onError }) {
 }
 /**
  * Generic error handler for JSON-based apps.
- *
- * Composed together with the Sentry error handler.
  */
 export function errorHandler({ onError } = {}) {
     const logger = getLogger();
@@ -82,14 +79,6 @@ export function errorHandler({ onError } = {}) {
         }
     };
     return errors([
-        Sentry.expressErrorHandler({
-            shouldHandleError(error) {
-                if (error instanceof ApiError && error.status < 500) {
-                    return false;
-                }
-                return process.env.NODE_ENV === 'production';
-            },
-        }),
         _errorHandler({
             onError: onError || _defaultErrorHandler,
         }),

package/dist/index.d.ts

@@ -19,7 +19,6 @@ export * from './rate-limit.js';
 export * from './redis.js';
 export * from './router.js';
 export * from './routes.js';
-export * from './sentry.js';
 export * from './slack.js';
 export * from './utils.js';
 export * from './validate.js';

package/dist/index.js

@@ -20,7 +20,6 @@ export * from './rate-limit.js';
 export * from './redis.js';
 export * from './router.js';
 export * from './routes.js';
-export * from './sentry.js';
 export * from './slack.js';
 export * from './utils.js';
 export * from './validate.js';

package/dist/listen.d.ts

@@ -14,6 +14,7 @@ export interface ExpressServerOptions {
     onStart?(): Promise<void> | void;
     onShutdown?(): Promise<void> | void;
     beforeShutdown?(): Promise<void> | void;
+    afterShutdown?(): Promise<void> | void;
     healthCheck?(type?: 'live' | 'ready'): Promise<unknown>;
     gracePeriodMs?: number;
 }

package/dist/listen.js

@@ -126,6 +126,7 @@ export function createExpressServer(app, options = {}) {
                 duration: timer.getDuration(),
                 gracefully,
             });
+            await options.afterShutdown?.();
             process.exit(0);
         }
         catch (error) {

package/dist/logger.d.ts

@@ -1,20 +1,12 @@
 import { type Writable } from 'node:stream';
+import { type LoggerAdapter } from '@devmoods/observability';
 export type LoggerContext = Record<string, any>;
-export interface LoggerAdapter {
-    captureError(error: Error | null, attributes?: Record<string, any>): void;
-    write(chunk: Record<string, any>): boolean;
-}
 export declare class JsonStreamAdapter implements LoggerAdapter {
     #private;
     constructor(stream: Writable);
     captureError(error: Error, attributes?: Record<string, any>): void;
     write(log: Record<string, any>): boolean;
 }
-export declare class SentryLoggerAdapter implements LoggerAdapter {
-    constructor();
-    captureError(error: Error | null, attributes?: Record<string, any>): void;
-    write(log: Record<string, any>): boolean;
-}
 export interface LoggerOptions {
     /**
      * Name of the logger
@@ -36,6 +28,8 @@ export interface LoggerOptions {
 export declare function setGlobalLoggerContext(getContext: () => LoggerContext): void;
 export declare function clearGlobalLoggerContext(): void;
 export type Logger = ReturnType<typeof createLogger>;
+export declare function addDefaultLoggerOutput(output: LoggerAdapter): void;
+export declare function clearDefaultLoggerOutputs(): void;
 export declare function createLogger({ name, getContext, level, outputs }: LoggerOptions): {
     debug(message: string, context?: LoggerContext): void;
     info(message: string, context?: LoggerContext): void;

package/dist/logger.js

@@ -1,7 +1,7 @@
 import * as os from 'node:os';
 import {} from 'node:stream';
 import { config } from '@devmoods/config';
-import * as Sentry from '@sentry/node';
+import {} from '@devmoods/observability';
 export class JsonStreamAdapter {
     #stream;
     constructor(stream) {
@@ -14,30 +14,6 @@ export class JsonStreamAdapter {
         return this.#stream.write(chunk);
     }
 }
-export class SentryLoggerAdapter {
-    constructor() { }
-    captureError(error, attributes) {
-        /* v8 ignore next -- @preserve */
-        if (error == null) {
-            return;
-        }
-        /* v8 ignore next -- @preserve */
-        if (Sentry.isInitialized()) {
-            Sentry.captureException(error, {
-                tags: attributes,
-            });
-        }
-    }
-    write(log) {
-        const { message, ...attributes } = log;
-        /* v8 ignore next -- @preserve */
-        if (Sentry.isInitialized()) {
-            const fn = log.level;
-            Sentry.logger[fn](message, attributes);
-        }
-        return true;
-    }
-}
 const LEVELS = {
     TRACE: 10,
     DEBUG: 20,
@@ -73,7 +49,19 @@ function baseContext() {
     }
     return globalContext;
 }
-export function createLogger({ name, getContext, level = config.LOG_LEVEL, outputs = [new JsonStreamAdapter(process.stdout), new SentryLoggerAdapter()], }) {
+const defaultLoggerOutputs = [
+    new JsonStreamAdapter(process.stdout),
+];
+export function addDefaultLoggerOutput(output) {
+    if (defaultLoggerOutputs.includes(output)) {
+        return;
+    }
+    defaultLoggerOutputs.push(output);
+}
+export function clearDefaultLoggerOutputs() {
+    defaultLoggerOutputs.length = 0;
+}
+export function createLogger({ name, getContext, level = config.LOG_LEVEL, outputs = defaultLoggerOutputs, }) {
     if (_loggers.has(name)) {
         throw new Error(`A logger named ${name} already exists`);
     }

package/dist/vite/ssr.js

@@ -1,3 +1,11 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { config } from '@devmoods/config';
@@ -38,7 +46,7 @@ export async function createSsrMiddleware({ root = process.cwd(), getInitialData
                 render = (await vite.ssrLoadModule('/src/entry-server.tsx')).render;
             }
             else {
-                render = (await import(path.join(root, 'dist/server/entry-server.js'))).render;
+                render = (await import(__rewriteRelativeImportExtension(path.join(root, 'dist/server/entry-server.js')))).render;
             }
             const rendered = await render(createFetchRequest(req, res), {
                 useDevServer,
@@ -117,15 +125,17 @@ async function getAssetLinks(manifestPath, input, publicPath = '/') {
     // Collect all transitively imported chunk keys so we can gather their CSS too
     const visited = new Set();
     const collectImports = (key) => {
+        /* c8 ignore start */
         if (visited.has(key)) {
             return;
         }
+        /* c8 ignore end */
         visited.add(key);
-        const chunk = manifest[key];
-        if (!chunk) {
+        const manifestValue = manifest[key];
+        if (!manifestValue) {
             return;
         }
-        for (const importKey of chunk.imports ?? []) {
+        for (const importKey of manifestValue.imports ?? []) {
             collectImports(importKey);
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.72.1",
+  "version": "0.73.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -68,15 +68,12 @@
     "vite": "^8.0.8"
   },
   "dependencies": {
-    "@devmoods/config": "0.2.1",
+    "@devmoods/config": "0.2.3",
     "@devmoods/fetch": "^4.3.0",
-    "@devmoods/observability": "0.1.2",
-    "@devmoods/postgres": "0.4.0",
-    "@hey-api/openapi-ts": "^0.95.0",
-    "@rolldown/plugin-babel": "^0.2.2",
-    "@sentry/node": "^10.47.0",
-    "@sentry/node-native": "^10.47.0",
-    "@sentry/profiling-node": "^10.47.0",
+    "@devmoods/observability": "0.2.0",
+    "@devmoods/postgres": "0.5.0",
+    "@hey-api/openapi-ts": "^0.96.0",
+    "@rolldown/plugin-babel": "^0.2.3",
     "@standard-schema/spec": "^1.1.0",
     "@types/bcrypt": "^6.0.0",
     "@types/cookie-parser": "^1.4.10",
@@ -91,7 +88,7 @@
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "cookie-parser": "^1.4.7",
-    "dotenv": "^17.4.1",
+    "dotenv": "^17.4.2",
     "express": "^4.21.2",
     "google-auth-library": "^10.6.2",
     "helmet": "^8.1.0",
@@ -104,7 +101,7 @@
     "vitest-fail-on-console": "^0.10.1"
   },
   "peerDependencies": {
-    "@vitejs/plugin-react": ">=4.3.4",
+    "@vitejs/plugin-react": ">=6.0.1",
     "arktype": ">=2.0.0",
     "express": ">=4.21.2 <5.0.0",
     "faktory-worker": ">=4.5.1",
@@ -113,5 +110,5 @@
   "engines": {
     "node": ">=20 <26"
   },
-  "gitHead": "04f69fb0aafc073cc734a0cfc9d278b5850d4ec2"
+  "gitHead": "ea4f51756aca98bd050cf98128bf4d4b3da1bf38"
 }

package/dist/sentry.d.ts

@@ -1,5 +0,0 @@
-import type * as Sentry from '@sentry/node';
-export type { Sentry };
-export interface SentryOptions extends Sentry.NodeOptions {
-}
-export declare function sentryOptions(options?: SentryOptions): Promise<SentryOptions>;

package/dist/sentry.js

@@ -1,38 +0,0 @@
-import { config } from '@devmoods/config';
-/**
- * Safely imports native Sentry integrations if available.
- * Returns null if native modules are not available (e.g., on unsupported Node.js versions).
- */
-async function getNativeIntegrations() {
-    const integrations = [];
-    /* v8 ignore next -- @preserve */
-    try {
-        const { nodeProfilingIntegration } = await import('@sentry/profiling-node');
-        integrations.push(nodeProfilingIntegration());
-    }
-    catch {
-        // Native profiling integration not available
-    }
-    /* v8 ignore next -- @preserve */
-    try {
-        const { eventLoopBlockIntegration } = await import('@sentry/node-native');
-        integrations.push(eventLoopBlockIntegration({
-            threshold: config.SENTRY_EVENT_LOOP_THRESHOLD,
-        }));
-    }
-    catch {
-        // Native event loop integration not available
-    }
-    return integrations;
-}
-export async function sentryOptions(options = {}) {
-    const nativeIntegrations = await getNativeIntegrations();
-    return {
-        dsn: config.SENTRY_DSN,
-        tracesSampleRate: config.SENTRY_TRACES_SAMPLE_RATE,
-        profilesSampleRate: config.SENTRY_PROFILES_SAMPLE_RATE,
-        integrations: nativeIntegrations,
-        enableLogs: true,
-        ...options,
-    };
-}