From 0fe7ce2343347285d4f6f620357daefbb715b8e7 Mon Sep 17 00:00:00 2001 From: notheowner <86596679+notheowner@users.noreply.github.com> Date: Sat, 15 Feb 2025 02:44:22 +0200 Subject: [PATCH 1/7] dragonite: config updates --- package.json | 3 ++- pages/docs/dragonite/config.mdx | 26 ++++++++++++++++++++++++++ yarn.lock | 6 +++--- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0b98b0f..427153f 100644 --- a/package.json +++ b/package.json @@ -27,5 +27,6 @@ "devDependencies": { "@types/node": "18.11.10", "typescript": "^5.2.2" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/pages/docs/dragonite/config.mdx b/pages/docs/dragonite/config.mdx index d8d9ce7..77c473a 100644 --- a/pages/docs/dragonite/config.mdx +++ b/pages/docs/dragonite/config.mdx @@ -58,6 +58,14 @@ enable = true | token_refresh_concurrency | 10 | define concurrency for the token background refresher | | token_init_concurrency | 1 | define concurrency for the token background initer | | token_init_interval_seconds | PTC: 1, NK: 180 | define the interval to request tokens | +| remote_auth_timeout_seconds | "" | define a timeout for remote auth requests | +| remote_init_retry_delay_minutes | "" | define a delay for retrying remote auth requests | +| token_init_start_delay_minutes | "" | define a delay for starting the token initer | +| token_refresh_days | "" | define the days after which a token should be refreshed | +| token_refresh_start_delay_minutes | "" | define a delay for starting the token refresher | +| ip_ban_backoff_minutes | 15 | define how to long to backoff an IP | +| remote_auth_secret | "" | define a secret for remote auth requests if needed | +| token_valid_days | "" | define the days a token is valid | ## Koji section @@ -89,20 +97,38 @@ bearer_token = "KOJI_SECRET" [tuning] #recycle_gmo_limit = 4900 #recycle_encounter_limit = 9900 +#recycle_invasion_limit = 940 #recycle_on_jail=false #minimum_account_reuse_hours = 169 #location_delay = 0 #fort_location_delay = 0 +#scout_age_limit = 30 ``` | Key | Default | Description | | :-- | :-- | :-- | | `recycle_gmo_limit` | 4900 | (Advanced) Recommend keeping this value commented out. When the GMO limit is reached for a specific account it will be be rotated. | | `recycle_encounter_limit` | 9900 | (Advanced) Recommend keeping this value commented out. When an account has encountered this amount of pokemon it will be rotated. | +| `recycle_invasion_limit` | 940 | (Advanced) Recommend keeping this value commented out. When an account has encountered this amount of invasions it will be rotated. | | `recycle_on_jail` | false | Enabling this setting will utilize significantly more accounts. Currently five accounts are assigned to one worker and will rotate while the worker is running. | | `location_delay` | 0 | This value, in milliseconds, will add a slight wait period while a worker is moving to a new location. Adding a slight delay has proven to decrease empty GMO results and positively impact scans overall. Recommend starting with 100, 200, 300, etc and monitoring overall results. | | `fort_location_delay` | 0 | This value, in milliseconds, is the same as `location_delay` however it only impacts fort scans (gyms/pokestops). | | `minimum_account_reuse_hours` | 0 | This sets the amount of hours for accounts to "rest" until they can be reused. Recommended value is 169 hours (7 days). | +| `scout_age_limit` | 30 | | + +```toml +# Make location_delay(max) dynamic by tuning against initial_gmo_success_rate(percentage), limited by minimum_location_delay(min). +initial_gmo_success_rate = 75 +minimum_location_delay = 4000 + +# Introduced in 1.10.9 Testing. Automatically test accounts for being shadow banned and marked as banned in database. +test_shadow_banned=true + +# Introduced in Dragonite 1.12.3-testing +# This option for questing will hold on to AR Quests and try to move to 'ar only scans' over time. +# This may become default later (the current default is 'true' which means it will try and drop ar quests if you have them as required, unless your account is marked as ar banned) +quest_layer_swap = false +``` ## Accounts section diff --git a/yarn.lock b/yarn.lock index b0b5615..c966ce4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -394,9 +394,9 @@ busboy@1.6.0: streamsearch "^1.1.0" caniuse-lite@^1.0.30001406: - version "1.0.30001555" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001555.tgz" - integrity sha512-NzbUFKUnJ3DTcq6YyZB6+qqhfD112uR3uoEnkmfzm2wVzUNsFkU7AwBjKQ654Sp5cau0JxhFyRSn/tQZ+XfygA== + version "1.0.30001699" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001699.tgz" + integrity sha512-b+uH5BakXZ9Do9iK+CkDmctUSEqZl+SP056vc5usa0PL+ev5OHw003rZXcnjNDv3L8P5j6rwT6C0BPKSikW08w== ccount@^2.0.0: version "2.0.1" From 98f9aca41a307f9d7dee4b1ecefcca846f0831a7 Mon Sep 17 00:00:00 2001 From: notheowner <86596679+notheowner@users.noreply.github.com> Date: Sat, 15 Feb 2025 03:11:31 +0200 Subject: [PATCH 2/7] dragonite: config updates --- pages/docs/dragonite/config.mdx | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pages/docs/dragonite/config.mdx b/pages/docs/dragonite/config.mdx index 77c473a..d44b8a0 100644 --- a/pages/docs/dragonite/config.mdx +++ b/pages/docs/dragonite/config.mdx @@ -50,6 +50,12 @@ enable = true # token_init_enabled = true # don't rely on remote auth and only use accounts with stored token - true by default # token_refresh_only = true + +[auth.nk] +enable = false +#login_delay = 20 +#token_init_enabled=true +#token_refresh_only = true ``` ⚠ Additional config variables, but only put them if you know what you do ⚠ @@ -115,19 +121,16 @@ bearer_token = "KOJI_SECRET" | `fort_location_delay` | 0 | This value, in milliseconds, is the same as `location_delay` however it only impacts fort scans (gyms/pokestops). | | `minimum_account_reuse_hours` | 0 | This sets the amount of hours for accounts to "rest" until they can be reused. Recommended value is 169 hours (7 days). | | `scout_age_limit` | 30 | | +| `test_shadow_banned` | false | Automatically test accounts for being shadow banned and marked as banned in database. | +| `quest_layer_swap` | true | This option for questing will hold on to AR Quests and try to move to 'ar only scans' over time. This may become default later (the current default is 'true' which means it will try and drop ar quests if you have them as required, unless your account is marked as ar banned). | +### Dynamic Location Delay +Make location_delay(max) dynamic by tuning against initial_gmo_success_rate(percentage), limited by minimum_location_delay(min). ```toml -# Make location_delay(max) dynamic by tuning against initial_gmo_success_rate(percentage), limited by minimum_location_delay(min). -initial_gmo_success_rate = 75 -minimum_location_delay = 4000 - -# Introduced in 1.10.9 Testing. Automatically test accounts for being shadow banned and marked as banned in database. -test_shadow_banned=true - -# Introduced in Dragonite 1.12.3-testing -# This option for questing will hold on to AR Quests and try to move to 'ar only scans' over time. -# This may become default later (the current default is 'true' which means it will try and drop ar quests if you have them as required, unless your account is marked as ar banned) -quest_layer_swap = false +#Example +location_delay = 7000 +initial_gmo_success_rate = 80 +minimum_location_delay = 3000 ``` ## Accounts section From 79bfaba2298bdc1728b7ecc0e294e71dc8687946 Mon Sep 17 00:00:00 2001 From: notheowner <86596679+notheowner@users.noreply.github.com> Date: Sat, 15 Feb 2025 19:26:48 +0200 Subject: [PATCH 3/7] auth defaults --- pages/docs/dragonite/config.mdx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pages/docs/dragonite/config.mdx b/pages/docs/dragonite/config.mdx index d44b8a0..4ec5054 100644 --- a/pages/docs/dragonite/config.mdx +++ b/pages/docs/dragonite/config.mdx @@ -58,17 +58,18 @@ enable = false #token_refresh_only = true ``` -⚠ Additional config variables, but only put them if you know what you do ⚠ +⚠ Additional config variables +Do NOT change these unless you know what you are doing. ⚠ | Key | Default | Description | | :-- | :-- | :-- | | token_refresh_concurrency | 10 | define concurrency for the token background refresher | | token_init_concurrency | 1 | define concurrency for the token background initer | | token_init_interval_seconds | PTC: 1, NK: 180 | define the interval to request tokens | -| remote_auth_timeout_seconds | "" | define a timeout for remote auth requests | +| remote_auth_timeout_seconds | 60 | define a timeout for remote auth requests | | remote_init_retry_delay_minutes | "" | define a delay for retrying remote auth requests | -| token_init_start_delay_minutes | "" | define a delay for starting the token initer | -| token_refresh_days | "" | define the days after which a token should be refreshed | -| token_refresh_start_delay_minutes | "" | define a delay for starting the token refresher | +| token_init_start_delay_minutes | 5 | define a delay for starting the token initer | +| token_refresh_days | 28 | define the days after which a token should be refreshed | +| token_refresh_start_delay_minutes | 5 | define a delay for starting the token refresher | | ip_ban_backoff_minutes | 15 | define how to long to backoff an IP | | remote_auth_secret | "" | define a secret for remote auth requests if needed | | token_valid_days | "" | define the days a token is valid | @@ -120,12 +121,14 @@ bearer_token = "KOJI_SECRET" | `location_delay` | 0 | This value, in milliseconds, will add a slight wait period while a worker is moving to a new location. Adding a slight delay has proven to decrease empty GMO results and positively impact scans overall. Recommend starting with 100, 200, 300, etc and monitoring overall results. | | `fort_location_delay` | 0 | This value, in milliseconds, is the same as `location_delay` however it only impacts fort scans (gyms/pokestops). | | `minimum_account_reuse_hours` | 0 | This sets the amount of hours for accounts to "rest" until they can be reused. Recommended value is 169 hours (7 days). | -| `scout_age_limit` | 30 | | +| `scout_age_limit` | 30 | Configure age limit for scout queue entries | | `test_shadow_banned` | false | Automatically test accounts for being shadow banned and marked as banned in database. | | `quest_layer_swap` | true | This option for questing will hold on to AR Quests and try to move to 'ar only scans' over time. This may become default later (the current default is 'true' which means it will try and drop ar quests if you have them as required, unless your account is marked as ar banned). | ### Dynamic Location Delay Make location_delay(max) dynamic by tuning against initial_gmo_success_rate(percentage), limited by minimum_location_delay(min). +This is applied per worker and resets to the max value(location_delay) after an account is rotated. Therefore this should not be used with recycle_on_jail set to true. +Every 50 steps Dragonite checks the success rate of GMOs without retries and adjusts location delay accordingly. ```toml #Example location_delay = 7000 From 356503b5849136908ce3b750f1c5928e30a4196d Mon Sep 17 00:00:00 2001 From: notheowner <86596679+notheowner@users.noreply.github.com> Date: Sat, 15 Feb 2025 19:42:23 +0200 Subject: [PATCH 4/7] Update tuning with reasonable starting values --- pages/docs/dragonite/config.mdx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pages/docs/dragonite/config.mdx b/pages/docs/dragonite/config.mdx index 4ec5054..5f9ccf3 100644 --- a/pages/docs/dragonite/config.mdx +++ b/pages/docs/dragonite/config.mdx @@ -107,9 +107,12 @@ bearer_token = "KOJI_SECRET" #recycle_invasion_limit = 940 #recycle_on_jail=false #minimum_account_reuse_hours = 169 -#location_delay = 0 -#fort_location_delay = 0 #scout_age_limit = 30 +location_delay = 3000 +fort_location_delay = 3000 +quest_layer_swap = false +test_shadow_banned = true + ``` | Key | Default | Description | From 9391c0c75341639aae4c9e0fcb1f209491182cfd Mon Sep 17 00:00:00 2001 From: notheowner <86596679+notheowner@users.noreply.github.com> Date: Sun, 16 Feb 2025 12:31:44 +0200 Subject: [PATCH 5/7] update config.mdx --- pages/docs/dragonite/config.mdx | 35 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pages/docs/dragonite/config.mdx b/pages/docs/dragonite/config.mdx index 5f9ccf3..f9283c2 100644 --- a/pages/docs/dragonite/config.mdx +++ b/pages/docs/dragonite/config.mdx @@ -58,21 +58,21 @@ enable = false #token_refresh_only = true ``` -⚠ Additional config variables -Do NOT change these unless you know what you are doing. ⚠ +⚠ Additional config variables. +Do **NOT** change these unless you really know what you are doing! ⚠ | Key | Default | Description | | :-- | :-- | :-- | -| token_refresh_concurrency | 10 | define concurrency for the token background refresher | -| token_init_concurrency | 1 | define concurrency for the token background initer | -| token_init_interval_seconds | PTC: 1, NK: 180 | define the interval to request tokens | -| remote_auth_timeout_seconds | 60 | define a timeout for remote auth requests | -| remote_init_retry_delay_minutes | "" | define a delay for retrying remote auth requests | -| token_init_start_delay_minutes | 5 | define a delay for starting the token initer | -| token_refresh_days | 28 | define the days after which a token should be refreshed | -| token_refresh_start_delay_minutes | 5 | define a delay for starting the token refresher | -| ip_ban_backoff_minutes | 15 | define how to long to backoff an IP | -| remote_auth_secret | "" | define a secret for remote auth requests if needed | -| token_valid_days | "" | define the days a token is valid | +| `token_refresh_concurrency` | 10 | define concurrency for the token background refresher | +| `token_init_concurrency` | 1 | define concurrency for the token background initer | +| `token_init_interval_seconds` | PTC: 1, NK: 180 | define the interval to request tokens | +| `token_init_start_delay_minutes` | 5 | define a delay for starting the token initer | +| `remote_auth_timeout_seconds` | 60 | define a timeout for remote auth requests | +| `remote_init_retry_delay_minutes` | | define a delay for retrying remote auth requests | +| `remote_auth_secret` | "" | define a secret for remote auth requests if needed | +| `token_refresh_days` | 28 | define the days after which a token should be refreshed | +| `token_refresh_start_delay_minutes` | 5 | define a delay for starting the token refresher | +| `ip_ban_backoff_minutes` | 15 | define how to long to backoff an IP | +| `token_valid_days` | | define the days a token is valid | ## Koji section @@ -121,7 +121,7 @@ test_shadow_banned = true | `recycle_encounter_limit` | 9900 | (Advanced) Recommend keeping this value commented out. When an account has encountered this amount of pokemon it will be rotated. | | `recycle_invasion_limit` | 940 | (Advanced) Recommend keeping this value commented out. When an account has encountered this amount of invasions it will be rotated. | | `recycle_on_jail` | false | Enabling this setting will utilize significantly more accounts. Currently five accounts are assigned to one worker and will rotate while the worker is running. | -| `location_delay` | 0 | This value, in milliseconds, will add a slight wait period while a worker is moving to a new location. Adding a slight delay has proven to decrease empty GMO results and positively impact scans overall. Recommend starting with 100, 200, 300, etc and monitoring overall results. | +| `location_delay` | 0 | This value, in milliseconds, will add a slight wait period while a worker is moving to a new location. Adding a slight delay has proven to decrease empty GMO results and positively impact scans overall. Recommend starting with 2500+ and monitoring overall results. | | `fort_location_delay` | 0 | This value, in milliseconds, is the same as `location_delay` however it only impacts fort scans (gyms/pokestops). | | `minimum_account_reuse_hours` | 0 | This sets the amount of hours for accounts to "rest" until they can be reused. Recommended value is 169 hours (7 days). | | `scout_age_limit` | 30 | Configure age limit for scout queue entries | @@ -129,14 +129,15 @@ test_shadow_banned = true | `quest_layer_swap` | true | This option for questing will hold on to AR Quests and try to move to 'ar only scans' over time. This may become default later (the current default is 'true' which means it will try and drop ar quests if you have them as required, unless your account is marked as ar banned). | ### Dynamic Location Delay -Make location_delay(max) dynamic by tuning against initial_gmo_success_rate(percentage), limited by minimum_location_delay(min). -This is applied per worker and resets to the max value(location_delay) after an account is rotated. Therefore this should not be used with recycle_on_jail set to true. +Make `location_delay`(max) dynamic by tuning against `initial_gmo_success_rate`(percentage), limited by `minimum_location_delay`(min). + +This is applied per worker and resets to the max value(location_delay) after an account is rotated. Therefore this should NOT be used with `recycle_on_jail` set to true. Every 50 steps Dragonite checks the success rate of GMOs without retries and adjusts location delay accordingly. ```toml #Example location_delay = 7000 initial_gmo_success_rate = 80 -minimum_location_delay = 3000 +minimum_location_delay = 3000 ``` ## Accounts section From edde2106263257d9556dc268881c713f7da24923 Mon Sep 17 00:00:00 2001 From: notheowner <86596679+notheowner@users.noreply.github.com> Date: Sun, 16 Feb 2025 20:44:19 +0200 Subject: [PATCH 6/7] Update defaults and more disclaimers. --- pages/docs/dragonite/config.mdx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pages/docs/dragonite/config.mdx b/pages/docs/dragonite/config.mdx index f9283c2..536d85e 100644 --- a/pages/docs/dragonite/config.mdx +++ b/pages/docs/dragonite/config.mdx @@ -59,7 +59,9 @@ enable = false ``` ⚠ Additional config variables. -Do **NOT** change these unless you really know what you are doing! ⚠ +Do **NOT** change these unless you **REALLY** know what you are doing! ⚠ + +Dragonite has sensible defaults for these options and changing them can lead to unexpected behavior! | Key | Default | Description | | :-- | :-- | :-- | | `token_refresh_concurrency` | 10 | define concurrency for the token background refresher | @@ -69,7 +71,7 @@ Do **NOT** change these unless you really know what you are doing! ⚠ | `remote_auth_timeout_seconds` | 60 | define a timeout for remote auth requests | | `remote_init_retry_delay_minutes` | | define a delay for retrying remote auth requests | | `remote_auth_secret` | "" | define a secret for remote auth requests if needed | -| `token_refresh_days` | 28 | define the days after which a token should be refreshed | +| `token_refresh_days` | PTC: 28, NK: 12 | define the days after which a token should be refreshed | | `token_refresh_start_delay_minutes` | 5 | define a delay for starting the token refresher | | `ip_ban_backoff_minutes` | 15 | define how to long to backoff an IP | | `token_valid_days` | | define the days a token is valid | From 17dbc8ce70c5d9be12712a607a4e90cbe6f835ed Mon Sep 17 00:00:00 2001 From: notheowner <86596679+notheowner@users.noreply.github.com> Date: Wed, 19 Feb 2025 16:17:21 +0200 Subject: [PATCH 7/7] New defaults in preparation of new release. --- pages/docs/dragonite/config.mdx | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pages/docs/dragonite/config.mdx b/pages/docs/dragonite/config.mdx index 536d85e..a9ba781 100644 --- a/pages/docs/dragonite/config.mdx +++ b/pages/docs/dragonite/config.mdx @@ -104,39 +104,35 @@ bearer_token = "KOJI_SECRET" ```toml [tuning] -#recycle_gmo_limit = 4900 -#recycle_encounter_limit = 9900 -#recycle_invasion_limit = 940 -#recycle_on_jail=false +#recycle_gmo_limit = 4990 +#recycle_encounter_limit = 9975 +#recycle_invasion_limit = 900 #minimum_account_reuse_hours = 169 #scout_age_limit = 30 -location_delay = 3000 -fort_location_delay = 3000 -quest_layer_swap = false -test_shadow_banned = true +#location_delay = 2500 +#fort_location_delay = 0 ``` | Key | Default | Description | | :-- | :-- | :-- | -| `recycle_gmo_limit` | 4900 | (Advanced) Recommend keeping this value commented out. When the GMO limit is reached for a specific account it will be be rotated. | -| `recycle_encounter_limit` | 9900 | (Advanced) Recommend keeping this value commented out. When an account has encountered this amount of pokemon it will be rotated. | -| `recycle_invasion_limit` | 940 | (Advanced) Recommend keeping this value commented out. When an account has encountered this amount of invasions it will be rotated. | -| `recycle_on_jail` | false | Enabling this setting will utilize significantly more accounts. Currently five accounts are assigned to one worker and will rotate while the worker is running. | -| `location_delay` | 0 | This value, in milliseconds, will add a slight wait period while a worker is moving to a new location. Adding a slight delay has proven to decrease empty GMO results and positively impact scans overall. Recommend starting with 2500+ and monitoring overall results. | -| `fort_location_delay` | 0 | This value, in milliseconds, is the same as `location_delay` however it only impacts fort scans (gyms/pokestops). | +| `recycle_gmo_limit` | 4990 | (Advanced) Recommend keeping this value commented out. When the GMO limit is reached for a specific account it will be be rotated. | +| `recycle_encounter_limit` | 9975 | (Advanced) Recommend keeping this value commented out. When an account has encountered this amount of pokemon it will be rotated. | +| `recycle_invasion_limit` | 900 | (Advanced) Recommend keeping this value commented out. When an account has encountered this amount of invasions it will be rotated. | +| `location_delay` | 2500 | This value, in milliseconds, will add a slight wait period while a worker is moving to a new location. Adding a slight delay has proven to decrease empty GMO results and positively impact scans overall. Recommend starting with 2500+ and monitoring overall results. | +| `fort_location_delay` | 0 | This value, in milliseconds, is the same as `location_delay` however it only impacts fort scans (gyms/pokestops). When not specified, it uses the same value as `location_delay` | | `minimum_account_reuse_hours` | 0 | This sets the amount of hours for accounts to "rest" until they can be reused. Recommended value is 169 hours (7 days). | | `scout_age_limit` | 30 | Configure age limit for scout queue entries | -| `test_shadow_banned` | false | Automatically test accounts for being shadow banned and marked as banned in database. | -| `quest_layer_swap` | true | This option for questing will hold on to AR Quests and try to move to 'ar only scans' over time. This may become default later (the current default is 'true' which means it will try and drop ar quests if you have them as required, unless your account is marked as ar banned). | +| `test_shadow_banned` | true | Automatically test accounts for being shadow banned and marked as banned in database. | +| `quest_layer_swap` | false | This option for questing will hold on to AR Quests and try to move to 'ar only scans' over time. When set to 'true' it will try and drop ar quests if you have them as required, unless your account is marked as ar banned). | ### Dynamic Location Delay Make `location_delay`(max) dynamic by tuning against `initial_gmo_success_rate`(percentage), limited by `minimum_location_delay`(min). -This is applied per worker and resets to the max value(location_delay) after an account is rotated. Therefore this should NOT be used with `recycle_on_jail` set to true. +This is applied per worker and resets to the max value(location_delay) after an account is rotated. Every 50 steps Dragonite checks the success rate of GMOs without retries and adjusts location delay accordingly. ```toml -#Example +#Example configuration location_delay = 7000 initial_gmo_success_rate = 80 minimum_location_delay = 3000