11import { IncomingMessage , ServerResponse } from 'http' ;
2+ import { UrlWithParsedQuery } from 'url' ;
3+
4+ import {
5+ imageOptimizer as pixel ,
6+ ImageOptimizerOptions ,
7+ } from '@millihq/pixel-core' ;
28import { ImageConfig } from 'next/dist/server/image-config' ;
3- import { NextConfig } from 'next/dist/server/config' ;
4- import { imageOptimizer as nextImageOptimizer } from 'next/dist/server/image-optimizer' ;
5- import Server from 'next/dist/server/next-server' ;
69import nodeFetch from 'node-fetch' ;
7- import { UrlWithParsedQuery } from 'url' ;
810import S3 from 'aws-sdk/clients/s3' ;
911
1012/* -----------------------------------------------------------------------------
1113 * Types
1214 * ---------------------------------------------------------------------------*/
1315
14- type NodeFetch = typeof nodeFetch ;
15-
16- type OriginCacheControl = string | null ;
17-
1816interface S3Config {
1917 s3 : S3 ;
2018 bucket : string ;
2119}
2220
23- type ImageOptimizerResult = {
24- finished : boolean ;
25- originCacheControl : OriginCacheControl ;
26- } ;
27-
28- /* -----------------------------------------------------------------------------
29- * globals
30- * ---------------------------------------------------------------------------*/
31-
32- // Sets working dir of Next.js to /tmp (Lambda tmp dir)
33- const distDir = '/tmp' ;
34-
35- let originCacheControl : OriginCacheControl ;
36-
37- /**
38- * fetch polyfill to intercept the request to the external resource
39- * to get the Cache-Control header from the origin
40- */
41- const fetchPolyfill : NodeFetch = ( url , init ) => {
42- return nodeFetch ( url , init ) . then ( ( result ) => {
43- originCacheControl = result . headers . get ( 'Cache-Control' ) ;
44- return result ;
45- } ) ;
46- } ;
47-
48- fetchPolyfill . isRedirect = nodeFetch . isRedirect ;
49-
50- // Polyfill fetch is used by nextImageOptimizer
51- // @ts -ignore
52- global . fetch = fetchPolyfill ;
53-
5421/* -----------------------------------------------------------------------------
5522 * imageOptimizer
5623 * ---------------------------------------------------------------------------*/
@@ -61,19 +28,31 @@ async function imageOptimizer(
6128 res : ServerResponse ,
6229 parsedUrl : UrlWithParsedQuery ,
6330 s3Config ?: S3Config
64- ) : Promise < ImageOptimizerResult > {
65- // Create next config mock
66- const nextConfig = ( {
67- images : imageConfig ,
68- } as unknown ) as NextConfig ;
69-
70- // Create Next Server mock
71- const server = {
72- getRequestHandler : ( ) => async (
31+ ) : ReturnType < typeof pixel > {
32+ const options : ImageOptimizerOptions = {
33+ /**
34+ * Use default temporary folder from AWS Lambda
35+ */
36+ distDir : '/tmp' ,
37+
38+ imageConfig : {
39+ ...imageConfig ,
40+ loader : 'default' ,
41+ } ,
42+
43+ /**
44+ * Is called when the path is an absolute URI, e.g. `/my/image.png`.
45+ *
46+ * @param req - Incoming client request
47+ * @param res - Outgoing mocked response
48+ * @param url - Parsed url object from the client request,
49+ * e.g. `/my/image.png`
50+ */
51+ async requestHandler (
7352 { headers } : IncomingMessage ,
7453 res : ServerResponse ,
7554 url : UrlWithParsedQuery
76- ) => {
55+ ) {
7756 if ( s3Config ) {
7857 // S3 expects keys without leading `/`
7958 const trimmedKey = url . href . startsWith ( '/' )
@@ -98,10 +77,12 @@ async function imageOptimizer(
9877 }
9978
10079 if ( object . CacheControl ) {
101- originCacheControl = object . CacheControl ;
80+ res . setHeader ( 'Cache-Control' , object . CacheControl ) ;
81+ // originCacheControl = object.CacheControl;
10282 }
10383
104- res . end ( object . Body ) ;
84+ res . write ( object . Body ) ;
85+ res . end ( ) ;
10586 } else if ( headers . referer ) {
10687 const { referer } = headers ;
10788 const trimmedReferer = referer . endsWith ( '/' )
@@ -116,30 +97,24 @@ async function imageOptimizer(
11697
11798 res . statusCode = upstreamRes . status ;
11899 const upstreamType = upstreamRes . headers . get ( 'Content-Type' ) ;
119- originCacheControl = upstreamRes . headers . get ( 'Cache-Control' ) ;
100+ const originCacheControl = upstreamRes . headers . get ( 'Cache-Control' ) ;
120101
121102 if ( upstreamType ) {
122103 res . setHeader ( 'Content-Type' , upstreamType ) ;
123104 }
124105
106+ if ( originCacheControl ) {
107+ res . setHeader ( 'Cache-Control' , originCacheControl ) ;
108+ }
109+
125110 const upstreamBuffer = Buffer . from ( await upstreamRes . arrayBuffer ( ) ) ;
126- res . end ( upstreamBuffer ) ;
111+ res . write ( upstreamBuffer ) ;
112+ res . end ( ) ;
127113 }
128114 } ,
129- } as Server ;
130-
131- const result = await nextImageOptimizer (
132- server ,
133- req ,
134- res ,
135- parsedUrl ,
136- nextConfig ,
137- distDir
138- ) ;
139- return {
140- ...result ,
141- originCacheControl,
142115 } ;
116+
117+ return pixel ( req , res , parsedUrl , options ) ;
143118}
144119
145120export type { S3Config } ;
0 commit comments