3 Commits
Author SHA1 Message Date
shmyga 347e20ab6b feat(app): add network game mode 2026-05-20 00:06:13 +03:00
shmyga 9e67513897 build(npm): update gulp-haxetool 2026-05-20 00:05:30 +03:00
shmyga e41d461ba6 feat(app): update nginx image source 2026-05-20 00:03:52 +03:00
28 changed files with 13943 additions and 13702 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
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
PUBLISH_PATH=$HOME/public/$PROJECT
BUILD_PATH=./build
@@ -8,7 +8,7 @@ KEY_STORE=<keystore.jks>
KEY_PASS=<passphrase>
# publish
PUBLISH_REPO=https://git.shmyga.ru/api/packages/InfernalGames
REPO=https://git.shmyga.ru/api/packages/InfernalGames
PUBLISH_USER=<username>
PUBLISH_PASSWORD=<passphrase>
+5 -5
View File
@@ -1,4 +1,4 @@
build/
/build/
target/
src-gen/
out/
@@ -10,8 +10,8 @@ out/
.idea/
.ideaDataSources/
config.json
node_modules
log
ansible/*.retry
/node_modules
/log
/ansible/*.retry
.npmrc
.env
.env
-23
View File
@@ -1,23 +0,0 @@
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"
+10 -11
View File
@@ -1,10 +1,10 @@
FROM ubuntu:noble AS base
RUN apt update && apt install -y \
nodejs \
npm \
openjdk-11-jre \
protobuf-compiler \
jq
nodejs \
npm \
openjdk-11-jre \
protobuf-compiler \
jq
RUN node -v
RUN npm -v
@@ -12,17 +12,16 @@ FROM base AS builder
ENV GRADLE_USER_HOME=/sdk/gradle
WORKDIR /app
COPY package.json package-lock.json ./
RUN --mount=type=cache,target=/root/.npm \
npm ci
RUN npm ci
COPY gulpfile.js protohx.json ./
COPY tasks ./tasks
COPY config.example.json ./config.example.json
RUN --mount=type=secret,id=KEY_STORE \
cat /run/secrets/KEY_STORE > ./key.jks
cat /run/secrets/KEY_STORE > ./key.jks
RUN --mount=type=secret,id=KEY_PASS,env=KEY_PASS \
jq --arg key_pass "$KEY_PASS" \
'.SdkDir = "/sdk" | .PublishDir = "/app/publish" | .Key.store = "key.jks" | .Key.pass = $key_pass' \
config.example.json > config.json
jq --arg key_pass "$KEY_PASS" \
'.SdkDir = "/sdk" | .PublishDir = "/app/publish" | .Key.store = "key.jks" | .Key.pass = $key_pass' \
config.example.json > config.json
COPY src ./src
COPY dependencies ./dependencies
VOLUME ["/sdk", "/app/build", "/app/target", "/app/publish", "/app/src-gen"]
+11
View File
@@ -0,0 +1,11 @@
[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
@@ -0,0 +1,11 @@
---
- 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
@@ -0,0 +1,2 @@
all:
hosts: localhost
+9
View File
@@ -0,0 +1,9 @@
---
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
@@ -0,0 +1,4 @@
all:
hosts: shmyga.ru
vars:
config_src: "/home/holop/puzzlez/config.json"
+5
View File
@@ -0,0 +1,5 @@
---
- name: ansible-deploy
src: git@bitbucket.org:shmyga/ansible-deploy.git
version: master
scm: git
+2
View File
@@ -0,0 +1,2 @@
config_src: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json"
config_dest: "{{ deploy_release_dir }}/config.json"
+11
View File
@@ -0,0 +1,11 @@
---
- 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": "$HOME/sdk",
"SdkDir": "C:\\sdk",
"BuildDir": null,
"PublishDir": "$HOME/public/puzzlez",
"PublishDir": "",
"PublishUrl": "https://shmyga.ru/repo/puzzlez",
"Develop": false,
"Key": {
+12 -5
View File
@@ -4,21 +4,21 @@ const Config = require("./config.json");
const packageInfo = require("./package.json");
const { System, Sdk, Haxe, Project } = require("gulp-haxetool");
const dateformat = require("dateformat");
const argv = require("yargs").argv;
const publish = require("./tasks/gulp-publish");
const os = require("os");
const resolvePath = (path) => path.replace("$HOME", os.homedir());
Project.useRuffle();
if (packageInfo.haxe) {
Haxe.VERSION = packageInfo.haxe;
}
if (Config.SdkDir) {
Sdk.dir = resolvePath(Config.SdkDir);
Sdk.dir = Config.SdkDir;
}
if (Config.BuildDir) {
Haxe.buildDir = resolvePath(Config.BuildDir);
Haxe.buildDir = Config.BuildDir;
}
exports.clean = function clean() {
@@ -66,6 +66,9 @@ const config = new Project.Config({
flags: ["proto_debug"],
});
const host = argv.host || "localhost";
const port = argv.port || 5000;
const app = new Project(
Project.BuildSystem.OPENFL,
[
@@ -90,6 +93,10 @@ const app = new Project(
width: 1280,
height: 768,
},
macros: [
`CompilationOption.set('host','${host}')`,
`CompilationOption.set('port',${port})`,
],
flags: ["app"],
}),
).bind(module, gulp);
@@ -107,7 +114,7 @@ const server = new Project(
module.exports.publish = publish(
packageInfo.name,
packageInfo.version,
resolvePath(Config.PublishDir),
Config.PublishDir,
Config.PublishUrl,
);
+13731 -13594
View File
File diff suppressed because it is too large Load Diff
+4 -6
View File
@@ -1,10 +1,7 @@
{
"name": "puzzlez",
"version": "0.6.1",
"scripts": {
"build": "gulp",
"dev": "gulp app:flash:test"
},
"private": true,
"devDependencies": {
"dateformat": "^3.0.3",
"fs-extra": "^10.0.0",
@@ -12,7 +9,7 @@
"gulp-add": "0.0.2",
"gulp-clean": "^0.4.0",
"gulp-cli": "^2.2.0",
"gulp-haxetool": "^0.1.9",
"gulp-haxetool": "^0.2.1",
"yargs": "^13.2.4"
},
"haxeDependencies": {
@@ -23,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"
}
+6
View File
@@ -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();
}
}
+19 -26
View File
@@ -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<String, GameState> {
using ru.m.SignalUtil;
@:provide class Network {
public var userSignal:Signal<User> = new Signal();
public var notificationSignal:Signal<NotificationResponse> = new Signal();
public var listSignal:Signal<GameListResponse> = new Signal();
public var joinSignal:Signal<GameState> = new Signal();
public var gameEventSignal:Signal<GameEvent> = new Signal();
private var connection:IConnection<Request, Response>;
public var connection:IConnection<Request, Response>;
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<User> {
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<GameState> {
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<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;
}
}
+8 -2
View File
@@ -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 {
@@ -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<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,6 +25,7 @@ class NginxImageSource implements ImageSource {
public var id(default, never):String = "nginx";
private var baseUrl:String;
private var cache:Map<String, Promise<NginxResponse>> = new Map();
public function new(baseUrl:String) {
this.baseUrl = baseUrl;
@@ -36,31 +37,35 @@ class NginxImageSource implements ImageSource {
public function getPage(page:Page):Promise<DataPage<ImageId>> {
var category = page.filter.get("category");
return new JsonLoader<NginxResponse>().GET(category != null ? this.baseUrl + category + "/" : this.baseUrl)
.then((response:NginxResponse) -> {
var data:Array<ImageId> = [];
for (item in response) {
if (item.type == NginxResponseItemType.FILE) {
var itemId = category != null ? category + "@" + item.name : item.name;
data.push(new ImageId().setSource(id).setId(itemId));
}
var url = category != null ? this.baseUrl + category + "/" : this.baseUrl;
if (!this.cache.exists(url)) {
this.cache.set(url, new JsonLoader<NginxResponse>().GET(url));
}
return this.cache.get(url).then((response:NginxResponse) -> {
var data:Array<ImageId> = [];
for (item in response) {
if (item.type == NginxResponseItemType.FILE) {
var itemId = category != null ? category + "@" + item.name : item.name;
data.push(new ImageId().setSource(id).setId(itemId));
}
return {
page: page,
data: data,
total: response.length,
}
});
}
data = data.slice(page.index * page.count, (page.index + 1) * page.count);
return {
page: page,
data: data,
total: response.length,
}
});
}
public function load(id:String, thumb:Bool = false):Promise<ImageValue> {
var url = this.baseUrl + StringTools.replace(id, "@", "/");
if (thumb) {
var parts = url.split(".");
var index = parts.length - 2;
parts[index] = parts[index] + "-thumbnail";
url = parts.join(".");
}
// TODO: default size by screen width?
var width = thumb ? 360 : 1920;
var parts = url.split(".");
var index = parts.length - 2;
parts[index] = parts[index] + '-w${width}';
url = parts.join(".");
return Promise.promise(ImageValue.URL(url));
}
+2 -1
View File
@@ -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);
}
@@ -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);
}
@@ -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
@@ -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);
@@ -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
+18
View File
@@ -0,0 +1,18 @@
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 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;