koi-net 1.1.0b4__py3-none-any.whl → 1.1.0b6__py3-none-any.whl

koi_net/core.py

@@ -174,6 +174,7 @@ class NodeInterface(Generic[T]):
             processor=self.processor,
             effector=self.effector,
             actor=self.actor,
+            handler_context=self.handler_context,
             use_kobj_processor_thread=use_kobj_processor_thread
         )
         

koi_net/lifecycle.py

@@ -1,4 +1,7 @@
 import logging
+from contextlib import contextmanager, asynccontextmanager
+
+from koi_net.context import HandlerContext
 
 from .network.behavior import Actor
 from .effector import Effector
@@ -25,6 +28,7 @@ class NodeLifecycle:
         processor: ProcessorInterface,
         effector: Effector,
         actor: Actor,
+        handler_context: HandlerContext,
         use_kobj_processor_thread: bool
     ):
         self.config = config
@@ -33,9 +37,34 @@ class NodeLifecycle:
         self.processor = processor
         self.effector = effector
         self.actor = actor
+        self.handler_context = handler_context
         self.use_kobj_processor_thread = use_kobj_processor_thread
+        
+    @contextmanager
+    def run(self):
+        try:
+            logger.info("Starting node lifecycle...")
+            self.start()
+            yield
+        except KeyboardInterrupt:
+            logger.info("Keyboard interrupt!")
+        finally:
+            logger.info("Stopping node lifecycle...")
+            self.stop()
+
+    @asynccontextmanager
+    async def async_run(self):
+        try:
+            logger.info("Starting async node lifecycle...")
+            self.start()
+            yield
+        except KeyboardInterrupt:
+            logger.info("Keyboard interrupt!")
+        finally:
+            logger.info("Stopping async node lifecycle...")
+            self.stop()
     
-    def start(self) -> None:
+    def start(self):
         """Starts a node, call this method first.
         
         Starts the processor thread (if enabled). Loads event queues into memory. Generates network graph from nodes and edges in cache. Processes any state changes of node bundle. Initiates handshake with first contact (if provided) if node doesn't have any neighbors.
@@ -48,7 +77,7 @@ class NodeLifecycle:
         
         # refresh to reflect changes (if any) in config.yaml
         self.effector.deref(self.identity.rid, refresh_cache=True)
-                
+        
         logger.debug("Waiting for kobj queue to empty")
         if self.use_kobj_processor_thread:
             self.processor.kobj_queue.join()
@@ -66,9 +95,7 @@ class NodeLifecycle:
         """Stops a node, call this method last.
         
         Finishes processing knowledge object queue. Saves event queues to storage.
-        """
-        logger.info("Stopping node...")
-        
+        """        
         if self.use_kobj_processor_thread:
             logger.info(f"Waiting for kobj queue to empty ({self.processor.kobj_queue.unfinished_tasks} tasks remaining)")
             self.processor.kobj_queue.join()

koi_net/network/error_handler.py

@@ -1,5 +1,5 @@
 from logging import getLogger
-from koi_net.protocol.errors import ErrorTypes
+from koi_net.protocol.errors import ErrorType
 from koi_net.protocol.event import EventType
 from rid_lib.types import KoiNetNode
 from ..processor.interface import ProcessorInterface
@@ -36,15 +36,15 @@ class ErrorHandler:
         
     def handle_protocol_error(
         self, 
-        error_type: ErrorTypes, 
+        error_type: ErrorType, 
         node: KoiNetNode
     ):
         logger.info(f"Handling protocol error {error_type} for node {node!r}")
         match error_type:
-            case ErrorTypes.UnknownNode:
+            case ErrorType.UnknownNode:
                 logger.info("Peer doesn't know me, attempting handshake...")
                 self.actor.handshake_with(node)
                 
-            case ErrorTypes.InvalidKey: ...
-            case ErrorTypes.InvalidSignature: ...
-            case ErrorTypes.InvalidTarget: ...
+            case ErrorType.InvalidKey: ...
+            case ErrorType.InvalidSignature: ...
+            case ErrorType.InvalidTarget: ...

koi_net/network/graph.py

@@ -41,7 +41,7 @@ class NetworkGraph:
                 logger.debug(f"Added edge {rid!r} ({edge_profile.source} -> {edge_profile.target})")
         logger.debug("Done")
         
