Refined header code, added reverse recursive action

core/apirequest/headers.py

@@ -0,0 +1,21 @@
+import os
+def buildHeaders(definition, request, outputs, resolved):
+    headers = {}
+
+    for header_name, header_value in definition.headers.items():
+        value = header_value
+
+        if isinstance(value, dict) and "output" in header_value:
+            value = outputs[value["output"]]
+
+        if isinstance(value, dict) and "os" in header_value:
+            value = os.environ.get(value["os"])
+
+        if isinstance(header_value, dict) and "prefix" in header_value:
+            value = header_value["prefix"] + value
+
+        headers[header_name] = value
+
+        request["headers"] = headers
+
+    return headers

core/apirequest/request.py

@@ -1,6 +1,7 @@
 from .object import buildObject
 from .path import buildPath
-import os
+from .headers import buildHeaders
+#import os
 
 def buildRequest(definition, outputs, resolved):
     path = buildPath(definition.path, outputs, resolved)
@@ -14,22 +15,6 @@ def buildRequest(definition, outputs, resolved):
         request["object"] = buildObject(definition.keys, outputs, resolved)
 
     if hasattr(definition, "headers"):
-        headers = {}
+        request["headers"] = buildHeaders(definition, request, outputs, resolved)
-
-        for header_name, header_value in definition.headers.items():
-            value = header_value
-
-            if isinstance(value, dict) and "output" in header_value:
-                value = outputs[value["output"]]
-            if isinstance(value, dict) and "os" in header_value:
-                #value = os.environ[definition.headers[header_name]["os"]]
-                value = os.environ["AS_TOKEN"]
-
-            if isinstance(header_value, dict) and "prefix" in header_value:
-                value = header_value["prefix"] + value
-
-            headers[header_name] = value
-
-        request["headers"] = headers
 
     return request, outputs

core/execution/action/action.py

@@ -6,7 +6,13 @@ def buildAction (action, outputs):
     #outputs, resolved = buildPreRuntimeAttr(action, outputs)
 
     if hasattr(action, "recursive"):
-        for item in outputs[action.recursive["source"]]:
+        items = outputs[action.recursive["source"]]
+        reverse = action.recursive.get("reversed", False)
+        
+        if reverse:
+            items = reversed(items)
+            
+        for item in items:
             outputs[action.recursive["label"]] = item
             outputs, resolved = buildPreRuntimeAttr(action, outputs)
             response, outputs = executeRequest(action, outputs, resolved)

core/runtime/recursiveactions.py

@@ -0,0 +1,17 @@
+from core.execution.action.action import buildAction
+
+def recursiveSet(definition, outputs):
+    recursiveset = definition.recursiveset["actions"]
+    for item in outputs[definition.recursiveset["source"]]:
+        outputs[definition.recursiveset["outputlabel"]] = item
+        #outputs["recursive"] = item
+
+        for job in recursiveset:
+            outputs, response = buildAction(job, outputs)
+
+        print(outputs["profile"])
+        print(outputs["messages"])
+    return outputs
+
+from core.execution.action.action import buildAction
+

core/server/server.py

@@ -2,7 +2,7 @@ import socket
 import json
 import os
 import logging
-
+from http.server import HTTPServer, BaseHTTPRequestHandler
 from .dispatcher import dispatchRequest
 from .createresponse import buildResponse
 
@@ -16,18 +16,25 @@ def startServer():
     lifecycles = {}
     
     server.listen()
-    logging.info(f"Server listening on port {port}")
+    print(f"Server listening on port {port}")
     while True:
         connection, address = server.accept()
-        logging.info("Accepting connections")
+        print("Accepting connections")
+        connection.settimeout(30)
 
+        class RequestHandler(BaseHTTPRequestHandler):
+            def do_POST(self):
+                print("POST request received")
+            
+        try:
             while True:
                 data = connection.recv(4096)
                 
-            request = json.loads(data)
+                if not data:
+                    print("Client Disconnected")
+                    break
 
