dimples 1.2.7__tar.gz → 1.3.0__tar.gz

dimples-1.3.0/PKG-INFO

@@ -0,0 +1,22 @@
+Metadata-Version: 2.1
+Name: dimples
+Version: 1.3.0
+Summary: DIMP Library for Edges and Stations
+Home-page: https://github.com/dimchat/demo-py
+Author: Albert Moky
+Author-email: albert.moky@gmail.com
+License: MIT
+Description: # DIMP Library for Edges and Stations (Python version)
+        
+        [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/dimchat/demo-py/blob/master/LICENSE)
+        [![Version](https://img.shields.io/badge/alpha-0.1.0-red.svg)](https://github.com/dimchat/demo-py/wiki)
+        [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/demo-py/pulls)
+        [![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/demo-py/wiki)
+        
+        Copyright © 2018-2022 Albert Moky
+        
+Platform: UNKNOWN
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown

{dimples-1.2.7 → dimples-1.3.0}/dimples/conn/gate.py

@@ -29,7 +29,6 @@
 # ==============================================================================
 
 import socket
-import threading
 from abc import ABC
 from typing import Generic, TypeVar, Optional, Union
 
@@ -38,7 +37,7 @@ from startrek.net.state import StateOrder
 from startrek import Hub
 from startrek import Connection, ConnectionState, ActiveConnection
 from startrek import Porter, PorterStatus, PorterDelegate
-from startrek import Arrival, StarPorter, StarGate
+from startrek import Arrival, StarGate
 
 from ..utils import Logging
 
@@ -57,7 +56,6 @@ class CommonGate(StarGate, Logging, Generic[H], ABC):
     def __init__(self, delegate: PorterDelegate):
         super().__init__(delegate=delegate)
         self.__hub: H = None
-        self.__lock = threading.Lock()
 
     @property
     def hub(self) -> H:
@@ -92,29 +90,15 @@ class CommonGate(StarGate, Logging, Generic[H], ABC):
         else:
             return docker.status
 
-    async def fetch_porter(self, remote: SocketAddress, local: Optional[SocketAddress]) -> Porter:
-        # try to get docker
-        with self.__lock:
-            old = self._get_porter(remote=remote, local=local)
-            if old is None:
-                # create & cache docker
-                worker = self._create_porter(remote=remote, local=local)
-                self._set_porter(worker, remote=remote, local=local)
-            else:
-                worker = old
-        if old is None:
-            hub = self.hub
-            assert isinstance(hub, Hub), 'gate hub error: %s' % hub
-            conn = await hub.connect(remote=remote, local=local)
-            if conn is None:
-                # assert False, 'failed to get connection: %s -> %s' % (local, remote)
-                self._remove_porter(worker, remote=remote, local=local)
-                worker = None
-            else:
-                assert isinstance(worker, StarPorter), 'docker error: %s, %s' % (remote, worker)
-                # set connection for this docker
-                await worker.set_connection(conn)
-        return worker
+    async def fetch_porter(self, remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Porter]:
+        # get connection from hub
+        hub = self.hub
+        assert isinstance(hub, Hub), 'gate hub error: %s' % hub
+        conn = await hub.connect(remote=remote, local=local)
+        if conn is not None:
+            # connected, get docker with this connection
+            return await self._dock(connection=conn, create_porter=True)
+        assert False, 'failed to get connection: %s -> %s' % (local, remote)
 
     async def send_response(self, payload: bytes, ship: Arrival,
                             remote: SocketAddress, local: Optional[SocketAddress]) -> bool:

{dimples-1.2.7 → dimples-1.3.0}/dimples/conn/ws.py

@@ -61,7 +61,9 @@ class WSArrival(ArrivalShip):
 
     @property  # Override
     def sn(self) -> bytes:
-        return self.__payload
+        data = self.__payload
+        sn = _fetch_sig_or_time(data=data)
+        return data if sn is None else sn
 
     # Override
     def assemble(self, ship):
@@ -71,11 +73,12 @@ class WSArrival(ArrivalShip):
 
 class WSDeparture(DepartureShip):
 
-    def __init__(self, package: bytes, payload: bytes, priority: int = 0):
+    def __init__(self, package: bytes, payload: bytes, priority: int = 0, important: bool = False):
         super().__init__(priority=priority, max_tries=1)
         self.__fragments = [package]
         self.__package = package
         self.__payload = payload
+        self.__important = important
 
     @property
     def package(self) -> bytes:
@@ -87,7 +90,9 @@ class WSDeparture(DepartureShip):
 
     @property  # Override
     def sn(self) -> bytes:
-        return self.__payload
+        data = self.__payload
+        sn = _fetch_sig_or_time(data=data)
+        return data if sn is None else sn
 
     @property  # Override
     def fragments(self) -> List[bytes]:
@@ -102,7 +107,43 @@ class WSDeparture(DepartureShip):
 
     @property
     def is_important(self) -> bool:
-        return False
+        return self.__important
+
+
+def _fetch_sig_or_time(data: bytes) -> Optional[bytes]:
+    sn = _fetch_value(data=data, tag=b'signature')
+    if sn is None:
+        sn = _fetch_value(data=data, tag=b'time')
+    return sn
+
+
+def _fetch_value(data: bytes, tag: bytes) -> Optional[bytes]:
+    tag_len = len(tag)
+    if tag_len == 0:
+        return None
+    # search tag
+    pos = data.find(tag)
+    if pos < 0:
+        return None
+    else:
+        pos += tag_len
+    # skip to start of value
+    pos = data.find(b':', pos)
+    if pos < 0:
+        return None
+    else:
+        pos += 1
+    # find end value
+    end = data.find(b',', pos)
+    if end < 0:
+        end = data.find(b'}', pos)
+        if end < 0:
+            return None
+    value = data[pos:end]
+    value = value.strip(b' ')
+    value = value.strip(b'"')
+    value = value.strip(b"'")
+    return value
 
 
 class WSPorter(PlainPorter, DeparturePacker):
@@ -116,6 +157,7 @@ class WSPorter(PlainPorter, DeparturePacker):
         self.__chunks = b''
         self.__chunks_lock = threading.RLock()
         self.__package_received = False
+        self.__ack_enable = False
 
     def _parse_package(self, data: bytes) -> Tuple[Optional[bytes], Optional[bytes], int]:
         conn = self.connection
@@ -208,6 +250,11 @@ class WSPorter(PlainPorter, DeparturePacker):
         elif body == OK:
             # should not happen
             return None
+        if body.startswith(b'ACK:'):
+            # respond for message
+            await self._check_response(ship=ship)
+            self.__ack_enable = True
+            return None
         # NOTICE: the delegate must respond to client in current request,
         #         cause it's a HTTP connection
         return ship
@@ -220,7 +267,8 @@ class WSPorter(PlainPorter, DeparturePacker):
     # Override
     def pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
         req_pack = WebSocket.pack(payload=payload)
-        return WSDeparture(package=req_pack, payload=payload, priority=priority)
+        important = self.__ack_enable
+        return WSDeparture(package=req_pack, payload=payload, priority=priority, important=important)
 
     @classmethod
     def check(cls, data: bytes) -> bool:

dimples-1.3.0/dimples.egg-info/PKG-INFO

@@ -0,0 +1,22 @@
+Metadata-Version: 2.1
+Name: dimples
+Version: 1.3.0
+Summary: DIMP Library for Edges and Stations
+Home-page: https://github.com/dimchat/demo-py
+Author: Albert Moky
+Author-email: albert.moky@gmail.com
+License: MIT
+Description: # DIMP Library for Edges and Stations (Python version)
+        
+        [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/dimchat/demo-py/blob/master/LICENSE)
+        [![Version](https://img.shields.io/badge/alpha-0.1.0-red.svg)](https://github.com/dimchat/demo-py/wiki)
+        [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/demo-py/pulls)
+        [![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/demo-py/wiki)
+        
+        Copyright © 2018-2022 Albert Moky
+        
+Platform: UNKNOWN
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown

{dimples-1.2.7 → dimples-1.3.0}/dimples.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-LICENSE
 README.md
 setup.py
 dimples/__init__.py

{dimples-1.2.7 → dimples-1.3.0}/dimples.egg-info/entry_points.txt

@@ -2,3 +2,4 @@
 dime = dimples.edge.start:main
 dimid = dimples.register.run:main
 dims = dimples.station.start:main
+

dimples-1.3.0/dimples.egg-info/requires.txt

@@ -0,0 +1,9 @@
+dimplugins>=2.1.0
+dimsdk>=2.1.0
+dimp>=2.1.0
+dkd>=2.1.0
+mkm>=2.1.0
+startrek>=2.2.0
+tcp>=2.2.0
+udp>=2.2.0
+aiou>=0.3.0

{dimples-1.2.7 → dimples-1.3.0}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '1.2.7'
+__version__ = '1.3.0'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -51,12 +51,12 @@ setup(
         # 'pycryptodome',  # 3.14.1
         # 'base58',  # 1.0.3
         # 'ecdsa',   # 0.16.1
-        'dimplugins>=2.0.0',
+        'dimplugins>=2.1.0',
 
-        'dimsdk>=2.0.0',
-        'dimp>=2.0.0',
-        'dkd>=2.0.0',
-        'mkm>=2.0.0',
+        'dimsdk>=2.1.0',
+        'dimp>=2.1.0',
+        'dkd>=2.1.0',
+        'mkm>=2.1.0',
 
         'startrek>=2.2.0',
         'tcp>=2.2.0',

dimples-1.2.7/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Albert Moky
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

dimples-1.2.7/PKG-INFO

@@ -1,31 +0,0 @@
-Metadata-Version: 2.1
-Name: dimples
-Version: 1.2.7
-Summary: DIMP Library for Edges and Stations
-Home-page: https://github.com/dimchat/demo-py
-Author: Albert Moky
-Author-email: albert.moky@gmail.com
-License: MIT
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: dimplugins>=2.0.0
-Requires-Dist: dimsdk>=2.0.0
-Requires-Dist: dimp>=2.0.0
-Requires-Dist: dkd>=2.0.0
-Requires-Dist: mkm>=2.0.0
-Requires-Dist: startrek>=2.2.0
-Requires-Dist: tcp>=2.2.0
-Requires-Dist: udp>=2.2.0
-Requires-Dist: aiou>=0.3.0
-
-# DIMP Library for Edges and Stations (Python version)
-
-[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/dimchat/demo-py/blob/master/LICENSE)
-[![Version](https://img.shields.io/badge/alpha-0.1.0-red.svg)](https://github.com/dimchat/demo-py/wiki)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/demo-py/pulls)
-[![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/demo-py/wiki)
-
-Copyright © 2018-2022 Albert Moky

dimples-1.2.7/dimples.egg-info/PKG-INFO

@@ -1,31 +0,0 @@
-Metadata-Version: 2.1
-Name: dimples
-Version: 1.2.7
-Summary: DIMP Library for Edges and Stations
-Home-page: https://github.com/dimchat/demo-py
-Author: Albert Moky
-Author-email: albert.moky@gmail.com
-License: MIT
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: dimplugins>=2.0.0
-Requires-Dist: dimsdk>=2.0.0
-Requires-Dist: dimp>=2.0.0
-Requires-Dist: dkd>=2.0.0
-Requires-Dist: mkm>=2.0.0
-Requires-Dist: startrek>=2.2.0
-Requires-Dist: tcp>=2.2.0
-Requires-Dist: udp>=2.2.0
-Requires-Dist: aiou>=0.3.0
-
-# DIMP Library for Edges and Stations (Python version)
-
-[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/dimchat/demo-py/blob/master/LICENSE)
-[![Version](https://img.shields.io/badge/alpha-0.1.0-red.svg)](https://github.com/dimchat/demo-py/wiki)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/demo-py/pulls)
-[![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/demo-py/wiki)
-
-Copyright © 2018-2022 Albert Moky

dimples-1.2.7/dimples.egg-info/requires.txt

@@ -1,9 +0,0 @@
-dimplugins>=2.0.0
-dimsdk>=2.0.0
-dimp>=2.0.0
-dkd>=2.0.0
-mkm>=2.0.0
-startrek>=2.2.0
-tcp>=2.2.0
-udp>=2.2.0
-aiou>=0.3.0