Change of plans, we're now just a regular pseudoservice

- Remove multinet support
- Update config.yml.example

README.md

@@ -1,6 +1,6 @@
 # PyLink
 
-PyLink is an IRC PseudoService written in Python that *might one day* be a replacement for the now defunct Janus.
+PyLink is an IRC PseudoService written in Python.
 
 ## Dependencies
 

config.yml.example

@@ -9,17 +9,18 @@ login:
   user: admin
   password: changeme
 
-networks:
+server:
-  mynet:
     # Server name, port, and passwords
+    netname: whatever
     ip: 127.0.0.1
-    port: 6667
+    port: 7000
-    recvpass: "abcdefg"
+    recvpass: "abcd"
-    sendpass: "gfedcba"
+    sendpass: "abcd"
     # Hostname we will use to connect to the remote server
-    hostname: "pylink.overdrive.pw"
+    hostname: "pylink.yournet"
     # SID - required for InspIRCd and TS6 based servers. This must be three characters long.
     # The first char must be a digit [0-9], and the remaining two chars may be letters [A-Z] or digits.
     sid: "0AL"
-    # Set protocol module (currently only a null stub is available, but this will change in the future)
+    # Set protocol module
-    protocol: stub
+    protocol: inspircd
+    channel: "#pylink"

main.py

@@ -16,30 +16,25 @@ with open("config.yml", 'r') as f:
 # if conf['login']['password'] == 'changeme':
 #     print("You have not set the login details correctly! Exiting...")
 
-global networkobjects
-networkobjects = {}
-
 class IrcUser():
     def __init__(self, nick, timestamp, data={'uid': None}):
         self.nick = nick
         self.data = data
         self.timestamp = timestamp
 
-class Irc(multiprocessing.Process):
+class Irc():
-    def __init__(self, network):
+    def __init__(self):
-        multiprocessing.Process.__init__(self)
         # Initialize some variables
         self.socket = socket.socket()
-        self.kill_received = False
+        self.connected = False
         self.users = {}
-        self.name = network
+        self.name = conf['server']['netname']
 
-        self.serverdata = conf['networks'][network]
+        self.serverdata = conf['server']
         ip = self.serverdata["ip"]
         port = self.serverdata["port"]
         self.sid = self.serverdata["sid"]
-        print("[+] New thread started for %s:%s" % (ip, port))
+        print("Connecting to network %r on %s:%s" % (self.name, ip, port))
-
 
         protoname = self.serverdata['protocol']
         # With the introduction of Python 3, relative imports are no longer
@@ -57,9 +52,11 @@ class Irc(multiprocessing.Process):
         self.socket = socket.socket()
         self.socket.connect((ip, port))
         self.proto.connect(self)
+        self.connected = True
+        self.run()
 
     def run(self):
-        while not self.kill_received:
+        while self.connected:
             try:
                 data = self.socket.recv(1024)
                 if data:
@@ -68,25 +65,12 @@ class Irc(multiprocessing.Process):
                         print("<- {}".format(line))
                         self.proto.handle_events(self, line)
             except socket.error:
-                self.restart()
+                print('Received socket.error: %s, exiting.' % str(e))
-                break
+                self.connected = False
 
     def send(self, data):
         data = data.encode("utf-8") + b"\n"
         print("-> {}".format(data.decode("utf-8").strip("\n")))
         self.socket.send(data)
 
-    def restart(self):
+irc_obj = Irc()
-        print('Disconnected... Restarting IRC Object for: %s' % network)
-        time.sleep(1)
-        del networkobjects[network]
-        networkobjects[network] = Irc(network)
-
-    def relay(self, line):
-        for network in networkobjects.values():
-            self.proto.handle_events(self, line)
-
-for network in conf['networks']:
-    print('Creating IRC Object for: %s' % network)
-    networkobjects[network] = Irc(network)
-    networkobjects[network].start()

protocols/inspircd.py

@@ -70,7 +70,6 @@ def handle_events(irc, data):
 
         numeric = args[0]
         command = args[1]
-        print(args)
     except IndexError:
         return