no more notification token
This commit is contained in:
parent
6db449ef06
commit
ab1965c27e
|
@ -26,7 +26,6 @@ namespace realm {
|
||||||
|
|
||||||
JSClassRef RJSRealmClass();
|
JSClassRef RJSRealmClass();
|
||||||
JSClassRef RJSRealmConstructorClass();
|
JSClassRef RJSRealmConstructorClass();
|
||||||
JSClassRef RJSNotificationClass();
|
|
||||||
|
|
||||||
std::string RJSDefaultPath();
|
std::string RJSDefaultPath();
|
||||||
void RJSSetDefaultPath(std::string path);
|
void RJSSetDefaultPath(std::string path);
|
||||||
|
|
118
src/RJSRealm.mm
118
src/RJSRealm.mm
|
@ -32,43 +32,25 @@ using namespace realm;
|
||||||
|
|
||||||
class RJSRealmDelegate : public RealmDelegate {
|
class RJSRealmDelegate : public RealmDelegate {
|
||||||
public:
|
public:
|
||||||
typedef std::shared_ptr<std::function<void(const std::string)>> NotificationFunction;
|
|
||||||
void add_notification(NotificationFunction ¬ification) { m_notifications.insert(notification); }
|
|
||||||
void remove_notification(NotificationFunction notification) { m_notifications.erase(notification); }
|
|
||||||
void remove_all_notifications() { m_notifications.clear(); }
|
|
||||||
std::set<NotificationFunction> m_notifications;
|
|
||||||
|
|
||||||
virtual void changes_available() {
|
virtual void changes_available() {
|
||||||
for (NotificationFunction notification : m_notifications) {
|
notify("RefreshRequiredNotification");
|
||||||
(*notification)("RefreshRequiredNotification");
|
|
||||||
}
|
}
|
||||||
|
virtual void did_change(std::vector<ObserverState> const& observers, std::vector<void*> const& invalidated) {
|
||||||
|
notify("DidChangeNotification");
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void did_change(std::vector<ObserverState> const& observers,
|
|
||||||
std::vector<void*> const& invalidated) {
|
|
||||||
for (NotificationFunction notification : m_notifications) {
|
|
||||||
(*notification)("DidChangeNotification");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual std::vector<ObserverState> get_observed_rows() {
|
virtual std::vector<ObserverState> get_observed_rows() {
|
||||||
return std::vector<ObserverState>();
|
return std::vector<ObserverState>();
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void will_change(std::vector<ObserverState> const& observers,
|
virtual void will_change(std::vector<ObserverState> const& observers,
|
||||||
std::vector<void*> const& invalidated) {
|
std::vector<void*> const& invalidated) {}
|
||||||
|
|
||||||
}
|
RJSRealmDelegate(WeakRealm realm, JSGlobalContextRef ctx) : m_context(ctx), m_realm(realm) {
|
||||||
|
|
||||||
JSGlobalContextRef m_context;
|
|
||||||
std::map<std::string, ObjectDefaults> m_defaults;
|
|
||||||
std::map<std::string, JSValueRef> m_prototypes;
|
|
||||||
|
|
||||||
RJSRealmDelegate(JSGlobalContextRef ctx) : m_context(ctx) {
|
|
||||||
JSGlobalContextRetain(m_context);
|
JSGlobalContextRetain(m_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
~RJSRealmDelegate() {
|
~RJSRealmDelegate() {
|
||||||
|
remove_all_notifications();
|
||||||
|
|
||||||
for (auto prototype : m_prototypes) {
|
for (auto prototype : m_prototypes) {
|
||||||
JSValueUnprotect(m_context, prototype.second);
|
JSValueUnprotect(m_context, prototype.second);
|
||||||
}
|
}
|
||||||
|
@ -79,6 +61,48 @@ public:
|
||||||
}
|
}
|
||||||
JSGlobalContextRelease(m_context);
|
JSGlobalContextRelease(m_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void add_notification(JSObjectRef notification) {
|
||||||
|
JSValueProtect(m_context, notification);
|
||||||
|
m_notifications.insert(notification);
|
||||||
|
}
|
||||||
|
void remove_notification(JSObjectRef notification) {
|
||||||
|
JSValueUnprotect(m_context, notification);
|
||||||
|
m_notifications.erase(notification);
|
||||||
|
}
|
||||||
|
void remove_all_notifications() {
|
||||||
|
for (auto notification : m_notifications) {
|
||||||
|
JSValueUnprotect(m_context, notification);
|
||||||
|
}
|
||||||
|
m_notifications.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::map<std::string, ObjectDefaults> m_defaults;
|
||||||
|
std::map<std::string, JSValueRef> m_prototypes;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::set<JSObjectRef> m_notifications;
|
||||||
|
JSGlobalContextRef m_context;
|
||||||
|
WeakRealm m_realm;
|
||||||
|
|
||||||
|
void notify(const char *notification_name) {
|
||||||
|
for (auto callback : m_notifications) {
|
||||||
|
JSValueRef arguments[2];
|
||||||
|
SharedRealm realm = m_realm.lock();
|
||||||
|
if (!realm) {
|
||||||
|
throw std::runtime_error("Realm no longer exists");
|
||||||
|
}
|
||||||
|
JSObjectRef realm_object = RJSWrapObject<SharedRealm *>(m_context, RJSRealmClass(), new SharedRealm(realm));
|
||||||
|
arguments[0] = realm_object;
|
||||||
|
arguments[1] = RJSValueForString(m_context, notification_name);
|
||||||
|
|
||||||
|
JSValueRef ex = NULL;
|
||||||
|
JSObjectCallAsFunction(m_context, callback, realm_object, 2, arguments, &ex);
|
||||||
|
if (ex) {
|
||||||
|
throw RJSException(m_context, ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
std::map<std::string, ObjectDefaults> &RJSDefaults(Realm *realm) {
|
std::map<std::string, ObjectDefaults> &RJSDefaults(Realm *realm) {
|
||||||
|
@ -189,7 +213,7 @@ JSObjectRef RealmConstructor(JSContextRef ctx, JSObjectRef constructor, size_t a
|
||||||
}
|
}
|
||||||
SharedRealm realm = Realm::get_shared_realm(config);
|
SharedRealm realm = Realm::get_shared_realm(config);
|
||||||
if (!realm->m_delegate) {
|
if (!realm->m_delegate) {
|
||||||
realm->m_delegate = std::make_unique<RJSRealmDelegate>(JSContextGetGlobalContext(ctx));
|
realm->m_delegate = std::make_unique<RJSRealmDelegate>(realm, JSContextGetGlobalContext(ctx));
|
||||||
}
|
}
|
||||||
RJSDefaults(realm.get()) = defaults;
|
RJSDefaults(realm.get()) = defaults;
|
||||||
RJSPrototypes(realm.get()) = prototypes;
|
RJSPrototypes(realm.get()) = prototypes;
|
||||||
|
@ -399,48 +423,14 @@ JSValueRef RealmWrite(JSContextRef ctx, JSObjectRef function, JSObjectRef thisOb
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace realm {
|
|
||||||
struct Notification {
|
|
||||||
JSGlobalContextRef ctx;
|
|
||||||
JSObjectRef realmObject;
|
|
||||||
JSObjectRef callbackObject;
|
|
||||||
RJSRealmDelegate::NotificationFunction func;
|
|
||||||
|
|
||||||
Notification(JSGlobalContextRef c, JSObjectRef r, JSObjectRef cb, RJSRealmDelegate::NotificationFunction f) : ctx(c), realmObject(r), callbackObject(cb), func(f) {
|
|
||||||
JSGlobalContextRetain(ctx);
|
|
||||||
JSValueProtect(ctx, realmObject);
|
|
||||||
JSValueProtect(ctx, callbackObject);
|
|
||||||
}
|
|
||||||
|
|
||||||
~Notification() {
|
|
||||||
JSValueUnprotect(ctx, callbackObject);
|
|
||||||
JSValueUnprotect(ctx, realmObject);
|
|
||||||
JSGlobalContextRelease(ctx);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
JSValueRef RealmAddNotification(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* jsException) {
|
JSValueRef RealmAddNotification(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* jsException) {
|
||||||
try {
|
try {
|
||||||
RJSValidateArgumentCount(argumentCount, 1);
|
RJSValidateArgumentCount(argumentCount, 1);
|
||||||
|
|
||||||
JSObjectRef callback = RJSValidatedValueToFunction(ctx, arguments[0]);
|
JSObjectRef callback = RJSValidatedValueToFunction(ctx, arguments[0]);
|
||||||
SharedRealm realm = *RJSGetInternal<SharedRealm *>(thisObject);
|
SharedRealm realm = *RJSGetInternal<SharedRealm *>(thisObject);
|
||||||
JSGlobalContextRef gCtx = JSContextGetGlobalContext(ctx);
|
static_cast<RJSRealmDelegate *>(realm->m_delegate.get())->add_notification(callback);
|
||||||
|
return NULL;
|
||||||
RJSRealmDelegate::NotificationFunction func = std::make_shared<std::function<void(const std::string)>>([=](std::string notification_name) {
|
|
||||||
JSValueRef arguments[2];
|
|
||||||
arguments[0] = thisObject;
|
|
||||||
arguments[1] = RJSValueForString(gCtx, notification_name);
|
|
||||||
JSValueRef ex = NULL;
|
|
||||||
JSObjectCallAsFunction(gCtx, callback, thisObject, 2, arguments, &ex);
|
|
||||||
if (ex) {
|
|
||||||
throw RJSException(gCtx, ex);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
static_cast<RJSRealmDelegate *>(realm->m_delegate.get())->add_notification(func);
|
|
||||||
return RJSWrapObject<Notification *>(ctx, RJSNotificationClass(), new Notification { gCtx, thisObject, callback, func });
|
|
||||||
}
|
}
|
||||||
catch (std::exception &exp) {
|
catch (std::exception &exp) {
|
||||||
if (jsException) {
|
if (jsException) {
|
||||||
|
@ -482,8 +472,4 @@ JSClassRef RJSRealmClass() {
|
||||||
return s_realmClass;
|
return s_realmClass;
|
||||||
}
|
}
|
||||||
|
|
||||||
JSClassRef RJSNotificationClass() {
|
|
||||||
static JSClassRef s_notificationClass = RJSCreateWrapperClass<Notification *>("Notification", NULL, NULL, NULL);
|
|
||||||
return s_notificationClass;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -254,12 +254,6 @@ json RPCServer::serialize_json_value(JSValueRef value) {
|
||||||
{"schema", serialize_object_schema(results->object_schema)}
|
{"schema", serialize_object_schema(results->object_schema)}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
else if (JSValueIsObjectOfClass(m_context, value, RJSNotificationClass())) {
|
|
||||||
return {
|
|
||||||
{"type", RealmObjectTypesNotification},
|
|
||||||
{"id", store_object(js_object)},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
else if (RJSIsValueArray(m_context, value)) {
|
else if (RJSIsValueArray(m_context, value)) {
|
||||||
size_t length = RJSValidatedListLength(m_context, js_object);
|
size_t length = RJSValidatedListLength(m_context, js_object);
|
||||||
std::vector<json> array;
|
std::vector<json> array;
|
||||||
|
|
Loading…
Reference in New Issue