MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-15 14:31:11 +01:00
Code Issues Releases Wiki Activity

ircd::js: Fixes for js bitrot / maintenance cleanup.

Browse source
This commit is contained in:
Jason Volk 2018-07-03 15:40:36 -07:00
parent cc4bc23a22
commit ae5678269c
4 changed files with 59 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/ircd/js/error.h
View file

@ -28,14 +28,14 @@ struct jserror
void create(JSErrorReport &); void create(JSErrorReport &);
void create(const JSErrorReport &); void create(const JSErrorReport &);
void generate(const JSExnType &type, const char *const &fmt, va_list ap); void generate(const JSExnType &type, const char *const &fmt, const va_rtti &ap);
void set_pending() const; void set_pending() const;
void set_uncatchable() const; void set_uncatchable() const;
jserror(pending_t); jserror(pending_t);
jserror(generate_skip_t); jserror(generate_skip_t);
jserror(const JSErrorReport &); jserror(const JSErrorReport &);
jserror(const char *fmt = " ", ...) AFP(2, 3); template<class... args> jserror(const char *const &fmt = " ", args&&...);
jserror(JSObject &); jserror(JSObject &);
jserror(JSObject *const &); jserror(JSObject *const &);
jserror(const JS::Value &); jserror(const JS::Value &);
@ -65,3 +65,12 @@ IRCD_JS_ERROR_DEF( uri_error, JSEXN_URIERR )
} // namespace js } // namespace js
} // namespace ircd } // namespace ircd
template<class... args>
ircd::js::jserror::jserror(const char *const &fmt,
args&&... a)
:ircd::js::error{generate_skip}
,val{}
{
generate(JSEXN_ERR, fmt, va_rtti{std::forward<args>(a)...});
}

2
include/ircd/js/string.h
View file

@ -531,7 +531,7 @@ inline auto
hash(const string &s) hash(const string &s)
{ {
//TODO: optimize //TODO: optimize
return ircd::util::hash(std::u16string(s)); return ircd::hash(std::u16string(s));
} }
template<class A, template<class A,

100
ircd/js.cc
View file

