not-node 6.5.3 → 6.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.5.3",
+	"version": "6.5.4",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {

package/src/init/index.js

@@ -13,25 +13,59 @@ const STANDART_INIT_SEQUENCE = require("./sequence.standart.js");
 
 /**
  *	@example <caption>Application initialization</caption>
- *	let App = new notApp({
- *		mongoose: mongooseLink
- *		modulesCollectionPaths: [__dirname + '/modules'], //each path to folder with modules
- *		modulesPaths: [],	//each path to module
- *		modules: {
- *			filestore: require('not-filestore') //each npm not-* module with custom overriden name as key
- *		}
- *	})
- *		.importModuleFrom(__dirname+'/anotherModule', 'anotherCustomModuleName')	//import module from path
- *		.importModulesFrom(__dirname+'/directoryOfUsefullessModules')
- *		.importModule(require('notModule'), 'notModule')
- *		.expose(ExpressApp);
+ *
+ * const sharp = require("sharp");
+ * const InitIdentityTokens = require("not-user").InitIdentityTokens;
+ *
+ * const notNode = require("not-node"),
+ *   Init = notNode.Init,
+ *   path = require("path"),
+ *   manifest = require("./../../project.manifest.json")
+ *
+ * const options = {
+ *       pathToApp: path.join(__dirname),
+ *      pathToNPM: path.join(__dirname, "../../node_modules"),
+ *      routesPath: path.join(__dirname, "./routes"),
+ *      indexRoute: require("./routes/site.js").index,
+ *  };
+ *  //fix error on some images
+ *  sharp.simd(false);
+ *  notNode.Env.set("extractVariants", 1);
+ *  const additional = {
+ *      pre({ initSequence }) {
+ *          initSequence.remove("InitMonitoring");    //no resource usage monitoring needed, removing initializer by its class name
+ *          initSequence.insert(InitIdentityTokens);  //initializing usage of identity tokens
+ *      },
+ *  };
+ *  //starting everything
+ *  await Init.run({ options, manifest, additional });
+ *  //sending message to error reporting server that we restarted
+ *  Init.notApp.reporter.report(new Error("server started"));
  **/
 class Init {
-    static options = false;
+    /**
+     * @type {Object}
+     *
+     * @static
+     * @memberof Init
+     */
+    static options = null;
     static manifest = false;
-    static config = false;
+    /**
+     * @type {Object}
+     *
+     * @static
+     * @memberof Init
+     */
+    static config = null;
     static mongoose = false;
-    static notApp = false;
+    /**
+     * @type {import('../app.js')|null}
+     *
+     * @static
+     * @memberof Init
+     */
+    static notApp = null;
     static server = false;
     static httpServer = false;
     static WSServer = false;
@@ -107,7 +141,7 @@ class Init {
 
     static printOutManifest = () => {
         log?.debug("Manifest:");
-        log?.debug(JSON.stringify(Init.notApp.getManifest(), null, 4));
+        log?.debug(JSON.stringify(Init.notApp?.getManifest(), null, 4));
     };
 
     /**
@@ -131,6 +165,7 @@ class Init {
                 manifest,
                 additional,
                 initSequence, //giving a chance to change init sequence
+                log,
             });
             //setting basic resources
             Init.options = options; // pathToApp, pathToNPM
@@ -143,6 +178,7 @@ class Init {
                 options, //options
                 master: Init, //this class
                 emit: ADDS.run.bind(ADDS),
+                log,
             };
             //running all prepared initalizers with current context
             await initSequence.run(context);
@@ -151,8 +187,9 @@ class Init {
                 options,
                 manifest,
                 master: Init,
+                log,
             });
-            log.info("Application initalization finished");
+            log?.info("Application initalization finished");
         } catch (e) {
             Init.throwError(e.message, 1);
         }

package/src/init/sequence.js

@@ -13,19 +13,19 @@ module.exports = class InitSequence {
      * Insert initalizator after and before specified modules or at the end
      * @param  {Object}  what    initializator class constructor
      * @param  {Object}  where   specification where to insert
-     * @param  {Array.String}  where.after   list of constructor names of
+     * @param  {string}  where.after   list of constructor names of
      *                       initalizators after which item should be inserted
-     * @param  {Array.String}  where.before   list of constructor names of
+     * @param  {string}  where.before   list of constructor names of
      *                       initalizators before which item should be inserted
      **/
-    insert(what, where = {}) {
+    insert(what, where = { after: "", before: "" }) {
         if (where && this.list.length > 0) {
             let start = -1,
                 end = this.list.length;
-            if (objHas(where, "after")) {
+            if (objHas(where, "after") && where.after) {
                 start = this.highestPos(where.after);
             }
-            if (objHas(where, "before")) {
+            if (objHas(where, "before") && where.before) {
                 end = this.lowestPos(where.before);
             }
             if (start > end) {

package/src/metas.js

@@ -1,7 +1,7 @@
 const Auth = require("./auth"),
     notAppIdentity = require("./identity"),
     notStyler = require("./styler"),
-    config = require("not-config").createReader();
+    notEnv = require("./env");
 
 function getRole(req) {
     const identity = new notAppIdentity(req);
@@ -14,7 +14,7 @@ function getRole(req) {
 
 const DEFAULT_STYLER = (req, res) => {
     const role = getRole(req);
-    const host = config.get("fullServerName");
+    const host = notEnv.get("fullServerName");
     const canonical = host + req.originalUrl;
 
     return {
@@ -22,6 +22,7 @@ const DEFAULT_STYLER = (req, res) => {
         desription: res?.options?.APP_DESCRIPTION,
         canonical,
         rand: Math.random(),
+        env: process.env.NODE_ENV,
         host,
         role,
         authenticated: role !== Auth.DEFAULT_USER_ROLE_FOR_GUEST,

package/test/notInit.js

@@ -158,6 +158,7 @@ describe("initialization", function () {
                                 "manifest",
                                 "additional",
                                 "initSequence",
+                                "log",
                             ]);
                             expect(params.config).to.be.deep.equal(config);
                             expect(params.options).to.be.deep.equal(options);
@@ -188,6 +189,7 @@ describe("initialization", function () {
                                 "manifest",
                                 "additional",
                                 "initSequence",
+                                "log",
                             ]);
                             expect(params.config).to.be.deep.equal(config);
                             expect(params.options).to.be.deep.equal(options);