@devmoods/express-extras 0.25.0 → 0.26.1

package/README.md

@@ -42,7 +42,7 @@ PORT=3000
 READINESS_PROBE_MS=
 FORCE_EXIT_TIMEOUT=
 
-APP_JWT_SECRET=123456
+AUTH_JWT_SECRET=123456
 
 POSTGRES_URL=postgresql://user:pass@localhost:5432/my_database
 REDIS_URL=

package/dist/auth.js

@@ -190,8 +190,8 @@ export function createAuth({ getUserByToken, filterUser = (x) => x, redis, provi
             const token = createAuthToken(rest);
             await redis.set(token, '1', { EX: TOKEN_EXPIRES_IN });
             setAccessTokenCookie(res, token);
-            logger.info('refreshed token', { user });
-            return { token };
+            logger.info('refreshed token');
+            return { token, user: filterUser(user) };
         }));
         for (const provider of providers) {
             provider.setupRoutes(router, providerContext);

package/dist/cache.d.ts

@@ -0,0 +1,14 @@
+import { type RedisClient } from './redis.js';
+export interface CacheAdapter {
+    get(key: string): Promise<any>;
+    set(key: string, value: any, expires?: number | null | undefined): Promise<void>;
+    clear(key?: string): Promise<void>;
+}
+export declare function createRedisCacheAdapter(redis: RedisClient): CacheAdapter;
+export declare function createMemoryCacheAdapter(): CacheAdapter;
+export declare function createCache(adapter: CacheAdapter): {
+    set: (key: string, value: any, expires?: number | null | undefined) => Promise<void>;
+    get: (key: string) => Promise<any>;
+    clear: (key?: string | undefined) => Promise<void>;
+    wrap: <T>(key: string, expiresMs: number | null | undefined, fn: () => Promise<T>) => Promise<T>;
+};

package/dist/cache.js

@@ -0,0 +1,64 @@
+export function createRedisCacheAdapter(redis) {
+    return {
+        async get(key) {
+            const value = await redis.get(key);
+            if (value == null) {
+                return null;
+            }
+            return JSON.parse(value);
+        },
+        async set(key, value, expires) {
+            await redis.set(key, JSON.stringify(value), { PX: expires });
+        },
+        async clear(key) {
+            if (key) {
+                await redis.del(key);
+            }
+        },
+    };
+}
+export function createMemoryCacheAdapter() {
+    const cache = new Map();
+    return {
+        async get(key) {
+            const entry = cache.get(key);
+            if (entry == null) {
+                return null;
+            }
+            const [value, expires] = entry;
+            if (expires != null && Date.now() >= expires) {
+                cache.delete(key);
+                return null;
+            }
+            return value;
+        },
+        async set(key, value, expires) {
+            cache.set(key, [value, expires == null ? null : Date.now() + expires]);
+        },
+        async clear(key) {
+            if (key) {
+                cache.delete(key);
+            }
+            else {
+                cache.clear();
+            }
+        },
+    };
+}
+export function createCache(adapter) {
+    async function cached(key, expiresMs, fn) {
+        const cachedValue = await adapter.get(key);
+        if (cachedValue != null) {
+            return cachedValue;
+        }
+        const result = await fn();
+        await adapter.set(key, result, expiresMs);
+        return result;
+    }
+    return {
+        set: adapter.set.bind(adapter),
+        get: adapter.get.bind(adapter),
+        clear: adapter.clear.bind(adapter),
+        wrap: cached,
+    };
+}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './auth.js';
+export * from './cache.js';
 export * from './context.js';
 export * from './email.js';
 export * from './errors.js';

package/dist/index.js

@@ -1,4 +1,5 @@
 export * from './auth.js';
+export * from './cache.js';
 export * from './context.js';
 export * from './email.js';
 export * from './errors.js';

package/dist/logger.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
 import type { CreateSentry } from './sentry.js';
 export type LoggerContext = Record<string, any>;
 export interface LoggerOptions {
@@ -13,11 +14,12 @@ export interface LoggerOptions {
      * Defaults to `process.env.NODE_ENV === 'test'`
      */
     silent?: () => boolean;
+    output?: NodeJS.WriteStream;
 }
 export declare function attachSentryClientToLoggers(sentryClient: CreateSentry['client']): void;
 export declare function setGlobalLoggerContext(getContext: () => LoggerContext): void;
 export type Logger = ReturnType<typeof createLogger>;
-export declare function createLogger({ name, getContext, silent, }: LoggerOptions): {
+export declare function createLogger({ name, getContext, silent, output, }: LoggerOptions): {
     debug(message: string, context?: LoggerContext): void;
     info(message: string, context?: LoggerContext): void;
     warn(message: string, context?: LoggerContext): void;

package/dist/logger.js

@@ -24,12 +24,13 @@ function defaultGetContext() {
         ..._globalGetContext?.(),
     };
 }
-export function createLogger({ name, getContext, silent = () => process.env.NODE_ENV === 'test', }) {
+export function createLogger({ name, getContext, silent = () => process.env.NODE_ENV === 'test', output = process.stdout, }) {
     if (_loggers.has(name)) {
         throw new Error(`A logger named ${name} already exists`);
     }
     const hostname = os.hostname();
     const pid = process.pid;
+    const env = process.env.NODE_ENV;
     const logLevel = silent() ? LEVELS.FATAL + 1 : LEVELS.INFO;
     function getFinalContext(context) {
         return {
@@ -41,6 +42,7 @@ export function createLogger({ name, getContext, silent = () => process.env.NODE
     function log(level, message, context) {
         const payload = JSON.stringify({
             level: LEVELS_TO_NAME[level],
+            env,
             hostname,
             pid,
             name,
@@ -50,7 +52,7 @@ export function createLogger({ name, getContext, silent = () => process.env.NODE
             v: 1,
         });
         if (level >= logLevel) {
-            console.log(payload);
+            output.write(payload + '\n');
         }
     }
     const api = {

package/dist/middleware.js

@@ -104,7 +104,7 @@ export function after() {
  * Alias of `route()`
  */
 export function asyncMiddleware(fn) {
-    return (req, res, next) => {
+    const handler = (req, res, next) => {
         return Promise.resolve(fn(req, res, next))
             .then((result) => {
             if (Array.isArray(result) &&
@@ -125,4 +125,6 @@ export function asyncMiddleware(fn) {
         })
             .catch(next);
     };
+    Object.defineProperty(handler, 'name', { value: fn.name });
+    return handler;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.25.0",
+  "version": "0.26.1",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -24,9 +24,9 @@
   "license": "ISC",
   "devDependencies": {
     "@devmoods/eslint-config": "^1.2.0",
-    "@sentry/types": "^7.63.0",
+    "@sentry/types": "^7.64.0",
     "@types/express-serve-static-core": "^4.17.35",
-    "@types/node": "20.4.10",
+    "@types/node": "20.5.0",
     "@types/supertest": "^2.0.12",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",
@@ -51,7 +51,7 @@
   "dependencies": {
     "@devmoods/fetch": "^3.3.0",
     "@godaddy/terminus": "^4.12.1",
-    "@sentry/node": "^7.63.0",
+    "@sentry/node": "^7.64.0",
     "@types/bcrypt": "^5.0.0",
     "@types/body-parser": "^1.19.2",
     "@types/cookie-parser": "^1.4.3",