fix(WaspClient): session creation was moved to the launcher

Author: Torwent

utils/input/mouse.simba

@@ -38,23 +38,9 @@ You can view what the distributions look like by running the {ref}`Distribution
   EMouseDistribution = enum(DEFAULT, RANDOM, GAUSS, SKEWED, ROWP);
 
 (*
-## Mouse
-```pascal
-TMouse = record(TSRLBaseRecord)
-  Speed: Double;                     // Overall mouse speed (Default: 12)
-  Gravity, Wind: Double;             // Gravity & Wind for generating mouse path (Default: 9 & 5)
-  Distribution: EMouseDistribution;  // Default distribution to use (Default: MOUSE_DISTRIBUTION_ROWP)
-  MissChance: Double;                // Percentage chance to "Miss" the mouse (Default: 10)
-  IdleInterval: Double;              // Distance to travel before calling Mouse.Idle() (Default: 0)
-  IdleProgress: Double;
-  IdleGoal: Double;
-  OnMoving: TMouseMovingEvent;       // Callback while mouse is being moved
-  OnTeleport: TMouseTeleportEvent;   // Callback when mouse is teleported
-end;
-```
+## TMouse
+Main record used to interact with the {ref}`Mouse`.
 *)
-  PMouse = ^TMouse;
-
   TMouse = record
     Distribution: EMouseDistribution;
 
@@ -68,6 +54,8 @@ end;
     {$ENDIF}
   end;
 
+  PMouse = ^TMouse;
+
 {$IFDEF WL_DEBUG_MOUSE}
 procedure TMouse._Debug();
 var
@@ -214,6 +202,9 @@ traveling to it's destinations. The default is `False`.
 
 Setting this to `True` will make all the above variables and the below
 properties irrelevant as they will not be used.
+
+It will also make all of the {ref}`Mouse.Move` methods use {ref}`Mouse.Teleport`
+instead.
 *)
 
 (*

utils/waspclient.simba

@@ -6,7 +6,6 @@ The following compiler directives are available and are useful for local
 development:
 ```pascal
 {$DEFINE WASP_LOCAL_DEVELOPMENT}
-{$DEFINE WASP_ACCESS_TOKEN := 'access_token'}
 {$DEFINE WASP_REFRESH_TOKEN := 'refresh_token'}
 {$DEFINE SCRIPT_ID := 'script_uuid'}
 {$DEFINE SCRIPT_REVISION := 'script_revision'}
@@ -19,8 +18,7 @@ As for the others, you can get values for them by running Simba through
 (wasp-launcher)[https://github.com/WaspScripts/wasp-launcher] and running
 something like this:
 ```pascal
-begin      
-  WriteLn GetEnvVar('WASP_ACCESS_TOKEN');
+begin
   WriteLn GetEnvVar('WASP_REFRESH_TOKEN');
   WriteLn GetEnvVar('SCRIPT_ID');
   WriteLn GetEnvVar('SCRIPT_REVISION');
@@ -78,34 +76,6 @@ begin
   Async.ScheduleStop('WaspClient-RefreshToken');
 end;
 
-function TWaspClient.CreateSession(accessToken, refreshToken: String): Boolean;
-var
-  response: String;
-  json: TJSONParser;
-begin
-  Self.Client.RequestHeader['Authorization'] := 'Bearer ' + accessToken;
-  Self.Client.RequestHeader['RefreshToken'] := refreshToken;
-
-  try
-    response := Self.Client.Get(Self.Server + 'session');
-  except
-    WriteLn GetDebugLn('WaspClient', GetExceptionMessage());
-    Exit;
-  end;
-
-  Result := InRange(Self.Client.ResponseStatus.AsInteger, 200, 299);
-  if not Result then
-  begin
-    WriteLn GetDebugLn('WaspClient', response);
-    Exit;
-  end;
-
-  json := new TJSONParser();
-  json.Parse(response);
-
-  Self.Client.RequestHeader['Authorization'] := 'Bearer ' + json.Item['access_token'].AsString;
-  Self.Client.RequestHeader['RefreshToken'] := json.Item['refresh_token'].AsString;
-end;
 
 procedure TWaspClient.RefreshSession();
 var
@@ -117,9 +87,16 @@ begin
 
   payload := '{"refresh_token": "' + Self.Client.RequestHeader['RefreshToken'] + '"}';
 
-  response := Self.Client.Post(
-    Self.Database + 'auth/v1/token?grant_type=refresh_token', payload
-  );
+  try
+    response := Self.Client.Post(
+      Self.Database + 'auth/v1/token?grant_type=refresh_token', payload
+    );
+  except
+    WriteLn GetDebugLn('WaspClient', GetExceptionMessage());
+    Self.IsSetup := False;
+    Self.Lock.Leave();
+    Exit;
+  end;
 
   if not InRange(Self.Client.ResponseStatus.AsInteger, 200, 299) then
   begin
@@ -135,10 +112,6 @@ begin
   Self.Client.RequestHeader['Authorization'] := 'Bearer ' + json.Item['access_token'].AsString;
   Self.Client.RequestHeader['RefreshToken'] := json.Item['refresh_token'].AsString;
 
-  {$IFDEF WASP_ACCESS_TOKEN}
-  FileWrite(WLEnv.ConfigsDir + 'access_token.txt', json.Item['access_token'].AsString);
-  {$ENDIF}
-
   {$IFDEF WASP_REFRESH_TOKEN}
   FileWrite(WLEnv.ConfigsDir + 'refresh_token.txt', json.Item['refresh_token'].AsString);
   WriteLn GetDebugLn('WaspClient', 'Refresh token was refreshed: ' + json.Item['refresh_token'].AsString);
@@ -154,7 +127,7 @@ end;
 
 procedure TWaspClient.Setup();
 var
-  accessToken, refreshToken: String;
+  refreshToken: String;
 begin
   {$IFDEF WASP_LOCAL_DEVELOPMENT}
   Self.Server := 'http://localhost:3000/';
@@ -169,16 +142,6 @@ begin
   Self.Client.RequestHeader['Content-Type'] := 'application/json';
   Self.Client.RequestHeader['apikey'] := Self.APIKey;
 
-  {$IFDEF WASP_ACCESS_TOKEN}
-  accessToken := {$MACRO WASP_ACCESS_TOKEN};
-  if accessToken = 'file' then
-    accessToken := FileRead(WLEnv.ConfigsDir + 'access_token.txt');
-  {$ELSE}
-  accessToken := GetEnvVar('WASP_ACCESS_TOKEN');
-  {$ENDIF}
-  if accessToken = '' then
-    Exit;
-
   {$IFDEF WASP_REFRESH_TOKEN}
   refreshToken := {$MACRO WASP_REFRESH_TOKEN};
   if refreshToken = 'file' then
@@ -205,10 +168,6 @@ begin
   Self.Script.Revision := StrToInt(GetEnvVar('SCRIPT_REVISION'), 0);
   {$ENDIF}
 
-  Self.IsSetup := Self.CreateSession(accessToken, refreshToken);
-  if not Self.IsSetup then
-    Exit;
-
   Self.Payload := new TJSONObject();
   Self.Payload.AddInt('experience', 0);
   Self.Payload.AddInt('gold', 0);