finished http implementation working on spm and liveboot env

2026-07-23 14:33:16 -04:00
parent f7b64c11b7
commit 49c9e5e37c
130 changed files with 1128 additions and 635 deletions
@@ -193,6 +193,100 @@ function kernel.newUUID()
    return uuid
 end

+function kernel.sfile(str, writeable)
+    local buf = {str or ""}
+    local pos = 1
+    local closed = false
+
+    local function content()
+        return table.concat(buf)
+    end
+
+    local function set_content(s)
+        buf = {s}
+    end
+
+    local function flush()
+        str=content()
+    end
+
+    local file = {}
+
+    function file.read(n)
+        assert(not closed, "file is closed")
+
+        local s = content()
+        local len = #s
+
+        if not n then
+            local out = s:sub(pos)
+            pos = len + 1
+            return out
+        end
+
+        local out = s:sub(pos, pos + n - 1)
+        pos = pos + #out
+        return out
+    end
+
+    if writeable then
+        function file.write(data)
+            assert(not closed, "file is closed")
+
+            local s = content()
+            local before = s:sub(1, pos - 1)
+            local after = s:sub(pos + #data)
+
+            set_content(before .. data .. after)
+            pos = pos + #data
+
+            return true
+        end
+    end
+
+    function file.seek(whence, offset)
+        assert(not closed, "file is closed")
+
+        local s = content()
+        local len = #s
+
+        whence = whence or "cur"
+        offset = offset or 0
+
+        if whence == "set" then
+            pos = offset + 1
+        elseif whence == "cur" then
+            pos = pos + offset
+        elseif whence == "end" then
+            pos = len + offset + 1
+        else
+            error("invalid whence")
+        end
+
+        if pos < 1 then pos = 1 end
+        if pos > len + 1 then pos = len + 1 end
+
+        return pos - 1
+    end
+
+    function file.close()
+        assert(not closed, "file is closed")
+        flush()
+        closed = true
+    end
+
+    function file.flush()
+        assert(not closed, "file is closed")
+        flush()
+    end
+
+    function file.content()
+        return str
+    end
+
+    return file
+end
+
 kernel.syscalls={}
 local modules={[0]={}}
 for i=0, 100 do
@@ -297,6 +391,7 @@ kernel.syscalls["halt"]=function()
    end
 end

+kernel.saveLog()
 kernel.log("Running modules")
 for _,p in ipairs(modules) do
    for _,v in ipairs(p) do
@@ -310,6 +405,7 @@ for _,p in ipairs(modules) do
        local status, err = xpcall(func,debug.traceback, kernel)
        if not status then kernel.panic("ModuRunErr: "..tostring(err)) end
        if kernel.config.showModLoad then kernel.log("Loaded module "..v, "DBUG", 0x00FFFF) end
+        if kernel.config.moreLogsaves then kernel.saveLog() end
    end
 end

@@ -9,55 +9,39 @@ kernel.reqcache = cache

 local function require(module, ...)
    if cache[module] then return cache[module].ret end
-    kernel.currentTask.status = "D"
    local args = {...}
-    kernel.currentTask.ksh = coroutine.create(function()
-        local coro = function()
-            for _, path in ipairs(kernel.searchpaths) do
-                local filepath = path:gsub("?", module)
-                if kernel.vfs.exists(filepath) then
-                    if kernel.vfs.type(filepath) == "directory" then
-                        filepath = filepath .. "/init.lua"
-                        if kernel.vfs.type(filepath) == "directory" then
-                            kernel.asyncReturn(false, "Module not found: "..module)
-                            return
-                        end
-                    end
-                
-                    local fd = kernel.vfs.open(filepath, "r")
-                    local chunks = {}
-                    while true do
-                        local chunk = kernel.vfs.read(fd, 4096)
-                        if not chunk or chunk == "" then break end
-                        chunks[#chunks + 1] = chunk
-                        coroutine.yield()
-                    end
-                    kernel.vfs.close(fd)
-                    local data = table.concat(chunks)
-                    local func, err = load(data, "@"..module, "t", kernel._U)
-                    if not func then
-                        kernel.asyncReturn(false, "Error loading module "..module..": "..tostring(err))
-                        return
-                    end
-                    local ok, ret = xpcall(func, debug.traceback, table.unpack(args))
-                    if not ok then
-                        kernel.asyncReturn(false, "Error running module "..module..": "..tostring(ret))
-                        return
-                    end
-                    cache[module] = {ret = ret, expires = kernel.EFI:getEpochMs() + 120000}
-                    kernel.asyncReturn(true, ret)
-                    return
+    for _, path in ipairs(kernel.searchpaths) do
+        local filepath = path:gsub("?", module)
+        if kernel.vfs.exists(filepath) then
+            if kernel.vfs.type(filepath) == "directory" then
+                filepath = filepath .. "/init.lua"
+                if kernel.vfs.type(filepath) == "directory" then
+                    error("Module not found: "..module)
                end
-                coroutine.yield()
            end
-            kernel.asyncReturn(false, "Module not found: "..module)
+            local fd = kernel.vfs.open(filepath, "r")
+            local chunks = {}
+            while true do
+                local chunk = kernel.vfs.read(fd, 4096)
+                if not chunk or chunk == "" then break end
+                chunks[#chunks + 1] = chunk
+            end
+            kernel.vfs.close(fd)
+            local data = table.concat(chunks)
+            local func, err = load(data, "@"..module, "t", kernel._U)
+            if not func then
+                error("Error loading module "..module..": "..tostring(err))
+            end
+            local ok, ret = xpcall(func, debug.traceback, table.unpack(args))
+            if not ok then
+                error("Error running module "..module..": "..tostring(ret))
+            end
+            cache[module] = {ret = ret, expires = kernel.EFI:getEpochMs() + 120000}
+            return ret
        end
-        local status, err = xpcall(coro, debug.traceback)
-        if not status then
-            kernel.asyncReturn(false, "Error in require coroutine for module "..module..": "..tostring(err))
-        end
-    end)
+        coroutine.yield()
+    end
+    error("Module not found: "..module)
 end

-kernel.syscalls["require"] = require
-_G.require = function(...) return syscall.require(...) end
+_G.require = function(...) return require(...) end
@@ -217,7 +217,7 @@ data[".meta"]=strFile(buildMeta({
    log="/var/log/syslog.log"
 }))

-if kernel.EFI:getEEPROM() then
+if kernel.EFI.getEEPROM then
    function data.eeprom(op, mode)
        if op=="type" then
            return "character device"
@@ -255,7 +255,7 @@ if kernel.EFI:getEEPROM() then
    end
 end

-if kernel.EFI:getNvram() then
+if kernel.EFI.getNvram then
    function data.nvram(op, mode)
        if op=="type" then
            return "character device"
@@ -22,7 +22,7 @@ local function getHandler(address)
    end
 end

-function socket.socket(domain, socktype)
+function socket.socket()
    local fd = kernel.vfs.newfd({
        handle = {},

@@ -54,7 +54,7 @@ function socket.socket(domain, socktype)
    local fdo = kernel.currentTask.fd[fd]

    fdo.handle.read = function()
-        return ""
+        return nil, "ENOTCONN"
    end

    fdo.handle.write = function()
@@ -396,22 +396,16 @@ function kernel.main()
            end

            if task.status == "D" then
-                if task.ksh then
-                    coroutine.resume(task.ksh)
-                    if coroutine.status(task.ksh) == "dead" then
-                        task.ksh = nil
-                        if task.status == "D" then
-                            task.status = "R"
-                        end
-
-                        if kernel.config.debugSyscalls then
-                            kernel.log("Task " .. task.pid .. " IO wait completed", "DBUG", 0x00FFFF)
-                            local sysret = task.syscallReturn
-                            for i = 2, #sysret do
-                                local v = type(sysret[i]) == "table" and table.serialize(sysret[i]) or tostring(sysret[i])
-                                kernel.log("  retval[" .. (i-1) .. "] = " .. v, "DBUG", 0x00FFFF)
-                            end
-                        end
+                if task.io then
+                    local ret = {xpcall(task.io, debug.traceback)}
+                    if not ret[1] then
+                        task.syscallReturn = {false, table.unpack(ret, 2)}
+                        task.status = "R"
+                        task.io=nil
+                    elseif #ret>1 then
+                        task.syscallReturn = {true, table.unpack(ret, 2)}
+                        task.status = "R"
+                        task.io=nil
                    end
                end
            end
@@ -25,6 +25,7 @@ kernel.tasks["1"] = {
        else
            kernel.panic("Init system exited: " .. tostring(err))
        end
+        kernel.saveLog()
    end),

    name   = "sysinit",
@@ -1,10 +0,0 @@
--:Minify:--
-local kernel = ...
-if not kernel.vfs.exists("/root") then kernel.vfs.mkdir("/root") end
-
-kernel.processes.login = function()
-    local ok, err = pcall(kernel.hpv.execspawn, "/bin/login", "login")
-    if not ok then
-        kernel.log("Failed to exec /bin/login: " .. tostring(err), "ERROR", 0xFF0000)
-    end
-end