@wooksjs/http-static 0.4.11 → 0.4.12

package/dist/index.cjs

@@ -1224,8 +1224,6 @@ async function serveFile(filePath, options = {}) {
         throw new eventHttp.HttpError(404);
     }
     status(200);
-    // if-none-match & if-modified-since processing start
-    // rfc7232
     const etag = `"${[
         fileStats.ino,
         fileStats.size,
@@ -1236,7 +1234,6 @@ async function serveFile(filePath, options = {}) {
         status(304);
         return '';
     }
-    // if-none-match & if-modified-since processing end
     setHeader('etag', etag);
     setHeader('last-modified', lastModified.toUTCString());
     if (options.cacheControl !== undefined) {
@@ -1271,7 +1268,6 @@ async function serveFile(filePath, options = {}) {
         removeHeader('last-modified');
         throw new eventHttp.HttpError(404);
     }
-    // range header processing start
     let range = headers.range;
     let start, end;
     let size = fileStats.size;
@@ -1288,30 +1284,20 @@ async function serveFile(filePath, options = {}) {
             throw new eventHttp.HttpError(416);
         }
         size = end - start + 1;
-        // if-range processing start
-        // rfc7233#section-3.2\
         const ifRange = headers['if-range'] || '';
         const ifRangeTag = ifRange[0] === '"' ? ifRange : '';
         const ifRangeDate = ifRangeTag ? '' : ifRange;
         if (ifRange &&
             !isNotModified(etag, lastModified, ifRangeTag, ifRangeDate)) {
-            // If the validator does not match, the server MUST ignore
-            // the Range header field.
             status(200);
             size = fileStats.size;
             range = '';
         }
         else {
-            // If the validator given in the If-Range header field matches the
-            // current validator for the selected representation of the target
-            // resource, then the server SHOULD process the Range header field as
-            // requested.
             setHeader('content-range', `bytes ${start}-${end}/${fileStats.size}`);
             status(206);
         }
-        // if-range processing end
     }
-    // range header processing end
     setHeader('accept-ranges', 'bytes');
     setHeader('content-type', getMimeType(normalizedPath) || 'application/octet-stream');
     setHeader('content-length', size);
@@ -1324,9 +1310,6 @@ async function serveFile(filePath, options = {}) {
         ? ''
         : fs.createReadStream(normalizedPath, !!range ? { start, end } : undefined);
 }
-// function toWeak(etag: string): string {
-//     return `W/${etag}`
-// }
 function isNotModified(etag, lastModified, clientEtag, clientLM) {
     if (clientEtag) {
         const parts = clientEtag.split(',').map((v) => v.trim());
@@ -1335,18 +1318,9 @@ function isNotModified(etag, lastModified, clientEtag, clientLM) {
                 return true;
             }
         }
-        // A recipient MUST ignore If-Modified-Since if the request contains an
-        // If-None-Match header field; the condition in If-None-Match is
-        // considered to be a more accurate replacement for the condition in
-        // If-Modified-Since, and the two are only combined for the sake of
-        // interoperating with older intermediaries that might not implement
-        // If-None-Match.
         return false;
     }
     const date = new Date(clientLM);
-    // A recipient MUST ignore the If-Modified-Since header field if the
-    // received field-value is not a valid HTTP-date, or if the request
-    // method is neither GET nor HEAD.
     if (date.toString() !== 'Invalid Date' &&
         date.getTime() > lastModified.getTime()) {
         return true;

package/dist/index.d.ts

@@ -1,20 +1,17 @@
-/// <reference types="node" />
-
-import { Readable } from 'stream';
-import { TCacheControl } from '@wooksjs/event-http';
-
-export declare function serveFile(filePath: string, options?: TServeFileOptions): Promise<Readable | string | string[] | unknown>;
-
-declare interface TServeFileOptions {
-    headers?: Record<string, string>;
-    cacheControl?: TCacheControl;
-    expires?: Date | string | number;
-    pragmaNoCache?: boolean;
-    baseDir?: string;
-    defaultExt?: string;
-    listDirectory?: boolean;
-    index?: string;
-    allowDotDot?: boolean;
-}
-
-export { }
+import { TCacheControl } from '@wooksjs/event-http';
+import { Readable } from 'stream';
+
+interface TServeFileOptions {
+    headers?: Record<string, string>;
+    cacheControl?: TCacheControl;
+    expires?: Date | string | number;
+    pragmaNoCache?: boolean;
+    baseDir?: string;
+    defaultExt?: string;
+    listDirectory?: boolean;
+    index?: string;
+    allowDotDot?: boolean;
+}
+declare function serveFile(filePath: string, options?: TServeFileOptions): Promise<Readable | string | string[] | unknown>;
+
+export { serveFile };

package/dist/index.mjs

@@ -1222,8 +1222,6 @@ async function serveFile(filePath, options = {}) {
         throw new HttpError(404);
     }
     status(200);
-    // if-none-match & if-modified-since processing start
-    // rfc7232
     const etag = `"${[
         fileStats.ino,
         fileStats.size,
