Merge branch 'release-1.4' into api_pagination

and crashes.

See https://discourse.joplinapp.org/t/11658/9?u=laurent

.eslintignore

@@ -60,6 +60,7 @@ Tools/PortableAppsLauncher
 Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/langs/
 CliClient/build/
+plugin_types/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
@@ -105,7 +106,11 @@ ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
 ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/openFolder.js
+ElectronClient/gui/MainScreen/commands/openNote.js
+ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js
@@ -122,6 +127,7 @@ ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
+ElectronClient/gui/menuCommandNames.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -144,8 +150,10 @@ ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
 ElectronClient/gui/NoteEditor/NoteEditor.js
+ElectronClient/gui/NoteEditor/NoteTitle/NoteTitleBar.js
 ElectronClient/gui/NoteEditor/styles/index.js
 ElectronClient/gui/NoteEditor/utils/contextMenu.js
 ElectronClient/gui/NoteEditor/utils/index.js
@@ -202,8 +210,10 @@ ElectronClient/services/plugins/PluginRunner.js
 ElectronClient/services/plugins/UserWebview.js
 ElectronClient/services/plugins/UserWebviewDialog.js
 ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
+ElectronClient/services/spellChecker/SpellCheckerServiceDriverNative.js
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/BaseApplication.js
+ReactNativeClient/lib/BaseModel.js
 ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
@@ -247,6 +257,9 @@ ReactNativeClient/lib/markdownUtils.js
 ReactNativeClient/lib/markupLanguageUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
+ReactNativeClient/lib/models/utils/modelFeed.js
+ReactNativeClient/lib/models/utils/paginationToSql.js
+ReactNativeClient/lib/models/utils/types.js
 ReactNativeClient/lib/ntpDate.js
 ReactNativeClient/lib/path-utils.js
 ReactNativeClient/lib/PoorManIntervals.js
@@ -321,10 +334,27 @@ ReactNativeClient/lib/services/ResourceEditWatcher/index.js
 ReactNativeClient/lib/services/ResourceEditWatcher/reducer.js
 ReactNativeClient/lib/services/rest/actionApi.desktop.js
 ReactNativeClient/lib/services/rest/Api.js
-ReactNativeClient/lib/services/rest/errors.js
+ReactNativeClient/lib/services/rest/ApiResponse.js
+ReactNativeClient/lib/services/rest/routes/folders.js
+ReactNativeClient/lib/services/rest/routes/master_keys.js
+ReactNativeClient/lib/services/rest/routes/notes.js
+ReactNativeClient/lib/services/rest/routes/ping.js
+ReactNativeClient/lib/services/rest/routes/resources.js
+ReactNativeClient/lib/services/rest/routes/search.js
+ReactNativeClient/lib/services/rest/routes/tags.js
+ReactNativeClient/lib/services/rest/utils/defaultAction.js
+ReactNativeClient/lib/services/rest/utils/defaultLoadOptions.js
+ReactNativeClient/lib/services/rest/utils/defaultSaveOptions.js
+ReactNativeClient/lib/services/rest/utils/errors.js
+ReactNativeClient/lib/services/rest/utils/paginatedResults.js
+ReactNativeClient/lib/services/rest/utils/readonlyProperties.js
+ReactNativeClient/lib/services/rest/utils/requestFields.js
+ReactNativeClient/lib/services/rest/utils/requestPaginationOptions.js
 ReactNativeClient/lib/services/searchengine/filterParser.js
 ReactNativeClient/lib/services/searchengine/queryBuilder.js
 ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerService.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerServiceDriverBase.js
 ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
 ReactNativeClient/lib/services/synchronizer/LockHandler.js
 ReactNativeClient/lib/services/synchronizer/MigrationHandler.js
@@ -347,6 +377,7 @@ ReactNativeClient/lib/themes/oledDark.js
 ReactNativeClient/lib/themes/solarizedDark.js
 ReactNativeClient/lib/themes/solarizedLight.js
 ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/time.js
 ReactNativeClient/lib/uuid.js
 ReactNativeClient/lib/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js

.gitignore

@@ -99,7 +99,11 @@ ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
 ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/openFolder.js
