Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support openresty #25

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: support openresty #25

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
009504a
feat: support openresty
oowl Aug 7, 2022
aac3e30
Update kernel.py
oowl Aug 18, 2022
cb4c72a
use localhost listen
oowl Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 69 additions & 14 deletions ilua/kernel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,17 @@
stuff
"""

import asyncio
import json
import os
import re

from distutils.spawn import find_executable
import socket

import twisted

from ilua import websocket
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from . import websocket


if os.name == 'nt':
# pylint: disable=E0401
Expand All @@ -31,9 +37,15 @@
from .proto import InterpreterProtocol, OutputCapture
from .inspector import Inspector
from .version import __version__ as ilua_version
from twisted.internet import reactor

from autobahn.twisted.websocket import WebSocketClientFactory, \
WebSocketClientProtocol, \
create_client_agent

INTERPRETER_SCRIPT = os.path.join(os.path.dirname(__file__), "interp.lua")
LUA_PATH_EXTRA = os.path.join(os.path.dirname(__file__), "?.lua")
OPENRESTY_LUA_PATH_EXTRA = os.path.join(os.path.dirname(__file__), "openresty/?.lua")

_bold_red = lambda s: termcolor.colored(s, "red", attrs=['bold'])

Expand Down Expand Up @@ -86,22 +98,62 @@ def message_sink(stream, data):
"path?".format(
self.lua_interpreter))

# pylint: disable=no-member
if os.name == "nt":
self.lua_process = self.reactor.spawnProcess(proto, None,
[self.lua_interpreter,
INTERPRETER_SCRIPT],
None)
else:
if self.lua_interpreter == "openresty":
assert os.name != "nt", ("Could not support '{}', "
"is windows ".format(
self.lua_interpreter))
self.agent_port = 8081
while True:
s = socket.socket()
try:
s.connect(("127.0.0.1", self.agent_port))
self.agent_port += 1
continue
except socket.error:
break

config_data = ""
with open(os.path.dirname(__file__)+"/openresty/nginx.conf", "r") as file:
config_data = file.read()
config_data = config_data.replace("{PORT}", str(self.agent_port))
config_data = config_data.replace("{LUALIB}", OPENRESTY_LUA_PATH_EXTRA + ";")
with open("/tmp/nginx.conf", "w") as file:
file.write(config_data)
if not os.path.exists("/tmp/logs"):
os.makedirs("/tmp/logs")
self.lua_process = self.reactor.spawnProcess(proto,
self.lua_interpreter,
[self.lua_interpreter,
INTERPRETER_SCRIPT],
None)
self.lua_interpreter,
[self.lua_interpreter,
"-p", "/tmp", "-c", "nginx.conf", "-g", "daemon off;"],
None)

return
else:
# pylint: disable=no-member
if os.name == "nt":
self.lua_process = self.reactor.spawnProcess(proto, None,
[self.lua_interpreter,
INTERPRETER_SCRIPT],
None)
else:
self.lua_process = self.reactor.spawnProcess(proto,
self.lua_interpreter,
[self.lua_interpreter,
INTERPRETER_SCRIPT],
None)

@defer.inlineCallbacks
def do_startup(self):
self.proto = yield self.pipes.connect(
if self.lua_interpreter == "openresty":
self.agent = create_client_agent(reactor)
while True:
try:
self.proto = yield self.agent.open("ws://127.0.0.1:{}/ws".format(self.agent_port), options={},protocol_class=websocket.WSClientProtocol)
except twisted.internet.error.ConnectionRefusedError:
continue
break
else:
self.proto = yield self.pipes.connect(
protocol.Factory.forProtocol(InterpreterProtocol))

returned = yield self.proto.sendRequest({"type": "execute",
Expand Down Expand Up @@ -278,5 +330,8 @@ def do_interrupt(self):
self.log.warn("ILua does not support keyboard interrupts")

def do_shutdown(self):
self.pipes.loseConnection()
self.lua_process.signalProcess("KILL")
if self.lua_interpreter == "openresty":
self.lua_process.signalProcess("TERM")
else:
self.pipes.loseConnection()
self.lua_process.signalProcess("KILL")
Loading