yourtar-cli 1.3.3 → 2.0.0

package/bin/backTemplate/Makefile

@@ -25,5 +25,12 @@ down:
 shell:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml run php_{{name}}_back bash
 
+update:
+	make down
+	git pull
+	make up
+	sudo chmod -R 777 var/ public/
+	make -C ~/gateway restart
+
 database:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml exec mysql_{{name}}_back mysql -uroot -p$(DATABASE_PASSWORD)

package/bin/backTemplate/config/packages/monolog.yaml

@@ -0,0 +1,61 @@
+monolog:
+    channels:
+        - deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists
+        - {{name}}
+
+when@dev:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+                channels: ["!event"]
+            # uncomment to get logging in your browser
+            # you may have to allow bigger header sizes in your Web server configuration
+            #firephp:
+            #    type: firephp
+            #    level: info
+            #chromephp:
+            #    type: chromephp
+            #    level: info
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine", "!console"]
+
+when@test:
+    monolog:
+        handlers:
+            main:
+                type: fingers_crossed
+                action_level: error
+                handler: nested
+                excluded_http_codes: [404, 405]
+                channels: ["!event"]
+            nested:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+
+when@prod:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                action_level: error
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: error
+                channels: ["!event", "{{name}}"]
+                service_name: "{{name}}"
+                formatter: monolog.formatter.json
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine"]
+                formatter: monolog.formatter.json
+            deprecation:
+                type: stream
+                channels: [deprecation]
+                path: php://stderr
+                formatter: monolog.formatter.json

package/bin/backTemplate/docker/config/promtail/config.yml

