ruslan/stbf
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

#3 change sessions impl

Browse Source
This commit is contained in:
Ruslan Penkrat
2022-09-25 09:33:42 +03:00
parent 8453ba42f8
commit a06f9940ff
9 changed files with 279 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
stbf-common/src/main/java/ru/penkrat/stbf/common/command/SessionAwareCommandChain.java Normal file
View File

@@ -0,0 +1,20 @@
package ru.penkrat.stbf.common.command;
import lombok.RequiredArgsConstructor;
import ru.penkrat.stbf.api.BotRequest;
import ru.penkrat.stbf.api.BotResponse;
import ru.penkrat.stbf.api.CommandChain;
import ru.penkrat.stbf.api.SessionProvider;
import ru.penkrat.stbf.common.session.SessionAwareBotRequest;
@RequiredArgsConstructor
public class SessionAwareCommandChain implements CommandChain {
private final CommandChain delegate;
private final SessionProvider sessionProvider;
@Override
public void processCommand(BotRequest botRequest, BotResponse botResponse) {
delegate.processCommand(new SessionAwareBotRequest(botRequest, sessionProvider), botResponse);
}
}

31
stbf-common/src/main/java/ru/penkrat/stbf/common/command/ThreadPolledCommandChain.java Normal file
View File

@@ -0,0 +1,31 @@
package ru.penkrat.stbf.common.command;
import ru.penkrat.stbf.api.BotRequest;
import ru.penkrat.stbf.api.BotResponse;
import ru.penkrat.stbf.api.CommandChain;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class ThreadPolledCommandChain implements CommandChain {
private final CommandChain delegate;
private final ExecutorService executor;
public ThreadPolledCommandChain(CommandChain delegate) {
this(delegate, 4);
}
public ThreadPolledCommandChain(CommandChain delegate, int nThreads) {
this.delegate = delegate;
this.executor = Executors.newFixedThreadPool(nThreads);
}
@Override
public void processCommand(BotRequest botRequest, BotResponse botResponse) {
executor.execute(() -> {
delegate.processCommand(botRequest, botResponse);
});
}
}

49
stbf-common/src/main/java/ru/penkrat/stbf/common/session/SessionAwareBotRequest.java Normal file
View File

@@ -0,0 +1,49 @@
package ru.penkrat.stbf.common.session;
import lombok.RequiredArgsConstructor;
import ru.penkrat.stbf.api.BotRequest;
import ru.penkrat.stbf.api.BotSession;
import ru.penkrat.stbf.api.SessionProvider;
import java.util.Objects;
import java.util.Optional;
@RequiredArgsConstructor
public class SessionAwareBotRequest implements BotRequest {
private final BotRequest delegate;
private final SessionProvider sessionProvider;
private BotSession botSession;
@Override
public BotSession getSession() {
if (botSession == null) {
botSession = sessionProvider.get(getChatId());
Objects.requireNonNull(botSession, "Session can not be null");
}
return botSession;
}
public Optional<String> getMessageText() {
return this.delegate.getMessageText();
}
public Optional<String> getPhoneNumber() {
return this.delegate.getPhoneNumber();
}
public Optional<String> getCallbackData() {
return this.delegate.getCallbackData();
}
public Optional<String> getCallbackMessageText() {
return this.delegate.getCallbackMessageText();
}
public Long getChatId() {
return this.delegate.getChatId();
}
}

10
stbf-demo/src/main/java/ru/penkrat/stbf/demo/App.java
View File

