From 6377de720803eed6d69d8658aa76500370f2ca43 Mon Sep 17 00:00:00 2001 From: robogg133 Date: Thu, 23 Oct 2025 23:04:35 -0300 Subject: [PATCH] creating new build system --- cmd/packets/main.go | 2 +- configs/structs.go | 8 ++- internal/build/main.go | 129 ++++++++++++++++++++++++++++++++++++++ internal/utils/lua/lua.go | 1 - internal/utils/utils.go | 6 +- pkg/main.go | 4 ++ 6 files changed, 143 insertions(+), 7 deletions(-) create mode 100644 internal/build/main.go diff --git a/cmd/packets/main.go b/cmd/packets/main.go index af72a91..51c4ff4 100644 --- a/cmd/packets/main.go +++ b/cmd/packets/main.go @@ -649,7 +649,7 @@ func UpgradeToThis(id string, installPath string, installedDB *sql.DB, storePkgF serial = ?, package_d = ?, filename = ?, os = ?, arch = ?, in_cache = ? `, p.QueryName, - p.Manifest.Info.Id, + p.Manifest.Package.Id, p.Version, p.Description, p.Serial, diff --git a/configs/structs.go b/configs/structs.go index 21813b1..09923d5 100644 --- a/configs/structs.go +++ b/configs/structs.go @@ -1,17 +1,21 @@ package configs type Manifest struct { - Info struct { + Package struct { Name string `toml:"name"` Id string `toml:"id"` Version string `toml:"version"` Description string `toml:"description"` Dependencies map[string]string `toml:"dependencies"` Author string `toml:"author"` - } `toml:"Info"` + } `toml:"Package"` + Build struct { + BuildDependencies map[string]string `toml:"dependencies"` + } Hooks struct { Install string `toml:"install"` Remove string `toml:"remove"` + Build string `toml:"build"` } `toml:"Hooks"` } diff --git a/internal/build/main.go b/internal/build/main.go new file mode 100644 index 0000000..c646129 --- /dev/null +++ b/internal/build/main.go @@ -0,0 +1,129 @@ +package build + +import ( + "io" + "os" + "packets/configs" + utils_lua "packets/internal/utils/lua" + "path/filepath" + + "github.com/spf13/afero" + lua "github.com/yuin/gopher-lua" +) + +type Container struct { + Root string + FS afero.Fs + DataDir string + Manifest configs.Manifest +} + +func NewContainer(Root string, dataDir string, manifest configs.Manifest) (Container, error) { + + var container Container + baseFs := afero.NewOsFs() + fileSystem := afero.NewBasePathFs(baseFs, Root) + + container.Root = Root + container.Manifest = manifest + container.DataDir = dataDir + container.FS = fileSystem + + if err := container.CopyHostToContainer(dataDir, "/data"); err != nil { + return Container{}, err + } + + if err := container.FS.MkdirAll("/usr/bin", 0777); err != nil { + return Container{}, err + } + + if err := afero.Symlinker.SymlinkIfPossible(container.FS.(afero.Symlinker), "/usr/bin", "/bin"); err != nil { + return Container{}, err + } + + return container, nil +} + +func (container Container) CopyHostToContainer(src string, dest string) error { + stats, err := os.Stat(src) + if err != nil { + return err + } + + if stats.IsDir() { + files, err := os.ReadDir(src) + if err != nil { + return err + } + + if err := container.FS.MkdirAll(dest, 0755); err != nil { + return err + } + + for _, file := range files { + srcPath := filepath.Join(src, file.Name()) + destPath := filepath.Join(dest, file.Name()) + + if file.IsDir() { + if err := container.CopyHostToContainer(srcPath, destPath); err != nil { + return err + } + continue + } + + if err := container.copySingleFile(srcPath, destPath); err != nil { + return err + } + } + } else { + if err := container.copySingleFile(src, dest); err != nil { + return err + } + } + + return nil +} + +func (container Container) copySingleFile(source string, destination string) error { + src, err := os.Open(source) + if err != nil { + return err + } + defer src.Close() + + stats, err := src.Stat() + if err != nil { + return err + } + if err := container.FS.MkdirAll(filepath.Dir(destination), 0755); err != nil { + return err + } + dst, err := container.FS.Create(destination) + if err != nil { + return err + } + defer dst.Close() + + if _, err := io.Copy(dst, src); err != nil { + return err + } + + if err := container.FS.Chmod(destination, stats.Mode()); err != nil { + return err + } + + return nil +} + +func (container Container) RunBuild() error { + + L, err := utils_lua.GetSandBox() + if err != nil { + return err + } + + L.SetGlobal("data_dir", lua.LString(container.DataDir)) + L.SetGlobal("script", lua.LString(container.Manifest.Hooks.Build)) + + return nil +} diff --git a/internal/utils/lua/lua.go b/internal/utils/lua/lua.go index 425582a..f4a5607 100644 --- a/internal/utils/lua/lua.go +++ b/internal/utils/lua/lua.go @@ -14,7 +14,6 @@ func GetSandBox() (lua.LState, error) { } L := lua.NewState() osObject := L.GetGlobal("os").(*lua.LTable) - L.SetGlobal("SAFE_MODE", lua.LTrue) L.SetGlobal("PACKETS_DATADIR", lua.LString(cfg.Config.Data_d)) diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 691293b..6512262 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -210,7 +210,7 @@ func (p *Package) AddToInstalledDB(inCache int, packagePath string) error { defer func() { if !success { - _, err := db.Exec("DELETE FROM packages WHERE id = ?", p.Manifest.Info.Id) + _, err := db.Exec("DELETE FROM packages WHERE id = ?", p.Manifest.Package.Id) if err != nil { log.Println("failed to rollback package addition:", err) } @@ -223,7 +223,7 @@ func (p *Package) AddToInstalledDB(inCache int, packagePath string) error { serial, package_d, filename, os, arch, in_cache ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, p.QueryName, - p.Manifest.Info.Id, + p.Manifest.Package.Id, p.Version, p.Description, p.Serial, @@ -238,7 +238,7 @@ func (p *Package) AddToInstalledDB(inCache int, packagePath string) error { } for depnName, versionConstraint := range p.Dependencies { - _, err = db.Exec("INSERT INTO package_dependencies (package_id, dependency_name, version_constraint) VALUES (?, ?, ?)", p.Manifest.Info.Id, depnName, versionConstraint) + _, err = db.Exec("INSERT INTO package_dependencies (package_id, dependency_name, version_constraint) VALUES (?, ?, ?)", p.Manifest.Package.Id, depnName, versionConstraint) } success = true diff --git a/pkg/main.go b/pkg/main.go index b016e50..ce1909f 100644 --- a/pkg/main.go +++ b/pkg/main.go @@ -113,6 +113,10 @@ func InstallPackage(file []byte, destDir string) error { if err != nil { return err } + + L.SetGlobal("data_dir", lua.LString(filepath.Join(destDir, "data"))) + L.SetGlobal("script", lua.LString(manifest.Hooks.Build)) + L.SetGlobal("data_dir", lua.LString(filepath.Join(destDir, "data"))) L.SetGlobal("script", lua.LString(manifest.Hooks.Install))