@yumerijs/core 2.0.9 → 2.0.11

package/dist/session.d.ts

@@ -23,7 +23,16 @@ export interface CacheOptions {
     etag?: string;
     modified?: Date;
     maxAge?: number;
+    smaxAge?: number;
+    isImmutable?: boolean;
     expires?: Date;
+    cacheControl?: 'public' | 'private' | 'no-cache' | 'no-store' | 'must-revalidate' | 'proxy-revalidate';
+}
+export interface StaticCacheOptions {
+    etag?: boolean;
+    maxAge?: number;
+    smaxAge?: number;
+    etagType?: 'md5' | 'sha1' | 'sha256' | 'sha512';
 }
 export declare class Session {
     ip: string;
@@ -95,6 +104,7 @@ export declare class Session {
      * @param option 选项
      */
     setCache(option: CacheOptions): void;
-    static(path: string, option: CacheOptions): void;
+    static(content: string, option: CacheOptions): void;
+    file(path: string, option: StaticCacheOptions): void;
 }
 export {};

package/dist/session.js

@@ -296,16 +296,25 @@ class Session {
             this.head['ETag'] = `"${option.etag}"`;
         if (option.modified)
             this.head['Last-Modified'] = option.modified.toUTCString();
+        let control = [];
+        if (option.cacheControl !== undefined)
+            control.push(option.cacheControl);
         if (option.maxAge !== undefined)
-            this.head['Cache-Control'] = `max-age=${option.maxAge}`;
+            control.push[`max-age=${option.maxAge}`];
+        if (option.smaxAge !== undefined)
+            control.push(`s-maxage=${option.smaxAge}`);
+        if (option.isImmutable)
+            control.push('immutable');
+        if (control.length > 0)
+            this.head['Cache-Control'] = control.join(', ');
         if (option.expires)
             this.head['Expires'] = option.expires.toUTCString();
     }
-    static(path, option) {
+    static(content, option) {
         // 先查看用户是否在询问文件修改情况
         if (this.client.headers['If-Modified-Since']) {
             const modified = new Date(this.client.headers['If-Modified-Since']);
-            if (modified.getTime() === option.modified.getTime()) {
+            if (modified.getTime() === option.modified?.getTime()) {
                 this.status = 304;
                 return;
             }
@@ -317,7 +326,34 @@ class Session {
             }
         }
         this.setCache(option);
-        this.body = fs_1.default.readFileSync(path);
+        this.body = content;
+    }
+    file(path, option) {
+        if (this.client.headers['If-Modified-Since']) {
+            const modified = new Date(this.client.headers['If-Modified-Since']);
+            const moditime = fs_1.default.statSync(path).mtime;
+            if (modified.getTime() === moditime.getTime()) {
+                this.status = 304;
+                return;
+            }
+        }
+        const etag = crypto_1.default.createHash(option.etagType || 'md5').update(fs_1.default.readFileSync(path)).digest('hex');
+        if (this.client.headers['If-None-Match']) {
+            if (option.etag) {
+                if (this.client.headers['If-None-Match'] === etag) {
+                    this.status = 304;
+                    return;
+                }
+            }
+        }
+        this.setCache({
+            modified: fs_1.default.statSync(path).mtime,
+            etag,
+            maxAge: option.maxAge,
+            smaxAge: option.smaxAge,
+            cacheControl: 'public'
+        });
+        this.body = fs_1.default.readFileSync(path, 'utf-8');
     }
 }
 exports.Session = Session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/core",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "Core module for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",