CK-InoDrive-API 1.0.1__tar.gz → 1.0.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CK_InoDrive_API.egg-info/PKG-INFO +18 -4
- ck_inodrive_api-1.0.2/CK_InoDrive_API.egg-info/requires.txt +4 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/__init__.py +1 -2
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/defines.py +15 -1
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/discoverLan.py +22 -10
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/file.py +32 -19
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/inoDrive.py +12 -8
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/sysControl.py +17 -1
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/userApp.py +8 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/utils.py +43 -10
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/wsHandle.py +81 -35
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/PKG-INFO +18 -4
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/README.txt +110 -36
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/setup.py +4 -2
- ck_inodrive_api-1.0.1/CK_InoDrive_API.egg-info/requires.txt +0 -3
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CK_InoDrive_API.egg-info/SOURCES.txt +0 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CK_InoDrive_API.egg-info/dependency_links.txt +0 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CK_InoDrive_API.egg-info/top_level.txt +0 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/IO.py +0 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/_version.py +0 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/callback.py +0 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/ck_ca.crt +0 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CkInoDriveAPI/discoverWs.py +0 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/LICENSE.txt +0 -0
- {ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: CK-InoDrive-API
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.2
|
|
4
4
|
Summary: InoDrive API Library
|
|
5
5
|
Home-page: https://cardinalkinetic.com
|
|
6
6
|
Author: Cardinal Kinetic
|
|
@@ -15,12 +15,26 @@ Classifier: Topic :: Scientific/Engineering
|
|
|
15
15
|
Classifier: Programming Language :: Python :: 3
|
|
16
16
|
Classifier: Programming Language :: Python :: 3.10
|
|
17
17
|
Classifier: Programming Language :: Python :: 3.12
|
|
18
|
+
Classifier: Programming Language :: Python :: 3.14
|
|
18
19
|
Description-Content-Type: text/markdown
|
|
19
20
|
License-File: LICENSE.txt
|
|
20
21
|
License-File: README.txt
|
|
21
|
-
Requires-Dist: websocket-client==1.
|
|
22
|
+
Requires-Dist: websocket-client==1.9.0
|
|
22
23
|
Requires-Dist: ifaddr==0.2.0
|
|
23
|
-
Requires-Dist: msgpack==1.1.
|
|
24
|
+
Requires-Dist: msgpack==1.1.2
|
|
25
|
+
Requires-Dist: getmac==0.9.5
|
|
26
|
+
Dynamic: author
|
|
27
|
+
Dynamic: author-email
|
|
28
|
+
Dynamic: classifier
|
|
29
|
+
Dynamic: description
|
|
30
|
+
Dynamic: description-content-type
|
|
31
|
+
Dynamic: home-page
|
|
32
|
+
Dynamic: keywords
|
|
33
|
+
Dynamic: license
|
|
34
|
+
Dynamic: license-file
|
|
35
|
+
Dynamic: project-url
|
|
36
|
+
Dynamic: requires-dist
|
|
37
|
+
Dynamic: summary
|
|
24
38
|
|
|
25
39
|
#### **Installation**
|
|
26
40
|
|
|
@@ -83,6 +83,7 @@ class _MsgPack(object):
|
|
|
83
83
|
GET_METRICS = 0x12
|
|
84
84
|
LIST_VARIABLES = 0x16
|
|
85
85
|
ACCESS_VARIABLES = 0x17
|
|
86
|
+
RPC_SET_FLAG = 0x18
|
|
86
87
|
|
|
87
88
|
SET_INPUT_POLARITY = 0x20
|
|
88
89
|
SET_OUTPUTS = 0x21
|
|
@@ -98,6 +99,18 @@ class _MsgPackErrors(object):
|
|
|
98
99
|
NOT_IMPLEMENTED = 0x5
|
|
99
100
|
NOT_ALLOWED = 0x6
|
|
100
101
|
|
|
102
|
+
class _RPCDefines(object):
|
|
103
|
+
PEER_READY = 0x0
|
|
104
|
+
PEER_NOT_READY = 0x1
|
|
105
|
+
|
|
106
|
+
class _ConsoleMsgTypes(object):
|
|
107
|
+
TYPES = {
|
|
108
|
+
0: "trace",
|
|
109
|
+
1: "info",
|
|
110
|
+
2: "notice",
|
|
111
|
+
3: "warning",
|
|
112
|
+
4: "error"
|
|
113
|
+
}
|
|
101
114
|
|
|
102
115
|
class _OPState(object):
|
|
103
116
|
STATES = {
|
|
@@ -172,7 +185,6 @@ class _CkDefines(object):
|
|
|
172
185
|
'counter': {'type': 12, 'size': 0},
|
|
173
186
|
}
|
|
174
187
|
|
|
175
|
-
|
|
176
188
|
# MessageTypes = _MsgDefines()
|
|
177
189
|
#
|
|
178
190
|
#
|
|
@@ -446,3 +458,5 @@ class _CkDefines(object):
|
|
|
446
458
|
|
|
447
459
|
CK = _CkDefines()
|
|
448
460
|
OP_STATE = _OPState()
|
|
461
|
+
consoleMsgTypes = _ConsoleMsgTypes()
|
|
462
|
+
RPC_FLAGS = _RPCDefines()
|
|
@@ -14,6 +14,7 @@ SMEEX_UDP_WELL_KNOWN_PORT = 17737
|
|
|
14
14
|
def _get_network_interfaces_using_ifaddr(one_ip_per_adapter=False):
|
|
15
15
|
logging.info("List interfaces with ifaddr...")
|
|
16
16
|
netif_ip_list = []
|
|
17
|
+
|
|
17
18
|
try:
|
|
18
19
|
import ifaddr
|
|
19
20
|
except Exception as ex:
|
|
@@ -21,17 +22,25 @@ def _get_network_interfaces_using_ifaddr(one_ip_per_adapter=False):
|
|
|
21
22
|
logging.error("Error, module 'ifaddr' not installed.")
|
|
22
23
|
return None
|
|
23
24
|
|
|
25
|
+
try:
|
|
26
|
+
import getmac
|
|
27
|
+
except Exception as ex:
|
|
28
|
+
print("Error, module 'getmac' not installed.")
|
|
29
|
+
logging.error("Error, module 'getmac' not installed.")
|
|
30
|
+
return None
|
|
31
|
+
|
|
24
32
|
adapters = ifaddr.get_adapters()
|
|
25
33
|
logging.info("Found %d interfaces" % len(adapters))
|
|
26
34
|
for adapter in adapters:
|
|
27
35
|
ipv4_address_found = False
|
|
28
36
|
print("IPs of network adapter ", adapter.nice_name)
|
|
29
37
|
for ip in adapter.ips:
|
|
30
|
-
if ip.ip.count(
|
|
38
|
+
if ip.ip.count(".") != 3:
|
|
31
39
|
continue
|
|
32
40
|
ipv4_address_found = True
|
|
33
41
|
logging.info("--> " + str(ip.ip) + "/" + str(ip.network_prefix))
|
|
34
|
-
|
|
42
|
+
mac = getmac.get_mac_address(interface=ip.nice_name)
|
|
43
|
+
result = (adapter, ip.ip, mac)
|
|
35
44
|
netif_ip_list.append(result)
|
|
36
45
|
if one_ip_per_adapter:
|
|
37
46
|
break
|
|
@@ -42,8 +51,10 @@ def _get_network_interfaces_using_ifaddr(one_ip_per_adapter=False):
|
|
|
42
51
|
return netif_ip_list
|
|
43
52
|
|
|
44
53
|
|
|
45
|
-
def _discover_modules_on_netif(
|
|
46
|
-
|
|
54
|
+
def _discover_modules_on_netif(
|
|
55
|
+
netif_ip_tuple, num_attempts=1, per_attempt_timeout=0.5, ma_sleep_min=0.2, ma_sleep_max=0.5
|
|
56
|
+
):
|
|
57
|
+
"""Discover modules on the network interface with the specified IP address."""
|
|
47
58
|
modules_found = {}
|
|
48
59
|
|
|
49
60
|
# Apply a sensible minimum to the timeout
|
|
@@ -60,7 +71,7 @@ def _discover_modules_on_netif(netif_ip_tuple, num_attempts=1, per_attempt_timeo
|
|
|
60
71
|
local_listen_port = 0
|
|
61
72
|
# I could not get consistently good results with properly calculated size, so just use a big number.
|
|
62
73
|
# Plan for around 300 bytes MINIMUM per module, especially on a CPU constrained system.
|
|
63
|
-
recv_buf_size =
|
|
74
|
+
recv_buf_size = 1000 * 500 # 500k/0.1s-OK, 100k/0.1s-OK
|
|
64
75
|
# Just a safety limit to prevent run-away memory allocation. We should never see 1000 responses, let alone more
|
|
65
76
|
# Do not set this too low though because on Windows, if all modules respond with broadcasts, our internal list
|
|
66
77
|
# will hold all responses twice.
|
|
@@ -101,7 +112,7 @@ def _discover_modules_on_netif(netif_ip_tuple, num_attempts=1, per_attempt_timeo
|
|
|
101
112
|
# Bind to the wildcard address and the same port number as the first socket.
|
|
102
113
|
# Under Linux, this allows us to collect responses sent to 255.255.255.255 which we would not get
|
|
103
114
|
# through the original socket.
|
|
104
|
-
bcast_sock.bind((
|
|
115
|
+
bcast_sock.bind(("", local_listen_port))
|
|
105
116
|
except Exception as exc:
|
|
106
117
|
logging.error(type(exc).__name__)
|
|
107
118
|
# Logger.log(logging.DEBUG, exc.__class__.__name__)
|
|
@@ -126,9 +137,9 @@ def _discover_modules_on_netif(netif_ip_tuple, num_attempts=1, per_attempt_timeo
|
|
|
126
137
|
svc_name = "Identity"
|
|
127
138
|
svc_name_len = min(16, len(svc_name))
|
|
128
139
|
padding = 16 - svc_name_len
|
|
129
|
-
payload = struct.pack(">BII", 0x05, my_session_id, 0) + bytes("Identity",
|
|
140
|
+
payload = struct.pack(">BII", 0x05, my_session_id, 0) + bytes("Identity", "ascii") + bytearray(padding)
|
|
130
141
|
# Send it to 255.255.255.255
|
|
131
|
-
send_sock.sendto(payload, (
|
|
142
|
+
send_sock.sendto(payload, ("<broadcast>", SMEEX_UDP_WELL_KNOWN_PORT))
|
|
132
143
|
|
|
133
144
|
internal_list_full = False
|
|
134
145
|
while not internal_list_full:
|
|
@@ -178,8 +189,9 @@ def _discover_modules_on_netif(netif_ip_tuple, num_attempts=1, per_attempt_timeo
|
|
|
178
189
|
sn = None
|
|
179
190
|
|
|
180
191
|
if module_object is not None:
|
|
181
|
-
module_object[
|
|
182
|
-
|
|
192
|
+
module_object["netif"] = netif_ip_tuple[0]
|
|
193
|
+
module_object["netifMac"] = netif_ip_tuple[2]
|
|
194
|
+
sn = module_object["sn"]
|
|
183
195
|
|
|
184
196
|
except struct.error:
|
|
185
197
|
continue
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import json
|
|
2
|
+
import base64
|
|
2
3
|
import logging
|
|
3
4
|
|
|
4
5
|
from .defines import CK
|
|
@@ -16,7 +17,7 @@ class File(object):
|
|
|
16
17
|
def dispose(self):
|
|
17
18
|
return
|
|
18
19
|
|
|
19
|
-
def read(self, files=None, transfer_type=None):
|
|
20
|
+
def read(self, files=None, transfer_type=None, props={}):
|
|
20
21
|
try:
|
|
21
22
|
if files is None:
|
|
22
23
|
logging.error(f"Files is None...")
|
|
@@ -58,7 +59,7 @@ class File(object):
|
|
|
58
59
|
# Add file path TLV to the message
|
|
59
60
|
msg += Utils.get_tlv(CK.TYPE.STRING, file_path)
|
|
60
61
|
|
|
61
|
-
response = self._connection_handle.request(msg)
|
|
62
|
+
response = self._connection_handle.request(msg, props)
|
|
62
63
|
if response.get('error'):
|
|
63
64
|
logging.error('File read error...')
|
|
64
65
|
return None
|
|
@@ -80,10 +81,10 @@ class File(object):
|
|
|
80
81
|
|
|
81
82
|
return None
|
|
82
83
|
|
|
83
|
-
def write(self, files=None, transfer_type=None):
|
|
84
|
+
def write(self, files=None, transfer_type=None, props={}):
|
|
84
85
|
try:
|
|
85
86
|
if files is None:
|
|
86
|
-
logging.error(
|
|
87
|
+
logging.error("Files not provided...")
|
|
87
88
|
return False
|
|
88
89
|
|
|
89
90
|
if type(files) is not list:
|
|
@@ -104,7 +105,7 @@ class File(object):
|
|
|
104
105
|
if file_path[0] == '.':
|
|
105
106
|
file_path = file_path[1:]
|
|
106
107
|
|
|
107
|
-
if file_path[0] != '/':
|
|
108
|
+
if transfer_type != CK.FILE.WEBPAGE_TRANSFER and file_path[0] != '/':
|
|
108
109
|
file_path = f"/{file_path}"
|
|
109
110
|
|
|
110
111
|
file_path = file_path.replace('\\', '/')
|
|
@@ -118,7 +119,7 @@ class File(object):
|
|
|
118
119
|
file_content = bytes(file_content, 'utf-8')
|
|
119
120
|
|
|
120
121
|
if file_content is None or type(file_content) is not bytes:
|
|
121
|
-
logging.error(f"File
|
|
122
|
+
logging.error(f"File data is not bytes...")
|
|
122
123
|
return False
|
|
123
124
|
|
|
124
125
|
msg = b''
|
|
@@ -130,7 +131,7 @@ class File(object):
|
|
|
130
131
|
msg += Utils.get_tlv(CK.TYPE.BLOB, file_content)
|
|
131
132
|
|
|
132
133
|
# Send request and wait for response
|
|
133
|
-
resp = self._connection_handle.request(msg)
|
|
134
|
+
resp = self._connection_handle.request(msg, props)
|
|
134
135
|
|
|
135
136
|
if resp.get('error'):
|
|
136
137
|
logging.error(f"File [{file_path}] write error: {resp.get('error')}")
|
|
@@ -142,10 +143,10 @@ class File(object):
|
|
|
142
143
|
|
|
143
144
|
return False
|
|
144
145
|
|
|
145
|
-
def delete_uapp(self):
|
|
146
|
+
def delete_uapp(self, props={}):
|
|
146
147
|
try:
|
|
147
148
|
# Send request and wait for response
|
|
148
|
-
resp = self._connection_handle.request(Utils.get_tlv(CK.SPECIAL.DELETE_UAPP))
|
|
149
|
+
resp = self._connection_handle.request(Utils.get_tlv(CK.SPECIAL.DELETE_UAPP), props)
|
|
149
150
|
|
|
150
151
|
if resp.get('error'):
|
|
151
152
|
logging.error(f"Deleting User Application failed...")
|
|
@@ -157,36 +158,48 @@ class File(object):
|
|
|
157
158
|
|
|
158
159
|
return False
|
|
159
160
|
|
|
160
|
-
def upload_user_app(self, content=None):
|
|
161
|
+
def upload_user_app(self, content=None, props={}):
|
|
161
162
|
try:
|
|
162
|
-
|
|
163
|
+
if type(content) is str:
|
|
164
|
+
content = base64.b64decode(content)
|
|
165
|
+
|
|
166
|
+
return self.write([{'path': "/uapp/application.idsol", 'content': content}], CK.FILE.UAPP_TRANSFER, props)
|
|
163
167
|
except Exception as ex:
|
|
164
168
|
logging.exception(ex)
|
|
165
169
|
|
|
166
|
-
def upload_firmware(self, content=None):
|
|
170
|
+
def upload_firmware(self, content=None, props={}):
|
|
167
171
|
try:
|
|
168
|
-
|
|
172
|
+
if type(content) is str:
|
|
173
|
+
content = base64.b64decode(content)
|
|
174
|
+
|
|
175
|
+
return self.write([{'path': "/firmware/firmware.ckfw", 'content': content}], CK.FILE.FIRMWARE_TRANSFER, props)
|
|
169
176
|
except Exception as ex:
|
|
170
177
|
logging.exception(ex)
|
|
171
178
|
|
|
172
|
-
def
|
|
179
|
+
def upload_web_content(self, file_name=None, content=None, props={}):
|
|
173
180
|
try:
|
|
174
|
-
|
|
181
|
+
if type(content) is str:
|
|
182
|
+
content = base64.b64decode(content)
|
|
183
|
+
|
|
184
|
+
if type(file_name) is not str:
|
|
185
|
+
file_name = "web.bfb"
|
|
186
|
+
|
|
187
|
+
return self.write([{'path': file_name, 'content': content}], CK.FILE.WEBPAGE_TRANSFER, props)
|
|
175
188
|
except Exception as ex:
|
|
176
189
|
logging.exception(ex)
|
|
177
190
|
|
|
178
|
-
def read_module_config(self):
|
|
191
|
+
def read_module_config(self, props={}):
|
|
179
192
|
try:
|
|
180
|
-
return self.read({'path': '/config/module_cfg.json', 'content': 'json'})
|
|
193
|
+
return self.read({'path': '/config/module_cfg.json', 'content': 'json'}, props)
|
|
181
194
|
except Exception as ex:
|
|
182
195
|
logging.exception(ex)
|
|
183
196
|
|
|
184
|
-
def write_module_config(self, content=None):
|
|
197
|
+
def write_module_config(self, content=None, props={}):
|
|
185
198
|
try:
|
|
186
199
|
if type(content) is not dict:
|
|
187
200
|
logging.error('Content type is not dictionary')
|
|
188
201
|
return False
|
|
189
202
|
|
|
190
|
-
return self.write({'path': '/config/module_cfg.json', 'content': content})
|
|
203
|
+
return self.write({'path': '/config/module_cfg.json', 'content': content}, CK.FILE.TRANSFER, props)
|
|
191
204
|
except Exception as ex:
|
|
192
205
|
logging.exception(ex)
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import logging
|
|
2
2
|
import weakref
|
|
3
|
+
import sys
|
|
3
4
|
from ._version import get_version_number
|
|
4
5
|
from .callback import Callback
|
|
5
6
|
|
|
@@ -15,10 +16,21 @@ class InoDrive(object):
|
|
|
15
16
|
version = None
|
|
16
17
|
_kwargs = None
|
|
17
18
|
_connection_handle_instance = None
|
|
19
|
+
_os = None
|
|
18
20
|
|
|
19
21
|
def __init__(self, **kwargs):
|
|
20
22
|
self.version = get_version_number()
|
|
21
23
|
self._kwargs = kwargs
|
|
24
|
+
|
|
25
|
+
if (sys.platform == "win32") or (sys.platform == "win64"):
|
|
26
|
+
self._os = "windows"
|
|
27
|
+
elif sys.platform == "darwin":
|
|
28
|
+
self._os = "mac"
|
|
29
|
+
elif sys.platform == "linux":
|
|
30
|
+
self._os = "linux"
|
|
31
|
+
else:
|
|
32
|
+
self._os = "unknown"
|
|
33
|
+
|
|
22
34
|
logging.debug('Create InoDrive instance...')
|
|
23
35
|
self._auto_connect = kwargs.get('autoConnect', False)
|
|
24
36
|
|
|
@@ -49,11 +61,6 @@ class InoDrive(object):
|
|
|
49
61
|
# ==============================================================================================================
|
|
50
62
|
# CONNECTION
|
|
51
63
|
# ==============================================================================================================
|
|
52
|
-
if "useFallback" in self._kwargs:
|
|
53
|
-
self._use_fallback = False if self._kwargs["useFallback"] == False else True
|
|
54
|
-
else:
|
|
55
|
-
self._use_fallback = True
|
|
56
|
-
|
|
57
64
|
if "secureConnection" in self._kwargs:
|
|
58
65
|
self._secure_connection = False if self._kwargs["secureConnection"] == False else True
|
|
59
66
|
else:
|
|
@@ -107,9 +114,6 @@ class InoDrive(object):
|
|
|
107
114
|
logging.exception(ex)
|
|
108
115
|
if connection_handle:
|
|
109
116
|
connection_handle = connection_handle.dispose()
|
|
110
|
-
|
|
111
|
-
if not self._use_fallback:
|
|
112
|
-
return
|
|
113
117
|
else:
|
|
114
118
|
connection_handle = InoDriveWS(**self._kwargs, callback=self._callback, secure=False)
|
|
115
119
|
self._connection_handle_instance = connection_handle
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import logging
|
|
2
2
|
|
|
3
|
-
from .defines import CK
|
|
3
|
+
from .defines import CK, RPC_FLAGS
|
|
4
4
|
from .utils import Utils
|
|
5
5
|
|
|
6
6
|
|
|
@@ -102,3 +102,19 @@ class SysControl(object):
|
|
|
102
102
|
logging.exception(ex)
|
|
103
103
|
|
|
104
104
|
return None
|
|
105
|
+
|
|
106
|
+
def set_ready(self):
|
|
107
|
+
try:
|
|
108
|
+
response = self._connection_handle.msg_pack_request([CK.MSG_PACK.RPC_SET_FLAG, RPC_FLAGS.PEER_READY])
|
|
109
|
+
except Exception as ex:
|
|
110
|
+
logging.exception(ex)
|
|
111
|
+
|
|
112
|
+
return None
|
|
113
|
+
|
|
114
|
+
def clear_ready(self):
|
|
115
|
+
try:
|
|
116
|
+
response = self._connection_handle.msg_pack_request([CK.MSG_PACK.RPC_SET_FLAG, RPC_FLAGS.PEER_NOT_READY])
|
|
117
|
+
except Exception as ex:
|
|
118
|
+
logging.exception(ex)
|
|
119
|
+
|
|
120
|
+
return None
|
|
@@ -44,6 +44,7 @@ class UserApp(object):
|
|
|
44
44
|
self._callback.on('connect', self._on_connect)
|
|
45
45
|
self._callback.on('disconnect', self._on_disconnect)
|
|
46
46
|
self._callback.on('error', self._on_error)
|
|
47
|
+
self._callback.on('console', self._on_console)
|
|
47
48
|
|
|
48
49
|
@property
|
|
49
50
|
def _connection_handle(self):
|
|
@@ -439,6 +440,13 @@ class UserApp(object):
|
|
|
439
440
|
except Exception as ex:
|
|
440
441
|
logging.exception(ex)
|
|
441
442
|
|
|
443
|
+
def _on_console(self, msg):
|
|
444
|
+
try:
|
|
445
|
+
if self._poll_active:
|
|
446
|
+
self._callback.dispatch("appConsole", msg)
|
|
447
|
+
except Exception as ex:
|
|
448
|
+
logging.exception(ex)
|
|
449
|
+
|
|
442
450
|
def _thread_loop(self):
|
|
443
451
|
while self._thread_running:
|
|
444
452
|
if self._thread is None:
|
|
@@ -8,24 +8,29 @@ import logging
|
|
|
8
8
|
import msgpack
|
|
9
9
|
|
|
10
10
|
from .defines import CK
|
|
11
|
+
from .defines import consoleMsgTypes
|
|
11
12
|
|
|
12
13
|
|
|
13
14
|
class CkUtils(object):
|
|
14
15
|
|
|
15
16
|
def get_target_url(self, target='', props={}):
|
|
16
17
|
try:
|
|
17
|
-
|
|
18
|
+
has_dot_local = False
|
|
19
|
+
secure = props.get('secure', True)
|
|
20
|
+
dot_local = props.get('dotLocal', False)
|
|
18
21
|
port_number = props.get('port')
|
|
19
22
|
path = props.get('path')
|
|
20
|
-
|
|
21
|
-
|
|
23
|
+
os = props.get('os')
|
|
24
|
+
|
|
25
|
+
if props.get('timestamp'):
|
|
26
|
+
logging.warning("InoDriveApi: Timestamp is deprecated due to SSL Certificate compatibility issues...")
|
|
22
27
|
|
|
23
28
|
protocol_type = props.get('protocolType', "")
|
|
24
29
|
if len([key for key in ['ws', 'http'] if key in protocol_type]) == 0:
|
|
25
30
|
protocol_type = "ws"
|
|
26
31
|
|
|
27
|
-
|
|
28
|
-
|
|
32
|
+
if target.find('.local') >= 0:
|
|
33
|
+
has_dot_local = True
|
|
29
34
|
target = target.replace('.local', '')
|
|
30
35
|
|
|
31
36
|
protocol = f"{protocol_type}{'s' if secure == True else ''}"
|
|
@@ -42,7 +47,6 @@ class CkUtils(object):
|
|
|
42
47
|
if path[0] == '/':
|
|
43
48
|
path = path[1:]
|
|
44
49
|
|
|
45
|
-
cmd_delimiter = '--'
|
|
46
50
|
is_ipv4 = True if re.match(r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}', target) else False
|
|
47
51
|
if is_ipv4:
|
|
48
52
|
for octet in target.split("."):
|
|
@@ -52,13 +56,16 @@ class CkUtils(object):
|
|
|
52
56
|
|
|
53
57
|
url = f"{protocol}://{target}"
|
|
54
58
|
if not is_ipv4:
|
|
55
|
-
if timestamp and secure == False:
|
|
56
|
-
url += f"{cmd_delimiter}T{int(time.time())}"
|
|
57
|
-
|
|
58
59
|
if has_dot_local or dot_local:
|
|
59
60
|
url += '.local'
|
|
60
61
|
|
|
61
|
-
|
|
62
|
+
if port:
|
|
63
|
+
url += f"{port}"
|
|
64
|
+
|
|
65
|
+
if path:
|
|
66
|
+
url += f"/{path if path is not None else ''}"
|
|
67
|
+
|
|
68
|
+
# url += f"{port if port is not None else ''}/{path if path is not None else ''}"
|
|
62
69
|
|
|
63
70
|
return url
|
|
64
71
|
except Exception as ex:
|
|
@@ -301,6 +308,32 @@ class CkUtils(object):
|
|
|
301
308
|
|
|
302
309
|
return b''
|
|
303
310
|
|
|
311
|
+
def get_console_message(self, msg):
|
|
312
|
+
result = {
|
|
313
|
+
'success': True,
|
|
314
|
+
'timestamp': msg['ntpTime'],
|
|
315
|
+
'error': None,
|
|
316
|
+
'type': 0
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
try:
|
|
320
|
+
for idx in range(len(msg['items'])):
|
|
321
|
+
item = msg['items'][idx]
|
|
322
|
+
|
|
323
|
+
if item['ctpType'] == CK.TYPE.INT_NUM:
|
|
324
|
+
if idx == 0:
|
|
325
|
+
msgType = consoleMsgTypes.TYPES[item['data'][0]]
|
|
326
|
+
result['type'] = msgType if msgType else consoleMsgTypes[0]
|
|
327
|
+
if item['ctpType'] == CK.TYPE.STRING:
|
|
328
|
+
if "text" not in result:
|
|
329
|
+
result['text'] = ""
|
|
330
|
+
result['text'] += item['data'].decode("utf-8").rstrip("x\00")
|
|
331
|
+
except Exception as ex:
|
|
332
|
+
logging.exception(ex)
|
|
333
|
+
result['success'] = False
|
|
334
|
+
result['error'] = ex
|
|
335
|
+
return result
|
|
336
|
+
|
|
304
337
|
def get_var_c_type(self, var_type=None):
|
|
305
338
|
try:
|
|
306
339
|
if var_type is None:
|
|
@@ -18,6 +18,13 @@ class InoDriveWS(object):
|
|
|
18
18
|
# Connection ID
|
|
19
19
|
self._id = kwargs.get('id', str(uuid.uuid4()))
|
|
20
20
|
|
|
21
|
+
self._type = kwargs.get("type")
|
|
22
|
+
|
|
23
|
+
# OS Type
|
|
24
|
+
self._os = kwargs.get('os')
|
|
25
|
+
|
|
26
|
+
self._key = kwargs.get("key")
|
|
27
|
+
|
|
21
28
|
# Connection Properties
|
|
22
29
|
key = [key for key in ['target', 'host'] if key in kwargs]
|
|
23
30
|
if key:
|
|
@@ -33,7 +40,7 @@ class InoDriveWS(object):
|
|
|
33
40
|
self._secure = kwargs.get('secure', False)
|
|
34
41
|
|
|
35
42
|
# Other
|
|
36
|
-
self._reconnect_attempts = kwargs.get('reconnectAttempts',
|
|
43
|
+
self._reconnect_attempts = kwargs.get('reconnectAttempts', 2)
|
|
37
44
|
|
|
38
45
|
# Timeouts
|
|
39
46
|
# connectTimeout should be 3 - 15 seconds. Low values like 3-5 should be good, even over the internet.
|
|
@@ -41,14 +48,17 @@ class InoDriveWS(object):
|
|
|
41
48
|
# filesystem overhead and the transfer of 300k+ firmware file takes 2+ seconds.
|
|
42
49
|
# Maybe we need separate file transfer and variable API timeouts.
|
|
43
50
|
self._create_timeout = kwargs.get('createTimeout', 15)
|
|
44
|
-
self._connect_timeout = kwargs.get('connectTimeout', 15)
|
|
51
|
+
self._connect_timeout = kwargs.get('connectTimeout', (15 * self._reconnect_attempts))
|
|
45
52
|
self._socket_timeout = kwargs.get('socketTimeout', 10)
|
|
46
|
-
self._request_timeout = kwargs.get('requestTimeout',
|
|
53
|
+
self._request_timeout = kwargs.get('requestTimeout', 30)
|
|
47
54
|
self._keep_alive_timeout = kwargs.get('keepAliveTimeout', 5)
|
|
48
|
-
self._reconnect_timeout = (self._connect_timeout /
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
self.
|
|
55
|
+
self._reconnect_timeout = int(self._connect_timeout / self._reconnect_attempts - (self._connect_timeout / 10))
|
|
56
|
+
|
|
57
|
+
if self._connect_timeout < 5:
|
|
58
|
+
self._connect_timeout = 5
|
|
59
|
+
|
|
60
|
+
if self._reconnect_attempts > 4:
|
|
61
|
+
self._reconnect_attempts = 4
|
|
52
62
|
|
|
53
63
|
self._ws_input_buff_size = kwargs.get('wsInputBuffer', None)
|
|
54
64
|
|
|
@@ -93,6 +103,13 @@ class InoDriveWS(object):
|
|
|
93
103
|
def on(self):
|
|
94
104
|
return self._callback.on
|
|
95
105
|
|
|
106
|
+
@property
|
|
107
|
+
def key(self):
|
|
108
|
+
return self._key
|
|
109
|
+
|
|
110
|
+
def set_key(self, value):
|
|
111
|
+
self._key = value
|
|
112
|
+
|
|
96
113
|
def dispose(self):
|
|
97
114
|
try:
|
|
98
115
|
logging.debug(f"Dispose connection -> host [{self._target}]...")
|
|
@@ -108,9 +125,21 @@ class InoDriveWS(object):
|
|
|
108
125
|
def get_target(self, **kwargs):
|
|
109
126
|
if not isinstance(kwargs, dict):
|
|
110
127
|
kwargs = {}
|
|
111
|
-
url = Utils.get_target_url(self._target, {'port': self._port, 'path': self._path, 'secure': self._secure, **kwargs})
|
|
112
|
-
|
|
113
|
-
|
|
128
|
+
url = Utils.get_target_url(self._target, {'os': self._os, 'port': self._port, 'path': self._path, 'secure': self._secure, **kwargs})
|
|
129
|
+
|
|
130
|
+
search_props = []
|
|
131
|
+
|
|
132
|
+
if self._secure and self._ws_input_buff_size is not None:
|
|
133
|
+
search_props.append(f"ibs={self._ws_input_buff_size}")
|
|
134
|
+
if self._type is not None:
|
|
135
|
+
search_props.append(f"conn-type={self._type}")
|
|
136
|
+
if self._key is not None:
|
|
137
|
+
search_props.append(f"key={self._key}")
|
|
138
|
+
|
|
139
|
+
if len(search_props) != 0:
|
|
140
|
+
url_options = "&".join(search_props)
|
|
141
|
+
url += f"?{url_options}"
|
|
142
|
+
|
|
114
143
|
return url
|
|
115
144
|
|
|
116
145
|
def set_target(self, target=None):
|
|
@@ -147,7 +176,8 @@ class InoDriveWS(object):
|
|
|
147
176
|
if not getattr(self, "_wsapp", None):
|
|
148
177
|
logging.warning(f"Connect to: ---> {self._target_url}")
|
|
149
178
|
timestamp = True if attempt == self._reconnect_attempts else False
|
|
150
|
-
|
|
179
|
+
# Alternate between .local and without
|
|
180
|
+
url = self.get_target(dotLocal=(True if attempt & 0x1 else False))
|
|
151
181
|
# WebSocket instance
|
|
152
182
|
self._wsapp = websocket.WebSocketApp(
|
|
153
183
|
url,
|
|
@@ -271,11 +301,15 @@ class InoDriveWS(object):
|
|
|
271
301
|
def send(self, data):
|
|
272
302
|
logging.exception("Method not implemented")
|
|
273
303
|
|
|
274
|
-
def request(self, payload=None,
|
|
304
|
+
def request(self, payload=None, props={}):
|
|
275
305
|
try:
|
|
276
306
|
if type(payload) is not bytes:
|
|
277
307
|
return {'success': False, 'error': 'Payload is None...'}
|
|
278
308
|
|
|
309
|
+
blocking = props.get("blocking", True)
|
|
310
|
+
|
|
311
|
+
timeout = props.get("timeout", None)
|
|
312
|
+
|
|
279
313
|
self._last_request_time = int(time.time())
|
|
280
314
|
|
|
281
315
|
token = Utils.get_token(8, bytes=False)
|
|
@@ -287,6 +321,7 @@ class InoDriveWS(object):
|
|
|
287
321
|
queue_item = {
|
|
288
322
|
'state': "sent",
|
|
289
323
|
'time': self._last_request_time,
|
|
324
|
+
'timeout': timeout if timeout is not None else self._request_timeout,
|
|
290
325
|
'error': None,
|
|
291
326
|
'response': None,
|
|
292
327
|
}
|
|
@@ -326,10 +361,10 @@ class InoDriveWS(object):
|
|
|
326
361
|
logging.error(str(ex))
|
|
327
362
|
return {'success': False, 'error': ex}
|
|
328
363
|
|
|
329
|
-
def msg_pack_request(self, msg=[]):
|
|
364
|
+
def msg_pack_request(self, msg=[], props={}):
|
|
330
365
|
try:
|
|
331
366
|
msg_tlv = Utils.get_msg_pack_tlv(msg)
|
|
332
|
-
response = self.request(msg_tlv)
|
|
367
|
+
response = self.request(msg_tlv, props)
|
|
333
368
|
|
|
334
369
|
if response.get('error'):
|
|
335
370
|
return {
|
|
@@ -385,24 +420,30 @@ class InoDriveWS(object):
|
|
|
385
420
|
if self._binary:
|
|
386
421
|
msg = Utils.decode_tlv_message(msg)
|
|
387
422
|
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
if msg.get(
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
423
|
+
if msg.get("type") == CK.SPECIAL.CONSOLE:
|
|
424
|
+
console_msg = Utils.get_console_message(msg)
|
|
425
|
+
if console_msg['success']:
|
|
426
|
+
self._callback.dispatch("console", console_msg)
|
|
427
|
+
return
|
|
428
|
+
|
|
429
|
+
msg_token = None
|
|
430
|
+
if msg.get("token"):
|
|
431
|
+
msg_token = Utils.get_typed_value(msg['token'][0:], 'string')
|
|
432
|
+
|
|
433
|
+
msg_request = self._msg_queue_get(msg_token)
|
|
434
|
+
if msg_request:
|
|
435
|
+
msg_request['state'] = "received"
|
|
436
|
+
if msg.get('error'):
|
|
437
|
+
logging.error(msg['error'])
|
|
438
|
+
msg_request['error'] = True
|
|
439
|
+
elif msg['response'] != CK.RESULT.OK:
|
|
440
|
+
result_name = Utils.get_result_name_by_value(msg['response'])
|
|
441
|
+
logging.error(f"Unexpected response type [{msg['response']}]: {result_name}")
|
|
442
|
+
msg_request['error'] = True
|
|
443
|
+
else:
|
|
444
|
+
msg_request['response'] = msg
|
|
404
445
|
|
|
405
|
-
|
|
446
|
+
self._msg_queue_pull(msg_token)
|
|
406
447
|
|
|
407
448
|
self._callback.dispatch("message", msg)
|
|
408
449
|
except Exception as ex:
|
|
@@ -486,8 +527,12 @@ class InoDriveWS(object):
|
|
|
486
527
|
def _send(self, data=None):
|
|
487
528
|
try:
|
|
488
529
|
if self.connected():
|
|
489
|
-
self.
|
|
490
|
-
|
|
530
|
+
if self._binary and type(data) is bytes:
|
|
531
|
+
self._wsapp.sock.send_binary(data)
|
|
532
|
+
return True
|
|
533
|
+
else:
|
|
534
|
+
logging.error("Data type to send on Websocket is invalid.")
|
|
535
|
+
return False
|
|
491
536
|
except Exception as ex:
|
|
492
537
|
logging.error(str(ex))
|
|
493
538
|
|
|
@@ -519,7 +564,8 @@ class InoDriveWS(object):
|
|
|
519
564
|
# =====================================================================================================
|
|
520
565
|
for token, props in self._msg_queue.items():
|
|
521
566
|
if props and type(props) is dict:
|
|
522
|
-
|
|
567
|
+
timeout = props['timeout'] if props['timeout'] is not None else self._request_timeout
|
|
568
|
+
if (ws_time - props['time']) >= timeout:
|
|
523
569
|
props['state'] = "timeout"
|
|
524
570
|
expire_list.append(token)
|
|
525
571
|
|
|
@@ -535,7 +581,7 @@ class InoDriveWS(object):
|
|
|
535
581
|
time_delta = int(time.time()) - self._last_request_time
|
|
536
582
|
if time_delta >= self._keep_alive_timeout:
|
|
537
583
|
try:
|
|
538
|
-
self.request(Utils.get_tlv(CK.NOP), blocking
|
|
584
|
+
self.request(Utils.get_tlv(CK.NOP), {'blocking': False})
|
|
539
585
|
logging.debug(f"Keep alive: {self._target_url}")
|
|
540
586
|
except Exception as ex:
|
|
541
587
|
logging.error(str(ex))
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: CK-InoDrive-API
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.2
|
|
4
4
|
Summary: InoDrive API Library
|
|
5
5
|
Home-page: https://cardinalkinetic.com
|
|
6
6
|
Author: Cardinal Kinetic
|
|
@@ -15,12 +15,26 @@ Classifier: Topic :: Scientific/Engineering
|
|
|
15
15
|
Classifier: Programming Language :: Python :: 3
|
|
16
16
|
Classifier: Programming Language :: Python :: 3.10
|
|
17
17
|
Classifier: Programming Language :: Python :: 3.12
|
|
18
|
+
Classifier: Programming Language :: Python :: 3.14
|
|
18
19
|
Description-Content-Type: text/markdown
|
|
19
20
|
License-File: LICENSE.txt
|
|
20
21
|
License-File: README.txt
|
|
21
|
-
Requires-Dist: websocket-client==1.
|
|
22
|
+
Requires-Dist: websocket-client==1.9.0
|
|
22
23
|
Requires-Dist: ifaddr==0.2.0
|
|
23
|
-
Requires-Dist: msgpack==1.1.
|
|
24
|
+
Requires-Dist: msgpack==1.1.2
|
|
25
|
+
Requires-Dist: getmac==0.9.5
|
|
26
|
+
Dynamic: author
|
|
27
|
+
Dynamic: author-email
|
|
28
|
+
Dynamic: classifier
|
|
29
|
+
Dynamic: description
|
|
30
|
+
Dynamic: description-content-type
|
|
31
|
+
Dynamic: home-page
|
|
32
|
+
Dynamic: keywords
|
|
33
|
+
Dynamic: license
|
|
34
|
+
Dynamic: license-file
|
|
35
|
+
Dynamic: project-url
|
|
36
|
+
Dynamic: requires-dist
|
|
37
|
+
Dynamic: summary
|
|
24
38
|
|
|
25
39
|
#### **Installation**
|
|
26
40
|
|
|
@@ -19,47 +19,49 @@ of the license associated with each component.
|
|
|
19
19
|
SECTION 1: Apache License, V2.0
|
|
20
20
|
|
|
21
21
|
>>> bleach-5.0.1
|
|
22
|
-
>>>
|
|
23
|
-
>>> msgpack-1.1.
|
|
22
|
+
>>> id-1.6.1
|
|
23
|
+
>>> msgpack-1.1.2
|
|
24
|
+
>>> packaging-26.2
|
|
24
25
|
>>> readme-renderer-44.0
|
|
25
|
-
>>> requests-2.
|
|
26
|
+
>>> requests-2.34.2
|
|
26
27
|
>>> requests-toolbelt-1.0.0
|
|
27
28
|
>>> rfc3986-2.0.0
|
|
28
|
-
>>> twine-
|
|
29
|
-
>>> websocket-client-1.
|
|
29
|
+
>>> twine-6.2.0
|
|
30
|
+
>>> websocket-client-1.9.0
|
|
30
31
|
|
|
31
32
|
SECTION 2: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
|
|
32
33
|
|
|
33
34
|
>>> blinker-1.7.0
|
|
34
|
-
>>> charset-normalizer-3.
|
|
35
|
+
>>> charset-normalizer-3.4.7
|
|
35
36
|
>>> click-8.1.7
|
|
36
37
|
>>> colorama-0.4.6
|
|
37
38
|
>>> commonmark-0.9.1
|
|
38
|
-
>>> docutils-0.
|
|
39
|
+
>>> docutils-0.23
|
|
39
40
|
>>> flask-3.0.0
|
|
41
|
+
>>> getmac-0.9.5
|
|
40
42
|
>>> greenlet-3.0.1
|
|
41
|
-
>>> idna-3.
|
|
43
|
+
>>> idna-3.17
|
|
42
44
|
>>> ifaddr-0.2.0
|
|
43
45
|
>>> itsdangerous-2.1.2
|
|
44
46
|
>>> jaraco.classes-3.4.0
|
|
45
|
-
>>> jaraco.context-6.
|
|
46
|
-
>>> jaraco.functools-4.0
|
|
47
|
+
>>> jaraco.context-6.1.2
|
|
48
|
+
>>> jaraco.functools-4.5.0
|
|
47
49
|
>>> jinja2-3.1.2
|
|
48
|
-
>>> keyring-25.
|
|
49
|
-
>>> markdown-it-py-
|
|
50
|
+
>>> keyring-25.7.0
|
|
51
|
+
>>> markdown-it-py-4.2.0
|
|
50
52
|
>>> markupsafe-2.1.3
|
|
51
53
|
>>> mdurl-0.1.2
|
|
52
|
-
>>> more-itertools-
|
|
53
|
-
>>> nh3-0.
|
|
54
|
+
>>> more-itertools-11.1.0
|
|
55
|
+
>>> nh3-0.3.5
|
|
54
56
|
>>> pkginfo-1.10.0
|
|
55
57
|
>>> pygments-2.18.0
|
|
56
58
|
>>> pycryptodome-3.19.0
|
|
57
59
|
>>> pywin32-ctypes-0.2.3
|
|
58
|
-
>>> rich-
|
|
59
|
-
>>> setuptools-
|
|
60
|
+
>>> rich-15.0.0
|
|
61
|
+
>>> setuptools-82.0.1
|
|
60
62
|
>>> six-1.16.0
|
|
61
63
|
>>> sqlalchemy-2.0.23
|
|
62
|
-
>>> urllib3-2.
|
|
64
|
+
>>> urllib3-2.7.0
|
|
63
65
|
>>> webencodings-0.5.1
|
|
64
66
|
>>> werkzeug-3.0.1
|
|
65
67
|
>>> zipp-3.21.0
|
|
@@ -70,10 +72,11 @@ SECTION 3: GNU General Public License, V2.0
|
|
|
70
72
|
|
|
71
73
|
SECTION 4: Mozilla Public License, V2.0
|
|
72
74
|
|
|
73
|
-
>>> certifi-
|
|
75
|
+
>>> certifi-2026.5.20
|
|
74
76
|
|
|
75
77
|
SECTION 5: Python License, V2.0
|
|
76
78
|
|
|
79
|
+
>>> base64
|
|
77
80
|
>>> ipaddress-1.0
|
|
78
81
|
>>> json-2.0.9
|
|
79
82
|
>>> logging-0.5.1.2
|
|
@@ -91,7 +94,6 @@ SECTION 5: Python License, V2.0
|
|
|
91
94
|
>>> uuid
|
|
92
95
|
>>> weakref
|
|
93
96
|
|
|
94
|
-
|
|
95
97
|
=============== SECTION 1. Apache License, V2.0 ===============
|
|
96
98
|
|
|
97
99
|
|
|
@@ -110,8 +112,24 @@ Copyright (c) 2014-2017, Mozilla Foundation
|
|
|
110
112
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
111
113
|
See the License for the specific language governing permissions and
|
|
112
114
|
limitations under the License.
|
|
115
|
+
|
|
116
|
+
>>> id-1.6.1
|
|
117
|
+
|
|
118
|
+
Copyright 2022 The Sigstore Authors.
|
|
119
|
+
|
|
120
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
121
|
+
you may not use this file except in compliance with the License.
|
|
122
|
+
You may obtain a copy of the License at
|
|
123
|
+
|
|
124
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
125
|
+
|
|
126
|
+
Unless required by applicable law or agreed to in writing, software
|
|
127
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
128
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
129
|
+
See the License for the specific language governing permissions and
|
|
130
|
+
limitations under the License.
|
|
113
131
|
|
|
114
|
-
>>> msgpack-1.1.
|
|
132
|
+
>>> msgpack-1.1.2
|
|
115
133
|
|
|
116
134
|
Found in: msgpack-python/COPYING
|
|
117
135
|
|
|
@@ -128,7 +146,13 @@ Copyright (C) 2008-2011 INADA Naoki <songofacandy@gmail.com>
|
|
|
128
146
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
129
147
|
See the License for the specific language governing permissions and
|
|
130
148
|
limitations under the License.
|
|
149
|
+
|
|
150
|
+
>>> packaging-26.2
|
|
131
151
|
|
|
152
|
+
This software is made available under the terms of *either* of the licenses
|
|
153
|
+
found in LICENSE.APACHE or LICENSE.BSD. Contributions to this software is made
|
|
154
|
+
under the terms of *both* these licenses.
|
|
155
|
+
|
|
132
156
|
>>> requests-toolbelt-1.0.0
|
|
133
157
|
|
|
134
158
|
Copyright 2014 Ian Cordasco, Cory Benfield
|
|
@@ -161,11 +185,11 @@ Copyright 2014 Ian Cordasco, Rackspace
|
|
|
161
185
|
See the License for the specific language governing permissions and
|
|
162
186
|
limitations under the License.
|
|
163
187
|
|
|
164
|
-
>>>
|
|
188
|
+
>>> packaging-26.2
|
|
165
189
|
>>> readme-renderer-44.0
|
|
166
|
-
>>> requests-2.
|
|
167
|
-
>>> twine-
|
|
168
|
-
>>> websocket-client-1.
|
|
190
|
+
>>> requests-2.34.2
|
|
191
|
+
>>> twine-6.2.0
|
|
192
|
+
>>> websocket-client-1.9.0
|
|
169
193
|
|
|
170
194
|
Apache License
|
|
171
195
|
Version 2.0, January 2004
|
|
@@ -369,7 +393,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
|
369
393
|
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
370
394
|
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
371
395
|
|
|
372
|
-
>>> charset-normalizer-3.4.
|
|
396
|
+
>>> charset-normalizer-3.4.7
|
|
373
397
|
|
|
374
398
|
MIT License
|
|
375
399
|
|
|
@@ -489,7 +513,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
489
513
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
490
514
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
491
515
|
|
|
492
|
-
>>> docutils-0.
|
|
516
|
+
>>> docutils-0.23
|
|
493
517
|
|
|
494
518
|
.. include:: docs/header0.txt
|
|
495
519
|
|
|
@@ -682,6 +706,30 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
|
682
706
|
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
683
707
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
684
708
|
|
|
709
|
+
>>> getmac-0.9.5
|
|
710
|
+
|
|
711
|
+
MIT License
|
|
712
|
+
|
|
713
|
+
Copyright (c) 2019 Christopher Goes
|
|
714
|
+
|
|
715
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
716
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
717
|
+
in the Software without restriction, including without limitation the rights
|
|
718
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
719
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
720
|
+
furnished to do so, subject to the following conditions:
|
|
721
|
+
|
|
722
|
+
The above copyright notice and this permission notice shall be included in all
|
|
723
|
+
copies or substantial portions of the Software.
|
|
724
|
+
|
|
725
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
726
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
727
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
728
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
729
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
730
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
731
|
+
SOFTWARE.
|
|
732
|
+
|
|
685
733
|
>>> greenlet-3.0.1
|
|
686
734
|
|
|
687
735
|
The following files are derived from Stackless Python and are subject to the
|
|
@@ -715,7 +763,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
715
763
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
716
764
|
THE SOFTWARE.
|
|
717
765
|
|
|
718
|
-
>>> idna-3.
|
|
766
|
+
>>> idna-3.17
|
|
719
767
|
|
|
720
768
|
BSD 3-Clause License
|
|
721
769
|
|
|
@@ -835,7 +883,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
|
835
883
|
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
836
884
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
837
885
|
|
|
838
|
-
>>> markdown-it-py-
|
|
886
|
+
>>> markdown-it-py-4.2.0
|
|
839
887
|
|
|
840
888
|
MIT License
|
|
841
889
|
|
|
@@ -939,7 +987,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
939
987
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
940
988
|
IN THE SOFTWARE.
|
|
941
989
|
|
|
942
|
-
>>> more-itertools-
|
|
990
|
+
>>> more-itertools-11.1.0
|
|
943
991
|
|
|
944
992
|
Copyright (c) 2012 Erik Rose
|
|
945
993
|
|
|
@@ -961,7 +1009,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
961
1009
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
962
1010
|
SOFTWARE.
|
|
963
1011
|
|
|
964
|
-
>>> nh3-0.
|
|
1012
|
+
>>> nh3-0.3.5
|
|
965
1013
|
|
|
966
1014
|
The MIT License (MIT)
|
|
967
1015
|
|
|
@@ -985,6 +1033,32 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
985
1033
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
986
1034
|
SOFTWARE.
|
|
987
1035
|
|
|
1036
|
+
>>> packaging-26.2
|
|
1037
|
+
|
|
1038
|
+
Copyright (c) Donald Stufft and individual contributors.
|
|
1039
|
+
All rights reserved.
|
|
1040
|
+
|
|
1041
|
+
Redistribution and use in source and binary forms, with or without
|
|
1042
|
+
modification, are permitted provided that the following conditions are met:
|
|
1043
|
+
|
|
1044
|
+
1. Redistributions of source code must retain the above copyright notice,
|
|
1045
|
+
this list of conditions and the following disclaimer.
|
|
1046
|
+
|
|
1047
|
+
2. Redistributions in binary form must reproduce the above copyright
|
|
1048
|
+
notice, this list of conditions and the following disclaimer in the
|
|
1049
|
+
documentation and/or other materials provided with the distribution.
|
|
1050
|
+
|
|
1051
|
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
1052
|
+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
1053
|
+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
1054
|
+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
1055
|
+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
1056
|
+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
1057
|
+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
1058
|
+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
1059
|
+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
1060
|
+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
1061
|
+
|
|
988
1062
|
>>> pkginfo-1.10.0
|
|
989
1063
|
|
|
990
1064
|
MIT License
|
|
@@ -1132,7 +1206,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
1132
1206
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
1133
1207
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
1134
1208
|
|
|
1135
|
-
>>> rich-
|
|
1209
|
+
>>> rich-15.0.0
|
|
1136
1210
|
|
|
1137
1211
|
Copyright (c) 2020 Will McGugan
|
|
1138
1212
|
|
|
@@ -1287,10 +1361,10 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
|
1287
1361
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
1288
1362
|
|
|
1289
1363
|
>>> jaraco.classes-3.4.0
|
|
1290
|
-
>>> jaraco.context-6.
|
|
1291
|
-
>>> jaraco.functools-4.0
|
|
1292
|
-
>>> keyring-25.
|
|
1293
|
-
>>> setuptools-
|
|
1364
|
+
>>> jaraco.context-6.1.2
|
|
1365
|
+
>>> jaraco.functools-4.5.0
|
|
1366
|
+
>>> keyring-25.7.0
|
|
1367
|
+
>>> setuptools-82.0.1
|
|
1294
1368
|
>>> zipp-3.21.0
|
|
1295
1369
|
|
|
1296
1370
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
@@ -1661,7 +1735,7 @@ Public License instead of this License.
|
|
|
1661
1735
|
=============== SECTION 4. Mozilla Public License, V2.0 ===============
|
|
1662
1736
|
|
|
1663
1737
|
|
|
1664
|
-
>>> certifi-
|
|
1738
|
+
>>> certifi-2026.5.20
|
|
1665
1739
|
|
|
1666
1740
|
This package contains a modified version of ca-bundle.crt:
|
|
1667
1741
|
|
|
@@ -13,9 +13,10 @@ except FileNotFoundError:
|
|
|
13
13
|
|
|
14
14
|
# specify requirements of your package here
|
|
15
15
|
REQUIREMENTS = [
|
|
16
|
-
'websocket-client==1.
|
|
16
|
+
'websocket-client==1.9.0',
|
|
17
17
|
'ifaddr==0.2.0',
|
|
18
|
-
'msgpack==1.1.
|
|
18
|
+
'msgpack==1.1.2',
|
|
19
|
+
'getmac==0.9.5'
|
|
19
20
|
]
|
|
20
21
|
|
|
21
22
|
# some more details
|
|
@@ -27,6 +28,7 @@ CLASSIFIERS = [
|
|
|
27
28
|
'Programming Language :: Python :: 3',
|
|
28
29
|
'Programming Language :: Python :: 3.10',
|
|
29
30
|
'Programming Language :: Python :: 3.12',
|
|
31
|
+
'Programming Language :: Python :: 3.14',
|
|
30
32
|
]
|
|
31
33
|
|
|
32
34
|
# reading version number from file
|
|
File without changes
|
{ck_inodrive_api-1.0.1 → ck_inodrive_api-1.0.2}/CK_InoDrive_API.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|