+ElectronClient/gui/MainScreen/commands/openNote.js
+ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js
@@ -116,6 +120,7 @@ ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
+ElectronClient/gui/menuCommandNames.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -138,8 +143,10 @@ ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
 ElectronClient/gui/NoteEditor/NoteEditor.js
+ElectronClient/gui/NoteEditor/NoteTitle/NoteTitleBar.js
 ElectronClient/gui/NoteEditor/styles/index.js
 ElectronClient/gui/NoteEditor/utils/contextMenu.js
 ElectronClient/gui/NoteEditor/utils/index.js
@@ -196,8 +203,10 @@ ElectronClient/services/plugins/PluginRunner.js
 ElectronClient/services/plugins/UserWebview.js
 ElectronClient/services/plugins/UserWebviewDialog.js
 ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
+ElectronClient/services/spellChecker/SpellCheckerServiceDriverNative.js
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/BaseApplication.js
+ReactNativeClient/lib/BaseModel.js
 ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
@@ -241,6 +250,9 @@ ReactNativeClient/lib/markdownUtils.js
 ReactNativeClient/lib/markupLanguageUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
+ReactNativeClient/lib/models/utils/modelFeed.js
+ReactNativeClient/lib/models/utils/paginationToSql.js
+ReactNativeClient/lib/models/utils/types.js
 ReactNativeClient/lib/ntpDate.js
 ReactNativeClient/lib/path-utils.js
 ReactNativeClient/lib/PoorManIntervals.js
@@ -315,10 +327,27 @@ ReactNativeClient/lib/services/ResourceEditWatcher/index.js
 ReactNativeClient/lib/services/ResourceEditWatcher/reducer.js
 ReactNativeClient/lib/services/rest/actionApi.desktop.js
 ReactNativeClient/lib/services/rest/Api.js
-ReactNativeClient/lib/services/rest/errors.js
+ReactNativeClient/lib/services/rest/ApiResponse.js
+ReactNativeClient/lib/services/rest/routes/folders.js
+ReactNativeClient/lib/services/rest/routes/master_keys.js
+ReactNativeClient/lib/services/rest/routes/notes.js
+ReactNativeClient/lib/services/rest/routes/ping.js
+ReactNativeClient/lib/services/rest/routes/resources.js
+ReactNativeClient/lib/services/rest/routes/search.js
+ReactNativeClient/lib/services/rest/routes/tags.js
+ReactNativeClient/lib/services/rest/utils/defaultAction.js
+ReactNativeClient/lib/services/rest/utils/defaultLoadOptions.js
+ReactNativeClient/lib/services/rest/utils/defaultSaveOptions.js
+ReactNativeClient/lib/services/rest/utils/errors.js
+ReactNativeClient/lib/services/rest/utils/paginatedResults.js
+ReactNativeClient/lib/services/rest/utils/readonlyProperties.js
+ReactNativeClient/lib/services/rest/utils/requestFields.js
+ReactNativeClient/lib/services/rest/utils/requestPaginationOptions.js
 ReactNativeClient/lib/services/searchengine/filterParser.js
 ReactNativeClient/lib/services/searchengine/queryBuilder.js
 ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerService.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerServiceDriverBase.js
 ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
 ReactNativeClient/lib/services/synchronizer/LockHandler.js
 ReactNativeClient/lib/services/synchronizer/MigrationHandler.js
@@ -341,6 +370,7 @@ ReactNativeClient/lib/themes/oledDark.js
 ReactNativeClient/lib/themes/solarizedDark.js
 ReactNativeClient/lib/themes/solarizedLight.js
 ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/time.js
 ReactNativeClient/lib/uuid.js
 ReactNativeClient/lib/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js

.ignore

@@ -48,7 +48,11 @@ ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
 ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/openFolder.js
+ElectronClient/gui/MainScreen/commands/openNote.js
+ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js
@@ -65,6 +69,7 @@ ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
+ElectronClient/gui/menuCommandNames.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -87,8 +92,10 @@ ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
 ElectronClient/gui/NoteEditor/NoteEditor.js
