Merge branch 'dev'

Author: JujuAdams

README.md

@@ -1,6 +1,6 @@
 <p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/Snitch/master/LOGO.png" style="display:block; margin:auto; width:300px"></p>
 
-<h1 align="center">Snitch 3.1.0</h1>
+<h1 align="center">Snitch 4.0.0</h1>
 
 <p align="center">Logging and crash handling system for GameMaker Studio 2022 LTS by <b>@jujuadams</b></p>
 

Snitch.yyp

@@ -0,0 +1 @@
+__SnitchError("__SnitchController instance has been destroyed\nPlease ensure that this instance always exists");

objects/__SnitchController/Destroy_0.gml

@@ -0,0 +1,21 @@
+var _id = string(async_load[? "id"]);
+if (variable_struct_exists(__SnitchState().__HTTPRequests, _id))
+{
+    //Pass the response into the request's response handler
+    __SnitchState().__HTTPRequests[$ _id].__HTTPResponse(async_load[? "http_status"], async_load[? "status"]);
+    
+    //Output extra details if there was a failure to submit a request
+    if (SNITCH_OUTPUT_HTTP_FAILURE_DETAILS && (async_load[? "http_status"] != 200) && (async_load[? "http_status"] != 204))
+    {
+        var _result = async_load[? "result"];
+        try
+        {
+            var _json = json_parse(_result);
+            __SnitchTrace("Result was:\n", __SnitchSNAPtoJSON(_json, true, true));
+        }
+        catch(_error)
+        {
+            __SnitchTrace("Result was: \"", _result, "\"");
+        }
+    }
+}

objects/__SnitchController/Other_62.gml

@@ -0,0 +1,36 @@
+var _snitchState = __SnitchState();
+
+switch(async_load[? "type"])
+{
+    case network_type_disconnect:
+        __SnitchTrace("TCP connection lost, retrying");
+        _snitchState.__NetworkConnectionAttempts = 0;
+        _snitchState.__NetworkConnected = false;
+        _snitchState.__NetworkAbandoned = false;
+        __SnitchAttemptTCPConnection();
+    break;
+    
+    case network_type_non_blocking_connect:
+        if (async_load[? "succeeded"])
+        {
+            __SnitchTrace("TCP connection established");
+            _snitchState.__NetworkConnected = true;
+            _snitchState.__NetworkAbandoned = false;
+        }
+        else
+        {
+            _snitchState.__NetworkConnectionAttempts++;
+            if (_snitchState.__NetworkConnectionAttempts >= SNITCH_NETWORK_CONNECTION_ATTEMPTS)
+            {
+                __SnitchTrace("TCP connection failed to establish despite ", _snitchState.__NetworkConnectionAttempts, " attempts, giving up");
+                _snitchState.__NetworkConnected = false;
+                _snitchState.__NetworkAbandoned = true;
+            }
+            else
+            {
+                __SnitchTrace("TCP connection failed to establish, retrying");
+                __SnitchAttemptTCPConnection();
+            }
+        }
+    break;
+}

objects/__SnitchController/Other_68.gml

