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

@@ -249,7 +249,154 @@ local ok, err = xpcall(function()
         return value
     end
 
-    local allscreens = {apis.peripheral.find("monitor")}
+    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()

Src/install.json

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

build.py

@@ -247,7 +247,7 @@ def main():
         return
 
     prod         = "prod" in args.target
-    minify       = "mini" in args.target or "micro" in args.target or "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
 

installers/HyperionOS-install-cct.lua

@@ -197,7 +197,6 @@ print("")
 printc(colors.cyan, "       \\\\Installing//")
 print("")
 printc(colors.white, "Getting package list...")
-local list=json.decode()
 
 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))

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

@@ -1 +1 @@
-local a=...local b={}b.handlers={}a.socket=b;function b.registerProtocal(c,d)b.handlers[c]=d end;function b.socket()local e=a.vfs.P;local f=a.newFifo()local g=false;a.vfs.newfd({handle={read=function()if not g then error("ECCON")end;return f.read()end,write=function()if not g then error("ECCON")end;return f.write()end,close=function()g=true end},type="socket",refcount=1,meta={owner=a.currentTask.uid,group=a.currentTask.uid,etype=2,perms=e.OWNER_R+e.OWNER_W+e.GROUP_R+e.GROUP_W},isvirt=true})end;function b.connect(h,i)end;function b.listen(h,j)end;a.log("Loaded socket module")
+local a=...local b={}b.handlers={}a.socket=b;function b.registerProtocal(c,d)b.handlers[c]=d end;function b.socket()local e=a.vfs.P;local f=a.newFifo()local g=false;a.vfs.newfd({handle={read=function()if g then error("ECCON")end;return f.read()end,write=function()if g then error("ECCON")end;return f.write()end,close=function()g=true end},type="socket",refcount=1,meta={owner=a.currentTask.uid,group=a.currentTask.uid,etype=2,perms=e.OWNER_R+e.OWNER_W+e.GROUP_R+e.GROUP_W},isvirt=true})end;function b.connect(h,i)end;function b.listen(h,j)end;a.log("Loaded socket module")