1 Commits
Author SHA1 Message Date
shmyga 5b9c3655d1 ci(pm): add project-manager preset 2026-10-02 15:56:03 +03:00
29 changed files with 13677 additions and 13982 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
PROJECT=puzzlez PROJECT=puzzlez
VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+.\d+') #VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+.\d+')
SDK_PATH=$HOME/sdk SDK_PATH=$HOME/sdk
PUBLISH_PATH=$HOME/public/$PROJECT PUBLISH_PATH=$HOME/public/$PROJECT
BUILD_PATH=./build BUILD_PATH=./build
@@ -8,7 +8,7 @@ KEY_STORE=<keystore.jks>
KEY_PASS=<passphrase> KEY_PASS=<passphrase>
# publish # publish
REPO=https://git.shmyga.ru/api/packages/InfernalGames PUBLISH_REPO=https://git.shmyga.ru/api/packages/InfernalGames
PUBLISH_USER=<username> PUBLISH_USER=<username>
PUBLISH_PASSWORD=<passphrase> PUBLISH_PASSWORD=<passphrase>
+4 -4
View File
@@ -1,4 +1,4 @@
/build/ build/
target/ target/
src-gen/ src-gen/
out/ out/
@@ -10,8 +10,8 @@ out/
.idea/ .idea/
.ideaDataSources/ .ideaDataSources/
config.json config.json
/node_modules node_modules
/log log
/ansible/*.retry ansible/*.retry
.npmrc .npmrc
.env .env
+23
View File
@@ -0,0 +1,23 @@
modules = ["."]
[presets.docker]
variables.docker_target = "web"
variables.docker_name = "{{ project_name }}-web"
[presets.docker.tasks.build.compose]
priority = 1
variables.sdk_path = "{{ 'SDK_PATH' | env('$HOME/sdk') }}"
variables.publish_path = "{{ 'PUBLISH_PATH' | env('$HOME/public/' + project_name) }}"
variables.build_path = "{{ 'BUILD_PATH' | env('./build') }}"
variables.target_path = "{{ 'TARGET_PATH' | env('./target') }}"
commands = [
"mkdir -p \"{{ sdk_path }}\" \"{{ publish_path }}\" \"{{ build_path }}\" \"{{ target_path }}\" \"src-gen\"",
"docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder",
]
[presets.gitea]
variables.publish_artefacts.debian = "target/app/debian/{{ project_name }}_{{ project_version }}_all.deb"
variables.publish_artefacts.android = "target/app/android/{{ project_name }}_{{ project_version }}.apk"
variables.publish_artefacts.archive_linux = "target/app/archive/{{ project_name }}_{{ project_version }}_linux.tar.gz"
variables.publish_artefacts.archive_win = "target/app/archive/{{ project_name }}_{{ project_version }}_win.zip"
variables.publish_artefacts.installer = "target/app/installer/{{ project_name }}_{{ project_version }}.exe"
+2 -1
View File
@@ -12,7 +12,8 @@ FROM base AS builder
ENV GRADLE_USER_HOME=/sdk/gradle ENV GRADLE_USER_HOME=/sdk/gradle
WORKDIR /app WORKDIR /app
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
RUN npm ci RUN --mount=type=cache,target=/root/.npm \
npm ci
COPY gulpfile.js protohx.json ./ COPY gulpfile.js protohx.json ./
COPY tasks ./tasks COPY tasks ./tasks
COPY config.example.json ./config.example.json COPY config.example.json ./config.example.json
-11
View File
@@ -1,11 +0,0 @@
[defaults]
hash_behaviour = merge
host_key_checking = False
#callback_whitelist = profile_tasks
display_skipped_hosts = False
stdout_callback = yaml
bin_ansible_callbacks = True
[ssh_connection]
pipelining = True
ssh_args = -o ForwardAgent=yes
-11
View File
@@ -1,11 +0,0 @@
---
- hosts: all
vars:
ansible_user: "{{ deploy_user }}"
roles:
- ansible-deploy
- build
post_tasks:
- include_role:
name: ansible-deploy
tasks_from: complete.yml
-2
View File
@@ -1,2 +0,0 @@
all:
hosts: localhost
-9
View File
@@ -1,9 +0,0 @@
---
project_name: puzzlez
project_user: holop
deploy_user: "{{ project_user }}"
deploy_project: "{{ project_name }}"
deploy_repo_url: "git@bitbucket.org:infernalgames/{{ project_name }}.git"
deploy_repo_version: master
deploy_npm: yes
-4
View File
@@ -1,4 +0,0 @@
all:
hosts: shmyga.ru
vars:
config_src: "/home/holop/puzzlez/config.json"
-5
View File
@@ -1,5 +0,0 @@
---
- name: ansible-deploy
src: git@bitbucket.org:shmyga/ansible-deploy.git
version: master
scm: git
-2
View File
@@ -1,2 +0,0 @@
config_src: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json"
config_dest: "{{ deploy_release_dir }}/config.json"
-11
View File
@@ -1,11 +0,0 @@
---
- name: "Copy config"
copy:
src: "{{ config_src }}"
dest: "{{ config_dest }}"
remote_src: true
- name: "Gulp build"
command: "{{ deploy_release_dir }}/node_modules/.bin/gulp default"
args:
chdir: "{{ deploy_release_dir }}"
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"SdkDir": "C:\\sdk", "SdkDir": "$HOME/sdk",
"BuildDir": null, "BuildDir": null,
"PublishDir": "", "PublishDir": "$HOME/public/puzzlez",
"PublishUrl": "https://shmyga.ru/repo/puzzlez", "PublishUrl": "https://shmyga.ru/repo/puzzlez",
"Develop": false, "Develop": false,
"Key": { "Key": {
+5 -12
View File
@@ -4,21 +4,21 @@ const Config = require("./config.json");
const packageInfo = require("./package.json"); const packageInfo = require("./package.json");
const { System, Sdk, Haxe, Project } = require("gulp-haxetool"); const { System, Sdk, Haxe, Project } = require("gulp-haxetool");
const dateformat = require("dateformat"); const dateformat = require("dateformat");
const argv = require("yargs").argv;
const publish = require("./tasks/gulp-publish"); const publish = require("./tasks/gulp-publish");
const os = require("os");
Project.useRuffle(); const resolvePath = (path) => path.replace("$HOME", os.homedir());
if (packageInfo.haxe) { if (packageInfo.haxe) {
Haxe.VERSION = packageInfo.haxe; Haxe.VERSION = packageInfo.haxe;
} }
if (Config.SdkDir) { if (Config.SdkDir) {
Sdk.dir = Config.SdkDir; Sdk.dir = resolvePath(Config.SdkDir);
} }
if (Config.BuildDir) { if (Config.BuildDir) {
Haxe.buildDir = Config.BuildDir; Haxe.buildDir = resolvePath(Config.BuildDir);
} }
exports.clean = function clean() { exports.clean = function clean() {
@@ -66,9 +66,6 @@ const config = new Project.Config({
flags: ["proto_debug"], flags: ["proto_debug"],
}); });
const host = argv.host || "localhost";
const port = argv.port || 5000;
const app = new Project( const app = new Project(
Project.BuildSystem.OPENFL, Project.BuildSystem.OPENFL,
[ [
@@ -93,10 +90,6 @@ const app = new Project(
width: 1280, width: 1280,
height: 768, height: 768,
}, },
macros: [
`CompilationOption.set('host','${host}')`,
`CompilationOption.set('port',${port})`,
],
flags: ["app"], flags: ["app"],
}), }),
).bind(module, gulp); ).bind(module, gulp);
@@ -114,7 +107,7 @@ const server = new Project(
module.exports.publish = publish( module.exports.publish = publish(
packageInfo.name, packageInfo.name,
packageInfo.version, packageInfo.version,
Config.PublishDir, resolvePath(Config.PublishDir),
Config.PublishUrl, Config.PublishUrl,
); );
+169 -306
View File
File diff suppressed because it is too large Load Diff
+6 -4
View File
@@ -1,7 +1,10 @@
{ {
"name": "puzzlez", "name": "puzzlez",
"version": "0.6.1", "version": "0.6.1",
"private": true, "scripts": {
"build": "gulp",
"dev": "gulp app:flash:test"
},
"devDependencies": { "devDependencies": {
"dateformat": "^3.0.3", "dateformat": "^3.0.3",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
@@ -9,7 +12,7 @@
"gulp-add": "0.0.2", "gulp-add": "0.0.2",
"gulp-clean": "^0.4.0", "gulp-clean": "^0.4.0",
"gulp-cli": "^2.2.0", "gulp-cli": "^2.2.0",
"gulp-haxetool": "^0.2.1", "gulp-haxetool": "^0.1.9",
"yargs": "^13.2.4" "yargs": "^13.2.4"
}, },
"haxeDependencies": { "haxeDependencies": {
@@ -20,8 +23,7 @@
"svg": "1.1.3", "svg": "1.1.3",
"protohx": "0.4.6", "protohx": "0.4.6",
"yield": "3.2.2", "yield": "3.2.2",
"formatter": "1.16.0", "formatter": "1.16.0"
"hxWebSockets": "1.4.0"
}, },
"haxe": "4.2.5" "haxe": "4.2.5"
} }
-6
View File
@@ -4,8 +4,6 @@ import hw.app.App;
import hw.app.Const; import hw.app.Const;
import hw.log.TraceLogger; import hw.log.TraceLogger;
import ru.m.puzzlez.image.ImageSourceBundle; 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.render.part.IPartBuilder;
import ru.m.puzzlez.settings.Settings; import ru.m.puzzlez.settings.Settings;
import ru.m.puzzlez.source.AssetImageSource; import ru.m.puzzlez.source.AssetImageSource;
@@ -20,15 +18,12 @@ import ru.m.update.Updater;
class PuzzlezApp { class PuzzlezApp {
@:provide static var updater:Updater; @:provide static var updater:Updater;
@:provide static var sourceBundle:ImageSourceBundle; @:provide static var sourceBundle:ImageSourceBundle;
@:provide static var network:Network;
public static function main() { public static function main() {
// ToDo: fix @:provide macro // ToDo: fix @:provide macro
Settings; Settings;
IPartBuilder; IPartBuilder;
GameStorage; GameStorage;
Network;
NetworkSource;
sourceBundle.register(new AssetImageSource()); sourceBundle.register(new AssetImageSource());
sourceBundle.register(new FileImageSource()); sourceBundle.register(new FileImageSource());
sourceBundle.register(new PixabayImageSource(CompilationOption.get("PIXABAY_KEY"))); sourceBundle.register(new PixabayImageSource(CompilationOption.get("PIXABAY_KEY")));
@@ -41,6 +36,5 @@ class PuzzlezApp {
app.icon = openfl.Assets.getBitmapData("resources/icon.png"); app.icon = openfl.Assets.getBitmapData("resources/icon.png");
app.view = new PuzzlezAppView(); app.view = new PuzzlezAppView();
L.d("Puzzlez", "started"); L.d("Puzzlez", "started");
network.auth();
} }
} }
+25 -17
View File
@@ -5,6 +5,7 @@ import hw.connect.IConnection;
import hw.signal.Signal; import hw.signal.Signal;
import hw.storage.SharedObjectStorage; import hw.storage.SharedObjectStorage;
import promhx.Promise; import promhx.Promise;
import ru.m.data.IDataSource;
import ru.m.puzzlez.proto.core.User; import ru.m.puzzlez.proto.core.User;
import ru.m.puzzlez.proto.event.GameAction; import ru.m.puzzlez.proto.event.GameAction;
import ru.m.puzzlez.proto.event.GameEvent; import ru.m.puzzlez.proto.event.GameEvent;
@@ -12,34 +13,29 @@ import ru.m.puzzlez.proto.game.GamePreset;
import ru.m.puzzlez.proto.game.GameState; import ru.m.puzzlez.proto.game.GameState;
import ru.m.puzzlez.proto.pack.AuthRequest; import ru.m.puzzlez.proto.pack.AuthRequest;
import ru.m.puzzlez.proto.pack.GameActionRequest; 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.GameJoinRequest;
import ru.m.puzzlez.proto.pack.GameLeaveRequest; import ru.m.puzzlez.proto.pack.GameLeaveRequest;
import ru.m.puzzlez.proto.pack.GameListRequest;
import ru.m.puzzlez.proto.pack.GameListResponse; import ru.m.puzzlez.proto.pack.GameListResponse;
import ru.m.puzzlez.proto.pack.NotificationResponse; import ru.m.puzzlez.proto.pack.NotificationResponse;
import ru.m.puzzlez.proto.pack.Request; import ru.m.puzzlez.proto.pack.Request;
import ru.m.puzzlez.proto.pack.Response; import ru.m.puzzlez.proto.pack.Response;
using ru.m.SignalUtil; @:provide class Network implements IDataSource<String, GameState> {
@:provide class Network {
public var userSignal:Signal<User> = new Signal(); public var userSignal:Signal<User> = new Signal();
public var notificationSignal:Signal<NotificationResponse> = new Signal(); public var notificationSignal:Signal<NotificationResponse> = new Signal();
public var listSignal:Signal<GameListResponse> = new Signal(); public var listSignal:Signal<GameListResponse> = new Signal();
public var joinSignal:Signal<GameState> = new Signal(); public var joinSignal:Signal<GameState> = new Signal();
public var gameEventSignal:Signal<GameEvent> = new Signal(); public var gameEventSignal:Signal<GameEvent> = new Signal();
public var connection:IConnection<Request, Response>; private var connection:IConnection<Request, Response>;
private var storage:SharedObjectStorage; private var storage:SharedObjectStorage;
private static var USER_KEY = "user"; private static var USER_KEY = "user";
public function new() { public function new() {
storage = new SharedObjectStorage("network/2"); storage = new SharedObjectStorage("network/2");
var host:String = CompilationOption.get("host"); connection = ConnectionFactory.buildClientConnection("127.0.0.1", 5000, Response);
var port:Int = cast(CompilationOption.get("port"), Int);
connection = ConnectionFactory.buildClientConnection(host, port, Response);
connection.handler.connect(onConnectionChange); connection.handler.connect(onConnectionChange);
connection.receiveHandler.connect(onReceivePacket); connection.receiveHandler.connect(onReceivePacket);
connection.connect().catchError(_ -> {}); connection.connect().catchError(_ -> {});
@@ -49,23 +45,17 @@ using ru.m.SignalUtil;
if (storage.exists(USER_KEY)) { if (storage.exists(USER_KEY)) {
return storage.read(USER_KEY); return storage.read(USER_KEY);
} else { } else {
var uuid = IdUtil.generate(); return new User().setName('Anonimus #${IdUtil.generate()}');
return new User().setUuid(uuid).setName('Anonimus #${uuid}');
} }
} }
public function auth():Promise<User> { public function auth():Promise<User> {
try {
connection.send(new Request().setAuth(new AuthRequest().setUser(restoreUser()))); connection.send(new Request().setAuth(new AuthRequest().setUser(restoreUser())));
return userSignal.next(); return userSignal.next();
} catch (error:Dynamic) {
L.w("network", "auth", error);
return Promise.promise(null);
}
} }
public function createGame(preset:GamePreset):Promise<GameState> { public function createGame(preset:GamePreset):Promise<GameState> {
connection.send(new Request().setCreate(new GameCreateRequest().setPreset(preset))); connection.send(new Request().setJoin(new GameJoinRequest().setPreset(preset)));
return joinSignal.next(); return joinSignal.next();
} }
@@ -109,4 +99,22 @@ using ru.m.SignalUtil;
} }
} }
} }
public function getPage(page:Page):Promise<DataPage<GameState>> {
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;
}
} }
+1 -7
View File
@@ -2,12 +2,10 @@ package ru.m.puzzlez.net;
import ru.m.puzzlez.proto.event.GameStart; import ru.m.puzzlez.proto.event.GameStart;
import hw.signal.Signal; import hw.signal.Signal;
import ru.m.puzzlez.game.IGame; import ru.m.puzzlez.image.IGame;
import ru.m.puzzlez.proto.event.GameAction; import ru.m.puzzlez.proto.event.GameAction;
import ru.m.puzzlez.proto.event.GameEvent; import ru.m.puzzlez.proto.event.GameEvent;
import ru.m.puzzlez.proto.game.GameState; 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 { class NetworkGame implements IGame {
public var state(default, null):GameState; public var state(default, null):GameState;
@@ -21,12 +19,8 @@ class NetworkGame implements IGame {
} }
public function action(action:GameAction):Void { public function action(action:GameAction):Void {
if (action.action == Action.MOVE) {
events.emit(EventUtil.action(action));
} else {
network.sendGameAction(action); network.sendGameAction(action);
} }
}
public function start():Void { public function start():Void {
events.emit(new GameEvent().setStart(new GameStart().setState(state))); events.emit(new GameEvent().setStart(new GameStart().setState(state)));
@@ -1,65 +0,0 @@
package ru.m.puzzlez.net;
import hw.connect.IConnection;
import hw.signal.Signal;
import promhx.Deferred;
import promhx.Promise;
enum NetworkState {
CONNECT;
ACTIVE;
DISCONNECT;
ERROR(error:Dynamic);
}
class ReconnectTimer {
private var interval:Float;
private var lastConnected:Float;
private var lastActivity:Float;
private var lastError:Float;
private var next:Float;
public function new(interval:Float) {
this.interval = interval;
}
public function connect():Promise<Void> {
d = new Deferred();
d.resolve();
return d.promise();
}
public function onActivity() {}
public function onError() {}
}
class NetworkManager {
public var state(default, null):Signal<NetworkState>;
private var reconnectTimer:ReconnectTimer;
public function new(connection:IConnection<Dynamic, Dynamic>) {
this.reconnectTimer = new ReconnectTimer(5.0);
connection.handler.connect(onConnectionChange);
}
public function reconnect() {
return this.reconnectTimer.connect().then(() => {
state.emit(CONNECT);
connection.connect();
});
}
private function onConnectionChange(event:ConnectionEvent):Void {
switch event {
case CONNECTED:
state.emit(ACTIVE);
case DISCONNECTED:
state.emit(DISCONNECT);
case ERROR(error):
state.emit(ERROR(error));
this.reconnect();
}
}
}
@@ -1,28 +0,0 @@
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<GameState> {
@:provide private var network:Network;
public function getPage(page:Page):Promise<DataPage<GameState>> {
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,
}));
}
}
@@ -25,7 +25,6 @@ class NginxImageSource implements ImageSource {
public var id(default, never):String = "nginx"; public var id(default, never):String = "nginx";
private var baseUrl:String; private var baseUrl:String;
private var cache:Map<String, Promise<NginxResponse>> = new Map();
public function new(baseUrl:String) { public function new(baseUrl:String) {
this.baseUrl = baseUrl; this.baseUrl = baseUrl;
@@ -37,11 +36,8 @@ class NginxImageSource implements ImageSource {
public function getPage(page:Page):Promise<DataPage<ImageId>> { public function getPage(page:Page):Promise<DataPage<ImageId>> {
var category = page.filter.get("category"); var category = page.filter.get("category");
var url = category != null ? this.baseUrl + category + "/" : this.baseUrl; return new JsonLoader<NginxResponse>().GET(category != null ? this.baseUrl + category + "/" : this.baseUrl)
if (!this.cache.exists(url)) { .then((response:NginxResponse) -> {
this.cache.set(url, new JsonLoader<NginxResponse>().GET(url));
}
return this.cache.get(url).then((response:NginxResponse) -> {
var data:Array<ImageId> = []; var data:Array<ImageId> = [];
for (item in response) { for (item in response) {
if (item.type == NginxResponseItemType.FILE) { if (item.type == NginxResponseItemType.FILE) {
@@ -49,7 +45,6 @@ class NginxImageSource implements ImageSource {
data.push(new ImageId().setSource(id).setId(itemId)); data.push(new ImageId().setSource(id).setId(itemId));
} }
} }
data = data.slice(page.index * page.count, (page.index + 1) * page.count);
return { return {
page: page, page: page,
data: data, data: data,
@@ -60,12 +55,12 @@ class NginxImageSource implements ImageSource {
public function load(id:String, thumb:Bool = false):Promise<ImageValue> { public function load(id:String, thumb:Bool = false):Promise<ImageValue> {
var url = this.baseUrl + StringTools.replace(id, "@", "/"); var url = this.baseUrl + StringTools.replace(id, "@", "/");
// TODO: default size by screen width? if (thumb) {
var width = thumb ? 360 : 1920;
var parts = url.split("."); var parts = url.split(".");
var index = parts.length - 2; var index = parts.length - 2;
parts[index] = parts[index] + '-w${width}'; parts[index] = parts[index] + "-thumbnail";
url = parts.join("."); url = parts.join(".");
}
return Promise.promise(ImageValue.URL(url)); return Promise.promise(ImageValue.URL(url));
} }
+1 -2
View File
@@ -7,7 +7,6 @@ import hw.view.popup.ConfirmView;
import promhx.Promise; import promhx.Promise;
import ru.m.puzzlez.game.Game; import ru.m.puzzlez.game.Game;
import ru.m.puzzlez.game.IGame; 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.GameAction;
import ru.m.puzzlez.proto.event.GameEvent; import ru.m.puzzlez.proto.event.GameEvent;
import ru.m.puzzlez.proto.event.gameaction.Action; import ru.m.puzzlez.proto.event.gameaction.Action;
@@ -38,7 +37,7 @@ import ru.m.puzzlez.view.popup.PreviewPopup;
L.d("Frame", '$ID: ${state.preset.image.source}:${state.preset.image.id}'); L.d("Frame", '$ID: ${state.preset.image.source}:${state.preset.image.id}');
onHide(); onHide();
if (state.online) { if (state.online) {
game = new NetworkGame(state); // game = new NetworkGame(state);
} else { } else {
game = new Game(state); game = new Game(state);
} }
@@ -6,7 +6,6 @@ import hw.view.form.ToggleButtonView;
import hw.view.frame.FrameSwitcher; import hw.view.frame.FrameSwitcher;
import hw.view.frame.FrameView; import hw.view.frame.FrameView;
import ru.m.puzzlez.game.GameUtil; import ru.m.puzzlez.game.GameUtil;
import ru.m.puzzlez.net.Network;
import ru.m.puzzlez.proto.game.ImageId; import ru.m.puzzlez.proto.game.ImageId;
import ru.m.puzzlez.view.common.PresetView; import ru.m.puzzlez.view.common.PresetView;
@@ -18,7 +17,7 @@ import ru.m.puzzlez.view.common.PresetView;
@:provide var switcher:FrameSwitcher; @:provide var switcher:FrameSwitcher;
@:provide var network:Network; // @:provide var network:Network;
private var imageId:ImageId; private var imageId:ImageId;
public function new() { public function new() {
@@ -56,7 +55,7 @@ import ru.m.puzzlez.view.common.PresetView;
private function start(online:Bool = false):Void { private function start(online:Bool = false):Void {
if (online) { 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 { } else {
switcher.change(GameFrame.ID, imageView.state); switcher.change(GameFrame.ID, imageView.state);
} }
@@ -29,7 +29,7 @@ views:
geometry.margin.left: 15 geometry.margin.left: 15
text: Network text: Network
+onPress: ~start(true) +onPress: ~start(true)
visible: true visible: false
- id: image - id: image
$type: ru.m.puzzlez.view.common.PresetView $type: ru.m.puzzlez.view.common.PresetView
geometry.stretch: true geometry.stretch: true
@@ -6,7 +6,6 @@ import hw.view.frame.FrameSwitcher;
import hw.view.frame.FrameView; import hw.view.frame.FrameView;
import ru.m.puzzlez.FileUtil; import ru.m.puzzlez.FileUtil;
import ru.m.puzzlez.image.ImageSourceBundle; import ru.m.puzzlez.image.ImageSourceBundle;
import ru.m.puzzlez.net.NetworkSource;
import ru.m.puzzlez.proto.game.GameStatus; import ru.m.puzzlez.proto.game.GameStatus;
import ru.m.puzzlez.storage.FileStorage; import ru.m.puzzlez.storage.FileStorage;
import ru.m.puzzlez.storage.GameStorage; import ru.m.puzzlez.storage.GameStorage;
@@ -29,7 +28,6 @@ import ru.m.update.Updater;
@:provide var fileStorage:FileStorage; @:provide var fileStorage:FileStorage;
@:provide var gameStorage:GameStorage; @:provide var gameStorage:GameStorage;
@:provide var sourceBundle:ImageSourceBundle; @:provide var sourceBundle:ImageSourceBundle;
@:provide var networkSource:NetworkSource;
private var fileSource:ImageListConfig = {title: "Files", sourceId: "file"}; private var fileSource:ImageListConfig = {title: "Files", sourceId: "file"};
private var startedGames:GameListConfig = { private var startedGames:GameListConfig = {
@@ -42,10 +40,6 @@ import ru.m.update.Updater;
source: gameStorage, source: gameStorage,
filter: ["status" => GameStatus.COMPLETE] filter: ["status" => GameStatus.COMPLETE]
}; };
private var networkGames:GameListConfig = {
title: "Network",
source: networkSource
};
public function new() { public function new() {
super(ID); super(ID);
@@ -39,10 +39,6 @@ views:
$type: hw.view.form.ButtonView $type: hw.view.form.ButtonView
text: Completed text: Completed
+onPress: ~showGames(completedGames) +onPress: ~showGames(completedGames)
- id: networkButton
$type: hw.view.form.ButtonView
text: Network
+onPress: ~showGames(networkGames)
- $type: hw.view.form.ButtonView - $type: hw.view.form.ButtonView
text: Upload text: Upload
geometry.margin.left: 30 geometry.margin.left: 30
-18
View File
@@ -1,18 +0,0 @@
package ru.m;
import hw.signal.Signal;
import promhx.Deferred;
import promhx.Promise;
class SignalUtil {
public static function next<T>(signal:Signal<T>):Promise<T> {
var d:Deferred<T> = new Deferred<T>();
var receiver:T->Void;
receiver = (value:T) -> {
signal.disconnect(receiver);
d.resolve(value);
};
signal.connect(receiver);
return d.promise();
}
}
+2 -2
View File
@@ -5,8 +5,8 @@ import ru.m.puzzlez.proto.pack.GameListResponse;
import ru.m.puzzlez.proto.pack.GameListRequest; import ru.m.puzzlez.proto.pack.GameListRequest;
import hw.connect.session.ProtoSession; import hw.connect.session.ProtoSession;
import hw.log.BaseLogger.LoggerUtil; import hw.log.BaseLogger.LoggerUtil;
import ru.m.puzzlez.game.Game; import ru.m.puzzlez.image.Game;
import ru.m.puzzlez.game.GameUtil; import ru.m.puzzlez.image.GameUtil;
import ru.m.puzzlez.proto.core.User; import ru.m.puzzlez.proto.core.User;
import ru.m.puzzlez.proto.event.GameAction; import ru.m.puzzlez.proto.event.GameAction;
import ru.m.puzzlez.proto.event.GameEvent; import ru.m.puzzlez.proto.event.GameEvent;