-    #        if not data:
+                request = json.loads(data)
-    #            break
 
                 thread, lifecycles, module, mode = dispatchRequest(request, lifecycles)
 
@@ -36,7 +43,13 @@ def startServer():
                 connection.sendall(
                     json.dumps(response).encode("utf-8"),
                 )
+        except json.decoder.JSONDecodeError as error:
+            print("Invalid JSON received", error)
+            print("Closing client connection")
+        except socket.timeout:
+            print("Client connection timed out")
 
+        finally:
             connection.close()
 
     #    server.close()

initialize.py

@@ -1,5 +1,5 @@
 from core.server.server import startServer
-import login
+#import login
 
 #login
 startServer()

plugins/rmass/actions/synapseassignspace.py

@@ -28,7 +28,7 @@ path = [
     {"resolved": "space_id"},
     "/state/m.space.child/",
     {"resolved": "room_id"},
-    "?user_id=@rmass_bridge_test:loxthelion.com"
+    "?user_id=@rmass_bridge:loxthelion.com"
 ]
 
 headers = {

plugins/rmass/actions/synapsecreatedmroom.py

@@ -22,7 +22,7 @@ keys = [
         "keytitle": "room_alias_name",
         "keyvalue": {
             "resolved": "sender",
-            "prefix": "rmass_dmtest_",
+            "prefix": "rmass_dm_",
         },
     },
     {

plugins/rmass/actions/synapsecreatespace.py

@@ -24,7 +24,7 @@ keys = [
         "keytitle": "room_alias_name",
         "keyvalue": {
             "resolved": "locationcode",
-            "prefix": "rmass_spacetest_",
+            "prefix": "rmass_space_",
         },
     },
     {
@@ -58,7 +58,7 @@ path = [
     #"https://loxthelion.com/_matrix/client/v3/createRoom?user_id=@rmass_",
     #{"resolved": "sender"},
     #":loxthelion.com",
-    "https://loxthelion.com/_matrix/client/v3/createRoom?user_id=@rmass_bridge_test:loxthelion.com"
+    "https://loxthelion.com/_matrix/client/v3/createRoom?user_id=@rmass_bridge:loxthelion.com"
 ]
 
 headers = {

plugins/rmass/actions/synapsegetroomid.py

@@ -13,7 +13,7 @@ resolve = {
 method = "GET"
 
 path = [
-    "https://loxthelion.com/_matrix/client/v3/directory/room/%23rmass_dmtest_",
+    "https://loxthelion.com/_matrix/client/v3/directory/room/%23rmass_dm_",
     {"resolved": "sender"},
     "%3Aloxthelion.com",
 ]

plugins/rmass/actions/synapsegetspaceid.py

@@ -14,7 +14,7 @@ resolve = {
 method = "GET"
 
 path = [
-    "https://loxthelion.com/_matrix/client/v3/directory/room/%23rmass_spacetest_",
+    "https://loxthelion.com/_matrix/client/v3/directory/room/%23rmass_space_",
     {"resolved": "locationcode"},
     "%3Aloxthelion.com",
 ]

plugins/rmass/actions/synapsepushmessages.py

@@ -8,6 +8,7 @@ showstatus = True
 
 recursive = {
     "source": "messages",
+    "reverse": True,
     "label": "messageitem",
 }
 

plugins/rmass/operations/__init__.py

@@ -1,2 +1,2 @@
-from . import login, checkavailable, setavailable, pullmessagelist
+from . import login, checkavailable, setavailable, synapsemessagepush
 

synapsemessagepush.py

@@ -3,5 +3,5 @@ from core.execution.operation import buildOperation
 
 
 
-outputs = buildOperation(rmass.operations.pullmessagelist)
+outputs = buildOperation(rmass.operations.synapsemessagepush)
 

testrooms.json

@@ -0,0 +1,30 @@
+[
+  "!GmcMNwFtjQUVLZsINr:loxthelion.com",
+  "!GseJOgedWIEZJIFBof:loxthelion.com",
+  "!MedbFMjfngnXiOCvBl:loxthelion.com",
+  "!OxUixFApFPCCQqmYlP:loxthelion.com",
+  "!PpAcegYZCeaCsTWmAD:loxthelion.com",
+  "!QzNDQOxuxLpZdfoMSa:loxthelion.com",
+  "!SayRxBpXfrMEliTZWu:loxthelion.com",
+  "!TMbTcUkRbqymtlIqae:loxthelion.com",
+  "!XdrVLrVDPilgcwBrii:loxthelion.com",
+  "!ZIzEHnfXDQMrKDvbsf:loxthelion.com",
+  "!ZlnjVMBsBIzTooxUzx:loxthelion.com",
+  "!ZqZXiCjJSxoNKbuYIK:loxthelion.com",
+  "!agmQlrIIzRhCmrLlKz:loxthelion.com",
+  "!bnOsYLzfYwCiOUNtMc:loxthelion.com",
+  "!eImaLbIbsJCdFQCDwW:loxthelion.com",
+  "!gVaGhwJIHMPYpBCnaa:loxthelion.com",
+  "!giaDjvrUjCSAxZByFv:loxthelion.com",
+  "!gzBIZtRPqrqrXhhKfi:loxthelion.com",
+  "!iNeouCdsHqUzrOOoVF:loxthelion.com",
+  "!joaKUuLwoKDGBzyJvR:loxthelion.com",
+  "!mmIXIlbfbQvlJGcOrl:loxthelion.com",
+  "!oOKonquvcMNGGggsZj:loxthelion.com",
+  "!uKNmAyAXuqbJHPNdCJ:loxthelion.com",
+  "!uoJdCOQaCdrVtkzhDs:loxthelion.com",
+  "!wUyFfHUHKfLMrJlkrz:loxthelion.com",
+  "!xkeHqlqEIfFQZfDzoe:loxthelion.com",
+  "!yoOHZCCbENBeWJEwgx:loxthelion.com",
+  "!zihaZFtKrzvvxHvVha:loxthelion.com"
+]

tokens.json

@@ -1 +1 @@
-{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIwMTYxNzYsIm5iZiI6MTc5MjAxNTk5Niwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjAxNjA1Nn0.x80ROCVbjmvc7D4FCbcFB7fWdvLL7Wm3TmBS8XN-lL-UyYGT1zGbmr_kDLpJ06I9-RtcKvkrX52cQKDHqfFplg", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ2MDgwNTYsIm5iZiI6MTc5MjAxNTk5NiwianRpIjoiLy9xblJvU3Voc3F2ZVRXUENURkRoRlVjRjhCTCsvV2hYZzJLVFErblN0az0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjAxNjA1Niwic3ViIjoiMjM4MzAyIn0.4nTN0v_hXVE2XwCIS5ZH6zGp1TE3F9aQbOEasiSFu-Nvc_1fT4MsrXL9nr1FGgo_5N6uSfbgYAOioa7fyzucJA"}
+{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIwMzI4ODYsIm5iZiI6MTc5MjAzMjcwNiwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjAzMjc2Nn0.ChWvtapeudX4p0aEXxxMB0FWjDbLSCqgzevyi8UlhXj34l397o70_Owtns60TGh4JbC2l4EBInTggujF3bYREg", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ2MjQ3NjYsIm5iZiI6MTc5MjAzMjcwNiwianRpIjoibzNZYXMrNU5YNkRSc3pSa05kOTBQa3BMMTJ5VXkwWWx6ZTVNUUZMbFovcz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjAzMjc2Niwic3ViIjoiMjM4MzAyIn0.tXWt8Jgc9jW006ZKSPMsueWNUNWaaenlkDc9-TphAkLDtWWRY5_2zz8Bdt8qgl_s0NJ_WDXnv6WwU5on054BZA"}