diff --git a/.gitignore b/.gitignore index 06a50614f0b12ea9d0a0c4ba100b297f93d7a72b..4096281b6b9d331d10100eec82e21285768ea479 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,10 @@ workspace.xml .idea/ .DS_Store _build +*.crashdump + +# Generated code +priv/ # Excessive for iOS models apps/roster/priv/macbert/Model/PublishService.swift diff --git a/Makefile b/Makefile index dd4a9409d9f4017b9c71f5525a81e6935bd932d9..54489d236f9c229a23e28d776a50bfaba98cdc8a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,49 @@ +REBAR ?= ./rebar3 + RELEASE := mq COOKIE := node_runner VER := 1.0.0 -default: deps compile +all: compile + +compile: + @$(REBAR) compile + +clean: + @rm -rf priv + @$(REBAR) clean + +console: local-build + @./_build/local/rel/server/bin/server console + +start: local-build + @./_build/local/rel/server/bin/server start + +attach: + @./_build/local/rel/server/bin/server attach + +local-build: + @$(REBAR) as local release + + +prod-build: + @$(REBAR) as prod release + +prod-console: prod-build + @./_build/prod/rel/server/bin/server console + +prod-start: prod-build + @./_build/prod/rel/server/bin/server start + +prod-attach: + @./_build/prod/rel/server/bin/server attach + +tar: + @$(REBAR) as prod tar + -include otp.mk +.PHONY: \ + all compile clean console local-build \ + start attach \ + prod-build prod-console prod-start prod-attach \ + tar diff --git a/README.md b/README.md index 18a1a741506bbfed6cb608cf522a8ab76623bdfc..67ffd9a74ea7959f9f35874b17161d59152abcd3 100644 --- a/README.md +++ b/README.md @@ -26,79 +26,26 @@ Developers Setup ---------------- ``` -$ curl -fsSL https://raw.github.com/synrc/mad/master/mad > mad \ - && chmod +x mad \ - && sudo cp /usr/local/bin -$ mad dep com rep -Configuration: [{n2o, - [{port,8000}, - {app,review}, - {pickler,n2o_secret}, - {formatter,bert}, - {log_modules,config}, - {log_level,config}]}, - {emq_dashboard, - [{listeners_dash, - [{http,18083,[{acceptors,4},{max_clients,512}]}]}]}, - {emq_modules, - [{modules, - [{emq_mod_presence,[{qos,1}]}, - {emq_mod_subscription,[{<<"%u/%c/#">>,2}]}, - {emq_mod_rewrite, - [{rewrite,"x/#","^x/y/(.+)$","z/y/$1"}, - {rewrite,"y/+/z/#","^y/(.+)/z/(.+)$", - "y/z/$2"}]}]}]}, - {emqttd, - [{listeners, - [{http,8083,[{acceptors,4},{max_clients,512}]}, - {tcp,1883,[{acceptors,4},{max_clients,512}]}]}, - {sysmon, - [{long_gc,false}, - {long_schedule,240}, - {large_heap,8000000}, - {busy_port,false}, - {busy_dist_port,true}]}, - {session, - [{upgrade_qos,off}, - {max_inflight,32}, - {retry_interval,20}, - {max_awaiting_rel,100}, - {await_rel_timeout,20}, - {enable_stats,off}]}, - {queue,[]}, - {allow_anonymous,true}, - {protocol, - [{max_clientid_len,1024},{max_packet_size,64000}]}, - {acl_file,"etc/acl.conf"}, - {plugins_etc_dir,"etc/plugins/"}, - {plugins_loaded_file,"etc/loaded_plugins"}, - {pubsub, - [{pool_size,8},{by_clientid,true},{async,true}]}]}, - {kvs, - [{dba,store_mnesia}, - {schema,[kvs_user,kvs_acl,kvs_feed,kvs_subscription]}]}] -Applications: [kernel,stdlib,gproc,lager_syslog,pbkdf2,asn1,fs,ranch,mnesia, - compiler,inets,crypto,syntax_tools,xmerl,gen_logger,esockd, - cowlib,goldrush,public_key,lager,ssl,cowboy,mochiweb,emqttd, - erlydtl,kvs,mad,emqttc,nitro,rest,sh,syslog,review] -Erlang/OTP 19 [erts-8.3] [source] [64-bit] [smp:4:4] - [async-threads:10] [hipe] [kernel-poll:false] [dtrace] - -Eshell V8.3 (abort with ^G) -starting emqttd on node 'nonode@nohost' -Nonexistent: [] -Plugins: [{mqtt_plugin,emq_auth_username,"2.1.1", - "Authentication with Username/Password",false}, - {mqtt_plugin,emq_dashboard,"2.1.1","EMQ Web Dashboard",false}, - {mqtt_plugin,emq_modules,"2.1.1","EMQ Modules",false}, - {mqtt_plugin,n2o,"4.5-mqtt","N2O Server",false}] -Names: [emq_dashboard,n2o] -dashboard:http listen on 0.0.0.0:18083 with 4 acceptors. -Async Start Attempt {handler,"timer",n2o,system,n2o,[],[]} -Proc Init: init -mqtt:ws listen on 0.0.0.0:8083 with 4 acceptors. -mqtt:tcp listen on 0.0.0.0:1883 with 4 acceptors. -emqttd 2.1.1 is running now +$ make +===> Verifying dependencies... +... +===> Compiling roster +===> Compiling service +$ make console +===> Verifying dependencies... +===> Compiling roster +===> Compiling service +===> Starting relx build process ... +===> Resolving OTP Applications from directories: +... +===> release successfully created! +Exec: /.../erlang/20.3/erts-9.3/bin/erlexec -boot /.../nynja/server/_build/local/rel/server/releases/1.0.0/server -mode embedded -boot_var ERTS_LIB_DIR /.../erlang/20.3/lib -config /.../nynja/server/_build/local/rel/server/releases/1.0.0/sys.config -args_file /.../nynja/server/_build/local/rel/server/releases/1.0.0/vm.args -- console +Root: /.../nynja/server/_build/local/rel/server +/.../nynja/server/_build/local/rel/server +Erlang/OTP 20 [erts-9.3] [source] [64-bit] [smp:8:8] [ds:8:8:10] [async-threads:32] [hipe] [kernel-poll:true] +... +Eshell V9.3 (abort with ^G) +(mq@127.0.0.1)1> > ``` @@ -132,8 +79,7 @@ Creating Single File Bundle --------------------------- ``` -$ mad release emqttd -$ ./emqttd rep +$ make tar ``` User/Device Registration @@ -160,32 +106,9 @@ ok > emqttd_ctl:run(["help"]). ``` -MQTT Erlang Client ------------------- - -``` -$ mad com -==> "/Users/maxim/depot/voxoz/emqttc/examples/gen_server" -Compiling /src/gen_server_example.erl -Writing /ebin/gen_server_example.app -OK -bash-3.2$ ./run -Erlang/OTP 19 [erts-8.2] [source] [64-bit] [smp:4:4] - [async-threads:10] [hipe] [kernel-poll:false] [dtrace] - -Eshell V8.2 (abort with ^G) -1> [info] [Client <0.58.0>]: connecting to 127.0.0.1:1883 -[info] [Client <0.58.0>] connected with 127.0.0.1:1883 -[info] [Client <0.58.0>] RECV: CONNACK_ACCEPT -Client <0.58.0> is connected -[warning] [simpleClient@127.0.0.1:64618] resubscribe [{<<"TopicA">>,1}] -Message from TopicA: <<"hello...1">> -Message from TopicB: <<"hello...1">> -``` Credits ------- * Maxim Sokhatsky - -OM A HUM +* Ulf Wiger diff --git a/apps/roster/src/roster.app.src b/apps/roster/src/roster.app.src index e5ed158381e133b9a1950c109e602c6724111cfc..ec6fdf48612cb45316aba1b69ba22a9bf7e0b4e9 100644 --- a/apps/roster/src/roster.app.src +++ b/apps/roster/src/roster.app.src @@ -2,6 +2,11 @@ [{description, "Roster Protocol"}, {vsn, "1"}, {registered, []}, - {applications, [kernel,stdlib,mnesia,kvs,emqttd,n2o,bpe,locus,prometheus,libphonenumber_erlang]}, + {applications, [kernel,stdlib, mnesia, crypto, inets, ssl, + ibrowse, cowlib, mochiweb, gen_smtp, + kvs, nitro, n2o, emqttc, emqttd, nitro, bpe, + jose, json_rec, jsx, uuid, erlydtl, jwt, + mad, migresia, mini_s3, qdate, rest, enenra, + locus, prometheus, libphonenumber_erlang]}, {mod, { roster, []}}, {env, []} ]}. diff --git a/apps/roster/src/roster.erl b/apps/roster/src/roster.erl index d403dee9d0cd162241cdb5b497a9a7d11408f302..a432b566aa8e7304933fa99fa35188611ccb49fa 100644 --- a/apps/roster/src/roster.erl +++ b/apps/roster/src/roster.erl @@ -48,42 +48,46 @@ register_acl_mod() -> atoms() -> [android, ios, contact, signup, signin, welcome]. init([]) -> {ok, {{one_for_one, 5, 10}, []}}. -start(_, _) -> atoms(), catch load([]), - application:stop(n2o), - application:start(n2o), - X = try begin - A = supervisor:start_link({local, roster}, roster, []), - emqttd_access_control:register_mod(auth, n2o_auth, [[]], 9997), - emqttd_access_control:register_mod(auth, roster_auth, [[]], 9998), - emqttd_access_control:register_mod(auth, micro_auth, [[]], 9996), - register_acl_mod(), - % roster_db:restore("mnesia.backup"), - roster_message:start(), - roster_friend:start(), - roster_roster:start(), - roster_profile:start(), - % roster_search:start(), - roster_auth:start(), - micro_auth:start(), - [M:start() || M <- application:get_env(?MODULE, start_modules, [])], - roster_bpe:start(), - rest_handler:init(), - roster_room:start(), - roster_history:start(), - roster_push:start(), - stickers_api:init_default_pack(), - init_default_fake_numbers(), - prometheus_api:init(), - sync_indexes(), - A end - catch E:Z -> - io:format("FATAL ROSTER START: ~p~n",[{E, Z, erlang:get_stacktrace()}]), - [] - end, +start(_, _) -> + atoms(), + try load([]) + catch + Error:Reason -> + warning("Error loading ~p: ~p~n",[Error, Reason]) + end, + A = supervisor:start_link({local, roster}, roster, []), + try + emqttd_access_control:register_mod(auth, n2o_auth, [[]], 9997), + emqttd_access_control:register_mod(auth, roster_auth, [[]], 9998), + emqttd_access_control:register_mod(auth, micro_auth, [[]], 9996), + register_acl_mod(), + % roster_db:restore("mnesia.backup"), + roster_message:start(), + roster_friend:start(), + roster_roster:start(), + roster_profile:start(), + % roster_search:start(), + roster_auth:start(), + micro_auth:start(), + [ M:start() || M <- application:get_env(?MODULE, start_modules, [])], + roster_bpe:start(), + rest_handler:init(), + roster_room:start(), + roster_history:start(), + roster_push:start(), + stickers_api:init_default_pack(), + init_default_fake_numbers(), + prometheus_api:init(), + sync_indexes() + catch E:Z -> + io:format("FATAL ROSTER START: ~p~n",[{E, Z, erlang:get_stacktrace()}]), + error("FATAL ROSTER START: ~p~n", [{E, Z}]), + {E, Z} + end, google_api:start(), - X. + A. -execution_time(StartTime) -> +execution_time(StartTime) -> TimeInMicroSec = (os:system_time() - StartTime)/1000, list_to_integer(float_to_list(TimeInMicroSec,[{decimals,0}])). @@ -134,9 +138,9 @@ error(String) -> roster_io:log(?MODULE, String, [], error). % PROFILE MANAGEMENT delete_sessions(Index, P) -> - [begin + [begin n2o_vnode:unsubscribe(ClientId, roster:action_topic(ClientId)), - kvs:delete('Auth', ClientId) + kvs:delete('Auth', ClientId) end || #'Auth'{client_id = ClientId} <- kvs:index('Auth', Index, P)]. delete_sessions({client_id, ClientId}) -> @@ -176,8 +180,8 @@ add_length_settings_maybe(Settings, Size, #'Roster'{userlist = Contacts, [] -> Settings; _ -> RealStars = [RealStar || RealStar = #'Star'{} <- Stars], - info(?MODULE, - "split_roster:TotalLength: ~p Contacts | ~p Rooms | ~p Stars", + info(?MODULE, + "split_roster:TotalLength: ~p Contacts | ~p Rooms | ~p Stars", [length(Contacts), length(Rooms), length(RealStars)]), Settings ++ [create_length_feature(contacts, length(Contacts))] @@ -188,7 +192,7 @@ add_length_settings_maybe(Settings, Size, #'Roster'{userlist = Contacts, create_length_feature(Key, Size) -> Type = atom_to_binary(Key, utf8), - #'Feature'{id = [], + #'Feature'{id = [], key = <>, value = list_to_binary(integer_to_list(Size)), group = <<"PAGINATION">>}. @@ -210,7 +214,7 @@ send_profile(#'Profile'{ ClientPid) -> roster:info(?MODULE, "SEND PROFILE [~p]", [length(Rosters)]), case kvs:get('Roster', RosterId) of - {error, _} -> + {error, _} -> roster:info(?MODULE, "roster ~p not found in profile ~p", [RosterId, Phone]); {ok, #'Roster'{} = Roster} -> ProfileWithNewSettings = Profile#'Profile'{settings = add_length_settings_maybe(Settings, N, Roster)}, @@ -245,7 +249,7 @@ send_profile(#'Profile'{ ClientPid) -> roster:info(?MODULE, "SEND PROFILE [~p]", [length(Rosters)]), case kvs:get('Roster', RosterId) of - {error, _} -> + {error, _} -> roster:info(?MODULE, "roster ~p not found in profile ~p", [RosterId, Phone]); {ok, #'Roster'{} = Roster} -> ProfileWithNewSettings = Profile#'Profile'{settings = add_length_settings_maybe(Settings, N, Roster)}, @@ -879,12 +883,12 @@ parse_token(Token) -> {error, invalid_token}; {Expiration, D} when Expiration =< Now -> {error, token_expired}; - {_, D} -> D + {_, D} -> D end. parse_token2(Token) -> case depicle(Token) of <<>> -> {error, invalid_token}; - {_, D} -> D + {_, D} -> D end. get_vnode(Term) -> [H|_] = binary_to_list(erlang:md5(term_to_binary(Term))), @@ -1205,11 +1209,11 @@ last_objs([Obj|TObjs], PhoneId, LastSync, N, {Acc, MaxUpd}) -> {0, Feed} end, LastUpd = erlang:max(Created, last_upd(Obj)), - Acc2 = case LastUpd > LastSync of + Acc2 = case LastUpd > LastSync of true -> Acc++[{Obj, W}]; _ -> - Acc + Acc end, %% TODO sort objects if update? last_objs(TObjs, PhoneId, LastSync, N, {Acc2, erlang:max(MaxUpd, LastUpd)}). @@ -1229,7 +1233,7 @@ split_objlist(Index, #'Roster'{} = Roster, LastSync, N, Acc) split_objlist([], _Roster, _LastSync, _N, Acc) -> Acc; split_objlist([_|_] = List, #'Roster'{}=Roster, LastSync, N, Acc) -> - %[ Objs | TObjs ] = + %[ Objs | TObjs ] = objlist(List, Roster, LastSync, N); %split_objlist(TObjs, Roster, LastSync, N, Acc ++ [Objs]); split_objlist(Index, Id, LastSync, N, Acc) @@ -1241,7 +1245,7 @@ split_objlist(Index, Id, LastSync, N, Acc) split_objlist(Index, R, LastSync, N, Acc); _ -> info(?MODULE, "roster ~p not found", [Id]), - {error, roster_not_found} + {error, roster_not_found} end. objlist(Index, Roster) -> @@ -1279,7 +1283,7 @@ objlist([Object | _] = Objects, [H | _ ] when length(H) =< N -> Fun(H), Objs; - _ -> + _ -> Objs end; objlist([_Obj | TObjs], #'Roster'{id = _Id} = Roster, LastSync, N, Fun) -> @@ -1315,7 +1319,7 @@ build_object(Object, Acc, maybe_build_and_add_object(Object, Acc, Roster, Feed, LastUpd, LastSync) end. -maybe_build_and_add_object(_Object, Acc, _Roster, _Writer, LastUpd, LastSync) +maybe_build_and_add_object(_Object, Acc, _Roster, _Writer, LastUpd, LastSync) when LastUpd =< LastSync -> Acc; maybe_build_and_add_object(#'Contact'{} = Object, [HAcc | TAcc], Roster, Writer, _LastUpd, LastSync) -> @@ -1500,12 +1504,12 @@ roster(#'Roster'{} = Roster, N, LastSync) -> favorite = objlist(#'Roster'.favorite, Roster, LastSync, N) }; -roster(Id, N, LastSync) -> +roster(Id, N, LastSync) -> case kvs:get('Roster', Id) of {ok, Roster} -> roster(Roster, N, LastSync); _ -> - [] + [] end. sub_room(subscribe, #'Member'{status = removed}) -> []; @@ -1812,7 +1816,7 @@ presence(#'Contact'{phone_id = PhoneId} = C) -> info(?MODULE, "invalid contact: ~p", [PhoneId]), C end. get_data_val(Key, Data) -> - case get_data(Key, Data) of + case get_data(Key, Data) of [] -> []; #'Feature'{value = Val} -> Val @@ -1822,7 +1826,7 @@ get_data(Key, #'Desc'{data = Data}) when not is_record(Data, 'Desc') -> get_data(Key, Data) -> case lists:keyfind(Key, #'Feature'.key, Data) of false -> []; - F -> F + F -> F end. set_data(Key, Val, Data) -> case get_data(Key, Data) of diff --git a/apps/service/rebar.config b/apps/service/rebar.config index 3af62d09d982540eee7491d120627685fa701a14..f7def62b5f5dc25b4d987c0e5e5d64fe0fbfdbe6 100644 --- a/apps/service/rebar.config +++ b/apps/service/rebar.config @@ -1 +1,5 @@ -{deps,[{bert, ".*", {git, "git://github.com/synrc/bert",[]}}]}. \ No newline at end of file +%% -*- mode:erlang; erlang-indent-level:4; indent-tabs-mode: 4 -*- +{deps, + [ + {bert, ".*", {git, "git://github.com/erlang-cn/bert", {ref,"bbe248e"}}} + ]}. diff --git a/otp.mk b/otp.mk deleted file mode 100644 index 2b74dc0b770eea8de329f9747b101df8c5178ff4..0000000000000000000000000000000000000000 --- a/otp.mk +++ /dev/null @@ -1,33 +0,0 @@ -VM := vm.args -SYS := sys.config -ERL_ARGS := -args_file $(VM) -config $(SYS) -RUN_DIR ?= . -LOG_DIR ?= ./log -empty := -ROOTS := deps apps -space := $(empty) $(empty) -comma := $(empty),$(empty) -VSN := $(shell git rev-parse HEAD | head -c 6) -DATE := $(shell date "+%Y%m%d-%H%M%S") -ERL_LIBS := $(subst $(space),:,$(ROOTS)) - -clean: - rm -f .applist - mad $@ -compile: - mad $@ -.applist: - mad plan -$(RUN_DIR) $(LOG_DIR): - mkdir -p $(RUN_DIR) & mkdir -p $(LOG_DIR) -attach: - to_erl $(RUN_DIR)/ -console: .applist - ERL_LIBS=$(ERL_LIBS) erl +pc unicode $(ERL_ARGS) -eval '[application:ensure_started(A) || A <- $(shell cat .applist)]' -start: $(RUN_DIR) $(LOG_DIR) .applist - RUN_ERL_LOG_GENERATIONS=1000 RUN_ERL_LOG_MAXSIZE=20000000 \ - ERL_LIBS=$(ERL_LIBS) run_erl -daemon $(RUN_DIR)/ $(LOG_DIR)/ "exec $(MAKE) console" -stop: - @kill -9 $(shell ps ax -o pid= -o command=|grep $(RELEASE)|grep $(COOKIE)|awk '{print $$1}') - -.PHONY: compile clean console start diff --git a/priv/protobuf/service_auth/1compile.sh b/priv/protobuf/service_auth/1compile.sh deleted file mode 100755 index 6ad626dee21b25f4fa0b9b918f9631377fd75f88..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/1compile.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -protoc *.proto --java_out=java diff --git a/priv/protobuf/service_auth/Auth.proto b/priv/protobuf/service_auth/Auth.proto deleted file mode 100644 index f5c0b18ecc1ce9a535bbccc356df41f8165da1e0..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/Auth.proto +++ /dev/null @@ -1,30 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Auth.grpc"; -option java_outer_classname = "AuthCls"; -import public "authOs.proto"; -import public "Feature.proto"; -import public "authType.proto"; -import public "Service.proto"; - -message Auth { - string client_id = 1; - string dev_key = 2; - string user_id = 3; - string token = 4; - string data = 5; - authType type = 6; - int64 attempts = 7; - repeated Feature settings = 8; - repeated Service services = 9; - string push = 10; - authOs os = 11; - int64 created = 12; - int64 last_online = 13; -} diff --git a/priv/protobuf/service_auth/AuthError.proto b/priv/protobuf/service_auth/AuthError.proto deleted file mode 100644 index c75a62ed642c9674ff611ca1eb5e0887e805a646..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/AuthError.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "AuthError.grpc"; -option java_outer_classname = "AuthErrorCls"; -import public "Auth.proto"; -import public "authStatus.proto"; - -message AuthError { - repeated authStatus codes = 1; - Auth data = 2; -} diff --git a/priv/protobuf/service_auth/AuthService.proto b/priv/protobuf/service_auth/AuthService.proto deleted file mode 100644 index e5022911c823c2ef613d6a5c57f5266cf7467334..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/AuthService.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; -package service_auth; - -import "Auth.proto"; -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "AuthService.grpc"; -option java_outer_classname = "AuthServiceCls"; - -service AuthService { - rpc login (Auth) returns (Auth); - rpc resendSMS (Auth) returns (Auth); - rpc call (Auth) returns (Auth); - rpc confirm (Auth) returns (Auth); - rpc updatePushToken (Auth) returns (Auth); - rpc getSessions (Auth) returns (Auth); - rpc deleteSession (Auth) returns (Auth); - rpc deleteAllSessions (Auth) returns (Auth); -} diff --git a/priv/protobuf/service_auth/Desc.proto b/priv/protobuf/service_auth/Desc.proto deleted file mode 100644 index a1bdff122639882de16d2365361829b1f23827dc..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/Desc.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Desc.grpc"; -option java_outer_classname = "DescCls"; -import public "Feature.proto"; - -message Desc { - string id = 1; - string mime = 2; - string payload = 3; - string parentid = 4; - repeated Feature data = 5; -} diff --git a/priv/protobuf/service_auth/Feature.proto b/priv/protobuf/service_auth/Feature.proto deleted file mode 100644 index 44e5d5a25170e7dd0f9c778227de975185b59a61..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/Feature.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Feature.grpc"; -option java_outer_classname = "FeatureCls"; - -message Feature { - string id = 1; - string key = 2; - string value = 3; - string group = 4; -} diff --git a/priv/protobuf/service_auth/Service.proto b/priv/protobuf/service_auth/Service.proto deleted file mode 100644 index 5255c11383fad0751fad42cd288351aea27fd6ba..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/Service.proto +++ /dev/null @@ -1,22 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Service.grpc"; -option java_outer_classname = "ServiceCls"; -import public "Feature.proto"; -import public "serverType.proto"; -import public "serverStatus.proto"; - -message Service { - string id = 1; - string data = 2; - serverType type = 3; - repeated Feature setting = 4; - int64 expiration = 5; - serverStatus service_status = 6; -} diff --git a/priv/protobuf/service_auth/Tag.proto b/priv/protobuf/service_auth/Tag.proto deleted file mode 100644 index fb29d81cb4aea95a05444d71d1cd7e9419de1629..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/Tag.proto +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Tag.grpc"; -option java_outer_classname = "TagCls"; -import public "tagType.proto"; - -message Tag { - int64 roster_id = 1; - string name = 2; - string color = 3; - tagType tag_status = 4; -} diff --git a/priv/protobuf/service_auth/authOs.proto b/priv/protobuf/service_auth/authOs.proto deleted file mode 100644 index 4308091b1208cd3bf560d0cf6e99d940110c4fad..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/authOs.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "authOs.grpc"; -option java_outer_classname = "authOsCls"; - -enum authOs { - ios = 0; - android = 1; - web = 2; -} - diff --git a/priv/protobuf/service_auth/authStatus.proto b/priv/protobuf/service_auth/authStatus.proto deleted file mode 100644 index 241324b6bfe8c83a39916370f4ae5aa6e6ec79b5..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/authStatus.proto +++ /dev/null @@ -1,23 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "authStatus.grpc"; -option java_outer_classname = "authStatusCls"; - -enum authStatus { - invalid_version = 0; - mismatch_user_data = 1; - number_not_allowed = 2; - session_not_found = 3; - attempts_expired = 4; - invalid_sms_code = 5; - invalid_jwt_code = 6; - permission_denied = 7; - invalid_data = 8; -} - diff --git a/priv/protobuf/service_auth/authType.proto b/priv/protobuf/service_auth/authType.proto deleted file mode 100644 index 0dbed28f069f7bd7c5bf9fbee8e348af63cca828..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/authType.proto +++ /dev/null @@ -1,26 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "authType.grpc"; -option java_outer_classname = "authTypeCls"; - -enum authType { - google_auth = 0; - facebook_auth = 1; - mobile_auth = 2; - email_auth = 3; - voice = 4; - resend = 5; - verify = 6; - push = 7; - logout = 8; - get = 9; - delete = 10; - clear = 11; -} - diff --git a/priv/protobuf/service_auth/presence.proto b/priv/protobuf/service_auth/presence.proto deleted file mode 100644 index 00f79c3f14b24783674e06115917a035e3410fe9..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/presence.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "presence.grpc"; -option java_outer_classname = "presenceCls"; - -enum presence { - online = 0; - offline = 1; -} - diff --git a/priv/protobuf/service_auth/serverStatus.proto b/priv/protobuf/service_auth/serverStatus.proto deleted file mode 100644 index 97d7dd002854abc3904040d78c3a5bc9e9c58a00..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/serverStatus.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverStatus.grpc"; -option java_outer_classname = "serverStatusCls"; - -enum serverStatus { - servie_verified = 0; - service_not_verified = 1; -} - diff --git a/priv/protobuf/service_auth/serverType.proto b/priv/protobuf/service_auth/serverType.proto deleted file mode 100644 index 56279a32238e9ae7b34a68269defae2d99553080..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/serverType.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverType.grpc"; -option java_outer_classname = "serverTypeCls"; - -enum serverType { - email = 0; - wallet = 1; - google_type = 2; - fb = 3; - phone = 4; -} - diff --git a/priv/protobuf/service_auth/tagType.proto b/priv/protobuf/service_auth/tagType.proto deleted file mode 100644 index 18503cdcac81525aa4dd9345f0f0bec4ee577e8e..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_auth/tagType.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_auth; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "tagType.grpc"; -option java_outer_classname = "tagTypeCls"; - -enum tagType { - tag_create = 0; - tag_remove = 1; - tag_edit = 2; -} - diff --git a/priv/protobuf/service_friend/1compile.sh b/priv/protobuf/service_friend/1compile.sh deleted file mode 100755 index 6ad626dee21b25f4fa0b9b918f9631377fd75f88..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/1compile.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -protoc *.proto --java_out=java diff --git a/priv/protobuf/service_friend/Desc.proto b/priv/protobuf/service_friend/Desc.proto deleted file mode 100644 index cfc8b92b45579fc7ec7572b847c4cc8eb984ef3e..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/Desc.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_friend; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Desc.grpc"; -option java_outer_classname = "DescCls"; -import public "Feature.proto"; - -message Desc { - string id = 1; - string mime = 2; - string payload = 3; - string parentid = 4; - repeated Feature data = 5; -} diff --git a/priv/protobuf/service_friend/Feature.proto b/priv/protobuf/service_friend/Feature.proto deleted file mode 100644 index 21240771b56a93cd866c61e8229d5eaf0c5febc4..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/Feature.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_friend; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Feature.grpc"; -option java_outer_classname = "FeatureCls"; - -message Feature { - string id = 1; - string key = 2; - string value = 3; - string group = 4; -} diff --git a/priv/protobuf/service_friend/FriendService.proto b/priv/protobuf/service_friend/FriendService.proto deleted file mode 100644 index 8af2e80293cd9d2075003dc07d08493a3e71aa88..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/FriendService.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; -package service_friend; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "FriendService.grpc"; -option java_outer_classname = "FriendServiceCls"; -import public "Friend.proto"; -import public "Contact.proto"; - -service FriendService { - rpc banUser(Friend) returns (Contact); - rpc unbanContact(Friend) returns (Contact); - rpc friendRequest(Friend) returns (Contact); - rpc confirmFrienship(Friend) returns (Contact); - rpc muteContact(Friend) returns (Contact); - rpc unmuteContact(Friend) returns (Contact); - rpc ignoreRequest(Friend) returns (Contact); -} \ No newline at end of file diff --git a/priv/protobuf/service_friend/Service.proto b/priv/protobuf/service_friend/Service.proto deleted file mode 100644 index fa6c1583279207312a127499c6a9ab9a14896fc7..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/Service.proto +++ /dev/null @@ -1,22 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_friend; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Service.grpc"; -option java_outer_classname = "ServiceCls"; -import public "Feature.proto"; -import public "serverType.proto"; -import public "serverStatus.proto"; - -message Service { - string id = 1; - string data = 2; - serverType type = 3; - repeated Feature setting = 4; - int64 expiration = 5; - serverStatus service_status = 6; -} diff --git a/priv/protobuf/service_friend/Tag.proto b/priv/protobuf/service_friend/Tag.proto deleted file mode 100644 index 0bf0dea199c090e36023ba8dd3eaeae432bff754..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/Tag.proto +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_friend; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Tag.grpc"; -option java_outer_classname = "TagCls"; -import public "tagType.proto"; - -message Tag { - int64 roster_id = 1; - string name = 2; - string color = 3; - tagType tag_status = 4; -} diff --git a/priv/protobuf/service_friend/presence.proto b/priv/protobuf/service_friend/presence.proto deleted file mode 100644 index a340e10d6a903ab1b8212b4b99d777c61c697029..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/presence.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_friend; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "presence.grpc"; -option java_outer_classname = "presenceCls"; - -enum presence { - online = 0; - offline = 1; -} - diff --git a/priv/protobuf/service_friend/serverStatus.proto b/priv/protobuf/service_friend/serverStatus.proto deleted file mode 100644 index 837e7ce36722e7f4d149d9151de6cc2e7c0b5219..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/serverStatus.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_friend; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverStatus.grpc"; -option java_outer_classname = "serverStatusCls"; - -enum serverStatus { - servie_verified = 0; - service_not_verified = 1; -} - diff --git a/priv/protobuf/service_friend/serverType.proto b/priv/protobuf/service_friend/serverType.proto deleted file mode 100644 index eccfaae8a537cd46934708252dc7152a7b6349f9..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/serverType.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_friend; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverType.grpc"; -option java_outer_classname = "serverTypeCls"; - -enum serverType { - email = 0; - wallet = 1; - google_type = 2; - fb = 3; - phone = 4; -} - diff --git a/priv/protobuf/service_friend/tagType.proto b/priv/protobuf/service_friend/tagType.proto deleted file mode 100644 index 05a0f94a92505082f9284fb0dfc54891fd2205b6..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_friend/tagType.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_friend; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "tagType.grpc"; -option java_outer_classname = "tagTypeCls"; - -enum tagType { - tag_create = 0; - tag_remove = 1; - tag_edit = 2; -} - diff --git a/priv/protobuf/service_message/1compile.sh b/priv/protobuf/service_message/1compile.sh deleted file mode 100755 index 6ad626dee21b25f4fa0b9b918f9631377fd75f88..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/1compile.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -protoc *.proto --java_out=java diff --git a/priv/protobuf/service_message/Desc.proto b/priv/protobuf/service_message/Desc.proto deleted file mode 100644 index 08869717e1da6dc410f2c897ef46978c0a6cf8e6..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/Desc.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Desc.grpc"; -option java_outer_classname = "DescCls"; -import public "Feature.proto"; - -message Desc { - string id = 1; - string mime = 2; - string payload = 3; - string parentid = 4; - repeated Feature data = 5; -} diff --git a/priv/protobuf/service_message/Feature.proto b/priv/protobuf/service_message/Feature.proto deleted file mode 100644 index c525cc9148869e2e972e7383845d2f915f531222..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/Feature.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Feature.grpc"; -option java_outer_classname = "FeatureCls"; - -message Feature { - string id = 1; - string key = 2; - string value = 3; - string group = 4; -} diff --git a/priv/protobuf/service_message/History.proto b/priv/protobuf/service_message/History.proto deleted file mode 100644 index 9ec7743622212e77f87beff198fedfc2e48e2387..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/History.proto +++ /dev/null @@ -1,25 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "History.grpc"; -option java_outer_classname = "HistoryCls"; -import public "muc.proto"; -import public "p2p.proto"; -import public "historyType.proto"; - -message History { - string roster_id = 1; - oneof feed { - p2p feed20 = 20; - muc feed21 = 21; - } - int64 size = 3; - int64 entity_id = 4; - int64 data = 5; - historyType status = 6; -} diff --git a/priv/protobuf/service_message/Job.proto b/priv/protobuf/service_message/Job.proto deleted file mode 100644 index 0b9faf28ad69b5eac4a34ec4b869d51efbd234c0..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/Job.proto +++ /dev/null @@ -1,34 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Job.grpc"; -option java_outer_classname = "JobCls"; -import public "act.proto"; -import public "jobType.proto"; -import public "Feature.proto"; -import public "Message.proto"; -import public "messageEvent.proto"; -import public "container.proto"; - -message Job { - int64 id = 1; - container container = 2; - act feed_id = 3; - int64 prev = 4; - int64 next = 5; - oneof context { - int64 context60 = 60; - string context61 = 61; - } - int64 proc = 7; - int64 time = 8; - repeated Message data = 9; - repeated messageEvent events = 10; - repeated Feature settings = 11; - jobType status = 12; -} diff --git a/priv/protobuf/service_message/Message.proto b/priv/protobuf/service_message/Message.proto deleted file mode 100644 index 838663d199308c44a6966bd3daf582877143e87f..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/Message.proto +++ /dev/null @@ -1,42 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -import "google/protobuf/Any.proto"; -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Message.grpc"; -option java_outer_classname = "MessageCls"; -import public "messageType.proto"; -import public "messageStatus.proto"; -import public "muc.proto"; -import public "p2p.proto"; -import public "Desc.proto"; -import public "container.proto"; - -message Message { - int64 id = 1; - container container = 2; - oneof feed_id { - muc feed_id30 = 30; - p2p feed_id31 = 31; - } - int64 prev = 4; - int64 next = 5; - string msg_id = 6; - string from = 7; - string to = 8; - int64 created = 9; - repeated Desc files = 10; - messageType type = 11; - oneof link { - int64 link120 = 120; - Message link121 = 121; - } - repeated google.protobuf.Any seenby = 13; - repeated int64 repliedby = 14; - repeated int64 mentioned = 15; - messageStatus mstatus = 16; -} diff --git a/priv/protobuf/service_message/MessageService.proto b/priv/protobuf/service_message/MessageService.proto deleted file mode 100644 index 2663f92a57d3394a2348e01160c70a8d103e1369..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/MessageService.proto +++ /dev/null @@ -1,39 +0,0 @@ -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "MessageService.grpc"; -option java_outer_classname = "MessageServiceCls"; -import public "Message.proto"; -import public "History.proto"; -import public "Job.proto"; - -service MessageService { - //Message - rpc sendMessage(Message) returns (Message); - rpc delete(Message) returns (Message); - rpc deleteForAll(Message) returns (Message); - rpc replyMessage(Message) returns (Message); - rpc editMessage(Message) returns (Message); - rpc updateMessage(Message) returns (Message); - rpc translateMessage(Message) returns (Message); - rpc trancribeMessage(Message) returns (Message); - - //Job - rpc forwardMessage(Job) returns (Job); - rpc createScheduledMessage(Job) returns (Job); - rpc deleteScheduledMessage(Job) returns (Job); - rpc editScheduledMessage(Job) returns (Job); - - //History - rpc getMessage(History) returns (History); - rpc getMessagesToEndFromMessageId(History) returns (History); - rpc getAllMessages(History) returns (History); - rpc readMessage(History) returns (History); - rpc clearMessageHistory(History) returns (History); - rpc getMessageByType(History) returns (History); - rpc getMessageByTypeWithPagination(History) returns (History); - rpc getRepliedMessages(History) returns (History); - rpc getMessagesBetweenIds(History) returns (History); -} \ No newline at end of file diff --git a/priv/protobuf/service_message/Service.proto b/priv/protobuf/service_message/Service.proto deleted file mode 100644 index fd98188cc7be5d125995a0b2e392b519a4d3b882..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/Service.proto +++ /dev/null @@ -1,22 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Service.grpc"; -option java_outer_classname = "ServiceCls"; -import public "Feature.proto"; -import public "serverType.proto"; -import public "serverStatus.proto"; - -message Service { - string id = 1; - string data = 2; - serverType type = 3; - repeated Feature setting = 4; - int64 expiration = 5; - serverStatus service_status = 6; -} diff --git a/priv/protobuf/service_message/Tag.proto b/priv/protobuf/service_message/Tag.proto deleted file mode 100644 index 9a1632c0de26e45ecd7114e468b20d90054a0aea..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/Tag.proto +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Tag.grpc"; -option java_outer_classname = "TagCls"; -import public "tagType.proto"; - -message Tag { - int64 roster_id = 1; - string name = 2; - string color = 3; - tagType tag_status = 4; -} diff --git a/priv/protobuf/service_message/act.proto b/priv/protobuf/service_message/act.proto deleted file mode 100644 index bbeec857a6062d34b966211d79f9bf6cc7f45ce5..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/act.proto +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "act.grpc"; -option java_outer_classname = "actCls"; - -message act { - string name = 1; - oneof data { - string data20 = 20; - int64 data21 = 21; - } -} diff --git a/priv/protobuf/service_message/container.proto b/priv/protobuf/service_message/container.proto deleted file mode 100644 index 3012039d1edb6c9ce5098fc83143936696900912..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/container.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "container.grpc"; -option java_outer_classname = "containerCls"; - -enum container { - chain = 0; - cur = 1; -} - diff --git a/priv/protobuf/service_message/historyType.proto b/priv/protobuf/service_message/historyType.proto deleted file mode 100644 index e9a7eebdbf952e7a17d7d1aac53aa29bbfaac378..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/historyType.proto +++ /dev/null @@ -1,20 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "historyType.grpc"; -option java_outer_classname = "historyTypeCls"; - -enum historyType { - hupdated = 0; - hget = 1; - hupdate = 2; - hlast_loaded = 3; - hlast_msg = 4; - hget_reply = 5; -} - diff --git a/priv/protobuf/service_message/jobType.proto b/priv/protobuf/service_message/jobType.proto deleted file mode 100644 index c64277dc63f1f63d2ad892fc9a3e1378595a1170..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/jobType.proto +++ /dev/null @@ -1,20 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "jobType.grpc"; -option java_outer_classname = "jobTypeCls"; - -enum jobType { - jinit = 0; - jupdate = 1; - jdelete = 2; - jpending = 3; - jstop = 4; - jcomplete = 5; -} - diff --git a/priv/protobuf/service_message/messageEvent.proto b/priv/protobuf/service_message/messageEvent.proto deleted file mode 100644 index 72715dd79e30d0e2ca85dd30115592c0c77bf63b..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/messageEvent.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "messageEvent.grpc"; -option java_outer_classname = "messageEventCls"; - -message messageEvent { - string name = 1; - string payload = 2; - int64 timeout = 3; - string module = 4; -} diff --git a/priv/protobuf/service_message/messageStatus.proto b/priv/protobuf/service_message/messageStatus.proto deleted file mode 100644 index b514a8a72708b351b1aa00604f15bdee1ca8c475..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/messageStatus.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "messageStatus.grpc"; -option java_outer_classname = "messageStatusCls"; - -enum messageStatus { - masync = 0; - mdelete = 1; - mclear = 2; - mupdate = 3; - medit = 4; -} - diff --git a/priv/protobuf/service_message/messageType.proto b/priv/protobuf/service_message/messageType.proto deleted file mode 100644 index 5f38169131c0ff79eb9d795399262ad1c61291d9..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/messageType.proto +++ /dev/null @@ -1,20 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "messageType.grpc"; -option java_outer_classname = "messageTypeCls"; - -enum messageType { - sys = 0; - reply = 1; - forward = 2; - read = 3; - edited = 4; - cursor = 5; -} - diff --git a/priv/protobuf/service_message/muc.proto b/priv/protobuf/service_message/muc.proto deleted file mode 100644 index 8eb84eb4f0b68c7a58c269f215f2368d7c954896..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/muc.proto +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "muc.grpc"; -option java_outer_classname = "mucCls"; - -message muc { - string name = 1; -} diff --git a/priv/protobuf/service_message/p2p.proto b/priv/protobuf/service_message/p2p.proto deleted file mode 100644 index 3290d952615c1f2286bb6053b11172fa81b5943f..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/p2p.proto +++ /dev/null @@ -1,15 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "p2p.grpc"; -option java_outer_classname = "p2pCls"; - -message p2p { - string from = 1; - string to = 2; -} diff --git a/priv/protobuf/service_message/presence.proto b/priv/protobuf/service_message/presence.proto deleted file mode 100644 index 0b33ae3cc4fa1ae3b83aac2d041653e2f4d83306..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/presence.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "presence.grpc"; -option java_outer_classname = "presenceCls"; - -enum presence { - online = 0; - offline = 1; -} - diff --git a/priv/protobuf/service_message/serverStatus.proto b/priv/protobuf/service_message/serverStatus.proto deleted file mode 100644 index 41e3eeac5f149c3de2e8d3adfb543d0b2b75894e..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/serverStatus.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverStatus.grpc"; -option java_outer_classname = "serverStatusCls"; - -enum serverStatus { - servie_verified = 0; - service_not_verified = 1; -} - diff --git a/priv/protobuf/service_message/serverType.proto b/priv/protobuf/service_message/serverType.proto deleted file mode 100644 index afa4a3716aaf865eaf24b1241f35a945d7eadaca..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/serverType.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverType.grpc"; -option java_outer_classname = "serverTypeCls"; - -enum serverType { - email = 0; - wallet = 1; - google_type = 2; - fb = 3; - phone = 4; -} - diff --git a/priv/protobuf/service_message/tagType.proto b/priv/protobuf/service_message/tagType.proto deleted file mode 100644 index f21e09717a572d79caee5933d6731fcfbc5f43e8..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_message/tagType.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_message; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "tagType.grpc"; -option java_outer_classname = "tagTypeCls"; - -enum tagType { - tag_create = 0; - tag_remove = 1; - tag_edit = 2; -} - diff --git a/priv/protobuf/service_profile/1compile.sh b/priv/protobuf/service_profile/1compile.sh deleted file mode 100755 index 6ad626dee21b25f4fa0b9b918f9631377fd75f88..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/1compile.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -protoc *.proto --java_out=java diff --git a/priv/protobuf/service_profile/Desc.proto b/priv/protobuf/service_profile/Desc.proto deleted file mode 100644 index 9a5a2dd166166bd8cc75b78d3b673fc6b454fd92..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/Desc.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Desc.grpc"; -option java_outer_classname = "DescCls"; -import public "Feature.proto"; - -message Desc { - string id = 1; - string mime = 2; - string payload = 3; - string parentid = 4; - repeated Feature data = 5; -} diff --git a/priv/protobuf/service_profile/Feature.proto b/priv/protobuf/service_profile/Feature.proto deleted file mode 100644 index 64e1725871b5a1ad01018c1343521fbc56f1d608..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/Feature.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Feature.grpc"; -option java_outer_classname = "FeatureCls"; - -message Feature { - string id = 1; - string key = 2; - string value = 3; - string group = 4; -} diff --git a/priv/protobuf/service_profile/Profile.proto b/priv/protobuf/service_profile/Profile.proto deleted file mode 100644 index db8e1b3d233548f4adb1942ad1131edce8d6793b..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/Profile.proto +++ /dev/null @@ -1,25 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Profile.grpc"; -option java_outer_classname = "ProfileCls"; -import public "Feature.proto"; -import public "profileStatus.proto"; -import public "presence.proto"; -import public "Service.proto"; - -message Profile { - string phone = 1; - repeated Service services = 2; - repeated int64 rosters = 3; - repeated Feature settings = 4; - int64 update = 5; - int64 balance = 6; - presence presence = 7; - profileStatus profileStatus = 8; -} diff --git a/priv/protobuf/service_profile/ProfileService.proto b/priv/protobuf/service_profile/ProfileService.proto deleted file mode 100644 index 64dab5f5bb7bed7414ace485b13f6d79abdb026b..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/ProfileService.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "ProfileService.grpc"; -option java_outer_classname = "ProfileServiceCls"; -import public "Profile.proto"; - -service FriendService { - rpc getProfile(Profile) returns (Profile); - rpc deleteProfile(Profile) returns (Profile); -} \ No newline at end of file diff --git a/priv/protobuf/service_profile/Service.proto b/priv/protobuf/service_profile/Service.proto deleted file mode 100644 index d3af3a6ee25ff6fb7e1487a132371178c04525fc..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/Service.proto +++ /dev/null @@ -1,22 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Service.grpc"; -option java_outer_classname = "ServiceCls"; -import public "Feature.proto"; -import public "serverType.proto"; -import public "serverStatus.proto"; - -message Service { - string id = 1; - string data = 2; - serverType type = 3; - repeated Feature setting = 4; - int64 expiration = 5; - serverStatus service_status = 6; -} diff --git a/priv/protobuf/service_profile/Tag.proto b/priv/protobuf/service_profile/Tag.proto deleted file mode 100644 index db4d5d5b4198c748ca798bac521a4aeb5afe9918..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/Tag.proto +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Tag.grpc"; -option java_outer_classname = "TagCls"; -import public "tagType.proto"; - -message Tag { - int64 roster_id = 1; - string name = 2; - string color = 3; - tagType tag_status = 4; -} diff --git a/priv/protobuf/service_profile/presence.proto b/priv/protobuf/service_profile/presence.proto deleted file mode 100644 index f37d175ce43b465495fedd5f147c8d6594e1eed0..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/presence.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "presence.grpc"; -option java_outer_classname = "presenceCls"; - -enum presence { - online = 0; - offline = 1; -} - diff --git a/priv/protobuf/service_profile/profileStatus.proto b/priv/protobuf/service_profile/profileStatus.proto deleted file mode 100644 index 44277b57cb56553088551c39fc443c206352e7cd..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/profileStatus.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "profileStatus.grpc"; -option java_outer_classname = "profileStatusCls"; - -enum profileStatus { - remove_profile = 0; - get_profile = 1; - patch_profile = 2; -} - diff --git a/priv/protobuf/service_profile/serverStatus.proto b/priv/protobuf/service_profile/serverStatus.proto deleted file mode 100644 index 1883e26bcadb3ff4d6af50a51fada0f85131b11b..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/serverStatus.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverStatus.grpc"; -option java_outer_classname = "serverStatusCls"; - -enum serverStatus { - servie_verified = 0; - service_not_verified = 1; -} - diff --git a/priv/protobuf/service_profile/serverType.proto b/priv/protobuf/service_profile/serverType.proto deleted file mode 100644 index af48113f40d7fe3996486c58dab53fb2270e36ed..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/serverType.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverType.grpc"; -option java_outer_classname = "serverTypeCls"; - -enum serverType { - email = 0; - wallet = 1; - google_type = 2; - fb = 3; - phone = 4; -} - diff --git a/priv/protobuf/service_profile/tagType.proto b/priv/protobuf/service_profile/tagType.proto deleted file mode 100644 index e7673153547d894925b862651330c2e887d9e37f..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_profile/tagType.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_profile; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "tagType.grpc"; -option java_outer_classname = "tagTypeCls"; - -enum tagType { - tag_create = 0; - tag_remove = 1; - tag_edit = 2; -} - diff --git a/priv/protobuf/service_room/1compile.sh b/priv/protobuf/service_room/1compile.sh deleted file mode 100755 index 6ad626dee21b25f4fa0b9b918f9631377fd75f88..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/1compile.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -protoc *.proto --java_out=java diff --git a/priv/protobuf/service_room/Desc.proto b/priv/protobuf/service_room/Desc.proto deleted file mode 100644 index e9a4db9b74f83347aab34670ddca9f9eaed8017b..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/Desc.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Desc.grpc"; -option java_outer_classname = "DescCls"; -import public "Feature.proto"; - -message Desc { - string id = 1; - string mime = 2; - string payload = 3; - string parentid = 4; - repeated Feature data = 5; -} diff --git a/priv/protobuf/service_room/Feature.proto b/priv/protobuf/service_room/Feature.proto deleted file mode 100644 index 2de076cb5d05aa33adb8684bcffda5b71e7ef28a..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/Feature.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Feature.grpc"; -option java_outer_classname = "FeatureCls"; - -message Feature { - string id = 1; - string key = 2; - string value = 3; - string group = 4; -} diff --git a/priv/protobuf/service_room/Link.proto b/priv/protobuf/service_room/Link.proto deleted file mode 100644 index a3cf002d4507f96e4b4bc9bec4f9773b354fabf1..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/Link.proto +++ /dev/null @@ -1,21 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Link.grpc"; -option java_outer_classname = "LinkCls"; - -message Link { - string id = 1; - string name = 2; - string room_id = 3; - int64 created = 4; - oneof type { - } - oneof status { - } -} diff --git a/priv/protobuf/service_room/Member.proto b/priv/protobuf/service_room/Member.proto deleted file mode 100644 index fa750d3ba8e902f87262133e69f543c46618ab61..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/Member.proto +++ /dev/null @@ -1,41 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -import "google/protobuf/Any.proto"; -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Member.grpc"; -option java_outer_classname = "MemberCls"; -import public "Feature.proto"; -import public "presence.proto"; -import public "muc.proto"; -import public "p2p.proto"; -import public "memberStatus.proto"; -import public "Service.proto"; -import public "container.proto"; - -message Member { - int64 id = 1; - container container = 2; - oneof feed_id { - muc feed_id30 = 30; - p2p feed_id31 = 31; - } - int64 prev = 4; - int64 next = 5; - repeated google.protobuf.Any feeds = 6; - string phone_id = 7; - string avatar = 8; - string names = 9; - string surnames = 10; - string alias = 11; - int64 reader = 12; - int64 update = 13; - repeated Feature settings = 14; - repeated Service services = 15; - presence presence = 16; - memberStatus member_status = 17; -} diff --git a/priv/protobuf/service_room/Room.proto b/priv/protobuf/service_room/Room.proto deleted file mode 100644 index 13d1f556a2853b23fdd041862cb6917accca0740..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/Room.proto +++ /dev/null @@ -1,40 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Room.grpc"; -option java_outer_classname = "RoomCls"; -import public "Member.proto"; -import public "Feature.proto"; -import public "Message.proto"; -import public "Desc.proto"; - -message Room { - string id = 1; - string name = 2; - string links = 3; - string description = 4; - repeated Feature settings = 5; - repeated Member members = 6; - repeated Member admins = 7; - repeated Desc data = 8; - oneof type { - } - string tos = 10; - int64 tos_update = 11; - int64 unread = 12; - repeated int64 mentions = 13; - repeated int64 readers = 14; - oneof last_msg { - int64 last_msg150 = 150; - Message last_msg151 = 151; - } - int64 update = 16; - int64 created = 17; - oneof status { - } -} diff --git a/priv/protobuf/service_room/RoomService.proto b/priv/protobuf/service_room/RoomService.proto deleted file mode 100644 index 034e92c38f7b1de6c52e5b39ceedad72167f1b04..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/RoomService.proto +++ /dev/null @@ -1,23 +0,0 @@ -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "RoomService.grpc"; -option java_outer_classname = "RoomServiceCls"; -import public "Room.proto"; -import public "Member.proto"; - -service RoomService { - rpc createRoom(Room) returns (Room); - rpc leaveRoom(Room) returns (Room); - rpc kickFromRoom(Room) returns (Room); - rpc updatemRoom(Room) returns (Room); - rpc addUserToRoom(Room) returns (Room); - rpc changeUserRoleInRoom(Room) returns (Room); - rpc getRoomMembers(Room) returns (Room); - rpc clearRoomHistory(Room) returns (Room); - rpc muteRoom(Member) returns (Member); - rpc unmuteRoom(Member) returns (Member); - rpc updateMemberDetails(Member) returns (Member); -} \ No newline at end of file diff --git a/priv/protobuf/service_room/Service.proto b/priv/protobuf/service_room/Service.proto deleted file mode 100644 index 596afa5735d66b3a6f8aa3009ed201821af995c5..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/Service.proto +++ /dev/null @@ -1,22 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Service.grpc"; -option java_outer_classname = "ServiceCls"; -import public "Feature.proto"; -import public "serverType.proto"; -import public "serverStatus.proto"; - -message Service { - string id = 1; - string data = 2; - serverType type = 3; - repeated Feature setting = 4; - int64 expiration = 5; - serverStatus service_status = 6; -} diff --git a/priv/protobuf/service_room/Tag.proto b/priv/protobuf/service_room/Tag.proto deleted file mode 100644 index e2d1b28d2f59fa50b598c111781af2bd5c855afa..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/Tag.proto +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Tag.grpc"; -option java_outer_classname = "TagCls"; -import public "tagType.proto"; - -message Tag { - int64 roster_id = 1; - string name = 2; - string color = 3; - tagType tag_status = 4; -} diff --git a/priv/protobuf/service_room/container.proto b/priv/protobuf/service_room/container.proto deleted file mode 100644 index 917329a001dc795736917f2a83318a846c92b0a0..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/container.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "container.grpc"; -option java_outer_classname = "containerCls"; - -enum container { - chain = 0; - cur = 1; -} - diff --git a/priv/protobuf/service_room/linkStatus.proto b/priv/protobuf/service_room/linkStatus.proto deleted file mode 100644 index 1ff436f8b7cc12476bbee9b61013d146eb310a6e..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/linkStatus.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "linkStatus.grpc"; -option java_outer_classname = "linkStatusCls"; - -enum linkStatus { - lgen = 0; - lcheck = 1; - ladd = 2; - ldelete = 3; - lupdate = 4; -} - diff --git a/priv/protobuf/service_room/memberStatus.proto b/priv/protobuf/service_room/memberStatus.proto deleted file mode 100644 index 34bee9bab1e829d093d204aa6d228ad6b7030e16..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/memberStatus.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "memberStatus.grpc"; -option java_outer_classname = "memberStatusCls"; - -enum memberStatus { - admin = 0; - member = 1; - removed = 2; - patch = 3; - owner = 4; -} - diff --git a/priv/protobuf/service_room/muc.proto b/priv/protobuf/service_room/muc.proto deleted file mode 100644 index 57ddef8afd34c4bac4fbe95eb665189b4acecd64..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/muc.proto +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "muc.grpc"; -option java_outer_classname = "mucCls"; - -message muc { - string name = 1; -} diff --git a/priv/protobuf/service_room/p2p.proto b/priv/protobuf/service_room/p2p.proto deleted file mode 100644 index e0d183961c5592bde7c90b761c88bc723657d7b8..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/p2p.proto +++ /dev/null @@ -1,15 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "p2p.grpc"; -option java_outer_classname = "p2pCls"; - -message p2p { - string from = 1; - string to = 2; -} diff --git a/priv/protobuf/service_room/presence.proto b/priv/protobuf/service_room/presence.proto deleted file mode 100644 index bb9958e1c220bc8359b1bc504a478ae785d2330a..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/presence.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "presence.grpc"; -option java_outer_classname = "presenceCls"; - -enum presence { - online = 0; - offline = 1; -} - diff --git a/priv/protobuf/service_room/roomStatus.proto b/priv/protobuf/service_room/roomStatus.proto deleted file mode 100644 index d6c14cfdefc7abea14e4b0934d48b5b4c3df184e..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/roomStatus.proto +++ /dev/null @@ -1,22 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "roomStatus.grpc"; -option java_outer_classname = "roomStatusCls"; - -enum roomStatus { - room_create = 0; - room_leave = 1; - room_add = 2; - room_remove = 3; - room_patch = 4; - room_get = 5; - room_delete = 6; - room_last_msg = 7; -} - diff --git a/priv/protobuf/service_room/roomType.proto b/priv/protobuf/service_room/roomType.proto deleted file mode 100644 index 1ce70af7b7bc0aaa2f9e1d0e679bff39eda61df1..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/roomType.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "roomType.grpc"; -option java_outer_classname = "roomTypeCls"; - -enum roomType { - group = 0; - channel = 1; -} - diff --git a/priv/protobuf/service_room/serverStatus.proto b/priv/protobuf/service_room/serverStatus.proto deleted file mode 100644 index 045d8ed0e6398ae96a789eb4be7fe94a18eea87b..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/serverStatus.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverStatus.grpc"; -option java_outer_classname = "serverStatusCls"; - -enum serverStatus { - servie_verified = 0; - service_not_verified = 1; -} - diff --git a/priv/protobuf/service_room/serverType.proto b/priv/protobuf/service_room/serverType.proto deleted file mode 100644 index eeefc6b5cf0c7636f541b841362890e13bdc18a4..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/serverType.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverType.grpc"; -option java_outer_classname = "serverTypeCls"; - -enum serverType { - email = 0; - wallet = 1; - google_type = 2; - fb = 3; - phone = 4; -} - diff --git a/priv/protobuf/service_room/tagType.proto b/priv/protobuf/service_room/tagType.proto deleted file mode 100644 index c0f05076e5560cb938673108fc12ea211649a296..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_room/tagType.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_room; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "tagType.grpc"; -option java_outer_classname = "tagTypeCls"; - -enum tagType { - tag_create = 0; - tag_remove = 1; - tag_edit = 2; -} - diff --git a/priv/protobuf/service_roster/1compile.sh b/priv/protobuf/service_roster/1compile.sh deleted file mode 100755 index 6ad626dee21b25f4fa0b9b918f9631377fd75f88..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/1compile.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -protoc *.proto --java_out=java diff --git a/priv/protobuf/service_roster/Contact.proto b/priv/protobuf/service_roster/Contact.proto deleted file mode 100644 index 8fcb3eec68396638ffd6bec97b6d78ec62432370..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/Contact.proto +++ /dev/null @@ -1,32 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -import "google/protobuf/Any.proto"; -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Contact.grpc"; -option java_outer_classname = "ContactCls"; -import public "Feature.proto"; -import public "contactStatus.proto"; -import public "presence.proto"; -import public "Service.proto"; - -message Contact { - string user_id = 1; - repeated int64 avatar = 2; - string names = 3; - string surnames = 4; - string nick = 5; - repeated google.protobuf.Any reader = 6; - int64 unread = 7; - int64 last_msg = 8; - int64 update = 9; - int64 created = 10; - repeated Feature settings = 11; - repeated Service services = 12; - presence presence = 13; - contactStatus status = 14; -} diff --git a/priv/protobuf/service_roster/Desc.proto b/priv/protobuf/service_roster/Desc.proto deleted file mode 100644 index 99c421db4a2cc404394a5ca6f59c76a9ff1968d8..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/Desc.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Desc.grpc"; -option java_outer_classname = "DescCls"; -import public "Feature.proto"; - -message Desc { - string id = 1; - string mime = 2; - string payload = 3; - string parentid = 4; - repeated Feature data = 5; -} diff --git a/priv/protobuf/service_roster/Feature.proto b/priv/protobuf/service_roster/Feature.proto deleted file mode 100644 index 3859dcf675244820ed48253043efa88c789b12ca..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/Feature.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Feature.grpc"; -option java_outer_classname = "FeatureCls"; - -message Feature { - string id = 1; - string key = 2; - string value = 3; - string group = 4; -} diff --git a/priv/protobuf/service_roster/Roster.proto b/priv/protobuf/service_roster/Roster.proto deleted file mode 100644 index 956afea8e247d9b5f5918227e60199e76cc2b77e..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/Roster.proto +++ /dev/null @@ -1,28 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Roster.grpc"; -option java_outer_classname = "RosterCls"; -import public "Contact.proto"; -import public "rosterStatus.proto"; - -message Roster { - int64 id = 1; - string names = 2; - string surnames = 3; - string email = 4; - string nick = 5; - repeated Contact userlist = 6; - repeated int64 roomlist = 7; - repeated int64 favorite = 8; - repeated int64 tags = 9; - string phone = 10; - string avatar = 11; - int64 update = 12; - rosterStatus rosterStatus = 13; -} diff --git a/priv/protobuf/service_roster/RosterService.proto b/priv/protobuf/service_roster/RosterService.proto deleted file mode 100644 index abf822cc920a3757c7a074fcfd3c87f96a439345..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/RosterService.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "RosterService.grpc"; -option java_outer_classname = "RosterServiceCls"; -import public "Roster.proto"; -import public "Contact.proto"; - -service RosterService { - rpc update(Roster) returns (Roster); - rpc updateNick(Roster) returns (Roster); -} \ No newline at end of file diff --git a/priv/protobuf/service_roster/Service.proto b/priv/protobuf/service_roster/Service.proto deleted file mode 100644 index 180788cd3120cf232a2ae3d76bfd8b31d2512d8c..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/Service.proto +++ /dev/null @@ -1,22 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Service.grpc"; -option java_outer_classname = "ServiceCls"; -import public "Feature.proto"; -import public "serverType.proto"; -import public "serverStatus.proto"; - -message Service { - string id = 1; - string data = 2; - serverType type = 3; - repeated Feature setting = 4; - int64 expiration = 5; - serverStatus service_status = 6; -} diff --git a/priv/protobuf/service_roster/Tag.proto b/priv/protobuf/service_roster/Tag.proto deleted file mode 100644 index 8fc287a05eaaad8fd0c198be1a9957ddd4e3e28f..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/Tag.proto +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "Tag.grpc"; -option java_outer_classname = "TagCls"; -import public "tagType.proto"; - -message Tag { - int64 roster_id = 1; - string name = 2; - string color = 3; - tagType tag_status = 4; -} diff --git a/priv/protobuf/service_roster/contactStatus.proto b/priv/protobuf/service_roster/contactStatus.proto deleted file mode 100644 index be8237beaf778b4d4c5886301b1b5b8a5105f1ef..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/contactStatus.proto +++ /dev/null @@ -1,23 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "contactStatus.grpc"; -option java_outer_classname = "contactStatusCls"; - -enum contactStatus { - conact_request = 0; - authorization = 1; - contact_ignore = 2; - conatct_internal = 3; - friend = 4; - contact_last_msg = 5; - contact_ban = 6; - conact_banned = 7; - contact_deleted = 8; -} - diff --git a/priv/protobuf/service_roster/muc.proto b/priv/protobuf/service_roster/muc.proto deleted file mode 100644 index 039c4d5224bc7eb1da2776ef8655526ef97bc6de..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/muc.proto +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "muc.grpc"; -option java_outer_classname = "mucCls"; - -message muc { - string name = 1; -} diff --git a/priv/protobuf/service_roster/p2p.proto b/priv/protobuf/service_roster/p2p.proto deleted file mode 100644 index 46a95b911cc13c55a16713e889979ea363ab62c1..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/p2p.proto +++ /dev/null @@ -1,15 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "p2p.grpc"; -option java_outer_classname = "p2pCls"; - -message p2p { - string from = 1; - string to = 2; -} diff --git a/priv/protobuf/service_roster/presence.proto b/priv/protobuf/service_roster/presence.proto deleted file mode 100644 index 3c2a5c119cf0afea9d4a01b3029a5cd329a15002..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/presence.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "presence.grpc"; -option java_outer_classname = "presenceCls"; - -enum presence { - online = 0; - offline = 1; -} - diff --git a/priv/protobuf/service_roster/rosterStatus.proto b/priv/protobuf/service_roster/rosterStatus.proto deleted file mode 100644 index 65c391024ba14d93be03838e546653f8e0955635..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/rosterStatus.proto +++ /dev/null @@ -1,24 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "rosterStatus.grpc"; -option java_outer_classname = "rosterStatusCls"; - -enum rosterStatus { - get_roster = 0; - create_roster = 1; - del_roster = 2; - remove_roster = 3; - nick = 4; - add_roster = 5; - update_roster = 6; - list_loster = 7; - patch_roster = 8; - roster_last_msg = 9; -} - diff --git a/priv/protobuf/service_roster/serverStatus.proto b/priv/protobuf/service_roster/serverStatus.proto deleted file mode 100644 index 57d0314df734039ae7f2f61934c06d9bde997567..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/serverStatus.proto +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverStatus.grpc"; -option java_outer_classname = "serverStatusCls"; - -enum serverStatus { - servie_verified = 0; - service_not_verified = 1; -} - diff --git a/priv/protobuf/service_roster/serverType.proto b/priv/protobuf/service_roster/serverType.proto deleted file mode 100644 index 7ca622a890869f2b71d6dafec6d7f9cdac7bfc7d..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/serverType.proto +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "serverType.grpc"; -option java_outer_classname = "serverTypeCls"; - -enum serverType { - email = 0; - wallet = 1; - google_type = 2; - fb = 3; - phone = 4; -} - diff --git a/priv/protobuf/service_roster/tagType.proto b/priv/protobuf/service_roster/tagType.proto deleted file mode 100644 index 73981ba16a735570949d6021bd25098ad4fcc555..0000000000000000000000000000000000000000 --- a/priv/protobuf/service_roster/tagType.proto +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by https://github.com/synrc/bert -// DO NOT EDIT - -syntax = "proto3"; -package service_roster; - -option java_generic_services = true; -option java_multiple_files = true; -option java_package = "tagType.grpc"; -option java_outer_classname = "tagTypeCls"; - -enum tagType { - tag_create = 0; - tag_remove = 1; - tag_edit = 2; -} - diff --git a/rebar.config b/rebar.config index dfc1848f47a406f57b8f584a14f7a04811477925..d1ed37d6e610c2432afc15bf1314b80e813f0ca1 100644 --- a/rebar.config +++ b/rebar.config @@ -1,51 +1,77 @@ +%% -*- mode:erlang; erlang-indent-level: 4; indent-tabs-mode: nil -*- {sub_dirs,["apps"]}. -{lib_dirs,["apps","deps"]}. -{deps_dir,"deps"}. +{lib_dirs,["apps"]}. {deps, [ - {bert, ".*", {git, "git://github.com/synrc/bert",{tag,"2.4"}}}, - {active, ".*", {git, "git://github.com/synrc/active",{tag,"master"}}}, - {esockd, ".*", {git, "https://github.com/voxoz/esockd",{ref, "a80634b961c315ffe5f020d73236473b53ae5dc9"}}}, + {active, ".*", {git, "git://github.com/synrc/active",{branch,"master"}}}, + {esockd, ".*", {git, "https://github.com/voxoz/esockd",{branch, "master"}}}, {bpe, ".*", {git, "git://github.com/synrc/bpe", {tag,"4.4"}}}, - {emqttd, ".*", {git, "git://github.com/NYNJA-MC/emqttd",{tag,"master"}}}, + {emqttd, ".*", {git, "git://github.com/NYNJA-MC/emqttd",{branch,"master"}}}, {n2o, ".*", {git, "git://github.com/synrc/n2o", {tag,"6.4"}}}, - {emqttc, ".*", {git, "git://github.com/NYNJA-MC/emqttc",{tag,"master"}}}, + {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",{tag,"master"}}}, - {emq_dashboard, ".*", {git, "https://github.com/synrc/emq_dashboard",{tag,"master"}}}, - {'opencensus-erlang', ".*", {git, "https://github.com/voxoz/opencensus-erlang",{tag, "v0.4.0"}}}, - {libphonenumber_erlang, ".*", {git, "https://github.com/marinakr/libphonenumber_erlang.git",{tag,"master"}}}, + {gen_smtp, ".*", {git, "git://github.com/voxoz/gen_smtp",{branch,"master"}}}, + {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"}}}, {gproc, ".*", {git, "https://github.com/uwiger/gproc","0.6.1"}}, - {erlydtl, ".*", {git, "git://github.com/voxoz/erlydtl",{tag,"master"}}}, - {mini_s3, ".*", {git, "https://github.com/chef/mini_s3.git",{tag,"master"}}}, + {erlydtl, ".*", {git, "git://github.com/voxoz/erlydtl",{branch,"master"}}}, + {mini_s3, ".*", {git, "https://github.com/chef/mini_s3.git",{branch,"master"}}}, {jwt, ".*", {git, "https://github.com/artemeff/jwt.git",{tag, "0.1.8"}}}, {jsx, ".*", {git, "https://github.com/talentdeficit/jsx.git","v2.9.0"}}, {base64url, ".*", {git, "https://github.com/dvv/base64url.git","v1.0"}}, - {migresia, ".*", {git, "https://github.com/yoonka/migresia.git",{tag,"master"}}}, - {counters, ".*", {git, "https://github.com/deadtrickster/counters.erl.git", {tag, "v0.2.0"}}}, + {migresia, ".*", {git, "https://github.com/yoonka/migresia.git",{branch,"master"}}}, + {counters, ".*", {git, "https://github.com/deadtrickster/counters.erl.git", {tag, "v0.2.2"}}}, {ctx, ".*", {git, "https://github.com/tsloughter/ctx.git", []}}, {wts, ".*", {git, "https://github.com/tsloughter/wts.git", []}}, {rfc3339, ".*", {git, "https://github.com/talentdeficit/rfc3339",{tag,"0.2.2"}}}, {locus, ".*", {git, "https://github.com/g-andrade/locus.git",{ref,"0ea9079ce5686573e0e70e2b1311343dd25feef8"}}}, - {prometheus, ".*", {git, "https://github.com/deadtrickster/prometheus.erl",{tag,"master"}}}, - {cowboy, ".*", {git, "git://github.com/voxoz/cowboy", {tag,"master"}}}, - {'jose-erlang', ".*", {git, "https://github.com/manifest/jose-erlang.git", {tag,"master"}}}, - {json_rec, ".*", {git, "https://github.com/justinkirby/json_rec.git", {tag,"master"}}}, - {'erlang-uuid', ".*", {git, "https://github.com/avtobiff/erlang-uuid.git",{tag,"master"}}}, + {prometheus, ".*", {git, "https://github.com/deadtrickster/prometheus.erl",{branch,"master"}}}, + {cowboy, ".*", {git, "git://github.com/ninenines/cowboy", {tag,"2.7.0"}}}, + {jose, ".*", {git, "https://github.com/NYNJA-MC/jose-erlang.git", {ref, "7094018"}}}, + {json_rec, ".*", {git, "https://github.com/justinkirby/json_rec.git", {branch,"master"}}}, + {uuid, ".*", {git, "https://github.com/avtobiff/erlang-uuid.git",{branch,"master"}}}, {enenra, ".*", {git, "https://github.com/nlfiedler/enenra", {tag, "0.3.0"}}}, {'qdate', ".*", {git, "https://github.com/enterprizing/qdate.git",{ref,"fba988fc54214bb37a3ce11d5c5a3cc68752c3ce"}}} ]}. -{erl_opts, [{parse_transform,lager_transform},{parse_transform, oc_transform},debug_info]}. + + +{profiles, [{local, [{relx, [{dev_mode, true}, + {include_erts, false}, + {include_src, true}]} + ]}, + {prod, [{relx, [{dev_mode, false}, + {include_erts, true}, + {include_src, true}, + {overlay, []} + ]} + ]} + ]}. + +{erl_opts, [{parse_transform,lager_transform},{parse_transform, oc_span_transform},debug_info]}. {relx, [{release, {server, "1.0.0"}, - [roster, service]}, - {sys_config, "./sys.config"}, - {vm_args, "./vm.args"}, - {dev_mode, true}, - {include_erts, false}, - {extended_start_script, true} - ] - }. - {profiles, [ - {prod, [{relx, [{dev_mode, false}, - {include_erts, true}]} - ]} - ]}. + %% Copied from .applist in older version. Should be cleaned up. + [kernel, stdlib, sasl, crypto, inets, os_mon, + fs, gproc, gen_logger, compiler, + mnesia, kvs, + esockd, + prometheus,bert,n2o, + metrics,mimerl,unicode_util_compat,base64url,jsx,tools, + certifi,ibrowse,asn1,xmerl,counters,ctx, + wts,syntax_tools,qdate_localtime, + libphonenumber_erlang,syn,cowlib,jiffy,idna,parse_trans, + goldrush, public_key,bpe,lager,ssl,ranch,mochiweb, + ssl_verify_fun,locus,emqttd,hackney,roster,service,active, + cowboy,emq_dashboard,emqttc,enenra,envy,uuid,erlydtl,forms, + gen_smtp,json_rec,jwt,mad,migresia,mini_s3,nitro,opencensus, + qdate,rest,rfc3339,sh,stacktrace_compat]}, + {sys_config, "./sys.config"}, + {vm_args, "./vm.args"}, + {dev_mode, true}, + {include_erts, false}, + {extended_start_script, true}, + {overlay, [{link, "admin", "./admin"}, + {link, "etc", "./etc"}, + {link, "priv", "./priv"}, + {link, "asserts", "./asserts"} + ]} + ]}. diff --git a/rebar.lock b/rebar.lock index f641a2fbb6bca33e10d4417842103b9f24c3d93d..ef39cdd0bc8e849c43fa2a793ec9c2cec5bebedf 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,68 +1,78 @@ {"1.1.0", -[{<<"base64url">>, +[{<<"active">>, + {git,"git://github.com/synrc/active", + {ref,"cdd8f2b0f62b9785673bdbea7be90e1ae1ca1c02"}}, + 0}, + {<<"base64url">>, {git,"https://github.com/dvv/base64url.git", {ref,"f2c64ed8b9bebc536fad37ad97243452b674b837"}}, 0}, {<<"bert">>, - {git,"git://github.com/synrc/bert", - {ref,"6cde41b32448e85ecd48225221d6f978943a1bad"}}, + {git,"git://github.com/erlang-cn/bert", + {ref,"bbe248e7c09438aa8f946075374a98944560e769"}}, 0}, {<<"bpe">>, {git,"git://github.com/synrc/bpe", {ref,"356c9e621c38e927a8611ecac592bcdc8d689026"}}, 0}, {<<"certifi">>,{pkg,<<"certifi">>,<<"2.4.2">>},1}, + {<<"cf">>,{pkg,<<"cf">>,<<"0.3.1">>},2}, {<<"counters">>, {git,"https://github.com/deadtrickster/counters.erl.git", - {ref,"c3f4aa3acdf71c3db0a4b3fc1343aa45de2c5df0"}}, + {ref,"70e709ef43ba0f6ee28e31efe5894eaa475211e1"}}, 0}, {<<"cowboy">>, - {git,"git://github.com/voxoz/cowboy", - {ref,"c1cfbfa5dc6b5f6ecd9591ad5bf642b6a107a7f5"}}, + {git,"git://github.com/ninenines/cowboy", + {ref,"63b17e4edf666d995ec86cdcda17a62ba5ebc423"}}, 0}, {<<"cowlib">>, - {git,"git://github.com/voxoz/cowlib", - {ref,"5cc0038d0a3ae6a829646ddfff998d8c491969ca"}}, + {git,"https://github.com/ninenines/cowlib", + {ref,"c6553f8308a2ca5dcd69d845f0a7d098c40c3363"}}, 1}, {<<"ctx">>, {git,"https://github.com/tsloughter/ctx.git", - {ref,"a5a6b0948708e02bc7b9cb6248807c9ff8327940"}}, + {ref,"91c892b51d3340fc004099e15e4e029a5ec0e098"}}, 0}, {<<"emq_dashboard">>, {git,"https://github.com/synrc/emq_dashboard", - {ref,"f711e8d2b0a992f5540123f3504eebabc324a684"}}, + {ref,"3317c7dd47b07d28d7dbea4de971b48fc042fefd"}}, 0}, {<<"emqttc">>, - {git,"git://github.com/voxoz/emqttc", - {ref,"141fd2e925be854321d22005313762adb1195f48"}}, + {git,"git://github.com/NYNJA-MC/emqttc", + {ref,"1ffeaf64791b76faa18dad9e9f40686814d5dd10"}}, 0}, {<<"emqttd">>, - {git,"git://github.com/synrc/emqttd", - {ref,"c3d0b7b092fffe7bebe27af27dbbfe1714757d1c"}}, + {git,"git://github.com/NYNJA-MC/emqttd", + {ref,"5e2342bf7ae597804a6f9234a54cad2f6b5761d1"}}, + 0}, + {<<"enenra">>, + {git,"https://github.com/nlfiedler/enenra", + {ref,"ccc2553b8df5a188cdc77aeec7b856a1e5250e67"}}, 0}, {<<"envy">>, {git,"https://github.com/markan/envy.git", {ref,"0148fb4b7ed0e188511578e98b42d6e7dde0ebd1"}}, 1}, - {<<"erlang-uuid">>, - {git,"https://github.com/avtobiff/erlang-uuid.git", - {ref,"cb02a2039a9b29dd2eef0446039c9c6e164df9ef"}}, - 0}, + {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.3.1">>},1}, {<<"erlydtl">>, {git,"git://github.com/voxoz/erlydtl", {ref,"bdebe6f87d8f989018facbbf8dc6320936ffe98f"}}, 0}, {<<"esockd">>, {git,"https://github.com/voxoz/esockd", - {ref,"a80634b961c315ffe5f020d73236473b53ae5dc9"}}, + {ref,"817a4f059698a349aac9037fc0600b3928036e3d"}}, 0}, {<<"forms">>, {git,"git://github.com/synrc/forms", {ref,"845feb45a46dfc2e0e9a156da9c01c218d8fd6cc"}}, 1}, + {<<"fs">>, + {git,"git://github.com/synrc/fs", + {ref,"45ca2003b208f461ef4acd56c5fdecd2e98e1f33"}}, + 1}, {<<"gen_logger">>, - {git,"git://github.com/voxoz/gen_logger", - {ref,"5b14530363feb0b049c4f5c7c606f815aec781d2"}}, + {git,"git://github.com/NYNJA-MC/gen_logger", + {ref,"edc9b0aa1202cd4129725d3962a8b992fcf0e29c"}}, 1}, {<<"gen_smtp">>, {git,"git://github.com/voxoz/gen_smtp", @@ -76,10 +86,27 @@ {git,"https://github.com/uwiger/gproc", {ref,"1d16f5e6d7cf616eec4395f2385e3a680a4ffc9f"}}, 0}, + {<<"hackney">>, + {git,"https://github.com/benoitc/hackney", + {ref,"f2ac65700ef7918eb4e827892f1a7bb01e826026"}}, + 1}, {<<"ibrowse">>, {git,"git://github.com/cmullaparthi/ibrowse.git", {ref,"c97136cfb61fcc6f39d4e7da47372a64f7fca04e"}}, 1}, + {<<"idna">>,{pkg,<<"idna">>,<<"6.0.0">>},2}, + {<<"jiffy">>, + {git,"https://github.com/davisp/jiffy", + {ref,"c942525130ff0271bd318715406f234c0dc9bc5a"}}, + 1}, + {<<"jose">>, + {git,"https://github.com/NYNJA-MC/jose-erlang.git", + {ref,"709401825367c029986a3bc688de3ed016b914cd"}}, + 0}, + {<<"json_rec">>, + {git,"https://github.com/justinkirby/json_rec.git", + {ref,"8c72324e0f6fca8534ca733f8af03d4808f7e3be"}}, + 0}, {<<"jsx">>, {git,"https://github.com/talentdeficit/jsx.git", {ref,"fc2a001073f2300ba38427c23e83d5673c020542"}}, @@ -94,20 +121,26 @@ 1}, {<<"lager">>, {git,"git://github.com/voxoz/lager", - {ref,"1ecf4c17e9e39dd7a1943140477f632d17518f0c"}}, + {ref,"9d657ab5acc9e82354f945ef819dab3760fe63cb"}}, 1}, {<<"libphonenumber_erlang">>, {git,"https://github.com/marinakr/libphonenumber_erlang.git", - {ref,"3a6be75ef4f6fdd40fa8afee2a7fc5cf2ddb8601"}}, + {ref,"a78037e6f06f0aeeed9eaf4b8abaf378d24a0d01"}}, 0}, {<<"locus">>, {git,"https://github.com/g-andrade/locus.git", {ref,"0ea9079ce5686573e0e70e2b1311343dd25feef8"}}, 0}, + {<<"mad">>, + {git,"git://github.com/synrc/mad", + {ref,"0cd4d9e709d0ca70ec6d01b9d434692eff51222d"}}, + 1}, + {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2}, {<<"migresia">>, {git,"https://github.com/yoonka/migresia.git", {ref,"40e11825e01502d045e87bf8b5d7dc5a9d6e3f73"}}, 0}, + {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.0.2">>},2}, {<<"mini_s3">>, {git,"https://github.com/chef/mini_s3.git", {ref,"df0c68ea901343b8e0c647142d88d7f3aae27e7b"}}, @@ -124,18 +157,26 @@ {git,"git://github.com/synrc/nitro", {ref,"1aeb421c332f94b135563f8e855b139c1b067f59"}}, 1}, - {<<"opencensus-erlang">>, - {git,"https://github.com/voxoz/opencensus-erlang", - {ref,"8dc9ae86f5c1ef69593fe37b49e649afed6bd201"}}, + {<<"opencensus">>, + {git,"https://github.com/census-instrumentation/opencensus-erlang", + {ref,"7fb276ff73d677c00458922c9180df634f45e018"}}, 0}, - {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},2}, + {<<"parse_trans">>, + {git,"https://github.com/uwiger/parse_trans.git", + {ref,"e61ab8e09eee791222ba49a5706162c4985f24b0"}}, + 1}, {<<"prometheus">>, {git,"https://github.com/deadtrickster/prometheus.erl", - {ref,"46ea4b487baf4f6cc44495eae07582808e0369d4"}}, + {ref,"39c6595728041fa075561c03f3d45881065cc7e7"}}, + 0}, + {<<"qdate">>, + {git,"https://github.com/enterprizing/qdate.git", + {ref,"fba988fc54214bb37a3ce11d5c5a3cc68752c3ce"}}, 0}, + {<<"qdate_localtime">>,{pkg,<<"qdate_localtime">>,<<"1.1.0">>},1}, {<<"ranch">>, - {git,"git://github.com/voxoz/ranch", - {ref,"1a75038c82ede22efec46a7dca192b8ce26309e0"}}, + {git,"https://github.com/ninenines/ranch", + {ref,"3190aef88aea04d6dce8545fe9b4574288903f44"}}, 1}, {<<"rest">>, {git,"git://github.com/synrc/rest", @@ -145,20 +186,35 @@ {git,"https://github.com/talentdeficit/rfc3339", {ref,"90effc078c5e673d025b2c1269a153ad4748d3df"}}, 0}, + {<<"sh">>, + {git,"git://github.com/synrc/sh", + {ref,"a4e646aba9a4c18a34d19089e8b9391076b2bff8"}}, + 2}, {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.4">>},1}, {<<"stacktrace_compat">>,{pkg,<<"stacktrace_compat">>,<<"1.0.2">>},1}, {<<"syn">>, {git,"git://github.com/ostinelli/syn", {ref,"9964eb8969b6e1e712249d3aed4f3dfafd3aaac3"}}, 1}, + {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.4.1">>},3}, + {<<"uuid">>, + {git,"https://github.com/avtobiff/erlang-uuid.git", + {ref,"cb02a2039a9b29dd2eef0446039c9c6e164df9ef"}}, + 0}, {<<"wts">>, {git,"https://github.com/tsloughter/wts.git", - {ref,"5613b6c4354867fd2b02fde5ef15bf80190b8586"}}, + {ref,"09c039e4d9f7ab9b984c9ffb45dd0db0add58f96"}}, 0}]}. [ {pkg_hash,[ {<<"certifi">>, <<"75424FF0F3BAACCFD34B1214184B6EF616D89E420B258BB0A5EA7D7BC628F7F0">>}, - {<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>}, + {<<"cf">>, <<"5CB902239476E141EA70A740340233782D363A31EEA8AD37049561542E6CD641">>}, + {<<"erlware_commons">>, <<"0CE192AD69BC6FD0880246D852D0ECE17631E234878011D1586E053641ED4C04">>}, + {<<"idna">>, <<"689C46CBCDF3524C44D5F3DDE8001F364CD7608A99556D8FBD8239A5798D4C10">>}, + {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>}, + {<<"mimerl">>, <<"993F9B0E084083405ED8252B99460C4F0563E41729AB42D9074FD5E52439BE88">>}, + {<<"qdate_localtime">>, <<"5F6C3ACF10ECC5A7E2EFA3DCD2C863102B962188DBD9E086EC01D29FE029DA29">>}, {<<"ssl_verify_fun">>, <<"F0EAFFF810D2041E93F915EF59899C923F4568F4585904D010387ED74988E77B">>}, - {<<"stacktrace_compat">>, <<"8AD31C32C9A0EADB1EB298F04DC8B0C8D79BCC6233A638B02791FFCA4F331275">>}]} + {<<"stacktrace_compat">>, <<"8AD31C32C9A0EADB1EB298F04DC8B0C8D79BCC6233A638B02791FFCA4F331275">>}, + {<<"unicode_util_compat">>, <<"D869E4C68901DD9531385BB0C8C40444EBF624E60B6962D95952775CAC5E90CD">>}]} ]. diff --git a/rebar3 b/rebar3 new file mode 100755 index 0000000000000000000000000000000000000000..865ec59000c95fec9d6adf6c0e24f42c88f5014c Binary files /dev/null and b/rebar3 differ diff --git a/sys.config b/sys.config index 6d111849b5e95bd9f96023feba297fb35686edc3..ff74a806807d9ca5de2e57c3d44a709433cc6d71 100644 --- a/sys.config +++ b/sys.config @@ -1,174 +1,196 @@ +%% -*- mode:erlang; erlang-indent-level: 2; indent-tabs-mode: nil -*- [ - {review,[{host,"ns.synrc.com"}]}, - {bert,[{js,"apps/roster/priv/macbert/"}, - {erl,"apps/roster/src"}, - {google,"apps/service/priv/"}, - {disallowed,['feed', 'Whitelist', 'FakeNumbers','Schedule','Index','process']}, - {allowed_hrl, ["roster"]}, - {custom_validate, {roster, validate}}, - {swift,"apps/roster/priv/macbert/"}]}, - {roster,[ - {freeze_time, 1000}, - {upload,"./storage"}, - {email_api,[ - {from,<<"Nynja App">>}, - {host,<<"smtp.gmail.com">>}, - {login,<<"sandbox.nynja.app@gmail.com">>}, - {password,<<"tecSynt_nynja110917">>}]}, - {vox_api,[ - {account_id,<<"1152724">>}, - {api_key,<<"94b9f0f0-7d93-4e63-9061-aef62c30182b">>}, - {application_name,<<"videoconf.nynja.voximplant.com">>}, - {conference_rule_id,<<"294893">>}]}, - {telesign_api,[ - {customer_id,<<"CF6E2918-89A9-417F-8074-382908FEDCD9">>}, - {api_key,<<"JE1zC3gjYg1fITkPK4xYtAGk0uVpbsWSqi7e54wg+sLbMGAbKoJSw0/BRJaAezZpVZzEQfHYyL3PKutGfZ38Gg==">>}]}, - {amazon_api,[ - {access_key_id,<<"AKIAITNYSJXI2NUDRRXA">>}, - {secret_access_key,<<"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">>}, - {sts, [ - {host, <<"sts.amazonaws.com">>}, - {region, <<"us-east-1">>}, - {service, <<"sts">>}, - {action, <<"GetSessionToken">>}, - {duration_seconds, <<"43200">>}, - {version, <<"2011-06-15">>}, - {http_method, <<"GET">>}, - {endpoint, <<"https://sts.amazonaws.com">>} - ]}, - {s3, [ - {default_bucket_name,<<"nynja-defaults">>} + {kernel, + [{logger, + [{handler, default, logger_std_h, + #{level => error, + config => #{file => "log/erlang.log"}}}, + {handler, info, logger_std_h, + #{level => debug, + config => #{file => "log/debug.log"}}} + ]}]}, + {review,[{host,"ns.synrc.com"}]}, + {bert,[{js,"apps/roster/priv/macbert/"}, + {erl,"apps/roster/src"}, + {google,"apps/service/priv/"}, + {disallowed,['feed', 'Whitelist', 'FakeNumbers','Schedule','Index','process']}, + {allowed_hrl, ["roster"]}, + {custom_validate, {roster, validate}}, + {swift,"apps/roster/priv/macbert/"}]}, + {roster, + [ + {freeze_time, 1000}, + {upload,"./storage"}, + {email_api, + [ + {from,<<"Nynja App">>}, + {host,<<"smtp.gmail.com">>}, + {login,<<"sandbox.nynja.app@gmail.com">>}, + {password,<<"tecSynt_nynja110917">>}]}, + {vox_api, + [ + {account_id,<<"1152724">>}, + {api_key,<<"94b9f0f0-7d93-4e63-9061-aef62c30182b">>}, + {application_name,<<"videoconf.nynja.voximplant.com">>}, + {conference_rule_id,<<"294893">>}]}, + {telesign_api, + [ + {customer_id,<<"CF6E2918-89A9-417F-8074-382908FEDCD9">>}, + {api_key,<<"JE1zC3gjYg1fITkPK4xYtAGk0uVpbsWSqi7e54wg+sLbMGAbKoJSw0/BRJaAezZpVZzEQfHYyL3PKutGfZ38Gg==">>}]}, + {amazon_api, + [ + {access_key_id,<<"AKIAITNYSJXI2NUDRRXA">>}, + {secret_access_key,<<"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">>}, + {sts, [ + {host, <<"sts.amazonaws.com">>}, + {region, <<"us-east-1">>}, + {service, <<"sts">>}, + {action, <<"GetSessionToken">>}, + {duration_seconds, <<"43200">>}, + {version, <<"2011-06-15">>}, + {http_method, <<"GET">>}, + {endpoint, <<"https://sts.amazonaws.com">>} + ]}, + {s3, [ + {default_bucket_name,<<"nynja-defaults">>} ]} - ]}, - {google_api, [ - {gs_bucket, <<"cryoflamer">>}, - {key, <<"AIzaSyC-HHyIj9gwYLEK1tdcYC1AhCq5xie4lYc">>}, - {app_credentials, "etc/certs/transcribe-dacb4306ab76.json"} - ]}, - {push_api,[ - {fcm_server_key,<<"AAAAAzb6_Zg:APA91bGN0jYv_4iqyk8IC4xUdPYXh0yPsTF9YYj_gd9oebRr_ZEoLuC5hCD9RfdqA3Y3AF_P_WbelqvzvgR3RsX_mHBLynV14Q6HakXAtrY_eWLK2xqamF2OC9uBXfKgxTFFqmyr1Kbw">>}, - {apns_cert_dir,<<"apps/roster/priv/apns_certificates/">>}, - {apns_port,2195}]}, - {job_delay, 60}, %% 1 mins - {auth_ttl, 900}, %% 15 mins - {auth_check_ip, false}, - {get_sessions_api, true}, - {whitelist_check, false}, - {fake_numbers_check, true}, - {validate_token, micro_auth} - ]}, - {rest, [{port,8888}, - {basic_auth,[ - {username,<<"nynja">>}, - {password,<<"nynjaTS">>}]}, -%% api which can be opened without basic auth - {open_api_list, [<<"/test">>, <<"/metrics">>]} + ]}, + {google_api, [ + {gs_bucket, <<"cryoflamer">>}, + {key, <<"AIzaSyC-HHyIj9gwYLEK1tdcYC1AhCq5xie4lYc">>}, + {app_credentials, "etc/certs/transcribe-dacb4306ab76.json"} + ]}, + {push_api, + [ + {fcm_server_key,<<"AAAAAzb6_Zg:APA91bGN0jYv_4iqyk8IC4xUdPYXh0yPsTF9YYj_gd9oebRr_ZEoLuC5hCD9RfdqA3Y3AF_P_WbelqvzvgR3RsX_mHBLynV14Q6HakXAtrY_eWLK2xqamF2OC9uBXfKgxTFFqmyr1Kbw">>}, + {apns_cert_dir,<<"apps/roster/priv/apns_certificates/">>}, + {apns_port,2195}]}, + {job_delay, 60}, %% 1 mins + {auth_ttl, 900}, %% 15 mins + {auth_check_ip, false}, + {get_sessions_api, true}, + {whitelist_check, false}, + {fake_numbers_check, true}, + {validate_token, micro_auth} ]}, - {n2o, [{port,8000}, - {upload,"./storage"}, - {app,review}, - {tables,[ cookies, file, caching, ring, async, nick, names, surnames, system]}, - {pickler,nitro_pickle}, - {formatter,n2o_bert}, - {auth_ttl, 86400}, %% 24 h - {protocols,[n2o_nitro,n2o_ftp,roster_proto]}, - {log_modules,[roster, n2o_vnode]}, - {log_level,roster}, - {vnode, {roster, get_vnode}}, - {validate, {roster, validate}} + {rest, [{port,8888}, + {basic_auth,[ + {username,<<"nynja">>}, + {password,<<"nynjaTS">>}]}, + %% api which can be opened without basic auth + {open_api_list, [<<"/test">>, <<"/metrics">>]} ]}, - {emq_dashboard, [ - {listeners_dash,[ - {http,18083,[ - {acceptors,4},{max_clients,512}] - }, - {https,18084,[ - {acceptors,4},{max_clients,512},{handshake_timeout, 15}, -% {certfile, "etc/certs/cert.pem"}, - {keyfile, "etc/certs/privkey.pem"}, - {cacertfile ,"etc/certs/fullchain.pem"}, - {verify,verify_peer}, - {fail_if_no_peer_cert, false}]} + {n2o, [{port,8000}, + {upload,"./storage"}, + {app,review}, + {tables,[ cookies, file, caching, ring, async, nick, names, surnames, system]}, + {pickler,nitro_pickle}, + {formatter,n2o_bert}, + {auth_ttl, 86400}, %% 24 h + {protocols,[n2o_nitro,n2o_ftp,roster_proto]}, + {log_modules,[roster, n2o_vnode]}, + {log_level,roster}, + {vnode, {roster, get_vnode}}, + {validate, {roster, validate}} ]}, - {default_admin, [ - {name, <<"nynja">>}, - {password, <<"nynjaAdmin">>} - ]}]}, - {emq_modules, [{modules,[{emq_mod_presence,[{qos,1}]}, - {emq_mod_subscription,[{<<"%u/%c/#">>,2}]}, - {emq_mod_rewrite,[{rewrite,"x/#","^x/y/(.+)$","z/y/$1"}, - {rewrite,"y/+/z/#","^y/(.+)/z/(.+)$","y/z/$2"}]}]}]}, -{emqttd, - [{plugins_loaded_file,"etc/loaded_plugins"}, - {plugins_etc_dir,"etc/plugins/"}, - {broker_sys_interval,60}, - {conn_force_gc_count,100}, - {cache_acl,true}, - {acl_file,"etc/acl.conf"}, - {allow_anonymous,true}, - {protocol,[{max_clientid_len,1024},{max_packet_size,25165824}]}, - {client,[{client_idle_timeout,30000},{client_enable_stats,false}]}, - {session, - [{upgrade_qos,false}, - {max_inflight,32}, - {retry_interval,20000}, - {max_awaiting_rel,100000}, - {await_rel_timeout,60000}, - {enable_stats,false}, - {expiry_interval,7200000}]}, - {queue, - [{priority,[]}, - {type,simple}, - {max_length,infinity}, - {low_watermark,0.2}, - {high_watermark,0.6}, - {queue_qos0,true}]}, - {pubsub,[{pool_size,8},{by_clientid,true},{async,true}]}, - {bridge,[{max_queue_len,10000},{ping_down_interval,1}]}, - {listeners, - [{tcp,1883, - [{connopts,[]}, - {sockopts,[{backlog,1024},{nodelay,true}]}, - {acceptors,8}, - {max_clients,1048576}, - {tune_buffer,false}]}, - {ssl,8883, - [{sslopts, - [{versions,['tlsv1.2','tlsv1.1',tlsv1]}, - {cacertfile,"etc/certs/cert.pem"}, - {keyfile,"etc/certs/privkey.pem"}, - {certfile,"etc/certs/fullchain.pem"}]}, - {connopts,[]}, - {sockopts,[{nodelay,true}]}, - {acceptors,8}, - {max_clients,1048576}]}, - {http,8083, - [{connopts,[]}, - {sockopts,[{nodelay,true}]}, - {acceptors,8}, - {max_clients,1048576}]}, - {https,8084, - [{sslopts, - [{cacertfile,"etc/certs/cert.pem"}, - {keyfile,"etc/certs/privkey.pem"}, - {certfile,"etc/certs/fullchain.pem"}]}, - {connopts,[]}, - {sockopts,[{nodelay,true}]}, - {acceptors,8}, - {max_clients,1048576}]}]}, - {sysmon, - [{long_gc,false}, - {long_schedule,2400}, - {large_heap,67108864}, - {busy_port,false}, - {busy_dist_port,true}]}]}, - {kvs, [{dba,store_mnesia}, + {emq_dashboard, + [ + {listeners_dash, + [ + {http,18083, + [ + {acceptors,4},{max_clients,512}] + }, + {https,18084, + [ + {acceptors,4},{max_clients,512},{handshake_timeout, 15}, + %% {certfile, "etc/certs/cert.pem"}, + {keyfile, "etc/certs/privkey.pem"}, + {cacertfile ,"etc/certs/fullchain.pem"}, + {verify,verify_peer}, + {fail_if_no_peer_cert, false}]} + ]}, + {default_admin, [ + {name, <<"nynja">>}, + {password, <<"nynjaAdmin">>} + ]}]}, + {emq_modules, + [{modules,[{emq_mod_presence,[{qos,1}]}, + {emq_mod_subscription,[{<<"%u/%c/#">>,2}]}, + {emq_mod_rewrite, + [{rewrite,"x/#","^x/y/(.+)$","z/y/$1"}, + {rewrite,"y/+/z/#","^y/(.+)/z/(.+)$","y/z/$2"}]}]}]}, + {emqttd, + [{plugins_loaded_file,"etc/loaded_plugins"}, + {plugins_etc_dir,"etc/plugins/"}, + {broker_sys_interval,60}, + {conn_force_gc_count,100}, + {cache_acl,true}, + {acl_file,"etc/acl.conf"}, + {allow_anonymous,true}, + {protocol,[{max_clientid_len,1024},{max_packet_size,25165824}]}, + {client,[{client_idle_timeout,30000},{client_enable_stats,false}]}, + {session, + [{upgrade_qos,false}, + {max_inflight,32}, + {retry_interval,20000}, + {max_awaiting_rel,100000}, + {await_rel_timeout,60000}, + {enable_stats,false}, + {expiry_interval,7200000}]}, + {queue, + [{priority,[]}, + {type,simple}, + {max_length,infinity}, + {low_watermark,0.2}, + {high_watermark,0.6}, + {queue_qos0,true}]}, + {pubsub,[{pool_size,8},{by_clientid,true},{async,true}]}, + {bridge,[{max_queue_len,10000},{ping_down_interval,1}]}, + {listeners, + [{tcp,1883, + [{connopts,[]}, + {sockopts,[{backlog,1024},{nodelay,true}]}, + {acceptors,8}, + {max_clients,1048576}, + {tune_buffer,false}]}, + {ssl,8883, + [{sslopts, + [{versions,['tlsv1.2','tlsv1.1',tlsv1]}, + {cacertfile,"etc/certs/cert.pem"}, + {keyfile,"etc/certs/privkey.pem"}, + {certfile,"etc/certs/fullchain.pem"}]}, + {connopts,[]}, + {sockopts,[{nodelay,true}]}, + {acceptors,8}, + {max_clients,1048576}]}, + {http,8083, + [{connopts,[]}, + {sockopts,[{nodelay,true}]}, + {acceptors,8}, + {max_clients,1048576}]}, + {https,8084, + [{sslopts, + [{cacertfile,"etc/certs/cert.pem"}, + {keyfile,"etc/certs/privkey.pem"}, + {certfile,"etc/certs/fullchain.pem"}]}, + {connopts,[]}, + {sockopts,[{nodelay,true}]}, + {acceptors,8}, + {max_clients,1048576}]}]}, + {sysmon, + [{long_gc,false}, + {long_schedule,2400}, + {large_heap,67108864}, + {busy_port,false}, + {busy_dist_port,true}]}]}, + {kvs, [{dba,store_mnesia}, {schema, [kvs_user, kvs_acl, kvs_feed, kvs_subscription, roster, micro, emqttd_kvs, bpe_metainfo]} -%% ,{generation, {roster_test, limit}} -%% ,{forbidding, {roster_test, forbid}} - ]}, - {bpe,[{process_worker,{job,worker}} - ,{ttl, 8640000} - ]}, - {locus, [{url, "http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz"}]} + %% ,{generation, {roster_test, limit}} + %% ,{forbidding, {roster_test, forbid}} + ]}, + {bpe,[{process_worker,{job,worker}} + ,{ttl, 8640000} + ]}, + {locus, [{url, "http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz"}]} ].