update to build with last n2o tools

apps/server/include/journal.hrl

@@ -0,0 +1,19 @@
+-ifndef(JOURNAL_HRL).
+-define(JOURNAL_HRL, "journal.hrl").
+
+-include_lib("kvs/include/kvs.hrl").
+-define(LOG_HEADER, game_id, date, time, user, module, type, speed, rounds).
+-define(CONTAINER_LOG, ?CONTAINER, ?LOG_HEADER, stats=[]).
+-record(container_log, {?CONTAINER_LOG}).
+-record(container_event, {?ITERATOR(container_log), ?LOG_HEADER }).
+
+-record(series_log,  {?CONTAINER_LOG, score, game_points, kakush }).
+-record(series_event,  {?ITERATOR(series_log),?LOG_HEADER, result, score}).
+
+-record(reveal_log,  {?CONTAINER_LOG, skill, score }).
+-record(reveal_event,  {?ITERATOR(reveal_log), ?LOG_HEADER, reason, winner, score, total}).
+
+-record(protocol_log,  {?CONTAINER_LOG}).
+-record(protocol_event, {?ITERATOR(protocol_log), ?LOG_HEADER, event, game_event}).
+
+-endif.

apps/server/src/modules/elimination.erl

@@ -59,9 +59,9 @@
          tournament_table  :: list(), %% [{TurnNum, TurnRes}], TurnRes = [{PlayerId, CommonPos, Points, Status}]
          table_id_counter  :: pos_integer(),
          tour              :: pos_integer(),
-         cr_tab_requests   :: dict(),  %% {TableId, PlayersIds}
-         reg_requests      :: dict(),  %% {PlayerId, From}
-         tab_requests      :: dict(),  %% {RequestId, RequestContext}
+         cr_tab_requests,
+         reg_requests,
+         tab_requests,
          timer             :: undefined | reference(),
          timer_magic       :: undefined | reference(),
          tables_wl         :: list(), %% Tables waiting list

apps/server/src/modules/lucky.erl

@@ -52,9 +52,9 @@
          seats,            %% Stores relation between players and tables seats
          player_id_counter :: pos_integer(),
          table_id_counter  :: pos_integer(),
