diff --git a/.gitignore b/.gitignore index 8bbf0a28b..b78d533e5 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ ct.coverdata emqttd.iml _rel/ data/ +_build +.rebar3 +rebar3.crashdump diff --git a/.travis.yml b/.travis.yml index a4cef5371..15834e620 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,9 @@ language: erlang otp_release: - - 18.0 - - 18.1 - - 18.2.1 - - 18.3 + - 19.0 + - 19.1 + - 19.2 script: - make diff --git a/Makefile b/Makefile index ff2a5602f..5b46ef5ce 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,26 @@ PROJECT = emqttd PROJECT_DESCRIPTION = Erlang MQTT Broker -PROJECT_VERSION = 2.0.7 +PROJECT_VERSION = 2.1.0 -DEPS = gproc lager gen_logger esockd mochiweb +NO_AUTOPATCH = cuttlefish -dep_gproc = git https://github.com/uwiger/gproc -dep_getopt = git https://github.com/jcomellas/getopt v0.8.2 -dep_lager = git https://github.com/basho/lager master -dep_gen_logger = git https://github.com/emqtt/gen_logger -dep_esockd = git https://github.com/emqtt/esockd proxy-protocol -dep_mochiweb = git https://github.com/emqtt/mochiweb +DEPS = gproc lager esockd mochiweb lager_syslog pbkdf2 + +dep_gproc = git https://github.com/uwiger/gproc +dep_getopt = git https://github.com/jcomellas/getopt v0.8.2 +dep_lager = git https://github.com/basho/lager master +dep_esockd = git https://github.com/emqtt/esockd emq22 +dep_mochiweb = git https://github.com/emqtt/mochiweb emq22 +dep_lager_syslog = git https://github.com/basho/lager_syslog +dep_pbkdf2 = git https://github.com/comtihon/erlang-pbkdf2.git 2.0.0 ERLC_OPTS += +'{parse_transform, lager_transform}' -TEST_DEPS = cuttlefish emqttc +BUILD_DEPS = cuttlefish dep_cuttlefish = git https://github.com/emqtt/cuttlefish -dep_emqttc = git https://github.com/emqtt/emqttc -NO_AUTOPATCH = cuttlefish +TEST_DEPS = emqttc +dep_emqttc = git https://github.com/emqtt/emqttc TEST_ERLC_OPTS += +debug_info TEST_ERLC_OPTS += +'{parse_transform, lager_transform}' @@ -25,9 +28,9 @@ TEST_ERLC_OPTS += +'{parse_transform, lager_transform}' EUNIT_OPTS = verbose # EUNIT_ERL_OPTS = -CT_SUITES = emqttd emqttd_access emqttd_lib emqttd_mod emqttd_net \ - emqttd_mqueue emqttd_protocol emqttd_topic emqttd_trie \ - emqttd_vm +CT_SUITES = emqttd emqttd_access emqttd_lib emqttd_inflight emqttd_mod \ + emqttd_net emqttd_mqueue emqttd_protocol emqttd_topic \ + emqttd_trie emqttd_vm CT_OPTS = -cover test/ct.cover.spec -erl_args -name emqttd_ct@127.0.0.1 @@ -38,5 +41,5 @@ include erlang.mk app:: rebar.config app.config:: - cuttlefish -l info -e etc/ -c etc/emq.conf -i priv/emq.schema -d data/ + ./deps/cuttlefish/cuttlefish -l info -e etc/ -c etc/emq.conf -i priv/emq.schema -d data/ diff --git a/README.md b/README.md index 95a0a0d54..c2bbf5ebd 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Documentation on [emqtt.io/docs/v2/](http://emqtt.io/docs/v2/install.html), [doc ## Build From Source -The *EMQ* broker requires Erlang/OTP R18+ to build. +The *EMQ* broker requires Erlang/OTP R19+ to build since 2.1 release. ``` git clone https://github.com/emqtt/emq-relx.git @@ -71,6 +71,8 @@ Plugin | Descrip -----------------------------------------------------------------------|-------------------------------------- [emq_plugin_template](https://github.com/emqtt/emq_plugin_template) | Plugin template and demo [emq_dashboard](https://github.com/emqtt/emq_dashboard) | Web Dashboard +[emq_retainer](https://github.com/emqtt/emq_retainer) | Store MQTT Retained Messages +[emq_modules](https://github.com/emqtt/emq_modules) | Presence, Subscription and Rewrite Modules [emq_auth_username](https://github.com/emqtt/emq_auth_username) | Username/Password Authentication Plugin [emq_auth_clientid](https://github.com/emqtt/emq_auth_clientid) | ClientId Authentication Plugin [emq_auth_mysql](https://github.com/emqtt/emq_auth_mysql) | MySQL Authentication/ACL Plugin @@ -79,10 +81,6 @@ Plugin | Descrip [emq_auth_mongo](https://github.com/emqtt/emq_auth_mongo) | MongoDB Authentication/ACL Plugin [emq_auth_http](https://github.com/emqtt/emq_auth_http) | Authentication/ACL by HTTP API [emq_auth_ldap](https://github.com/emqtt/emq_auth_ldap) | LDAP Authentication Plugin -[emq_mod_presence](https://github.com/emqtt/emq_mod_presence) | Presence Module -[emq_mod_rewrite](https://github.com/emqtt/emq_mod_rewrite) | Rewrite Module -[emq_mod_retainer](https://github.com/emqtt/emq_mod_retainer) | Store MQTT Retained Messages -[emq_mod_subscription](https://github.com/emqtt/emq_mod_subscription) | Subscribe topics when client connected [emq_sn](https://github.com/emqtt/emq_sn) | MQTT-SN Protocol Plugin [emq_coap](https://github.com/emqtt/emq_coap) | CoAP Protocol Plugin [emq_stomp](https://github.com/emqtt/emq_stomp) | Stomp Protocol Plugin diff --git a/etc/emq.conf b/etc/emq.conf index be4c78c25..49ec5ac10 100644 --- a/etc/emq.conf +++ b/etc/emq.conf @@ -1,3 +1,8 @@ + +##=================================================================== +## EMQ Configuration R2.1 +##=================================================================== + ##-------------------------------------------------------------------- ## Node Args ##-------------------------------------------------------------------- @@ -39,35 +44,57 @@ node.max_ets_tables = 256000 node.fullsweep_after = 1000 ## Crash dump -node.crash_dump = log/crash.dump +node.crash_dump = {{ platform_log_dir }}/crash.dump ## Distributed node ticktime node.dist_net_ticktime = 60 ## Distributed node port range -## node.dist_listen_min = 6000 -## node.dist_listen_max = 6999 +## node.dist_listen_min = 6369 +## node.dist_listen_max = 6369 ##-------------------------------------------------------------------- ## Log ##-------------------------------------------------------------------- +## Set the log dir +log.dir = {{ platform_log_dir }} + ## Console log. Enum: off, file, console, both log.console = console +## Syslog. Enum: on, off +log.syslog = on + +## syslog level. Enum: debug, info, notice, warning, error, critical, alert, emergency +log.syslog.level = error + ## Console log level. Enum: debug, info, notice, warning, error, critical, alert, emergency log.console.level = error ## Console log file -## log.console.file = log/console.log +## log.console.file = {{ platform_log_dir }}/console.log ## Error log file -log.error.file = log/error.log +log.error.file = {{ platform_log_dir }}/error.log ## Enable the crash log. Enum: on, off log.crash = on -log.crash.file = log/crash.log +log.crash.file = {{ platform_log_dir }}/crash.log + +##-------------------------------------------------------------------- +## Allow Anonymous and Default ACL +##-------------------------------------------------------------------- + +## Allow Anonymous authentication +mqtt.allow_anonymous = true + +## Default ACL File +mqtt.acl_file = {{ platform_etc_dir }}/acl.conf + +## Cache ACL for PUBLISH +mqtt.cache_acl = true ##-------------------------------------------------------------------- ## MQTT Protocol @@ -79,37 +106,45 @@ mqtt.max_clientid_len = 1024 ## Max Packet Size Allowed, 64K by default. mqtt.max_packet_size = 64KB +##-------------------------------------------------------------------- +## MQTT Connection +##-------------------------------------------------------------------- + +## Force GC: integer. Value 0 disabled the Force GC. +mqtt.conn.force_gc_count = 100 + +##-------------------------------------------------------------------- +## MQTT Client +##-------------------------------------------------------------------- + ## Client Idle Timeout (Second) -mqtt.client_idle_timeout = 30 +mqtt.client.idle_timeout = 30s -## Allow Anonymous authentication -mqtt.allow_anonymous = true - -## Default ACL File -mqtt.acl_file = etc/acl.conf - -## Cache ACL for PUBLISH -mqtt.cache_acl = true +## Enable client Stats: on | off +mqtt.client.enable_stats = off ##-------------------------------------------------------------------- ## MQTT Session ##-------------------------------------------------------------------- -## Max number of QoS 1 and 2 messages that can be “inflight” at one time. -## 0 means no limit -mqtt.session.max_inflight = 100 +## Upgrade QoS? +mqtt.session.upgrade_qos = off -## Retry interval for redelivering QoS1/2 messages. -mqtt.session.retry_interval = 60 +## Max Size of the Inflight Window for QoS1 and QoS2 messages +## 0 means no limit +mqtt.session.max_inflight = 32 + +## Retry Interval for redelivering QoS1/2 messages. +mqtt.session.retry_interval = 20s + +## Client -> Broker: Max Packets Awaiting PUBREL, 0 means no limit +mqtt.session.max_awaiting_rel = 100 ## Awaiting PUBREL Timeout -mqtt.session.await_rel_timeout = 20 +mqtt.session.await_rel_timeout = 20s -## Max Packets that Awaiting PUBREL, 0 means no limit -mqtt.session.max_awaiting_rel = 0 - -## Statistics Collection Interval(seconds) -mqtt.session.collect_interval = 0 +## Enable Statistics: on | off +mqtt.session.enable_stats = off ## Expired after 1 day: ## w - week @@ -117,7 +152,7 @@ mqtt.session.collect_interval = 0 ## h - hour ## m - minute ## s - second -mqtt.session.expired_after = 1d +mqtt.session.expiry_interval = 2h ##-------------------------------------------------------------------- ## MQTT Queue @@ -172,10 +207,10 @@ mqtt.bridge.ping_down_interval = 1 ##------------------------------------------------------------------- ## Dir of plugins' config -mqtt.plugins.etc_dir = etc/plugins/ +mqtt.plugins.etc_dir ={{ platform_etc_dir }}/plugins/ ## File to store loaded plugin names. -mqtt.plugins.loaded_file = data/loaded_plugins +mqtt.plugins.loaded_file = {{ platform_data_dir }}/loaded_plugins ##-------------------------------------------------------------------- ## MQTT Listeners @@ -218,12 +253,13 @@ mqtt.listener.ssl.max_clients = 512 mqtt.listener.ssl.proxy_protocol = 1 mqtt.listener.ssl.proxy_protocol_timeout = 10 -## Configuring SSL Options -## See http://erlang.org/doc/man/ssl.html -mqtt.listener.ssl.handshake_timeout = 15 -mqtt.listener.ssl.keyfile = etc/certs/key.pem -mqtt.listener.ssl.certfile = etc/certs/cert.pem -## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem +## Configuring SSL Options. See http://erlang.org/doc/man/ssl.html +### TLS only for POODLE attack +mqtt.listener.ssl.tls_versions = tlsv1.2,tlsv1.1,tlsv1 +mqtt.listener.ssl.handshake_timeout = 15s +mqtt.listener.ssl.keyfile = {{ platform_etc_dir }}/certs/key.pem +mqtt.listener.ssl.certfile = {{ platform_etc_dir }}/certs/cert.pem +## mqtt.listener.ssl.cacertfile = {{ platform_etc_dir }}/certs/cacert.pem ## mqtt.listener.ssl.verify = verify_peer ## mqtt.listener.ssl.fail_if_no_peer_cert = true @@ -241,9 +277,10 @@ mqtt.listener.https = 8084 mqtt.listener.https.acceptors = 4 mqtt.listener.https.max_clients = 64 mqtt.listener.https.handshake_timeout = 15 -mqtt.listener.https.certfile = etc/certs/cert.pem -mqtt.listener.https.keyfile = etc/certs/key.pem -## mqtt.listener.https.cacertfile = etc/certs/cacert.pem +mqtt.listener.https.keyfile = {{ platform_etc_dir }}/certs/key.pem +mqtt.listener.https.certfile = {{ platform_etc_dir }}/certs/cert.pem +## mqtt.listener.https.cacertfile = {{ platform_etc_dir }}/certs/cacert.pem + ## mqtt.listener.https.verify = verify_peer ## mqtt.listener.https.fail_if_no_peer_cert = true diff --git a/include/emqttd.hrl b/include/emqttd.hrl index 53350ed6d..a02c86129 100644 --- a/include/emqttd.hrl +++ b/include/emqttd.hrl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -18,13 +18,13 @@ %% Banner %%-------------------------------------------------------------------- --define(COPYRIGHT, "Copyright (C) 2012-2017, Feng Lee "). +-define(COPYRIGHT, "Copyright (c) 2013-2017 EMQ Enterprise, Inc."). -define(LICENSE_MESSAGE, "Licensed under the Apache License, Version 2.0"). --define(PROTOCOL_VERSION, "MQTT/3.1.1"). +-define(PROTOCOL_VERSION, "MQTT/5.0"). --define(ERTS_MINIMUM, "7.0"). +-define(ERTS_MINIMUM, "8.0"). %%-------------------------------------------------------------------- %% Sys/Queue/Share Topics' Prefix @@ -42,27 +42,28 @@ -type(pubsub() :: publish | subscribe). --define(PUBSUB(PS), (PS =:= publish orelse PS =:= subscribe)). +-define(PS(PS), (PS =:= publish orelse PS =:= subscribe)). %%-------------------------------------------------------------------- %% MQTT Topic %%-------------------------------------------------------------------- --record(mqtt_topic, { - topic :: binary(), - flags = [] :: [retained | static] -}). +-record(mqtt_topic, + { topic :: binary(), + flags = [] :: [retained | static] + }). -type(mqtt_topic() :: #mqtt_topic{}). %%-------------------------------------------------------------------- %% MQTT Subscription %%-------------------------------------------------------------------- --record(mqtt_subscription, { - subid :: binary() | atom(), - topic :: binary(), - qos :: 0 | 1 | 2 -}). + +-record(mqtt_subscription, + { subid :: binary() | atom(), + topic :: binary(), + qos :: 0 | 1 | 2 + }). -type(mqtt_subscription() :: #mqtt_subscription{}). @@ -73,18 +74,18 @@ -type(ws_header_key() :: atom() | binary() | string()). -type(ws_header_val() :: atom() | binary() | string() | integer()). --record(mqtt_client, { - client_id :: binary() | undefined, - client_pid :: pid(), - username :: binary() | undefined, - peername :: {inet:ip_address(), integer()}, - clean_sess :: boolean(), - proto_ver :: 3 | 4, - keepalive = 0, - will_topic :: undefined | binary(), - ws_initial_headers :: list({ws_header_key(), ws_header_val()}), - connected_at :: erlang:timestamp() -}). +-record(mqtt_client, + { client_id :: binary() | undefined, + client_pid :: pid(), + username :: binary() | undefined, + peername :: {inet:ip_address(), inet:port_number()}, + clean_sess :: boolean(), + proto_ver :: 3 | 4, + keepalive = 0, + will_topic :: undefined | binary(), + ws_initial_headers :: list({ws_header_key(), ws_header_val()}), + connected_at :: erlang:timestamp() + }). -type(mqtt_client() :: #mqtt_client{}). @@ -92,95 +93,103 @@ %% MQTT Session %%-------------------------------------------------------------------- --record(mqtt_session, { - client_id :: binary(), - sess_pid :: pid(), - persistent :: boolean() -}). +-record(mqtt_session, + { client_id :: binary(), + sess_pid :: pid(), + clean_sess :: boolean() + }). -type(mqtt_session() :: #mqtt_session{}). %%-------------------------------------------------------------------- %% MQTT Message %%-------------------------------------------------------------------- --type(mqtt_msgid() :: binary() | undefined). + +-type(mqtt_msg_id() :: binary() | undefined). + -type(mqtt_pktid() :: 1..16#ffff | undefined). --record(mqtt_message, { - id :: mqtt_msgid(), %% Global unique message ID - pktid :: mqtt_pktid(), %% PacketId - from :: {binary(), undefined | binary()}, %% ClientId and Username - topic :: binary(), %% Topic that the message is published to - qos = 0 :: 0 | 1 | 2, %% Message QoS - flags = [] :: [retain | dup | sys], %% Message Flags - retain = false :: boolean(), %% Retain flag - dup = false :: boolean(), %% Dup flag - sys = false :: boolean(), %% $SYS flag - headers = [] :: list(), - payload :: binary(), %% Payload - timestamp :: pos_integer() %% os:timestamp to seconds -}). +-type(mqtt_msg_from() :: atom() | {binary(), undefined | binary()}). + +-record(mqtt_message, + { %% Global unique message ID + id :: mqtt_msg_id(), + %% PacketId + pktid :: mqtt_pktid(), + %% ClientId and Username + from :: mqtt_msg_from(), + %% Topic that the message is published to + topic :: binary(), + %% Message QoS + qos = 0 :: 0 | 1 | 2, + %% Message Flags + flags = [] :: [retain | dup | sys], + %% Retain flag + retain = false :: boolean(), + %% Dup flag + dup = false :: boolean(), + %% $SYS flag + sys = false :: boolean(), + %% Headers + headers = [] :: list(), + %% Payload + payload :: binary(), + %% Timestamp + timestamp :: erlang:timestamp() + }). -type(mqtt_message() :: #mqtt_message{}). %%-------------------------------------------------------------------- %% MQTT Delivery %%-------------------------------------------------------------------- --record(mqtt_delivery, { - sender :: pid(), %% Pid of the sender/publisher - message :: mqtt_message(), %% Message - flows :: list() -}). + +-record(mqtt_delivery, + { sender :: pid(), %% Pid of the sender/publisher + message :: mqtt_message(), %% Message + flows :: list() + }). -type(mqtt_delivery() :: #mqtt_delivery{}). %%-------------------------------------------------------------------- %% MQTT Route %%-------------------------------------------------------------------- --record(mqtt_route, { - topic :: binary(), - node :: node() -}). + +-record(mqtt_route, + { topic :: binary(), + node :: node() + }). -type(mqtt_route() :: #mqtt_route{}). %%-------------------------------------------------------------------- %% MQTT Alarm %%-------------------------------------------------------------------- --record(mqtt_alarm, { - id :: binary(), - severity :: warning | error | critical, - title :: iolist() | binary(), - summary :: iolist() | binary(), - timestamp :: erlang:timestamp() %% Timestamp -}). + +-record(mqtt_alarm, + { id :: binary(), + severity :: warning | error | critical, + title :: iolist() | binary(), + summary :: iolist() | binary(), + timestamp :: erlang:timestamp() + }). -type(mqtt_alarm() :: #mqtt_alarm{}). %%-------------------------------------------------------------------- %% MQTT Plugin %%-------------------------------------------------------------------- --record(mqtt_plugin, { - name, - version, - descr, - active = false -}). + +-record(mqtt_plugin, { name, version, descr, active = false }). -type(mqtt_plugin() :: #mqtt_plugin{}). %%-------------------------------------------------------------------- -%% MQTT CLI Command -%% For example: 'broker metrics' +%% MQTT CLI Command. For example: 'broker metrics' %%-------------------------------------------------------------------- --record(mqtt_cli, { - name, - action, - args = [], - opts = [], - usage, - descr -}). + +-record(mqtt_cli, { name, action, args = [], opts = [], usage, descr }). -type(mqtt_cli() :: #mqtt_cli{}). diff --git a/include/emqttd_cli.hrl b/include/emqttd_cli.hrl index 461306747..bda88d801 100644 --- a/include/emqttd_cli.hrl +++ b/include/emqttd_cli.hrl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/include/emqttd_internal.hrl b/include/emqttd_internal.hrl index 06102e26a..ede858916 100644 --- a/include/emqttd_internal.hrl +++ b/include/emqttd_internal.hrl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,19 +16,18 @@ %% Internal Header File --define(GPROC_POOL(JoinOrLeave, Pool, I), +-define(GPROC_POOL(JoinOrLeave, Pool, Id), (begin case JoinOrLeave of join -> gproc_pool:connect_worker(Pool, {Pool, Id}); - leave -> gproc_pool:disconnect_worker(Pool, {Pool, I}) + leave -> gproc_pool:disconnect_worker(Pool, {Pool, Id}) end end)). -define(PROC_NAME(M, I), (list_to_atom(lists:concat([M, "_", I])))). -define(record_to_proplist(Def, Rec), - lists:zip(record_info(fields, Def), - tl(tuple_to_list(Rec)))). + lists:zip(record_info(fields, Def), tl(tuple_to_list(Rec)))). -define(record_to_proplist(Def, Rec, Fields), [{K, V} || {K, V} <- ?record_to_proplist(Def, Rec), @@ -58,3 +57,5 @@ false-> (FalseFun) end)). +-define(FULLSWEEP_OPTS, [{fullsweep_after, 10}]). + diff --git a/include/emqttd_protocol.hrl b/include/emqttd_protocol.hrl index 9ed3a993b..9d9cec714 100644 --- a/include/emqttd_protocol.hrl +++ b/include/emqttd_protocol.hrl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,23 +14,32 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% MQTT Protocol Header +%%-------------------------------------------------------------------- +%% MQTT SockOpts +%%-------------------------------------------------------------------- + +-define(MQTT_SOCKOPTS, [binary, {packet, raw}, {reuseaddr, true}, + {backlog, 512}, {nodelay, true}]). %%-------------------------------------------------------------------- %% MQTT Protocol Version and Levels %%-------------------------------------------------------------------- --define(MQTT_PROTO_V31, 3). --define(MQTT_PROTO_V311, 4). + +-define(MQTT_PROTO_V3, 3). +-define(MQTT_PROTO_V4, 4). +-define(MQTT_PROTO_V5, 5). -define(PROTOCOL_NAMES, [ - {?MQTT_PROTO_V31, <<"MQIsdp">>}, - {?MQTT_PROTO_V311, <<"MQTT">>}]). + {?MQTT_PROTO_V3, <<"MQIsdp">>}, + {?MQTT_PROTO_V4, <<"MQTT">>}, + {?MQTT_PROTO_V5, <<"MQTT">>}]). --type(mqtt_vsn() :: ?MQTT_PROTO_V31 | ?MQTT_PROTO_V311). +-type(mqtt_vsn() :: ?MQTT_PROTO_V3 | ?MQTT_PROTO_V4 | ?MQTT_PROTO_V5). %%-------------------------------------------------------------------- -%% MQTT QoS +%% MQTT QoS Level %%-------------------------------------------------------------------- + -define(QOS_0, 0). %% At most once -define(QOS_1, 1). %% At least once -define(QOS_2, 2). %% Exactly once @@ -63,28 +72,31 @@ end). %%-------------------------------------------------------------------- -%% Max ClientId Length. Why 1024? NiDongDe... +%% Max ClientId Length. Why 1024? %%-------------------------------------------------------------------- + -define(MAX_CLIENTID_LEN, 1024). %%-------------------------------------------------------------------- %% MQTT Control Packet Types %%-------------------------------------------------------------------- --define(RESERVED, 0). %% Reserved --define(CONNECT, 1). %% Client request to connect to Server --define(CONNACK, 2). %% Server to Client: Connect acknowledgment --define(PUBLISH, 3). %% Publish message --define(PUBACK, 4). %% Publish acknowledgment --define(PUBREC, 5). %% Publish received (assured delivery part 1) --define(PUBREL, 6). %% Publish release (assured delivery part 2) --define(PUBCOMP, 7). %% Publish complete (assured delivery part 3) --define(SUBSCRIBE, 8). %% Client subscribe request --define(SUBACK, 9). %% Server Subscribe acknowledgment --define(UNSUBSCRIBE, 10). %% Unsubscribe request --define(UNSUBACK, 11). %% Unsubscribe acknowledgment --define(PINGREQ, 12). %% PING request --define(PINGRESP, 13). %% PING response --define(DISCONNECT, 14). %% Client is disconnecting + +-define(RESERVED, 0). %% Reserved +-define(CONNECT, 1). %% Client request to connect to Server +-define(CONNACK, 2). %% Server to Client: Connect acknowledgment +-define(PUBLISH, 3). %% Publish message +-define(PUBACK, 4). %% Publish acknowledgment +-define(PUBREC, 5). %% Publish received (assured delivery part 1) +-define(PUBREL, 6). %% Publish release (assured delivery part 2) +-define(PUBCOMP, 7). %% Publish complete (assured delivery part 3) +-define(SUBSCRIBE, 8). %% Client subscribe request +-define(SUBACK, 9). %% Server Subscribe acknowledgment +-define(UNSUBSCRIBE, 10). %% Unsubscribe request +-define(UNSUBACK, 11). %% Unsubscribe acknowledgment +-define(PINGREQ, 12). %% PING request +-define(PINGRESP, 13). %% PING response +-define(DISCONNECT, 14). %% Client or Server is disconnecting +-define(AUTH, 15). %% Authentication exchange -define(TYPE_NAMES, [ 'CONNECT', @@ -100,102 +112,122 @@ 'UNSUBACK', 'PINGREQ', 'PINGRESP', - 'DISCONNECT']). + 'DISCONNECT', + 'AUTH']). -type(mqtt_packet_type() :: ?RESERVED..?DISCONNECT). %%-------------------------------------------------------------------- %% MQTT Connect Return Codes %%-------------------------------------------------------------------- --define(CONNACK_ACCEPT, 0). %% Connection accepted --define(CONNACK_PROTO_VER, 1). %% Unacceptable protocol version --define(CONNACK_INVALID_ID, 2). %% Client Identifier is correct UTF-8 but not allowed by the Server --define(CONNACK_SERVER, 3). %% Server unavailable --define(CONNACK_CREDENTIALS, 4). %% Username or password is malformed --define(CONNACK_AUTH, 5). %% Client is not authorized to connect + +-define(CONNACK_ACCEPT, 0). %% Connection accepted +-define(CONNACK_PROTO_VER, 1). %% Unacceptable protocol version +-define(CONNACK_INVALID_ID, 2). %% Client Identifier is correct UTF-8 but not allowed by the Server +-define(CONNACK_SERVER, 3). %% Server unavailable +-define(CONNACK_CREDENTIALS, 4). %% Username or password is malformed +-define(CONNACK_AUTH, 5). %% Client is not authorized to connect -type(mqtt_connack() :: ?CONNACK_ACCEPT..?CONNACK_AUTH). +%%-------------------------------------------------------------------- +%% Max MQTT Packet Length +%%-------------------------------------------------------------------- + +-define(MAX_PACKET_SIZE, 16#fffffff). + %%-------------------------------------------------------------------- %% MQTT Parser and Serializer %%-------------------------------------------------------------------- --define(MAX_LEN, 16#fffffff). + -define(HIGHBIT, 2#10000000). -define(LOWBITS, 2#01111111). %%-------------------------------------------------------------------- %% MQTT Packet Fixed Header %%-------------------------------------------------------------------- --record(mqtt_packet_header, { - type = ?RESERVED :: mqtt_packet_type(), - dup = false :: boolean(), - qos = ?QOS_0 :: mqtt_qos(), - retain = false :: boolean()}). + +-record(mqtt_packet_header, + { type = ?RESERVED :: mqtt_packet_type(), + dup = false :: boolean(), + qos = ?QOS_0 :: mqtt_qos(), + retain = false :: boolean() + }). %%-------------------------------------------------------------------- %% MQTT Packets %%-------------------------------------------------------------------- --type(mqtt_client_id() :: binary()). --type(mqtt_username() :: binary() | undefined). --type(mqtt_packet_id() :: 1..16#ffff | undefined). --record(mqtt_packet_connect, { - client_id = <<>> :: mqtt_client_id(), - proto_ver = ?MQTT_PROTO_V311 :: mqtt_vsn(), - proto_name = <<"MQTT">> :: binary(), - will_retain = false :: boolean(), - will_qos = ?QOS_0 :: mqtt_qos(), - will_flag = false :: boolean(), - clean_sess = false :: boolean(), - keep_alive = 60 :: non_neg_integer(), - will_topic = undefined :: undefined | binary(), - will_msg = undefined :: undefined | binary(), - username = undefined :: undefined | binary(), - password = undefined :: undefined | binary()}). +-type(mqtt_client_id() :: binary()). +-type(mqtt_username() :: binary() | undefined). +-type(mqtt_packet_id() :: 1..16#ffff | undefined). --record(mqtt_packet_connack, { - ack_flags = ?RESERVED :: 0 | 1, - return_code :: mqtt_connack() }). +-record(mqtt_packet_connect, + { client_id = <<>> :: mqtt_client_id(), + proto_ver = ?MQTT_PROTO_V4 :: mqtt_vsn(), + proto_name = <<"MQTT">> :: binary(), + will_retain = false :: boolean(), + will_qos = ?QOS_1 :: mqtt_qos(), + will_flag = false :: boolean(), + clean_sess = false :: boolean(), + keep_alive = 60 :: non_neg_integer(), + will_topic = undefined :: undefined | binary(), + will_msg = undefined :: undefined | binary(), + username = undefined :: undefined | binary(), + password = undefined :: undefined | binary() + }). --record(mqtt_packet_publish, { - topic_name :: binary(), - packet_id :: mqtt_packet_id() }). +-record(mqtt_packet_connack, + { ack_flags = ?RESERVED :: 0 | 1, + return_code :: mqtt_connack() + }). --record(mqtt_packet_puback, { - packet_id :: mqtt_packet_id() }). +-record(mqtt_packet_publish, + { topic_name :: binary(), + packet_id :: mqtt_packet_id() + }). --record(mqtt_packet_subscribe, { - packet_id :: mqtt_packet_id(), - topic_table :: list({binary(), mqtt_qos()}) }). +-record(mqtt_packet_puback, + { packet_id :: mqtt_packet_id() }). --record(mqtt_packet_unsubscribe, { - packet_id :: mqtt_packet_id(), - topics :: list(binary()) }). +-record(mqtt_packet_subscribe, + { packet_id :: mqtt_packet_id(), + topic_table :: list({binary(), mqtt_qos()}) + }). --record(mqtt_packet_suback, { - packet_id :: mqtt_packet_id(), - qos_table :: list(mqtt_qos() | 128) }). +-record(mqtt_packet_unsubscribe, + { packet_id :: mqtt_packet_id(), + topics :: list(binary()) + }). --record(mqtt_packet_unsuback, { - packet_id :: mqtt_packet_id() }). +-record(mqtt_packet_suback, + { packet_id :: mqtt_packet_id(), + qos_table :: list(mqtt_qos() | 128) + }). + +-record(mqtt_packet_unsuback, + { packet_id :: mqtt_packet_id() }). %%-------------------------------------------------------------------- %% MQTT Control Packet %%-------------------------------------------------------------------- --record(mqtt_packet, { - header :: #mqtt_packet_header{}, - variable :: #mqtt_packet_connect{} | #mqtt_packet_connack{} - | #mqtt_packet_publish{} | #mqtt_packet_puback{} - | #mqtt_packet_subscribe{} | #mqtt_packet_suback{} - | #mqtt_packet_unsubscribe{} | #mqtt_packet_unsuback{} - | mqtt_packet_id() | undefined, - payload :: binary() | undefined }). --type mqtt_packet() :: #mqtt_packet{}. +-record(mqtt_packet, + { header :: #mqtt_packet_header{}, + variable :: #mqtt_packet_connect{} | #mqtt_packet_connack{} + | #mqtt_packet_publish{} | #mqtt_packet_puback{} + | #mqtt_packet_subscribe{} | #mqtt_packet_suback{} + | #mqtt_packet_unsubscribe{} | #mqtt_packet_unsuback{} + | mqtt_packet_id() | undefined, + payload :: binary() | undefined + }). + +-type(mqtt_packet() :: #mqtt_packet{}). %%-------------------------------------------------------------------- %% MQTT Packet Match %%-------------------------------------------------------------------- + -define(CONNECT_PACKET(Var), #mqtt_packet{header = #mqtt_packet_header{type = ?CONNECT}, variable = Var}). diff --git a/include/emqttd_trie.hrl b/include/emqttd_trie.hrl index bd4184ad8..c5b9d03c7 100644 --- a/include/emqttd_trie.hrl +++ b/include/emqttd_trie.hrl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2016-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,20 +16,20 @@ -type(trie_node_id() :: binary() | atom()). --record(trie_node, { - node_id :: trie_node_id(), - edge_count = 0 :: non_neg_integer(), - topic :: binary() | undefined, - flags :: [retained | static] -}). +-record(trie_node, + { node_id :: trie_node_id(), + edge_count = 0 :: non_neg_integer(), + topic :: binary() | undefined, + flags :: [retained | static] + }). --record(trie_edge, { - node_id :: trie_node_id(), - word :: binary() | atom() -}). +-record(trie_edge, + { node_id :: trie_node_id(), + word :: binary() | atom() + }). --record(trie, { - edge :: #trie_edge{}, - node_id :: trie_node_id() -}). +-record(trie, + { edge :: #trie_edge{}, + node_id :: trie_node_id() + }). diff --git a/priv/emq.schema b/priv/emq.schema index f562faeab..3ef4fe60d 100644 --- a/priv/emq.schema +++ b/priv/emq.schema @@ -132,14 +132,14 @@ end}. %% @doc http://www.erlang.org/doc/man/kernel_app.html {mapping, "node.dist_listen_min", "kernel.inet_dist_listen_min", [ - {commented, 6000}, + {commented, 6369}, {datatype, integer}, hidden ]}. %% @see node.dist_listen_min {mapping, "node.dist_listen_max", "kernel.inet_dist_listen_max", [ - {commented, 6999}, + {commented, 6369}, {datatype, integer}, hidden ]}. @@ -148,8 +148,13 @@ end}. %% Log %%-------------------------------------------------------------------- +{mapping, "log.dir", "lager.log_dir", [ + {default, "log"}, + {datatype, string} +]}. + {mapping, "log.console", "lager.handlers", [ - {default, file }, + {default, file}, {datatype, {enum, [off, file, console, both]}} ]}. @@ -168,6 +173,26 @@ end}. {datatype, file} ]}. +{mapping, "log.syslog", "lager.handlers", [ + {default, off}, + {datatype, flag} +]}. + +{mapping, "log.syslog.identity", "lager.handlers", [ + {default, "emq"}, + {datatype, string} +]}. + +{mapping, "log.syslog.facility", "lager.handlers", [ + {default, local0}, + {datatype, {enum, [daemon, local0, local1, local2, local3, local4, local5, local6, local7]}} +]}. + +{mapping, "log.syslog.level", "lager.handlers", [ + {default, err}, + {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency]}} +]}. + {mapping, "log.error.redirect", "lager.error_logger_redirect", [ {default, on}, {datatype, flag}, @@ -209,7 +234,16 @@ end}. both -> [ConsoleHandler, ConsoleFileHandler]; _ -> [] end, - ConsoleHandlers ++ ErrorHandler + + SyslogHandler = case cuttlefish:conf_get("log.syslog", Conf) of + false -> []; + true -> [{lager_syslog_backend, + [cuttlefish:conf_get("log.syslog.identity", Conf), + cuttlefish:conf_get("log.syslog.facility", Conf), + cuttlefish:conf_get("log.syslog.level", Conf)]}] + end, + + ConsoleHandlers ++ ErrorHandler ++ SyslogHandler end }. @@ -240,33 +274,9 @@ end}. ]}. %%-------------------------------------------------------------------- -%% MQTT Protocol +%% Allow Anonymous and Default ACL %%-------------------------------------------------------------------- -%% @doc Set the Max ClientId Length Allowed. -{mapping, "mqtt.max_clientid_len", "emqttd.protocol", [ - {default, 1024}, - {datatype, integer} -]}. - -%% @doc Max Packet Size Allowed, 64K by default. -{mapping, "mqtt.max_packet_size", "emqttd.protocol", [ - {default, "64KB"}, - {datatype, bytesize} -]}. - -%% @doc Client Idle Timeout. -{mapping, "mqtt.client_idle_timeout", "emqttd.protocol", [ - {default, 30}, - {datatype, integer} -]}. - -{translation, "emqttd.protocol", fun(Conf) -> - [{max_clientid_len, cuttlefish:conf_get("mqtt.max_clientid_len", Conf)}, - {max_packet_size, cuttlefish:conf_get("mqtt.max_packet_size", Conf)}, - {client_idle_timeout, cuttlefish:conf_get("mqtt.client_idle_timeout", Conf)}] -end}. - %% @doc Allow Anonymous {mapping, "mqtt.allow_anonymous", "emqttd.allow_anonymous", [ {default, false}, @@ -285,10 +295,68 @@ end}. {datatype, {enum, [true, false]}} ]}. +%%-------------------------------------------------------------------- +%% MQTT Protocol +%%-------------------------------------------------------------------- + +%% @doc Set the Max ClientId Length Allowed. +{mapping, "mqtt.max_clientid_len", "emqttd.protocol", [ + {default, 1024}, + {datatype, integer} +]}. + +%% @doc Max Packet Size Allowed, 64K by default. +{mapping, "mqtt.max_packet_size", "emqttd.protocol", [ + {default, "64KB"}, + {datatype, bytesize} +]}. + +{translation, "emqttd.protocol", fun(Conf) -> + [{max_clientid_len, cuttlefish:conf_get("mqtt.max_clientid_len", Conf)}, + {max_packet_size, cuttlefish:conf_get("mqtt.max_packet_size", Conf)}] +end}. + +%%-------------------------------------------------------------------- +%% MQTT Connection +%%-------------------------------------------------------------------- + +%% @doc Force the client to GC: integer +{mapping, "mqtt.conn.force_gc_count", "emqttd.conn_force_gc_count", [ + {datatype, integer} +]}. + +%%-------------------------------------------------------------------- +%% MQTT Client +%%-------------------------------------------------------------------- + +%% @doc Client Idle Timeout. +{mapping, "mqtt.client.idle_timeout", "emqttd.client", [ + {default, "30s"}, + {datatype, {duration, ms}} +]}. + +%% @doc Enable Stats of Client. +{mapping, "mqtt.client.enable_stats", "emqttd.client", [ + {default, off}, + {datatype, flag} +]}. + +%% @doc Client +{translation, "emqttd.client", fun(Conf) -> + [{client_idle_timeout, cuttlefish:conf_get("mqtt.client.idle_timeout", Conf)}, + {client_enable_stats, cuttlefish:conf_get("mqtt.client.enable_stats", Conf)}] +end}. + %%-------------------------------------------------------------------- %% MQTT Session %%-------------------------------------------------------------------- +%% @doc Upgrade QoS? +{mapping, "mqtt.session.upgrade_qos", "emqttd.session", [ + {default, off}, + {datatype, flag} +]}. + %% @doc Max number of QoS 1 and 2 messages that can be “inflight” at one time. %% 0 means no limit {mapping, "mqtt.session.max_inflight", "emqttd.session", [ @@ -296,17 +364,10 @@ end}. {datatype, integer} ]}. - %% @doc Retry interval for redelivering QoS1/2 messages. {mapping, "mqtt.session.retry_interval", "emqttd.session", [ - {default, 60}, - {datatype, integer} -]}. - -%% @doc Awaiting PUBREL Timeout -{mapping, "mqtt.session.await_rel_timeout", "emqttd.session", [ - {default, 30}, - {datatype, integer} + {default, "20s"}, + {datatype, {duration, ms}} ]}. %% @doc Max Packets that Awaiting PUBREL, 0 means no limit @@ -315,25 +376,32 @@ end}. {datatype, integer} ]}. -%% @doc Statistics Collection Interval(seconds) -{mapping, "mqtt.session.collect_interval", "emqttd.session", [ - {default, 0}, - {datatype, integer} +%% @doc Awaiting PUBREL Timeout +{mapping, "mqtt.session.await_rel_timeout", "emqttd.session", [ + {default, "20s"}, + {datatype, {duration, ms}} ]}. -%% @doc Session expired after... -{mapping, "mqtt.session.expired_after", "emqttd.session", [ - {default, "2d"}, - {datatype, {duration, s}} +%% @doc Enable Stats +{mapping, "mqtt.session.enable_stats", "emqttd.session", [ + {default, off}, + {datatype, flag} +]}. + +%% @doc Session Expiry Interval +{mapping, "mqtt.session.expiry_interval", "emqttd.session", [ + {default, "2h"}, + {datatype, {duration, ms}} ]}. {translation, "emqttd.session", fun(Conf) -> - [{max_inflight, cuttlefish:conf_get("mqtt.session.max_inflight", Conf)}, - {retry_interval, cuttlefish:conf_get("mqtt.session.retry_interval", Conf)}, + [{upgrade_qos, cuttlefish:conf_get("mqtt.session.upgrade_qos", Conf)}, + {max_inflight, cuttlefish:conf_get("mqtt.session.max_inflight", Conf)}, + {retry_interval, cuttlefish:conf_get("mqtt.session.retry_interval", Conf)}, + {max_awaiting_rel, cuttlefish:conf_get("mqtt.session.max_awaiting_rel", Conf)}, {await_rel_timeout, cuttlefish:conf_get("mqtt.session.await_rel_timeout", Conf)}, - {max_awaiting_rel, cuttlefish:conf_get("mqtt.session.max_awaiting_rel", Conf)}, - {collect_interval, cuttlefish:conf_get("mqtt.session.collect_interval", Conf)}, - {expired_after, cuttlefish:conf_get("mqtt.session.expired_after", Conf)}] + {enable_stats, cuttlefish:conf_get("mqtt.session.enable_stats", Conf)}, + {expiry_interval, cuttlefish:conf_get("mqtt.session.expiry_interval", Conf)}] end}. %%-------------------------------------------------------------------- @@ -517,6 +585,11 @@ end}. hidden ]}. +{mapping, "mqtt.listener.tcp.tune_buffer", "emqttd.listeners", [ + {default, off}, + {datatype, flag} +]}. + {mapping, "mqtt.listener.tcp.nodelay", "emqttd.listeners", [ {datatype, {enum, [true, false]}}, hidden @@ -542,21 +615,22 @@ end}. ]}. {mapping, "mqtt.listener.ssl.proxy_protocol", "emqttd.listeners", [ - {default, 1}, - {datatype, integer}, - {validators, ["range:1-2"]}, - hidden + {default, off}, + {datatype, flag} ]}. {mapping, "mqtt.listener.ssl.proxy_protocol_timeout", "emqttd.listeners", [ - {default, 10}, - {datatype, integer}, - hidden + {default, 5s}, + {datatype, {duration, ms}} +]}. + +{mapping, "mqtt.listener.ssl.tls_versions", "emqttd.listeners", [ + {datatype, string} ]}. {mapping, "mqtt.listener.ssl.handshake_timeout", "emqttd.listeners", [ - {default, 15}, - {datatype, integer} + {default, "15s"}, + {datatype, {duration, ms}} ]}. {mapping, "mqtt.listener.ssl.keyfile", "emqttd.listeners", [ @@ -663,7 +737,8 @@ end}. Filter = fun(Opts) -> [{K, V} || {K, V} <- Opts, V =/= undefined] end, LisOpts = fun(Prefix) -> Filter([{acceptors, cuttlefish:conf_get(Prefix ++ ".acceptors", Conf)}, - {max_clients, cuttlefish:conf_get(Prefix ++ ".max_clients", Conf)}]) + {max_clients, cuttlefish:conf_get(Prefix ++ ".max_clients", Conf)}, + {tune_buffer, cuttlefish:conf_get(Prefix ++ ".tune_buffer", Conf, undefined)}]) end, TcpOpts = fun(Prefix) -> Filter([{backlog, cuttlefish:conf_get(Prefix ++ ".backlog", Conf, undefined)}, @@ -672,8 +747,16 @@ end}. {buffer, cuttlefish:conf_get(Prefix ++ ".buffer", Conf, undefined)}, {nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}]) end, + + SplitFun = fun(undefined) -> undefined; (S) -> string:tokens(S, ",") end, + SslOpts = fun(Prefix) -> - Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf) * 1000}, + Versions = case SplitFun(cuttlefish:conf_get(Prefix ++ ".tls_versions", Conf, undefined)) of + undefined -> undefined; + L -> [list_to_atom(V) || V <- L] + end, + Filter([{versions, Versions}, + {handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf), undefined}, {keyfile, cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)}, {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}, @@ -689,13 +772,10 @@ end}. Port -> ConnOpts = Filter([{rate_limit, cuttlefish:conf_get(Key ++ ".rate_limit", Conf, undefined)}, {proxy_protocol, cuttlefish:conf_get(Key ++ ".proxy_protocol", Conf, undefined)}, - {proxy_protocol_timeout, case cuttlefish:conf_get(Key ++ ".proxy_protocol_timeout", Conf, undefined) of - undefined -> undefined; - I -> I * 1000 - end}]), + {proxy_protocol_timeout, cuttlefish:conf_get(Key ++ ".proxy_protocol_timeout", Conf, undefined)}]), Opts = [{connopts, ConnOpts}, {sockopts, TcpOpts(Key)} | LisOpts(Key)], [{Name, Port, case Name =:= ssl orelse Name =:= https of - true -> [{ssl, SslOpts(Key)} | Opts]; + true -> [{sslopts, SslOpts(Key)} | Opts]; false -> Opts end}] end diff --git a/rebar.config b/rebar.config index c9e0dbcf0..4cc2a59d1 100644 --- a/rebar.config +++ b/rebar.config @@ -1,4 +1,4 @@ {deps, [ -{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{gen_logger,".*",{git,"https://github.com/emqtt/gen_logger",""}},{esockd,".*",{git,"https://github.com/emqtt/esockd","master"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb",""}} +{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{esockd,".*",{git,"https://github.com/emqtt/esockd","v4.2"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb",""}},{lager_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}},{pbkdf2,".*",{git,"https://github.com/comtihon/erlang-pbkdf2.git","2.0.0"}} ]}. {erl_opts, [{parse_transform,lager_transform}]}. diff --git a/rebar.lock b/rebar.lock new file mode 100644 index 000000000..e5d182bad --- /dev/null +++ b/rebar.lock @@ -0,0 +1,32 @@ +[{<<"esockd">>, + {git,"https://github.com/emqtt/esockd", + {ref,"6ef597f16ce242fe37ae019d6ff5214f7a784c80"}}, + 0}, + {<<"gen_logger">>, + {git,"https://github.com/emqtt/gen_logger.git", + {ref,"f6e9f2f373d99f41ffe0579ab5a5f3b19472c9c5"}}, + 1}, + {<<"goldrush">>, + {git,"https://github.com/basho/goldrush.git", + {ref,"8f1b715d36b650ec1e1f5612c00e28af6ab0de82"}}, + 1}, + {<<"gproc">>, + {git,"https://github.com/uwiger/gproc", + {ref,"01c8fbfdd5e4701e8e4b57b0c8279872f9574b0b"}}, + 0}, + {<<"lager">>, + {git,"https://github.com/basho/lager", + {ref,"81eaef0ce98fdbf64ab95665e3bc2ec4b24c7dac"}}, + 0}, + {<<"lager_syslog">>, + {git,"https://github.com/basho/lager_syslog", + {ref,"126dd0284fcac9b01613189a82facf8d803411a2"}}, + 0}, + {<<"mochiweb">>, + {git,"https://github.com/emqtt/mochiweb", + {ref,"af27c0c90bf4c1bfeae0290e4c541264b69f7168"}}, + 0}, + {<<"syslog">>, + {git,"git://github.com/Vagabond/erlang-syslog", + {ref,"0e4f0e95c361af298c5d1d17ceccfa831efc036d"}}, + 1}]. diff --git a/src/emqttd.app.src b/src/emqttd.app.src new file mode 100644 index 000000000..d03a4d952 --- /dev/null +++ b/src/emqttd.app.src @@ -0,0 +1,12 @@ +{application, emqttd, [ + {description, "Erlang MQTT Broker"}, + {vsn, "2.1.0"}, + {modules, []}, + {registered, [emqttd_sup]}, + {applications, [kernel,stdlib,gproc,lager,esockd,mochiweb,lager_syslog,pbkdf2]}, + {env, []}, + {mod, {emqttd_app, []}}, + {maintainers, ["Feng Lee "]}, + {licenses, ["MIT"]}, + {links, [{"Github", "https://github.com/emqtt/emqttd"}]} +]}. diff --git a/src/emqttd.erl b/src/emqttd.erl index 23db807cc..037c0de1a 100644 --- a/src/emqttd.erl +++ b/src/emqttd.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,10 +14,12 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% Facade Module for The EMQ Broker +%% @doc EMQ Main Module. -module(emqttd). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). @@ -136,25 +138,28 @@ subscriber_down(Subscriber) -> %% Hooks API %%-------------------------------------------------------------------- --spec(hook(atom(), function(), list(any())) -> ok | {error, any()}). -hook(Hook, Function, InitArgs) -> - emqttd_hook:add(Hook, Function, InitArgs). +-spec(hook(atom(), function() | {emqttd_hooks:hooktag(), function()}, list(any())) + -> ok | {error, any()}). +hook(Hook, TagFunction, InitArgs) -> + emqttd_hooks:add(Hook, TagFunction, InitArgs). --spec(hook(atom(), function(), list(any()), integer()) -> ok | {error, any()}). -hook(Hook, Function, InitArgs, Priority) -> - emqttd_hook:add(Hook, Function, InitArgs, Priority). +-spec(hook(atom(), function() | {emqttd_hooks:hooktag(), function()}, list(any()), integer()) + -> ok | {error, any()}). +hook(Hook, TagFunction, InitArgs, Priority) -> + emqttd_hooks:add(Hook, TagFunction, InitArgs, Priority). --spec(unhook(atom(), function()) -> ok | {error, any()}). -unhook(Hook, Function) -> - emqttd_hook:delete(Hook, Function). +-spec(unhook(atom(), function() | {emqttd_hooks:hooktag(), function()}) + -> ok | {error, any()}). +unhook(Hook, TagFunction) -> + emqttd_hooks:delete(Hook, TagFunction). -spec(run_hooks(atom(), list(any())) -> ok | stop). run_hooks(Hook, Args) -> - emqttd_hook:run(Hook, Args). + emqttd_hooks:run(Hook, Args). -spec(run_hooks(atom(), list(any()), any()) -> {ok | stop, any()}). run_hooks(Hook, Args, Acc) -> - emqttd_hook:run(Hook, Args, Acc). + emqttd_hooks:run(Hook, Args, Acc). %%-------------------------------------------------------------------- %% Debug diff --git a/src/emqttd_access_control.erl b/src/emqttd_access_control.erl index 7aea58e79..65d0c76f5 100644 --- a/src/emqttd_access_control.erl +++ b/src/emqttd_access_control.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,29 +16,25 @@ -module(emqttd_access_control). --include("emqttd.hrl"). - -behaviour(gen_server). --define(SERVER, ?MODULE). +-author("Feng Lee "). + +-include("emqttd.hrl"). %% API Function Exports --export([start_link/0, - auth/2, % authentication - check_acl/3, % acl check - reload_acl/0, % reload acl - lookup_mods/1, - register_mod/3, register_mod/4, - unregister_mod/2, - stop/0]). +-export([start_link/0, auth/2, check_acl/3, reload_acl/0, lookup_mods/1, + register_mod/3, register_mod/4, unregister_mod/2, stop/0]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). +-define(SERVER, ?MODULE). + -define(ACCESS_CONTROL_TAB, mqtt_access_control). --type password() :: undefined | binary(). +-type(password() :: undefined | binary()). -record(state, {}). @@ -74,7 +70,7 @@ auth(Client, Password, [{Mod, State, _Seq} | Mods]) -> Client :: mqtt_client(), PubSub :: pubsub(), Topic :: binary()). -check_acl(Client, PubSub, Topic) when ?PUBSUB(PubSub) -> +check_acl(Client, PubSub, Topic) when ?PS(PubSub) -> case lookup_mods(acl) of [] -> case emqttd:env(allow_anonymous, false) of true -> allow; diff --git a/src/emqttd_access_rule.erl b/src/emqttd_access_rule.erl index 1590d2efe..73718fd3a 100644 --- a/src/emqttd_access_rule.erl +++ b/src/emqttd_access_rule.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,21 +16,24 @@ -module(emqttd_access_rule). +-author("Feng Lee "). + -include("emqttd.hrl"). --type who() :: all | binary() | + +-type(who() :: all | binary() | {ipaddr, esockd_cidr:cidr_string()} | {client, binary()} | - {user, binary()}. + {user, binary()}). --type access() :: subscribe | publish | pubsub. +-type(access() :: subscribe | publish | pubsub). --type topic() :: binary(). +-type(topic() :: binary()). --type rule() :: {allow, all} | +-type(rule() :: {allow, all} | {allow, who(), access(), list(topic())} | {deny, all} | - {deny, who(), access(), list(topic())}. + {deny, who(), access(), list(topic())}). -export_type([rule/0]). diff --git a/src/emqttd_acl_internal.erl b/src/emqttd_acl_internal.erl index 74ab8519a..1cd32c0f4 100644 --- a/src/emqttd_acl_internal.erl +++ b/src/emqttd_acl_internal.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -18,7 +18,10 @@ -behaviour(emqttd_acl_mod). +-author("Feng Lee "). + -include("emqttd.hrl"). +-include("emqttd_cli.hrl"). -export([all_rules/0]). @@ -112,7 +115,7 @@ reload_acl(#state{config = undefined}) -> reload_acl(State) -> case catch load_rules_from_file(State) of {'EXIT', Error} -> {error, Error}; - true -> ok + true -> ?PRINT("~s~n", ["reload acl_internal successfully"]), ok end. %% @doc ACL Module Description diff --git a/src/emqttd_acl_mod.erl b/src/emqttd_acl_mod.erl index 44c775460..12e949afe 100644 --- a/src/emqttd_acl_mod.erl +++ b/src/emqttd_acl_mod.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_acl_mod). +-author("Feng Lee "). + -include("emqttd.hrl"). %%-------------------------------------------------------------------- @@ -26,10 +28,9 @@ -callback(init(AclOpts :: list()) -> {ok, State :: any()}). --callback(check_acl({Client, PubSub, Topic}, State :: any()) -> allow | deny | ignore when - Client :: mqtt_client(), - PubSub :: pubsub(), - Topic :: binary()). +-callback(check_acl({Client :: mqtt_client(), + PubSub :: pubsub(), + Topic :: binary()}, State :: any()) -> allow | deny | ignore). -callback(reload_acl(State :: any()) -> ok | {error, any()}). diff --git a/src/emqttd_alarm.erl b/src/emqttd_alarm.erl index 1ff4a5ae9..1467797c7 100644 --- a/src/emqttd_alarm.erl +++ b/src/emqttd_alarm.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_alarm). +-author("Feng Lee "). + -behaviour(gen_event). -include("emqttd.hrl"). @@ -85,17 +87,17 @@ handle_event({set_alarm, Alarm = #mqtt_alarm{id = AlarmId, severity = Severity, title = Title, summary = Summary}}, Alarms)-> - Timestamp = os:timestamp(), + TS = os:timestamp(), Json = mochijson2:encode([{id, AlarmId}, {severity, Severity}, {title, iolist_to_binary(Title)}, {summary, iolist_to_binary(Summary)}, - {ts, emqttd_time:now_to_secs(Timestamp)}]), + {ts, emqttd_time:now_secs(TS)}]), emqttd:publish(alarm_msg(alert, AlarmId, Json)), - {ok, [Alarm#mqtt_alarm{timestamp = Timestamp} | Alarms]}; + {ok, [Alarm#mqtt_alarm{timestamp = TS} | Alarms]}; handle_event({clear_alarm, AlarmId}, Alarms) -> - Json = mochijson2:encode([{id, AlarmId}, {ts, emqttd_time:now_to_secs()}]), + Json = mochijson2:encode([{id, AlarmId}, {ts, emqttd_time:now_secs()}]), emqttd:publish(alarm_msg(clear, AlarmId, Json)), {ok, lists:keydelete(AlarmId, 2, Alarms), hibernate}; diff --git a/src/emqttd_app.erl b/src/emqttd_app.erl index bdbfc4a54..992e22da6 100644 --- a/src/emqttd_app.erl +++ b/src/emqttd_app.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -18,29 +18,26 @@ -behaviour(application). +-author("Feng Lee "). + -include("emqttd_cli.hrl"). +-include("emqttd_protocol.hrl"). + %% Application callbacks -export([start/2, stop/1]). -export([start_listener/1, stop_listener/1]). -%% MQTT SockOpts --define(MQTT_SOCKOPTS, [binary, {packet, raw}, {reuseaddr, true}, - {backlog, 512}, {nodelay, true}]). +-type(listener() :: {atom(), esockd:listen_on(), [esockd:option()]}). --type listener() :: {atom(), esockd:listen_on(), [esockd:option()]}. +-define(APP, emqttd). %%-------------------------------------------------------------------- %% Application callbacks %%-------------------------------------------------------------------- --spec(start(StartType, StartArgs) -> {ok, pid()} | {ok, pid(), State} | {error, Reason} when - StartType :: normal | {takeover, node()} | {failover, node()}, - StartArgs :: term(), - State :: term(), - Reason :: term()). -start(_StartType, _StartArgs) -> +start(_Type, _Args) -> print_banner(), emqttd_mnesia:start(), {ok, Sup} = emqttd_sup:start_link(), @@ -63,12 +60,11 @@ stop(_State) -> %%-------------------------------------------------------------------- print_banner() -> - ?PRINT("starting emqttd on node '~s'~n", [node()]). + ?PRINT("starting ~s on node '~s'~n", [?APP, node()]). print_vsn() -> {ok, Vsn} = application:get_key(vsn), - {ok, Desc} = application:get_key(description), - ?PRINT("~s ~s is running now~n", [Desc, Vsn]). + ?PRINT("~s ~s is running now~n", [?APP, Vsn]). %%-------------------------------------------------------------------- %% Start Servers @@ -76,7 +72,7 @@ print_vsn() -> start_servers(Sup) -> Servers = [{"emqttd ctl", emqttd_ctl}, - {"emqttd hook", emqttd_hook}, + {"emqttd hook", emqttd_hooks}, {"emqttd router", emqttd_router}, {"emqttd pubsub", {supervisor, emqttd_pubsub_sup}}, {"emqttd stats", emqttd_stats}, @@ -176,14 +172,14 @@ start_listener({Proto, ListenOn, Opts}) when Proto == https; Proto == wss -> mochiweb:start_http('mqtt:wss', ListenOn, Opts, {emqttd_http, handle_request, []}). start_listener(Proto, ListenOn, Opts) -> - {ok, Env} = emqttd:env(protocol), + Env = lists:append(emqttd:env(client, []), emqttd:env(protocol, [])), MFArgs = {emqttd_client, start_link, [Env]}, {ok, _} = esockd:open(Proto, ListenOn, merge_sockopts(Opts), MFArgs). merge_sockopts(Options) -> - SockOpts = emqttd_opts:merge(?MQTT_SOCKOPTS, - proplists:get_value(sockopts, Options, [])), - emqttd_opts:merge(Options, [{sockopts, SockOpts}]). + SockOpts = emqttd_misc:merge_opts( + ?MQTT_SOCKOPTS, proplists:get_value(sockopts, Options, [])), + emqttd_misc:merge_opts(Options, [{sockopts, SockOpts}]). %%-------------------------------------------------------------------- %% Stop Listeners @@ -211,3 +207,4 @@ merge_sockopts_test_() -> ?_assert(merge_sockopts(Opts) == [{sockopts, ?MQTT_SOCKOPTS} | Opts]). -endif. + diff --git a/src/emqttd_auth_mod.erl b/src/emqttd_auth_mod.erl index d6d4a55b0..ff7f79a20 100644 --- a/src/emqttd_auth_mod.erl +++ b/src/emqttd_auth_mod.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,11 +16,13 @@ -module(emqttd_auth_mod). +-author("Feng Lee "). + -include("emqttd.hrl"). -export([passwd_hash/2]). --type(hash_type() :: plain | md5 | sha | sha256). +-type(hash_type() :: plain | md5 | sha | sha256 | pbkdf2). %%-------------------------------------------------------------------- %% Authentication behavihour @@ -30,10 +32,10 @@ -callback(init(AuthOpts :: list()) -> {ok, State :: any()}). --callback(check(Client, Password, State) -> ok | | {ok, boolean()} | ignore | {error, string()} when - Client :: mqtt_client(), - Password :: binary(), - State :: any()). +-callback(check(Client :: mqtt_client(), + Password :: binary(), + State :: any()) + -> ok | | {ok, boolean()} | ignore | {error, string()}). -callback(description() -> string()). @@ -49,7 +51,7 @@ behaviour_info(_Other) -> -endif. %% @doc Password Hash --spec(passwd_hash(hash_type(), binary()) -> binary()). +-spec(passwd_hash(hash_type(), binary() | tuple()) -> binary()). passwd_hash(plain, Password) -> Password; passwd_hash(md5, Password) -> @@ -57,7 +59,10 @@ passwd_hash(md5, Password) -> passwd_hash(sha, Password) -> hexstring(crypto:hash(sha, Password)); passwd_hash(sha256, Password) -> - hexstring(crypto:hash(sha256, Password)). + hexstring(crypto:hash(sha256, Password)); +passwd_hash(pbkdf2,{Salt, Password, Macfun, Iterations, Dklen}) -> + {ok,Hexstring} = pbkdf2:pbkdf2(Macfun, Password, Salt, Iterations, Dklen), + pbkdf2:to_hex(Hexstring). hexstring(<>) -> iolist_to_binary(io_lib:format("~32.16.0b", [X])); diff --git a/src/emqttd_base62.erl b/src/emqttd_base62.erl index 5895fa245..481488fb9 100644 --- a/src/emqttd_base62.erl +++ b/src/emqttd_base62.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2016-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_base62). +-author("Feng Lee "). + -export([encode/1, decode/1]). %% @doc Encode an integer to base62 string diff --git a/src/emqttd_boot.erl b/src/emqttd_boot.erl index 043eb08c3..d7a6d311e 100644 --- a/src/emqttd_boot.erl +++ b/src/emqttd_boot.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_boot). +-author("Feng Lee "). + -export([apply_module_attributes/1, all_module_attributes/1]). %% only {F, Args}... @@ -58,6 +60,6 @@ ignore_lib_apps(Apps) -> snmp, otp_mibs, public_key, asn1, ssh, hipe, common_test, observer, webtool, xmerl, tools, test_server, compiler, debugger, eunit, et, - gen_logger, wx], + wx], [App || App = {Name, _, _} <- Apps, not lists:member(Name, LibApps)]. diff --git a/src/emqttd_bridge.erl b/src/emqttd_bridge.erl index 3dca7bf0f..a1dd34bcc 100644 --- a/src/emqttd_bridge.erl +++ b/src/emqttd_bridge.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ -behaviour(gen_server2). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). @@ -38,16 +40,16 @@ qos = ?QOS_2, topic_suffix = <<>>, topic_prefix = <<>>, - mqueue :: emqttd_mqueue:mqueue(), + mqueue :: emqttd_mqueue:mqueue(), max_queue_len = 10000, ping_down_interval = ?PING_DOWN_INTERVAL, status = up}). --type option() :: {qos, mqtt_qos()} | - {topic_suffix, binary()} | - {topic_prefix, binary()} | - {max_queue_len, pos_integer()} | - {ping_down_interval, pos_integer()}. +-type(option() :: {qos, mqtt_qos()} | + {topic_suffix, binary()} | + {topic_prefix, binary()} | + {max_queue_len, pos_integer()} | + {ping_down_interval, pos_integer()}). -export_type([option/0]). @@ -77,9 +79,10 @@ init([Pool, Id, Node, Topic, Options]) -> MQueue = emqttd_mqueue:new(qname(Node, Topic), [{max_len, State#state.max_queue_len}], emqttd_alarm:alarm_fun()), - {ok, State#state{pool = Pool, id = Id, mqueue = MQueue}}; + {ok, State#state{pool = Pool, id = Id, mqueue = MQueue}, + hibernate, {backoff, 1000, 1000, 10000}}; false -> - {stop, {cannot_connect, Node}} + {stop, {cannot_connect_node, Node}} end. parse_opts([], State) -> diff --git a/src/emqttd_bridge_sup.erl b/src/emqttd_bridge_sup.erl index dd418b2f6..d28b2274c 100644 --- a/src/emqttd_bridge_sup.erl +++ b/src/emqttd_bridge_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/src/emqttd_bridge_sup_sup.erl b/src/emqttd_bridge_sup_sup.erl index 47e246273..1d47bd003 100644 --- a/src/emqttd_bridge_sup_sup.erl +++ b/src/emqttd_bridge_sup_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ -behavior(supervisor). +-author("Feng Lee "). + -export([start_link/0, bridges/0, start_bridge/2, start_bridge/3, stop_bridge/2]). -export([init/1]). @@ -47,7 +49,7 @@ start_bridge(Node, _Topic, _Options) when Node =:= node() -> {error, bridge_to_self}; start_bridge(Node, Topic, Options) when is_atom(Node) andalso is_binary(Topic) -> {ok, BridgeEnv} = emqttd:env(bridge), - Options1 = emqttd_opts:merge(BridgeEnv, Options), + Options1 = emqttd_misc:merge_opts(BridgeEnv, Options), supervisor:start_child(?MODULE, bridge_spec(Node, Topic, Options1)). %% @doc Stop a bridge diff --git a/src/emqttd_broker.erl b/src/emqttd_broker.erl index 96dd7d553..e729ec9cb 100644 --- a/src/emqttd_broker.erl +++ b/src/emqttd_broker.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ -behaviour(gen_server). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_internal.hrl"). @@ -40,16 +42,18 @@ -record(state, {started_at, sys_interval, heartbeat, tick_tref, version, sysdescr}). +-define(APP, emqttd). + -define(SERVER, ?MODULE). -define(BROKER_TAB, mqtt_broker). %% $SYS Topics of Broker -define(SYSTOP_BROKERS, [ - version, % Broker version - uptime, % Broker uptime - datetime, % Broker local datetime - sysdescr % Broker description + version, % Broker version + uptime, % Broker uptime + datetime, % Broker local datetime + sysdescr % Broker description ]). %%-------------------------------------------------------------------- @@ -74,12 +78,12 @@ notify(EventType, Event) -> %% @doc Get broker version -spec(version() -> string()). version() -> - {ok, Version} = application:get_key(emqttd, vsn), Version. + {ok, Version} = application:get_key(?APP, vsn), Version. %% @doc Get broker description -spec(sysdescr() -> string()). sysdescr() -> - {ok, Descr} = application:get_key(emqttd, description), Descr. + {ok, Descr} = application:get_key(?APP, description), Descr. %% @doc Get broker uptime -spec(uptime() -> string()). @@ -102,14 +106,14 @@ start_tick(0, _Msg) -> start_tick(Interval, Msg) when Interval > 0 -> {ok, TRef} = timer:send_interval(Interval, Msg), TRef. -%% @doc Start tick timer +%% @doc Stop tick timer stop_tick(undefined) -> ok; stop_tick(TRef) -> timer:cancel(TRef). %%-------------------------------------------------------------------- -%% gen_server callbacks +%% gen_server Callbacks %%-------------------------------------------------------------------- init([]) -> @@ -161,13 +165,11 @@ retain(brokers) -> Payload = list_to_binary(string:join([atom_to_list(N) || N <- emqttd_mnesia:running_nodes()], ",")), Msg = emqttd_message:make(broker, <<"$SYS/brokers">>, Payload), - Msg1 = emqttd_message:set_flag(sys, emqttd_message:set_flag(retain, Msg)), - emqttd:publish(Msg1). + emqttd:publish(emqttd_message:set_flag(sys, emqttd_message:set_flag(retain, Msg))). retain(Topic, Payload) when is_binary(Payload) -> Msg = emqttd_message:make(broker, emqttd_topic:systop(Topic), Payload), - Msg1 = emqttd_message:set_flag(sys, emqttd_message:set_flag(retain, Msg)), - emqttd:publish(Msg1). + emqttd:publish(emqttd_message:set_flag(sys, emqttd_message:set_flag(retain, Msg))). publish(Topic, Payload) when is_binary(Payload) -> Msg = emqttd_message:make(broker, emqttd_topic:systop(Topic), Payload), diff --git a/src/emqttd_cli.erl b/src/emqttd_cli.erl index 085032b24..54d462e65 100644 --- a/src/emqttd_cli.erl +++ b/src/emqttd_cli.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_cli). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_cli.hrl"). @@ -30,7 +32,7 @@ -export([status/1, broker/1, cluster/1, users/1, clients/1, sessions/1, routes/1, topics/1, subscriptions/1, plugins/1, bridges/1, - listeners/1, vm/1, mnesia/1, trace/1]). + listeners/1, vm/1, mnesia/1, trace/1, acl/1]). -define(PROC_INFOKEYS, [status, memory, @@ -57,6 +59,7 @@ is_cmd(Fun) -> %%-------------------------------------------------------------------- %% @doc Node status + status([]) -> {InternalStatus, _ProvidedStatus} = init:get_status(), ?PRINT("Node ~p is ~p~n", [node(), InternalStatus]), @@ -71,6 +74,7 @@ status(_) -> %%-------------------------------------------------------------------- %% @doc Query broker + broker([]) -> Funs = [sysdescr, version, uptime, datetime], foreach(fun(Fun) -> @@ -105,6 +109,7 @@ broker(_) -> %%-------------------------------------------------------------------- %% @doc Cluster with other nodes + cluster(["join", SNode]) -> case emqttd_cluster:join(emqttd_node:parse_name(SNode)) of ok -> @@ -143,10 +148,15 @@ cluster(_) -> %%-------------------------------------------------------------------- %% @doc Users usage + users(Args) -> emq_auth_username:cli(Args). +acl(["reload"]) -> emqttd_access_control:reload_acl(); +acl(_) -> ?USAGE([{"acl reload", "reload etc/acl.conf"}]). + %%-------------------------------------------------------------------- %% @doc Query clients + clients(["list"]) -> dump(mqtt_client); @@ -169,14 +179,17 @@ if_client(ClientId, Fun) -> %%-------------------------------------------------------------------- %% @doc Sessions Command + sessions(["list"]) -> dump(mqtt_local_session); %% performance issue? + sessions(["list", "persistent"]) -> lists:foreach(fun print/1, ets:match_object(mqtt_local_session, {'_', '_', false, '_'})); %% performance issue? + sessions(["list", "transient"]) -> lists:foreach(fun print/1, ets:match_object(mqtt_local_session, {'_', '_', true, '_'})); @@ -194,6 +207,7 @@ sessions(_) -> %%-------------------------------------------------------------------- %% @doc Routes Command + routes(["list"]) -> Routes = emqttd_router:dump(), foreach(fun print/1, Routes); @@ -207,6 +221,7 @@ routes(_) -> %%-------------------------------------------------------------------- %% @doc Topics Command + topics(["list"]) -> lists:foreach(fun(Topic) -> ?PRINT("~s~n", [Topic]) end, emqttd:topics()); @@ -260,14 +275,14 @@ subscriptions(_) -> {"subscriptions del ", "Delete static subscriptions manually"}, {"subscriptions del ", "Delete a static subscription manually"}]). -if_could_print(Tab, Fun) -> - case mnesia:table_info(Tab, size) of - Size when Size >= ?MAX_LIMIT -> - ?PRINT("Could not list, too many ~ss: ~p~n", [Tab, Size]); - _Size -> - Keys = mnesia:dirty_all_keys(Tab), - foreach(fun(Key) -> Fun(ets:lookup(Tab, Key)) end, Keys) - end. +% if_could_print(Tab, Fun) -> +% case mnesia:table_info(Tab, size) of +% Size when Size >= ?MAX_LIMIT -> +% ?PRINT("Could not list, too many ~ss: ~p~n", [Tab, Size]); +% _Size -> +% Keys = mnesia:dirty_all_keys(Tab), +% foreach(fun(Key) -> Fun(ets:lookup(Tab, Key)) end, Keys) +% end. if_valid_qos(QoS, Fun) -> try list_to_integer(QoS) of @@ -303,6 +318,7 @@ plugins(_) -> %%-------------------------------------------------------------------- %% @doc Bridges command + bridges(["list"]) -> foreach(fun({Node, Topic, _Pid}) -> ?PRINT("bridge: ~s--~s-->~s~n", [node(), Topic, Node]) @@ -360,6 +376,7 @@ parse_opt(_Cmd, Opt, _Val) -> %%-------------------------------------------------------------------- %% @doc vm command + vm([]) -> vm(["all"]); @@ -398,6 +415,7 @@ vm(_) -> %%-------------------------------------------------------------------- %% @doc mnesia Command + mnesia([]) -> mnesia:system_info(); @@ -406,6 +424,7 @@ mnesia(_) -> %%-------------------------------------------------------------------- %% @doc Trace Command + trace(["list"]) -> foreach(fun({{Who, Name}, LogFile}) -> ?PRINT("trace ~s ~s -> ~s~n", [Who, Name, LogFile]) @@ -448,6 +467,7 @@ trace_off(Who, Name) -> %%-------------------------------------------------------------------- %% @doc Listeners Command + listeners([]) -> foreach(fun({{Protocol, ListenOn}, Pid}) -> Info = [{acceptors, esockd:get_acceptors(Pid)}, @@ -503,7 +523,7 @@ print(#mqtt_client{client_id = ClientId, clean_sess = CleanSess, username = User peername = Peername, connected_at = ConnectedAt}) -> ?PRINT("Client(~s, clean_sess=~s, username=~s, peername=~s, connected_at=~p)~n", [ClientId, CleanSess, Username, emqttd_net:format(Peername), - emqttd_time:now_to_secs(ConnectedAt)]); + emqttd_time:now_secs(ConnectedAt)]); %% print(#mqtt_topic{topic = Topic, flags = Flags}) -> %% ?PRINT("~s: ~s~n", [Topic, string:join([atom_to_list(F) || F <- Flags], ",")]); @@ -517,20 +537,21 @@ print({Topic, Node}) -> ?PRINT("~s -> ~s~n", [Topic, Node]); print({ClientId, _ClientPid, _Persistent, SessInfo}) -> + Data = lists:append(SessInfo, emqttd_stats:get_session_stats(ClientId)), InfoKeys = [clean_sess, + subscriptions, max_inflight, - inflight_queue, - message_queue, - message_dropped, - awaiting_rel, - awaiting_ack, - awaiting_comp, + inflight_len, + mqueue_len, + mqueue_dropped, + awaiting_rel_len, + deliver_msg, + enqueue_msg, created_at], - ?PRINT("Session(~s, clean_sess=~s, max_inflight=~w, inflight_queue=~w, " - "message_queue=~w, message_dropped=~w, " - "awaiting_rel=~w, awaiting_ack=~w, awaiting_comp=~w, " - "created_at=~w)~n", - [ClientId | [format(Key, get_value(Key, SessInfo)) || Key <- InfoKeys]]). + ?PRINT("Session(~s, clean_sess=~s, max_inflight=~w, inflight=~w, " + "mqueue_len=~w, mqueue_dropped=~w, awaiting_rel=~w, " + "deliver_msg=~w, enqueue_msg=~w, created_at=~w)~n", + [ClientId | [format(Key, get_value(Key, Data)) || Key <- InfoKeys]]). print(subscription, {Sub, Topic}) when is_pid(Sub) -> ?PRINT("~p -> ~s~n", [Sub, Topic]); @@ -542,7 +563,7 @@ print(subscription, {Sub, Topic}) -> ?PRINT("~s -> ~s~n", [Sub, Topic]). format(created_at, Val) -> - emqttd_time:now_to_secs(Val); + emqttd_time:now_secs(Val); format(_, Val) -> Val. diff --git a/src/emqttd_client.erl b/src/emqttd_client.erl index 6f15bdf8c..88f14c2d6 100644 --- a/src/emqttd_client.erl +++ b/src/emqttd_client.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,10 +14,13 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc MQTT Client Connection +%% @doc MQTT/TCP Connection. + -module(emqttd_client). --behaviour(gen_server). +-behaviour(gen_server2). + +-author("Feng Lee "). -include("emqttd.hrl"). @@ -25,163 +28,206 @@ -include("emqttd_internal.hrl"). +-import(proplists, [get_value/2, get_value/3]). + %% API Function Exports --export([start_link/2, session/1, info/1, kick/1, - set_rate_limit/2, get_rate_limit/1]). +-export([start_link/2]). + +%% Management and Monitor API +-export([info/1, stats/1, kick/1]). + +-export([set_rate_limit/2, get_rate_limit/1]). %% SUB/UNSUB Asynchronously. Called by plugins. -export([subscribe/2, unsubscribe/2]). +%% Get the session proc? +-export([session/1]). + %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2, code_change/3, terminate/2]). +%% gen_server2 Callbacks +-export([prioritise_call/4, prioritise_info/3, handle_pre_hibernate/1]). + %% Client State --record(client_state, {connection, connname, peername, peerhost, peerport, - await_recv, conn_state, rate_limit, parser_fun, - proto_state, packet_opts, keepalive, mountpoint}). +%% Unused fields: connname, peerhost, peerport +-record(client_state, {connection, peername, conn_state, await_recv, + rate_limit, packet_size, parser, proto_state, + keepalive, enable_stats, force_gc_count}). --define(INFO_KEYS, [peername, peerhost, peerport, await_recv, conn_state]). +-define(INFO_KEYS, [peername, conn_state, await_recv]). --define(SOCK_STATS, [recv_oct, recv_cnt, send_oct, send_cnt]). +-define(SOCK_STATS, [recv_oct, recv_cnt, send_oct, send_cnt, send_pend]). -define(LOG(Level, Format, Args, State), - lager:Level("Client(~s): " ++ Format, [State#client_state.connname | Args])). + lager:Level("Client(~s): " ++ Format, + [esockd_net:format(State#client_state.peername) | Args])). -start_link(Connection, MqttEnv) -> - {ok, proc_lib:spawn_link(?MODULE, init, [[Connection, MqttEnv]])}. - -session(CPid) -> - gen_server:call(CPid, session, infinity). +start_link(Conn, Env) -> + {ok, proc_lib:spawn_opt(?MODULE, init, [[Conn, Env]], [link | ?FULLSWEEP_OPTS])}. info(CPid) -> - gen_server:call(CPid, info, infinity). + gen_server2:call(CPid, info). + +stats(CPid) -> + gen_server2:call(CPid, stats). kick(CPid) -> - gen_server:call(CPid, kick). + gen_server2:call(CPid, kick). set_rate_limit(Cpid, Rl) -> - gen_server:call(Cpid, {set_rate_limit, Rl}). + gen_server2:call(Cpid, {set_rate_limit, Rl}). get_rate_limit(Cpid) -> - gen_server:call(Cpid, get_rate_limit). + gen_server2:call(Cpid, get_rate_limit). subscribe(CPid, TopicTable) -> - gen_server:cast(CPid, {subscribe, TopicTable}). + CPid ! {subscribe, TopicTable}. unsubscribe(CPid, Topics) -> - gen_server:cast(CPid, {unsubscribe, Topics}). + CPid ! {unsubscribe, Topics}. -init([OriginConn, MqttEnv]) -> - {ok, Connection} = OriginConn:wait(), - {PeerHost, PeerPort, PeerName} = - case Connection:peername() of - {ok, Peer = {Host, Port}} -> - {Host, Port, Peer}; - {error, enotconn} -> - Connection:fast_close(), - exit(normal); - {error, Reason} -> - Connection:fast_close(), - exit({shutdown, Reason}) - end, - ConnName = esockd_net:format(PeerName), +session(CPid) -> + gen_server2:call(CPid, session, infinity). + +%%-------------------------------------------------------------------- +%% gen_server Callbacks +%%-------------------------------------------------------------------- + +init([Conn0, Env]) -> + {ok, Conn} = Conn0:wait(), + case Conn:peername() of + {ok, Peername} -> do_init(Conn, Env, Peername); + {error, enotconn} -> Conn:fast_close(), + exit(normal); + {error, Reason} -> Conn:fast_close(), + exit({shutdown, Reason}) + end. + +do_init(Conn, Env, Peername) -> + %% Send Fun + SendFun = send_fun(Conn, Peername), + RateLimit = get_value(rate_limit, Conn:opts()), + PacketSize = get_value(max_packet_size, Env, ?MAX_PACKET_SIZE), + Parser = emqttd_parser:initial_state(PacketSize), + ProtoState = emqttd_protocol:init(Peername, SendFun, Env), + EnableStats = get_value(client_enable_stats, Env, false), + ForceGcCount = emqttd_gc:conn_max_gc_count(), + State = run_socket(#client_state{connection = Conn, + peername = Peername, + await_recv = false, + conn_state = running, + rate_limit = RateLimit, + packet_size = PacketSize, + parser = Parser, + proto_state = ProtoState, + enable_stats = EnableStats, + force_gc_count = ForceGcCount}), + IdleTimout = get_value(client_idle_timeout, Env, 30000), + gen_server2:enter_loop(?MODULE, [], State, self(), IdleTimout, + {backoff, 2000, 2000, 20000}). + +send_fun(Conn, Peername) -> Self = self(), - - %% Send Packet... - SendFun = fun(Packet) -> + fun(Packet) -> Data = emqttd_serializer:serialize(Packet), - ?LOG(debug, "SEND ~p", [Data], #client_state{connname = ConnName}), + ?LOG(debug, "SEND ~p", [Data], #client_state{peername = Peername}), emqttd_metrics:inc('bytes/sent', iolist_size(Data)), - try Connection:async_send(Data) of + try Conn:async_send(Data) of true -> ok catch error:Error -> Self ! {shutdown, Error} end - end, - ParserFun = emqttd_parser:new(MqttEnv), - ProtoState = emqttd_protocol:init(PeerName, SendFun, MqttEnv), - RateLimit = proplists:get_value(rate_limit, Connection:opts()), - State = run_socket(#client_state{connection = Connection, - connname = ConnName, - peername = PeerName, - peerhost = PeerHost, - peerport = PeerPort, - await_recv = false, - conn_state = running, - rate_limit = RateLimit, - parser_fun = ParserFun, - proto_state = ProtoState, - packet_opts = MqttEnv}), - IdleTimout = proplists:get_value(client_idle_timeout, MqttEnv, 30), - gen_server:enter_loop(?MODULE, [], State, timer:seconds(IdleTimout)). + end. -handle_call(session, _From, State = #client_state{proto_state = ProtoState}) -> - {reply, emqttd_protocol:session(ProtoState), State}; +prioritise_call(Msg, _From, _Len, _State) -> + case Msg of info -> 10; stats -> 10; state -> 10; _ -> 5 end. -handle_call(info, _From, State = #client_state{connection = Connection, - proto_state = ProtoState}) -> - ClientInfo = ?record_to_proplist(client_state, State, ?INFO_KEYS), +prioritise_info(Msg, _Len, _State) -> + case Msg of {redeliver, _} -> 5; _ -> 0 end. + +handle_pre_hibernate(State) -> + {hibernate, emqttd_gc:reset_conn_gc_count(#client_state.force_gc_count, emit_stats(State))}. + +handle_call(info, From, State = #client_state{proto_state = ProtoState}) -> ProtoInfo = emqttd_protocol:info(ProtoState), - {ok, SockStats} = Connection:getstat(?SOCK_STATS), - {reply, lists:append([ClientInfo, [{proto_info, ProtoInfo}, - {sock_stats, SockStats}]]), State}; + ClientInfo = ?record_to_proplist(client_state, State, ?INFO_KEYS), + {reply, Stats, _, _} = handle_call(stats, From, State), + reply(lists:append([ClientInfo, ProtoInfo, Stats]), State); + +handle_call(stats, _From, State = #client_state{proto_state = ProtoState}) -> + reply(lists:append([emqttd_misc:proc_stats(), + emqttd_protocol:stats(ProtoState), + sock_stats(State)]), State); handle_call(kick, _From, State) -> {stop, {shutdown, kick}, ok, State}; handle_call({set_rate_limit, Rl}, _From, State) -> - {reply, ok, State#client_state{rate_limit = Rl}}; + reply(ok, State#client_state{rate_limit = Rl}); handle_call(get_rate_limit, _From, State = #client_state{rate_limit = Rl}) -> - {reply, Rl, State}; + reply(Rl, State); + +handle_call(session, _From, State = #client_state{proto_state = ProtoState}) -> + reply(emqttd_protocol:session(ProtoState), State); handle_call(Req, _From, State) -> ?UNEXPECTED_REQ(Req, State). -handle_cast({subscribe, TopicTable}, State) -> - with_proto_state(fun(ProtoState) -> - emqttd_protocol:handle({subscribe, TopicTable}, ProtoState) - end, State); - -handle_cast({unsubscribe, Topics}, State) -> - with_proto_state(fun(ProtoState) -> - emqttd_protocol:handle({unsubscribe, Topics}, ProtoState) - end, State); - handle_cast(Msg, State) -> ?UNEXPECTED_MSG(Msg, State). +handle_info({subscribe, TopicTable}, State) -> + with_proto( + fun(ProtoState) -> + emqttd_protocol:subscribe(TopicTable, ProtoState) + end, State); + +handle_info({unsubscribe, Topics}, State) -> + with_proto( + fun(ProtoState) -> + emqttd_protocol:unsubscribe(Topics, ProtoState) + end, State); + +%% Asynchronous SUBACK +handle_info({suback, PacketId, GrantedQos}, State) -> + with_proto( + fun(ProtoState) -> + Packet = ?SUBACK_PACKET(PacketId, GrantedQos), + emqttd_protocol:send(Packet, ProtoState) + end, State); + +handle_info({deliver, Message}, State) -> + with_proto( + fun(ProtoState) -> + emqttd_protocol:send(Message, ProtoState) + end, State); + +handle_info({redeliver, {?PUBREL, PacketId}}, State) -> + with_proto( + fun(ProtoState) -> + emqttd_protocol:pubrel(PacketId, ProtoState) + end, State); + +handle_info(emit_stats, State) -> + {noreply, emit_stats(State), hibernate}; + handle_info(timeout, State) -> shutdown(idle_timeout, State); -%% fix issue #535 +%% Fix issue #535 handle_info({shutdown, Error}, State) -> shutdown(Error, State); -%% Asynchronous SUBACK -handle_info({suback, PacketId, GrantedQos}, State) -> - with_proto_state(fun(ProtoState) -> - Packet = ?SUBACK_PACKET(PacketId, GrantedQos), - emqttd_protocol:send(Packet, ProtoState) - end, State); - -handle_info({deliver, Message}, State) -> - with_proto_state(fun(ProtoState) -> - emqttd_protocol:send(Message, ProtoState) - end, State); - -handle_info({redeliver, {?PUBREL, PacketId}}, State) -> - with_proto_state(fun(ProtoState) -> - emqttd_protocol:redeliver({?PUBREL, PacketId}, ProtoState) - end, State); - handle_info({shutdown, conflict, {ClientId, NewPid}}, State) -> ?LOG(warning, "clientid '~s' conflict with ~p", [ClientId, NewPid], State), shutdown(conflict, State); handle_info(activate_sock, State) -> - hibernate(run_socket(State#client_state{conn_state = running})); + {noreply, run_socket(State#client_state{conn_state = running}), hibernate}; handle_info({inet_async, _Sock, _Ref, {ok, Data}}, State) -> Size = iolist_size(Data), @@ -193,26 +239,31 @@ handle_info({inet_async, _Sock, _Ref, {error, Reason}}, State) -> shutdown(Reason, State); handle_info({inet_reply, _Sock, ok}, State) -> - hibernate(State); + {noreply, gc(State), hibernate}; %% Tune GC handle_info({inet_reply, _Sock, {error, Reason}}, State) -> shutdown(Reason, State); -handle_info({keepalive, start, Interval}, State = #client_state{connection = Connection}) -> +handle_info({keepalive, start, Interval}, State = #client_state{connection = Conn}) -> ?LOG(debug, "Keepalive at the interval of ~p", [Interval], State), StatFun = fun() -> - case Connection:getstat([recv_oct]) of + case Conn:getstat([recv_oct]) of {ok, [{recv_oct, RecvOct}]} -> {ok, RecvOct}; {error, Error} -> {error, Error} end end, - KeepAlive = emqttd_keepalive:start(StatFun, Interval, {keepalive, check}), - hibernate(State#client_state{keepalive = KeepAlive}); + case emqttd_keepalive:start(StatFun, Interval, {keepalive, check}) of + {ok, KeepAlive} -> + {noreply, State#client_state{keepalive = KeepAlive}, hibernate}; + {error, Error} -> + ?LOG(warning, "Keepalive error - ~p", [Error], State), + shutdown(Error, State) + end; handle_info({keepalive, check}, State = #client_state{keepalive = KeepAlive}) -> case emqttd_keepalive:check(KeepAlive) of {ok, KeepAlive1} -> - hibernate(State#client_state{keepalive = KeepAlive1}); + {noreply, State#client_state{keepalive = KeepAlive1}, hibernate}; {error, timeout} -> ?LOG(debug, "Keepalive timeout", [], State), shutdown(keepalive_timeout, State); @@ -224,10 +275,10 @@ handle_info({keepalive, check}, State = #client_state{keepalive = KeepAlive}) -> handle_info(Info, State) -> ?UNEXPECTED_INFO(Info, State). -terminate(Reason, #client_state{connection = Connection, +terminate(Reason, #client_state{connection = Conn, keepalive = KeepAlive, proto_state = ProtoState}) -> - Connection:fast_close(), + Conn:fast_close(), emqttd_keepalive:cancel(KeepAlive), case {ProtoState, Reason} of {undefined, _} -> @@ -245,25 +296,21 @@ code_change(_OldVsn, State, _Extra) -> %% Internal functions %%-------------------------------------------------------------------- -with_proto_state(Fun, State = #client_state{proto_state = ProtoState}) -> - {ok, ProtoState1} = Fun(ProtoState), - hibernate(State#client_state{proto_state = ProtoState1}). - -%% Receive and parse tcp data +%% Receive and Parse TCP Data received(<<>>, State) -> - hibernate(State); + {noreply, gc(State), hibernate}; -received(Bytes, State = #client_state{parser_fun = ParserFun, - packet_opts = PacketOpts, +received(Bytes, State = #client_state{parser = Parser, + packet_size = PacketSize, proto_state = ProtoState}) -> - case catch ParserFun(Bytes) of - {more, NewParser} -> - noreply(run_socket(State#client_state{parser_fun = NewParser})); + case catch emqttd_parser:parse(Bytes, Parser) of + {more, NewParser} -> + {noreply, run_socket(State#client_state{parser = NewParser}), hibernate}; {ok, Packet, Rest} -> emqttd_metrics:received(Packet), case emqttd_protocol:received(Packet, ProtoState) of {ok, ProtoState1} -> - received(Rest, State#client_state{parser_fun = emqttd_parser:new(PacketOpts), + received(Rest, State#client_state{parser = emqttd_parser:initial_state(PacketSize), proto_state = ProtoState1}); {error, Error} -> ?LOG(error, "Protocol error - ~p", [Error], State), @@ -289,7 +336,7 @@ rate_limit(Size, State = #client_state{rate_limit = Rl}) -> {0, Rl1} -> run_socket(State#client_state{conn_state = running, rate_limit = Rl1}); {Pause, Rl1} -> - ?LOG(error, "Rate limiter pause for ~p", [Pause], State), + ?LOG(warning, "Rate limiter pause for ~p", [Pause], State), erlang:send_after(Pause, self(), activate_sock), State#client_state{conn_state = blocked, rate_limit = Rl1} end. @@ -298,15 +345,31 @@ run_socket(State = #client_state{conn_state = blocked}) -> State; run_socket(State = #client_state{await_recv = true}) -> State; -run_socket(State = #client_state{connection = Connection}) -> - Connection:async_recv(0, infinity), +run_socket(State = #client_state{connection = Conn}) -> + Conn:async_recv(0, infinity), State#client_state{await_recv = true}. -noreply(State) -> - {noreply, State}. +with_proto(Fun, State = #client_state{proto_state = ProtoState}) -> + {ok, ProtoState1} = Fun(ProtoState), + {noreply, State#client_state{proto_state = ProtoState1}, hibernate}. -hibernate(State) -> - {noreply, State, hibernate}. +emit_stats(State = #client_state{proto_state = ProtoState}) -> + emit_stats(emqttd_protocol:clientid(ProtoState), State). + +emit_stats(_ClientId, State = #client_state{enable_stats = false}) -> + State; +emit_stats(undefined, State) -> + State; +emit_stats(ClientId, State) -> + {reply, Stats, _, _} = handle_call(stats, undefined, State), + emqttd_stats:set_client_stats(ClientId, Stats), + State. + +sock_stats(#client_state{connection = Conn}) -> + case Conn:getstat(?SOCK_STATS) of {ok, Ss} -> Ss; {error, _} -> [] end. + +reply(Reply, State) -> + {reply, Reply, State, hibernate}. shutdown(Reason, State) -> stop({shutdown, Reason}, State). @@ -314,3 +377,7 @@ shutdown(Reason, State) -> stop(Reason, State) -> {stop, Reason, State}. +gc(State = #client_state{connection = Conn}) -> + Cb = fun() -> Conn:gc() end, + emqttd_gc:maybe_force_gc(#client_state.force_gc_count, State, Cb). + diff --git a/src/emqttd_cluster.erl b/src/emqttd_cluster.erl index 7c83c079c..7990a5d51 100644 --- a/src/emqttd_cluster.erl +++ b/src/emqttd_cluster.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_cluster). +-author("Feng Lee "). + -include("emqttd.hrl"). %% Cluster API diff --git a/src/emqttd_cm.erl b/src/emqttd_cm.erl index 6b40a480f..2e57ebe5b 100644 --- a/src/emqttd_cm.erl +++ b/src/emqttd_cm.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -15,10 +15,13 @@ %%-------------------------------------------------------------------- %% @doc MQTT Client Manager + -module(emqttd_cm). -behaviour(gen_server2). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_internal.hrl"). @@ -120,6 +123,7 @@ handle_info({'DOWN', MRef, process, DownPid, _Reason}, State) -> {ok, {ClientId, DownPid}} -> case lookup_proc(ClientId) of DownPid -> + emqttd_stats:del_client_stats(ClientId), ets:delete(mqtt_client, ClientId); _ -> ignore diff --git a/src/emqttd_cm_sup.erl b/src/emqttd_cm_sup.erl index dfa623cc3..fc01ea649 100644 --- a/src/emqttd_cm_sup.erl +++ b/src/emqttd_cm_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -15,10 +15,13 @@ %%-------------------------------------------------------------------- %% @doc Client Manager Supervisor. + -module(emqttd_cm_sup). -behaviour(supervisor). +-author("Feng Lee "). + -include("emqttd.hrl"). %% API diff --git a/src/emqttd_ctl.erl b/src/emqttd_ctl.erl index c0b7dcf70..0aa8ce353 100644 --- a/src/emqttd_ctl.erl +++ b/src/emqttd_ctl.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ -behaviour(gen_server). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_cli.hrl"). @@ -134,7 +136,9 @@ next_seq(State = #state{seq = Seq}) -> State#state{seq = Seq + 1}. -ifdef(TEST). + -include_lib("eunit/include/eunit.hrl"). + register_cmd_test_() -> {setup, fun() -> @@ -149,4 +153,5 @@ register_cmd_test_() -> [?_assertMatch([{{0,test0},{?MODULE, test0}, []}], ets:lookup(?CMD_TAB, {Seq,test0}))] end }. + -endif. diff --git a/src/emqttd_gc.erl b/src/emqttd_gc.erl new file mode 100644 index 000000000..75545a77f --- /dev/null +++ b/src/emqttd_gc.erl @@ -0,0 +1,50 @@ +%%-------------------------------------------------------------------- +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%%-------------------------------------------------------------------- + +%% GC Utility functions. + +-module(emqttd_gc). + +-author("Feng Lee "). + +-export([conn_max_gc_count/0, reset_conn_gc_count/2, maybe_force_gc/2, + maybe_force_gc/3]). + +-spec(conn_max_gc_count() -> integer()). +conn_max_gc_count() -> + case emqttd:env(conn_force_gc_count) of + {ok, I} when I > 0 -> I + rand:uniform(I); + {ok, I} when I =< 0 -> undefined; + undefined -> undefined + end. + +-spec(reset_conn_gc_count(pos_integer(), tuple()) -> tuple()). +reset_conn_gc_count(Pos, State) -> + case element(Pos, State) of + undefined -> State; + _I -> setelement(Pos, State, conn_max_gc_count()) + end. + +maybe_force_gc(Pos, State) -> + maybe_force_gc(Pos, State, fun() -> ok end). +maybe_force_gc(Pos, State, Cb) -> + case element(Pos, State) of + undefined -> State; + I when I =< 0 -> Cb(), garbage_collect(), + reset_conn_gc_count(Pos, State); + I -> setelement(Pos, State, I - 1) + end. + diff --git a/src/emqttd_gen_mod.erl b/src/emqttd_gen_mod.erl index b201f7bdd..824b65f4c 100644 --- a/src/emqttd_gen_mod.erl +++ b/src/emqttd_gen_mod.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -15,15 +15,18 @@ %%-------------------------------------------------------------------- %% @doc emqttd gen_mod behaviour + -module(emqttd_gen_mod). +-author("Feng Lee "). + -include("emqttd.hrl"). -ifdef(use_specs). --callback load(Opts :: any()) -> ok | {error, any()}. +-callback(load(Opts :: any()) -> ok | {error, any()}). --callback unload(State :: any()) -> any(). +-callback(unload(State :: any()) -> any()). -else. @@ -35,4 +38,3 @@ behaviour_info(_Other) -> undefined. -endif. - diff --git a/src/emqttd_guid.erl b/src/emqttd_guid.erl index a4c2d1ea4..24199fa01 100644 --- a/src/emqttd_guid.erl +++ b/src/emqttd_guid.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -27,13 +27,14 @@ %% 4. Sequence: 2 bytes sequence in one process %% %% @end + -module(emqttd_guid). -export([gen/0, new/0, timestamp/1, to_hexstr/1, from_hexstr/1, to_base62/1, from_base62/1]). -define(MAX_SEQ, 16#FFFF). --type guid() :: <<_:128>>. +-type(guid() :: <<_:128>>). %% @doc Generate a global unique id. -spec(gen() -> guid()). diff --git a/src/emqttd_hook.erl b/src/emqttd_hooks.erl similarity index 52% rename from src/emqttd_hook.erl rename to src/emqttd_hooks.erl index 675698688..693a67ff7 100644 --- a/src/emqttd_hook.erl +++ b/src/emqttd_hooks.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2016 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ %% limitations under the License. %%-------------------------------------------------------------------- --module(emqttd_hook). - --author("Feng Lee "). +-module(emqttd_hooks). -behaviour(gen_server). +-author("Feng Lee "). + %% Start -export([start_link/0]). @@ -32,7 +32,12 @@ -record(state, {}). --record(callback, {function :: function(), +-type(hooktag() :: atom() | string() | binary()). + +-export_type([hooktag/0]). + +-record(callback, {tag :: hooktag(), + function :: function(), init_args = [] :: list(any()), priority = 0 :: integer()}). @@ -40,10 +45,6 @@ -define(HOOK_TAB, mqtt_hook). -%%-------------------------------------------------------------------- -%% Start API -%%-------------------------------------------------------------------- - start_link() -> gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). @@ -51,17 +52,24 @@ start_link() -> %% Hooks API %%-------------------------------------------------------------------- --spec(add(atom(), function(), list(any())) -> ok). -add(HookPoint, Function, InitArgs) -> - add(HookPoint, Function, InitArgs, 0). +-spec(add(atom(), function() | {hooktag(), function()}, list(any())) -> ok). +add(HookPoint, Function, InitArgs) when is_function(Function) -> + add(HookPoint, {undefined, Function}, InitArgs, 0); --spec(add(atom(), function(), list(any()), integer()) -> ok). -add(HookPoint, Function, InitArgs, Priority) -> - gen_server:call(?MODULE, {add, HookPoint, Function, InitArgs, Priority}). +add(HookPoint, {Tag, Function}, InitArgs) when is_function(Function) -> + add(HookPoint, {Tag, Function}, InitArgs, 0). --spec(delete(atom(), function()) -> ok). -delete(HookPoint, Function) -> - gen_server:call(?MODULE, {delete, HookPoint, Function}). +-spec(add(atom(), function() | {hooktag(), function()}, list(any()), integer()) -> ok). +add(HookPoint, Function, InitArgs, Priority) when is_function(Function) -> + add(HookPoint, {undefined, Function}, InitArgs, Priority); +add(HookPoint, {Tag, Function}, InitArgs, Priority) when is_function(Function) -> + gen_server:call(?MODULE, {add, HookPoint, {Tag, Function}, InitArgs, Priority}). + +-spec(delete(atom(), function() | {hooktag(), function()}) -> ok). +delete(HookPoint, Function) when is_function(Function) -> + delete(HookPoint, {undefined, Function}); +delete(HookPoint, {Tag, Function}) when is_function(Function) -> + gen_server:call(?MODULE, {delete, HookPoint, {Tag, Function}}). %% @doc Run hooks without Acc. -spec(run(atom(), list(Arg :: any())) -> ok | stop). @@ -89,7 +97,8 @@ run_([#callback{function = Fun, init_args = InitArgs} | Callbacks], Args, Acc) - ok -> run_(Callbacks, Args, Acc); {ok, NewAcc} -> run_(Callbacks, Args, NewAcc); stop -> {stop, Acc}; - {stop, NewAcc} -> {stop, NewAcc} + {stop, NewAcc} -> {stop, NewAcc}; + _Any -> run_(Callbacks, Args, Acc) end; run_([], _Args, Acc) -> @@ -98,8 +107,8 @@ run_([], _Args, Acc) -> -spec(lookup(atom()) -> [#callback{}]). lookup(HookPoint) -> case ets:lookup(?HOOK_TAB, HookPoint) of - [] -> []; - [#hook{callbacks = Callbacks}] -> Callbacks + [#hook{callbacks = Callbacks}] -> Callbacks; + [] -> [] end. %%-------------------------------------------------------------------- @@ -110,39 +119,38 @@ init([]) -> ets:new(?HOOK_TAB, [set, protected, named_table, {keypos, #hook.name}]), {ok, #state{}}. -handle_call({add, HookPoint, Function, InitArgs, Priority}, _From, State) -> - Reply = - case ets:lookup(?HOOK_TAB, HookPoint) of - [#hook{callbacks = Callbacks}] -> - case lists:keyfind(Function, #callback.function, Callbacks) of - false -> - Callback = #callback{function = Function, - init_args = InitArgs, - priority = Priority}, - insert_hook_(HookPoint, add_callback_(Callback, Callbacks)); - _Callback -> - {error, already_hooked} - end; - [] -> - Callback = #callback{function = Function, - init_args = InitArgs, - priority = Priority}, - insert_hook_(HookPoint, [Callback]) - end, - {reply, Reply, State}; +handle_call({add, HookPoint, {Tag, Function}, InitArgs, Priority}, _From, State) -> + Callback = #callback{tag = Tag, function = Function, + init_args = InitArgs, priority = Priority}, + {reply, + case ets:lookup(?HOOK_TAB, HookPoint) of + [#hook{callbacks = Callbacks}] -> + case contain_(Tag, Function, Callbacks) of + false -> + insert_hook_(HookPoint, add_callback_(Callback, Callbacks)); + true -> + {error, already_hooked} + end; + [] -> + insert_hook_(HookPoint, [Callback]) + end, State}; -handle_call({delete, HookPoint, Function}, _From, State) -> - Reply = - case ets:lookup(?HOOK_TAB, HookPoint) of - [#hook{callbacks = Callbacks}] -> - insert_hook_(HookPoint, del_callback_(Function, Callbacks)); - [] -> - {error, not_found} - end, - {reply, Reply, State}; +handle_call({delete, HookPoint, {Tag, Function}}, _From, State) -> + {reply, + case ets:lookup(?HOOK_TAB, HookPoint) of + [#hook{callbacks = Callbacks}] -> + case contain_(Tag, Function, Callbacks) of + true -> + insert_hook_(HookPoint, del_callback_(Tag, Function, Callbacks)); + false -> + {error, not_found} + end; + [] -> + {error, not_found} + end, State}; -handle_call(_Req, _From, State) -> - {reply, ignore, State}. +handle_call(Req, _From, State) -> + {reply, {error, {unexpected_request, Req}}, State}. handle_cast(_Msg, State) -> {noreply, State}. @@ -166,6 +174,16 @@ insert_hook_(HookPoint, Callbacks) -> add_callback_(Callback, Callbacks) -> lists:keymerge(#callback.priority, Callbacks, [Callback]). -del_callback_(Function, Callbacks) -> - lists:keydelete(Function, #callback.function, Callbacks). +del_callback_(Tag, Function, Callbacks) -> + lists:filter( + fun(#callback{tag = Tag1, function = Func1}) -> + not ((Tag =:= Tag1) andalso (Function =:= Func1)) + end, Callbacks). + +contain_(_Tag, _Function, []) -> + false; +contain_(Tag, Function, [#callback{tag = Tag, function = Function}|_Callbacks]) -> + true; +contain_(Tag, Function, [_Callback | Callbacks]) -> + contain_(Tag, Function, Callbacks). diff --git a/src/emqttd_http.erl b/src/emqttd_http.erl index 69b9f827a..692477447 100644 --- a/src/emqttd_http.erl +++ b/src/emqttd_http.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,9 +14,12 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc emqttd http publish API and websocket client. +%% @doc HTTP publish API and websocket client. + -module(emqttd_http). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). @@ -98,7 +101,7 @@ http_publish(Req) -> Msg = emqttd_message:make(ClientId, Qos, Topic, Payload), emqttd:publish(Msg#mqtt_message{retain = Retain}) end, Topics), - Req:ok({"text/plain", <<"ok">>}); + Req:ok({"text/plain", <<"OK">>}); {false, _} -> Req:respond({400, [], <<"Bad QoS">>}); {_, false} -> diff --git a/src/emqttd_inflight.erl b/src/emqttd_inflight.erl new file mode 100644 index 000000000..bb9af390b --- /dev/null +++ b/src/emqttd_inflight.erl @@ -0,0 +1,94 @@ +%%-------------------------------------------------------------------- +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%%-------------------------------------------------------------------- + +%% @doc Inflight Window that wraps the gb_trees. + +-module(emqttd_inflight). + +-author("Feng Lee "). + +-export([new/1, contain/2, lookup/2, insert/3, update/3, delete/2, values/1, + to_list/1, size/1, max_size/1, is_full/1, is_empty/1, window/1]). + +-type(inflight() :: {?MODULE, list()}). + +-export_type([inflight/0]). + +-spec(new(non_neg_integer()) -> inflight()). +new(MaxSize) when MaxSize >= 0 -> + {?MODULE, [MaxSize, gb_trees:empty()]}. + +-spec(contain(Key :: any(), inflight()) -> boolean()). +contain(Key, {?MODULE, [_MaxSize, Tree]}) -> + gb_trees:is_defined(Key, Tree). + +-spec(lookup(Key :: any(), inflight()) -> any()). +lookup(Key, {?MODULE, [_MaxSize, Tree]}) -> + gb_trees:get(Key, Tree). + +-spec(insert(Key :: any(), Value :: any(), inflight()) -> inflight()). +insert(Key, Value, {?MODULE, [MaxSize, Tree]}) -> + {?MODULE, [MaxSize, gb_trees:insert(Key, Value, Tree)]}. + +-spec(delete(Key :: any(), inflight()) -> inflight()). +delete(Key, {?MODULE, [MaxSize, Tree]}) -> + {?MODULE, [MaxSize, gb_trees:delete(Key, Tree)]}. + +-spec(update(Key :: any(), Val :: any(), inflight()) -> inflight()). +update(Key, Val, {?MODULE, [MaxSize, Tree]}) -> + {?MODULE, [MaxSize, gb_trees:update(Key, Val, Tree)]}. + +-spec(is_full(inflight()) -> boolean()). +is_full({?MODULE, [0, _Tree]}) -> + false; +is_full({?MODULE, [MaxSize, Tree]}) -> + MaxSize =< gb_trees:size(Tree). + +-spec(is_empty(inflight()) -> boolean()). +is_empty({?MODULE, [_MaxSize, Tree]}) -> + gb_trees:is_empty(Tree). + +-spec(smallest(inflight()) -> {K :: any(), V :: any()}). +smallest({?MODULE, [_MaxSize, Tree]}) -> + gb_trees:smallest(Tree). + +-spec(largest(inflight()) -> {K :: any(), V :: any()}). +largest({?MODULE, [_MaxSize, Tree]}) -> + gb_trees:largest(Tree). + +-spec(values(inflight()) -> list()). +values({?MODULE, [_MaxSize, Tree]}) -> + gb_trees:values(Tree). + +-spec(to_list(inflight()) -> list({K :: any(), V :: any()})). +to_list({?MODULE, [_MaxSize, Tree]}) -> + gb_trees:to_list(Tree). + +-spec(window(inflight()) -> list()). +window(Inflight = {?MODULE, [_MaxSize, Tree]}) -> + case gb_trees:is_empty(Tree) of + true -> []; + false -> [Key || {Key, _Val} <- [smallest(Inflight), largest(Inflight)]] + end. + +-spec(size(inflight()) -> non_neg_integer()). +size({?MODULE, [_MaxSize, Tree]}) -> + gb_trees:size(Tree). + +-spec(max_size(inflight()) -> non_neg_integer()). +max_size({?MODULE, [MaxSize, _Tree]}) -> + MaxSize. + diff --git a/src/emqttd_keepalive.erl b/src/emqttd_keepalive.erl index 54a4d20e5..5d26ea8a6 100644 --- a/src/emqttd_keepalive.erl +++ b/src/emqttd_keepalive.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -15,25 +15,32 @@ %%-------------------------------------------------------------------- %% @doc Client Keepalive + -module(emqttd_keepalive). +-author("Feng Lee "). + -export([start/3, check/1, cancel/1]). --record(keepalive, {statfun, statval, - tsec, tmsg, tref, - repeat = 0}). +-record(keepalive, {statfun, statval, tsec, tmsg, tref, repeat = 0}). --type keepalive() :: #keepalive{}. +-type(keepalive() :: #keepalive{}). + +-export_type([keepalive/0]). %% @doc Start a keepalive --spec(start(fun(), integer(), any()) -> undefined | keepalive()). +-spec(start(fun(), integer(), any()) -> {ok, keepalive()} | {error, any()}). start(_, 0, _) -> - undefined; + {ok, #keepalive{}}; start(StatFun, TimeoutSec, TimeoutMsg) -> - {ok, StatVal} = StatFun(), - #keepalive{statfun = StatFun, statval = StatVal, - tsec = TimeoutSec, tmsg = TimeoutMsg, - tref = timer(TimeoutSec, TimeoutMsg)}. + case StatFun() of + {ok, StatVal} -> + {ok, #keepalive{statfun = StatFun, statval = StatVal, + tsec = TimeoutSec, tmsg = TimeoutMsg, + tref = timer(TimeoutSec, TimeoutMsg)}}; + {error, Error} -> + {error, Error} + end. %% @doc Check keepalive, called when timeout. -spec(check(keepalive()) -> {ok, keepalive()} | {error, any()}). @@ -56,12 +63,10 @@ resume(KeepAlive = #keepalive{tsec = TimeoutSec, tmsg = TimeoutMsg}) -> %% @doc Cancel Keepalive -spec(cancel(keepalive()) -> ok). -cancel(#keepalive{tref = TRef}) -> - cancel(TRef); -cancel(undefined) -> - ok; -cancel(TRef) -> - catch erlang:cancel_timer(TRef). +cancel(#keepalive{tref = TRef}) when is_reference(TRef) -> + catch erlang:cancel_timer(TRef), ok; +cancel(_) -> + ok. timer(Sec, Msg) -> erlang:send_after(timer:seconds(Sec), self(), Msg). diff --git a/src/emqttd_message.erl b/src/emqttd_message.erl index ec4a02479..4c3bea0d8 100644 --- a/src/emqttd_message.erl +++ b/src/emqttd_message.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ %%-------------------------------------------------------------------- %% @doc MQTT Message Functions + -module(emqttd_message). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). @@ -42,7 +45,7 @@ make(From, Qos, Topic, Payload) -> qos = ?QOS_I(Qos), topic = Topic, payload = Payload, - timestamp = emqttd_time:now_to_secs()}. + timestamp = os:timestamp()}. %% @doc Message from Packet -spec(from_packet(mqtt_packet()) -> mqtt_message()). @@ -60,7 +63,7 @@ from_packet(#mqtt_packet{header = #mqtt_packet_header{type = ?PUBLISH, dup = Dup, topic = Topic, payload = Payload, - timestamp = emqttd_time:now_to_secs()}; + timestamp = os:timestamp()}; from_packet(#mqtt_packet_connect{will_flag = false}) -> undefined; @@ -78,7 +81,7 @@ from_packet(#mqtt_packet_connect{client_id = ClientId, qos = Qos, dup = false, payload = Msg, - timestamp = emqttd_time:now_to_secs()}. + timestamp = os:timestamp()}. from_packet(ClientId, Packet) -> Msg = from_packet(Packet), diff --git a/src/emqttd_metrics.erl b/src/emqttd_metrics.erl index 6f7a53f5a..2c0e42ea0 100644 --- a/src/emqttd_metrics.erl +++ b/src/emqttd_metrics.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,11 +14,12 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc emqttd metrics. responsible for collecting broker metrics. -module(emqttd_metrics). -behaviour(gen_server). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). @@ -37,7 +38,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --record(state, {tick_tref}). +-record(state, {tick}). -define(METRIC_TAB, mqtt_metric). @@ -57,12 +58,16 @@ {counter, 'packets/publish/sent'}, % PUBLISH packets sent {counter, 'packets/puback/received'}, % PUBACK packets received {counter, 'packets/puback/sent'}, % PUBACK packets sent + {counter, 'packets/puback/missed'}, % PUBACK packets missed {counter, 'packets/pubrec/received'}, % PUBREC packets received {counter, 'packets/pubrec/sent'}, % PUBREC packets sent + {counter, 'packets/pubrec/missed'}, % PUBREC packets missed {counter, 'packets/pubrel/received'}, % PUBREL packets received {counter, 'packets/pubrel/sent'}, % PUBREL packets sent + {counter, 'packets/pubrel/missed'}, % PUBREL packets missed {counter, 'packets/pubcomp/received'}, % PUBCOMP packets received {counter, 'packets/pubcomp/sent'}, % PUBCOMP packets sent + {counter, 'packets/pubcomp/missed'}, % PUBCOMP packets missed {counter, 'packets/subscribe'}, % SUBSCRIBE Packets received {counter, 'packets/suback'}, % SUBACK packets sent {counter, 'packets/unsubscribe'}, % UNSUBSCRIBE Packets received @@ -74,14 +79,15 @@ %% Messages sent and received of broker -define(SYSTOP_MESSAGES, [ - {counter, 'messages/received'}, % Messages received - {counter, 'messages/sent'}, % Messages sent - {counter, 'messages/qos0/received'}, % Messages received - {counter, 'messages/qos0/sent'}, % Messages sent - {counter, 'messages/qos1/received'}, % Messages received - {counter, 'messages/qos1/sent'}, % Messages sent - {counter, 'messages/qos2/received'}, % Messages received - {counter, 'messages/qos2/sent'}, % Messages sent + {counter, 'messages/received'}, % All Messages received + {counter, 'messages/sent'}, % All Messages sent + {counter, 'messages/qos0/received'}, % QoS0 Messages received + {counter, 'messages/qos0/sent'}, % QoS0 Messages sent + {counter, 'messages/qos1/received'}, % QoS1 Messages received + {counter, 'messages/qos1/sent'}, % QoS1 Messages sent + {counter, 'messages/qos2/received'}, % QoS2 Messages received + {counter, 'messages/qos2/sent'}, % QoS2 Messages sent + {counter, 'messages/qos2/dropped'}, % QoS2 Messages dropped {gauge, 'messages/retained'}, % Messagea retained {counter, 'messages/dropped'} % Messages dropped ]). @@ -138,7 +144,7 @@ qos_received(?QOS_2) -> sent(?PUBLISH_PACKET(_Qos, <<"$SYS/", _/binary>>, _, _)) -> ignore; sent(Packet) -> - emqttd_metrics:inc('packets/sent'), + inc('packets/sent'), sent1(Packet). sent1(?PUBLISH_PACKET(Qos, _PktId)) -> inc('packets/publish/sent'), @@ -245,7 +251,7 @@ init([]) -> % $SYS Topics for metrics % [ok = emqttd:create(topic, metric_topic(Topic)) || {_, Topic} <- Metrics], % Tick to publish metrics - {ok, #state{tick_tref = emqttd_broker:start_tick(tick)}, hibernate}. + {ok, #state{tick = emqttd_broker:start_tick(tick)}, hibernate}. handle_call(_Req, _From, State) -> {reply, error, State}. @@ -261,7 +267,7 @@ handle_info(tick, State) -> handle_info(_Info, State) -> {noreply, State}. -terminate(_Reason, #state{tick_tref = TRef}) -> +terminate(_Reason, #state{tick = TRef}) -> emqttd_broker:stop_tick(TRef). code_change(_OldVsn, State, _Extra) -> diff --git a/src/emqttd_opts.erl b/src/emqttd_misc.erl similarity index 51% rename from src/emqttd_opts.erl rename to src/emqttd_misc.erl index 8f5f3fea5..e60d27d4f 100644 --- a/src/emqttd_opts.erl +++ b/src/emqttd_misc.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,12 +14,15 @@ %% limitations under the License. %%-------------------------------------------------------------------- --module(emqttd_opts). +-module(emqttd_misc). --export([merge/2]). +-author("Feng Lee "). + +-export([merge_opts/2, start_timer/2, start_timer/3, cancel_timer/1, + proc_stats/0, proc_stats/1]). %% @doc Merge Options -merge(Defaults, Options) -> +merge_opts(Defaults, Options) -> lists:foldl( fun({Opt, Val}, Acc) -> case lists:keymember(Opt, 1, Acc) of @@ -33,3 +36,30 @@ merge(Defaults, Options) -> end end, Defaults, Options). +-spec(start_timer(integer(), term()) -> reference()). +start_timer(Interval, Msg) -> + start_timer(Interval, self(), Msg). + +-spec(start_timer(integer(), pid() | atom(), term()) -> reference()). +start_timer(Interval, Dest, Msg) -> + erlang:start_timer(Interval, Dest, Msg). + +-spec(cancel_timer(undefined | reference()) -> ok). +cancel_timer(undefined) -> + ok; +cancel_timer(Timer) -> + case catch erlang:cancel_timer(Timer) of + false -> receive {timeout, Timer, _} -> ok after 0 -> ok end; + _ -> ok + end. + +-spec(proc_stats() -> list()). +proc_stats() -> + proc_stats(self()). + +-spec(proc_stats(pid()) -> list()). +proc_stats(Pid) -> + Stats = process_info(Pid, [message_queue_len, heap_size, reductions]), + {value, {_, V}, Stats1} = lists:keytake(message_queue_len, 1, Stats), + [{mailbox_len, V} | Stats1]. + diff --git a/src/emqttd_mnesia.erl b/src/emqttd_mnesia.erl index 52dca1d1b..31fa88d3a 100644 --- a/src/emqttd_mnesia.erl +++ b/src/emqttd_mnesia.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_mnesia). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_internal.hrl"). diff --git a/src/emqttd_mod_sup.erl b/src/emqttd_mod_sup.erl index 57b13bc37..586d5af1a 100644 --- a/src/emqttd_mod_sup.erl +++ b/src/emqttd_mod_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -39,11 +39,7 @@ start_link() -> start_child(ChildSpec) when is_tuple(ChildSpec) -> supervisor:start_child(?MODULE, ChildSpec). -%% -%% start_child(Mod::atom(), Type::type()) -> {ok, pid()} -%% @type type() = worker | supervisor -%% -start_child(Mod, Type) when is_atom(Mod) and is_atom(Type) -> +start_child(Mod, Type) when is_atom(Mod) andalso is_atom(Type) -> supervisor:start_child(?MODULE, ?CHILD(Mod, Type)). -spec(stop_child(any()) -> ok | {error, any()}). diff --git a/src/emqttd_mqueue.erl b/src/emqttd_mqueue.erl index 53f37206f..4f825329a 100644 --- a/src/emqttd_mqueue.erl +++ b/src/emqttd_mqueue.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -43,52 +43,50 @@ -module(emqttd_mqueue). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). -import(proplists, [get_value/3]). --export([new/3, type/1, name/1, is_empty/1, len/1, max_len/1, in/2, out/1, stats/1]). +-export([new/3, type/1, name/1, is_empty/1, len/1, max_len/1, in/2, out/1, + dropped/1, stats/1]). -define(LOW_WM, 0.2). -define(HIGH_WM, 0.6). --type priority() :: {iolist(), pos_integer()}. +-type(priority() :: {iolist(), pos_integer()}). --type option() :: {type, simple | priority} +-type(option() :: {type, simple | priority} | {max_length, pos_integer() | infinity} | {priority, list(priority())} - | {low_watermark, float()} %% Low watermark - | {high_watermark, float()} %% High watermark - | {queue_qos0, boolean()}. %% Queue Qos0? + | {low_watermark, float()} %% Low watermark + | {high_watermark, float()} %% High watermark + | {queue_qos0, boolean()}). %% Queue Qos0? --type mqueue_option() :: {max_length, pos_integer()} %% Max queue length - | {low_watermark, float()} %% Low watermark - | {high_watermark, float()} %% High watermark - | {queue_qos0, boolean()}. %% Queue Qos0 - --type stat() :: {max_len, infinity | pos_integer()} +-type(stat() :: {max_len, infinity | pos_integer()} | {len, non_neg_integer()} - | {dropped, non_neg_integer()}. + | {dropped, non_neg_integer()}). -record(mqueue, {type :: simple | priority, name, q :: queue:queue() | priority_queue:q(), %% priority table pseq = 0, priorities = [], %% len of simple queue - len = 0, max_len = ?MAX_LEN, + len = 0, max_len = infinity, low_wm = ?LOW_WM, high_wm = ?HIGH_WM, qos0 = false, dropped = 0, alarm_fun}). --type mqueue() :: #mqueue{}. +-type(mqueue() :: #mqueue{}). -export_type([mqueue/0, priority/0, option/0]). %% @doc New Queue. --spec(new(iolist(), list(mqueue_option()), fun()) -> mqueue()). +-spec(new(iolist(), list(option()), fun()) -> mqueue()). new(Name, Opts, AlarmFun) -> Type = get_value(type, Opts, simple), MaxLen = get_value(max_length, Opts, infinity), @@ -141,6 +139,10 @@ len(#mqueue{type = priority, q = Q}) -> priority_queue:len(Q). max_len(#mqueue{max_len= MaxLen}) -> MaxLen. +%% @doc Dropped of the mqueue +-spec(dropped(mqueue()) -> non_neg_integer()). +dropped(#mqueue{dropped = Dropped}) -> Dropped. + %% @doc Stats of the mqueue -spec(stats(mqueue()) -> [stat()]). stats(#mqueue{type = Type, q = Q, max_len = MaxLen, len = Len, dropped = Dropped}) -> @@ -208,14 +210,12 @@ maybe_set_alarm(MQ = #mqueue{name = Name, len = Len, high_wm = HighWM, alarm_fun title = io_lib:format("Queue ~s high-water mark", [Name]), summary = io_lib:format("queue len ~p > high_watermark ~p", [Len, HighWM])}, MQ#mqueue{alarm_fun = AlarmFun(alert, Alarm)}; - maybe_set_alarm(MQ) -> MQ. maybe_clear_alarm(MQ = #mqueue{name = Name, len = Len, low_wm = LowWM, alarm_fun = AlarmFun}) when Len < LowWM -> MQ#mqueue{alarm_fun = AlarmFun(clear, list_to_binary(["queue_high_watermark.", Name]))}; - maybe_clear_alarm(MQ) -> MQ. diff --git a/src/emqttd_net.erl b/src/emqttd_net.erl index 8278e1f74..1f246a315 100644 --- a/src/emqttd_net.erl +++ b/src/emqttd_net.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,7 +14,6 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc emqttd net utilities. -module(emqttd_net). -include_lib("kernel/include/inet.hrl"). diff --git a/src/emqttd_node.erl b/src/emqttd_node.erl index e48f71fae..ecf44503f 100644 --- a/src/emqttd_node.erl +++ b/src/emqttd_node.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_node). +-author("Feng Lee "). + -import(lists, [concat/1]). -export([is_aliving/1, parse_name/1]). diff --git a/src/emqttd_packet.erl b/src/emqttd_packet.erl index 38de31fe0..6349e58b1 100644 --- a/src/emqttd_packet.erl +++ b/src/emqttd_packet.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc MQTT Packet Functions -module(emqttd_packet). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). @@ -28,12 +29,13 @@ %% @doc Protocol name of version -spec(protocol_name(mqtt_vsn()) -> binary()). -protocol_name(Ver) when Ver =:= ?MQTT_PROTO_V31; Ver =:= ?MQTT_PROTO_V311 -> - proplists:get_value(Ver, ?PROTOCOL_NAMES). +protocol_name(?MQTT_PROTO_V3) -> <<"MQIsdp">>; +protocol_name(?MQTT_PROTO_V4) -> <<"MQTT">>; +protocol_name(?MQTT_PROTO_V5) -> <<"MQTT">>. %% @doc Name of MQTT packet type -spec(type_name(mqtt_packet_type()) -> atom()). -type_name(Type) when Type > ?RESERVED andalso Type =< ?DISCONNECT -> +type_name(Type) when Type > ?RESERVED andalso Type =< ?AUTH -> lists:nth(Type, ?TYPE_NAMES). %% @doc Connack Name diff --git a/src/emqttd_parser.erl b/src/emqttd_parser.erl index d6c09c42e..dde9ae4dc 100644 --- a/src/emqttd_parser.erl +++ b/src/emqttd_parser.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -17,32 +17,31 @@ %% @doc MQTT Packet Parser -module(emqttd_parser). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). %% API --export([new/1, parse/2]). +-export([initial_state/0, initial_state/1, parse/2]). --record(mqtt_packet_limit, {max_packet_size}). +-type(max_packet_size() :: 1..?MAX_PACKET_SIZE). --type option() :: {atom(), any()}. - --type parser() :: fun( (binary()) -> any() ). +-spec(initial_state() -> {none, max_packet_size()}). +initial_state() -> + initial_state(?MAX_PACKET_SIZE). %% @doc Initialize a parser --spec(new(Opts :: [option()]) -> parser()). -new(Opts) -> - fun(Bin) -> parse(Bin, {none, limit(Opts)}) end. - -limit(Opts) -> - #mqtt_packet_limit{max_packet_size = proplists:get_value(max_packet_size, Opts, ?MAX_LEN)}. +-spec(initial_state(max_packet_size()) -> {none, max_packet_size()}). +initial_state(MaxSize) -> + {none, MaxSize}. %% @doc Parse MQTT Packet --spec(parse(binary(), {none, [option()]} | fun()) +-spec(parse(binary(), {none, pos_integer()} | fun()) -> {ok, mqtt_packet()} | {error, any()} | {more, fun()}). -parse(<<>>, {none, Limit}) -> - {more, fun(Bin) -> parse(Bin, {none, Limit}) end}; +parse(<<>>, {none, MaxLen}) -> + {more, fun(Bin) -> parse(Bin, {none, MaxLen}) end}; parse(<>, {none, Limit}) -> parse_remaining_len(Rest, #mqtt_packet_header{type = Type, dup = bool(Dup), @@ -55,7 +54,7 @@ parse_remaining_len(<<>>, Header, Limit) -> parse_remaining_len(Rest, Header, Limit) -> parse_remaining_len(Rest, Header, 1, 0, Limit). -parse_remaining_len(_Bin, _Header, _Multiplier, Length, #mqtt_packet_limit{max_packet_size = MaxLen}) +parse_remaining_len(_Bin, _Header, _Multiplier, Length, MaxLen) when Length > MaxLen -> {error, invalid_mqtt_frame_len}; parse_remaining_len(<<>>, Header, Multiplier, Length, Limit) -> @@ -68,7 +67,7 @@ parse_remaining_len(<<0:8, Rest/binary>>, Header, 1, 0, _Limit) -> parse_frame(Rest, Header, 0); parse_remaining_len(<<1:1, Len:7, Rest/binary>>, Header, Multiplier, Value, Limit) -> parse_remaining_len(Rest, Header, Multiplier * ?HIGHBIT, Value + Len * Multiplier, Limit); -parse_remaining_len(<<0:1, Len:7, Rest/binary>>, Header, Multiplier, Value, #mqtt_packet_limit{max_packet_size = MaxLen}) -> +parse_remaining_len(<<0:1, Len:7, Rest/binary>>, Header, Multiplier, Value, MaxLen) -> FrameLen = Value + Len * Multiplier, if FrameLen > MaxLen -> {error, invalid_mqtt_frame_len}; @@ -86,7 +85,7 @@ parse_frame(Bin, #mqtt_packet_header{type = Type, qos = Qos} = Header, Length) WillRetain : 1, WillQos : 2, WillFlag : 1, - CleanSession : 1, + CleanSess : 1, _Reserved : 1, KeepAlive : 16/big, Rest3/binary>> = Rest2, @@ -104,7 +103,7 @@ parse_frame(Bin, #mqtt_packet_header{type = Type, qos = Qos} = Header, Length) will_retain = bool(WillRetain), will_qos = WillQos, will_flag = bool(WillFlag), - clean_sess = bool(CleanSession), + clean_sess = bool(CleanSess), keep_alive = KeepAlive, client_id = ClientId, will_topic = WillTopic, diff --git a/src/emqttd_plugins.erl b/src/emqttd_plugins.erl index 78b543440..f126f631c 100644 --- a/src/emqttd_plugins.erl +++ b/src/emqttd_plugins.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_plugins). +-author("Feng Lee "). + -include("emqttd.hrl"). -export([init/0]). diff --git a/src/emqttd_pmon.erl b/src/emqttd_pmon.erl index dc9554015..ebe691ad4 100644 --- a/src/emqttd_pmon.erl +++ b/src/emqttd_pmon.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2016 Feng Lee . All Rights Reserved. +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -18,11 +18,14 @@ -author("Feng Lee "). --type(pmon() :: {?MODULE, map()}). - -export([new/0, monitor/2, demonitor/2, erase/2]). -new() -> {?MODULE, [maps:new()]}. +-type(pmon() :: {?MODULE, map()}). + +-export_type([pmon/0]). + +new() -> + {?MODULE, [maps:new()]}. -spec(monitor(pid(), pmon()) -> pmon()). monitor(Pid, PM = {?MODULE, [M]}) -> diff --git a/src/emqttd_pool_sup.erl b/src/emqttd_pool_sup.erl index e06d09e8f..bc8f59562 100644 --- a/src/emqttd_pool_sup.erl +++ b/src/emqttd_pool_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -17,6 +17,8 @@ %% @doc Common Pool Supervisor -module(emqttd_pool_sup). +-author("Feng Lee "). + -behaviour(supervisor). %% API diff --git a/src/emqttd_pooler.erl b/src/emqttd_pooler.erl index 2701c470e..1b73d138c 100644 --- a/src/emqttd_pooler.erl +++ b/src/emqttd_pooler.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -39,6 +39,7 @@ start_link() -> %%-------------------------------------------------------------------- %% API %%-------------------------------------------------------------------- + -spec(start_link(atom(), pos_integer()) -> {ok, pid()} | ignore | {error, any()}). start_link(Pool, Id) -> gen_server:start_link({local, ?PROC_NAME(?MODULE, Id)}, ?MODULE, [Pool, Id], []). diff --git a/src/emqttd_protocol.erl b/src/emqttd_protocol.erl index e892c6158..b87274455 100644 --- a/src/emqttd_protocol.erl +++ b/src/emqttd_protocol.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_protocol). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). @@ -25,42 +27,54 @@ -import(proplists, [get_value/2, get_value/3]). %% API --export([init/3, info/1, clientid/1, client/1, session/1]). +-export([init/3, info/1, stats/1, clientid/1, client/1, session/1]). --export([received/2, handle/2, send/2, redeliver/2, shutdown/2]). +-export([subscribe/2, unsubscribe/2, pubrel/2, shutdown/2]). + +-export([received/2, send/2]). -export([process/2]). -%% Protocol State --record(proto_state, {peername, sendfun, connected = false, - client_id, client_pid, clean_sess, - proto_ver, proto_name, username, is_superuser = false, - will_msg, keepalive, max_clientid_len = ?MAX_CLIENTID_LEN, - session, ws_initial_headers, %% Headers from first HTTP request for websocket client - connected_at}). +-record(proto_stats, {enable_stats = false, recv_pkt = 0, recv_msg = 0, + send_pkt = 0, send_msg = 0}). --type proto_state() :: #proto_state{}. +%% Protocol State +%% ws_initial_headers: Headers from first HTTP request for WebSocket Client. +-record(proto_state, {peername, sendfun, connected = false, client_id, client_pid, + clean_sess, proto_ver, proto_name, username, is_superuser, + will_msg, keepalive, max_clientid_len, session, stats_data, + ws_initial_headers, connected_at}). + +-type(proto_state() :: #proto_state{}). -define(INFO_KEYS, [client_id, username, clean_sess, proto_ver, proto_name, keepalive, will_msg, ws_initial_headers, connected_at]). +-define(STATS_KEYS, [recv_pkt, recv_msg, send_pkt, send_msg]). + -define(LOG(Level, Format, Args, State), lager:Level([{client, State#proto_state.client_id}], "Client(~s@~s): " ++ Format, [State#proto_state.client_id, esockd_net:format(State#proto_state.peername) | Args])). %% @doc Init protocol init(Peername, SendFun, Opts) -> + EnableStats = get_value(client_enable_stats, Opts, false), MaxLen = get_value(max_clientid_len, Opts, ?MAX_CLIENTID_LEN), WsInitialHeaders = get_value(ws_initial_headers, Opts), #proto_state{peername = Peername, sendfun = SendFun, - max_clientid_len = MaxLen, client_pid = self(), - ws_initial_headers = WsInitialHeaders}. + max_clientid_len = MaxLen, + is_superuser = false, + ws_initial_headers = WsInitialHeaders, + stats_data = #proto_stats{enable_stats = EnableStats}}. info(ProtoState) -> ?record_to_proplist(proto_state, ProtoState, ?INFO_KEYS). +stats(#proto_state{stats_data = Stats}) -> + tl(?record_to_proplist(proto_stats, Stats)). + clientid(#proto_state{client_id = ClientId}) -> ClientId. @@ -96,8 +110,10 @@ session(#proto_state{session = Session}) -> %% A Client can only send the CONNECT Packet once over a Network Connection. -spec(received(mqtt_packet(), proto_state()) -> {ok, proto_state()} | {error, any()}). -received(Packet = ?PACKET(?CONNECT), State = #proto_state{connected = false}) -> - process(Packet, State#proto_state{connected = true}); +received(Packet = ?PACKET(?CONNECT), + State = #proto_state{connected = false, stats_data = Stats}) -> + trace(recv, Packet, State), Stats1 = inc_stats(recv, ?CONNECT, Stats), + process(Packet, State#proto_state{connected = true, stats_data = Stats1}); received(?PACKET(?CONNECT), State = #proto_state{connected = true}) -> {error, protocol_bad_connect, State}; @@ -106,36 +122,42 @@ received(?PACKET(?CONNECT), State = #proto_state{connected = true}) -> received(_Packet, State = #proto_state{connected = false}) -> {error, protocol_not_connected, State}; -received(Packet = ?PACKET(_Type), State) -> - trace(recv, Packet, State), +received(Packet = ?PACKET(Type), State = #proto_state{stats_data = Stats}) -> + trace(recv, Packet, State), Stats1 = inc_stats(recv, Type, Stats), case validate_packet(Packet) of ok -> - process(Packet, State); + process(Packet, State#proto_state{stats_data = Stats1}); {error, Reason} -> {error, Reason, State} end. -handle({subscribe, RawTopicTable}, ProtoState = #proto_state{client_id = ClientId, - username = Username, - session = Session}) -> +subscribe(RawTopicTable, ProtoState = #proto_state{client_id = ClientId, + username = Username, + session = Session}) -> TopicTable = parse_topic_table(RawTopicTable), - case emqttd:run_hooks('client.subscribe', [ClientId, Username], TopicTable) of + case emqttd_hooks:run('client.subscribe', [ClientId, Username], TopicTable) of {ok, TopicTable1} -> emqttd_session:subscribe(Session, TopicTable1); {stop, _} -> ok end, - {ok, ProtoState}; - -handle({unsubscribe, RawTopics}, ProtoState = #proto_state{client_id = ClientId, - username = Username, - session = Session}) -> - {ok, TopicTable} = emqttd:run_hooks('client.unsubscribe', - [ClientId, Username], parse_topics(RawTopics)), - emqttd_session:unsubscribe(Session, TopicTable), {ok, ProtoState}. -process(Packet = ?CONNECT_PACKET(Var), State0) -> +unsubscribe(RawTopics, ProtoState = #proto_state{client_id = ClientId, + username = Username, + session = Session}) -> + case emqttd_hooks:run('client.unsubscribe', [ClientId, Username], parse_topics(RawTopics)) of + {ok, TopicTable} -> + emqttd_session:unsubscribe(Session, TopicTable); + {stop, _} -> + ok + end, + {ok, ProtoState}. + +%% @doc Send PUBREL +pubrel(PacketId, State) -> send(?PUBREL_PACKET(PacketId), State). + +process(?CONNECT_PACKET(Var), State0) -> #mqtt_packet_connect{proto_ver = ProtoVer, proto_name = ProtoName, @@ -154,8 +176,6 @@ process(Packet = ?CONNECT_PACKET(Var), State0) -> will_msg = willmsg(Var), connected_at = os:timestamp()}, - trace(recv, Packet, State1), - {ReturnCode1, SessPresent, State3} = case validate_connect(Var, State1) of ?CONNACK_ACCEPT -> @@ -171,6 +191,8 @@ process(Packet = ?CONNECT_PACKET(Var), State0) -> emqttd_cm:reg(client(State2)), %% Start keepalive start_keepalive(KeepAlive), + %% Emit Stats + self() ! emit_stats, %% ACCEPT {?CONNACK_ACCEPT, SP, State2#proto_state{session = Session, is_superuser = IsSuperuser}}; {error, Error} -> @@ -184,7 +206,7 @@ process(Packet = ?CONNECT_PACKET(Var), State0) -> {ReturnCode, false, State1} end, %% Run hooks - emqttd:run_hooks('client.connected', [ReturnCode1], client(State3)), + emqttd_hooks:run('client.connected', [ReturnCode1], client(State3)), %% Send connack send(?CONNACK_PACKET(ReturnCode1, sp(SessPresent)), State3), %% stop if authentication failure @@ -217,8 +239,11 @@ process(?SUBSCRIBE_PACKET(PacketId, []), State) -> send(?SUBACK_PACKET(PacketId, []), State); %% TODO: refactor later... -process(?SUBSCRIBE_PACKET(PacketId, RawTopicTable), State = #proto_state{session = Session, - client_id = ClientId, username = Username, is_superuser = IsSuperuser}) -> +process(?SUBSCRIBE_PACKET(PacketId, RawTopicTable), + State = #proto_state{session = Session, + client_id = ClientId, + username = Username, + is_superuser = IsSuperuser}) -> Client = client(State), TopicTable = parse_topic_table(RawTopicTable), AllowDenies = if IsSuperuser -> []; @@ -229,7 +254,7 @@ process(?SUBSCRIBE_PACKET(PacketId, RawTopicTable), State = #proto_state{session ?LOG(error, "Cannot SUBSCRIBE ~p for ACL Deny", [TopicTable], State), send(?SUBACK_PACKET(PacketId, [16#80 || _ <- TopicTable]), State); false -> - case emqttd:run_hooks('client.subscribe', [ClientId, Username], TopicTable) of + case emqttd_hooks:run('client.subscribe', [ClientId, Username], TopicTable) of {ok, TopicTable1} -> emqttd_session:subscribe(Session, PacketId, TopicTable1), {ok, State}; {stop, _} -> @@ -241,10 +266,16 @@ process(?SUBSCRIBE_PACKET(PacketId, RawTopicTable), State = #proto_state{session process(?UNSUBSCRIBE_PACKET(PacketId, []), State) -> send(?UNSUBACK_PACKET(PacketId), State); -process(?UNSUBSCRIBE_PACKET(PacketId, RawTopics), State = #proto_state{ - client_id = ClientId, username = Username, session = Session}) -> - {ok, TopicTable} = emqttd:run_hooks('client.unsubscribe', [ClientId, Username], parse_topics(RawTopics)), - emqttd_session:unsubscribe(Session, TopicTable), +process(?UNSUBSCRIBE_PACKET(PacketId, RawTopics), + State = #proto_state{client_id = ClientId, + username = Username, + session = Session}) -> + case emqttd_hooks:run('client.unsubscribe', [ClientId, Username], parse_topics(RawTopics)) of + {ok, TopicTable} -> + emqttd_session:unsubscribe(Session, TopicTable); + {stop, _} -> + ok + end, send(?UNSUBACK_PACKET(PacketId), State); process(?PACKET(?PINGREQ), State) -> @@ -255,7 +286,9 @@ process(?PACKET(?DISCONNECT), State) -> {stop, normal, State#proto_state{will_msg = undefined}}. publish(Packet = ?PUBLISH_PACKET(?QOS_0, _PacketId), - #proto_state{client_id = ClientId, username = Username, session = Session}) -> + #proto_state{client_id = ClientId, + username = Username, + session = Session}) -> Msg = emqttd_message:from_packet(Username, ClientId, Packet), emqttd_session:publish(Session, Msg); @@ -280,15 +313,16 @@ with_puback(Type, Packet = ?PUBLISH_PACKET(_Qos, PacketId), -spec(send(mqtt_message() | mqtt_packet(), proto_state()) -> {ok, proto_state()}). send(Msg, State = #proto_state{client_id = ClientId, username = Username}) when is_record(Msg, mqtt_message) -> - emqttd:run_hooks('message.delivered', [ClientId, Username], Msg), + emqttd_hooks:run('message.delivered', [ClientId, Username], Msg), send(emqttd_message:to_packet(Msg), State); -send(Packet, State = #proto_state{sendfun = SendFun}) - when is_record(Packet, mqtt_packet) -> +send(Packet = ?PACKET(Type), + State = #proto_state{sendfun = SendFun, stats_data = Stats}) -> trace(send, Packet, State), emqttd_metrics:sent(Packet), SendFun(Packet), - {ok, State}. + Stats1 = inc_stats(send, Type, Stats), + {ok, State#proto_state{stats_data = Stats1}}. trace(recv, Packet, ProtoState) -> ?LOG(info, "RECV ~s", [emqttd_packet:format(Packet)], ProtoState); @@ -296,9 +330,23 @@ trace(recv, Packet, ProtoState) -> trace(send, Packet, ProtoState) -> ?LOG(info, "SEND ~s", [emqttd_packet:format(Packet)], ProtoState). -%% @doc redeliver PUBREL PacketId -redeliver({?PUBREL, PacketId}, State) -> - send(?PUBREL_PACKET(PacketId), State). +inc_stats(_Direct, _Type, Stats = #proto_stats{enable_stats = false}) -> + Stats; + +inc_stats(recv, Type, Stats) -> + #proto_stats{recv_pkt = PktCnt, recv_msg = MsgCnt} = Stats, + inc_stats(Type, #proto_stats.recv_pkt, PktCnt, #proto_stats.recv_msg, MsgCnt, Stats); + +inc_stats(send, Type, Stats) -> + #proto_stats{send_pkt = PktCnt, send_msg = MsgCnt} = Stats, + inc_stats(Type, #proto_stats.send_pkt, PktCnt, #proto_stats.send_msg, MsgCnt, Stats). + +inc_stats(Type, PktPos, PktCnt, MsgPos, MsgCnt, Stats) -> + Stats1 = setelement(PktPos, Stats, PktCnt + 1), + case Type =:= ?PUBLISH of + true -> setelement(MsgPos, Stats1, MsgCnt + 1); + false -> Stats1 + end. stop_if_auth_failure(RC, State) when RC == ?CONNACK_CREDENTIALS; RC == ?CONNACK_AUTH -> {stop, {shutdown, auth_failure}, State}; @@ -318,7 +366,7 @@ shutdown(Error, State = #proto_state{will_msg = WillMsg}) -> ?LOG(info, "Shutdown for ~p", [Error], State), Client = client(State), send_willmsg(Client, WillMsg), - emqttd:run_hooks('client.disconnected', [Error], Client), + emqttd_hooks:run('client.disconnected', [Error], Client), %% let it down %% emqttd_cm:unreg(ClientId). ok. @@ -368,19 +416,19 @@ validate_protocol(#mqtt_packet_connect{proto_ver = Ver, proto_name = Name}) -> validate_clientid(#mqtt_packet_connect{client_id = ClientId}, #proto_state{max_clientid_len = MaxLen}) - when (size(ClientId) >= 1) andalso (size(ClientId) =< MaxLen) -> + when (byte_size(ClientId) >= 1) andalso (byte_size(ClientId) =< MaxLen) -> true; %% Issue#599: Null clientId and clean_sess = false validate_clientid(#mqtt_packet_connect{client_id = ClientId, clean_sess = CleanSess}, _ProtoState) - when size(ClientId) == 0 andalso (not CleanSess) -> + when byte_size(ClientId) == 0 andalso (not CleanSess) -> false; %% MQTT3.1.1 allow null clientId. -validate_clientid(#mqtt_packet_connect{proto_ver =?MQTT_PROTO_V311, +validate_clientid(#mqtt_packet_connect{proto_ver =?MQTT_PROTO_V4, client_id = ClientId}, _ProtoState) - when size(ClientId) =:= 0 -> + when byte_size(ClientId) =:= 0 -> true; validate_clientid(#mqtt_packet_connect{proto_ver = ProtoVer, diff --git a/src/emqttd_pubsub.erl b/src/emqttd_pubsub.erl index 83a080ff6..d976618cd 100644 --- a/src/emqttd_pubsub.erl +++ b/src/emqttd_pubsub.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -18,11 +18,12 @@ -behaviour(gen_server2). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_internal.hrl"). -%% Start API. -export([start_link/3]). %% PubSub API. @@ -31,7 +32,7 @@ -export([dispatch/2]). -%% gen_server. +%% gen_server Callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -45,7 +46,6 @@ %% Start PubSub %%-------------------------------------------------------------------- -%% @doc Start one Pubsub -spec(start_link(atom(), pos_integer(), list()) -> {ok, pid()} | ignore | {error, any()}). start_link(Pool, Id, Env) -> gen_server2:start_link({local, ?PROC_NAME(?MODULE, Id)}, ?MODULE, [Pool, Id, Env], []). @@ -115,6 +115,7 @@ dispatch({_Share, [Sub]}, Topic, Msg) -> dispatch(Sub, Topic, Msg); dispatch({_Share, []}, _Topic, _Msg) -> ok; +%%TODO: round-robbin dispatch({_Share, Subs}, Topic, Msg) -> dispatch(lists:nth(rand:uniform(length(Subs)), Subs), Topic, Msg). @@ -163,11 +164,12 @@ pick(Subscriber) -> init([Pool, Id, Env]) -> ?GPROC_POOL(join, Pool, Id), - {ok, #state{pool = Pool, id = Id, env = Env}}. + {ok, #state{pool = Pool, id = Id, env = Env}, + hibernate, {backoff, 2000, 2000, 20000}}. handle_call({subscribe, Topic, Subscriber, Options}, _From, State) -> add_subscriber(Topic, Subscriber, Options), - {reply, ok, setstats(State)}; + {reply, ok, setstats(State), hibernate}; handle_call({unsubscribe, Topic, Subscriber, Options}, _From, State) -> del_subscriber(Topic, Subscriber, Options), @@ -178,7 +180,7 @@ handle_call(Req, _From, State) -> handle_cast({subscribe, Topic, Subscriber, Options}, State) -> add_subscriber(Topic, Subscriber, Options), - {noreply, setstats(State)}; + {noreply, setstats(State), hibernate}; handle_cast({unsubscribe, Topic, Subscriber, Options}, State) -> del_subscriber(Topic, Subscriber, Options), diff --git a/src/emqttd_pubsub_sup.erl b/src/emqttd_pubsub_sup.erl index 882fce57c..09d08d110 100644 --- a/src/emqttd_pubsub_sup.erl +++ b/src/emqttd_pubsub_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -17,6 +17,8 @@ %% @doc PubSub Supervisor. -module(emqttd_pubsub_sup). +-author("Feng Lee "). + -behaviour(supervisor). %% API diff --git a/src/emqttd_router.erl b/src/emqttd_router.erl index e0e3962a2..6894ea528 100644 --- a/src/emqttd_router.erl +++ b/src/emqttd_router.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/src/emqttd_serializer.erl b/src/emqttd_serializer.erl index f08ed7eef..079cfbb3c 100644 --- a/src/emqttd_serializer.erl +++ b/src/emqttd_serializer.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -17,6 +17,8 @@ %% @doc MQTT Packet Serializer -module(emqttd_serializer). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). @@ -25,8 +27,8 @@ -export([serialize/1]). %% @doc Serialise MQTT Packet --spec(serialize(mqtt_packet()) -> binary()). -serialize(#mqtt_packet{header = Header = #mqtt_packet_header{type = Type}, +-spec(serialize(mqtt_packet()) -> iolist()). +serialize(#mqtt_packet{header = Header = #mqtt_packet_header{type = Type}, variable = Variable, payload = Payload}) -> serialize_header(Header, @@ -37,14 +39,12 @@ serialize_header(#mqtt_packet_header{type = Type, dup = Dup, qos = Qos, retain = Retain}, - {VariableBin, PayloadBin}) when ?CONNECT =< Type andalso Type =< ?DISCONNECT -> - Len = size(VariableBin) + size(PayloadBin), - true = (Len =< ?MAX_LEN), - LenBin = serialize_len(Len), - <>. + {VariableBin, PayloadBin}) + when ?CONNECT =< Type andalso Type =< ?DISCONNECT -> + Len = byte_size(VariableBin) + byte_size(PayloadBin), + true = (Len =< ?MAX_PACKET_SIZE), + [<>, + serialize_len(Len), VariableBin, PayloadBin]. serialize_variable(?CONNECT, #mqtt_packet_connect{client_id = ClientId, proto_ver = ProtoVer, @@ -58,7 +58,7 @@ serialize_variable(?CONNECT, #mqtt_packet_connect{client_id = ClientId, will_msg = WillMsg, username = Username, password = Password}, undefined) -> - VariableBin = <<(size(ProtoName)):16/big-unsigned-integer, + VariableBin = <<(byte_size(ProtoName)):16/big-unsigned-integer, ProtoName/binary, ProtoVer:8, (opt(Username)):1, @@ -73,7 +73,7 @@ serialize_variable(?CONNECT, #mqtt_packet_connect{client_id = ClientId, PayloadBin1 = case WillFlag of true -> <>; false -> PayloadBin end, @@ -93,7 +93,7 @@ serialize_variable(?SUBACK, #mqtt_packet_suback{packet_id = PacketId, {<>, << <> || Q <- QosTable >>}; serialize_variable(?UNSUBSCRIBE, #mqtt_packet_unsubscribe{packet_id = PacketId, - topics = Topics }, undefined) -> + topics = Topics }, undefined) -> {<>, serialize_topics(Topics)}; serialize_variable(?UNSUBACK, #mqtt_packet_unsuback{packet_id = PacketId}, undefined) -> @@ -134,7 +134,7 @@ serialize_topics([H|_] = Topics) when is_binary(H) -> serialize_utf(String) -> StringBin = unicode:characters_to_binary(String), - Len = size(StringBin), + Len = byte_size(StringBin), true = (Len =< 16#ffff), <>. @@ -148,4 +148,3 @@ opt(false) -> 0; opt(true) -> 1; opt(X) when is_integer(X) -> X; opt(B) when is_binary(B) -> 1. - diff --git a/src/emqttd_server.erl b/src/emqttd_server.erl index f21bd5d4b..ec57f2802 100644 --- a/src/emqttd_server.erl +++ b/src/emqttd_server.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ -module(emqttd_server). --author("Feng Lee "). - -behaviour(gen_server2). +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). @@ -43,7 +43,7 @@ %% Debug API -export([dump/0]). -%% gen_server. +%% gen_server Callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -89,7 +89,7 @@ async_subscribe(Topic, Subscriber, Options) when is_binary(Topic) -> -spec(publish(mqtt_message()) -> {ok, mqtt_delivery()} | ignore). publish(Msg = #mqtt_message{from = From}) -> trace(publish, From, Msg), - case emqttd_hook:run('message.publish', [], Msg) of + case emqttd_hooks:run('message.publish', [], Msg) of {ok, Msg1 = #mqtt_message{topic = Topic}} -> emqttd_pubsub:publish(Topic, Msg1); {stop, Msg1} -> @@ -97,14 +97,13 @@ publish(Msg = #mqtt_message{from = From}) -> ignore end. +%% @private trace(publish, From, _Msg) when is_atom(From) -> %% Dont' trace '$SYS' publish ignore; - trace(publish, {ClientId, Username}, #mqtt_message{topic = Topic, payload = Payload}) -> lager:info([{client, ClientId}, {topic, Topic}], "~s/~s PUBLISH to ~s: ~p", [ClientId, Username, Topic, Payload]); - trace(publish, From, #mqtt_message{topic = Topic, payload = Payload}) when is_binary(From); is_list(From) -> lager:info([{client, From}, {topic, Topic}], "~s PUBLISH to ~s: ~p", [From, Topic, Payload]). @@ -142,7 +141,8 @@ subscriptions(Subscriber) -> subscription(Topic, Subscriber) -> {Topic, Subscriber, ets:lookup_element(mqtt_subproperty, {Topic, Subscriber}, 2)}. -subscribers(Topic) -> emqttd_pubsub:subscribers(Topic). +subscribers(Topic) -> + emqttd_pubsub:subscribers(Topic). -spec(is_subscribed(binary(), emqttd:subscriber()) -> boolean()). is_subscribed(Topic, Subscriber) when is_binary(Topic) -> diff --git a/src/emqttd_session.erl b/src/emqttd_session.erl index a73503479..85b027781 100644 --- a/src/emqttd_session.erl +++ b/src/emqttd_session.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,199 +14,264 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc Session for persistent MQTT client. %% -%% Session State in the broker consists of: +%% @doc MQTT Session %% -%% 1. The Client’s subscriptions. +%% A stateful interaction between a Client and a Server. Some Sessions +%% last only as long as the Network Connection, others can span multiple +%% consecutive Network Connections between a Client and a Server. %% -%% 2. inflight qos1/2 messages sent to the client but unacked, QoS 1 and QoS 2 -%% messages which have been sent to the Client, but have not been completely -%% acknowledged. +%% The Session state in the Server consists of: %% -%% 3. inflight qos2 messages received from client and waiting for pubrel. QoS 2 -%% messages which have been received from the Client, but have not been -%% completely acknowledged. +%% The existence of a Session, even if the rest of the Session state is empty. %% -%% 4. all qos1, qos2 messages published to when client is disconnected. -%% QoS 1 and QoS 2 messages pending transmission to the Client. +%% The Client’s subscriptions. %% -%% 5. Optionally, QoS 0 messages pending transmission to the Client. +%% QoS 1 and QoS 2 messages which have been sent to the Client, but have not +%% been completely acknowledged. %% -%% State of Message: newcome, inflight, pending +%% QoS 1 and QoS 2 messages pending transmission to the Client. +%% +%% QoS 2 messages which have been received from the Client, but have not +%% been completely acknowledged. +%% +%% Optionally, QoS 0 messages pending transmission to the Client. +%% +%% If the session is currently disconnected, the time at which the Session state +%% will be deleted. %% %% @end +%% -module(emqttd_session). +-behaviour(gen_server2). + +-author("Feng Lee "). + -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). -include("emqttd_internal.hrl"). --behaviour(gen_server2). +-import(emqttd_misc, [start_timer/2]). -import(proplists, [get_value/2, get_value/3]). %% Session API --export([start_link/3, resume/3, info/1, destroy/2]). +-export([start_link/3, resume/3, destroy/2]). -%% PubSub APIs --export([publish/2, puback/2, pubrec/2, pubrel/2, pubcomp/2, - subscribe/2, subscribe/3, unsubscribe/2]). +%% Management and Monitor API +-export([state/1, info/1, stats/1]). + +%% PubSub API +-export([subscribe/2, subscribe/3, publish/2, puback/2, pubrec/2, + pubrel/2, pubcomp/2, unsubscribe/2]). %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). %% gen_server2 Message Priorities --export([prioritise_call/4, prioritise_cast/3, prioritise_info/3]). +-export([prioritise_call/4, prioritise_cast/3, prioritise_info/3, + handle_pre_hibernate/1]). --record(session, { +-record(state, + { + %% Clean Session Flag + clean_sess = false :: boolean(), - %% Clean Session Flag - clean_sess = true, + %% Client Binding: local | remote + binding = local :: local | remote, - %% ClientId: Identifier of Session - client_id :: binary(), + %% ClientId: Identifier of Session + client_id :: binary(), - %% Client Pid bind with session - client_pid :: pid(), + %% Username + username :: binary() | undefined, - %% Old Client Pid that has been kickout - old_client_pid :: pid(), + %% Client Pid binding with session + client_pid :: pid(), - %% Username - username :: binary() | undefined, + %% Old Client Pid that has been kickout + old_client_pid :: pid(), - %% Last packet id of the session - packet_id = 1, - - %% Client’s subscriptions. - subscriptions :: map(), + %% Next message id of the session + next_msg_id = 1 :: mqtt_packet_id(), - %% Inflight qos1, qos2 messages sent to the client but unacked, - %% QoS 1 and QoS 2 messages which have been sent to the Client, - %% but have not been completely acknowledged. - %% Client <- Broker - inflight_queue :: list(), + max_subscriptions :: non_neg_integer(), - max_inflight = 0, + %% Client’s subscriptions. + subscriptions :: map(), - %% All qos1, qos2 messages published to when client is disconnected. - %% QoS 1 and QoS 2 messages pending transmission to the Client. - %% - %% Optionally, QoS 0 messages pending transmission to the Client. - message_queue :: emqttd_mqueue:mqueue(), + %% Upgrade Qos? + upgrade_qos = false :: boolean(), - %% Inflight qos2 messages received from client and waiting for pubrel. - %% QoS 2 messages which have been received from the Client, - %% but have not been completely acknowledged. - %% Client -> Broker - awaiting_rel :: map(), + %% Client <- Broker: Inflight QoS1, QoS2 messages sent to the client but unacked. + inflight :: emqttd_inflight:inflight(), - %% Awaiting PUBREL timeout - await_rel_timeout = 8, + %% Max Inflight Size + max_inflight = 32 :: non_neg_integer(), - %% Max Packets that Awaiting PUBREL - max_awaiting_rel = 100, + %% Retry interval for redelivering QoS1/2 messages + retry_interval = 20000 :: timeout(), - %% Awaiting timers for ack, rel. - awaiting_ack :: map(), + %% Retry Timer + retry_timer :: reference(), - %% Retry interval for redelivering QoS1/2 messages - retry_interval = 20, + %% All QoS1, QoS2 messages published to when client is disconnected. + %% QoS 1 and QoS 2 messages pending transmission to the Client. + %% + %% Optionally, QoS 0 messages pending transmission to the Client. + mqueue :: emqttd_mqueue:mqueue(), - %% Awaiting for PUBCOMP - awaiting_comp :: map(), + %% Client -> Broker: Inflight QoS2 messages received from client and waiting for pubrel. + awaiting_rel :: map(), - %% session expired after 48 hours - expired_after = 172800, + %% Max Packets that Awaiting PUBREL + max_awaiting_rel = 100 :: non_neg_integer(), - expired_timer, + %% Awaiting PUBREL timeout + await_rel_timeout = 20000 :: timeout(), - collect_interval, + %% Awaiting PUBREL timer + await_rel_timer :: reference(), - collect_timer, - - timestamp}). + %% Session Expiry Interval + expiry_interval = 7200000 :: timeout(), --define(PUBSUB_TIMEOUT, 60000). + %% Expired Timer + expiry_timer :: reference(), + + %% Enable Stats + enable_stats :: boolean(), + + %% Force GC Count + force_gc_count :: undefined | integer(), + + created_at :: erlang:timestamp() + }). + +-define(TIMEOUT, 60000). + +-define(INFO_KEYS, [clean_sess, client_id, username, client_pid, binding, created_at]). + +-define(STATE_KEYS, [clean_sess, client_id, username, binding, client_pid, old_client_pid, + next_msg_id, max_subscriptions, subscriptions, upgrade_qos, inflight, + max_inflight, retry_interval, mqueue, awaiting_rel, max_awaiting_rel, + await_rel_timeout, expiry_interval, enable_stats, force_gc_count, + created_at]). -define(LOG(Level, Format, Args, State), - lager:Level([{client, State#session.client_id}], - "Session(~s): " ++ Format, [State#session.client_id | Args])). + lager:Level([{client, State#state.client_id}], + "Session(~s): " ++ Format, [State#state.client_id | Args])). -%% @doc Start a session. +%% @doc Start a Session -spec(start_link(boolean(), {mqtt_client_id(), mqtt_username()}, pid()) -> {ok, pid()} | {error, any()}). start_link(CleanSess, {ClientId, Username}, ClientPid) -> - gen_server2:start_link(?MODULE, [CleanSess, {ClientId, Username}, ClientPid], []). - -%% @doc Resume a session. --spec(resume(pid(), mqtt_client_id(), pid()) -> ok). -resume(SessPid, ClientId, ClientPid) -> - gen_server2:cast(SessPid, {resume, ClientId, ClientPid}). - -%% @doc Session Info. -info(SessPid) -> - gen_server2:call(SessPid, info). - -%% @doc Destroy a session. --spec(destroy(pid(), mqtt_client_id()) -> ok). -destroy(SessPid, ClientId) -> - gen_server2:cast(SessPid, {destroy, ClientId}). + gen_server2:start_link(?MODULE, [CleanSess, {ClientId, Username}, ClientPid], + [{spawn_opt, ?FULLSWEEP_OPTS}]). %% Tune GC. %%-------------------------------------------------------------------- -%% PubSub +%% PubSub API %%-------------------------------------------------------------------- -%% @doc Subscribe Topics +%% @doc Subscribe topics -spec(subscribe(pid(), [{binary(), [emqttd_topic:option()]}]) -> ok). -subscribe(SessPid, TopicTable) -> - gen_server2:cast(SessPid, {subscribe, TopicTable, fun(_) -> ok end}). +subscribe(Session, TopicTable) ->%%TODO: the ack function??... + gen_server2:cast(Session, {subscribe, self(), TopicTable, fun(_) -> ok end}). --spec(subscribe(pid(), mqtt_pktid(), [{binary(), [emqttd_topic:option()]}]) -> ok). -subscribe(SessPid, PktId, TopicTable) -> +-spec(subscribe(pid(), mqtt_packet_id(), [{binary(), [emqttd_topic:option()]}]) -> ok). +subscribe(Session, PacketId, TopicTable) -> %%TODO: the ack function??... From = self(), - AckFun = fun(GrantedQos) -> From ! {suback, PktId, GrantedQos} end, - gen_server2:cast(SessPid, {subscribe, TopicTable, AckFun}). + AckFun = fun(GrantedQos) -> From ! {suback, PacketId, GrantedQos} end, + gen_server2:cast(Session, {subscribe, From, TopicTable, AckFun}). -%% @doc Publish message +%% @doc Publish Message -spec(publish(pid(), mqtt_message()) -> ok | {error, any()}). -publish(_SessPid, Msg = #mqtt_message{qos = ?QOS_0}) -> - %% publish qos0 directly - emqttd:publish(Msg), ok; +publish(_Session, Msg = #mqtt_message{qos = ?QOS_0}) -> + %% Publish QoS0 Directly + emqttd_server:publish(Msg), ok; -publish(_SessPid, Msg = #mqtt_message{qos = ?QOS_1}) -> - %% publish qos1 directly, and client will puback automatically - emqttd:publish(Msg), ok; +publish(_Session, Msg = #mqtt_message{qos = ?QOS_1}) -> + %% Publish QoS1 message directly for client will PubAck automatically + emqttd_server:publish(Msg), ok; -publish(SessPid, Msg = #mqtt_message{qos = ?QOS_2}) -> - %% publish qos2 by session - gen_server2:call(SessPid, {publish, Msg}, ?PUBSUB_TIMEOUT). +publish(Session, Msg = #mqtt_message{qos = ?QOS_2}) -> + %% Publish QoS2 to Session + gen_server2:call(Session, {publish, Msg}, ?TIMEOUT). -%% @doc PubAck message +%% @doc PubAck Message -spec(puback(pid(), mqtt_packet_id()) -> ok). -puback(SessPid, PktId) -> - gen_server2:cast(SessPid, {puback, PktId}). +puback(Session, PacketId) -> + gen_server2:cast(Session, {puback, PacketId}). -spec(pubrec(pid(), mqtt_packet_id()) -> ok). -pubrec(SessPid, PktId) -> - gen_server2:cast(SessPid, {pubrec, PktId}). +pubrec(Session, PacketId) -> + gen_server2:cast(Session, {pubrec, PacketId}). -spec(pubrel(pid(), mqtt_packet_id()) -> ok). -pubrel(SessPid, PktId) -> - gen_server2:cast(SessPid, {pubrel, PktId}). +pubrel(Session, PacketId) -> + gen_server2:cast(Session, {pubrel, PacketId}). -spec(pubcomp(pid(), mqtt_packet_id()) -> ok). -pubcomp(SessPid, PktId) -> - gen_server2:cast(SessPid, {pubcomp, PktId}). +pubcomp(Session, PacketId) -> + gen_server2:cast(Session, {pubcomp, PacketId}). -%% @doc Unsubscribe Topics +%% @doc Unsubscribe the topics -spec(unsubscribe(pid(), [{binary(), [emqttd_topic:option()]}]) -> ok). -unsubscribe(SessPid, TopicTable) -> - gen_server2:cast(SessPid, {unsubscribe, TopicTable}). +unsubscribe(Session, TopicTable) -> + gen_server2:cast(Session, {unsubscribe, self(), TopicTable}). + +%% @doc Resume the session +-spec(resume(pid(), mqtt_client_id(), pid()) -> ok). +resume(Session, ClientId, ClientPid) -> + gen_server2:cast(Session, {resume, ClientId, ClientPid}). + +%% @doc Get session state +state(Session) when is_pid(Session) -> + gen_server2:call(Session, state). + +%% @doc Get session info +-spec(info(pid() | #state{}) -> list(tuple())). +info(Session) when is_pid(Session) -> + gen_server2:call(Session, info); + +info(State) when is_record(State, state) -> + ?record_to_proplist(state, State, ?INFO_KEYS). + +-spec(stats(pid() | #state{}) -> list({atom(), non_neg_integer()})). +stats(Session) when is_pid(Session) -> + gen_server2:call(Session, stats); + +stats(#state{max_subscriptions = MaxSubscriptions, + subscriptions = Subscriptions, + inflight = Inflight, + max_inflight = MaxInflight, + mqueue = MQueue, + max_awaiting_rel = MaxAwaitingRel, + awaiting_rel = AwaitingRel}) -> + lists:append(emqttd_misc:proc_stats(), + [{max_subscriptions, MaxSubscriptions}, + {subscriptions, maps:size(Subscriptions)}, + {max_inflight, MaxInflight}, + {inflight_len, Inflight:size()}, + {max_mqueue, case emqttd_mqueue:max_len(MQueue) of + infinity -> 0; + Len -> Len + end}, + {mqueue_len, emqttd_mqueue:len(MQueue)}, + {mqueue_dropped, emqttd_mqueue:dropped(MQueue)}, + {max_awaiting_rel, MaxAwaitingRel}, + {awaiting_rel_len, maps:size(AwaitingRel)}, + {deliver_msg, get(deliver_msg)}, + {enqueue_msg, get(enqueue_msg)}]). + +%% @doc Destroy the session +-spec(destroy(pid(), mqtt_client_id()) -> ok). +destroy(Session, ClientId) -> + gen_server2:cast(Session, {destroy, ClientId}). %%-------------------------------------------------------------------- %% gen_server Callbacks @@ -215,36 +280,44 @@ unsubscribe(SessPid, TopicTable) -> init([CleanSess, {ClientId, Username}, ClientPid]) -> process_flag(trap_exit, true), true = link(ClientPid), + init_stats([deliver_msg, enqueue_msg]), + {ok, Env} = emqttd:env(session), {ok, QEnv} = emqttd:env(queue), - {ok, SessEnv} = emqttd:env(session), - Session = #session{ - clean_sess = CleanSess, - client_id = ClientId, - client_pid = ClientPid, - username = Username, - subscriptions = #{}, - inflight_queue = [], - max_inflight = get_value(max_inflight, SessEnv, 0), - message_queue = emqttd_mqueue:new(ClientId, QEnv, emqttd_alarm:alarm_fun()), - awaiting_rel = #{}, - awaiting_ack = #{}, - awaiting_comp = #{}, - retry_interval = get_value(retry_interval, SessEnv), - await_rel_timeout = get_value(await_rel_timeout, SessEnv), - max_awaiting_rel = get_value(max_awaiting_rel, SessEnv), - expired_after = get_value(expired_after, SessEnv), - collect_interval = get_value(collect_interval, SessEnv, 0), - timestamp = os:timestamp()}, - emqttd_sm:reg_session(ClientId, CleanSess, sess_info(Session)), - emqttd:run_hooks('session.created', [ClientId, Username]), - %% Start statistics - {ok, start_collector(Session), hibernate}. + MaxInflight = get_value(max_inflight, Env, 0), + EnableStats = get_value(enable_stats, Env, false), + ForceGcCount = emqttd_gc:conn_max_gc_count(), + MQueue = emqttd_mqueue:new(ClientId, QEnv, emqttd_alarm:alarm_fun()), + State = #state{clean_sess = CleanSess, + binding = binding(ClientPid), + client_id = ClientId, + client_pid = ClientPid, + username = Username, + subscriptions = #{}, + max_subscriptions = get_value(max_subscriptions, Env, 0), + upgrade_qos = get_value(upgrade_qos, Env, false), + max_inflight = MaxInflight, + inflight = emqttd_inflight:new(MaxInflight), + mqueue = MQueue, + retry_interval = get_value(retry_interval, Env), + awaiting_rel = #{}, + await_rel_timeout = get_value(await_rel_timeout, Env), + max_awaiting_rel = get_value(max_awaiting_rel, Env), + expiry_interval = get_value(expiry_interval, Env), + enable_stats = EnableStats, + force_gc_count = ForceGcCount, + created_at = os:timestamp()}, + emqttd_sm:register_session(ClientId, CleanSess, info(State)), + emqttd_hooks:run('session.created', [ClientId, Username]), + {ok, emit_stats(State), hibernate, {backoff, 1000, 1000, 10000}}. + +init_stats(Keys) -> + lists:foreach(fun(K) -> put(K, 0) end, Keys). + +binding(ClientPid) -> + case node(ClientPid) =:= node() of true -> local; false -> remote end. prioritise_call(Msg, _From, _Len, _State) -> - case Msg of - info -> 10; - _ -> 0 - end. + case Msg of info -> 10; stats -> 10; state -> 10; _ -> 5 end. prioritise_cast(Msg, _Len, _State) -> case Msg of @@ -262,279 +335,252 @@ prioritise_cast(Msg, _Len, _State) -> prioritise_info(Msg, _Len, _State) -> case Msg of {'EXIT', _, _} -> 10; - expired -> 10; {timeout, _, _} -> 5; - collect_info -> 2; {dispatch, _, _} -> 1; _ -> 0 end. -handle_call(info, _From, State) -> - {reply, sess_info(State), State, hibernate}; +handle_pre_hibernate(State) -> + {hibernate, emqttd_gc:reset_conn_gc_count(#state.force_gc_count, emit_stats(State))}. -handle_call({publish, Msg = #mqtt_message{qos = ?QOS_2, pktid = PktId}}, - _From, Session = #session{awaiting_rel = AwaitingRel, - await_rel_timeout = Timeout}) -> - case check_awaiting_rel(Session) of - true -> - TRef = timer(Timeout, {timeout, awaiting_rel, PktId}), - AwaitingRel1 = maps:put(PktId, {Msg, TRef}, AwaitingRel), - {reply, ok, Session#session{awaiting_rel = AwaitingRel1}}; +handle_call({publish, Msg = #mqtt_message{qos = ?QOS_2, pktid = PacketId}}, _From, + State = #state{awaiting_rel = AwaitingRel, + await_rel_timer = Timer, + await_rel_timeout = Timeout}) -> + case is_awaiting_full(State) of false -> - ?LOG(critical, "Dropped Qos2 message for too many awaiting_rel: ~p", [Msg], Session), - {reply, {error, dropped}, Session, hibernate} + State1 = case Timer == undefined of + true -> State#state{await_rel_timer = start_timer(Timeout, check_awaiting_rel)}; + false -> State + end, + reply(ok, State1#state{awaiting_rel = maps:put(PacketId, Msg, AwaitingRel)}); + true -> + ?LOG(warning, "Dropped Qos2 Message for too many awaiting_rel: ~p", [Msg], State), + emqttd_metrics:inc('messages/qos2/dropped'), + reply({error, dropped}, State) end; +handle_call(info, _From, State) -> + reply(info(State), State); + +handle_call(stats, _From, State) -> + reply(stats(State), State); + +handle_call(state, _From, State) -> + reply(?record_to_proplist(state, State, ?STATE_KEYS), State); + handle_call(Req, _From, State) -> ?UNEXPECTED_REQ(Req, State). -handle_cast({subscribe, TopicTable, AckFun}, Session = #session{client_id = ClientId, - username = Username, - subscriptions = Subscriptions}) -> - ?LOG(info, "Subscribe ~p", [TopicTable], Session), +handle_cast({subscribe, _From, TopicTable, AckFun}, + State = #state{client_id = ClientId, + username = Username, + subscriptions = Subscriptions}) -> + ?LOG(info, "Subscribe ~p", [TopicTable], State), {GrantedQos, Subscriptions1} = lists:foldl(fun({Topic, Opts}, {QosAcc, SubMap}) -> NewQos = proplists:get_value(qos, Opts), SubMap1 = case maps:find(Topic, SubMap) of {ok, NewQos} -> - ?LOG(warning, "duplicated subscribe: ~s, qos = ~w", [Topic, NewQos], Session), + ?LOG(warning, "Duplicated subscribe: ~s, qos = ~w", [Topic, NewQos], State), SubMap; {ok, OldQos} -> emqttd:setqos(Topic, ClientId, NewQos), - ?LOG(warning, "duplicated subscribe ~s, old_qos=~w, new_qos=~w", - [Topic, OldQos, NewQos], Session), + ?LOG(warning, "Duplicated subscribe ~s, old_qos=~w, new_qos=~w", + [Topic, OldQos, NewQos], State), maps:put(Topic, NewQos, SubMap); error -> emqttd:subscribe(Topic, ClientId, Opts), - emqttd:run_hooks('session.subscribed', [ClientId, Username], {Topic, Opts}), + emqttd_hooks:run('session.subscribed', [ClientId, Username], {Topic, Opts}), maps:put(Topic, NewQos, SubMap) end, {[NewQos|QosAcc], SubMap1} end, {[], Subscriptions}, TopicTable), AckFun(lists:reverse(GrantedQos)), - hibernate(Session#session{subscriptions = Subscriptions1}); + hibernate(emit_stats(State#state{subscriptions = Subscriptions1})); -handle_cast({unsubscribe, TopicTable}, Session = #session{client_id = ClientId, - username = Username, - subscriptions = Subscriptions}) -> - ?LOG(info, "unsubscribe ~p", [TopicTable], Session), +handle_cast({unsubscribe, _From, TopicTable}, + State = #state{client_id = ClientId, + username = Username, + subscriptions = Subscriptions}) -> + ?LOG(info, "Unsubscribe ~p", [TopicTable], State), Subscriptions1 = lists:foldl(fun({Topic, Opts}, SubMap) -> case maps:find(Topic, SubMap) of {ok, _Qos} -> emqttd:unsubscribe(Topic, ClientId), - emqttd:run_hooks('session.unsubscribed', [ClientId, Username], {Topic, Opts}), + emqttd_hooks:run('session.unsubscribed', [ClientId, Username], {Topic, Opts}), maps:remove(Topic, SubMap); error -> SubMap end end, Subscriptions, TopicTable), - hibernate(Session#session{subscriptions = Subscriptions1}); + hibernate(emit_stats(State#state{subscriptions = Subscriptions1})); -handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client_pid = undefined}) -> - ?LOG(warning, "destroyed", [], Session), - shutdown(destroy, Session); +%% PUBACK: +handle_cast({puback, PacketId}, State = #state{inflight = Inflight}) -> + {noreply, + case Inflight:contain(PacketId) of + true -> + dequeue(acked(puback, PacketId, State)); + false -> + ?LOG(warning, "PUBACK ~p missed inflight: ~p", + [PacketId, Inflight:window()], State), + emqttd_metrics:inc('packets/puback/missed'), + State + end, hibernate}; -handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client_pid = OldClientPid}) -> - ?LOG(warning, "kickout ~p", [OldClientPid], Session), - shutdown(conflict, Session); +%% PUBREC: +handle_cast({pubrec, PacketId}, State = #state{inflight = Inflight}) -> + {noreply, + case Inflight:contain(PacketId) of + true -> + acked(pubrec, PacketId, State); + false -> + ?LOG(warning, "PUBREC ~p missed inflight: ~p", + [PacketId, Inflight:window()], State), + emqttd_metrics:inc('packets/pubrec/missed'), + State + end, hibernate}; -handle_cast({resume, ClientId, ClientPid}, Session = #session{client_id = ClientId, - client_pid = OldClientPid, - clean_sess = CleanSess, - inflight_queue = InflightQ, - awaiting_ack = AwaitingAck, - awaiting_comp = AwaitingComp, - expired_timer = ETimer} = Session) -> +%% PUBREL: +handle_cast({pubrel, PacketId}, State = #state{awaiting_rel = AwaitingRel}) -> + {noreply, + case maps:take(PacketId, AwaitingRel) of + {Msg, AwaitingRel1} -> + spawn(emqttd_server, publish, [Msg]), %%:) + gc(State#state{awaiting_rel = AwaitingRel1}); + error -> + ?LOG(warning, "Cannot find PUBREL: ~p", [PacketId], State), + emqttd_metrics:inc('packets/pubrel/missed'), + State + end, hibernate}; - ?LOG(info, "resumed by ~p", [ClientPid], Session), +%% PUBCOMP: +handle_cast({pubcomp, PacketId}, State = #state{inflight = Inflight}) -> + {noreply, + case Inflight:contain(PacketId) of + true -> + dequeue(acked(pubcomp, PacketId, State)); + false -> + ?LOG(warning, "The PUBCOMP ~p is not inflight: ~p", + [PacketId, Inflight:window()], State), + emqttd_metrics:inc('packets/pubcomp/missed'), + State + end, hibernate}; - %% Cancel expired timer - cancel_timer(ETimer), +%% RESUME: +handle_cast({resume, ClientId, ClientPid}, + State = #state{client_id = ClientId, + client_pid = OldClientPid, + clean_sess = CleanSess, + retry_timer = RetryTimer, + await_rel_timer = AwaitTimer, + expiry_timer = ExpireTimer}) -> + + ?LOG(info, "Resumed by ~p", [ClientPid], State), + + %% Cancel Timers + lists:foreach(fun emqttd_misc:cancel_timer/1, + [RetryTimer, AwaitTimer, ExpireTimer]), case kick(ClientId, OldClientPid, ClientPid) of - ok -> ?LOG(warning, "~p kickout ~p", [ClientPid, OldClientPid], Session); + ok -> ?LOG(warning, "~p kickout ~p", [ClientPid, OldClientPid], State); ignore -> ok end, true = link(ClientPid), - %% Redeliver PUBREL - [ClientPid ! {redeliver, {?PUBREL, PktId}} || PktId <- maps:keys(AwaitingComp)], + State1 = State#state{client_pid = ClientPid, + binding = binding(ClientPid), + old_client_pid = OldClientPid, + clean_sess = false, + retry_timer = undefined, + awaiting_rel = #{}, + await_rel_timer = undefined, + expiry_timer = undefined}, - %% Clear awaiting_ack timers - [cancel_timer(TRef) || TRef <- maps:values(AwaitingAck)], - - %% Clear awaiting_comp timers - [cancel_timer(TRef) || TRef <- maps:values(AwaitingComp)], - - Session1 = Session#session{client_pid = ClientPid, - old_client_pid = OldClientPid, - clean_sess = false, - awaiting_ack = #{}, - awaiting_comp = #{}, - expired_timer = undefined}, - - %% CleanSess: true -> false? + %% Clean Session: true -> false? if - CleanSess =:= true -> - ?LOG(warning, "CleanSess changed to false.", [], Session), - emqttd_sm:reg_session(ClientId, false, sess_info(Session1)); + CleanSess =:= true -> + ?LOG(error, "CleanSess changed to false.", [], State1), + emqttd_sm:register_session(ClientId, false, info(State1)); CleanSess =:= false -> ok end, - %% Redeliver inflight messages - Session2 = - lists:foldl(fun({_Id, Msg}, Sess) -> - redeliver(Msg, Sess) - end, Session1, lists:reverse(InflightQ)), + %% Replay delivery and Dequeue pending messages + hibernate(emit_stats(dequeue(retry_delivery(true, State1)))); - %% Dequeue pending messages - hibernate(dequeue(Session2)); +handle_cast({destroy, ClientId}, + State = #state{client_id = ClientId, client_pid = undefined}) -> + ?LOG(warning, "Destroyed", [], State), + shutdown(destroy, State); -%% PUBACK -handle_cast({puback, PktId}, Session = #session{awaiting_ack = AwaitingAck}) -> - case maps:find(PktId, AwaitingAck) of - {ok, TRef} -> - cancel_timer(TRef), - hibernate(dequeue(acked(PktId, Session))); - error -> - ?LOG(warning, "Cannot find PUBACK: ~p", [PktId], Session), - hibernate(Session) - end; - -%% PUBREC -handle_cast({pubrec, PktId}, Session = #session{awaiting_ack = AwaitingAck, - awaiting_comp = AwaitingComp, - await_rel_timeout = Timeout}) -> - case maps:find(PktId, AwaitingAck) of - {ok, TRef} -> - cancel_timer(TRef), - TRef1 = timer(Timeout, {timeout, awaiting_comp, PktId}), - AwaitingComp1 = maps:put(PktId, TRef1, AwaitingComp), - Session1 = acked(PktId, Session#session{awaiting_comp = AwaitingComp1}), - hibernate(dequeue(Session1)); - error -> - ?LOG(error, "Cannot find PUBREC: ~p", [PktId], Session), - hibernate(Session) - end; - -%% PUBREL -handle_cast({pubrel, PktId}, Session = #session{awaiting_rel = AwaitingRel}) -> - case maps:find(PktId, AwaitingRel) of - {ok, {Msg, TRef}} -> - cancel_timer(TRef), - emqttd:publish(Msg), - hibernate(Session#session{awaiting_rel = maps:remove(PktId, AwaitingRel)}); - error -> - ?LOG(error, "Cannot find PUBREL: ~p", [PktId], Session), - hibernate(Session) - end; - -%% PUBCOMP -handle_cast({pubcomp, PktId}, Session = #session{awaiting_comp = AwaitingComp}) -> - case maps:find(PktId, AwaitingComp) of - {ok, TRef} -> - cancel_timer(TRef), - hibernate(Session#session{awaiting_comp = maps:remove(PktId, AwaitingComp)}); - error -> - ?LOG(error, "Cannot find PUBCOMP: ~p", [PktId], Session), - hibernate(Session) - end; +handle_cast({destroy, ClientId}, + State = #state{client_id = ClientId, client_pid = OldClientPid}) -> + ?LOG(warning, "kickout ~p", [OldClientPid], State), + shutdown(conflict, State); handle_cast(Msg, State) -> ?UNEXPECTED_MSG(Msg, State). %% Dispatch Message -handle_info({dispatch, Topic, Msg}, Session = #session{subscriptions = Subscriptions}) - when is_record(Msg, mqtt_message) -> - dispatch(tune_qos(Topic, Msg, Subscriptions), Session); +handle_info({dispatch, Topic, Msg}, State) when is_record(Msg, mqtt_message) -> + {noreply, gc(dispatch(tune_qos(Topic, Msg, State), State)), hibernate}; -handle_info({timeout, awaiting_ack, PktId}, Session = #session{client_pid = undefined, - awaiting_ack = AwaitingAck}) -> - %% just remove awaiting - hibernate(Session#session{awaiting_ack = maps:remove(PktId, AwaitingAck)}); +%% Do nothing if the client has been disconnected. +handle_info({timeout, _Timer, retry_delivery}, State = #state{client_pid = undefined}) -> + hibernate(emit_stats(State#state{retry_timer = undefined})); -handle_info({timeout, awaiting_ack, PktId}, Session = #session{inflight_queue = InflightQ, - awaiting_ack = AwaitingAck}) -> - case maps:find(PktId, AwaitingAck) of - {ok, _TRef} -> - case lists:keyfind(PktId, 1, InflightQ) of - {_, Msg} -> - hibernate(redeliver(Msg, Session)); - false -> - ?LOG(error, "AwaitingAck timeout but Cannot find PktId: ~p", [PktId], Session), - hibernate(dequeue(Session)) - end; - error -> - ?LOG(error, "Cannot find AwaitingAck: ~p", [PktId], Session), - hibernate(Session) - end; +handle_info({timeout, _Timer, retry_delivery}, State) -> + hibernate(emit_stats(retry_delivery(false, State#state{retry_timer = undefined}))); -handle_info({timeout, awaiting_rel, PktId}, Session = #session{awaiting_rel = AwaitingRel}) -> - case maps:find(PktId, AwaitingRel) of - {ok, {_Msg, _TRef}} -> - ?LOG(warning, "AwaitingRel Timout: ~p, Drop Message!", [PktId], Session), - hibernate(Session#session{awaiting_rel = maps:remove(PktId, AwaitingRel)}); - error -> - ?LOG(error, "Cannot find AwaitingRel: ~p", [PktId], Session), - hibernate(Session) - end; +handle_info({timeout, _Timer, check_awaiting_rel}, State) -> + hibernate(expire_awaiting_rel(emit_stats(State#state{await_rel_timer = undefined}))); -handle_info({timeout, awaiting_comp, PktId}, Session = #session{awaiting_comp = Awaiting}) -> - case maps:find(PktId, Awaiting) of - {ok, _TRef} -> - ?LOG(warning, "Awaiting PUBCOMP Timout: ~p", [PktId], Session), - hibernate(Session#session{awaiting_comp = maps:remove(PktId, Awaiting)}); - error -> - ?LOG(error, "Cannot find Awaiting PUBCOMP: ~p", [PktId], Session), - hibernate(Session) - end; +handle_info({timeout, _Timer, expired}, State) -> + ?LOG(info, "Expired, shutdown now.", [], State), + shutdown(expired, State); -handle_info(collect_info, Session = #session{clean_sess = CleanSess, client_id = ClientId}) -> - emqttd_sm:reg_session(ClientId, CleanSess, sess_info(Session)), - hibernate(start_collector(Session)); +handle_info({'EXIT', ClientPid, _Reason}, + State = #state{clean_sess = true, client_pid = ClientPid}) -> + {stop, normal, State}; -handle_info({'EXIT', ClientPid, _Reason}, Session = #session{clean_sess = true, - client_pid = ClientPid}) -> - {stop, normal, Session}; +handle_info({'EXIT', ClientPid, Reason}, + State = #state{clean_sess = false, + client_pid = ClientPid, + expiry_interval = Interval}) -> + ?LOG(info, "Client ~p EXIT for ~p", [ClientPid, Reason], State), + ExpireTimer = start_timer(Interval, expired), + State1 = State#state{client_pid = undefined, expiry_timer = ExpireTimer}, + hibernate(emit_stats(State1)); -handle_info({'EXIT', ClientPid, Reason}, Session = #session{clean_sess = false, - client_pid = ClientPid, - expired_after = Expires}) -> - ?LOG(info, "Client ~p EXIT for ~p", [ClientPid, Reason], Session), - TRef = timer(Expires, expired), - hibernate(Session#session{client_pid = undefined, expired_timer = TRef}); - -handle_info({'EXIT', Pid, _Reason}, Session = #session{old_client_pid = Pid}) -> +handle_info({'EXIT', Pid, _Reason}, State = #state{old_client_pid = Pid}) -> %%ignore - hibernate(Session); + hibernate(State); -handle_info({'EXIT', Pid, Reason}, Session = #session{client_pid = ClientPid}) -> +handle_info({'EXIT', Pid, Reason}, State = #state{client_pid = ClientPid}) -> ?LOG(error, "Unexpected EXIT: client_pid=~p, exit_pid=~p, reason=~p", - [ClientPid, Pid, Reason], Session), - hibernate(Session); - -handle_info(expired, Session) -> - ?LOG(info, "expired, shutdown now.", [], Session), - shutdown(expired, Session); + [ClientPid, Pid, Reason], State), + hibernate(State); handle_info(Info, Session) -> ?UNEXPECTED_INFO(Info, Session). -terminate(Reason, #session{client_id = ClientId, username = Username}) -> - emqttd:run_hooks('session.terminated', [ClientId, Username, Reason]), - emqttd:subscriber_down(ClientId), - emqttd_sm:unreg_session(ClientId). +terminate(Reason, #state{client_id = ClientId, username = Username}) -> + emqttd_stats:del_session_stats(ClientId), + emqttd_hooks:run('session.terminated', [ClientId, Username, Reason]), + emqttd_server:subscriber_down(ClientId), + emqttd_sm:unregister_session(ClientId). code_change(_OldVsn, Session, _Extra) -> {ok, Session}. %%-------------------------------------------------------------------- -%% Kick old client out +%% Kickout old client %%-------------------------------------------------------------------- kick(_ClientId, undefined, _Pid) -> ignore; @@ -546,133 +592,222 @@ kick(ClientId, OldPid, Pid) -> %% Clean noproc receive {'EXIT', OldPid, _} -> ok after 0 -> ok end. +%%-------------------------------------------------------------------- +%% Replay or Retry Delivery +%%-------------------------------------------------------------------- + +%% Redeliver at once if Force is true + +retry_delivery(Force, State = #state{inflight = Inflight}) -> + case Inflight:is_empty() of + true -> State; + false -> Msgs = lists:sort(sortfun(inflight), Inflight:values()), + retry_delivery(Force, Msgs, os:timestamp(), State) + end. + +retry_delivery(_Force, [], _Now, State = #state{retry_interval = Interval}) -> + State#state{retry_timer = start_timer(Interval, retry_delivery)}; + +retry_delivery(Force, [{Type, Msg, Ts} | Msgs], Now, + State = #state{inflight = Inflight, + retry_interval = Interval}) -> + Diff = timer:now_diff(Now, Ts) div 1000, %% micro -> ms + if + Force orelse (Diff >= Interval) -> + case {Type, Msg} of + {publish, Msg = #mqtt_message{pktid = PacketId}} -> + redeliver(Msg, State), + Inflight1 = Inflight:update(PacketId, {publish, Msg, Now}), + retry_delivery(Force, Msgs, Now, State#state{inflight = Inflight1}); + {pubrel, PacketId} -> %% remove 'pubrel' directly? + retry_delivery(Force, Msgs, Now, State#state{inflight = Inflight:delete(PacketId)}) + end; + true -> + State#state{retry_timer = start_timer(Interval - Diff, retry_delivery)} + end. + +%%-------------------------------------------------------------------- +%% Expire Awaiting Rel +%%-------------------------------------------------------------------- + +expire_awaiting_rel(State = #state{awaiting_rel = AwaitingRel}) -> + case maps:size(AwaitingRel) of + 0 -> State; + _ -> Msgs = lists:sort(sortfun(awaiting_rel), maps:to_list(AwaitingRel)), + expire_awaiting_rel(Msgs, os:timestamp(), State) + end. + +expire_awaiting_rel([], _Now, State) -> + State#state{await_rel_timer = undefined}; + +expire_awaiting_rel([{PacketId, #mqtt_message{timestamp = TS}} | Msgs], + Now, State = #state{awaiting_rel = AwaitingRel, + await_rel_timeout = Timeout}) -> + case (timer:now_diff(Now, TS) div 1000) of + Diff when Diff >= Timeout -> + expire_awaiting_rel(Msgs, Now, State#state{awaiting_rel = maps:remove(PacketId, AwaitingRel)}); + Diff -> + State#state{await_rel_timer = start_timer(Timeout - Diff, check_awaiting_rel)} + end. + +%%-------------------------------------------------------------------- +%% Sort Inflight, AwaitingRel +%%-------------------------------------------------------------------- + +sortfun(inflight) -> + fun({_, _, Ts1}, {_, _, Ts2}) -> Ts1 < Ts2 end; + +sortfun(awaiting_rel) -> + fun({_, #mqtt_message{timestamp = Ts1}}, + {_, #mqtt_message{timestamp = Ts2}}) -> + Ts1 < Ts2 + end. + +%%-------------------------------------------------------------------- +%% Check awaiting rel +%%-------------------------------------------------------------------- + +is_awaiting_full(#state{max_awaiting_rel = 0}) -> + false; +is_awaiting_full(#state{awaiting_rel = AwaitingRel, max_awaiting_rel = MaxLen}) -> + maps:size(AwaitingRel) >= MaxLen. + %%-------------------------------------------------------------------- %% Dispatch Messages %%-------------------------------------------------------------------- -%% Queue message if client disconnected -dispatch(Msg, Session = #session{client_pid = undefined, message_queue = Q}) -> - hibernate(Session#session{message_queue = emqttd_mqueue:in(Msg, Q)}); +%% Enqueue message if the client has been disconnected +dispatch(Msg, State = #state{client_pid = undefined}) -> + enqueue_msg(Msg, State); %% Deliver qos0 message directly to client -dispatch(Msg = #mqtt_message{qos = ?QOS0}, Session = #session{client_pid = ClientPid}) -> - ClientPid ! {deliver, Msg}, - hibernate(Session); +dispatch(Msg = #mqtt_message{qos = ?QOS0}, State) -> + deliver(Msg, State), State; -dispatch(Msg = #mqtt_message{qos = QoS}, Session = #session{message_queue = MsgQ}) +dispatch(Msg = #mqtt_message{qos = QoS}, + State = #state{next_msg_id = MsgId, inflight = Inflight}) when QoS =:= ?QOS1 orelse QoS =:= ?QOS2 -> - case check_inflight(Session) of + case Inflight:is_full() of true -> - noreply(deliver(Msg, Session)); + enqueue_msg(Msg, State); false -> - hibernate(Session#session{message_queue = emqttd_mqueue:in(Msg, MsgQ)}) + Msg1 = Msg#mqtt_message{pktid = MsgId}, + deliver(Msg1, State), + await(Msg1, next_msg_id(State)) end. -tune_qos(Topic, Msg = #mqtt_message{qos = PubQos}, SubMap) -> +enqueue_msg(Msg, State = #state{mqueue = Q}) -> + inc_stats(enqueue_msg), + State#state{mqueue = emqttd_mqueue:in(Msg, Q)}. + +%%-------------------------------------------------------------------- +%% Deliver +%%-------------------------------------------------------------------- + +redeliver(Msg = #mqtt_message{qos = QoS}, State) -> + deliver(Msg#mqtt_message{dup = if QoS =:= ?QOS2 -> false; true -> true end}, State). + +deliver(Msg, #state{client_pid = Pid}) -> + inc_stats(deliver_msg), + Pid ! {deliver, Msg}. + +%%-------------------------------------------------------------------- +%% Awaiting ACK for QoS1/QoS2 Messages +%%-------------------------------------------------------------------- + +await(Msg = #mqtt_message{pktid = PacketId}, + State = #state{inflight = Inflight, + retry_timer = RetryTimer, + retry_interval = Interval}) -> + %% Start retry timer if the Inflight is still empty + State1 = ?IF(RetryTimer == undefined, State#state{retry_timer = start_timer(Interval, retry_delivery)}, State), + State1#state{inflight = Inflight:insert(PacketId, {publish, Msg, os:timestamp()})}. + +acked(puback, PacketId, State = #state{client_id = ClientId, + username = Username, + inflight = Inflight}) -> + {publish, Msg, _Ts} = Inflight:lookup(PacketId), + emqttd_hooks:run('message.acked', [ClientId, Username], Msg), + State#state{inflight = Inflight:delete(PacketId)}; + +acked(pubrec, PacketId, State = #state{client_id = ClientId, + username = Username, + inflight = Inflight}) -> + {publish, Msg, _Ts} = Inflight:lookup(PacketId), + emqttd_hooks:run('message.acked', [ClientId, Username], Msg), + State#state{inflight = Inflight:update(PacketId, {pubrel, PacketId, os:timestamp()})}; + +acked(pubcomp, PacketId, State = #state{inflight = Inflight}) -> + State#state{inflight = Inflight:delete(PacketId)}. + +%%-------------------------------------------------------------------- +%% Dequeue +%%-------------------------------------------------------------------- + +%% Do nothing if client is disconnected +dequeue(State = #state{client_pid = undefined}) -> + State; + +dequeue(State = #state{inflight = Inflight}) -> + case Inflight:is_full() of + true -> State; + false -> dequeue2(State) + end. + +dequeue2(State = #state{mqueue = Q}) -> + case emqttd_mqueue:out(Q) of + {empty, _Q} -> + State; + {{value, Msg}, Q1} -> + %% Dequeue more + dequeue(dispatch(Msg, State#state{mqueue = Q1})) + end. + +%%-------------------------------------------------------------------- +%% Tune QoS +%%-------------------------------------------------------------------- + +tune_qos(Topic, Msg = #mqtt_message{qos = PubQoS}, + #state{subscriptions = SubMap, upgrade_qos = UpgradeQoS}) -> case maps:find(Topic, SubMap) of - {ok, SubQos} when PubQos > SubQos -> - Msg#mqtt_message{qos = SubQos}; - {ok, _SubQos} -> + {ok, SubQoS} when UpgradeQoS andalso (SubQoS > PubQoS) -> + Msg#mqtt_message{qos = SubQoS}; + {ok, SubQoS} when (not UpgradeQoS) andalso (SubQoS < PubQoS) -> + Msg#mqtt_message{qos = SubQoS}; + {ok, _} -> Msg; error -> Msg end. %%-------------------------------------------------------------------- -%% Check inflight and awaiting_rel +%% Next Msg Id %%-------------------------------------------------------------------- -check_inflight(#session{max_inflight = 0}) -> - true; -check_inflight(#session{max_inflight = Max, inflight_queue = Q}) -> - Max > length(Q). +next_msg_id(State = #state{next_msg_id = 16#FFFF}) -> + State#state{next_msg_id = 1}; -check_awaiting_rel(#session{max_awaiting_rel = 0}) -> - true; -check_awaiting_rel(#session{awaiting_rel = AwaitingRel, - max_awaiting_rel = MaxLen}) -> - maps:size(AwaitingRel) < MaxLen. +next_msg_id(State = #state{next_msg_id = Id}) -> + State#state{next_msg_id = Id + 1}. %%-------------------------------------------------------------------- -%% Dequeue and Deliver +%% Emit session stats %%-------------------------------------------------------------------- -dequeue(Session = #session{client_pid = undefined}) -> - %% do nothing if client is disconnected - Session; +emit_stats(State = #state{enable_stats = false}) -> + State; +emit_stats(State = #state{client_id = ClientId}) -> + emqttd_stats:set_session_stats(ClientId, stats(State)), + State. -dequeue(Session) -> - case check_inflight(Session) of - true -> dequeue2(Session); - false -> Session - end. - -dequeue2(Session = #session{message_queue = Q}) -> - case emqttd_mqueue:out(Q) of - {empty, _Q} -> - Session; - {{value, Msg}, Q1} -> - %% dequeue more - dequeue(deliver(Msg, Session#session{message_queue = Q1})) - end. - -deliver(Msg = #mqtt_message{qos = ?QOS_0}, Session = #session{client_pid = ClientPid}) -> - ClientPid ! {deliver, Msg}, Session; - -deliver(Msg = #mqtt_message{qos = QoS}, Session = #session{packet_id = PktId, - client_pid = ClientPid, - inflight_queue = InflightQ}) - when QoS =:= ?QOS_1 orelse QoS =:= ?QOS_2 -> - Msg1 = Msg#mqtt_message{pktid = PktId, dup = false}, - ClientPid ! {deliver, Msg1}, - await(Msg1, next_packet_id(Session#session{inflight_queue = [{PktId, Msg1}|InflightQ]})). - -redeliver(Msg = #mqtt_message{qos = ?QOS_0}, Session) -> - deliver(Msg, Session); - -redeliver(Msg = #mqtt_message{qos = QoS}, Session = #session{client_pid = ClientPid}) - when QoS =:= ?QOS_1 orelse QoS =:= ?QOS_2 -> - ClientPid ! {deliver, Msg#mqtt_message{dup = true}}, - await(Msg, Session). +inc_stats(Key) -> put(Key, get(Key) + 1). %%-------------------------------------------------------------------- -%% Awaiting ack for qos1, qos2 message -%%------------------------------------------------------------------------------ -await(#mqtt_message{pktid = PktId}, Session = #session{awaiting_ack = Awaiting, - retry_interval = Timeout}) -> - TRef = timer(Timeout, {timeout, awaiting_ack, PktId}), - Awaiting1 = maps:put(PktId, TRef, Awaiting), - Session#session{awaiting_ack = Awaiting1}. +%% Helper functions +%%-------------------------------------------------------------------- -acked(PktId, Session = #session{client_id = ClientId, - username = Username, - inflight_queue = InflightQ, - awaiting_ack = Awaiting}) -> - case lists:keyfind(PktId, 1, InflightQ) of - {_, Msg} -> - emqttd:run_hooks('message.acked', [ClientId, Username], Msg); - false -> - ?LOG(error, "Cannot find acked pktid: ~p", [PktId], Session) - end, - Session#session{awaiting_ack = maps:remove(PktId, Awaiting), - inflight_queue = lists:keydelete(PktId, 1, InflightQ)}. - -next_packet_id(Session = #session{packet_id = 16#ffff}) -> - Session#session{packet_id = 1}; - -next_packet_id(Session = #session{packet_id = Id}) -> - Session#session{packet_id = Id + 1}. - -timer(TimeoutSec, TimeoutMsg) -> - erlang:send_after(timer:seconds(TimeoutSec), self(), TimeoutMsg). - -cancel_timer(undefined) -> - undefined; -cancel_timer(Ref) -> - catch erlang:cancel_timer(Ref). - -noreply(State) -> - {noreply, State}. +reply(Reply, State) -> + {reply, Reply, State, hibernate}. hibernate(State) -> {noreply, State, hibernate}. @@ -680,29 +815,6 @@ hibernate(State) -> shutdown(Reason, State) -> {stop, {shutdown, Reason}, State}. -start_collector(Session = #session{collect_interval = 0}) -> - Session; - -start_collector(Session = #session{collect_interval = Interval}) -> - TRef = erlang:send_after(timer:seconds(Interval), self(), collect_info), - Session#session{collect_timer = TRef}. - -sess_info(#session{clean_sess = CleanSess, - inflight_queue = InflightQueue, - max_inflight = MaxInflight, - message_queue = MessageQueue, - awaiting_rel = AwaitingRel, - awaiting_ack = AwaitingAck, - awaiting_comp = AwaitingComp, - timestamp = CreatedAt}) -> - Stats = emqttd_mqueue:stats(MessageQueue), - [{clean_sess, CleanSess}, - {max_inflight, MaxInflight}, - {inflight_queue, length(InflightQueue)}, - {message_queue, get_value(len, Stats)}, - {message_dropped,get_value(dropped, Stats)}, - {awaiting_rel, maps:size(AwaitingRel)}, - {awaiting_ack, maps:size(AwaitingAck)}, - {awaiting_comp, maps:size(AwaitingComp)}, - {created_at, CreatedAt}]. +gc(State) -> + emqttd_gc:maybe_force_gc(#state.force_gc_count, State). diff --git a/src/emqttd_session_sup.erl b/src/emqttd_session_sup.erl index 88766b11a..bd9b34f02 100644 --- a/src/emqttd_session_sup.erl +++ b/src/emqttd_session_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,9 +14,11 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc emqttd session supervisor. +%% @doc Session Supervisor. -module(emqttd_session_sup). +-author("Feng Lee "). + -behavior(supervisor). -export([start_link/0, start_session/3]). @@ -41,4 +43,3 @@ init([]) -> {ok, {{simple_one_for_one, 0, 1}, [{session, {emqttd_session, start_link, []}, temporary, 5000, worker, [emqttd_session]}]}}. - diff --git a/src/emqttd_sm.erl b/src/emqttd_sm.erl index 704242b2d..bbba50d6a 100644 --- a/src/emqttd_sm.erl +++ b/src/emqttd_sm.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc Session Manager -module(emqttd_sm). +-author("Feng Lee "). + -behaviour(gen_server2). -include("emqttd.hrl"). @@ -32,10 +33,12 @@ %% API Function Exports -export([start_link/2]). --export([start_session/2, lookup_session/1, reg_session/3, unreg_session/1]). +-export([start_session/2, lookup_session/1, register_session/3, unregister_session/1]). -export([dispatch/3]). +-export([local_sessions/0]). + %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -91,27 +94,31 @@ lookup_session(ClientId) -> end. %% @doc Register a session with info. --spec(reg_session(binary(), boolean(), [tuple()]) -> true). -reg_session(ClientId, CleanSess, Properties) -> +-spec(register_session(binary(), boolean(), [tuple()]) -> true). +register_session(ClientId, CleanSess, Properties) -> ets:insert(mqtt_local_session, {ClientId, self(), CleanSess, Properties}). %% @doc Unregister a session. --spec(unreg_session(binary()) -> true). -unreg_session(ClientId) -> +-spec(unregister_session(binary()) -> true). +unregister_session(ClientId) -> ets:delete(mqtt_local_session, ClientId). dispatch(ClientId, Topic, Msg) -> try ets:lookup_element(mqtt_local_session, ClientId, 2) of Pid -> Pid ! {dispatch, Topic, Msg} catch - error:badarg -> io:format("Session Not Found: ~p~n", [ClientId]), ok %%TODO: How?? + error:badarg -> ok %%FIXME Later. end. call(SM, Req) -> gen_server2:call(SM, Req, ?TIMEOUT). %%infinity). +%% @doc for debug. +local_sessions() -> + ets:tab2list(mqtt_local_session). + %%-------------------------------------------------------------------- -%% gen_server callbacks +%% gen_server Callbacks %%-------------------------------------------------------------------- init([Pool, Id]) -> @@ -171,6 +178,7 @@ handle_info({'DOWN', MRef, process, DownPid, _Reason}, State) -> [] -> ok; [Sess = #mqtt_session{sess_pid = DownPid}] -> + emqttd_stats:del_session_stats(ClientId), mnesia:delete_object(mqtt_session, Sess, write); [_Sess] -> ok @@ -208,7 +216,7 @@ create_session({CleanSess, {ClientId, Username}, ClientPid}, State) -> create_session(CleanSess, {ClientId, Username}, ClientPid) -> case emqttd_session_sup:start_session(CleanSess, {ClientId, Username}, ClientPid) of {ok, SessPid} -> - Session = #mqtt_session{client_id = ClientId, sess_pid = SessPid, persistent = not CleanSess}, + Session = #mqtt_session{client_id = ClientId, sess_pid = SessPid, clean_sess = CleanSess}, case insert_session(Session) of {aborted, {conflict, ConflictPid}} -> %% Conflict with othe node? diff --git a/src/emqttd_sm_helper.erl b/src/emqttd_sm_helper.erl index 97b356c8d..0f7cb7ef1 100644 --- a/src/emqttd_sm_helper.erl +++ b/src/emqttd_sm_helper.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -17,6 +17,8 @@ %% @doc Session Helper. -module(emqttd_sm_helper). +-author("Feng Lee "). + -behaviour(gen_server). -include("emqttd.hrl"). diff --git a/src/emqttd_sm_sup.erl b/src/emqttd_sm_sup.erl index c43f89f80..efabadb96 100644 --- a/src/emqttd_sm_sup.erl +++ b/src/emqttd_sm_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -15,10 +15,13 @@ %%-------------------------------------------------------------------- %% @doc Session Manager Supervisor. + -module(emqttd_sm_sup). -behaviour(supervisor). +-author("Feng Lee "). + -include("emqttd.hrl"). -define(SM, emqttd_sm). diff --git a/src/emqttd_stats.erl b/src/emqttd_stats.erl index cae57207f..73a1471ac 100644 --- a/src/emqttd_stats.erl +++ b/src/emqttd_stats.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,34 +14,39 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc emqttd statistics -module(emqttd_stats). --include("emqttd.hrl"). - -behaviour(gen_server). --define(SERVER, ?MODULE). +-author("Feng Lee "). + +-include("emqttd.hrl"). -export([start_link/0, stop/0]). -%% statistics API. --export([statsfun/1, statsfun/2, - getstats/0, getstat/1, - setstat/2, setstats/3]). +%% Client and Session Stats +-export([set_client_stats/2, get_client_stats/1, del_client_stats/1, + set_session_stats/2, get_session_stats/1, del_session_stats/1]). + +%% Statistics API. +-export([statsfun/1, statsfun/2, getstats/0, getstat/1, setstat/2, setstats/3]). %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --record(state, {tick_tref}). +-record(state, {tick}). + +-type(stats() :: list({atom(), non_neg_integer()})). -define(STATS_TAB, mqtt_stats). +-define(CLIENT_STATS_TAB, mqtt_client_stats). +-define(SESSION_STATS_TAB, mqtt_session_stats). %% $SYS Topics for Clients -define(SYSTOP_CLIENTS, [ - 'clients/count', % clients connected current - 'clients/max' % max clients connected + 'clients/count', % clients connected current + 'clients/max' % max clients connected ]). %% $SYS Topics for Sessions @@ -75,10 +80,40 @@ %% @doc Start stats server -spec(start_link() -> {ok, pid()} | ignore | {error, term()}). start_link() -> - gen_server:start_link({local, ?SERVER}, ?MODULE, [], []). + gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). stop() -> - gen_server:call(?SERVER, stop). + gen_server:call(?MODULE, stop). + +-spec(set_client_stats(binary(), stats()) -> true). +set_client_stats(ClientId, Stats) -> + ets:insert(?CLIENT_STATS_TAB, {ClientId, [{'$ts', emqttd_time:now_secs()}|Stats]}). + +-spec(get_client_stats(binary()) -> stats()). +get_client_stats(ClientId) -> + case ets:lookup(?CLIENT_STATS_TAB, ClientId) of + [{_, Stats}] -> Stats; + [] -> [] + end. + +-spec(del_client_stats(binary()) -> true). +del_client_stats(ClientId) -> + ets:delete(?CLIENT_STATS_TAB, ClientId). + +-spec(set_session_stats(binary(), stats()) -> true). +set_session_stats(ClientId, Stats) -> + ets:insert(?SESSION_STATS_TAB, {ClientId, [{'$ts', emqttd_time:now_secs()}|Stats]}). + +-spec(get_session_stats(binary()) -> stats()). +get_session_stats(ClientId) -> + case ets:lookup(?SESSION_STATS_TAB, ClientId) of + [{_, Stats}] -> Stats; + [] -> [] + end. + +-spec(del_session_stats(binary()) -> true). +del_session_stats(ClientId) -> + ets:delete(?SESSION_STATS_TAB, ClientId). %% @doc Generate stats fun -spec(statsfun(Stat :: atom()) -> fun()). @@ -118,13 +153,14 @@ setstats(Stat, MaxStat, Val) -> init([]) -> emqttd_time:seed(), - ets:new(?STATS_TAB, [set, public, named_table, {write_concurrency, true}]), + lists:foreach( + fun(Tab) -> + Tab = ets:new(Tab, [set, public, named_table, {write_concurrency, true}]) + end, [?STATS_TAB, ?CLIENT_STATS_TAB, ?SESSION_STATS_TAB]), Topics = ?SYSTOP_CLIENTS ++ ?SYSTOP_SESSIONS ++ ?SYSTOP_PUBSUB ++ ?SYSTOP_RETAINED, ets:insert(?STATS_TAB, [{Topic, 0} || Topic <- Topics]), - % Create $SYS Topics - % [ok = emqttd:create(topic, stats_topic(Topic)) || Topic <- Topics], % Tick to publish stats - {ok, #state{tick_tref = emqttd_broker:start_tick(tick)}, hibernate}. + {ok, #state{tick = emqttd_broker:start_tick(tick)}, hibernate}. handle_call(stop, _From, State) -> {stop, normal, ok, State}; @@ -154,7 +190,7 @@ handle_info(tick, State) -> handle_info(_Info, State) -> {noreply, State}. -terminate(_Reason, #state{tick_tref = TRef}) -> +terminate(_Reason, #state{tick = TRef}) -> emqttd_broker:stop_tick(TRef). code_change(_OldVsn, State, _Extra) -> diff --git a/src/emqttd_sup.erl b/src/emqttd_sup.erl index 59ffde2ea..e38d20d65 100644 --- a/src/emqttd_sup.erl +++ b/src/emqttd_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,11 +14,12 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc emqttd top supervisor. -module(emqttd_sup). -behaviour(supervisor). +-author("Feng Lee "). + -include("emqttd.hrl"). %% API @@ -50,5 +51,5 @@ start_child(Mod, Type) when is_atom(Mod) and is_atom(Type) -> %%-------------------------------------------------------------------- init([]) -> - {ok, {{one_for_all, 10, 3600}, []}}. + {ok, {{one_for_all, 0, 1}, []}}. diff --git a/src/emqttd_sysmon.erl b/src/emqttd_sysmon.erl index 7c338a842..c94c1df54 100644 --- a/src/emqttd_sysmon.erl +++ b/src/emqttd_sysmon.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -17,6 +17,8 @@ %% @doc VM System Monitor -module(emqttd_sysmon). +-author("Feng Lee "). + -behavior(gen_server). -include("emqttd_internal.hrl"). diff --git a/src/emqttd_sysmon_sup.erl b/src/emqttd_sysmon_sup.erl index 0131c42db..99e7a628d 100644 --- a/src/emqttd_sysmon_sup.erl +++ b/src/emqttd_sysmon_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/src/emqttd_time.erl b/src/emqttd_time.erl index 49cf4965c..7e5940438 100644 --- a/src/emqttd_time.erl +++ b/src/emqttd_time.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,21 +16,25 @@ -module(emqttd_time). --export([seed/0, now_to_secs/0, now_to_secs/1, now_to_ms/0, now_to_ms/1]). +-author("Feng Lee "). + +-export([seed/0, now_secs/0, now_secs/1, now_ms/0, now_ms/1, ts_from_ms/1]). seed() -> - case erlang:function_exported(erlang, timestamp, 0) of - true -> random:seed(erlang:timestamp()); %% R18 - false -> random:seed(os:timestamp()) %% Compress now() deprecated warning... - end. + rand:seed(exsplus, erlang:timestamp()). -now_to_secs() -> now_to_secs(os:timestamp()). +now_ms() -> + now_ms(os:timestamp()). -now_to_secs({MegaSecs, Secs, _MicroSecs}) -> - MegaSecs * 1000000 + Secs. - -now_to_ms() -> now_to_ms(os:timestamp()). - -now_to_ms({MegaSecs, Secs, MicroSecs}) -> +now_ms({MegaSecs, Secs, MicroSecs}) -> (MegaSecs * 1000000 + Secs) * 1000 + round(MicroSecs/1000). +now_secs() -> + now_secs(os:timestamp()). + +now_secs({MegaSecs, Secs, _MicroSecs}) -> + MegaSecs * 1000000 + Secs. + +ts_from_ms(Ms) -> + {Ms div 1000000, Ms rem 1000000, 0}. + diff --git a/src/emqttd_topic.erl b/src/emqttd_topic.erl index 0afeacae8..458a41f7d 100644 --- a/src/emqttd_topic.erl +++ b/src/emqttd_topic.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,8 +16,12 @@ -module(emqttd_topic). +-author("Feng Lee "). + -include("emqttd_protocol.hrl"). +-include("emqttd_internal.hrl"). + -import(lists, [reverse/1]). -export([match/2, validate/1, triples/1, words/1, wildcard/1]). @@ -55,8 +59,8 @@ wildcard([_H|T]) -> %% @doc Match Topic name with filter -spec(match(Name, Filter) -> boolean() when - Name :: topic() | words(), - Filter :: topic() | words()). + Name :: topic() | words(), + Filter :: topic() | words()). match(Name, Filter) when is_binary(Name) and is_binary(Filter) -> match(words(Name), words(Filter)); match([], []) -> @@ -94,17 +98,14 @@ validate2([]) -> true; validate2(['#']) -> % end with '#' true; -validate2(['#'|Words]) when length(Words) > 0 -> - false; +validate2(['#'|Words]) when length(Words) > 0 -> + false; validate2([''|Words]) -> validate2(Words); validate2(['+'|Words]) -> validate2(Words); validate2([W|Words]) -> - case validate3(W) of - true -> validate2(Words); - false -> false - end. + case validate3(W) of true -> validate2(Words); false -> false end. validate3(<<>>) -> true; @@ -180,24 +181,28 @@ join(Words) -> parse(Topic) when is_binary(Topic) -> parse(Topic, []). -parse(Topic = <<"$local/", Topic1/binary>>, Options) -> - case lists:member(local, Options) of - true -> error({invalid_topic, Topic}); - false -> parse(Topic1, [local | Options]) - end; +parse(<<"$local/", Topic1/binary>>, Options) -> + if_not_contain(local, Options, fun() -> + parse(Topic1, [local | Options]) + end); -parse(Topic = <<"$queue/", Topic1/binary>>, Options) -> - case lists:keyfind(share, 1, Options) of - {share, _} -> error({invalid_topic, Topic}); - false -> parse(Topic1, [{share, '$queue'} | Options]) - end; +parse(<<"$queue/", Topic1/binary>>, Options) -> + if_not_contain(share, Options,fun() -> + parse(Topic1, [{share, '$queue'} | Options]) + end); -parse(Topic = <<"$share/", Topic1/binary>>, Options) -> - case lists:keyfind(share, 1, Options) of - {share, _} -> error({invalid_topic, Topic}); - false -> [Share, Topic2] = binary:split(Topic1, <<"/">>), - {Topic2, [{share, Share} | Options]} - end; +parse(<<"$share/", Topic1/binary>>, Options) -> + if_not_contain(share, Options, fun() -> + [Share, Topic2] = binary:split(Topic1, <<"/">>), + {Topic2, [{share, Share} | Options]} + end); -parse(Topic, Options) -> {Topic, Options}. +parse(Topic, Options) -> + {Topic, Options}. + +if_not_contain(local, Options, Fun) -> + ?IF(lists:member(local, Options), error(invalid_topic), Fun()); + +if_not_contain(share, Options, Fun) -> + ?IF(lists:keyfind(share, 1, Options), error(invalid_topic), Fun()). diff --git a/src/emqttd_trace.erl b/src/emqttd_trace.erl index 069f44937..4d46d9165 100644 --- a/src/emqttd_trace.erl +++ b/src/emqttd_trace.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ %% limitations under the License. %%-------------------------------------------------------------------- -%% @doc -%% Trace MQTT packets/messages by ClientID or Topic. -%% @end +%% @docTrace MQTT packets/messages by ClientID or Topic. -module(emqttd_trace). -behaviour(gen_server). +-author("Feng Lee "). + -include("emqttd_internal.hrl"). %% API Function Exports @@ -34,7 +34,7 @@ -record(state, {level, traces}). --type trace_who() :: {client | topic, binary()}. +-type(trace_who() :: {client | topic, binary()}). -define(TRACE_OPTIONS, [{formatter_config, [time, " [",severity,"] ", message, "\n"]}]). diff --git a/src/emqttd_trace_sup.erl b/src/emqttd_trace_sup.erl index 22736b1a2..728e6818e 100644 --- a/src/emqttd_trace_sup.erl +++ b/src/emqttd_trace_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(emqttd_trace_sup). +-author("Feng Lee "). + -behaviour(supervisor). %% API @@ -29,6 +31,6 @@ start_link() -> init([]) -> Trace = {trace, {emqttd_trace, start_link, []}, - permanent, 5000, worker, [emqttd_trace]}, - {ok, {{one_for_one, 10, 100}, [Trace]}}. + permanent, 5000, worker, [emqttd_trace]}, + {ok, {{one_for_one, 10, 3600}, [Trace]}}. diff --git a/src/emqttd_trie.erl b/src/emqttd_trie.erl index 23bb40bcf..70b1c003f 100644 --- a/src/emqttd_trie.erl +++ b/src/emqttd_trie.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -17,8 +17,11 @@ %% @doc MQTT Topic Trie: %% [Trie](http://en.wikipedia.org/wiki/Trie) %% @end + -module(emqttd_trie). +-author("Feng Lee "). + -include("emqttd_trie.hrl"). %% Mnesia Callbacks diff --git a/src/emqttd_vm.erl b/src/emqttd_vm.erl index abf4d3b78..16fae60ae 100644 --- a/src/emqttd_vm.erl +++ b/src/emqttd_vm.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/src/emqttd_ws.erl b/src/emqttd_ws.erl index a5b3b344f..c6a68150d 100644 --- a/src/emqttd_ws.erl +++ b/src/emqttd_ws.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,13 +16,20 @@ -module(emqttd_ws). +-author("Feng Lee "). + +-include("emqttd_protocol.hrl"). + +-import(proplists, [get_value/3]). + -export([handle_request/1, ws_loop/3]). %% WebSocket Loop State --record(wsocket_state, {peer, client_pid, packet_opts, parser_fun}). +-record(wsocket_state, {peername, client_pid, max_packet_size, parser}). --define(WSLOG(Level, Peer, Format, Args), - lager:Level("WsClient(~s): " ++ Format, [Peer | Args])). +-define(WSLOG(Level, Format, Args, State), + lager:Level("WsClient(~s): " ++ Format, + [esockd_net:format(State#wsocket_state.peername) | Args])). %%-------------------------------------------------------------------- %% Handle WebSocket Request @@ -30,18 +37,14 @@ %% @doc Handle WebSocket Request. handle_request(Req) -> - Peer = Req:get(peer), - {ok, PktOpts} = emqttd:env(protocol), - ParserFun = emqttd_parser:new(PktOpts), - {ReentryWs, ReplyChannel} = upgrade(Req), + {ok, ProtoEnv} = emqttd:env(protocol), + PacketSize = get_value(max_packet_size, ProtoEnv, ?MAX_PACKET_SIZE), + Parser = emqttd_parser:initial_state(PacketSize), + %% Upgrade WebSocket. + {ReentryWs, ReplyChannel} = mochiweb_websocket:upgrade_connection(Req, fun ?MODULE:ws_loop/3), {ok, ClientPid} = emqttd_ws_client_sup:start_client(self(), Req, ReplyChannel), - ReentryWs(#wsocket_state{peer = Peer, client_pid = ClientPid, - packet_opts = PktOpts, parser_fun = ParserFun}). - -%% @doc Upgrade WebSocket. -%% @private -upgrade(Req) -> - mochiweb_websocket:upgrade_connection(Req, fun ?MODULE:ws_loop/3). + ReentryWs(#wsocket_state{peername = Req:get(peername), parser = Parser, + max_packet_size = PacketSize, client_pid = ClientPid}). %%-------------------------------------------------------------------- %% Receive Loop @@ -52,25 +55,24 @@ ws_loop(<<>>, State, _ReplyChannel) -> State; ws_loop([<<>>], State, _ReplyChannel) -> State; -ws_loop(Data, State = #wsocket_state{peer = Peer, client_pid = ClientPid, - parser_fun = ParserFun}, ReplyChannel) -> - ?WSLOG(debug, Peer, "RECV ~p", [Data]), +ws_loop(Data, State = #wsocket_state{client_pid = ClientPid, parser = Parser}, ReplyChannel) -> + ?WSLOG(debug, "RECV ~p", [Data], State), emqttd_metrics:inc('bytes/received', iolist_size(Data)), - case catch ParserFun(iolist_to_binary(Data)) of + case catch emqttd_parser:parse(iolist_to_binary(Data), Parser) of {more, NewParser} -> - State#wsocket_state{parser_fun = NewParser}; + State#wsocket_state{parser = NewParser}; {ok, Packet, Rest} -> gen_server:cast(ClientPid, {received, Packet}), ws_loop(Rest, reset_parser(State), ReplyChannel); {error, Error} -> - ?WSLOG(error, Peer, "Frame error: ~p", [Error]), + ?WSLOG(error, "Frame error: ~p", [Error], State), exit({shutdown, Error}); {'EXIT', Reason} -> - ?WSLOG(error, Peer, "Frame error: ~p", [Reason]), - ?WSLOG(error, Peer, "Error data: ~p", [Data]), + ?WSLOG(error, "Frame error: ~p", [Reason], State), + ?WSLOG(error, "Error data: ~p", [Data], State), exit({shutdown, parser_error}) end. -reset_parser(State = #wsocket_state{packet_opts = PktOpts}) -> - State#wsocket_state{parser_fun = emqttd_parser:new(PktOpts)}. +reset_parser(State = #wsocket_state{max_packet_size = PacketSize}) -> + State#wsocket_state{parser = emqttd_parser:initial_state(PacketSize)}. diff --git a/src/emqttd_ws_client.erl b/src/emqttd_ws_client.erl index bd416fa27..4beb7bc40 100644 --- a/src/emqttd_ws_client.erl +++ b/src/emqttd_ws_client.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -14,106 +14,136 @@ %% limitations under the License. %%-------------------------------------------------------------------- +%% @doc MQTT WebSocket Connection. + -module(emqttd_ws_client). --behaviour(gen_server). +-behaviour(gen_server2). + +-author("Feng Lee "). -include("emqttd.hrl"). -include("emqttd_protocol.hrl"). +-include("emqttd_internal.hrl"). + +-import(proplists, [get_value/3]). + %% API Exports --export([start_link/4, session/1, info/1, kick/1]). +-export([start_link/4]). + +%% Management and Monitor API +-export([info/1, stats/1, kick/1]). %% SUB/UNSUB Asynchronously -export([subscribe/2, unsubscribe/2]). +%% Get the session proc? +-export([session/1]). + %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). -%% WebSocket Client State --record(wsclient_state, {ws_pid, peer, connection, proto_state, keepalive}). +%% gen_server2 Callbacks +-export([prioritise_call/4, prioritise_info/3, handle_pre_hibernate/1]). --define(WSLOG(Level, Peer, Format, Args), - lager:Level("WsClient(~s): " ++ Format, [Peer | Args])). +%% WebSocket Client State +-record(wsclient_state, {ws_pid, peername, connection, proto_state, keepalive, + enable_stats, force_gc_count}). + +-define(SOCK_STATS, [recv_oct, recv_cnt, send_oct, send_cnt, send_pend]). + +-define(WSLOG(Level, Format, Args, State), + lager:Level("WsClient(~s): " ++ Format, + [esockd_net:format(State#wsclient_state.peername) | Args])). %% @doc Start WebSocket Client. -start_link(MqttEnv, WsPid, Req, ReplyChannel) -> - gen_server:start_link(?MODULE, [MqttEnv, WsPid, Req, ReplyChannel], []). - -session(CPid) -> - gen_server:call(CPid, session, infinity). +start_link(Env, WsPid, Req, ReplyChannel) -> + gen_server2:start_link(?MODULE, [Env, WsPid, Req, ReplyChannel], + [{spawn_opt, ?FULLSWEEP_OPTS}]). %% Tune GC. info(CPid) -> - gen_server:call(CPid, info, infinity). + gen_server2:call(CPid, info). + +stats(CPid) -> + gen_server2:call(CPid, stats). kick(CPid) -> - gen_server:call(CPid, kick). + gen_server2:call(CPid, kick). subscribe(CPid, TopicTable) -> - gen_server:cast(CPid, {subscribe, TopicTable}). + CPid ! {subscribe, TopicTable}. unsubscribe(CPid, Topics) -> - gen_server:cast(CPid, {unsubscribe, Topics}). + CPid ! {unsubscribe, Topics}. + +session(CPid) -> + gen_server2:call(CPid, session). %%-------------------------------------------------------------------- %% gen_server Callbacks %%-------------------------------------------------------------------- -init([MqttEnv, WsPid, Req, ReplyChannel]) -> +init([Env, WsPid, Req, ReplyChannel]) -> process_flag(trap_exit, true), true = link(WsPid), {ok, Peername} = Req:get(peername), Headers = mochiweb_headers:to_list( mochiweb_request:get(headers, Req)), - %% SendFun = fun(Payload) -> ReplyChannel({binary, Payload}) end, - SendFun = fun(Packet) -> - Data = emqttd_serializer:serialize(Packet), - emqttd_metrics:inc('bytes/sent', iolist_size(Data)), - ReplyChannel({binary, Data}) - end, - ProtoState = emqttd_protocol:init(Peername, SendFun, - [{ws_initial_headers, Headers} | MqttEnv]), - {ok, #wsclient_state{ws_pid = WsPid, peer = Req:get(peer), - connection = Req:get(connection), - proto_state = ProtoState}, idle_timeout(MqttEnv)}. + Conn = Req:get(connection), + ProtoState = emqttd_protocol:init(Peername, send_fun(ReplyChannel), + [{ws_initial_headers, Headers} | Env]), + IdleTimeout = get_value(client_idle_timeout, Env, 30000), + EnableStats = get_value(client_enable_stats, Env, false), + ForceGcCount = emqttd_gc:conn_max_gc_count(), + {ok, #wsclient_state{connection = Conn, + ws_pid = WsPid, + peername = Peername, + proto_state = ProtoState, + enable_stats = EnableStats, + force_gc_count = ForceGcCount}, + IdleTimeout, {backoff, 2000, 2000, 20000}, ?MODULE}. -idle_timeout(MqttEnv) -> - timer:seconds(proplists:get_value(client_idle_timeout, MqttEnv, 10)). +prioritise_call(Msg, _From, _Len, _State) -> + case Msg of info -> 10; stats -> 10; state -> 10; _ -> 5 end. -handle_call(session, _From, State = #wsclient_state{proto_state = ProtoState}) -> - {reply, emqttd_protocol:session(ProtoState), State}; +prioritise_info(Msg, _Len, _State) -> + case Msg of {redeliver, _} -> 5; _ -> 0 end. -handle_call(info, _From, State = #wsclient_state{peer = Peer, - proto_state = ProtoState}) -> - ProtoInfo = emqttd_protocol:info(ProtoState), - {reply, [{websocket, true}, {peer, Peer}| ProtoInfo], State}; +handle_pre_hibernate(State = #wsclient_state{ws_pid = WsPid}) -> + erlang:garbage_collect(WsPid), + {hibernate, emqttd_gc:reset_conn_gc_count(#wsclient_state.force_gc_count, emit_stats(State))}. + +handle_call(info, From, State = #wsclient_state{peername = Peername, + proto_state = ProtoState}) -> + Info = [{websocket, true}, {peername, Peername} | emqttd_protocol:info(ProtoState)], + {reply, Stats, _, _} = handle_call(stats, From, State), + reply(lists:append(Info, Stats), State); + +handle_call(stats, _From, State = #wsclient_state{proto_state = ProtoState}) -> + reply(lists:append([emqttd_misc:proc_stats(), + wsock_stats(State), + emqttd_protocol:stats(ProtoState)]), State); handle_call(kick, _From, State) -> {stop, {shutdown, kick}, ok, State}; -handle_call(Req, _From, State = #wsclient_state{peer = Peer}) -> - ?WSLOG(critical, Peer, "Unexpected request: ~p", [Req]), - {reply, {error, unsupported_request}, State}. +handle_call(session, _From, State = #wsclient_state{proto_state = ProtoState}) -> + reply(emqttd_protocol:session(ProtoState), State); -handle_cast({subscribe, TopicTable}, State) -> - with_proto_state(fun(ProtoState) -> - emqttd_protocol:handle({subscribe, TopicTable}, ProtoState) - end, State); +handle_call(Req, _From, State) -> + ?WSLOG(error, "Unexpected request: ~p", [Req], State), + reply({error, unexpected_request}, State). -handle_cast({unsubscribe, Topics}, State) -> - with_proto_state(fun(ProtoState) -> - emqttd_protocol:handle({unsubscribe, Topics}, ProtoState) - end, State); - -handle_cast({received, Packet}, State = #wsclient_state{peer = Peer, proto_state = ProtoState}) -> +handle_cast({received, Packet}, State = #wsclient_state{proto_state = ProtoState}) -> emqttd_metrics:received(Packet), case emqttd_protocol:received(Packet, ProtoState) of {ok, ProtoState1} -> - noreply(State#wsclient_state{proto_state = ProtoState1}); + {noreply, gc(State#wsclient_state{proto_state = ProtoState1}), hibernate}; {error, Error} -> - ?WSLOG(error, Peer, "Protocol error - ~p", [Error]), + ?WSLOG(error, "Protocol error - ~p", [Error], State), shutdown(Error, State); {error, Error, ProtoState1} -> shutdown(Error, State#wsclient_state{proto_state = ProtoState1}); @@ -121,67 +151,83 @@ handle_cast({received, Packet}, State = #wsclient_state{peer = Peer, proto_state stop(Reason, State#wsclient_state{proto_state = ProtoState1}) end; -handle_cast(Msg, State = #wsclient_state{peer = Peer}) -> - ?WSLOG(critical, Peer, "Unexpected msg: ~p", [Msg]), - noreply(State). +handle_cast(Msg, State) -> + ?WSLOG(error, "Unexpected Msg: ~p", [Msg], State), + {noreply, State, hibernate}. + +handle_info({subscribe, TopicTable}, State) -> + with_proto( + fun(ProtoState) -> + emqttd_protocol:subscribe(TopicTable, ProtoState) + end, State); + +handle_info({unsubscribe, Topics}, State) -> + with_proto( + fun(ProtoState) -> + emqttd_protocol:unsubscribe(Topics, ProtoState) + end, State); + +handle_info({suback, PacketId, GrantedQos}, State) -> + with_proto( + fun(ProtoState) -> + Packet = ?SUBACK_PACKET(PacketId, GrantedQos), + emqttd_protocol:send(Packet, ProtoState) + end, State); + +handle_info({deliver, Message}, State) -> + with_proto( + fun(ProtoState) -> + emqttd_protocol:send(Message, ProtoState) + end, gc(State)); + +handle_info({redeliver, {?PUBREL, PacketId}}, State) -> + with_proto( + fun(ProtoState) -> + emqttd_protocol:pubrel(PacketId, ProtoState) + end, State); + +handle_info(emit_stats, State) -> + {noreply, emit_stats(State), hibernate}; handle_info(timeout, State) -> shutdown(idle_timeout, State); -handle_info({suback, PacketId, GrantedQos}, State) -> - with_proto_state(fun(ProtoState) -> - Packet = ?SUBACK_PACKET(PacketId, GrantedQos), - emqttd_protocol:send(Packet, ProtoState) - end, State); - -handle_info({deliver, Message}, State) -> - with_proto_state(fun(ProtoState) -> - emqttd_protocol:send(Message, ProtoState) - end, State); - -handle_info({redeliver, {?PUBREL, PacketId}}, State) -> - with_proto_state(fun(ProtoState) -> - emqttd_protocol:redeliver({?PUBREL, PacketId}, ProtoState) - end, State); - -handle_info({shutdown, conflict, {ClientId, NewPid}}, State = #wsclient_state{peer = Peer}) -> - ?WSLOG(warning, Peer, "clientid '~s' conflict with ~p", [ClientId, NewPid]), +handle_info({shutdown, conflict, {ClientId, NewPid}}, State) -> + ?WSLOG(warning, "clientid '~s' conflict with ~p", [ClientId, NewPid], State), shutdown(conflict, State); -handle_info({keepalive, start, Interval}, State = #wsclient_state{peer = Peer, connection = Conn}) -> - ?WSLOG(debug, Peer, "Keepalive at the interval of ~p", [Interval]), - StatFun = fun() -> - case Conn:getstat([recv_oct]) of - {ok, [{recv_oct, RecvOct}]} -> {ok, RecvOct}; - {error, Error} -> {error, Error} - end - end, - KeepAlive = emqttd_keepalive:start(StatFun, Interval, {keepalive, check}), - noreply(State#wsclient_state{keepalive = KeepAlive}); +handle_info({keepalive, start, Interval}, State = #wsclient_state{connection = Conn}) -> + ?WSLOG(debug, "Keepalive at the interval of ~p", [Interval], State), + case emqttd_keepalive:start(stat_fun(Conn), Interval, {keepalive, check}) of + {ok, KeepAlive} -> + {noreply, State#wsclient_state{keepalive = KeepAlive}, hibernate}; + {error, Error} -> + ?WSLOG(warning, "Keepalive error - ~p", [Error], State), + shutdown(Error, State) + end; -handle_info({keepalive, check}, State = #wsclient_state{peer = Peer, - keepalive = KeepAlive}) -> +handle_info({keepalive, check}, State = #wsclient_state{keepalive = KeepAlive}) -> case emqttd_keepalive:check(KeepAlive) of {ok, KeepAlive1} -> - noreply(State#wsclient_state{keepalive = KeepAlive1}); + {noreply, emit_stats(State#wsclient_state{keepalive = KeepAlive1}), hibernate}; {error, timeout} -> - ?WSLOG(debug, Peer, "Keepalive Timeout!", []), + ?WSLOG(debug, "Keepalive Timeout!", [], State), shutdown(keepalive_timeout, State); {error, Error} -> - ?WSLOG(warning, Peer, "Keepalive error - ~p", [Error]), + ?WSLOG(warning, "Keepalive error - ~p", [Error], State), shutdown(keepalive_error, State) end; handle_info({'EXIT', WsPid, normal}, State = #wsclient_state{ws_pid = WsPid}) -> stop(normal, State); -handle_info({'EXIT', WsPid, Reason}, State = #wsclient_state{peer = Peer, ws_pid = WsPid}) -> - ?WSLOG(error, Peer, "shutdown: ~p",[Reason]), +handle_info({'EXIT', WsPid, Reason}, State = #wsclient_state{ws_pid = WsPid}) -> + ?WSLOG(error, "shutdown: ~p",[Reason], State), shutdown(Reason, State); -handle_info(Info, State = #wsclient_state{peer = Peer}) -> - ?WSLOG(critical, Peer, "Unexpected Info: ~p", [Info]), - noreply(State). +handle_info(Info, State) -> + ?WSLOG(error, "Unexpected Info: ~p", [Info], State), + {noreply, State, hibernate}. terminate(Reason, #wsclient_state{proto_state = ProtoState, keepalive = KeepAlive}) -> emqttd_keepalive:cancel(KeepAlive), @@ -199,16 +245,52 @@ code_change(_OldVsn, State, _Extra) -> %% Internal functions %%-------------------------------------------------------------------- -with_proto_state(Fun, State = #wsclient_state{proto_state = ProtoState}) -> - {ok, ProtoState1} = Fun(ProtoState), - noreply(State#wsclient_state{proto_state = ProtoState1}). +send_fun(ReplyChannel) -> + fun(Packet) -> + Data = emqttd_serializer:serialize(Packet), + emqttd_metrics:inc('bytes/sent', iolist_size(Data)), + ReplyChannel({binary, Data}) + end. -noreply(State) -> - {noreply, State, hibernate}. +stat_fun(Conn) -> + fun() -> + case Conn:getstat([recv_oct]) of + {ok, [{recv_oct, RecvOct}]} -> {ok, RecvOct}; + {error, Error} -> {error, Error} + end + end. + +emit_stats(State = #wsclient_state{proto_state = ProtoState}) -> + emit_stats(emqttd_protocol:clientid(ProtoState), State). + +emit_stats(_ClientId, State = #wsclient_state{enable_stats = false}) -> + State; +emit_stats(undefined, State) -> + State; +emit_stats(ClientId, State) -> + {reply, Stats, _, _} = handle_call(stats, undefined, State), + emqttd_stats:set_client_stats(ClientId, Stats), + State. + +wsock_stats(#wsclient_state{connection = Conn}) -> + case Conn:getstat(?SOCK_STATS) of + {ok, Ss} -> Ss; + {error, _} -> [] + end. + +with_proto(Fun, State = #wsclient_state{proto_state = ProtoState}) -> + {ok, ProtoState1} = Fun(ProtoState), + {noreply, State#wsclient_state{proto_state = ProtoState1}, hibernate}. + +reply(Reply, State) -> + {reply, Reply, State, hibernate}. shutdown(Reason, State) -> stop({shutdown, Reason}, State). -stop(Reason, State ) -> +stop(Reason, State) -> {stop, Reason, State}. +gc(State) -> + emqttd_gc:maybe_force_gc(#wsclient_state.force_gc_count, State). + diff --git a/src/emqttd_ws_client_sup.erl b/src/emqttd_ws_client_sup.erl index d01055115..21f683eaa 100644 --- a/src/emqttd_ws_client_sup.erl +++ b/src/emqttd_ws_client_sup.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []). -%% @doc Start a WebSocket Client +%% @doc Start a WebSocket Connection. -spec(start_client(pid(), mochiweb_request:request(), fun()) -> {ok, pid()}). start_client(WsPid, Req, ReplyChannel) -> supervisor:start_child(?MODULE, [WsPid, Req, ReplyChannel]). @@ -37,8 +37,9 @@ start_client(WsPid, Req, ReplyChannel) -> %%-------------------------------------------------------------------- %% Supervisor callbacks %%-------------------------------------------------------------------- + init([]) -> - {ok, Env} = emqttd:env(protocol), + Env = lists:append(emqttd:env(client, []), emqttd:env(protocol, [])), {ok, {{simple_one_for_one, 0, 1}, [{ws_client, {emqttd_ws_client, start_link, [Env]}, temporary, 5000, worker, [emqttd_ws_client]}]}}. diff --git a/src/lager_emqtt_backend.erl b/src/lager_emqtt_backend.erl index 214182b8d..69c1aece4 100644 --- a/src/lager_emqtt_backend.erl +++ b/src/lager_emqtt_backend.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ -module(lager_emqtt_backend). +-author("Feng Lee "). + -behaviour(gen_event). -include_lib("lager/include/lager.hrl"). diff --git a/test/emqttd_SUITE.erl b/test/emqttd_SUITE.erl index a7ab2fb5f..926a68824 100644 --- a/test/emqttd_SUITE.erl +++ b/test/emqttd_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -47,7 +47,8 @@ all() -> {group, http}, {group, cluster}, {group, alarms}, - {group, cli}]. + {group, cli}, + {group, cleanSession}]. groups() -> [{protocol, [sequence], @@ -103,7 +104,11 @@ groups() -> cli_bridges, cli_plugins, cli_listeners, - cli_vm]}]. + cli_vm]}, + {cleanSession, [sequence], + [cleanSession_validate, + cleanSession_validate1, + cleanSession_validate2]}]. init_per_suite(Config) -> application:start(lager), @@ -366,37 +371,39 @@ set_get_stat(_) -> %%-------------------------------------------------------------------- add_delete_hook(_) -> - emqttd:hook(test_hook, fun ?MODULE:hook_fun1/1, []), - emqttd:hook(test_hook, fun ?MODULE:hook_fun2/1, []), - {error, already_hooked} = emqttd:hook(test_hook, fun ?MODULE:hook_fun2/1, []), - Callbacks = [{callback, fun ?MODULE:hook_fun1/1, [], 0}, - {callback, fun ?MODULE:hook_fun2/1, [], 0}], - Callbacks = emqttd_hook:lookup(test_hook), - emqttd:unhook(test_hook, fun ?MODULE:hook_fun1/1), - emqttd:unhook(test_hook, fun ?MODULE:hook_fun2/1), - ok = emqttd:unhook(test_hook, fun ?MODULE:hook_fun2/1), - {error, not_found} = emqttd:unhook(test_hook1, fun ?MODULE:hook_fun2/1), - [] = emqttd_hook:lookup(test_hook), + ok = emqttd:hook(test_hook, fun ?MODULE:hook_fun1/1, []), + ok = emqttd:hook(test_hook, {tag, fun ?MODULE:hook_fun2/1}, []), + {error, already_hooked} = emqttd:hook(test_hook, {tag, fun ?MODULE:hook_fun2/1}, []), + Callbacks = [{callback, undefined, fun ?MODULE:hook_fun1/1, [], 0}, + {callback, tag, fun ?MODULE:hook_fun2/1, [], 0}], + Callbacks = emqttd_hooks:lookup(test_hook), + ok = emqttd:unhook(test_hook, fun ?MODULE:hook_fun1/1), + ct:print("Callbacks: ~p~n", [emqttd_hooks:lookup(test_hook)]), + ok = emqttd:unhook(test_hook, {tag, fun ?MODULE:hook_fun2/1}), + {error, not_found} = emqttd:unhook(test_hook1, {tag, fun ?MODULE:hook_fun2/1}), + [] = emqttd_hooks:lookup(test_hook), - emqttd:hook(emqttd_hook, fun ?MODULE:hook_fun1/1, [], 9), - emqttd:hook(emqttd_hook, fun ?MODULE:hook_fun2/1, [], 8), - Callbacks2 = [{callback, fun ?MODULE:hook_fun2/1, [], 8}, - {callback, fun ?MODULE:hook_fun1/1, [], 9}], - Callbacks2 = emqttd_hook:lookup(emqttd_hook), - emqttd:unhook(emqttd_hook, fun ?MODULE:hook_fun1/1), - emqttd:unhook(emqttd_hook, fun ?MODULE:hook_fun2/1), - [] = emqttd_hook:lookup(emqttd_hook). + ok = emqttd:hook(emqttd_hook, fun ?MODULE:hook_fun1/1, [], 9), + ok = emqttd:hook(emqttd_hook, {"tag", fun ?MODULE:hook_fun2/1}, [], 8), + Callbacks2 = [{callback, "tag", fun ?MODULE:hook_fun2/1, [], 8}, + {callback, undefined, fun ?MODULE:hook_fun1/1, [], 9}], + Callbacks2 = emqttd_hooks:lookup(emqttd_hook), + ok = emqttd:unhook(emqttd_hook, fun ?MODULE:hook_fun1/1), + ok = emqttd:unhook(emqttd_hook, {"tag", fun ?MODULE:hook_fun2/1}), + [] = emqttd_hooks:lookup(emqttd_hook). run_hooks(_) -> - emqttd:hook(foldl_hook, fun ?MODULE:hook_fun3/4, [init]), - emqttd:hook(foldl_hook, fun ?MODULE:hook_fun4/4, [init]), - emqttd:hook(foldl_hook, fun ?MODULE:hook_fun5/4, [init]), + ok = emqttd:hook(foldl_hook, fun ?MODULE:hook_fun3/4, [init]), + ok = emqttd:hook(foldl_hook, {tag, fun ?MODULE:hook_fun3/4}, [init]), + ok = emqttd:hook(foldl_hook, fun ?MODULE:hook_fun4/4, [init]), + ok = emqttd:hook(foldl_hook, fun ?MODULE:hook_fun5/4, [init]), {stop, [r3, r2]} = emqttd:run_hooks(foldl_hook, [arg1, arg2], []), {ok, []} = emqttd:run_hooks(unknown_hook, [], []), - emqttd:hook(foreach_hook, fun ?MODULE:hook_fun6/2, [initArg]), - emqttd:hook(foreach_hook, fun ?MODULE:hook_fun7/2, [initArg]), - emqttd:hook(foreach_hook, fun ?MODULE:hook_fun8/2, [initArg]), + ok = emqttd:hook(foreach_hook, fun ?MODULE:hook_fun6/2, [initArg]), + ok = emqttd:hook(foreach_hook, {tag, fun ?MODULE:hook_fun6/2}, [initArg]), + ok = emqttd:hook(foreach_hook, fun ?MODULE:hook_fun7/2, [initArg]), + ok = emqttd:hook(foreach_hook, fun ?MODULE:hook_fun8/2, [initArg]), stop = emqttd:run_hooks(foreach_hook, [arg]). hook_fun1([]) -> ok. @@ -514,8 +521,8 @@ cluster_remove2(_) -> ok = emqttd_cluster:join(Z), Node = node(), [Z, Node] = emqttd_mnesia:running_nodes(), - ok = rpc:call(Z, emqttd_mnesia, ensure_stopped, []), ok = emqttd_cluster:remove(Z), + ok = rpc:call(Z, emqttd_mnesia, ensure_stopped, []), [Node] = emqttd_mnesia:running_nodes(), slave:stop(Z). @@ -616,6 +623,59 @@ cli_vm(_) -> emqttd_cli:vm([]), emqttd_cli:vm(["ports"]). +cleanSession_validate(_) -> + {ok, C1} = emqttc:start_link([{host, "localhost"}, + {port, 1883}, + {client_id, <<"c1">>}, + {clean_sess, false}]), + timer:sleep(10), + emqttc:subscribe(C1, <<"topic">>, qos0), + ok = emqttd_cli:sessions(["list", "persistent"]), + emqttc:disconnect(C1), + {ok, Pub} = emqttc:start_link([{host, "localhost"}, + {port, 1883}, + {client_id, <<"pub">>}]), + + emqttc:publish(Pub, <<"topic">>, <<"m1">>, [{qos, 0}]), + timer:sleep(10), + {ok, C11} = emqttc:start_link([{host, "localhost"}, + {port, 1883}, + {client_id, <<"c1">>}, + {clean_sess, false}]), + timer:sleep(100), + Metrics = emqttd_metrics:all(), + ct:log("Metrics:~p~n", [Metrics]), + ?assertEqual(1, proplists:get_value('messages/qos0/sent', Metrics)), + ?assertEqual(1, proplists:get_value('messages/qos0/received', Metrics)), + emqttc:disconnect(Pub), + emqttc:disconnect(C11). + +cleanSession_validate1(_) -> + {ok, C1} = emqttc:start_link([{host, "localhost"}, + {port, 1883}, + {client_id, <<"c1">>}, + {clean_sess, true}]), + timer:sleep(10), + emqttc:subscribe(C1, <<"topic">>, qos1), + ok = emqttd_cli:sessions(["list", "transient"]), + emqttc:disconnect(C1), + {ok, Pub} = emqttc:start_link([{host, "localhost"}, + {port, 1883}, + {client_id, <<"pub">>}]), + + emqttc:publish(Pub, <<"topic">>, <<"m1">>, [{qos, 1}]), + timer:sleep(10), + {ok, C11} = emqttc:start_link([{host, "localhost"}, + {port, 1883}, + {client_id, <<"c1">>}, + {clean_sess, false}]), + timer:sleep(100), + Metrics = emqttd_metrics:all(), + ?assertEqual(0, proplists:get_value('messages/qos1/sent', Metrics)), + ?assertEqual(1, proplists:get_value('messages/qos1/received', Metrics)), + emqttc:disconnect(Pub), + emqttc:disconnect(C11). + ensure_ok(ok) -> ok; ensure_ok({error, {already_started, _}}) -> ok. diff --git a/test/emqttd_SUITE_data/emqttd.conf b/test/emqttd_SUITE_data/emqttd.conf index 4aaa60eff..a15aeada9 100644 --- a/test/emqttd_SUITE_data/emqttd.conf +++ b/test/emqttd_SUITE_data/emqttd.conf @@ -1,3 +1,8 @@ + +##=================================================================== +## EMQ Configuration R2.1 +##=================================================================== + ##-------------------------------------------------------------------- ## Node Args ##-------------------------------------------------------------------- @@ -11,6 +16,11 @@ node.cookie = emq_dist_cookie ## SMP support: enable, auto, disable node.smp = auto +## vm.args: -heart +## Heartbeat monitoring of an Erlang runtime system +## Value should be 'on' or comment the line +## node.heartbeat = on + ## Enable kernel poll node.kernel_poll = on @@ -40,21 +50,30 @@ node.crash_dump = log/crash.dump node.dist_net_ticktime = 60 ## Distributed node port range -## node.dist_listen_min = 6000 -## node.dist_listen_max = 6999 +## node.dist_listen_min = 6369 +## node.dist_listen_max = 6369 ##-------------------------------------------------------------------- ## Log ##-------------------------------------------------------------------- +## Set the log dir +log.dir = {{ platform_log_dir }} + ## Console log. Enum: off, file, console, both log.console = console +## Syslog. Enum: on, off +log.syslog = on + +## syslog level. Enum: debug, info, notice, warning, error, critical, alert, emergency +log.syslog.level = error + ## Console log level. Enum: debug, info, notice, warning, error, critical, alert, emergency log.console.level = error ## Console log file -## log.console.file = log/console.log +## log.console.file = {{ platform_log_dir }}/console.log ## Error log file log.error.file = log/error.log @@ -64,6 +83,19 @@ log.crash = on log.crash.file = log/crash.log +##-------------------------------------------------------------------- +## Allow Anonymous and Default ACL +##-------------------------------------------------------------------- + +## Allow Anonymous authentication +mqtt.allow_anonymous = true + +## Default ACL File +mqtt.acl_file = etc/acl.conf + +## Cache ACL for PUBLISH +mqtt.cache_acl = true + ##-------------------------------------------------------------------- ## MQTT Protocol ##-------------------------------------------------------------------- @@ -74,34 +106,38 @@ mqtt.max_clientid_len = 1024 ## Max Packet Size Allowed, 64K by default. mqtt.max_packet_size = 64KB +##-------------------------------------------------------------------- +## MQTT Client +##-------------------------------------------------------------------- + ## Client Idle Timeout (Second) -mqtt.client_idle_timeout = 30 +mqtt.client.idle_timeout = 30s -## Allow Anonymous authentication -mqtt.allow_anonymous = true - -## Default ACL File -mqtt.acl_file = etc/acl.conf +## Enable client Stats: seconds or off +mqtt.client.enable_stats = off ##-------------------------------------------------------------------- ## MQTT Session ##-------------------------------------------------------------------- +## Upgrade QoS? +mqtt.session.upgrade_qos = off + ## Max number of QoS 1 and 2 messages that can be “inflight” at one time. ## 0 means no limit -mqtt.session.max_inflight = 100 +mqtt.session.max_inflight = 32 -## Retry interval for redelivering QoS1/2 messages. -mqtt.session.retry_interval = 60 - -## Awaiting PUBREL Timeout -mqtt.session.await_rel_timeout = 20 +## Retry Interval for redelivering QoS1/2 messages. +mqtt.session.retry_interval = 20s ## Max Packets that Awaiting PUBREL, 0 means no limit -mqtt.session.max_awaiting_rel = 0 +mqtt.session.max_awaiting_rel = 100 -## Statistics Collection Interval(seconds) -mqtt.session.collect_interval = 0 +## Awaiting PUBREL Timeout +mqtt.session.await_rel_timeout = 20s + +## Enable Statistics at the Interval(seconds) +mqtt.session.enable_stats = off ## Expired after 1 day: ## w - week @@ -109,7 +145,7 @@ mqtt.session.collect_interval = 0 ## h - hour ## m - minute ## s - second -mqtt.session.expired_after = 1d +mqtt.session.expiry_interval = 2h ##-------------------------------------------------------------------- ## MQTT Queue @@ -204,12 +240,13 @@ mqtt.listener.ssl.max_clients = 512 ## Rate Limit. Format is 'burst,rate', Unit is KB/Sec ## mqtt.listener.ssl.rate_limit = 100,10 -## Configuring SSL Options -## See http://erlang.org/doc/man/ssl.html -mqtt.listener.ssl.handshake_timeout = 15 +## Configuring SSL Options. See http://erlang.org/doc/man/ssl.html +### TLS only for POODLE attack +mqtt.listener.ssl.tls_versions = tlsv1.2,tlsv1.1,tlsv1 +mqtt.listener.ssl.handshake_timeout = 15s mqtt.listener.ssl.keyfile = certs/key.pem mqtt.listener.ssl.certfile = certs/cert.pem -## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem +## mqtt.listener.ssl.cacertfile = {{ platform_etc_dir }}/certs/cacert.pem ## mqtt.listener.ssl.verify = verify_peer ## mqtt.listener.ssl.fail_if_no_peer_cert = true @@ -219,13 +256,14 @@ mqtt.listener.http.acceptors = 4 mqtt.listener.http.max_clients = 64 ## HTTP(SSL) Listener -## mqtt.listener.https = 8084 -## mqtt.listener.https.acceptors = 4 -## mqtt.listener.https.max_clients = 64 -## mqtt.listener.https.handshake_timeout = 15 -## mqtt.listener.https.certfile = etc/certs/cert.pem -## mqtt.listener.https.keyfile = etc/certs/key.pem -## mqtt.listener.https.cacertfile = etc/certs/cacert.pem +mqtt.listener.https = 8084 +mqtt.listener.https.acceptors = 4 +mqtt.listener.https.max_clients = 64 +mqtt.listener.https.handshake_timeout = 15 +mqtt.listener.https.keyfile = certs/key.pem +mqtt.listener.https.certfile = certs/cert.pem +## mqtt.listener.https.cacertfile = {{ platform_etc_dir }}/certs/cacert.pem + ## mqtt.listener.https.verify = verify_peer ## mqtt.listener.https.fail_if_no_peer_cert = true diff --git a/test/emqttd_SUITE_data/emqttd.schema b/test/emqttd_SUITE_data/emqttd.schema index 2c73482ed..530984383 100644 --- a/test/emqttd_SUITE_data/emqttd.schema +++ b/test/emqttd_SUITE_data/emqttd.schema @@ -22,6 +22,19 @@ hidden ]}. +%% @doc http://erlang.org/doc/man/heart.html +{mapping, "node.heartbeat", "vm_args.-heart", [ + {datatype, flag}, + hidden +]}. + +{translation, "vm_args.-heart", fun(Conf) -> + case cuttlefish:conf_get("node.heartbeat", Conf) of + true -> ""; + false -> cuttlefish:invalid("should be 'on' or comment the line!") + end +end}. + %% @doc Enable Kernel Poll {mapping, "node.kernel_poll", "vm_args.+K", [ {default, on}, @@ -135,8 +148,13 @@ %% Log %%-------------------------------------------------------------------- +{mapping, "log.dir", "lager.log_dir", [ + {default, "log"}, + {datatype, string} +]}. + {mapping, "log.console", "lager.handlers", [ - {default, file }, + {default, file}, {datatype, {enum, [off, file, console, both]}} ]}. @@ -155,6 +173,26 @@ {datatype, file} ]}. +{mapping, "log.syslog", "lager.handlers", [ + {default, off}, + {datatype, flag} +]}. + +{mapping, "log.syslog.identity", "lager.handlers", [ + {default, "emq"}, + {datatype, string} +]}. + +{mapping, "log.syslog.facility", "lager.handlers", [ + {default, local0}, + {datatype, {enum, [daemon, local0, local1, local2, local3, local4, local5, local6, local7]}} +]}. + +{mapping, "log.syslog.level", "lager.handlers", [ + {default, err}, + {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency]}} +]}. + {mapping, "log.error.redirect", "lager.error_logger_redirect", [ {default, on}, {datatype, flag}, @@ -196,7 +234,16 @@ both -> [ConsoleHandler, ConsoleFileHandler]; _ -> [] end, - ConsoleHandlers ++ ErrorHandler + + SyslogHandler = case cuttlefish:conf_get("log.syslog", Conf) of + false -> []; + true -> [{lager_syslog_backend, + [cuttlefish:conf_get("log.syslog.identity", Conf), + cuttlefish:conf_get("log.syslog.facility", Conf), + cuttlefish:conf_get("log.syslog.level", Conf)]}] + end, + + ConsoleHandlers ++ ErrorHandler ++ SyslogHandler end }. @@ -226,6 +273,28 @@ hidden ]}. +%%-------------------------------------------------------------------- +%% Allow Anonymous and Default ACL +%%-------------------------------------------------------------------- + +%% @doc Allow Anonymous +{mapping, "mqtt.allow_anonymous", "emqttd.allow_anonymous", [ + {default, false}, + {datatype, {enum, [true, false]}} +]}. + +%% @doc Default ACL File +{mapping, "mqtt.acl_file", "emqttd.acl_file", [ + {datatype, string}, + hidden +]}. + +%% @doc Cache ACL for PUBLISH +{mapping, "mqtt.cache_acl", "emqttd.cache_acl", [ + {default, true}, + {datatype, {enum, [true, false]}} +]}. + %%-------------------------------------------------------------------- %% MQTT Protocol %%-------------------------------------------------------------------- @@ -242,35 +311,42 @@ {datatype, bytesize} ]}. -%% @doc Client Idle Timeout. -{mapping, "mqtt.client_idle_timeout", "emqttd.protocol", [ - {default, 30}, - {datatype, integer} -]}. - {translation, "emqttd.protocol", fun(Conf) -> - [{max_clientid_len, cuttlefish:conf_get("mqtt.max_clientid_len", Conf)}, - {max_packet_size, cuttlefish:conf_get("mqtt.max_packet_size", Conf)}, - {client_idle_timeout, cuttlefish:conf_get("mqtt.client_idle_timeout", Conf)}] + [{max_clientid_len, cuttlefish:conf_get("mqtt.max_clientid_len", Conf)}, + {max_packet_size, cuttlefish:conf_get("mqtt.max_packet_size", Conf)}] end}. -%% @doc Allow Anonymous -{mapping, "mqtt.allow_anonymous", "emqttd.allow_anonymous", [ - {default, false}, - {datatype, {enum, [true, false]}}, - hidden +%%-------------------------------------------------------------------- +%% MQTT Client +%%-------------------------------------------------------------------- + +%% @doc Client Idle Timeout. +{mapping, "mqtt.client.idle_timeout", "emqttd.client", [ + {default, "30s"}, + {datatype, {duration, ms}} ]}. -%% @doc Default ACL File -{mapping, "mqtt.acl_file", "emqttd.acl_file", [ - {datatype, string}, - hidden +%% @doc Enable Stats of Client. +{mapping, "mqtt.client.enable_stats", "emqttd.client", [ + {default, off}, + {datatype, [{duration, ms}, flag]} ]}. +%% @doc Client +{translation, "emqttd.client", fun(Conf) -> + [{client_idle_timeout, cuttlefish:conf_get("mqtt.client.idle_timeout", Conf)}, + {client_enable_stats, cuttlefish:conf_get("mqtt.client.enable_stats", Conf)}] +end}. + %%-------------------------------------------------------------------- %% MQTT Session %%-------------------------------------------------------------------- +%% @doc Upgrade QoS? +{mapping, "mqtt.session.upgrade_qos", "emqttd.session", [ + {default, off}, + {datatype, flag} +]}. %% @doc Max number of QoS 1 and 2 messages that can be “inflight” at one time. %% 0 means no limit {mapping, "mqtt.session.max_inflight", "emqttd.session", [ @@ -278,17 +354,10 @@ end}. {datatype, integer} ]}. - %% @doc Retry interval for redelivering QoS1/2 messages. {mapping, "mqtt.session.retry_interval", "emqttd.session", [ - {default, 60}, - {datatype, integer} -]}. - -%% @doc Awaiting PUBREL Timeout -{mapping, "mqtt.session.await_rel_timeout", "emqttd.session", [ - {default, 30}, - {datatype, integer} + {default, "20s"}, + {datatype, {duration, ms}} ]}. %% @doc Max Packets that Awaiting PUBREL, 0 means no limit @@ -297,25 +366,32 @@ end}. {datatype, integer} ]}. -%% @doc Statistics Collection Interval(seconds) -{mapping, "mqtt.session.collect_interval", "emqttd.session", [ - {default, 0}, - {datatype, integer} +%% @doc Awaiting PUBREL Timeout +{mapping, "mqtt.session.await_rel_timeout", "emqttd.session", [ + {default, "20s"}, + {datatype, {duration, ms}} ]}. -%% @doc Session expired after... -{mapping, "mqtt.session.expired_after", "emqttd.session", [ - {default, "2d"}, - {datatype, {duration, s}} +%% @doc Enable Stats +{mapping, "mqtt.session.enable_stats", "emqttd.session", [ + {default, off}, + {datatype, [{duration, ms}, flag]} +]}. + +%% @doc Session Expiry Interval +{mapping, "mqtt.session.expiry_interval", "emqttd.session", [ + {default, "2h"}, + {datatype, {duration, ms}} ]}. {translation, "emqttd.session", fun(Conf) -> - [{max_inflight, cuttlefish:conf_get("mqtt.session.max_inflight", Conf)}, - {retry_interval, cuttlefish:conf_get("mqtt.session.retry_interval", Conf)}, + [{upgrade_qos, cuttlefish:conf_get("mqtt.session.upgrade_qos", Conf)}, + {max_inflight, cuttlefish:conf_get("mqtt.session.max_inflight", Conf)}, + {retry_interval, cuttlefish:conf_get("mqtt.session.retry_interval", Conf)}, + {max_awaiting_rel, cuttlefish:conf_get("mqtt.session.max_awaiting_rel", Conf)}, {await_rel_timeout, cuttlefish:conf_get("mqtt.session.await_rel_timeout", Conf)}, - {max_awaiting_rel, cuttlefish:conf_get("mqtt.session.max_awaiting_rel", Conf)}, - {collect_interval, cuttlefish:conf_get("mqtt.session.collect_interval", Conf)}, - {expired_after, cuttlefish:conf_get("mqtt.session.expired_after", Conf)}] + {enable_stats, cuttlefish:conf_get("mqtt.session.enable_stats", Conf)}, + {expiry_interval, cuttlefish:conf_get("mqtt.session.expiry_interval", Conf)}] end}. %%-------------------------------------------------------------------- @@ -331,28 +407,25 @@ end}. %% @doc Topic Priority: 0~255, Default is 0 {mapping, "mqtt.queue.priority", "emqttd.queue", [ {default, ""}, - {datatype, string}, - hidden + {datatype, string} ]}. %% @doc Max queue length. Enqueued messages when persistent client disconnected, or inflight window is full. {mapping, "mqtt.queue.max_length", "emqttd.queue", [ {default, infinity}, - {datatype, [atom, integer]} + {datatype, [integer, {atom, infinity}]} ]}. %% @doc Low-water mark of queued messages {mapping, "mqtt.queue.low_watermark", "emqttd.queue", [ {default, "20%"}, - {datatype, string}, - hidden + {datatype, string} ]}. %% @doc High-water mark of queued messages {mapping, "mqtt.queue.high_watermark", "emqttd.queue", [ {default, "60%"}, - {datatype, string}, - hidden + {datatype, string} ]}. %% @doc Queue Qos0 messages? @@ -405,8 +478,7 @@ end}. {mapping, "mqtt.pubsub.async", "emqttd.pubsub", [ {default, true}, - {datatype, {enum, [true, false]}}, - hidden + {datatype, {enum, [true, false]}} ]}. {translation, "emqttd.pubsub", fun(Conf) -> @@ -451,7 +523,7 @@ end}. %%-------------------------------------------------------------------- {mapping, "mqtt.listener.tcp", "emqttd.listeners", [ - {default, 1883}, + %% {default, 1883}, {datatype, [integer, ip]} ]}. @@ -467,8 +539,7 @@ end}. {mapping, "mqtt.listener.tcp.rate_limit", "emqttd.listeners", [ {default, undefined}, - {datatype, string}, - hidden + {datatype, string} ]}. {mapping, "mqtt.listener.tcp.backlog", "emqttd.listeners", [ @@ -497,7 +568,7 @@ end}. ]}. {mapping, "mqtt.listener.ssl", "emqttd.listeners", [ - {default, 8883}, + %% {default, 8883}, {datatype, [integer, ip]} ]}. @@ -515,9 +586,13 @@ end}. {datatype, string} ]}. +{mapping, "mqtt.listener.ssl.tls_versions", "emqttd.listeners", [ + {datatype, string} +]}. + {mapping, "mqtt.listener.ssl.handshake_timeout", "emqttd.listeners", [ - {default, 15}, - {datatype, integer} + {default, "15s"}, + {datatype, {duration, ms}} ]}. {mapping, "mqtt.listener.ssl.keyfile", "emqttd.listeners", [ @@ -541,7 +616,7 @@ end}. ]}. {mapping, "mqtt.listener.http", "emqttd.listeners", [ - {default, 8883}, + %% {default, 8083}, {datatype, [integer, ip]} ]}. @@ -556,9 +631,8 @@ end}. ]}. {mapping, "mqtt.listener.https", "emqttd.listeners", [ - {default, undefined}, - {datatype, [integer, ip]}, - hidden + %%{default, 8084}, + {datatype, [integer, ip]} ]}. {mapping, "mqtt.listener.https.acceptors", "emqttd.listeners", [ @@ -610,8 +684,16 @@ end}. {buffer, cuttlefish:conf_get(Prefix ++ ".buffer", Conf, undefined)}, {nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}]) end, + + SplitFun = fun(undefined) -> undefined; (S) -> string:tokens(S, ",") end, + SslOpts = fun(Prefix) -> - Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf) * 1000}, + Versions = case SplitFun(cuttlefish:conf_get(Prefix ++ ".tls_versions", Conf, undefined)) of + undefined -> undefined; + L -> [list_to_atom(V) || V <- L] + end, + Filter([{versions, Versions}, + {handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf), undefined}, {keyfile, cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)}, {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}, @@ -628,7 +710,7 @@ end}. ConnOpts = Filter([{rate_limit, cuttlefish:conf_get(Key ++ ".rate_limit", Conf, undefined)}]), Opts = [{connopts, ConnOpts}, {sockopts, TcpOpts(Key)} | LisOpts(Key)], [{Name, Port, case Name =:= ssl orelse Name =:= https of - true -> [{ssl, SslOpts(Key)} | Opts]; + true -> [{sslopts, SslOpts(Key)} | Opts]; false -> Opts end}] end diff --git a/test/emqttd_access_SUITE.erl b/test/emqttd_access_SUITE.erl index 5ab7e992b..762ae6f40 100644 --- a/test/emqttd_access_SUITE.erl +++ b/test/emqttd_access_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/test/emqttd_acl_test_mod.erl b/test/emqttd_acl_test_mod.erl index 196337fa4..08f1f9c94 100644 --- a/test/emqttd_acl_test_mod.erl +++ b/test/emqttd_acl_test_mod.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/test/emqttd_auth_anonymous_test_mod.erl b/test/emqttd_auth_anonymous_test_mod.erl index 8e93be0bc..be6a14bf8 100644 --- a/test/emqttd_auth_anonymous_test_mod.erl +++ b/test/emqttd_auth_anonymous_test_mod.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/test/emqttd_auth_dashboard.erl b/test/emqttd_auth_dashboard.erl index 0e509c08a..49f54c377 100644 --- a/test/emqttd_auth_dashboard.erl +++ b/test/emqttd_auth_dashboard.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/test/emqttd_inflight_SUITE.erl b/test/emqttd_inflight_SUITE.erl new file mode 100644 index 000000000..de5391f1a --- /dev/null +++ b/test/emqttd_inflight_SUITE.erl @@ -0,0 +1,51 @@ +%% +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) +%% + +-module(emqttd_inflight_SUITE). + +-author("Feng Lee "). + +-include_lib("eunit/include/eunit.hrl"). + +%% CT +-compile(export_all). + +all() -> [t_contain, t_lookup, t_insert, t_update, t_delete, t_window, + t_is_full, t_is_empty]. + +t_contain(_) -> + Inflight = emqttd_inflight:new(0), + ?assertNot(Inflight:contain(k)), + Inflight1 = Inflight:insert(k, v), + ?assert(Inflight1:contain(k)). + +t_lookup(_) -> + Inflight = (emqttd_inflight:new(0)):insert(k, v), + ?assertEqual(v, Inflight:lookup(k)). + +t_insert(_) -> + Inflight = ((emqttd_inflight:new(0)):insert(k1, v1)):insert(k2, v2), + ?assertEqual(v2, Inflight:lookup(k2)). + +t_update(_) -> + Inflight = ((emqttd_inflight:new(0)):insert(k, v1)):update(k, v2), + ?assertEqual(v2, Inflight:lookup(k)). + +t_delete(_) -> + Inflight = ((emqttd_inflight:new(0)):insert(k, v1)):delete(k), + ?assert(Inflight:is_empty()). + +t_window(_) -> + ?assertEqual([], (emqttd_inflight:new(10)):window()), + Inflight = ((emqttd_inflight:new(0)):insert(1, 1)):insert(2, 2), + ?assertEqual([1, 2], Inflight:window()). + +t_is_full(_) -> + Inflight = ((emqttd_inflight:new(1)):insert(k, v1)), + ?assert(Inflight:is_full()). + +t_is_empty(_) -> + Inflight = ((emqttd_inflight:new(1)):insert(k, v1)), + ?assertNot(Inflight:is_empty()). + diff --git a/test/emqttd_lib_SUITE.erl b/test/emqttd_lib_SUITE.erl index e51e778f0..344e185d0 100644 --- a/test/emqttd_lib_SUITE.erl +++ b/test/emqttd_lib_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ guid_base62(_) -> %%-------------------------------------------------------------------- opts_merge(_) -> - Opts = emqttd_opts:merge(?SOCKOPTS, [raw, + Opts = emqttd_misc:merge_opts(?SOCKOPTS, [raw, binary, {backlog, 1024}, {nodelay, false}, @@ -141,8 +141,8 @@ priority_queue_out2(_) -> time_now_to_(_) -> emqttd_time:seed(), - emqttd_time:now_to_secs(), - emqttd_time:now_to_ms(). + emqttd_time:now_secs(), + emqttd_time:now_ms(). %%-------------------------------------------------------------------- %% emqttd_node diff --git a/test/emqttd_mod_SUITE.erl b/test/emqttd_mod_SUITE.erl index a258eabe0..1fcf455d0 100644 --- a/test/emqttd_mod_SUITE.erl +++ b/test/emqttd_mod_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2016-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/test/emqttd_mqueue_SUITE.erl b/test/emqttd_mqueue_SUITE.erl index eaa0ecc68..e56b08398 100644 --- a/test/emqttd_mqueue_SUITE.erl +++ b/test/emqttd_mqueue_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/test/emqttd_net_SUITE.erl b/test/emqttd_net_SUITE.erl index 7d70f4291..78abb50c9 100644 --- a/test/emqttd_net_SUITE.erl +++ b/test/emqttd_net_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2016-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ groups() -> [{keepalive, [], [t_keepalive]}]. %%-------------------------------------------------------------------- t_keepalive(_) -> - KA = emqttd_keepalive:start(fun() -> {ok, 1} end, 1, {keepalive, timeout}), + {ok, KA} = emqttd_keepalive:start(fun() -> {ok, 1} end, 1, {keepalive, timeout}), [resumed, timeout] = lists:reverse(keepalive_recv(KA, [])). keepalive_recv(KA, Acc) -> diff --git a/test/emqttd_protocol_SUITE.erl b/test/emqttd_protocol_SUITE.erl index 49189bb90..21428f0c7 100644 --- a/test/emqttd_protocol_SUITE.erl +++ b/test/emqttd_protocol_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ -include("emqttd.hrl"). +-include_lib("eunit/include/eunit.hrl"). + -include("emqttd_protocol.hrl"). all() -> @@ -71,7 +73,7 @@ groups() -> %%-------------------------------------------------------------------- parse_connect(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), %% CONNECT(Q0, R0, D0, ClientId=mosqpub/10451-iMac.loca, ProtoName=MQIsdp, ProtoVsn=3, CleanSess=true, KeepAlive=60, Username=undefined, Password=undefined) V31ConnBin = <<16,37,0,6,77,81,73,115,100,112,3,2,0,60,0,23,109,111,115,113,112,117,98,47,49,48,52,53,49,45,105,77,97,99,46,108,111,99,97>>, {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?CONNECT, @@ -82,7 +84,7 @@ parse_connect(_) -> proto_name = <<"MQIsdp">>, client_id = <<"mosqpub/10451-iMac.loca">>, clean_sess = true, - keep_alive = 60}}, <<>>} = Parser(V31ConnBin), + keep_alive = 60}}, <<>>} = emqttd_parser:parse(V31ConnBin, Parser), %% CONNECT(Q0, R0, D0, ClientId=mosqpub/10451-iMac.loca, ProtoName=MQTT, ProtoVsn=4, CleanSess=true, KeepAlive=60, Username=undefined, Password=undefined) V311ConnBin = <<16,35,0,4,77,81,84,84,4,2,0,60,0,23,109,111,115,113,112,117,98,47,49,48,52,53,49,45,105,77,97,99,46,108,111,99,97>>, {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?CONNECT, @@ -93,7 +95,7 @@ parse_connect(_) -> proto_name = <<"MQTT">>, client_id = <<"mosqpub/10451-iMac.loca">>, clean_sess = true, - keep_alive = 60 } }, <<>>} = Parser(V311ConnBin), + keep_alive = 60 } }, <<>>} = emqttd_parser:parse(V311ConnBin, Parser), %% CONNECT(Qos=0, Retain=false, Dup=false, ClientId="", ProtoName=MQTT, ProtoVsn=4, CleanSess=true, KeepAlive=60) V311ConnWithoutClientId = <<16,12,0,4,77,81,84,84,4,2,0,60,0,0>>, @@ -105,7 +107,7 @@ parse_connect(_) -> proto_name = <<"MQTT">>, client_id = <<>>, clean_sess = true, - keep_alive = 60 } }, <<>>} = Parser(V311ConnWithoutClientId), + keep_alive = 60 } }, <<>>} = emqttd_parser:parse(V311ConnWithoutClientId, Parser), %%CONNECT(Q0, R0, D0, ClientId=mosqpub/10452-iMac.loca, ProtoName=MQIsdp, ProtoVsn=3, CleanSess=true, KeepAlive=60, %% Username=test, Password=******, Will(Qos=1, Retain=false, Topic=/will, Msg=willmsg)) ConnBinWithWill = <<16,67,0,6,77,81,73,115,100,112,3,206,0,60,0,23,109,111,115,113,112,117,98,47,49,48,52,53,50,45,105,77,97,99,46,108,111,99,97,0,5,47,119,105,108,108,0,7,119,105,108,108,109,115,103,0,4,116,101,115,116,0,6,112,117,98,108,105,99>>, @@ -124,18 +126,18 @@ parse_connect(_) -> will_topic = <<"/will">>, will_msg = <<"willmsg">>, username = <<"test">>, - password = <<"public">>}}, <<>>} = Parser(ConnBinWithWill), + password = <<"public">>}}, <<>>} = emqttd_parser:parse(ConnBinWithWill, Parser), ok. parse_bridge(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), Data = <<16,86,0,6,77,81,73,115,100,112,131,44,0,60,0,19,67,95,48,48,58,48,67,58,50,57,58,50,66,58,55,55,58,53,50, 0,48,36,83,89,83,47,98,114,111,107,101,114,47,99,111,110,110,101,99,116,105,111,110,47,67,95,48,48,58,48, 67,58,50,57,58,50,66,58,55,55,58,53,50,47,115,116,97,116,101,0,1,48>>, %% CONNECT(Q0, R0, D0, ClientId=C_00:0C:29:2B:77:52, ProtoName=MQIsdp, ProtoVsn=131, CleanSess=false, KeepAlive=60, %% Username=undefined, Password=undefined, Will(Q1, R1, Topic=$SYS/broker/connection/C_00:0C:29:2B:77:52/state, Msg=0)) - {ok, #mqtt_packet{variable = Variable}, <<>>} = Parser(Data), + {ok, #mqtt_packet{variable = Variable}, <<>>} = emqttd_parser:parse(Data, Parser), #mqtt_packet_connect{client_id = <<"C_00:0C:29:2B:77:52">>, proto_ver = 16#03, proto_name = <<"MQIsdp">>, @@ -148,7 +150,7 @@ parse_bridge(_) -> will_msg = <<"0">>} = Variable. parse_publish(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), %%PUBLISH(Qos=1, Retain=false, Dup=false, TopicName=a/b/c, PacketId=1, Payload=<<"hahah">>) PubBin = <<50,14,0,5,97,47,98,47,99,0,1,104,97,104,97,104>>, {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBLISH, @@ -157,7 +159,7 @@ parse_publish(_) -> retain = false}, variable = #mqtt_packet_publish{topic_name = <<"a/b/c">>, packet_id = 1}, - payload = <<"hahah">> }, <<>>} = Parser(PubBin), + payload = <<"hahah">> }, <<>>} = emqttd_parser:parse(PubBin, Parser), %PUBLISH(Qos=0, Retain=false, Dup=false, TopicName=xxx/yyy, PacketId=undefined, Payload=<<"hello">>) %DISCONNECT(Qos=0, Retain=false, Dup=false) @@ -168,43 +170,43 @@ parse_publish(_) -> retain = false}, variable = #mqtt_packet_publish{topic_name = <<"xxx/yyy">>, packet_id = undefined}, - payload = <<"hello">> }, <<224,0>>} = Parser(PubBin1), + payload = <<"hello">> }, <<224,0>>} = emqttd_parser:parse(PubBin1, Parser), {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?DISCONNECT, dup = false, qos = 0, - retain = false}}, <<>>} = Parser(<<224, 0>>). + retain = false}}, <<>>} = emqttd_parser:parse(<<224, 0>>, Parser). parse_puback(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), %%PUBACK(Qos=0, Retain=false, Dup=false, PacketId=1) {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBACK, dup = false, qos = 0, - retain = false}}, <<>>} = Parser(<<64,2,0,1>>). + retain = false}}, <<>>} = emqttd_parser:parse(<<64,2,0,1>>, Parser). parse_pubrec(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), %%PUBREC(Qos=0, Retain=false, Dup=false, PacketId=1) {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBREC, dup = false, qos = 0, - retain = false}}, <<>>} = Parser(<<5:4,0:4,2,0,1>>). + retain = false}}, <<>>} = emqttd_parser:parse(<<5:4,0:4,2,0,1>>, Parser). parse_pubrel(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBREL, dup = false, qos = 1, - retain = false}}, <<>>} = Parser(<<6:4,2:4,2,0,1>>). + retain = false}}, <<>>} = emqttd_parser:parse(<<6:4,2:4,2,0,1>>, Parser). parse_pubcomp(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBCOMP, dup = false, qos = 0, - retain = false}}, <<>>} = Parser(<<7:4,0:4,2,0,1>>). + retain = false}}, <<>>} = emqttd_parser:parse(<<7:4,0:4,2,0,1>>, Parser). parse_subscribe(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), %% SUBSCRIBE(Q1, R0, D0, PacketId=2, TopicTable=[{<<"TopicA">>,2}]) {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?SUBSCRIBE, dup = false, @@ -212,10 +214,10 @@ parse_subscribe(_) -> retain = false}, variable = #mqtt_packet_subscribe{packet_id = 2, topic_table = [{<<"TopicA">>,2}]} }, <<>>} - = Parser(<<130,11,0,2,0,6,84,111,112,105,99,65,2>>). + = emqttd_parser:parse(<<130,11,0,2,0,6,84,111,112,105,99,65,2>>, Parser). parse_unsubscribe(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), %% UNSUBSCRIBE(Q1, R0, D0, PacketId=2, TopicTable=[<<"TopicA">>]) {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?UNSUBSCRIBE, dup = false, @@ -223,24 +225,24 @@ parse_unsubscribe(_) -> retain = false}, variable = #mqtt_packet_unsubscribe{packet_id = 2, topics = [<<"TopicA">>]}}, <<>>} - = Parser(<<162,10,0,2,0,6,84,111,112,105,99,65>>). + = emqttd_parser:parse(<<162,10,0,2,0,6,84,111,112,105,99,65>>, Parser). parse_pingreq(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PINGREQ, dup = false, qos = 0, retain = false}}, <<>>} - = Parser(<>). + = emqttd_parser:parse(<>, Parser). parse_disconnect(_) -> - Parser = emqttd_parser:new([]), + Parser = emqttd_parser:initial_state(), %DISCONNECT(Qos=0, Retain=false, Dup=false) Bin = <<224, 0>>, {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?DISCONNECT, dup = false, qos = 0, - retain = false}}, <<>>} = Parser(Bin). + retain = false}}, <<>>} = emqttd_parser:parse(Bin, Parser). %%-------------------------------------------------------------------- %% Serialize Cases @@ -260,7 +262,7 @@ serialize_connect(_) -> serialize_connack(_) -> ConnAck = #mqtt_packet{header = #mqtt_packet_header{type = ?CONNACK}, variable = #mqtt_packet_connack{ack_flags = 0, return_code = 0}}, - <<32,2,0,0>> = serialize(ConnAck). + ?assertEqual(<<32,2,0,0>>, iolist_to_binary(serialize(ConnAck))). serialize_publish(_) -> serialize(?PUBLISH_PACKET(?QOS_0, <<"Topic">>, undefined, <<"Payload">>)), @@ -303,20 +305,20 @@ long_payload() -> %%-------------------------------------------------------------------- packet_proto_name(_) -> - <<"MQIsdp">> = emqttd_packet:protocol_name(3), - <<"MQTT">> = emqttd_packet:protocol_name(4). + ?assertEqual(<<"MQIsdp">>, emqttd_packet:protocol_name(3)), + ?assertEqual(<<"MQTT">>, emqttd_packet:protocol_name(4)). packet_type_name(_) -> - 'CONNECT' = emqttd_packet:type_name(?CONNECT), - 'UNSUBSCRIBE' = emqttd_packet:type_name(?UNSUBSCRIBE). + ?assertEqual('CONNECT', emqttd_packet:type_name(?CONNECT)), + ?assertEqual('UNSUBSCRIBE', emqttd_packet:type_name(?UNSUBSCRIBE)). packet_connack_name(_) -> - 'CONNACK_ACCEPT' = emqttd_packet:connack_name(?CONNACK_ACCEPT), - 'CONNACK_PROTO_VER' = emqttd_packet:connack_name(?CONNACK_PROTO_VER), - 'CONNACK_INVALID_ID' = emqttd_packet:connack_name(?CONNACK_INVALID_ID), - 'CONNACK_SERVER' = emqttd_packet:connack_name(?CONNACK_SERVER), - 'CONNACK_CREDENTIALS' = emqttd_packet:connack_name(?CONNACK_CREDENTIALS), - 'CONNACK_AUTH' = emqttd_packet:connack_name(?CONNACK_AUTH). + ?assertEqual('CONNACK_ACCEPT', emqttd_packet:connack_name(?CONNACK_ACCEPT)), + ?assertEqual('CONNACK_PROTO_VER', emqttd_packet:connack_name(?CONNACK_PROTO_VER)), + ?assertEqual('CONNACK_INVALID_ID', emqttd_packet:connack_name(?CONNACK_INVALID_ID)), + ?assertEqual('CONNACK_SERVER', emqttd_packet:connack_name(?CONNACK_SERVER)), + ?assertEqual('CONNACK_CREDENTIALS', emqttd_packet:connack_name(?CONNACK_CREDENTIALS)), + ?assertEqual('CONNACK_AUTH', emqttd_packet:connack_name(?CONNACK_AUTH)). packet_format(_) -> io:format("~s", [emqttd_packet:format(?CONNECT_PACKET(#mqtt_packet_connect{}))]), @@ -336,26 +338,25 @@ packet_format(_) -> message_make(_) -> Msg = emqttd_message:make(<<"clientid">>, <<"topic">>, <<"payload">>), - 0 = Msg#mqtt_message.qos, + ?assertEqual(0, Msg#mqtt_message.qos), Msg1 = emqttd_message:make(<<"clientid">>, qos2, <<"topic">>, <<"payload">>), - true = is_binary(Msg1#mqtt_message.id), - 2 = Msg1#mqtt_message.qos. + ?assert(is_binary(Msg1#mqtt_message.id)), + ?assertEqual(2, Msg1#mqtt_message.qos). message_from_packet(_) -> Msg = emqttd_message:from_packet(?PUBLISH_PACKET(1, <<"topic">>, 10, <<"payload">>)), - 1 = Msg#mqtt_message.qos, - 10 = Msg#mqtt_message.pktid, - <<"topic">> = Msg#mqtt_message.topic, - + ?assertEqual(1, Msg#mqtt_message.qos), + ?assertEqual(10, Msg#mqtt_message.pktid), + ?assertEqual(<<"topic">>, Msg#mqtt_message.topic), WillMsg = emqttd_message:from_packet(#mqtt_packet_connect{will_flag = true, will_topic = <<"WillTopic">>, will_msg = <<"WillMsg">>}), - <<"WillTopic">> = WillMsg#mqtt_message.topic, - <<"WillMsg">> = WillMsg#mqtt_message.payload, + ?assertEqual(<<"WillTopic">>, WillMsg#mqtt_message.topic), + ?assertEqual(<<"WillMsg">>, WillMsg#mqtt_message.payload), Msg2 = emqttd_message:from_packet(<<"username">>, <<"clientid">>, ?PUBLISH_PACKET(1, <<"topic">>, 20, <<"payload">>)), - {<<"clientid">>, <<"username">>} = Msg2#mqtt_message.from, + ?assertEqual({<<"clientid">>, <<"username">>}, Msg2#mqtt_message.from), io:format("~s", [emqttd_message:format(Msg2)]). message_flag(_) -> @@ -363,13 +364,13 @@ message_flag(_) -> Msg2 = emqttd_message:from_packet(<<"clientid">>, Pkt), Msg3 = emqttd_message:set_flag(retain, Msg2), Msg4 = emqttd_message:set_flag(dup, Msg3), - true = Msg4#mqtt_message.dup, - true = Msg4#mqtt_message.retain, + ?assert(Msg4#mqtt_message.dup), + ?assert(Msg4#mqtt_message.retain), Msg5 = emqttd_message:set_flag(Msg4), Msg6 = emqttd_message:unset_flag(dup, Msg5), Msg7 = emqttd_message:unset_flag(retain, Msg6), - false = Msg7#mqtt_message.dup, - false = Msg7#mqtt_message.retain, + ?assertNot(Msg7#mqtt_message.dup), + ?assertNot(Msg7#mqtt_message.retain), emqttd_message:unset_flag(Msg7), emqttd_message:to_packet(Msg7). diff --git a/test/emqttd_topic_SUITE.erl b/test/emqttd_topic_SUITE.erl index f8be7df1a..a43875fba 100644 --- a/test/emqttd_topic_SUITE.erl +++ b/test/emqttd_topic_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2016-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/test/emqttd_trie_SUITE.erl b/test/emqttd_trie_SUITE.erl index 37d247755..2394a902a 100644 --- a/test/emqttd_trie_SUITE.erl +++ b/test/emqttd_trie_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/test/emqttd_vm_SUITE.erl b/test/emqttd_vm_SUITE.erl index ba56ef97f..ef0ac2946 100644 --- a/test/emqttd_vm_SUITE.erl +++ b/test/emqttd_vm_SUITE.erl @@ -1,5 +1,5 @@ %%-------------------------------------------------------------------- -%% Copyright (c) 2012-2017 Feng Lee . +%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io) %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License.