FS-10167: Preliminary version of blade.subscribe is implemented

libs/libblade/libblade.vcxproj

@@ -192,6 +192,7 @@
     <ClCompile Include="src\blade_identity.c" />
     <ClCompile Include="src\blade_rpc.c" />
     <ClCompile Include="src\blade_protocol.c" />
+    <ClCompile Include="src\blade_subscription.c" />
     <ClCompile Include="src\blade_transport_wss.c" />
     <ClCompile Include="src\blade_session.c" />
     <ClCompile Include="src\blade_stack.c" />
@@ -204,6 +205,7 @@
     <ClInclude Include="src\include\blade_identity.h" />
     <ClInclude Include="src\include\blade_rpc.h" />
     <ClInclude Include="src\include\blade_protocol.h" />
+    <ClInclude Include="src\include\blade_subscription.h" />
     <ClInclude Include="src\include\blade_transport_wss.h" />
     <ClInclude Include="src\include\blade_session.h" />
     <ClInclude Include="src\include\blade_stack.h" />

libs/libblade/libblade.vcxproj.filters

@@ -45,6 +45,9 @@
     <ClCompile Include="src\blade_rpc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\blade_subscription.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\include\unqlite.h">
@@ -80,5 +83,8 @@
     <ClInclude Include="src\include\blade_rpc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\include\blade_subscription.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

libs/libblade/src/blade_session.c

@@ -280,6 +280,7 @@ KS_DECLARE(ks_status_t) blade_session_route_remove(blade_session_t *bs, const ch
 	return KS_STATUS_SUCCESS;
 }
 