@@ -5,6 +5,8 @@ import org.slf4j.LoggerFactory;
import picocli.CommandLine;
import ru.penkrat.stbf.api.BotCommandChain;
import ru.penkrat.stbf.api.CommandChain;
import ru.penkrat.stbf.common.command.SessionAwareCommandChain;
import ru.penkrat.stbf.common.command.ThreadPolledCommandChain;
import ru.penkrat.stbf.common.session.InMemBotSessionProvider;
import ru.penkrat.stbf.impl.pengrad.PengradTelegramBot;
import ru.penkrat.stbf.templates.xml.XmlFlowResolver;
@@ -12,7 +14,7 @@ import ru.penkrat.stbf.templates.xml.XmlFlowResolver;
import java.util.concurrent.atomic.AtomicReference;
@CommandLine.Command(name = "java -jar stbf-demo.jar", mixinStandardHelpOptions = true, description = "Run bot",
version = "Simple Telegram bot framework Demo app v. 0.0.1")
version = "Simple Telegram bot framework Demo app v. 0.0.2")
public class App implements Runnable {
private static final Logger log = LoggerFactory.getLogger(App.class);
@@ -29,17 +31,17 @@ public class App implements Runnable {
new CommandLine(new App()).execute(args);
}
private BotCommandChain getCommandChain(String filename) {
private CommandChain getCommandChain(String filename) {
XmlFlowResolver flow = new XmlFlowResolver(filename);
BotCommandChain chain = new BotCommandChain();
flow.getCommands().forEach(chain::add);
return chain;
return new ThreadPolledCommandChain(new SessionAwareCommandChain(chain, new InMemBotSessionProvider()));
}
private Runnable start(String token, CommandChain chain) {
return () -> botAtomicReference.set(new PengradTelegramBot(token, chain, new InMemBotSessionProvider()));
return () -> botAtomicReference.set(new PengradTelegramBot(token, chain));
}
private void onShutdown() {

8
stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotRequestImpl.java
View File

@@ -19,9 +19,6 @@ public class BotRequestImpl implements BotRequest {
@Getter(PROTECTED)
private final Update update;
@Getter
private final BotSession session;
@Override
public Optional<String> getMessageText() {
if (update.message() != null) {
@@ -61,4 +58,9 @@ public class BotRequestImpl implements BotRequest {
.orElseGet(() -> update.message()).chat().id();
}
@Override
public BotSession getSession() {
throw new UnsupportedOperationException("Session is not supported");
}
}

4
stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/KeyboardImpl.java
View File

@@ -1,6 +1,6 @@
package ru.penkrat.stbf.impl.pengrad;
import com.google.gson.internal.reflect.ReflectionAccessor;
import com.google.gson.internal.reflect.ReflectionHelper;
import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
import com.pengrad.telegrambot.model.request.KeyboardButton;
import lombok.Value;
@@ -58,7 +58,7 @@ class KeyboardImpl implements Keyboard {
return text.computeIfAbsent(btn, o -> {
try {
Field text = btn.getClass().getDeclaredField("text");
ReflectionAccessor.getInstance().makeAccessible(text);
ReflectionHelper.makeAccessible(text);
return String.valueOf(text.get(btn));
} catch (NoSuchFieldException | IllegalAccessException e) {
return "*error*";

9
stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/PengradTelegramBot.java
View File

@@ -6,7 +6,6 @@ import com.pengrad.telegrambot.model.CallbackQuery;
import com.pengrad.telegrambot.model.Update;
import lombok.extern.slf4j.Slf4j;
import ru.penkrat.stbf.api.CommandChain;
import ru.penkrat.stbf.api.SessionProvider;
import java.util.Optional;
@@ -14,12 +13,6 @@ import java.util.Optional;
public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
public PengradTelegramBot(String botToken, CommandChain commandChain) {
this(botToken, commandChain, (id) -> {
throw new IllegalArgumentException("'SessionProvider' is not defined");
});
}
public PengradTelegramBot(String botToken, CommandChain commandChain, SessionProvider sessionProvider) {
super(botToken);
this.setUpdatesListener(updates -> {
for (Update update : updates) {
@@ -32,7 +25,7 @@ public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
log.debug("New message in chat {}", chatId);
commandChain.processCommand(
new BotRequestImpl(update, sessionProvider.get(chatId)),
new BotRequestImpl(update),
new BotResponseImpl(update, this));
} catch (Exception e) {
log.error("Bot Error:", e);

8
stbf-rubenlagus/src/main/java/ru/penkrat/stbf/impl/rubenlagus/BotRequestImpl.java
View File

@@ -19,9 +19,6 @@ class BotRequestImpl implements BotRequest {
@Getter(PROTECTED)
private final Update update;
@Getter
private final BotSession session;
@Override
public Optional<String> getMessageText() {
if (update.hasMessage()) {
@@ -58,4 +55,9 @@ class BotRequestImpl implements BotRequest {
return Utils.getChatId(update);
}
@Override
public BotSession getSession() {
throw new UnsupportedOperationException("Session is not supported");
}
}

11
stbf-rubenlagus/src/main/java/ru/penkrat/stbf/impl/rubenlagus/RubenlagusTelegramBot.java
View File

@@ -7,7 +7,6 @@ import org.telegram.telegrambots.meta.api.objects.Update;
import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
import ru.penkrat.stbf.api.BotCommandChain;
import ru.penkrat.stbf.api.SessionProvider;
@Slf4j
public class RubenlagusTelegramBot extends TelegramLongPollingBot {
@@ -15,19 +14,11 @@ public class RubenlagusTelegramBot extends TelegramLongPollingBot {
private final String botUsername;
private final String botToken;
private final BotCommandChain commandChain;
private final SessionProvider sessionProvider;
public RubenlagusTelegramBot(String botUsername, String botToken, BotCommandChain botCommandChain) {
this(botUsername, botToken, botCommandChain, (id) -> {
throw new IllegalArgumentException("'SessionProvider' is not defined");
});
}
public RubenlagusTelegramBot(String botUsername, String botToken, BotCommandChain botCommandChain, SessionProvider sessionProvider) {
this.botUsername = botUsername;
this.botToken = botToken;
this.commandChain = botCommandChain;
this.sessionProvider = sessionProvider;
TelegramBotsApi telegramBotsApi;
try {
@@ -42,7 +33,7 @@ public class RubenlagusTelegramBot extends TelegramLongPollingBot {
public void onUpdateReceived(Update update) {
try {
commandChain.processCommand(
new BotRequestImpl(update, sessionProvider.get(Utils.getChatId(update))),
new BotRequestImpl(update),
new BotResponseImpl(update, this));
} catch (Exception e) {
log.error("Bot Error:", e);