nexusframework 0.3.0-beta.73 → 0.3.0-beta.74

package/src/compileScripts.ts

@@ -1,153 +1,153 @@
-import child_process = require("child_process");
-import uglifyJs = require("uglify-js");
-import uglifyEs = require("uglify-es");
-import logger = require("nulllogger");
-import async = require("async");
-import path = require("path");
-import _ = require("lodash");
-import fs = require("fs");
-import os = require("os");
-
-const cpus = os.cpus().length;
-const tsc = require.resolve("typescript/bin/tsc");
-
-const typeOptions = {
-    "es5": ["--target", "ES5"],
-    "es6": ["--target", "ES6"]
-};
-
-const compile = function(indir: string, outdir: string, cb: (err?: Error) => void, types = ["es5", "es6"]) {
-    const log = new logger("NexusFramework");
-    const sourcemap = indir === outdir;
-    const options: any = {
-        mangle: true,
-        compress: true
-    };
-    if (sourcemap)
-        indir = path.resolve(indir, "src");
-    const _cpus = Math.max(1, Math.floor(cpus / types.length));
-    fs.readdir(indir, function(err: Error, files?: string[]) {
-        if (err)
-            return cb(err);
-        const compileDir = function(typeOutDir: string, _type: string, cb: (err?: Error) => void) {
-            const l = log.extend(_type);
-            l.info("Processing");
-            async.eachLimit(files, _cpus, function(tsRaw, cb) {
-                if (!/\.ts$/.test(tsRaw))
-                    return cb();
-
-                const base = path.basename(tsRaw, ".ts");
-                const minOut = base + ".min.js";
-                const minOutJs = path.resolve(typeOutDir, minOut);
-                const jsOut = path.resolve(typeOutDir, base + ".js");
-                const tsIn = path.resolve(indir, tsRaw);
-
-                var inmtime: number, outmtime: number;
-                async.series([
-                    function(cb) {
-                        fs.stat(tsIn, function(err, stat) {
-                            if (err)
-                                return cb(err);
-                            inmtime = stat.mtimeMs;
-                            cb();
-                        })
-                    },
-                    function(cb) {
-                        fs.stat(minOutJs, function(err, stat) {
-                            if (err) {
-                                if (err.code === "ENOENT") {
-                                    outmtime = 0;
-                                    return cb();
-                                }
-                                return cb(err);
-                            }
-                            outmtime = stat.mtimeMs;
-                            cb();
-                        })
-                    }
-                ], function(err: Error) {
-                    if (err)
-                        return cb(err);
-                    if (outmtime >= inmtime)
-                        return cb();
-
-                    const args = ["--module", "AMD", "--out", jsOut];
-                    const opts = typeOptions[_type];
-                    if (sourcemap)
-                        args.push("--sourceMap", "true");
-                    if (opts)
-                        args.push.apply(args, opts);
-                    args.push(tsIn);
-
-                    l.info("Compiling", tsIn);
-                    const child = child_process.fork(tsc, args, {stdio:"inherit"} as any);
-                    child.on("exit", function(code, signal) {
-                        if(signal)
-                            return cb(new Error("Exited with signal " + signal));
-                        if(code)
-                            return cb(new Error("Exited with code " + code));
-
-                        const uglify = _type === "es6" ? uglifyEs : uglifyJs;
-                        l.info("uglify ", jsOut, minOut);
-                        fs.readFile(jsOut, "utf8", function(err, code) {
-                            if(err)
-                                return cb(err);
-                            const data: any = {};
-                            data["../src/" + tsRaw] = code;
-                            const _opts: any = _.cloneDeep(options);
-                            const next = function() {
-                                const output = uglify.minify(data as any, _opts);
-                                err = output['error'];
-                                if(err)
-                                    return cb(err instanceof Error ? err : new Error(err));
-                                if (sourcemap)
-                                    output.code += "\n//# sourceMappingURL=" + base + ".min.js.map";
-                                fs.writeFile(minOutJs, output.code, "utf8", function(err) {
-                                    if(err)
-                                        return cb(err);
-                                    if (sourcemap)
-                                        fs.writeFile(path.resolve(typeOutDir, base + ".min.js.map"), output.map, "utf8", cb);
-                                    else
-                                        cb();
-                                });
-                            }
-                            if (sourcemap)
-                                fs.readFile(path.resolve(typeOutDir, base + ".js.map"), "utf8", function(err, smap) {
-                                    if (err)
-                                        return cb(err);
-                                    _opts.sourceMap = {
-                                        content: smap,
-                                        filename: base + ".min.js"
-                                    };
-                                    next();
-                                });
-                            else
-                                fs.unlink(jsOut, function(err) {
-                                    if (err)
-                                        return cb(err);
-                                    next();
-                                });
-                        });
-                    });
-                });
-            }, cb);
-        }
-        if(types.length === 1)
-            compileDir(outdir, types[0], cb);
-        else
-            async.each(types, function(_type, cb) {
-                compileDir(path.resolve(outdir, _type), _type, cb);
-            }, cb);
-    });
-}
-export = compile;
-
-if (require.main === module) {
-    const scriptsDir = path.resolve(__dirname, "../scripts");
-    compile(scriptsDir, scriptsDir, function(err?: Error) {
-        if (err)
-            throw err;
-        else
-            process.exit(0);
-    });
-}
+import child_process = require("child_process");
+import uglifyJs = require("uglify-js");
+import uglifyEs = require("uglify-es");
+import logger = require("nulllogger");
+import async = require("async");
+import path = require("path");
+import _ = require("lodash");
+import fs = require("fs");
+import os = require("os");
+
+const cpus = os.cpus().length;
+const tsc = require.resolve("typescript/bin/tsc");
+
+const typeOptions = {
+    "es5": ["--target", "ES5"],
+    "es6": ["--target", "ES6"]
+};
+
+const compile = function(indir: string, outdir: string, cb: (err?: Error) => void, types = ["es5", "es6"]) {
+    const log = new logger("NexusFramework");
+    const sourcemap = indir === outdir;
+    const options: any = {
+        mangle: true,
+        compress: true
+    };
+    if (sourcemap)
+        indir = path.resolve(indir, "src");
+    const _cpus = Math.max(1, Math.floor(cpus / types.length));
+    fs.readdir(indir, function(err: Error, files?: string[]) {
+        if (err)
+            return cb(err);
+        const compileDir = function(typeOutDir: string, _type: string, cb: (err?: Error) => void) {
+            const l = log.extend(_type);
+            l.info("Processing");
+            async.eachLimit(files, _cpus, function(tsRaw, cb) {
+                if (!/\.ts$/.test(tsRaw))
+                    return cb();
+
+                const base = path.basename(tsRaw, ".ts");
+                const minOut = base + ".min.js";
+                const minOutJs = path.resolve(typeOutDir, minOut);
+                const jsOut = path.resolve(typeOutDir, base + ".js");
+                const tsIn = path.resolve(indir, tsRaw);
+
+                var inmtime: number, outmtime: number;
+                async.series([
+                    function(cb) {
+                        fs.stat(tsIn, function(err, stat) {
+                            if (err)
+                                return cb(err);
+                            inmtime = stat.mtimeMs;
+                            cb();
+                        })
+                    },
+                    function(cb) {
+                        fs.stat(minOutJs, function(err, stat) {
+                            if (err) {
+                                if (err.code === "ENOENT") {
+                                    outmtime = 0;
+                                    return cb();
+                                }
+                                return cb(err);
+                            }
+                            outmtime = stat.mtimeMs;
+                            cb();
+                        })
+                    }
+                ], function(err: Error) {
+                    if (err)
+                        return cb(err);
+                    if (outmtime >= inmtime)
+                        return cb();
+
+                    const args = ["--module", "AMD", "--out", jsOut];
+                    const opts = typeOptions[_type];
+                    if (sourcemap)
+                        args.push("--sourceMap", "true");
+                    if (opts)
+                        args.push.apply(args, opts);
+                    args.push(tsIn);
+
+                    l.info("Compiling", tsIn);
+                    const child = child_process.fork(tsc, args, {stdio:"inherit"} as any);
+                    child.on("exit", function(code, signal) {
+                        if(signal)
+                            return cb(new Error("Exited with signal " + signal));
+                        if(code)
+                            return cb(new Error("Exited with code " + code));
+
+                        const uglify = _type === "es6" ? uglifyEs : uglifyJs;
+                        l.info("uglify ", jsOut, minOut);
+                        fs.readFile(jsOut, "utf8", function(err, code) {
+                            if(err)
+                                return cb(err);
+                            const data: any = {};
+                            data["../src/" + tsRaw] = code;
+                            const _opts: any = _.cloneDeep(options);
+                            const next = function() {
+                                const output = uglify.minify(data as any, _opts);
+                                err = output['error'];
+                                if(err)
+                                    return cb(err instanceof Error ? err : new Error(err));
+                                if (sourcemap)
+                                    output.code += "\n//# sourceMappingURL=" + base + ".min.js.map";
+                                fs.writeFile(minOutJs, output.code, "utf8", function(err) {
+                                    if(err)
+                                        return cb(err);
+                                    if (sourcemap)
+                                        fs.writeFile(path.resolve(typeOutDir, base + ".min.js.map"), output.map, "utf8", cb);
+                                    else
+                                        cb();
+                                });
+                            }
+                            if (sourcemap)
+                                fs.readFile(path.resolve(typeOutDir, base + ".js.map"), "utf8", function(err, smap) {
+                                    if (err)
+                                        return cb(err);
+                                    _opts.sourceMap = {
+                                        content: smap,
+                                        filename: base + ".min.js"
+                                    };
+                                    next();
+                                });
+                            else
+                                fs.unlink(jsOut, function(err) {
+                                    if (err)
+                                        return cb(err);
+                                    next();
+                                });
+                        });
+                    });
+                });
+            }, cb);
+        }
+        if(types.length === 1)
+            compileDir(outdir, types[0], cb);
+        else
+            async.each(types, function(_type, cb) {
+                compileDir(path.resolve(outdir, _type), _type, cb);
+            }, cb);
+    });
+}
+export = compile;
+
+if (require.main === module) {
+    const scriptsDir = path.resolve(__dirname, "../scripts");
+    compile(scriptsDir, scriptsDir, function(err?: Error) {
+        if (err)
+            throw err;
+        else
+            process.exit(0);
+    });
+}