@@ -1234,7 +1232,6 @@ async function serveFile(filePath, options = {}) {
         status(304);
         return '';
     }
-    // if-none-match & if-modified-since processing end
     setHeader('etag', etag);
     setHeader('last-modified', lastModified.toUTCString());
     if (options.cacheControl !== undefined) {
@@ -1269,7 +1266,6 @@ async function serveFile(filePath, options = {}) {
         removeHeader('last-modified');
         throw new HttpError(404);
     }
-    // range header processing start
     let range = headers.range;
     let start, end;
     let size = fileStats.size;
@@ -1286,30 +1282,20 @@ async function serveFile(filePath, options = {}) {
             throw new HttpError(416);
         }
         size = end - start + 1;
-        // if-range processing start
-        // rfc7233#section-3.2\
         const ifRange = headers['if-range'] || '';
         const ifRangeTag = ifRange[0] === '"' ? ifRange : '';
         const ifRangeDate = ifRangeTag ? '' : ifRange;
         if (ifRange &&
             !isNotModified(etag, lastModified, ifRangeTag, ifRangeDate)) {
-            // If the validator does not match, the server MUST ignore
-            // the Range header field.
             status(200);
             size = fileStats.size;
             range = '';
         }
         else {
-            // If the validator given in the If-Range header field matches the
-            // current validator for the selected representation of the target
-            // resource, then the server SHOULD process the Range header field as
-            // requested.
             setHeader('content-range', `bytes ${start}-${end}/${fileStats.size}`);
             status(206);
         }
-        // if-range processing end
     }
-    // range header processing end
     setHeader('accept-ranges', 'bytes');
     setHeader('content-type', getMimeType(normalizedPath) || 'application/octet-stream');
     setHeader('content-length', size);
@@ -1322,9 +1308,6 @@ async function serveFile(filePath, options = {}) {
         ? ''
         : createReadStream(normalizedPath, !!range ? { start, end } : undefined);
 }
-// function toWeak(etag: string): string {
-//     return `W/${etag}`
-// }
 function isNotModified(etag, lastModified, clientEtag, clientLM) {
     if (clientEtag) {
         const parts = clientEtag.split(',').map((v) => v.trim());
@@ -1333,18 +1316,9 @@ function isNotModified(etag, lastModified, clientEtag, clientLM) {
                 return true;
             }
         }
-        // A recipient MUST ignore If-Modified-Since if the request contains an
-        // If-None-Match header field; the condition in If-None-Match is
-        // considered to be a more accurate replacement for the condition in
-        // If-Modified-Since, and the two are only combined for the sake of
-        // interoperating with older intermediaries that might not implement
-        // If-None-Match.
         return false;
     }
     const date = new Date(clientLM);
-    // A recipient MUST ignore the If-Modified-Since header field if the
-    // received field-value is not a valid HTTP-date, or if the request
-    // method is neither GET nor HEAD.
     if (date.toString() !== 'Invalid Date' &&
         date.getTime() > lastModified.getTime()) {
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/http-static",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "description": "@wooksjs/http-static",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -8,6 +8,14 @@
   "files": [
     "dist"
   ],
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/wooksjs/wooksjs.git",
@@ -31,7 +39,7 @@
     "url": "https://github.com/wooksjs/wooksjs/issues"
   },
   "peerDependencies": {
-    "@wooksjs/event-http": "0.4.11"
+    "@wooksjs/event-http": "0.4.12"
   },
   "homepage": "https://github.com/wooksjs/wooksjs/tree/main/packages/http-static#readme"
 }