@@ -0,0 +1,18 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+clients:
+  - url: http://monitor.inf.yourtar.ru:3100/loki/api/v1/push
+
+scrape_configs:
+- job_name: system
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: varlogs
+      __path__: /var/log/*log

package/bin/backTemplate/docker/docker-compose.prod.yml

@@ -82,6 +82,17 @@ services:
 #      - {{name}}
 #    restart: on-failure
 
+#  promtail_{{name}}:
+#    image: grafana/promtail:latest
+#    container_name: promtail_{{name}}
+#    restart: unless-stopped
+#    environment:
+#      TZ: "Europe/Moscow"
+#    volumes:
+#      - ../var/log:/var/log
+#      - ./config/promtail/config.yml:/etc/promtail/config.yml
+#    command: -config.file=/etc/promtail/config.yml
+
 networks:
   yourtar:
     external:

package/bin/backTemplate/docker/docker-compose.stage.yml

@@ -77,6 +77,17 @@ services:
 #    networks:
 #      - demo
 
+#  promtail_{{name}}:
+#    image: grafana/promtail:latest
+#    container_name: promtail_{{name}}
+#    restart: unless-stopped
+#    environment:
+#      TZ: "Europe/Moscow"
+#    volumes:
+#      - ../var/log:/var/log
+#      - ./config/promtail/config.yml:/etc/promtail/config.yml
+#    command: -config.file=/etc/promtail/config.yml
+
 networks:
   demo:
     external: true

package/bin/backTemplate/src/Logging/YTExtraDataProcessor.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Logging;
+
+use Monolog\Attribute\AsMonologProcessor;
+use Monolog\LogRecord;
+use Monolog\Processor\ProcessorInterface;
+
+#[AsMonologProcessor]
+class YTExtraDataProcessor implements ProcessorInterface
+{
+    public function __invoke(LogRecord $record): LogRecord
+    {
+        // Add data to the 'extra' array
+        $record->extra['yourtar_log'] = true;
+        $record->extra['project'] = '{{name}}';
+
+        return $record;
+    }
+}

package/bin/botTemplate/.env.dev-example

@@ -19,5 +19,7 @@ CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$
 DEFAULT_URI="http://localhost:8000"
 
 ###> Bot ###
-BOT_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#TG_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#VK_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#MAX_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
 ###< Bot ###

package/bin/botTemplate/.env.prod-example

@@ -19,5 +19,7 @@ CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$
 DEFAULT_URI="http://localhost:8000"
 
 ###> Bot ###
-BOT_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#TG_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#VK_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#MAX_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
 ###< Bot ###

package/bin/botTemplate/.env.stage-example

@@ -19,5 +19,7 @@ CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$
 DEFAULT_URI="http://localhost:8000"
 
 ###> Bot ###
-BOT_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#TG_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#VK_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#MAX_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
 ###< Bot ###

package/bin/botTemplate/Makefile

@@ -18,13 +18,22 @@ else
 endif
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml exec php_{{name}}_back bin/console doctrine:database:create --if-not-exists
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml exec php_{{name}}_back bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration
+	make webhook
 
 down:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml down
+	make webhook-delete
 
 shell:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml run php_{{name}}_back bash
 
+update:
+	make down
+	git pull
+	make up
+	sudo chmod -R 777 var/ public/
+	make -C ~/gateway restart
+
 database:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml exec mysql_{{name}}_back mysql -uroot -p$(DATABASE_PASSWORD)
 
@@ -32,7 +41,17 @@ commands:
 	curl -X POST -H "Content-Type: application/json" -d "{\"commands\":[{\"command\":\"help\",\"description\":\"Помощь\"}]}" https://api.telegram.org/bot$(BOT_TOKEN)/setMyCommands
 
 webhook:
-	curl https://api.telegram.org:443/bot$(BOT_TOKEN)/setWebhook?url=$(domain)/api/message/
+ifndef TG_TOKEN
+	curl https://api.telegram.org:443/bot$(TG_TOKEN)/setWebhook?url=$(DEFAULT_URI)/api/message/
+endif
+ifndef MAX_TOKEN
+	curl -X POST "https://platform-api.max.ru/subscriptions" -H "Authorization: $(MAX_TOKEN)" -H "Content-Type: application/json" -d '{"url": "$(DEFAULT_URI)/api/message/max","update_types": ["message_created", "bot_started", "message_callback"],"secret": "your_secret"}'
+endif
 
 webhook-delete:
-	curl https://api.telegram.org:443/bot$(BOT_TOKEN)/deleteWebhook
+ifndef TG_TOKEN
+	curl https://api.telegram.org:443/bot$(TG_TOKEN)/deleteWebhook
+endif
+ifndef MAX_TOKEN
+	curl -X DELETE "https://platform-api.max.ru/subscriptions?url=$(DEFAULT_URI)/api/message/max" -H "Authorization: $(MAX_TOKEN)"
+endif

package/bin/botTemplate/config/packages/monolog.yaml

@@ -0,0 +1,61 @@
+monolog:
+    channels:
+        - deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists
+        - {{name}}
+
+when@dev:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+                channels: ["!event"]
+            # uncomment to get logging in your browser
+            # you may have to allow bigger header sizes in your Web server configuration
+            #firephp:
+            #    type: firephp
+            #    level: info
+            #chromephp:
+            #    type: chromephp
+            #    level: info
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine", "!console"]
+
+when@test:
+    monolog:
+        handlers:
+            main:
+                type: fingers_crossed
+                action_level: error
+                handler: nested
+                excluded_http_codes: [404, 405]
+                channels: ["!event"]
+            nested:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+
+when@prod:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                action_level: error
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: error
+                channels: ["!event", "{{name}}"]
+                service_name: "{{name}}"
+                formatter: monolog.formatter.json
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine"]
+                formatter: monolog.formatter.json
+            deprecation:
+                type: stream
+                channels: [deprecation]
+                path: php://stderr
+                formatter: monolog.formatter.json

package/bin/botTemplate/docker/config/promtail/config.yml

@@ -0,0 +1,18 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+clients:
+  - url: http://monitor.inf.yourtar.ru:3100/loki/api/v1/push
+
+scrape_configs:
+- job_name: system
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: varlogs
+      __path__: /var/log/*log

package/bin/botTemplate/docker/docker-compose.prod.yml

@@ -82,6 +82,17 @@ services:
 #      - {{name}}
 #    restart: on-failure
 
+#  promtail_{{name}}:
+#    image: grafana/promtail:latest
+#    container_name: promtail_{{name}}
+#    restart: unless-stopped
+#    environment:
+#      TZ: "Europe/Moscow"
+#    volumes:
+#      - ../var/log:/var/log
+#      - ./config/promtail/config.yml:/etc/promtail/config.yml
+#    command: -config.file=/etc/promtail/config.yml
+
 networks:
   yourtar:
     external:

package/bin/botTemplate/docker/docker-compose.stage.yml

@@ -77,6 +77,17 @@ services:
 #    networks:
 #      - demo
 
+#  promtail_{{name}}:
+#    image: grafana/promtail:latest
+#    container_name: promtail_{{name}}
+#    restart: unless-stopped
+#    environment:
+#      TZ: "Europe/Moscow"
+#    volumes:
+#      - ../var/log:/var/log
+#      - ./config/promtail/config.yml:/etc/promtail/config.yml
+#    command: -config.file=/etc/promtail/config.yml
+
 networks:
   demo:
     external: true

package/bin/botTemplate/src/Logging/YTExtraDataProcessor.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Logging;
+
+use Monolog\Attribute\AsMonologProcessor;
+use Monolog\LogRecord;
+use Monolog\Processor\ProcessorInterface;
+
+#[AsMonologProcessor]
+class YTExtraDataProcessor implements ProcessorInterface
+{
+    public function __invoke(LogRecord $record): LogRecord
+    {
+        // Add data to the 'extra' array
+        $record->extra['yourtar_log'] = true;
+        $record->extra['project'] = '{{name}}';
+
+        return $record;
+    }
+}

package/bin/index.js

@@ -73,7 +73,7 @@ programm.command('create')
 					await fs.renameSync('./' + projectFolder + '/.env-main', './' + projectFolder + '/.env');
 					await fs.copyFileSync('./' + projectFolder + '/.env', './' + projectFolder + '/docker/.env');
 					await exec('docker compose -f ./' + projectFolder + '/docker/docker-compose.dev.yml up -d --build');
-					await exec('cd ' + projectFolder + '/docker && docker compose -f docker-compose.dev.yml exec php_' + answers.name + '_back composer require serializer security cors orm');
+					await exec('cd ' + projectFolder + '/docker && docker compose -f docker-compose.dev.yml exec php_' + answers.name + '_back composer require serializer security cors orm monolog');
 					if (fs.existsSync('./' + projectFolder + '/compose.yaml')) fs.unlinkSync('./' + projectFolder + '/compose.yaml');
 					if (fs.existsSync('./' + projectFolder + '/compose.override.yaml')) fs.unlinkSync('./' + projectFolder + '/compose.override.yaml');
 					await exec('cd ' + projectFolder + '/docker && docker compose -f docker-compose.dev.yml exec php_' + answers.name + '_back composer require --dev symfony/maker-bundle');
@@ -85,7 +85,7 @@ programm.command('create')
 					await fs.renameSync('./' + projectFolder + '/.env-main', './' + projectFolder + '/.env');
 					await fs.copyFileSync('./' + projectFolder + '/.env', './' + projectFolder + '/docker/.env');
 					await exec('docker compose -f ./' + projectFolder + '/docker/docker-compose.dev.yml up -d --build');
-					await exec('cd ' + projectFolder + '/docker && docker compose -f docker-compose.dev.yml exec php_' + answers.name + '_back composer require serializer security cors orm');
+					await exec('cd ' + projectFolder + '/docker && docker compose -f docker-compose.dev.yml exec php_' + answers.name + '_back composer require serializer security cors orm monolog');
 					if (fs.existsSync('./' + projectFolder + '/compose.yaml')) fs.unlinkSync('./' + projectFolder + '/compose.yaml');
 					if (fs.existsSync('./' + projectFolder + '/compose.override.yaml')) fs.unlinkSync('./' + projectFolder + '/compose.override.yaml');
 					await exec('cd ' + projectFolder + '/docker && docker compose -f docker-compose.dev.yml exec php_' + answers.name + '_back composer require --dev symfony/maker-bundle');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yourtar-cli",
-  "version": "1.3.3",
+  "version": "2.0.0",
   "description": "This CLI for YourTar developers and our clients ;-)",
   "main": "bin/index.js",
   "scripts": {