Update.

Reviewed-on: #49

pyproject.toml

@@ -38,6 +38,7 @@ dependencies = [
     "humanize",
     "Pillow",
     "pillow-heif",
+    "IP2Location",
 ]
 
 [tool.setuptools.packages.find]

src/snek/app.py

@@ -8,7 +8,7 @@ from snek import snode
 from snek.view.threads import ThreadsView
 import json 
 logging.basicConfig(level=logging.DEBUG)
-
+from ipaddress import ip_address 
 from concurrent.futures import ThreadPoolExecutor
 
 from aiohttp import web
@@ -20,7 +20,7 @@ from aiohttp_session import (
 from aiohttp_session.cookie_storage import EncryptedCookieStorage
 from app.app import Application as BaseApplication
 from jinja2 import FileSystemLoader
-
+import IP2Location
 from snek.sssh import start_ssh_server
 from snek.docs.app import Application as DocsApplication
 from snek.mapper import get_mappers
@@ -69,6 +69,31 @@ async def session_middleware(request, handler):
     response = await handler(request)
     return response
 
+@web.middleware 
+async def ip2location_middleware(request, handler):
+    response = await handler(request)
+    return response
+    ip = request.headers.get("X-Forwarded-For", request.remote)
+    ipaddress = ip_address(ip)
+    if ipaddress.is_private:
+        return response 
+    if not request.app.session.get("uid"):
+        return response 
+    user = await request.app.services.user.get(uid=request.app.session.get("uid"))
+    if not user:
+        return response
+    location = request.app.ip2location.get(ip)
+    original_city = user['city']
+    if user['city'] != location.city:
+        user['country_long'] = location.country
+        user['country_short'] = locaion.country_short
+        user['city'] = location.city
+        user['region'] = location.region
+        user['latitude'] = location.latitude
+        user['longitude'] = location.longitude
+        user['ip'] = ip
+        await request.app.services.user.update(user)
+    return response
 
 @web.middleware
 async def trailing_slash_middleware(request, handler):
@@ -84,6 +109,7 @@ class Application(BaseApplication):
         middlewares = [
             cors_middleware,
             web.normalize_path_middleware(merge_slashes=True),
+            ip2location_middleware
         ]
         self.template_path = pathlib.Path(__file__).parent.joinpath("templates")
         self.static_path = pathlib.Path(__file__).parent.joinpath("static")
@@ -111,11 +137,15 @@ class Application(BaseApplication):
         self.broadcast_service = None
         self.user_availability_service_task = None
         
+        base_path = pathlib.Path(__file__).parent 
+        self.ip2location = IP2Location.IP2Location(base_path.joinpath("IP2LOCATION-LITE-DB11.BIN"))
+
         self.on_startup.append(self.prepare_asyncio)
         self.on_startup.append(self.start_user_availability_service)
         self.on_startup.append(self.start_ssh_server)
         self.on_startup.append(self.prepare_database)
-       
+        
+
     @property
     def uptime_seconds(self):
         return (datetime.now() - self.time_start).total_seconds()

src/snek/model/user.py

@@ -30,6 +30,14 @@ class UserModel(BaseModel):
     last_ping = ModelField(name="last_ping", required=False, kind=str)
 
     is_admin = ModelField(name="is_admin", required=False, kind=bool)
+    
+    country_short = ModelField(name="country_short", required=False, kind=str)
+    country_long = ModelField(name="country_long", required=False, kind=str)
+    city = ModelField(name="city", required=False, kind=str)
+    latitude = ModelField(name="latitude", required=False, kind=float)
+    longitude = ModelField(name="longitude", required=False, kind=float)
+    region = ModelField(name="region", required=False, kind=str)
+    ip = ModelField(name="ip", required=False, kind=str)
 
     async def get_property(self, name):
         prop = await self.app.services.user_property.find_one(

src/snek/system/mapper.py

@@ -12,7 +12,7 @@ class BaseMapper:
 
     def __init__(self, app):
         self.app = app
-    
+        self.semaphore = asyncio.Semaphore(1)    
         self.default_limit = self.__class__.default_limit
 
     @property
@@ -24,7 +24,9 @@ class BaseMapper:
         return asyncio.get_event_loop()
 
     async def run_in_executor(self, func, *args, **kwargs):
-        return await self.loop.run_in_executor(None, lambda: func(*args, **kwargs))
+        async with self.semaphore:
+            return func(*args, **kwargs)
+            #return await self.loop.run_in_executor(None, lambda: func(*args, **kwargs))
 
     async def new(self):
         return self.model_class(mapper=self, app=self.app)
@@ -72,6 +74,10 @@ class BaseMapper:
         for record in await self.run_in_executor(self.db.query,sql, *args):
             yield dict(record)
 
+    async def update(self, model):
+        model.updated_at.update()
+        return await self.run_in_executor(self.table.update, model.record, ["uid"])
+
     async def delete(self, **kwargs) -> int:
         if not kwargs or not isinstance(kwargs, dict):
             raise Exception("Can't execute delete with no filter.")

src/snek/system/service.py

@@ -26,6 +26,9 @@ class BaseService:
             kwargs["uid"] = uid
         return await self.count(**kwargs) > 0
 
+    async def update(self, model):
+        return await self.mapper.update(model)
+
     async def count(self, **kwargs):
         return await self.mapper.count(**kwargs)