fix: Homescript backend args

core/automation/automationRunner.go

@@ -205,6 +205,7 @@ func AutomationRunnerFunc(id uint, automationCtx types.ExecutionContextAutomatio
 		false,
 		&automationCtx.Inner,
 		nil,
+		make(map[string]string),
 	)
 
 	if err != nil {

core/homescript/dispatcher/dispatcher.go

@@ -512,6 +512,7 @@ func (i *InstanceT) allocatingCall(
 			false,
 			nil,
 			nil,
+			make(map[string]string),
 		)
 
 		res = resTemp

core/homescript/dispatcher/mqtt.go

@@ -16,6 +16,7 @@ import (
 )
 
 const MqttKeepAlive time.Duration = time.Second * 60
+const MqttConnectTimeout time.Duration = time.Second * 3
 const MqttPingTimeout time.Duration = time.Second
 const MqttDisconnectTimeoutMillis uint = 250
 const MqttQOS byte = 0x2
@@ -192,9 +193,10 @@ func (m *MqttManager) init() error {
 	}
 
 	logger.Debugf(
-		"Initializing MQTT subsystem for broker `%s@%s`...",
+		"Initializing MQTT subsystem for broker `%s@%s` (timeout: %v)...",
 		m.Body.Content.Config.Username,
 		m.Body.Content.Config.Host,
+		MqttConnectTimeout,
 	)
 
 	opts := mqtt.NewClientOptions().
@@ -206,6 +208,7 @@ func (m *MqttManager) init() error {
 		SetUsername(m.Body.Content.Config.Username).
 		SetPassword(m.Body.Content.Config.Password)
 
+	opts.SetConnectTimeout(MqttConnectTimeout)
 	opts.SetKeepAlive(MqttKeepAlive)
 	opts.SetPingTimeout(MqttPingTimeout)
 	opts.SetDefaultPublishHandler(m.messageHandler)

core/homescript/executor/executor.go

@@ -43,7 +43,7 @@ type InterpreterExecutor struct {
 }
 
 func (self InterpreterExecutor) Free() error {
-	var errRes error = nil
+	var errRes error
 
 	for _, registration := range *self.registrations {
 		// Return the first error that is found
@@ -130,6 +130,7 @@ func (self InterpreterExecutor) execHelper(
 		self.ioWriter,
 		nil,
 		self.stdin,
+		arguments,
 	)
 
 	if err != nil {

core/homescript/manager.go

@@ -618,6 +618,7 @@ func (m *Manager) RunUserCode(
 	outputWriter io.Writer,
 	idChan *chan uint64,
 	stdin *types.StdinBuffer,
+	args map[string]string,
 ) (types.HmsRes, error) {
 	return m.RunUserCodeTweakable(
 		code,
@@ -630,6 +631,7 @@ func (m *Manager) RunUserCode(
 		true,
 		nil,
 		stdin,
+		args,
 	)
 }
 
@@ -642,11 +644,12 @@ func (m *Manager) RunUserCodeTweakable(
 	processAnnotations bool,
 	automationContext *types.ExecutionContextAutomationInner,
 	stdin *types.StdinBuffer,
+	args map[string]string,
 ) (types.HmsRes, error) {
 	userContext := types.NewExecutionContextUser(
 		filename,
 		username,
-		nil,
+		args,
 	)
 	context := types.ExecutionContext(userContext)
 
@@ -684,6 +687,7 @@ func (m *Manager) RunUserScriptTweakable(
 	processAnnotations bool,
 	automationContext *types.ExecutionContextAutomationInner,
 	stdin *types.StdinBuffer,
+	args map[string]string,
 ) (types.HmsRes, error) {
 	script, found, err := m.GetPersonalScriptById(programID, username)
 	if err != nil {
@@ -704,6 +708,7 @@ func (m *Manager) RunUserScriptTweakable(
 		processAnnotations,
 		automationContext,
 		stdin,
+		args,
 	)
 }
 
@@ -715,6 +720,7 @@ func (m *Manager) RunUserScript(
 	outputWriter io.Writer,
 	idChan *chan uint64,
 	stdin *types.StdinBuffer,
+	args map[string]string,
 ) (types.HmsRes, error) {
 	return m.RunUserScriptTweakable(
 		programID,
@@ -726,6 +732,7 @@ func (m *Manager) RunUserScript(
 		true,
 		nil,
 		stdin,
+		args,
 	)
 }
 

core/homescript/managerTrigger.go

@@ -118,6 +118,7 @@ func (m *Manager) ExtractTriggerAnnotationArgs(
 			false,
 			nil,
 			nil,
+			make(map[string]string),
 		)
 	case types.ExecutionContextAutomation:
 		panic("not implemented")

core/homescript/types/manager.go

@@ -73,6 +73,7 @@ type Manager interface {
 		outputWriter io.Writer,
 		idChan *chan uint64,
 		stdin *StdinBuffer,
+		args map[string]string,
 	) (HmsRes, error)
 
 	RunUserCodeTweakable(
@@ -84,6 +85,7 @@ type Manager interface {
 		processAnnotations bool,
 		automationContext *ExecutionContextAutomationInner,
 		stdin *StdinBuffer,
+		args map[string]string,
 	) (HmsRes, error)
 
 	RunUserScript(
@@ -93,6 +95,7 @@ type Manager interface {
 		outputWriter io.Writer,
 		idChan *chan uint64,
 		stdin *StdinBuffer,
+		args map[string]string,
 	) (HmsRes, error)
 
 	RunUserScriptTweakable(
@@ -104,6 +107,7 @@ type Manager interface {
 		processAnnotations bool,
 		automationContext *ExecutionContextAutomationInner,
 		stdin *StdinBuffer,
+		args map[string]string,
 	) (HmsRes, error)
 
 	RunDriverScript(

core/scheduler/scheduleRunner.go

@@ -155,6 +155,7 @@ func scheduleRunnerFunc(id uint, m *SchedulerManager) {
 			&bytes.Buffer{},
 			nil,
 			nil,
+			make(map[string]string),
 		)
 
 		if err != nil {

server/api/homescript.go

@@ -118,6 +118,7 @@ func RunHomescriptId(w http.ResponseWriter, r *http.Request) {
 		&outputBuffer,
 		nil,
 		nil,
+		args,
 	)
 
 	if err != nil {
@@ -236,6 +237,7 @@ func RunHomescriptString(w http.ResponseWriter, r *http.Request) {
 		&outputBuffer,
 		nil,
 		nil,
+		args,
 	)
 	output := outputBuffer.String()
 

server/api/homescriptAsync.go

@@ -159,6 +159,7 @@ func RunHomescriptByIDAsync(w http.ResponseWriter, r *http.Request) {
 			outWriter,
 			idChan,
 			stdin,
+			args,
 		)
 
 		log.Tracef("WS homescript (%s) finished.", request.HMSID)

web/src/pages/rooms/App.svelte

@@ -486,7 +486,7 @@
             top: auto;
         }
     }
-    
+
     #content {
         // On non-widescreen layouts, the room tabs might include a scrollbar which adds additional space
         min-height: calc(100vh - 63px);