github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-06 08:00:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,271 Commits 68 Branches 330 Tags 107 MiB
edddfe262e
Commit Graph

185 Commits

Author SHA1 Message Date
Him188
883518b1f1 Remove unused expressions 2021-07-23 12:58:09 +08:00
Him188
dfbe73da9a Do unwrap even if wrapper exception has suppressed exceptions 2021-07-22 11:48:11 +08:00
Him188
8d41e18cdc Improve Throwable.unwrap on Android: improve performance 2021-07-22 11:48:11 +08:00
Him188
2929db7f38 Implement Throwable.unwrap accordingly to the target platform. Fix #1404 2021-07-16 15:22:31 +08:00
Karlatemp
5b170ab63a Add HtmlEntity for decode html entity 2021-07-16 14:52:09 +08:00
Him188
dd606c3022 Improve performance of hexToBytes and simplify similar extensions 2021-07-07 15:00:28 +08:00
Him188
51d354c5e9 Improve Announcement logging 2021-07-06 19:12:45 +08:00
Him188
251bf3d9df Add JsonStruct to simplify deserialization 2021-07-06 19:12:45 +08:00
Him188
f0dc3cdf7e Add CheckableResult to standardize checks for deserialized responses 2021-07-06 19:12:45 +08:00
Him188
f5ce64ba4f Redesign Announcement API 
Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2021-07-06 19:12:45 +08:00
Him188
7722a5a0b0 Move KSerializer.map to mirai-core-utils 2021-07-04 17:56:23 +08:00
Him188
adc39a93b5 Update copyright 2021-07-02 00:39:10 +08:00
Him188
b9eb654a51 Reformat and cleanup code 2021-07-02 00:39:10 +08:00
Him188
5d57c33789 Improve Throwable.unwrap: add the unwrapped-out exception to suppressed exceptions to avoid loss of debugging information 2021-06-29 23:10:06 +08:00
Him188
abb28ee6d2 Improve performance of Either.fold, Either.mapLeft and Either.mapRight 2021-06-25 20:16:59 +08:00
Him188
11ffb324c9 Add Either 2021-06-25 20:05:28 +08:00
Him188
a38f24cbe5 Redesign connection maintenance mechanism: 
Reconnection is directed by `BotOfflineEvent`.

### Event Broadcasting

- PacketFactory `MessageSvcPushForceOffline` closes network with `ForceOfflineException`.
 - `network.close(cause)` pass the cause to state observer from `QQAndroidBot.stateObserverChain`, the observer broadcasts as follows:
   - Nothing if `cause` is `ForceOfflineException` or `BotClosedByEvent`(which is broadcast by user)
   - `BotOfflineEvent.Dropped` if cause is NetworkException and is recoverable(which is from Netty handlers)
   - `BotOfflineEvent.Force` if cause is `ForceOfflineException` is from the factory mentioned above.
   - `BotOfflineEvent.Active` otherwise(any other unexpected exceptions considered as an error)

### Deciding whether to reconnect

User can listen and change `BotOfflineEvent.reconnect` to decide. Default values are determined by `BotConfiguration`.

### Event listening

- Component `BotOfflineEventMonitor` listens `BotOfflineEvent`, logs the event for users, and launches a coroutine to do `network.resumeConnection` to notify the selector to renew an instance.
- `BotOnlineWatchdog` in `SelectorNetworkHandler` is removed.
- Selector now handles `maxAttempts` correctly in such a way that `awaitResumeInstance` does not throw exception until maximum attempts reached.
- On every attempt, new exceptions are logged to provide debugging information, and further duplications are ignored.
 2021-06-16 16:58:20 +08:00
Him188
9ceb7c3fc2 - Take line number into account of ExceptionCollector.collect; 
- Fix suppression;
- Add manual cleanup of references to help gc
 2021-06-07 17:47:11 +08:00