package/src/nexusframework.d.ts

@@ -1,13 +1,12 @@
-/// <reference types="node" />
-/// <reference types="socket.io" />
-/// <reference types="nulllogger" />
 import { User, APIEncoder, ResponseLocals, StaticMountOptions, Renderer, PageSystemSkeleton, MountOptions, ImageResizerOptions, MappedRequestHandler, RequestHandler, RequestHandlerEntry, ExistsRequestHandler, RouteRequestHandler, AccessRequestHandler, RequestHandlerChildEntry, Request, Response } from "../types";
-import { Template } from "nhp/lib/Template";
 import { Application } from "express";
+import socket_io = require("socket.io");
 import express = require("express");
 import events = require("events");
 import http = require("http");
 import nhp = require("nhp");
+type Template = InstanceType<typeof nhp.Template>;
+declare const Template: typeof nhp.Template;
 export declare class LeafRequestHandler implements RequestHandlerEntry {
     leaf: boolean;
     handle: RequestHandler<any, any>;
@@ -47,7 +46,7 @@ export declare class NexusFramework extends events.EventEmitter {
     readonly prefix: string;
     readonly app: Application;
     readonly server: http.Server;
-    readonly io?: SocketIO.Server;
+    readonly io?: socket_io.Server;
     readonly logger: nulllogger.INullLogger;
     static readonly apiencoders: {
         [index: string]: APIEncoder<User, ResponseLocals<User>>;
@@ -175,3 +174,4 @@ export declare class NexusFramework extends events.EventEmitter {
     close(cb?: Function): void;
     isIOSetup(): boolean;
 }
+export {};

package/src/nexusframework.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NexusFramework = exports.NHPRequestHandler = exports.LeafRequestHandler = void 0;
+exports.createExtendedRequestHandler = createExtendedRequestHandler;
 const cookieParser = require("cookie-parser");
 const querystring = require("querystring");
 const lrucache = require("lru-weak-cache");
-const Template_1 = require("nhp/lib/Template");
 const nulllogger = require("nulllogger");
 const socket_io = require("socket.io");
 const useragent = require("useragent");
 const statuses = require("statuses");
-const chokidar = require("chokidar");
 const express = require("express");
 const mime = require("mime-magic");
 const events = require("events");
@@ -25,7 +25,8 @@ const url = require("url");
 const nhp = require("nhp");
 const fs = require("fs");
 const os = require("os");
-const BSON = new bson;
+const Template = nhp.Template;
+const BSON = bson;
 const noop = function () { };
 const mainpkgversion = (function () {
     try {
@@ -36,7 +37,7 @@ const mainpkgversion = (function () {
     }
 })();
 const iconSizes = [310, 196, 152, 150, 144, 128, 120, 114, 96, 76, 72, 70, 64, 60, 57, 48, 24, 16, 32];
-const socket_io_slim_js = require.resolve("socket.io-client/dist/socket.io.slim.js");
+const socket_io_slim_js = require.resolve("socket.io-client/dist/socket.io.js");
 const has_slim_io_js = fs.existsSync(socket_io_slim_js);
 var socket_io_slim_path;
 var socket_io_slim_integrity;
@@ -54,8 +55,9 @@ if (has_slim_io_js) {
 else
     socket_io_slim_path = ":io/socket.io.js";
 var bson_path;
-const bson_js = require.resolve("bson/dist/bson.js");
-const bsonpkgjson = require("bson/package.json");
+const bson_package_dir = _path.resolve(_path.dirname(require.resolve("bson")), "..");
+const bson_js = _path.resolve(bson_package_dir, "lib/bson.bundle.js");
+const bsonpkgjson = require(_path.resolve(bson_package_dir, "package.json"));
 if (bson_js) {
     bson_path = ":scripts/bson.js?v=" + bsonpkgjson.version;
     // try {
@@ -827,7 +829,6 @@ function createExtendedRequestHandler() {
     };
     return requestHandler;
 }
-exports.createExtendedRequestHandler = createExtendedRequestHandler;
 function lazyLoadMapping(impl, method, mapping) {
     if (impl instanceof Function)
         return impl;
@@ -1411,27 +1412,32 @@ class FSWatcherRequestHandler extends RequestHandlerWithChildren {
         this.pagesysskeleton = options.pagesysskeleton;
         this.autoindexskeleton = options.autoindexskeleton;
         var onready = [];
-        const fswatcher = this.fswatcher = chokidar.watch(fspath, {
-            ignorePermissionErrors: true
-        });
         const self = this;
-        fswatcher.on("ready", function () {
-            delete self.handle;
-            onready.forEach(function (cb) {
-                cb();
+        const initializeWatcher = function (chokidar) {
+            const fswatcher = self.fswatcher = chokidar.watch(fspath, {
+                ignorePermissionErrors: true
             });
-        });
-        fswatcher.on("add", function (file) {
-            console.log("add", file);
-        });
-        fswatcher.on("remove", function (file) {
-            console.log("remove", file);
-        });
+            fswatcher.on("ready", function () {
+                delete self.handle;
+                onready.forEach(function (cb) {
+                    cb();
+                });
+            });
+            fswatcher.on("add", function (file) {
+                console.log("add", file);
+            });
+            fswatcher.on("remove", function (file) {
+                console.log("remove", file);
+            });
+        };
         this.handle = function (req, res, next) {
             onready.push(function () {
                 self.handle(req, res, next);
             });
         };
+        new Function("return import('chokidar')")().then(function (module) {
+            initializeWatcher(module.default || module);
+        });
     }
     destroy() {
         this.fswatcher.close();
@@ -1816,7 +1822,7 @@ class NexusFramework extends events.EventEmitter {
         if (!this.server)
             throw new Error("No server passed in constructor, cannot setup Socket.IO");
         const iopath = _path.posix.join(this.prefix, path);
-        const io = socket_io(this.server, {
+        const io = new socket_io.Server(this.server, {
             serveClient: !has_slim_io_js,
             path: iopath
         });
@@ -2417,13 +2423,13 @@ class NexusFramework extends events.EventEmitter {
                         };
                         const contentType = req.get("content-type");
                         if (!processors.length)
-                            processors = [0 /* URLEncoded */, 2 /* JSONBody */, 1 /* MultipartFormData */];
+                            processors = [0 /* BodyProcessor.URLEncoded */, 2 /* BodyProcessor.JSONBody */, 1 /* BodyProcessor.MultipartFormData */];
                         req.body = {};
                         req.files = {};
                         try {
                             processors.forEach((processor) => {
                                 switch (processor) {
-                                    case 2 /* JSONBody */:
+                                    case 2 /* BodyProcessor.JSONBody */:
                                         if (/\/(x\-)?json$/.test(contentType)) {
                                             req.readBody(function (err, data) {
                                                 if (err)
@@ -2439,7 +2445,7 @@ class NexusFramework extends events.EventEmitter {
                                             throw true;
                                         }
                                         break;
-                                    case 0 /* URLEncoded */:
+                                    case 0 /* BodyProcessor.URLEncoded */:
                                         if (/\/(((x\-)?www\-)?form\-)?urlencoded$/.test(contentType)) {
                                             req.readBody(function (err, data) {
                                                 if (err)
@@ -2455,7 +2461,7 @@ class NexusFramework extends events.EventEmitter {
                                             throw true;
                                         }
                                         break;
-                                    case 1 /* MultipartFormData */:
+                                    case 1 /* BodyProcessor.MultipartFormData */:
                                         if (/multipart\/form\-data(;.+)?$/.test(contentType)) {
                                             this.multerInstance(req, res, function (err) {
                                                 if (err)
@@ -2955,7 +2961,7 @@ class NexusFramework extends events.EventEmitter {
                                     }
                                 });
                                 if (icon)
-                                    locals.progressContainerHead = "<div class=\"loader-progress-heading\"><img width=\"152\" src=\"" + Template_1.Template.encodeHTML(icon, true) + "\" /></div>";
+                                    locals.progressContainerHead = "<div class=\"loader-progress-heading\"><img width=\"152\" src=\"" + Template.encodeHTML(icon, true) + "\" /></div>";
                                 else
                                     locals.progressContainerHead = "";
                             }
@@ -3069,7 +3075,7 @@ class NexusFramework extends events.EventEmitter {
                             }
                             else {
                                 out.write("<script type=\"text/javascript\" src=\"");
-                                out.write(Template_1.Template.encodeHTML(url.format(script.source), true));
+                                out.write(Template.encodeHTML(url.format(script.source), true));
                                 out.write("\"></script>");
                             }
                         });
@@ -3161,7 +3167,7 @@ class NexusFramework extends events.EventEmitter {
                         const _url = url.parse(req.originalUrl, true);
                         _url.query = _url.query || {};
                         _url.query.noscript = "1";
-                        out.write(Template_1.Template.encodeHTML(url.format(_url), true));
+                        out.write(Template.encodeHTML(url.format(_url), true));
                         out.write('\'" /></noscript>');
                     }
                 }
@@ -3176,7 +3182,7 @@ class NexusFramework extends events.EventEmitter {
                             out.write("\" type=\"image/");
                             out.write(type);
                             out.write("\" href=\"");
-                            out.write(Template_1.Template.encodeHTML(icons + size + "." + type, true));
+                            out.write(Template.encodeHTML(icons + size + "." + type, true));
                             out.write("\">");
                         });
                     }
@@ -3198,7 +3204,7 @@ class NexusFramework extends events.EventEmitter {
                             else
                                 out.write("unknown");
                             out.write("\" href=\"");
-                            out.write(Template_1.Template.encodeHTML(path, true));
+                            out.write(Template.encodeHTML(path, true));
                             out.write("\">");
                         });
                 }
@@ -3218,9 +3224,9 @@ class NexusFramework extends events.EventEmitter {
                     else
                         out.write("name");
                     out.write("=\"");
-                    out.write(Template_1.Template.encodeHTML(key, true));
+                    out.write(Template.encodeHTML(key, true));
                     out.write("\" content=\"");
-                    out.write(Template_1.Template.encodeHTML(meta[key]));
+                    out.write(Template.encodeHTML(meta[key]));
                     out.write("\" />");
                 });
                 const links = res.locals.links;
@@ -3231,9 +3237,9 @@ class NexusFramework extends events.EventEmitter {
                     catch (e) { }
                     Object.keys(links).forEach(function (link) {
                         out.write("<link rel=\"");
-                        out.write(Template_1.Template.encodeHTML(link, true));
+                        out.write(Template.encodeHTML(link, true));
                         out.write("\" href=\"");
-                        out.write(Template_1.Template.encodeHTML(links[link], true));
+                        out.write(Template.encodeHTML(links[link], true));
                         out.write("\" />");
                     });
                 }
@@ -3273,7 +3279,7 @@ class NexusFramework extends events.EventEmitter {
                         }
                         else {
                             out.write("<link rel=\"stylesheet\" href=\"");
-                            out.write(Template_1.Template.encodeHTML(url.format(style.source), true));
+                            out.write(Template.encodeHTML(url.format(style.source), true));
                             out.write("\">");
                         }
                     });
@@ -3544,12 +3550,14 @@ class NexusFramework extends events.EventEmitter {
         this.__express(req, res, next);
     }
     close(cb) {
+        this.nhp.destroy();
         this.server.close(cb);
     }
     isIOSetup() {
         return !!this.io;
     }
 }
+exports.NexusFramework = NexusFramework;
 NexusFramework.apiencoders = {
     "json": function (locals, req, res) {
         res.type("text/json").end(JSON.stringify(locals));
@@ -3564,7 +3572,6 @@ NexusFramework.apiencoders = {
         res.type("text/xml").end(XML.stringify(locals));
     }
 };
-exports.NexusFramework = NexusFramework;
 NexusFramework.prototype.use = NexusFramework.prototype.pushMiddleware;
 const json = SocketIOResponse.prototype.json;
 NexusFramework.expressUpgrade(SocketIORequest.prototype, SocketIOResponse.prototype, true);