Merge pull request #132 from wchaws/dev2

chore: disable mime.lookup

Author: wchaws

source/new-image-handler/package.json

@@ -46,14 +46,12 @@
     "typescript": "^4.6.4"
   },
   "dependencies": {
-    "@types/mime-types": "^2.1.1",
     "aws-sdk": "^2.1130.0",
     "http-errors": "^1.8.1",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "koa-logger": "^3.2.1",
     "koa-router": "^10.1.1",
-    "mime-types": "^2.1.35",
     "sharp": "^0.30.4"
   },
   "bundledDependencies": [],

source/new-image-handler/src/index-lambda.ts

@@ -14,7 +14,8 @@ export const handler = WrapError(async (event: APIGatewayProxyEventV2): Promise<
   if (event.rawPath === '/' || event.rawPath === '/ping') {
     return resp(200, 'ok');
   } else if (event.rawPath === '/_debug') {
-    return resp(400, debug());
+    console.log(debug());
+    return resp(400, 'Please check your server logs for more details!');
   }
 
   const accept = event.headers.Accept ?? event.headers.accept ?? '';
@@ -31,11 +32,11 @@ export const handler = WrapError(async (event: APIGatewayProxyEventV2): Promise<
     context.features[Features.AutoWebp] = autoWebp;
     const { data, type } = await processor.process(context);
 
-    return resp(200, data, type);
+    return resp(200, data, type, context.headers);
   } else {
-    const { buffer, type } = await bs.get(uri, bypass);
+    const { buffer, type, headers } = await bs.get(uri, bypass);
 
-    return resp(200, buffer, type);
+    return resp(200, buffer, type, headers);
   }
 });
 
@@ -44,7 +45,7 @@ function bypass() {
   throw new HttpErrors[403]('Please visit s3 directly');
 }
 
-function resp(code: number, body: any, type?: string): APIGatewayProxyResultV2 {
+function resp(code: number, body: any, type?: string, headers?: { [key: string]: any }): APIGatewayProxyResultV2 {
   const isBase64Encoded = Buffer.isBuffer(body);
   let data: string = '';
   if (isBase64Encoded) {
@@ -60,7 +61,7 @@ function resp(code: number, body: any, type?: string): APIGatewayProxyResultV2 {
   return {
     isBase64Encoded,
     statusCode: code,
-    headers: { 'Content-Type': type ?? 'text/plain' },
+    headers: Object.assign({ 'Content-Type': type ?? 'text/plain' }, headers),
     body: data,
   };
 }

source/new-image-handler/src/index.ts

@@ -50,8 +50,9 @@ router.get(['/', '/ping'], async (ctx) => {
 });
 
 router.get(['/debug', '/_debug'], async (ctx) => {
+  console.log(debug());
   ctx.status = 400;
-  ctx.body = debug();
+  ctx.body = 'Please check your server logs for more details!';
 });
 
 router.get('/(.*)', async (ctx) => {

source/new-image-handler/src/processor/image/index.ts

@@ -1,4 +1,3 @@
-import * as mime from 'mime-types';
 import * as sharp from 'sharp';
 import { Features, IAction, InvalidArgument, IProcessContext, IProcessor, IProcessResponse } from '../../processor';
 import { IBufferStore } from '../../store';
@@ -158,7 +157,7 @@ export class ImageProcessor implements IProcessor {
       return { data: ctx.info, type: 'application/json' };
     } else {
       const { data, info } = await ctx.image.toBuffer({ resolveWithObject: true });
-      return { data: data, type: (mime.lookup(info.format) || info.format) };
+      return { data: data, type: 'image/' + info.format };
     }
   }
 

source/new-image-handler/src/store.ts

@@ -44,7 +44,11 @@ export class LocalStore implements IBufferStore {
     return {
       buffer: await fs.promises.readFile(p),
       type: filetype(p),
-      headers: {},
+      headers: {
+        'Etag': 'fake-etag',
+        'Last-Modified': 'fake-last-modified',
+        'Cache-Control': 'no-cache',
+      },
     };
   }
 
@@ -71,7 +75,11 @@ export class S3Store implements IBufferStore {
       return {
         buffer: res.Body as Buffer,
         type: res.ContentType ?? '',
-        headers: { 'Etag': res.ETag, 'Last-Modified': res.LastModified },
+        headers: {
+          'Etag': res.ETag,
+          'Last-Modified': res.LastModified,
+          'Cache-Control': res.CacheControl,
+        },
       };
     };
     throw new Error('S3 response body is not a Buffer type');

source/new-image-handler/test/index-lambda.test.ts

@@ -73,6 +73,8 @@ test('index-lambda.ts example.jpg?x-oss-process=image/resize,w_100/quality,q_50'
   expect(res.isBase64Encoded).toBeTruthy();
   expect(res.statusCode).toBe(200);
   expect(res.headers['Content-Type']).toBe('image/jpeg');
+  expect(res.headers['Last-Modified']).toBe('fake-last-modified');
+  expect(res.headers['Cache-Control']).toBe('no-cache');
 
   const metadata = await sharp(Buffer.from(res.body, 'base64')).metadata();
 

source/new-image-handler/test/processor/index.test.ts

@@ -235,6 +235,7 @@ test('f.jpg?x-oss-process=image/resize,w_100/auto-orient,0', async () => {
   expect(type).toBe('image/jpeg');
   expect(metadata.width).toBe(100);
   expect(metadata.height).toBe(78);
+  expect(ctx.headers['Last-Modified']).toBe('fake-last-modified');
 });
 
 test('f.jpg?x-oss-process=image/resize,w_100/auto-orient,1', async () => {

source/new-image-handler/yarn.lock

@@ -1195,11 +1195,6 @@
     "@types/koa-compose" "*"
     "@types/node" "*"
 
-"@types/mime-types@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1"
-  integrity sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==
-
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -4534,7 +4529,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.35, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==