{ -private: - std::string m_path; - public: /** - * Analyze a file and extract tokens. If the function succeeds, that does not mean the content is valid, - * it just means that there are no syntax error. - * - * For example, this class does not allow adding options under no sections and this function will not - * detect that issue. - * - * \param file the file to read - * \return the list of tokens - * \throws Error on errors - */ - static Tokens analyze(const File &file); - - /** - * Overloaded function for buffers. - * - * \param buffer the buffer to read - * \return the list of tokens - * \throws Error on errors - */ - static Tokens analyze(const Buffer &buffer); - - /** - * Show all tokens and their description. - * - * \param tokens the tokens - */ - static void dump(const Tokens &tokens); - - /** - * Construct a document from a file. - * - * \param file the file to read - * \throws Error on errors - */ - Document(const File &file); - - /** - * Overloaded constructor for buffers. - * - * \param buffer the buffer to read - * \throws Error on errors - */ - Document(const Buffer &buffer); - - /** - * Get the current document path, only useful when constructed from File source. - * - * \return the path - */ - inline const std::string &path() const noexcept - { - return m_path; - } - - /** * Check if a document has a specific section. * * \param key the key + * \return true if the document contains the section */ inline bool contains(const std::string &key) const noexcept { @@ -476,30 +488,6 @@ } /** - * Access a section at the specified key. - * - * \param key the key - * \return the section - * \throw std::out_of_range if the key does not exist - */ - inline Section &operator[](const std::string &key) - { - return *find(key); - } - - /** - * Access a section at the specified key. - * - * \param key the key - * \return the section - * \throw std::out_of_range if the key does not exist - */ - inline const Section &operator[](const std::string &key) const - { - return *find(key); - } - - /** * Find a section by key and return an iterator. * * \param key the key @@ -526,11 +514,99 @@ } /** + * Access a section at the specified key. + * + * \param key the key + * \return the section + * \pre contains(key) must return true + */ + inline Section &operator[](const std::string &key) + { + assert(contains(key)); + + return *find(key); + } + + /** + * Overloaded function. + * + * \param key the key + * \return the section + * \pre contains(key) must return true + */ + inline const Section &operator[](const std::string &key) const + { + assert(contains(key)); + + return *find(key); + } + + /** * Inherited operators. */ using std::vector

::operator[]; }; +/** + * Analyse a stream and detect potential syntax errors. This does not parse the file like including other + * files in include statement. + * + * It does only analysis, for example if an option is defined under no section, this does not trigger an + * error while it's invalid. + * + * \param it the iterator + * \param end where to stop + * \return the list of tokens + * \throws Error on errors + */ +Tokens analyse(std::istreambuf_iterator it, std::istreambuf_iterator end); + +/** + * Overloaded function for stream. + * + * \param stream the stream + * \return the list of tokens + * \throws Error on errors + */ +Tokens analyse(std::istream &stream); + +/** + * Parse the produced tokens. + * + * \param tokens the tokens + * \param path the parent path + * \return the document + * \throw Error on errors + */ +Document parse(const Tokens &tokens, const std::string &path = "."); + +/** + * Parse a file. + * + * \param filename the file name + * \return the document + * \throw Error on errors + */ +Document readFile(const std::string &filename); + +/** + * Parse a string. + * + * If the string contains include statements, they are relative to the current working directory. + * + * \param buffer the buffer + * \return the document + * \throw Error on errors + */ +Document readString(const std::string &buffer); + +/** + * Show all tokens and their description. + * + * \param tokens the tokens + */ +void dump(const Tokens &tokens); + } // !ini } // !irccd diff -r 2aecbd638b1c -r c7fee63ccf92 lib/irccd/irccd.cpp --- a/lib/irccd/irccd.cpp Wed May 04 13:38:02 2016 +0200 +++ b/lib/irccd/irccd.cpp Tue May 10 21:27:40 2016 +0200 @@ -625,7 +625,7 @@ auto tc = ptr.lock(); if (tc) { - m_lookupTransportClients.erase(tc->handle()); + m_transportClients.erase(std::find(m_transportClients.begin(), m_transportClients.end(), tc)); } }); } @@ -643,21 +643,21 @@ void Irccd::processTransportClients(fd_set &input, fd_set &output) { - for (auto &pair : m_lookupTransportClients) { - pair.second->sync(input, output); + for (auto &client : m_transportClients) { + client->sync(input, output); } } void Irccd::processTransportServers(fd_set &input) { - for (auto &pair : m_lookupTransportServers) { - if (!FD_ISSET(pair.second->handle(), &input)) { + for (auto &transport : m_transportServers) { + if (!FD_ISSET(transport->handle(), &input)) { continue; } log::debug("transport: new client connected"); - std::shared_ptr client = pair.second->accept(); + std::shared_ptr client = transport->accept(); std::weak_ptr ptr(client); /* Send some information */ @@ -682,14 +682,14 @@ client->onDie.connect(std::bind(&Irccd::handleTransportDie, this, ptr)); /* Register it */ - m_lookupTransportClients.emplace(client->handle(), move(client)); + m_transportClients.push_back(std::move(client)); } } void Irccd::processServers(fd_set &input, fd_set &output) { - for (auto &pair : m_servers) { - pair.second->sync(input, output); + for (auto &server : m_servers) { + server->sync(input, output); } } @@ -736,7 +736,9 @@ void Irccd::addServer(shared_ptr server) noexcept { +#if 0 assert(m_servers.count(server->info().name) == 0); +#endif std::weak_ptr ptr(server); @@ -762,50 +764,54 @@ if (server) { log::info(fmt::format("server {}: removed", server->info().name)); - m_servers.erase(server->info().name); + m_servers.erase(std::find(m_servers.begin(), m_servers.end(), server)); } }); }); - m_servers.emplace(server->info().name, move(server)); + m_servers.push_back(std::move(server)); } std::shared_ptr Irccd::getServer(const std::string &name) const noexcept { - auto it = m_servers.find(name); + auto it = std::find_if(m_servers.begin(), m_servers.end(), [&] (const auto &server) { + return server->info().name == name; + }); if (it == m_servers.end()) { return nullptr; } - return it->second; + return *it; } std::shared_ptr Irccd::requireServer(const std::string &name) const { - auto it = m_servers.find(name); + auto server = getServer(name); - if (it == m_servers.end()) { - throw std::invalid_argument("server " + name + " not found"); + if (!server) { + throw std::invalid_argument("server {} not found"_format(name)); } - return it->second; + return server; } void Irccd::removeServer(const std::string &name) { - auto it = m_servers.find(name); + auto it = std::find_if(m_servers.begin(), m_servers.end(), [&] (const auto &server) { + return server->info().name == name; + }); if (it != m_servers.end()) { - it->second->disconnect(); + (*it)->disconnect(); m_servers.erase(it); } } void Irccd::clearServers() noexcept { - for (auto &pair : m_servers) { - pair.second->disconnect(); + for (auto &server : m_servers) { + server->disconnect(); } m_servers.clear(); @@ -813,14 +819,14 @@ void Irccd::addTransport(std::shared_ptr ts) { - m_lookupTransportServers.emplace(ts->handle(), ts); + m_transportServers.push_back(std::move(ts)); } void Irccd::broadcast(std::string data) { - /* Asynchronous send */ - for (auto &pair : m_lookupTransportClients) { - pair.second->send(data); + // Asynchronous send. + for (auto &client : m_transportClients) { + client->send(data); } } @@ -828,24 +834,26 @@ std::shared_ptr Irccd::getPlugin(const std::string &name) const noexcept { - auto it = m_plugins.find(name); + auto it = std::find_if(m_plugins.begin(), m_plugins.end(), [&] (const auto &plugin) { + return plugin->name() == name; + }); if (it == m_plugins.end()) { return nullptr; } - return it->second; + return *it; } std::shared_ptr Irccd::requirePlugin(const std::string &name) const { - auto it = m_plugins.find(name); + auto plugin = getPlugin(name); - if (it == m_plugins.end()) { - throw std::out_of_range(std::string("plugin ") + name + " not found"); + if (!plugin) { + throw std::invalid_argument("plugin {} not found"_format(name)); } - return it->second; + return plugin; } void Irccd::addPlugin(std::shared_ptr plugin) @@ -861,15 +869,20 @@ /* Initial load now */ try { plugin->onLoad(); - m_plugins.insert({plugin->name(), plugin}); + m_plugins.push_back(std::move(plugin)); } catch (const std::exception &ex) { - log::warning(fmt::format("plugin {}: {}", plugin->name(), ex.what())); + log::warning("plugin {}: {}"_format(plugin->name(), ex.what())); } } void Irccd::loadPlugin(std::string name, const std::string &source, bool find) { - if (m_plugins.count(name) > 0) { + // TODO: change with Plugin::find + auto it = std::find_if(m_plugins.begin(), m_plugins.end(), [&] (const auto &plugin) { + return plugin->name() == name; + }); + + if (it != m_plugins.end()) { throw std::invalid_argument("plugin already loaded"); } @@ -891,7 +904,7 @@ log::info() << " from " << path << std::endl; try { - plugin = std::make_shared(name, path, m_pluginConf[name]); + plugin = std::make_shared(name, path /*, m_pluginConf[name] */); break; } catch (const std::exception &ex) { log::info(fmt::format(" error: {}", ex.what())); @@ -916,11 +929,13 @@ void Irccd::unloadPlugin(const std::string &name) { - auto plugin = getPlugin(name); + auto it = std::find_if(m_plugins.begin(), m_plugins.end(), [&] (const auto &plugin) { + return plugin->name() == name; + }); - if (plugin) { - plugin->onUnload(); - m_plugins.erase(name); + if (it != m_plugins.end()) { + (*it)->onUnload(); + m_plugins.erase(it); } } @@ -999,22 +1014,23 @@ FD_SET(m_socketServer.handle(), &setinput); /* 2. Add servers */ - for (auto &pair : m_servers) { - pair.second->update(); - pair.second->prepare(setinput, setoutput, max); + for (auto &server : m_servers) { + server->update(); + server->prepare(setinput, setoutput, max); } /* 3. Add transports clients */ - for (auto &pair : m_lookupTransportClients) { - set(setinput, pair.first); + for (auto &client : m_transportClients) { + set(setinput, client->handle()); - if (pair.second->hasOutput()) - set(setoutput, pair.first); + if (client->hasOutput()) { + set(setoutput, client->handle()); + } } /* 4. Add transport servers */ - for (auto &pair : m_lookupTransportServers) { - set(setinput, pair.first); + for (auto &transport : m_transportServers) { + set(setinput, transport->handle()); } /* 5. Do the selection */ @@ -1045,7 +1061,7 @@ * Make a copy because the events can add other events while we are iterating it. Also lock because the timers * may alter these events too. */ - std::vector copy; + std::vector> copy; { std::lock_guard lock(m_mutex); diff -r 2aecbd638b1c -r c7fee63ccf92 lib/irccd/irccd.hpp --- a/lib/irccd/irccd.hpp Wed May 04 13:38:02 2016 +0200 +++ b/lib/irccd/irccd.hpp Tue May 10 21:27:40 2016 +0200 @@ -24,6 +24,7 @@ * \brief Base class for irccd front end. */ +#include #include #include #include @@ -52,50 +53,6 @@ class TransportCommand; /** - * Event to execute after the poll. - */ -using Event = std::function; - -/** - * List of events. - */ -using Events = std::vector; - -/** - * Map of identities. - */ -using Identities = std::unordered_map; - -/** - * List of rules. - */ -using Rules = std::vector; - -/** - * Map of servers. - */ -using Servers = std::unordered_map>; - -/** - * Map of transport command handlers. - */ -using TransportCommands = std::unordered_map>; - -#if defined(WITH_JS) - -/** - * Map of plugins. - */ -using Plugins = std::unordered_map>; - -/** - * Map of plugin configurations. - */ -using PluginConfigs = std::unordered_map; - -#endif - -/** * \class Irccd * \brief Irccd main instance * @@ -111,40 +68,29 @@ */ class Irccd : public Application { private: - template - using LookupTable = std::unordered_map>; - - /* Main loop */ + // Main loop stuff. std::atomic m_running{true}; + std::mutex m_mutex; + std::vector> m_events; - /* Mutex for post() */ - std::mutex m_mutex; - - /* IPC */ + // IPC. net::SocketTcp m_socketServer; net::SocketTcp m_socketClient; - /* Event loop */ - Events m_events; + // Servers. + std::vector> m_servers; - /* Servers */ - Servers m_servers; - - /* Optional JavaScript plugins */ + // Optional plugins. #if defined(WITH_JS) - Plugins m_plugins; - PluginConfigs m_pluginConf; + std::vector> m_plugins; #endif - /* Identities */ - Identities m_identities; + // Rules. + std::vector m_rules; - /* Rules */ - Rules m_rules; - - /* Lookup tables */ - LookupTable m_lookupTransportClients; - LookupTable m_lookupTransportServers; + // Transports. + std::vector> m_transportClients; + std::vector> m_transportServers; /* * Server slots @@ -207,17 +153,6 @@ Irccd(); /** - * Load a configuration into irccd. Added as convenience to allow expressions like `irccd.load(Config{"foo"})`. - * - * \param config the configuration loader - */ - template - inline void load(T &&config) - { - config.load(*this); - } - - /** * Add an event to the queue. This will immediately signals the event loop to interrupt itself to dispatch * the pending events. * @@ -227,37 +162,6 @@ void post(std::function ev) noexcept; /* - * Identity management - * ---------------------------------------------------------- - * - * Functions to get or add new identities. - */ - - /** - * Add an identity. - * - * \param identity the identity - * \note If the identity already exists, it is overriden - */ - inline void addIdentity(ServerIdentity identity) noexcept - { - m_identities.emplace(identity.name, std::move(identity)); - } - - /** - * Get an identity, if not found, the default one is used. - * - * \param name the identity name - * \return the identity or default one - */ - inline ServerIdentity findIdentity(const std::string &name) const noexcept - { - auto it = m_identities.find(name); - - return it == m_identities.end() ? ServerIdentity() : it->second; - } - - /* * Server management * ---------------------------------------------------------- * @@ -274,7 +178,9 @@ */ inline bool hasServer(const std::string &name) const noexcept { - return m_servers.count(name) > 0; + return std::count_if(m_servers.cbegin(), m_servers.end(), [&] (const auto &sv) { + return sv->info().name == name; + }) > 0; } /** @@ -303,11 +209,11 @@ std::shared_ptr requireServer(const std::string &name) const; /** - * Get the map of loaded servers. + * Get the list of servers * * \return the servers */ - inline const Servers &servers() const noexcept + inline const std::vector> &servers() const noexcept { return m_servers; } @@ -365,7 +271,9 @@ */ inline bool hasPlugin(const std::string &name) const noexcept { - return m_plugins.count(name) > 0; + return std::count_if(m_plugins.cbegin(), m_plugins.cend(), [&] (const auto &plugin) { + return plugin->name() == name; + }) > 0; } /** @@ -386,17 +294,6 @@ std::shared_ptr requirePlugin(const std::string &name) const; /** - * Add plugin configuration for the specified plugin. - * - * \param name - * \param config - */ - inline void addPluginConfig(std::string name, PluginConfig config) - { - m_pluginConf.emplace(std::move(name), std::move(config)); - } - - /** * Add a loaded plugin. * * Plugins signals will be connected to the irccd main loop. The onLoad function will also be called and the @@ -437,7 +334,7 @@ * * \return the map of plugins */ - inline const Plugins &plugins() const noexcept + inline const std::vector> &plugins() const noexcept { return m_plugins; } diff -r 2aecbd638b1c -r c7fee63ccf92 lib/irccd/irccdctl.cpp --- a/lib/irccd/irccdctl.cpp Wed May 04 13:38:02 2016 +0200 +++ b/lib/irccd/irccdctl.cpp Tue May 10 21:27:40 2016 +0200 @@ -250,7 +250,7 @@ void Irccdctl::read(const std::string &path, const parser::Result &options) { - ini::Document doc(ini::File{path}); + ini::Document doc = ini::readFile(path); ini::Document::const_iterator it = doc.find("connect"); /* Do not try to read [connect] if specified at command line */ diff -r 2aecbd638b1c -r c7fee63ccf92 lib/irccd/js-plugin.cpp --- a/lib/irccd/js-plugin.cpp Wed May 04 13:38:02 2016 +0200 +++ b/lib/irccd/js-plugin.cpp Tue May 10 21:27:40 2016 +0200 @@ -103,8 +103,8 @@ duk::push(ctx, duk::Array{}); int i = 0; - for (const auto &pair : duk::getGlobal>(ctx, "\xff""\xff""irccd")->plugins()) { - duk::putProperty(ctx, -1, i++, pair.first); + for (const auto &plugin : duk::getGlobal>(ctx, "\xff""\xff""irccd")->plugins()) { + duk::putProperty(ctx, -1, i++, plugin->name()); } return 1; diff -r 2aecbd638b1c -r c7fee63ccf92 lib/irccd/js-server.cpp --- a/lib/irccd/js-server.cpp Wed May 04 13:38:02 2016 +0200 +++ b/lib/irccd/js-server.cpp Tue May 10 21:27:40 2016 +0200 @@ -468,8 +468,8 @@ { duk::push(ctx, duk::Object{}); - for (const auto &pair : duk::getGlobal>(ctx, "\xff""\xff""irccd")->servers()) { - duk::putProperty(ctx, -1, pair.first, duk::Shared{pair.second}); + for (const auto &server : duk::getGlobal>(ctx, "\xff""\xff""irccd")->servers()) { + duk::putProperty(ctx, -1, server->info().name, duk::Shared{server}); } return 1; diff -r 2aecbd638b1c -r c7fee63ccf92 lib/irccd/plugin.cpp --- a/lib/irccd/plugin.cpp Wed May 04 13:38:02 2016 +0200 +++ b/lib/irccd/plugin.cpp Tue May 10 21:27:40 2016 +0200 @@ -18,6 +18,8 @@ #include +#include + #include "sysconfig.hpp" #if defined(HAVE_STAT) @@ -46,9 +48,11 @@ using namespace std; +using namespace fmt::literals; + namespace irccd { -void Plugin::call(const string &name, unsigned nargs) +void Plugin::call(const std::string &name, unsigned nargs) { duk::getGlobal(m_context, name); @@ -148,6 +152,29 @@ duk::pop(m_context, 2); } +std::shared_ptr Plugin::find(const std::string &name, const PluginConfig &config) +{ + log::info("plugin {}: searching {}.js"_format(name, name)); + + for (const auto &path : path::list(path::PathPlugins)) { + std::string fullpath = path + name + ".js"; + + if (!fs::isReadable(fullpath)) { + continue; + } + + log::info("plugin {}: trying {}"_format(name, fullpath)); + + try { + return std::make_shared(name, fullpath, config); + } catch (const std::exception &ex) { + throw std::runtime_error("{}: {}"_format(fullpath, ex.what())); + } + } + + throw std::runtime_error("no suitable plugin found"); +} + Plugin::Plugin(std::string name, std::string path, const PluginConfig &config) : m_name(std::move(name)) , m_path(std::move(path)) diff -r 2aecbd638b1c -r c7fee63ccf92 lib/irccd/plugin.hpp --- a/lib/irccd/plugin.hpp Wed May 04 13:38:02 2016 +0200 +++ b/lib/irccd/plugin.hpp Tue May 10 21:27:40 2016 +0200 @@ -107,6 +107,14 @@ public: /** + * Find plugin in standard paths. + * + * \param name the plugin name + * \param config the optional configuration + */ + static std::shared_ptr find(const std::string &name, const PluginConfig &config = PluginConfig()); + + /** * Constructor. * * \param name the plugin id diff -r 2aecbd638b1c -r c7fee63ccf92 lib/irccd/server-event.cpp --- a/lib/irccd/server-event.cpp Wed May 04 13:38:02 2016 +0200 +++ b/lib/irccd/server-event.cpp Tue May 10 21:27:40 2016 +0200 @@ -37,9 +37,9 @@ void ServerEvent::operator()(Irccd &irccd) const { - for (auto &pair : irccd.plugins()) { - auto name = m_plugin_function_name(*pair.second); - auto allowed = Rule::solve(irccd.rules(), m_server, m_target, m_origin, pair.first, name); + for (auto &plugin : irccd.plugins()) { + auto eventname = m_plugin_function_name(*plugin); + auto allowed = Rule::solve(irccd.rules(), m_server, m_target, m_origin, plugin->name(), eventname); if (!allowed) { log::debug() << "rule: event skipped on match" << std::endl; @@ -49,9 +49,9 @@ } try { - m_plugin_exec(*pair.second); + m_plugin_exec(*plugin); } catch (const duk::ErrorInfo &info) { - log::warning() << "plugin " << pair.second->name() << ": error: " << info.what() << std::endl; + log::warning() << "plugin " << plugin->name() << ": error: " << info.what() << std::endl; if (!info.fileName.empty()) { log::warning() << " " << info.fileName << ":" << info.lineNumber << std::endl;