diff --git a/package.json b/package.json index 2d0ae74..83dccf7 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "svg": "1.1.3", "protohx": "0.4.6", "yield": "3.2.2", - "formatter": "1.16.0" + "formatter": "1.16.0", + "hxWebSockets": "1.4.0" }, "haxe": "4.2.5" } diff --git a/src/app/haxe/ru/m/puzzlez/PuzzlezApp.hx b/src/app/haxe/ru/m/puzzlez/PuzzlezApp.hx index 6fc3670..921054c 100644 --- a/src/app/haxe/ru/m/puzzlez/PuzzlezApp.hx +++ b/src/app/haxe/ru/m/puzzlez/PuzzlezApp.hx @@ -4,6 +4,8 @@ import hw.app.App; import hw.app.Const; import hw.log.TraceLogger; import ru.m.puzzlez.image.ImageSourceBundle; +import ru.m.puzzlez.net.Network; +import ru.m.puzzlez.net.NetworkSource; import ru.m.puzzlez.render.part.IPartBuilder; import ru.m.puzzlez.settings.Settings; import ru.m.puzzlez.source.AssetImageSource; @@ -18,12 +20,15 @@ import ru.m.update.Updater; class PuzzlezApp { @:provide static var updater:Updater; @:provide static var sourceBundle:ImageSourceBundle; + @:provide static var network:Network; public static function main() { // ToDo: fix @:provide macro Settings; IPartBuilder; GameStorage; + Network; + NetworkSource; sourceBundle.register(new AssetImageSource()); sourceBundle.register(new FileImageSource()); sourceBundle.register(new PixabayImageSource(CompilationOption.get("PIXABAY_KEY"))); @@ -36,5 +41,6 @@ class PuzzlezApp { app.icon = openfl.Assets.getBitmapData("resources/icon.png"); app.view = new PuzzlezAppView(); L.d("Puzzlez", "started"); + network.auth(); } } diff --git a/src/app/haxe/ru/m/puzzlez/net/Network.hx b/src/app/haxe/ru/m/puzzlez/net/Network.hx index d31c31f..f303ee1 100644 --- a/src/app/haxe/ru/m/puzzlez/net/Network.hx +++ b/src/app/haxe/ru/m/puzzlez/net/Network.hx @@ -5,7 +5,6 @@ import hw.connect.IConnection; import hw.signal.Signal; import hw.storage.SharedObjectStorage; import promhx.Promise; -import ru.m.data.IDataSource; import ru.m.puzzlez.proto.core.User; import ru.m.puzzlez.proto.event.GameAction; import ru.m.puzzlez.proto.event.GameEvent; @@ -13,6 +12,7 @@ import ru.m.puzzlez.proto.game.GamePreset; import ru.m.puzzlez.proto.game.GameState; import ru.m.puzzlez.proto.pack.AuthRequest; import ru.m.puzzlez.proto.pack.GameActionRequest; +import ru.m.puzzlez.proto.pack.GameCreateRequest; import ru.m.puzzlez.proto.pack.GameJoinRequest; import ru.m.puzzlez.proto.pack.GameLeaveRequest; import ru.m.puzzlez.proto.pack.GameListRequest; @@ -21,21 +21,26 @@ import ru.m.puzzlez.proto.pack.NotificationResponse; import ru.m.puzzlez.proto.pack.Request; import ru.m.puzzlez.proto.pack.Response; -@:provide class Network implements IDataSource { +using ru.m.SignalUtil; + +@:provide class Network { public var userSignal:Signal = new Signal(); public var notificationSignal:Signal = new Signal(); public var listSignal:Signal = new Signal(); public var joinSignal:Signal = new Signal(); public var gameEventSignal:Signal = new Signal(); - private var connection:IConnection; + public var connection:IConnection; + private var storage:SharedObjectStorage; private static var USER_KEY = "user"; public function new() { storage = new SharedObjectStorage("network/2"); - connection = ConnectionFactory.buildClientConnection("127.0.0.1", 5000, Response); + var host:String = CompilationOption.get("host"); + var port:Int = cast(CompilationOption.get("port"), Int); + connection = ConnectionFactory.buildClientConnection(host, port, Response); connection.handler.connect(onConnectionChange); connection.receiveHandler.connect(onReceivePacket); connection.connect().catchError(_ -> {}); @@ -45,17 +50,23 @@ import ru.m.puzzlez.proto.pack.Response; if (storage.exists(USER_KEY)) { return storage.read(USER_KEY); } else { - return new User().setName('Anonimus #${IdUtil.generate()}'); + var uuid = IdUtil.generate(); + return new User().setUuid(uuid).setName('Anonimus #${uuid}'); } } public function auth():Promise { - connection.send(new Request().setAuth(new AuthRequest().setUser(restoreUser()))); - return userSignal.next(); + try { + connection.send(new Request().setAuth(new AuthRequest().setUser(restoreUser()))); + return userSignal.next(); + } catch (error:Dynamic) { + L.w("network", "auth", error); + return Promise.promise(null); + } } public function createGame(preset:GamePreset):Promise { - connection.send(new Request().setJoin(new GameJoinRequest().setPreset(preset))); + connection.send(new Request().setCreate(new GameCreateRequest().setPreset(preset))); return joinSignal.next(); } @@ -99,22 +110,4 @@ import ru.m.puzzlez.proto.pack.Response; } } } - - public function getPage(page:Page):Promise> { - connection.send(new Request().setList(new GameListRequest().setCount(page.count).setPage(page.index))); - return listSignal.next().then((list:GameListResponse) -> ({ - page: { - index: list.page, - count: list.count, - filter: null, - order: null, - }, - total: list.total, - data: list.games, - })); - } - - public function get(id:String):GameState { - return null; - } } diff --git a/src/app/haxe/ru/m/puzzlez/net/NetworkGame.hx b/src/app/haxe/ru/m/puzzlez/net/NetworkGame.hx index c8b7878..3a0ad69 100644 --- a/src/app/haxe/ru/m/puzzlez/net/NetworkGame.hx +++ b/src/app/haxe/ru/m/puzzlez/net/NetworkGame.hx @@ -2,10 +2,12 @@ package ru.m.puzzlez.net; import ru.m.puzzlez.proto.event.GameStart; import hw.signal.Signal; -import ru.m.puzzlez.image.IGame; +import ru.m.puzzlez.game.IGame; import ru.m.puzzlez.proto.event.GameAction; import ru.m.puzzlez.proto.event.GameEvent; import ru.m.puzzlez.proto.game.GameState; +import ru.m.puzzlez.proto.event.gameaction.Action; +import ru.m.puzzlez.game.EventUtil; class NetworkGame implements IGame { public var state(default, null):GameState; @@ -19,7 +21,11 @@ class NetworkGame implements IGame { } public function action(action:GameAction):Void { - network.sendGameAction(action); + if (action.action == Action.MOVE) { + events.emit(EventUtil.action(action)); + } else { + network.sendGameAction(action); + } } public function start():Void { diff --git a/src/app/haxe/ru/m/puzzlez/net/NetworkSource.hx b/src/app/haxe/ru/m/puzzlez/net/NetworkSource.hx new file mode 100644 index 0000000..82b32cb --- /dev/null +++ b/src/app/haxe/ru/m/puzzlez/net/NetworkSource.hx @@ -0,0 +1,28 @@ +package ru.m.puzzlez.net; + +import promhx.Promise; +import ru.m.data.DataSource; +import ru.m.puzzlez.proto.game.GameState; +import ru.m.puzzlez.proto.pack.GameListRequest; +import ru.m.puzzlez.proto.pack.GameListResponse; +import ru.m.puzzlez.proto.pack.Request; + +using ru.m.SignalUtil; + +@:provide class NetworkSource implements DataSource { + @:provide private var network:Network; + + public function getPage(page:Page):Promise> { + network.connection.send(new Request().setList(new GameListRequest().setCount(page.count).setPage(page.index))); + return network.listSignal.next().then((list:GameListResponse) -> ({ + page: { + index: list.page, + count: list.count, + filter: null, + order: null, + }, + total: list.total, + data: list.games, + })); + } +} diff --git a/src/app/haxe/ru/m/puzzlez/view/GameFrame.hx b/src/app/haxe/ru/m/puzzlez/view/GameFrame.hx index 8bebf6f..6a4563b 100644 --- a/src/app/haxe/ru/m/puzzlez/view/GameFrame.hx +++ b/src/app/haxe/ru/m/puzzlez/view/GameFrame.hx @@ -7,6 +7,7 @@ import hw.view.popup.ConfirmView; import promhx.Promise; import ru.m.puzzlez.game.Game; import ru.m.puzzlez.game.IGame; +import ru.m.puzzlez.net.NetworkGame; import ru.m.puzzlez.proto.event.GameAction; import ru.m.puzzlez.proto.event.GameEvent; import ru.m.puzzlez.proto.event.gameaction.Action; @@ -37,7 +38,7 @@ import ru.m.puzzlez.view.popup.PreviewPopup; L.d("Frame", '$ID: ${state.preset.image.source}:${state.preset.image.id}'); onHide(); if (state.online) { - // game = new NetworkGame(state); + game = new NetworkGame(state); } else { game = new Game(state); } diff --git a/src/app/haxe/ru/m/puzzlez/view/PresetFrame.hx b/src/app/haxe/ru/m/puzzlez/view/PresetFrame.hx index 941fa9d..8f84cd1 100644 --- a/src/app/haxe/ru/m/puzzlez/view/PresetFrame.hx +++ b/src/app/haxe/ru/m/puzzlez/view/PresetFrame.hx @@ -6,6 +6,7 @@ import hw.view.form.ToggleButtonView; import hw.view.frame.FrameSwitcher; import hw.view.frame.FrameView; import ru.m.puzzlez.game.GameUtil; +import ru.m.puzzlez.net.Network; import ru.m.puzzlez.proto.game.ImageId; import ru.m.puzzlez.view.common.PresetView; @@ -17,7 +18,7 @@ import ru.m.puzzlez.view.common.PresetView; @:provide var switcher:FrameSwitcher; - // @:provide var network:Network; + @:provide var network:Network; private var imageId:ImageId; public function new() { @@ -55,7 +56,7 @@ import ru.m.puzzlez.view.common.PresetView; private function start(online:Bool = false):Void { if (online) { - // network.createGame(imageView.state.preset).then(state -> switcher.change(GameFrame.ID, state)); + network.createGame(imageView.state.preset).then(state -> switcher.change(GameFrame.ID, state)); } else { switcher.change(GameFrame.ID, imageView.state); } diff --git a/src/app/haxe/ru/m/puzzlez/view/PresetFrame.yaml b/src/app/haxe/ru/m/puzzlez/view/PresetFrame.yaml index 98af812..c97634a 100644 --- a/src/app/haxe/ru/m/puzzlez/view/PresetFrame.yaml +++ b/src/app/haxe/ru/m/puzzlez/view/PresetFrame.yaml @@ -29,7 +29,7 @@ views: geometry.margin.left: 15 text: Network +onPress: ~start(true) - visible: false + visible: true - id: image $type: ru.m.puzzlez.view.common.PresetView geometry.stretch: true diff --git a/src/app/haxe/ru/m/puzzlez/view/StartFrame.hx b/src/app/haxe/ru/m/puzzlez/view/StartFrame.hx index 855c0b3..eadfec0 100644 --- a/src/app/haxe/ru/m/puzzlez/view/StartFrame.hx +++ b/src/app/haxe/ru/m/puzzlez/view/StartFrame.hx @@ -6,6 +6,7 @@ import hw.view.frame.FrameSwitcher; import hw.view.frame.FrameView; import ru.m.puzzlez.FileUtil; import ru.m.puzzlez.image.ImageSourceBundle; +import ru.m.puzzlez.net.NetworkSource; import ru.m.puzzlez.proto.game.GameStatus; import ru.m.puzzlez.storage.FileStorage; import ru.m.puzzlez.storage.GameStorage; @@ -28,6 +29,7 @@ import ru.m.update.Updater; @:provide var fileStorage:FileStorage; @:provide var gameStorage:GameStorage; @:provide var sourceBundle:ImageSourceBundle; + @:provide var networkSource:NetworkSource; private var fileSource:ImageListConfig = {title: "Files", sourceId: "file"}; private var startedGames:GameListConfig = { @@ -40,6 +42,10 @@ import ru.m.update.Updater; source: gameStorage, filter: ["status" => GameStatus.COMPLETE] }; + private var networkGames:GameListConfig = { + title: "Network", + source: networkSource + }; public function new() { super(ID); diff --git a/src/app/haxe/ru/m/puzzlez/view/StartFrame.yaml b/src/app/haxe/ru/m/puzzlez/view/StartFrame.yaml index e8a85f4..db93b3b 100644 --- a/src/app/haxe/ru/m/puzzlez/view/StartFrame.yaml +++ b/src/app/haxe/ru/m/puzzlez/view/StartFrame.yaml @@ -39,6 +39,10 @@ views: $type: hw.view.form.ButtonView text: Completed +onPress: ~showGames(completedGames) + - id: networkButton + $type: hw.view.form.ButtonView + text: Network + +onPress: ~showGames(networkGames) - $type: hw.view.form.ButtonView text: Upload geometry.margin.left: 30 diff --git a/src/common/haxe/ru/m/SignalUtil.hx b/src/common/haxe/ru/m/SignalUtil.hx new file mode 100644 index 0000000..953c21a --- /dev/null +++ b/src/common/haxe/ru/m/SignalUtil.hx @@ -0,0 +1,18 @@ +package ru.m; + +import hw.signal.Signal; +import promhx.Deferred; +import promhx.Promise; + +class SignalUtil { + public static function next(signal:Signal):Promise { + var d:Deferred = new Deferred(); + var receiver:T->Void; + receiver = (value:T) -> { + signal.disconnect(receiver); + d.resolve(value); + }; + signal.connect(receiver); + return d.promise(); + } +} diff --git a/src/server/haxe/ru/m/puzzlez/GameSession.hx b/src/server/haxe/ru/m/puzzlez/GameSession.hx index aff4a49..0ceba9e 100644 --- a/src/server/haxe/ru/m/puzzlez/GameSession.hx +++ b/src/server/haxe/ru/m/puzzlez/GameSession.hx @@ -5,8 +5,8 @@ import ru.m.puzzlez.proto.pack.GameListResponse; import ru.m.puzzlez.proto.pack.GameListRequest; import hw.connect.session.ProtoSession; import hw.log.BaseLogger.LoggerUtil; -import ru.m.puzzlez.image.Game; -import ru.m.puzzlez.image.GameUtil; +import ru.m.puzzlez.game.Game; +import ru.m.puzzlez.game.GameUtil; import ru.m.puzzlez.proto.core.User; import ru.m.puzzlez.proto.event.GameAction; import ru.m.puzzlez.proto.event.GameEvent;