wnox 0.8.0__tar.gz → 1.0.0__tar.gz

{wnox-0.8.0 → wnox-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wnox
-Version: 0.8.0
+Version: 1.0.0
 Summary: QE nexus client.
 Home-page: https://github.com/arminkardan/pywnox
 Author: Ethan (Armin) Cardan
@@ -13,7 +13,8 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: slixmpp
-Requires-Dist: bson
+Requires-Dist: python-dotenv
+Requires-Dist: pymongo
 Dynamic: author
 Dynamic: home-page
 Dynamic: requires-python

{wnox-0.8.0 → wnox-1.0.0}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wnox"
-version = "0.8.0"
+version = "1.0.0"
 authors = [{ name = "Ethan (Armin) Cardan", email = "armin.fire@gmail.com" }]
 description = "QE nexus client."
 readme = "README.md"
 license = { file = "LICENSE" }
-dependencies = ["slixmpp","bson"]
+dependencies = ["slixmpp","python-dotenv","pymongo"]
 requires-python = ">=3.11"
 classifiers = [
     "Programming Language :: Python :: 3",

{wnox-0.8.0 → wnox-1.0.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="wnox",
-    version="0.8.0",
+    version="1.0.0",
     packages=find_packages(),
     install_requires=[],
     author="Ethan (Armin) Cardan",

{wnox-0.8.0 → wnox-1.0.0}/wnox/__init__.py

@@ -10,6 +10,10 @@ import requests as r
 
 import random
 import string
+from dotenv import load_dotenv
+import os
+from pymongo import MongoClient
+
 
 nest_asyncio.apply()
 eventdatax = {}
@@ -46,6 +50,11 @@ class WSX(ClientXMPP, EventEmitter):
     connected = False
     def __init__(self, jid, password, app:str, uid:str, resource:str):
     
+        if "-" in app:
+            raise "app should not contain dash '-'"
+        if "-" in resource:
+            raise "resource should not contain dash '-'"
+        
         ClientXMPP.__init__(self, jid, password)
         EventEmitter.__init__(self)
         self.app = app
@@ -59,7 +68,7 @@ class WSX(ClientXMPP, EventEmitter):
 
     async def start(self, event):
         """Handle session start."""
-        print("[bridge] connected.")
+        
         self.send_presence(ptype="presence")
         await self.get_roster()
         await self.emit("__connect",{})
@@ -113,16 +122,14 @@ class WSX(ClientXMPP, EventEmitter):
                             data = {key: val for key, val in data.items() if key != "mid"}
                             data["from"] = from_jid
                             data["app"] = None
+                           
                             if len(user_uid) == 24 and ObjectId.is_valid(user_uid):
                                 data["uid"] = user_uid
                                 data["app"] = None
-                                result = await self.emit(json_data["api"], data)
-                                if result == None:
-                                    result = {}
-                                self.send_message(
-                                    mto=from_jid,
-                                    mbody=json.dumps({**result, "mid": json_data.get("mid")})
-                                )
+                                data["resource"] = None
+                                if "@qepal.com/" in  from_jid:
+                                    data["resource"] = from_jid.split("@qepal.com/")[1]
+                                
                             elif "conference.qepal.com" in from_jid:
                                 pass
                             elif "-" in user_uid:
@@ -130,6 +137,15 @@ class WSX(ClientXMPP, EventEmitter):
                                 user_uid = user_uid.split('-')[1]
                                 data["app"] = app
                                 data["uid"] = user_uid
+                                data["resource"] = from_jid.split('@qepal.com/')[1]
+                                
+                            result = await self.emit(json_data["api"], data)
+                            if result == None:
+                                result = {}    
+                            self.send_message(
+                                    mto=from_jid,
+                                    mbody=json.dumps({**result, "mid": json_data.get("mid")})
+                                )
                                 
                         else:
                             if "mid" in json_data:
@@ -138,18 +154,80 @@ class WSX(ClientXMPP, EventEmitter):
                                 if json_data.get("mid") in eventsx:
                                     eventsx.get(json_data.get("mid")).set()
                             else:
-                                await self.emit("__message", {"from": from_jid, "body": body, "itsme": itsme, "itsbro": itsbro})
+                               
+                                data["channel"] = None
+                                if "@conference.qepal.com" in from_jid:
+                                    s = from_jid.split("@conference.qepal.com/")
+                                    data = {"from": from_jid, "body": body, "itsme": itsme, "itsbro": itsbro}
+                                    data["channel"] = s[0]
+                                    data["uid"] = None
+                                    data["resource"] = None
+                                    data["app"] = None
+                                    ss = s[1].split("-")
+                                    if len(ss) == 2 and len(ss[0]) == 24 and ObjectId.is_valid(ss[0]):
+                                        data["uid"] = ss[0]
+                                        data["resource"] = ss[1]
+                                    elif len(ss) == 3 and len(ss[1]) == 24 and ObjectId.is_valid(ss[1]):
+                                        data["uid"] = ss[1]
+                                        data["app"] = ss[0]
+                                        data["resource"] = ss[2]
+                                await self.emit("__message", data)
                    
                     except json.JSONDecodeError:
                         pass
                 else:
-                    await self.emit("__message", {"from": from_jid, "body": body, "itsme": itsme, "itsbro": itsbro})
-
+                    data = {"from": from_jid, "body": body, "itsme": itsme, "itsbro": itsbro}
+                    data["channel"] = None
+                    data["uid"] = None
+                    data["resource"] = None
+                    data["app"] = None
+                    if "@qepal.com" in from_jid:
+                        ss = from_jid.split("@qepal.com/")
+                        if len(ss) == 2 and len(ss[0]) == 24 and ObjectId.is_valid(ss[0]):
+                            data["uid"] = ss[0]
+                            data["resource"] = ss[1]
+                        elif "-" in ss[0]:
+                            sss = ss[0].split("-")
+                            data["app"] = sss[0]
+                            data["uid"] = sss[1]
+                            data["resource"] = ss[1]
+                    elif "@conference.qepal.com" in from_jid:
+                        ss = from_jid.split("@conference.qepal.com/")
+                        data["channel"] = ss[0]
+                        if "-" in ss[1]:
+                            sss = ss[1].split("-")
+                            if len(sss) == 2:
+                                data["uid"] = sss[0]
+                                data["resource"] = sss[1]
+                            elif len(sss) == 3 and len(sss[1]) == 24 and ObjectId.is_valid(sss[1]):
+                                data["app"] = sss[0]
+                                data["uid"] = sss[1]
+                                data["resource"] = sss[2]
+                    await self.emit("__message",data)
+                                
 
 
 class App:
     
+    udb = None
     def __init__(self, *, app:str, resource:str, securekey:str, image:str, public:bool=False):
+        
+        load_dotenv(".env.local")
+        mongourl = os.getenv("UMONGOURL")
+        mongo_db = os.getenv("UMONGODB_DB")
+
+        if mongourl:
+            try:
+                client = MongoClient(mongourl)
+                client.server_info()
+                self.udb = client[mongo_db]
+                print("✅ mongo udb connected.")
+            except:
+                print("❌ mongo udb not connected.")
+        else:
+            print("❌ no .env.local correct file")
+                
+            
         self.app = app
         self.channels = set()
         self.resource = resource
@@ -184,8 +262,7 @@ class App:
                 else:
                     jid = jids[0]
         if jid == None:
-            print("unable to send api (-1)")
-            return
+            return { "error": "no worker found" }
     
         mid = serial_generator(10)
         msg = {"mid":mid, "api":cmd, **body }  

{wnox-0.8.0 → wnox-1.0.0}/wnox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wnox
-Version: 0.8.0
+Version: 1.0.0
 Summary: QE nexus client.
 Home-page: https://github.com/arminkardan/pywnox
 Author: Ethan (Armin) Cardan
@@ -13,7 +13,8 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: slixmpp
-Requires-Dist: bson
+Requires-Dist: python-dotenv
+Requires-Dist: pymongo
 Dynamic: author
 Dynamic: home-page
 Dynamic: requires-python

wnox-1.0.0/wnox.egg-info/requires.txt

@@ -0,0 +1,3 @@
+slixmpp
+python-dotenv
+pymongo

wnox-0.8.0/wnox.egg-info/requires.txt

@@ -1,2 +0,0 @@
-slixmpp
-bson