manner.js 0.0.28 → 0.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manner.js",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "Frontend mode project.",
   "repository": "git@github.com:leobrad/mode.git",
   "author": "Leo Ely",

package/server.js

@@ -9,11 +9,25 @@ exports.parseOption = parseOption;
 exports.readCookie = readCookie;
 var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
+var _zlib = _interopRequireDefault(require("zlib"));
+var _stream = require("stream");
 var _handlebars = _interopRequireDefault(require("handlebars"));
 var _htmlMinifier = require("html-minifier");
-var _cacheOutput = _interopRequireDefault(require("./lib/cacheOutput"));
-var _compressOutput = _interopRequireDefault(require("./lib/compressOutput"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function onError(err) {
+  if (err) {
+    console.error('An error occurred:', err);
+    process.exitCode = 1;
+  }
+}
+function parseDateString(dateString) {
+  return new Date(httpDate).getTime();
+}
+function formateHttpDate(date) {
+  let [week, month, day, year, time, zone] = date.toString().split(' ');
+  zone = zone.split('+')[0];
+  return month + ', ' + day + ' ' + month + ' ' + year + ' ' + time + ' ' + zone;
+}
 function isOption(string) {
   let ans = true;
   if (typeof string === 'string') {
@@ -146,8 +160,46 @@ class CommonHttp {
     this.compress = {};
     this.options = options;
     this.regexp = new RegExp(`\.(${getLists(options.fonts.concat(['html, ico', 'js']))})$`);
-    this.cacheOutput = _cacheOutput.default.bind(this);
-    this.compressOutput = _compressOutput.default.bind(this);
+  }
+  compressOutput(req, res, buffer, path) {
+    res.setHeader('Vary', 'Accept-Encoding');
+    let acceptEncoding = req.headers['accept-encoding'];
+    if (/gzip/.test(acceptEncoding)) {
+      res.writeHead(200, {
+        'Content-Encoding': 'gzip'
+      });
+      this.dealCompress(_zlib.default.gzipSync(buffer), path, res);
+    } else {
+      res.writeHead(200, {});
+      this.dealDirect(buffer, path, res);
+    }
+  }
+  cacheOutput(req, res, path, file, ms) {
+    let ifModifiedSince = req.headers['If-Modified-Since'];
+    if (ifModifiedSince === undefined) {
+      if (this.modify[path] === undefined) {
+        this.modify[path] = new Date(ms).toString();
+      }
+      if (this.file[path] === undefined) {
+        this.file[path] = file;
+      }
+      res.setHeader('Last-Modified', formateHttpDate(this.modify[path]));
+      this.compressOutput(req, res, this.file[path], path);
+    } else {
+      if (this.modify[path] === undefined) {
+        this.modify[path] = new Date(ms).toString();
+      }
+      if (parseDateString(new Date().toString()) < parseDateString(this.modify[path])) {
+        if (this.file[path] === undefined) {
+          this.file[path] = file;
+        }
+        res.setHeader('Last-Modified', formateHttpDate(this.modify[path]));
+        this.compressOutput(req, res, this.file[path], path);
+      } else {
+        res.writeHead(304);
+        res.end();
+      }
+    }
   }
   dealCompress(data, path, res) {
     if (this.compress[path] === undefined) {
@@ -172,6 +224,7 @@ class CommonHttp {
         } = this;
         res.end(time);
       } else if (this.regexp.test(url)) {
+        const restPath = url.substring(1, url.length);
         this.cacheOutput(req, res, restPath, _fs.default.readFileSync(_path.default.resolve('static', restPath)), parseInt(_fs.default.statSync(_path.default.resolve('static', restPath)).mtimeMs));
       } else if (url.substring(0, 4) === '/api') {
         const body = await new Promise((resolve, reject) => {