boomack 0.8.2 → 0.9.2

package/server-build/plugins/markdown.js

@@ -44,7 +44,7 @@ exports.textTransformations = {
     'commonmark': textTransformationCommonmark,
     'markdown': textTransformationMarkdownIt,
 };
-function textTransformationCommonmark({ text }) {
+function textTransformationCommonmark(text) {
     const parser = new Parser({
         smart: true,
     });
@@ -54,7 +54,7 @@ function textTransformationCommonmark({ text }) {
     const dom = parser.parse(text);
     return renderer.render(dom);
 }
-function textTransformationMarkdownIt({ text, options }) {
+function textTransformationMarkdownIt(text, { options }) {
     // configure Markdown it! with options
     const md = new MarkdownIt({
         html: _.isBoolean(options.allowHtml) ? options.allowHtml : true,

package/server-build/plugins/media.js

@@ -47,10 +47,10 @@ exports.renderers = {
     'audio': renderAudio,
     'video': renderVideo,
 };
-function renderImage(url, type, options) {
+function renderImage(url) {
     return `<img src="${url}"/>`;
 }
-function renderAudio(url, type, options) {
+function renderAudio(url, { type, options }) {
     let switchAttributes = '';
     if (enforceBoolean(options.mediaControls, true))
         switchAttributes += ' controls';
@@ -65,7 +65,7 @@ function renderAudio(url, type, options) {
         `</a>` +
         `</audio>`;
 }
-function renderVideo(url, type, options) {
+function renderVideo(url, { type, options }) {
     let switchAttributes = '';
     if (enforceBoolean(options.mediaControls, true))
         switchAttributes += ' controls';

package/server-build/plugins/text.js

@@ -26,13 +26,13 @@ exports.textTransformations = {
     'uppercase': textTransformationUpperCase,
     'lowercase': textTransformationLowerCase,
 };
-function textTransformationPlain({ text }) {
+function textTransformationPlain(text) {
     return html.textLines(text);
 }
-function textTransformationUpperCase({ text }) {
+function textTransformationUpperCase(text) {
     return html.textLines(_.upperCase(text));
 }
-function textTransformationLowerCase({ text }) {
+function textTransformationLowerCase(text) {
     return html.textLines(_.lowerCase(text));
 }
 //# sourceMappingURL=text.js.map

package/server-build/routes/eval-request.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setup = void 0;
+const _ = require('lodash');
+const YAML = require('yaml');
+const async = require('async');
+const express = require('express');
+const { requestStream } = require('../utils');
+const { info, warning, error } = require('../service/response-messages');
+const cfg = require('../service/config');
+const { log } = require('../service/logging');
+const { checkPanelAccess } = require('../service/rbac');
+const panels = require('../service/panels');
+const themes = require('../service/themes');
+const { apiAuth, forbiddenMessage } = require('../middleware/token-auth');
+const { dataBody } = require('../middleware/data-parser');
+const pipeline = require('../pipeline');
+function setup(app, io) {
+    if (!cfg.getBoolean('api.enable.evaluation')) {
+        log.info('Deactivated routes for evaluation requests');
+        return;
+    }
+    const contentNS = io.of('/boomack-content');
+    function checkAuthorization(authorization, request, cb) {
+        if (!authorization) {
+            cb(null, request);
+            return;
+        }
+        const panelId = request.panel || 'default';
+        if (!checkPanelAccess(authorization, panelId)) {
+            cb({ message: 'Forbidden', forbidden: true });
+            return;
+        }
+        cb(null, request);
+    }
+    function checkRequest(request, cb) {
+        cb(null, {
+            panel: request.panel || 'default',
+            script: typeof request.script === 'string' ? request.script : null,
+        });
+    }
+    function handleEvaluationRequest(requests, auth, res) {
+        log.verbose(`Request to evaluate: ${_.size(requests)} JS code blocks`);
+        const checkPermissions = (r, cb) => checkAuthorization(auth, r, cb);
+        async.waterfall([
+            cb => async.map(requests, checkPermissions, cb),
+            (requests, cb) => async.map(requests, checkRequest, cb),
+            (commands, cb) => async.filter(commands, (cmd, cb) => cb(null, !!cmd.script), cb),
+            (commands, cb) => {
+                log.verbose(`Sending ${_.size(commands)} evaluation commands`);
+                // distribute commands on different panels
+                const evalCommands = _.groupBy(commands, c => c.panel);
+                _.forEach(evalCommands, (cmds, id) => {
+                    contentNS.to(id).emit('eval', cmds);
+                });
+                cb(null);
+            },
+        ], err => {
+            if (err) {
+                if (err.forbidden) {
+                    error(res, forbiddenMessage);
+                }
+                else {
+                    console.error('ERROR', err.message);
+                    console.error(err.stack);
+                    error(res, {
+                        title: 'Sending evaluation commands failed',
+                        message: err.message,
+                        details: err.stack,
+                    });
+                }
+            }
+            else {
+                res.status(204).send();
+            }
+        });
+    }
+    app.post('/v1/eval', [apiAuth('content.evaluate'), dataBody], (req, res) => {
+        if (!_.isObject(req.body) && !_.isArray(req.body)) {
+            const hint = cfg.getBoolean('api.request.yaml') ?
+                'Hint: JSON and YAML is supported. Make sure to use the right Content-Type header.' :
+                'Hint: Only JSON is allowed. Make sure to use the right Content-Type header.';
+            if (req.parsingError) {
+                error(res, {
+                    status: 400,
+                    title: 'Malformed Request Body',
+                    message: req.parsingError,
+                    details: hint,
+                });
+            }
+            else {
+                error(res, {
+                    status: 400,
+                    title: 'Malformed Request Body',
+                    message: 'Empty body or unknown error during body parsing.',
+                    detail: hint,
+                });
+            }
+            return;
+        }
+        const requests = _.isArray(req.body) ? req.body : [req.body];
+        handleEvaluationRequest(requests, req.authorization, res);
+    });
+    app.post('/v1/panels/:panelId/eval', [
+        apiAuth('content.evaluate'),
+        express.text({ limit: '16MB', type: 'application/javascript' })
+    ], (req, res) => {
+        const panelId = req.params.panelId;
+        const panel = panels.lookup(panelId);
+        if (!panel) {
+            error(res, {
+                status: 404,
+                title: 'Target Not Found',
+                message: `The target panel "${panelId}" does not exist.`,
+            });
+        }
+        const type = req.get('Content-Type');
+        if (type !== 'application/javascript') {
+            error(res, {
+                status: 400,
+                title: 'Unsupported Content-Type',
+                message: 'The MIME type of the evaluation request must be application/javascript.',
+            });
+            return;
+        }
+        const evalRequest = {
+            panel: panelId,
+            stream: req.body,
+        };
+        handleEvaluationRequest([evalRequest], req.authorization, res);
+    });
+}
+exports.setup = setup;
+//# sourceMappingURL=eval-request.js.map

package/server-build/routes/eval-requests.js

@@ -0,0 +1,152 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setup = void 0;
+const _ = require('lodash');
+const YAML = require('yaml');
+const async = require('async');
+const express = require('express');
+const { requestStream } = require('../utils');
+const { info, warning, error } = require('../service/response-messages');
+const cfg = require('../service/config');
+const { log } = require('../service/logging');
+const { checkPanelAccess } = require('../service/rbac');
+const panels = require('../service/panels');
+const themes = require('../service/themes');
+const { apiAuth, forbiddenMessage } = require('../middleware/token-auth');
+const { dataBody } = require('../middleware/data-parser');
+const pipeline = require('../pipeline');
+function setup(app, io) {
+    if (!cfg.getBoolean('api.enable.evaluation')) {
+        log.info('Deactivated routes for evaluation requests');
+        return;
+    }
+    const contentNS = io.of('/boomack-content');
+    function checkAuthorization(authorization, request, cb) {
+        if (!authorization) {
+            cb(null, request);
+            return;
+        }
+        const panelId = request.panel || 'default';
+        if (!checkPanelAccess(authorization, panelId)) {
+            cb({ message: 'Forbidden', forbidden: true });
+            return;
+        }
+        cb(null, request);
+    }
+    function checkRequest(request, cb) {
+        const panelId = request.panel;
+        const panel = panels.lookup(panelId);
+        if (!panel) {
+            cb({
+                notFound: true,
+                message: `The target panel "${panelId}" does not exist.`,
+            });
+            return;
+        }
+        cb(null, {
+            panel: request.panel || 'default',
+            script: typeof request.script === 'string' ? request.script : null,
+        });
+    }
+    function handleEvaluationRequest(requests, auth, res) {
+        log.verbose(`Request to evaluate: ${_.size(requests)} JS code blocks`);
+        const checkPermissions = (r, cb) => checkAuthorization(auth, r, cb);
+        async.waterfall([
+            cb => async.map(requests, checkPermissions, cb),
+            (requests, cb) => async.map(requests, checkRequest, cb),
+            (commands, cb) => async.filter(commands, (cmd, cb) => cb(null, !!cmd.script), cb),
+            (commands, cb) => {
+                if (_.size(commands) > 0) {
+                    log.verbose(`Sending ${_.size(commands)} evaluation commands`);
+                    // distribute commands on different panels
+                    const evalCommands = _.groupBy(commands, c => c.panel);
+                    _.forEach(evalCommands, (cmds, id) => {
+                        contentNS.to(id).emit('eval', cmds);
+                    });
+                    cb(null);
+                }
+            },
+        ], err => {
+            if (err) {
+                if (err.forbidden) {
+                    error(res, forbiddenMessage);
+                }
+                else if (err.notFound) {
+                    error(res, {
+                        status: 400,
+                        title: 'Panel not found',
+                        message: err.message,
+                    });
+                }
+                else {
+                    console.error('ERROR', err.message);
+                    console.error(err.stack);
+                    error(res, {
+                        title: 'Sending evaluation commands failed',
+                        message: err.message,
+                        details: err.stack,
+                    });
+                }
+            }
+            else {
+                res.status(204).send();
+            }
+        });
+    }
+    app.post('/v1/eval', [apiAuth('content.evaluate'), dataBody], (req, res) => {
+        if (!_.isObject(req.body) && !_.isArray(req.body)) {
+            const hint = cfg.getBoolean('api.request.yaml') ?
+                'Hint: JSON and YAML is supported. Make sure to use the right Content-Type header.' :
+                'Hint: Only JSON is allowed. Make sure to use the right Content-Type header.';
+            if (req.parsingError) {
+                error(res, {
+                    status: 400,
+                    title: 'Malformed Request Body',
+                    message: req.parsingError,
+                    details: hint,
+                });
+            }
+            else {
+                error(res, {
+                    status: 400,
+                    title: 'Malformed Request Body',
+                    message: 'Empty body or unknown error during body parsing.',
+                    detail: hint,
+                });
+            }
+            return;
+        }
+        const requests = _.isArray(req.body) ? req.body : [req.body];
+        handleEvaluationRequest(requests, req.authorization, res);
+    });
+    app.post('/v1/panels/:panelId/eval', [
+        apiAuth('content.evaluate'),
+        express.text({ limit: '16MB', type: 'application/javascript' })
+    ], (req, res) => {
+        const panelId = req.params.panelId;
+        const panel = panels.lookup(panelId);
+        if (!panel) {
+            error(res, {
+                status: 404,
+                title: 'Target Not Found',
+                message: `The target panel "${panelId}" does not exist.`,
+            });
+        }
+        const type = req.get('Content-Type');
+        if (type !== 'application/javascript') {
+            error(res, {
+                status: 400,
+                title: 'Unsupported Content-Type',
+                message: 'The MIME type of the evaluation request must be application/javascript.',
+            });
+            return;
+        }
+        const evalRequest = {
+            panel: panelId,
+            script: req.body,
+        };
+        handleEvaluationRequest([evalRequest], req.authorization, res);
+    });
+}
+exports.setup = setup;
+//# sourceMappingURL=eval-requests.js.map

package/server-build/routes/export.js

@@ -16,6 +16,7 @@ const clientRes = require('../service/client-resources');
 const plugins = require('../service/plugins');
 const resources = require('../service/resources');
 const uiPaths = require('../service/web-ui-paths');
+const { error } = require('../service/response-messages');
 const { webAuthBasic } = require('../middleware/basic-auth');
 const { webAuthStandard } = require('../middleware/standard-auth');
 const { apiAuth, forbiddenMessage } = require('../middleware/token-auth');
@@ -161,9 +162,13 @@ exports.setup = function (app) {
             const clientResGroupIds = clientRes.getResourceGroupsForPanel(panel);
             // plugin resources
             _.forEach(clientResGroupIds, groupId => {
-                const group = plugins.getClientResourceGroup(groupId);
-                _.forEach(group, (resource, i) => {
-                    zip.file(resource.path, { name: `plugins/client-resources/${groupId}/${i}` });
+                const stylePaths = plugins.getStylePathsOfClientResourceGroup(groupId);
+                _.forEach(stylePaths, (resourcePath, i) => {
+                    zip.file(resourcePath, { name: `plugins/styles/${groupId}/${i}` });
+                });
+                const scriptPaths = plugins.getScriptPathsOfClientResourceGroup(groupId);
+                _.forEach(scriptPaths, (resourcePath, i) => {
+                    zip.file(resourcePath, { name: `plugins/scripts/${groupId}/${i}` });
                 });
             });
             // resources
@@ -258,7 +263,8 @@ exports.setup = function (app) {
         const subject = slot ?
             `slot ${panel.id}/${slot.id}` :
             `panel ${panel.id}`;
-        const pluginResourcesDir = path.join(targetDir, 'plugins', 'client-resources');
+        const pluginStylesDir = path.join(targetDir, 'plugins', 'styles');
+        const pluginScriptsDir = path.join(targetDir, 'plugins', 'scripts');
         const resourcesSubPath = 'resources/' + name;
         render(panel, slot, options, (err, html) => {
             if (err) {
@@ -269,7 +275,11 @@ exports.setup = function (app) {
             const displayCommands = getDisplayCommands(panel, slot);
             const referencedResources = findReferencedResources(displayCommands);
             html = replaceResourceUrls(html, referencedResources, basePath + resourcesSubPath);
-            const clientResGroups = _.map(clientRes.getResourceGroupsForPanel(panel, slot), groupId => ({ id: groupId, group: plugins.getClientResourceGroup(groupId) }));
+            const clientResGroups = _.map(clientRes.getResourceGroupsForPanel(panel, slot), groupId => ({
+                id: groupId,
+                stylePaths: plugins.getStylePathsOfClientResourceGroup(groupId),
+                scriptPaths: plugins.getScriptPathsOfClientResourceGroup(groupId),
+            }));
             const maxResourceSize = parseDataAmount(cfg.get('export.local.resourceSizeLimit'));
             const includedResources = [];
             let resourceSize = 0;
@@ -330,12 +340,17 @@ exports.setup = function (app) {
                     }
                 },
                 // plugin resources
-                cb => async.each(clientResGroups, ({ id, group }, cb) => {
-                    const groupResourcesDir = path.join(pluginResourcesDir, id);
+                cb => async.each(clientResGroups, ({ id, stylePaths, scriptPaths }, cb) => {
+                    const groupStylesDir = path.join(pluginStylesDir, id);
+                    const groupScriptsDir = path.join(pluginScriptsDir, id);
                     async.waterfall([
-                        cb => mkdir(path.join(groupResourcesDir), cb),
-                        cb => async.eachOf(group, (resource, i, cb) => {
-                            fs.copyFile(resource.path, path.join(groupResourcesDir, i.toString()), cb);
+                        cb => mkdir(path.join(groupStylesDir), cb),
+                        cb => async.eachOf(stylePaths, (p, i, cb) => {
+                            fs.copyFile(p, path.join(groupStylesDir, i.toString()), cb);
+                        }, cb),
+                        cb => mkdir(path.join(groupScriptsDir), cb),
+                        cb => async.eachOf(scriptPaths, (p, i, cb) => {
+                            fs.copyFile(p, path.join(groupScriptsDir, i.toString()), cb);
                         }, cb),
                     ], cb);
                 }, cb),

package/server-build/routes/panels.js

@@ -73,17 +73,30 @@ exports.setup = function (app, io) {
         }
         const panel = panels.lookup(panelId);
         if (panel && (panel.layout.grid || panel.layout.document)) {
+            const theme = themes.safeTheme(panel.layout.theme);
             res.format({
-                html: () => res.render(panel.layout.document ? 'parts/document-layout.ejs' : 'parts/grid-layout.ejs', {
-                    _,
-                    uiPaths,
-                    query: req.query,
-                    basePath: cfg.serverBasePath(),
-                    themes: themes.getThemes(),
-                    theme: themes.safeTheme(req.query.theme || panel.layout.theme),
-                    themeOverride: !!req.query.theme,
-                    panel,
-                    offline: true,
+                html: () => themes.getThemeProperties(theme, (err, themeProperties) => {
+                    if (err) {
+                        warning(res, {
+                            status: 500,
+                            title: 'Theme Error',
+                            message: 'Failed to load the properties of the selected theme.',
+                            details: err,
+                        });
+                    }
+                    else {
+                        res.render(panel.layout.type === 'document' ? 'parts/document-layout.ejs' : 'parts/grid-layout.ejs', {
+                            _,
+                            uiPaths,
+                            query: req.query,
+                            basePath: cfg.serverBasePath(),
+                            theme,
+                            themeOverride: false,
+                            themeProperties,
+                            panel,
+                            offline: true,
+                        });
+                    }
                 }),
                 json: () => res.json(panel.layout),
                 text: () => res.type('text').send(YAML.stringify(panel.layout)),
@@ -143,6 +156,7 @@ exports.setup = function (app, io) {
                     panel.layout.theme != newLayout.theme ||
                     panel.layout.style != newLayout.style ||
                     panel.layout.script != newLayout.script ||
+                    panel.layout.type != newLayout.type ||
                     !_.isEqual(panel.layout.grid, newLayout.grid) ||
                     !_.isEqual(panel.layout.document, newLayout.document));
             action(panelId, newLayout, (err, panel2) => {
@@ -158,24 +172,7 @@ exports.setup = function (app, io) {
                     contentNS.to(panelId).emit('reload', {});
                 }
                 else {
-                    app.render(panel2.layout.document ? 'parts/document-layout.ejs' : 'parts/grid-layout.ejs', {
-                        _,
-                        uiPaths,
-                        query: {},
-                        basePath: cfg.serverBasePath(),
-                        themes: themes.getThemes(),
-                        theme: themes.safeTheme(panel2.layout.theme),
-                        themeOverride: false,
-                        panel: panel2,
-                        offline: false,
-                    }, (err, html) => {
-                        if (err) {
-                            log.error('Rendering layout failed: ' + err.message);
-                            log.error(err.stack);
-                            return;
-                        }
-                        contentNS.to(panelId).emit('layout', html);
-                    });
+                    contentNS.to(panelId).emit('reload-layout', {});
                 }
                 if (panel) {
                     log.verbose(`Layout updated for '${panelId}': ` +

package/server-build/routes/web-client.js

@@ -173,6 +173,22 @@ exports.setup = function (app, io) {
                 },
             })]);
     });
+    _.forEach(plugins.getPlugInIds(), plugInId => {
+        const plugin = plugins.getPlugIn(plugInId);
+        const routes = _.keys(plugin.static);
+        _.forEach(routes, route => {
+            if (route.indexOf(' ') >= 0) {
+                log.warn('Invalid route for static resource in plugin ' + plugInId + ': ' + route);
+                return;
+            }
+            const resourcePath = _.get(plugin, ['static', route]);
+            if (!path.isAbsolute(resourcePath)) {
+                log.warn('Path to static resource ' + route + ' in plugin ' + plugInId + ' is not absolute');
+                return;
+            }
+            app.use('/plugins/' + plugInId + '/static/' + _.trimStart(route, '/'), express.static(resourcePath, staticOptions));
+        });
+    });
     function visiblePanelsForRequest(req) {
         return _.chain(panels.getPanelIds())
             .filter(panelId => isAccessToPanelAllowed(req, panelId))
@@ -231,6 +247,42 @@ exports.setup = function (app, io) {
             log.verbose('A home client disconnected from Socket.IO');
         });
     });
+    app.get('/panels/:panelId/layout', mw, (req, res) => {
+        const panelId = req.params.panelId;
+        if (!isAccessToPanelAllowed(req, panelId)) {
+            res.status(403).end();
+            return;
+        }
+        const panel = panels.lookup(panelId);
+        if (panel) {
+            const theme = themes.safeTheme(req.query.theme || panel.layout.theme);
+            themes.getThemeProperties(theme, (err, themeProperties) => {
+                if (err) {
+                    res.status(500).end();
+                }
+                else {
+                    res.render(panel.layout.type === 'document' ? 'parts/document-layout.ejs' : 'parts/grid-layout.ejs', {
+                        _,
+                        uiPaths,
+                        query: req.query,
+                        basePath: cfg.serverBasePath(),
+                        theme,
+                        themeProperties,
+                        themeOverride: !!req.query.theme,
+                        panel,
+                        offline: false,
+                    });
+                }
+            });
+        }
+        else {
+            warning(res, {
+                status: 404,
+                title: 'Panel Not Found',
+                message: 'Go to the home page to select an existing panel.',
+            });
+        }
+    });
     app.get('/panels/:panelId', mw, (req, res) => {
         const panelId = req.params.panelId;
         if (!isAccessToPanelAllowed(req, panelId)) {
@@ -417,22 +469,43 @@ exports.setup = function (app, io) {
             });
         }
     });
-    app.get('/plugins/client-resources/:groupId/:index', mw, (req, res) => {
+    app.get('/plugins/scripts/:groupId/:index', mw, (req, res) => {
+        const groupId = req.params.groupId;
+        const index = _.toNumber(req.params.index);
+        const paths = plugins.getScriptPathsOfClientResourceGroup(groupId);
+        const resourcePath = _.get(paths, index);
+        const maxAgeVal = cfg.get('web.cache.static');
+        const maxAge = _.isString(maxAgeVal) ? Math.floor(ms(maxAgeVal) / 1000) : maxAgeVal;
+        if (resourcePath) {
+            res.sendFile(resourcePath, {
+                headers: {
+                    'Content-Type': 'application/javascript',
+                    'Cache-Control': `public, max-age=${maxAge}`,
+                },
+            });
+        }
+        else {
+            log.info(`Requested unknown plugin script resource: ${groupId}, ${index}`);
+            res.status(404).end();
+        }
+    });
+    app.get('/plugins/styles/:groupId/:index', mw, (req, res) => {
         const groupId = req.params.groupId;
         const index = _.toNumber(req.params.index);
-        const rg = plugins.getClientResourceGroup(groupId);
-        const ressource = _.get(rg, index);
+        const paths = plugins.getStylePathsOfClientResourceGroup(groupId);
+        const resourcePath = _.get(paths, index);
         const maxAgeVal = cfg.get('web.cache.static');
         const maxAge = _.isString(maxAgeVal) ? Math.floor(ms(maxAgeVal) / 1000) : maxAgeVal;
-        if (ressource) {
-            res.sendFile(ressource.path, {
+        if (resourcePath) {
+            res.sendFile(resourcePath, {
                 headers: {
-                    'Cache-Control': `public, max-age=${maxAge}`
+                    'Content-Type': 'text/css',
+                    'Cache-Control': `public, max-age=${maxAge}`,
                 },
             });
         }
         else {
-            log.info(`Requested unknown client resource: ${groupId}, ${index}`);
+            log.info(`Requested unknown plugin style resource: ${groupId}, ${index}`);
             res.status(404).end();
         }
     });

package/server-build/service/client-resources.js

@@ -24,7 +24,7 @@ function getResourceGroupsForPanel(panel, slot) {
             resourceGroupIds.add(groupId);
         });
     });
-    return [...resourceGroupIds];
+    return Array.from(resourceGroupIds);
 }
 exports.getResourceGroupsForPanel = getResourceGroupsForPanel;
 //# sourceMappingURL=client-resources.js.map

package/server-build/service/panels.js

@@ -215,6 +215,7 @@ exports.pushDisplayCommand = function (displayCommand, cb) {
             // if display command replaces current content
             // update current content
             displayCommand.no = layoutSlot.history ? currentSequenceNo + 1 : 1;
+            displayCommand.version = 0;
             panel.content.set(slotId, displayCommand);
             // proceed with history
         }
@@ -222,10 +223,12 @@ exports.pushDisplayCommand = function (displayCommand, cb) {
             // if display command extends current content at the end
             currentContent.title = displayCommand.title;
             currentContent.content = currentContent.content + CONTENT_SEPARATOR + displayCommand.content;
+            currentContent.version = currentContent.version + 1;
             currentContent.extensions = currentContent.extensions + 1;
             limitExtensions(currentContent, layoutSlot.extensions, displayCommand.extend);
             // return display command, but do not store it
             displayCommand.no = currentSequenceNo;
+            displayCommand.version = currentContent.version;
             cb(null, displayCommand);
             return;
         }
@@ -233,10 +236,12 @@ exports.pushDisplayCommand = function (displayCommand, cb) {
             // if display command extends current content at the beginning
             currentContent.title = displayCommand.title;
             currentContent.content = displayCommand.content + CONTENT_SEPARATOR + currentContent.content;
+            currentContent.version = currentContent.version + 1;
             currentContent.extensions = currentContent.extensions + 1;
             limitExtensions(currentContent, layoutSlot.extensions, displayCommand.extend);
             // return display command, but do not store it
             displayCommand.no = currentSequenceNo;
+            displayCommand.version = currentContent.version;
             cb(null, displayCommand);
             return;
         }