Fixed: Some bugs on macOS ARM terminal

MrcSnm · MrcSnm · commit 16bd7dff7a22 · 2025-09-05T13:26:04.000-03:00
diff --git a/tools/hbuild/dub.json b/tools/hbuild/dub.json
@@ -5,7 +5,7 @@
 	"copyright": "Copyright © 2023, Hipreme",
 	"dependencies": {
 		"arsd-official:terminal": "~>11.5.0",
-		"redub": "~>1.24.7",
+		"redub": "~>1.24.9",
 		"handy-httpd": "~>8.4.3",
 		"archive": "~>0.7.1",
 		"my-ip": "~>0.2.0",
diff --git a/tools/hbuild/source/app.d b/tools/hbuild/source/app.d
@@ -74,9 +74,11 @@ Choice* selectChoice(ref Terminal terminal, ref RealTimeConsoleInput input, Choi
 			selectedChoice);
 	}
 
-
-	configs["selectedChoice"] = cast(long)selectedChoice;
-	updateConfigFile();
+	if(!choices[selectedChoice].disableSelectedConfigCache)
+	{
+		configs["selectedChoice"] = cast(long)selectedChoice;
+		updateConfigFile();
+	}
 	return &choices[selectedChoice];
 }
 
@@ -307,9 +309,6 @@ string updateSelectedCompiler()
 
 ChoiceResult exitFn(Choice* c, ref Terminal t, ref RealTimeConsoleInput input, in CompilationOptions cOpts)
 {
-	t.showCursor();
-	configs["selectedChoice"] = 0;
-	updateConfigFile();
 	return ChoiceResult.Continue;
 }
 
@@ -412,7 +411,7 @@ void main(string[] args)
 		Choice("Select Game", &selectGameFolder),
 		Choice("Release Game", &releaseGame),
 		Choice("Selected Compiler: ", &changeCompiler, false, &updateSelectedCompiler),
-		Choice("Exit", &exitFn)
+		Choice("Exit", &exitFn, false, null, false, true)
 	];
 
 	bool usesDflags = "DFLAGS" in environment;
@@ -458,5 +457,8 @@ void main(string[] args)
 		}
 		else break;
 	}
-	exitServer();
+	exitServer(terminal);
+	destroy(terminal);
+	import core.stdc.stdlib;
+	exit(0);
 }
