release 0.10.1-beta

package.json

@@ -1,7 +1,7 @@
 {
   "name": "trilium",
   "description": "Trilium Notes",
-  "version": "0.10.0-beta",
+  "version": "0.10.1-beta",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "repository": {

src/public/javascripts/migration.js

@@ -1,20 +1,19 @@
 import server from './services/server.js';
 
-$(document).ready(() => {
+$(document).ready(async () => {
-    server.get('migration').then(result => {
+    const {appDbVersion, dbVersion} = await server.get('migration');
-        const appDbVersion = result.app_dbVersion;
-        const dbVersion = result.dbVersion;
 
-        if (appDbVersion === dbVersion) {
+    console.log("HI", {appDbVersion, dbVersion});
-            $("#up-to-date").show();
-        }
-        else {
-            $("#need-to-migrate").show();
 
-            $("#app-db-version").html(appDbVersion);
+    if (appDbVersion === dbVersion) {
-            $("#db-version").html(dbVersion);
+        $("#up-to-date").show();
-        }
+    }
-    });
+    else {
+        $("#need-to-migrate").show();
+
+        $("#app-db-version").html(appDbVersion);
+        $("#db-version").html(dbVersion);
+    }
 });
 
 $("#run-migration").click(async () => {
@@ -37,4 +36,11 @@ $("#run-migration").click(async () => {
 
         $("#migration-table").append(row);
     }
+});
+
+// copy of this shortcut to be able to debug migration problems
+$(document).bind('keydown', 'ctrl+shift+i', () => {
+    require('electron').remote.getCurrentWindow().toggleDevTools();
+
+    return false;
 });

src/public/javascripts/services/messaging.js

@@ -100,7 +100,7 @@ setTimeout(() => {
             lastSyncId: lastSyncId
         }));
     }, 1000);
-}, 1000);
+}, 0);
 
 export default {
     logError,

src/public/javascripts/services/server.js

@@ -85,19 +85,17 @@ async function ajax(url, method, data) {
     });
 }
 
-setTimeout(() => {
+if (utils.isElectron()) {
-    if (utils.isElectron()) {
+    const ipc = require('electron').ipcRenderer;
-        const ipc = require('electron').ipcRenderer;
 
-        ipc.on('server-response', (event, arg) => {
+    ipc.on('server-response', (event, arg) => {
-            console.log(utils.now(), "Response #" + arg.requestId + ": " + arg.statusCode);
+        console.log(utils.now(), "Response #" + arg.requestId + ": " + arg.statusCode);
 
-            reqResolves[arg.requestId](arg.body);
+        reqResolves[arg.requestId](arg.body);
 
-            delete reqResolves[arg.requestId];
+        delete reqResolves[arg.requestId];
-        });
+    });
-    }
+}
-}, 100);
 
 export default {
     get,

src/routes/api/migration.js

@@ -7,7 +7,7 @@ const appInfo = require('../../services/app_info');
 async function getMigrationInfo() {
     return {
         dbVersion: parseInt(await optionService.getOption('dbVersion')),
-        app_dbVersion: appInfo.dbVersion
+        appDbVersion: appInfo.dbVersion
     };
 }
 

src/routes/electron.js

@@ -19,6 +19,7 @@ function init(app) {
 
         res.status = function(statusCode) {
             res.statusCode = statusCode;
+            return res;
         };
 
         res.send = function(obj) {

src/routes/routes.js

@@ -40,22 +40,22 @@ const cls = require('../services/cls');
 const sql = require('../services/sql');
 const protectedSessionService = require('../services/protected_session');
 
-function apiResultHandler(res, result) {
+function apiResultHandler(req, res, result) {
     // if it's an array and first element is integer then we consider this to be [statusCode, response] format
     if (Array.isArray(result) && result.length > 0 && Number.isInteger(result[0])) {
         const [statusCode, response] = result;
 
         res.status(statusCode).send(response);
 
-        if (statusCode !== 200) {
+        if (statusCode !== 200 && statusCode !== 201 && statusCode !== 204) {
-            log.info(`${method} ${path} returned ${statusCode} with response ${JSON.stringify(response)}`);
+            log.info(`${req.method} ${req.originalUrl} returned ${statusCode} with response ${JSON.stringify(response)}`);
         }
     }
     else if (result === undefined) {
         res.status(204).send();
     }
     else {
-        res.status(200).send(result);
+        res.send(result);
     }
 }
 
@@ -76,7 +76,7 @@ function route(method, path, middleware, routeHandler, resultHandler) {
             });
 
             if (resultHandler) {
-                resultHandler(res, result);
+                resultHandler(req, res, result);
             }
         }
         catch (e) {
@@ -158,6 +158,7 @@ function register(app) {
     apiRoute(GET, '/api/sync/labels/:labelId', syncApiRoute.getLabel);
     apiRoute(GET, '/api/sync/api_tokens/:apiTokenId', syncApiRoute.getApiToken);
     apiRoute(PUT, '/api/sync/notes', syncApiRoute.updateNote);
+    apiRoute(PUT, '/api/sync/branches', syncApiRoute.updateBranch);
     apiRoute(PUT, '/api/sync/note_revisions', syncApiRoute.updateNoteRevision);
     apiRoute(PUT, '/api/sync/note_reordering', syncApiRoute.updateNoteReordering);
     apiRoute(PUT, '/api/sync/options', syncApiRoute.updateOption);

src/services/scheduler.js

@@ -1,6 +1,7 @@
 const scriptService = require('./script');
 const repository = require('./repository');
 const cls = require('./cls');
+const sqlInit = require('./sql_init');
 
 async function runNotesWithLabel(runAttrValue) {
     const notes = await repository.getEntities(`
@@ -19,8 +20,10 @@ async function runNotesWithLabel(runAttrValue) {
     }
 }
 
-setTimeout(cls.wrap(() => runNotesWithLabel('backendStartup')), 10 * 1000);
+sqlInit.dbReady.then(() => {
+    setTimeout(cls.wrap(() => runNotesWithLabel('backendStartup')), 10 * 1000);
 
-setInterval(cls.wrap(() => runNotesWithLabel('hourly')), 3600 * 1000);
+    setInterval(cls.wrap(() => runNotesWithLabel('hourly')), 3600 * 1000);
 
-setInterval(cls.wrap(() => runNotesWithLabel('daily')), 24 * 3600 * 1000);
+    setInterval(cls.wrap(() => runNotesWithLabel('daily')), 24 * 3600 * 1000);
+});

src/www

@@ -18,8 +18,6 @@ const log = require('./services/log');
 const appInfo = require('./services/app_info');
 const messagingService = require('./services/messaging');
 const utils = require('./services/utils');
-const sql = require('./services/sql');
-const sqlInit = require('./services/sql_init');
 
 const port = normalizePort(config['Network']['port'] || '3000');
 app.set('port', port);
@@ -56,7 +54,7 @@ httpServer.listen(port);
 httpServer.on('error', onError);
 httpServer.on('listening', onListening);
 
-sqlInit.dbReady.then(() => messagingService.init(httpServer, sessionParser));
+messagingService.init(httpServer, sessionParser);
 
 if (utils.isElectron()) {
     const electronRouting = require('./routes/electron');