@ -21,15 +21,16 @@
// Use JS_DEBUG as an analog instead. // Use JS_DEBUG as an analog instead.
#undef DEBUG #undef DEBUG
namespace ircd {
namespace js {
// Logging facility for this submodule with SNOMASK. // Logging facility for this submodule with SNOMASK.
struct log::log log decltype(ircd::js::log)
ircd::js::log
{ {
"js", 'J' "js", 'J'
}; };
namespace ircd {
namespace js {
// Location of the thread_local runtext (js/context.h) // Location of the thread_local runtext (js/context.h)
// If this is null, js is not available on your thread. // If this is null, js is not available on your thread.
__thread context *cx; __thread context *cx;
@ -333,7 +334,7 @@ ircd::js::global::import(module &importer,
fname = substr(fname, 0, fname.size() - 1); fname = substr(fname, 0, fname.size() - 1);
fname += ".so"; fname += ".so";
ircd::module *const m(new ircd::module(fname)); ircd::module *const m(new ircd::module(std::string(fname)));
const auto exporter(m->get<module *>("IRCD_JS_MODULE")); const auto exporter(m->get<module *>("IRCD_JS_MODULE"));
const auto iit(imports.emplace(requesting, exporter)); const auto iit(imports.emplace(requesting, exporter));
const string name(exporter->trap->name); const string name(exporter->trap->name);
@ -752,14 +753,12 @@ ircd::js::trap::prototype(const object::handle &globals)
{ 0 } { 0 }
}; };
/* // std::transform(begin(this->memfunc), end(this->memfunc), begin(memfunc), []
std::transform(begin(this->memfunc), end(this->memfunc), begin(memfunc), [] // (const auto &it)
(const auto &it) // {
{ // const auto &function(*it.second);
const auto &function(*it.second); // return function.spec;
return function.spec; // });
});
*/
// Create object // Create object
const object proto const object proto
@ -1303,27 +1302,23 @@ bool
ircd::js::trap::on_has(object::handle, ircd::js::trap::on_has(object::handle,
id::handle id) id::handle id)
{ {
/* // const string sid(id);
const string sid(id); // if(children.count(sid))
if(children.count(sid)) // return false;
return false; //
// if(std::any_of(begin(memfun), end(memfun), [&sid]
if(std::any_of(begin(memfun), end(memfun), [&sid] // (const auto &it)
(const auto &it) // {
{ // const auto &memfun(*it.second);
const auto &memfun(*it.second); // return sid == memfun.name;
return sid == memfun.name; // }))
})) // return false;
return false; //
*/ // value val;
// const auto flags(JSPROP_SHARED | JSPROP_ENUMERATE);
/* // if(!JS_DefinePropertyById(*cx, obj, id, val, flags, handle_getter, handle_setter))
value val; // throw jserror("Failed to define property '%s'", sid.c_str());
const auto flags(JSPROP_SHARED | JSPROP_ENUMERATE); //
if(!JS_DefinePropertyById(*cx, obj, id, val, flags, handle_getter, handle_setter))
throw jserror("Failed to define property '%s'", sid.c_str());
*/
// const auto flags(0); // const auto flags(0);
// if(!JS_DefineObject(*cx, obj, sid.c_str(), &jsclass(), flags)) // if(!JS_DefineObject(*cx, obj, sid.c_str(), &jsclass(), flags))
// throw jserror("Failed to define property '%s'", sid.c_str()); // throw jserror("Failed to define property '%s'", sid.c_str());
@ -1464,13 +1459,11 @@ noexcept
{ {
// This frame is entered on a thread owned by SpiderMonkey, not IRCd. Do not call // This frame is entered on a thread owned by SpiderMonkey, not IRCd. Do not call
// ircd::log from here, it is not thread-safe. // ircd::log from here, it is not thread-safe.
/* // printf("[thread %s]: context(%p): compile(%p) READY (priv: %p)\n",
printf("[thread %s]: context(%p): compile(%p) READY (priv: %p)\n", // ircd::string(std::this_thread::get_id()).c_str(),
ircd::string(std::this_thread::get_id()).c_str(), // (const void *)cx,
(const void *)cx, // token,
token, // priv);
priv);
*/
// Setting the value of the promise and then deleting the promise is thread-safe. // Setting the value of the promise and then deleting the promise is thread-safe.
// Note that JS::FinishOffThreadScript(); will need to be called on the main thread. // Note that JS::FinishOffThreadScript(); will need to be called on the main thread.
@ -1813,7 +1806,7 @@ ircd::js::del(const object::handle &src,
object obj(src); object obj(src);
const char *fail(nullptr); const char *fail(nullptr);
char buffer[strlen(path) + 1]; char buffer[strlen(path) + 1];
ircd::tokens(path, ".", buffer, sizeof(buffer), [&path, &val, &obj, &fail] ircd::tokens(path, ".", mutable_buffer{buffer, sizeof(buffer)}, [&path, &val, &obj, &fail]
(const string_view &part) (const string_view &part)
{ {
if(fail) if(fail)
@ -1889,7 +1882,7 @@ ircd::js::set(const object::handle &src,
object obj(src); object obj(src);
char buffer[strlen(path) + 1]; char buffer[strlen(path) + 1];
const char *fail(nullptr), *key(nullptr); const char *fail(nullptr), *key(nullptr);
ircd::tokens(path, ".", buffer, sizeof(buffer), [&path, &obj, &fail, &key] ircd::tokens(path, ".", mutable_buffer{buffer, sizeof(buffer)}, [&path, &obj, &fail, &key]
(const string_view &part) (const string_view &part)
{ {
if(fail) if(fail)
@ -1981,8 +1974,8 @@ ircd::js::get(const object::handle &src,
value ret; value ret;
object obj(src); object obj(src);
const char *fail(nullptr); const char *fail(nullptr);
char buf[strlen(path) + 1]; char buffer[strlen(path) + 1];
ircd::tokens(path, ".", buf, sizeof(buf), [&obj, &path, &ret, &fail] ircd::tokens(path, ".", mutable_buffer{buffer, sizeof(buffer)}, [&obj, &path, &ret, &fail]
(const string_view &part) (const string_view &part)
{ {
if(fail) if(fail)
@ -2046,8 +2039,8 @@ ircd::js::has(const object::handle &src,
bool ret(true); bool ret(true);
object obj(src); object obj(src);
const char *fail(nullptr); const char *fail(nullptr);
char buf[strlen(path) + 1]; char buffer[strlen(path) + 1];
ircd::tokens(path, ".", buf, sizeof(buf), [&obj, &path, &ret, &fail] ircd::tokens(path, ".", mutable_buffer{buffer, sizeof(buffer)}, [&obj, &path, &ret, &fail]
(const string_view &part) (const string_view &part)
{ {
if(fail) if(fail)
@ -2391,17 +2384,6 @@ ircd::js::jserror::jserror(generate_skip_t)
{ {
} }
ircd::js::jserror::jserror(const char *const fmt,
...)
:ircd::js::error{generate_skip}
,val{}
{
va_list ap;
va_start(ap, fmt);
generate(JSEXN_ERR, fmt, ap);
va_end(ap);
}
ircd::js::jserror::jserror(const JSErrorReport &report) ircd::js::jserror::jserror(const JSErrorReport &report)
:ircd::js::error{generate_skip} :ircd::js::error{generate_skip}
,val{} ,val{}
@ -2455,7 +2437,7 @@ const
void void
ircd::js::jserror::generate(const JSExnType &type, ircd::js::jserror::generate(const JSExnType &type,
const char *const &fmt, const char *const &fmt,
va_list ap) const va_rtti &ap)
{ {
ircd::exception::generate(fmt, ap); ircd::exception::generate(fmt, ap);
const auto msg(locale::char16::conv(what())); const auto msg(locale::char16::conv(what()));

10
modules/js/listener.cc
View file

@ -8,7 +8,7 @@
// copyright notice and this permission notice is present in all copies. The // copyright notice and this permission notice is present in all copies. The
// full license for this software is available in the LICENSE file. // full license for this software is available in the LICENSE file.
#include <ircd/listen.h> #include <ircd/net/listener.h>
#include <ircd/js/js.h> #include <ircd/js/js.h>
namespace ircd { namespace ircd {
@ -29,11 +29,13 @@ static listener;
struct listener::listen struct listener::listen
:trap::function :trap::function
{ {
ircd::listener *l; net::listener *l;
value on_call(object::handle obj, value::handle _this, const args &args) override value on_call(object::handle obj, value::handle _this, const args &args) override
{ {
l = new ircd::listener(std::string(args[0])); const std::string a(args[0]);
const ircd::json::object o(a);
l = new net::listener(o.get("name", "js"), o);
return {}; return {};
} }
@ -81,7 +83,7 @@ ircd::js::listener::listener()
{ {
} }
extern "C" ircd::js::module * ircd::js::module *
IRCD_JS_MODULE IRCD_JS_MODULE
{ {
&ircd::js::listener.module &ircd::js::listener.module