diff --git a/tools/hbuild/source/commons.d b/tools/hbuild/source/commons.d
@@ -21,16 +21,24 @@ string pathBeforeNewLdc;
 struct Terminal
 {
 	import std.stdio;
+	import core.sync.mutex;
+
 	arsd.terminal.Terminal* arsdTerminal;
+	Mutex mtx;
 	this(arsd.terminal.Terminal* arsdTerminal)
 	{
 		this.arsdTerminal = arsdTerminal;
+		mtx = new Mutex();
 	}
 
-	void color(Color main, Color secondary){if(arsdTerminal) arsdTerminal.color(main, secondary);}
+	void color(Color main, Color secondary)
+	{
+		if(arsdTerminal) synchronized(mtx)
+			arsdTerminal.color(main, secondary);
+	}
 	int cursorY()
 	{
-		if(arsdTerminal)
+		if(arsdTerminal) synchronized(mtx)
 		{
 			arsdTerminal.updateCursorPosition();
 			return arsdTerminal.cursorY;
@@ -39,20 +47,20 @@ struct Terminal
 	}
 	string getline(string message)
 	{
-		if(arsdTerminal) return arsdTerminal.getline(message); 
+		if(arsdTerminal) synchronized(mtx) return arsdTerminal.getline(message); 
 		std.stdio.writeln("Can't get line with message [", message, "]");
 		return "";
 	}
-	void moveTo(int x, int y){if(arsdTerminal) arsdTerminal.moveTo(x, y);}
-	void clear(){if(arsdTerminal) arsdTerminal.clear();}
+	void moveTo(int x, int y){if(arsdTerminal) synchronized(mtx) arsdTerminal.moveTo(x, y);}
+	void clear(){if(arsdTerminal) synchronized(mtx) arsdTerminal.clear();}
 	void write(T...)(T args)
 	{
-		if(arsdTerminal) arsdTerminal.write(args);
+		if(arsdTerminal) synchronized(mtx) arsdTerminal.write(args);
 		else std.stdio.write(args);
 	}
 	void flush()
 	{
-		if(arsdTerminal)
+		if(arsdTerminal) synchronized(mtx)
 		{
 			arsdTerminal.flush();
 			arsdTerminal.updateCursorPosition();
@@ -65,11 +73,11 @@ struct Terminal
 		return std.process.wait(pid);
 	}
 
-	void hideCursor(){ if(arsdTerminal) arsdTerminal.hideCursor();}
-	void showCursor(){ if(arsdTerminal) arsdTerminal.showCursor();}
+	void hideCursor(){ if(arsdTerminal) synchronized(mtx) arsdTerminal.hideCursor();}
+	void showCursor(){ if(arsdTerminal) synchronized(mtx) arsdTerminal.showCursor();}
 	void clearToEndOfLine()
 	{
-		if(arsdTerminal) arsdTerminal.clearToEndOfLine();
+		if(arsdTerminal) synchronized(mtx) arsdTerminal.clearToEndOfLine();
 		flush();
 	}
 	void clearLine()
@@ -81,12 +89,14 @@ struct Terminal
 
 	void writeln(T...)(T args)
 	{
-		if (arsdTerminal) arsdTerminal.writeln(args);
+		if (arsdTerminal) synchronized(mtx) arsdTerminal.writeln(args);
 		else std.stdio.writeln(args);
 	}
 	~this()
 	{
-		if(arsdTerminal) destroy(*arsdTerminal);
+		showCursor();
+		if(arsdTerminal) synchronized(mtx) destroy(*arsdTerminal);
+		mtx = null;
 	}
 }
 
@@ -146,17 +156,24 @@ struct Choice
 	bool shouldTime;
 	string function() updateChoice;
 	bool scriptOnly;
+	bool disableSelectedConfigCache;
+
+
+
+
+
 
 	this(string name,
 	ChoiceResult function(Choice* self, ref Terminal t, ref RealTimeConsoleInput input, in CompilationOptions opts) onSelected,
 	bool shouldTime = false,
-	string function() updateChoice = null, bool scriptOnly = false)
+	string function() updateChoice = null, bool scriptOnly = false, bool disableSelectedConfigCache = false)
 	{
 		this.name = updateChoice ? updateChoice() : name;
 		this.onSelected = onSelected;
 		this.shouldTime = shouldTime;
 		this.updateChoice = updateChoice;
 		this.scriptOnly = scriptOnly;
+		this.disableSelectedConfigCache = disableSelectedConfigCache;
 	}
 
 	bool opEquals(ref const Choice other) const 
@@ -882,7 +899,7 @@ private ChoiceResult _backFn(Choice* c, ref Terminal t, ref RealTimeConsoleInput
 }
 Choice getBackChoice()
 {
-	return Choice("Back", &_backFn);
+	return Choice("Back", &_backFn, false, null, false, true);
 }
 
 
@@ -1055,9 +1072,17 @@ int waitRedub(ref Terminal t, DubArguments dArgs, out ProjectDetails proj, strin
 void inParallel(scope void delegate()[] args...)
 {
 	import std.parallelism;
-	foreach(action; parallel(args))
-		action();
 
+	// version(AArch64)
+	// {
+	// 	foreach(action; args)
+	// 		action();
+	// }
+	// else
+	// {
+		foreach(action; parallel(args))
+			action();
+	// }
 }
 
 int waitDub(ref Terminal t, DubArguments dArgs, string copyLinkerFilesTo = null)
diff --git a/tools/hbuild/source/global_opts.d b/tools/hbuild/source/global_opts.d
@@ -13,12 +13,16 @@ private Thread serverThread;
 shared ushort gameServerPort;
 shared string gameServerHost;
 
-void startServer(shared ushort* usingPort, shared string* usingHost)
+
+private Terminal* term;
+
+void startServer(shared ushort* usingPort, shared string* usingHost, ref Terminal t)
 {
     if(serverStarted) return;
     import server;
     import core.stdc.stdlib;
     serverStarted = true;
+    term = &t;
     Semaphore s = new Semaphore();
 	serverThread = new Thread(()
     {
@@ -35,7 +39,11 @@ void startServer(shared ushort* usingPort, shared string* usingHost)
         {
             if (ctrlType == CTRL_C_EVENT) // CTRL+C signal
             {
-                try exitServer();
+                try 
+                {
+                    exitServer(*term);
+                    destroy(*term);
+                }
                 catch(Exception e){}
                 exit(0);
             }
@@ -53,7 +61,8 @@ void startServer(shared ushort* usingPort, shared string* usingHost)
         import core.sys.posix.signal;
         static extern(C) void handleCtrlC(int signum)
         {
-            exitServer();
+            exitServer(*term);
+            destroy(*term);
             exit(0);
         }
         alias fn = extern(C) void function(int) nothrow @nogc;
@@ -63,13 +72,14 @@ void startServer(shared ushort* usingPort, shared string* usingHost)
     s.wait;
 }
 
-void exitServer()
+void exitServer(ref Terminal t)
 {
-    if(!serverStarted) return;
-    import core.stdc.stdlib;
+    if(!serverStarted) 
+        return;
+    import std.conv: to;
     import server;
-    serverStarted = false;
+    t.writelnHighlighted("Shutting down the server at ", cast()gameServerHost, ":", cast()gameServerPort.to!string);
     serverThread = null;
+    serverStarted = false;
     stopServer();
-    exit(0);
 }
diff --git a/tools/hbuild/source/server.d b/tools/hbuild/source/server.d
@@ -166,6 +166,8 @@ string contentTypeFromFileExtension(string filename)
 
 void stopServer()
 {
+	if(context is null)
+		return;
 	pushWebsocketMessage("close");
 	context.server.stop();
 }
diff --git a/tools/hbuild/source/targets/wasm.d b/tools/hbuild/source/targets/wasm.d
@@ -49,7 +49,7 @@ ChoiceResult prepareWASM(Choice* c, ref Terminal t, ref RealTimeConsoleInput inp
 			t.writelnError("Could not build for WebAssembly.");
 			return ChoiceResult.Error;
 		}
-		import wasm_sourcemaps.generate;
+		// import wasm_sourcemaps.generate;
 
 		///In the current status, wasm sourcemap generation invalidates cache, but since the compilation is really fast right now
 		///We can keep that
@@ -69,7 +69,7 @@ ChoiceResult prepareWASM(Choice* c, ref Terminal t, ref RealTimeConsoleInput inp
 	if(!serverStarted)
 	{
 		t.writelnHighlighted("Attempt to start WebAssembly development server.");
-		startServer(&gameServerPort, &gameServerHost);
+		startServer(&gameServerPort, &gameServerHost, t);
 		t.writelnSuccess("Development started at localhost:"~gameServerPort.to!string);
 		cached(() => cast(void)openDefaultBrowser("http://"~gameServerHost~":"~gameServerPort.to!string));
 	}

Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,11 @@ Choice* selectChoice(ref Terminal terminal, ref RealTimeConsoleInput input, Choi`
`74`	`74`	`selectedChoice);`
`75`	`75`	`}`
`76`	`76`
`77`		`-`
`78`		`- configs["selectedChoice"] = cast(long)selectedChoice;`
`79`		`- updateConfigFile();`
	`77`	`+ if(!choices[selectedChoice].disableSelectedConfigCache)`
	`78`	`+ {`
	`79`	`+ configs["selectedChoice"] = cast(long)selectedChoice;`
	`80`	`+ updateConfigFile();`
	`81`	`+ }`
`80`	`82`	`return &choices[selectedChoice];`
`81`	`83`	`}`
`82`	`84`
`@@ -307,9 +309,6 @@ string updateSelectedCompiler()`
`307`	`309`
`308`	`310`	`ChoiceResult exitFn(Choice* c, ref Terminal t, ref RealTimeConsoleInput input, in CompilationOptions cOpts)`
`309`	`311`	`{`
`310`		`- t.showCursor();`
`311`		`- configs["selectedChoice"] = 0;`
`312`		`- updateConfigFile();`
`313`	`312`	`return ChoiceResult.Continue;`
`314`	`313`	`}`
`315`	`314`
`@@ -412,7 +411,7 @@ void main(string[] args)`
`412`	`411`	`Choice("Select Game", &selectGameFolder),`
`413`	`412`	`Choice("Release Game", &releaseGame),`
`414`	`413`	`Choice("Selected Compiler: ", &changeCompiler, false, &updateSelectedCompiler),`
`415`		`- Choice("Exit", &exitFn)`
	`414`	`+ Choice("Exit", &exitFn, false, null, false, true)`
`416`	`415`	`];`
`417`	`416`
`418`	`417`	`bool usesDflags = "DFLAGS" in environment;`
`@@ -458,5 +457,8 @@ void main(string[] args)`
`458`	`457`	`}`
`459`	`458`	`else break;`
`460`	`459`	`}`
`461`		`- exitServer();`
	`460`	`+ exitServer(terminal);`
	`461`	`+ destroy(terminal);`
	`462`	`+ import core.stdc.stdlib;`
	`463`	`+ exit(0);`
`462`	`464`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,16 +21,24 @@ string pathBeforeNewLdc;`
`21`	`21`	`struct Terminal`
`22`	`22`	`{`
`23`	`23`	`import std.stdio;`
	`24`	`+ import core.sync.mutex;`
	`25`	`+`
`24`	`26`	`arsd.terminal.Terminal* arsdTerminal;`
	`27`	`+ Mutex mtx;`
`25`	`28`	`this(arsd.terminal.Terminal* arsdTerminal)`
`26`	`29`	`{`
`27`	`30`	`this.arsdTerminal = arsdTerminal;`
	`31`	`+ mtx = new Mutex();`
`28`	`32`	`}`
`29`	`33`
`30`		`- void color(Color main, Color secondary){if(arsdTerminal) arsdTerminal.color(main, secondary);}`
	`34`	`+ void color(Color main, Color secondary)`
	`35`	`+ {`
	`36`	`+ if(arsdTerminal) synchronized(mtx)`
	`37`	`+ arsdTerminal.color(main, secondary);`
	`38`	`+ }`
`31`	`39`	`int cursorY()`
`32`	`40`	`{`
`33`		`- if(arsdTerminal)`
	`41`	`+ if(arsdTerminal) synchronized(mtx)`
`34`	`42`	`{`
`35`	`43`	`arsdTerminal.updateCursorPosition();`
`36`	`44`	`return arsdTerminal.cursorY;`
`@@ -39,20 +47,20 @@ struct Terminal`
`39`	`47`	`}`
`40`	`48`	`string getline(string message)`
`41`	`49`	`{`
`42`		`- if(arsdTerminal) return arsdTerminal.getline(message);`
	`50`	`+ if(arsdTerminal) synchronized(mtx) return arsdTerminal.getline(message);`
`43`	`51`	`std.stdio.writeln("Can't get line with message [", message, "]");`
`44`	`52`	`return "";`
`45`	`53`	`}`
`46`		`- void moveTo(int x, int y){if(arsdTerminal) arsdTerminal.moveTo(x, y);}`
`47`		`- void clear(){if(arsdTerminal) arsdTerminal.clear();}`
	`54`	`+ void moveTo(int x, int y){if(arsdTerminal) synchronized(mtx) arsdTerminal.moveTo(x, y);}`
	`55`	`+ void clear(){if(arsdTerminal) synchronized(mtx) arsdTerminal.clear();}`
`48`	`56`	`void write(T...)(T args)`
`49`	`57`	`{`
`50`		`- if(arsdTerminal) arsdTerminal.write(args);`
	`58`	`+ if(arsdTerminal) synchronized(mtx) arsdTerminal.write(args);`
`51`	`59`	`else std.stdio.write(args);`
`52`	`60`	`}`
`53`	`61`	`void flush()`
`54`	`62`	`{`
`55`		`- if(arsdTerminal)`
	`63`	`+ if(arsdTerminal) synchronized(mtx)`
`56`	`64`	`{`
`57`	`65`	`arsdTerminal.flush();`
`58`	`66`	`arsdTerminal.updateCursorPosition();`
`@@ -65,11 +73,11 @@ struct Terminal`
`65`	`73`	`return std.process.wait(pid);`
`66`	`74`	`}`
`67`	`75`
`68`		`- void hideCursor(){ if(arsdTerminal) arsdTerminal.hideCursor();}`
`69`		`- void showCursor(){ if(arsdTerminal) arsdTerminal.showCursor();}`
	`76`	`+ void hideCursor(){ if(arsdTerminal) synchronized(mtx) arsdTerminal.hideCursor();}`
	`77`	`+ void showCursor(){ if(arsdTerminal) synchronized(mtx) arsdTerminal.showCursor();}`
`70`	`78`	`void clearToEndOfLine()`
`71`	`79`	`{`
`72`		`- if(arsdTerminal) arsdTerminal.clearToEndOfLine();`
	`80`	`+ if(arsdTerminal) synchronized(mtx) arsdTerminal.clearToEndOfLine();`
`73`	`81`	`flush();`
`74`	`82`	`}`
`75`	`83`	`void clearLine()`
`@@ -81,12 +89,14 @@ struct Terminal`
`81`	`89`
`82`	`90`	`void writeln(T...)(T args)`
`83`	`91`	`{`
`84`		`- if (arsdTerminal) arsdTerminal.writeln(args);`
	`92`	`+ if (arsdTerminal) synchronized(mtx) arsdTerminal.writeln(args);`
`85`	`93`	`else std.stdio.writeln(args);`
`86`	`94`	`}`
`87`	`95`	`~this()`
`88`	`96`	`{`
`89`		`- if(arsdTerminal) destroy(*arsdTerminal);`
	`97`	`+ showCursor();`
	`98`	`+ if(arsdTerminal) synchronized(mtx) destroy(*arsdTerminal);`
	`99`	`+ mtx = null;`
`90`	`100`	`}`
`91`	`101`	`}`
`92`	`102`
`@@ -146,17 +156,24 @@ struct Choice`
`146`	`156`	`bool shouldTime;`
`147`	`157`	`string function() updateChoice;`
`148`	`158`	`bool scriptOnly;`
	`159`	`+ bool disableSelectedConfigCache;`
	`160`	`+`
	`161`	`+`
	`162`	`+`
	`163`	`+`
	`164`	`+`
`149`	`165`
`150`	`166`	`this(string name,`
`151`	`167`	`ChoiceResult function(Choice* self, ref Terminal t, ref RealTimeConsoleInput input, in CompilationOptions opts) onSelected,`
`152`	`168`	`bool shouldTime = false,`
`153`		`- string function() updateChoice = null, bool scriptOnly = false)`
	`169`	`+ string function() updateChoice = null, bool scriptOnly = false, bool disableSelectedConfigCache = false)`
`154`	`170`	`{`
`155`	`171`	`this.name = updateChoice ? updateChoice() : name;`
`156`	`172`	`this.onSelected = onSelected;`
`157`	`173`	`this.shouldTime = shouldTime;`
`158`	`174`	`this.updateChoice = updateChoice;`
`159`	`175`	`this.scriptOnly = scriptOnly;`
	`176`	`+ this.disableSelectedConfigCache = disableSelectedConfigCache;`
`160`	`177`	`}`
`161`	`178`
`162`	`179`	`bool opEquals(ref const Choice other) const`
`@@ -882,7 +899,7 @@ private ChoiceResult _backFn(Choice* c, ref Terminal t, ref RealTimeConsoleInput`
`882`	`899`	`}`
`883`	`900`	`Choice getBackChoice()`
`884`	`901`	`{`
`885`		`- return Choice("Back", &_backFn);`
	`902`	`+ return Choice("Back", &_backFn, false, null, false, true);`
`886`	`903`	`}`
`887`	`904`
`888`	`905`
`@@ -1055,9 +1072,17 @@ int waitRedub(ref Terminal t, DubArguments dArgs, out ProjectDetails proj, strin`
`1055`	`1072`	`void inParallel(scope void delegate()[] args...)`
`1056`	`1073`	`{`
`1057`	`1074`	`import std.parallelism;`
`1058`		`- foreach(action; parallel(args))`
`1059`		`- action();`
`1060`	`1075`
	`1076`	`+ // version(AArch64)`
	`1077`	`+ // {`
	`1078`	`+ // foreach(action; args)`
	`1079`	`+ // action();`
	`1080`	`+ // }`
	`1081`	`+ // else`
	`1082`	`+ // {`
	`1083`	`+ foreach(action; parallel(args))`
	`1084`	`+ action();`
	`1085`	`+ // }`
`1061`	`1086`	`}`
`1062`	`1087`
`1063`	`1088`	`int waitDub(ref Terminal t, DubArguments dArgs, string copyLinkerFilesTo = null)`
Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,8 @@ string contentTypeFromFileExtension(string filename)`
`166`	`166`
`167`	`167`	`void stopServer()`
`168`	`168`	`{`
	`169`	`+ if(context is null)`
	`170`	`+ return;`
`169`	`171`	`pushWebsocketMessage("close");`
`170`	`172`	`context.server.stop();`
`171`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ ChoiceResult prepareWASM(Choice* c, ref Terminal t, ref RealTimeConsoleInput inp`
`49`	`49`	`t.writelnError("Could not build for WebAssembly.");`
`50`	`50`	`return ChoiceResult.Error;`
`51`	`51`	`}`
`52`		`- import wasm_sourcemaps.generate;`
	`52`	`+ // import wasm_sourcemaps.generate;`
`53`	`53`
`54`	`54`	`///In the current status, wasm sourcemap generation invalidates cache, but since the compilation is really fast right now`
`55`	`55`	`///We can keep that`
`@@ -69,7 +69,7 @@ ChoiceResult prepareWASM(Choice* c, ref Terminal t, ref RealTimeConsoleInput inp`
`69`	`69`	`if(!serverStarted)`
`70`	`70`	`{`
`71`	`71`	`t.writelnHighlighted("Attempt to start WebAssembly development server.");`
`72`		`- startServer(&gameServerPort, &gameServerHost);`
	`72`	`+ startServer(&gameServerPort, &gameServerHost, t);`
`73`	`73`	`t.writelnSuccess("Development started at localhost:"~gameServerPort.to!string);`
`74`	`74`	`cached(() => cast(void)openDefaultBrowser("http://"~gameServerHost~":"~gameServerPort.to!string));`
`75`	`75`	`}`