gg.easy.airship 0.1.2160 → 0.1.2162

package/.github/workflows/package-deployment.yaml

@@ -44,11 +44,24 @@ jobs:
     environment: 'platform-production'
     runs-on: ubuntu-latest
     steps:
+      - name: "Setup Git Config"
+        run: |
+          git config --global user.email "actions@github.com"
+          git config --global user.name "GitHub Actions"
+
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.DEPLOY_APP_ID }}
+          private-key: ${{ secrets.DEPLOY_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+
       - name: Checkout Airship Template
         uses: actions/checkout@v4
         with:
           repository: easy-games/airship-template
-          token: ${{ secrets.PULL_PACKAGE_PAT }}
+          token: ${{ steps.generate-token.outputs.token }}
           lfs: true
           path: airship-template
           ref: refs/heads/main
@@ -57,7 +70,7 @@ jobs:
       - name: Update Template Version
         uses: actions/github-script@v7
         with:
-          github-token: ${{ secrets.PULL_PACKAGE_PAT }}
+          github-token: ${{ steps.generate-token.outputs.token }}
           script: |
             const fs = require('fs');
             const path = require('path');

package/Editor/TypescriptServices/Compiler/TypescriptCompilerWatchState.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
+using UnityEditor;
 using UnityEngine;
 using Debug = UnityEngine.Debug;
 
@@ -65,10 +67,16 @@ namespace Airship.Editor {
             var fullCommandString = string.Join(" ", argList);
             
             TypescriptLogService.Log(TypescriptLogLevel.Information, $"Start process 'node {fullCommandString}'");
-            var compilerProcess = TypescriptCompilationService.RunNodeCommand(directory, fullCommandString);
-            
-            TypescriptCompilationService.AttachWatchOutputToUnityConsole(this, arguments, compilerProcess);
-            processId = compilerProcess.Id;
+
+            try {
+                var compilerProcess = TypescriptCompilationService.RunNodeCommand(directory, fullCommandString);
+                TypescriptCompilationService.AttachWatchOutputToUnityConsole(this, arguments, compilerProcess);
+                processId = compilerProcess.Id;
+            }
+            catch (Win32Exception _) {
+                EditorUtility.DisplayDialog("Failed to initialize TypeScript",
+                    "Ensure you have the latest LTS node.js installed, then restart the editor and Unity Hub", "Ok");
+            }
             
             TypescriptCompilationServicesState.instance.RegisterWatchCompiler(this);
             yield return null;

package/Runtime/Code/Auth/Socket/SocketManager.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Airship.DevConsole;
 using Code.Auth;
 using Code.Http.Internal;
 using Code.Platform.Shared;
@@ -48,6 +49,21 @@ public class SocketManager : Singleton<SocketManager> {
         DontDestroyOnLoad(this);
     }
 
+    private void Start() {
+        DevConsole.AddCommand(Command.Create<string>("join", "", "Join a game from given gameId",
+            Parameter.Create("gameId", "Game ID of the target game."), async (gameId) => {
+                Debug.Log("Requesting transfer to game " + gameId + " ...");
+                var packet = $"{{\"gameId\": \"{gameId}\"}}";
+                var res = await InternalHttpManager.PostAsync(AirshipPlatformUrl.gameCoordinator + "/transfers/transfer/self", packet);
+                if (res.success) {
+                    Debug.Log("<color=green>Joining...</color>");
+                }
+                else {
+                    Debug.LogError("Failed to join game: " + res.error);
+                }
+            }));
+    }
+
     public static async Task<bool> ConnectAsyncInternal() {
         // print("Connecting to socket with auth token: " + authToken);
         if (Instance.socket == null) {

package/Runtime/Code/Authentication/EasyAuthenticator.cs

@@ -34,6 +34,10 @@ namespace Code.Authentication {
         public string reason;
     }
 
+    public struct ServerStartupFailureMessage : NetworkMessage {
+        public string reason;
+    }
+
     public class EasyAuthenticator : NetworkAuthenticator {
         private string passkey = "empty";
         
@@ -57,6 +61,7 @@ namespace Code.Authentication {
 
         public override async void OnStartClient() {
             NetworkClient.RegisterHandler<KickMessage>(Client_OnKickBroadcast, false);
+            NetworkClient.RegisterHandler<ServerStartupFailureMessage>(Client_OnServerStartupFailure, false);
 
             //Listen to response from server.
             NetworkClient.RegisterHandler<LoginResponseMessage>(Client_OnLoginResponseMessage, false);
@@ -64,6 +69,7 @@ namespace Code.Authentication {
 
         public override void OnStopClient() {
             NetworkClient.UnregisterHandler<KickMessage>();
+            NetworkClient.UnregisterHandler<ServerStartupFailureMessage>();
             NetworkClient.UnregisterHandler<LoginResponseMessage>();
         }
 
@@ -121,6 +127,10 @@ namespace Code.Authentication {
             TransferManager.Instance.Disconnect(true, kickMessage.reason);
         }
 
+        private void Client_OnServerStartupFailure(ServerStartupFailureMessage message) {
+            TransferManager.Instance.Disconnect(true, message.reason);
+        }
+
         /// <summary>
         /// Received on server when a client sends the password broadcast message.
         /// </summary>

package/Runtime/Code/Bootstrap/BundleDownloader.cs

@@ -220,11 +220,8 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 				}
 
 				if (!success && RunCore.IsServer()) {
-					var serverBootstrap = FindAnyObjectByType<ServerBootstrap>();
-					if (serverBootstrap.IsAgonesEnvironment()) {
-						Debug.LogError("[SEVERE] Server failed to download bundles. Shutting down!");
-						serverBootstrap.agones.Shutdown().Wait();
-					}
+					onComplete?.Invoke(false);
+					return false;
 				}
 
 				if (!success && RunCore.IsClient()) {
@@ -268,12 +265,10 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 					if (loadingScreen) {
 						loadingScreen.SetError("Failed to download Main Menu scripts.");
 					}
-					if (RunCore.IsServer()) {
-						var serverBootstrap = FindAnyObjectByType<ServerBootstrap>();
-						if (serverBootstrap.IsAgonesEnvironment()) {
-							Debug.LogError("[SEVERE] Server failed to download code.zip. Shutting down!");
-							serverBootstrap.agones.Shutdown().Wait();
-						}
+					if (RunCore.IsServer())
+					{
+						onComplete?.Invoke(false);
+						return false;
 					}
 				} else {
 					File.WriteAllText(Path.Join(package.GetPersistentDataDirectory(), "code_version_" + package.codeVersion + ".txt"), "success");

package/Runtime/Code/Bootstrap/ServerBootstrap.cs

@@ -7,6 +7,7 @@ using System.Runtime.Serialization;
 using Agones;
 using Agones.Model;
 using Code.Analytics;
+using Code.Authentication;
 using Code.Bootstrap;
 using Code.GameBundle;
 using Code.Http.Internal;
@@ -429,7 +430,15 @@ public class ServerBootstrap : MonoBehaviour
 		if (!RunCore.IsEditor()) {
 			BundleDownloader.Instance.DownloadBundles(startupConfig.CdnUrl, packages.ToArray(), privateBundleFiles, null, gameCodeZipUrl, false,
 				(res) => {
-					downloadComplete = true;
+					if (!res)
+					{
+						Debug.LogWarning("[Airship]: Failed to download required files. See above logs for details. Shutting down server.");
+						ShutdownDueToAssetFailure(1);
+					}
+					else
+					{
+						downloadComplete = true;
+					}
 				});
 		} else {
 			downloadComplete = true;
@@ -477,13 +486,34 @@ public class ServerBootstrap : MonoBehaviour
         isServerReady = true;
         OnServerReady?.Invoke();
 	}
-
-	public void Shutdown() {
+	
+	private void ShutdownInternal(int exitCode = 0) {
 		if (agones && !this.isAgonesShutdownTriggered) {
 			this.isAgonesShutdownTriggered = true;
 			agones.Shutdown();
-			Application.Quit();
+			Application.Quit(exitCode);
+		}
+	}
+
+	private void ShutdownDueToAssetFailure(int exitCode = 1) {
+		if (NetworkServer.connections != null && NetworkServer.connections.Count > 0) {
+			var message = new ServerStartupFailureMessage {
+				reason = "Server failed to download required game assets.\n\nIf you are the game developer, ensure your game / packages have all been properly published.\n\nCheck the error console in the Airship Create portal for more details.",
+			};
+			
+			foreach (var connection in NetworkServer.connections.Values) {
+				if (connection != null) {
+					connection.Send(message);
+				}
+			}
 		}
+
+		ShutdownInternal(exitCode);
+	}
+
+	public void Shutdown()
+	{
+		ShutdownInternal(0);
 	}
 
 	/**

package/Runtime/Code/Bootstrap/SignalHandler.cs

@@ -43,4 +43,4 @@ namespace Code.Bootstrap {
         }
 #endif
     }
-}
+}

package/Runtime/Code/Health/AirshipProfileExporter.cs

@@ -88,33 +88,49 @@ namespace Code.Health
                 NetworkClient.RegisterHandler<ClientProfileUploadResponse>(OnClientUploadResponse);
             }
 
-            DevConsole.AddCommand(Command.Create<string, int, bool>(
-                "profile", 
+            // Profile without callstacks
+            DevConsole.AddCommand(Command.Create<string, int>(
+                "profile",
                 "",
-                "Starts and uploads a profile. Once complete the download link will be printed.", 
-                    Parameter.Create("Context", "Options: Server | Client"),
+                "Starts and uploads a profile. Once complete the download link will be printed.",
+                Parameter.Create("Context", "Options: Server | Client"),
                 Parameter.Create("Duration", "Duration of profile in seconds (max 5s)"),
-                Parameter.Create("Callstacks", "Enable callstacks for profile (this is laggy)"), 
-                (context, d, callstacks) => {
-                    if (d is < 0 or > 5) {
-                        Debug.LogError("You can only profile for a max of 5s.");
-                        return;
-                    }
+                (context, d) => {
+                    OnProfileCommand(context, d, false);
+                }
+            ));
 
-                    if (context.Equals("client", StringComparison.OrdinalIgnoreCase)) {
-                        if (!Debug.isDebugBuild) {
-                            Debug.Log(
-                                "Unable to capture profile log because debug mode is not enabled. Use the development build branch on Steam to enable debug mode.");
-                            return;
-                        }
-                        StartProfiling(d, null, callstacks);
-                    } else if (context.Equals("server", StringComparison.OrdinalIgnoreCase)) {
-                        Debug.Log("Starting a server profile, view server console to monitor progress.");
-                        NetworkClient.Send(new StartServerProfileMessage { DurationSecs = d, CallstacksEnabled = callstacks });
-                    }
+            // Deep profile with callstacks
+            DevConsole.AddCommand(Command.Create<string, int>(
+                "deepprofile", 
+                "",
+                "Starts and uploads a profile with callstacks. Once complete the download link will be printed.",
+                    Parameter.Create("Context", "Options: Server | Client"),
+                Parameter.Create("Duration", "Duration of profile in seconds (max 5s)"),
+                (context, d) => {
+                    OnProfileCommand(context, d, true);
                 }));
         }
 
+        private void OnProfileCommand(string context, int dur, bool callstacks) {
+            if (dur is < 0 or > 5) {
+                Debug.LogError("You can only profile for a max of 5s.");
+                return;
+            }
+
+            if (context.Equals("client", StringComparison.OrdinalIgnoreCase)) {
+                if (!Debug.isDebugBuild) {
+                    Debug.Log(
+                        "Unable to capture profile log because debug mode is not enabled. Use the development build branch on Steam to enable debug mode.");
+                    return;
+                }
+                StartProfiling(dur, null, callstacks);
+            } else if (context.Equals("server", StringComparison.OrdinalIgnoreCase)) {
+                Debug.Log("Starting a server profile, view server console to monitor progress.");
+                NetworkClient.Send(new StartServerProfileMessage { DurationSecs = dur, CallstacksEnabled = callstacks });
+            }
+        }
+
         private void Update() {
             if (Profiler.enabled != lastProfilerEnabled) {
                 lastProfilerEnabled = Profiler.enabled;
@@ -167,12 +183,6 @@ namespace Code.Health
         }
 
         public void StartProfiling(int durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator, bool enableCallstacks) {
-            // TODO check that sender is game dev
-            // if (Profiler.enabled) {
-            //     Debug.LogWarning("Profiler is already running.");
-            //     return;
-            // }
-
             var date = DateTime.Now.ToString("MM-dd-yyyy h.mm.ss");
             var fileName = RunCore.IsClient() ?  $"Client-Profile-{date}.raw" :  $"Server-Profile-{date}.raw";
             if (!Directory.Exists(Path.Combine(Application.persistentDataPath, "ClientProfiles"))) {
@@ -193,6 +203,7 @@ namespace Code.Health
         private async void StopProfilingAfterDelay(string logPath, string fileName, float durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator) {
             await Task.Delay((int)(durationSecs * 1000));
             Profiler.enabled = false;
+            Profiler.enableBinaryLog = false;
             Profiler.enableAllocationCallstacks = false;
             var info = new FileInfo(logPath);
 

package/Runtime/Code/Luau/AirshipComponent.cs

@@ -180,7 +180,14 @@ public class AirshipComponent : MonoBehaviour, ITriggerReceiver {
 			script = runtimeScript;
 		}
 		else {
-			Debug.LogError($"Failed to find code.zip compiled script. Path: {script.m_path.ToLower()}, GameObject: {gameObject.name}", gameObject);
+			var isPackage = scriptPath.StartsWith("Assets/AirshipPackage");
+			if (script == null) {
+				var suggestion = isPackage ? "have you published this package?" : "have you done a full publish of this game?";
+				Debug.LogError($"Could not find compiled script from asset bundle '{scriptPath}' for GameObject {gameObject.name} (Missing Script Asset) - {suggestion}", gameObject);
+			}
+			else {
+				Debug.LogError($"Could not find compiled script in code archive '{script.m_path.ToLower()}' for GameObject {gameObject.name} (Missing Runtime Script Code)", gameObject);
+			}
 			return;
 		}
 #endif

package/Runtime/DevConsole/Runtime/DevConsoleMono.cs

@@ -27,6 +27,7 @@ using UnityEngine.Serialization;
 using Enum = System.Enum;
 using System.Globalization;
 using System.IO;
+using UnityEngine.Networking;
 using UnityEngine.Profiling;
 using Debug = UnityEngine.Debug;
 #if INPUT_SYSTEM_INSTALLED
@@ -1791,96 +1792,6 @@ namespace Airship.DevConsole
                 this.Log("<color=red>Console logging has been disabled.</color>");
             }));
 
-            AddCommand(Command.Create<string>(
-                "enum",
-                "",
-                "Display information about a specified enum",
-                Parameter.Create("enumName", "Name of the enum to get information about (case-sensitive)"),
-                s =>
-                {
-                    // Check if the enum type was cached
-                    Type enumType = _cacheEnumTypes.FirstOrDefault(t => t.Name.Equals(s));
-
-#if INPUT_SYSTEM_INSTALLED
-                    // Special case for Key
-                    if (s.Equals("Key"))
-                    {
-                        enumType = typeof(Key);
-                    }
-#endif
-
-                    if (enumType == null)
-                    {
-                        List<Type> options = new List<Type>();
-
-                        // Search all loaded assemblies for the enum
-                        foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
-                        {
-                            enumType = assembly.GetTypes()
-                                .SelectMany(t => t.GetMembers())
-                                .Union(assembly.GetTypes())
-                                .FirstOrDefault(t => t.ReflectedType != null && t.ReflectedType.IsEnum && (t.ReflectedType.Name.Equals(s) || s.Equals($"{t.ReflectedType.Namespace}.{t.ReflectedType.Name}")))
-                                ?.ReflectedType;
-
-                            if (enumType != null)
-                            {
-                                if (s.Equals($"{enumType.Namespace}.{enumType.Name}"))
-                                {
-                                    options = new List<Type>() { enumType };
-                                    break;
-                                }
-
-                                options.Add(enumType);
-                            }
-                        }
-
-                        if (options.Count > 1)
-                        {
-                            LogError($"Multiple results found: {string.Join(", ", options.Select(x => $"{x.Namespace}.{x.Name}"))}.");
-                            return;
-                        }
-
-                        else if (options.Count == 1)
-                        {
-                            // Select the first type
-                            enumType = options.FirstOrDefault();
-
-                            // Cache the type
-                            _cacheEnumTypes.Add(enumType);
-                            if (_cacheEnumTypes.Count > MaxCachedEnumTypes)
-                            {
-                                _cacheEnumTypes.RemoveAt(0);
-                            }
-                        }
-
-                        else
-                        {
-                            LogError($"Could not find enum type with the specified name: \"{s}\"");
-                            return;
-                        }
-                    }
-
-                    LogSeperator($"{enumType.Namespace}.{enumType.Name} ({enumType.GetEnumUnderlyingType().Name}){(enumType.GetCustomAttribute(typeof(FlagsAttribute)) == null ? "" : " [Flags]")}");
-
-                    FieldInfo[] values = enumType.GetFields();
-                    string formattedValues = string.Empty;
-                    bool first = true;
-                    for (int i = 0; i < values.Length; i++)
-                    {
-                        if (values[i].Name.Equals("value__"))
-                        {
-                            continue;
-                        }
-
-                        formattedValues += $"{(first ? "" : "\n")}{values[i].Name} = {values[i].GetRawConstantValue()}";
-                        first = false;
-                    }
-                    Log(formattedValues);
-
-                    LogSeperator();
-                }
-            ));
-
             AddCommand(Command.Create(
                 "commands",
                 "",

package/ThirdParty/Graphy - Ultimate Stats Monitor/Materials/Timings Graph.mat

@@ -0,0 +1,97 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Timings Graph
+  m_Shader: {fileID: 4800000, guid: bc65170c051b0724287a7f1636d87573, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 5
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 4500
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - FpsValues_Length: 120
+    - PixelSnap: 0
+    - ScrollSpeed: 0.2
+    - _AmazingThreshold: 0.72
+    - _BumpScale: 1
+    - _CautionThreshold: 0
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _Glossiness: 0.5
+    - _GoodThreshold: 0.4
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _AmazingColor: {r: 0, g: 1, b: 1, a: 1}
+    - _CautionColor: {r: 0.9137255, g: 0.76862746, b: 0.41568628, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _CriticalColor: {r: 0.20784314, g: 0.6784314, b: 0.62352943, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _GoodColor: {r: 0.90588236, g: 0.43529412, b: 0.31764707, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

package/ThirdParty/Graphy - Ultimate Stats Monitor/Materials/Timings Graph.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5b42a1eb000204cb3af3e64d0b342b92
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: