diff --git a/RNS/Resource.py b/RNS/Resource.py index c22210d2..5faf0dbf 100644 --- a/RNS/Resource.py +++ b/RNS/Resource.py @@ -280,6 +280,16 @@ class Resource: if hasattr(data, "read"): if data_size == None: data_size = os.stat(data.name).st_size + + if data_size == 0: + RNS.log(f"Zero-sized stat at resource init, probably stream. Attempting to proxy stream data...", RNS.LOG_DEBUG) + stream_proxy = tempfile.TemporaryFile() + stream_proxy.write(data.read()) + data_size = os.stat(stream_proxy.name).st_size + if data_size: RNS.log(f"Stream proxy succeeded, final data size is {RNS.prettysize(data_size)}", RNS.LOG_DEBUG) + else: RNS.log(f"Resource initialisation received an invalid readable input, or stream data that could not be proxied, the transfer will likely fail.", RNS.LOG_WARNING) + data = stream_proxy + self.total_size = data_size + self.metadata_size if self.total_size <= Resource.MAX_EFFICIENT_SIZE: @@ -290,12 +300,6 @@ class Resource: data.close() else: - # self.total_segments = ((data_size-1)//Resource.MAX_EFFICIENT_SIZE)+1 - # self.segment_index = segment_index - # self.split = True - # seek_index = segment_index-1 - # seek_position = seek_index*Resource.MAX_EFFICIENT_SIZE - self.total_segments = ((self.total_size-1)//Resource.MAX_EFFICIENT_SIZE)+1 self.segment_index = segment_index self.split = True @@ -372,10 +376,8 @@ class Resource: self.req_hashlist = [] self.receiver_min_consecutive_height = 0 - if timeout != None: - self.timeout = timeout - else: - self.timeout = self.link.rtt * self.link.traffic_timeout_factor + if timeout != None: self.timeout = timeout + else: self.timeout = self.link.rtt * self.link.traffic_timeout_factor if data != None: self.initiator = True @@ -384,18 +386,21 @@ class Resource: compression_began = time.time() if self.auto_compress and data_size <= self.auto_compress_limit: - RNS.log("Compressing resource data...", RNS.LOG_EXTREME) if RNS.sl(RNS.LOG_EXTREME) else None - self.compressed_data = bz2.compress(self.uncompressed_data) - RNS.log("Compression completed in "+str(round(time.time()-compression_began, 3))+" seconds", RNS.LOG_EXTREME) if RNS.sl(RNS.LOG_EXTREME) else None - else: - self.compressed_data = self.uncompressed_data + RNS.log("Compressing resource data...", RNS.LOG_DEBUG) if RNS.sl(RNS.LOG_DEBUG) else None + try: + self.compressed_data = bz2.compress(self.uncompressed_data) + RNS.log("Compression completed in "+str(round(time.time()-compression_began, 3))+" seconds", RNS.LOG_DEBUG) if RNS.sl(RNS.LOG_DEBUG) else None + except Exception as e: + RNS.log(f"Could not auto-compress resource data, falling back to uncompressed transfer: {e}", RNS.LOG_DEBUG) + self.compressed_data = self.uncompressed_data + else: self.compressed_data = self.uncompressed_data self.uncompressed_size = len(self.uncompressed_data) self.compressed_size = len(self.compressed_data) if (self.compressed_size < self.uncompressed_size and auto_compress): saved_bytes = len(self.uncompressed_data) - len(self.compressed_data) - RNS.log("Compression saved "+str(saved_bytes)+" bytes, sending compressed", RNS.LOG_EXTREME) if RNS.sl(RNS.LOG_EXTREME) else None + RNS.log("Compression saved "+str(saved_bytes)+" bytes, sending compressed", RNS.LOG_DEBUG) if RNS.sl(RNS.LOG_DEBUG) else None self.data = b"" self.data += RNS.Identity.get_random_hash()[:Resource.RANDOM_HASH_SIZE] @@ -1238,7 +1243,9 @@ class Resource: return self.compressed def __str__(self): - return "<"+RNS.hexrep(self.hash,delimit=False)+"/"+RNS.hexrep(self.link.link_id,delimit=False)+">" + if hasattr(self, "hash") and self.hash and hasattr(self, "link") and self.link: + return "<"+RNS.hexrep(self.hash,delimit=False)+"/"+RNS.hexrep(self.link.link_id,delimit=False)+">" + else: return "" class ResourceAdvertisement: