Browse Source
* First stab at killing holster and getting tests passing * Fix some things from my brief smoketestpull/136/head
Andrei Zbikowski
6 years ago
committed by
GitHub
GitHub
30 changed files with 481 additions and 429 deletions
@ -1,118 +0,0 @@ |
|||||
# CHANGELOG |
|
||||
|
|
||||
## v0.0.12 |
|
||||
|
|
||||
### Additions |
|
||||
|
|
||||
- **MAJOR** Added voice gateway v3 support. This will result in increased stability for voice connections |
|
||||
- **BREAKING** Updated holster to v2.0.0 which changes the way emitters work (and removes the previous priorities). A migration guide will be provided post-RC cycle. |
|
||||
- Added support for ETF on Python 3.x via `earl-etf` (@GiovanniMCMXCIX) |
|
||||
- Supported detecting dead/inactive/zombied Gateway websocket connections via tracking `HEARTBEAT_ACK` (@PixeLInc) |
|
||||
- Added support for animated emoji (@Seklfreak) |
|
||||
- Added support for `LISTENING` and `WATCHING` game statuses (@PixeLInc) |
|
||||
- Added `wsaccel` package within the `performance` pack, should improve websocket performance |
|
||||
- Added the concept of a `shared_config` which propgates its options to all plugin configs (@enkoder) |
|
||||
- Added support for streaming zlib compression to our gateway socket. This is enabled by default and provides significant performance improvements on startup and overall bandwidth usage |
|
||||
- Added support for `Guild.system_channel_id` and `GUILD_MEMBER_JOIN` system message |
|
||||
- Added `Guild.create_category`, `Guild.create_text_channel` and `Guild.create_voice_channel` |
|
||||
- Added `Channel.create_text_channel` and `Channel.create_voice_channel` which can be called only on category channels to add sub-channels |
|
||||
|
|
||||
### Fixes |
|
||||
|
|
||||
- Fixed 'Invalid token passed' errors from showing up (via removal of token validation) |
|
||||
- Fixed `IndexError` being raised when `MessageIterator` was done iterating (@Majora320) |
|
||||
- Fixed overwrite calculations in `Channel.get_permissions` (@cookkkie) |
|
||||
- A plethora of PEP8 and general syntax changes have been made to cleanup the code |
|
||||
- Fixed a bug with `Emoji.custom` |
|
||||
- Fixed a bug in the typing system that would not allow Field's to have a `default` of `None` |
|
||||
- Fixed the `__str__` method for Channel's displaying (useless) unset data for DMs |
|
||||
- Fixed a bug with `MessageIterator` related to iterating before or after an ID of 0 |
|
||||
- Fixed incorrect field name (`icon_proxy_url` vs `proxy_icon_url`) in MessageEmbedAuthor model |
|
||||
- Fixed bugs related to creating and deleting pinned messages |
|
||||
- Fixed `GuildBan.reason` incorrectly handling unicode reasons |
|
||||
- Fixed `Paginator` throwing an exception when reaching the end of pagination, instead of just ending its iteration |
|
||||
- Fixed `Paginator` defaulting to start at 0 for all iterations |
|
||||
|
|
||||
### Etc |
|
||||
|
|
||||
- **BREAKING** Refactor the way Role's are managed and updated. You should update your code to use `Role.update` |
|
||||
- **BREAKING** Renamed `Model.update` to `Model.inplace_update`. You should not have to worry about this change unless you explicitly call that method |
|
||||
- **DEPRECATION** Deprecated the use of `Guild.create_channel`. You should use the explicit channel type creation methods added in this release |
|
||||
- Cleaned up various documentation |
|
||||
- Removed some outdated storage/etc examples |
|
||||
- Expanded `APIClient.guilds_roles_create` to handle more attributes |
|
||||
- Bumped various requirement versions |
|
||||
|
|
||||
## v0.0.11 |
|
||||
|
|
||||
### Additions |
|
||||
|
|
||||
- Added support for Guild audit logs, exposed via `Guild.get_audit_log_entries`, `Guild.audit_log` and `Guild.audit_log_iter`. For more information see the `AuditLogEntry` model |
|
||||
- Added built-in Flask HTTP server which can be enabled via `http_enabled` and configured via `http_host`/`http_port` config options. The server allows plugins to define routes which can be called externally. |
|
||||
- Added support for capturing the raw responses returned from API requests via the `APIClient.capture` contextmanager |
|
||||
- Added support for NSFW channels via `Channel.nsfw` and `Channel.is_nsfw` |
|
||||
- Added initial support for channel categories via `Channel.parent_id` and `Channel.parent` |
|
||||
- Added various setters for updating Channel properties, e.g. `Channel.set_topic` |
|
||||
- Added support for audit log reasons, accessible through passing `reason` to various methods |
|
||||
- Added `disco.util.snowflake.from_timestamp_ms` |
|
||||
- Added support for `on_complete` callback within DCADOpusEncoderPlayable |
|
||||
- **BREAKING** Added new custom queue types `BaseQueue`/`PlayableQueue` for use w/ `Player`. |
|
||||
- `queue` can be passed when creating a `Player`, should inherit from BaseQueue |
|
||||
- Users who previously utilized the `put` method of the old `Player.queue` must move to using `Player.queue.append`, or providing a custom queue implementation. |
|
||||
- Added `Emoji.custom` property |
|
||||
|
|
||||
### Fixes |
|
||||
|
|
||||
- Fixed GuildRoleCreate missing guild\_id, resulting in incorrect state |
|
||||
- Fixed SimpleLimiter behaving incorrectly (causing GW socket to be ratelimited in some cases) |
|
||||
- Fixed the shortest possible match for a single command being an empty string |
|
||||
- Fixed group matching being overly greedy, which allowed for extra characters to be allowed at the end of a group match |
|
||||
- Fixed errors thrown when not enabling manhole via cli |
|
||||
- Fixed various warnings emitted due to useage of StopIteration |
|
||||
- Fixed warnings about missing voice libs when importing `disco.types.channel` |
|
||||
- Fixed `Bot.get_commands_for_message` returning None (instead of empty list) in some cases |
|
||||
|
|
||||
### Etc |
|
||||
|
|
||||
- Greatly imrpoved the performance of `HashMap` |
|
||||
- **BREAKING** Increased the weight of group matches over command argument matches, and limited the number of commands executed per message to one. |
|
||||
- Reuse a buffer in voice code to slightly improve performance |
|
||||
|
|
||||
## v0.0.11-rc.8 |
|
||||
|
|
||||
### Additions |
|
||||
|
|
||||
- Added support for capturing the raw responses returned from the API via `APIClient.capture` contextmanager |
|
||||
- Added various pieces of documentation |
|
||||
|
|
||||
### Fixes |
|
||||
|
|
||||
- Fixed Python 3 errors and Python 2 deprecation warnings for CommandError using `.message` attribute |
|
||||
|
|
||||
### ETC |
|
||||
|
|
||||
- Grealty improved the performance of the custom HashMap |
|
||||
- Moved tests around and added pytest as the testing framework of choice |
|
||||
|
|
||||
|
|
||||
## v0.0.11-rc.7 |
|
||||
|
|
||||
### Additions |
|
||||
|
|
||||
- Added support for new NSFW attribute of channels |
|
||||
- `Channel.nsfw` |
|
||||
- `Channel.set_nsfw` |
|
||||
- `Channel.is_nsfw` behaves correctly, checking both the deprecated `nsfw-` prefix and the new attribute |
|
||||
- Added support for `on_complete` callback within DCADOpusEncoderPlayable |
|
||||
- **BREAKING** Added new custom queue types `BaseQueue`/`PlayableQueue` for use w/ `Player`. |
|
||||
- `queue` can be passed when creating a `Player`, should inherit from BaseQueue |
|
||||
- Users who previously utilized the `put` method of the old `Player.queue` must move to using `Player.queue.append`, or providing a custom queue implementation. |
|
||||
|
|
||||
### Fixes |
|
||||
|
|
||||
- Fixed bug within SimpleLimiter which would cause all events after a quiescent period to be immedietly dispatched. This would cause gateway disconnects w/ RATE\_LIMITED on clients with many Guilds and member sync enabled. |
|
||||
|
|
||||
### ETC |
|
||||
|
|
||||
- Improved log messages within GatewayClient |
|
||||
- Log voice endpoint within VoiceClient |
|
||||
@ -1,20 +1,18 @@ |
|||||
from holster.enum import Enum |
|
||||
|
|
||||
SEND = 1 |
SEND = 1 |
||||
RECV = 2 |
RECV = 2 |
||||
|
|
||||
OPCode = Enum( |
|
||||
DISPATCH=0, |
class OPCode(object): |
||||
HEARTBEAT=1, |
DISPATCH = 0 |
||||
IDENTIFY=2, |
HEARTBEAT = 1 |
||||
STATUS_UPDATE=3, |
IDENTIFY = 2 |
||||
VOICE_STATE_UPDATE=4, |
STATUS_UPDATE = 3 |
||||
VOICE_SERVER_PING=5, |
VOICE_STATE_UPDATE = 4 |
||||
RESUME=6, |
VOICE_SERVER_PING = 5 |
||||
RECONNECT=7, |
RESUME = 6 |
||||
REQUEST_GUILD_MEMBERS=8, |
RECONNECT = 7 |
||||
INVALID_SESSION=9, |
REQUEST_GUILD_MEMBERS = 8 |
||||
HELLO=10, |
INVALID_SESSION = 9 |
||||
HEARTBEAT_ACK=11, |
HELLO = 10 |
||||
GUILD_SYNC=12, |
HEARTBEAT_ACK = 11 |
||||
) |
GUILD_SYNC = 12 |
||||
|
|||||
@ -0,0 +1,162 @@ |
|||||
|
import gevent |
||||
|
|
||||
|
from collections import defaultdict |
||||
|
from gevent.event import AsyncResult |
||||
|
from gevent.queue import Queue, Full |
||||
|
|
||||
|
|
||||
|
class Priority(object): |
||||
|
# BEFORE is the most dangerous priority level. Every event that flows through |
||||
|
# the given emitter instance will be dispatched _sequentially_ to all BEFORE |
||||
|
# handlers. Until these before handlers complete execution, no other event |
||||
|
# will be allowed to continue. Any exceptions raised will be ignored. |
||||
|
BEFORE = 1 |
||||
|
|
||||
|
# AFTER has the same behavior as before with regards to dispatching events, |
||||
|
# with the one difference being it executes after all the BEFORE listeners. |
||||
|
AFTER = 2 |
||||
|
|
||||
|
# SEQUENTIAL guarentees that all events your handler recieves will be ordered |
||||
|
# when looked at in isolation. SEQUENTIAL handlers will not block other handlers, |
||||
|
# but do use a queue internally and thus can fall behind. |
||||
|
SEQUENTIAL = 3 |
||||
|
|
||||
|
# NONE provides no guarentees around the ordering or execution of events, sans |
||||
|
# that BEFORE handlers will always complete before any NONE handlers are called. |
||||
|
NONE = 4 |
||||
|
|
||||
|
ALL = {BEFORE, AFTER, SEQUENTIAL, NONE} |
||||
|
|
||||
|
|
||||
|
class Event(object): |
||||
|
def __init__(self, parent, data): |
||||
|
self.parent = parent |
||||
|
self.data = data |
||||
|
|
||||
|
def __getattr__(self, name): |
||||
|
if hasattr(self.data, name): |
||||
|
return getattr(self.data, name) |
||||
|
raise AttributeError |
||||
|
|
||||
|
|
||||
|
class EmitterSubscription(object): |
||||
|
def __init__(self, events, callback, priority=Priority.NONE, conditional=None, metadata=None, max_queue_size=8096): |
||||
|
self.events = events |
||||
|
self.callback = callback |
||||
|
self.priority = priority |
||||
|
self.conditional = conditional |
||||
|
self.metadata = metadata or {} |
||||
|
self.max_queue_size = max_queue_size |
||||
|
|
||||
|
self._emitter = None |
||||
|
self._queue = None |
||||
|
self._queue_greenlet = None |
||||
|
|
||||
|
if priority == Priority.SEQUENTIAL: |
||||
|
self._queue_greenlet = gevent.spawn(self._queue_handler) |
||||
|
|
||||
|
def __del__(self): |
||||
|
if self._emitter: |
||||
|
self.detach() |
||||
|
|
||||
|
if self._queue_greenlet: |
||||
|
self._queue_greenlet.kill() |
||||
|
|
||||
|
def __call__(self, *args, **kwargs): |
||||
|
if self._queue is not None: |
||||
|
try: |
||||
|
self._queue.put_nowait((args, kwargs)) |
||||
|
except Full: |
||||
|
# TODO: warning |
||||
|
pass |
||||
|
return |
||||
|
|
||||
|
if callable(self.conditional): |
||||
|
if not self.conditional(*args, **kwargs): |
||||
|
return |
||||
|
return self.callback(*args, **kwargs) |
||||
|
|
||||
|
def _queue_handler(self): |
||||
|
self._queue = Queue(self.max_queue_size) |
||||
|
|
||||
|
while True: |
||||
|
args, kwargs = self._queue.get() |
||||
|
try: |
||||
|
self.callback(*args, **kwargs) |
||||
|
except Exception: |
||||
|
# TODO: warning |
||||
|
pass |
||||
|
|
||||
|
def attach(self, emitter): |
||||
|
self._emitter = emitter |
||||
|
|
||||
|
for event in self.events: |
||||
|
self._emitter.event_handlers[self.priority][event].append(self) |
||||
|
|
||||
|
return self |
||||
|
|
||||
|
def detach(self, emitter=None): |
||||
|
emitter = emitter or self._emitter |
||||
|
|
||||
|
for event in self.events: |
||||
|
if self in emitter.event_handlers[self.priority][event]: |
||||
|
emitter.event_handlers[self.priority][event].remove(self) |
||||
|
|
||||
|
def remove(self, emitter=None): |
||||
|
self.detach(emitter) |
||||
|
|
||||
|
|
||||
|
class Emitter(object): |
||||
|
def __init__(self): |
||||
|
self.event_handlers = { |
||||
|
k: defaultdict(list) for k in Priority.ALL |
||||
|
} |
||||
|
|
||||
|
def emit(self, name, *args, **kwargs): |
||||
|
# First execute all BEFORE handlers sequentially |
||||
|
for listener in self.event_handlers[Priority.BEFORE].get(name, []): |
||||
|
try: |
||||
|
listener(*args, **kwargs) |
||||
|
except Exception: |
||||
|
pass |
||||
|
|
||||
|
# Next execute all AFTER handlers sequentially |
||||
|
for listener in self.event_handlers[Priority.AFTER].get(name, []): |
||||
|
try: |
||||
|
listener(*args, **kwargs) |
||||
|
except Exception: |
||||
|
pass |
||||
|
|
||||
|
# Next enqueue all sequential handlers. This just puts stuff into a queue |
||||
|
# without blocking, so we don't have to worry too much |
||||
|
for listener in self.event_handlers[Priority.SEQUENTIAL].get(name, []): |
||||
|
listener(*args, **kwargs) |
||||
|
|
||||
|
# Finally just spawn for everything else |
||||
|
for listener in self.event_handlers[Priority.NONE].get(name, []): |
||||
|
gevent.spawn(listener, *args, **kwargs) |
||||
|
|
||||
|
def on(self, *args, **kwargs): |
||||
|
return EmitterSubscription(args[:-1], args[-1], **kwargs).attach(self) |
||||
|
|
||||
|
def once(self, *args, **kwargs): |
||||
|
result = AsyncResult() |
||||
|
li = None |
||||
|
|
||||
|
def _f(e): |
||||
|
result.set(e) |
||||
|
li.detach() |
||||
|
|
||||
|
li = self.on(*args + (_f, )) |
||||
|
|
||||
|
return result.wait(kwargs.pop('timeout', None)) |
||||
|
|
||||
|
def wait(self, *args, **kwargs): |
||||
|
result = AsyncResult() |
||||
|
match = args[-1] |
||||
|
|
||||
|
def _f(e): |
||||
|
if match(e): |
||||
|
result.set(e) |
||||
|
|
||||
|
return result.wait(kwargs.pop('timeout', None)) |
||||
@ -0,0 +1,27 @@ |
|||||
|
import gevent |
||||
|
import weakref |
||||
|
|
||||
|
|
||||
|
class ThreadLocal(object): |
||||
|
___slots__ = ['storage'] |
||||
|
|
||||
|
def __init__(self): |
||||
|
self.storage = weakref.WeakKeyDictionary() |
||||
|
|
||||
|
def get(self): |
||||
|
if gevent.getcurrent() not in self.storage: |
||||
|
self.storage[gevent.getcurrent()] = {} |
||||
|
return self.storage[gevent.getcurrent()] |
||||
|
|
||||
|
def drop(self): |
||||
|
if gevent.getcurrent() in self.storage: |
||||
|
del self.storage[gevent.getcurrent()] |
||||
|
|
||||
|
def __contains__(self, key): |
||||
|
return key in self.get() |
||||
|
|
||||
|
def __getitem__(self, item): |
||||
|
return self.get()[item] |
||||
|
|
||||
|
def __setitem__(self, item, value): |
||||
|
self.get()[item] = value |
||||
@ -1,17 +1,14 @@ |
|||||
from holster.enum import Enum |
class VoiceOPCode(object): |
||||
|
IDENTIFY = 0 |
||||
VoiceOPCode = Enum( |
SELECT_PROTOCOL = 1 |
||||
IDENTIFY=0, |
READY = 2 |
||||
SELECT_PROTOCOL=1, |
HEARTBEAT = 3 |
||||
READY=2, |
SESSION_DESCRIPTION = 4 |
||||
HEARTBEAT=3, |
SPEAKING = 5 |
||||
SESSION_DESCRIPTION=4, |
HEARTBEAT_ACK = 6 |
||||
SPEAKING=5, |
RESUME = 7 |
||||
HEARTBEAT_ACK=6, |
HELLO = 8 |
||||
RESUME=7, |
RESUMED = 9 |
||||
HELLO=8, |
CLIENT_CONNECT = 12 |
||||
RESUMED=9, |
CLIENT_DISCONNECT = 13 |
||||
CLIENT_CONNECT=12, |
CODECS = 14 |
||||
CLIENT_DISCONNECT=13, |
|
||||
CODECS=14, |
|
||||
) |
|
||||
|
|||||
@ -1,5 +1,4 @@ |
|||||
gevent==1.3.7 |
gevent==1.3.7 |
||||
holster==2.0.0 |
|
||||
requests==2.20.1 |
requests==2.20.1 |
||||
six==1.11.0 |
six==1.11.0 |
||||
websocket-client==0.44.0 |
websocket-client==0.44.0 |
||||
|
|||||
Loading…
Reference in new issue