-    def get_edge(self, source: KoiNetNode, target: KoiNetNode,) -> EdgeProfile | None:
+    def get_edge(self, source: KoiNetNode, target: KoiNetNode,) -> KoiNetEdge | None:
         """Returns edge RID given the RIDs of a source and target node."""
         if (source, target) in self.dg.edges:
             edge_data = self.dg.get_edge_data(source, target)

koi_net/poller.py

@@ -30,18 +30,11 @@ class NodePoller:
         self.processor.flush_kobj_queue()
 
     def run(self):
-        try:
-            self.lifecycle.start()
+        with self.lifecycle.run():
             while True:
                 start_time = time.time()
                 self.poll()
                 elapsed = time.time() - start_time
                 sleep_time = self.config.koi_net.polling_interval - elapsed
                 if sleep_time > 0:
-                    time.sleep(sleep_time)
-                    
-        except KeyboardInterrupt:
-            logger.info("Polling interrupted by user.")
-            
-        finally:
-            self.lifecycle.stop()
+                    time.sleep(sleep_time)

koi_net/protocol/api_models.py

@@ -1,51 +1,60 @@
 """Pydantic models for request and response/payload objects in the KOI-net API."""
 
-from pydantic import BaseModel
+from typing import Literal
+from pydantic import BaseModel, Field
 from rid_lib import RID, RIDType
 from rid_lib.ext import Bundle, Manifest
 from .event import Event
-from .errors import ErrorTypes
+from .errors import ErrorType
 
 
 # REQUEST MODELS
 
 class PollEvents(BaseModel):
-    rid: RID
+    type: Literal["poll_events"] = Field("poll_events")
     limit: int = 0
     
 class FetchRids(BaseModel):
+    type: Literal["fetch_rids"] = Field("fetch_rids")
     rid_types: list[RIDType] = []
     
 class FetchManifests(BaseModel):
+    type: Literal["fetch_manifests"] = Field("fetch_manifests")
     rid_types: list[RIDType] = []
     rids: list[RID] = []
     
 class FetchBundles(BaseModel):
+    type: Literal["fetch_bundles"] = Field("fetch_bundles")
     rids: list[RID]
     
 
 # RESPONSE/PAYLOAD MODELS
 
 class RidsPayload(BaseModel):
+    type: Literal["rids_payload"] = Field("rids_payload")
     rids: list[RID]
 
 class ManifestsPayload(BaseModel):
+    type: Literal["manifests_payload"] = Field("manifests_payload")
     manifests: list[Manifest]
     not_found: list[RID] = []
     
 class BundlesPayload(BaseModel):
+    type: Literal["bundles_payload"] = Field("bundles_payload")
     bundles: list[Bundle]
     not_found: list[RID] = []
     deferred: list[RID] = []
     
 class EventsPayload(BaseModel):
+    type: Literal["events_payload"] = Field("events_payload")
     events: list[Event]
     
 
 # ERROR MODELS
 
 class ErrorResponse(BaseModel):
-    error: ErrorTypes
+    type: Literal["error_response"] = Field("error_response")
+    error: ErrorType
 
 # TYPES
 

koi_net/protocol/envelope.py

@@ -27,7 +27,7 @@ class SignedEnvelope(BaseModel, Generic[T]):
         )
         
         logger.debug(f"Verifying envelope: {unsigned_envelope.model_dump_json()}")
