yacscript 0.3.0__tar.gz → 0.3.1__tar.gz

{yacscript-0.3.0 → yacscript-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yacscript
-Version: 0.3.0
+Version: 0.3.1
 Summary: yet another chatroom script.
 Author: Valine0x
 Author-email: Valine0x <me@valine0x.icu>
@@ -56,7 +56,7 @@ $ source .venv/bin/activate
 Then, install the package inside venv.
 
 ```bash
-$(venv) pip install yacscript
+$(.venv) pip install yacscript
 ```
 
 Create a configuration file and edit it to your liking.
@@ -64,7 +64,7 @@ Create a configuration file and edit it to your liking.
 For reference, see the <a href="#configuration">configuration section</a>.
 
 ```bash
-$(venv) vi ./config.toml
+$(.venv) vi ./config.toml
 ```
 
 Finally, you run the server within the venv

{yacscript-0.3.0 → yacscript-0.3.1}/README.md

@@ -39,7 +39,7 @@ $ source .venv/bin/activate
 Then, install the package inside venv.
 
 ```bash
-$(venv) pip install yacscript
+$(.venv) pip install yacscript
 ```
 
 Create a configuration file and edit it to your liking.
@@ -47,7 +47,7 @@ Create a configuration file and edit it to your liking.
 For reference, see the <a href="#configuration">configuration section</a>.
 
 ```bash
-$(venv) vi ./config.toml
+$(.venv) vi ./config.toml
 ```
 
 Finally, you run the server within the venv

{yacscript-0.3.0 → yacscript-0.3.1}/app/__init__.py

@@ -2,7 +2,7 @@ from .app import app, socketio, initialization
 from os.path import isfile
 import click
 
-@click.command
+@click.command()
 @click.option('-c', '--config', default=None, help='Path to the config file.')
 def main(config):
     '''Entry point for YACS.'''
@@ -15,7 +15,18 @@ def main(config):
         click.echo(f'Initialization failed while parsing config file: {result}')
         return 0
     app.logger.info(f'YACS is now running on http://{app.config["app"]["ip"]}:{app.config["app"]["port"]}{' with DEBUG MODE ON' if app.config['DEBUG'] else ''}.')
-    app.logger.info(f'You have set the guest passphrase to "{app.config['app']['user_phrase']}" , and the admin passphrase to "{app.config['app']['admin_phrase']}"')
+    user_phrase = app.config['app']['user_phrase']
+    admin_phrase = app.config['app']['admin_phrase']
+
+    if user_phrase == '' and admin_phrase == 'admin':
+        app.logger.warning(f'You have not set the passphrases or set exactly as default values, this is not safe!')
+        app.logger.warning(f'There\'s no passphrase for user and "{admin_phrase}" for admin.')
+    if user_phrase == admin_phrase:
+        app.logger.critical('user_phrase and admin_phrase shouldn\'t be exactly same!')
+        return 0
+    if admin_phrase == '':
+        app.logger.critical('admin_phrase shouldn\'t be empty!')
+        return 0
     socketio.run(
         app,
         host=app.config["app"]["ip"],

{yacscript-0.3.0 → yacscript-0.3.1}/app/app.py

@@ -36,11 +36,18 @@ online = dict()
 
 # --- HELPER FUNCTIONS ---
 
+def deep_update(dst: dict, src: dict) -> None:
+    for k, v in src.items():
+        if isinstance(v, dict) and isinstance(dst.get(k), dict):
+            deep_update(dst[k], v)
+        else:
+            dst[k] = v
+
 def initialization(config=None):
     app.config.update(CONFIG_DEFAULT)
     if config is not None:
         if path.isfile(path.abspath(config)):
-            with open(path.abspath(path.abspath(config)), 'rb') as file:
+            with open(path.abspath(config), 'rb') as file:
                 try:
                     conf = tomllib.load(file)
                 except tomllib.TOMLDecodeError as e:
@@ -48,15 +55,15 @@ def initialization(config=None):
                 # read built-in values
                 top = conf.get('flask', None)
                 if top:
-                    app.config.update(conf['flask'])
-                    conf.pop('flask')
-                app.config.update(conf)
+                    app.config.update(conf.pop('flask'))
+                deep_update(app.config, conf)
     if app.config['app']['proxy_fix']:
         app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_host=1)
     if not path.isdir(app.config['res']['path']):
         mkdir(app.config['res']['path'])
 
     # Making global variables
+    # TODO: consider changing them to vars inside app
     global logger
     global conn
     global SIZE_MAX_BYTE
@@ -111,6 +118,11 @@ def clean_user(name):
             item['sid'],
             item['namespace']
         )
+    emit(
+        'kicked',
+        to=item['sid'],
+        namespace=item['namespace']
+    )
     disconnect(
         item['sid'],
         item['namespace']
@@ -688,11 +700,11 @@ def heartbeat_handler(json):
     online[json['nick']]['last_heartbeat'] = time_milisecond()
 
 
-def exit():
+def cleanup():
     try:
         conn.close()
     except:
         pass
 
 
-atexit.register(exit)
+atexit.register(cleanup)

{yacscript-0.3.0 → yacscript-0.3.1}/app/definitions.py

@@ -40,8 +40,8 @@ CONFIG_DEFAULT = {
     'app': {
         'ip': '0.0.0.0',
         'port': 8080,
-        'admin_phrase': 'CHANGE_ME_ADMIN',
-        'user_phrase': 'CHANGE_ME',
+        'admin_phrase': 'admin',
+        'user_phrase': '',
         'log_level': 'INFO',
         'timeout': 5000,
         'proxy_fix': False,

{yacscript-0.3.0 → yacscript-0.3.1}/app/static/room.js

@@ -50,6 +50,11 @@ socket.on("joining", async (e) => {
     document.getElementById("fellows_list").innerHTML += `<li id="fellow-${e["target"]}">${e["target"]}</li>`
 });
 
+socket.on("kicked", async () => {
+    window.alert("You're kicked out :(")
+    window.location.replace("/");
+})
+
 async function refresh_channels() {
     var clist = document.getElementById("channel_list");
     clist.innerHTML = "";

{yacscript-0.3.0 → yacscript-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "YACScript"
-version = "0.3.0"
+version = "0.3.1"
 description = "yet another chatroom script."
 readme = "README.md"
 requires-python = ">=3.13"