nails-boilerplate 1.3.1 → 2.0.2

package/lib/nails.js

@@ -15,14 +15,10 @@ import { EventEmitter } from 'node:events';
 
 
 import Controller from './controller.js';
-import Model from './model.js';
 import ModelV2 from './model_v2.js';
 import Router from './router.js';
 
 import express_app from './application.js';
-import DbConnector from './database_connector.js';
-
-const models = {};
 
 // TODO: add key value pairs to express app singleton.
 var application = {};
@@ -42,8 +38,8 @@ export default async function nails(app_config) {
 nails.application = express_app;
 nails.Controller = Controller;
 nails.Model = ModelV2;
-nails.ModelDeprecated = Model;
 nails.events = new EventEmitter();
+nails._dbConnector = null;
 
 async function configure( app_config ) {
   express_app.set('nails_config', application);
@@ -75,26 +71,16 @@ async function configure( app_config ) {
   console.log("Initializing DB connection...");
   var DBConnector = await get_dbconnector(app_config.db.connector);
 
-  // TODO: deprecate the old Model style
-  if (app_config.config.MODELS_ROOT) {
-    Model.set_connector(DBConnector, app_config.db);
-    await init_models(app_config.config.MODELS_ROOT);
-  }
-  // TODO: make this Model style mandatory
-  console.log("Connecting to DB...");
-  if (DBConnector instanceof DbConnector) {
-    console.log("Generating model superclass...");
-    await DBConnector.connect(app_config.db);
-    ModelV2.setConnector(DBConnector);
-    await init_models_v2(app_config.config.MODELS_ROOT);
-    DBConnector.afterInitialization();
-  } else {
-    console.log("Instantiating DBConnector...");
-    // Try to instantiate DBConnector
-    let dbConnector = new DBConnector();
-    await dbConnector.connect(app_config.db);
-    ModelV2.setConnector(dbConnector);
-  }
+  console.log("Instantiating DBConnector and Connecting to DB...");
+  // Try to instantiate DBConnector
+  const dbConnector = new DBConnector();
+  nails._dbConnector = dbConnector;
+  await dbConnector.connect(app_config.db);
+  console.log("Generating model superclass...");
+  ModelV2.setConnector(dbConnector);
+  await init_models_v2(app_config.config.MODELS_ROOT);
+  console.log("Done importing models")
+  await dbConnector.afterInitialization();
   console.log("DB Connection complete");
 
   // init Controllers
@@ -151,9 +137,9 @@ function startServer(config) {
 async function init_controllers(controller_lib) {
   await init_app_lib(Controller, controller_lib);
 }
-async function init_models(model_lib) {
-  await init_app_lib(Model, model_lib);
-}
+// async function init_models(model_lib) {
+//   await init_app_lib(Model, model_lib);
+// }
 async function init_app_lib(superclass, abs_path) {
     console.log('attempting to import:', abs_path);
     if (!fs.existsSync(abs_path))
@@ -183,7 +169,8 @@ async function init_models_v2(abs_path) {
     // We just need to import each model once so the generateSuperclass
     // method is called at least once for each model.
     let modelClass = (await import(abs_path)).default;
-    console.log('imported model:', modelClass.name);
+    if (modelClass && modelClass.name) console.log('imported model:', modelClass.name);
+    else console.warn("No model found at:", abs_path);
     // // Constructor function was provided
     // if (!superclass.isPrototypeOf(subclass))
     //     return superclass.extend(subclass);

package/lib/sequelize_connector.js

@@ -21,6 +21,6 @@ export default class SequelizeConnector extends DbConnector {
 
   async afterInitialization() {
     console.log("SEQUELIZE::Writing changes to SQL Database");
-    await this.sequelize.sync({alter: true});
+    await this.sequelize.sync();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nails-boilerplate",
-  "version": "1.3.1",
+  "version": "2.0.2",
   "description": "A node.js webserver scaffold",
   "type": "module",
   "main": "index.js",

package/spec/mongodb_connector.util.js

@@ -1,4 +1,4 @@
-import MongoDBConnector from '../lib/mongodb_connector.js';
+import MongooseConnector from '../lib/mongoose_connector.js';
 import {MongoMemoryServer} from 'mongodb-memory-server';
 
 let singularInstanceCreated = false;
@@ -19,7 +19,7 @@ class MongoDBConnectorUtil {
     const dbConfig =
         {uri: uri, port: port, database: dbName, dbPath: dbPath};
     //console.log(JSON.stringify(dbConfig));
-    return new MongoDBConnector(dbConfig);
+    return new MongooseConnector(dbConfig);
   }
 
   async cleanup() {

package/spec/services/integration_sequelize/README.md

@@ -0,0 +1,5 @@
+Integration testing (Sans DB Connector)
+==============
+
+The package.json was copied from the example app. This is for integration
+testing nails.

package/spec/services/integration_sequelize/client/index.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+<head>
+</head>
+<body>
+    <h1>Welcome</h1>
+    <div></div>
+</body>
+</html>

package/spec/services/integration_sequelize/client/js/components/app.jsx

@@ -0,0 +1,15 @@
+// Use frontend React components to build a single-page webapp
+class App extends React.Component {
+  render() {
+    return (
+      <div>
+        Successfully rendered your homepage!
+      </div>
+    );
+  }
+}
+
+ReactDOM.render(
+ <App />,
+ document.getElementById('app')
+);

package/spec/services/integration_sequelize/config/db.js

@@ -0,0 +1,4 @@
+export default {
+  connector: 'sequelize_connector.js',
+  address: 'sqlite::memory:',
+}

package/spec/services/integration_sequelize/config/mimes.js

@@ -0,0 +1,61 @@
+/**
+ *  This file uses file extensions in the request to determine
+ *  the type of an asset and, therefore, where it can be found
+ *  in the file system.
+ *
+ *  Currently, the supported types are: 'js', 'css', 'html',
+ *  'img'
+ *  TODO: Add supported types pdf ( or document ), and video
+ *  TODO: move this file into nails.  Too annoying for the dev
+ *  to see and they shouldn't need to have to change it
+ */
+ /*
+    var mimes = {
+    // <ext>: '<type>'
+        js: 'js',
+        jpg: 'image',
+        css: 'css',
+        html: 'html'
+    };
+    */
+
+var mimes = {
+    html: {
+        type: 'page',
+        contentType: 'text/html'
+    },
+    js: {
+        type: 'script', // the type of the script,
+        contentType: 'application/javascript' // Header info
+    },
+    css: {
+        type: 'style',
+        contentType: 'text/css'
+    },
+    ico: {
+        type: 'image',
+        contentType: 'image/x-icon'
+    },
+    jpg: {
+        type: 'image',
+        contentType: 'image/jpeg'
+    },
+    png: {
+        type: 'image',
+        contentType: 'image/png'
+    },
+    pdf: {
+        type: 'document',
+        contentType: 'application/pdf'
+    },
+    xml: {
+        type: 'data',
+        contentType: 'text/xml'
+    },
+    json: {
+        type: 'data',
+        contentType: 'application/json'
+    }
+}
+
+export default mimes;

package/spec/services/integration_sequelize/config/routes.js

@@ -0,0 +1,25 @@
+/**
+ *	Routes specifies the array of route definitions to be passed to the router
+ *
+ *	Routes are checked in series, and the first matching route is applied.
+ *	A route definition is as follows:
+ *		['METHOD', 'MATCHER', 'OPTIONS']
+ *
+ *		METHOD => crud methods (GET, PUT, POST, DELETE)
+ *		MATCHER  => to be matched against the path.  Captured elements will be passed to options. Delegates to express application routing.
+ *		OPTIONS => an object with parametes deciding how the route will be handled in order of execution:
+ *			path: => the path to a static file ( index.html f/e)
+ *			controller: => controller to route the request to. TODO: May implement a resource definition for automatically routing cruds
+ *			action: => the method to run in the controller. If not specified, the index method will be called.
+ *			[1..n]: => each numerical definition defines a parameter in which to store the value of the captured elements in the regex.
+ *						controller, and action are protected names and will apply the cature to controller name and method respectively.
+ *						f/e: ['get', /\/(home)/, {0: 'controller'}] => routes to home controller
+ *							 ['get, '/\/home\/(5)/, {controller: 'home', 0: 'id'}] => routes to home controller and adds {id: 5} to the params hash.
+ */
+
+var routes = [
+  // Routes the root request to index.html, as well as all other requests to static
+  ['get', "/", {controller: 'home'}],
+];
+
+export default routes;

package/spec/services/integration_sequelize/config/service.js

@@ -0,0 +1,48 @@
+// Initializes application before server starts
+// Each of these is REQUIRED
+
+import routes from './routes.js';
+import mimes from './mimes.js';
+import db from './db.js';
+
+var SERVER_ROOT = import.meta.dirname + '/..';
+var APP_ROOT = SERVER_ROOT + '/server';
+
+// Only for reading the certificates for SSL
+import fs from 'node:fs';
+// const fs = require('fs');
+const PRIVATE_KEY_FILE = fs.readFileSync(`${import.meta.dirname}/ssl/key.pem`);
+const CERTIFICATE_FILE = fs.readFileSync(`${import.meta.dirname}/ssl/certificate.pem`);
+
+var config = {
+  APP_ROOT: APP_ROOT,
+  // root directory for delivering static assets
+  PUBLIC_ROOT: SERVER_ROOT + '/client',
+  CONTROLLERS_ROOT: APP_ROOT + '/controllers',
+  VIEWS_ROOT: APP_ROOT + '/views',
+  MODELS_ROOT: APP_ROOT + '/models',
+  SERVER_ROOT: SERVER_ROOT,
+
+  ENABLE_HTTP: true,
+  //IP: "0.0.0.0",
+  PORT: 3333,
+
+  ASYNC: false,
+
+  // For HTTPS
+  ENABLE_HTTPS: true,
+  SSL_PORT: 3334,
+  PRIVATE_KEY: PRIVATE_KEY_FILE,
+  CERTIFICATE: CERTIFICATE_FILE,
+};
+
+// module.exports.routes = require('./routes.js');
+// module.exports.mimes = require('./mimes.js');
+// module.exports.db = require('./db.js');
+
+export default {
+  config,
+  routes,
+  db,
+  mimes,
+}

package/spec/services/integration_sequelize/config/ssl/certificate.pem

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIUR04h3qlfhW5SYQrnm0VjDSLQrwUwDQYJKoZIhvcNAQEL
+BQAwZzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQ4wDAYDVQQKDAVOYWlsczES
+MBAGA1UEAwwJbG9jYWxob3N0MScwJQYJKoZIhvcNAQkBFhhhZG1pbkBwcm9qZWN0
+aW52aWN0YS5jb20wHhcNMjMwODMwMDE1MzUzWhcNMjQwODI5MDE1MzUzWjBnMQsw
+CQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExDjAMBgNVBAoMBU5haWxzMRIwEAYDVQQD
+DAlsb2NhbGhvc3QxJzAlBgkqhkiG9w0BCQEWGGFkbWluQHByb2plY3RpbnZpY3Rh
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALP54rGDg1Lo7FSs
+q4xvvOeisWLJzbTZN+hsxL3ytcxvk3oidVoZDDfkDJ1QBoPFjIyHlJZCvC6mJMeY
+3Nibn1zZAtsST84DCYS8c0bQAbEUc+OwSmNpVLQElnTAKyoY/7izj579p5uR7WLD
+mSk2c4igeqjOAQn/rrC3Lr+Dr6HA3lcEQD7g87OQz7JCRY6p5E980HO81gknnxod
+veQogbreiQ+MOwC9qPOwfJjAX/qkTWc1SXIiV2SskoIANTbGujMHZZZIaY5a5oWZ
+9pAKR0basSAjECMmr1/UCKGZeot0AZRKMBSHp6mlHlE5LLFIH56PaRTguSBhsrle
+BWcuUcUCAwEAAaNTMFEwHQYDVR0OBBYEFCigQMRd+cKymXdHgew3JMEcokv0MB8G
+A1UdIwQYMBaAFCigQMRd+cKymXdHgew3JMEcokv0MA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAD5ZtQ3XLBzOiJoICcRA0evC/59gt2kKw1owOLJy
+Ji4rtoWCis8nr3R1U62KUENZ//WRy09uNPHfjsaFwuvgO+GWn53Q3breCEO1r2lH
+z5qWUAdb7WpoZWZJdj6wZoJQeKQoK8fVCVNNPNHwhZRK2P2SWhn5v/7Qco5JMP8+
+qpIbAzjKOoHiz1238JYXJ5G1tMVMfVvQpC1E+KM9p9Bohtuc51pYMssT31WPBoOv
+TBcIarZ8ri6VBAh/+aUpce0BqOEtZ1oa6Mnd2w5GeqgtV+G7ir5g0uXZjOFrh5A7
+c6J3QmpeF3kfs+Ggsxh/fRrnK1VDDtWQ/mF/3Jrq43JoP0E=
+-----END CERTIFICATE-----

package/spec/services/integration_sequelize/config/ssl/csr.csr

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICrDCCAZQCAQAwZzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQ4wDAYDVQQK
+DAVOYWlsczESMBAGA1UEAwwJbG9jYWxob3N0MScwJQYJKoZIhvcNAQkBFhhhZG1p
+bkBwcm9qZWN0aW52aWN0YS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCz+eKxg4NS6OxUrKuMb7znorFiyc202TfobMS98rXMb5N6InVaGQw35Ayd
+UAaDxYyMh5SWQrwupiTHmNzYm59c2QLbEk/OAwmEvHNG0AGxFHPjsEpjaVS0BJZ0
+wCsqGP+4s4+e/aebke1iw5kpNnOIoHqozgEJ/66wty6/g6+hwN5XBEA+4POzkM+y
+QkWOqeRPfNBzvNYJJ58aHb3kKIG63okPjDsAvajzsHyYwF/6pE1nNUlyIldkrJKC
+ADU2xrozB2WWSGmOWuaFmfaQCkdG2rEgIxAjJq9f1AihmXqLdAGUSjAUh6eppR5R
+OSyxSB+ej2kU4LkgYbK5XgVnLlHFAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEA
+U9LsZPK6UDQJFNCVAwDQszIE8Jt5LsNR/h7/ljp98T2BEW5+i7kPGCF+sIzkafQR
+1NEKrwq8nAHOoS7cbzTQCtRLHgKQ5edj/dWVEzDmhf07uvq2wc9QmBjw9DIWD9Hd
+7P4FsOHEp++4h+CupNwLaMrisggsWtVihvqpSJxWt3IzvoqWKldBfIZfR1nf2Tl+
+2N1taAX+LHWQwzoq5xMMxmtQgabZk5kbeJ2K+NyxP3msjmREsRn0+TWzw9sTU6qu
+9EZtiW6xje2KlvjSmRP7pvJg17GbtqCHSVWamcHqs/HE69SZhgY/iWJk7eIJhSY3
+/b5srd0URvtlTivyQgsfUg==
+-----END CERTIFICATE REQUEST-----

package/spec/services/integration_sequelize/config/ssl/key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz+eKxg4NS6OxU
+rKuMb7znorFiyc202TfobMS98rXMb5N6InVaGQw35AydUAaDxYyMh5SWQrwupiTH
+mNzYm59c2QLbEk/OAwmEvHNG0AGxFHPjsEpjaVS0BJZ0wCsqGP+4s4+e/aebke1i
+w5kpNnOIoHqozgEJ/66wty6/g6+hwN5XBEA+4POzkM+yQkWOqeRPfNBzvNYJJ58a
+Hb3kKIG63okPjDsAvajzsHyYwF/6pE1nNUlyIldkrJKCADU2xrozB2WWSGmOWuaF
+mfaQCkdG2rEgIxAjJq9f1AihmXqLdAGUSjAUh6eppR5ROSyxSB+ej2kU4LkgYbK5
+XgVnLlHFAgMBAAECggEAJRJufyk7VkszTxfIOGPV0hLhnhs6e6uYyBALkKLbjtJW
+2vwZFyd8rFCVxpuy09bP5iyRT0hM0gEYJ2MV7qpTr8DlxTFm7eUTQ1u8FRSInKy9
+WGO6VvLd5zzgrwjce03t8uJNza6rJTDwaH0o4ePc9YI08euJLEGV/sGk5/8coOEr
+sdczGdxxumLEew9vwjDbIFuuVr4YHn/qs6h8DzEg595jWBibWxqVx4JvKTAMCmeM
+oLi251i2y3NLoKRd/+MOQ1WW9fLMiA1/cbhICqp3hGCGRv/g71bM0DVPsfmSPwGt
+Jm+Wtv12gmRqfDw5N+hJxAIUiW1CqU9SAZDmrPV+ewKBgQD373V/fBV1x73Mhbsr
++4IZxmp4CbLeT2aUFMThLfTCfs7zNL4VRfHwSw6n503YNANmBqBq8bKcNQqmTnXH
+EKvc7liSfSn0STLZtrubHkNe5t2TvUUQNOQBENsU0S8nS+ei+E0xJ6wey2TjN23F
+0CoEbh8/xhH0hoLT3B3GcAwNtwKBgQC51IjKPdlo1jmIUjNcGz76SpcMowkWp0+s
+qAEh0ksSCh1Pn4G+YhgoFmFcUahwkyP2CmAtHUrL+atw4b22/jHiJN/IfyhUPP31
+0ereRpi33m2dImz6PzistyM0jPdMAKz+W2wEBmOF6Z78MgaxUZm3s0CeXGYkzWoH
+iLQGJyMcYwKBgQDjtusTy8NqCaooziq6mqVDRxlCZqYByKtOFkU9DBhhClbIyQhM
+QZGUQVuUmrzEdgEpE60CjDqffZfqZuWFj6pJoB95a7u8wf4SN+LW9VSrNR8NMijc
+WbePwwt0cyv7y5tT8vnyy50qK2Tdy2rm4+mzZ/ELgb+79k7yhphSSVbIwQKBgC1u
+LjrzP/GHXe1b2z6LUqwyDBeEzDYDlVDqicxQ8xVn756Fqlx28tzqC8dcF0feUQ5X
+nweof566XRVtusm//0YAKc2EeMGPX673MOpCbBeXg0jFH8tWJW7kHvE7/UFRcPmG
+NDQPs8kLQlj5ifVTs7bbVdLhV/9rUJ6i5xASBV1tAoGAAess1DjK1jnX+v6h0/OP
+GFgg2cFB1ZarAstYHgLrLu+1Iuj9RDuTNwyiQDwT8gbz4i43o4zWE0NhQwlhJ84K
+EY5BgS8a7sILoZjo+Mfd06bQy0AhgmYtW8mojh9/9vfg42mE2bIlSVLnbWnSkvID
+jTFVReA7tpBS7h/Q6rW2hM8=
+-----END PRIVATE KEY-----

package/spec/services/integration_sequelize/config/ssl/private_key.pem

@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIcpza33KNpC0CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBBH4EXXxNpaRGmSXdx4SZI9BIIE
+0OiJGDq7wPbvMDc41zoOOD9dKozvlWJ6I7SXehwFmUrQFQSFyT9NiIw9bhnzQxnL
+F8osKdEHAknXKFVEVG4q64fDOiyaUojsBUavuUC1HG9MU9tBJ+gt118LYFTr0zrG
+WlFOl/p8kpwtAwrI+qRIrWFADzZExp2vX2b5qnapj9f/26BdjRTJvZtjDC10mBAJ
+UYoCAPyjtIOiBmkCQUCtwHJywpMLFZlGyrg+8WiTk2vW3vz+D5KWBYXb9BaLFTu+
+E/oeHJH30NDZewhlgi5vUjYE36fXi9TGaz8Zcron4wTUrtrAbV7bTWv8t0AnY7wp
+aM8zpsaULZ4XK0xSSA0LYRYYj5EYiYAv3OpQE/cjzRD6pbaAIzifRpsgLSh3UAp5
+45OqzbA3/JkrdsANGspUkrb/x3O6sSg6vgz/ocSlzRaiGcJ0qkFSETcHUCvpWSZD
+ltOLsYckgtFpcEzST+HG+hqORNoe4Sx/moJgMOfvlThr32GImj8wgi/czXze85bO
+v3HYffLxoQIfaz8XpYmcAfUgw3PMRTfPj5+pqmKXtRmemUHPNIDVFOD0eQWI61af
+og4f2OO0c0abELI7V5OlNrqWzAKoV1HtszedffPHNE5eJ+ENbbp68sFKmFLjZzOh
+GwhHkauaG9OW0F/wS03fJQdEMVXc8vvW8NAU3438o85Por0fiFfSgJ3Z9281IHBJ
+rEJ0nuqDCXJorX/On17qTF7EaXLzidpobdQ4vTg4N+/Q5l+Ep5zYby8Oiu/Hl618
+T7R4s3r4ceUHAJeyDli8C7fw761Qwd73qpB9RgbHY5HVZUALNk+TG4aS7kwcZ7CT
+MW6/PR+6RkMrwAPsfZwJnErzcrmhodxP3HRP0ikAfX9qbK8n8TIDt7Lb4WIZpqKu
+vGNnGScnBVmaGfrbqk6WeK9iAH3XXGYWcsGOFwxPYMl0YymW/MThDS+eIqJhqI4Z
+a2mjB/w6g5ANX5YOMbTWqjnsYdqobPRDPN5PEk1wWCYGZq9Hwbt0bHi1bKev/itw
+RyK60j25fsVf8RDkrMFaCgP/x/6iMl26TCi3R3W4cW5NlesxWYwNcOxnUwL7OQQT
+8aY1iR/Cn/RoRiZ90D4anCOTYLPX6pTHAPsTHBuU+odAUhXBGvIhSknvCf3xhahW
+hUY1yUnEYhgXbYLRCEsa7q48BoSFMibmwbt07YRJXNAGjgcc7bzCV43vc/GeUgdZ
+RrS1GNuzO0+S1TfvxfMBNBpoPbkeY2yHlUr+A8j6KHQw5mr3GnoOoeQTdZYK594m
+N6J/gxF1emQqJoP+i+mx7iSdf5i2DmV9ACl/tyU92PKocIcsYoIevSmhtliBnsdG
+R1kPkoUWuEVZujxzlIXcj0vEtOxyKJmzlBXKKO7B8U4HociBNMM41acX9WsIYdsA
+QFjZTyU2DkpOCPRcBFbgQFPwfrkC93hndiByWPCkmAjeHJ0O74fnBCUP5BhmFuuc
+/L0WWAVKp8HGgFmiq+i+rznJZEEEEoZClDFNkOBp4yfGZL9yZ2Ot3IRb2HNIJaj1
+69CX7ukHVHPLgiOcRSbFyuZZyqO++kWgEQm5jKlFFqGyFNpHmkGL8CGFlq7x9sF7
+ONozML/sxGNw4Ubo6TAPflvl7KOd9bcYJdpODqtJgngi
+-----END ENCRYPTED PRIVATE KEY-----

package/spec/services/integration_sequelize/config/ssl/public_key.pem

@@ -0,0 +1,9 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+Comment: "2048-bit RSA, converted by stantonwjones@darkmatter.lan from"
+AAAAB3NzaC1yc2EAAAADAQABAAABAQDPJQsK/daFi/b+7bOSEJcKdzjvNJygX3BvMQ4HY+
+JJaiSDyQgtwc8K85XDH0/eWyu5a6OzbadU3SkSdYP+0+uTdxfxRUCChKoASIoAaAfwB/BW
+WOIdsuGPhJjYiLnPL4SScFdjUbJXGP5JOSQ6wgsRdqsDeQezUjF0CvR1CXoJaqRQt7p5T9
+TlRzzuhN5Vf6BDpXBPTcNyUGKCaUwGQn2QmpXzRXrAZNb7XpzBSXdpUWm9W7U9zCFHva7J
+XCuXsC9yMy3w1mpbL+oFBx7Wvic5FqwnATXjM7xBSqcG4tYzrISyn5pj13cIzzk9aEPRI3
+qhV6kiA62JofiX1RkxMP+j
+---- END SSH2 PUBLIC KEY ----

package/spec/services/integration_sequelize/package.json

@@ -0,0 +1,23 @@
+{
+    "name": "nails_app",
+    "version": "0.0.0",
+    "description": "A basic nails application",
+    "main": "server.js",
+    "type": "module",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "start": "node server.js"
+    },
+    "author": "",
+    "license": "BSD",
+    "bugs": {
+        "url": "https://github.com/stantonwjones/nails-boilerplate/issues"
+    },
+    "config": {
+      "mongodbMemoryServer": {
+        "version": "latest"
+      }
+    },
+    "dependencies": {
+    }
+}

package/spec/services/integration_sequelize/server/controllers/default_json_controller.js

@@ -0,0 +1,21 @@
+import nails from "../../../../../index.js";
+import Dog from "../models/dog.js";
+import Owner from "../models/owner.js";
+
+export default class DefaultJsonController extends nails.Controller {
+  json = true;
+  routes = [
+    ['get', '/listowners'],
+    ['get', '/listowneddogs'],
+  ];
+
+  async listowners(params, request, response) {
+    return await Owner.findAll();
+  }
+
+  async listowneddogs(params, request, response) {
+    // await nails._dbConnector.afterInitialization();
+    // await Dog.sync({alter: true});
+    return await Dog.findAll();
+  }
+}

package/spec/services/integration_sequelize/server/controllers/home_controller.js

@@ -0,0 +1,39 @@
+export default function HomeController() {
+  this.index = function(params, request, response) {
+    console.log("HOME::INDEX");
+    response.json({
+      home_index: true
+    });
+  };
+  this.testaction = function(params, request, response) {
+    response.json({
+      home_testaction: true
+    });
+  }
+  this.test_ejs = function() {
+  };
+/*
+  this.public_index = function(params, request, response) {
+    response.public({path: 'index.html'});
+  };
+  this.json = function(params, request, response) {
+    response.json({test: 'json'});
+  };
+  // By setting a method to asynchronous, Nails will wait for an
+  // explicit response to the client. Otherwise, it will attempt
+  // to respond with a view immediately after the action terminates.
+  this.json.async = true;
+
+  this.test_model = function(params, request, response) {
+    var u = new User();
+    u.set('created_at', (new Date()).getTime());
+    u.save();
+    response.json({new_user_id: u.id.toString()});
+  };
+  this.test_id_template = function(params, request, response) {
+    var varz = {};
+    varz.id = params.id || "no id set";
+    response.render('test_id', varz);
+  };
+  */
+}

package/spec/services/integration_sequelize/server/models/dog.js

@@ -0,0 +1,7 @@
+import nails from '../../../../../index.js';
+import { DataTypes } from 'sequelize';
+const dogSchema = {
+  good: DataTypes.BOOLEAN,
+  name: DataTypes.STRING,
+};
+export default class Dog extends new nails.Model("Dog", dogSchema) {};

package/spec/services/integration_sequelize/server/models/owner.js

@@ -0,0 +1,10 @@
+import nails from '../../../../../index.js';
+import { DataTypes } from 'sequelize';
+import Dog from './dog.js';
+const ownerSchema = {
+  name: DataTypes.STRING,
+};
+class Owner extends new nails.Model("Owner", ownerSchema) {};
+Owner.hasMany(Dog);
+await Dog.sync();
+export default Owner;

package/spec/services/integration_sequelize/server/views/defaultjson/testnojson.ejs

@@ -0,0 +1 @@
+I am some arbitrary text

package/spec/services/integration_sequelize/server/views/testreact/testreact.ejs

@@ -0,0 +1,15 @@
+/* jshint esversion: 6 */
+var React = require('react');
+
+class TestReact extends React.Component {
+	render() {
+		return (
+			<html>
+			<head><title>react</title></head>
+			<body>react works!</body>
+			</html>
+			);
+	}
+}
+
+module.exports = TestReact;

package/spec/services/integration_sequelize/server.js

@@ -0,0 +1,9 @@
+// var nails = require('../../../index.js');
+import nails from '../../../index.js';
+import service_config from './config/service.js';
+
+// See self-documented config files
+// var service_config = require('./config/service.js');
+// console.log("starting server")
+(await nails( service_config )).startServer();
+export default nails; // export nails for testing

package/spec/services.integration_sequelize.spec.js

@@ -0,0 +1,67 @@
+import * as chai from 'chai';
+import { default as chaiHttp, request } from "chai-http";
+// import chaiHttp from 'chai-http';
+import { assert } from 'chai';
+// import { WebSocket } from 'ws';
+import WebSocket from 'ws';
+// const WebSocket = require('ws');
+
+var express_app;
+// const {MongoMemoryServer} = require('mongodb-memory-server');
+let mongod = null;
+
+// Configure chai
+chai.use(chaiHttp);
+chai.should();
+
+describe("Integration", function () {
+  before(async function () {
+    try {
+      var nails = (await import('./services/integration_sequelize/server.js')).default;
+    } catch (e) {
+      console.log("could not import server");
+      console.log(e);
+    }
+    console.log("got here");
+    express_app = nails.application;
+    return new Promise((resolve, reject) => {
+      nails.events.on("ready", () => {
+        console.log("ready was emitted!");
+        resolve();
+      });
+    });
+  });
+  describe("GET /", function () {
+    it('should return the expected JSON from index', function (done) {
+      request.execute(express_app)
+        .get('/')
+        .end((err, res) => {
+          res.should.have.status(200);
+          assert(res.text == JSON.stringify({ home_index: true }));
+          done();
+        });
+    });
+  });
+  describe("/listowners", function() {
+    it('should return an empty array if no owners', function(done) {
+      request.execute(express_app)
+        .get('/listowners')
+        .end((err, res) => {
+          res.should.have.status(200);
+          assert(JSON.parse(res.text).length == 0);
+          done();
+        });
+    })
+  })
+  describe("/listowneddogs", function() {
+    it('should return an empty array if no owned dogs', function(done) {
+      request.execute(express_app)
+        .get('/listowneddogs')
+        .end((err, res) => {
+          res.should.have.status(200);
+          assert(JSON.parse(res.text).length == 0);
+          done();
+        });
+    })
+  })
+});

package/templates/config/service.js

@@ -19,7 +19,7 @@ var config = {
   PUBLIC_ROOT: SERVER_ROOT + '/public',
   CONTROLLERS_ROOT: APP_ROOT + '/controllers',
   VIEWS_ROOT: APP_ROOT + '/views',
-  //MODELS_ROOT: APP_ROOT + '/models',
+  MODELS_ROOT: APP_ROOT + '/models',
   SERVER_ROOT: SERVER_ROOT,
 
   ENABLE_HTTP: true,

package/lib/model.js

@@ -1,167 +0,0 @@
-// This is the base definition for a model / collection
-// ideally used as a wrapper for database integration
-// should use promise objects to allow for method chaining
-// eventful.  emits ready event passing itself
-// start with mongodb
-import util from 'util';
-import controller_base from './controller.js';
-// var controller_base = require('./controller.js');
-// var util = require('util');
-
-/** TODO: what persistence methods does a model need?
- *  save/post => saves record to db
- *  fetch/get => updates model from database
- *  patch/put(?) => only changes specific methods and saves to database...
- *  destroy/delete => remove model from db
- *
- ** On Constructor:
- *
- *  get => get a single model by id
- *  find => get a collection of models by parameters
- */
-/** TODO: define a collection
- *
- *  will likely want to put collection constructor as attribute on Model
- *  f/e Model.Collection
- *
- ** Persistence methods:
- *
- *  save/post => save collection in database by batch command
- *      will want to minimize number of db requests, but can probably
- *      start with saving each individually for now
- *  fetch/get => updates collection from database
- *      a collection should have a saved query attribute which
- *      was used to get the collection.  Will make updating easy.
- */
-
-// init references to model base objects for use by controllers
-// and models
-controller_base.prototype.models = {};
-Model.prototype.models = {};
-
-var model_prot = Model.prototype;
-var db;
-
-var NAME_REQUIRED_ERROR = function() {
-    return new Error(
-        'FATAL ERROR::: Named function required for Model constructor method'
-    );
-}
-
-export default function Model(){
-};
-
-Model.extend = function(constructor) {
-    //console.log('extending', constructor.name);
-    if ( !constructor.name ) throw NAME_REQUIRED_ERROR();
-    //model_proto = model_proto || new Model();
-    constructor.prototype.__proto__ = model_prot;
-
-    // TODO: bind collection-specific methods to the constructor
-    //Model.set_db_access_methods(contructor);
-
-    // make models available to controller and other models
-    Model.prototype.models[constructor.name] = constructor;
-    controller_base.prototype.models[constructor.name] = constructor;
-
-};
-Model.set_connector = function(DBConnector, config) {
-  if (!config) {
-    this.prototype.connector = DBConnector;
-  } else {
-    this.prototype.connector = new DBConnector(config);
-  }
-};
-Model.set_db_access_methods = function(constructor) {
-    constructor.find = Model.find;
-};
-Model.find = function() {
-    var args = Array.prototype.slice.call(arguments, 0);
-    return this.connector.find.apply(connector, args);
-};
-
-Object.defineProperty(Model.prototype, 'id', {
-    get: function() {
-        return this.attributes[this.id_attribute];
-    },
-    set: function(new_val) {
-        this.set(this.id_attribute, new_val);
-        return new_val;
-    }
-});
-Object.defineProperty(Model.prototype, 'attributes', {
-    get: function() {
-        if (!this._attributes) this._attributes = {};
-        return this._attributes;
-    },
-    set: function(new_val) {
-        if (typeof new_val != 'object' && util.isArray(new_val))
-            throw 'Model#attributes cannot be set to non-object or array value';
-        this._extend_deeply(this.attributes, new_val, true);
-        return this.attributes;
-    }
-});
-Model.prototype.id_attribute = '_id';
-Model.prototype.is_model = true;
-/**
- * returns the name of the collection or table in the db.
- * override this by setting collection attribute on the model.
- */
-Model.prototype._collection_name = function() {
-    return this.collection || this.constructor.name;
-};
-/**
- * pointer to the database connector
- */
-Model.prototype.connector = {};
-
-Model.prototype.save = function() {
-    // this should create the model if it does not exist
-    // (uses an id to check existence)
-    // or it should update the model
-    if (this.id) return this.connector.put(this);
-    return this.connector.post(this);
-};
-Model.prototype.fetch = function() {
-    if (!this.id) throw 'cannot fetch model with id: ' + this.id.toString();
-    return this.connector.get(this);
-    // TODO: give model backbone-like sync event
-};
-/*
-Model.prototype.patch = function() {
-    // should try to update the model's changed attributes if no
-    // arguments given. Otherwise should attempt to set attributes
-    // on model and then update
-    Model.connector.update(this);
-};
-*/
-Model.prototype.destroy = function() {
-    // should delete the model from the database if it has been
-    // persisted
-    if (this.id) return false;
-    this.connector.delete(this);
-};
-Model.prototype.set = function(attr, val) {
-    this.attributes[attr] = val;
-};
-/**
- * merge a hash of attributes into the current set
- */
-Model.prototype._merge_attributes = function(attr) {
-    this._extend_deeply(this.attributes, attr);
-};
-Model.prototype._extend_deeply = function(obj0, obj1, should_prune) {
-    if (typeof obj0 != 'object' || typeof obj1 != 'object' ||
-            util.isArray(obj0) || util.isArray(obj1))
-        throw 'Attempting to extend a non-object entity';
-    for(var key in obj1) {
-        if (typeof obj0[key] == 'object' && typeof obj1[key] == 'object' && !util.isArray(obj0[key]))
-            this._extend_deeply(obj0[key], obj1[key], should_prune);
-        else obj0[key] = obj1[key];
-    }
-    if (!should_prune) return;
-    for (key in obj0) {
-        if (key in obj1) continue;
-        delete obj0[key];
-    }
-};

package/lib/mongodb_connector.js

@@ -1,100 +0,0 @@
-// TODO: multiple async requests here... need to
-// consider how this will be used by the models
-import {EventEmitter} from 'node:events';
-// var EventEmitter = require('events').EventEmitter;
-// const MongoClient = require('mongodb').MongoClient;
-import { MongoClient } from 'mongodb';
-
-export default MongoDBConnector;
-
-// TODO: need to deal with clustered databases...
-
-MongoDBConnector.prototype.__proto__ = EventEmitter.prototype;
-function MongoDBConnector(config) {
-  EventEmitter.call(this);
-  var url = config.url || 'mongodb://localhost';
-  var port = config.port || '27017';
-  var database = config.database || 'nails';
-  var uri =
-      config.uri ? config.uri : `${url}:${port}/${database}`;
-  this.exec_once_connected = [];
-  var that = this;
-  MongoClient.connect(uri)
-      .then(client => {
-        this._client = client;
-        this._db = client.db(database);
-        this.emit("connected");
-      }).catch(error => {
-        // TODO: better handling of the failed connection
-        console.error(error);
-        throw error;
-      });
-}
-
-/**
-* Need to implement these methods for a connector to work
-*/
-// maybe use rest methods as names for any database connector used...
-MongoDBConnector.prototype.post = function(model_or_collection) {
-  if (model_or_collection.is_model)
-      return this._post_one(model_or_collection._collection_name(),
-          model_or_collection.attributes);
-}
-MongoDBConnector.prototype._post_one = function(collection_name, doc_attributes, callback) {
-  return this._db.collection(collection_name).insert(doc_attributes);
-}
-MongoDBConnector.prototype._post_many = function(collection) {
-  return this._db.collection(collection.name())
-      .save(collection.model_attributes());
-}
-
-// update a record in the collection
-MongoDBConnector.prototype.put = function(model_or_collection) {
-  if (model_or_collection.is_model)
-      return this._put_one(
-        model_or_collection._collection_name(),
-        model_or_collection.attributes);
-}
-MongoDBConnector.prototype._put_one = function(collection_name, doc) {
-  // TODO: replacing document completely is sow
-  // will want to only send changed attr
-  // TODO: write concerns?
-  return this._db.collection(collection_name).replaceOne({_id: doc._id}, doc);
-}
-/**
-* _put_many will call _update on each individual object in collection
-* if that object has changed
-*/
-MongoDBConnector.prototype._put_many = function(collection) {
-}
-
-// return a single record from a collection
-// or a collection of records if requested...
-// if a model or collection is passed,
-MongoDBConnector.prototype.get = function(model_or_collection) {
-  if (model_or_collection.is_model)
-      return this._get_one(model_or_collection._collection_name(), model_or_collection.id, null)
-          .then(doc => this._on_doc_response(model_or_collection, doc));
-}
-MongoDBConnector.prototype._get_one = function(collection_name, id, options) {
-  options = options || {};
-  return this._db.collection(collection_name).findOne(id, options);
-}
-MongoDBConnector.prototype._get_many = function(collection) {
-  return this._db.collection(collection.name()).find({
-      _id: collection.collect('_id')});
-}
-
-// delete a record from a collection
-MongoDBConnector.prototype.delete = function(model) {
-  return this._db.collection(model.collection_name())
-      .remove(model.attributes._id);
-}
-// MongoDBConnector.prototype._delete_one
-// MongoDBConnector.prototype._delete_many
-
-MongoDBConnector.prototype._on_doc_response = function(model_or_collection, doc) {
-  // move this to the promise catch block: if (err) return console.log('error retrieving from', collection_name, '\n', err);
-  delete doc._id;
-  model_or_collection._merge_attributes(doc);
-}

package/lib/sqlite3_connector.js

@@ -1,88 +0,0 @@
-// TODO: multiple async requests here... need to
-// consider how this will be used by the models
-import { EventEmitter } from 'events';
-import DBClient from 'node:sqlite';
-// var EventEmitter = require('events').EventEmitter;
-// const DBClient = require('sqlite3');
-import test from 'node:assert';
-// const test = require('assert');
-
-module.exports = SQLite3Connector;
-
-// TODO: need to deal with clustered databases...
-
-SQLite3Connector.prototype.__proto__ = EventEmitter.prototype;
-function SQLite3Connector(config) {
-  EventEmitter.call(this);
-  var url = config.url || 'mongodb://localhost';
-  var port = config.port || '27017';
-  var database = config.database || 'nails';
-  this.exec_once_connected = [];
-  this._db = new DBClient.Database(config.filename);
-}
-
-/**
- * Need to implement these methods for a connector to work
- */
-// maybe use rest methods as names for any database connector used...
-SQLite3Connector.prototype.post = function(model_or_collection) {
-    if (model_or_collection.is_model) 
-        this._post_one(model_or_collection._collection_name(), 
-            model_or_collection.attributes);
-}
-SQLite3Connector.prototype._post_one = function(collection_name, doc_attributes, callback) {
-    this._db.collection(collection_name).insert(doc_attributes);
-}
-SQLite3Connector.prototype._post_many = function(collection) {
-    this._db.collection(collection.name())
-        .save(collection.model_attributes());
-}
-
-// update a record in the collection
-SQLite3Connector.prototype.put = function(model_or_collection) {
-    if (model_or_collection.is_model)
-        this._put_one(model_or_collection._collection_name(), model_or_collection.attributes);
-}
-SQLite3Connector.prototype._put_one = function(collection_name, doc) {
-    // TODO: replacing document completely is sow
-    // will want to only send changed attr
-    // TODO: write concerns?
-    this._db.collection(collection_name).update({_id: doc._id}, doc);
-}
-/**
- * _put_many will call _update on each individual object in collection
- * if that object has changed
- */
-SQLite3Connector.prototype._put_many = function(collection) {
-}
-
-// return a single record from a collection
-// or a collection of records if requested...
-// if a model or collection is passed, 
-SQLite3Connector.prototype.get = function(model_or_collection) {
-    if (model_or_collection.is_model)
-        this._get_one(model_or_collection._collection_name(), model_or_collection.id, null,
-                this._on_doc_response.bind(model_or_collection));
-}
-SQLite3Connector.prototype._get_one = function(collection_name, id, options, callback) {
-    options = options || {};
-    this._db.collection(collection_name).findOne(id, options, callback);
-}
-SQLite3Connector.prototype._get_many = function(collection) {
-    return this._db.collection(collection.name()).find({
-        _id: collection.collect('_id')});
-}
-
-// delete a record from a collection
-SQLite3Connector.prototype.delete = function(model) {
-    return this._db.collection(model.collection_name())
-        .remove(model.attributes._id);
-}
-// SQLite3Connector.prototype._delete_one
-// SQLite3Connector.prototype._delete_many
-
-SQLite3Connector.prototype._on_doc_response = function(err, doc) {
-    if (err) return console.log('error retrieving from', collection_name, '\n', err);
-    delete doc._id;
-    this._merge_attributes(doc);
-}

package/spec/model.spec.js

@@ -1,95 +0,0 @@
-import assert from 'assert';
-import Model from '../lib/model.js';
-import MongoDBConnectorUtil from './mongodb_connector.util.js';
-
-var test_model = new Model();
-var model_prot = Model.prototype;
-describe('Model', function() {
-  var util;
-  beforeEach(function(done) {
-    util = new MongoDBConnectorUtil();
-    util.getTestConnector().then(connector => {
-      Model.set_connector(connector);
-      connector.on("connected", done);
-    });
-  });
-  afterEach(function(done) {
-    util.cleanup().then(() => done());
-  });
-  describe('#_merge_attributes', function() {
-  });
-  describe('#_extend_deeply', function() {
-    var attr0;
-    var attr1;
-    beforeEach(function() {
-      attr0 = {a:7, b:'test', c:null, o: {}};
-      attr1 = {a:8, c:'test0', o: {a:0}};
-    });
-    it('should rewrite non object attributes', function() {
-      model_prot._extend_deeply(attr0, attr1);
-      // these should change
-      assert(attr0.a == attr1.a);
-      assert(attr0.c == attr1.c);
-      // these should not
-      assert(attr0.b == attr0.b);
-      assert(attr0.o == attr0.o);
-    });
-    it('should merge two attributes if they are both non-array objects',
-      function() {
-        model_prot._extend_deeply(attr0, attr1);
-        assert(attr0.o.a == attr1.o.a);
-      });
-    it('should delete attributes not present in obj1 if prune is true',
-      function() {
-        model_prot._extend_deeply(attr0, attr1, true);
-        assert(!('b' in attr0));
-      });
-    it('should not delete attributes absent present in obj1 if prune is falsey', function() {
-      model_prot._extend_deeply(attr0, attr1);
-      assert(attr0.o.a == attr1.o.a);
-    });
-  });
-  describe('#save', function() {
-    it('should save a new model to the database and update id',
-      async function() {
-        var model0 = new Model();
-        var model_name = 'testname0';
-        model0.attributes = {
-          name: model_name
-        };
-        await model0.save();
-        assert.ok(model0.attributes._id);
-        assert.ok(model_name == model0.attributes.name);
-      });
-    it('should save changes to an existing model to the database',
-      async function() {
-        var model0 = new Model();
-        model0.attributes = {
-          name: 'testname1'
-        };
-        await model0.save();
-        model0.set('x', 5);
-        await model0.save();
-        var model1 = new Model();
-        model1.id = model0.id;
-        await model1.fetch();
-        assert.ok(model1.attributes.x == 5);
-      });
-  });
-  describe('#fetch', function() {
-    it('should retrieve attributes for this model id from the database',
-      async function() {
-        var model0 = new Model();
-        model0.set('x', 7);
-        await model0.save();
-        var model1 = new Model();
-        model1.id = model0.id;
-        await model1.fetch();
-        assert.ok(model1.attributes.x == 7);
-      });
-  });
-  describe('#attributes', function() {
-    it('should be a plain object');
-    it('should not change by reference if set to a different attributes hash');
-  });
-});

package/spec/mongodb_connector.spec.js

@@ -1,66 +0,0 @@
-import assert from 'assert';
-import MongoDBConnectorUtil from './mongodb_connector.util.js';
-
-describe('MongoDBConnector', function() {
-  var util;
-  var mdbc;
-  beforeEach(function(done) {
-    util = new MongoDBConnectorUtil();
-    util.getTestConnector().then(connector => {
-      mdbc = connector;
-      connector.on("connected", done);
-    });
-  });
-  afterEach(function(done) {
-    util.cleanup().then(() => done());
-  });
-  it('should create a new connection to mongodb', function(done) {
-    assert.notEqual(mdbc._db, null);
-    done();
-  });
-  describe('#put', function() {
-    it('should be ok, updating the record in the database');
-  });
-  describe('Document retrieval', function() {
-    describe('#get', function() {
-      it('should return a single document when model is passed');
-      it('should return an array of docments when collection is passed');
-    });
-    describe('#_get_one', function() {
-      it('should return a single document with the matching _id', async function() {
-        var test_model = get_test_model('custom0');
-        var test_attr = test_model.attributes;
-        await mdbc._post_one(test_model.collection_name(), test_attr);
-        let doc = await mdbc._get_one(test_model.collection_name(),
-        test_model.attributes._id, null);
-        assert.ok(doc.custom_attr == test_attr.custom_attr);
-        assert.ok(doc._id.equals(test_attr._id));
-        return null;
-      });
-    });
-    describe('#_get_many', function() {
-      it('should return all documents matching the collection._query field');
-    });
-  });
-  describe('Document Creation', function(){
-    describe('#_post_one', function() {
-      it('should set an _id attribute on the given attributes hash', function(done) {
-        var test_model = get_test_model();
-        mdbc._post_one(test_model.collection_name(), test_model.attributes)
-          .then(() => {
-            assert.ok(test_model.attributes._id);
-            done();
-          });
-      });
-    });
-  });
-});
-function get_test_model(custom_attr) {
-  return {
-    collection_name: function() {return 'test_model'},
-    attributes: {
-      x: 'x',
-      custom_attr: custom_attr
-    }
-  }
-}