-        
+                
         pub_key.verify(
             self.signature,
             unsigned_envelope.model_dump_json().encode()

koi_net/protocol/errors.py

@@ -1,23 +1,23 @@
 from enum import StrEnum
 
 
-class ErrorTypes(StrEnum):
+class ErrorType(StrEnum):
     UnknownNode = "unknown_node"
     InvalidKey = "invalid_key"
     InvalidSignature = "invalid_signature"
     InvalidTarget = "invalid_target"
 
 class ProtocolError(Exception):
-    error_type: ErrorTypes
+    error_type: ErrorType
     
 class UnknownNodeError(ProtocolError):
-    error_type = ErrorTypes.UnknownNode
+    error_type = ErrorType.UnknownNode
     
 class InvalidKeyError(ProtocolError):
-    error_type = ErrorTypes.InvalidKey
+    error_type = ErrorType.InvalidKey
     
 class InvalidSignatureError(ProtocolError):
-    error_type = ErrorTypes.InvalidSignature
+    error_type = ErrorType.InvalidSignature
 
 class InvalidTargetError(ProtocolError):
-    error_type = ErrorTypes.InvalidTarget
+    error_type = ErrorType.InvalidTarget

koi_net/protocol/secure.py

@@ -1,22 +1,64 @@
 import logging
-from base64 import urlsafe_b64decode, urlsafe_b64encode
+from base64 import b64decode, b64encode
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import serialization
 from rid_lib.ext.utils import sha256_hash
+from cryptography.hazmat.primitives.asymmetric.utils import (
+    decode_dss_signature, 
+    encode_dss_signature
+)
 
 logger = logging.getLogger(__name__)
 
 
+def der_to_raw_signature(der_signature: bytes, curve=ec.SECP256R1()) -> bytes:
+    """Convert a DER-encoded signature to raw r||s format."""
+    
+    # Decode the DER signature to get r and s
+    r, s = decode_dss_signature(der_signature)
+    
+    # Determine byte length based on curve bit size
+    byte_length = (curve.key_size + 7) // 8
+    
+    # Convert r and s to big-endian byte arrays of fixed length
+    r_bytes = r.to_bytes(byte_length, byteorder='big')
+    s_bytes = s.to_bytes(byte_length, byteorder='big')
+    
+    # Concatenate r and s
+    return r_bytes + s_bytes
+
+
+def raw_to_der_signature(raw_signature: bytes, curve=ec.SECP256R1()) -> bytes:
+    """Convert a raw r||s signature to DER format."""
+    
+    # Determine byte length based on curve bit size
+    byte_length = (curve.key_size + 7) // 8
+    
+    # Split the raw signature into r and s components
+    if len(raw_signature) != 2 * byte_length:
+        raise ValueError(f"Raw signature must be {2 * byte_length} bytes for {curve.name}")
+    
+    r_bytes = raw_signature[:byte_length]
+    s_bytes = raw_signature[byte_length:]
+    
+    # Convert bytes to integers
+    r = int.from_bytes(r_bytes, byteorder='big')
+    s = int.from_bytes(s_bytes, byteorder='big')
+    
+    # Encode as DER
+    return encode_dss_signature(r, s)
+
+
 class PrivateKey:
     priv_key: ec.EllipticCurvePrivateKey
     
     def __init__(self, priv_key):
         self.priv_key = priv_key
-        
+    
     @classmethod
     def generate(cls):
-        return cls(priv_key=ec.generate_private_key(ec.SECP192R1()))
+        return cls(priv_key=ec.generate_private_key(ec.SECP256R1()))
 
     def public_key(self) -> "PublicKey":
         return PublicKey(self.priv_key.public_key())
@@ -40,12 +82,14 @@ class PrivateKey:
     def sign(self, message: bytes) -> str:
         hashed_message = sha256_hash(message.decode())
         
-        signature = urlsafe_b64encode(
-            self.priv_key.sign(
-                data=message,
-                signature_algorithm=ec.ECDSA(hashes.SHA256())
-            )
-        ).decode()
+        der_signature_bytes = self.priv_key.sign(
+            data=message,
+            signature_algorithm=ec.ECDSA(hashes.SHA256())
+        )
+        
+        raw_signature_bytes = der_to_raw_signature(der_signature_bytes)
+        
+        signature = b64encode(raw_signature_bytes).decode()
         
         logger.debug(f"Signing message with [{self.public_key().to_der()}]")
         logger.debug(f"hash: {hashed_message}")
@@ -78,29 +122,39 @@ class PublicKey:
     def from_der(cls, pub_key_der: str):        
         return cls(
             pub_key=serialization.load_der_public_key(
-                data=urlsafe_b64decode(pub_key_der)
+                data=b64decode(pub_key_der)
             )
         )
     
     def to_der(self) -> str:
-        return urlsafe_b64encode(
+        return b64encode(
             self.pub_key.public_bytes(
                 encoding=serialization.Encoding.DER,
                 format=serialization.PublicFormat.SubjectPublicKeyInfo
             )
         ).decode()
         
+        
     def verify(self, signature: str, message: bytes) -> bool:
-        hashed_message = sha256_hash(message.decode())
+        # hashed_message = sha256_hash(message.decode())
+        
+        # print(message.hex())
+        # print()
+        # print(hashed_message)
+        # print()
+        # print(message.decode())
 
-        logger.debug(f"Verifying message with [{self.to_der()}]")
-        logger.debug(f"hash: {hashed_message}")
-        logger.debug(f"signature: {signature}")
+        # logger.debug(f"Verifying message with [{self.to_der()}]")
+        # logger.debug(f"hash: {hashed_message}")
+        # logger.debug(f"signature: {signature}")
+        
+        raw_signature_bytes = b64decode(signature)
+        der_signature_bytes = raw_to_der_signature(raw_signature_bytes)
         
         # NOTE: throws cryptography.exceptions.InvalidSignature on failure
         
         self.pub_key.verify(
-            signature=urlsafe_b64decode(signature),
+            signature=der_signature_bytes,
             data=message,
             signature_algorithm=ec.ECDSA(hashes.SHA256())
         )

koi_net/server.py

@@ -54,8 +54,14 @@ class NodeServer:
         self._build_app()
         
     def _build_app(self):
+        
+        @asynccontextmanager
+        async def lifespan(*args, **kwargs):
+            async with self.lifecycle.async_run():
+                yield
+        
         self.app = FastAPI(
-            lifespan=self.lifespan, 
+            lifespan=lifespan, 
             title="KOI-net Protocol API",
             version="1.0.0"
         )
@@ -85,12 +91,6 @@ class NodeServer:
             port=self.config.server.port
         )
         
-    @asynccontextmanager
-    async def lifespan(self, app: FastAPI):
-        self.lifecycle.start()
-        yield
-        self.lifecycle.stop()
-
     def protocol_error_handler(self, request, exc: ProtocolError):
         logger.info(f"caught protocol error: {exc}")
         resp = ErrorResponse(error=exc.error_type)

{koi_net-1.1.0b4.dist-info → koi_net-1.1.0b6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: koi-net
-Version: 1.1.0b4
+Version: 1.1.0b6
 Summary: Implementation of KOI-net protocol in Python
 Project-URL: Homepage, https://github.com/BlockScience/koi-net/
 Author-email: Luke Miller <luke@block.science>

{koi_net-1.1.0b4.dist-info → koi_net-1.1.0b6.dist-info}/RECORD

@@ -1,19 +1,19 @@
 koi_net/__init__.py,sha256=b0Ze0pZmJAuygpWUFHM6Kvqo3DkU_uzmkptv1EpAArw,31
 koi_net/config.py,sha256=47XbQ59GRYFi4rlsoWKlnzMQATcnK70i3qmKTZAGOQk,4087
 koi_net/context.py,sha256=FwkzjmsyNqUeOeGCuZXtONqs5_MSl1R8-e3IxHuyzTI,1531
-koi_net/core.py,sha256=UFERsvnphUCWSQYunMgXlLpJ_XU5yD_1tcqlGO0BV9A,7100
+koi_net/core.py,sha256=aO9caoS8dLafRGheJWzhbp_ym7o7bi_wxds683bly48,7150
 koi_net/default_actions.py,sha256=TkQR9oj9CpO37Gb5bZLmFNl-Q8n3OxGiX4dvxQR7SaA,421
 koi_net/effector.py,sha256=gSyZgRxQ91X04UL261e2pXWUfBHnQTGtjSHpc2JufxA,4097
 koi_net/identity.py,sha256=FvIWksGTqwM7HCevIwmo_6l-t-2tnYkaaR4CanZatL4,569
-koi_net/lifecycle.py,sha256=-J5y4i0JdernatLTed8hQbkK26Cs6rm1kZqlx3aQzZA,2727
-koi_net/poller.py,sha256=ZvQcZ0RQhViXVhbIpdTZb7_ql3nG0mTcdBamneZKLpA,1361
+koi_net/lifecycle.py,sha256=GL2zltmh-aeBuNVg_rbIgsXMch672w7xkWAXCTjxst4,3550
+koi_net/poller.py,sha256=bIrlqdac5vLQYAid35xiQJLDMR85GnOSPCXSTQ07-Mc,1173
 koi_net/secure.py,sha256=cGNF2assqCaYq0i0fhQBm7aREoAdpY-XVypDsE1ALaU,3970
-koi_net/server.py,sha256=5BVVrgn69r_HMC3c4npWywPsjBDqUnHFWLKdtnfRTbA,4250
+koi_net/server.py,sha256=dZfSKrNHqIVD1qc9WkYRO30L4so-A7iW4IsX63oSmlE,4265
 koi_net/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 koi_net/network/behavior.py,sha256=NZLvWlrxR0uWriE3ZzCXmocUVccQthy7Xx8E_8KBwsg,1208
-koi_net/network/error_handler.py,sha256=CrmCpBY2oj4nl7uXrIYusUHDKxPZ1HDuQAtiBSZarRI,1623
+koi_net/network/error_handler.py,sha256=_dAl2ovpUZEVhPc8_dcLA7I-FoMNqQNwFy0QLa4uTSY,1617
 koi_net/network/event_queue.py,sha256=DWs26C235iYkP4koKcdbhmIOHGZRJ48d072BoNWyiHo,7325
-koi_net/network/graph.py,sha256=NLstBsPa9By0luxcTjThnqVd3hxfQdFwn8tWgJ6u4l4,4144
+koi_net/network/graph.py,sha256=60SLiR3aNXIOGe-URzMGgx8abmMEJtz37EJs6jeImEM,4143
 koi_net/network/request_handler.py,sha256=vBXw2GO5vGAYCs18flWbln4kO_HmY1G9uuFu9MYqedY,6852
 koi_net/network/resolver.py,sha256=coIp4M6k0-8sUfAy4h2NMx_7zCNroWlCHKOj3AXZVhc,5412
 koi_net/network/response_handler.py,sha256=__R_EvEpjaMz3PCDvkNgWF_EAHe2nePGk-zK_cT4C4g,2077
@@ -24,15 +24,15 @@ koi_net/processor/interface.py,sha256=ebDwqggznFRfp2PT8-UJPUAvCwX8nZaaQ68FUeWQvm
 koi_net/processor/knowledge_object.py,sha256=avQnsaeqqiJxy40P1VGljuQMtAGmJB-TBa4pmBXTaIs,3863
 koi_net/processor/knowledge_pipeline.py,sha256=i7FpCFl0UIOwCI5zhP1i8M4PX4A48VN28iV9jruvN5k,9486
 koi_net/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-koi_net/protocol/api_models.py,sha256=bHhbLeq8I7nVBuW-AXgKfb1O58_mLogHRG8A_LZt2IE,1188
+koi_net/protocol/api_models.py,sha256=jzRZWW_ZB5YsBAiwCom882-WIbr0rPyelJxExRgHZGc,1755
 koi_net/protocol/consts.py,sha256=bisbVEojPIHlLhkLafBzfIhH25TjNfvTORF1g6YXzIM,243
 koi_net/protocol/edge.py,sha256=dQKtI0_eX2E6tD7kMExv6DeJMkqNo2cY-LxJMJbiK0E,963
-koi_net/protocol/envelope.py,sha256=W-K3rjwqwAL9wCXb2_gpAUwnc2xOVdZ1UWMoDlLrqJY,1690
-koi_net/protocol/errors.py,sha256=A83QiYe_fJdxW2lsNsLCujWxDr5sk1UmYYd3TGbSNJA,601
+koi_net/protocol/envelope.py,sha256=BkBabUZXDOiGJnfBJm5BHTQZflsiQ3jBmG1gNOtmeO4,1698
+koi_net/protocol/errors.py,sha256=uKPQ-TGLouZuK0xd2pXuCQoRTyu_JFsydSCLml13Cz8,595
 koi_net/protocol/event.py,sha256=eGgihEj1gliLoQRk8pVB2q_was0AGo-PbT3Hqnpn3oU,1379
 koi_net/protocol/node.py,sha256=7GQzHORFr9cP4BqJgir6EGSWCskL-yqmvJksIiLfcWU,409
-koi_net/protocol/secure.py,sha256=Reem9Z4le4uWXM9uczNOdmgVBg8p4YQav-7_c3pZ1CQ,3366
-koi_net-1.1.0b4.dist-info/METADATA,sha256=olgGAhiNBqMAwhtLYCaK0QNNS3s0LuNzHBwazVELAqk,37118
-koi_net-1.1.0b4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-koi_net-1.1.0b4.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
-koi_net-1.1.0b4.dist-info/RECORD,,
+koi_net/protocol/secure.py,sha256=6sRLWxG5EDF0QLBj29gk3hPmZnPXATrTTFdwx39wQfY,5127
+koi_net-1.1.0b6.dist-info/METADATA,sha256=G2VwaYEW0oLstoINlbOJlT-f2yAhSXEOZP3shspdgqo,37118
+koi_net-1.1.0b6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+koi_net-1.1.0b6.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
+koi_net-1.1.0b6.dist-info/RECORD,,