From 8a076c01ab54d7cab5b144d58ce944e58fd647bf Mon Sep 17 00:00:00 2001
From: Nick O'Leary <knolleary@users.noreply.github.com>
Date: Thu, 17 Dec 2020 14:35:01 +0000
Subject: [PATCH 1/6] Support for library source plugins

---
 .../editor-client/src/js/ui/clipboard.js      | 196 +++++++++---------
 .../editor-client/src/js/ui/library.js        |  99 +++++----
 .../editor-client/src/sass/library.scss       |   9 +-
 .../@node-red/runtime/lib/api/settings.js     |   2 +-
 .../@node-red/runtime/lib/index.js            |   2 +-
 .../@node-red/runtime/lib/library/index.js    |  84 +++++++-
 .../plugin/test-plugin/library-filestore.html |  11 +
 .../plugin/test-plugin/library-filestore.js   |  32 +++
 .../resources/plugin/test-plugin/package.json |   3 +-
 9 files changed, 283 insertions(+), 155 deletions(-)
 create mode 100644 test/resources/plugin/test-plugin/library-filestore.html
 create mode 100644 test/resources/plugin/test-plugin/library-filestore.js

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
index bb82ecea3..eb3b7b6de 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -26,7 +26,8 @@ RED.clipboard = (function() {
     var currentPopoverError;
     var activeTab;
     var libraryBrowser;
-    var examplesBrowser;
+
+    var activeLibraries = {};
 
     var pendingImportConfig;
 
@@ -93,7 +94,7 @@ RED.clipboard = (function() {
                                 $( this ).dialog( "close" );
                             } else {
                                 var flowToExport = $("#red-ui-clipboard-dialog-export-text").val();
-                                var selectedPath = libraryBrowser.getSelected();
+                                var selectedPath = activeLibraries[activeTab].getSelected();
                                 if (!selectedPath.children) {
                                     selectedPath = selectedPath.parent;
                                 }
@@ -159,12 +160,7 @@ RED.clipboard = (function() {
                             if (activeTab === "red-ui-clipboard-dialog-import-tab-clipboard") {
                                 importNodes($("#red-ui-clipboard-dialog-import-text").val(),addNewFlow);
                             } else {
-                                var selectedPath;
-                                if (activeTab === "red-ui-clipboard-dialog-import-tab-library") {
-                                    selectedPath = libraryBrowser.getSelected();
-                                } else {
-                                    selectedPath = examplesBrowser.getSelected();
-                                }
+                                var selectedPath = activeLibraries[activeTab].getSelected();
                                 if (selectedPath.path) {
                                     $.get('library/'+selectedPath.library+'/'+selectedPath.type+'/'+selectedPath.path, function(data) {
                                         importNodes(data,addNewFlow);
@@ -254,11 +250,8 @@ RED.clipboard = (function() {
                             '</div>'+
                         '</div>'+
                     '</div>'+
-                    '<div id="red-ui-clipboard-dialog-export-tab-library" class="red-ui-clipboard-dialog-tab-library">'+
-                        '<div id="red-ui-clipboard-dialog-export-tab-library-browser"></div>'+
-                        '<div class="form-row">'+
-                            '<label data-i18n="clipboard.export.exportAs"></label><input id="red-ui-clipboard-dialog-tab-library-name" type="text">'+
-                        '</div>'+
+                    '<div class="form-row" id="red-ui-clipboard-dialog-export-tab-library-filename">'+
+                        '<label data-i18n="clipboard.export.exportAs"></label><input id="red-ui-clipboard-dialog-tab-library-name" type="text">'+
                     '</div>'+
                 '</div>'+
             '</div>'
@@ -280,8 +273,6 @@ RED.clipboard = (function() {
                             '<textarea id="red-ui-clipboard-dialog-import-text"></textarea>'+
                         '</div>'+
                     '</div>'+
-                    '<div id="red-ui-clipboard-dialog-import-tab-library" class="red-ui-clipboard-dialog-tab-library"></div>'+
-                    '<div id="red-ui-clipboard-dialog-import-tab-examples" class="red-ui-clipboard-dialog-tab-library"></div>'+
                 '</div>'+
             '</div>'+
             '<div class="form-row">'+
@@ -414,7 +405,7 @@ RED.clipboard = (function() {
                 }
             },100);
         } else {
-            var file = libraryBrowser.getSelected();
+            var file = activeLibraries[activeTab].getSelected();
             if (file && file.label && !file.children) {
                 $("#red-ui-clipboard-dialog-ok").button("enable");
             } else {
@@ -446,7 +437,7 @@ RED.clipboard = (function() {
                 if (tab.id === "red-ui-clipboard-dialog-import-tab-clipboard") {
                     $("#red-ui-clipboard-dialog-import-text").trigger("focus");
                 } else {
-                    libraryBrowser.focus();
+                    activeLibraries[tab.id].focus();
                 }
                 validateImport();
             }
@@ -455,54 +446,43 @@ RED.clipboard = (function() {
             id: "red-ui-clipboard-dialog-import-tab-clipboard",
             label: RED._("clipboard.clipboard")
         });
-        tabs.addTab({
-            id: "red-ui-clipboard-dialog-import-tab-library",
-            label: RED._("library.library")
-        });
-        tabs.addTab({
-            id: "red-ui-clipboard-dialog-import-tab-examples",
-            label: RED._("library.types.examples")
-        });
+
+        var libraries = RED.settings.libraries || [];
+        libraries.forEach(function(lib) {
+            var tabId = "red-ui-clipboard-dialog-import-tab-library-"+lib.id
+            tabs.addTab({
+                id: tabId,
+                label: RED._(lib.label||lib.id)
+            })
+
+            var content = $('<div id="red-ui-clipboard-dialog-import-tab-library" class="red-ui-clipboard-dialog-tab-library"></div>')
+                .attr("id",tabId)
+                .hide()
+                .appendTo("#red-ui-clipboard-dialog-import-tabs-content");
+
+            var browser = RED.library.createBrowser({
+                container: content,
+                onselect: function(file) {
+                    if (file && file.label && !file.children) {
+                        $("#red-ui-clipboard-dialog-ok").button("enable");
+                    } else {
+                        $("#red-ui-clipboard-dialog-ok").button("disable");
+                    }
+                },
+                onconfirm: function(item) {
+                    if (item && item.label && !item.children) {
+                        $("#red-ui-clipboard-dialog-ok").trigger("click");
+                    }
+                }
+            })
+            loadFlowLibrary(browser,lib);
+            activeLibraries[tabId] = browser;
+        })
 
         $("#red-ui-clipboard-dialog-tab-library-name").on("keyup", validateExportFilename);
         $("#red-ui-clipboard-dialog-tab-library-name").on('paste',function() { setTimeout(validateExportFilename,10)});
         $("#red-ui-clipboard-dialog-export").button("enable");
 
-        libraryBrowser = RED.library.createBrowser({
-            container: $("#red-ui-clipboard-dialog-import-tab-library"),
-            onselect: function(file) {
-                if (file && file.label && !file.children) {
-                    $("#red-ui-clipboard-dialog-ok").button("enable");
-                } else {
-                    $("#red-ui-clipboard-dialog-ok").button("disable");
-                }
-            },
-            onconfirm: function(item) {
-                if (item && item.label && !item.children) {
-                    $("#red-ui-clipboard-dialog-ok").trigger("click");
-                }
-            }
-        })
-        loadFlowLibrary(libraryBrowser,"local",RED._("library.types.local"));
-
-        examplesBrowser = RED.library.createBrowser({
-            container: $("#red-ui-clipboard-dialog-import-tab-examples"),
-            onselect: function(file) {
-                if (file && file.label && !file.children) {
-                    $("#red-ui-clipboard-dialog-ok").button("enable");
-                } else {
-                    $("#red-ui-clipboard-dialog-ok").button("disable");
-                }
-            },
-            onconfirm: function(item) {
-                if (item && item.label && !item.children) {
-                    $("#red-ui-clipboard-dialog-ok").trigger("click");
-                }
-            }
-        })
-        loadFlowLibrary(examplesBrowser,"_examples_",RED._("library.types.examples"));
-
-
         dialogContainer.i18n();
 
         $("#red-ui-clipboard-dialog-ok").show();
@@ -582,10 +562,12 @@ RED.clipboard = (function() {
                 if (tab.id === "red-ui-clipboard-dialog-export-tab-clipboard") {
                     $("#red-ui-clipboard-dialog-export").button("option","label", RED._("clipboard.export.copy"))
                     $("#red-ui-clipboard-dialog-download").show();
+                    $("#red-ui-clipboard-dialog-export-tab-library-filename").hide();
                 } else {
                     $("#red-ui-clipboard-dialog-export").button("option","label", RED._("clipboard.export.export"))
                     $("#red-ui-clipboard-dialog-download").hide();
-                    libraryBrowser.focus();
+                    $("#red-ui-clipboard-dialog-export-tab-library-filename").show();
+                    activeLibraries[activeTab].focus();
                 }
 
             }
@@ -594,26 +576,45 @@ RED.clipboard = (function() {
             id: "red-ui-clipboard-dialog-export-tab-clipboard",
             label: RED._("clipboard.clipboard")
         });
-        tabs.addTab({
-            id: "red-ui-clipboard-dialog-export-tab-library",
-            label: RED._("library.library")
-        });
+
+
+        var libraries = RED.settings.libraries || [];
+
+        libraries.forEach(function(lib) {
+            if (lib.readOnly) {
+                return
+            }
+            var tabId = "red-ui-clipboard-dialog-export-tab-library-"+lib.id
+            tabs.addTab({
+                id: tabId,
+                label: RED._(lib.label||lib.id)
+            })
+
+            var content = $('<div class="red-ui-clipboard-dialog-export-tab-library-browser red-ui-clipboard-dialog-tab-library"></div>')
+                .attr("id",tabId)
+                .hide()
+                .insertBefore("#red-ui-clipboard-dialog-export-tab-library-filename");
+
+            var browser = RED.library.createBrowser({
+                container: content,
+                folderTools: true,
+                onselect: function(file) {
+                    if (file && file.label && !file.children) {
+                        $("#red-ui-clipboard-dialog-tab-library-name").val(file.label);
+                    }
+                },
+            })
+            loadFlowLibrary(browser,lib);
+            activeLibraries[tabId] = browser;
+        })
+
+
+
 
         $("#red-ui-clipboard-dialog-tab-library-name").on("keyup", validateExportFilename);
         $("#red-ui-clipboard-dialog-tab-library-name").on('paste',function() { setTimeout(validateExportFilename,10)});
         $("#red-ui-clipboard-dialog-export").button("enable");
 
-        libraryBrowser = RED.library.createBrowser({
-            container: $("#red-ui-clipboard-dialog-export-tab-library-browser"),
-            folderTools: true,
-            onselect: function(file) {
-                if (file && file.label && !file.children) {
-                    $("#red-ui-clipboard-dialog-tab-library-name").val(file.label);
-                }
-            }
-        })
-        loadFlowLibrary(libraryBrowser,"local",RED._("library.types.local"));
-
         var clipboardTabs = RED.tabs.create({
             id: "red-ui-clipboard-dialog-export-tab-clipboard-tabs",
             onchange: function(tab) {
@@ -852,35 +853,28 @@ RED.clipboard = (function() {
         $("#red-ui-clipboard-dialog-export-tab-clipboard-preview-list").treeList('data',treeData);
     }
 
-    function loadFlowLibrary(browser,library,label) {
-        // if (includeExamples) {
-        //     listing.push({
-        //         library: "_examples_",
-        //         type: "flows",
-        //         icon: 'fa fa-hdd-o',
-        //         label: RED._("library.types.examples"),
-        //         path: "",
-        //         children: function(done,item) {
-        //             RED.library.loadLibraryFolder("_examples_","flows","",function(children) {
-        //                 item.children = children;
-        //                 done(children);
-        //             })
-        //         }
-        //     })
-        // }
+    function loadFlowLibrary(browser,library) {
         browser.data([{
-            library: library,
+            library: library.id,
             type: "flows",
-            icon: 'fa fa-hdd-o',
-            label: label,
+            icon: library.icon || 'fa fa-hdd-o',
+            label: RED._(library.label||library.id),
             path: "",
             expanded: true,
-            children: function(done, item) {
-                RED.library.loadLibraryFolder(library,"flows","",function(children) {
-                    item.children = children;
-                    done(children);
-                })
-            }
+            children: [{
+                library: library.id,
+                type: "flows",
+                icon: 'fa fa-cube',
+                label: "flows",
+                path: "",
+                expanded: true,
+                children: function(done, item) {
+                    RED.library.loadLibraryFolder(library.id,"flows","",function(children) {
+                        item.children = children;
+                        done(children);
+                    })
+                }
+            }]
         }], true);
 
     }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
index 54d73c022..3872a38ea 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
@@ -216,31 +216,7 @@ RED.library = (function() {
             { id:'node-input-'+options.type+'-menu-open-library',
                 label: RED._("library.openLibrary"),
                 onselect: function() {
-                    activeLibrary = options;
-                    loadLibraryFolder("local",options.url, "", function(items) {
-                        var listing = [{
-                            library: "local",
-                            type: options.url,
-                            icon: 'fa fa-hdd-o',
-                            label: RED._("library.types.local"),
-                            path: "",
-                            expanded: true,
-                            writable: false,
-                            children: [{
-                                library: "local",
-                                type: options.url,
-                                icon: 'fa fa-cube',
-                                label: options.type,
-                                path: "",
-                                expanded: true,
-                                children: items
-                            }]
-                        }]
-                        loadLibraryBrowser.data(listing);
-                        setTimeout(function() {
-                            loadLibraryBrowser.select(listing[0].children[0]);
-                        },200);
-                    });
+
                     libraryEditor = ace.edit('red-ui-library-dialog-load-preview-text',{
                         useWorker: false
                     });
@@ -256,6 +232,43 @@ RED.library = (function() {
                     libraryEditor.renderer.$cursorLayer.element.style.opacity=0;
                     libraryEditor.$blockScrolling = Infinity;
 
+                    activeLibrary = options;
+                    var listing = [];
+                    var libraries = RED.settings.libraries || [];
+                    libraries.forEach(function(lib) {
+                        if (lib.types && lib.types.indexOf(options.url) === -1) {
+                            return;
+                        }
+                        listing.push({
+                            library: lib.id,
+                            type: options.url,
+                            icon: lib.icon || 'fa fa-hdd-o',
+                            label: RED._(lib.label||lib.id),
+                            path: "",
+                            expanded: true,
+                            writable: false,
+                            children: [{
+                                library: lib.id,
+                                type: options.url,
+                                icon: 'fa fa-cube',
+                                label: options.type,
+                                path: "",
+                                expanded: false,
+                                children: function(done, item) {
+                                    loadLibraryFolder(lib.id, options.url, "", function(children) {
+                                        item.children = children;
+                                        done(children);
+                                    })
+                                }
+                            }]
+                        })
+                    });
+                    loadLibraryBrowser.data(listing);
+                    setTimeout(function() {
+                        loadLibraryBrowser.select(listing[0].children[0]);
+                    },200);
+
+
                     var dialogHeight = 400;
                     var winHeight = $(window).height();
                     if (winHeight < 570) {
@@ -278,30 +291,40 @@ RED.library = (function() {
                     }
                     $("#red-ui-library-dialog-save-filename").attr("value",filename+"."+(options.ext||"txt"));
 
-                    loadLibraryFolder("local",options.url, "", function(items) {
-                        var listing = [{
-                            library: "local",
+                    var listing = [];
+                    var libraries = RED.settings.libraries || [];
+                    libraries.forEach(function(lib) {
+                        if (lib.types && lib.types.indexOf(options.url) === -1) {
+                            return;
+                        }
+                        listing.push({
+                            library: lib.id,
                             type: options.url,
-                            icon: 'fa fa-hdd-o',
-                            label: RED._("library.types.local"),
+                            icon: lib.icon || 'fa fa-hdd-o',
+                            label: RED._(lib.label||lib.id),
                             path: "",
                             expanded: true,
                             writable: false,
                             children: [{
-                                library: "local",
+                                library: lib.id,
                                 type: options.url,
                                 icon: 'fa fa-cube',
                                 label: options.type,
                                 path: "",
-                                expanded: true,
-                                children: items
+                                expanded: false,
+                                children: function(done, item) {
+                                    loadLibraryFolder(lib.id, options.url, "", function(children) {
+                                        item.children = children;
+                                        done(children);
+                                    })
+                                }
                             }]
-                        }]
-                        saveLibraryBrowser.data(listing);
-                        setTimeout(function() {
-                            saveLibraryBrowser.select(listing[0].children[0]);
-                        },200);
+                        })
                     });
+                    saveLibraryBrowser.data(listing);
+                    setTimeout(function() {
+                        saveLibraryBrowser.select(listing[0].children[0]);
+                    },200);
 
                     var dialogHeight = 400;
                     var winHeight = $(window).height();
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/library.scss b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
index 89109f357..3ddf44a95 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/library.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
@@ -93,10 +93,9 @@
     border:1px solid $primary-border-color;
 }
 
-.red-ui-clipboard-dialog-tab-library {
-    .form-row {
-        margin-left: 10px;
-    }
+#red-ui-clipboard-dialog-export-tab-library-filename {
+    height: auto !important;
+    margin-left: 10px;
 }
 
 #red-ui-clipboard-dialog {
@@ -110,7 +109,7 @@
 #red-ui-clipboard-dialog-tab-library-name {
     width: calc(100% - 120px);
 }
-#red-ui-clipboard-dialog-export-tab-library-browser {
+.red-ui-clipboard-dialog-tabs-content>div.red-ui-clipboard-dialog-export-tab-library-browser {
     height: calc(100% - 60px);
     margin-bottom: 13px;
     border-bottom: 1px solid $primary-border-color;
diff --git a/packages/node_modules/@node-red/runtime/lib/api/settings.js b/packages/node_modules/@node-red/runtime/lib/api/settings.js
index d96ec5b58..07d09e379 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/settings.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/settings.js
@@ -81,7 +81,7 @@ var api = module.exports = {
 
         if (!runtime.settings.disableEditor) {
             safeSettings.context = runtime.nodes.listContextStores();
-
+            safeSettings.libraries = runtime.library.getLibraries();
             if (util.isArray(runtime.settings.paletteCategories)) {
                 safeSettings.paletteCategories = runtime.settings.paletteCategories;
             }
diff --git a/packages/node_modules/@node-red/runtime/lib/index.js b/packages/node_modules/@node-red/runtime/lib/index.js
index 0be1c6511..42e053baf 100644
--- a/packages/node_modules/@node-red/runtime/lib/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/index.js
@@ -74,7 +74,6 @@ function init(userSettings,httpServer,_adminApi) {
         adminApi = _adminApi;
     }
     redNodes.init(runtime);
-    library.init(runtime);
     externalAPI.init(runtime);
 }
 
@@ -104,6 +103,7 @@ function start() {
     return i18n.registerMessageCatalog("runtime",path.resolve(path.join(__dirname,"..","locales")),"runtime.json")
         .then(function() { return storage.init(runtime)})
         .then(function() { return settings.load(storage)})
+        .then(function() { return library.init(runtime)})
         .then(function() {
 
             if (log.metric()) {
diff --git a/packages/node_modules/@node-red/runtime/lib/library/index.js b/packages/node_modules/@node-red/runtime/lib/library/index.js
index 8a4e6518e..293745f2d 100644
--- a/packages/node_modules/@node-red/runtime/lib/library/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/library/index.js
@@ -15,21 +15,54 @@
  **/
 
 
-var knownTypes = {};
+const {events} = require("@node-red/util")
+const knownTypes = {};
+const libraries = {};
+const libraryPlugins = {};
 
-var libraries = {};
+// Libraries defined in the settings file. Their configurations
+// cannot be modified in the editor.
+let runtimeLibraries = [];
 
+// Libraries defined by the user in the editor.
+let userLibraries = [];
 
 function init(runtime) {
-    knownTypes = {
-        'flows': 'node-red'
-    };
 
-    libraries["_examples_"] = require("./examples");
-    libraries["_examples_"].init(runtime);
+    events.on("registry:plugin-added", function(id) {
+        const plugin = runtime.plugins.getPlugin(id);
+        if (plugin.type === "node-red-library-source") {
+            libraryPlugins[plugin.id] = plugin;
+
+            runtimeLibraries.forEach(library => {
+                if (library.type === id) {
+                    library.local = false;
+                    libraries[library.id] = new plugin.class(library)
+                    if (libraries[library.id].init) {
+                        libraries[library.id].init();
+                    }
+                }
+            })
+
+
+        }
+    })
+
+    knownTypes.flows = 'node-red';
+
+    libraries["examples"] = require("./examples");
+    libraries["examples"].init(runtime);
     libraries["local"] = require("./local");
     libraries["local"].init(runtime);
 
+    try {
+        runtimeLibraries = runtime.settings.editorTheme.library.sources;
+    } catch(err) {
+        runtimeLibraries = [];
+    }
+    // userLibraries = runtime.settings.get("library")
+
+
 }
 
 function registerType(id,type) {
@@ -56,7 +89,7 @@ function saveEntry(library,type,path,meta,body) {
         throw new Error(`Unknown library type '${type}'`);
     }
     if (libraries.hasOwnProperty(library)) {
-        if (libraries[library].hasOwnProperty("saveEntry")) {
+        if (libraries[library].saveEntry) {
             return libraries[library].saveEntry(type,path,meta,body);
         } else {
             throw new Error(`Library '${library}' is read-only`);
@@ -66,8 +99,43 @@ function saveEntry(library,type,path,meta,body) {
     }
 }
 
+function getLibraries() {
+    const libraryList = [
+        {
+            id: "local",
+            label: "editor:library.types.local",
+            user: false,
+            icon: "fa fa-bath"
+        },
+        {
+            id: "examples",
+            label: "editor:library.types.examples",
+            user: false,
+            readOnly: true,
+            types: ['flows']
+        }
+    ];
+
+    for (let id in libraries) {
+        if (libraries.hasOwnProperty(id)) {
+            if (id !== 'local' && id !== 'examples') {
+                libraryList.push({
+                    id: id,
+                    label: libraries[id].name || id,
+                    user: false,
+                    icon: libraries[id].icon
+                })
+            }
+        }
+    }
+
+    return libraryList;
+
+}
+
 module.exports = {
     init: init,
+    getLibraries: getLibraries,
     register: registerType,
     getEntry: getEntry,
     saveEntry: saveEntry
diff --git a/test/resources/plugin/test-plugin/library-filestore.html b/test/resources/plugin/test-plugin/library-filestore.html
new file mode 100644
index 000000000..b4f1c0946
--- /dev/null
+++ b/test/resources/plugin/test-plugin/library-filestore.html
@@ -0,0 +1,11 @@
+<script type="text/javascript">
+    RED.plugins.registerPlugin("node-red-library-filestore", {
+        type: "node-red-library-source",
+        name: "Local File-System Library",
+        icon: "font-awesome/fa-hdd-o",
+        defaults: {
+            name: { value: "" },
+            path: { value: ""}
+        }
+    })
+</script>
\ No newline at end of file
diff --git a/test/resources/plugin/test-plugin/library-filestore.js b/test/resources/plugin/test-plugin/library-filestore.js
new file mode 100644
index 000000000..61c8d9803
--- /dev/null
+++ b/test/resources/plugin/test-plugin/library-filestore.js
@@ -0,0 +1,32 @@
+
+module.exports = function(RED) {
+
+    class FileStorePlugin {
+        constructor(config) {
+            this.id = config.id;
+            this.name = config.name;
+            this.config = config;
+            this.icon = config.icon;
+            
+            console.log("FileStorePlugin",config)
+        }
+        async init() {
+            console.log("FileStorePlugin.init")
+
+        }
+        async getEntry(type,path) {
+            console.log("FileStorePlugin.getLibraryEntry",type,path)
+            return []
+        }
+        async saveEntry(type,path,meta,body) {
+            console.log("FileStorePlugin.saveLibraryEntry",type,path)
+
+        }
+    }
+
+
+    RED.plugins.registerPlugin("node-red-library-filestore", {
+        type: "node-red-library-source",
+        class: FileStorePlugin
+    })
+}
\ No newline at end of file
diff --git a/test/resources/plugin/test-plugin/package.json b/test/resources/plugin/test-plugin/package.json
index 1077042de..65487c656 100644
--- a/test/resources/plugin/test-plugin/package.json
+++ b/test/resources/plugin/test-plugin/package.json
@@ -6,7 +6,8 @@
       "plugins": {
           "test": "test.js",
           "test-editor-plugin": "test-editor-plugin.html",
-          "test-runtime-plugin": "test-runtime-plugin.js"
+          "test-runtime-plugin": "test-runtime-plugin.js",
+          "library-filestore": "library-filestore.js"
       }
   }
 }

From 3f9a29730f9ddcbb8ce2cadad5c77c77f9b4f2f6 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <knolleary@users.noreply.github.com>
Date: Fri, 22 Jan 2021 11:20:28 +0000
Subject: [PATCH 2/6] Add partial implementation of adding library sources via
 editor

This adds lots of commented out code that provides a settings panel
to add new library sources. It is incomplete as it doesn't actually
add/update the library sources on the runtime.

For 1.3, I'm focussing on allowing additional sources get added
via the settings file only. I've done enough work on the editor
side to convince myself more work is needed than I can justify
at this time on what is otherwise not going to be a widely
used feature.
---
 .../@node-red/editor-api/lib/editor/index.js  |   1 +
 .../editor-api/lib/editor/library.js          |  11 +
 .../editor-client/src/js/ui/clipboard.js      |   7 +-
 .../editor-client/src/js/ui/library.js        | 228 +++++++++++++++++-
 .../editor-client/src/sass/library.scss       |  38 +++
 .../editor-client/src/sass/projects.scss      |   1 +
 .../@node-red/runtime/lib/api/library.js      |  21 ++
 .../@node-red/runtime/lib/library/examples.js |   6 +-
 .../@node-red/runtime/lib/library/index.js    |  75 +++---
 .../@node-red/runtime/lib/library/local.js    |   4 +-
 .../plugin/test-plugin/library-filestore.html |  15 +-
 .../plugin/test-plugin/library-filestore.js   |  17 +-
 .../locales/en-US/library-filestore.json      |   8 +
 13 files changed, 393 insertions(+), 39 deletions(-)
 create mode 100644 test/resources/plugin/test-plugin/locales/en-US/library-filestore.json

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/index.js b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
index 2e8333f3f..b2fdc1f6b 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
@@ -93,6 +93,7 @@ module.exports = {
             // Library
             var library = require("./library");
             library.init(runtimeAPI);
+            // editorApp.get("/library/:id",needsPermission("library.read"),library.getLibraryConfig);
             editorApp.get(/^\/library\/([^\/]+)\/([^\/]+)(?:$|\/(.*))/,needsPermission("library.read"),library.getEntry);
             editorApp.post(/^\/library\/([^\/]+)\/([^\/]+)\/(.*)/,needsPermission("library.write"),library.saveEntry);
 
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/library.js b/packages/node_modules/@node-red/editor-api/lib/editor/library.js
index 89b92fd11..cd564b3f8 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/library.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/library.js
@@ -24,6 +24,17 @@ module.exports = {
     init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;
     },
+    // getLibraryConfig: function(req,res) {
+    //     var opts = {
+    //         user: req.user,
+    //         library: req.params.id
+    //     }
+    //     runtimeAPI.library.getConfig(opts).then(function(result) {
+    //         res.json(result);
+    //     }).catch(function(err) {
+    //         apiUtils.rejectHandler(req,res,err);
+    //     });
+    // },
     getEntry: function(req,res) {
         var opts = {
             user: req.user,
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
index eb3b7b6de..6ec719708 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -854,10 +854,15 @@ RED.clipboard = (function() {
     }
 
     function loadFlowLibrary(browser,library) {
+        var icon = 'fa fa-hdd-o';
+        if (library.icon) {
+            var fullIcon = RED.utils.separateIconPath(library.icon);
+            icon = (fullIcon.module==="font-awesome"?"fa ":"")+fullIcon.file;
+        }
         browser.data([{
             library: library.id,
             type: "flows",
-            icon: library.icon || 'fa fa-hdd-o',
+            icon: icon,
             label: RED._(library.label||library.id),
             path: "",
             expanded: true,
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
index 3872a38ea..66e617229 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
@@ -483,9 +483,235 @@ RED.library = (function() {
         }
     }
 
+    // var libraryPlugins = {};
+    //
+    // function showLibraryDetailsDialog(container, lib, done) {
+    //     var dialog = $('<div>').addClass("red-ui-projects-dialog-list-dialog").hide().appendTo(container);
+    //     $('<div>').addClass("red-ui-projects-dialog-list-dialog-header").text(lib?"Edit library source":"Add library source").appendTo(dialog);
+    //     var formRow = $('<div class="red-ui-settings-row"></div>').appendTo(dialog);
+    //     $('<label>').text("Type").appendTo(formRow);
+    //     var typeSelect = $('<select>').appendTo(formRow);
+    //     for (var type in libraryPlugins) {
+    //         if (libraryPlugins.hasOwnProperty(type)) {
+    //             $('<option>').attr('value',type).attr('selected',(lib && lib.type === type)?true:null).text(libraryPlugins[type].name).appendTo(typeSelect);
+    //         }
+    //     }
+    //     var dialogBody = $("<div>").addClass("red-ui-settings-section").appendTo(dialog);
+    //     var libraryFields = {};
+    //     var fieldsModified = {};
+    //     function validateFields() {
+    //         var validForm = true;
+    //         for (var p in libraryFields) {
+    //             if (libraryFields.hasOwnProperty(p)) {
+    //                 var v = libraryFields[p].input.val().trim();
+    //                 if (v === "") {
+    //                     validForm = false;
+    //                     if (libraryFields[p].modified) {
+    //                         libraryFields[p].input.addClass("input-error");
+    //                     }
+    //                 } else {
+    //                     libraryFields[p].input.removeClass("input-error");
+    //                 }
+    //             }
+    //         }
+    //         okayButton.attr("disabled",validForm?null:"disabled");
+    //     }
+    //     typeSelect.on("change", function(evt) {
+    //         dialogBody.empty();
+    //         libraryFields = {};
+    //         fieldsModified = {};
+    //         var libDef = libraryPlugins[$(this).val()];
+    //         var defaultIcon = lib?lib.icon:(libDef.icon || "font-awesome/fa-image");
+    //         formRow = $('<div class="red-ui-settings-row"></div>').appendTo(dialogBody);
+    //         $('<label>').text(RED._("editor.settingIcon")).appendTo(formRow);
+    //         libraryFields['icon'] = {input: $('<input type="hidden">').val(defaultIcon) };
+    //         var iconButton = $('<button type="button" class="red-ui-button"></button>').appendTo(formRow);
+    //         iconButton.on("click", function(evt) {
+    //             evt.preventDefault();
+    //             var icon = libraryFields['icon'].input.val() || "";
+    //             var iconPath = (icon ? RED.utils.separateIconPath(icon) : {});
+    //             RED.editor.showIconPicker(iconButton, null, iconPath, true, function (newIcon) {
+    //                 iconButton.empty();
+    //                 var path = newIcon || "";
+    //                 var newPath = RED.utils.separateIconPath(path);
+    //                 if (newPath) {
+    //                     $('<i class="fa"></i>').addClass(newPath.file).appendTo(iconButton);
+    //                 }
+    //                 libraryFields['icon'].input.val(path);
+    //             });
+    //         })
+    //         var newPath = RED.utils.separateIconPath(defaultIcon);
+    //         $('<i class="fa '+newPath.file+'"></i>').appendTo(iconButton);
+    //
+    //         var libProps = libDef.defaults;
+    //         var libPropKeys = Object.keys(libProps).map(function(p) { return {id: p, def: libProps[p]}});
+    //         libPropKeys.unshift({id: "label", def: {value:""}})
+    //
+    //         libPropKeys.forEach(function(prop) {
+    //             var p = prop.id;
+    //             var def = prop.def;
+    //             formRow = $('<div class="red-ui-settings-row"></div>').appendTo(dialogBody);
+    //             var label = libDef._(def.label || "label."+p,{defaultValue: p});
+    //             if (label === p) {
+    //                 label = libDef._("editor:common.label."+p,{defaultValue:p});
+    //             }
+    //             $('<label>').text(label).appendTo(formRow);
+    //             libraryFields[p] = {
+    //                 input: $('<input type="text">').val(lib?(lib[p]||lib.config[p]):def.value).appendTo(formRow),
+    //                 modified: false
+    //             }
+    //             if (def.type === "password") {
+    //                 libraryFields[p].input.attr("type","password").typedInput({type:"cred"})
+    //             }
+    //
+    //             libraryFields[p].input.on("change paste keyup", function(evt) {
+    //                 if (!evt.key || evt.key.length === 1) {
+    //                     libraryFields[p].modified = true;
+    //                 }
+    //                 validateFields();
+    //             })
+    //             var desc = libDef._("desc."+p, {defaultValue: ""});
+    //             if (desc) {
+    //                 $('<label class="red-ui-projects-edit-form-sublabel"></label>').append($('<small>').text(desc)).appendTo(formRow);
+    //             }
+    //         });
+    //         validateFields();
+    //     })
+    //
+    //     var dialogButtons = $('<span class="button-row" style="position: relative; float: right; margin: 10px;"></span>').appendTo(dialog);
+    //     var cancelButton = $('<button class="red-ui-button"></button>').text(RED._("common.label.cancel")).appendTo(dialogButtons).on("click", function(evt) {
+    //         evt.preventDefault();
+    //         done(false);
+    //     })
+    //     var okayButton = $('<button class="red-ui-button"></button>').text(lib?"Update library":"Add library").appendTo(dialogButtons).on("click", function(evt) {
+    //         evt.preventDefault();
+    //         var item;
+    //         if (!lib) {
+    //             item = {
+    //                 id: libraryFields['label'].input.val().trim().toLowerCase().replace(/( |[^a-z0-9])/g,"-"),
+    //                 user: true,
+    //                 type: typeSelect.val(),
+    //                 config: {}
+    //             }
+    //         } else {
+    //             item = lib;
+    //         }
+    //
+    //         item.label = libraryFields['label'].input.val().trim();
+    //         item.icon = libraryFields['icon'].input.val();
+    //
+    //         for (var p in libraryFields) {
+    //             if (libraryFields.hasOwnProperty(p) && p !== 'label') {
+    //                 item.config[p] = libraryFields[p].input.val().trim();
+    //             }
+    //         }
+    //         done(item);
+    //     });
+    //
+    //     typeSelect.trigger("change");
+    //     if (lib) {
+    //         typeSelect.attr('disabled',true);
+    //     }
+    //
+    //     dialog.slideDown(200);
+    // }
+    //
+    // function createSettingsPane() {
+    //     var pane = $('<div id="red-ui-settings-tab-library-manager"></div>');
+    //     var toolbar = $('<div>').css("text-align","right").appendTo(pane);
+    //     var addButton = $('<button class="red-ui-button"><i class="fa fa-plus"></i> Add library</button>').appendTo(toolbar);
+    //
+    //     var addingLibrary = false;
+    //
+    //     var libraryList = $("<ol>").css({
+    //         position: "absolute",
+    //         left: "10px",
+    //         right: "10px",
+    //         top: "50px",
+    //         bottom: "10px"
+    //     }).appendTo(pane).editableList({
+    //         addButton: false,
+    //         addItem: function(row,index,itemData) {
+    //             if (itemData.id) {
+    //                 row.addClass("red-ui-settings-tab-library-entry");
+    //                 var iconCell = $("<span>").appendTo(row);
+    //                 if (itemData.icon) {
+    //                     var iconPath = RED.utils.separateIconPath(itemData.icon);
+    //                     if (iconPath) {
+    //                         $("<i>").addClass("fa "+iconPath.file).appendTo(iconCell);
+    //                     }
+    //                 }
+    //                 $("<span>").text(RED._(itemData.label)).appendTo(row);
+    //                 $("<span>").text(RED._(itemData.type)).appendTo(row);
+    //                 $('<button class="red-ui-button red-ui-button-small"></button>').text(RED._("sidebar.project.projectSettings.edit")).appendTo(
+    //                     $('<span>').appendTo(row)
+    //                 ).on("click", function(evt) {
+    //                     if (addingLibrary) {
+    //                         return;
+    //                     }
+    //                     evt.preventDefault();
+    //                     addingLibrary = true;
+    //                     row.empty();
+    //                     row.removeClass("red-ui-settings-tab-library-entry");
+    //                     showLibraryDetailsDialog(row,itemData,function(newItem) {
+    //                         var itemIndex = libraryList.editableList("indexOf", itemData);
+    //                         libraryList.editableList("removeItem", itemData);
+    //                         if (newItem) {
+    //                             libraryList.editableList("insertItemAt", newItem, itemIndex);
+    //                         } else {
+    //                             libraryList.editableList("insertItemAt", itemData,itemIndex);
+    //                         }
+    //                         addingLibrary = false;
+    //
+    //                     })
+    //                 })
+    //
+    //             } else {
+    //                 showLibraryDetailsDialog(row,null,function(newItem) {
+    //                     libraryList.editableList("removeItem", itemData);
+    //                     if (newItem) {
+    //                         libraryList.editableList("addItem", newItem);
+    //                     }
+    //                     addingLibrary = false;
+    //                 })
+    //
+    //             }
+    //         }
+    //     });
+    //
+    //     addButton.on('click', function(evt) {
+    //         evt.preventDefault();
+    //         if (!addingLibrary) {
+    //             addingLibrary = true;
+    //             libraryList.editableList("addItem",{user:true});
+    //         }
+    //     })
+    //     var libraries = RED.settings.libraries || [];
+    //     libraries.forEach(function(library) {
+    //         if (library.user) {
+    //             libraryList.editableList("addItem",library)
+    //         }
+    //     })
+    //
+    //     return pane;
+    // }
+    //
+    //
     return {
         init: function() {
-
+            // RED.events.on("registry:plugin-added", function(id) {
+            //     var plugin = RED.plugins.getPlugin(id);
+            //     if (plugin.type === "node-red-library-source") {
+            //         libraryPlugins[id] = plugin;
+            //     }
+            // });
+            //
+            // RED.userSettings.add({
+            //     id:'library-manager',
+            //     title: "NLS: Libraries",
+            //     get: createSettingsPane,
+            //     close: function() {}
+            // });
             $(_librarySave).appendTo("#red-ui-editor").i18n();
             $(_libraryLookup).appendTo("#red-ui-editor").i18n();
 
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/library.scss b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
index 3ddf44a95..874160baa 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/library.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
@@ -231,4 +231,42 @@
         padding: 0;
         margin: 0;
     }
+}
+
+#red-ui-settings-tab-library-manager {
+    box-sizing: border-box;
+    padding: 10px;
+    position: relative;
+    height: 100%;
+    li {
+        padding: 0;
+    }
+}
+
+.red-ui-settings-tab-library-entry {
+    display: flex;
+    flex-direction: row;
+    span:not(:nth-child(2)) {
+        @include disable-selection;
+    }
+    span {
+        padding: 8px 0;
+    }
+    span:first-child {
+        display: inline-block;
+        width: 20px;
+        padding-right: 8px;
+        text-align: center;
+        flex-grow: 0;
+    }
+    span:nth-child(2) {
+        flex-grow: 1;
+    }
+
+    span:nth-child(3), span:nth-child(4) {
+        flex-grow: 0;
+        padding-right: 5px;
+        color: $secondary-text-color;
+        font-size: 0.9em;
+    }
 }
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/projects.scss b/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
index 6a8e73938..4c0e503c2 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
@@ -807,6 +807,7 @@ div.red-ui-projects-dialog-ssh-public-key {
     border: 1px solid $secondary-border-color;
     .red-ui-projects-edit-form-sublabel {
         margin-top: -8px !important;
+        margin-right: 50px;
         display: block !important;
         width: auto !important;
     }
diff --git a/packages/node_modules/@node-red/runtime/lib/api/library.js b/packages/node_modules/@node-red/runtime/lib/api/library.js
index 6b7ed6218..a412bbde5 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/library.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/library.js
@@ -25,6 +25,27 @@ var api = module.exports = {
         runtime = _runtime;
     },
 
+    // /* *
+    // * Gets the configuration of a library source.
+    // * @param {Object} opts
+    // * @param {User} opts.user - the user calling the api
+    // * @param {String} opts.library - the library
+    // * @param {Object} opts.req - the request to log (optional)
+    // * @return {Promise<String|Object>} - resolves when complete
+    // * @memberof @node-red/runtime_library
+    // */
+    // getConfig: async function(opts) {
+    //     runtime.log.audit({event: "library.getConfig",library:opts.library}, opts.req);
+    //     try {
+    //         return runtime.library.getConfig(opts.library)
+    //     } catch(err) {
+    //         var error = new Error();
+    //         error.code = "not_found";
+    //         error.status = 404;
+    //         throw error;
+    //     }
+    // },
+
     /**
     * Gets an entry from the library.
     * @param {Object} opts
diff --git a/packages/node_modules/@node-red/runtime/lib/library/examples.js b/packages/node_modules/@node-red/runtime/lib/library/examples.js
index 28b7c76d0..69ef1445c 100644
--- a/packages/node_modules/@node-red/runtime/lib/library/examples.js
+++ b/packages/node_modules/@node-red/runtime/lib/library/examples.js
@@ -95,7 +95,11 @@ function getEntry(type,path) {
 }
 
 module.exports = {
-    name: '_examples_',
+    id: "examples",
+    label: "editor:library.types.examples",
+    icon: "font-awesome/fa-life-ring",
+    types: ["flows"],
+    readOnly: true,
     init: init,
     getEntry: getEntry
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/library/index.js b/packages/node_modules/@node-red/runtime/lib/library/index.js
index 293745f2d..81521fd4b 100644
--- a/packages/node_modules/@node-red/runtime/lib/library/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/library/index.js
@@ -18,6 +18,7 @@
 const {events} = require("@node-red/util")
 const knownTypes = {};
 const libraries = {};
+const libraryConfigs = {};
 const libraryPlugins = {};
 
 // Libraries defined in the settings file. Their configurations
@@ -37,7 +38,9 @@ function init(runtime) {
             runtimeLibraries.forEach(library => {
                 if (library.type === id) {
                     library.local = false;
+                    libraryConfigs[library.id] = library;
                     libraries[library.id] = new plugin.class(library)
+                    libraryConfigs[library.id].type = id;
                     if (libraries[library.id].init) {
                         libraries[library.id].init();
                     }
@@ -49,11 +52,13 @@ function init(runtime) {
     })
 
     knownTypes.flows = 'node-red';
+    libraries["local"] = require("./local");
+    libraries["local"].init(runtime);
+    libraryConfigs["local"] = libraries["local"]
 
     libraries["examples"] = require("./examples");
     libraries["examples"].init(runtime);
-    libraries["local"] = require("./local");
-    libraries["local"].init(runtime);
+    libraryConfigs["examples"] = libraries["examples"]
 
     try {
         runtimeLibraries = runtime.settings.editorTheme.library.sources;
@@ -100,42 +105,58 @@ function saveEntry(library,type,path,meta,body) {
 }
 
 function getLibraries() {
-    const libraryList = [
-        {
-            id: "local",
-            label: "editor:library.types.local",
-            user: false,
-            icon: "fa fa-bath"
-        },
-        {
-            id: "examples",
-            label: "editor:library.types.examples",
-            user: false,
-            readOnly: true,
-            types: ['flows']
-        }
-    ];
-
+    const libraryList = []
     for (let id in libraries) {
         if (libraries.hasOwnProperty(id)) {
-            if (id !== 'local' && id !== 'examples') {
-                libraryList.push({
-                    id: id,
-                    label: libraries[id].name || id,
-                    user: false,
-                    icon: libraries[id].icon
-                })
+            var config = getConfig(id);
+            // Don't include the full configuration of each library when providing
+            // the list of all libraries
+            delete config.config;
+            libraryList.push(config);
+        }
+    }
+    return libraryList;
+}
+
+function getConfig(id) {
+    var lib = {
+        id: id,
+        label: libraryConfigs[id].label || id,
+        user: false,
+        icon: libraryConfigs[id].icon
+    }
+    if (libraryConfigs[id].types) {
+        lib.types = libraryConfigs[id].types
+    }
+    if (libraryConfigs[id].readOnly) {
+        lib.readOnly = libraryConfigs[id].readOnly
+    }
+
+    if (libraryConfigs[id].type) {
+        lib.type = libraryConfigs[id].type;
+
+        var def = libraryPlugins[lib.type];
+        if (def && def.defaults) {
+            lib.config = {};
+            for (var d in def.defaults) {
+                if (def.defaults.hasOwnProperty(d)) {
+                    if (def.defaults[d].type !== 'password') {
+                        lib.config[d] = libraryConfigs[id][d];
+                    } else if (!!libraryConfigs[id][d]) {
+                        lib.config["has_"+d] = true;
+                    }
+                }
             }
         }
     }
-
-    return libraryList;
+    return lib;
 
 }
 
 module.exports = {
     init: init,
     getLibraries: getLibraries,
+    // getConfig: getConfig,
     register: registerType,
     getEntry: getEntry,
     saveEntry: saveEntry
diff --git a/packages/node_modules/@node-red/runtime/lib/library/local.js b/packages/node_modules/@node-red/runtime/lib/library/local.js
index 454e800ca..1c93cf00e 100644
--- a/packages/node_modules/@node-red/runtime/lib/library/local.js
+++ b/packages/node_modules/@node-red/runtime/lib/library/local.js
@@ -30,7 +30,9 @@ function saveEntry(type,path,meta,body) {
 }
 
 module.exports = {
-    name: 'local',
+    id: "local",
+    label: "editor:library.types.local",
+    icon: "font-awesome/fa-hdd-o",
     init: init,
     getEntry: getEntry,
     saveEntry: saveEntry
diff --git a/test/resources/plugin/test-plugin/library-filestore.html b/test/resources/plugin/test-plugin/library-filestore.html
index b4f1c0946..60fbae464 100644
--- a/test/resources/plugin/test-plugin/library-filestore.html
+++ b/test/resources/plugin/test-plugin/library-filestore.html
@@ -4,8 +4,19 @@
         name: "Local File-System Library",
         icon: "font-awesome/fa-hdd-o",
         defaults: {
-            name: { value: "" },
-            path: { value: ""}
+            path: { value: ""},
+            // secret: { type: "password" }
+        }
+    })
+
+
+
+    RED.plugins.registerPlugin("node-red-library-dbstore", {
+        type: "node-red-library-source",
+        name: "Database Library",
+        icon: "font-awesome/fa-database",
+        defaults: {
+            connection: { value: ""}
         }
     })
 </script>
\ No newline at end of file
diff --git a/test/resources/plugin/test-plugin/library-filestore.js b/test/resources/plugin/test-plugin/library-filestore.js
index 61c8d9803..7c6f1db83 100644
--- a/test/resources/plugin/test-plugin/library-filestore.js
+++ b/test/resources/plugin/test-plugin/library-filestore.js
@@ -1,13 +1,15 @@
 
 module.exports = function(RED) {
+    const PLUGIN_TYPE_ID = "node-red-library-filestore";
 
     class FileStorePlugin {
         constructor(config) {
+            this.type = PLUGIN_TYPE_ID;
             this.id = config.id;
-            this.name = config.name;
-            this.config = config;
+            this.label = config.label;
+            this.config = config.config;
             this.icon = config.icon;
-            
+
             console.log("FileStorePlugin",config)
         }
         async init() {
@@ -20,13 +22,16 @@ module.exports = function(RED) {
         }
         async saveEntry(type,path,meta,body) {
             console.log("FileStorePlugin.saveLibraryEntry",type,path)
-
         }
     }
 
 
-    RED.plugins.registerPlugin("node-red-library-filestore", {
+    RED.plugins.registerPlugin(PLUGIN_TYPE_ID, {
         type: "node-red-library-source",
-        class: FileStorePlugin
+        class: FileStorePlugin,
+        defaults: {
+            "path": { value: "" },
+            // "secret": { type: "password" }
+        }
     })
 }
\ No newline at end of file
diff --git a/test/resources/plugin/test-plugin/locales/en-US/library-filestore.json b/test/resources/plugin/test-plugin/locales/en-US/library-filestore.json
new file mode 100644
index 000000000..b9ffa5f17
--- /dev/null
+++ b/test/resources/plugin/test-plugin/locales/en-US/library-filestore.json
@@ -0,0 +1,8 @@
+{
+    "label": {
+        "path": "Path"
+    },
+    "desc": {
+        "path":"The local file-system path to the library"
+    }
+}
\ No newline at end of file

From c744af161de584f798f5adc5044d24108cc3fe78 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 19 Feb 2021 11:59:49 +0000
Subject: [PATCH 3/6] Add support for settings object in plugin definition

---
 .../@node-red/registry/lib/index.js           |  3 +-
 .../@node-red/registry/lib/plugins.js         | 64 +++++++++++++++++--
 .../@node-red/runtime/lib/api/settings.js     |  1 +
 .../@node-red/runtime/lib/plugins.js          |  1 +
 4 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/packages/node_modules/@node-red/registry/lib/index.js b/packages/node_modules/@node-red/registry/lib/index.js
index 251b04971..18c30f0fc 100644
--- a/packages/node_modules/@node-red/registry/lib/index.js
+++ b/packages/node_modules/@node-red/registry/lib/index.js
@@ -304,7 +304,8 @@ module.exports = {
     getPluginsByType: plugins.getPluginsByType,
     getPluginList: plugins.getPluginList,
     getPluginConfigs: plugins.getPluginConfigs,
-
+    exportPluginSettings: plugins.exportPluginSettings,
+    
     deprecated: require("./deprecated")
 
 };
diff --git a/packages/node_modules/@node-red/registry/lib/plugins.js b/packages/node_modules/@node-red/registry/lib/plugins.js
index 82b230011..182ad5bb6 100644
--- a/packages/node_modules/@node-red/registry/lib/plugins.js
+++ b/packages/node_modules/@node-red/registry/lib/plugins.js
@@ -1,11 +1,13 @@
 const registry = require("./registry");
-const {events} = require("@node-red/util")
+const {events} = require("@node-red/util");
+const clone = require("clone");
 
-var pluginConfigCache = {};
-var pluginToId = {};
-var plugins = {};
-var pluginsByType = {};
-var settings;
+let pluginConfigCache = {};
+let pluginToId = {};
+let plugins = {};
+let pluginsByType = {};
+let pluginSettings = {};
+let settings;
 
 function init(_settings) {
     settings = _settings;
@@ -13,6 +15,7 @@ function init(_settings) {
     pluginConfigCache = {};
     pluginToId = {};
     pluginsByType = {};
+    pluginSettings = {};
 }
 
 function registerPlugin(nodeSetId,id,definition) {
@@ -32,6 +35,11 @@ function registerPlugin(nodeSetId,id,definition) {
         pluginsByType[definition.type] = pluginsByType[definition.type] || [];
         pluginsByType[definition.type].push(definition);
     }
+    if (definition.settings) {
+        pluginSettings[id] = definition.settings;
+    }
+
+
     if (definition.onadd && typeof definition.onadd === 'function') {
         definition.onadd();
     }
@@ -93,11 +101,53 @@ function getPluginList() {
     return list;
 }
 
+function exportPluginSettings(safeSettings) {
+    for (let id in pluginSettings) {
+        if (pluginSettings.hasOwnProperty(id)) {
+            if (settings.hasOwnProperty(id) && !safeSettings.hasOwnProperty(id)) {
+                let pluginTypeSettings = pluginSettings[id];
+                let exportedSet = {};
+                let defaultExportable = false;
+                if (pluginTypeSettings['*'] && pluginTypeSettings['*'].hasOwnProperty("exportable")) {
+                    defaultExportable = pluginTypeSettings['*'].exportable;
+                }
+                if (defaultExportable) {
+                    exportedSet = clone(settings[id]);
+                }
+                for (let property in pluginTypeSettings) {
+                    if (pluginTypeSettings.hasOwnProperty(property)) {
+                        let setting = pluginTypeSettings[property];
+                        if (defaultExportable) {
+                            if (setting.exportable === false) {
+                                delete exportedSet[property]
+                            } else if (!exportedSet.hasOwnProperty(property) && setting.hasOwnProperty('value')) {
+                                exportedSet[property] = setting.value;
+                            }
+                        } else if (setting.exportable) {
+                            if (settings[id].hasOwnProperty(property)) {
+                                exportedSet[property] = settings[id][property];
+                            } else if (setting.hasOwnProperty('value')) {
+                                exportedSet[property] = setting.value;
+                            }
+                        }
+                    }
+                }
+                if (Object.keys(exportedSet).length > 0) {
+                    safeSettings[id] = exportedSet;
+                }
+            }
+        }
+    }
+
+    return safeSettings;
+}
+
 module.exports = {
     init,
     registerPlugin,
     getPlugin,
     getPluginsByType,
     getPluginConfigs,
-    getPluginList
+    getPluginList,
+    exportPluginSettings
 }
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/runtime/lib/api/settings.js b/packages/node_modules/@node-red/runtime/lib/api/settings.js
index 07d09e379..02f991722 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/settings.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/settings.js
@@ -130,6 +130,7 @@ var api = module.exports = {
 
             safeSettings.flowEncryptionType = runtime.nodes.getCredentialKeyType();
             runtime.settings.exportNodeSettings(safeSettings);
+            runtime.plugins.exportPluginSettings(safeSettings);
         }
 
         return safeSettings;
diff --git a/packages/node_modules/@node-red/runtime/lib/plugins.js b/packages/node_modules/@node-red/runtime/lib/plugins.js
index 738a64fa7..bedeabb4c 100644
--- a/packages/node_modules/@node-red/runtime/lib/plugins.js
+++ b/packages/node_modules/@node-red/runtime/lib/plugins.js
@@ -7,4 +7,5 @@ module.exports = {
     getPluginsByType: registry.getPluginsByType,
     getPluginList: registry.getPluginList,
     getPluginConfigs: registry.getPluginConfigs,
+    exportPluginSettings: registry.exportPluginSettings
 }
\ No newline at end of file

From c2347076f4d5a181c38a9c47ca0ecb8a949cccac Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 19 Feb 2021 14:01:33 +0000
Subject: [PATCH 4/6] Handle errors when initialising library plugin

---
 .../@node-red/runtime/lib/library/index.js    | 30 ++++++++++++-------
 .../runtime/locales/en-US/runtime.json        |  7 ++++-
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/library/index.js b/packages/node_modules/@node-red/runtime/lib/library/index.js
index 81521fd4b..5bafc7817 100644
--- a/packages/node_modules/@node-red/runtime/lib/library/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/library/index.js
@@ -15,7 +15,7 @@
  **/
 
 
-const {events} = require("@node-red/util")
+const {events,log} = require("@node-red/util")
 const knownTypes = {};
 const libraries = {};
 const libraryConfigs = {};
@@ -38,11 +38,19 @@ function init(runtime) {
             runtimeLibraries.forEach(library => {
                 if (library.type === id) {
                     library.local = false;
-                    libraryConfigs[library.id] = library;
-                    libraries[library.id] = new plugin.class(library)
-                    libraryConfigs[library.id].type = id;
-                    if (libraries[library.id].init) {
-                        libraries[library.id].init();
+                    try {
+                        libraries[library.id] = new plugin.class(library)
+                        libraryConfigs[library.id] = library;
+                        libraryConfigs[library.id].type = id;
+                        if (libraries[library.id].init) {
+                            libraries[library.id].init().catch(err => {
+                                delete libraries[library.id];
+                                delete libraryConfigs[library.id];
+                                log.warn(log._("library.failedToInit",{library:library.id, error:err.toString()}));
+                            });
+                        }
+                    } catch(err) {
+                        log.warn(log._("library.failedToInit",{library:library.id, error:err.toString()}));
                     }
                 }
             })
@@ -81,26 +89,26 @@ function registerType(id,type) {
 
 function getEntry(library,type,path) {
     if (!knownTypes.hasOwnProperty(type)) {
-        throw new Error(`Unknown library type '${type}'`);
+        throw new Error(log._("library.unknownType",{type: type}))
     }
     if (libraries.hasOwnProperty(library)) {
         return libraries[library].getEntry(type,path);
     } else {
-        throw new Error(`Unknown library '${library}'`);
+        throw new Error(log._("library.unknownLibrary",{library: library}))
     }
 }
 function saveEntry(library,type,path,meta,body) {
     if (!knownTypes.hasOwnProperty(type)) {
-        throw new Error(`Unknown library type '${type}'`);
+        throw new Error(log._("library.unknownType",{type: type}))
     }
     if (libraries.hasOwnProperty(library)) {
         if (libraries[library].saveEntry) {
             return libraries[library].saveEntry(type,path,meta,body);
         } else {
-            throw new Error(`Library '${library}' is read-only`);
+            throw new Error(log._("library.readOnly",{library: library}))
         }
     } else {
-        throw new Error(`Unknown library '${library}'`);
+        throw new Error(log._("library.unknownLibrary",{library: library}))
     }
 }
 
diff --git a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
index 02e15aa88..2d46bb334 100644
--- a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
@@ -89,7 +89,12 @@
         "not-available": "Settings not available",
         "property-read-only": "Property '__prop__' is read-only"
     },
-
+    "library": {
+        "unknownLibrary": "Unknown library: __library__",
+        "unknownType": "Unknown library type: __type__",
+        "readOnly": "Library __library__ is read-only",
+        "failedToInit": "Failed to initialise __library__: __error__"
+    },
     "nodes": {
         "credentials": {
             "error":"Error loading credentials: __message__",

From 6f9e06e78dca3eadf729309e0446207f330a42d4 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 19 Feb 2021 14:39:42 +0000
Subject: [PATCH 5/6] Add validation of library plugin id and better error
 reporting

---
 packages/node_modules/@node-red/runtime/lib/library/index.js | 5 +++++
 .../@node-red/runtime/locales/en-US/runtime.json             | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/library/index.js b/packages/node_modules/@node-red/runtime/lib/library/index.js
index 5bafc7817..83bac06a2 100644
--- a/packages/node_modules/@node-red/runtime/lib/library/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/library/index.js
@@ -38,6 +38,11 @@ function init(runtime) {
             runtimeLibraries.forEach(library => {
                 if (library.type === id) {
                     library.local = false;
+
+                    if (!/^[a-z0-9-_]+$/.test(library.id)) {
+                        log.warn(log._("library.failedToInit",{error:log._("library.invalidProperty",{prop:"id",value:library.id})}));
+                        return;
+                    }
                     try {
                         libraries[library.id] = new plugin.class(library)
                         libraryConfigs[library.id] = library;
diff --git a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
index 2d46bb334..1a29f32b4 100644
--- a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
@@ -93,7 +93,8 @@
         "unknownLibrary": "Unknown library: __library__",
         "unknownType": "Unknown library type: __type__",
         "readOnly": "Library __library__ is read-only",
-        "failedToInit": "Failed to initialise __library__: __error__"
+        "failedToInit": "Failed to initialise library __library__: __error__",
+        "invalidProperty": "Invalid property __prop__: '__value__'"
     },
     "nodes": {
         "credentials": {

From b41c7962c29e131d9a35c3f2d28d5a2b55ad7aaa Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 19 Feb 2021 15:24:56 +0000
Subject: [PATCH 6/6] Add tests for pluggable library

---
 .../@node-red/runtime/lib/library/index.js    | 75 ++++++++++---------
 .../runtime/lib/api/settings_spec.js          | 38 ++++++++++
 .../runtime/lib/library/index_spec.js         | 68 +++++++++++++++--
 3 files changed, 140 insertions(+), 41 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/library/index.js b/packages/node_modules/@node-red/runtime/lib/library/index.js
index 83bac06a2..c08b7b44c 100644
--- a/packages/node_modules/@node-red/runtime/lib/library/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/library/index.js
@@ -28,43 +28,15 @@ let runtimeLibraries = [];
 // Libraries defined by the user in the editor.
 let userLibraries = [];
 
-function init(runtime) {
+let runtime;
 
-    events.on("registry:plugin-added", function(id) {
-        const plugin = runtime.plugins.getPlugin(id);
-        if (plugin.type === "node-red-library-source") {
-            libraryPlugins[plugin.id] = plugin;
-
-            runtimeLibraries.forEach(library => {
-                if (library.type === id) {
-                    library.local = false;
-
-                    if (!/^[a-z0-9-_]+$/.test(library.id)) {
-                        log.warn(log._("library.failedToInit",{error:log._("library.invalidProperty",{prop:"id",value:library.id})}));
-                        return;
-                    }
-                    try {
-                        libraries[library.id] = new plugin.class(library)
-                        libraryConfigs[library.id] = library;
-                        libraryConfigs[library.id].type = id;
-                        if (libraries[library.id].init) {
-                            libraries[library.id].init().catch(err => {
-                                delete libraries[library.id];
-                                delete libraryConfigs[library.id];
-                                log.warn(log._("library.failedToInit",{library:library.id, error:err.toString()}));
-                            });
-                        }
-                    } catch(err) {
-                        log.warn(log._("library.failedToInit",{library:library.id, error:err.toString()}));
-                    }
-                }
-            })
-
-
-        }
-    })
+function init(_runtime) {
+    runtime = _runtime;
+    events.removeListener("registry:plugin-added",onPluginAdded);
+    events.on("registry:plugin-added",onPluginAdded);
 
     knownTypes.flows = 'node-red';
+
     libraries["local"] = require("./local");
     libraries["local"].init(runtime);
     libraryConfigs["local"] = libraries["local"]
@@ -83,6 +55,41 @@ function init(runtime) {
 
 }
 
+function onPluginAdded(id) {
+    const plugin = runtime.plugins.getPlugin(id);
+    if (plugin.type === "node-red-library-source") {
+        libraryPlugins[plugin.id] = plugin;
+
+        runtimeLibraries.forEach(library => {
+            if (library.type === id) {
+                library.local = false;
+
+                if (!/^[a-z0-9-_]+$/.test(library.id)) {
+                    log.warn(log._("library.failedToInit",{error:log._("library.invalidProperty",{prop:"id",value:library.id})}));
+                    return;
+                }
+                try {
+                    libraries[library.id] = new plugin.class(library)
+                    libraryConfigs[library.id] = library;
+                    libraryConfigs[library.id].type = id;
+                    if (libraries[library.id].init) {
+                        libraries[library.id].init().catch(err => {
+                            delete libraries[library.id];
+                            delete libraryConfigs[library.id];
+                            log.warn(log._("library.failedToInit",{library:library.id, error:err.toString()}));
+                        });
+                    }
+                } catch(err) {
+                    log.warn(log._("library.failedToInit",{library:library.id, error:err.toString()}));
+                }
+            }
+        })
+
+
+    }
+}
+
+
 function registerType(id,type) {
     // TODO: would like to enforce this, but currently the tests register the same type multiple
     //       times and have no way to remove themselves.
diff --git a/test/unit/@node-red/runtime/lib/api/settings_spec.js b/test/unit/@node-red/runtime/lib/api/settings_spec.js
index b5b4878e2..9b3b94229 100644
--- a/test/unit/@node-red/runtime/lib/api/settings_spec.js
+++ b/test/unit/@node-red/runtime/lib/api/settings_spec.js
@@ -44,6 +44,11 @@ describe("runtime-api/settings", function() {
                     paletteCategories :["red","blue","green"],
                     exportNodeSettings: (obj) => {
                         obj.testNodeSetting = "helloWorld";
+                    },
+                },
+                plugins: {
+                    exportPluginSettings: (obj) => {
+                        obj.testPluginSettings = "helloPluginWorld";
                     }
                 },
                 nodes: {
@@ -51,13 +56,16 @@ describe("runtime-api/settings", function() {
                     installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
+                library: {getLibraries: () => ["lib1"] },
                 storage: {}
             })
             return settings.getRuntimeSettings({}).then(result => {
                 result.should.have.property("httpNodeRoot","testHttpNodeRoot");
                 result.should.have.property("version","testVersion");
                 result.should.have.property("paletteCategories",["red","blue","green"]);
+                result.should.have.property("libraries",["lib1"]);
                 result.should.have.property("testNodeSetting","helloWorld");
+                result.should.have.property("testPluginSettings","helloPluginWorld");
                 result.should.not.have.property("foo",123);
                 result.should.have.property("flowEncryptionType","test-key-type");
                 result.should.not.have.property("user");
@@ -75,6 +83,11 @@ describe("runtime-api/settings", function() {
                     paletteCategories :["red","blue","green"],
                     exportNodeSettings: (obj) => {
                         obj.testNodeSetting = "helloWorld";
+                    },
+                },
+                plugins: {
+                    exportPluginSettings: (obj) => {
+                        obj.testPluginSettings = "helloPluginWorld";
                     }
                 },
                 nodes: {
@@ -82,6 +95,7 @@ describe("runtime-api/settings", function() {
                     installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
+                library: {getLibraries: () => { ["lib1"]} },
                 storage: {}
             })
             return settings.getRuntimeSettings({
@@ -111,6 +125,11 @@ describe("runtime-api/settings", function() {
                     paletteCategories :["red","blue","green"],
                     exportNodeSettings: (obj) => {
                         obj.testNodeSetting = "helloWorld";
+                    },
+                },
+                plugins: {
+                    exportPluginSettings: (obj) => {
+                        obj.testPluginSettings = "helloPluginWorld";
                     }
                 },
                 nodes: {
@@ -118,6 +137,7 @@ describe("runtime-api/settings", function() {
                     installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
+                library: {getLibraries: () => { ["lib1"]} },
                 storage: {
                     projects: {
                         getActiveProject: () => 'test-active-project',
@@ -162,6 +182,11 @@ describe("runtime-api/settings", function() {
                     paletteCategories :["red","blue","green"],
                     exportNodeSettings: (obj) => {
                         obj.testNodeSetting = "helloWorld";
+                    },
+                },
+                plugins: {
+                    exportPluginSettings: (obj) => {
+                        obj.testPluginSettings = "helloPluginWorld";
                     }
                 },
                 nodes: {
@@ -169,6 +194,7 @@ describe("runtime-api/settings", function() {
                     installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
+                library: {getLibraries: () => { ["lib1"]} },
                 storage: {
                     projects: {
                         getActiveProject: () => 'test-active-project',
@@ -203,6 +229,11 @@ describe("runtime-api/settings", function() {
                     paletteCategories :["red","blue","green"],
                     exportNodeSettings: (obj) => {
                         obj.testNodeSetting = "helloWorld";
+                    },
+                },
+                plugins: {
+                    exportPluginSettings: (obj) => {
+                        obj.testPluginSettings = "helloPluginWorld";
                     }
                 },
                 nodes: {
@@ -210,6 +241,7 @@ describe("runtime-api/settings", function() {
                     installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
+                library: {getLibraries: () => { ["lib1"]} },
                 storage: {
                     projects: {
                         flowFileExists: () => true,
@@ -248,6 +280,11 @@ describe("runtime-api/settings", function() {
                     paletteCategories :["red","blue","green"],
                     exportNodeSettings: (obj) => {
                         obj.testNodeSetting = "helloWorld";
+                    },
+                },
+                plugins: {
+                    exportPluginSettings: (obj) => {
+                        obj.testPluginSettings = "helloPluginWorld";
                     }
                 },
                 nodes: {
@@ -255,6 +292,7 @@ describe("runtime-api/settings", function() {
                     installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
+                library: {getLibraries: () => { ["lib1"]} },
                 storage: {
                     projects: {
                         flowFileExists: () => false,
diff --git a/test/unit/@node-red/runtime/lib/library/index_spec.js b/test/unit/@node-red/runtime/lib/library/index_spec.js
index ac2608a18..378e61f5c 100644
--- a/test/unit/@node-red/runtime/lib/library/index_spec.js
+++ b/test/unit/@node-red/runtime/lib/library/index_spec.js
@@ -14,13 +14,14 @@
  * limitations under the License.
  **/
 
-var should = require("should");
-var sinon = require("sinon");
+const should = require("should");
+const sinon = require("sinon");
 
-var NR_TEST_UTILS = require("nr-test-utils");
-var library = NR_TEST_UTILS.require("@node-red/runtime/lib/library/index")
-var localLibrary = NR_TEST_UTILS.require("@node-red/runtime/lib/library/local")
-var examplesLibrary = NR_TEST_UTILS.require("@node-red/runtime/lib/library/examples")
+const NR_TEST_UTILS = require("nr-test-utils");
+const library = NR_TEST_UTILS.require("@node-red/runtime/lib/library/index")
+const localLibrary = NR_TEST_UTILS.require("@node-red/runtime/lib/library/local")
+const examplesLibrary = NR_TEST_UTILS.require("@node-red/runtime/lib/library/examples")
+const events = NR_TEST_UTILS.require("@node-red/util/lib/events")
 
 var mockLog = {
     log: sinon.stub(),
@@ -72,6 +73,59 @@ describe("runtime/library", function() {
         //     should(()=>{library.register("unknown","/abc")} ).throw();
         // })
     })
+
+    describe("getLibraries", function() {
+        before(function() {
+            library.init({});
+        });
+        it('returns the default and examples libraries', function() {
+            const libs = library.getLibraries();
+            libs.should.have.length(2);
+            libs[0].should.have.property('id', 'local');
+            libs[0].should.have.property('label','editor:library.types.local');
+            libs[0].should.have.property("user", false);
+            libs[0].should.have.property('icon', 'font-awesome/fa-hdd-o');
+
+            libs[1].should.have.property('id', 'examples');
+            libs[1].should.have.property('label','editor:library.types.examples');
+            libs[1].should.have.property("user", false);
+            libs[1].should.have.property('icon', 'font-awesome/fa-life-ring');
+            libs[1].should.have.property('readOnly', true);
+            libs[1].should.have.property('types', ['flows']);
+        });
+
+        it('returns the libraries from settings', function() {
+            library.init({
+                plugins: {
+                    getPlugin: id => { return {
+                            id: "test-library-plugin",
+                            type: "node-red-library-source",
+                            class: function() {}
+                        }
+                    }
+                },
+                settings: {
+                    editorTheme: {
+                        library: {
+                            sources: [
+                                {id: "test-plugin-id", type:"test-library-plugin"}
+                            ]
+                        }
+                    }
+                }
+            });
+            let libs = library.getLibraries();
+            libs.should.have.length(2);
+
+            events.emit("registry:plugin-added","test-library-plugin" )
+
+            libs = library.getLibraries();
+            libs.should.have.length(3);
+            libs[2].should.have.property('id', 'test-plugin-id');
+            libs[2].should.have.property("user", false);
+        });
+    })
+
     describe("getEntry", function() {
         before(function() {
             library.init({});
@@ -102,7 +156,7 @@ describe("runtime/library", function() {
         });
 
         it ('returns a flow example entry', function(done) {
-            library.getEntry("_examples_","flows","/test-module/abc").then(function(result) {
+            library.getEntry("examples","flows","/test-module/abc").then(function(result) {
                 result.should.have.property("library","_examples_")
                 result.should.have.property("path","/test-module/abc")
                 done();