@quenty/softshutdown 9.48.0 → 9.49.0

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.49.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/softshutdown@9.48.1...@quenty/softshutdown@9.49.0) (2026-07-14)
+
+### Bug Fixes
+
+- **lint:** resolve selene unused-self and Rx shadowing from --!strict conversions ([3f4a085](https://github.com/Quenty/NevermoreEngine/commit/3f4a085911808146f10a2435efbe9e89dff8edff))
+
+### Features
+
+- **softshutdown:** convert package to --!strict ([91f7bfa](https://github.com/Quenty/NevermoreEngine/commit/91f7bfa6518461761599d492d83cd3dc6ecb0d4f))
+
+## [9.48.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/softshutdown@9.48.0...@quenty/softshutdown@9.48.1) (2026-05-30)
+
+**Note:** Version bump only for package @quenty/softshutdown
+
 # [9.48.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/softshutdown@9.47.0...@quenty/softshutdown@9.48.0) (2026-05-29)
 
 **Note:** Version bump only for package @quenty/softshutdown

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/softshutdown",
-  "version": "9.48.0",
+  "version": "9.49.0",
   "description": "This service lets you shut down servers without losing a bunch of players. When game.OnClose is called, the script teleports everyone in the server into a reserved server.",
   "keywords": [
     "Roblox",
@@ -32,25 +32,25 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/attributeutils": "14.30.0",
+    "@quenty/attributeutils": "14.30.1",
     "@quenty/baseobject": "10.13.0",
-    "@quenty/basicpane": "13.31.0",
-    "@quenty/bindtocloseservice": "8.32.0",
-    "@quenty/blend": "12.36.0",
-    "@quenty/clienttranslator": "14.37.0",
-    "@quenty/coreguienabler": "12.33.0",
-    "@quenty/datastore": "13.39.0",
+    "@quenty/basicpane": "13.31.1",
+    "@quenty/bindtocloseservice": "8.33.0",
+    "@quenty/blend": "12.37.0",
+    "@quenty/clienttranslator": "14.38.0",
+    "@quenty/coreguienabler": "12.33.1",
+    "@quenty/datastore": "13.40.0",
     "@quenty/loader": "10.11.0",
     "@quenty/maid": "3.9.0",
     "@quenty/math": "2.7.5",
-    "@quenty/promise": "10.18.0",
-    "@quenty/rx": "13.28.2",
-    "@quenty/servicebag": "11.18.0",
+    "@quenty/promise": "10.18.1",
+    "@quenty/rx": "13.28.3",
+    "@quenty/servicebag": "11.18.1",
     "@quenty/table": "3.9.2",
-    "@quenty/teleportserviceutils": "9.31.0",
-    "@quenty/uiobjectutils": "6.29.0",
-    "@quenty/valuebaseutils": "13.30.0",
-    "@quenty/valueobject": "13.31.0"
+    "@quenty/teleportserviceutils": "9.31.1",
+    "@quenty/uiobjectutils": "6.29.1",
+    "@quenty/valuebaseutils": "13.30.1",
+    "@quenty/valueobject": "13.31.1"
   },
-  "gitHead": "f4a374a0a294ee8900aa5cb68ab138b0acf3e0ae"
+  "gitHead": "13f0162f4971a77378e55e9b7236aea94f0dd3a8"
 }

package/src/Client/SoftShutdownServiceClient.lua

@@ -1,4 +1,4 @@
---!nonstrict
+--!strict
 --[=[
 	@class SoftShutdownServiceClient
 ]=]
@@ -22,6 +22,19 @@ local ValueObject = require("ValueObject")
 local SoftShutdownServiceClient = {}
 SoftShutdownServiceClient.ServiceName = "SoftShutdownServiceClient"
 
+export type SoftShutdownServiceClient = typeof(setmetatable(
+	{} :: {
+		_serviceBag: ServiceBag.ServiceBag,
+		_maid: Maid.Maid,
+		_translator: any,
+		_isLobby: AttributeValue.AttributeValue<boolean>,
+		_isUpdating: AttributeValue.AttributeValue<boolean>,
+		_localTeleportDataSaysIsLobby: ValueObject.ValueObject<boolean>,
+		_isArrivingAfterShutdown: ValueObject.ValueObject<boolean>,
+	},
+	{} :: typeof({ __index = SoftShutdownServiceClient })
+))
+
 local DISABLE_CORE_GUI_TYPES = {
 	Enum.CoreGuiType.PlayerList,
 	Enum.CoreGuiType.Health,
@@ -31,8 +44,8 @@ local DISABLE_CORE_GUI_TYPES = {
 	Enum.CoreGuiType.All,
 }
 
-function SoftShutdownServiceClient:Init(serviceBag: ServiceBag.ServiceBag)
-	assert(not self._serviceBag, "Already initialized")
+function SoftShutdownServiceClient.Init(self: SoftShutdownServiceClient, serviceBag: ServiceBag.ServiceBag): ()
+	assert(not (self :: any)._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
 	self._maid = Maid.new()
@@ -58,7 +71,7 @@ function SoftShutdownServiceClient:Init(serviceBag: ServiceBag.ServiceBag)
 		isShuttingDown = self._isUpdating:Observe(),
 		localTeleportDataSaysIsLobby = self._localTeleportDataSaysIsLobby:Observe(),
 		isArrivingAfterShutdown = self._isArrivingAfterShutdown:Observe(),
-	}):Subscribe(function(state)
+	}):Subscribe(function(state: any)
 		if state.isLobby or state.localTeleportDataSaysIsLobby then
 			self._maid._shutdownUI = nil
 			if not self._maid._lobbyUI then
@@ -95,7 +108,7 @@ function SoftShutdownServiceClient:Init(serviceBag: ServiceBag.ServiceBag)
 	end))
 end
 
-function SoftShutdownServiceClient:_queryIsArrivingAfterShutdown()
+function SoftShutdownServiceClient._queryIsArrivingAfterShutdown(_self: SoftShutdownServiceClient): boolean
 	local data = TeleportService:GetLocalPlayerTeleportData()
 	if type(data) == "table" and data.isSoftShutdownArrivingIntoUpdatedServer then
 		return true
@@ -104,7 +117,7 @@ function SoftShutdownServiceClient:_queryIsArrivingAfterShutdown()
 	end
 end
 
-function SoftShutdownServiceClient:_queryLocalTeleportInfo()
+function SoftShutdownServiceClient._queryLocalTeleportInfo(_self: SoftShutdownServiceClient): boolean
 	local data = TeleportService:GetLocalPlayerTeleportData()
 	if type(data) == "table" and data.isSoftShutdownReserveServer then
 		return true
@@ -113,7 +126,12 @@ function SoftShutdownServiceClient:_queryLocalTeleportInfo()
 	end
 end
 
-function SoftShutdownServiceClient:_showSoftShutdownUI(titleKey, subtitleKey, doNotAnimateShow)
+function SoftShutdownServiceClient._showSoftShutdownUI(
+	self: SoftShutdownServiceClient,
+	titleKey: string,
+	subtitleKey: string,
+	doNotAnimateShow: boolean?
+): (Maid.Maid, ScreenGui)
 	local maid = Maid.new()
 
 	local renderMaid = Maid.new()
@@ -152,19 +170,24 @@ function SoftShutdownServiceClient:_showSoftShutdownUI(titleKey, subtitleKey, do
 
 	softShutdownUI:Show(doNotAnimateShow)
 
-	softShutdownUI.Gui.Parent = screenGui
+	local gui = softShutdownUI.Gui :: GuiObject
+	gui.Parent = screenGui
 
 	return maid, screenGui
 end
 
-function SoftShutdownServiceClient:_hideCoreGuiUI(maid, ignoreScreenGui)
+function SoftShutdownServiceClient._hideCoreGuiUI(
+	_self: SoftShutdownServiceClient,
+	maid: Maid.Maid,
+	ignoreScreenGui: ScreenGui
+): ()
 	maid:GiveTask(CoreGuiEnabler:PushDisable("ModalEnabled"))
 
 	local playerGui = PlayerGuiUtils.getPlayerGui()
 
-	local enabledScreenGuis = {}
+	local enabledScreenGuis: { [ScreenGui]: ScreenGui } = {}
 
-	local function handleChild(child)
+	local function handleChild(child: Instance)
 		if child:IsA("ScreenGui") and child ~= ignoreScreenGui and child.Enabled then
 			enabledScreenGuis[child] = child
 			child.Enabled = false
@@ -180,7 +203,7 @@ function SoftShutdownServiceClient:_hideCoreGuiUI(maid, ignoreScreenGui)
 	end))
 
 	maid:GiveTask(playerGui.ChildRemoved:Connect(function(child)
-		enabledScreenGuis[child] = nil
+		enabledScreenGuis[child :: ScreenGui] = nil
 	end))
 
 	maid:GiveTask(function()
@@ -194,7 +217,7 @@ function SoftShutdownServiceClient:_hideCoreGuiUI(maid, ignoreScreenGui)
 	end
 end
 
-function SoftShutdownServiceClient:Destroy()
+function SoftShutdownServiceClient.Destroy(self: SoftShutdownServiceClient): ()
 	self._maid:DoCleaning()
 end
 

package/src/Client/SoftShutdownUI.lua

@@ -1,4 +1,4 @@
---!nonstrict
+--!strict
 --[=[
 	@class SoftShutdownUI
 ]=]
@@ -11,6 +11,7 @@ local Workspace = game:GetService("Workspace")
 local BasicPane = require("BasicPane")
 local Blend = require("Blend")
 local Math = require("Math")
+local Observable = require("Observable")
 local Rx = require("Rx")
 local SpringObject = require("SpringObject")
 
@@ -18,8 +19,20 @@ local SoftShutdownUI = setmetatable({}, BasicPane)
 SoftShutdownUI.ClassName = "SoftShutdownUI"
 SoftShutdownUI.__index = SoftShutdownUI
 
-function SoftShutdownUI.new()
-	local self = setmetatable(BasicPane.new(), SoftShutdownUI)
+export type SoftShutdownUI =
+	typeof(setmetatable(
+		{} :: {
+			_title: StringValue,
+			_subtitle: StringValue,
+			_percentVisible: SpringObject.SpringObject<number>,
+			_blur: BlurEffect,
+		},
+		{} :: typeof({ __index = SoftShutdownUI })
+	))
+	& BasicPane.BasicPane
+
+function SoftShutdownUI.new(): SoftShutdownUI
+	local self: SoftShutdownUI = setmetatable(BasicPane.new() :: any, SoftShutdownUI)
 
 	self._title = Instance.new("StringValue")
 	self._title.Value = ""
@@ -31,7 +44,7 @@ function SoftShutdownUI.new()
 
 	self._percentVisible = self._maid:Add(SpringObject.new(0, 40))
 
-	self._maid:GiveTask(self.VisibleChanged:Connect(function(isVisible, doNotAnimate)
+	self._maid:GiveTask(self.VisibleChanged:Connect(function(isVisible: boolean, doNotAnimate: boolean)
 		self._percentVisible.t = isVisible and 1 or 0
 		if doNotAnimate then
 			self._percentVisible.p = self._percentVisible.t
@@ -46,22 +59,22 @@ function SoftShutdownUI.new()
 	self._blur.Parent = Workspace.CurrentCamera
 	self._maid:GiveTask(self._blur)
 
-	self._maid:GiveTask(self:_render():Subscribe(function(gui)
+	self._maid:GiveTask(self:_render():Subscribe(function(gui: GuiObject)
 		self.Gui = gui
 	end))
 
 	return self
 end
 
-function SoftShutdownUI:SetTitle(text)
+function SoftShutdownUI.SetTitle(self: SoftShutdownUI, text: string): ()
 	self._title.Value = text
 end
 
-function SoftShutdownUI:SetSubtitle(text)
+function SoftShutdownUI.SetSubtitle(self: SoftShutdownUI, text: string): ()
 	self._subtitle.Value = text
 end
 
-function SoftShutdownUI:_render()
+function SoftShutdownUI._render(self: SoftShutdownUI): Observable.Observable<GuiObject>
 	local percentVisible = self._percentVisible:ObserveRenderStepped()
 	local transparency = Blend.Computed(percentVisible, function(value)
 		return 1 - value
@@ -74,174 +87,176 @@ function SoftShutdownUI:_render()
 		self._blur.Enabled = percent > 0
 	end))
 
-	return Blend.New "Frame" {
-		Name = "SoftShutdownUI",
-		Size = UDim2.fromScale(1, 1),
-		AnchorPoint = Vector2.new(0.5, 0.5),
-		Position = UDim2.fromScale(0.5, 0.5),
-		Active = Blend.Computed(percentVisible, function(visible)
-			return visible > 0
-		end),
-		Visible = Blend.Computed(percentVisible, function(visible)
-			return visible > 0
-		end),
-		BackgroundColor3 = backgroundColor,
-		BackgroundTransparency = Blend.Computed(percentVisible, function(visible)
-			return Math.map(visible, 0, 1, 1, 0.4)
-		end),
-
-		[Blend.Children] = {
-			Blend.New "UIPadding" {
-				PaddingLeft = UDim.new(0, 20),
-				PaddingRight = UDim.new(0, 20),
-				PaddingTop = UDim.new(0, 20),
-				PaddingBottom = UDim.new(0, 20),
-			},
+	return (
+		Blend.New "Frame" {
+			Name = "SoftShutdownUI",
+			Size = UDim2.fromScale(1, 1),
+			AnchorPoint = Vector2.new(0.5, 0.5),
+			Position = UDim2.fromScale(0.5, 0.5),
+			Active = Blend.Computed(percentVisible, function(visible)
+				return visible > 0
+			end),
+			Visible = Blend.Computed(percentVisible, function(visible)
+				return visible > 0
+			end),
+			BackgroundColor3 = backgroundColor,
+			BackgroundTransparency = Blend.Computed(percentVisible, function(visible)
+				return Math.map(visible, 0, 1, 1, 0.4)
+			end),
+
+			[Blend.Children] = {
+				Blend.New "UIPadding" {
+					PaddingLeft = UDim.new(0, 20),
+					PaddingRight = UDim.new(0, 20),
+					PaddingTop = UDim.new(0, 20),
+					PaddingBottom = UDim.new(0, 20),
+				},
 
-			Blend.New "Frame" {
-				Name = "ContentContainer",
-				Size = UDim2.fromScale(1, 1),
-				AnchorPoint = Vector2.new(0.5, 0.5),
-				Position = UDim2.fromScale(0.5, 0.5),
-				BackgroundTransparency = 1,
-
-				[Blend.Children] = {
-					Blend.New "UIScale" {
-						Scale = Blend.Computed(percentVisible, function(visible)
-							return 0.7 + 0.3 * visible
-						end),
-					},
+				Blend.New "Frame" {
+					Name = "ContentContainer",
+					Size = UDim2.fromScale(1, 1),
+					AnchorPoint = Vector2.new(0.5, 0.5),
+					Position = UDim2.fromScale(0.5, 0.5),
+					BackgroundTransparency = 1,
+
+					[Blend.Children] = {
+						Blend.New "UIScale" {
+							Scale = Blend.Computed(percentVisible, function(visible)
+								return 0.7 + 0.3 * visible
+							end),
+						},
 
-					Blend.New "Frame" {
-						Name = "ImageLabelContainer",
-						Size = UDim2.fromOffset(80, 80),
-						BackgroundTransparency = 1,
-						LayoutOrder = 1,
-
-						[Blend.Children] = {
-							Blend.New "ImageLabel" {
-								Size = UDim2.fromScale(1, 1),
-								ImageTransparency = transparency,
-								BackgroundTransparency = 1,
-								Image = "rbxassetid://6031302916",
+						Blend.New "Frame" {
+							Name = "ImageLabelContainer",
+							Size = UDim2.fromOffset(80, 80),
+							BackgroundTransparency = 1,
+							LayoutOrder = 1,
+
+							[Blend.Children] = {
+								Blend.New "ImageLabel" {
+									Size = UDim2.fromScale(1, 1),
+									ImageTransparency = transparency,
+									BackgroundTransparency = 1,
+									Image = "rbxassetid://6031302916",
+								},
 							},
 						},
-					},
 
-					Blend.New "Frame" {
-						Name = "LabelContainer",
-						Size = UDim2.new(1, 0, 0, 80),
-						Position = UDim2.fromScale(0.5, 0.5),
-						AnchorPoint = Vector2.new(0.5, 0.5),
-						BackgroundTransparency = 1,
-						LayoutOrder = 2,
-
-						[Blend.Children] = {
-							Blend.New "TextLabel" {
-								Name = "TitleLabel",
-								BackgroundTransparency = 1,
-								Position = UDim2.fromScale(0.5, 0),
-								Size = UDim2.fromScale(1, 0.6),
-								AnchorPoint = Vector2.new(0.5, 0),
-								Text = self._title,
-								Font = Enum.Font.SourceSansBold,
-								TextTransparency = transparency,
-								TextColor3 = foregroundColor,
-								LayoutOrder = 1,
-								TextScaled = true,
-							},
+						Blend.New "Frame" {
+							Name = "LabelContainer",
+							Size = UDim2.new(1, 0, 0, 80),
+							Position = UDim2.fromScale(0.5, 0.5),
+							AnchorPoint = Vector2.new(0.5, 0.5),
+							BackgroundTransparency = 1,
+							LayoutOrder = 2,
+
+							[Blend.Children] = {
+								Blend.New "TextLabel" {
+									Name = "TitleLabel",
+									BackgroundTransparency = 1,
+									Position = UDim2.fromScale(0.5, 0),
+									Size = UDim2.fromScale(1, 0.6),
+									AnchorPoint = Vector2.new(0.5, 0),
+									Text = self._title,
+									Font = Enum.Font.SourceSansBold,
+									TextTransparency = transparency,
+									TextColor3 = foregroundColor,
+									LayoutOrder = 1,
+									TextScaled = true,
+								},
 
-							Blend.New "TextLabel" {
-								Name = "SubtitleLabel",
-								BackgroundTransparency = 1,
-								Position = UDim2.fromScale(0.5, 1),
-								Size = UDim2.fromScale(1, 0.3),
-								AnchorPoint = Vector2.new(0.5, 1),
-								Text = self._subtitle,
-								Font = Enum.Font.SourceSansLight,
-								TextTransparency = transparency,
-								TextColor3 = foregroundColor,
-								LayoutOrder = 2,
-								TextScaled = true,
-							},
+								Blend.New "TextLabel" {
+									Name = "SubtitleLabel",
+									BackgroundTransparency = 1,
+									Position = UDim2.fromScale(0.5, 1),
+									Size = UDim2.fromScale(1, 0.3),
+									AnchorPoint = Vector2.new(0.5, 1),
+									Text = self._subtitle,
+									Font = Enum.Font.SourceSansLight,
+									TextTransparency = transparency,
+									TextColor3 = foregroundColor,
+									LayoutOrder = 2,
+									TextScaled = true,
+								},
 
-							Blend.New "UIAspectRatioConstraint" {
-								AspectRatio = 5,
+								Blend.New "UIAspectRatioConstraint" {
+									AspectRatio = 5,
+								},
 							},
 						},
-					},
 
-					Blend.New "Frame" {
-						Name = "Spacer",
-						BackgroundTransparency = 1,
-						Size = UDim2.fromOffset(0, 50),
-						LayoutOrder = 3,
-					},
+						Blend.New "Frame" {
+							Name = "Spacer",
+							BackgroundTransparency = 1,
+							Size = UDim2.fromOffset(0, 50),
+							LayoutOrder = 3,
+						},
 
-					Blend.New "Frame" {
-						Name = "LoadingLabel",
-						Position = UDim2.fromScale(0.5, 0.5),
-						AnchorPoint = Vector2.new(0.5, 0.5),
-						LayoutOrder = 4,
-						Size = UDim2.fromScale(0.25, 0.25),
-						BackgroundTransparency = 1,
-
-						[Blend.Children] = {
-							Blend.New "Frame" {
-								Name = "RobloxLogo",
-								Size = UDim2.fromScale(1, 1),
-								BackgroundColor3 = foregroundColor,
-								AnchorPoint = Vector2.new(0.5, 0.5),
-								Position = UDim2.fromScale(0.5, 0.5),
-
-								BackgroundTransparency = transparency,
-								Rotation = Rx.fromSignal(RunService.RenderStepped):Pipe({
-									Rx.map(function()
-										-- tick persists between sessions
-										local t = tick() * math.pi * 1.5
-										local smallerWave = math.sin(t)
-										local percent = (math.sin(t - math.pi / 2) + 1) / 2
-
-										if smallerWave > 0 then
-											return 15 + percent * 360
-										else
-											return 15
-										end
-									end),
-								}),
-
-								[Blend.Children] = {
-									Blend.New "Frame" {
-										BackgroundColor3 = backgroundColor,
-										Size = UDim2.fromScale(4 / 14, 4 / 14),
-										AnchorPoint = Vector2.new(0.5, 0.5),
-										Position = UDim2.fromScale(0.5, 0.5),
-										BackgroundTransparency = transparency,
+						Blend.New "Frame" {
+							Name = "LoadingLabel",
+							Position = UDim2.fromScale(0.5, 0.5),
+							AnchorPoint = Vector2.new(0.5, 0.5),
+							LayoutOrder = 4,
+							Size = UDim2.fromScale(0.25, 0.25),
+							BackgroundTransparency = 1,
+
+							[Blend.Children] = {
+								Blend.New "Frame" {
+									Name = "RobloxLogo",
+									Size = UDim2.fromScale(1, 1),
+									BackgroundColor3 = foregroundColor,
+									AnchorPoint = Vector2.new(0.5, 0.5),
+									Position = UDim2.fromScale(0.5, 0.5),
+
+									BackgroundTransparency = transparency,
+									Rotation = (Rx.fromSignal(RunService.RenderStepped) :: any):Pipe({
+										Rx.map(function(): any
+											-- tick persists between sessions
+											local t = tick() * math.pi * 1.5
+											local smallerWave = math.sin(t)
+											local percent = (math.sin(t - math.pi / 2) + 1) / 2
+
+											if smallerWave > 0 then
+												return 15 + percent * 360
+											else
+												return 15
+											end
+										end),
+									}),
+
+									[Blend.Children] = {
+										Blend.New "Frame" {
+											BackgroundColor3 = backgroundColor,
+											Size = UDim2.fromScale(4 / 14, 4 / 14),
+											AnchorPoint = Vector2.new(0.5, 0.5),
+											Position = UDim2.fromScale(0.5, 0.5),
+											BackgroundTransparency = transparency,
+										},
 									},
 								},
-							},
 
-							Blend.New "UIAspectRatioConstraint" {
-								AspectRatio = 1,
-							},
+								Blend.New "UIAspectRatioConstraint" {
+									AspectRatio = 1,
+								},
 
-							Blend.New "UISizeConstraint" {
-								MaxSize = Vector2.new(math.huge, 50),
+								Blend.New "UISizeConstraint" {
+									MaxSize = Vector2.new(math.huge, 50),
+								},
 							},
 						},
-					},
 
-					Blend.New "UIListLayout" {
-						FillDirection = Enum.FillDirection.Vertical,
-						SortOrder = Enum.SortOrder.LayoutOrder,
-						HorizontalAlignment = Enum.HorizontalAlignment.Center,
-						VerticalAlignment = Enum.VerticalAlignment.Center,
-						Padding = UDim.new(0, 10),
+						Blend.New "UIListLayout" {
+							FillDirection = Enum.FillDirection.Vertical,
+							SortOrder = Enum.SortOrder.LayoutOrder,
+							HorizontalAlignment = Enum.HorizontalAlignment.Center,
+							VerticalAlignment = Enum.VerticalAlignment.Center,
+							Padding = UDim.new(0, 10),
+						},
 					},
 				},
 			},
-		},
-	}
+		}
+	) :: any
 end
 
 return SoftShutdownUI

package/src/Server/SoftShutdownService.lua

@@ -1,4 +1,4 @@
---!nonstrict
+--!strict
 --[=[
 	This service lets you shut down servers without losing a bunch of players.
 	When game.OnClose is called, the script teleports everyone in the server
@@ -22,6 +22,7 @@ local Players = game:GetService("Players")
 local RunService = game:GetService("RunService")
 local Workspace = game:GetService("Workspace")
 
+local BindToCloseService = require("BindToCloseService")
 local DataStorePromises = require("DataStorePromises")
 local Maid = require("Maid")
 local Promise = require("Promise")
@@ -32,6 +33,16 @@ local TeleportServiceUtils = require("TeleportServiceUtils")
 local SoftShutdownService = {}
 SoftShutdownService.ServiceName = "SoftShutdownService"
 
+export type SoftShutdownService = typeof(setmetatable(
+	{} :: {
+		_maid: Maid.Maid,
+		_serviceBag: ServiceBag.ServiceBag,
+		_bindToCloseService: BindToCloseService.BindToCloseService,
+		_dataStore: DataStore,
+	},
+	{} :: typeof({ __index = SoftShutdownService })
+))
+
 --[=[
 	Initialize the service. Should be done via [ServiceBag].
 
@@ -42,11 +53,11 @@ SoftShutdownService.ServiceName = "SoftShutdownService"
 
 	@param serviceBag ServiceBag
 ]=]
-function SoftShutdownService:Init(serviceBag: ServiceBag.ServiceBag)
+function SoftShutdownService.Init(self: SoftShutdownService, serviceBag: ServiceBag.ServiceBag): ()
 	self._maid = Maid.new()
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
-	self._bindToCloseService = self._serviceBag:GetService(require("BindToCloseService"))
+	self._bindToCloseService = self._serviceBag:GetService(BindToCloseService) :: any
 	self._serviceBag:GetService(require("SoftShutdownTranslator"))
 
 	self._dataStore = DataStoreService:GetDataStore("IsSoftShutdownServer")
@@ -62,11 +73,11 @@ function SoftShutdownService:Init(serviceBag: ServiceBag.ServiceBag)
 	end)
 end
 
-function SoftShutdownService:_isReservedServer(): boolean
+function SoftShutdownService._isReservedServer(_self: SoftShutdownService): boolean
 	return game.PrivateServerId ~= "" and game.PrivateServerOwnerId == 0
 end
 
-function SoftShutdownService:_promiseIsLobby()
+function SoftShutdownService._promiseIsLobby(self: SoftShutdownService): Promise.Promise<boolean>
 	if not self:_isReservedServer() then
 		return Promise.resolved(false)
 	end
@@ -74,7 +85,7 @@ function SoftShutdownService:_promiseIsLobby()
 	return self._maid:GivePromise(DataStorePromises.getAsync(self._dataStore, game.PrivateServerId))
 end
 
-function SoftShutdownService:_promiseTeleportPlayersToLobby()
+function SoftShutdownService._promiseTeleportPlayersToLobby(self: SoftShutdownService): Promise.Promise<()>
 	local players = Players:GetPlayers()
 	if RunService:IsStudio() or #players == 0 or game.JobId == "" then
 		return Promise.resolved()
@@ -90,7 +101,7 @@ function SoftShutdownService:_promiseTeleportPlayersToLobby()
 
 	-- Collect any players remaining
 	local remainingPlayers = {}
-	self._maid._playerAddedCollector = Players.PlayerAdded:Connect(function(player)
+	(self._maid :: any)._playerAddedCollector = Players.PlayerAdded:Connect(function(player: Player)
 		table.insert(remainingPlayers, player)
 	end)
 
@@ -102,7 +113,7 @@ function SoftShutdownService:_promiseTeleportPlayersToLobby()
 			return TeleportServiceUtils.promiseTeleport(game.PlaceId, players, initialTeleportOptions)
 		end)
 		:Then(function(teleportResult)
-			self._maid._playerAddedCollector = nil
+			(self._maid :: any)._playerAddedCollector = nil
 
 			-- Construct new teleport options
 			local newTeleportOptions = Instance.new("TeleportOptions")
@@ -122,7 +133,7 @@ function SoftShutdownService:_promiseTeleportPlayersToLobby()
 				)
 			end
 
-			self._maid:GiveTask(Players.PlayerAdded:Connect(function(player)
+			self._maid:GiveTask(Players.PlayerAdded:Connect(function(player: Player)
 				table.insert(
 					promises,
 					TeleportServiceUtils.promiseTeleport(game.PlaceId, { player }, newTeleportOptions)
@@ -130,7 +141,10 @@ function SoftShutdownService:_promiseTeleportPlayersToLobby()
 			end))
 
 			-- We hope this works!
-			table.insert(promises, DataStorePromises.setAsync(self._dataStore, teleportResult.PrivateServerId, true))
+			table.insert(
+				promises,
+				DataStorePromises.setAsync(self._dataStore, teleportResult.PrivateServerId, true :: any)
+			)
 
 			return Promise.spawn(function(resolve)
 				while #Players:GetPlayers() > 0 and self:_containsPending(promises) do
@@ -142,7 +156,7 @@ function SoftShutdownService:_promiseTeleportPlayersToLobby()
 		end)
 end
 
-function SoftShutdownService:_containsPending(promises)
+function SoftShutdownService._containsPending(_self: SoftShutdownService, promises: { any }): boolean
 	for _, item in promises do
 		if item:IsPending() then
 			return true
@@ -152,7 +166,7 @@ function SoftShutdownService:_containsPending(promises)
 	return false
 end
 
-function SoftShutdownService:_promiseRedirectAllPlayers()
+function SoftShutdownService._promiseRedirectAllPlayers(self: SoftShutdownService): Promise.Promise<()>
 	Workspace:SetAttribute(SoftShutdownConstants.IS_SOFT_SHUTDOWN_LOBBY_ATTRIBUTE, true)
 
 	-- Wait for some players
@@ -174,7 +188,7 @@ function SoftShutdownService:_promiseRedirectAllPlayers()
 		})
 
 		-- Teleport all remaining players
-		self._maid:GiveTask(Players.PlayerAdded:Connect(function(player)
+		self._maid:GiveTask(Players.PlayerAdded:Connect(function(player: Player)
 			task.wait(1) -- Let the teleport GUI be set
 			TeleportServiceUtils.promiseTeleport(game.PlaceId, { player }, teleportOptions)
 		end))
@@ -184,7 +198,7 @@ function SoftShutdownService:_promiseRedirectAllPlayers()
 	end)
 end
 
-function SoftShutdownService:Destroy()
+function SoftShutdownService.Destroy(self: SoftShutdownService): ()
 	self._maid:DoCleaning()
 end