mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-27 23:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add Lua compiler

Browse source 
Redbean Lua Server Pages may now be stored in the zip as byte code. This
can improve performance, since redbean currently doesn't cache byte code
but it might be more useful for anyone wanting to create a closed source
redbean. The .lua extension should be used for byte code files. Lua will
tell them apart based on a magic number at the start of the file.

This change also improves some Lua error reporting conditions. See #97
This commit is contained in:
Justine Tunney 2021-08-09 13:09:14 -07:00
parent b703eee96e
commit 3bfb7580c5
16 changed files with 864 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tool/net/demo/closedsource.lua Normal file
View file

@ -0,0 +1,2 @@
Write('This Lua Server Page is stored in ZIP\r\n')
Write('as compressed byte code, see luac.com and net.mk\r\n')

2
tool/net/demo/opensource.lua Normal file
View file

@ -0,0 +1,2 @@
Write('This Lua Server Page is stored in ZIP\r\n')
Write('as normal Lua code that is compressed\r\n')

4
tool/net/net.mk
View file

@ -133,6 +133,8 @@ o/$(MODE)/tool/net/redbean-demo.com: \
tool/net/demo/seekable.txt \
tool/net/demo/virtualbean.html \
tool/net/demo/printpayload.lua \
tool/net/demo/opensource.lua \
o/$(MODE)/tool/net/demo/closedsource.lua \
tool/net/demo/fetch.lua \
tool/net/redbean.c \
net/http/parsehttpmessage.c \
@ -149,7 +151,7 @@ o/$(MODE)/tool/net/redbean-demo.com: \
@(cd o/$(MODE)/tool/net && ../../host/third_party/infozip/zip.com -qr redbean-demo.com .lua)
@$(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -qj $@ tool/net/demo/hello.lua tool/net/demo/sql.lua
@echo "<-- check out this lua server page" | $(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -cqj $@ tool/net/demo/redbean.lua
@$(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -qj $@ tool/net/demo/404.html tool/net/favicon.ico tool/net/redbean.png tool/net/demo/redbean-form.lua tool/net/demo/redbean-xhr.lua tool/net/demo/printpayload.lua tool/net/demo/fetch.lua
@$(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -qj $@ tool/net/demo/404.html tool/net/favicon.ico tool/net/redbean.png tool/net/demo/redbean-form.lua tool/net/demo/redbean-xhr.lua tool/net/demo/printpayload.lua tool/net/demo/fetch.lua o/$(MODE)/tool/net/demo/closedsource.lua tool/net/demo/opensource.lua
@echo Uncompressed for HTTP Range requests | $(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -cqj0 $@ tool/net/demo/seekable.txt
@$(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -q $@ tool/net/ tool/net/demo/ tool/net/demo/index.html tool/net/demo/redbean.css tool/net/redbean.c net/http/parsehttpmessage.c net/http/parseurl.c net/http/encodeurl.c test/net/http/parsehttpmessage_test.c test/net/http/parseurl_test.c
@$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/virtualbean.justine.lol/

50
tool/net/redbean.c
View file

@ -3146,14 +3146,20 @@ static char *LuaOnHttpRequest(void) {
static char *ServeLua(struct Asset *a, const char *s, size_t n) {
char *code;
size_t codelen;
LockInc(&shared->c.dynamicrequests);
effectivepath.p = s;
effectivepath.n = n;
if ((code = FreeLater(LoadAsset(a, NULL)))) {
if (luaL_dostring(L, code) == LUA_OK) {
if ((code = FreeLater(LoadAsset(a, &codelen)))) {
if (!luaL_loadbufferx(L, code, codelen, FreeLater(strndup(s, n)), 0) &&
!lua_pcall(L, 0, LUA_MULTRET, 0)) {
return CommitOutput(GetLuaResponse());
} else {
WARNF("%s", lua_tostring(L, -1));
WARNF("failed to run lua code %s", lua_tostring(L, -1));
/*
* TODO: Print backtrace, and then serve Django-like error page if
* and only if IsLoopbackIp(GetRemoteAddr())
*/
lua_pop(L, 1);
}
}
@ -4999,21 +5005,27 @@ static int LuaHidePath(lua_State *L) {
static int LuaLog(lua_State *L) {
int level;
char *module;
lua_Debug ar;
const char *msg;
const char *msg, *module;
level = luaL_checkinteger(L, 1);
if (LOGGABLE(level)) {
/*
* TODO: There needs to be some reasonable way to get the source
* filename and line number.
*/
msg = luaL_checkstring(L, 2);
lua_getstack(L, 0, &ar);
lua_getinfo(L, "nSl", &ar);
if (!strcmp(ar.name, "main")) {
module = strndup(effectivepath.p, effectivepath.n);
flogf(level, module, ar.currentline, NULL, "%s", msg);
free(module);
if (ar.source) {
module = ar.source;
} else {
module = gc(strndup(effectivepath.p, effectivepath.n));
}
} else {
flogf(level, ar.name, ar.currentline, NULL, "%s", msg);
module = ar.name;
}
flogf(level, module, ar.currentline, NULL, "%s", msg);
}
return 0;
}
@ -5298,21 +5310,25 @@ static int LuaRe(lua_State *L) {
}
static bool LuaRun(const char *path, bool mandatory) {
size_t pathlen;
struct Asset *a;
const char *code;
size_t pathlen, codelen;
pathlen = strlen(path);
if ((a = GetAsset(path, pathlen))) {
if ((code = LoadAsset(a, NULL))) {
if ((code = LoadAsset(a, &codelen))) {
effectivepath.p = path;
effectivepath.n = pathlen;
DEBUGF("LuaRun(%`'s)", path);
if (luaL_dostring(L, code) != LUA_OK) {
if (mandatory) {
FATALF("%s %s", path, lua_tostring(L, -1));
} else {
WARNF("%s %s", path, lua_tostring(L, -1));
}
if (luaL_loadbufferx(L, code, codelen, path, 0) ||
lua_pcall(L, 0, LUA_MULTRET, 0)) {
/*
* TODO: There needs to be some reasonable way to get a
* backtrace. The best thing about Django was the
* fabulous backtrace page (and the admin panel).
*/
/* luaL_traceback(L, L, lua_tostring(L, -1), 0); */
WARNF("script failed to run %s", lua_tostring(L, -1));
if (mandatory) exit(1);
lua_pop(L, 1);
}
free(code);