+
 KS_DECLARE(cJSON *) blade_session_properties_get(blade_session_t *bs)
 {
 	ks_assert(bs);

libs/libblade/src/blade_subscription.c

+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+struct blade_subscription_s {
+	ks_pool_t *pool;
+
+	const char *event;
+	const char *protocol;
+	const char *realm;
+	ks_hash_t *subscribers;
+};
+
+
+static void blade_subscription_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+	blade_subscription_t *bsub = (blade_subscription_t *)ptr;
+
+	ks_assert(bsub);
+
+	switch (action) {
+	case KS_MPCL_ANNOUNCE:
+		break;
+	case KS_MPCL_TEARDOWN:
+		if (bsub->event) ks_pool_free(bsub->pool, &bsub->event);
+		if (bsub->protocol) ks_pool_free(bsub->pool, &bsub->protocol);
+		if (bsub->realm) ks_pool_free(bsub->pool, &bsub->subscribers);
+		if (bsub->subscribers) ks_hash_destroy(&bsub->subscribers);
+		break;
+	case KS_MPCL_DESTROY:
+		break;
+	}
+}
+
+KS_DECLARE(ks_status_t) blade_subscription_create(blade_subscription_t **bsubP, ks_pool_t *pool, const char *event, const char *protocol, const char *realm)
+{
+	blade_subscription_t *bsub = NULL;
+
+	ks_assert(bsubP);
+	ks_assert(pool);
+	ks_assert(event);
+	ks_assert(protocol);
+	ks_assert(realm);
+
+	bsub = ks_pool_alloc(pool, sizeof(blade_subscription_t));
+	bsub->pool = pool;
+	bsub->event = ks_pstrdup(pool, event);
+	bsub->protocol = ks_pstrdup(pool, protocol);
+	bsub->realm = ks_pstrdup(pool, realm);
+
+	ks_hash_create(&bsub->subscribers, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_NOLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bsub->pool);
+	ks_assert(bsub->subscribers);
+
+	ks_pool_set_cleanup(pool, bsub, NULL, blade_subscription_cleanup);
+
+	*bsubP = bsub;
+
+	return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_subscription_destroy(blade_subscription_t **bsubP)
+{
+	blade_subscription_t *bsub = NULL;
+	
+	ks_assert(bsubP);
+	ks_assert(*bsubP);
+
+	bsub = *bsubP;
+
+	ks_pool_free(bsub->pool, bsubP);
+
+	return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(const char *) blade_subscription_event_get(blade_subscription_t *bsub)
+{
+	ks_assert(bsub);
+
+	return bsub->event;
+
+}
+
+KS_DECLARE(const char *) blade_subscription_protocol_get(blade_subscription_t *bsub)
+{
+	ks_assert(bsub);
+
+	return bsub->protocol;
+
+}
+
+KS_DECLARE(const char *) blade_subscription_realm_get(blade_subscription_t *bsub)
+{
+	ks_assert(bsub);
+
+	return bsub->realm;
+
+}
+
+KS_DECLARE(ks_hash_t *) blade_subscription_subscribers_get(blade_subscription_t *bsub)
+{
+	ks_assert(bsub);
+
+	return bsub->subscribers;
+
+}
+
+KS_DECLARE(ks_status_t) blade_subscription_subscribers_add(blade_subscription_t *bsub, const char *nodeid)
+{
+	char *key = NULL;
+
+	ks_assert(bsub);
+	ks_assert(nodeid);
+
+	key = ks_pstrdup(bsub->pool, nodeid);
+	ks_hash_insert(bsub->subscribers, (void *)key, (void *)KS_TRUE);
+
+	return KS_STATUS_SUCCESS;
+
+}
+
+KS_DECLARE(ks_status_t) blade_subscription_subscribers_remove(blade_subscription_t *bsub, const char *nodeid)
+{
+	ks_assert(bsub);
+	ks_assert(nodeid);
+
+	ks_hash_remove(bsub->subscribers, (void *)nodeid);
+
+	return KS_STATUS_SUCCESS;
+
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */

libs/libblade/src/include/blade.h

@@ -45,6 +45,7 @@
 #include "blade_connection.h"
 #include "blade_session.h"
 #include "blade_protocol.h"
+#include "blade_subscription.h"
 
 #include "blade_transport_wss.h"
 

libs/libblade/src/include/blade_stack.h

@@ -78,6 +78,9 @@ KS_DECLARE(ks_status_t) blade_handle_protocolrpc_register(blade_rpc_t *brpc);
 KS_DECLARE(ks_status_t) blade_handle_protocolrpc_unregister(blade_rpc_t *brpc);
 KS_DECLARE(blade_rpc_t *) blade_handle_protocolrpc_lookup(blade_handle_t *bh, const char *method, const char *protocol, const char *realm);
 
+KS_DECLARE(ks_status_t) blade_handle_subscriber_add(blade_handle_t *bh, const char *event, const char *protocol, const char *realm, const char *nodeid);
+KS_DECLARE(ks_status_t) blade_handle_subscriber_remove(blade_handle_t *bh, const char *event, const char *protocol, const char *realm, const char *nodeid);
+
 
 KS_DECLARE(ks_status_t) blade_handle_connect(blade_handle_t *bh, blade_connection_t **bcP, blade_identity_t *target, const char *session_id);
 
@@ -106,6 +109,9 @@ KS_DECLARE(cJSON *) blade_protocol_execute_request_params_get(blade_rpc_request_
 KS_DECLARE(cJSON *) blade_protocol_execute_response_result_get(blade_rpc_response_t *brpcres);
 KS_DECLARE(void) blade_protocol_execute_response_send(blade_rpc_request_t *brpcreq, cJSON *result);
 
+KS_DECLARE(ks_status_t) blade_protocol_subscribe(blade_handle_t *bh, const char *event, const char *protocol, const char *realm, ks_bool_t remove, blade_rpc_response_callback_t callback, void *data);
+KS_DECLARE(ks_status_t) blade_protocol_subscribe_raw(blade_handle_t *bh, const char *event, const char *protocol, const char *realm, ks_bool_t remove, blade_rpc_response_callback_t callback, void *data);
+
 KS_END_EXTERN_C
 
 #endif

libs/libblade/src/include/blade_subscription.h

+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_SUBSCRIPTION_H_
+#define _BLADE_SUBSCRIPTION_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_subscription_create(blade_subscription_t **bsubP, ks_pool_t *pool, const char *event, const char *protocol, const char *realm);
+KS_DECLARE(ks_status_t) blade_subscription_destroy(blade_subscription_t **bsubP);
+KS_DECLARE(const char *) blade_subscription_event_get(blade_subscription_t *bsub);
+KS_DECLARE(const char *) blade_subscription_protocol_get(blade_subscription_t *bsub);
+KS_DECLARE(const char *) blade_subscription_realm_get(blade_subscription_t *bsub);
+KS_DECLARE(ks_hash_t *) blade_subscription_subscribers_get(blade_subscription_t *bsub);
+KS_DECLARE(ks_status_t) blade_subscription_subscribers_add(blade_subscription_t *bsub, const char *nodeid);
+KS_DECLARE(ks_status_t) blade_subscription_subscribers_remove(blade_subscription_t *bsub, const char *nodeid);
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */

libs/libblade/src/include/blade_types.h

@@ -49,8 +49,9 @@ typedef struct blade_connection_s blade_connection_t;
 typedef struct blade_session_s blade_session_t;
 typedef struct blade_session_callbacks_s blade_session_callbacks_t;
 typedef struct blade_protocol_s blade_protocol_t;
-typedef struct blade_protocol_realm_s blade_protocol_realm_t;
-typedef struct blade_protocol_method_s blade_protocol_method_t;
+typedef struct blade_subscription_s blade_subscription_t;
+//typedef struct blade_protocol_realm_s blade_protocol_realm_t;
+//typedef struct blade_protocol_method_s blade_protocol_method_t;
 
 
 typedef ks_bool_t (*blade_rpc_request_callback_t)(blade_rpc_request_t *brpcreq, void *data);

libs/libblade/test/bladec.c

@@ -17,10 +17,12 @@ struct command_def_s {
 
 void command_quit(blade_handle_t *bh, char *args);
 void command_execute(blade_handle_t *bh, char *args);
+void command_subscribe(blade_handle_t *bh, char *args);
 
 static const struct command_def_s command_defs[] = {
 	{ "quit", command_quit },
 	{ "execute", command_execute },
+	{ "subscribe", command_subscribe },
 
 	{ NULL, NULL }
 };
@@ -109,6 +111,26 @@ ks_bool_t blade_locate_response_handler(blade_rpc_response_t *brpcres, void *dat
 	return KS_FALSE;
 }
 
+ks_bool_t blade_subscribe_response_handler(blade_rpc_response_t *brpcres, void *data)
+{
+	blade_handle_t *bh = NULL;
+	blade_session_t *bs = NULL;
+
+	ks_assert(brpcres);
+
+	bh = blade_rpc_response_handle_get(brpcres);
+	ks_assert(bh);
+
+	bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+	ks_assert(bs);
+
+	ks_log(KS_LOG_DEBUG, "Session (%s) blade.subscribe response processing\n", blade_session_id_get(bs));
+
+	blade_session_read_unlock(bs);
+
+	return KS_FALSE;
+}
+
 int main(int argc, char **argv)
 {
 	blade_handle_t *bh = NULL;
@@ -246,6 +268,14 @@ void command_execute(blade_handle_t *bh, char *args)
 	blade_protocol_locate(bh, "test", "mydomain.com", blade_locate_response_handler, NULL);
 }
 
+void command_subscribe(blade_handle_t *bh, char *args)
+{
+	ks_assert(bh);
+	ks_assert(args);
+
+	blade_protocol_subscribe(bh, "test.event", "test", "mydomain.com", KS_FALSE, blade_subscribe_response_handler, NULL);
+}
+
 /* For Emacs:
 * Local Variables:
 * mode:c