mirror of
https://github.com/pfalstad/circuitjs1.git
synced 2026-03-03 23:24:03 +01:00
961292cce8
Made the result of the SVG data to be returned asynchronously as a event. This makes it possible to significantly clean up the whole SVG initialization code and not expose these internals to the outside. We do not need any polling anymore after this change.
98 lines
2.4 KiB
Python
98 lines
2.4 KiB
Python
import asyncio
|
|
import os
|
|
import urllib.parse
|
|
import aiohttp.web
|
|
import sys
|
|
|
|
config = {
|
|
"host": "127.0.0.1",
|
|
"port": 8080,
|
|
"circuitws_uri": "http://127.0.0.1:8123/circuitws.html",
|
|
}
|
|
|
|
demo_circuit = """\
|
|
$ 1 0.000005 10.20027730826997 50 5 50 5e-11
|
|
w 192 272 208 304 0
|
|
w 208 304 272 304 0
|
|
w 272 304 288 272 0
|
|
w 240 256 240 272 0
|
|
z 208 224 272 224 2 default-zener
|
|
"""
|
|
|
|
|
|
async def websocket_handler(request):
|
|
msg_id = 0
|
|
print("Websocket connected.")
|
|
ws = aiohttp.web.WebSocketResponse()
|
|
await ws.prepare(request)
|
|
|
|
while True:
|
|
cmd = input("Cmd: ")
|
|
|
|
wait_for_event = None
|
|
match cmd.lower():
|
|
case "?":
|
|
msg = { "cmd": "status" }
|
|
case "start":
|
|
msg = { "cmd": "set_running", "state": True }
|
|
case "stop":
|
|
msg = { "cmd": "set_running", "state": False }
|
|
case "reload":
|
|
msg = { "cmd": "reload", "args": { "IECGates": False, "whiteBackground": True } }
|
|
wait_for_event = "reload_complete"
|
|
case "setts":
|
|
msg = { "cmd": "set_timestep", "timestep": 1e-3 }
|
|
case "gnv":
|
|
msg = { "cmd": "get_node_voltage", "nodes": [ "D7", "D6" ] }
|
|
case "list":
|
|
msg = { "cmd": "get_elements" }
|
|
case "sev1":
|
|
msg = { "cmd": "set_ext_voltage", "voltages": { "extsin": 1 } }
|
|
case "sev2":
|
|
msg = { "cmd": "set_ext_voltage", "voltages": { "extsin": 2 } }
|
|
case "svg":
|
|
msg = { "cmd": "get_svg" }
|
|
wait_for_event = "svg_rendered"
|
|
case "export":
|
|
msg = { "cmd": "circuit_export" }
|
|
case "import":
|
|
msg = { "cmd": "circuit_import", "circuit": demo_circuit }
|
|
case "q":
|
|
sys.exit(0)
|
|
break
|
|
case "":
|
|
continue
|
|
case _:
|
|
print("Not understood. Commands: ?, start, stop, setts, gnv, list, sev1, sev2, svg, export, import, q")
|
|
continue
|
|
|
|
msg_id += 1
|
|
msg["msgid"] = msg_id
|
|
await ws.send_json(msg)
|
|
while True:
|
|
response = await ws.receive_json()
|
|
if (wait_for_event is None) and (response.get("msgid") == msg_id):
|
|
break
|
|
elif (wait_for_event is not None) and (response["type"] == "event") and (response["code"] == wait_for_event):
|
|
break
|
|
print("Ignored:", response)
|
|
print(response)
|
|
|
|
return ws
|
|
|
|
|
|
def main():
|
|
my_uri = f"ws://{config['host']}:{config['port']}/ws"
|
|
query = {
|
|
"ws": my_uri,
|
|
}
|
|
print(f"Point your browser to: {config['circuitws_uri']}?{urllib.parse.urlencode(query)}")
|
|
|
|
app = aiohttp.web.Application()
|
|
app.router.add_route("GET", "/ws", websocket_handler)
|
|
aiohttp.web.run_app(app, host = config["host"], port = config["port"])
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|