diff --git a/apps/roster/include/static/push_notification_var.hrl b/apps/roster/include/static/push_notification_var.hrl deleted file mode 100644 index 0af215f1bea3bca315ae235380cf881db2da944a..0000000000000000000000000000000000000000 --- a/apps/roster/include/static/push_notification_var.hrl +++ /dev/null @@ -1,12 +0,0 @@ -%% ------------------------------------------------------------------ -%% Static Variables for Push Notification modules -%% ------------------------------------------------------------------ - -%% FGPN - Feature Group for Push Notification -%% FKPN - Feature Key for Push Notification - --define(FGPN_INFO, <<"PUSH_SETTINGS">>). - --define(FKPN_BANDLE, <<"IOS_BANDLE">>). --define(FKPN_GATEWAY, <<"APNS_GATEWAY">>). --define(FKPN_SERVER_DNS, <<"SERVER_DNS">>). \ No newline at end of file diff --git a/apps/roster/src/api/push/ios.erl b/apps/roster/src/api/push/ios.erl deleted file mode 100644 index 07a878027b7739383fde6341ecb1d2535fe98df8..0000000000000000000000000000000000000000 --- a/apps/roster/src/api/push/ios.erl +++ /dev/null @@ -1,118 +0,0 @@ --module(ios). --include_lib("kernel/include/logger.hrl"). --include("roster.hrl"). --include_lib("roster/include/static/push_notification_var.hrl"). - --export([description/0, notify/5, test_push_notification/0]). - -description() -> "IOS Push Notifications Module". - --define(APNS_CERT_DIR, proplists:get_value(apns_cert_dir, application:get_env(roster, push_api, []))). --define(APNS_PORT, proplists:get_value(apns_port, application:get_env(roster, push_api, []))). - --define(GATEWAY_LIST, [ - {<<"SANDBOX">>, "gateway.sandbox.push.apple.com"}, - {<<"LIVE">>, "gateway.push.apple.com"}]). - --define(BANDLE_LIST, [ - {<<"com.nynja.mobile.communicator">>, {"cert_prod.pem", "key_prod.pem"}}, - {<<"com.nynja.rс.mobile.communicator">>, {"cert_prod.pem", "key_prod.pem"}}, - {<<"com.nynja.dev.mobile.communicator">>, {"cert_dev.pem", "key_dev.pem"}} - ]). - -%% ------------------------------------------------------------------ -%% Ios Push Notifications -%% ------------------------------------------------------------------ - -notify(Alert, Custom, Type, DeviceId, SessionSettings) when is_binary(DeviceId) -> - notify(Alert, Custom, Type, binary_to_list(DeviceId), SessionSettings); -notify(A, C, T, DeviceId, SessionSettings) -> - [Alert, Custom, Type] = [iolist_to_binary([L]) || L <- [A, C, T]], - application:ensure_started(ssl), - -%% create aps json - Aps = jsx:encode([{<<"model">>, Custom}, {<<"type">>, Type}, {<<"title">>, Alert}, - {<<"dns">>, get_data_from_feature(SessionSettings, ?FKPN_SERVER_DNS)}, {<<"version">>, <>}]), - -%% create ios payload string - PayloadString = binary_to_list(iolist_to_binary(["{\"aps\": {\"nynja\": ", Aps, "}}"])), -% ?LOG_INFO("PayloadString ~p~n~n", [PayloadString]), - -%% prepare push data - Payload = list_to_binary(PayloadString), - PayloadLength = size(Payload), - FormattedDeviceId = list_to_integer(DeviceId, 16), - Packet = <<0:8, 32:16/big, FormattedDeviceId:256/big, PayloadLength:16/big, Payload/binary>>, - {_, {CertFile, KeyFile}} = get_bandle(SessionSettings), - ?LOG_INFO("CertFile: ~p", [CertFile]), - Options = [{certfile, path_to_pem_file(CertFile)}, {keyfile, path_to_pem_file(KeyFile)}, {mode, binary}], - [send_push(Addr, Packet, Options, 1) || {_, Addr} <- get_gateway(SessionSettings)], - ok. - -%% ------------------------------------------------------------------ -%% Helpers -%% ------------------------------------------------------------------ - -send_push(Addr, Payload, Options, Attempt) -> - ?LOG_INFO("Addr: ~p, Attempt:~p", [Addr, Attempt]), -%% NOTE set Duration = Attempt * 100 for tests - Duration = Attempt * 500, - {Status, Socket} = ssl:connect(Addr, ?APNS_PORT, Options, Duration), - case Status of - ok -> - ssl:send(Socket, Payload), - ssl:close(Socket), - ?LOG_INFO("Push sent", []); - error -> - if - Attempt > 10 -> - ?LOG_INFO("Final error", []); - true -> - timer:sleep(Duration), - ?LOG_INFO("Error with socket opening. Reason:~p", [Socket]), - send_push(Addr, Payload, Options, Attempt + 1) - end - end. - -path_to_pem_file(FileName) -> - PrivDir = code:priv_dir(roster), - filename:join([PrivDir,?APNS_CERT_DIR, FileName]). - -get_data_from_feature(SessionSettings, Key) -> - case lists:keyfind(Key, #'Feature'.key, SessionSettings) of - #'Feature'{value = Value} -> Value; - _ -> [] - end. - -get_bandle(SessionSettings) -> - [H|_]=get_from_session(SessionSettings, ?FKPN_BANDLE, ?BANDLE_LIST), - H. - -get_gateway(SessionSettings) -> - get_from_session(SessionSettings, ?FKPN_GATEWAY, ?GATEWAY_LIST). - -get_from_session(SessionSettings, Key, AcceptedValues) -> - case get_data_from_feature(SessionSettings, Key) of - [] -> AcceptedValues; - FoundValue -> Filtered = lists:filter(fun(X) -> element(1,X) == FoundValue end, AcceptedValues), - case Filtered of [] -> AcceptedValues; _ -> Filtered end - end. - -%% ------------------------------------------------------------------ -%% Tests -%% ------------------------------------------------------------------ - -%% Liubov's phone --define(APNS_TEST_DEVICE_ID, "f9e7bedd8d46079c51a5aee1f951bbafc68ec541d68a56a0aa709214263cf138"). -%% Anton's phone dev -%% -define(APNS_TEST_DEVICE_ID, "55e9a60ffde1701ba701ea653ba6c0dfa4e515de7d56aa2039d72a904f353e54"). -%% Anton's phone rc -%% -define(APNS_TEST_DEVICE_ID, "a34830e7199ff499e986d2bc3ab0555b0acebe499f9a9f0445701b7dbe2a6722"). - -test_push_notification() -> - SessionSettings = [#'Feature'{id = <<"ID_Sandbox">>, key = <<"APNS_GATEWAY">>, value = <<"SANDBOX">>, group = <<"AUTH_DATA">>}, - #'Feature'{id = <<"ID_Dns">>, key = <<"SERVER_DNS">>, value = <<"SomeDNSValue">>, group = <<"AUTH_DATA">>}, - #'Feature'{id = <<"ID_Bandle">>, key = <<"IOS_BANDLE">>,value = <<"com.nynja.mobile.communicator">>, group = <<"AUTH_DATA">>}], - Msg = lists:concat(["Test it! ", vox_api:generate_random_data(4)]), - Custom = <<"g2gSZAAHTWVzc2FnZWEQZAAFY2hhaW5oA2QAA3AycG0AAAAOMzgwNjM4MDk1MTU4XzdtAAAADjM4MDk5NDM4Mjc5OF84ampqam0AAAAOMzgwOTk0MzgyNzk4XzhtAAAADjM4MDYzODA5NTE1OF83am4GAD5BRlNeAWpqbAAAAAFoBmQABERlc2NqbQAAAARIaGhoYQBqampqamQABHNlbnQ=">>, - notify(Msg, Custom, <<"message">>, ?APNS_TEST_DEVICE_ID, SessionSettings). diff --git a/apps/roster/src/api/push/push_api.erl b/apps/roster/src/api/push/push_api.erl deleted file mode 100644 index 41990451b09e3d82bb2d23b3d6a7123af708b514..0000000000000000000000000000000000000000 --- a/apps/roster/src/api/push/push_api.erl +++ /dev/null @@ -1,14 +0,0 @@ --module(push_api). - --export([description/0, fcm_notify/3, apns_notify/5]). - -description() -> "Mobile Push Notifications Module. Wrapper for IOS and Android". - --compile(export_all). - - -fcm_notify(MessageTitle, MessageBody, DeviceId) -> - android:notify(MessageTitle, MessageBody, DeviceId). - -apns_notify(Alert, Custom, Type, DeviceId, SessionSettings) -> - ios:notify(Alert, Custom, Type, DeviceId, SessionSettings). \ No newline at end of file diff --git a/apps/roster/src/api/push/roster_apns_api.erl b/apps/roster/src/api/push/roster_apns_api.erl new file mode 100644 index 0000000000000000000000000000000000000000..b7935fe578c627ae685cf66cf8119830432f3515 --- /dev/null +++ b/apps/roster/src/api/push/roster_apns_api.erl @@ -0,0 +1,299 @@ +%%%------------------------------------------------------------------- +%%% @doc Client interface to apns +%%% +%%% @end +%%%------------------------------------------------------------------- +-module(roster_apns_api). + +-include_lib("kernel/include/logger.hrl"). +-include_lib("roster/include/roster.hrl"). + +-export([ notify/6 + , start/0 + ]). + +%% Temporary manual interface +-export([ toggle_force_http/0 + ]). + +-type connection() :: #{ pid => pid() | 'undefined' + , config => maps:map() + }. + +-type connection_name() :: 'apns_live' | + 'apns_sandbox_prod' | + 'apns_sandbox_dev'. + +-record(roster_apns_api_state, + { http_connections :: orddict:orddict(connection_name(), connection()) + , binary_configs :: orddict:orddict(connection_name(), map()) + }). + + +%% FGPN - Feature Group for Push Notification +%% FKPN - Feature Key for Push Notification +-define(FGPN_INFO, <<"PUSH_SETTINGS">>). + +-define(FKPN_BUNDLE, <<"IOS_BANDLE">>). %% Sic! +-define(FKPN_GATEWAY, <<"APNS_GATEWAY">>). +-define(FKPN_SERVER_DNS, <<"SERVER_DNS">>). +-define(FKPN_GENERIC_TOKEN, <<"GENERIC_TOKEN">>). + + +%% Temporary manual interface +toggle_force_http() -> + {ok, Env} = application:get_env(roster, push_api), + Key = apns_force_http, + Val = not proplists:get_value(Key, Env), + Env1 = lists:keyreplace(Key, 1, Env, {Key, Val}), + application:set_env(roster, push_api, Env1), + Val. + +%%%=================================================================== +%%% API +%%%=================================================================== + +start() -> + start(http_connection_configs(), []). + +start([{Name, Config}|Left], Connections) -> + ?LOG_INFO("Connecting to apns with config ~p", [Config]), + case apns:connect(Config) of + {ok, Pid} -> + Connection = #{ pid => Pid + , config => Config}, + Connections1 = orddict:store(Name, Connection, Connections), + start(Left, Connections1); + {error, What} -> + error({could_not_start_apns, What}) + end; +start([], Connections) -> + %% TODO: Extend to long-lived ssl connections. + BinaryConfigs = orddict:from_list(binary_connection_configs()), + #roster_apns_api_state{ http_connections = Connections + , binary_configs = BinaryConfigs + }. + +notify(A, C, T, VoipToken, SessionSettings, State) -> + [Alert, Custom, Type] = [iolist_to_binary([L]) || L <- [A, C, T]], + DNS = get_data_from_feature(SessionSettings, ?FKPN_SERVER_DNS), + NynjaPayload = #{ model => Custom + , type => Type + , title => Alert + , dns => DNS + %% TODO: Is this needed? + , version => <> + }, + case pick_connection_type(Type, SessionSettings, VoipToken) of + {binary, Token} -> + Config = pick_binary_config(SessionSettings, State), + %% TODO: This is what seems to work here, but + %% it seems wrong according to docs. + Payload = #{ aps => #{nynja => NynjaPayload}}, + binary_notify(Config, Payload, Token); + {http, Headers, Aps, Token} -> + Conn = pick_http_connection(SessionSettings, State), + Payload = #{ aps => Aps + , nynja => NynjaPayload + }, + http_notify(Conn, Payload, Headers, Token) + end. + +%%%=================================================================== +%%% Internal functions +%%%=================================================================== + +%%%=================================================================== +%%% Notifications + +pick_connection_type(Type, SessionSettings, VoipToken) -> + %% Note that headers need to be written as strings. + %% The payload content should be numbers. + case push_type_and_token(Type, SessionSettings) of + {background, Token} -> + Headers = #{ apns_push_type => <<"background">> + , apns_priority => <<"5">>}, + Aps = #{ <<"content-available">> => 1 }, + {http, Headers, Aps, Token}; + binary -> + %% Token from the old system where we used only one token + %% both for voip and background updates. + case get_from_config(apns_force_http) of + true -> + Headers = #{ apns_push_type => <<"voip">> + , apns_priority => <<"5">>}, + Aps = #{}, + {http, Headers, Aps, VoipToken}; + false -> + {binary, VoipToken} + end; + voip -> + Headers = #{ apns_push_type => <<"voip">> + , apns_expiration => <<"0">> %% Deliver immediately or not at all. + , apns_priority => <<"10">>}, + Aps = #{}, + {http, Headers, Aps, VoipToken} + end. + +push_type_and_token(<<"calling">>, _SessionSettings) -> + voip; +push_type_and_token(_Type, SessionSettings) -> + case get_data_from_feature(SessionSettings, ?FKPN_GENERIC_TOKEN) of + [] -> binary; + Token -> {background, Token} + end. + +binary_notify(Config, Payload, Token) -> + BinPayload = jsx:encode(Payload), + Packet = << 0:8, + 32:16/big, + (binary_to_integer(Token, 16)):256/big, + (byte_size(BinPayload)):16/big, + BinPayload/binary >>, + binary_push(Config, Packet, Token, 1). + +binary_push(Config, Packet, Token, Attempt) -> + #{options:= Options, apple_port := Port, apple_host := Addr} = Config, + ?LOG_INFO("Binary apns push: Addr: ~p, Options: ~p, Attempt:~p", [Addr, Options, Attempt]), + Duration = Attempt * 500, + case ssl:connect(Addr, Port, Options, Duration) of + {ok, Socket} -> + ssl:send(Socket, Packet), + ssl:close(Socket), + ?LOG_INFO("Push sent. Token: ~P", [Token, 5]), + ok; + {error, Reason} when Attempt > 10 -> + ?LOG_INFO("Socket error, giving up: ~p, Token ~P", + [Reason, Token, 5]), + ok; + {error, Reason} -> + ?LOG_INFO("Socket error: ~p, Retrying on ~P", + [Reason, Token, 5]), + timer:sleep(Duration), + binary_push(Config, Packet, Token, Attempt + 1) + end. + +http_notify(Conn, Payload, Headers, Token) -> + Pid = maps:get(pid, Conn), + #{config := #{ apple_host := Addr}} = Conn, + case apns:push_notification(Pid, Token, Payload, Headers) of + {200, _RespHeaders, _RespBody} -> + ?LOG_INFO("APNS: Push done. Addr: ~p, Token: ~P", + [Addr, Token, 5]), + ok; + {410, RespHeaders, RespBody} -> + %% Expired of invalid token. + ?LOG_INFO("APNS Invalid token. Addr: ~p Resp: ~p:~p Token: ~p", + [Addr, RespHeaders, RespBody, Token]), + {error, bad_token}; + {Status, RespHeaders, RespBody} -> + ?LOG_ERROR("APNS push error Resp: ~w:~p:~p, Token: ~p", + [Status, RespHeaders, RespBody, Token]), + {error, not_delivered} + end. + +%%%=================================================================== +%%% Initialisation of connections and configs + +-define(SESSION_NAMES, [apns_live, apns_sandbox_prod, apns_sandbox_dev]). +-define(SANDBOX_HTTP_HOST, "api.sandbox.push.apple.com"). +-define(LIVE_HTTP_HOST, "api.push.apple.com"). +-define(SANDBOX_SSL_HOST, "gateway.sandbox.push.apple.com"). +-define(LIVE_SSL_HOST, "gateway.push.apple.com"). +-define(PROD_CERTS, {"cert_prod.pem", "key_prod.pem"}). +-define(DEV_CERTS, {"cert_dev.pem", "key_dev.pem"}). + +get_from_config(Key) -> + {ok, Env} = application:get_env(roster, push_api), + proplists:get_value(Key, Env). + +http_connection_configs() -> + ApnsPort = get_from_config(apns_http_port), + [ { SessionName, http_config(SessionName, ApnsPort)} + || SessionName <- ?SESSION_NAMES]. + +http_config(SessionName, ApnsPort) -> + {CertFile, KeyFile} = certfiles_from_session_name(SessionName), + #{ name => undefined %% In order to be able to start more than one + , apple_host => http_host_from_session_name(SessionName) + , apple_port => ApnsPort + , certfile => CertFile + , keyfile => KeyFile + , type => cert + , timeout => 10000 + , gun => #{ transport => tls + , http2_opts => #{ keepalive => 30000 } + } + }. + +binary_connection_configs() -> + ApnsPort = get_from_config(apns_binary_port), + [ { SessionName, binary_config(SessionName, ApnsPort)} + || SessionName <- ?SESSION_NAMES]. + +binary_config(SessionName, BinaryApnsPort) -> + {CertFile, KeyFile} = certfiles_from_session_name(SessionName), + #{ options => [{certfile, CertFile}, + {keyfile, KeyFile}, + {mode, binary}] + , apple_port => BinaryApnsPort + , apple_host => ssl_host_from_session_name(SessionName) + }. + + +http_host_from_session_name(apns_live) -> ?LIVE_HTTP_HOST; +http_host_from_session_name(apns_sandbox_prod) -> ?SANDBOX_HTTP_HOST; +http_host_from_session_name(apns_sandbox_dev) -> ?SANDBOX_HTTP_HOST. + +ssl_host_from_session_name(apns_live) -> ?LIVE_SSL_HOST; +ssl_host_from_session_name(apns_sandbox_prod) -> ?SANDBOX_SSL_HOST; +ssl_host_from_session_name(apns_sandbox_dev) -> ?SANDBOX_SSL_HOST. + +certfiles_from_session_name(apns_live) -> ensure_cert_files(?PROD_CERTS); +certfiles_from_session_name(apns_sandbox_prod) -> ensure_cert_files(?PROD_CERTS); +certfiles_from_session_name(apns_sandbox_dev) -> ensure_cert_files(?DEV_CERTS). + +ensure_cert_files({CertBase, KeyBase}) -> + %% TODO: Move the certs away from priv_dir + CertDir = filename:join(code:priv_dir(roster), + get_from_config(apns_cert_dir)), + KeyFile = filename:join(CertDir, KeyBase), + CertFile = filename:join(CertDir, CertBase), + case filelib:is_file(KeyFile) andalso filelib:is_file(CertFile) of + true -> {CertFile, KeyFile}; + false -> error({missing_apns_cert_files, CertFile, KeyFile}) + end. + +%%%=================================================================== +%%% Client settings + +pick_http_connection(SessionSettings, State) -> + Connections = State#roster_apns_api_state.http_connections, + Name = pick_session_name(SessionSettings), + orddict:fetch(Name, Connections). + +pick_binary_config(SessionSettings, State) -> + Configs = State#roster_apns_api_state.binary_configs, + Name = pick_session_name(SessionSettings), + orddict:fetch(Name, Configs). + + +pick_session_name(SessionSettings) -> + Bundle = get_data_from_feature(SessionSettings, ?FKPN_BUNDLE), + Gateway = get_data_from_feature(SessionSettings, ?FKPN_GATEWAY), + CertType = cert_type_from_bundle(Bundle), + case {CertType, Gateway} of + {prod, <<"LIVE">>} -> apns_live; + {prod, <<"SANDBOX">>} -> apns_sandbox_prod; + {dev, <<"SANDBOX">>} -> apns_sandbox_dev + end. + +cert_type_from_bundle(<<"com.nynja.mobile.communicator">>) -> prod; +cert_type_from_bundle(<<"com.nynja.rc.mobile.communicator">>) -> prod; +cert_type_from_bundle(<<"com.nynja.dev.mobile.communicator">>) -> dev. + +get_data_from_feature(SessionSettings, Key) -> + case lists:keyfind(Key, #'Feature'.key, SessionSettings) of + #'Feature'{value = Value} -> Value; + _ -> [] + end. diff --git a/apps/roster/src/api/push/android.erl b/apps/roster/src/api/push/roster_fcm_api.erl similarity index 96% rename from apps/roster/src/api/push/android.erl rename to apps/roster/src/api/push/roster_fcm_api.erl index db15d4c91e67bce9b68001655ec2723a5f03353e..fb07f73a12b40e53d62e797bb23a30a273b5dad0 100644 --- a/apps/roster/src/api/push/android.erl +++ b/apps/roster/src/api/push/roster_fcm_api.erl @@ -1,4 +1,4 @@ --module(android). +-module(roster_fcm_api). -include_lib("kernel/include/logger.hrl"). -include("roster.hrl"). @@ -42,4 +42,4 @@ notify(_, MessageBody, DeviceId) -> test_push_notification() -> MessageBody = "Notify Liubov about this push", - notify(MessageBody, MessageBody, ?FCM_TEST_DEVICE_ID). \ No newline at end of file + notify(MessageBody, MessageBody, ?FCM_TEST_DEVICE_ID). diff --git a/apps/roster/src/protocol/roster_push.erl b/apps/roster/src/protocol/roster_push.erl index b6e67162c5aee7831287e778536091a670e3a239..5b675aca6bb076733f8a150834cab8ccc880b582 100644 --- a/apps/roster/src/protocol/roster_push.erl +++ b/apps/roster/src/protocol/roster_push.erl @@ -3,34 +3,72 @@ -include("roster.hrl"). -include_lib("n2o/include/n2o.hrl"). -include_lib("kvs/include/kvs.hrl"). --compile(export_all). +-export([ start/0 + , send_push_notification/4 + , proc/2 + ]). -start() -> n2o_async:start(#handler{module = ?MODULE, class = system, group = roster, name = ?MODULE, state = []}). +start() -> + n2o_async:start(#handler{ module = ?MODULE + , class = system + , group = roster + , name = ?MODULE + , state = init}). + +send_push_notification(Session, Payload, Alert, Type) -> + n2o_async:pid(system, ?MODULE) + ! {async_push, Session, Payload, Alert, Type}. + +%% TODO: Handle apns connection messages in proc/2 proc(init, #handler{name = ?MODULE} = Async) -> - ?LOG_INFO("ASYNC", []), - {ok, Async}; + ConnState = #{ android => [] + , ios => roster_apns_api:start()}, + {ok, Async#handler{state = ConnState}}; + +proc({connection_up, _Pid}, #handler{} = H) -> + %% APNS connection. Safe to ignore + {noreply, H}; -proc({async_push, Session, Payload, PushAlert, PushType}, #handler{} = H) -> - send_push_notification(Session, Payload, PushAlert, PushType), +proc({connection_down, _Pid}, #handler{} = H) -> + %% APNS connection. Safe to ignore + {noreply, H}; + +proc({reconnecting, _Pid}, #handler{} = H) -> + %% APNS connection. Safe to ignore + {noreply, H}; + +proc({async_push, Session, Payload, PushAlert, PushType}, #handler{state = HS} = H) -> + send_push_notification(Session, Payload, PushAlert, PushType, HS), {reply, [], H}. -%% TODO prettify variables naming -send_push_notification(#'Auth'{os = OS, push = PushToken, user_id = PhoneId, settings = AuthSettings}, Payload, PushAlert, PushType) -> +send_push_notification(#'Auth'{ os = OS + , push = PushToken + , user_id = PhoneId + , settings = AuthSettings}, Payload, PushAlert, PushType, HS) -> case PushToken of [] -> skip; _ -> - ?LOG_INFO("~p:~p:~pPushAlert:~p", - [PhoneId, OS, binary:part(PushToken, 0, erlang:min(25, size(PushToken))), PushAlert]), - send_push_notification(OS, PushToken, Payload, PushAlert, PushType, AuthSettings) + ?LOG_INFO("~p:~p:~PPushAlert:~p", + [PhoneId, OS, PushToken, 5, PushAlert]), + send_push_notification(OS, PushToken, Payload, PushAlert, PushType, AuthSettings, HS) end. -send_push_notification(ios, Push, Payload, PushAlert, <<"calling">>, AuthSettings) -> - push_api:apns_notify(PushAlert, Payload, <<"calling">>, Push, AuthSettings); -send_push_notification(ios, Push, Payload, PushAlert, PushType, AuthSettings) -> - DecodedPayload = base64:encode(term_to_binary(Payload)), - push_api:apns_notify(PushAlert, DecodedPayload, PushType, Push, AuthSettings); -send_push_notification(android, Push, Payload, PushAlert, PushType, _) -> + +send_push_notification(ios, Push, Payload, PushAlert, PushType, AuthSettings, HS) -> + EncodedPayload = base64:encode(term_to_binary(Payload)), + IOS = maps:get(ios, HS), + case roster_apns_api:notify(PushAlert, EncodedPayload, + PushType, Push, AuthSettings, IOS) of + ok -> + ok; + {error, bad_token} -> + %% TODO: Remove auth. + ok; + {error,_What} -> + ok + end; +send_push_notification(android, Push, Payload, PushAlert, PushType, _AuthSettings,_HS) -> PushModel = #push{model = Payload, type = PushType, alert = PushAlert, title = PushAlert, badge = 1}, AndroidPush = http_uri:encode(binary_to_list(base64:encode(term_to_binary(PushModel)))), - push_api:fcm_notify(PushAlert, AndroidPush, Push); -send_push_notification(_, _, _, _, _, _) -> skip. \ No newline at end of file + roster_fcm_api:notify(PushAlert, AndroidPush, Push); +send_push_notification(_, _, _, _, _, _, _) -> skip. diff --git a/apps/roster/src/rest/rest_cowboy_push_handler.erl b/apps/roster/src/rest/rest_cowboy_push_handler.erl index 96303a561d8b4c422fa307d16505daac0f74753f..b16d2cbfa8be800b8ef0b2d4424dea37d2c1701b 100644 --- a/apps/roster/src/rest/rest_cowboy_push_handler.erl +++ b/apps/roster/src/rest/rest_cowboy_push_handler.erl @@ -52,14 +52,14 @@ from_json(Req, State) -> Payload = list_to_binary(PS#'PushService'.payload), Recipients = PS#'PushService'.recipients, PushAlert = PushType = list_to_binary(PS#'PushService'.module), - Pid = n2o_async:pid(system, roster_push), lists:foreach( fun(PhoneId0) -> PhoneId = iolist_to_binary(PhoneId0), AuthList = kvs:index('Auth', user_id, PhoneId), lists:foreach( fun(Auth) -> - Pid ! {async_push, Auth, Payload, PushAlert, PushType} + roster_push:send_push_notification( + Auth, Payload, PushAlert, PushType) end, AuthList) end, Recipients), {true, Req1, State} diff --git a/apps/roster/src/roster.app.src b/apps/roster/src/roster.app.src index 05a7bdae98dd0f58a38dde424cc2c55d7fabaf81..bf95b63841c3ebf24a9bb1576438485b590d7208 100644 --- a/apps/roster/src/roster.app.src +++ b/apps/roster/src/roster.app.src @@ -5,7 +5,7 @@ {applications, [kernel,stdlib, mnesia, crypto, inets, ssl, ibrowse, cowboy, mochiweb, gen_smtp, kvs, nitro, n2o, emqttc, emqttd, bpe, - jose, jsx, uuid, erlydtl, jwt, + jose, jsx, uuid, erlydtl, jwt, apns, mini_s3, qdate, rest, enenra, locus, prometheus, libphonenumber_erlang]}, {mod, {roster, []}}, diff --git a/rebar.config b/rebar.config index a22caab3b5575af9665cfdadedbd09d4ce579b89..78719e36231089230bee0238141d9441a57e58f3 100644 --- a/rebar.config +++ b/rebar.config @@ -15,6 +15,7 @@ {emqttc, {git, "git://github.com/NYNJA-MC/emqttc", {branch,"master"}}}, {rest, {git, "git://github.com/synrc/rest", {tag,"5.10"}}}, {gen_smtp, {git, "git://github.com/voxoz/gen_smtp", {branch,"master"}}}, + {apns, {git, "git://github.com/NYNJA-MC/apns4erl", {ref, "6724edcf073f512a01a0b7652223d173db2f2fe0"}}}, {emq_dashboard, {git, "https://github.com/synrc/emq_dashboard", {branch,"master"}}}, {opencensus, {git, "https://github.com/census-instrumentation/opencensus-erlang", {ref, "7fb276f"}}}, {libphonenumber_erlang, {git, "https://github.com/marinakr/libphonenumber_erlang.git", {branch,"master"}}}, @@ -82,7 +83,7 @@ certifi,ibrowse,asn1,xmerl,counters,ctx, wts,syntax_tools,qdate_localtime, libphonenumber_erlang,syn,cowlib,jiffy,idna,parse_trans, - goldrush, public_key,bpe,{lager,load},ssl,ranch, + goldrush, public_key,bpe,{lager,load},ssl,ranch,gun,apns, ssl_verify_fun,locus,emqttd,hackney,roster,service,active, cowboy,emq_dashboard,emqttc,enenra,envy,uuid,erlydtl,forms, gen_smtp, jwt, mini_s3, nitro, opencensus, diff --git a/rebar.lock b/rebar.lock index 31235aeb1c596699627d95e68a2619cbc237bf7b..08e6c3e5502721a72b8a59ce87899cd93a741b6a 100644 --- a/rebar.lock +++ b/rebar.lock @@ -3,6 +3,10 @@ {git,"git://github.com/synrc/active", {ref,"cdd8f2b0f62b9785673bdbea7be90e1ae1ca1c02"}}, 0}, + {<<"apns">>, + {git,"git://github.com/NYNJA-MC/apns4erl", + {ref,"6724edcf073f512a01a0b7652223d173db2f2fe0"}}, + 0}, {<<"base64url">>, {git,"https://github.com/dvv/base64url.git", {ref,"f2c64ed8b9bebc536fad37ad97243452b674b837"}}, @@ -86,6 +90,7 @@ {git,"https://github.com/uwiger/gproc", {ref,"1d16f5e6d7cf616eec4395f2385e3a680a4ffc9f"}}, 0}, + {<<"gun">>,{pkg,<<"gun">>,<<"1.3.0">>},1}, {<<"hackney">>, {git,"https://github.com/benoitc/hackney", {ref,"3c32f04ff0783479992a5d11ec0f4a2d09ba922a"}}, @@ -203,6 +208,7 @@ {<<"certifi">>, <<"75424FF0F3BAACCFD34B1214184B6EF616D89E420B258BB0A5EA7D7BC628F7F0">>}, {<<"cf">>, <<"5CB902239476E141EA70A740340233782D363A31EEA8AD37049561542E6CD641">>}, {<<"erlware_commons">>, <<"0CE192AD69BC6FD0880246D852D0ECE17631E234878011D1586E053641ED4C04">>}, + {<<"gun">>, <<"18E5D269649C987AF95AEC309F68A27FFC3930531DD227A6EAA0884D6684286E">>}, {<<"idna">>, <<"689C46CBCDF3524C44D5F3DDE8001F364CD7608A99556D8FBD8239A5798D4C10">>}, {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>}, {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>}, diff --git a/sys.config b/sys.config index c319338aed5340fe3b3a83a3bcd2413ff790dc41..5a628324391def40ebde38ead7c586edbc319d12 100644 --- a/sys.config +++ b/sys.config @@ -95,9 +95,11 @@ {app_credentials, "etc/certs/transcribe-dacb4306ab76.json"} ]}, {push_api,[ + {apns_force_http, false}, {fcm_server_key,<<"AAAAAzb6_Zg:APA91bGN0jYv_4iqyk8IC4xUdPYXh0yPsTF9YYj_gd9oebRr_ZEoLuC5hCD9RfdqA3Y3AF_P_WbelqvzvgR3RsX_mHBLynV14Q6HakXAtrY_eWLK2xqamF2OC9uBXfKgxTFFqmyr1Kbw">>}, - {apns_cert_dir,<<"apns_certificates">>}, - {apns_port,2195}]}, + {apns_cert_dir, "apns_certificates"}, + {apns_binary_port, 2195}, + {apns_http_port, 443}]}, {job_delay, 60}, %% 1 mins {auth_ttl, 900}, %% 15 mins {auth_check_ip, false},