+ElectronClient/gui/NoteEditor/NoteTitle/NoteTitleBar.js
 ElectronClient/gui/NoteEditor/styles/index.js
 ElectronClient/gui/NoteEditor/utils/contextMenu.js
 ElectronClient/gui/NoteEditor/utils/index.js
@@ -145,8 +152,10 @@ ElectronClient/services/plugins/PluginRunner.js
 ElectronClient/services/plugins/UserWebview.js
 ElectronClient/services/plugins/UserWebviewDialog.js
 ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
+ElectronClient/services/spellChecker/SpellCheckerServiceDriverNative.js
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/BaseApplication.js
+ReactNativeClient/lib/BaseModel.js
 ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
@@ -190,6 +199,9 @@ ReactNativeClient/lib/markdownUtils.js
 ReactNativeClient/lib/markupLanguageUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
+ReactNativeClient/lib/models/utils/modelFeed.js
+ReactNativeClient/lib/models/utils/paginationToSql.js
+ReactNativeClient/lib/models/utils/types.js
 ReactNativeClient/lib/ntpDate.js
 ReactNativeClient/lib/path-utils.js
 ReactNativeClient/lib/PoorManIntervals.js
@@ -264,10 +276,27 @@ ReactNativeClient/lib/services/ResourceEditWatcher/index.js
 ReactNativeClient/lib/services/ResourceEditWatcher/reducer.js
 ReactNativeClient/lib/services/rest/actionApi.desktop.js
 ReactNativeClient/lib/services/rest/Api.js
-ReactNativeClient/lib/services/rest/errors.js
+ReactNativeClient/lib/services/rest/ApiResponse.js
+ReactNativeClient/lib/services/rest/routes/folders.js
+ReactNativeClient/lib/services/rest/routes/master_keys.js
+ReactNativeClient/lib/services/rest/routes/notes.js
+ReactNativeClient/lib/services/rest/routes/ping.js
+ReactNativeClient/lib/services/rest/routes/resources.js
+ReactNativeClient/lib/services/rest/routes/search.js
+ReactNativeClient/lib/services/rest/routes/tags.js
+ReactNativeClient/lib/services/rest/utils/defaultAction.js
+ReactNativeClient/lib/services/rest/utils/defaultLoadOptions.js
+ReactNativeClient/lib/services/rest/utils/defaultSaveOptions.js
+ReactNativeClient/lib/services/rest/utils/errors.js
+ReactNativeClient/lib/services/rest/utils/paginatedResults.js
+ReactNativeClient/lib/services/rest/utils/readonlyProperties.js
+ReactNativeClient/lib/services/rest/utils/requestFields.js
+ReactNativeClient/lib/services/rest/utils/requestPaginationOptions.js
 ReactNativeClient/lib/services/searchengine/filterParser.js
 ReactNativeClient/lib/services/searchengine/queryBuilder.js
 ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerService.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerServiceDriverBase.js
 ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
 ReactNativeClient/lib/services/synchronizer/LockHandler.js
 ReactNativeClient/lib/services/synchronizer/MigrationHandler.js
@@ -290,6 +319,7 @@ ReactNativeClient/lib/themes/oledDark.js
 ReactNativeClient/lib/themes/solarizedDark.js
 ReactNativeClient/lib/themes/solarizedLight.js
 ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/time.js
 ReactNativeClient/lib/uuid.js
 ReactNativeClient/lib/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js

CliClient/.gitignore

@@ -23,3 +23,4 @@ tests/support/dropbox-auth.txt
 tests/support/nextcloud-auth.json
 tests/support/onedrive-auth.txt
 build/
+patches/

CliClient/app/app-gui.js

@@ -2,7 +2,7 @@ const Logger = require('lib/Logger').default;
 const Folder = require('lib/models/Folder.js');
 const BaseItem = require('lib/models/BaseItem.js');
 const Tag = require('lib/models/Tag.js');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Note = require('lib/models/Note.js');
 const Resource = require('lib/models/Resource.js');
 const Setting = require('lib/models/Setting').default;

CliClient/app/app.js

@@ -1,7 +1,7 @@
 const BaseApplication = require('lib/BaseApplication').default;
 const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
 const ResourceService = require('lib/services/ResourceService');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Folder = require('lib/models/Folder.js');
 const BaseItem = require('lib/models/BaseItem.js');
 const Note = require('lib/models/Note.js');