@@ -0,0 +1,63 @@
+var _snitchState = __SnitchState();
+
+_snitchState.__Frames++;
+
+if (!os_is_paused() && window_has_focus())
+{
+    _snitchState.__FocusFrames++;
+    _snitchState.__FocusTime += delta_time/1000;
+}
+
+if (SNITCH_NETWORK_MODE == 2)
+{
+    if (_snitchState.__NetworkConnected)
+    {
+        //Churn through the pending messages and clear them out
+        repeat(ceil(sqrt(array_length(_snitchState.__NetworkPendingMessages))))
+        {
+            __SnitchSendStringToNetwork(_snitchState.__NetworkPendingMessages[0]);
+            array_delete(_snitchState.__NetworkPendingMessages, 0, 1);
+        }
+    }
+}
+
+if (_snitchState.__RequestBackupFailures < SNITCH_REQUEST_BACKUP_RESEND_MAX_FAILURES)
+{
+    if (current_time - _snitchState.__RequestBackupResendTime > SNITCH_REQUEST_BACKUP_RESEND_DELAY)
+    {
+        var _backupCount = array_length(_snitchState.__RequestBackupOrder);
+        if (_backupCount > 0)
+        {
+            //Step round the request backup array
+            _snitchState.__RequestBackupResendIndex = (_snitchState.__RequestBackupResendIndex + 1) mod _backupCount;
+            
+            //Pull out a backup...
+            var _uuid = _snitchState.__RequestBackupOrder[_snitchState.__RequestBackupResendIndex];
+            with(_snitchState.__RequestBackups[$ _uuid])
+            {
+                //...and if we're not waiting for a response for this particular request, resend it
+                if (asyncID < 0)
+                {
+                    if (SNITCH_REQUEST_BACKUP_OUTPUT_ATTEMPT) __SnitchTrace("Trying to resend event ", _uuid);
+                    
+                    switch(SNITCH_SERVICE_MODE)
+                    {
+                        case 1: __SnitchSentryHTTPRequest(self);        break;
+                        case 2: __SnitchGameAnalyticsHTTPRequest(self); break;
+                        case 3: __SnitchBugsnagHTTPRequest(self);       break;
+                    }
+                    
+                    _snitchState.__RequestBackupResendTime = current_time;
+                }
+            }
+        }
+    }
+}
+else
+{
+    if (current_time - _snitchState.__RequestBackupResendTime > SNITCH_REQUEST_BACKUP_RESEND_FAILURE_TIMEOUT)
+    {
+        _snitchState.__RequestBackupFailures = 0;
+        __SnitchTrace("Retrying backup resending");
+    }
+}

objects/__SnitchController/Step_1.gml

@@ -21,15 +21,16 @@ if (is_struct(crashDump))
 
     try
     {
-        _string += "message = \"" + string(crashDump.message) + "\"\n";
+        var _exception = crashDump.exception
+        _string += "message = \"" + string(_exception.message) + "\"\n";
         _string += "\n";
-        _string += "longMessage = \"" + string(crashDump.longMessage) + "\"\n";
+        _string += "longMessage = \"" + string(_exception.longMessage) + "\"\n";
         _string += "\n";
-        _string += "script = \"" + string(crashDump.script) + "\"\n";
+        _string += "script = \"" + string(_exception.script) + "\"\n";
         _string += "\n";
-        _string += "line = " + string(crashDump.line) + "\n";
+        _string += "line = " + string(_exception.line) + "\n";
         _string += "\n";
-        _string += "stacktrace = " + string(crashDump.stacktrace) + "\n";
+        _string += "stacktrace = " + string(_exception.stacktrace) + "\n";
         _string += "\n";
     }
     catch(_error)

objects/__SnitchController/__SnitchController.yy

@@ -5,8 +5,6 @@
 
 function SnitchCrashDumpCollect()
 {
-    __SnitchInit();
-    
     var _struct = undefined;
 
     if ((SNITCH_CRASH_DUMP_FILENAME != "") && file_exists(SNITCH_CRASH_DUMP_FILENAME))

objects/oTest/Draw_0.gml

@@ -2,7 +2,5 @@
 
 function SnitchCrashDumpDelete()
 {
-    __SnitchInit();
-    
     if ((SNITCH_CRASH_DUMP_FILENAME != "") && file_exists(SNITCH_CRASH_DUMP_FILENAME)) file_delete(SNITCH_CRASH_DUMP_FILENAME);
 }

options/windows/options_windows.yy

@@ -15,7 +15,7 @@ function SnitchGenerateUUID4String(_hyphenate = false)
 
 ////Set up the XORShift32 starting seed
 ////Can throw in a randomize() / random() call here too if you'd like but 1) that might mess up other stuff? 2) feels unnecessary
-//global.__snitchXORShift32State = floor(1000000*date_current_datetime() + display_mouse_get_x() + display_get_width()*display_mouse_get_y());
+//__SnitchState().__XORShift32State = floor(1000000*date_current_datetime() + display_mouse_get_x() + display_get_width()*display_mouse_get_y());
 
 //Basic XORShift32, nothing fancy
 function __SnitchXORShift32Random(_value)

scripts/SnitchCrashDumpCollect/SnitchCrashDumpCollect.gml

@@ -3,9 +3,6 @@
 
 function SnitchLogGet()
 {
-    __SnitchInit();
-    
     if (!SNITCH_LOG_PERMITTED) return false;
-    
-    return global.__snitchLogToFileEnabled;
+    return __SnitchState().__LogToFileEnabled;
 }