codehooks-js 1.1.9 → 1.1.11

package/README.md

@@ -36,7 +36,7 @@ app.get('/myroute', async (req, res) => {
 app.static({directory: "/static"})
 
 // CRUD REST API for any collection
-app.crudlify()
+app.crudlify({}, {prefix: "/"})
 
 // return app to serverless runtime engine
 export default app.init()

package/crudlify/index.mjs

@@ -22,10 +22,14 @@ let _eventHooks = null;
  * @param {object} options - Options
  * @returns {EventHooks} Hooks for REST operations
  */
-export default async function crudlify(app, schema = {}, options = { schema: "yup", query: "q2m" }) {
+export default async function crudlify(app, schema = {}, options = { schema: "yup", query: "q2m", prefix: "" }) {
     console.log('Init crudlify', schema, options)
     _schema = schema;
     _opt = options;
+    if (_opt.prefix === undefined || _opt.prefix === '/') {
+        _opt.prefix = '';
+    }
+ 
     try {
         // the DB variable is present when running as a codehooks.io app
         Datastore = DB;
@@ -79,14 +83,14 @@ export default async function crudlify(app, schema = {}, options = { schema: "yu
 
     console.debug('Apply routes to app');
     // App API routes
-    app.post('/:collection', createFunc);
-    app.get('/:collection', readManyFunc);
-    app.get('/:collection/:ID', readOneFunc);
-    app.put('/:collection/:ID', updateFunc);
-    app.patch('/:collection/_byquery', patchManyFunc);
-    app.patch('/:collection/:ID', patchFunc);
-    app.delete('/:collection/_byquery', deleteManyFunc);
-    app.delete('/:collection/:ID', deleteFunc);
+    app.post(_opt.prefix+'/:collection', createFunc);
+    app.get(_opt.prefix+'/:collection', readManyFunc);
+    app.get(_opt.prefix+'/:collection/:ID', readOneFunc);
+    app.put(_opt.prefix+'/:collection/:ID', updateFunc);
+    app.patch(_opt.prefix+'/:collection/_byquery', patchManyFunc);
+    app.patch(_opt.prefix+'/:collection/:ID', patchFunc);
+    app.delete(_opt.prefix+'/:collection/_byquery', deleteManyFunc);
+    app.delete(_opt.prefix+'/:collection/:ID', deleteFunc);
     _eventHooks = new EventHooks();
     console.debug('Return event hooks');
     return _eventHooks;
@@ -163,8 +167,7 @@ async function readManyFunc(req, res) {
         console.log(req.headers['x-real-ip'], req.method, req.originalUrl);
     
         const conn = await Datastore.open();
-        
-        return (await conn.getMany(collection, mongoQuery)).json(res);
+        return (await conn.getMany(collection, mongoQuery.filter, mongoQuery)).json(res);
     } catch (ex) {
         console.error(ex.message);
         res.status(400).send(ex.message);
@@ -262,7 +265,8 @@ async function patchManyFunc(req, res) {
         console.log(req.headers['x-real-ip'], req.method, req.originalUrl);
         const conn = await Datastore.open();
         await _eventHooks.fireBefore(collection, 'PATCH', document);
-        const result = await conn.updateMany(collection, document, mongoQuery);
+        // coll, query, doc, option
+        const result = await conn.updateMany(collection, mongoQuery.filter, document, mongoQuery);
         await _eventHooks.fireAfter(collection, 'PATCH', result);
         res.json(result);
     } catch (e) {
@@ -302,7 +306,7 @@ async function deleteManyFunc(req, res) {
         console.log(req.headers['x-real-ip'], req.method, req.originalUrl);
         const mongoQuery = _query(req.query, req.headers);
         const conn = await Datastore.open();
-        const result = await conn.removeMany(collection, mongoQuery);
+        const result = await conn.removeMany(collection, mongoQuery.filter, mongoQuery);
         res.json(result);
     } catch (e) {
         res

package/package.json

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

package/webserver.mjs

@@ -14,46 +14,55 @@ function promisify(cb, fn) {
 }
 
 
-const defaultOptions = { route: '/', default: "index.html", directory: "/" };
+const defaultOptions = { route: '/public', default: "index.html", directory: "/" };
 
 export function serveStatic(options, app, filestore) {
     if (!options) {
         options = defaultOptions;
     }
-    let baseRoute = '/';
+    let baseRoute = '';
     if (options.route && options.route !== undefined && options.route !== '/') {
-        baseRoute = options.route + '/';
+        baseRoute = options.route;
     }
-    const regex = new RegExp(`^\\${baseRoute}(([\\w\\s.-]|%[0-9a-fA-F]{2})+\\/)*([\\w\\s.-]|%[0-9a-fA-F]{2})+(\\.(css|html|htm|js|ts|jpeg|jpg|png|svg))?$|^\\/$`);
+    // match path and file
+    const regex = new RegExp(`^${baseRoute}(\/[\\w\/_-]*|[\\w\/_-]+\/)?([\\w.-]+)?(\\?[\\w=&%-]+)?$`);
+    // create public access for static files
     app.auth(regex, (req, res, next) => {
-        //console.log('Auth', req.apiPath, options.route)
-        if (options.route && options.route !== undefined && options.route !== '/') {
-            if (!req.apiPath.startsWith(options.route)) {
-                console.error('Not serving', req.apiPath)
-                return res.status(404).send('Nothing here that matches ' + req.apiPath)
-            }
+        let filePath = decodeURIComponent(req.apiPath);
+        
+        if (filePath == options.route) {
+            filePath = '/' + (options.default !== undefined ? options.default : 'index.html');
         }
-        next()
+        const type = mime.getType(filePath)
+        if (!type) {
+            next(`Static server: ${filePath} is not a valid file name`)
+        } else {            
+            // ok to grant public access to file
+            next()
+        }        
     })
 
     app.get(regex, async (req, res) => {
-        //console.log('apiPath', req.apiPath, options)
         let filePath = decodeURIComponent(req.apiPath);
-        //console.log('apiPath', req.apiPath, options, filePath)
         try {
-            if (filePath == '/') {
+            // serve root '' or '/'
+            if (filePath == options.route) {
                 filePath = '/' + (options.default !== undefined ? options.default : 'index.html');
             }
-            //console.log('f1', filePath)
+            // remove route from file path
             if (options.route && options.route !== undefined && options.route !== '/') {
                 filePath = filePath.replace(options.route, '');
             }
-            //console.log('f2', filePath)
+            // add directory filesystem path
             if (options.directory && options.directory !== undefined && options.directory !== '/') {
                 filePath = options.directory + filePath;
             }
+            // serve index.html for empty sub routes '/a/b/'
+            if(filePath.endsWith('/')) {
+                filePath += (options.default !== undefined ? options.default : 'index.html')
+            }
 
-            //console.log('f3', filePath)
+            // get mime type
             const type = mime.getType(filePath)
             console.debug('Serve file', filePath, type)
             const filestream = await filestore.getReadStream(filePath);