@devmoods/express-extras 0.28.4 → 0.28.6

package/dist/auth.d.ts

@@ -1,5 +1,5 @@
 import { type Request, type RequestHandler, type Response, Router } from 'express';
-import type { RedisClient } from './redis.js';
+import { type RedisClient } from './redis.js';
 /**
  * Returns a signed JWT token.
  */

package/dist/auth.js

@@ -1,5 +1,5 @@
 import * as crypto from 'node:crypto';
-import * as bcrypt from 'bcrypt';
+import bcrypt from 'bcrypt';
 import { Router, } from 'express';
 import jwt from 'jsonwebtoken';
 import { v4 } from 'uuid';
@@ -7,8 +7,9 @@ import { setContext, useContext } from './context.js';
 import { BadRequest, NotFound, Unauthorized } from './errors.js';
 import { getLogger } from './logger.js';
 import { route } from './middleware.js';
-import { validateBody, validateParams, } from './validate.js';
+import {} from './redis.js';
 import { readEnv } from './utils.js';
+import { validateBody, validateParams, } from './validate.js';
 const logger = getLogger('auth');
 const TOKEN_EXPIRES_IN = readEnv.number('AUTH_TOKEN_EXPIRES', 3600 * 48);
 const TEMP_TOKEN_EXIRES_IN = readEnv.number('AUTH_TEMP_TOKEN_EXPIRES', 3600);
