James Lu
f4da1fc94c
Merge branch 'master' into devel
...
Conflicts:
VERSION
classes.py
docs/faq.md
example-conf.yml
protocols/p10.py
pylink
world.py
2017-08-05 22:11:22 -07:00
James Lu
7db811f2dd
protocols: declare quiet extban support where applicable
2017-08-05 21:52:34 -07:00
James Lu
a0a295f7d2
Set Irc.aborted earlier in the disconnect loop
...
This prevents plugins from getting really confused as we remove things.
2017-08-03 10:22:57 -07:00
James Lu
0d5afd266f
Irc: stop extraneous queue threads when removing from world.networkobjects
2017-08-03 10:15:29 -07:00
James Lu
981e6c508f
Move _check_nick_collision to NetworkCoreWithUtils
...
This is useful for networks that emulate IRC as well, to prevent clashes between real clients and virtual ones.
2017-07-31 20:58:02 +08:00
James Lu
47f3977554
Move NetworkCore.parse_protocol_command to IRCNetwork.parse_irc_command
...
Also add a stub for handle_events.
2017-07-31 11:09:08 +08:00
James Lu
eae1425975
NetworkCore: remove nonexistent cmode +r from mode type definitions
2017-07-31 00:43:19 +08:00
James Lu
c7c29f35e5
core: make message cutoff optional, and disable for inspircd
...
Closes #490 .
2017-07-16 21:01:55 -07:00
James Lu
b88830ba25
classes: migrate to conf.conf['pylink']
2017-07-14 05:50:19 -07:00
James Lu
880d0975db
Merge branch 'type-to-isinstance' of https://github.com/cooper/PyLink into devel
2017-07-14 05:22:37 -07:00
James Lu
716ffd389b
classes: mark reply_lock, init_vars as private
2017-07-14 05:22:05 -07:00
James Lu
fa4d831e44
NetworkCore: remove outdated, now misleading constructor description
2017-07-12 23:16:03 -07:00
James Lu
2e7fed84c1
IRCNetwork: mark connection_thread, pingTimer, socket, and queue as private
2017-07-12 22:56:30 -07:00
James Lu
2ef7df01e7
IRCNetwork: don't try to close the socket if none was ever initialized
2017-07-12 22:50:16 -07:00
James Lu
db778debb8
Fix error logging for validate_server_conf ( #472 )
2017-07-12 22:44:48 -07:00
James Lu
69bafedcca
IRCNetwork: use a less confusing error than "No data received"
2017-07-12 22:22:08 -07:00
James Lu
0e3d733a72
NetworkCore: set self.aborted to True as early as possible when launching a disconnect
...
This should prevent spurious "No data received" errors from popping up when using the 'disconnect' command.
2017-07-12 22:22:08 -07:00
James Lu
f85bdb3d8b
IRCNetwork: suppress logging connection errors when PyLink is shutting down
2017-07-12 22:22:08 -07:00
Mitchell Cooper
7ab0e8f105
use isinstance() instead of type() where appropriate #410
2017-07-12 17:29:34 -04:00
James Lu
1a8dcdfa3a
NetworkCore: use the new validate_server_conf name
2017-07-11 02:22:01 -07:00
James Lu
b7466327db
protocols: move S2S_BUFSIZE definition into a class variable
2017-07-07 20:14:26 -07:00
James Lu
1172ca7387
IRCNetwork: use \r\n as separator instead of \n
...
CRLF is the standard way of doing this per RFC1459
2017-07-07 20:14:26 -07:00
James Lu
51fb269d0d
IRCNetwork: don't attempt to send more than 510 bytes per message
...
Some IRCds like ngIRCd will SQUIT you if you try to do so, though most just ignore this kind of overflow.
2017-07-07 20:14:23 -07:00
James Lu
3bcf0092e9
NetworkCoreWithUtils: wrap irc.to_lower in a lru_cache
2017-07-07 14:40:27 -07:00
James Lu
6636a19a2b
ngircd: implement handler for METADATA
2017-07-06 22:15:56 -07:00
James Lu
9132556fd9
PyLinkNetworkCore: fix __repr__ definition
2017-07-04 23:32:41 -07:00
James Lu
970b38719d
core: rename ping() to _ping_uplink(), and drop the unused source/target arguments
2017-07-04 22:09:50 -07:00
James Lu
640e903dd6
Move _get_SID/_get_UID to IRCCommonProtocol
2017-07-02 22:36:47 -07:00
James Lu
bbc4dec8dd
NetworkCoreWithUtils: shortcut _get_SID/UID if the target already exists
2017-07-02 22:35:39 -07:00
James Lu
e866e9eb7b
NetworkCore: demote "stopping connect loop" messages to DEBUG
2017-07-02 22:26:28 -07:00
James Lu
06ef421578
classes: clean up references to deprecated classes/methods
2017-06-30 21:49:29 -07:00
James Lu
a73300e864
classes.Channel: migrate to snake case
2017-06-30 21:34:08 -07:00
James Lu
0c7fb861f1
classes, relay, ircs2s_c: tweak/remove various debug statements
2017-06-29 23:19:21 -07:00
James Lu
67347935b5
ircs2s_common: add missing ProtocolError import
2017-06-29 21:55:33 -07:00
James Lu
56275c5a3b
NetworkCore: rename removeClient -> _remove_client (no migration stub)
2017-06-27 16:21:30 -07:00
James Lu
5e7529dae4
Move some functions back into NetworkCore
...
Things like is_internal_client() are specific to the way we track users, so it doesn't make much sense to override these per protocol. It can *still* be done though, but there's little point...
2017-06-27 16:17:28 -07:00
James Lu
56f1c9e919
NetworkCore: fix irc.protoname definition
2017-06-27 16:15:37 -07:00
James Lu
ad2d5a5ae0
Move ts_lock definition into PyLinkNetworkCoreWithUtils
2017-06-27 16:12:45 -07:00
James Lu
928dbf80bb
Move more IRC-specific attributes into IRCNetwork.init_vars()
2017-06-27 16:05:58 -07:00
James Lu
62784a63e4
IRCNetwork: error when attempting to start multiple connection threads for a network
2017-06-27 15:58:55 -07:00
James Lu
c3cdf63253
Move some IRC-specific attributes to IRCNetwork
2017-06-27 15:58:38 -07:00
James Lu
fb34392fca
IRCNetwork: mark schedule_ping, process_queue as private
2017-06-27 02:53:09 -07:00
James Lu
710a276c45
IRCNetwork: rename run() -> _run_irc(), this is a private function
2017-06-27 01:44:26 -07:00
James Lu
7814914a05
classes, protocols: convert self.irc usage to self
2017-06-25 02:09:52 -07:00
James Lu
eef7a73ce9
classes: migrate self.proto calls to self
2017-06-25 02:09:41 -07:00
James Lu
d0209f720a
Rewrite network intitialization bits
...
- Move protocols.connect -> protocols.post_connect to fix namespace conflict
- Starting an IRC connection is now explicit (via irc.connect instead of __init__)
2017-06-25 01:12:58 -07:00
James Lu
df18e318a8
WIP: merge IRCNetwork and Protocol classes together
...
Eventually, the goal is to have both of these hotswappable with inheritance, so this distinction becomes moot.
2017-06-24 23:27:24 -07:00
James Lu
7ca98eb965
Split IRC-specific code from classes.Protocol into a new IRCCommonProtocol ( #454 )
2017-06-16 17:13:26 -07:00
James Lu
37d8e8ad43
Irc: break protocol-agnostic [dis]connect code into _pre/_post functions ( #371 )
2017-06-16 16:53:23 -07:00
James Lu
2a978c498e
Rename PyLinkIRCNetwork -> IRCNetwork
...
The "PyLink" prefix is sort of redundant here...
2017-06-15 21:55:08 -07:00
James Lu
c4f6d626d5
Drop Irc prefix from IrcServer/User/Channel classes
2017-06-15 21:54:40 -07:00
James Lu
d98d522387
Move Irc.runline => PyLinkNetworkCore.parse_protocol_command
2017-06-15 21:45:04 -07:00
James Lu
47e36a9249
classes: break Irc into three classes: PyLinkNetworkCore, PyLinkNetworkCoreWithUtils, PyLinkIRCNetwork (aliased to Irc)
2017-06-15 21:38:52 -07:00
James Lu
d4fae02540
Irc: migrate functions to camel case
2017-06-02 23:17:14 -07:00
James Lu
f97db31533
Irc: show the current encoding setting in fullVersion()
2017-06-02 08:46:55 -07:00
James Lu
3a934ef5b8
Merge branch 'wip/configurable-encoding' into devel
2017-06-02 07:32:07 -07:00
James Lu
b9aee6ae85
Irc: only apply encoding settings on connect
...
Changing the encoding after a connection has been established is somewhat dangerous, because it's possible to corrupt channel/user state if characters in the old encoding are no longer valid.
Also, mark this option as experimental.
2017-06-02 07:31:49 -07:00
James Lu
1ff027152a
Irc: remove outdated cert/keyfile comment
2017-05-28 20:09:26 -07:00
James Lu
2737b6bbfc
Irc: simplify _send() code and replace unencodable characters
2017-05-27 02:21:12 -07:00
James Lu
1246edaf2c
Irc: initial work on encoding support ( #101 )
2017-05-27 01:27:09 -07:00
James Lu
ead20f5be9
Irc: log full tracebacks when disconnecting due to an error
2017-05-16 16:30:03 -07:00
James Lu
fd3236ddb7
Irc: fix another CPU loop on 'disconnect'
2017-05-12 19:52:40 -07:00
James Lu
daa6593534
Irc: block when the queue is empty instead of needlessly polling it
...
Rework Irc.processQueue() to block when the queue is full, and abort if the item "None" is sent to it.
To make sure that the None isn't caught by a full queue or pushed back by other elements, this modifies queue.Queue's underlying deque instance directly.
Closes #459 .
2017-05-12 17:55:24 -07:00
James Lu
06d49f4433
Revert "Irc: only disconnect the write portion of the socket"
...
This reverts commit f4babc6f28
.
2017-05-12 17:19:16 -07:00
James Lu
7daef0000b
Irc: break out of processQueue properly when a network disconnects
2017-05-09 23:31:20 -07:00
James Lu
701f01fa4f
Irc: reword error message from last commit to be more concise
2017-05-09 18:19:35 -07:00
James Lu
bac6dc36b4
Irc: log socket.send() errors with a proper traceback
2017-05-09 18:06:51 -07:00
James Lu
4ca8667669
Irc: fix 62aea23879
(lowercase queue)
2017-05-07 17:34:04 -07:00
James Lu
62aea23879
Irc: fix throttle_time not actually blocking for the defined amount of time
...
Passing the timeout to queue.Queue.get is invalid because it'll only block if there ISN'T any text to send.
2017-05-07 17:31:31 -07:00
James Lu
15ed251ed7
Irc: refuse to queue send data if aborted is set
2017-05-07 13:46:25 -07:00
James Lu
de67fe0d37
Irc: log socket shutdown errors to debug
2017-05-07 13:46:15 -07:00
James Lu
f4babc6f28
Irc: only disconnect the write portion of the socket
...
Per https://docs.python.org/3/howto/sockets.html#disconnecting
2017-05-07 13:46:06 -07:00
James Lu
5d629f7331
matchHost: extend negation via "!" to regular hostmasks as well as exttargets
2017-05-04 19:04:03 -07:00
James Lu
6d96dd21ac
updateTS: remove usage of mutable as function default argument
...
This may subtly break things: https://docs.quantifiedcode.com/python-anti-patterns/correctness/mutable_default_value_as_argument.html
2017-04-09 14:45:12 -07:00
James Lu
348572bcb6
Irc: rewrite sendq to use queue.Queue, and add an upper bound (maxsendq)
...
Closes #430 . Closes #442 .
2017-03-31 17:41:56 -07:00
James Lu
9d9b01839c
Split Irc.reply() into _reply() to make 'networks.remote' actually thread-safe
...
Previously, the Irc.reply_lock check was in the reply() function itself: replacing it with another function checking for the same lock would delay execution,
but then run the wrong reply() code if another module used irc.reply() while 'remote' was executing.
2017-03-31 16:25:28 -07:00
James Lu
ae6c68018b
core: half the default throttle time (from 0.01 to 0.005)
2017-03-28 22:38:54 -07:00
James Lu
938a1fb9d7
Irc: reorder comments from last commit
2017-03-26 14:25:02 -07:00
James Lu
397df48efd
Irc: simplify runloop error catching, adding RuntimeError and SystemExit ( closes #438 )
...
socket.error is aliased to OSError since Python 3.3, and ConnectionError is actually a subclass of OSError.
So, it makes more sense to just catch the more generic type here.
Also, make ProtocolError derive from RuntimeError instead of Exception.
2017-03-26 14:17:37 -07:00
James Lu
e3c0bf6a1b
Irc: break out of processQueue as soon as self.aborted is set
2017-03-24 18:40:02 -07:00
James Lu
99d3780773
Irc: add locking for reply() calls ( #437 )
2017-03-24 00:57:21 -07:00
James Lu
ff6d961922
Protocol: add missing self in hasCap()
2017-03-23 22:41:12 -07:00
James Lu
f512ae1b33
Protocol: add a hasCap() wrapper function ( #337 )
2017-03-15 23:46:13 -07:00
James Lu
2ca0cf05a0
Start work on protocol capabilities ( #337 )
2017-03-15 23:32:47 -07:00
James Lu
afc5cc26fa
Irc: more compact __repr__ for IrcChannel/IrcServer/IrcUser
2017-03-11 22:49:48 -08:00
James Lu
2028cab04c
core: Grow autoconnect delays by a configurable factor whenever connections fail
...
Closes #348 .
2017-03-11 00:21:30 -08:00
James Lu
9e50c5e69a
Irc: try to make breaking out of autoconnect loops faster
2017-03-10 23:57:37 -08:00
James Lu
3096c54bb8
Irc: return in msg() if the main client is missing and no explicit source is set
2017-03-10 23:47:07 -08:00
James Lu
9a9e0b2c20
Irc: deprecate the botdata field as well ( #273 )
2017-03-05 00:14:43 -08:00
James Lu
b4f70bdece
Irc: remove duplicate botdata assignment
2017-03-05 00:06:49 -08:00
James Lu
4284853a4a
Irc: remove internal use of 'conf' and 'botdata' ( #273 )
2017-03-05 00:06:44 -08:00
James Lu
7f070448b7
utils, Irc: add abstraction to warn on deprecated attribute usage ( #273 )
2017-03-05 00:00:26 -08:00
James Lu
5fe277f90d
Irc: mention CIDR matching ( #411 ) and casemappings in matchHost() desc.
2017-02-25 22:26:37 -08:00
James Lu
4df8567fa6
Irc: move PYLINK_DISCONNECT firing and connected.clear() into disconnect() ( #421 )
...
This may prevent extra irc.connected.clear() calls from messing with the was_connected state.
2017-02-25 22:06:43 -08:00
James Lu
7c0cb92696
Irc: hack in CIDR support in matchHost() ( #411 )
2017-02-24 22:27:26 -08:00
James Lu
04fa0520a6
Irc: make was_successful check the last Irc.connected state
2017-02-24 22:09:41 -08:00
James Lu
b30d696e3a
Irc: add "was_successful" data key to PYLINK_DISCONNECT
...
This stores whether the network was actually connected before this disconnect message fired (i.e. the disconnect wasn't caused by a configuration error, etc.)
2017-02-24 21:42:44 -08:00
James Lu
3d9f69dba7
Irc: deprecate checkAuthenticated()
2017-02-24 18:42:58 -08:00
James Lu
21cbcb8cf6
Irc: fix / simplify defaults in msg(), reply, error()
2017-02-24 16:28:23 -08:00
James Lu
12bb59d257
Irc: more parseArgs tweaks
...
- Make parsePrefixedArgs() a class method
- Split the input if parseArgs() is given a raw string instead of a list
2017-02-18 19:58:24 -08:00