fixed boot crash

Reviewed-on: #10

README.md

@@ -1,3 +1,4 @@
+[![Download on PineStore](https://raster.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpinestore.cc%2Fapi%2Fproject%2F225&query=%24.project.downloads&suffix=%20downloads&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzYuOTA0IiBoZWlnaHQ9Ijg5LjI5NSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ieE1pZFlNaWQiIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDc2OS4wNCA4OTIuOTUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI%2BCiA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTQuNzQgLTQuNjgyNikiIGZpbGw9IiM5YWIyZjIiPgogIDxwYXRoIGQ9Im00MTAgODUxYzAtMTIgMjYtMjEgNTgtMjEgMTUgMCAyMiA0IDE3IDktMTQgMTItNzUgMjItNzUgMTJ6Ii8%2BCiAgPHBhdGggZD0ibTU4NSA3NDJjLTEtNDkgNC03MiAxNi04NSAyMi0yNCAzMC02OCAxNi04Ni0xMi0xNC0yNy0zOS00OC03OC0xMC0xOS05LTI2IDQtNDEgMjItMjQgMjEtNjctMi0xNDQtMjEtNjktMzktMTQ0LTQ4LTE5NS00LTI2LTItMzMgMTEtMzMgMzEgMCAxMTIgMzMgMTQxIDU4IDI4IDIzIDgxIDkyIDcxIDkyLTIgMCA1IDI2IDE2IDU3IDI4IDc5IDI5IDIyNCAzIDMwOC0xMCAzMy0xOSA2Mi0xOSA2NS00IDI2LTEzMiAxNTAtMTU1IDE1MC0zIDAtNi0zMC02LTY4eiIvPgogIDxwYXRoIGQ9Im02OCA2NzNjLTcyLTEwOS03MS0yNzggMy00MjMgMzYtNzEgNjItMTAwIDEyOC0xNDAgNDMtMjcgNjUtMzQgMTE4LTM2IDEwMC00IDk4IDExLTE5IDEzNi0zNCAzNy03OCA4OC05NiAxMTMtMjggMzktMzEgNDgtMjEgNjUgMTEgMTcgNiAyNy0zMyA3OS00MCA1My00NCA2Mi0zMiA3OCAxNyAyMyAxOCA1NyAyIDczLTYgNi0xNCAzMS0xNyA1NC02IDQyLTYgNDItMzMgMXoiLz4KIDwvZz4KIDxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNC43NCAtNC42ODI2KSIgZmlsbD0iIzU5YTY0ZiI%2BCiAgPHBhdGggZD0ibTM2NSA4MTNjLTUzLTYtMTM5LTMzLTE5Mi02MS02OC0zNS04My02Ny01OC0xMjIgMjYtNTkgNDAtNjcgNzgtNDkgNjggMzMgMTY3IDU4IDI2NiA2OSA1OCA1IDEwNiAxMiAxMDkgMTQgMiAzIDYgMzIgOSA2NSA4IDg1IDAgOTEtMTAxIDkwLTQ0LTEtOTQtNC0xMTEtNnoiLz4KICA8cGF0aCBkPSJtNDEwIDQ1OWMtNjctNy0xNjAtMjktMTk5LTQ4LTI3LTE0LTM0LTM2LTIwLTYzIDIxLTM4IDk3LTEzNiAxNTAtMTkzIDI1LTI3IDU4LTcxIDczLTk3IDI1LTQzIDMxLTQ3IDU0LTQyIDQwIDEwIDQyIDEyIDQyIDUyIDAgMjAgNiA1NyAxNCA4MiAyNCA3MyA1NCAxOTIgNjIgMjM2IDUgMzUgMyA0NS0xNSA2My0yMyAyMy0zNiAyNC0xNjEgMTB6Ii8%2BCiA8L2c%2BCiA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTQuNzQgLTQuNjgyNikiIGZpbGw9IiM3ZWNiMjUiPgogIDxwYXRoIGQ9Im01NTggNjc0Yy0yLTItNTEtOS0xMDktMTQtMTAyLTExLTIwNC0zNy0yNjQtNjktMTYtOC0zMi0xNC0zNC0xMi00IDMtMzEtNDgtMzEtNjEgMC01IDIxLTMxIDQ2LTU4IDUxLTU0IDcxLTYwIDEzMC0zNSAxOSA4IDgzIDE5IDE0MiAyNSA1OCA2IDEwNyAxMiAxMDcgMTNzMTUgMjYgMzMgNTZjMjcgNDMgMzIgNjMgMzAgOTktMiAzNS04IDQ3LTI1IDUzLTExIDQtMjMgNi0yNSAzeiIvPgogPC9nPgogPGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE0Ljc0IC00LjY4MjYpIiBmaWxsPSIjZWNlZGVmIj4KICA8cGF0aCBkPSJtMjYwIDg5MGMtMzQtOC03MC00MS03MC02NSAwLTYtOS0yMC0yMC0zMHMtMjAtMjItMjAtMjctMTMtMjEtMzAtMzVjLTM1LTI5LTQxLTgzLTEzLTEyMiAxNS0yMiAxNS0yNi0xLTU2LTE4LTMzLTE4LTMzIDI3LTkxIDI4LTM2IDQyLTYzIDM2LTY4LTIzLTI1IDktNzggMTIwLTE5NyAzNi0zOCA3Mi04MSA4Mi05NiAxMC0xNCAyNS0zMCAzMy0zNSAzNi0yMCA3IDMyLTUzIDk3LTQ4IDUxLTEyNiAxNTAtMTQ5IDE4OS0xMCAxOC05IDI0IDEwIDQwIDIzIDE5IDIzIDE5LTI5IDcxLTUzIDUyLTUzIDUyLTM4IDgyIDE0IDI4IDE0IDMzLTEwIDc2LTMyIDU3LTIzIDgxIDQ2IDEyMCAzNCAxOSA0OSAzMyA0NSA0Mi0xNCAzNyAzNiA3NSA5OCA3NSAyNSAwIDQwLTcgNTQtMjUgMTgtMjMgMjctMjUgOTUtMjUgOTQgMCAxMDItOCA5My04OS02LTUzLTUtNTkgMTQtNjQgMzItOCAyNi02NC0xNS0xMzItMzUtNTgtMzUtNTgtOS04MiAyMS0xOSAyNC0yOSAxOS01Ni0xMC00Ny00NC0xNzUtNjEtMjI3LTgtMjUtMTQtNjItMTQtODMgMC0yNy01LTM5LTE3LTQzLTEwLTMtMjUtOC0zMy0xMC0xMi00LTEyLTYtMS0xNCAyNy0xNiA1NiA1IDY5IDUxIDM1IDExNyA0MyAxNDggNDYgMTcwIDIgMTMgMTEgNTEgMjEgODQgMjEgNzEgMjEgMTIxIDAgMTQ1LTE0IDE1LTEzIDE5IDUgNDMgMTEgMTQgMjAgMzAgMjAgMzVzNyAxNSAxNSAyMmMyMSAxNyAxNiA3NS0xMCAxMDItMTggMTktMjAgMzItMTcgNzkgNCA1MCAyIDU4LTE5IDcyLTEyIDktNTAgMTktODMgMjMtNDUgNS02NSAxMy04MyAzMi0yNiAyOC05MiAzOC0xNTMgMjJ6Ii8%2BCiA8L2c%2BCiA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTQuNzQgLTQuNjgyNikiIGZpbGw9IiM3ZTY3NGQiPgogIDxwYXRoIGQ9Im0yNDggODU0Yy0zMC0xNi00Ny01OS0zMC03NiA4LTggMjMtNyA1NCAyIDI0IDcgNjEgMTQgODMgMTcgNTQgNyA1OSAxNSAzNSA0Ni0xOCAyMy0yOSAyNy02OCAyNy0yNi0xLTU5LTctNzQtMTZ6Ii8%2BCiA8L2c%2BCjwvc3ZnPgo%3D&label=PineStore)](https://pinestore.cc/projects/225/hyperionos)
 # HyperionOS
 
 HyperionOS is a modular, hybrid kernel operating system written entirely in Lua. It features a custom task scheduler, virtual filesystem, syscall interface, and separates core functionality from user-space services.

Src/Hyperion-core/lib/colors

@@ -0,0 +1,18 @@
+--:Minify:--
+return {
+    white=0xFFFFFF,
+    red=0xFF0000,
+    green=0x00FF00,
+    blue=0x0000FF,
+    cyan=0x00FFFF,
+    yellow=0xFFFF00,
+    purple=0xFF00FF,
+    black=0x000000,
+    gray=0x888888,
+    lightgrey=0xBBBBBB,
+    darkgrey=0x444444,
+    orange=0xFF8800,
+    mint=0x00FF88,
+    brown=0xa52a2a,
+    chocolate=0xd2691e
+}

Src/Hyperion-core/lib/io

@@ -1,5 +1,5 @@
 local io = {}
-local fs = require("sys.fs")
+local fs = require("fs")
 
 function io.open(path, mode)
     return fs.open(path, mode)

Src/Hyperion-core/lib/sys/hpv

@@ -1,6 +0,0 @@
-local sys = {}
-local fs = require("sys.fs")
-
-
-
-return sys

Src/Hyperion-core/lib/sys/init

@@ -1,5 +0,0 @@
-local sys = {}
-sys.fs = require("sys.fs")
-sys.hpv = require("sys.hpv")
-sys.ipc = require("sys.ipc")
-return sys

Src/Hyperion-core/lib/sys/ipc

@@ -1,3 +0,0 @@
-local ipc = {}
-
-return ipc

Src/Hyperion-core/lib/sys/term

@@ -1,71 +0,0 @@
-local term = {}
-
-function term.clear()
-    coroutine.yield("VFS_write", 1, "\27C\25")
-end
-
-function term.setCursorPos(x, y)
-    coroutine.yield("VFS_write", 1, "\27cs"..tostring(y)..";"..tostring(x).."\25")
-end
-
-function term.size()
-    coroutine.yield("VFS_write", 1, "\27ts\25")
-    local ok, data = coroutine.yield("VFS_read", 0, 16) -- read response
-    if not ok then error("Failed to get terminal size") end
-    local x, y = string.match(data, "%R(%d+);(%d+)\25")
-    return tonumber(x), tonumber(y)
-end
-
-function term.getCursorPos()
-    coroutine.yield("VFS_write", 1, "\27gc\25")
-    local ok, data = coroutine.yield("VFS_read", 0, 16) -- read response
-    if not ok then error("Failed to get cursor position") end
-    local y, x = string.match(data, "%R(%d+);(%d+)\25")
-    return tonumber(x), tonumber(y)
-end
-
-function term.write(data)
-    coroutine.yield("VFS_write", 1, data)
-end
-
-function term.setTextColor(color)
-    local ok, err = coroutine.yield("VFS_type", 1)
-    if not ok then error(err) end
-    if ok ~= "tty" then return end
-    coroutine.yield("VFS_write", 1, "\27f"..tostring(color).."\25")
-end
-
-function term.setBackgroundColor(color)
-    local ok, err = coroutine.yield("VFS_type", 1)
-    if not ok then error(err) end
-    if ok ~= "tty" then return end
-    coroutine.yield("VFS_write", 1, "\27b"..tostring(color).."\25")
-end
-
-function term.isColor()
-    local ok, err = coroutine.yield("VFS_type", 1)
-    if not ok then error(err) end
-    return ok == "tty"
-end
-
-function term.scroll(n)
-    coroutine.yield("VFS_write", 1, "\27S"..tostring(n).."\25")
-end
-
-function term.setDefault(color, layer)
-    if layer then
-        coroutine.yield("VFS_write", 1, "\27F"..tostring(color).."\25")
-    else
-        coroutine.yield("VFS_write", 1, "\27B"..tostring(color).."\25")
-    end
-end
-
-function term.showCursor(show)
-    if show then
-        coroutine.yield("VFS_write", 1, "\27sc\25")
-    else
-        coroutine.yield("VFS_write", 1, "\27hc\25")
-    end
-end
-
-return term

Src/Hyperion-firmware-ac/boot/ac/boot.lua

@@ -0,0 +1,344 @@
+--:Minify:--
+local args={...}
+local bootdrive=args[1]
+local gpu=components:getFirst("gpu")
+local screenTextBuffer=nil
+local cursorX,cursorY=0,0
+local screenSizeX,screenSizeY=128,25
+
+
+if gpu then
+    screenTextBuffer=gpu:newBuffer(screenSizeX,screenSizeY)
+    for t,v in components:list() do
+		if t == "screen" then
+			gpu:assignBuffer(screenTextBuffer, v)
+		end
+	end
+end
+
+local function write(text)
+	cursorX, cursorY = screenTextBuffer:pasteText(cursorX, cursorY, "SCROLL_SPILL_CLEAR", text)
+	cursorY = cursorY + 1
+	cursorX = 0
+	if cursorY >= screenSizeY then
+		cursorY = screenSizeY-1
+		screenTextBuffer:newline()
+	end
+end
+
+local function displaySuperBadError(err)
+    gpu:freeAllBuffers()
+    screenTextBuffer=gpu:newBuffer(screenSizeX,screenSizeY)
+    for t,v in components:list() do
+		if t == "screen" then
+			gpu:assignBuffer(screenTextBuffer, v)
+		end
+	end
+    term.setBackgroundColor(0x1)
+    term.setTextColor(0x4)
+    term.clear()
+    term.setCursorPos(1, 1)
+    term.write("A critical error occurred while loading the system:")
+    term.setCursorPos(1, 3)
+    write(err)
+    while true do end
+end
+
+local ok, err = xpcall(function()
+    local apis = {}
+
+    local lua = {
+        coroutine = true,
+        debug = true,
+        _VERSION = true,
+        assert = true,
+        collectgarbage = true,
+        error = true,
+        gcinfo = true,
+        getmetatable = true,
+        ipairs = true,
+        __inext = true,
+        load = true,
+        math = true,
+        next = true,
+        pairs = true,
+        pcall = true,
+        rawequal = true,
+        rawget = true,
+        rawlen = true,
+        rawset = true,
+        select = true,
+        setmetatable = true,
+        string = true,
+        table = true,
+        tonumber = true,
+        tostring = true,
+        type = true,
+        xpcall = true,
+        _G = true
+    }
+
+    local debug = debug
+    for i, v in pairs(_G) do
+        if not lua[i] or lua[i] == nil then
+            apis[i] = v
+            _G[i] = nil
+        end
+    end
+
+    local function string_file(file)
+        local str = file:read()
+        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()
+            file.write(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
+
+        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
+
+        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
+
+        return file
+    end
+
+    local function getFile(path)
+        local file = bootdrive:open(path, "r")
+        if not file then
+            displaySuperBadError("Could not open file: " .. path)
+        end
+        local content = file:read()
+        return content
+    end
+
+    local Kernel = load(getFile("/boot/kernel.lua"),"@Kernel")
+    local initFs = load(getFile("/boot/ac/initdisks"),"@Init_disks")(apis)
+    local fs = load(getFile("/boot/initfs"), "@InitFs")()
+
+    if not Kernel then displaySuperBadError("Could not load kernel.") end
+    if not initFs then displaySuperBadError("Could not load initdisks.") end
+    if not fs then displaySuperBadError("Could not load initfs.") end
+
+    local computercomp=apis.components:getFirst("computer")
+    local uefi=apis.components:getFirst("uefi")
+    local computer = {
+        time = function() return apis.os.epoch("utc") end,
+        clock = function() return apis.os.clock() * 1000 end,
+        shutdown = apis.os.shutdown,
+        reboot = apis.os.reboot,
+        getMachineEvent = function()
+            return computercomp:getMachineEvent()
+        end,
+        getEEPROM = function() return uefi.data end,
+        setEEPROM = function(_, text)
+            uefi.data=text
+        end
+    }
+
+    local icolors = {
+        [0x1] = 1, -- #000000
+        [0x2] = 2, -- #FFFFFF
+        [0x4] = 3, -- #FF0000
+        [0x8] = 4, -- #00FF00
+        [0x10] = 5, -- #0000FF
+        [0x20] = 6, -- #00FFFF
+        [0x40] = 7, -- #FF00FF
+        [0x80] = 8, -- #FFFF00
+        [0x100] = 9, -- #FF6D00
+        [0x200] = 10, -- #6DFF55
+        [0x400] = 11, -- #24FFFF
+        [0x800] = 12, -- #924900
+        [0x1000] = 13, -- #6D6D55
+        [0x2000] = 14, -- #DBDBAA
+        [0x4000] = 15, -- #6D00FF
+        [0x8000] = 16 -- #B6FF00
+    }
+
+    local colors = {
+        0x0001, -- #000000
+        0x0002, -- #FFFFFF
+        0x0004, -- #FF0000
+        0x0008, -- #00FF00
+        0x0010, -- #0000FF
+        0x0020, -- #00FFFF
+        0x0040, -- #FF00FF
+        0x0080, -- #FFFF00
+        0x0100, -- #FF6D00
+        0x0200, -- #6DFF55
+        0x0400, -- #24FFFF
+        0x0800, -- #924900
+        0x1000, -- #6D6D55
+        0x2000, -- #DBDBAA
+        0x4000, -- #6D00FF
+        0x8000  -- #B6FF00
+    }
+
+    apis.term.setBackgroundColor(0x8000)
+    apis.term.setTextColor(0x1000)
+    apis.term.clear()
+    apis.term.setCursorPos(1, 1)
+
+    local kernelCoro = coroutine.create(function()
+        ---@diagnostic disable-next-line: param-type-mismatch
+        local ok, err = xpcall(Kernel, debug.traceback, apis, initFs, "cct", "/sbin/init",
+        {
+            print = function(_, text) write(text .. "\n") end,
+            printInline = function(_, text) write(text) end,
+            clear = function()
+                apis.term.clear()
+                apis.term.setCursorPos(1, 1)
+            end,
+            setCursorPos = function(_, x, y)
+                apis.term.setCursorPos(x, y)
+            end,
+            getCursorPos = function() return apis.term.getCursorPos() end,
+            getSize = function() return apis.term.getSize() end,
+            setBackgroundColor = function(_, color)
+                apis.term.setBackgroundColor(colors[color])
+            end,
+            setTextColor = function(_, color)
+                apis.term.setTextColor(colors[color])
+            end,
+            getBackgroundColor = function()
+                return icolors[apis.term.getBackgroundColor()]
+            end,
+            getTextColor = function()
+                return icolors[apis.term.getTextColor()]
+            end
+        }, computer, fs, "$")
+        if not ok then displaySuperBadError(err) end
+    end)
+
+    function coroutine.resumeWithTimeout(co, timeout, ...)
+        local startTime = computer.time()
+        debug.sethook(co, function()
+            if computer.time() > startTime + timeout then
+                return coroutine.yield("timeout")
+            end
+        end, "", 1000)
+        local ret = {coroutine.resume(co, ...)}
+        if ret[1] and ret[2] == "timeout" then
+            return "timeout"
+        elseif ret[1] == false then
+            return "error", ret[2]
+        else
+            debug.sethook(co)
+            return "success", table.unpack(ret, 2)
+        end
+    end
+
+    write("Loaded in " .. tostring(apis.os.clock()) .. " seconds.\n")
+
+    while true do
+        local status, err = coroutine.resumeWithTimeout(kernelCoro, 50)
+        apis.os.queueEvent("NoSleep")
+        local exit = false
+        while not exit do
+            local event = {coroutine.yield()}
+            if event[1] == "key" then
+                queueEvent("keyPressed", 1, event[2])
+                if acekeys[event[2]] then
+                    queueEvent("keyTyped", 1, acekeys[event[2]])
+                end
+            elseif event[1] == "char" then
+                queueEvent("keyTyped", 1, event[2])
+            elseif event[1] == "key_up" then
+                queueEvent("keyReleased", 1, event[2])
+            elseif event[1] == "disk" then
+                queueEvent("componentAdded", "disk")
+            elseif event[1] == "disk_eject" then
+                queueEvent("componentRemoved", "disk")
+            elseif event[1] == "modem_message" then
+                queueEvent("modem_message", table.unpack(event, 2))
+            elseif event[1] == "rednet_message" then
+                queueEvent("rednet_message", table.unpack(event, 2))
+            elseif event[1] == "http_success" then
+                queueEvent("http_success", table.unpack(event, 2))
+            elseif event[1] == "http_failure" then
+                queueEvent("http_failure", table.unpack(event, 2))
+            elseif event[1] == "NoSleep" then
+                exit = true
+            end
+        end
+        if status == "error" or coroutine.status(kernelCoro) == "dead" then
+            displaySuperBadError("Kernel error: " .. tostring(err))
+            coroutine.yield("key")
+        end
+    end
+end, debug.traceback)
+
+if not ok then displaySuperBadError("Fatal error during boot: " .. err) end
+while true do coroutine.yield() end

Src/Hyperion-firmware-ccpc/boot/ccpc/boot.lua

@@ -1,4 +1,4 @@
--- :Minify:--
+--:Minify:--
 local BOOT_DRIVE_PATH = ({...})[1] or "/$"
 ---@diagnostic disable-next-line: undefined-global
 local term = term
@@ -71,7 +71,6 @@ local ok, err = xpcall(function()
         collectgarbage = true,
         error = true,
         gcinfo = true,
-        getfenv = true,
         getmetatable = true,
         ipairs = true,
         __inext = true,
@@ -85,7 +84,6 @@ local ok, err = xpcall(function()
         rawlen = true,
         rawset = true,
         select = true,
-        setfenv = true,
         setmetatable = true,
         string = true,
         table = true,
@@ -154,17 +152,106 @@ local ok, err = xpcall(function()
     if not initFs then displaySuperBadError("Could not load initdisks.") end
     if not fs then displaySuperBadError("Could not load initfs.") end
 
+    if not apis.fs.exists("/nvram.dat") then
+        local file = apis.fs.open("/nvram.dat", "w")
+        file.write("Hello, World!")
+        file.close()
+    end
+
+    local eeprom
+    if apis.fs.exists("/startup.lua") then
+        eeprom="/startup.lua"
+    elseif apis.fs.exists("/eeprom") then
+        eeprom="/eeprom"
+    end
+
     local eventQueue = {}
 
     local function queueEvent(event, ...)
         table.insert(eventQueue, {event, ...})
     end
 
-    local computer = {
-        time = function() return apis.os.epoch("utc") end,
-        clock = function() return apis.os.clock() * 1000 end,
-        shutdown = apis.os.shutdown,
-        reboot = apis.os.reboot,
+    local colors = {
+        [0x000000]=0x0001,
+        [0xFFFFFF]=0x0002,
+        [0xFF0000]=0x0004,
+        [0x00FF00]=0x0008,
+        [0x0000FF]=0x0010,
+        [0x00FFFF]=0x0020,
+        [0xFF00FF]=0x0040,
+        [0xFFFF00]=0x0080,
+        [0xFF6D00]=0x0100,
+        [0x6DFF55]=0x0200,
+        [0x24FFFF]=0x0400,
+        [0x924900]=0x0800,
+        [0x6D6D55]=0x1000,
+        [0xDBDBAA]=0x2000,
+        [0x6D00FF]=0x4000,
+        [0xB6FF00]=0x8000
+    }
+
+    local fg,bg=0x6D6D55,0x000000
+    local l1f,l1d,l2,ops={},{},{},0
+
+    local function findClosest(tbl, target)
+        local closest = nil
+        local smallestDiff = math.huge
+
+        for k, _ in pairs(tbl) do
+            local diff = math.abs(k - target)
+            if diff < smallestDiff then
+                smallestDiff = diff
+                closest = k
+            end
+        end
+
+        return closest
+    end
+
+    local function aprox(c24)
+        ops = ops + 1
+
+        if ops % 1024 == 0 then
+            l1d = {}
+            l1f = {}
+        end
+
+        if ops % 8192 == 0 then
+            l2 = {}
+        end
+
+        if l2[c24] ~= nil then
+            return l2[c24]
+        end
+
+        if l1d[c24] ~= nil then
+            l1f[c24] = l1f[c24] + 1
+
+            if l1f[c24] >= 16 then
+                l2[c24] = l1d[c24]
+                l1d[c24] = nil
+                l1f[c24] = nil
+                return l2[c24]
+            end
+
+            return l1d[c24]
+        end
+
+        local closestKey = findClosest(colors, c24)
+        if not closestKey then return nil end
+
+        local value = colors[closestKey]
+
+        l1d[c24] = value
+        l1f[c24] = 1
+
+        return value
+    end
+
+    local EFI = {
+        getEpochMs = function() return apis.os.epoch("utc") end,
+        getUptime = function() return apis.os.clock() * 1000 end,
+        date = function() return apis.os.date("!%Y-%m-%dT%H:%M:%SZ", apis.os.epoch("utc") / 1000) end,
         getMachineEvent = function()
             if #eventQueue > 0 then
                 return table.unpack(table.remove(eventQueue, 1))
@@ -172,61 +259,15 @@ local ok, err = xpcall(function()
                 return nil
             end
         end,
-        getEEPROM = function() return getFile("/startup.lua") end,
+        getEEPROM = function() return getFile(eeprom) end,
         setEEPROM = function(_, text)
-            local h = apis.fs.open("/startup.lua", "w")
+            local h = apis.fs.open(eeprom, "w")
             h.write(text)
             h.close()
-        end
-    }
-
-    local icolors = {
-        [0x1] = 1, -- #000000
-        [0x2] = 2, -- #FFFFFF
-        [0x4] = 3, -- #FF0000
-        [0x8] = 4, -- #00FF00
-        [0x10] = 5, -- #0000FF
-        [0x20] = 6, -- #00FFFF
-        [0x40] = 7, -- #FF00FF
-        [0x80] = 8, -- #FFFF00
-        [0x100] = 9, -- #FF6D00
-        [0x200] = 10, -- #6DFF55
-        [0x400] = 11, -- #24FFFF
-        [0x800] = 12, -- #924900
-        [0x1000] = 13, -- #6D6D55
-        [0x2000] = 14, -- #DBDBAA
-        [0x4000] = 15, -- #6D00FF
-        [0x8000] = 16 -- #B6FF00
-    }
-
-    local colors = {
-        0x0001, -- #000000
-        0x0002, -- #FFFFFF
-        0x0004, -- #FF0000
-        0x0008, -- #00FF00
-        0x0010, -- #0000FF
-        0x0020, -- #00FFFF
-        0x0040, -- #FF00FF
-        0x0080, -- #FFFF00
-        0x0100, -- #FF6D00
-        0x0200, -- #6DFF55
-        0x0400, -- #24FFFF
-        0x0800, -- #924900
-        0x1000, -- #6D6D55
-        0x2000, -- #DBDBAA
-        0x4000, -- #6D00FF
-        0x8000 -- #B6FF00
-    }
-
-    apis.term.setBackgroundColor(0x8000)
-    apis.term.setTextColor(0x1000)
-    apis.term.clear()
-    apis.term.setCursorPos(1, 1)
-
-    local kernelCoro = coroutine.create(function()
-        ---@diagnostic disable-next-line: param-type-mismatch
-        local ok, err = xpcall(Kernel, debug.traceback, apis, initFs, "cct", "/sbin/init",
-        {
+        end,
+        initfs=fs,
+        disks=initFs,
+        screenCtl={
             print = function(_, text) write(text .. "\n") end,
             printInline = function(_, text) write(text) end,
             clear = function()
@@ -239,25 +280,51 @@ local ok, err = xpcall(function()
             getCursorPos = function() return apis.term.getCursorPos() end,
             getSize = function() return apis.term.getSize() end,
             setBackgroundColor = function(_, color)
-                apis.term.setBackgroundColor(colors[color])
+                apis.term.setBackgroundColor(aprox(color))
             end,
             setTextColor = function(_, color)
-                apis.term.setTextColor(colors[color])
+                apis.term.setTextColor(aprox(color))
             end,
             getBackgroundColor = function()
-                return icolors[apis.term.getBackgroundColor()]
+                return bg
             end,
             getTextColor = function()
-                return icolors[apis.term.getTextColor()]
+                return fg
+            end,
+            enable=function() end,
+            disable=function() end
+        },
+        architecture="cct",
+        getNvram = function() return getFile("/nvram.dat") end,
+        setNvram = function(_, text)
+            local h = apis.fs.open("/nvram.dat", "w")
+            h.write(text)
+            h.close()
+        end,
+        firmware=apis,
+        reboot=false
+    }
+
+    apis.term.setBackgroundColor(0x8000)
+    apis.term.setTextColor(0x1000)
+    apis.term.clear()
+    apis.term.setCursorPos(1, 1)
+
+    local kernelCoro = coroutine.create(function()
+        ---@diagnostic disable-next-line: param-type-mismatch
+        local ok, err = xpcall(Kernel, debug.traceback, EFI)
+        if not ok and not EFI.reboot then displaySuperBadError(err) end
+        if err then
+            apis.os.reboot()
+        else
+            apis.os.shutdown()
         end
-        }, computer, fs, "$")
-        if not ok then displaySuperBadError(err) end
     end)
 
     function coroutine.resumeWithTimeout(co, timeout, ...)
-        local startTime = computer.time()
+        local startTime = EFI.getEpochMs()
         debug.sethook(co, function()
-            if computer.time() > startTime + timeout then
+            if EFI.getEpochMs() > startTime + timeout then
                 return coroutine.yield("timeout")
             end
         end, "", 1000)
@@ -306,11 +373,15 @@ local ok, err = xpcall(function()
             end
         end
         if status == "error" or coroutine.status(kernelCoro) == "dead" then
+            if EFI.reboot then
+                apis.os.reboot()
+            end
             displaySuperBadError("Kernel error: " .. tostring(err))
             coroutine.yield("key")
         end
+        initFs:refresh()
     end
 end, debug.traceback)
 
 if not ok then displaySuperBadError("Fatal error during boot: " .. err) end
-while true do coroutine.yield() end
+while true do coroutine.yield("key") end

Src/Hyperion-firmware-ccpc/boot/ccpc/initdisks

@@ -0,0 +1,272 @@
+--:Minify:--
+local apis = ({...})[1]
+local BOOT_DRIVE_PATH = apis.BOOT_DRIVE_PATH
+local fs = apis.fs
+local native = apis.peripheral
+local peripheral = {}
+local sides = {"top", "bottom", "left", "right", "front", "back"}
+
+function peripheral.getNames()
+    local results = {}
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.isPresent(side) then
+            table.insert(results, side)
+            if native.hasType(side, "peripheral_hub") then
+                local remote = native.call(side, "getNamesRemote")
+                for _, name in ipairs(remote) do
+                    table.insert(results, name)
+                end
+            end
+        end
+    end
+    return results
+end
+
+function peripheral.isPresent(name)
+    if native.isPresent(name) then
+        return true
+    end
+
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return true
+        end
+    end
+    return false
+end
+
+function peripheral.getType(peripheral)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.getType(peripheral)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "getTypeRemote", peripheral)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return table.unpack(mt.types)
+    end
+end
+
+function peripheral.hasType(peripheral, peripheral_type)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.hasType(peripheral, peripheral_type)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "hasTypeRemote", peripheral, peripheral_type)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return mt.types[peripheral_type] ~= nil
+    end
+end
+
+function peripheral.getMethods(name)
+    if native.isPresent(name) then
+        return native.getMethods(name)
+    end
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return native.call(side, "getMethodsRemote", name)
+        end
+    end
+    return nil
+end
+
+function peripheral.getName(peripheral)
+    local mt = getmetatable(peripheral)
+    if not mt or mt.__name ~= "peripheral" or type(mt.name) ~= "string" then
+        error("bad argument #1 (table is not a peripheral)", 2)
+    end
+    return mt.name
+end
+
+function peripheral.call(name, method, ...)
+    if native.isPresent(name) then
+        return native.call(name, method, ...)
+    end
+
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return native.call(side, "callRemote", name, method, ...)
+        end
+    end
+    return nil
+end
+
+function peripheral.wrap(name)
+    local methods = peripheral.getMethods(name)
+    if not methods then
+        return nil
+    end
+
+    local types = { peripheral.getType(name) }
+    for i = 1, #types do types[types[i]] = true end
+    local result = setmetatable({}, {
+        __name = "peripheral",
+        name = name,
+        type = types[1],
+        types = types,
+    })
+    for _, method in ipairs(methods) do
+        result[method] = function(...)
+            return peripheral.call(name, method, ...)
+        end
+    end
+    return result
+end
+
+function peripheral.find(ty, filter)
+    local results = {}
+    for _, name in ipairs(peripheral.getNames()) do
+        if peripheral.hasType(name, ty) then
+            local wrapped = peripheral.wrap(name)
+            if filter == nil or filter(name, wrapped) then
+                table.insert(results, wrapped)
+            end
+        end
+    end
+    return table.unpack(results)
+end
+
+local disks = {}
+local internal = {}
+
+local function norm(path)
+    if not path or path == "" then return "/" end
+    return fs.combine("/", path)
+end
+
+local function createDisk(id, basePath, readonly, periph)
+    basePath = norm(basePath)
+
+    local disk = {address = id, isReadOnly = function() return readonly end}
+
+    function disk:spaceUsed()
+        return fs.getCapacity(basePath) - fs.getFreeSpace(basePath)
+    end
+
+    function disk:spaceTotal() return fs.getCapacity(basePath) end
+
+    function disk:list(path)
+        local p = fs.combine(basePath, path)
+        if not fs.exists(p) or not fs.isDir(p) then
+            return nil, "not directory"
+        end
+        return fs.list(p)
+    end
+
+    function disk:fileExists(path)
+        local p = fs.combine(basePath, path)
+        return fs.exists(p) and not fs.isDir(p)
+    end
+
+    function disk:directoryExists(path)
+        local p = fs.combine(basePath, path)
+        return fs.exists(p) and fs.isDir(p)
+    end
+
+    function disk:type(path)
+        local p = fs.combine(basePath, path)
+        if not fs.exists(p) then
+            return nil
+        elseif fs.isDir(p) then
+            return "directory"
+        else
+            return "file"
+        end
+    end
+
+    function disk:makeDirectory(path)
+        local p = fs.combine(basePath, path)
+        fs.makeDir(p)
+        return true
+    end
+
+    function disk:remove(path)
+        local p = fs.combine(basePath, path)
+        if fs.exists(p) then fs.delete(p) end
+        return true
+    end
+
+    function disk:setLabel(label) periph.setLabel(label) end
+
+    function disk:getLabel(label) return periph.getLabel() end
+
+    function disk:attributes(path)
+        local p = fs.combine(basePath, path)
+        return fs.attributes(p)
+    end
+
+    function disk:open(path, mode)
+        local p = fs.combine(basePath, path)
+        return fs.open(p, mode)
+    end
+
+    return disk
+end
+
+internal["$"] = createDisk("$", BOOT_DRIVE_PATH, false, {
+    setLabel = function(label)
+        local h = fs.open("/.label", "w")
+        h.write(label)
+        h.close()
+    end,
+    getLabel = function()
+        local h = fs.open("/.label", "r")
+        if not h then return "$" end
+        local label = h.readAll()
+        h.close()
+        return label
+    end
+})
+
+internal["rom"] = createDisk("rom", "/rom", true, {
+    setLabel = function(label)
+        error("Device is read-only")
+    end,
+    getLabel = function()
+        return "cctrom"
+    end
+})
+
+local function refresh()
+    disks={}
+    for _, disk in ipairs({peripheral.find("drive")}) do
+        if disk.isDiskPresent() then
+            disks[tostring(disk.getDiskID())]=createDisk("cctdisk"..tostring(disk.getDiskID()), disk.getMountPath(), false, fs)
+        end
+    end
+end
+
+local function iter()
+    refresh()
+    local combined = {}
+
+    for id, obj in pairs(internal) do combined[id] = obj end
+    for id, obj in pairs(disks) do combined[id] = obj end
+
+    return pairs(combined)
+end
+
+return {refresh = refresh, list = iter}

Src/Hyperion-firmware-ccpc/boot/cct/initdisks

@@ -1,155 +0,0 @@
--- :Minify:--
-local apis = ({...})[1]
-local BOOT_DRIVE_PATH = apis.BOOT_DRIVE_PATH or "/$"
-local fs = apis.fs
-local native = apis.peripheral
-local peripheral = {}
-local sides = {"top", "bottom", "left", "right", "front", "back"}
-
-function peripheral.getType(name)
-    if native.isPresent(name) then return native.getType(name) end
-    for n = 1, #sides do
-        local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and
-            native.call(side, "isPresentRemote", name) then
-            return native.call(side, "getTypeRemote", name)
-        end
-    end
-    return nil
-end
-
-function peripheral.getNames()
-    local names = {}
-    for n = 1, #sides do
-        local side = sides[n]
-        if native.isPresent(side) then table.insert(names, side) end
-        if native.hasType(side, "peripheral_hub") then
-            local hubSides = native.call(side, "getConnectedSides")
-            for _, hubSide in ipairs(hubSides) do
-                table.insert(names, hubSide)
-            end
-        end
-    end
-    return names
-end
-
-local disks = {}
-local internal = {}
-
-local function norm(path)
-    if not path or path == "" then return "/" end
-    return fs.combine("/", path)
-end
-
-local function createDisk(id, basePath, readonly, periph)
-    basePath = norm(basePath)
-
-    local disk = {address = id, isReadOnly = function() return readonly end}
-
-    function disk:spaceUsed()
-        return fs.getCapacity(basePath) - fs.getFreeSpace(basePath)
-    end
-
-    function disk:spaceTotal() return fs.getCapacity(basePath) end
-
-    function disk:list(path)
-        local p = fs.combine(basePath, path)
-        if not fs.exists(p) or not fs.isDir(p) then
-            return nil, "not directory"
-        end
-        return fs.list(p)
-    end
-
-    function disk:fileExists(path)
-        local p = fs.combine(basePath, path)
-        return fs.exists(p) and not fs.isDir(p)
-    end
-
-    function disk:directoryExists(path)
-        local p = fs.combine(basePath, path)
-        return fs.exists(p) and fs.isDir(p)
-    end
-
-    function disk:type(path)
-        local p = fs.combine(basePath, path)
-        if not fs.exists(p) then
-            return nil
-        elseif fs.isDir(p) then
-            return "directory"
-        else
-            return "file"
-        end
-    end
-
-    function disk:makeDirectory(path)
-        local p = fs.combine(basePath, path)
-        fs.makeDir(p)
-        return true
-    end
-
-    function disk:remove(path)
-        local p = fs.combine(basePath, path)
-        if fs.exists(p) then fs.delete(p) end
-        return true
-    end
-
-    function disk:setLabel(label) periph.setLabel(label) end
-
-    function disk:getLabel(label) return periph.getLabel() end
-
-    function disk:attributes(path)
-        local p = fs.combine(basePath, path)
-        return fs.attributes(p)
-    end
-
-    function disk:open(path, mode)
-        local p = fs.combine(basePath, path)
-        return fs.open(p, mode)
-    end
-
-    return disk
-end
-
-internal["$"] = createDisk("$", BOOT_DRIVE_PATH, false, {
-    setLabel = function(label)
-        local h = fs.open("/.label", "w")
-        h.write(label)
-        h.close()
-    end,
-    getLabel = function()
-        local h = fs.open("/.label", "r")
-        if not h then return "$" end
-        local label = h.readAll()
-        h.close()
-        return label
-    end
-})
-
-local function refresh()
-    for id, _ in pairs(disks) do
-        if not peripheral.getType(id) then disks[id] = nil end
-    end
-
-    for _, name in ipairs(peripheral.getNames()) do
-        if peripheral.getType(name) == "disk" then
-            if not disks[name] then
-                local mount = disk.getMountPath(name)
-                if mount then
-                    disks[name] = createDisk(name, mount, false, disk)
-                end
-            end
-        end
-    end
-end
-
-local function iter()
-    refresh()
-    local combined = {}
-
-    for id, obj in pairs(internal) do combined[id] = obj end
-    for id, obj in pairs(disks) do combined[id] = obj end
-
-    return pairs(combined)
-end
-
-return {refresh = refresh, list = iter}

Src/Hyperion-firmware-ccpc/lib/modules/CC-Tweaked/40_redstone.kmod

@@ -1,26 +0,0 @@
-local args={...}
-local kernel=args[1]
-local driver={}
-
-driver.name="CCT Term Module"
-driver.version="0.1.0"
-driver.type="gpio"
-driver.description="CCT redstone Module Kernel Module"
-driver.arch="cct"
-driver.author="HyperionOS Dev Team"
-driver.license="MIT"
-driver.api={}
-
-function driver.load()
-    -- will 
-end
-
-function driver.unload()
-    -- Nothing to unload
-end
-
-function driver.main()
-    -- Nothing to run
-end
-
--- kernel.drivers.register(driver)

Src/Hyperion-firmware-ccpc/lib/modules/ccpc/25_gfx.kmod

@@ -311,7 +311,7 @@ local fifo = kernel.newFifo()
 kernel.processes.cctmond = function()
     local timeout = false
     while true do
-        local event = {kernel.computer:getMachineEvent()}
+        local event = {kernel.EFI:getMachineEvent()}
 
         if event[1] then
             local eventType = event[1]

Src/Hyperion-firmware-cct/boot/cct/boot.lua

@@ -1,4 +1,4 @@
--- :Minify:--
+--:Minify:--
 local BOOT_DRIVE_PATH = ({...})[1] or "/$"
 ---@diagnostic disable-next-line: undefined-global
 local term = term
@@ -152,17 +152,262 @@ local ok, err = xpcall(function()
     if not initFs then displaySuperBadError("Could not load initdisks.") end
     if not fs then displaySuperBadError("Could not load initfs.") end
 
+    if not apis.fs.exists("/nvram.dat") then
+        local file = apis.fs.open("/nvram.dat", "w")
+        file.write("Hello, World!")
+        file.close()
+    end
+
+    local eeprom
+    if apis.fs.exists("/startup.lua") then
+        eeprom="/startup.lua"
+    elseif apis.fs.exists("/eeprom") then
+        eeprom="/eeprom"
+    end
+
     local eventQueue = {}
 
     local function queueEvent(event, ...)
         table.insert(eventQueue, {event, ...})
     end
 
-    local computer = {
-        time = function() return apis.os.epoch("utc") end,
-        clock = function() return apis.os.clock() * 1000 end,
-        shutdown = apis.os.shutdown,
-        reboot = apis.os.reboot,
+    local colors = {
+        [0x000000]=0x0001,
+        [0xFFFFFF]=0x0002,
+        [0xFF0000]=0x0004,
+        [0x00FF00]=0x0008,
+        [0x0000FF]=0x0010,
+        [0x00FFFF]=0x0020,
+        [0xFF00FF]=0x0040,
+        [0xFFFF00]=0x0080,
+        [0xFF6D00]=0x0100,
+        [0x6DFF55]=0x0200,
+        [0x24FFFF]=0x0400,
+        [0x924900]=0x0800,
+        [0x6D6D55]=0x1000,
+        [0xDBDBAA]=0x2000,
+        [0x6D00FF]=0x4000,
+        [0xB6FF00]=0x8000
+    }
+
+    local fg,bg=0x6D6D55,0x000000
+    local l1f,l1d,l2,ops={},{},{},0
+
+    local function findClosest(tbl, target)
+        local closest = nil
+        local smallestDiff = math.huge
+
+        for k, _ in pairs(tbl) do
+            if k==target then return k end
+            local diff = math.abs(k - target)
+            if diff < smallestDiff then
+                smallestDiff = diff
+                closest = k
+            end
+        end
+
+        return closest
+    end
+
+    local function aprox(c24)
+        ops = ops + 1
+
+        if ops % 1024 == 0 then
+            l1d = {}
+            l1f = {}
+        end
+
+        if ops % 8192 == 0 then
+            l2 = {}
+        end
+
+        if l2[c24] ~= nil then
+            return l2[c24]
+        end
+
+        if l1d[c24] ~= nil then
+            l1f[c24] = l1f[c24] + 1
+
+            if l1f[c24] >= 16 then
+                l2[c24] = l1d[c24]
+                l1d[c24] = nil
+                l1f[c24] = nil
+                return l2[c24]
+            end
+
+            return l1d[c24]
+        end
+
+        local closestKey = findClosest(colors, c24)
+        if not closestKey then return nil end
+
+        local value = colors[closestKey]
+
+        l1d[c24] = value
+        l1f[c24] = 1
+
+        return value
+    end
+
+    local peripheral={}
+    local native = apis.peripheral
+    local sides = {"top", "bottom", "left", "right", "front", "back"}
+
+    function peripheral.getNames()
+        local results = {}
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.isPresent(side) then
+                table.insert(results, side)
+                if native.hasType(side, "peripheral_hub") then
+                    local remote = native.call(side, "getNamesRemote")
+                    for _, name in ipairs(remote) do
+                        table.insert(results, name)
+                    end
+                end
+            end
+        end
+        return results
+    end
+
+    function peripheral.isPresent(name)
+        if native.isPresent(name) then
+            return true
+        end
+
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+                return true
+            end
+        end
+        return false
+    end
+
+    function peripheral.getType(peripheral)
+        if type(peripheral) == "string" then
+            if native.isPresent(peripheral) then
+                return native.getType(peripheral)
+            end
+            for n = 1, #sides do
+                local side = sides[n]
+                if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                    return native.call(side, "getTypeRemote", peripheral)
+                end
+            end
+            return nil
+        else
+            local mt = getmetatable(peripheral)
+            if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+                error("bad argument #1 (table is not a peripheral)", 2)
+            end
+            return table.unpack(mt.types)
+        end
+    end
+
+    function peripheral.hasType(peripheral, peripheral_type)
+        if type(peripheral) == "string" then
+            if native.isPresent(peripheral) then
+                return native.hasType(peripheral, peripheral_type)
+            end
+            for n = 1, #sides do
+                local side = sides[n]
+                if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                    return native.call(side, "hasTypeRemote", peripheral, peripheral_type)
+                end
+            end
+            return nil
+        else
+            local mt = getmetatable(peripheral)
+            if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+                error("bad argument #1 (table is not a peripheral)", 2)
+            end
+            return mt.types[peripheral_type] ~= nil
+        end
+    end
+
+    function peripheral.getMethods(name)
+        if native.isPresent(name) then
+            return native.getMethods(name)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+                return native.call(side, "getMethodsRemote", name)
+            end
+        end
+        return nil
+    end
+
+    function peripheral.getName(peripheral)
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.name) ~= "string" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return mt.name
+    end
+
+    function peripheral.call(name, method, ...)
+        if native.isPresent(name) then
+            return native.call(name, method, ...)
+        end
+
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+                return native.call(side, "callRemote", name, method, ...)
+            end
+        end
+        return nil
+    end
+
+    function peripheral.wrap(name)
+        local methods = peripheral.getMethods(name)
+        if not methods then
+            return nil
+        end
+
+        local types = { peripheral.getType(name) }
+        for i = 1, #types do types[types[i]] = true end
+        local result = setmetatable({}, {
+            __name = "peripheral",
+            name = name,
+            type = types[1],
+            types = types,
+        })
+        for _, method in ipairs(methods) do
+            result[method] = function(...)
+                return peripheral.call(name, method, ...)
+            end
+        end
+        return result
+    end
+
+    function peripheral.find(ty, filter)
+        local results = {}
+        for _, name in ipairs(peripheral.getNames()) do
+            if peripheral.hasType(name, ty) then
+                local wrapped = peripheral.wrap(name)
+                if filter == nil or filter(name, wrapped) then
+                    table.insert(results, wrapped)
+                end
+            end
+        end
+        return table.unpack(results)
+    end
+
+    local allscreens = {peripheral.find("monitor")}
+    for i=1, #allscreens do
+        allscreens[i].setTextScale(.5)
+        allscreens[i].clear()
+        allscreens[i].setCursorPos(1,1)
+        allscreens[i].write("Initializing...")
+    end
+
+    local EFI = {
+        getEpochMs = function() return apis.os.epoch("utc") end,
+        getUptime = function() return apis.os.clock() * 1000 end,
+        date = function() return apis.os.date("!%Y-%m-%dT%H:%M:%SZ", apis.os.epoch("utc") / 1000) end,
         getMachineEvent = function()
             if #eventQueue > 0 then
                 return table.unpack(table.remove(eventQueue, 1))
@@ -170,61 +415,15 @@ local ok, err = xpcall(function()
                 return nil
             end
         end,
-        getEEPROM = function() return getFile("/startup.lua") end,
+        getEEPROM = function() return getFile(eeprom) end,
         setEEPROM = function(_, text)
-            local h = apis.fs.open("/startup.lua", "w")
+            local h = apis.fs.open(eeprom, "w")
             h.write(text)
             h.close()
-        end
-    }
-
-    local icolors = {
-        [0x1] = 1, -- #000000
-        [0x2] = 2, -- #FFFFFF
-        [0x4] = 3, -- #FF0000
-        [0x8] = 4, -- #00FF00
-        [0x10] = 5, -- #0000FF
-        [0x20] = 6, -- #00FFFF
-        [0x40] = 7, -- #FF00FF
-        [0x80] = 8, -- #FFFF00
-        [0x100] = 9, -- #FF6D00
-        [0x200] = 10, -- #6DFF55
-        [0x400] = 11, -- #24FFFF
-        [0x800] = 12, -- #924900
-        [0x1000] = 13, -- #6D6D55
-        [0x2000] = 14, -- #DBDBAA
-        [0x4000] = 15, -- #6D00FF
-        [0x8000] = 16 -- #B6FF00
-    }
-
-    local colors = {
-        0x0001, -- #000000
-        0x0002, -- #FFFFFF
-        0x0004, -- #FF0000
-        0x0008, -- #00FF00
-        0x0010, -- #0000FF
-        0x0020, -- #00FFFF
-        0x0040, -- #FF00FF
-        0x0080, -- #FFFF00
-        0x0100, -- #FF6D00
-        0x0200, -- #6DFF55
-        0x0400, -- #24FFFF
-        0x0800, -- #924900
-        0x1000, -- #6D6D55
-        0x2000, -- #DBDBAA
-        0x4000, -- #6D00FF
-        0x8000 -- #B6FF00
-    }
-
-    apis.term.setBackgroundColor(0x8000)
-    apis.term.setTextColor(0x1000)
-    apis.term.clear()
-    apis.term.setCursorPos(1, 1)
-
-    local kernelCoro = coroutine.create(function()
-        ---@diagnostic disable-next-line: param-type-mismatch
-        local ok, err = xpcall(Kernel, debug.traceback, apis, initFs, "cct", "/sbin/init",
-        {
+        end,
+        initfs=fs,
+        disks=initFs,
+        screenCtl={
             print = function(_, text) write(text .. "\n") end,
             printInline = function(_, text) write(text) end,
             clear = function()
@@ -237,25 +436,52 @@ local ok, err = xpcall(function()
             getCursorPos = function() return apis.term.getCursorPos() end,
             getSize = function() return apis.term.getSize() end,
             setBackgroundColor = function(_, color)
-                apis.term.setBackgroundColor(colors[color])
+                apis.term.setBackgroundColor(aprox(color))
             end,
             setTextColor = function(_, color)
-                apis.term.setTextColor(colors[color])
+                apis.term.setTextColor(aprox(color))
             end,
             getBackgroundColor = function()
-                return icolors[apis.term.getBackgroundColor()]
+                return bg
             end,
             getTextColor = function()
-                return icolors[apis.term.getTextColor()]
+                return fg
+            end,
+            enable=function() end,
+            disable=function() end
+        },
+        architecture="cct",
+        getNvram = function() return getFile("/nvram.dat") end,
+        setNvram = function(_, text)
+            local h = apis.fs.open("/nvram.dat", "w")
+            h.write(text)
+            h.close()
+        end,
+        firmware=apis,
+        reboot=false,
+        beep=function() end
+    }
+
+    apis.term.setBackgroundColor(0x8000)
+    apis.term.setTextColor(0x1000)
+    apis.term.clear()
+    apis.term.setCursorPos(1, 1)
+
+    local kernelCoro = coroutine.create(function()
+        ---@diagnostic disable-next-line: param-type-mismatch
+        local ok, err = xpcall(Kernel, debug.traceback, EFI)
+        if not ok and not EFI.reboot then displaySuperBadError(err) end
+        if err then
+            apis.os.reboot()
+        else
+            apis.os.shutdown()
         end
-        }, computer, fs, "$")
-        if not ok then displaySuperBadError(err) end
     end)
 
     function coroutine.resumeWithTimeout(co, timeout, ...)
-        local startTime = computer.time()
+        local startTime = EFI.getEpochMs()
         debug.sethook(co, function()
-            if computer.time() > startTime + timeout then
+            if EFI.getEpochMs() > startTime + timeout then
                 return coroutine.yield("timeout")
             end
         end, "", 1000)
@@ -270,7 +496,7 @@ local ok, err = xpcall(function()
         end
     end
 
-    write("Loaded in " .. tostring(apis.os.clock()) .. " seconds.\n")
+    EFI.screenCtl:print("Loaded in " .. tostring(apis.os.clock()) .. " seconds.\n")
 
     while true do
         local status, err = coroutine.resumeWithTimeout(kernelCoro, 50)
@@ -304,11 +530,15 @@ local ok, err = xpcall(function()
             end
         end
         if status == "error" or coroutine.status(kernelCoro) == "dead" then
+            if EFI.reboot then
+                apis.os.reboot()
+            end
             displaySuperBadError("Kernel error: " .. tostring(err))
             coroutine.yield("key")
         end
+        initFs:refresh()
     end
 end, debug.traceback)
 
 if not ok then displaySuperBadError("Fatal error during boot: " .. err) end
-while true do coroutine.yield() end
+while true do coroutine.yield("key") end

Src/Hyperion-firmware-cct/boot/cct/initdisks

@@ -1,36 +1,152 @@
--- :Minify:--
+--:Minify:--
 local apis = ({...})[1]
-local BOOT_DRIVE_PATH = apis.BOOT_DRIVE_PATH or "/$"
+local BOOT_DRIVE_PATH = apis.BOOT_DRIVE_PATH
 local fs = apis.fs
 local native = apis.peripheral
 local peripheral = {}
 local sides = {"top", "bottom", "left", "right", "front", "back"}
 
-function peripheral.getType(name)
-    if native.isPresent(name) then return native.getType(name) end
+function peripheral.getNames()
+    local results = {}
     for n = 1, #sides do
         local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and
-            native.call(side, "isPresentRemote", name) then
-            return native.call(side, "getTypeRemote", name)
+        if native.isPresent(side) then
+            table.insert(results, side)
+            if native.hasType(side, "peripheral_hub") then
+                local remote = native.call(side, "getNamesRemote")
+                for _, name in ipairs(remote) do
+                    table.insert(results, name)
+                end
+            end
+        end
+    end
+    return results
+end
+
+function peripheral.isPresent(name)
+    if native.isPresent(name) then
+        return true
+    end
+
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return true
+        end
+    end
+    return false
+end
+
+function peripheral.getType(peripheral)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.getType(peripheral)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "getTypeRemote", peripheral)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return table.unpack(mt.types)
+    end
+end
+
+function peripheral.hasType(peripheral, peripheral_type)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.hasType(peripheral, peripheral_type)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "hasTypeRemote", peripheral, peripheral_type)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return mt.types[peripheral_type] ~= nil
+    end
+end
+
+function peripheral.getMethods(name)
+    if native.isPresent(name) then
+        return native.getMethods(name)
+    end
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return native.call(side, "getMethodsRemote", name)
         end
     end
     return nil
 end
 
-function peripheral.getNames()
-    local names = {}
+function peripheral.getName(peripheral)
+    local mt = getmetatable(peripheral)
+    if not mt or mt.__name ~= "peripheral" or type(mt.name) ~= "string" then
+        error("bad argument #1 (table is not a peripheral)", 2)
+    end
+    return mt.name
+end
+
+function peripheral.call(name, method, ...)
+    if native.isPresent(name) then
+        return native.call(name, method, ...)
+    end
+
     for n = 1, #sides do
         local side = sides[n]
-        if native.isPresent(side) then table.insert(names, side) end
-        if native.hasType(side, "peripheral_hub") then
-            local hubSides = native.call(side, "getConnectedSides")
-            for _, hubSide in ipairs(hubSides) do
-                table.insert(names, hubSide)
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return native.call(side, "callRemote", name, method, ...)
+        end
+    end
+    return nil
+end
+
+function peripheral.wrap(name)
+    local methods = peripheral.getMethods(name)
+    if not methods then
+        return nil
+    end
+
+    local types = { peripheral.getType(name) }
+    for i = 1, #types do types[types[i]] = true end
+    local result = setmetatable({}, {
+        __name = "peripheral",
+        name = name,
+        type = types[1],
+        types = types,
+    })
+    for _, method in ipairs(methods) do
+        result[method] = function(...)
+            return peripheral.call(name, method, ...)
+        end
+    end
+    return result
+end
+
+function peripheral.find(ty, filter)
+    local results = {}
+    for _, name in ipairs(peripheral.getNames()) do
+        if peripheral.hasType(name, ty) then
+            local wrapped = peripheral.wrap(name)
+            if filter == nil or filter(name, wrapped) then
+                table.insert(results, wrapped)
             end
         end
     end
-    return names
+    return table.unpack(results)
 end
 
 local disks = {}
@@ -125,19 +241,20 @@ internal["$"] = createDisk("$", BOOT_DRIVE_PATH, false, {
     end
 })
 
-local function refresh()
-    for id, _ in pairs(disks) do
-        if not peripheral.getType(id) then disks[id] = nil end
+internal["rom"] = createDisk("rom", "/rom", true, {
+    setLabel = function(label)
+        error("Device is read-only")
+    end,
+    getLabel = function()
+        return "cctrom"
     end
+})
 
-    for _, name in ipairs(peripheral.getNames()) do
-        if peripheral.getType(name) == "disk" then
-            if not disks[name] then
-                local mount = disk.getMountPath(name)
-                if mount then
-                    disks[name] = createDisk(name, mount, false, disk)
-                end
-            end
+local function refresh()
+    disks={}
+    for _, disk in ipairs({peripheral.find("drive")}) do
+        if disk.isDiskPresent() then
+            disks[tostring(disk.getDiskID())]=createDisk("cctdisk"..tostring(disk.getDiskID()), disk.getMountPath(), false, fs)
         end
     end
 end

Src/Hyperion-firmware-cct/lib/modules/CC-Tweaked/25_tty.kmod

@@ -1,410 +0,0 @@
---:Minify:--
-local kernel = ...
-local apis = kernel.apis
-local native = apis.peripheral
-local sides = {"top", "bottom", "left", "right", "front", "back"}
-local peripheral={}
-
-function peripheral.getNames()
-    local results = {}
-    for n = 1, #sides do
-        local side = sides[n]
-        if native.isPresent(side) then
-            table.insert(results, side)
-            if native.hasType(side, "peripheral_hub") then
-                local remote = native.call(side, "getNamesRemote")
-                for _, name in ipairs(remote) do
-                    table.insert(results, name)
-                end
-            end
-        end
-    end
-    return results
-end
-
-function peripheral.isPresent(name)
-    if native.isPresent(name) then
-        return true
-    end
-
-    for n = 1, #sides do
-        local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
-            return true
-        end
-    end
-    return false
-end
-
-function peripheral.getType(peripheral)
-    if type(peripheral) == "string" then
-        if native.isPresent(peripheral) then
-            return native.getType(peripheral)
-        end
-        for n = 1, #sides do
-            local side = sides[n]
-            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
-                return native.call(side, "getTypeRemote", peripheral)
-            end
-        end
-        return nil
-    else
-        local mt = getmetatable(peripheral)
-        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
-            error("bad argument #1 (table is not a peripheral)", 2)
-        end
-        return table.unpack(mt.types)
-    end
-end
-
-function peripheral.hasType(peripheral, peripheral_type)
-    if type(peripheral) == "string" then
-        if native.isPresent(peripheral) then
-            return native.hasType(peripheral, peripheral_type)
-        end
-        for n = 1, #sides do
-            local side = sides[n]
-            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
-                return native.call(side, "hasTypeRemote", peripheral, peripheral_type)
-            end
-        end
-        return nil
-    else
-        local mt = getmetatable(peripheral)
-        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
-            error("bad argument #1 (table is not a peripheral)", 2)
-        end
-        return mt.types[peripheral_type] ~= nil
-    end
-end
-
-function peripheral.getMethods(name)
-    if native.isPresent(name) then
-        return native.getMethods(name)
-    end
-    for n = 1, #sides do
-        local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
-            return native.call(side, "getMethodsRemote", name)
-        end
-    end
-    return nil
-end
-
-function peripheral.getName(peripheral)
-    local mt = getmetatable(peripheral)
-    if not mt or mt.__name ~= "peripheral" or type(mt.name) ~= "string" then
-        error("bad argument #1 (table is not a peripheral)", 2)
-    end
-    return mt.name
-end
-
-function peripheral.call(name, method, ...)
-    if native.isPresent(name) then
-        return native.call(name, method, ...)
-    end
-
-    for n = 1, #sides do
-        local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
-            return native.call(side, "callRemote", name, method, ...)
-        end
-    end
-    return nil
-end
-
-function peripheral.wrap(name)
-    local methods = peripheral.getMethods(name)
-    if not methods then
-        return nil
-    end
-
-    local types = { peripheral.getType(name) }
-    for i = 1, #types do types[types[i]] = true end
-    local result = setmetatable({}, {
-        __name = "peripheral",
-        name = name,
-        type = types[1],
-        types = types,
-    })
-    for _, method in ipairs(methods) do
-        result[method] = function(...)
-            return peripheral.call(name, method, ...)
-        end
-    end
-    return result
-end
-
-function peripheral.find(ty, filter)
-    local results = {}
-    for _, name in ipairs(peripheral.getNames()) do
-        if peripheral.hasType(name, ty) then
-            local wrapped = peripheral.wrap(name)
-            if filter == nil or filter(name, wrapped) then
-                table.insert(results, wrapped)
-            end
-        end
-    end
-    return table.unpack(results)
-end
-
-local icolors = {
-    [0x1] = 1, -- #000000
-    [0x2] = 2, -- #FFFFFF
-    [0x4] = 3, -- #FF0000
-    [0x8] = 4, -- #00FF00
-    [0x10] = 5, -- #0000FF
-    [0x20] = 6, -- #00FFFF
-    [0x40] = 7, -- #FF00FF
-    [0x80] = 8, -- #FFFF00
-    [0x100] = 9, -- #FF6D00
-    [0x200] = 10, -- #6DFF55
-    [0x400] = 11, -- #24FFFF
-    [0x800] = 12, -- #924900
-    [0x1000] = 13, -- #6D6D55
-    [0x2000] = 14, -- #DBDBAA
-    [0x4000] = 15, -- #6D00FF
-    [0x8000] = 16 -- #B6FF00
-}
-
-local colors = {
-    0x0001, -- #000000
-    0x0002, -- #FFFFFF
-    0x0004, -- #FF0000
-    0x0008, -- #00FF00
-    0x0010, -- #0000FF
-    0x0020, -- #00FFFF
-    0x0040, -- #FF00FF
-    0x0080, -- #FFFF00
-    0x0100, -- #FF6D00
-    0x0200, -- #6DFF55
-    0x0400, -- #24FFFF
-    0x0800, -- #924900
-    0x1000, -- #6D6D55
-    0x2000, -- #DBDBAA
-    0x4000, -- #6D00FF
-    0x8000 -- #B6FF00
-}
-
-local function write(text, term)
-    local x, y = term.getCursorPos()
-    local w, h = term.getSize()
-
-    for i = 1, #text do
-        local c = text:sub(i, i)
-
-        if c == "\n" then
-            y = y + 1
-            x = 1
-        elseif c == "\t" then
-            local tabSize = 4
-            local spaces = tabSize - ((x - 1) % tabSize)
-            term.write(string.rep(" ", spaces))
-            x = x + spaces
-        elseif c == "\b" then
-            if x > 1 then
-                x = x - 1
-                term.setCursorPos(x, y)
-                term.write(" ")
-                term.setCursorPos(x, y)
-            end
-        else
-            if x <= w and y <= h then
-                term.setCursorPos(x, y)
-                term.write(c)
-                x = x + 1
-            end
-        end
-
-        if x > w then
-            x = 1
-            y = y + 1
-        end
-
-        if y - 1 >= h then
-            term.scroll(1)
-            y = h
-            term.setCursorPos(x, y)
-        end
-    end
-
-    term.setCursorPos(x, y)
-end
-
-kernel.devfs.data.tty={}
-local ctrl,alt = false, false
-
-local function serializeBool(bool)
-    if bool then
-        return "T"
-    else
-        return "F"
-    end
-end
-
-local function newtty(obj, id, ev)
-    obj.setPaletteColor(0x1, 0xFFFFFF) -- #000000
-    obj.setPaletteColor(0x2, 0xFF0000) -- #FFFFFF
-    obj.setPaletteColor(0x4, 0x00FF00) -- #FF0000
-    obj.setPaletteColor(0x8, 0x0000FF) -- #00FF00
-    obj.setPaletteColor(0x10, 0x00FFFF) -- #0000FF
-    obj.setPaletteColor(0x20, 0xFF00FF) -- #00FFFF
-    obj.setPaletteColor(0x40, 0xFFFF00) -- #FF00FF
-    obj.setPaletteColor(0x80, 0xFF6D00) -- #FFFF00
-    obj.setPaletteColor(0x100, 0x6DFF55) -- #FF6D00
-    obj.setPaletteColor(0x200, 0x24FFFF) -- #6DFF55
-    obj.setPaletteColor(0x400, 0x924900) -- #24FFFF
-    obj.setPaletteColor(0x800, 0x6D6D55) -- #924900
-    obj.setPaletteColor(0x1000, 0xDBDBAA) -- #6D6D55
-    obj.setPaletteColor(0x2000, 0x6D00FF) -- #DBDBAA
-    obj.setPaletteColor(0x4000, 0xB6FF00) -- #6D00FF
-    obj.setPaletteColor(0x8000, 0x000000) -- #B6FF00
-    kernel.devfs.data["tty"][id] = function(op, mode)
-        if op=="type" then
-            return "character device"
-        elseif op=="open" then
-            local h = {
-                read=function(amount)
-                    local rv=""
-                    for i=1, amount or 1 do
-                        local event = {ev()}
-                        if event[1] then
-                            rv=rv..event[1]
-                        end
-                    end
-                    if rv=="" then rv=nil end
-                    return rv
-                end,
-                write=function(content)
-                    write(content, obj)
-                end,
-                size=function()
-                    local s={obj.getSize()}
-                    return table.concat(s,";")
-                end,
-                clear=function()
-                    obj.clear()
-                    obj.setCursorPos(1,1)
-                end,
-                gpos=function()
-                    local s={obj.getCursorPos()}
-                    return table.concat(s,";")
-                end,
-                spos=function(x,y)
-                    return obj.setCursorPos(x,y)
-                end,
-                sfgc=function(c)
-                    return obj.setTextColor(colors[c])
-                end,
-                sbgc=function(c)
-                    return obj.setBackgroundColor(colors[c])
-                end,
-                gfgc=function()
-                    return icolors[obj.getTextColor()]
-                end,
-                gbgc=function()
-                    return icolors[obj.getBackgroundColor()]
-                end,
-                gctrl=function()
-                    return serializeBool(ctrl)..";"..serializeBool(alt)
-                end
-            }
-            if mode=="rw" then
-                return h
-            elseif mode=="r" then
-                h["write"]=nil
-                return h
-            elseif mode=="w" then
-                h["read"]=nil
-                return h
-            end
-        end
-    end
-end
-
-local fifo = kernel.newFifo()
-
-kernel.processes.cctmond = function()
-    local timeout = false
-    while true do
-        local event = {kernel.computer:getMachineEvent()}
-
-        if event[1] then
-            local eventType = event[1]
-            local charOrKey = event[3]
-
-            local ctrlKeyMap = {
-                [apis.keys.a]=1,  [apis.keys.b]=2,  [apis.keys.c]=3,
-                [apis.keys.d]=4,  [apis.keys.e]=5,  [apis.keys.f]=6,
-                [apis.keys.g]=7,  [apis.keys.h]=8,  [apis.keys.i]=9,
-                [apis.keys.j]=10, [apis.keys.k]=11, [apis.keys.l]=12,
-                [apis.keys.m]=13, [apis.keys.n]=14, [apis.keys.o]=15,
-                [apis.keys.p]=16, [apis.keys.q]=17, [apis.keys.r]=18,
-                [apis.keys.s]=19, [apis.keys.t]=20, [apis.keys.u]=21,
-                [apis.keys.v]=22, [apis.keys.w]=23, [apis.keys.x]=24,
-                [apis.keys.y]=25, [apis.keys.z]=26,
-            }
-
-            if eventType == "keyPressed" then
-                if charOrKey == apis.keys.leftCtrl or charOrKey == apis.keys.rightCtrl then
-                    ctrl = true
-                elseif charOrKey == apis.keys.leftAlt or charOrKey == apis.keys.rightAlt then
-                    alt = true
-                end
-
-                if ctrl then
-                    local ctrlByte = ctrlKeyMap[charOrKey]
-                    if ctrlByte then
-                        if ctrlByte == 3 then
-                            for _, task in ipairs(syscall.getTasks()) do
-                                syscall.sigsend(task, 1)
-                            end
-                        else
-                            fifo.push(string.char(ctrlByte))
-                        end
-                    end
-                else
-                    local specialKeyMap = {
-                        [apis.keys.up]        = "",
-                        [apis.keys.down]      = "",
-                        [apis.keys.right]     = "",
-                        [apis.keys.left]      = "",
-                        [apis.keys.home]      = "",
-                        [apis.keys["end"]]    = "",
-                        [apis.keys.pageUp]    = "[5~",
-                        [apis.keys.pageDown]  = "[6~",
-                        [apis.keys.delete]    = "[3~",
-                    }
-                    local special = specialKeyMap[charOrKey]
-                    if special then fifo.push(special) end
-                end
-
-            elseif eventType == "keyReleased" then
-                if charOrKey == apis.keys.leftCtrl or charOrKey == apis.keys.rightCtrl then
-                    ctrl = false
-                elseif charOrKey == apis.keys.leftAlt or charOrKey == apis.keys.rightAlt then
-                    alt = false
-                end
-
-            elseif eventType == "keyTyped" then
-                if charOrKey then fifo.push(charOrKey) end
-            end
-
-            timeout = false
-        else
-            timeout = true
-        end
-
-        if timeout then
-            sleep(0.05)
-        end
-    end
-end
-
-newtty(apis.term, "1", fifo.pop)
-
-for i,v in ipairs({peripheral.find("monitor")}) do
-    v.setTextScale(.5)
-    v.write("Initializing...")
-    newtty(v,tostring(i+1),function () end)
-end

Src/Hyperion-firmware-cct/lib/modules/CC-Tweaked/40_redstone.kmod

@@ -1,26 +0,0 @@
-local args={...}
-local kernel=args[1]
-local driver={}
-
-driver.name="CCT Term Module"
-driver.version="0.1.0"
-driver.type="gpio"
-driver.description="CCT redstone Module Kernel Module"
-driver.arch="cct"
-driver.author="HyperionOS Dev Team"
-driver.license="MIT"
-driver.api={}
-
-function driver.load()
-    -- will 
-end
-
-function driver.unload()
-    -- Nothing to unload
-end
-
-function driver.main()
-    -- Nothing to run
-end
-
--- kernel.drivers.register(driver)

Src/Hyperion-firmware-cct/lib/modules/cc-tweaked/01_periph.kmod

@@ -0,0 +1,152 @@
+--:Minify:--
+-- CCT driver peripheral helper
+local kernel=...
+kernel.cct={}
+kernel.cct.peripheral={}
+local peripheral=kernel.cct.peripheral
+local apis = kernel.apis
+local native = apis.peripheral
+local sides = {"top", "bottom", "left", "right", "front", "back"}
+
+function peripheral.getNames()
+    local results = {}
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.isPresent(side) then
+            table.insert(results, side)
+            if native.hasType(side, "peripheral_hub") then
+                local remote = native.call(side, "getNamesRemote")
+                for _, name in ipairs(remote) do
+                    table.insert(results, name)
+                end
+            end
+        end
+    end
+    return results
+end
+
+function peripheral.isPresent(name)
+    if native.isPresent(name) then
+        return true
+    end
+
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return true
+        end
+    end
+    return false
+end
+
+function peripheral.getType(peripheral)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.getType(peripheral)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "getTypeRemote", peripheral)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return table.unpack(mt.types)
+    end
+end
+
+function peripheral.hasType(peripheral, peripheral_type)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.hasType(peripheral, peripheral_type)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "hasTypeRemote", peripheral, peripheral_type)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return mt.types[peripheral_type] ~= nil
+    end
+end
+
+function peripheral.getMethods(name)
+    if native.isPresent(name) then
+        return native.getMethods(name)
+    end
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return native.call(side, "getMethodsRemote", name)
+        end
+    end
+    return nil
+end
+
+function peripheral.getName(peripheral)
+    local mt = getmetatable(peripheral)
+    if not mt or mt.__name ~= "peripheral" or type(mt.name) ~= "string" then
+        error("bad argument #1 (table is not a peripheral)", 2)
+    end
+    return mt.name
+end
+
+function peripheral.call(name, method, ...)
+    if native.isPresent(name) then
+        return native.call(name, method, ...)
+    end
+
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return native.call(side, "callRemote", name, method, ...)
+        end
+    end
+    return nil
+end
+
+function peripheral.wrap(name)
+    local methods = peripheral.getMethods(name)
+    if not methods then
+        return nil
+    end
+
+    local types = { peripheral.getType(name) }
+    for i = 1, #types do types[types[i]] = true end
+    local result = setmetatable({}, {
+        __name = "peripheral",
+        name = name,
+        type = types[1],
+        types = types,
+    })
+    for _, method in ipairs(methods) do
+        result[method] = function(...)
+            return peripheral.call(name, method, ...)
+        end
+    end
+    return result
+end
+
+function peripheral.find(ty, filter)
+    local results = {}
+    for _, name in ipairs(peripheral.getNames()) do
+        if peripheral.hasType(name, ty) then
+            local wrapped = peripheral.wrap(name)
+            if filter == nil or filter(name, wrapped) then
+                table.insert(results, wrapped)
+            end
+        end
+    end
+    return table.unpack(results)
+end

Src/Hyperion-firmware-cct/lib/modules/cc-tweaked/25_tty.kmod

@@ -0,0 +1,252 @@
+--:Minify:--
+local kernel = ...
+local peripheral=kernel.cct.peripheral
+
+local colors = {
+    [0xFFFFFF]=0x0001,
+    [0xFF0000]=0x0002,
+    [0x00FF00]=0x0004,
+    [0x0000FF]=0x0008,
+    [0x00FFFF]=0x0010,
+    [0xFF00FF]=0x0020,
+    [0xFFFF00]=0x0040,
+    [0xFF6D00]=0x0080,
+    [0x6DFF55]=0x0100,
+    [0x24FFFF]=0x0200,
+    [0x924900]=0x0400,
+    [0x6D6D55]=0x0800,
+    [0xDBDBAA]=0x1000,
+    [0x6D00FF]=0x2000,
+    [0xB6FF00]=0x4000,
+    [0x000000]=0x8000
+}
+
+local plt = {
+    0xFFFFFF,
+    0xFF0000,
+    0x00FF00,
+    0x0000FF,
+    0x00FFFF,
+    0xFF00FF,
+    0xFFFF00,
+    0xFF6D00,
+    0x6DFF55,
+    0x24FFFF,
+    0x924900,
+    0x6D6D55,
+    0xDBDBAA,
+    0x6D00FF,
+    0xB6FF00,
+    0x000000
+}
+
+local fg,bg=0x6D6D55,0x000000
+local l1f,l1d,l2,ops={},{},{},0
+
+local function findClosest(tbl, target)
+    local closest = nil
+    local smallestDiff = math.huge
+
+    for k, _ in pairs(tbl) do
+        if k==target then return k end
+        local diff = math.abs(k - target)
+        if diff < smallestDiff then
+            smallestDiff = diff
+            closest = k
+        end
+    end
+
+    return closest
+end
+
+local function aprox(c24)
+    ops = ops + 1
+
+    if ops % 1024 == 0 then
+        l1d = {}
+        l1f = {}
+    end
+
+    if ops % 8192 == 0 then
+        l2 = {}
+    end
+
+    if l2[c24] ~= nil then
+        return l2[c24]
+    end
+
+    if l1d[c24] ~= nil then
+        l1f[c24] = l1f[c24] + 1
+
+        if l1f[c24] >= 16 then
+            l2[c24] = l1d[c24]
+            l1d[c24] = nil
+            l1f[c24] = nil
+            return l2[c24]
+        end
+
+        return l1d[c24]
+    end
+
+    local closestKey = findClosest(colors, c24)
+    if not closestKey then return nil end
+
+    local value = colors[closestKey]
+
+    l1d[c24] = value
+    l1f[c24] = 1
+
+    return value
+end
+
+local function write(text, term)
+    local x, y = term.getCursorPos()
+    local w, h = term.getSize()
+
+    for i = 1, #text do
+        local c = text:sub(i, i)
+
+        if c == "\n" then
+            y = y + 1
+            x = 1
+        elseif c == "\t" then
+            local tabSize = 4
+            local spaces = tabSize - ((x - 1) % tabSize)
+            term.write(string.rep(" ", spaces))
+            x = x + spaces
+        elseif c == "\b" then
+            if x > 1 then
+                x = x - 1
+                term.setCursorPos(x, y)
+                term.write(" ")
+                term.setCursorPos(x, y)
+            end
+        else
+            if x <= w and y <= h then
+                term.setCursorPos(x, y)
+                term.write(c)
+                x = x + 1
+            end
+        end
+
+        if x > w then
+            x = 1
+            y = y + 1
+        end
+
+        if y - 1 >= h then
+            term.scroll(1)
+            y = h
+            term.setCursorPos(x, y)
+        end
+    end
+
+    term.setCursorPos(x, y)
+end
+
+kernel.devfs.data.tty={}
+kernel.cct.ctrl,kernel.cct.alt = false, false
+
+local function serializeBool(bool)
+    if bool then
+        return "T"
+    else
+        return "F"
+    end
+end
+
+local function newtty(obj, id, ev)
+    obj.setPaletteColor(0x1,    0xFFFFFF) -- #000000
+    obj.setPaletteColor(0x2,    0xFF0000) -- #FFFFFF
+    obj.setPaletteColor(0x4,    0x00FF00) -- #FF0000
+    obj.setPaletteColor(0x8,    0x0000FF) -- #00FF00
+    obj.setPaletteColor(0x10,   0x00FFFF) -- #0000FF
+    obj.setPaletteColor(0x20,   0xFF00FF) -- #00FFFF
+    obj.setPaletteColor(0x40,   0xFFFF00) -- #FF00FF
+    obj.setPaletteColor(0x80,   0xFF6D00) -- #FFFF00
+    obj.setPaletteColor(0x100,  0x6DFF55) -- #FF6D00
+    obj.setPaletteColor(0x200,  0x24FFFF) -- #6DFF55
+    obj.setPaletteColor(0x400,  0x924900) -- #24FFFF
+    obj.setPaletteColor(0x800,  0x6D6D55) -- #924900
+    obj.setPaletteColor(0x1000, 0xDBDBAA) -- #6D6D55
+    obj.setPaletteColor(0x2000, 0x6D00FF) -- #DBDBAA
+    obj.setPaletteColor(0x4000, 0xB6FF00) -- #6D00FF
+    obj.setPaletteColor(0x8000, 0x000000) -- #B6FF00
+    kernel.devfs.data["tty"][id] = function(op, mode)
+        if op=="type" then
+            return "Terminal"
+        elseif op=="open" then
+            local h = {
+                read=function(amount)
+                    local rv=""
+                    for i=1, amount or 1 do
+                        local event = {ev()}
+                        if event[1] then
+                            rv=rv..event[1]
+                        end
+                    end
+                    if rv=="" then rv=nil end
+                    return rv
+                end,
+                write=function(content)
+                    write(content, obj)
+                end,
+                size=function()
+                    local s={obj.getSize()}
+                    return table.concat(s,";")
+                end,
+                clear=function()
+                    obj.clear()
+                    obj.setCursorPos(1,1)
+                end,
+                gpos=function()
+                    local s={obj.getCursorPos()}
+                    return table.concat(s,";")
+                end,
+                spos=function(x,y)
+                    return obj.setCursorPos(x,y)
+                end,
+                sfgc=function(c)
+                    fg=c
+                    return obj.setTextColor(aprox(c))
+                end,
+                sbgc=function(c)
+                    bg=c
+                    return obj.setBackgroundColor(aprox(c))
+                end,
+                gfgc=function()
+                    return fg
+                end,
+                gbgc=function()
+                    return bg
+                end,
+                gctrl=function()
+                    return serializeBool(kernel.cct.ctrl)..";"..serializeBool(kernel.cct.alt)
+                end,
+                gplt=function()
+                    return plt
+                end
+            }
+            if mode=="rw" then
+                return h
+            elseif mode=="r" then
+                h["write"]=nil
+                return h
+            elseif mode=="w" then
+                h["read"]=nil
+                return h
+            end
+        end
+    end
+end
+
+local fifo = kernel.newFifo()
+kernel.cct.fifo=fifo
+
+newtty(kernel.apis.term, "1", fifo.pop)
+
+for i,v in ipairs({peripheral.find("monitor")}) do
+    v.setTextScale(.5)
+    v.write("Initializing...")
+    newtty(v,tostring(i+1),function () end)
+end

Src/Hyperion-firmware-cct/lib/modules/cc-tweaked/30_deamon.kmod

@@ -0,0 +1,86 @@
+--:Minify:--
+local kernel=...
+local keys=kernel.apis.keys
+
+kernel.processes.cctdeamon = function()
+    local timeout = false
+    while true do
+        local event = {kernel.EFI:getMachineEvent()}
+
+        if event[1] then
+            local eventType = event[1]
+            local charOrKey = event[3]
+
+            local ctrlKeyMap = {
+                [keys.a]=1,  [keys.b]=2,  [keys.c]=3,
+                [keys.d]=4,  [keys.e]=5,  [keys.f]=6,
+                [keys.g]=7,  [keys.h]=8,  [keys.i]=9,
+                [keys.j]=10, [keys.k]=11, [keys.l]=12,
+                [keys.m]=13, [keys.n]=14, [keys.o]=15,
+                [keys.p]=16, [keys.q]=17, [keys.r]=18,
+                [keys.s]=19, [keys.t]=20, [keys.u]=21,
+                [keys.v]=22, [keys.w]=23, [keys.x]=24,
+                [keys.y]=25, [keys.z]=26,
+            }
+
+            if eventType == "keyPressed" then
+                if charOrKey == keys.leftCtrl or charOrKey == keys.rightCtrl then
+                    kernel.cct.ctrl = true
+                elseif charOrKey == keys.leftAlt or charOrKey == keys.rightAlt then
+                    kernel.cct.alt = true
+                end
+
+                if kernel.cct.ctrl then
+                    local ctrlByte = ctrlKeyMap[charOrKey]
+                    if ctrlByte then
+                        if ctrlByte == 3 then
+                            for _, task in ipairs(syscall.getTasks()) do
+                                syscall.sigsend(task, 1)
+                            end
+                        else
+                            kernel.cct.fifo.push(string.char(ctrlByte))
+                        end
+                    end
+                else
+                    local specialKeyMap = {
+                        [keys.up]        = "",
+                        [keys.down]      = "",
+                        [keys.right]     = "",
+                        [keys.left]      = "",
+                        [keys.home]      = "",
+                        [keys["end"]]    = "",
+                        [keys.pageUp]    = "[5~",
+                        [keys.pageDown]  = "[6~",
+                        [keys.delete]    = "[3~",
+                    }
+                    local special = specialKeyMap[charOrKey]
+                    if special then kernel.cct.fifo.push(special) end
+                end
+
+            elseif eventType == "keyReleased" then
+                if charOrKey == keys.leftCtrl or charOrKey == keys.rightCtrl then
+                    kernel.cct.ctrl = false
+                elseif charOrKey == keys.leftAlt or charOrKey == keys.rightAlt then
+                    kernel.cct.alt = false
+                end
+
+            elseif eventType == "keyTyped" then
+                if charOrKey then kernel.cct.fifo.push(charOrKey) end
+            elseif eventType == "http_success" then
+                kernel.cct.httpqueue[event[2]]=nil
+                kernel.cct.httpresponse[event[2]]=event[3]
+            elseif eventType == "http_failure" then
+                kernel.cct.httpqueue[event[2]]=nil
+                kernel.cct.httperror[event[2]]=event[3]
+            end
+
+            timeout = false
+        else
+            timeout = true
+        end
+
+        if timeout then
+            sleep(0.05)
+        end
+    end
+end

Src/Hyperion-firmware-cct/lib/modules/cc-tweaked/51_gpio.kmod

@@ -0,0 +1,25 @@
+--:Minify:--
+local kernel=...
+local rs=kernel.apis.rs
+local sides = {top=1, bottom=2, left=3, right=4, front=5, back=6}
+local function newGPIO(side)
+    return function(mode, data)
+        if mode=="w" then
+            if type(data)~="boolean" then error("data: expected bool") end
+            rs.setOutput(side, data)
+        elseif mode=="wa" then
+            if type(data)~="number" then error("data: expected bool") end
+            rs.setAnalogOutput(side, data)
+        elseif mode=="r" then
+            return rs.getInput(side)
+        elseif mode=="ra" then
+            return rs.getAnalogInput(side)
+        end
+    end
+end
+
+for side, alt in pairs(sides) do
+    local func=newGPIO(side)
+    kernel.gpio[side]=func
+    kernel.gpio[alt]=func
+end

Src/Hyperion-kernel/boot/fstab

@@ -1,3 +1,4 @@
 U $;/
 U devfs0000;/dev/
 U tmpfs0000;/tmp/
+U procfs0000;/proc/

Src/Hyperion-kernel/boot/kernel.lua

@@ -1,14 +1,13 @@
 --:Minify:--
-local args = {...}
-local apis = args[1]
-local disks = args[2]
-local arch = args[3]
-local screen = args[5]
-local computer = args[6]
-local ifs = args[7]
+local EFI=...
+EFI.beep(440, 500)
+local screen=EFI.screenCtl
+local ifs=EFI.initfs
+local disks=EFI.disks
+local arch=EFI.architecture
 local kernel = {}
 kernel.LOG_Text=""
-kernel.version="HyperionOS V1.2.3"
+kernel.version="HyperionOS V1.2.4"
 kernel.process = "Kernel"
 kernel.users={[0]="root",[1]="User"}
 kernel.hostname = "hyperion"
@@ -26,28 +25,31 @@ _G.sleep=nil
 local windowsExp = false
 
 function kernel.log(msg, level, c)
-    c=c or 12
-    kernel.LOG_Text = kernel.LOG_Text..string.format("%X",c-1).." "..tostring(computer:time()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n"
+    c=c or 0x6D6D6D
+    kernel.LOG_Text = kernel.LOG_Text..tostring(EFI:date()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n"
     if kernel.status == "start" then
         screen:setTextColor(c)
-        screen:print(tostring(computer:time()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
+        screen:print(tostring(EFI:date()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
     elseif kernel.status == "term" then
         kernel.standbyTask=kernel.currentTask
         kernel.currentTask=kernel.kernelTask
-        kernel.vfs.devctl(1,"sfgc",c)
-        kernel.vfs.write(1,tostring(computer:time()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n")
+        local file=kernel.vfs.open("/dev/console", "w")
+        kernel.vfs.devctl(file,"sfgc",c)
+        kernel.vfs.write(file,tostring(EFI:date()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n")
+        kernel.vfs.close(file)
         kernel.currentTask=kernel.standbyTask
     end
 end
 
 function kernel.PANIC(msg)
     if kernel.status~="Panic" then
-        kernel.log("PANIC: "..msg, "PANIC")
+        kernel.log("PANIC: "..msg, "PANIC", 0xFF0000)
         pcall(kernel["saveLog"])
         kernel.status="Panic"
         kernel.reason=msg
-        screen:setTextColor(2)
-        screen:setBackgroundColor(16)
+        screen:enable()
+        screen:setTextColor(0xFF0000)
+        screen:setBackgroundColor(0x000000)
         screen:clear()
         screen:setCursorPos(1,1)
         screen:print(kernel.LOG_Text)
@@ -56,18 +58,19 @@ function kernel.PANIC(msg)
         kernel.exitMain = true
     end
     while true do
-        local event={computer:getMachineEvent()}
+        local event={EFI:getMachineEvent()}
         if event[1]=="keyPressed" then
             break
         end
     end
-    computer:reboot()
+    EFI.reboot=true
+    error("KERNEL PANIC")
 end
 kernel.panic=kernel.PANIC
 
 if windowsExp then
-    screen:setTextColor(1)
-    screen:setBackgroundColor(4)
+    screen:setTextColor(0xFFFFFF)
+    screen:setBackgroundColor(0x0000FF)
     screen:clear()
     local w,h = screen:getSize()
     screen:setCursorPos(3,5)
@@ -113,8 +116,9 @@ local split = function(str, delim, maxResultCountOrNil)
 end
 
 if not ifs.isFile("/boot/boot.cfg") then
-    kernel.log("boot.cfg missing or corrupted!, Attempting to write recovery boot.cfg", "ERROR", 2)
+    kernel.log("First boot detected writing boot.cfg", "INFO", 0x00FF00)
     ifs.writeAllText("/boot/boot.cfg",ifs.readAllText("/boot/safeboot.cfg"))
+    kernel.firstBoot=true
 end
 
 local initCfgFunc, err = load(ifs.readAllText("/boot/boot.cfg"), "@boot.cfg")
@@ -129,28 +133,34 @@ if not initCfgStatus then
 end
 kernel.config = config
 
+local skip=false
 for i,v in ipairs(split(fstab,"\n")) do
     if v:sub(1,1)=="U" then
         local id=""
         for i=3,#v do
             if v:sub(i,i)==";" then
-                if i==3 then kernel.log("Invalid fstab line... Skipping.","WARN") goto endline end
+                if i==3 then kernel.log("Invalid fstab line... Skipping.","WARN", 0xFF8800) skip = true break end
                 id=v:sub(3,i-1)
             end
         end
+        if not skip then
             local path=v:sub(#id+4)
             ifs.mount(id,path)
-        ::endline::
+        else
+            skip=false
+        end
     end
 end
 kernel.log("Disks initialized")
 
 function kernel.saveLog()
+    if kernel.status=="running" then
+        local file = kernel.vfs.open("/var/log/syslog.log", "w")
+        kernel.vfs.write(file, kernel.LOG_Text)
+        kernel.vfs.close(file)
+    else
         ifs.writeAllText("/var/log/syslog.log", kernel.LOG_Text)
-end
-
-function loadcstr(string)
-    
+    end
 end
 
 function kernel.newFifo()
@@ -190,7 +200,7 @@ kernel.log("Gathering modules")
 for _, i in ipairs(ifs.list("/lib/modules")) do
     local modlist = ifs.list("/lib/modules/"..i)
     if not modlist then
-        kernel.log("WARNING: could not list /lib/modules/"..i.." (skipping)", "WARN", 8)
+        kernel.log("WARNING: could not list /lib/modules/"..i.." (skipping)", "WARN", 0xFF8800)
     else
         for _,v in ipairs(modlist) do
             local prior=tonumber(v:sub(1,2))
@@ -202,8 +212,8 @@ for _, i in ipairs(ifs.list("/lib/modules")) do
 end
 
 kernel.ifs=ifs
-kernel.apis=apis
-kernel.computer=computer
+kernel.apis=EFI.firmware
+kernel.EFI=EFI
 kernel.arch=arch
 kernel.initdisks=disks
 kernel.screen=screen
@@ -232,16 +242,19 @@ kernel.kernelTask = {
 kernel.currentTask = kernel.kernelTask
 
 function kernel.shutdown()
-    kernel.computer:shutdown()
+    kernel.exitMain=true
+    kernel.status="shutdown"
 end
 
 function kernel.reboot()
-    kernel.computer:reboot()
+    kernel.exitMain=true
+    kernel.status="reboot"
 end
 
-kernel.syscalls["time"]=function() return kernel.computer:time() end
+kernel.syscalls["time"]=function() return kernel.EFI:getEpochMs() end
+kernel.syscalls["date"]=function() return kernel.EFI:date() end
 kernel.syscalls["log"]=kernel.log
-kernel.syscalls["getUptime"]=function() return kernel.computer:clock() end
+kernel.syscalls["getUptime"]=function() return kernel.EFI:getUptime() end
 kernel.syscalls["getUsername"]=function(uid) return kernel.users[uid or kernel.uid] end
 kernel.syscalls["getHostname"]=function() return kernel.hostname end
 kernel.syscalls["getHost"]=function() return kernel.apis._HOST end
@@ -255,36 +268,34 @@ kernel.syscalls["sysdump"]=function()
     end
     return rv
 end
-kernel.syscalls["reboot"]=function()
-    kernel.computer:reboot()
-end
-kernel.syscalls["shutdown"]=function()
-    kernel.computer:reboot()
-end
+kernel.syscalls["reboot"]=kernel.reboot
+kernel.syscalls["shutdown"]=kernel.shutdown
 
 kernel.log("Running modules")
 for _,p in ipairs(modules) do
     for _,v in ipairs(p) do
-        if kernel.config.showModLoad then kernel.log("Loading module "..v, "DBUG", 5) end
+        if kernel.config.showModLoad then kernel.log("Loading module "..v, "DBUG", 0x00FFFF) end
         local code=ifs.readAllText(v)
         if not code then
-            kernel.log("ModuReadErr: "..v, "WARN", 8)
-            goto skip
+            kernel.panic("Failed to read module "..v)
         end
         local func,err=load(code,"@"..v)
-        if not func then kernel.panic("ModuLoadErr: "..tostring(err)) goto skip end
+        if not func then kernel.panic("ModuLoadErr: "..tostring(err)) end
         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", 5) end
-        ::skip::
+        if kernel.config.showModLoad then kernel.log("Loaded module "..v, "DBUG", 0x00FFFF) end
     end
 end
 
 kernel.log("Kernel initialized successfully.")
 kernel.saveLog()
 kernel.status="running"
+screen:disable()
 kernel.main()
 if kernel.status=="panic" then
-    kernel.panic()
+    kernel.panic(kernel.reason)
+end
+if kernel.status=="reboot" then
+    EFI.reboot=true
+    return true
 end
-kernel.PANIC("Execution complete")

Src/Hyperion-kernel/boot/safeboot.cfg

@@ -4,8 +4,9 @@
 -- This file is auto-generated during the build process.
 -- DEFAULT BOOT CONFIGURATION FILE
 return {
-    initPath = "/sbin/init.lua",
+    initPath = "/sbin/init",
     maxOpenFiles = 128,
     maxFilesPerTask = 16,
-    preempt=true
+    preempt=true,
+    logTaskExit=true
 }

Src/Hyperion-kernel/lib/modules/hyperion/01_stdlib.kmod

@@ -1,4 +1,5 @@
 --:Minify:--
+--- @diagnostic disable: duplicate-set-field
 local kernel = ...
 kernel.allowGlobalOverwrites = true
 
@@ -172,6 +173,27 @@ function table.indexOf(t, value)
     return -1
 end
 
+function table.merge(...)
+    local args={...}
+    local out = {}
+    local outi = {}
+
+    for _,t in ipairs(args) do
+        for i,v in pairs(t) do
+            out[i]=v
+        end
+        for i,v in ipairs(t) do
+            outi[#outi+1]=v
+        end
+    end
+
+    for i,v in ipairs(outi) do
+        out[i]=v
+    end
+
+    return out
+end
+
 function string.replace(s, target, repl)
     local result = {}
     local i = 1

Src/Hyperion-kernel/lib/modules/hyperion/10_vfs.kmod

@@ -499,7 +499,7 @@ local function checkperms(meta, mode)
     local bitmap = {
         r = {owner = 5, group = 3, everyone = 1},
         w = {owner = 4, group = 2, everyone = 0},
-        a = {owner = 4, group = 2, everyone = 0},
+        a = {owner = 4, group = 2, everyone = 0}
     }
     local m = bitmap[mode]
     if not m then error("EINVAL") end
@@ -544,7 +544,6 @@ local function newFileObj(handle, mode, path, meta, ftype)
 end
 
 function vfs.newfd(fdobj)
-    checkSystemLimit(); total = total + 1
     local fd = allocFD(kernel.currentTask)
     kernel.currentTask.fd[fd] = fdobj
     return fd
@@ -555,8 +554,9 @@ function vfs.mount(target, diskOrId)
     if _euid ~= 0 then error("EPERM") end
     if not target then error("EINVAL") end
     target = normalizeMountPoint(target)
-    if not vfs.exists(target) then vfs.mkdir(target) end
-    if vfs.type(target) ~= "directory" then error("EINVAL") end
+    local drive, path = resolvePath(target)
+    if not drive:directoryExists(path) then drive:makeDirectory(path) end
+    if drive:type(target) ~= "directory" then error("EINVAL") end
 
     local disk, id
     if type(diskOrId) == "string" then
@@ -594,6 +594,21 @@ function vfs.open(path, mode)
     local fd   = allocFD(task)
     local disk, diskPath = resolvePath(path)
     if not disk then error("NODISK") end
+    if (mode=="w" or mode=="a") and disk:isReadOnly() then error("ERDONLY") end
+
+    if kernel.unixSockets[normalizePath(path)] then
+        local meta = kernel.unixSockets[normalizePath(path)].meta
+        if kernel.uid~=0 or kernel.uid~=meta.owner then
+            local groups = (task and task.groups) or kernel.groups or {}
+            local access=false
+            for _, gid in ipairs(groups) do
+                if gid == meta.group then access=true end
+            end
+            if not access then error("EACCES") end
+        end
+        task[fd]=kernel.unixSockets[normalizePath(path)]
+        return fd
+    end
 
     local meta = getFileMeta(path)
     local isNew = (mode == "w" or mode == "a") and not disk:fileExists(diskPath)
@@ -695,10 +710,18 @@ function vfs.sendfile(outfd, infd, count)
 end
 
 function vfs.stat(path)
+    local attrs
+    local meta
+    if meta.etype == 0x02 then
+        attrs = { size=0, modified=0, created=0 }
+    else
         local disk, diskPath = resolvePath(path)
-    local meta  = getFileMeta(path)
-    local ok, attrs = pcall(disk.attributes, disk, diskPath)
+        meta  = getFileMeta(path)
+        local ok
+        ok, attrs = pcall(disk.attributes, disk, diskPath)
         if not ok then attrs = { size=0, modified=0, created=0 } end
+    end
+
     return {
         size     = attrs.size,
         modified = attrs.modified,
@@ -713,15 +736,15 @@ end
 
 function vfs.lstat(path)
     local meta = getFileMeta(path, true)
-
     local attrs
-    if meta.etype == 0x01 then
+    if meta.etype == 0x01 or meta.etype == 0x02 then
         attrs = { size=0, modified=0, created=0 }
     else
         local disk, diskPath = resolvePath(path, true)
         local ok, a = pcall(disk.attributes, disk, diskPath)
         attrs = ok and a or { size=0, modified=0, created=0 }
     end
+
     return {
         size     = attrs.size,
         modified = attrs.modified,
@@ -738,8 +761,15 @@ end
 function vfs.fstat(fd)
     local file = kernel.currentTask.fd[fd]
     if not file then error("EBADF") end
-    local disk, diskPath = resolvePath(file.path)
-    local attrs = disk:attributes(diskPath)
+    local attrs
+    if file.meta.etype == 0x02 then
+        attrs = { size=0, modified=0, created=0 }
+    else
+        local disk, diskPath = resolvePath(file.path, true)
+        local ok, a = pcall(disk.attributes, disk, diskPath)
+        attrs = ok and a or { size=0, modified=0, created=0 }
+    end
+
     return {
         size    = attrs.size,
         modified = attrs.modified,
@@ -768,6 +798,14 @@ function vfs.listdir(path)
         end
     end
 
+    for k,v in pairs(kernel.unixSockets) do
+        local p=normalizePath(path)
+        if k:match("^(.*)/[^/]+$")==p then
+            seen[v.name]=true
+            table.insert(out, v.name)
+        end
+    end
+
     local mp
     if diskPath == "/" then
         mp = ".meta"
@@ -796,6 +834,7 @@ function vfs.mkdir(path)
     local parentMeta = getFileMeta(parent)
     checkperms(parentMeta, "w")
     local disk, diskPath = resolvePath(path)
+    if disk:isReadOnly() then error("ERDONLY") end
     disk:makeDirectory(diskPath)
     local task = kernel.currentTask
     local euid = (task and (task.euid or task.uid)) or kernel.uid
@@ -817,8 +856,13 @@ function vfs.remove(path)
 
     local meta = getFileMeta(path, true)
 
-    if kernel.unixSockets and kernel.unixSockets[path] then
-        kernel.unixSockets[path] = nil
+    if kernel.unixSockets and kernel.unixSockets[normalizePath(path)] then
+        if kernel.uid ~= 0 then
+            if kernel.unixSockets[normalizePath(path)].meta.owner~=kernel.uid then
+                error("EACCES")
+            end
+        end
+        kernel.unixSockets[normalizePath(path)] = nil
     end
 
     if meta.etype == 0x01 then
@@ -827,6 +871,7 @@ function vfs.remove(path)
         if parent == "" then parent = "/" end
         local name   = norm:match("[^/]+$")
         local disk, parentDiskPath = resolveMount(parent)
+        if disk:isReadOnly() then error("ERDONLY") end
         local mp
         if parentDiskPath == "/" then mp = ".meta"
         else mp = parentDiskPath:gsub("^/+", "") .. "/.meta" end
@@ -843,6 +888,7 @@ function vfs.remove(path)
         if f2.close then f2.close() end
     else
         local disk, diskPath = resolvePath(path)
+        if disk:isReadOnly() then error("ERDONLY") end
         disk:remove(diskPath)
     end
 end
@@ -851,6 +897,8 @@ function vfs.symlink(target, linkPath)
     if type(target) ~= "string" or type(linkPath) ~= "string" then error("EINVAL") end
     local norm   = normalizePath(linkPath)
     local parent = norm:match("^(.*)/[^/]+$") or "/"
+    local disk = resolveMount(linkPath)
+    if disk:isReadOnly() then error("ERDONLY") end
     if parent == "" then parent = "/" end
     local name   = norm:match("[^/]+$")
     if not name then error("EINVAL") end
@@ -880,7 +928,13 @@ function vfs.readlink(path)
 end
 
 function vfs.access(path, mode)
-    local meta = getFileMeta(path)
+    local meta
+    if kernel.unixSockets[normalizePath(path)] then
+        meta = kernel.unixSockets[normalizePath(path)].meta
+    else
+        meta = getFileMeta(path)
+    end
+
     for i = 1, #mode do
         checkperms(meta, mode:sub(i,i))
     end
@@ -891,6 +945,8 @@ local function updateMeta(path, fn, noFollow)
     local real   = namei(path, noFollow)
     local norm   = real
     local parent = norm:match("^(.*)/[^/]+$") or "/"
+    local disk = resolveMount(path)
+    if disk:isReadOnly() then error("ERDONLY") end
     if parent == "" then parent = "/" end
     local name   = norm:match("[^/]+$")
     if not name then error("EINVAL") end
@@ -917,6 +973,9 @@ local function updateMeta(path, fn, noFollow)
 end
 
 function vfs.chmod(path, perms)
+    if kernel.unixSockets[normalizePath(path)] then error("EINVAL") end
+    local disk = resolveMount(path)
+    if disk:isReadOnly() then error("ERDONLY") end
     local meta = getFileMeta(path)
     local euid = (kernel.currentTask and (kernel.currentTask.euid or kernel.currentTask.uid)) or kernel.uid
     if euid ~= 0 and euid ~= meta.owner then error("EACCES") end
@@ -926,10 +985,14 @@ end
 function vfs.fchmod(fd, perms)
     local file = kernel.currentTask.fd[fd]
     if not file then error("EBADF") end
+    if file.etype==0x02 then error("EINVAL") end
     vfs.chmod(file.path, perms)
 end
 
 function vfs.chown(path, uid, gid)
+    if kernel.unixSockets[normalizePath(path)] then error("EINVAL") end
+    local disk = resolveMount(path)
+    if disk:isReadOnly() then error("ERDONLY") end
     local _euid = (kernel.currentTask and (kernel.currentTask.euid or kernel.currentTask.uid)) or kernel.uid
     if _euid ~= 0 then error("EPERM") end
     updateMeta(path, function(e) e.owner = uid; e.group = gid end)
@@ -938,20 +1001,29 @@ end
 function vfs.fchown(fd, uid, gid)
     local file = kernel.currentTask.fd[fd]
     if not file then error("EBADF") end
+    if file.etype==0x02 then error("EINVAL") end
     vfs.chown(file.path, uid, gid)
 end
 
 function vfs.exists(path)
+    if kernel.unixSockets[normalizePath(path)] then return true end
     local meta = getFileMeta(path, true)
     if meta.etype == 0x01 then return true end
     local ok, disk, diskPath = pcall(resolvePath, path)
     if not ok then return false end
-    return disk:fileExists(diskPath)
+    if disk:type(diskPath) then
+        return true
+    else
+        return false
+    end
 end
 
 function vfs.type(path)
     local meta = getFileMeta(path, true)
     if meta.etype == 0x01 then return "symlink" end
+    if kernel.unixSockets[normalizePath(path)] then
+        return "socket"
+    end
     local ok, disk, diskPath = pcall(resolvePath, path)
     if not ok then return nil end
     return disk:type(diskPath)

Src/Hyperion-kernel/lib/modules/hyperion/12_devfs.kmod

@@ -50,7 +50,7 @@ function proxy:type(path, mode)
     if type(step[steps[#steps]]) == "table" then
         return "directory"
     end
-    error("ENOENT")
+    error(type(step[steps[#steps]]))
 end
 
 function proxy:list(path)
@@ -140,6 +140,82 @@ function data.zero(op, mode)
     end
 end
 
+if kernel.EFI:getEEPROM() then
+    function data.eeprom(op, mode)
+        if op=="type" then
+            return "character device"
+        elseif op=="open" then
+            if mode=="r" then
+                local ptr,eeprom=1,kernel.EFI:getEEPROM()
+                return {
+                    read=function(amount)
+                        ptr=ptr+amount
+                        return eeprom:sub(ptr-amount, ptr)
+                    end
+                }
+            elseif mode=="w" then
+                if kernel.uid~=0 then error("EACCES") end
+                local firstwrite=true
+                return {
+                    write=function(data)
+                        if firstwrite then
+                            kernel.EFI:setEEPROM(data)
+                        else
+                            kernel.EFI:setEEPROM(kernel.EFI:getEEPROM()..data)
+                        end
+                    end
+                }
+            elseif mode=="a" then
+                if kernel.uid~=0 then error("EACCES") end
+                return {
+                    write=function(data)
+                        kernel.EFI:setEEPROM(kernel.EFI:getEEPROM()..data)
+                    end
+                }
+            else error("EACCES")
+            end
+        end
+    end
+end
+
+if kernel.EFI:getNvram() then
+    function data.nvram(op, mode)
+        if op=="type" then
+            return "character device"
+        elseif op=="open" then
+            if mode=="r" then
+                local ptr,nvram=1,kernel.EFI:getNvram()
+                return {
+                    read=function(amount)
+                        ptr=ptr+amount
+                        return nvram:sub(ptr-amount, ptr)
+                    end
+                }
+            elseif mode=="w" then
+                if kernel.uid~=0 then error("EACCES") end
+                local firstwrite=true
+                return {
+                    write=function(data)
+                        if firstwrite then
+                            kernel.EFI:setNvram(data)
+                        else
+                            kernel.EFI:setNvram(kernel.EFI:getNvram()..data)
+                        end
+                    end
+                }
+            elseif mode=="a" then
+                if kernel.uid~=0 then error("EACCES") end
+                return {
+                    write=function(data)
+                        kernel.EFI:setNvram(kernel.EFI:getNvram()..data)
+                    end
+                }
+            else error("EACCES")
+            end
+        end
+    end
+end
+
 data["disk"]={}
 kernel.devfs={}
 kernel.devfs.data=data

Src/Hyperion-kernel/lib/modules/hyperion/12_procfs.kmod

@@ -0,0 +1,265 @@
+--:Minify:--
+local kernel = ...
+
+local proxy = {}
+local data = {}
+
+proxy.address = "procfs0000"
+proxy.isvirt = true
+proxy.isReadOnly = function() return true end
+proxy.spaceUsed = function() return 0 end
+proxy.spaceTotal = function() return 0 end
+proxy.makeDirectory = function() error("EACCES") end
+proxy.remove = function() error("EACCES") end
+proxy.setLabel = function() error("EACCES") end
+proxy.getLabel = function() return "procfs" end
+proxy.attributes = function(path) return {
+    size = 0,
+    modified = 0,
+    created = 0
+} end
+
+local function buildMeta(entries, opts)
+    opts = opts or {}
+    local uid = opts.uid or 0
+    local gid = opts.gid or 0
+    local perms = opts.perms or 0x3F  -- default read/write for owner/group/world
+
+    local chunks = {}
+    table.insert(chunks, string.char(0x02))  -- version header
+
+    for path, target in pairs(entries) do
+        local name = path
+        local nameLen = #name
+        if nameLen > 255 then
+            error("Filename too long (>255 bytes): "..name)
+        end
+
+        -- Determine entry type: 0x01 = symlink if target ~= nil and target ~= ""
+        local entryType = 0x00
+        local cmeta = ""
+        if target and target ~= "" then
+            entryType = 0x01
+            cmeta = target
+        end
+        local cmetaLen = #cmeta
+        if cmetaLen > 255 then
+            error("cmeta too long (>255 bytes) for "..name)
+        end
+
+        -- Build entry as bytes
+        table.insert(chunks, string.char(nameLen))    -- name length
+        table.insert(chunks, name)                    -- name
+        table.insert(chunks, string.char(entryType))  -- entry type
+        table.insert(chunks, string.char(uid % 256, math.floor(uid/256) % 256))  -- uid
+        table.insert(chunks, string.char(gid % 256, math.floor(gid/256) % 256))  -- gid
+        table.insert(chunks, string.char(perms % 256, math.floor(perms/256) % 256)) -- perms
+        table.insert(chunks, string.char(cmetaLen))   -- cmeta length
+        if cmetaLen > 0 then
+            table.insert(chunks, cmeta)
+        end
+    end
+
+    return table.concat(chunks)
+end
+
+local function simpleFile(r,w)
+    return function(op, mode)
+        if op=="type" then
+            return "character device"
+        elseif op=="open" then
+            if mode=="r" then
+                return {
+                    read=r
+                }
+            elseif mode=="w" then
+                return {
+                    write=w
+                }
+            end
+        end
+    end
+end
+
+local function strFile(str)
+    local dat=tostring(str)
+    local pos=1
+    return simpleFile(function(amount)
+        pos=pos+amount
+        return dat:sub(pos-amount, pos)
+    end,function() error("EACCES") end)
+end
+
+local function newtaskproxy(task)
+    local files,siblings,children={},{},{}
+    if task.fd[0] then files["0"]=task.fd[0].path end
+    for i,v in ipairs(task.fd) do
+        files[tostring(i)]=tostring(v.path)
+    end
+    for i,v in ipairs(task.siblings) do
+        siblings[tostring(v.pid)]="/proc/"..tostring(v.pid)
+    end
+    for i,v in ipairs(task.children) do
+        children[tostring(v.pid)]="/proc/"..tostring(v.pid)
+    end
+    return {
+        [".meta"]=strFile(buildMeta({cwd=task.cwd,parent="/proc/"..tostring(task.parent.pid)})),
+        uid=strFile(task.uid),
+        comm=strFile(task.name),
+        fd={
+            [".meta"]=strFile(buildMeta(files))
+        },
+        siblings={
+            [".meta"]=strFile(buildMeta(siblings))
+        },
+        children={
+            [".meta"]=strFile(buildMeta(children))
+        }
+    }
+end
+
+function proxy:open(path, mode)
+    local steps = kernel.vfs.splitPath(path)
+    local step = data
+    if tonumber(steps[1]) then
+        local task=kernel.tasks[tostring(steps[1])]
+        local step = newtaskproxy(task)
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("open", mode)
+        end
+    elseif tostring(steps[1])=="self" then
+        local task=kernel.currentTask
+        local step = newtaskproxy(task)
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("open", mode)
+        end
+    else
+        for i=1, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("open", mode)
+        end
+    end
+    error("ENFILE")
+end
+
+function proxy:type(path, mode)
+    local steps = kernel.vfs.splitPath(path)
+    local step = data
+    if #steps == 0 then
+        return "directory"
+    end
+    if tonumber(steps[1]) then
+        local task=kernel.tasks[steps[1]]
+        if #steps==1 then return "directory" end
+        local step = newtaskproxy(task)
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("type", mode)
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return "directory"
+        end
+    elseif tostring(steps[1])=="self" then
+        local task=kernel.currentTask
+        if #steps==1 then return "directory" end
+        local step = newtaskproxy(task)
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("type", mode)
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return "directory"
+        end
+    else
+        for i=1, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("type", mode)
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return "directory"
+        end
+    end
+    error("ENOENT")
+end
+
+function proxy:list(path)
+    local steps = kernel.vfs.splitPath(path)
+    local step = data
+    if #steps == 0 then
+        return table.merge(table.keys(data),table.keys(kernel.tasks),{"self"})
+    end
+    if tonumber(steps[1]) then
+        local task=kernel.tasks[steps[1]]
+        local step = newtaskproxy(task)
+        if #steps==1 then return table.keys(step) end
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENOENT") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return table.keys(step[steps[#steps]])
+        end
+    elseif tostring(steps[1])=="self" then
+        local task=kernel.currentTask
+        local step = newtaskproxy(task)
+        if #steps==1 then return table.keys(step) end
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENOENT") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return table.keys(step[steps[#steps]])
+        end
+    else
+        for i=1, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENOENT") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return table.keys(step[steps[#steps]])
+        end
+    end
+    error("ENOENT")
+end
+
+function proxy:fileExists(path)
+    local ok = pcall(function()
+        return self:type(path)
+    end)
+    return ok
+end
+
+data.uptime=simpleFile(function()return tostring(kernel.EFI:getUptime())end,function()error("EACCES")end)
+kernel.procfs={}
+kernel.procfs.data=data
+kernel.procfs.proxy=proxy
+kernel.disks["procfs0000"]=proxy

Src/Hyperion-kernel/lib/modules/hyperion/19_fstab.kmod

@@ -21,7 +21,7 @@ for _, line in ipairs(string.split(kernel.fstab, "\n")) do
         end
 
         if not semicolon_pos or semicolon_pos == 3 then
-            kernel.log("Invalid fstab line: "..line.." ... Skipping.", "WARN", 8)
+            kernel.log("Invalid fstab line: "..line.." ... Skipping.", "WARN", 0xFF8800)
         else
             local id = line:sub(3, semicolon_pos - 1)
             local path = trim(line:sub(semicolon_pos + 1))

Src/Hyperion-kernel/lib/modules/hyperion/20_signals.kmod

@@ -12,13 +12,24 @@ function signal.sigsend(pid, sig)
 end
 
 function signal.sigcatch(handler)
-    kernel.currentTask.sigh=handler
-    if not kernel.currentTask.sigq then kernel.currentTask.sigq={} end
+    local task=kernel.currentTask
+    task.sigh=handler
+    if not task.sigq then task.sigq={} end
+    local handle={
+        error="",
+        active=true
+    }
+    if task.sigd then task.sigd.active=false; end
+    task.sigd=handle
+    return handle
 end
 
 function signal.sigignore()
-    kernel.currentTask.sigh=nil
-    kernel.currentTask.sigq=nil
+    local task=kernel.currentTask
+    task.sigh=nil
+    task.sigq=nil
+    if task.sigd then task.sigd.active=false end
+    task.sigd=nil
 end
 
 local s=kernel.syscalls

Src/Hyperion-kernel/lib/modules/hyperion/20_socket.kmod

@@ -2,10 +2,7 @@
 -- Supports:
 --   AF_UNIX  - local IPC via /var/run/*.sock paths
 --   AF_INET  - network sockets with three backends:
---     rednet://0.0.B.C  or  rednet+PROTO://0.0.B.C    -> CC rednet (computer B*256+C)
---     modem://0.0.B.C                                 -> raw CC modem frames
---     http://host/path  or  https://...               -> HTTP via CC http API
---     A.B.C.D (dotted quad, non-zero A)               -> HTTP
+--      Implemented by drivers but expect http:// and https://
 --
 -- Socket lifecycle:
 --   fd = syscall.socket(domain, socktype)   -- "unix"/"inet", "stream"/"dgram"
@@ -18,539 +15,44 @@
 --   syscall.sockshutdown(fd)                -- half-close send side
 --   -- normal vfs.close(fd) closes the socket
 
-local kernel = ...
+local kernel=...
+local socket={}
+socket.handlers={}
+kernel.socket=socket
 
-local sockets    = {}
-local unixSocks  = {}
-local nextSockId = 1
-
-local function allocSockId()
-    local id = nextSockId
-    nextSockId = nextSockId + 1
-    return id
+function socket.registerProtocal(protocal, handler)
+    socket.handlers[protocal] = handler
 end
 
-local function parseAddress(addr)
-    if not addr then error("EINVAL") end
+function socket.socket()
+    local P=kernel.vfs.P
+    local data=kernel.newFifo()
+    local isClosed=false
+    kernel.vfs.newfd({
+        handle={
+            read=function() if isClosed then error("ECCON") end return data.read() end,
+            write=function() if isClosed then error("ECCON") end return data.write() end,
+            close=function() isClosed = true end
+        },
+        type="socket",
+        refcount=1,
 
-    if addr:sub(1,1) == "/" or addr:sub(1,5) == "unix:" then
-        local path = addr:sub(1,5) == "unix:" and addr:sub(6) or addr
-        return { backend="unix", path=path }
-    end
-
-    local rproto, raddr = addr:match("^rednet%+?([^:/]*)://(.+)$")
-    if raddr then
-        local a,b,c,d = raddr:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")
-        if not a then error("EINVAL: bad rednet address " .. raddr) end
-        local compId = tonumber(c)*256 + tonumber(d)
-        return { backend="rednet", compId=compId,
-                 protocol=(rproto ~= "" and rproto or "hyperion") }
-    end
-
-    local maddr = addr:match("^modem://(.+)$")
-    if maddr then
-        local a,b,c,d = maddr:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")
-        if not a then error("EINVAL: bad modem address " .. maddr) end
-        local compId = tonumber(c)*256 + tonumber(d)
-        local port = tonumber(maddr:match(":(%d+)$")) or 0
-        return { backend="modem", compId=compId, port=port }
-    end
-
-    local scheme, rest = addr:match("^(https?)://(.+)$")
-    if scheme then
-        return { backend=scheme, url=addr }
-    end
-
-    local a,b,c,d = addr:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)")
-    if a and tonumber(a) ~= 0 then
-        return { backend="http", url="http://" .. addr }
-    end
-
-    error("EINVAL: unrecognised address format: " .. tostring(addr))
-end
-
-local rednetOpen = false
-local function ensureRednet()
-    if rednetOpen then return end
-    local rn = kernel.apis and kernel.apis.rednet
-    if not rn then error("ENODEV: no rednet API available") end
-    local peripheral = kernel.apis.peripheral
-    if peripheral then
-        for _, name in ipairs(peripheral.getNames and peripheral.getNames() or {}) do
-            if peripheral.getType(name) == "modem" then
-                pcall(rn.open, name)
-            end
-        end
-    end
-    rednetOpen = true
-end
-
-local function getModem()
-    local peripheral = kernel.apis and kernel.apis.peripheral
-    if not peripheral then error("ENODEV") end
-    for _, name in ipairs(peripheral.getNames and peripheral.getNames() or {}) do
-        if peripheral.getType(name) == "modem" then
-            local m = peripheral.wrap(name)
-            if m then return m, name end
-        end
-    end
-    error("ENODEV: no modem peripheral found")
-end
-
-local function pumpEvents()
-    local ev = kernel.computer:getMachineEvent()
-    while ev do
-        if ev == "rednet_message" then
-            for _, sock in pairs(sockets) do
-                if sock.backend == "rednet" and sock.bound then
-                    if sock.address.protocol == tostring(select(4, table.unpack({ev}))) or
-                       sock.address.protocol == "hyperion" then
-                    end
-                end
-            end
-        end
-        ev = kernel.computer:getMachineEvent()
-    end
-end
-
-local function pollEvent()
-    local results = table.pack(kernel.computer:getMachineEvent())
-    if results.n == 0 or results[1] == nil then return nil end
-    return results
-end
-
-local function dispatchEvent(ev)
-    if not ev then return end
-    local evtype = ev[1]
-
-    if evtype == "rednet_message" then
-        local senderId = ev[2]
-        local message  = ev[3]
-        local protocol = ev[4] or "hyperion"
-        for _, sock in pairs(sockets) do
-            if sock.backend == "rednet" and (sock.listening or sock.connected) then
-                if sock.address and sock.address.protocol == protocol then
-                    table.insert(sock.rxbuf, { from=senderId, data=message })
-                end
-            end
-        end
-
-    elseif evtype == "modem_message" then
-        local channel = ev[3]
-        local msg     = ev[5]
-        local fromCh  = ev[4]
-        for _, sock in pairs(sockets) do
-            if sock.backend == "modem" and sock.modemChannel == channel then
-                table.insert(sock.rxbuf, { from=fromCh, data=msg })
-            end
-        end
-
-    elseif evtype == "http_success" then
-        local url    = ev[2]
-        local handle = ev[3]
-        for _, sock in pairs(sockets) do
-            if sock.backend == "http" or sock.backend == "https" then
-                if sock.pendingUrl == url then
-                    local body = handle.readAll and handle.readAll() or ""
-                    handle.close()
-                    table.insert(sock.rxbuf, { data=body, done=true })
-                    sock.pendingUrl = nil
-                    sock.connected  = true
-                end
-            end
-        end
-
-    elseif evtype == "http_failure" then
-        local url = ev[2]
-        local err = ev[3]
-        for _, sock in pairs(sockets) do
-            if (sock.backend == "http" or sock.backend == "https") and
-               sock.pendingUrl == url then
-                sock.error     = err
-                sock.pendingUrl = nil
-            end
-        end
-    end
-end
-
-local function pumpAll()
-    local ev = pollEvent()
-    while ev do
-        dispatchEvent(ev)
-        ev = pollEvent()
-    end
-end
-
-local function newSocket(domain, socktype)
-    local sock = {
-        id       = allocSockId(),
-        domain   = domain,    -- "unix" | "inet"
-        socktype = socktype,  -- "stream" | "dgram"
-        backend  = nil,
-        state    = "idle",    -- idle | bound | listening | connected | closed
-        rxbuf    = {},
-        txbuf    = {},
-        backlog  = {},
-        address  = nil,
-        peer     = nil,
-        modemChannel = nil,
-        modem        = nil,
-        pendingUrl = nil,
-        bound     = false,
-        listening = false,
-        connected = false,
-        error     = nil,
-    }
-    sockets[sock.id] = sock
-    return sock
-end
-
-local sockSend, sockClose
-
-local function socketToFd(sock)
-    return {
-        isSocket = true,
-        sockId   = sock.id,
-        mode     = "rw",
-        meta     = { etype=0, owner=0, group=0, perms=0x1FF, cmeta="" },
-        type     = "socket",
-        refcount = 1,
-        handle   = {
-            read = function(count)
-                pumpAll()
-                if #sock.rxbuf == 0 then return "" end
-                local item = table.remove(sock.rxbuf, 1)
-                local data = type(item) == "table" and (item.data or "") or tostring(item)
-                if count and #data > count then
-                    table.insert(sock.rxbuf, 1, { data=data:sub(count+1), from=item.from })
-                    data = data:sub(1, count)
-                end
-                return data
-            end,
-            write = function(data)
-                if sock.state == "closed" then error("EBADF") end
-                return sockSend(sock, data)
-            end,
-            close = function()
-                sockClose(sock)
-            end,
-        }
-    }
-end
-
-sockSend = function(sock, data)
-    if sock.backend == "unix" then
-        local peer = sock.peer
-        if not peer then error("ENOTCONN") end
-        table.insert(peer.rxbuf, { data=data })
-        return #data
-
-    elseif sock.backend == "rednet" then
-        ensureRednet()
-        local rn = kernel.apis.rednet
-        rn.send(sock.address.compId, data, sock.address.protocol)
-        return #data
-
-    elseif sock.backend == "modem" then
-        local modem = sock.modem
-        if not modem then error("ENOTCONN") end
-        modem.transmit(sock.address.port, sock.modemChannel or 0, data)
-        return #data
-
-    elseif sock.backend == "http" or sock.backend == "https" then
-        local http = kernel.apis and kernel.apis.http
-        if not http then error("ENODEV: no http API") end
-        local url = sock.address.url
-        local ok, err = pcall(http.request, url, data, {
-            ["Content-Type"] = "application/octet-stream"
+        meta={
+            owner=kernel.currentTask.uid,
+            group=kernel.currentTask.uid,
+            etype=2,
+            perms=P.OWNER_R+P.OWNER_W+P.GROUP_R+P.GROUP_W
+        },
+        isvirt=true
     })
-        if not ok then error("ENETDOWN: " .. tostring(err)) end
-        sock.pendingUrl = url
-        return #data
-    end
-    error("EPROTONOSUPPORT")
 end
 
-sockClose = function(sock)
-    if sock.state == "closed" then return end
-    sock.state = "closed"
+function socket.connect(fd, address)
     
-    if sock.backend == "unix" then
-        if sock.peer then
-            sock.peer.peer  = nil
-            sock.peer.state = "closed"
-        end
-        if sock.bound and sock.address and sock.address.path then
-            unixSocks[sock.address.path] = nil
-        end
-
-    elseif sock.backend == "modem" and sock.modem and sock.modemChannel then
-        pcall(sock.modem.close, sock.modemChannel)
-
-    elseif sock.backend == "rednet" then
-    end
-
-    sockets[sock.id] = nil
 end
 
-kernel.syscalls["socket"] = function(domain, socktype)
-    domain   = domain   or "inet"
-    socktype = socktype or "stream"
-    if domain ~= "unix" and domain ~= "inet" then error("EAFNOSUPPORT") end
-    if socktype ~= "stream" and socktype ~= "dgram" then error("EPROTOTYPE") end
+function socket.listen(fd, backlog)
     
-    local sock = newSocket(domain, socktype)
-    local fdobj = socketToFd(sock)
-    local fd = kernel.vfs.newfd(fdobj)
-    return fd
 end
 
-kernel.syscalls["bind"] = function(fd, address)
-    local task = kernel.currentTask
-    local fdobj = task.fd[fd]
-    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
-    local sock = sockets[fdobj.sockId]
-    if not sock then error("EBADF") end
-    if sock.bound then error("EINVAL") end
-
-    local parsed = parseAddress(address)
-
-    if parsed.backend == "unix" then
-        local existing = unixSocks[parsed.path]
-        if existing then
-            if existing.state == "closed" then
-                unixSocks[parsed.path] = nil
-            else
-                error("EADDRINUSE")
-            end
-        end
-        sock.backend = "unix"
-        sock.address = parsed
-        sock.bound   = true
-        sock.state   = "bound"
-        unixSocks[parsed.path] = sock
-
-    elseif parsed.backend == "rednet" then
-        ensureRednet()
-        sock.backend = "rednet"
-        sock.address = parsed
-        sock.bound   = true
-        sock.state   = "bound"
-
-    elseif parsed.backend == "modem" then
-        local modem, side = getModem()
-        sock.backend      = "modem"
-        sock.address      = parsed
-        sock.modem        = modem
-        sock.modemChannel = parsed.port
-        sock.bound        = true
-        sock.state        = "bound"
-        modem.open(parsed.port)
-
-    else
-        error("EOPNOTSUPP: cannot bind to " .. parsed.backend .. " address")
-    end
-end
-
-kernel.syscalls["listen"] = function(fd, backlog)
-    local task  = kernel.currentTask
-    local fdobj = task.fd[fd]
-    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
-    local sock = sockets[fdobj.sockId]
-    if not sock then error("EBADF") end
-    if not sock.bound then error("EDESTADDRREQ") end
-    sock.listening = true
-    sock.state     = "listening"
-    sock.maxBacklog = backlog or 5
-end
-
-kernel.syscalls["accept"] = function(fd)
-    local task  = kernel.currentTask
-    local fdobj = task.fd[fd]
-    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
-    local sock = sockets[fdobj.sockId]
-    if not sock then error("EBADF") end
-    if not sock.listening then error("EINVAL") end
-
-    local deadline = kernel.computer:time() + 30000
-    while #sock.backlog == 0 do
-        pumpAll()
-        if kernel.computer:time() > deadline then error("ETIMEDOUT") end
-        coroutine.yield()
-    end
-
-    local clientSock = table.remove(sock.backlog, 1)
-    local cfdobj     = socketToFd(clientSock)
-    local newfd      = kernel.vfs.newfd(cfdobj)
-    return newfd
-end
-
-kernel.syscalls["connect"] = function(fd, address)
-    local task  = kernel.currentTask
-    local fdobj = task.fd[fd]
-    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
-    local sock = sockets[fdobj.sockId]
-    if not sock then error("EBADF") end
-    if sock.connected then error("EISCONN") end
-
-    local parsed = parseAddress(address)
-    sock.address = parsed
-    sock.backend = parsed.backend
-
-    if parsed.backend == "unix" then
-        local server = unixSocks[parsed.path]
-        if not server then error("ECONNREFUSED") end
-        if not server.listening then error("ECONNREFUSED") end
-        if #server.backlog >= (server.maxBacklog or 5) then error("ECONNREFUSED") end
-
-        local serverPeer = newSocket("unix", sock.socktype)
-        serverPeer.backend   = "unix"
-        serverPeer.connected = true
-        serverPeer.state     = "connected"
-        serverPeer.peer      = sock
-
-        sock.peer      = serverPeer
-        sock.connected = true
-        sock.state     = "connected"
-
-        table.insert(server.backlog, serverPeer)
-
-    elseif parsed.backend == "rednet" then
-        ensureRednet()
-        sock.connected = true
-        sock.state     = "connected"
-
-    elseif parsed.backend == "modem" then
-        local modem, side = getModem()
-        local replyChannel = math.random(1024, 65534)
-        sock.modem        = modem
-        sock.modemChannel = replyChannel
-        sock.connected    = true
-        sock.state        = "connected"
-        modem.open(replyChannel)
-
-    elseif parsed.backend == "http" or parsed.backend == "https" then
-        sock.connected = true
-        sock.state     = "connected"
-
-    else
-        error("EAFNOSUPPORT")
-    end
-end
-
-kernel.syscalls["send"] = function(fd, data)
-    local task  = kernel.currentTask
-    local fdobj = task.fd[fd]
-    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
-    local sock = sockets[fdobj.sockId]
-    if not sock then error("EBADF") end
-    return sockSend(sock, data)
-end
-
-kernel.syscalls["recv"] = function(fd, maxlen, timeout_ms)
-    local task  = kernel.currentTask
-    local fdobj = task.fd[fd]
-    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
-    local sock = sockets[fdobj.sockId]
-    if not sock then error("EBADF") end
-
-    local deadline = kernel.computer:time() + (timeout_ms or 10000)
-    while #sock.rxbuf == 0 do
-        pumpAll()
-        if #sock.rxbuf > 0 then break end
-        if sock.state == "closed" or sock.error then
-            if sock.error then error("ECONNRESET: " .. tostring(sock.error)) end
-            return ""
-        end
-        if kernel.computer:time() > deadline then return "" end
-        coroutine.yield()
-    end
-
-    local item = table.remove(sock.rxbuf, 1)
-    local data = type(item) == "table" and (item.data or "") or tostring(item)
-    if maxlen and #data > maxlen then
-        table.insert(sock.rxbuf, 1, { data=data:sub(maxlen+1), from=item and item.from })
-        data = data:sub(1, maxlen)
-    end
-    return data
-end
-
-kernel.syscalls["sockshutdown"] = function(fd)
-    local task  = kernel.currentTask
-    local fdobj = task.fd[fd]
-    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
-    local sock = sockets[fdobj.sockId]
-    if sock then sockClose(sock) end
-end
-
-kernel.syscalls["getpeername"] = function(fd)
-    local task  = kernel.currentTask
-    local fdobj = task.fd[fd]
-    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
-    local sock = sockets[fdobj.sockId]
-    if not sock or not sock.connected then error("ENOTCONN") end
-    if sock.address then return sock.address end
-    return nil
-end
-
-kernel.syscalls["getsockname"] = function(fd)
-    local task  = kernel.currentTask
-    local fdobj = task.fd[fd]
-    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
-    local sock = sockets[fdobj.sockId]
-    if not sock then error("EBADF") end
-    return sock.address
-end
-
-kernel.syscalls["httpget"] = function(url, headers)
-    local http = kernel.apis and kernel.apis.http
-    if not http then error("ENODEV: no http API") end
-
-    local ok, err = pcall(http.request, url, nil, headers)
-    if not ok then error("ENETDOWN: " .. tostring(err)) end
-
-    local deadline = kernel.computer:time() + 15000
-    while true do
-        local ev = pollEvent()
-        if ev then
-            if ev[1] == "http_success" and ev[2] == url then
-                local handle = ev[3]
-                local body   = handle.readAll and handle.readAll() or ""
-                handle.close()
-                return body
-            elseif ev[1] == "http_failure" and ev[2] == url then
-                error("ECONNREFUSED: " .. tostring(ev[3]))
-            else
-                dispatchEvent(ev)
-            end
-        end
-        if kernel.computer:time() > deadline then error("ETIMEDOUT") end
-        coroutine.yield()
-    end
-end
-
-kernel.syscalls["resolve"] = function(hostname)
-    if hostname:match("^%d+%.%d+%.%d+%.%d+$") then return hostname end
-
-    local a,b,c,d = hostname:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")
-    if a and tonumber(a) == 0 and tonumber(b) == 0 then
-        return hostname
-    end
-
-    local http = kernel.apis and kernel.apis.http
-    if not http then error("ENODEV: no http API for DNS") end
-
-    local url = "https://cloudflare-dns.com/dns-query?name=" .. hostname .. "&type=A"
-    local body = kernel.syscalls["httpget"](url, {
-        ["Accept"] = "application/dns-json"
-    })
-
-    local ip = body:match('"type":1[^}]*"data":"([%d%.]+)"')
-    if not ip then error("ENOENT: could not resolve " .. hostname) end
-    return ip
-end
-
-kernel.sockets     = sockets
-kernel.unixSockets = unixSocks
-
 kernel.log("Loaded socket module")

Src/Hyperion-kernel/lib/modules/hyperion/21_unixsockets.kmod

@@ -0,0 +1,3 @@
+--:Minify:--
+local kernel=...
+kernel.unixSockets={}

Src/Hyperion-kernel/lib/modules/hyperion/40_auth.kmod

@@ -139,7 +139,7 @@ end
 if not blake2s then error("Failed to load blake2s") end
 
 if not kernel.vfs.exists("/etc/pam.d/secret") then
-    kernel.log("PAM SECRET REGENERATING PLEASE USE ROOT")
+    kernel.log("PAM SECRET REGENERATING PLEASE USE ROOT", "WARN", 0xFF8800)
     local key = ""
     for i = 1, 256 do key = key .. string.char(math.random(0, 255)) end
     local handle = kernel.vfs.open("/etc/pam.d/secret", "w")
@@ -150,16 +150,11 @@ end
 local pepper = getFile("/etc/pam.d/secret")
 
 local function genSalt()
-    local chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./"
-    local s = ""
-    for i = 1, 16 do
-        s = s .. chars:sub(math.random(1, #chars), math.random(1, #chars))
-    end
-    return s
+    return toHex(math.random(0,2^32))
 end
 
 local function hashPassword(password, salt)
-    local key = (pepper .. salt):sub(1, 32)
+    local key = (pepper .. salt)
     return blake2s(password, key)
 end
 
@@ -236,19 +231,18 @@ local function nextUID()
     return max + 1
 end
 
-function auth.login(username, password)
-    if type(username) ~= "string" or type(password) ~= "string" then
+function auth.login(uid, password)
+    if type(uid) ~= "number" or type(password) ~= "string" then
         return nil, "Authentication failure"
     end
 
-    local entry = getPasswdByUsername(username)
+    local entry = getPasswdByUID(uid)
     if not entry then
         -- timing attack resistance
         hashPassword(password, "aaaaaaaaaaaaaaaa")
         return nil, "Authentication failure"
     end
 
-    local uid = tonumber(entry[1])
     local sEntry = getShadowByUID(uid)
     if not sEntry then
         hashPassword(password, "aaaaaaaaaaaaaaaa")
@@ -273,7 +267,7 @@ function auth.login(username, password)
         _task.egid = tonumber(entry[2]) or uid
     end
 
-    kernel.log("AUTH: login uid=" .. tostring(uid) .. " (" .. username .. ")")
+    kernel.log("AUTH: login uid=" .. tostring(uid) .. " (" .. getPasswdByUID(uid)[3] .. ")")
     return true
 end
 

Src/Hyperion-kernel/lib/modules/hyperion/45_hypervisor.kmod

@@ -41,11 +41,11 @@ local function createTask(func, name, envars, args, tgid, real_uid, eff_uid)
 
             if kernel.config.logTaskExit then
                 if not ok then
-                    kernel.log("Task " .. tostring(id) .. " exited with err: " .. tostring(err), "ERROR", 2)
+                    kernel.log("Task " .. tostring(id) .. " exited with err: " .. tostring(err), "ERROR", 0xFF0000)
                 elseif err then
-                    kernel.log("Task " .. tostring(id) .. " exited with code: " .. tostring(err), "INFO")
+                    kernel.log("Task " .. tostring(id) .. " exited with code: " .. tostring(err), "DBUG", 0x00FFFF)
                 else
-                    kernel.log("Task " .. tostring(id) .. " exited without code", "INFO")
+                    kernel.log("Task " .. tostring(id) .. " exited without code", "DBUG", 0x00FFFF)
                 end
             end
 
@@ -110,7 +110,7 @@ function sys.execspawn(path, name, envars, args, tgid)
         kernel.log(
             "execspawn: suid exec '" .. path ..
             "' caller_uid=" .. tostring(real_uid) ..
-            " -> euid=" .. tostring(euid), "INFO"
+            " -> euid=" .. tostring(euid)
         )
     end
 
@@ -136,9 +136,9 @@ function sys.exec(path, args, envars)
         local ok, err = xpcall(func, debug.traceback, table.unpack(task.args))
         if kernel.config.logTaskExit then
             if not ok then
-                kernel.log("Task " .. tostring(task.pid) .. " exec '" .. path .. "' err: " .. tostring(err), "ERROR", 2)
+                kernel.log("Task " .. tostring(task.pid) .. " exec '" .. path .. "' err: " .. tostring(err), "ERROR", 0xFF0000)
             else
-                kernel.log("Task " .. tostring(task.pid) .. " exec '" .. path .. "' exited: " .. tostring(err), "INFO")
+                kernel.log("Task " .. tostring(task.pid) .. " exec '" .. path .. "' exited: " .. tostring(err), "DBUG", 0x00FFFF)
             end
         end
         if type(err) == "number" then tasks[tostring(task.pid)].exit = err end
@@ -155,8 +155,7 @@ end
 
 function sys.sleep(s)
     kernel.currentTask.status = "S"
-    kernel.currentTask.sleep  = kernel.computer:time() + s * 1000
-    coroutine.yield()
+    kernel.currentTask.sleep  = kernel.EFI:getEpochMs() + s * 1000
 end
 
 function sys.getTask(pid)
@@ -260,9 +259,9 @@ function sys.exit(code)
     local task = kernel.currentTask
     if kernel.config.logTaskExit then
         if code then
-            kernel.log("Task " .. tostring(task.pid) .. " exited with code: " .. tostring(code), "INFO")
+            kernel.log("Task " .. tostring(task.pid) .. " exited with code: " .. tostring(code), "DBUG", 0x00FFFF)
         else
-            kernel.log("Task " .. tostring(task.pid) .. " exited without code", "INFO")
+            kernel.log("Task " .. tostring(task.pid) .. " exited without code", "DBUG", 0x00FFFF)
         end
     end
     tasks[tostring(task.pid)].status = "Z"
@@ -303,9 +302,9 @@ local function reapDeadTasks()
             task.syscallReturn = nil
             task.sleep        = nil
             task.fd           = nil
-            task.reapTime     = kernel.computer:time() + 30000
+            task.reapTime     = kernel.EFI:getEpochMs() + 30000
 
-        elseif task.reapTime and kernel.computer:time() > task.reapTime
+        elseif task.reapTime and kernel.EFI:getEpochMs() > task.reapTime
                and task.status == "Z" then
             for _, child in ipairs(task.children) do
                 child.parent   = tasks["1"]
@@ -343,55 +342,61 @@ function kernel.main()
         local taskTimes    = {}
 
         for pid, task in pairs(tasks) do
-            if task.status == "S" and kernel.computer:time() >= task.sleep then
+            kernel.currentTask = task
+            kernel.uid  = task.euid or task.uid
+            kernel.process = task.name
+
+            if task.status == "S" and kernel.EFI:getEpochMs() >= task.sleep then
                 task.status = "R"
                 task.sleep  = 0
             end
 
-            if task.status == "R" then
-                kernel.currentTask = task
+            if task.status == "D" then
+                if task.ksh then
+                    coroutine.resume(task.ksh)
+                end
+            end
 
-                kernel.uid  = task.euid or task.uid
-                kernel.process = task.name
+            if task.status == "R" then
                 N = N + 1
 
                 task.timeSlice = math.min(Tmax, math.max(Tmin, B / (N ^ alpha)))
 
                 if task.sigq and #task.sigq ~= 0 and task.sigh then
                     local coro = coroutine.create(task.sigh)
-                    local sigret = { coroutine.resume(coro, table.remove(task.sigq, 1)) }
-                    while coroutine.status(coro) ~= "dead" do
-                        if sigret[1] == false then break end
-                        if sigret[2] == "syscall" then
-                            local scname = sigret[3]
-                            local sysret
-                            if kernel.syscalls[scname] then
-                                sysret = { xpcall(kernel.syscalls[scname], debug.traceback, table.unpack(sigret, 4)) }
-                            else
-                                sysret = { false, "Unknown syscall: " .. tostring(scname) }
-                            end
-                            if not sysret[1] then
-                                sigret = { coroutine.resume(coro, false, sysret[2]) }
-                            else
-                                sigret = { coroutine.resume(coro, true, table.unpack(sysret, 2)) }
-                            end
-                        else
-                            sigret = { coroutine.resume(coro) }
+                    local status,err=coroutine.resumeWithTimeout(coro, 100, table.remove(task.sigq, 1))
+                    if status=="error" then
+                        task.sigd.error=err
+                        task.sigd.active=false
+                        task.sigh=nil
+                        task.sigq=nil
+                        task.sigd=nil
+                    elseif status=="success" then
+                        if err=="syscall" then
+                            task.sigd.error="Cannot execute syscalls from signals"
+                            task.sigd.active=false
+                            task.sigh=nil
+                            task.sigq=nil
+                            task.sigd=nil
                         end
                     end
                 end
 
                 if task.status == "R" then
-                    local startTime = kernel.computer:time()
+                    local startTime = kernel.EFI:getEpochMs()
                     local ret
 
                     if kernel.config.preempt then
+                        if not task.debugger then
                             ret = { resumeWithTimeout(task.coro, task.timeSlice, table.unpack(task.syscallReturn)) }
                         else
                             ret = { coroutine.resume(task.coro, table.unpack(task.syscallReturn)) }
                         end
+                    else
+                        ret = { coroutine.resume(task.coro, table.unpack(task.syscallReturn)) }
+                    end
 
-                    local elapsed = kernel.computer:time() - startTime
+                    local elapsed = kernel.EFI:getEpochMs() - startTime
                     task.lastTime  = elapsed
                     task.totalTime = (task.totalTime or 0) + elapsed
                     task.numRuns   = (task.numRuns  or 0) + 1
@@ -403,7 +408,7 @@ function kernel.main()
                     if elapsed >= Tmax then Tmax_hit = Tmax_hit + 1 end
 
                     if ret[1] == "error" or ret[1] == false then
-                        kernel.log("processHandlerException: " .. tostring(ret[2]), "ERROR", 2)
+                        kernel.log("processHandlerException: " .. tostring(ret[2]), "ERROR", 0xFF0000)
                         task.status = "Z"
                         task.exit   = "processHandlerException: " .. tostring(ret[2])
 
@@ -418,9 +423,9 @@ function kernel.main()
                             local scname = ret[3]
                             if kernel.syscalls[scname] then
                                 if kernel.config.debugSyscalls then
-                                    kernel.log("Task " .. task.pid .. " syscall: " .. scname, "DBUG", 5)
+                                    kernel.log("Task " .. task.pid .. " syscall: " .. scname, "DBUG", 0x00FFFF)
                                     for i = 4, #ret do
-                                        kernel.log("  inval[" .. (i-3) .. "] = " .. tostring(ret[i]), "DBUG", 5)
+                                        kernel.log("  inval[" .. (i-3) .. "] = " .. tostring(ret[i]), "DBUG", 0x00FFFF)
                                     end
                                 end
 
@@ -428,12 +433,12 @@ function kernel.main()
 
                                 if kernel.config.debugSyscalls then
                                     if not sysret[1] then
-                                        kernel.log("Task " .. task.pid .. " syscall " .. scname .. " failed: " .. tostring(sysret[2]), "ERROR", 2)
+                                        kernel.log("Task " .. task.pid .. " syscall " .. scname .. " failed: " .. tostring(sysret[2]), "ERROR", 0xFF0000)
                                     else
-                                        kernel.log("Task " .. task.pid .. " syscall " .. scname .. " ok, " .. (#sysret-1) .. " retvals", "DBUG", 5)
+                                        kernel.log("Task " .. task.pid .. " syscall " .. scname .. " ok, " .. (#sysret-1) .. " retvals", "DBUG", 0x00FFFF)
                                         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", 5)
+                                            kernel.log("  retval[" .. (i-1) .. "] = " .. v, "DBUG", 0x00FFFF)
                                         end
                                     end
                                 end

Src/Hyperion-kernel/lib/modules/hyperion/50_gpio.kmod

@@ -9,8 +9,20 @@ sysc["gpio_write"]=function(pin, data)
     end
 end
 
+sysc["gpio_writeAnalog"]=function(pin, data)
+    if kernel.gpio[pin] then
+        return kernel.gpio[pin]("wa", data)
+    end
+end
+
 sysc["gpio_read"]=function(pin)
     if kernel.gpio[pin] then
         return kernel.gpio[pin]("r")
     end
 end
+
+sysc["gpio_readAnalog"]=function(pin)
+    if kernel.gpio[pin] then
+        return kernel.gpio[pin]("ra")
+    end
+end

Src/Hyperion-kernel/lib/modules/hyperion/90_init.kmod

@@ -9,11 +9,13 @@ if not initOk then
 end
 
 local handle = kernel.vfs.open(kernel.config.initPath, "r")
+if not handle then kernel.panic("Failed to open "..kernel.config.initPath) end
 local data   = kernel.vfs.read(handle, 1024 * 1024 * 4)
+if not handle then kernel.panic("Failed to read "..kernel.config.initPath) end
 kernel.vfs.close(handle)
 
 local initFunc, err = load(data, "@sysinit", "t", kernel._U)
-if not initFunc then error("Failed to load init system: " .. err) end
+if not initFunc then kernel.PANIC("Failed to load init system: " .. err) end
 
 kernel.tasks["1"] = {
     coro = coroutine.create(function()

Src/Hyperion-kernel/lib/modules/hyperion/91_login.kmod

@@ -1,9 +1,10 @@
 --: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", 2)
+        kernel.log("Failed to exec /bin/login: " .. tostring(err), "ERROR", 0xFF0000)
     end
 end

Src/Hyperion-kernel/lib/modules/hyperion/92_permissions.kmod

@@ -1,117 +0,0 @@
---:Minify:--
-local kernel = ...
-
-local P    = kernel.vfs.P
-local PERM = kernel.vfs.PERM
-
-local RW_R_R    = P.OWNER_R + P.OWNER_W + P.GROUP_R + P.WORLD_R
-local RWX_RX_RX = P.OWNER_R + P.OWNER_W + P.OWNER_X
-                + P.GROUP_R + P.GROUP_X
-                + P.WORLD_R + P.WORLD_X
-local RW_R__    = P.OWNER_R + P.OWNER_W + P.GROUP_R
-local RW____    = P.OWNER_R + P.OWNER_W
-local RWXRWXRWX = PERM.RWXRWXRWX
-local SUID_755  = PERM.SUID_755
-
-local META_VERSION = 0x02
-local rootDisk = kernel.disks["$"]
-
-local function makeEntry(name, etype, owner, group, perms, cmeta)
-    cmeta = cmeta or ""
-    local plo = perms % 256
-    local phi = math.floor(perms / 256) % 256
-    local olo = (owner or 0) % 256
-    local ohi = math.floor((owner or 0) / 256) % 256
-    local glo = (group or 0) % 256
-    local ghi = math.floor((group or 0) / 256) % 256
-    return string.char(#name) .. name
-         .. string.char(etype, olo, ohi, glo, ghi, plo, phi)
-         .. string.char(#cmeta) .. cmeta
-end
-
-local REG = 0x00
-
-local function mergeMeta(dir, entries)
-    local diskDir = dir
-    if diskDir:sub(1,1) == "/" then diskDir = diskDir:sub(2) end
-    local metaPath = (diskDir == "" and ".meta" or diskDir .. "/.meta")
-
-    local existing = {}
-    local rok, rf = pcall(function() return rootDisk:open(metaPath, "r") end)
-    if rok and rf then
-        local raw = rf.read(65535)
-        if rf.close then rf.close() end
-        existing = (kernel.vfs._parseMetafile and kernel.vfs._parseMetafile(raw)) or {}
-    end
-
-    for _, e in ipairs(entries) do
-        local name  = e[1]
-        local etype = e[2] or REG
-        local owner = e[3] or 0
-        local group = e[4] or 0
-        local perms = e[5] or RWX_RX_RX
-        local cmeta = e[6] or ""
-        existing[name] = {
-            etype = etype,
-            owner = owner,
-            group = group,
-            perms = perms,
-            cmeta = cmeta,
-        }
-    end
-
-    local data = string.char(META_VERSION)
-    for name, m in pairs(existing) do
-        data = data .. makeEntry(
-            name,
-            m.etype or REG,
-            m.owner or 0,
-            m.group or 0,
-            m.perms or RWX_RX_RX,
-            m.cmeta or ""
-        )
-    end
-
-    local ok, err = pcall(function()
-        local f = rootDisk:open(metaPath, "w")
-        f.write(data)
-        f.close()
-    end)
-    if not ok then
-        kernel.log("permissions: failed to write " .. metaPath .. ": " .. tostring(err), "WARN", 8)
-    end
-end
-
-kernel.log("Seeding filesystem permissions...", "INFO")
-
-mergeMeta("/", {
-    {"bin",  REG, 0, 0, RWX_RX_RX},
-    {"boot", REG, 0, 0, RWX_RX_RX},
-    {"dev",  REG, 0, 0, RWXRWXRWX},
-    {"etc",  REG, 0, 0, RWX_RX_RX},
-    {"home", REG, 0, 0, RWX_RX_RX},
-    {"lib",  REG, 0, 0, RWX_RX_RX},
-    {"root", REG, 0, 0, RW____   },
-    {"sbin", REG, 0, 0, RWX_RX_RX},
-    {"tmp",  REG, 0, 0, RWXRWXRWX},
-    {"usr",  REG, 0, 0, RWX_RX_RX},
-    {"var",  REG, 0, 0, RWX_RX_RX},
-})
-
-mergeMeta("/bin", {
-    {"login",       REG, 0, 0, SUID_755 },
-    {"su",          REG, 0, 0, SUID_755 },
-    {"sudo",        REG, 0, 0, SUID_755 },
-})
-
-mergeMeta("/etc", {
-    {"passwd", REG, 0, 0, RW_R_R   },
-    {"shadow", REG, 0, 0, RW____   },
-    {"pam.d",  REG, 0, 0, RWX_RX_RX},
-})
-
-mergeMeta("/etc/pam.d", {
-    {"secret", REG, 0, 0, RW____},
-})
-
-kernel.log("Filesystem permissions seeded.", "INFO")

Src/Hyperion-kernel/lib/modules/hyperion/92_setup.kmod

@@ -0,0 +1,121 @@
+--:Minify:--
+local kernel = ...
+
+if kernel.firstBoot then
+    local P    = kernel.vfs.P
+    local PERM = kernel.vfs.PERM
+
+    local RW_R_R    = P.OWNER_R + P.OWNER_W + P.GROUP_R + P.WORLD_R
+    local RWX_RX_RX = P.OWNER_R + P.OWNER_W + P.OWNER_X
+                    + P.GROUP_R + P.GROUP_X
+                    + P.WORLD_R + P.WORLD_X
+    local RW_R__    = P.OWNER_R + P.OWNER_W + P.GROUP_R
+    local RW____    = P.OWNER_R + P.OWNER_W
+    local RWXRWXRWX = PERM.RWXRWXRWX
+    local SUID_755  = PERM.SUID_755
+
+    local META_VERSION = 0x02
+    local rootDisk = kernel.disks["$"]
+
+    local function makeEntry(name, etype, owner, group, perms, cmeta)
+        cmeta = cmeta or ""
+        local plo = perms % 256
+        local phi = math.floor(perms / 256) % 256
+        local olo = (owner or 0) % 256
+        local ohi = math.floor((owner or 0) / 256) % 256
+        local glo = (group or 0) % 256
+        local ghi = math.floor((group or 0) / 256) % 256
+        return string.char(#name) .. name
+             .. string.char(etype, olo, ohi, glo, ghi, plo, phi)
+             .. string.char(#cmeta) .. cmeta
+    end
+
+    local REG = 0x00
+
+    local function mergeMeta(dir, entries)
+        local diskDir = dir
+        if diskDir:sub(1,1) == "/" then diskDir = diskDir:sub(2) end
+        local metaPath = (diskDir == "" and ".meta" or diskDir .. "/.meta")
+
+        local existing = {}
+        local rok, rf = pcall(function() return rootDisk:open(metaPath, "r") end)
+        if rok and rf then
+            local raw = rf.read(65535)
+            if rf.close then rf.close() end
+            existing = (kernel.vfs._parseMetafile and kernel.vfs._parseMetafile(raw)) or {}
+        end
+
+        for _, e in ipairs(entries) do
+            local name  = e[1]
+            local etype = e[2] or REG
+            local owner = e[3] or 0
+            local group = e[4] or 0
+            local perms = e[5] or RWX_RX_RX
+            local cmeta = e[6] or ""
+            existing[name] = {
+                etype = etype,
+                owner = owner,
+                group = group,
+                perms = perms,
+                cmeta = cmeta,
+            }
+        end
+
+        local data = string.char(META_VERSION)
+        for name, m in pairs(existing) do
+            data = data .. makeEntry(
+                name,
+                m.etype or REG,
+                m.owner or 0,
+                m.group or 0,
+                m.perms or RWX_RX_RX,
+                m.cmeta or ""
+            )
+        end
+
+        local ok, err = pcall(function()
+            local f = rootDisk:open(metaPath, "w")
+            f.write(data)
+            f.close()
+        end)
+        if not ok then
+            kernel.log("permissions: failed to write " .. metaPath .. ": " .. tostring(err), "WARN", 0xFF8800)
+        end
+    end
+
+    kernel.log("Seeding filesystem permissions...")
+
+    mergeMeta("/", {
+        {"bin",  REG, 0, 0, RWX_RX_RX},
+        {"boot", REG, 0, 0, RWX_RX_RX},
+        {"dev",  REG, 0, 0, RWXRWXRWX},
+        {"etc",  REG, 0, 0, RWX_RX_RX},
+        {"home", REG, 0, 0, RWX_RX_RX},
+        {"lib",  REG, 0, 0, RWX_RX_RX},
+        {"proc", REG, 0, 0, RWXRWXRWX},
+        {"root", REG, 0, 0, RW____   },
+        {"sbin", REG, 0, 0, RWX_RX_RX},
+        {"tmp",  REG, 0, 0, RWXRWXRWX},
+        {"usr",  REG, 0, 0, RWX_RX_RX},
+        {"var",  REG, 0, 0, RWXRWXRWX},
+        {"opt",  REG, 0, 0, RWX_RX_RX},
+    })
+
+    mergeMeta("/bin", {
+        {"login",       REG, 0, 0, SUID_755 },
+        {"su",          REG, 0, 0, SUID_755 },
+        {"sudo",        REG, 0, 0, SUID_755 },
+    })
+
+    mergeMeta("/etc", {
+        {"passwd", REG, 0, 0, RW_R_R   },
+        {"shadow", REG, 0, 0, RW____   },
+        {"pam.d",  REG, 0, 0, RW____   },
+    })
+
+    mergeMeta("/etc/pam.d", {
+        {"secret", REG, 0, 0, RW____},
+    })
+
+    kernel.log("Filesystem permissions seeded.")
+end

Src/hysh/bin/help

@@ -261,16 +261,16 @@ local function render()
             syscall.write(1, "\n")
         end
     end
-    syscall.devctl(1, "sfgc", 16)
-    syscall.devctl(1, "sbgc", 13)
+    syscall.devctl(1, "sfgc", 0x000000)
+    syscall.devctl(1, "sbgc", 0xDBDBDB)
     local pct = math.floor(math.min(100, (scroll + pageSize) / totalLines * 100))
     local status = string.format(" help -- line %d/%d (%d%%)  [up/down: scroll  q: quit] ",
         scroll + 1, totalLines, pct)
     if #status > screenW then status = status:sub(1, screenW) end
     syscall.devctl(1, "spos", 1, screenH)
     syscall.write(1, status .. string.rep(" ", screenW - #status))
-    syscall.devctl(1, "sfgc", 1)
-    syscall.devctl(1, "sbgc", 16)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
+    syscall.devctl(1, "sbgc", 0x000000)
     dirty = false
 end
 
@@ -281,7 +281,7 @@ if totalLines <= pageSize then
         syscall.devctl(1, "sfgc", line[2])
         syscall.write(1, line[1] .. "\n")
     end
-    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
     return
 end
 
@@ -305,5 +305,5 @@ end
 
 syscall.devctl(1, "clear")
 syscall.devctl(1, "spos", 1, 1)
-syscall.devctl(1, "sfgc", 1)
-syscall.devctl(1, "sbgc", 16)
+syscall.devctl(1, "sfgc", 0xFFFFFF)
+syscall.devctl(1, "sbgc", 0x000000)

Src/hysh/bin/hfetch

@@ -3,11 +3,11 @@
 -- 1=white, 2=red, 3=green, 4=blue, 5=cyan, 6=magenta, 7=yellow
 -- 8=orange, 9=lime, 10=lightcyan, 11=brown, 12=darkgrey, 13=lightgrey, 14=purple, 15=chartreuse, 16=black
 
-local C_LOGO  = 5  -- cyan
-local C_WHITE = 1  -- white
-local C_LABEL = 13 -- light grey  (key names)
-local C_SEP   = 12 -- dark grey   (---- separator)
-local C_USER  = 3  -- green       (user@host)
+local C_LOGO  = 0x00FFFF  -- cyan
+local C_WHITE = 0xFFFFFF  -- white
+local C_LABEL = 0xDBDBDB -- light grey  (key names)
+local C_SEP   = 0x6D6D6D -- dark grey   (---- separator)
+local C_USER  = 0x00FF00  -- green       (user@host)
 
 local function c(col) syscall.devctl(1, "sfgc", col) end
 

Src/hysh/bin/hysh

@@ -5,17 +5,17 @@ syscall.open("/dev/null","w")     --stderr (device 2)
 
 local success, errorMsg = xpcall(function()
 
-local fs = require("sys.fs")
+local fs = require("fs")
 
 syscall.devctl(1,"clear")
-syscall.devctl(1,"sfgc",1)
+syscall.devctl(1,"sfgc",0xFFFFFF)
 syscall.devctl(1,"spos",1,1)
 print("HyperionOS hysh Shell")
 
 local userhost = (syscall.getUsername() or "Unknown").."@"..(syscall.getHostname() or "Unknown")
 local commandHistory = {}
 local terminate = false
-syscall.setEnviron("SHELL","rtbash")
+syscall.setEnviron("SHELL","hysh")
 syscall.setEnviron("PATH","/bin/")
 local _home = syscall.getEnviron("HOME")
 if _home and _home ~= "" then
@@ -26,8 +26,27 @@ else
 end
 local oldWD = ""
 
+local colors = {
+    0xFFFFFF,
+    0xFF0000,
+    0x00FF00,
+    0x0000FF,
+    0x00FFFF,
+    0xFF00FF,
+    0xFFFF00,
+    0xFF6D00,
+    0x6DFF55,
+    0x24FFFF,
+    0x924900,
+    0x6D6D55,
+    0xDBDBAA,
+    0x6D00FF,
+    0xB6FF00,
+    0x000000
+}
+
 for i = 1, 16 do
-    syscall.devctl(1,"sbgc",i); printInline("   ")
+    syscall.devctl(1,"sbgc",colors[i]); printInline("   ")
 end
 print("\n")
 
@@ -133,8 +152,6 @@ local function copyfile(src, dst)
     if not data then return false, err end
     local ok, err2 = writefile(dst, data)
     if not ok then return false, err2 end
-    local ok2, stat = pcall(syscall.stat, src)
-    if ok2 and stat and stat.perms then pcall(syscall.chmod, dst, stat.perms) end
     return true
 end
 
@@ -223,7 +240,7 @@ end
 
 builtinCmds.clear = function()
     syscall.devctl(1,"clear")
-    syscall.devctl(1,"sfgc",1)
+    syscall.devctl(1,"sfgc",0xFFFFFF)
     syscall.devctl(1,"spos",1,1)
 end
 
@@ -431,7 +448,7 @@ builtinCmds.head = function(...)
     local multi = #files > 1
     local function dohead(text, label)
         if multi then
-            syscall.devctl(1,"sfgc",4); print("==> "..label.." <=="); syscall.devctl(1,"sfgc",1)
+            syscall.devctl(1,"sfgc",0x0000FF); print("==> "..label.." <=="); syscall.devctl(1,"sfgc",0xFFFFFF)
         end
         local count = 0
         for line in (text.."\n"):gmatch("([^\n]*)\n") do
@@ -470,7 +487,7 @@ builtinCmds.tail = function(...)
     local multi = #files > 1
     local function dotail(text, label)
         if multi then
-            syscall.devctl(1,"sfgc",4); print("==> "..label.." <=="); syscall.devctl(1,"sfgc",1)
+            syscall.devctl(1,"sfgc",0x0000FF); print("==> "..label.." <=="); syscall.devctl(1,"sfgc",0xFFFFFF)
         end
         local lines = splitlines(text)
         local start = math.max(1, #lines - n + 1)
@@ -965,13 +982,13 @@ local function doTabComplete(input, cursorPos)
 end
 
 local function getUserInput()
-    syscall.devctl(1,"sfgc",3)
+    syscall.devctl(1,"sfgc",0x00FF00)
     syscall.write(1, userhost)
-    syscall.devctl(1,"sfgc",1)
+    syscall.devctl(1,"sfgc",0xFFFFFF)
     syscall.write(1, ":")
-    syscall.devctl(1,"sfgc",10)
+    syscall.devctl(1,"sfgc",0x24FFFF)
     syscall.write(1, syscall.getcwd())
-    syscall.devctl(1,"sfgc",1)
+    syscall.devctl(1,"sfgc",0xFFFFFF)
     syscall.write(1, "$ ")
     local curOffsetStr = syscall.devctl(1, "gpos")
     local curOffsetX = tonumber(curOffsetStr:sub(1, curOffsetStr:find(";")-1))
@@ -1022,21 +1039,21 @@ local function getUserInput()
         syscall.devctl(1,"spos",curOffsetX,curOffsetY)
         syscall.write(1, string.sub(input, 1, cursorPos-1))
         if blinkState then
-            syscall.devctl(1,"sfgc",16); syscall.devctl(1,"sbgc",1)
+            syscall.devctl(1,"sfgc",0x000000); syscall.devctl(1,"sbgc",0xFFFFFF)
         end
         if cursorPos > #input then
             syscall.write(1, " ")
         else
             syscall.write(1, string.sub(input, cursorPos, cursorPos))
         end
-        syscall.devctl(1,"sfgc",1); syscall.devctl(1,"sbgc",16)
+        syscall.devctl(1,"sfgc",0xFFFFFF); syscall.devctl(1,"sbgc",0x000000)
         local after = string.sub(input, cursorPos+1)
         syscall.write(1, after)
         local ghost = getGhostSuffix()
         if #ghost > 0 then
-            syscall.devctl(1,"sfgc",14)
+            syscall.devctl(1,"sfgc",0x6D00FF)
             syscall.write(1, ghost)
-            syscall.devctl(1,"sfgc",1)
+            syscall.devctl(1,"sfgc",0xFFFFFF)
             syscall.write(1, " ")
         else
             syscall.write(1, " ")
@@ -1084,10 +1101,10 @@ local function getUserInput()
                         syscall.write(1, string.rep(" ", tw))
                         syscall.devctl(1,"spos",1,py)
                     end
-                    syscall.devctl(1,"sfgc",3); syscall.write(1, userhost)
-                    syscall.devctl(1,"sfgc",1); syscall.write(1, ":")
-                    syscall.devctl(1,"sfgc",10); syscall.write(1, syscall.getcwd())
-                    syscall.devctl(1,"sfgc",1); syscall.write(1, "$ ")
+                    syscall.devctl(1,"sfgc",0x00FF00); syscall.write(1, userhost)
+                    syscall.devctl(1,"sfgc",0xFFFFFF); syscall.write(1, ":")
+                    syscall.devctl(1,"sfgc",0x00FFFF); syscall.write(1, syscall.getcwd())
+                    syscall.devctl(1,"sfgc",0xFFFFFF); syscall.write(1, "$ ")
                     posStr = syscall.devctl(1, "gpos")
                     sep = posStr:find(";")
                     curOffsetX = tonumber(posStr:sub(1, sep-1))
@@ -1100,7 +1117,7 @@ local function getUserInput()
                     cursorPos=cursorPos-1;dirty=true
                 end
             elseif key=="\n" then
-                syscall.devctl(1,"sfgc",1);syscall.devctl(1,"sbgc",16)
+                syscall.devctl(1,"sfgc",0xFFFFFF);syscall.devctl(1,"sbgc",0x000000)
                 syscall.devctl(1,"spos",curOffsetX,curOffsetY)
                 syscall.write(1, input.." \n")
                 return input
@@ -1116,7 +1133,7 @@ local function getUserInput()
 end
 
 local function printError(progName, msg)
-    syscall.devctl(1,"sfgc",2)
+    syscall.devctl(1,"sfgc",0xFF0000)
     local s = tostring(msg)
     local line, rest = s:match("%]:(%d+): (.+)$")
     if not line then line, rest = s:match(":(%d+): (.+)$") end
@@ -1125,7 +1142,7 @@ local function printError(progName, msg)
     else
         print(progName..": "..s)
     end
-    syscall.devctl(1,"sfgc",1)
+    syscall.devctl(1,"sfgc",0xFFFFFF)
 end
 
 local function runCommand(command)
@@ -1173,7 +1190,7 @@ local function runCommand(command)
 
     local xok, xerr = pcall(syscall.access, cmdPath, "x")
     if not xok then
-        syscall.devctl(1,"sfgc",2); print(progName..": Permission denied"); syscall.devctl(1,"sfgc",1)
+        syscall.devctl(1,"sfgc",0xFF0000); print(progName..": Permission denied"); syscall.devctl(1,"sfgc",0xFFFFFF)
         return
     end
 
@@ -1197,8 +1214,8 @@ local function runCommand(command)
         if terminate then
             local ok2 = syscall.kill(proc)
             if ok2 then
-                syscall.devctl(1,"sbgc",16); syscall.devctl(1,"sfgc",2)
-                print("\nProgram Terminated."); syscall.devctl(1,"sfgc",1)
+                syscall.devctl(1,"sbgc",16); syscall.devctl(1,"sfgc",0xFF0000)
+                print("\nProgram Terminated."); syscall.devctl(1,"sfgc",0xFFFFFF)
             end
             terminate = false; break
         end
@@ -1220,8 +1237,8 @@ end, debug.traceback)
 
 if not success then
     syscall.log("Error running shell: "..errorMsg, "ERROR")
-    syscall.devctl(1,"sfgc",2)
-    syscall.devctl(1,"sbgc",16)
+    syscall.devctl(1,"sfgc",0xFF0000)
+    syscall.devctl(1,"sbgc",0x000000)
     print()
     print("Error running shell: ")
     print(errorMsg)

Src/hysh/bin/ll

@@ -1,3 +1,3 @@
 local args={...}
 table.insert(args, "-lah")
-syscall.exec("/bin/ls", args)2
+syscall.exec("/bin/ls", args)

Src/hysh/bin/login

@@ -37,9 +37,9 @@ local function firstBoot()
 
     syscall.devctl(1, "clear")
     syscall.devctl(1, "spos", 1, 1)
-    syscall.devctl(1, "sfgc", 3)
+    syscall.devctl(1, "sfgc", 0x00FF00)
     syscall.write(1, "HyperionOS First Boot Setup\n")
-    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
     syscall.write(1, "No root password is set. Please create one now.\n\n")
 
     while true do
@@ -49,25 +49,25 @@ local function firstBoot()
         local pw2 = readLine("*")
 
         if pw1 ~= pw2 then
-            syscall.devctl(1, "sfgc", 2)
+            syscall.devctl(1, "sfgc", 0xFF0000)
             syscall.write(1, "Passwords do not match. Try again.\n\n")
-            syscall.devctl(1, "sfgc", 1)
+            syscall.devctl(1, "sfgc", 0xFFFFFF)
         elseif #pw1 < 6 then
-            syscall.devctl(1, "sfgc", 2)
+            syscall.devctl(1, "sfgc", 0xFF0000)
             syscall.write(1, "Password too short (minimum 6 characters).\n\n")
-            syscall.devctl(1, "sfgc", 1)
+            syscall.devctl(1, "sfgc", 0xFFFFFF)
         else
             local ok, err = syscall.setpassword(0, pw1)
             if ok then
-                syscall.devctl(1, "sfgc", 3)
+                syscall.devctl(1, "sfgc", 0x00FF00)
                 syscall.write(1, "Root password set.\n\n")
-                syscall.devctl(1, "sfgc", 1)
+                syscall.devctl(1, "sfgc", 0xFFFFFF)
                 sleep(0.5)
                 break
             else
-                syscall.devctl(1, "sfgc", 2)
+                syscall.devctl(1, "sfgc", 0xFF0000)
                 syscall.write(1, "Error: " .. tostring(err) .. "\n")
-                syscall.devctl(1, "sfgc", 1)
+                syscall.devctl(1, "sfgc", 0xFFFFFF)
             end
         end
     end
@@ -112,8 +112,8 @@ end
 
 local function doLogin()
     syscall.devctl(1, "clear")
-    syscall.devctl(1, "sfgc", 1)
-    syscall.devctl(1, "sbgc", 16)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
+    syscall.devctl(1, "sbgc", 0x000000)
     syscall.devctl(1, "spos", 1, 1)
 
     local hostname = syscall.getHostname() or "hyperion"
@@ -122,16 +122,17 @@ local function doLogin()
 
     local attempts = 0
     while attempts < MAX_ATTEMPTS do
-        syscall.devctl(1, "sfgc", 1)
+        syscall.devctl(1, "sfgc", 0xFFFFFF)
         syscall.write(1, "Username: ")
         local username = readLine(nil)
 
-        if username == "" then goto continue end
+        if username ~= "" then
 
             syscall.write(1, "Password: ")
             local password = readLine("*")
+            local uid = syscall.getuidbyname(username)
 
-        local ok, err = syscall.login(username, password)
+            local ok, err = syscall.login(uid, password)
             if ok then
                 local uid     = syscall.getuid()
                 local pwent   = syscall.getpasswd(uid)
@@ -139,9 +140,9 @@ local function doLogin()
                 local shell   = (pwent and pwent.shell)   or "/bin/hysh"
                 local homedir = (pwent and pwent.homedir) or "/"
 
-            syscall.devctl(1, "sfgc", 3)
+                syscall.devctl(1, "sfgc", 0x00FF00)
                 syscall.write(1, "\nWelcome, " .. username .. "!\n")
-            syscall.devctl(1, "sfgc", 1)
+                syscall.devctl(1, "sfgc", 0xFFFFFF)
                 sleep(0.3)
 
                 spawnShell(username, uid, shell, homedir)
@@ -149,17 +150,16 @@ local function doLogin()
             else
                 attempts = attempts + 1
                 sleep(1)
-            syscall.devctl(1, "sfgc", 2)
+                syscall.devctl(1, "sfgc", 0xFF0000)
                 syscall.write(1, "Login incorrect.\n\n")
-            syscall.devctl(1, "sfgc", 1)
+                syscall.devctl(1, "sfgc", 0xFFFFFF)
+            end
+        end
     end
 
-        ::continue::
-    end
-
-    syscall.devctl(1, "sfgc", 2)
+    syscall.devctl(1, "sfgc", 0xFF0000)
     syscall.write(1, "Maximum login attempts exceeded.\n")
-    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
     sleep(5)
 end
 

Src/hysh/bin/loimgcreate

@@ -43,7 +43,7 @@ if opts.help then
     return
 end
 
-local fs = require("sys.fs")
+local fs = require("fs")
 
 if opts.x then
     if #args < 2 then
@@ -110,9 +110,9 @@ if opts.x then
     pcall(syscall.umount, tmpMnt)
     pcall(syscall.lodetach, loopId)
 
-    syscall.devctl(1, "sfgc", 10)
+    syscall.devctl(1, "sfgc", 0x00FFFF)
     print(name..": extracted "..count.." file(s) to "..destPath)
-    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
     return
 end
 
@@ -150,8 +150,8 @@ local lineCount = 0
 for _ in imgStr:gmatch("\n") do lineCount = lineCount + 1 end
 local byteCount = #imgStr
 
-syscall.devctl(1, "sfgc", 10)
+syscall.devctl(1, "sfgc", 0x00FFFF)
 print(name..": image written to "..imgPath)
-syscall.devctl(1, "sfgc", 14)
+syscall.devctl(1, "sfgc", 0x6D00FF)
 print(string.format("  %d records, %d bytes", lineCount - 1, byteCount))
-syscall.devctl(1, "sfgc", 1)
+syscall.devctl(1, "sfgc", 0xFFFFFF)

Src/hysh/bin/losetup

@@ -60,18 +60,18 @@ if opts.l then
         local info   = devs[id]
         local mode   = (type(info) == "table" and info.mode) or "bind"
         local path   = (type(info) == "table" and info.path) or tostring(info)
-        local colour = mode == "image" and 5 or 4
-        syscall.devctl(1, "sfgc", 3)
+        local colour = mode == "image" and 0x00FFFF or 0x0000FF
+        syscall.devctl(1, "sfgc", 0x00FF00)
         printInline(string.format("%-10s", id))
         syscall.devctl(1, "sfgc", colour)
         printInline(string.format("%-7s", "["..mode.."]"))
-        syscall.devctl(1, "sfgc", 1)
+        syscall.devctl(1, "sfgc", 0xFFFFFF)
         print(" "..path)
     end
     if not any then
-        syscall.devctl(1, "sfgc", 14)
+        syscall.devctl(1, "sfgc", 0x6D00FF)
         print(name..": no loop devices attached")
-        syscall.devctl(1, "sfgc", 1)
+        syscall.devctl(1, "sfgc", 0xFFFFFF)
     end
     return
 end
@@ -92,9 +92,9 @@ if opts.d then
         end
         print(name..": "..msg); syscall.exit(1); return
     end
-    syscall.devctl(1, "sfgc", 10)
+    syscall.devctl(1, "sfgc", 0x00FFFF)
     print(name..": detached "..id)
-    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
     return
 end
 

Src/hysh/bin/ls

@@ -45,7 +45,7 @@ if cloptions.help then
     return
 end
 
-local fs  = require("sys.fs")
+local fs  = require("fs")
 local dir = args[1] or ""
 if dir:sub(1, 1) ~= "/" then
     dir = syscall.getcwd() .. "/" .. dir
@@ -84,7 +84,7 @@ local function humanSize(size)
         size  = size / 1024
         scale = scale + 1
     end
-    if scale == 0 then return tostring(size) end
+    if scale == 0 then return tostring(size).."B" end
     if size < 10 then
         return string.format("%.1f%s", size, sizePrefixes[scale])
     end
@@ -110,10 +110,12 @@ if cloptions.l then
         local stat = syscall.lstat and syscall.lstat(fullPath) or syscall.stat(fullPath)
         local isDir  = fs.isDir(fullPath)
         local isSym  = stat and stat.etype == 0x01
+        local isSock = stat and stat.etype == 0x02
 
         local typeChar
         if isSym then typeChar = "l"
         elseif isDir then typeChar = "d"
+        elseif isSock then typeChar = "s"
         else              typeChar = "-" end
 
         local pstr
@@ -136,26 +138,30 @@ if cloptions.l then
         printInline(tostring(mtime) .. " ")
 
         if isSym then
-            syscall.devctl(1, "sfgc", 6)
+            syscall.devctl(1, "sfgc", 0x00FFFF)
             printInline(v)
-            syscall.devctl(1, "sfgc", 1)
+            syscall.devctl(1, "sfgc", 0xFFFFFF)
             local ok, target = pcall(syscall.readlink, fullPath)
             if ok then
                 printInline(" -> ")
                 local targetExists = pcall(syscall.stat, fullPath)
-                syscall.devctl(1, "sfgc", targetExists and 6 or 2)
+                syscall.devctl(1, "sfgc", targetExists and 0x00FFFF or 0xFF0000)
                 printInline(target)
-                syscall.devctl(1, "sfgc", 1)
+                syscall.devctl(1, "sfgc", 0xFFFFFF)
             end
         elseif isDir then
-            syscall.devctl(1, "sfgc", 4)
+            syscall.devctl(1, "sfgc", 0x6D00FF)
             printInline(v)
-            syscall.devctl(1, "sfgc", 1)
+            syscall.devctl(1, "sfgc", 0xFFFFFF)
+        elseif isSock then
+            syscall.devctl(1, "sfgc", 0xFF00FF)
+            printInline(v)
+            syscall.devctl(1, "sfgc", 0xFFFFFF)
         else
             local isExec = stat and stat.perms and (math.floor(stat.perms / (2^9)) % 2 == 1)
-            syscall.devctl(1, "sfgc", isExec and 3 or 1)
+            syscall.devctl(1, "sfgc", isExec and 0x00FF00 or 0xFFFFFF)
             printInline(v)
-            syscall.devctl(1, "sfgc", 1)
+            syscall.devctl(1, "sfgc", 0xFFFFFF)
         end
         print("")
     end
@@ -175,16 +181,18 @@ for i, v in ipairs(list) do
     local isSym    = stat and stat.etype == 0x01
 
     if isSym then
-        syscall.devctl(1, "sfgc", 6)
+        syscall.devctl(1, "sfgc", 0x00FFFF)
     elseif isDir then
-        syscall.devctl(1, "sfgc", 4)
+        syscall.devctl(1, "sfgc", 0x6D00FF)
+    elseif isSock then
+        syscall.devctl(1, "sfgc", 0xFF00FF)
     else
         local isExec = stat and stat.perms and (math.floor(stat.perms / (2^9)) % 2 == 1)
-        syscall.devctl(1, "sfgc", isExec and 3 or 1)
+        syscall.devctl(1, "sfgc", isExec and 0x00FF00 or 0xFFFFFF)
     end
 
     printInline(v)
-    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
     printInline((" "):rep(colWidth - #v))
 
     if i % numCols == 0 then print("") end

Src/hysh/bin/lsusers

@@ -5,15 +5,15 @@ if not users or #users == 0 then
     return
 end
 
-syscall.devctl(1,"sfgc",13)
+syscall.devctl(1,"sfgc",0xDBDBDB)
 print(string.format("%-6s %-6s %-16s %-20s %s", "UID", "GID", "Username", "Home", "Shell"))
 print(string.rep("-", 65))
-syscall.devctl(1,"sfgc",1)
+syscall.devctl(1,"sfgc",0xFFFFFF)
 
 for _, u in ipairs(users) do
     local lock_marker = u.locked and " [locked]" or ""
-    if u.locked then syscall.devctl(1,"sfgc",2) end
+    if u.locked then syscall.devctl(1,"sfgc",0xFF0000) end
     print(string.format("%-6d %-6d %-16s %-20s %s%s",
         u.uid, u.gid, u.username, u.homedir, u.shell, lock_marker))
-    if u.locked then syscall.devctl(1,"sfgc",1) end
+    if u.locked then syscall.devctl(1,"sfgc",0xFFFFFF) end
 end

Src/hysh/bin/mount

@@ -69,17 +69,17 @@ if #args == 0 and not opts.o then
     end
 
     if next(loDevs) == nil then
-        syscall.devctl(1, "sfgc", 14)
+        syscall.devctl(1, "sfgc", 0xFF00FF)
         print("(no loop devices attached)")
-        syscall.devctl(1, "sfgc", 1)
+        syscall.devctl(1, "sfgc", 0xFFFFFF)
         return
     end
 
     for id, info in pairs(loDevs) do
-        local colour = info.mode == "image" and 5 or 4
+        local colour = info.mode == "image" and 0x00FFFF or 0x0000FF
         syscall.devctl(1, "sfgc", colour)
         printInline(info.mode.." "..id)
-        syscall.devctl(1, "sfgc", 1)
+        syscall.devctl(1, "sfgc", 0xFFFFFF)
         print(" on "..info.path)
     end
     return
@@ -119,9 +119,9 @@ if opts.o and opts.o:lower() == "loop" then
         print(name..": mount: "..msg); syscall.exit(1); return
     end
 
-    syscall.devctl(1, "sfgc", 10)
+    syscall.devctl(1, "sfgc", 0x00FFFF)
     print(name..": "..loopId.." mounted at "..dest)
-    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
     return
 end
 
@@ -141,9 +141,9 @@ if #args == 2 then
         print(name..": "..msg); syscall.exit(1); return
     end
 
-    syscall.devctl(1, "sfgc", 10)
+    syscall.devctl(1, "sfgc", 0x00FFFF)
     print(name..": "..loopId.." mounted at "..dest)
-    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
     return
 end
 

Src/hysh/bin/passwd

@@ -9,7 +9,7 @@ local currentUid = syscall.getuid()
 
 local targetUid
 if targetName then
-    targetUid = syscall.getuid(targetName)
+    targetUid = syscall.getuid()
     if not targetUid then
         print("passwd: user '" .. targetName .. "' does not exist")
         syscall.exit(1); return
@@ -36,7 +36,7 @@ if currentUid ~= 0 then
             if #cur > 0 then cur=cur:sub(1,-2); syscall.write(1,"\b \b") end
         else cur=cur..ch; syscall.write(1,"*") end
     end
-    local ok, err = syscall.elevate(targetName, cur)
+    local ok, err = syscall.login(targetUid, cur)
     if not ok then
         sleep(1)
         print("passwd: authentication failure")

Src/hysh/bin/su

@@ -1,7 +1,15 @@
 --:Minify:--
-local targetUser = ({ ... })[1] or "root"
+local targetUser = ({ ... })[1]
 local currentUid = syscall.getuid()
-local targetUid  = syscall.getuidbyname(targetUser)
+if syscall.geteuid()~=0 then
+    syscall.exec("/bin/su", {...})
+end
+local targetUid
+if targetUser then
+    targetUid = syscall.getuidbyname(targetUser)
+else
+    targetUid = 0
+end
 
 if not targetUid then
     print("su: user '" .. targetUser .. "' does not exist")
@@ -25,20 +33,21 @@ if currentUid ~= 0 then
         end
     end
 
-    local ok, err = syscall.elevate(targetUser, pw)
+    local ok, err = syscall.login(targetUid, pw)
     if not ok then
         sleep(1)
         print("su: Authentication failure")
         syscall.exit(1)
         return
     end
+else
+    syscall.setuid(targetUid)
 end
 
-syscall.setuid(targetUid)
-
 local pwent   = syscall.getpasswd(targetUid)
 local shell   = (pwent and pwent.shell)   or "/bin/hysh"
 local homedir = (pwent and pwent.homedir) or "/"
+local username= (pwent and pwent.username)or "Unknown"
 
 local ok_cd, err_cd = pcall(syscall.chdir, homedir)
 if not ok_cd then
@@ -46,7 +55,7 @@ if not ok_cd then
     syscall.chdir(homedir)
 end
 syscall.setEnviron("HOME",  homedir)
-syscall.setEnviron("USER",  targetUser)
+syscall.setEnviron("USER",  username)
 syscall.setEnviron("SHELL", shell)
 
 local ok, err = pcall(syscall.exec, shell)

Src/hysh/bin/sudo

@@ -1,5 +1,5 @@
 --:Minify:--
-local fs = require("sys.fs")
+local fs = require("fs")
 
 local cmdArgs = {...}
 local targetUser = "root"
@@ -55,7 +55,7 @@ if currentUid ~= 0 then
         end
     end
 
-    local ok, err = syscall.elevate("root", pw)
+    local ok, err = syscall.login(0, pw)
     if not ok then
         sleep(1)
         print("sudo: Authentication failure")

Src/hysh/bin/umount

@@ -59,9 +59,9 @@ if opts.l then
         end
         print(name..": "..msg); syscall.exit(1); return
     end
-    syscall.devctl(1, "sfgc", 10)
+    syscall.devctl(1, "sfgc", 0x00FFFF)
     print(name..": detached "..id)
-    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sfgc", 0xFFFFFF)
     return
 end
 
@@ -95,17 +95,17 @@ if not ok then
     print(name..": "..msg); syscall.exit(1); return
 end
 
-syscall.devctl(1, "sfgc", 10)
+syscall.devctl(1, "sfgc", 0x00FFFF)
 print(name..": unmounted "..mpt)
-syscall.devctl(1, "sfgc", 1)
+syscall.devctl(1, "sfgc", 0xFFFFFF)
 
 if loopIdToDetach then
     for _, id in ipairs(loopIdToDetach) do
         local dok = pcall(syscall.lodetach, id)
         if dok then
-            syscall.devctl(1, "sfgc", 14)
+            syscall.devctl(1, "sfgc", 0xFF00FF)
             print(name..": auto-detached "..id)
-            syscall.devctl(1, "sfgc", 1)
+            syscall.devctl(1, "sfgc", 0xFFFFFF)
         end
     end
 end

Src/hysh/bin/userdel

@@ -29,7 +29,7 @@ if not ok then
 end
 
 if removeHome and pwent and pwent.homedir then
-    local fs = require("sys.fs")
+    local fs = require("fs")
     local ok2, err2 = pcall(function()
         local function rmdir(path)
             for _, f in ipairs(fs.list(path) or {}) do

Src/iniparse/lib/iniparse

@@ -0,0 +1,39 @@
+--:Minify:--
+local ini = {}
+
+function ini.parse(str)
+    local config = {}
+    local section = nil
+
+    for line in str:gmatch("[^\r\n]+") do
+        -- trim whitespace
+        line = line:match("^%s*(.-)%s*$")
+
+        -- skip empty lines and comments
+        if line ~= "" and not line:match("^[;#]") then
+            -- section
+            local sec = line:match("^%[(.-)%]$")
+            if sec then
+                section = sec
+                config[section] = config[section] or {}
+            else
+                -- key=value
+                local key, value = line:match("^(.-)=(.*)$")
+                if key then
+                    key = key:match("^%s*(.-)%s*$")
+                    value = value:match("^%s*(.-)%s*$")
+
+                    if section then
+                        config[section][key] = value
+                    else
+                        config[key] = value
+                    end
+                end
+            end
+        end
+    end
+
+    return config
+end
+
+return ini

Src/install.json

@@ -0,0 +1,8 @@
+[
+    "Hyperion-kernel",
+    "Hyperion-core",
+    "hysh",
+    "lua",
+    "micro",
+    "sysinit"
+]

Src/lua/bin/lua

@@ -1,14 +1,14 @@
 --:Minify:--
-local C_PROMPT = 7
-local C_CONT   = 13
-local C_OUT    = 5
-local C_ERR    = 2
-local C_KEY    = 3
-local C_STR    = 9
-local C_NUM    = 10
-local C_BOOL   = 8
-local C_NIL    = 12
-local C_TABLE  = 13
+local C_PROMPT = 0xFFFF00
+local C_CONT   = 0xDBDBDB
+local C_OUT    = 0x00FFFF
+local C_ERR    = 0xFF0000
+local C_KEY    = 0x00FF00
+local C_STR    = 0x00FF88
+local C_NUM    = 0x24FFFF
+local C_BOOL   = 0xFF6D00
+local C_NIL    = 0x6D6D6D
+local C_TABLE  = 0xDBDBDB
 
 local function c(col) syscall.devctl(1, "sfgc", col) end
 local function w(s)   syscall.write(1, tostring(s)) end
@@ -250,9 +250,9 @@ local function getUserInput(prompt, history)
     local function redraw()
         syscall.devctl(1, "spos", ox, oy)
         w(input:sub(1, cursor-1))
-        if blink then syscall.devctl(1,"sfgc",16); syscall.devctl(1,"sbgc",1) end
+        if blink then syscall.devctl(1,"sfgc",0x000000); syscall.devctl(1,"sbgc",1) end
         w(cursor > #input and " " or input:sub(cursor, cursor))
-        syscall.devctl(1,"sfgc",1); syscall.devctl(1,"sbgc",16)
+        syscall.devctl(1,"sfgc",0xFFFFFF); syscall.devctl(1,"sbgc",16)
         w(input:sub(cursor+1) .. " ")
         dirty = false
     end
@@ -260,17 +260,17 @@ local function getUserInput(prompt, history)
     while true do
         local key = syscall.read(0)
         if key and key ~= "" then
-            if     key == "\19" then
+            if     key == "" then
                 if cursor > 1 then cursor = cursor - 1; dirty = true end
-            elseif key == "\20" then
+            elseif key == "" then
                 if cursor <= #input then cursor = cursor + 1; dirty = true end
-            elseif key == "\17" then
+            elseif key == "" then
                 if history and histIdx < #history then
                     histIdx = histIdx + 1
                     input = history[#history - histIdx + 1]
                     cursor = #input + 1; dirty = true
                 end
-            elseif key == "\18" then
+            elseif key == "" then
                 if histIdx > 1 then
                     histIdx = histIdx - 1
                     input = history[#history - histIdx + 1]
@@ -284,13 +284,13 @@ local function getUserInput(prompt, history)
                     cursor = cursor - 1; dirty = true
                 end
             elseif key == "\n" then
-                syscall.devctl(1,"sfgc",1); syscall.devctl(1,"sbgc",16)
+                syscall.devctl(1,"sfgc",0xFFFFFF); syscall.devctl(1,"sbgc",16)
                 syscall.devctl(1,"spos",ox,oy)
                 w(input .. " \n")
                 return input
-            else
-                input = input:sub(1, cursor-1) .. key .. input:sub(cursor)
-                cursor = cursor + 1; dirty = true
+            elseif #key == 1 and key:byte(1) >= 32 and key:byte(1) < 127 then
+                input=string.sub(input,1,cursor-1)..key..string.sub(input,cursor)
+                cursor=cursor+1;dirty=true
             end
         end
         local nb = (math.floor(syscall.getUptime() / 500) % 2) == 0
@@ -299,8 +299,6 @@ local function getUserInput(prompt, history)
     end
 end
 
-syscall.devctl(1, "clear")
-syscall.devctl(1, "spos", 1, 1)
 c(C_PROMPT); w("HyperionOS " .. _VERSION .. "\n")
 c(C_NIL)
 w("Interactive Lua REPL. exit() to quit.\n\n")
@@ -310,7 +308,7 @@ local history = {}
 
 while true do
     local code = getUserInput("lua> ", history)
-    if code == "" then goto continue end
+    if code ~= "" then
 
         while isIncomplete(code) do
             code = code .. "\n" .. getUserInput("...  ", nil)
@@ -321,5 +319,5 @@ while true do
         end
 
         runCode(code)
-    ::continue::
+    end
 end

Src/micro/bin/micro

@@ -135,16 +135,16 @@ local function pad(s, w)
 end
 
 local function drawTop()
-    tpos(1,1); tbg(4); tfg(16)
+    tpos(1,1); tbg(0x0000FF); tfg(0x000000)
     local left  = " edit" .. (fname and (" - "..fname) or "")
     if dirty then left = left .. " [+]" end
     local right = tostring(cy)..","..tostring(cx).." "
     twrite(pad(left..string.rep(" ", math.max(1, W-#left-#right))..right, W))
-    tbg(16); tfg(1)
+    tbg(0x000000); tfg(0xFFFFFF)
 end
 
 local function drawBottom()
-    tpos(1, H); tbg(4); tfg(16)
+    tpos(1, H); tbg(0x0000FF); tfg(0x000000)
     if msg ~= "" then
         if msgErr then tbg(2) end
         twrite(pad(" "..msg, W))
@@ -152,7 +152,7 @@ local function drawBottom()
     else
         twrite(pad(" ^W Save  ^X Quit+Save  ^P Quit  ^K Cut  ^U Paste  ^F Find  ^G Go", W))
     end
-    tbg(16); tfg(1)
+    tbg(0x000000); tfg(0xFFFFFF)
 end
 
 local function drawLines(map)
@@ -177,29 +177,29 @@ local function drawLines(map)
                 local curCh  = ci > #seg and " " or seg:sub(ci, ci)
                 local after  = seg:sub(ci+1)
 
-                tfg(1); tbg(16); twrite(before)
-                if blinkState then tfg(16); tbg(1) else tfg(1); tbg(16) end
+                tfg(0xFFFFFF); tbg(0x000000); twrite(before)
+                if blinkState then tfg(0x000000); tbg(0xFFFFFF) else tfg(0xFFFFFF); tbg(0x000000) end
                 twrite(curCh)
-                tfg(1); tbg(16); twrite(after)
+                tfg(0xFFFFFF); tbg(0x000000); twrite(after)
                 local drawn = #before + 1 + #after
                 if drawn < W then twrite(string.rep(" ", W - drawn)) end
             else
                 if li == sLine and sPat ~= "" and entry[2] == 1 then
                     local s, e = seg:find(sPat)
                     if s then
-                        tfg(1);  tbg(16); twrite(seg:sub(1,s-1))
-                        tfg(16); tbg(3);  twrite(seg:sub(s,e))
-                        tfg(1);  tbg(16); twrite(seg:sub(e+1))
+                        tfg(0xFFFFFF);  tbg(0x000000); twrite(seg:sub(1,s-1))
+                        tfg(0x000000); tbg(0x00FF00);  twrite(seg:sub(s,e))
+                        tfg(0xFFFFFF);  tbg(0x000000); twrite(seg:sub(e+1))
                         twrite(string.rep(" ", W - #seg))
                     else
-                        tfg(1); tbg(16); twrite(pad(seg, W))
+                        tfg(0xFFFFFF); tbg(0x000000); twrite(pad(seg, W))
                     end
                 else
-                    tfg(1); tbg(16); twrite(pad(seg, W))
+                    tfg(0xFFFFFF); tbg(0x000000); twrite(pad(seg, W))
                 end
             end
         else
-            tfg(13); tbg(16); twrite(pad("~", W)); tfg(1)
+            tfg(0xDBDBDB); tbg(0x000000); twrite(pad("~", W)); tfg(0xFFFFFF)
         end
     end
 end
@@ -212,15 +212,15 @@ local function redraw()
     drawLines(map)
     drawBottom()
     tpos(1, H)
-    tbg(16); tfg(1)
+    tbg(0x000000); tfg(0xFFFFFF)
 end
 
 local function prompt(label, default)
     local inp = default or ""
     while true do
-        tpos(1, H); tbg(3); tfg(16)
+        tpos(1, H); tbg(0x00FF00); tfg(0x000000)
         twrite(pad(" "..label..inp.." ", W))
-        tbg(16); tfg(1)
+        tbg(0x000000); tfg(0xFFFFFF)
         local key = syscall.read(0)
         if not key or key == "" then sleep(0.02)
         elseif key == "" then return nil
@@ -413,9 +413,7 @@ while running do
         redraw()
         dirty = false
     end
-
-    sleep(0.05)
 end
 
-tclear(); tfg(1); tbg(16); tpos(1,1)
+tclear(); tfg(0xFFFFFF); tbg(0x000000); tpos(1,1)
 print("edit: exited"..(fname and (" - "..fname) or ""))

Src/sed/bin/sed

@@ -139,12 +139,9 @@ local function parseCommands(src)
         local c = src:sub(pos, pos)
         if c == "\n" or c == ";" then
             pos = pos + 1
-            goto continue
-        end
-        if c == "#" then
+        elseif c == "#" then
             while pos <= len and src:sub(pos,pos) ~= "\n" do pos = pos + 1 end
-            goto continue
-        end
+        else
 
             local addr1, addr2
             addr1, pos = parseAddr(src, pos)
@@ -203,8 +200,7 @@ local function parseCommands(src)
             elseif cmd == "\n" or cmd == ";" then
             else
             end
-
-        ::continue::
+        end
     end
 
     return cmds

Src/syscallautofill.lua

@@ -1,101 +0,0 @@
-syscall={}
-syscall.sethomedir=function(uid, homedir) end
-syscall.read=function(fd, amount) end
-syscall.getTask=function(pid) end
-syscall.connect=function(fd, address) end
-syscall.getcwd=function() end
-syscall.lodetach=function(id) end
-syscall.stop=function(pid) end
-syscall.recv
-syscall.write=function(fd, data) end
-syscall.getppid=function() end
-syscall.lstat
-syscall.open=function(path, mode) end
-syscall.lseek=function(fd, offset, whence) end
-syscall.setHostname=function(hostname) end
-syscall.chroot
-syscall.dup2
-syscall.getpid=function() end
-syscall.fchown
-syscall.close=function(fd) end
-syscall.umount
-syscall.getTasks=function() end
-syscall.sysdump=function() end
-syscall.fchmod
-syscall.getHostname=function() end
-syscall.listen
-syscall.dup
-syscall.gpio_read
-syscall.fget_suid
-syscall.gpio_write
-syscall.setpassword
-syscall.setEnviron=function(key, value) end
-syscall.losetup
-syscall.reboot=function() end
-syscall.getuid=function() end
-syscall.sigsend
-syscall.sleep=function(time) end
-syscall.exit=function(code) end
-syscall.getEnviron=function(key) end
-syscall.continue=function(pid) end
-syscall.socket
-syscall.log=function(text, tag, color) end
-syscall.loimgwrite
-syscall.exists=function(path) end
-syscall.setuid=function(uid) end
-syscall.exec=function(path, args, envars) end
-syscall.execspawn=function(path, name, envars, args, tgid) end
-syscall.loimgcreate
-syscall.time=function() end
-syscall.newuser
-syscall.spawn=function(func, name, envars, args, tgid) end
-syscall.collect=function(pid) end
-syscall.setshell
-syscall.devctl=function(fd, funcname) end
-syscall.listusers
-syscall.unlockuser
-syscall.mount
-syscall.accept
-syscall.lolist
-syscall.readlink
-syscall.deleteuser
-syscall.remove=function(path) end
-syscall.type=function(path) end
-syscall.elevate
-syscall.mkdir=function(path) end
-syscall.getuidbyname
-syscall.whoami=function() end
-syscall.sendfile
-syscall.setusername
-syscall.geteuid
-syscall.login
-syscall.getHost
-syscall.getUptime
-syscall.httpget
-syscall.stat
-syscall.symlink
-syscall.pread
-syscall.chdir
-syscall.arch=function() end
-syscall.pwrite
-syscall.sockshutdown
-syscall.resolve
-syscall.send
-syscall.fstat
-syscall.chown
-syscall.fsync
-syscall.lockuser
-syscall.getUsername
-syscall.getsockname
-syscall.bind
-syscall.kill=function(pid) end
-syscall.setgid
-syscall.getpeername
-syscall.sigcatch
-syscall.shutdown
-syscall.access
-syscall.sigignore
-syscall.getpasswd
-syscall.version
-syscall.chmod=function(path, perms) end
-syscall.listdir=function(path) end

Src/sysinit/$PKGCONFIG.ini

@@ -0,0 +1 @@
+[symlinks]

Src/sysinit/sbin/init

@@ -0,0 +1,4 @@
+local args={...}
+syscall.remove("/sbin/init")
+syscall.symlink("/usr/lib/sysinit/sysinit", "/sbin/init")
+syscall.exec("/sbin/init", args)

Src/sysinit/usr/lib/sysinit/sysinit

@@ -1,15 +1,16 @@
 --:Minify:--
 local kernel=...
-local fs=require("sys.fs")
+local fs=require("fs")
+kernel.log("Sysinit started...")
 
 for i,v in pairs(kernel.processes) do
     kernel.log("Spawning kernel task "..i)
     syscall.spawn(function()
         local status, err = pcall(v)
         if not status then
-            kernel.log("Error executing kernel task '" .. i .. "': " .. err, "ERROR")
+            kernel.log("Error executing kernel task '" .. i .. "': " .. err, "ERROR", 0xFF0000)
         else
-            kernel.log("Successfully executed kernel task: " .. i, "INFO")
+            kernel.log("Successfully executed kernel task: " .. i)
         end
     end, i)
 end
@@ -17,23 +18,24 @@ end
 if not fs.exists("/bin/startup") then
     fs.mkdir("/bin/startup")
 end
+
 local files = fs.list("/bin/startup")
 if not files then error("Failed to list /bin/startup") end
 for i,v in ipairs(files) do
     if v:sub(-4) == ".lua" then
         local filepath = "/bin/startup/" .. v
-        kernel.log("Executing startup script: " .. filepath, "INFO")
+        kernel.log("Executing startup script: " .. filepath)
         local startupFunc, err = load(fs.readAllText(filepath), "@" .. filepath)
         if not startupFunc then
-            kernel.log("Error loading startup script '" .. filepath .. "': " .. err, "ERROR")
+            kernel.log("Error loading startup script '" .. filepath .. "': " .. err, "ERROR", 0xFF0000)
         else
             syscall.spawn(function()
                 syscall.setuid(1)
                 local status, err = pcall(startupFunc)
                 if not status then
-                    kernel.log("Error executing startup script '" .. filepath .. "': " .. err, "ERROR")
+                    kernel.log("Error executing startup script '" .. filepath .. "': " .. err, "ERROR", 0xFF0000)
                 else
-                    kernel.log("Successfully executed startup script: " .. filepath, "INFO")
+                    kernel.log("Successfully executed startup script: " .. filepath)
                 end
             end, "startup:" .. v)
         end
@@ -41,6 +43,6 @@ for i,v in ipairs(files) do
 end
 
 while true do
-    sleep(1)
+    sleep(5)
     kernel.saveLog()
 end

Test/HyperionOS-units/bin/hunit

@@ -1,4 +1,4 @@
-local fs=require("sys.fs")
+local fs=require("fs")
 local units=fs.list("/usr/lib/hunit/")
 fs.mkdir("/tmp/hunit/")
 local errors={}

Test/HyperionOS-units/usr/lib/hunit/dir.unit

@@ -1,3 +1,3 @@
-local fs = require("sys.fs")
+local fs = require("fs")
 assert(fs.mkdir("/tmp/hunit/testdir"), "failed to make directory")
 assert(fs.isDir("/tmp/hunit/testdir"), "directory does not exist")

build.py

@@ -11,6 +11,8 @@ Targets:
     build-mini-test
     build-micro-test
     clean
+    prod
+    prod-mini
 
 Arch flags:
     --arch cct
@@ -32,6 +34,7 @@ PROJECT_ROOT = Path(__file__).resolve().parent
 SRC_ROOT     = PROJECT_ROOT / "Src"
 TEST_ROOT    = PROJECT_ROOT / "Test"
 BUILD_ROOT   = PROJECT_ROOT / "Build"
+PROD_ROOT    = PROJECT_ROOT / "prod"
 
 ARCH_BOOT_DIR = {
     "cct": Path("boot") / "cct",
@@ -46,6 +49,13 @@ def clean():
     else:
         print("Nothing to clean.")
 
+def cleanprod():
+    if PROD_ROOT.exists():
+        print(f"Removing {PROD_ROOT} ...")
+        shutil.rmtree(PROD_ROOT)
+    else:
+        print("Nothing to clean.")
+
 
 def has_minify_header(path: Path) -> bool:
     try:
@@ -74,7 +84,7 @@ def compress_lz4(data: bytes) -> bytes:
     return lz4.frame.compress(data)
 
 
-def process_root(src_root: Path, out_root: Path, minify: bool, micro: bool):
+def process_root(src_root: Path, out_root: Path, minify: bool, micro: bool, arch:Union[str, None], prod:bool):
     print(f"Building from {src_root}")
     print(f"Output to     {out_root}")
     print()
@@ -83,6 +93,11 @@ def process_root(src_root: Path, out_root: Path, minify: bool, micro: bool):
         if not pkg_dir.is_dir():
             continue
         
+        if pkg_dir.name[:18] == "Hyperion-firmware-":
+            if pkg_dir.name != f"Hyperion-firmware-{arch}":
+                if prod != True:
+                    continue
+
         print(f"== Package: {pkg_dir.name} ==")
 
         for src in sorted(pkg_dir.rglob("*")):
@@ -90,7 +105,14 @@ def process_root(src_root: Path, out_root: Path, minify: bool, micro: bool):
                 continue
 
             rel = src.relative_to(pkg_dir)
+            
+            if rel.name=="$PKGCONFIG.ini":
+                continue
+            
             dst = out_root / rel
+            if prod:
+                dst = out_root / pkg_dir.name / rel
+            
             dst.parent.mkdir(parents=True, exist_ok=True)
 
             print(f"  Processing: {src.relative_to(src_root)}")
@@ -124,13 +146,19 @@ def install_bootloader(arch: str, release: bool):
     shutil.copy2(eeprom, BUILD_ROOT / eeprom_dst_name)
 
 
-def run_build(minify: bool, micro: bool, include_test: bool, arch: Union[str, None], release: bool):
+def run_build(minify: bool, micro: bool, include_test: bool, arch: Union[str, None], release: bool, prod: bool):
     clean()
     BUILD_ROOT.mkdir()
+    if prod:
+        cleanprod()
+        PROD_ROOT.mkdir()
     
     out_root = BUILD_ROOT / "$" if arch else BUILD_ROOT
 
-    process_root(SRC_ROOT, out_root, minify, micro)
+    process_root(SRC_ROOT, out_root, minify, micro, arch, False)
+    if prod:
+        process_root(SRC_ROOT, PROD_ROOT, minify, micro, arch, True)
+    
     if include_test:
         process_root(TEST_ROOT, out_root, minify, micro)
 
@@ -192,9 +220,9 @@ def inject_makeusers(users, arch):
 
 def main():
     parser = argparse.ArgumentParser(description="HyperionOS build script")
-    parser.add_argument("target", choices=["build", "build-mini", "build-micro", "build-test", "build-mini-test", "build-micro-test", "clean"])
+    parser.add_argument("target", choices=["build", "build-mini", "build-micro", "build-test", "build-mini-test", "build-micro-test", "clean", "prod", "prod-mini"])
     parser.add_argument("--arch", choices=["cct", "oc"], default=None,
-                        help="Target architecture (cct or oc)")
+                        help="Target architecture")
     parser.add_argument("--release", dest="release", action="store_true", default=True,
                         help="Release build: eeprom placed as startup.lua (default)")
     parser.add_argument("--dev", dest="release", action="store_false",
@@ -218,6 +246,7 @@ def main():
         clean()
         return
 
+    prod         = "prod" in args.target
     minify       = "mini" in args.target or "micro" in args.target
     micro        = "micro" in args.target
     include_test = "test" in args.target
@@ -225,7 +254,7 @@ def main():
     if micro:
         import lz4.block
     
-    run_build(minify=minify, micro=micro, include_test=include_test, arch=args.arch, release=args.release)
+    run_build(minify=minify, micro=micro, include_test=include_test, arch=args.arch, release=args.release, prod=prod)
 
     if args.makeuser:
         print("Injecting first-boot user setup ...")

installers/HyperionOS-install-cct.lua

@@ -0,0 +1,229 @@
+term.clear()
+term.setTextColor(colors.white)
+term.setCursorPos(1,1)
+print("HyperionOS CCT Installer //")
+local w,h = term.getSize()
+local exitall,releasename,packagelist=false,"",{}
+
+local function printc(...)
+    local args={...}
+    for i=1, #args do
+        if type(args[i]) == "number" then
+            term.setTextColor(args[i])
+        else
+            term.write(args[i])
+        end
+    end
+    print("")
+end
+
+local function download(url)
+    printc(colors.gray, "[ ", colors.green, " FETCH ", colors.gray, " ] ", colors.white, url)
+    local data,err=http.get(url)
+    if not data then error(err) end
+    local text=data.readAll()
+    data.close()
+    return text
+end
+
+local function writeFile(path, data)
+    printc(colors.gray, "[ ", colors.green, "WRITING", colors.gray, " ] ", colors.white, path)
+    local file=fs.open(path, "w")
+    file.write(data)
+    file.close()
+end
+
+print("Installing JSON to /hyinstall/json...")
+writeFile("/hyinstall/json",download("https://git.astronand.dev/Hyperion/HyperionOS/raw/branch/main/misc/json"))
+print("Loading JSON...")
+local json=loadfile("/hyinstall/json")()
+
+local function printTitle()
+    term.clear()
+    term.setCursorPos(1,1)
+    term.setTextColor(colors.white)
+    print("HyperionOS CCT Installer //")
+    print("Orange is prerelease...")
+    term.setCursorPos(1,h-1)
+    print("DESCLAIMER: This will wipe your system on install...")
+    term.write("Bspc: Back | Enter: execute | Tab: description")
+end
+printTitle()
+
+local function pc(text, y, c)
+    local x=(w/2)-#text/2
+    term.setTextColor(c)
+    term.setCursorPos(x, y)
+    term.write(text)
+end
+
+local function drawMenu(menu, sel)
+    local y=(h/2)-#menu/2
+    for i,v in ipairs(menu) do
+        if i==sel then
+            pc("[ "..v.name.." ]", y+i, v.color)
+        else
+            pc(v.name, y+i, v.color)
+        end
+    end
+end
+
+local function desc(description)
+    term.clear()
+    term.setTextColor(colors.white)
+    term.setCursorPos(1,1)
+    print("HyperionOS CCT Installer //\n")
+    print(description)
+    term.setCursorPos(1,h)
+    term.write("Press enter to continue...")
+    while not exitall do
+        local _,key = os.pullEvent("key")
+        if key==keys.enter then
+            break
+        end
+    end
+end
+
+local function menu(m)
+    local exit,sel=false,1
+    while not exit and not exitall do
+        printTitle()
+        drawMenu(m, sel)
+        local _,key = os.pullEvent("key")
+        if key==keys.down then
+            if sel<#m then
+                sel=sel+1
+            end
+        elseif key==keys.up then
+            if sel>1 then
+                sel=sel-1
+            end
+        elseif key==keys.enter then
+            m[sel].func()
+        elseif key==keys.tab then
+            desc(m[sel].desc)
+        elseif key==keys.backspace then
+            exit=true
+        end
+    end
+end
+
+local releases,page={},1
+while true do
+    local handle=http.get("https://git.astronand.dev/api/v1/repos/Hyperion/HyperionOS/releases?page="..tostring(page).."&limit=1")
+    local raw=handle.readAll()
+    handle.close()
+    if raw=="[]\n" then
+        break
+    end
+    releases[page]=json.decode(raw)[1]
+    page=page+1
+end
+
+local function makePage(start, num)
+    local m={}
+    for i=start, num do
+        if not releases[i] then break end
+        local release=releases[i]
+        m[#m+1]={
+            name=release.name,
+            desc=release.body,
+            color=release.prerelease and colors.orange or colors.white,
+            func=function()
+                local data=download("https://git.astronand.dev/Hyperion/HyperionOS/raw/tag/"..release.tag_name.."/Src/install.json")
+                if not data then
+                    term.clear()
+                    term.setCursorPos(1,1)
+                    print("Unable to find package list for ver "..release.tag_name..":\n"..err)
+                    sleep(3)
+                    return
+                end
+                releasename=release.tag_name
+                packagelist=json.decode(data)
+                exitall=true
+            end
+        }
+    end
+    if #releases>start+num then
+        m[#m+1]={
+            name="Next",
+            desc="Next menu",
+            color=colors.cyan,
+            func=function()
+                local menudata=makePage(start+num, num)
+                menu(menudata)
+            end
+        }
+    end
+    return m
+end
+
+menu(makePage(1,5))
+term.clear()
+term.setCursorPos(1,1)
+term.setTextColor(colors.white)
+term.write("Formating disk in ")
+for i=5, 1, -1 do
+    term.write(tostring(i))
+    sleep(.25)
+    for v=1, 3 do
+        term.write(".")
+        sleep(.25)
+    end
+end
+print("")
+
+local function delDir(dir)
+    printc(colors.gray, "[ ", colors.green, " LSDIR ", colors.gray, " ] ", colors.white, dir)
+    local list=fs.list(dir)
+    printc(colors.gray, "[ ", colors.red, " DELET ", colors.gray, " ] ", colors.white, dir)
+    for i=1, #list do
+        if fs.isDir(dir..list[i]) then
+            if dir..list[i] ~= "/rom" then
+                delDir(dir..list[i].."/")
+                fs.delete(dir..list[i])
+            end
+        else
+            fs.delete(dir..list[i])
+            printc(colors.gray, "[ ", colors.red, " DELET ", colors.gray, " ] ", colors.white, dir..list[i])
+        end
+        sleep(.1)
+    end
+end
+
+delDir("/")
+
+print("")
+printc(colors.cyan, "       \\\\Installing//")
+print("")
+printc(colors.white, "Getting package list...")
+
+local function installdir(path, dir, pkg)
+    local data=json.decode(download("https://git.astronand.dev/api/v1/repos/Hyperion/HyperionOS/contents/prod/"..pkg..dir.."?ref="..releasename))
+    if not data then error("Uh Oh: JSON decode error...") end
+    for i=1, #data do
+        local entry=data[i]
+        if entry.type == "dir" then
+            installdir(path, dir..entry.name.."/", pkg)
+        elseif entry.type == "file" then
+            writeFile(path..dir..entry.name, download(entry.download_url))
+        else
+            error("Uh Oh: unknown entrytype "..entry.path)
+        end
+    end
+end
+
+local function installpkg(pkg)
+    installdir("/$", "/", pkg)
+end
+
+for i=1, #packagelist do
+    installpkg(packagelist[i])
+end
+
+installpkg("Hyperion-firmware-cct")
+fs.copy("/$/boot/cct/eeprom", "/startup.lua")
+
+printc(colors.white, "Rebooting...")
+sleep(1)
+os.reboot()

manifest.lua

@@ -0,0 +1,673 @@
+--- @version 1.2.3
+--- @diagnostic disable: missing-return
+--- @diagnostic disable: duplicate-set-field
+syscall={}
+
+--- @alias userinfo {username:string,homedir:string,shell:string,uid:number,gid:number}
+
+--- Sets home directory of User with corresponding uid to homedir
+--- @param uid integer
+--- @param homedir string
+--- @return true|nil, nil|string
+syscall.sethomedir=function(uid, homedir) end
+
+--- Reads amount from fd and returns content or nil
+--- @param fd integer
+--- @param amount? integer
+--- @return string|nil
+syscall.read=function(fd, amount) end
+
+--- Gets information of task with id of pid
+---@param pid integer
+---@return table|nil
+syscall.getTask=function(pid) end
+
+--- Connects a client socket to a server address
+---@param fd integer
+---@param address string
+---@return boolean, string|nil
+syscall.connect=function(fd, address) end
+
+--- Get current working directory
+--- @return string
+syscall.getcwd=function() end
+
+--- Detach loop device (must be unmounted first)
+--- @param id string
+--- @return boolean, string|nil
+syscall.lodetach=function(id) end
+
+--- Stops task with id of pid
+--- @param pid integer
+--- @return boolean, string|nil
+syscall.stop=function(pid) return true end
+
+--- Receive bytes from socket (blocking poll, returns "" if no data)
+--- @param fd integer
+--- @param amount integer
+--- @return string
+syscall.recv=function(fd, amount) end
+
+--- Write data to file descriptor
+--- @param fd integer
+--- @param data string
+--- @return boolean, string|nil
+syscall.write=function(fd, data) end
+
+--- Get parent process ID
+--- @return integer
+syscall.getppid=function() end
+
+--- Get file information (metadata)
+--- @param path string
+--- @return table|nil
+syscall.lstat=function(path) end
+
+--- Open a file with mode ("r", "w", etc.)
+--- @param path string
+--- @param mode string
+--- @return integer|nil, string|nil
+syscall.open=function(path, mode) end
+
+--- Seek in a file descriptor
+--- @param fd integer
+--- @param offset integer
+--- @param whence integer
+--- @return integer|nil
+syscall.lseek=function(fd, offset, whence) end
+
+--- Set system hostname
+--- @param hostname string
+--- @return boolean
+syscall.setHostname=function(hostname) end
+
+--- Change root directory
+--- @param path string
+--- @return boolean, string|nil
+syscall.chroot=function(path) end
+
+--- Duplicate file descriptor
+--- @param src integer
+--- @param dst integer
+--- @return integer|nil, string|nil
+syscall.dup2=function(src, dst) end
+
+--- Get current process ID
+--- @return integer
+syscall.getpid=function() end
+
+--- Change ownership of a file descriptor
+--- @param fd integer
+--- @param uid integer
+--- @param gid integer
+--- @return boolean, string|nil
+syscall.fchown=function(fd, uid, gid) end
+
+--- Close a file descriptor
+--- @param fd integer
+--- @return boolean, string|nil
+syscall.close=function(fd) end
+
+--- Unmount a target
+--- @param target string
+--- @return boolean, string|nil
+syscall.umount=function(target) end
+
+--- Get all task IDs
+--- @return integer[]
+syscall.getTasks=function() end
+
+--- Dump all syscalls for debugging
+--- @return table
+syscall.sysdump=function() end
+
+--- Change permissions of a file descriptor
+--- @param fd integer
+--- @param perms integer
+--- @return boolean, string|nil
+syscall.fchmod=function(fd, perms) end
+
+--- Get system hostname
+--- @return string
+syscall.getHostname=function() end
+
+--- Listen for incoming connections
+--- @param fd integer
+--- @param backlog integer
+--- @return boolean, string|nil
+syscall.listen=function(fd, backlog) end
+
+--- Duplicate a file descriptor
+--- @param fd integer
+--- @return integer|nil
+syscall.dup=function(fd) end
+
+--- Read GPIO pin
+--- @param pin integer
+--- @return boolean|nil
+syscall.gpio_read=function(pin) end
+
+--- Read GPIO pin analog
+--- @param pin integer
+--- @return number|nil
+syscall.gpio_readAnalog=function(pin) end
+
+--- Get SUID bit from fd
+--- @param fd integer
+--- @return boolean
+syscall.fget_suid=function(fd) end
+
+--- Write GPIO pin
+--- @param pin integer
+--- @param data boolean
+syscall.gpio_write=function(pin, data) end
+
+--- Write GPIO pin analog
+--- @param pin integer
+--- @param data number
+syscall.gpio_writeAnalog=function(pin, data) end
+
+--- Set password for user
+--- @param uid integer
+--- @param newPassword string
+--- @return boolean, string|nil
+syscall.setpassword=function(uid, newPassword) end
+
+--- Set environment variable
+--- @param key string
+--- @param value any
+--- @return boolean
+syscall.setEnviron=function(key, value) end
+
+--- Setup a loop device with filePath
+--- @param filePath string
+--- @param forceImage boolean
+--- @return string|nil, string|nil
+syscall.losetup=function(filePath, forceImage) end
+
+--- Reboot the system
+syscall.reboot=function() end
+
+--- Get current user ID
+--- @return integer
+syscall.getuid=function() end
+
+--- Send signal to task
+--- @param pid integer
+--- @param sigid integer|string
+--- @return boolean, string|nil
+syscall.sigsend=function(pid, sigid) end
+
+--- Sleep current task for time seconds
+--- @param time number
+syscall.sleep=function(time) end
+
+--- Exit current task
+--- @param code integer|nil
+syscall.exit=function(code) end
+
+--- Get environment variable
+--- @param key string
+--- @return any
+syscall.getEnviron=function(key) end
+
+--- Continue a stopped task
+--- @param pid integer
+--- @return boolean, string|nil
+syscall.continue=function(pid) end
+
+--- Create a socket
+--- @param domain integer
+--- @param socktype integer
+--- @return integer|nil
+syscall.socket=function(domain, socktype) end
+
+--- Log a message
+--- @param text string
+--- @param tag string
+--- @param color integer
+syscall.log=function(text, tag, color) end
+
+--- Write an image to disk
+--- @param imgStr string
+--- @param destPath string
+--- @return boolean, string|nil
+syscall.loimgwrite=function(imgStr, destPath) end
+
+--- Check if file exists
+--- @param path string
+--- @return boolean
+syscall.exists=function(path) end
+
+--- Set user ID of current task
+--- @param uid integer
+--- @return boolean, string|nil
+syscall.setuid=function(uid) end
+
+--- Replace current task with executable
+--- @param path string
+--- @param args? table
+--- @param envars? table
+syscall.exec=function(path, args, envars) end
+
+--- Spawn a new task from executable
+--- @param path string
+--- @param name? string
+--- @param envars? table
+--- @param args? table
+--- @param tgid? integer
+--- @return integer
+syscall.execspawn=function(path, name, envars, args, tgid) end
+
+--- Create image from file
+--- @param srcPath string
+--- @return string|nil
+syscall.loimgcreate=function(srcPath) end
+
+--- Get system time in ms
+--- @return number
+syscall.time=function() end
+
+--- Create a new user
+--- @param username string
+--- @param password string
+--- @param gid integer
+--- @param homedir string
+--- @param shell string
+--- @return integer|nil
+syscall.newuser=function(username, password, gid, homedir, shell) end
+
+--- Spawn a new task from function
+--- @param func function
+--- @param name? string
+--- @param envars? table
+--- @param args? table
+--- @param tgid? integer
+--- @return integer
+syscall.spawn=function(func, name, envars, args, tgid) end
+
+--- Collect exit code of a dead child task
+--- @param pid integer
+--- @return boolean, integer|string
+syscall.collect=function(pid) end
+
+--- Set shell of user
+--- @param uid integer
+--- @param shell string
+--- @return boolean
+syscall.setshell=function(uid, shell) end
+
+--- Device control
+--- @param fd integer
+--- @param funcname string
+--- @param ... any
+--- @return any
+syscall.devctl=function(fd, funcname, ...) end
+
+--- List all users
+--- @return table
+syscall.listusers=function() end
+
+--- Unlock a user account
+--- @param uid integer
+--- @return boolean
+syscall.unlockuser=function(uid) end
+
+--- Mount a disk or loop device
+--- @param target string
+--- @param diskOrId string
+--- @return boolean, string|nil
+syscall.mount=function(target, diskOrId) end
+
+--- Accept a client connection on a socket
+--- @param fd integer
+--- @return integer|nil
+syscall.accept=function(fd) end
+
+--- List loop devices
+--- @return table
+syscall.lolist=function() end
+
+--- Read a symbolic link
+--- @param path string
+--- @return string|nil
+syscall.readlink=function(path) end
+
+--- Delete a user
+--- @param uid integer
+--- @return boolean
+syscall.deleteuser=function(uid) end
+
+--- Remove a file
+--- @param path string
+--- @return boolean, string|nil
+syscall.remove=function(path) end
+
+--- Get type of a path (file, dir, link)
+--- @param path string
+--- @return string|nil
+syscall.type=function(path) end
+
+--- Elevate to root with password (Disabled due to VULN)
+--- @param targetUsername string
+--- @param password string
+--- @return boolean
+syscall.elevate=function(targetUsername, password) end
+
+--- Make a directory
+--- @param path string
+--- @return boolean, string|nil
+syscall.mkdir=function(path) end
+
+--- Get UID by username
+--- @param username string
+--- @return integer|nil
+syscall.getuidbyname=function(username) end
+
+--- Get current user name
+--- @return string
+syscall.whoami=function() end
+
+--- Send file content
+--- @param src string
+--- @param dest string
+--- @param amount integer
+--- @return boolean, string|nil
+syscall.sendfile=function(src, dest, amount) end
+
+--- Change username of user
+--- @param uid integer
+--- @param newUsername string
+--- @return boolean
+syscall.setusername=function(uid, newUsername) end
+
+--- Get effective UID
+--- @return integer
+syscall.geteuid=function() end
+
+--- Login as user
+--- @param uid integer
+--- @param password string
+--- @return boolean
+syscall.login=function(uid, password) end
+
+--- Get system hostname
+--- @return string
+syscall.getHost=function() end
+
+--- Get system uptime in ms
+--- @return number
+syscall.getUptime=function() end
+
+--- HTTP GET request
+--- @param url string
+--- @param headers table|nil
+--- @return string|nil
+syscall.httpget=function(url, headers) end
+
+--- Get file metadata
+--- @param path string
+--- @return table|nil
+syscall.stat=function(path) end
+
+--- Create symbolic link
+--- @param target string
+--- @param linkPath string
+--- @return boolean, string|nil
+syscall.symlink=function(target, linkPath) end
+
+--- Read from fd at offset
+--- @param fd integer
+--- @param count integer
+--- @param offset integer
+--- @return string|nil
+syscall.pread=function(fd, count, offset) end
+
+--- Change current working directory
+--- @param path string
+--- @return boolean, string|nil
+syscall.chdir=function(path) end
+
+--- Get system architecture
+--- @return string
+syscall.arch=function() end
+
+--- Write to fd at offset
+--- @param fd integer
+--- @param data string
+--- @param offset integer
+--- @return boolean, string|nil
+syscall.pwrite=function(fd, data, offset) end
+
+--- Shutdown socket
+--- @param fd integer
+--- @return boolean, string|nil
+syscall.sockshutdown=function(fd) end
+
+--- Resolve hostname to IP
+--- @param hostname string
+--- @return string|nil
+syscall.resolve=function(hostname) end
+
+--- Send data over socket
+--- @param fd integer
+--- @param data string
+--- @return boolean, string|nil
+syscall.send=function(fd, data) end
+
+--- Get file descriptor info
+--- @param fd integer
+--- @return table|nil
+syscall.fstat=function(fd) end
+
+--- Change ownership of path
+--- @param path string
+--- @param uid integer
+--- @param gid integer
+--- @return boolean, string|nil
+syscall.chown=function(path, uid, gid) end
+
+--- Flush file descriptor
+--- @param fd integer
+--- @return boolean, string|nil
+syscall.fsync=function(fd) end
+
+--- Lock user account
+--- @param uid integer
+--- @return boolean
+syscall.lockuser=function(uid) end
+
+--- Get username by UID
+--- @param uid integer
+--- @return string|nil
+syscall.getUsername=function(uid) end
+
+--- Get socket name
+--- @param fd integer
+--- @return string|nil
+syscall.getsockname=function(fd) end
+
+--- Bind socket to address
+--- @param fd integer
+--- @param address string
+--- @return boolean, string|nil
+syscall.bind=function(fd, address) end
+
+--- Kill a task
+--- @param pid integer
+--- @return boolean, string|nil
+syscall.kill=function(pid) end
+
+--- Set GID for user
+--- @param uid integer
+--- @param gid integer
+--- @return boolean
+syscall.setgid=function(uid, gid) end
+
+--- Get peer name of socket
+--- @param fd integer
+--- @return string|nil
+syscall.getpeername=function(fd) end
+
+--- Set signal handler
+--- @param handler function
+syscall.sigcatch=function(handler) end
+
+--- Shutdown the system
+syscall.shutdown=function() end
+
+--- Check file access mode
+--- @param path string
+--- @param mode string
+--- @return boolean
+syscall.access=function(path, mode) end
+
+--- Ignore current signal
+syscall.sigignore=function() end
+
+--- Get user information
+--- @param uid integer
+--- @return userinfo|nil
+syscall.getpasswd=function(uid) end
+
+--- Get OS version
+--- @return string
+syscall.version=function() end
+
+--- Change file permissions
+--- @param path string
+--- @param perms integer
+--- @return boolean
+syscall.chmod=function(path, perms) end
+
+--- List directory contents
+--- @param path string
+--- @return table
+syscall.listdir=function(path) end
+
+
+----------------------------------------------
+--- STDLib manifest
+----------------------------------------------
+
+--- Gets the index of value or -1
+--- @param tabl table
+--- @param value string|integer
+--- @return integer
+table.indexOf=function(tabl, value) end
+
+-- Returns true if tabl has key else false
+--- @param tabl table
+--- @param query string
+--- @return boolean
+table.hasKey=function(tabl, query) end
+
+--- Returns true if tabl has value else false
+--- @param tabl table
+--- @param query any
+--- @return boolean
+table.hasVal=function(tabl, query) end
+
+--- Creates a deepcopy of tabl
+--- @param tabl table
+--- @return table
+table.deepcopy=function(tabl) end
+
+--- Returns the keys of tabl
+--- @param tabl table
+--- @return table
+table.keys=function(tabl) end
+
+--- Returns the values of tabl
+--- @param tabl table
+--- @return table
+table.values=function(tabl) end
+
+--- Returns a serialized version of tabl
+--- @param tabl table
+--- @return string
+table.serialize=function(tabl) end
+
+--- Returns a merged table with a and b
+--- @param ... table
+--- @return table
+table.merge=function(...) end
+
+--- Gets prefix of string with suffix
+--- @param str string
+--- @param suffix string
+--- @return string
+string.getPrefix=function(str, suffix) end
+
+--- Gets suffix of string with prefix
+--- @param str string
+--- @param prefix string
+--- @return string
+string.getSuffix=function(str, prefix) end
+
+--- Returns if sting has prefix
+--- @param str string
+--- @param prefix string
+--- @return boolean
+string.hasPrefix=function(str, prefix) end
+
+--- Returns if sting has suffix
+--- @param str string
+--- @param suffix string
+--- @return boolean
+string.hasSuffix=function(str, suffix) end
+
+--- Joins all args
+--- @param str string
+--- @param ... string
+--- @return string
+string.join=function(str, ...) end
+
+--- Joins all strings with delim
+--- @param delim string
+--- @param ... string
+--- @return string
+string.delim=function(delim, ...) end
+
+--- Splits a string by delim
+--- @param str string
+--- @param delim string
+--- @return table
+string.split=function(str, delim) end
+
+--- Replaces all instances of target with repl
+--- @param str string
+--- @param target string
+--- @param repl string
+--- @return string
+string.replace=function(str, target, repl) end
+
+--- Converts a number to hex
+--- @param num integer
+--- @return string
+toHex=function(num) end
+
+--- Returns if obj is equal to all in ...
+--- @param obj any
+--- @param ... any
+--- @return boolean
+isEqualToAll=function(obj, ...) end
+
+--- Returns if obj is equal to any in ...
+--- @param obj any
+--- @param ... any
+--- @return boolean
+isEqualToAny=function(obj, ...) end
+
+--- Prints text to stdout
+--- @param ... any
+print=function(...) end
+
+--- Prints text to stdout but with no trailing newline
+--- @param ... any
+printInline=function(...) end
+
+--- Prints text to stdout with format
+--- @param fmt string
+--- @param ... any
+printf=function(fmt, ...) end

misc/json

@@ -0,0 +1,388 @@
+--:Minify:--
+-- json.lua
+--
+-- Copyright (c) 2020 rxi
+--
+-- Permission is hereby granted, free of charge, to any person obtaining a copy of
+-- this software and associated documentation files (the "Software"), to deal in
+-- the Software without restriction, including without limitation the rights to
+-- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+-- of the Software, and to permit persons to whom the Software is furnished to do
+-- so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in all
+-- copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-- SOFTWARE.
+--
+
+local json = { _version = "0.1.2" }
+
+-------------------------------------------------------------------------------
+-- Encode
+-------------------------------------------------------------------------------
+
+local encode
+
+local escape_char_map = {
+  [ "\\" ] = "\\",
+  [ "\"" ] = "\"",
+  [ "\b" ] = "b",
+  [ "\f" ] = "f",
+  [ "\n" ] = "n",
+  [ "\r" ] = "r",
+  [ "\t" ] = "t",
+}
+
+local escape_char_map_inv = { [ "/" ] = "/" }
+for k, v in pairs(escape_char_map) do
+  escape_char_map_inv[v] = k
+end
+
+
+local function escape_char(c)
+  return "\\" .. (escape_char_map[c] or string.format("u%04x", c:byte()))
+end
+
+
+local function encode_nil(val)
+  return "null"
+end
+
+
+local function encode_table(val, stack)
+  local res = {}
+  stack = stack or {}
+
+  -- Circular reference?
+  if stack[val] then error("circular reference") end
+
+  stack[val] = true
+
+  if rawget(val, 1) ~= nil or next(val) == nil then
+    -- Treat as array -- check keys are valid and it is not sparse
+    local n = 0
+    for k in pairs(val) do
+      if type(k) ~= "number" then
+        error("invalid table: mixed or invalid key types")
+      end
+      n = n + 1
+    end
+    if n ~= #val then
+      error("invalid table: sparse array")
+    end
+    -- Encode
+    for i, v in ipairs(val) do
+      table.insert(res, encode(v, stack))
+    end
+    stack[val] = nil
+    return "[" .. table.concat(res, ",") .. "]"
+
+  else
+    -- Treat as an object
+    for k, v in pairs(val) do
+      if type(k) ~= "string" then
+        error("invalid table: mixed or invalid key types")
+      end
+      table.insert(res, encode(k, stack) .. ":" .. encode(v, stack))
+    end
+    stack[val] = nil
+    return "{" .. table.concat(res, ",") .. "}"
+  end
+end
+
+
+local function encode_string(val)
+  return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"'
+end
+
+
+local function encode_number(val)
+  -- Check for NaN, -inf and inf
+  if val ~= val or val <= -math.huge or val >= math.huge then
+    error("unexpected number value '" .. tostring(val) .. "'")
+  end
+  return string.format("%.14g", val)
+end
+
+
+local type_func_map = {
+  [ "nil"     ] = encode_nil,
+  [ "table"   ] = encode_table,
+  [ "string"  ] = encode_string,
+  [ "number"  ] = encode_number,
+  [ "boolean" ] = tostring,
+}
+
+
+encode = function(val, stack)
+  local t = type(val)
+  local f = type_func_map[t]
+  if f then
+    return f(val, stack)
+  end
+  error("unexpected type '" .. t .. "'")
+end
+
+
+function json.encode(val)
+  return ( encode(val) )
+end
+
+
+-------------------------------------------------------------------------------
+-- Decode
+-------------------------------------------------------------------------------
+
+local parse
+
+local function create_set(...)
+  local res = {}
+  for i = 1, select("#", ...) do
+    res[ select(i, ...) ] = true
+  end
+  return res
+end
+
+local space_chars   = create_set(" ", "\t", "\r", "\n")
+local delim_chars   = create_set(" ", "\t", "\r", "\n", "]", "}", ",")
+local escape_chars  = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u")
+local literals      = create_set("true", "false", "null")
+
+local literal_map = {
+  [ "true"  ] = true,
+  [ "false" ] = false,
+  [ "null"  ] = nil,
+}
+
+
+local function next_char(str, idx, set, negate)
+  for i = idx, #str do
+    if set[str:sub(i, i)] ~= negate then
+      return i
+    end
+  end
+  return #str + 1
+end
+
+
+local function decode_error(str, idx, msg)
+  local line_count = 1
+  local col_count = 1
+  for i = 1, idx - 1 do
+    col_count = col_count + 1
+    if str:sub(i, i) == "\n" then
+      line_count = line_count + 1
+      col_count = 1
+    end
+  end
+  error( string.format("%s at line %d col %d", msg, line_count, col_count) )
+end
+
+
+local function codepoint_to_utf8(n)
+  -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=iws-appendixa
+  local f = math.floor
+  if n <= 0x7f then
+    return string.char(n)
+  elseif n <= 0x7ff then
+    return string.char(f(n / 64) + 192, n % 64 + 128)
+  elseif n <= 0xffff then
+    return string.char(f(n / 4096) + 224, f(n % 4096 / 64) + 128, n % 64 + 128)
+  elseif n <= 0x10ffff then
+    return string.char(f(n / 262144) + 240, f(n % 262144 / 4096) + 128,
+                       f(n % 4096 / 64) + 128, n % 64 + 128)
+  end
+  error( string.format("invalid unicode codepoint '%x'", n) )
+end
+
+
+local function parse_unicode_escape(s)
+  local n1 = tonumber( s:sub(1, 4),  16 )
+  local n2 = tonumber( s:sub(7, 10), 16 )
+   -- Surrogate pair?
+  if n2 then
+    return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000)
+  else
+    return codepoint_to_utf8(n1)
+  end
+end
+
+
+local function parse_string(str, i)
+  local res = ""
+  local j = i + 1
+  local k = j
+
+  while j <= #str do
+    local x = str:byte(j)
+
+    if x < 32 then
+      decode_error(str, j, "control character in string")
+
+    elseif x == 92 then -- `\`: Escape
+      res = res .. str:sub(k, j - 1)
+      j = j + 1
+      local c = str:sub(j, j)
+      if c == "u" then
+        local hex = str:match("^[dD][89aAbB]%x%x\\u%x%x%x%x", j + 1)
+                 or str:match("^%x%x%x%x", j + 1)
+                 or decode_error(str, j - 1, "invalid unicode escape in string")
+        res = res .. parse_unicode_escape(hex)
+        j = j + #hex
+      else
+        if not escape_chars[c] then
+          decode_error(str, j - 1, "invalid escape char '" .. c .. "' in string")
+        end
+        res = res .. escape_char_map_inv[c]
+      end
+      k = j + 1
+
+    elseif x == 34 then -- `"`: End of string
+      res = res .. str:sub(k, j - 1)
+      return res, j + 1
+    end
+
+    j = j + 1
+  end
+
+  decode_error(str, i, "expected closing quote for string")
+end
+
+
+local function parse_number(str, i)
+  local x = next_char(str, i, delim_chars)
+  local s = str:sub(i, x - 1)
+  local n = tonumber(s)
+  if not n then
+    decode_error(str, i, "invalid number '" .. s .. "'")
+  end
+  return n, x
+end
+
+
+local function parse_literal(str, i)
+  local x = next_char(str, i, delim_chars)
+  local word = str:sub(i, x - 1)
+  if not literals[word] then
+    decode_error(str, i, "invalid literal '" .. word .. "'")
+  end
+  return literal_map[word], x
+end
+
+
+local function parse_array(str, i)
+  local res = {}
+  local n = 1
+  i = i + 1
+  while 1 do
+    local x
+    i = next_char(str, i, space_chars, true)
+    -- Empty / end of array?
+    if str:sub(i, i) == "]" then
+      i = i + 1
+      break
+    end
+    -- Read token
+    x, i = parse(str, i)
+    res[n] = x
+    n = n + 1
+    -- Next token
+    i = next_char(str, i, space_chars, true)
+    local chr = str:sub(i, i)
+    i = i + 1
+    if chr == "]" then break end
+    if chr ~= "," then decode_error(str, i, "expected ']' or ','") end
+  end
+  return res, i
+end
+
+
+local function parse_object(str, i)
+  local res = {}
+  i = i + 1
+  while 1 do
+    local key, val
+    i = next_char(str, i, space_chars, true)
+    -- Empty / end of object?
+    if str:sub(i, i) == "}" then
+      i = i + 1
+      break
+    end
+    -- Read key
+    if str:sub(i, i) ~= '"' then
+      decode_error(str, i, "expected string for key")
+    end
+    key, i = parse(str, i)
+    -- Read ':' delimiter
+    i = next_char(str, i, space_chars, true)
+    if str:sub(i, i) ~= ":" then
+      decode_error(str, i, "expected ':' after key")
+    end
+    i = next_char(str, i + 1, space_chars, true)
+    -- Read value
+    val, i = parse(str, i)
+    -- Set
+    res[key] = val
+    -- Next token
+    i = next_char(str, i, space_chars, true)
+    local chr = str:sub(i, i)
+    i = i + 1
+    if chr == "}" then break end
+    if chr ~= "," then decode_error(str, i, "expected '}' or ','") end
+  end
+  return res, i
+end
+
+
+local char_func_map = {
+  [ '"' ] = parse_string,
+  [ "0" ] = parse_number,
+  [ "1" ] = parse_number,
+  [ "2" ] = parse_number,
+  [ "3" ] = parse_number,
+  [ "4" ] = parse_number,
+  [ "5" ] = parse_number,
+  [ "6" ] = parse_number,
+  [ "7" ] = parse_number,
+  [ "8" ] = parse_number,
+  [ "9" ] = parse_number,
+  [ "-" ] = parse_number,
+  [ "t" ] = parse_literal,
+  [ "f" ] = parse_literal,
+  [ "n" ] = parse_literal,
+  [ "[" ] = parse_array,
+  [ "{" ] = parse_object,
+}
+
+
+parse = function(str, idx)
+  local chr = str:sub(idx, idx)
+  local f = char_func_map[chr]
+  if f then
+    return f(str, idx)
+  end
+  decode_error(str, idx, "unexpected character '" .. chr .. "'")
+end
+
+
+function json.decode(str)
+  if type(str) ~= "string" then
+    error("expected argument of type string, got " .. type(str))
+  end
+  local res, idx = parse(str, next_char(str, 1, space_chars, true))
+  idx = next_char(str, idx, space_chars, true)
+  if idx <= #str then
+    decode_error(str, idx, "trailing garbage")
+  end
+  return res
+end
+
+
+return json

prod/Hyperion-core/lib/colors

@@ -0,0 +1 @@
+return{white=0xFFFFFF,red=0xFF0000,green=0x00FF00,blue=0x0000FF,cyan=0x00FFFF,yellow=0xFFFF00,purple=0xFF00FF,black=0x000000,gray=0x888888,lightgrey=0xBBBBBB,darkgrey=0x444444,orange=0xFF8800,mint=0x00FF88,brown=0xa52a2a,chocolate=0xd2691e}

prod/Hyperion-core/lib/fs

@@ -0,0 +1 @@
+local a={}function a.open(b,c)local d=syscall.open(b,c)local e={close=function()return syscall.close(d)end,flush=function()syscall.fsync(d)end}if c=="r"then e.read=function(f)local g=syscall.read(d,f)return g end;e.readAll=function(h)local i={}while true do local j=syscall.read(d,h or 65536)if j==nil or#j==0 then break end;table.insert(i,j)end;return table.concat(i)end;e.readLine=function(h)local k={}local l=""local m=h or 65536;local n=false;while true do local o=l:find("\n")if o then local p=l:sub(1,o-1)l=l:sub(o+1)return p end;if n then if l~=""then local q=l;l=""return q else return nil end end;local j=syscall.read(d,m)if not j or j==""then n=true else l=l..j end end end elseif c=="w"then e.write=function(g)return syscall.write(d,g)end elseif c=="a"then e.write=function(g)return syscall.write(d,g)end else error("Invalid mode '"..c.."'",2)end;return e end;function a.readAllText(b)local r=a.open(b,"r")if not r then return false end;local s=r.readAll()r.close()return s end;function a.writeAllText(b,g)local r=a.open(b,"w")r.write(g)r.close()end;function a.appendAllText(b,g)local r=a.open(b,"a")if not r then return false end;r.write(g)r.close()end;function a.mkdir(b)return syscall.mkdir(b)end;function a.remove(b)return syscall.remove(b)end;function a.list(b)return syscall.listdir(b)end;function a.type(b)return syscall.type(b)end;function a.stat(b)return syscall.stat(b)end;function a.exists(b)return syscall.exists(b)end;function a.getcwd()return syscall.getcwd()end;function a.chdir(b)return syscall.chdir(b)end;function a.isDir(b)return syscall.type(b)=="directory"end;return a

prod/Hyperion-core/lib/io

@@ -0,0 +1,6 @@
+local io = {}
+local fs = require("fs")
+
+function io.open(path, mode)
+    return fs.open(path, mode)
+end