From d01655e8035c9b2b89ff6cc3298074387f2715fc Mon Sep 17 00:00:00 2001
From: sammy-ette <torchedsammy@gmail.com>
Date: Sat, 14 Jun 2025 12:30:06 -0400
Subject: [PATCH] fix: reimpl commander, fix bait build

---
 golibs/bait/bait.go           |  2 +-
 golibs/commander/commander.go | 25 +++++++++++--------------
 util/util.go                  |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/golibs/bait/bait.go b/golibs/bait/bait.go
index d6869c6f..1db1960f 100644
--- a/golibs/bait/bait.go
+++ b/golibs/bait/bait.go
@@ -262,7 +262,7 @@ end)
 #example
 */
 func (b *Bait) bcatch(mlr *moonlight.Runtime, c *moonlight.GoCont) (moonlight.Cont, error) {
-	name, catcher, err := util.HandleStrCallback(mlr, c)
+	name, catcher, err := util.HandleStrCallback(mlr)
 	if err != nil {
 		return nil, err
 	}
diff --git a/golibs/commander/commander.go b/golibs/commander/commander.go
index e75ccaa1..96fb1388 100644
--- a/golibs/commander/commander.go
+++ b/golibs/commander/commander.go
@@ -54,11 +54,9 @@ func New(rtm *moonlight.Runtime) *Commander {
 
 func (c *Commander) Loader(rtm *moonlight.Runtime) moonlight.Value {
 	exports := map[string]moonlight.Export{
-		/*
-			"register":   {c.cregister, 2, false},
-			"deregister": {c.cderegister, 1, false},
-			"registry":   {c.cregistry, 0, false},
-		*/
+		"register":   {c.cregister, 2, false},
+		"deregister": {c.cderegister, 1, false},
+		"registry":   {c.cregistry, 0, false},
 	}
 	mod := moonlight.NewTable()
 	rtm.SetExports(mod, exports)
@@ -83,21 +81,20 @@ commander.register('hello', function(args, sinks)
 end)
 #example
 */
-func (c *Commander) cregister(mlr *moonlight.Runtime, ct *moonlight.GoCont) (moonlight.Cont, error) {
-	cmdName, cmd, err := util.HandleStrCallback(mlr, ct)
+func (c *Commander) cregister(mlr *moonlight.Runtime) error {
+	cmdName, cmd, err := util.HandleStrCallback(mlr)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	c.Commands[cmdName] = cmd
 
-	return ct.Next(), err
+	return nil
 }
 
 // deregister(name)
 // Removes the named command. Note that this will only remove Commander-registered commands.
 // #param name string Name of the command to remove.
-/*
 func (c *Commander) cderegister(mlr *moonlight.Runtime) error {
 	if err := mlr.Check1Arg(); err != nil {
 		return err
@@ -111,13 +108,12 @@ func (c *Commander) cderegister(mlr *moonlight.Runtime) error {
 
 	return err
 }
-*/
 
 // registry() -> table
 // Returns all registered commanders. Returns a list of tables with the following keys:
 // - `exec`: The function used to run the commander. Commanders require args and sinks to be passed.
 // #returns table
-/*func (c *Commander) cregistry(mlr *moonlight.Runtime, ct *moonlight.GoCont) (moonlight.Cont, error) {
+func (c *Commander) cregistry(mlr *moonlight.Runtime) error {
 	registryLua := moonlight.NewTable()
 	for cmdName, cmd := range c.Commands {
 		cmdTbl := moonlight.NewTable()
@@ -128,5 +124,6 @@ func (c *Commander) cderegister(mlr *moonlight.Runtime) error {
 		registryLua.SetField(cmdName, moonlight.TableValue(cmdTbl))
 	}
 
-	return mlr.PushNext1(ct, moonlight.TableValue(registryLua)), nil
-}*/
+	mlr.PushNext1(moonlight.TableValue(registryLua))
+	return nil
+}
diff --git a/util/util.go b/util/util.go
index 2e080477..44e8f318 100644
--- a/util/util.go
+++ b/util/util.go
@@ -17,7 +17,7 @@ func SetField(module *rt.Table, field string, value rt.Value) {
 
 // HandleStrCallback handles function parameters for Go functions which take
 // a string and a closure.
-func HandleStrCallback(mlr *moonlight.Runtime, c *moonlight.GoCont) (string, *moonlight.Closure, error) {
+func HandleStrCallback(mlr *moonlight.Runtime) (string, *moonlight.Closure, error) {
 	if err := mlr.CheckNArgs(2); err != nil {
 		return "", nil, err
 	}