From a563bffec59a111cffa049987f0aa9881eb8a575 Mon Sep 17 00:00:00 2001 From: saces Date: Thu, 12 Mar 2026 10:00:46 +0100 Subject: [PATCH] version the cli api part --- libmxclient/mxclientlib.go | 24 +++++++++++----------- pygomx/build_ffi.py | 12 +++++------ smal/src/pymxutils/mxutils/accountinfo.py | 2 +- smal/src/pymxutils/mxutils/clearaccount.py | 2 +- smal/src/pymxutils/mxutils/discoverhs.py | 2 +- smal/src/pymxutils/mxutils/mktoken.py | 2 +- smal/src/pymxutils/mxutils/serverinfo.py | 4 ++-- smal/src/pymxutils/mxutils/whoami.py | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libmxclient/mxclientlib.go b/libmxclient/mxclientlib.go index e66dc40..9dbc72e 100644 --- a/libmxclient/mxclientlib.go +++ b/libmxclient/mxclientlib.go @@ -121,8 +121,8 @@ func FreeCString(s *C.char) { cli tools */ -//export cli_discoverhs -func cli_discoverhs(id *C.char) *C.char { +//export cliv0_discoverhs +func cliv0_discoverhs(id *C.char) *C.char { mxid := C.GoString(id) result, err := mxutils.DiscoverHS(mxid) if err != nil { @@ -131,40 +131,40 @@ func cli_discoverhs(id *C.char) *C.char { return C.CString(result) } -//export cli_mkmxtoken -func cli_mkmxtoken(id *C.char, pw *C.char) *C.char { +//export cliv0_mkmxtoken +func cliv0_mkmxtoken(id *C.char, pw *C.char) *C.char { mxid := C.GoString(id) mxpw := C.GoString(pw) result := mxutils.MkToken(mxid, mxpw) return C.CString(result) } -//export cli_whoami -func cli_whoami(hs *C.char, tk *C.char) *C.char { +//export cliv0_whoami +func cliv0_whoami(hs *C.char, tk *C.char) *C.char { _hs := C.GoString(hs) _tk := C.GoString(tk) result := mxutils.Whoami(_hs, _tk) return C.CString(result) } -//export cli_accountinfo -func cli_accountinfo(hs *C.char, tk *C.char) *C.char { +//export cliv0_accountinfo +func cliv0_accountinfo(hs *C.char, tk *C.char) *C.char { _hs := C.GoString(hs) _tk := C.GoString(tk) result := mxutils.AccountInfo(_hs, _tk) return C.CString(result) } -//export cli_clearaccount -func cli_clearaccount(hs *C.char, tk *C.char) *C.char { +//export cliv0_clearaccount +func cliv0_clearaccount(hs *C.char, tk *C.char) *C.char { _hs := C.GoString(hs) _tk := C.GoString(tk) result := mxutils.ClearAccount(_hs, _tk) return C.CString(result) } -//export cli_serverinfo -func cli_serverinfo(url *C.char) *C.char { +//export cliv0_serverinfo +func cliv0_serverinfo(url *C.char) *C.char { _url := C.GoString(url) result := mxutils.ServerInfo(_url) return C.CString(result) diff --git a/pygomx/build_ffi.py b/pygomx/build_ffi.py index 8c5863a..bc1cd7a 100644 --- a/pygomx/build_ffi.py +++ b/pygomx/build_ffi.py @@ -35,12 +35,12 @@ ffibuilder.cdef( typedef void (*on_message_handler_ptr) (char*, void*); typedef void (*on_sys_handler_ptr) (char*, void*); extern void FreeCString(char* s); - extern char* cli_discoverhs(char* mxid); - extern char* cli_mkmxtoken(char* mxid, char* pw); - extern char* cli_whoami(char* hs, char* accessToken); - extern char* cli_accountinfo(char* hs, char* accessToken); - extern char* cli_clearaccount(char* hs, char* accessToken); - extern char* cli_serverinfo(char* url); + extern char* cliv0_discoverhs(char* mxid); + extern char* cliv0_mkmxtoken(char* mxid, char* pw); + extern char* cliv0_whoami(char* hs, char* accessToken); + extern char* cliv0_accountinfo(char* hs, char* accessToken); + extern char* cliv0_clearaccount(char* hs, char* accessToken); + extern char* cliv0_serverinfo(char* url); extern int apiv0_initialize(); extern int apiv0_deinitialize(); extern char* apiv0_discover(char* mxid); diff --git a/smal/src/pymxutils/mxutils/accountinfo.py b/smal/src/pymxutils/mxutils/accountinfo.py index 22b3504..97ec46f 100644 --- a/smal/src/pymxutils/mxutils/accountinfo.py +++ b/smal/src/pymxutils/mxutils/accountinfo.py @@ -12,7 +12,7 @@ def accountinfo(): url = sys.argv[1].encode(encoding="utf-8") tk = sys.argv[2].encode(encoding="utf-8") - r = lib.cli_accountinfo(url, tk) + r = lib.cliv0_accountinfo(url, tk) result = ffi.string(r) lib.FreeCString(r) print(result) diff --git a/smal/src/pymxutils/mxutils/clearaccount.py b/smal/src/pymxutils/mxutils/clearaccount.py index 0571695..63a8626 100644 --- a/smal/src/pymxutils/mxutils/clearaccount.py +++ b/smal/src/pymxutils/mxutils/clearaccount.py @@ -12,7 +12,7 @@ def clearaccount(): url = sys.argv[1].encode(encoding="utf-8") tk = sys.argv[2].encode(encoding="utf-8") - r = lib.cli_clearaccount(url, tk) + r = lib.cliv0_clearaccount(url, tk) result = ffi.string(r) lib.FreeCString(r) print(result) diff --git a/smal/src/pymxutils/mxutils/discoverhs.py b/smal/src/pymxutils/mxutils/discoverhs.py index e9af657..275b0b0 100644 --- a/smal/src/pymxutils/mxutils/discoverhs.py +++ b/smal/src/pymxutils/mxutils/discoverhs.py @@ -15,7 +15,7 @@ def discoverhs(domain, show_json): """Attempts to discover the homeserver from the given string""" mxid = domain.encode(encoding="utf-8") - r = lib.cli_discoverhs(mxid) + r = lib.cliv0_discoverhs(mxid) result = ffi.string(r).decode("utf-8") lib.FreeCString(r) if result.startswith("ERR:"): diff --git a/smal/src/pymxutils/mxutils/mktoken.py b/smal/src/pymxutils/mxutils/mktoken.py index f6fe40a..7e8afe0 100644 --- a/smal/src/pymxutils/mxutils/mktoken.py +++ b/smal/src/pymxutils/mxutils/mktoken.py @@ -12,7 +12,7 @@ def mktoken(): mxid = sys.argv[1].encode(encoding="utf-8") pw = sys.argv[2].encode(encoding="utf-8") - r = lib.cli_mkmxtoken(mxid, pw) + r = lib.cliv0_mkmxtoken(mxid, pw) result = ffi.string(r) lib.FreeCString(r) print(result) diff --git a/smal/src/pymxutils/mxutils/serverinfo.py b/smal/src/pymxutils/mxutils/serverinfo.py index 82eaec8..bce9aec 100644 --- a/smal/src/pymxutils/mxutils/serverinfo.py +++ b/smal/src/pymxutils/mxutils/serverinfo.py @@ -11,7 +11,7 @@ def serverinfo(): mxdomain = sys.argv[1].encode(encoding="utf-8") - r = lib.cli_serverinfo(mxdomain) - result = ffi.string(r) + r = lib.cliv0_serverinfo(mxdomain) + result = ffi.string(r).decode("utf-8") lib.FreeCString(r) print(result) diff --git a/smal/src/pymxutils/mxutils/whoami.py b/smal/src/pymxutils/mxutils/whoami.py index 3fa6cfa..6747828 100644 --- a/smal/src/pymxutils/mxutils/whoami.py +++ b/smal/src/pymxutils/mxutils/whoami.py @@ -12,7 +12,7 @@ def whoami(): url = sys.argv[1].encode(encoding="utf-8") tk = sys.argv[2].encode(encoding="utf-8") - r = lib.cli_whoami(url, tk) + r = lib.cliv0_whoami(url, tk) result = ffi.string(r) lib.FreeCString(r) print(result)