CliClient/app/cli-integration-tests.js

@@ -5,7 +5,7 @@ const Logger = require('lib/Logger').default;
 const { dirname } = require('lib/path-utils');
 const { DatabaseDriverNode } = require('lib/database-driver-node.js');
 const { JoplinDatabase } = require('lib/joplin-database.js');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const Setting = require('lib/models/Setting').default;

CliClient/app/cli-utils.js

@@ -1,6 +1,6 @@
 const yargParser = require('yargs-parser');
 const { _ } = require('lib/locale');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const stringPadding = require('string-padding');
 const Logger = require('lib/Logger').default;
 

CliClient/app/command-apidoc.js

@@ -1,14 +1,15 @@
 const { BaseCommand } = require('./base-command.js');
 const BaseItem = require('lib/models/BaseItem');
-const BaseModel = require('lib/BaseModel');
+const BaseModel = require('lib/BaseModel').default;
 const { toTitleCase } = require('lib/string-utils.js');
 const { reg } = require('lib/registry.js');
 const markdownUtils = require('lib/markdownUtils').default;
 const { Database } = require('lib/database.js');
+const shim = require('lib/shim').default;
 
 class Command extends BaseCommand {
 	usage() {
-		return 'apidoc';
+		return 'apidoc <file>';
 	}
 
 	description() {
@@ -35,7 +36,7 @@ class Command extends BaseCommand {
 		return markdownUtils.createMarkdownTable(headers, tableFields);
 	}
 
-	async action() {
+	async action(args) {
 		const models = [
 			{
 				type: BaseModel.TYPE_NOTE,
@@ -112,6 +113,51 @@ class Command extends BaseCommand {
 		lines.push('');
 		lines.push('\tcurl http://localhost:41184/tags?fields=id');
 		lines.push('');
+		lines.push('By default API results will contain the following fields: **id**, **parent_id**, **title**');
+
+		lines.push('# Pagination');
+		lines.push('');
+		lines.push('All API calls that return multiple results will be paginated. The actual results will be under the `items` key, and if there are more results, there will also be a `cursor` key, which allows you to fetch the next results. If the `cursor` key is not present, it means you have reached the end of the data set.');
+		lines.push('');
+		lines.push('You can specify how the results should be sorted using the `order_by` and `order_dir` query parameters, and you can specify the number of items to be returned using the `limit` parameter (the maximum being 100 items).');
+		lines.push('');
+		lines.push('The following call for example will initiate a request to fetch all the notes, 10 at a time, and sorted by "updated_time" ascending:');
+		lines.push('');
+		lines.push('\tcurl http://localhost:41184/notes?order_by=updated_time&order_dir=ASC&limit=10');
+		lines.push('');
+		lines.push('This will return a result like this');
+		lines.push('');
+		lines.push('\t{ "items": [ /* 10 notes */ ], "cursor": "somecursor" }');
+		lines.push('');
+		lines.push('Then you will resume fetching the results using this query:');
+		lines.push('');
+		lines.push('\tcurl http://localhost:41184/notes?cursor=somecursor');
+		lines.push('');
+		lines.push('Note that you only need to pass the cursor to the next request, as it will continue the fetching process using the same parameters you initially provided.');
+		lines.push('');
+		lines.push('Eventually you will get some results that do not contain a "cursor" paramater, at which point you will have retrieved all the results');
+		lines.push('');
+		lines.push('As an example the pseudo-code below could be used to fetch all the notes:');
+		lines.push('');
+		lines.push('```javascript');
+		lines.push(`
+async function fetchJson(url) {
+	return (await fetch(url)).json();
+}
+
+async function fetchAllNotes() {
+	let query = '';
+	const url = 'http://localhost:41184/notes';
+
+	do {
+		const response = await fetchJson(url + query);
+		console.info('Printing notes:');
+		console.info(response.items);
+		query = '?cursor' + response.cursor;
+	} while (response.cursor)
+}`);
+		lines.push('```');
+		lines.push('');
 
 		lines.push('# Error handling');
 		lines.push('');
@@ -314,7 +360,9 @@ class Command extends BaseCommand {
 			}
 		}
 
-		this.stdout(lines.join('\n'));
+		const outFilePath = args['file'];
+
+		await shim.fsDriver().writeFile(outFilePath, lines.join('\n'), 'utf8');
 	}
 }
 

CliClient/app/command-attach.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const shim = require('lib/shim').default;
 
 class Command extends BaseCommand {

CliClient/app/command-cat.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const BaseItem = require('lib/models/BaseItem.js');
 const Note = require('lib/models/Note.js');
 

CliClient/app/command-cp.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {

CliClient/app/command-done.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Note = require('lib/models/Note.js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-e2ee.js

@@ -45,10 +45,12 @@ class Command extends BaseCommand {
 
 		const startDecryption = async () => {
 			this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
-
 			while (true) {
 				try {
 					const result = await DecryptionWorker.instance().start();
+
+					if (result.error) throw result.error;
+
 					const line = [];
 					line.push(_('Decrypted items: %d', result.decryptedItemCount));
 					if (result.skippedItemCount) line.push(_('Skipped items: %d (use --retry-failed-items to retry decrypting them)', result.skippedItemCount));

CliClient/app/command-edit.js

@@ -6,7 +6,7 @@ const { app } = require('./app.js');
 const { _ } = require('lib/locale');
 const Note = require('lib/models/Note.js');
 const Setting = require('lib/models/Setting').default;
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-export.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const InteropService = require('lib/services/interop/InteropService').default;
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
 

CliClient/app/command-geoloc.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {

CliClient/app/command-import.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const InteropService = require('lib/services/interop/InteropService').default;
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const { cliUtils } = require('./cli-utils.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');

CliClient/app/command-ls.js

@@ -1,12 +1,12 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Folder = require('lib/models/Folder.js');
 const Setting = require('lib/models/Setting').default;
 const Note = require('lib/models/Note.js');
 const { sprintf } = require('sprintf-js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {

CliClient/app/command-mv.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 

CliClient/app/command-ren.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 

CliClient/app/command-rmbook.js

@@ -2,7 +2,7 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
 const Folder = require('lib/models/Folder.js');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-rmnote.js

@@ -2,7 +2,7 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
 const Note = require('lib/models/Note.js');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-search.js

@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Folder = require('lib/models/Folder.js');
 const uuid = require('lib/uuid').default;
 

CliClient/app/command-set.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const { Database } = require('lib/database.js');
 const Note = require('lib/models/Note.js');
 

CliClient/app/command-tag.js

@@ -2,8 +2,8 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
 const Tag = require('lib/models/Tag.js');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-todo.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const Note = require('lib/models/Note.js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/command-use.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 
 class Command extends BaseCommand {
 	usage() {

CliClient/app/fuzzing.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const Logger = require('lib/Logger').default;
 const Resource = require('lib/models/Resource.js');
 const { dirname } = require('lib/path-utils');

CliClient/app/gui/FolderListWidget.js

@@ -1,6 +1,6 @@
 const Folder = require('lib/models/Folder.js');
 const Tag = require('lib/models/Tag.js');
-const BaseModel = require('lib/BaseModel.js');
+const BaseModel = require('lib/BaseModel').default;
 const ListWidget = require('tkwidgets/ListWidget.js');
 const _ = require('lib/locale')._;
 

CliClient/app/services/plugins/PluginRunner.ts

@@ -54,15 +54,25 @@ export default class PluginRunner extends BasePluginRunner {
 		};
 	}
 
-	async run(plugin:Plugin, sandbox:Global) {
+	async run(plugin:Plugin, sandbox:Global):Promise<void> {
+		return new Promise((resolve:Function, reject:Function) => {
+			const onStarted = () => {
+				plugin.off('started', onStarted);
+				resolve();
+			};
+
+			plugin.on('started', onStarted);
+
 			const vmSandbox = vm.createContext(this.newSandboxProxy(plugin.id, sandbox));
 
 			try {
 				vm.runInContext(plugin.scriptText, vmSandbox);
 			} catch (error) {
-			this.logger().error(`In plugin ${plugin.id}:`, error);
+				reject(error);
-			return;
+				// this.logger().error(`In plugin ${plugin.id}:`, error);
+				// return;
 			}
+		});
 	}
 
 }

CliClient/gulpfile.js

@@ -17,12 +17,23 @@ tasks.prepareBuild = {
 			excluded: ['node_modules'],
 		});
 		await utils.copyDir(`${__dirname}/locales-build`, `${buildDir}/locales`);
-		await utils.copyDir(`${__dirname}/../patches`, `${buildDir}/patches`);
 		await tasks.copyLib.fn();
 		await utils.copyFile(`${__dirname}/package.json`, `${buildDir}/package.json`);
 		await utils.copyFile(`${__dirname}/package-lock.json`, `${buildDir}/package-lock.json`);
 		await utils.copyFile(`${__dirname}/gulpfile.js`, `${buildDir}/gulpfile.js`);
 
+		// Import all the patches inside the CliClient directory
+		// and build file. Needs to be in CliClient dir for when running
+		// in dev mode, and in build dir for production.
+		const localPatchDir = `${buildDir}/patches`;
+		await fs.remove(localPatchDir);
+		await fs.mkdirp(localPatchDir);
+		await utils.copyDir(`${__dirname}/../patches/shared`, `${localPatchDir}`, { delete: false });
+		await utils.copyDir(`${__dirname}/../patches/node`, `${localPatchDir}`, { delete: false });
+
+		await fs.remove(`${__dirname}/patches`);
+		await utils.copyDir(`${localPatchDir}`, `${__dirname}/patches`);
+
 		const packageRaw = await fs.readFile(`${buildDir}/package.json`);
 		const package = JSON.parse(packageRaw.toString());
 		package.scripts.postinstall = 'patch-package';

CliClient/locales-build/index.js

@@ -38,33 +38,33 @@ locales['tr_TR'] = require('./tr_TR.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":79};
+stats['ar'] = {"percentDone":78};
 stats['eu'] = {"percentDone":33};
 stats['bs_BA'] = {"percentDone":82};
 stats['bg_BG'] = {"percentDone":65};
 stats['ca'] = {"percentDone":95};
 stats['hr_HR'] = {"percentDone":27};
-stats['cs_CZ'] = {"percentDone":99};
+stats['cs_CZ'] = {"percentDone":98};
-stats['da_DK'] = {"percentDone":73};
+stats['da_DK'] = {"percentDone":72};
 stats['de_DE'] = {"percentDone":97};
 stats['et_EE'] = {"percentDone":65};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":99};
+stats['es_ES'] = {"percentDone":98};
 stats['eo'] = {"percentDone":37};
 stats['fr_FR'] = {"percentDone":98};
 stats['gl_ES'] = {"percentDone":42};
 stats['id_ID'] = {"percentDone":92};
 stats['it_IT'] = {"percentDone":98};
-stats['nl_BE'] = {"percentDone":33};
 stats['nl_NL'] = {"percentDone":94};
+stats['nl_BE'] = {"percentDone":33};
 stats['nb_NO'] = {"percentDone":87};
 stats['fa'] = {"percentDone":82};
 stats['pl_PL'] = {"percentDone":97};
 stats['pt_PT'] = {"percentDone":98};
-stats['pt_BR'] = {"percentDone":95};
+stats['pt_BR'] = {"percentDone":96};
 stats['ro'] = {"percentDone":77};
-stats['sl_SI'] = {"percentDone":42};
+stats['sl_SI'] = {"percentDone":41};
 stats['sv'] = {"percentDone":70};
 stats['th_TH'] = {"percentDone":52};
 stats['vi'] = {"percentDone":84};
@@ -74,6 +74,6 @@ stats['ru_RU'] = {"percentDone":94};
 stats['sr_RS'] = {"percentDone":70};
 stats['zh_CN'] = {"percentDone":95};
 stats['zh_TW'] = {"percentDone":94};
-stats['ja_JP'] = {"percentDone":97};
+stats['ja_JP'] = {"percentDone":99};
 stats['ko'] = {"percentDone":99};
 module.exports = { locales: locales, stats: stats };