-         cr_tab_requests   :: dict(), %% {TableId, PlayersIds}
-         reg_requests      :: dict(),  %% {PlayerId, From}
-         tab_requests      :: dict()   %% {RequestId, RequestContext}
+         cr_tab_requests,
+         reg_requests,
+         tab_requests
         }).
 
 -record(player,

apps/server/src/modules/standalone.erl

@@ -65,9 +65,9 @@
          player_id_counter :: pos_integer(),
          cur_table         :: pos_integer(),
          tour              :: pos_integer(),
-         cr_tab_requests   :: dict(),  %% {TableId, PlayersIds}
-         reg_requests      :: dict(),  %% {PlayerId, From}
-         tab_requests      :: dict(),  %% {RequestId, RequestContext}
+         cr_tab_requests,
+         reg_requests,
+         tab_requests,
          timer             :: undefined | reference(),
          timer_magic       :: undefined | reference(),
          tables_wl         :: list(), %% Tables waiting list

apps/server/src/tavla/tavla_bot.erl

@@ -17,7 +17,7 @@
 %%        next_initiated = false :: boolean(),
         table_id :: integer(),
         is_robot = true :: boolean(),
-        board :: list(tuple('Color'(), integer) | null),
+        board,
         user :: #'PlayerInfo'{},
         player_color :: integer(),
         players,
@@ -29,7 +29,7 @@
         bot :: pid(),
         conn :: pid(),
         hand :: list(),
-        running_requests = dict:new() :: any(),
+        running_requests,
         delay :: integer(),
         mode :: atom(),
         request_id = 0,

apps/server/src/tavla/tavla_desk.erl

@@ -90,7 +90,7 @@
         {home_hit_and_run_enabled    :: boolean(),
          bearoff_waste_moves_enabled :: boolean(),
          first_move                  :: black | white,
-         board                       :: dict(),
+         board,
          pips_list                   :: undefined | list(integer()),
          hitted_home_positions       :: list(),
          current                     :: black | white,

apps/server/src/tavla/tavla_paired.erl

@@ -63,9 +63,9 @@
          tournament_table  :: list(), %% [{TurnNum, TurnRes}], TurnRes = [{PlayerId, CommonPos, Points, Status}]
          table_id_counter  :: pos_integer(),
          player_id_counter :: pos_integer(),
-         cr_tab_requests   :: dict(),  %% {TableId, PlayersIds}
-         reg_requests      :: dict(),  %% {PlayerId, From}
-         tab_requests      :: dict(),  %% {RequestId, RequestContext}
+         cr_tab_requests,
+         reg_requests,
+         tab_requests,
          timer             :: undefined | reference(),
          timer_magic       :: undefined | reference(),
          tables_wl         :: list(),  %% Tables waiting list

apps/web/include/basic_types.hrl

@@ -0,0 +1,21 @@
+-ifndef(BASIC_TYPES).
+-define(BASIC_TYPES, true).
+
+-type 'PlayerId'()   :: any().
+-type 'GameId'()     :: any().
+
+-record('PlayerInfo', {
+    id :: 'PlayerId'(),
+    login :: string(),
+    name :: string(),
+    surname :: string(),
+    seat_num,
+    connected,
+    age :: integer(),
+    skill :: integer(),
+    score :: integer(),
+    avatar_url :: string(),
+    robot = false :: boolean(),
+    sex }).
+
+-endif.

apps/web/include/journal.hrl

@@ -0,0 +1,19 @@
+-ifndef(JOURNAL_HRL).
+-define(JOURNAL_HRL, "journal.hrl").
+
+-include_lib("kvs/include/kvs.hrl").
+-define(LOG_HEADER, game_id, date, time, user, module, type, speed, rounds).
+-define(CONTAINER_LOG, ?CONTAINER, ?LOG_HEADER, stats=[]).
+-record(container_log, {?CONTAINER_LOG}).
+-record(container_event, {?ITERATOR(container_log), ?LOG_HEADER }).
+
+-record(series_log,  {?CONTAINER_LOG, score, game_points, kakush }).
+-record(series_event,  {?ITERATOR(series_log),?LOG_HEADER, result, score}).
+
+-record(reveal_log,  {?CONTAINER_LOG, skill, score }).
+-record(reveal_event,  {?ITERATOR(reveal_log), ?LOG_HEADER, reason, winner, score, total}).
+
+-record(protocol_log,  {?CONTAINER_LOG}).
+-record(protocol_event, {?ITERATOR(protocol_log), ?LOG_HEADER, event, game_event}).
+
+-endif.

apps/web/include/requests.hrl

@@ -0,0 +1,21 @@
+-include("basic_types.hrl").
+
+% actions are being instantiated from client to server
+
+-record(session_attach, {token}).
+-record(login, {username, password}).
+-record(logout, {}).
+-record(join_game, {game}).
+-record(stats_action, {player_id :: 'PlayerId'(), game_type}).
+-record(chat, {game, player_id, who, message }).
+-record(game_action, {game :: 'GameId'(), action, args = []}).
+-record(pause_game, {table_id :: integer(),game :: 'GameId'(),action}).
+
+% event notifications from server to client
+
+-record(game_event, {game :: 'GameId'(), event, args = [] }).
+-record(chat_event, {game :: 'GameId'(), player_id :: 'PlayerId'(), who, message }).
+-record(stats_event, {player_id :: 'PlayerId'(), games, reveals, protocol, score}).
+-record(game_paused, {table_id :: integer(), game :: 'GameId'(),action,who :: 'PlayerId'(),retries}).
+-record(disconnect, {reason_id,reason}).
+-record(player_left, {player :: 'PlayerId'(),human_replaced=false,replacement::'PlayerId'()}).

apps/web/include/settings.hrl

@@ -0,0 +1,15 @@
+-define(LOBBY_TIMEOUT, begin {ok, X}   = kvs:get(config,"games/lobby_timeout", 60000), X end).
+-define(REMATCH_TIMEOUT, begin {ok, X} = kvs:get(config,"games/rematch_timeout", 45000), X end).
+-define(ROBOT_DELAY, begin {ok, X}     = kvs:get(config,"games/okey/robot_delay", 500), X end).
+-define(SKILL_SEED, begin {ok, X}      = kvs:get(config, "games/okey/skill_seed", 500), X end). %% skill value for new player
+-define(IS_TEST, begin {ok, X}         = kvs:get(config,"debug/is_test", false), X end). %% determines if code is executed in test
+-define(ALL_SESSIONS, <<"all_sessions_topic">>).
+-define(TEST_TOKEN,  "EBAs6dg2Xw6XuCdg8qiPmlBLgYJ6N4Ti0P+oGpWgYz4NW4nBBUzTe/wAuLYtPnjFpsjCExxSpV78fipmsPxcf+NGy+QKIM6rmVJhpnIlKf0bpFNuGaAPjZAWthhGO8nZ0V8UnA==").
+-define(TEST_TOKEN2, "EBAs6dg2Xw6XuCdg8qiPmlBLgYJ6N4Ti0P+oGpWgYz4NW4nBBUzTe/wAuLYtPnjFpsjCExxSpV78fipmsPxcf+NGy+QKIM6rmVJhpnIlKf0bpFNuGaAPjZAWthhGO8nZ0V8Un2==").
+-define(PAIRED_TAVLA_ASYNC, false).
+-define(SOCIAL_ACTION_SUBSCRIBE, 1).
+-define(SOCIAL_ACTION_UNSUBSCRIBE, 2).
+-define(SOCIAL_ACTION_BLOCK, 3).
+-define(SOCIAL_ACTION_UNBLOCK, 4).
+-define(SOCIAL_ACTION_LOVE, 5).
+-define(SOCIAL_ACTION_HAMMER, 6).

apps/web/src/okey.erl

@@ -1,11 +1,11 @@
 -module(okey).
 -compile(export_all).
 -include_lib("n2o/include/wf.hrl").
--include_lib("server/include/requests.hrl").
--include_lib("server/include/settings.hrl").
+-include("requests.hrl").
+-include("settings.hrl").
 -include_lib("avz/include/avz.hrl").
 -include_lib("kvs/include/user.hrl").
--include_lib("db/include/journal.hrl").
+-include("journal.hrl").
 
 -define(GAMEID, game_form()).
 

rebar.config

@@ -7,10 +7,10 @@
     {erlydtl,".*", {git, "git://github.com/evanmiller/erlydtl", {tag, "0.8.0"} }},
     {cowboy, ".*", {git, "git://github.com/extend/cowboy",      {tag, "0.9.0"} }},
     {gproc,  ".*", {git, "git://github.com/uwiger/gproc.git",   {tag, "0.3"}   }},
-    {fs,     ".*", {git, "git://github.com/synrc/fs",           {tag, "0.8"}   }},
-    {sh,     ".*", {git, "git://github.com/synrc/sh",           {tag, "0.8"}   }},
-    {active, ".*", {git, "git://github.com/synrc/active",       {tag, "0.8"}   }},
-    {mad,    ".*", {git, "git://github.com/synrc/mad",          {tag, "0.8"}   }},
+    {fs,     ".*", {git, "git://github.com/synrc/fs",           {tag, "master"}   }},
+    {sh,     ".*", {git, "git://github.com/synrc/sh",           {tag, "master"}   }},
+    {active, ".*", {git, "git://github.com/synrc/active",       {tag, "master"}   }},
+    {mad,    ".*", {git, "git://github.com/synrc/mad",          {tag, "master"}   }},
     {rest,   ".*", {git, "git://github.com/synrc/rest",         {tag, "1.5.0"} }},
     {kvs,    ".*", {git, "git://github.com/synrc/kvs",          {tag, "1.5.0"} }},
     {avz,    ".*", {git, "git://github.com/synrc/avz",          {tag, "1.4.0"} }}