Backend webpack (#1264)

jboolean · web-flow · commit 52b19cb66256 · 2025-09-02T18:07:33.000-04:00
Switch to webpack on the backend. serverless-plugin-typescript is deprecated and has some bizarre conflict with publishing lambda layers, which will be needed by #1263
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -5,6 +5,7 @@ jspm_packages
 # Serverless directories
 .serverless
 .build
+.webpack
 
 secrets.*.yml
 tsoa-build
diff --git a/backend/appHandler.ts b/backend/appHandler.ts
@@ -1,6 +1,6 @@
+import 'reflect-metadata';
 import serverlessHttp from 'serverless-http';
-import app from './src/app';
 import 'source-map-support/register';
-import 'reflect-metadata';
+import app from './src/app';
 
 export const handler = serverlessHttp(app);
diff --git a/backend/convertImage.ts b/backend/convertImage.ts
@@ -59,7 +59,9 @@ export const handler = async (event: S3Event): Promise<unknown> => {
     throw new Error('Source object not found');
   }
 
-  let inputBuffer = Buffer.from(await inputObject.Body.transformToByteArray());
+  let inputBuffer: Buffer = Buffer.from(
+    await inputObject.Body.transformToByteArray()
+  );
 
   // Crop laserdisc video frames to eliminate borders and superimposed banner
   if (await LaserdiscUtils.isLaserdiscVideoFrame(inputBuffer)) {
diff --git a/backend/layers/tippecanoe/bin/tippecanoe b/backend/layers/tippecanoe/bin/tippecanoe
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -23,6 +23,7 @@
     "@aws-sdk/client-s3": "^3.741.0",
     "@hey-api/openapi-ts": "^0.64.1",
     "@sparticuz/chromium": "^132.0.0",
+    "@tsoa/cli": "^4.1.3",
     "@types/aws-lambda": "^8.10.147",
     "@types/cookie-parser": "^1.4.3",
     "@types/cors": "^2.8.17",
@@ -42,6 +43,7 @@
     "@types/source-map-support": "^0.5.6",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
     "@typescript-eslint/parser": "^5.61.1",
+    "copy-webpack-plugin": "^13.0.1",
     "eslint": "^8.52.0",
     "eslint-config-jboolean": "^0.1.0",
     "eslint-config-prettier": "^8.5.0",
@@ -53,14 +55,18 @@
     "serverless-lambda-edge-pre-existing-cloudfront": "^1.2.0",
     "serverless-offline": "^13.8.3",
     "serverless-plugin-select": "^2.0.0-rc.1",
-    "serverless-plugin-typescript": "^2.1.5",
-    "typescript": "^5.2.2"
+    "serverless-webpack": "^5.15.2",
+    "ts-loader": "^9.5.4",
+    "typescript": "^5.2.2",
+    "webpack": "^5.101.3",
+    "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
     "@hey-api/client-axios": "^0.6.1",
     "@sentry/integrations": "^7.36.0",
     "@sentry/node": "^7.36.0",
     "@sentry/tracing": "^7.36.0",
+    "@tsoa/runtime": "^4.1.3",
     "@types/multer": "^1.4.11",
     "axios": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -85,7 +91,6 @@
     "sharp": "^0.31.3",
     "source-map-support": "^0.5.21",
     "stripe": "^17.7.0",
-    "tsoa": "^4.1.3",
     "typeorm": "^0.3.17",
     "typeorm-naming-strategies": "^4.1.0"
   },
diff --git a/backend/serverless.yml b/backend/serverless.yml
@@ -1,8 +1,9 @@
 service: fourtiesnyc
 package:
   individually: false
-  include:
-    - certs/*
+  patterns:
+    - 'certs/**'
+    - '!chromium/**'
 
 provider:
   name: aws
@@ -37,7 +38,7 @@ provider:
     PRINTFUL_SK: ${ssm:/${self:service}-${sls:stage}-printful-sk}
 plugins:
   - serverless-plugin-select
-  - serverless-plugin-typescript
+  - serverless-webpack
   - serverless-domain-manager
   - serverless-offline
 
@@ -118,6 +119,8 @@ functions:
     handler: registerPrintfulWebhooks.handler
     # Invoked manually
 custom:
+  webpack:
+    webpackConfig: 'webpack.config.js'
   bucket: fourties-photos
   domain:
     production: api.1940s.nyc
diff --git a/backend/src/api/AuthenticationController.ts b/backend/src/api/AuthenticationController.ts
@@ -1,5 +1,3 @@
-import * as express from 'express';
-import { BadRequest } from 'http-errors';
 import {
   Body,
   Controller,
@@ -9,7 +7,9 @@ import {
   Request,
   Route,
   Security,
-} from 'tsoa';
+} from '@tsoa/runtime';
+import * as express from 'express';
+import { BadRequest } from 'http-errors';
 import * as UserService from '../business/users/UserService';
 import required from '../business/utils/required';
 import LoginOutcome from '../enum/LoginOutcome';
diff --git a/backend/src/api/ColorizationController.ts b/backend/src/api/ColorizationController.ts
@@ -1,6 +1,3 @@
-import * as express from 'express';
-import { BadRequest } from 'http-errors';
-import Stripe from 'stripe';
 import {
   Body,
   Controller,
@@ -10,7 +7,10 @@ import {
   Request,
   Route,
   Security,
-} from 'tsoa';
+} from '@tsoa/runtime';
+import * as express from 'express';
+import { BadRequest } from 'http-errors';
+import Stripe from 'stripe';
 import * as ColorService from '../business/color/ColorService';
 import * as UserService from '../business/users/UserService';
 import isProduction from '../business/utils/isProduction';
diff --git a/backend/src/api/CorrectionsController.ts b/backend/src/api/CorrectionsController.ts
@@ -1,6 +1,6 @@
+import { Body, Post, Request, Route, Security } from '@tsoa/runtime';
 import * as express from 'express';
 import { Forbidden } from 'http-errors';
-import { Body, Post, Request, Route, Security } from 'tsoa';
 import { getRepository } from 'typeorm';
 import * as UserService from '../business/users/UserService';
 import AddressCorrection from '../entities/AddressCorrection';
diff --git a/backend/src/api/EmailCampaignController.ts b/backend/src/api/EmailCampaignController.ts
@@ -1,6 +1,6 @@
-import { Body, Controller, Post, Route, Security } from 'tsoa';
-import EmailCampaignService from '../business/email/EmailCampaignService';
+import { Body, Controller, Post, Route, Security } from '@tsoa/runtime';
 import { BadRequest } from 'http-errors';
+import EmailCampaignService from '../business/email/EmailCampaignService';
 import { Email } from './CommonApiTypes';
 
 type MailingListRequest = {
diff --git a/backend/src/api/TipsController.ts b/backend/src/api/TipsController.ts
@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
+import { Body, Get, Post, Request, Route, Security } from '@tsoa/runtime';
 import * as express from 'express';
 import { HttpError, InternalServerError } from 'http-errors';
-import { Body, Get, Post, Request, Route, Security } from 'tsoa';
 import * as TipsService from '../business/tips/TipsService';
 import { getUserFromRequestOrCreateAndSetCookie } from './auth/userAuthUtils';
 
diff --git a/backend/src/api/merch/MerchController.ts b/backend/src/api/merch/MerchController.ts
@@ -1,5 +1,3 @@
-import * as express from 'express';
-import { BadRequest, NotFound } from 'http-errors';
 import {
   Body,
   Controller,
@@ -11,7 +9,9 @@ import {
   Request,
   Route,
   Security,
-} from 'tsoa';
+} from '@tsoa/runtime';
+import * as express from 'express';
+import { BadRequest, NotFound } from 'http-errors';
 import { getRepository } from 'typeorm';
 import * as MerchOrderService from '../../business/merch/MerchOrderService';
 import absurd from '../../business/utils/absurd';
diff --git a/backend/src/api/photos/PhotosController.ts b/backend/src/api/photos/PhotosController.ts
@@ -1,6 +1,3 @@
-import * as express from 'express';
-import { BadRequest, NotFound } from 'http-errors';
-import querystring from 'querystring';
 import {
   Controller,
   Get,
@@ -9,7 +6,10 @@ import {
   Request,
   Route,
   SuccessResponse,
-} from 'tsoa';
+} from '@tsoa/runtime';
+import * as express from 'express';
+import { BadRequest, NotFound } from 'http-errors';
+import querystring from 'querystring';
 import { getRepository, In } from 'typeorm';
 import Paginated from '../../business/pagination/Paginated';
 import mapPaginated from '../../business/utils/mapPaginated';
@@ -62,10 +62,10 @@ export class PhotosController extends Controller {
       throw new BadRequest('lngLat required');
     }
 
-    const result = (await photoRepo.query(
+    const result: { identifier: string }[] = await photoRepo.query(
       'select identifier from effective_geocodes_view where lng_lat ~= point($1, $2)',
       [lng, lat]
-    )) as { identifier: string }[];
+    );
 
     const ids = result.map((r) => r.identifier);
 
@@ -85,10 +85,11 @@ export class PhotosController extends Controller {
   ): Promise<PhotoApiModel> {
     const photoRepo = getRepository(Photo);
 
-    const result = (await photoRepo.query(
-      'SELECT *, lng_lat<@>point($1, $2) AS distance FROM effective_geocodes_view WHERE collection = $3 ORDER BY distance LIMIT 1',
-      [lng, lat, collection ?? '1940']
-    )) as { identifier: string; distance: number }[];
+    const result: { identifier: string; distance: number }[] =
+      await photoRepo.query(
+        'SELECT *, lng_lat<@>point($1, $2) AS distance FROM effective_geocodes_view WHERE collection = $3 ORDER BY distance LIMIT 1',
+        [lng, lat, collection ?? '1940']
+      );
 
     if (!result.length) {
       throw new NotFound();
diff --git a/backend/src/api/stories/StoriesController.ts b/backend/src/api/stories/StoriesController.ts
@@ -1,6 +1,3 @@
-import Express from 'express';
-import isNumber from 'lodash/isNumber';
-import map from 'lodash/map';
 import {
   Body,
   Controller,
@@ -14,7 +11,10 @@ import {
   Request,
   Route,
   Security,
-} from 'tsoa';
+} from '@tsoa/runtime';
+import Express from 'express';
+import isNumber from 'lodash/isNumber';
+import map from 'lodash/map';
 
 import { UserData as NetlifyUserData } from 'gotrue-js';
 import { BadRequest, Forbidden, NotFound } from 'http-errors';
diff --git a/backend/src/app.ts b/backend/src/app.ts
@@ -1,3 +1,5 @@
+import 'reflect-metadata';
+
 import { CaptureConsole as CaptureConsoleIntegration } from '@sentry/integrations';
 import * as Sentry from '@sentry/node';
 import * as Tracing from '@sentry/tracing';
@@ -12,13 +14,13 @@ import { HttpError, NotFound } from 'http-errors';
 import { RegisterRoutes } from '../tsoa-build/routes';
 import GeodataResource from './api/GeodataResource';
 
+import { ValidateError } from '@tsoa/runtime';
 import {
   Request as ExRequest,
   Response as ExResponse,
   NextFunction,
 } from 'express';
 import { IpDeniedError } from 'express-ipfilter';
-import { ValidateError } from 'tsoa';
 import PostmarkWebhooksResource from './api/PostmarkWebhooksResource';
 import PrintfulWebhooksResource from './api/PrintfulWebhooksResource';
 import StripeWebhooksResource from './api/StripeWebhooksResource';
diff --git a/backend/src/business/email/EmailTemplate.ts b/backend/src/business/email/EmailTemplate.ts
@@ -7,7 +7,7 @@ abstract class EmailTemplate<
   Metadata extends Record<keyof Metadata, string>
 > {
   abstract readonly alias: string;
-  abstract readonly from: typeof Senders[keyof typeof Senders];
+  abstract readonly from: (typeof Senders)[keyof typeof Senders];
   abstract readonly streamType: EmailStreamType;
 
   createTemplatedEmail({
diff --git a/backend/src/createConnection.ts b/backend/src/createConnection.ts
@@ -1,9 +1,62 @@
 import * as fs from 'fs';
 import path from 'path';
+import 'reflect-metadata';
 import { Connection, createConnection, getConnectionManager } from 'typeorm';
 import { SnakeNamingStrategy } from 'typeorm-naming-strategies';
 
+// Import all entities directly for webpack compatibility
+import AddressCorrection from './entities/AddressCorrection';
+import CampaignSend from './entities/CampaignSend';
+import EffectiveAddress from './entities/EffectiveAddress';
+import EffectiveGeocode from './entities/EffectiveGeocode';
+import GeocodeCorrection from './entities/GeocodeCorrection';
+import GeocodeResult from './entities/GeocodeResult';
+import LedgerEntry from './entities/LedgerEntry';
+import MailingListMember from './entities/MailingListMember';
+
+import MerchOrder from './entities/MerchOrder';
+import MerchOrderItem from './entities/MerchOrderItem';
+import Photo from './entities/Photo';
+
+import Story from './entities/Story';
+import User from './entities/User';
+
+// Force entity class metadata to be evaluated
+const ENTITIES = [
+  AddressCorrection,
+  CampaignSend,
+  EffectiveAddress,
+  EffectiveGeocode,
+  GeocodeCorrection,
+  GeocodeResult,
+  LedgerEntry,
+  MailingListMember,
+  MerchOrder,
+  MerchOrderItem,
+  Photo,
+  Story,
+  User,
+];
+// Validate metadata exists for all entities
+function validateEntityMetadata(): void {
+  for (const entity of ENTITIES) {
+    const metadata: unknown = Reflect.getMetadata(
+      'design:type',
+      entity.prototype,
+      'id'
+    );
+    if (!metadata) {
+      console.error(`Missing metadata for entity: ${entity.name}`);
+    }
+  }
+}
+
 export default function createConnectionIfNotExists(): Promise<Connection> {
+  // Validate metadata in development/debug mode
+  if (process.env.IS_OFFLINE || process.env.NODE_ENV !== 'production') {
+    validateEntityMetadata();
+  }
+
   const connectionManager = getConnectionManager();
   if (connectionManager.has('default')) {
     const connection = connectionManager.get('default');
@@ -14,7 +67,7 @@ export default function createConnectionIfNotExists(): Promise<Connection> {
   }
 
   const sslCert = fs.readFileSync(
-    path.join(__dirname, '..', 'certs/us-east-1-bundle.pem')
+    path.join(process.cwd(), 'certs/us-east-1-bundle.pem')
   );
 
   const {
@@ -38,7 +91,7 @@ export default function createConnectionIfNotExists(): Promise<Connection> {
     },
     synchronize: false,
     logging: !!process.env.IS_OFFLINE,
-    entities: [__dirname + '/entities/*{.ts,.js}'],
+    entities: ENTITIES,
     namingStrategy: new SnakeNamingStrategy(),
   });
 }
diff --git a/backend/src/cron/checkStaleStories.ts b/backend/src/cron/checkStaleStories.ts
@@ -17,9 +17,10 @@ function forgeReviewStoriesUrl(): string {
 async function getReviewerStats(): Promise<
   { reviewer: string; count: number }[]
 > {
-  const stats = (await StoryRepository().query(
-    `select last_reviewer as reviewer, count(*) as count from stories where last_reviewer is not null group by last_reviewer order by count(*) desc;`
-  )) as Promise<{ reviewer: string; count: number }[]>;
+  const stats: { reviewer: string; count: number }[] =
+    await StoryRepository().query(
+      `select last_reviewer as reviewer, count(*) as count from stories where last_reviewer is not null group by last_reviewer order by count(*) desc;`
+    );
   return stats;
 }
 
diff --git a/backend/webpack.config.js b/backend/webpack.config.js

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,9 @@ export const handler = async (event: S3Event): Promise<unknown> => {`
`59`	`59`	`throw new Error('Source object not found');`
`60`	`60`	`}`
`61`	`61`
`62`		`- let inputBuffer = Buffer.from(await inputObject.Body.transformToByteArray());`
	`62`	`+ let inputBuffer: Buffer = Buffer.from(`
	`63`	`+ await inputObject.Body.transformToByteArray()`
	`64`	`+ );`
`63`	`65`
`64`	`66`	`// Crop laserdisc video frames to eliminate borders and superimposed banner`
`65`	`67`	`if (await LaserdiscUtils.isLaserdiscVideoFrame(inputBuffer)) {`