@@ -24,6 +25,7 @@ const emailSchema = { type: 'string', minLength: 4 };
  * Returns a signed JWT token.
  */
 export function createAuthToken(payload, secret = AUTH_SECRET) {
+    // eslint-disable-next-line import/no-named-as-default-member
     return jwt.sign(payload, secret, { expiresIn: TOKEN_EXPIRES_IN });
 }
 /**
@@ -31,6 +33,7 @@ export function createAuthToken(payload, secret = AUTH_SECRET) {
  */
 export function decodeAuthToken(token, secret = AUTH_SECRET) {
     try {
+        // eslint-disable-next-line import/no-named-as-default-member
         const decoded = jwt.verify(token.trim(), secret);
         /* c8 ignore next 3 */
         if (typeof decoded === 'string') {
@@ -327,6 +330,7 @@ export async function checkIfPasswordsMatch(realPassword, attemptedPassword) {
     if (!realPassword) {
         throw new Error('User has no defined password');
     }
+    // eslint-disable-next-line import/no-named-as-default-member
     const validPassword = await bcrypt.compare(attemptedPassword, realPassword);
     if (!validPassword) {
         throw new Error(`Passwords do not match`);
@@ -337,5 +341,6 @@ export async function checkIfPasswordsMatch(realPassword, attemptedPassword) {
  * Returns a hash of a password suitable for storage.
  */
 export function hashPassword(password) {
+    // eslint-disable-next-line import/no-named-as-default-member
     return bcrypt.hash(password, 10);
 }

package/dist/errors.js

@@ -1,6 +1,7 @@
+import { STATUS_CODES } from 'node:http';
 import * as Sentry from '@sentry/node';
 import { errors } from 'compose-middleware';
-import { STATUS_CODES } from 'node:http';
+import {} from 'express';
 import { DoesNotExistError, IntegrityError } from './postgres.js';
 export class ApiError extends Error {
 }

package/dist/listen.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { Application } from 'express';
-import type { Server } from 'node:http';
+import { type Server } from 'node:http';
+import { type Application } from 'express';
 interface StoppableServer extends Server {
     inspect(): Record<string, any>;
     stop(): Promise<boolean>;

package/dist/listen.js

@@ -1,5 +1,8 @@
-import { delay } from '@devmoods/fetch';
 import * as http from 'node:http';
+import {} from 'node:http';
+import {} from 'node:net';
+import { delay } from '@devmoods/fetch';
+import {} from 'express';
 import { getLogger } from './logger.js';
 import { route } from './middleware.js';
 import { envPort, readEnv } from './utils.js';

package/dist/logger.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { Duplex } from 'node:stream';
-import type { CreateSentry } from './sentry.js';
+import { type Duplex } from 'node:stream';
+import { type CreateSentry } from './sentry.js';
 export type LoggerContext = Record<string, any>;
 export interface LoggerOptions {
     /**

package/dist/logger.js

@@ -1,5 +1,7 @@
 import * as os from 'node:os';
+import {} from 'node:stream';
 import { useRequestId } from './context.js';
+import {} from './sentry.js';
 import { readEnv } from './utils.js';
 const LEVELS = {
     TRACE: 10,

package/dist/manage.d.ts

@@ -0,0 +1,5 @@
+import { program } from 'commander';
+type Command = typeof program.command;
+export declare function registerManagementCommand(register: (command: Command) => void): void;
+export declare function runManagementCommands(): Promise<void>;
+export {};

package/dist/manage.js

@@ -0,0 +1,7 @@
+import { program } from 'commander';
+export function registerManagementCommand(register) {
+    register(program.command.bind(program));
+}
+export async function runManagementCommands() {
+    await program.parseAsync(process.argv);
+}

package/dist/middleware.d.ts

@@ -1,5 +1,5 @@
 import bodyParser from 'body-parser';
-import type { RequestHandler } from 'express';
+import { type RequestHandler } from 'express';
 type UrlencodedParser = typeof bodyParser.urlencoded;
 type JsonParser = typeof bodyParser.json;
 export declare const urlencodedParser: UrlencodedParser;

package/dist/middleware.js

@@ -2,6 +2,7 @@ import * as Sentry from '@sentry/node';
 import bodyParser from 'body-parser';
 import { compose } from 'compose-middleware';
 import cookieParser from 'cookie-parser';
+import {} from 'express';
 import helmet from 'helmet';
 import { withRequestContext } from './context.js';
 import { NotFound } from './errors.js';
@@ -26,7 +27,12 @@ export function before({ cookies = false, helmet: useHelmet = true, json: useJso
                     directives: {
                         'default-src': ["'self'"],
                         'base-uri': ["'self'"],
-                        'connect-src': ["'self'", 'ws:', '*.sentry.io'],
+                        'connect-src': [
+                            "'self'",
+                            'ws:',
+                            '*.sentry.io',
+                            '*.cdn-apple.com',
+                        ],
                         'font-src': ["'self'", 'https:', 'data:'],
                         'form-action': ["'self'"],
                         'frame-ancestors': ["'self'"],

package/dist/postgres.d.ts

@@ -1,8 +1,8 @@
-import pg, { type PoolClient, type QueryResult, type QueryResultRow } from 'pg';
+import pg, { type PoolClient, type PoolConfig, type QueryResult, type QueryResultRow } from 'pg';
 import { SQL, type SQLStatement } from 'sql-template-strings';
-export interface PostgresOptions extends pg.PoolConfig {
+export interface PostgresOptions extends PoolConfig {
     onError?: (error: Error, client: any) => void;
-    url?: pg.PoolConfig['connectionString'];
+    url?: PoolConfig['connectionString'];
 }
 export declare class DoesNotExistError extends Error {
     constructor(message: string);

package/dist/postgres.js

@@ -70,6 +70,7 @@ export class Transaction extends Connection {
  * @param config
  */
 export function createPostgres({ onError, url = readEnv('POSTGRES_URL'), ...config } = {}) {
+    // eslint-disable-next-line import/no-named-as-default-member
     const pool = new pg.Pool({ connectionString: url, ...config });
     if (onError) {
         pool.on('error', onError);

package/dist/routes.d.ts

@@ -1,2 +1,2 @@
-import type { Express, RequestHandler } from 'express';
+import { type Express, type RequestHandler } from 'express';
 export declare function createDocsRouter(app: Express, extras?: Record<string, any>): RequestHandler;

package/dist/routes.js

@@ -1,3 +1,4 @@
+import {} from 'express';
 import { parseExpressApp } from 'express-route-parser';
 import { route } from './middleware.js';
 export function createDocsRouter(app, extras = {}) {

package/dist/setupTests.js

@@ -1,4 +1,9 @@
 import 'dotenv/config';
 import * as crypto from 'node:crypto';
-// @ts-ignore
-globalThis.crypto = crypto;
+try {
+    // @ts-ignore
+    globalThis.crypto = crypto;
+}
+catch (e) {
+    // empty
+}

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { EventEmitter } from 'node:events';
+import { type EventEmitter } from 'node:events';
 /**
  * Start a high resolution timer
  *

package/dist/utils.js

@@ -1,3 +1,4 @@
+import {} from 'node:events';
 /**
  * Start a high resolution timer
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.28.4",
+  "version": "0.28.6",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,67 +23,65 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@devmoods/eslint-config": "^1.2.0",
-    "@types/koa-compose": "^3.2.5",
-    "@types/node": "20.5.9",
-    "@types/supertest": "^2.0.12",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
-    "@vitest/coverage-v8": "^0.34.3",
+    "@devmoods/eslint-config": "^1.8.0",
+    "@types/koa-compose": "^3.2.8",
+    "@types/node": "20.9.0",
+    "@types/supertest": "^2.0.16",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
+    "@vitest/coverage-v8": "^0.34.6",
     "chalk": "^5.3.0",
-    "eslint": "^8.48.0",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint": "^8.53.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "faktory-worker": "^4.5.1",
-    "import-sort-cli": "6.0.0",
-    "import-sort-style-module": "6.0.0",
     "prettier": "3.0.3",
     "supertest": "6.3.3",
     "ts-node": "10.9.1",
     "typescript": "5.2.2",
-    "vitest": "^0.34.3"
+    "vitest": "^0.34.6"
   },
   "dependencies": {
     "@devmoods/fetch": "^4.0.1",
-    "@sentry/node": "^7.67.0",
-    "@types/bcrypt": "^5.0.0",
-    "@types/body-parser": "^1.19.2",
-    "@types/cookie-parser": "^1.4.4",
-    "@types/express": "^4.17.17",
-    "@types/jsonwebtoken": "^9.0.2",
-    "@types/nodemailer": "^6.4.9",
-    "@types/pg": "^8.10.2",
-    "@types/superagent": "^4.1.18",
-    "@types/uuid": "^9.0.3",
+    "@sentry/node": "^7.79.0",
+    "@types/bcrypt": "^5.0.2",
+    "@types/body-parser": "^1.19.5",
+    "@types/cookie-parser": "^1.4.6",
+    "@types/express": "^4.17.21",
+    "@types/jsonwebtoken": "^9.0.5",
+    "@types/nodemailer": "^6.4.14",
+    "@types/pg": "^8.10.9",
+    "@types/superagent": "^4.1.21",
+    "@types/uuid": "^9.0.7",
     "ajv": "^8.12.0",
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
+    "commander": "^11.1.0",
     "compose-middleware": "^5.0.1",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "express-route-parser": "^1.0.5",
-    "helmet": "^7.0.0",
+    "helmet": "^7.1.0",
     "jsonwebtoken": "^9.0.2",
     "meow": "^12.1.1",
-    "nodemailer": "^6.9.4",
+    "nodemailer": "^6.9.7",
     "pg": "^8.11.3",
-    "redis": "^4.6.8",
+    "redis": "^4.6.10",
     "sql-template-strings": "^2.2.2",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.1"
   },
   "prettier": {
     "singleQuote": true
   },
-  "importSort": {
-    ".js, .jsx, .ts, .tsx": {
-      "style": "module"
-    }
-  },
   "eslintConfig": {
     "extends": "@devmoods/eslint-config",
+    "parserOptions": {
+      "project": "./tsconfig.json"
+    },
     "rules": {
       "@typescript-eslint/consistent-type-imports": "warn",
       "@typescript-eslint/no-shadow": "off",
@@ -100,8 +98,6 @@
     "lint": "eslint src",
     "test": "./test.sh src",
     "build": "pnpm run clean && tsc --project tsconfig.build.json",
-    "prettier": "prettier --write '**/*.{js,css,md,ts,tsx}'",
-    "import-sort": "import-sort --write '**/*.{js,jsx,ts,tsx}'",
-    "format": "pnpm run import-sort && pnpm run prettier"
+    "format": "prettier --write '**/*.{js,css,md,ts,tsx}'"
   }
 }