Him188
71b128b06c Improve ExceptionCollector.collect for better performance, close #1308 2021-06-07 12:57:00 +08:00
Him188
dadff42718 Unwrap NetworkException on logon failure 2021-06-06 13:58:46 +08:00
Him188
137e1a1235 Fix network scopes and exception handling. Support recovering after system hibernation and network failure. 2021-06-05 16:05:41 +08:00
Him188
a781941ede Fix LateinitMutableProperty 2021-06-05 16:05:41 +08:00
Him188
e788aa09f7 Add awaitStateChange 2021-06-05 16:05:41 +08:00
Him188
bcdff1336b
Kotlin 1.5 and dependencies updates (#1246) 
* Kotlin 1.5 and dependencies updates

* Update mirai-console ref

* Use Kotlin 1.5.10

* 2.7-M1-dev-3

* Update console ref
 2021-05-27 14:39:13 +08:00
Him188
5e25c0e25b Remove bintray 2021-05-25 12:25:53 +08:00
Him188
f7f4ccf4f5 Correct state transition logic: 
- Linear lifecycle for NetworkHandler: no chance to change state back to previous ones
- No reconnection attempts in NetworkHandler but in NHSelector
- Ensure clashing checks performed in setState
- Print closure exception in TestNettyNH.setStateOK
 2021-05-09 21:05:32 +08:00
Him188
d43a77b590 Update docs and improve source code readability 2021-05-09 15:31:50 +08:00
Him188
a62c570205 Add ExceptionCollector.throwLast 2021-05-09 13:12:33 +08:00
Him188
b53e546743 Prototype EventDispatcher 2021-05-09 00:54:48 +08:00
Him188
971685a2b0 Fix state resume 2021-05-09 00:54:48 +08:00
Him188
95d634233c Close bot if first login failed 2021-05-09 00:54:48 +08:00
Him188
062492c546 Test: NettyEndlessReconnectionTest 2021-05-09 00:54:48 +08:00
Him188
29cb81ad64 Test: ExceptionCollectorTest 2021-05-09 00:54:48 +08:00
Him188
8db8e2fb03 Implement lifecycle management for network 2021-05-09 00:54:48 +08:00
Him188
f9ddf74d8e Extract sync logic 2021-05-09 00:54:48 +08:00
Him188
b91bbfd2b8 Add NetworkHandlerFactory and tests for NetworkHandler 2021-05-09 00:54:48 +08:00
Him188
35b80dc700 Processors 2021-05-09 00:54:48 +08:00
Him188
840dd19dd0 Move EMPTY_BYTE_ARRAY to mirai-core-utils 2021-05-09 00:54:48 +08:00
Him188
d01f71ff8b Remove rubbish; fix build; add todos 2021-05-09 00:54:48 +08:00
Him188
b844efb072 New network: framework infrastructure 2021-05-09 00:54:48 +08:00
Him188
48564056df Add AtomicLazy 2021-05-09 00:54:48 +08:00
sandtechnology
db4c41f84a
Rework seq system (#1230) 
* Rework seq system, should help #1209

* Use non-blocking (CAS) implement

* Making next seq code more clear for reading

* Fix mistake
 2021-05-02 13:50:24 +08:00
Him188
70dc0a4da6
Remove kotlin.time.Duration usages (#1215) 
* Remove kotlin.Duration usages

* Fix build

* update submodule console ref
 2021-04-27 11:49:30 +08:00
AdoptOSS
09475efbda
fix: serialization plugin should not be put into runtime classpath (#1197) 2021-04-17 19:56:19 +08:00
Him188
f3d3130f2d Support login cache and login without password. close #1158 2021-04-10 18:46:39 +08:00
AdoptOSS
21e8852e0f
buildscript: fix task not found errors when android sdk not available (#1161) 
* buildscript: fix task not found errors when android sdk not available

* fix: this shadowed by run

* cleanup: code style

* improve: avoid breaking index map
 2021-04-05 22:35:38 +08:00
Him188
36742a867f Add util function systemProp 2021-04-03 23:06:15 +08:00
Him188
0f41c225f9 Move SerialDescriptor.copy to mirai-core-utils 2021-03-26 20:42:51 +08:00
Karlatemp
f9353b6aef
Compiled code verify (#1080) 
* Compiled code verify

* Run `verifyCompiledClasses` in `check` task

* Redesign verification

Co-authored-by: Bo Zhang <bo@gradle.com>

* Disable console verify

* Decoupling

Co-authored-by: Bo Zhang <bo@gradle.com>
 2021-03-20 13:34:04 +08:00
Him188
e256ec06d3
Support file operations (#1069) 
* Proto structs for group file

* RemoteFile fundamental abstraction and proto structs

* Configure JVM target for mirai-console-intellij

* Add Group.filesRoot

* Fix build

* Implement a FileSystem for RemoteFile resolution

* Fix RemoteFile FileSystem and implement resolve and listFiles

* Implement file info query and file download

* Support uploading group file

* Support file feeds

* 2.5-M2-dev-1

* Fix tests

* 2.5-M2-dev-2

* Add uuid-based resolving, support getting file details

* Support FileMessage receive

* Support sending FileMessage

* 2.5-M2-dev-3

* Add DownloadInfo.id

* Improve RemoteFile.delete

* Support move, delete, rename, mkdir. Simplify listFiles

* - Rename RemoteFile.write to .upload.
- Prefer id matching
- Improve move

* Add permission checks

* Improve permission checks

* Rearrange functions and add constant ROOT_PATH

* Introduce FileSupported, add extensions

* Introduce ProgressionCallback

* Fix docs and uploadFileAndSend

* Remove empty FileHighway.kt

* Add test testNormalize

* Add RemoteFile.contact, change RemoteFile.uploadAndSend return type to MessageReceipt

* Move @JvmBlockingBridge to file

* Change FileMessage.toRemoteFile parameter type Group to FileSupported

* Add impl notes #1082
 2021-03-08 18:34:45 +08:00
Him188
f010b1150c Fix platform declarations in mirai-core-utils 2021-02-25 09:41:05 +08:00
Him188
2c14f0016f Disable atomicFU compiler plugin 2021-02-25 09:35:51 +08:00
Karlatemp
7a7c88b783
Android api level check 2021-02-25 00:12:58 +08:00
Him188
d3583162a5 Replace usage of List.replaceAll with Kotlin's 2021-02-24 15:15:31 +08:00
Him188
0b971b2117 Merge branch 'dev' into android_target 
# Conflicts:
#	build.gradle.kts
#	buildSrc/src/main/kotlin/Versions.kt
 2021-02-24 09:20:47 +08:00
Him188
cda6aaa79b Simplify cache configuration. 
Improve cache saving:
- Use ProtoBuf to serialize BdhSession
- More readable servers.json
 2021-02-10 15:20:39 +08:00
Him188
90d4030fe6 Support friend list cache, close #408 2021-02-06 22:52:41 +08:00
Him188
1768872bab Rewrite message to struct conversions, add ReceiveMessageTransformer, for parsing long and forward messages in the future 2021-02-03 08:09:57 +08:00
Him188
bacfef584f Add android compilation target 2021-02-01 12:23:28 +08:00
Karlatemp
db5e54507a
Fix image id conversion; fix #933 
Signed-off-by: Karlatemp <karlatemp@vip.qq.com>
 2021-01-31 14:27:10 +08:00
Him188
525d7c8de3 Do not publish jvm artifacts in root module, fix unresolved dependency with Android. fix #897 2021-01-27 13:57:32 +08:00
Him188
d8b1505181
Highway big data channel (#917) 
- Fix retryWithServers exception suppress
- ConfigPush BDH session
- ConfigPush SSO change server
- Upload group PTT silk, #577
- Support upload private image through highway, close #194;
- Add fallback strategies for uploading group voice #577 and private image #916
- Upload all resources through highway BDH
- Support concurrent uploading
- Add BotConfiguration.highwayUploadCoroutineCount

close #916, close #577, close #194
 2021-01-26 19:08:01 +08:00
Him188
8ad0b91974 Fix blocking calls in suspend contexts 2021-01-26 13:38:23 +08:00
Him188
988794343b Improve buildscript, fix publication 2021-01-21 10:08:21 +08:00
Him188
7dd7f48994 Don't catch Error while reconnecting and sending packet, fix #824 2021-01-08 12:03:42 +08:00
Him188
faece77942 [Review] Rearrange utilities 2021-01-06 16:09:44 +08:00
Him188
382d3d08d4 [Review] Move WeakRef to mirai-core-utils 2021-01-06 15:13:15 +08:00
Him188
1d24a810fe Unify image id 2021-01-05 23:28:34 +08:00
Him188
767eb75d4e Move Http client from MiraiPlatformUtils to IMirai.Http 
Delete MiraiPlatformUtils

Add timeout configuration for ktor HttpClient, fix #673
 2021-01-05 20:43:04 +08:00
Him188
d5cdd9e161 Improve file type detecting 2021-01-05 20:35:10 +08:00
Him188
9347d6baf6 Fix voice upload, fix #782 2020-12-28 16:39:30 +08:00
Him188
31a8932070 Fix voice upload 2020-12-28 15:10:47 +08:00
Him188
42f824d516 Integrate Voice APIs with ExternalResource 2020-12-27 23:31:04 +08:00
Him188
822c3049c2 Fix package 2020-12-26 22:16:27 +08:00
Him188
73954130f8 Move utilities to mirai-core-utils 2020-12-26 20:05:10 +08:00
Him188
7a4a8fd55c Rename utils file 2020-12-26 17:46:39 +08:00
Him188
bda4cee0ed Move utilities to mirai-core-utils 2020-12-26 17:45:30 +08:00
Him188
bfda72e58f
ExternalResource (#754) 
* ExternalResource fundamentals:
- Introduce ExternalResource
- Migrate functions
- Move utilities to mirai-core-utils

* Fix build

* Fix filename and misc improvements

* Close file on ExternalResource.close;
Reset filePointer to 0 on stream close

* Rearrange image extensions

* Fix tests

* Fix build

* toExternalResource: formatName = null by default

* Reduce unnecessary continuations

* Fix ExternalResourceImplByFileWithMd5.inputStream

* ExternalResource: Remove BufferedImage support

* Don't close stream on image upload;
Unified closing behaviorImprove;
Improve FileCacheStrategy;

* Fix createImageDataPacketSequence closing

* Fix image upload, change size to long

* Fix docs

* Rename SendImageUtilsJvmKt to SendResourceUtilsJvmKt

* Run BIO appropriately

* Postpone file detection on formatName getter

* Fix SendResourceUtilsJvmKt JvmName

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2020-12-26 17:36:00 +08:00
Him188
82f24b736c Fix HMPP platform structure 2020-12-18 15:37:13 +08:00
Him188
20bc17ee43 Use constants in buildscript 2020-12-18 14:14:12 +08:00
Him188
95013a6ca2 Change Duration.asHumanReadable to Duration.toHumanReadableString for clearer semantics 2020-12-17 09:21:59 +08:00
Him188
b0d43eb708 Fix file classname 2020-12-17 09:07:58 +08:00
Him188
caeedf5d5d Move TimeUtils from mirai-core-api to mirai-core-utils 2020-12-17 08:31:24 +08:00
Him188
64bd63d7a0 Multiple MessageSource.id and MessageSource.internalId for split sources now, and split messages in the future. Close #618 2020-12-02 10:46:06 +08:00
Him188
8fdfe830fe Introduce new module mirai-core-utils 2020-12-02 09:25:25 +08:00