@innet/server 1.4.3 → 1.4.4

package/README.md

@@ -213,14 +213,14 @@ You can return a file as a response.
 ```typescript jsx
 export default (
   <server>
-    <header name='content-type' value='text/html'>
+    <header name='cache-control' value='max-age=300'>
       <file path='index.html' />
     </header>
   </server>
 )
 ```
 
-In this case `content-type` will be equal to `text/html` even if the file does not exist.
+In this case `cache-control` will be equal to `max-age=300` even if the file does not exist.
 
 You can put content into the file to apply it only if the file does exist.
 
@@ -228,7 +228,7 @@ You can put content into the file to apply it only if the file does exist.
 export default (
   <server>
     <file path='index.html'>
-      <header name='content-type' value='text/html' />
+      <header name='cache-control' value='max-age=300' />
     </file>
   </server>
 )
@@ -394,7 +394,7 @@ export default (
 
 It will check if the file exist in cms folder then returns the file else returns `404.html`.
 
-You can add prefix with router to handle specific path.
+You can use prefix with router to handle specific path.
 
 ```typescript jsx
 export default (
@@ -409,6 +409,21 @@ export default (
 )
 ```
 
+You can input something into `cms`, if requested file is exist then the content should be used.
+
+```typescript jsx
+export default (
+  <server>
+    <switch>
+      <cms dir='cms'>
+        <header name='cache-control' value='max-age=300' />
+      </cms>
+      <file path='404.html' />
+    </switch>
+  </server>
+)
+```
+
 ## proxy
 You can proxy request.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",

package/plugins/cms/cms.d.ts

@@ -4,5 +4,6 @@ export interface CmsProps {
 }
 export interface CmsJsxElement {
     props: CmsProps;
+    children?: any;
 }
-export declare function cms({ props }: CmsJsxElement, handler: any): Promise<unknown>;
+export declare function cms({ props, children }: CmsJsxElement, handler: any): Promise<unknown>;

package/plugins/cms/cms.es6.js

@@ -2,7 +2,7 @@ import path from 'path';
 import { file } from '../file/file.es6.js';
 import { ACTION } from '../../action/Action/Action.es6.js';
 
-function cms({ props }, handler) {
+function cms({ props, children }, handler) {
     const action = handler[ACTION];
     const { req } = action;
     if (!req) {
@@ -19,7 +19,7 @@ function cms({ props }, handler) {
         }
     }
     const filePath = path.join(dir, url);
-    return file({ props: { path: filePath } }, handler);
+    return file({ props: { path: filePath }, children }, handler);
 }
 
 export { cms };

package/plugins/cms/cms.js

@@ -11,7 +11,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
 function cms(_a, handler) {
-    var props = _a.props;
+    var props = _a.props, children = _a.children;
     var action = handler[Action.ACTION];
     var req = action.req;
     if (!req) {
@@ -28,7 +28,7 @@ function cms(_a, handler) {
         }
     }
     var filePath = path__default["default"].join(dir, url);
-    return file.file({ props: { path: filePath } }, handler);
+    return file.file({ props: { path: filePath }, children: children }, handler);
 }
 
 exports.cms = cms;

package/plugins/file/file.es6.js

@@ -1,3 +1,4 @@
+import innet from 'innet';
 import fs from 'fs';
 import mime from 'mime';
 import { ACTION } from '../../action/Action/Action.es6.js';
@@ -8,14 +9,23 @@ function file({ props, children = null }, handler) {
     if (fs.existsSync(path)) {
         const stat = fs.statSync(path);
         if (stat.isFile()) {
-            res.writeHead(200, {
-                'Content-Type': mime.getType(path),
-                'Content-Length': stat.size,
-            });
             const readStream = fs.createReadStream(path);
-            readStream.pipe(res);
+            const result = innet(children, handler);
+            const run = () => {
+                res.writeHead(200, {
+                    'Content-Type': mime.getType(path),
+                    'Content-Length': stat.size,
+                });
+                readStream.pipe(res);
+            };
+            if (result instanceof Promise) {
+                result.then(run);
+            }
+            else {
+                run();
+            }
             return new Promise((resolve, reject) => {
-                readStream.once('end', () => resolve(children));
+                readStream.once('end', () => resolve(result));
                 readStream.once('error', reject);
             });
         }

package/plugins/file/file.js

@@ -2,12 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var innet = require('innet');
 var fs = require('fs');
 var mime = require('mime');
 var Action = require('../../action/Action/Action.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var mime__default = /*#__PURE__*/_interopDefaultLegacy(mime);
 
@@ -16,16 +18,25 @@ function file(_a, handler) {
     var res = handler[Action.ACTION].res;
     var path = props.path;
     if (fs__default["default"].existsSync(path)) {
-        var stat = fs__default["default"].statSync(path);
-        if (stat.isFile()) {
-            res.writeHead(200, {
-                'Content-Type': mime__default["default"].getType(path),
-                'Content-Length': stat.size,
-            });
+        var stat_1 = fs__default["default"].statSync(path);
+        if (stat_1.isFile()) {
             var readStream_1 = fs__default["default"].createReadStream(path);
-            readStream_1.pipe(res);
+            var result_1 = innet__default["default"](children, handler);
+            var run = function () {
+                res.writeHead(200, {
+                    'Content-Type': mime__default["default"].getType(path),
+                    'Content-Length': stat_1.size,
+                });
+                readStream_1.pipe(res);
+            };
+            if (result_1 instanceof Promise) {
+                result_1.then(run);
+            }
+            else {
+                run();
+            }
             return new Promise(function (resolve, reject) {
-                readStream_1.once('end', function () { return resolve(children); });
+                readStream_1.once('end', function () { return resolve(result_1); });
                 readStream_1.once('error', reject);
             });
         }