codehooks-js 1.2.8 → 1.2.10

package/index.js

@@ -86,8 +86,12 @@ class Codehooks {
     this.jobs[cronExpression] = hook;
   }
 
-  static = (options) => {
-    return ws(options, Codehooks.getInstance(), _filestore)
+  static = (options, hook) => {
+    return ws(options, Codehooks.getInstance(), _filestore, hook, {source: true})
+  }
+
+  storage = (options, hook) => {
+    return ws(options, Codehooks.getInstance(), _filestore, hook)
   }
 
   set = (key, val) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codehooks-js",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "type": "module",
   "description": "Codehooks.io official library - provides express.JS like syntax",
   "main": "index.js",

package/types/index.d.ts

@@ -498,6 +498,19 @@ export type httpResponse = {
    * - e.g. res.headers({'Content-Type': 'text/html; charset=UTF-8','X-myheader': '123456890'});
    */
   headers: (headers: object) => any;
+  /**
+   * Set a response header value
+   * @param header string
+   * @param value string
+   * @returns 
+   */
+  setHeader: (header: string, value: string) => any;
+  /**
+   * Remove any default headers from a response 
+   * @param header string
+   * @returns 
+   */
+  removeHeader: (header: string) => any;
   /**
    * - Return a HTTP response status code for a client request,
    * - e.g. res.status(401);
@@ -826,11 +839,27 @@ declare class Codehooks {
   ): void;
 
   /**
-   * Serve static file content
+   * Serve static file content from a source code diretory
    * @param {Object} options - {route: "/", default: "index.html", directory: "/static"}
    * @returns void
    */
-  static: (options: any) => void;
+  static: (options: any, 
+      ...hook: ((
+      request: httpRequest,
+      response: httpResponse,
+      next: nextFunction
+    ) => any)[]) => void;
+  /**
+   * Serve file content from a blob storage diretory
+   * @param {Object} options - {route: "/documents", directory: "/docs"}
+   * @returns void
+   */
+  storage: (options: any, 
+    ...hook: ((
+    request: httpRequest,
+    response: httpResponse,
+    next: nextFunction
+  ) => any)[]) => void;
   /**
    * Configuration settings
    * @param {string} key

package/webserver.mjs

@@ -16,7 +16,7 @@ function promisify(cb, fn) {
 
 const defaultOptions = { route: '/public', default: "index.html", directory: "/" };
 
-export function serveStatic(options, app, filestore) {
+export function serveStatic(options, app, filestore, hook, fsoptions) {
     if (!options) {
         options = defaultOptions;
     }
@@ -42,7 +42,7 @@ export function serveStatic(options, app, filestore) {
         }        
     })
 
-    app.get(regex, async (req, res) => {
+    const readFunc = async (req, res) => {
         let filePath = decodeURIComponent(req.apiPath);
         try {
             // serve root '' or '/'
@@ -65,7 +65,7 @@ export function serveStatic(options, app, filestore) {
             // get mime type
             const type = mime.getType(filePath)
             console.debug('Serve file', filePath, type)
-            const filestream = await filestore.getReadStream(filePath);
+            const filestream = await filestore.getReadStream(filePath, fsoptions);
             res.set('Content-Type', type || 'application/octet-stream');
             if (options.headers) {
                 res.headers(options.headers);
@@ -90,8 +90,12 @@ export function serveStatic(options, app, filestore) {
             console.error(error)
             res.status(404).end('No file here:' + filePath)
         }
-    })
-
+    }
+    const farr = [readFunc]
+    if (typeof hook === 'function'){
+        farr.unshift(hook)
+    } 
+    app.get(regex, ...farr)
 }
 
 /* template engine support */
@@ -129,7 +133,7 @@ async function ejs(viewFile, data, settings, cb) {
         if (tmplCache[viewFile]) {                        
             tmpl = tmplCache[viewFile];
         } else {
-            const txtfile = await _coho_fs.readFile(`${settings.views}/${viewFile}.ejs`);
+            const txtfile = await _coho_fs.readFile(`${settings.views}/${viewFile}.ejs`, {source: true});
             //console.log('Txtfile', txtfile)
             tmplCache[viewFile] = engine.compile(txtfile);
             tmpl = tmplCache[viewFile];
@@ -157,7 +161,7 @@ async function handlebars(viewFile, data, settings, cb) {
                 //console.log('Layout file', layoutFile)
                 engine.registerPartial('layout', layoutFile);
             }
-            const txtfile = await _coho_fs.readFile(`${settings.views}/${viewFile}.hbs`);
+            const txtfile = await _coho_fs.readFile(`${settings.views}/${viewFile}.hbs`, {source: true});
             //console.log('Txtfile', txtfile)
             tmplCache[viewFile] = engine.compile(txtfile);
             tmpl = tmplCache[viewFile];