Skip to content

Сделать загрузку капчи асинхронной #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BoomEaro wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Сделать загрузку капчи асинхронной #115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9935466
Implement async captcha loading
BoomEaro Jun 12, 2022
da663ce
Hide captcha generation progress messages if server not fully loaded
BoomEaro Jun 12, 2022
3fa23ba
Add generate command to regenerate captcha
BoomEaro Jun 13, 2022
346d01d
Clear captcha first
BoomEaro Jun 13, 2022
cb2aabd
Generate captcha every 6 hours
BoomEaro Jun 13, 2022
9b404a1
Kick player if captcha is not generated
BoomEaro Jun 13, 2022
71ba5f7
Fix 0 length random captcha
BoomEaro Jun 13, 2022
89f30c5
Little improve CaptchaGeneration
BoomEaro Jun 13, 2022
474e915
Create method for release buff in captcha holder
BoomEaro Jun 15, 2022
d8465e8
Use ArrayList in CachedCaptcha
BoomEaro Jun 15, 2022
b831311
Merge branch 'botfilter' into feature/captchas
BoomEaro Jun 15, 2022
5be43a8
Configure captcha count in settings
BoomEaro Jun 15, 2022
1ab060d
Improve comment
BoomEaro Jun 15, 2022
3398bbe
Create CaptchaGenerationTask
BoomEaro Jun 15, 2022
d6bfac4
Add ability to change captcha regeneration time in config
BoomEaro Jun 15, 2022
b3e57a4
Provide ThreadLocalRandom to CaptchaPainter
BoomEaro Jun 15, 2022
704dbe3
Use ThreadLocalRandom in randomCaptcha method
BoomEaro Jul 11, 2022
30fa0ba
Remove volatile from "enabled" field in BungeeCord class
BoomEaro Jul 11, 2022
aed7ef5
Little change error message in generate command
BoomEaro Jul 11, 2022
753dc9b
Add ability to disable captcha auto regeneration
BoomEaro Jul 11, 2022
891717f
Use future tasks
BoomEaro Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions proxy/src/main/java/ru/leymooo/botfilter/captcha/CaptchaGeneration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import net.md_5.bungee.BungeeCord;
import ru.leymooo.botfilter.caching.CachedCaptcha;
import ru.leymooo.botfilter.caching.PacketUtils;
import ru.leymooo.botfilter.captcha.generator.CaptchaPainter;
import ru.leymooo.botfilter.captcha.generator.map.MapPalette;
import ru.leymooo.botfilter.config.Settings;

Expand Down Expand Up @@ -55,7 +54,6 @@ private static void generateCaptchas()
.setPriority( Thread.MIN_PRIORITY )
.setNameFormat( "CaptchaGenerationTask-thread-%d" )
.build() );
CaptchaPainter painter = new CaptchaPainter();
MapPalette.prepareColors();

int captchaCount = Settings.IMP.CAPTCHA.COUNT;
Expand All @@ -69,7 +67,7 @@ private static void generateCaptchas()

for ( int i = 1; i <= captchaCount; i++ )
{
executor.execute( new CaptchaGenerationTask( executor, painter, fonts, holders ) );
executor.execute( new CaptchaGenerationTask( executor, fonts, holders ) );
}

long start = System.currentTimeMillis();
Expand Down
4 changes: 2 additions & 2 deletions proxy/src/main/java/ru/leymooo/botfilter/captcha/CaptchaGenerationTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
public class CaptchaGenerationTask implements Runnable
{
private final ExecutorService executor;
private final CaptchaPainter painter;
private final List<Font> fonts;
private final List<CachedCaptcha.CaptchaHolder> holders;
@Override
Expand All @@ -30,7 +29,8 @@ public void run()
{
Random rnd = ThreadLocalRandom.current();
String answer = randomAnswer( rnd );
BufferedImage image = this.painter.draw( this.fonts.get( rnd.nextInt( this.fonts.size() ) ), randomNotWhiteColor( rnd ), answer );
CaptchaPainter painter = new CaptchaPainter( rnd );
BufferedImage image = painter.draw( this.fonts.get( rnd.nextInt( this.fonts.size() ) ), randomNotWhiteColor( rnd ), answer );
final CraftMapCanvas map = new CraftMapCanvas();
map.drawImage( 0, 0, image );
MapDataPacket packet = new MapDataPacket( 0, (byte) 0, map.getMapData() );
Expand Down
4 changes: 3 additions & 1 deletion proxy/src/main/java/ru/leymooo/botfilter/captcha/generator/CaptchaPainter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@
import java.awt.image.ConvolveOp;
import java.awt.image.Kernel;
import java.util.Random;
import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
public class CaptchaPainter
{

private final int width = 128;
private final int height = 128;
private final Color background = Color.WHITE;
private final Random rnd = new Random();
private final Random rnd;
Copy link
Copy Markdown

@NoJokeFNA NoJokeFNA Jul 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will just throw NPE's, please fix it!

Copy link
Copy Markdown
Author

@BoomEaro BoomEaro Jul 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will just throw NPE's, please fix it!

The class is annotated lombok with @requiredargsconstructor annotation
It generates a constructor where there is Random

New CaptchaPainter instances are created in the CaptchaGenerationTask class always with Random instances inside


public BufferedImage draw(Font font, Color fGround, String text)
{
Expand Down