@quenty/receiptprocessing 1.6.0 → 1.6.1-canary.411.a43e0f9.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.1-canary.411.a43e0f9.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/receiptprocessing@1.6.0...@quenty/receiptprocessing@1.6.1-canary.411.a43e0f9.0) (2023-09-21)
+
+
+### Bug Fixes
+
+* Process and report products properly ([75bf0e9](https://github.com/Quenty/NevermoreEngine/commit/75bf0e94f3e03e6369aad9dc22b532a24f30a5d4))
+
+
+
+
+
 # [1.6.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/receiptprocessing@1.5.0...@quenty/receiptprocessing@1.6.0) (2023-08-23)
 
 **Note:** Version bump only for package @quenty/receiptprocessing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/receiptprocessing",
-  "version": "1.6.0",
+  "version": "1.6.1-canary.411.a43e0f9.0",
   "description": "Centralize receipt processing within games since this is a constrained resource.",
   "keywords": [
     "Roblox",
@@ -25,15 +25,16 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/enumutils": "^3.1.0",
-    "@quenty/loader": "^6.3.0",
-    "@quenty/maid": "^2.6.0",
-    "@quenty/promise": "^6.8.0",
-    "@quenty/servicebag": "^6.9.0",
-    "@quenty/signal": "^2.4.0"
+    "@quenty/enumutils": "3.1.0",
+    "@quenty/loader": "6.3.0",
+    "@quenty/maid": "2.6.0",
+    "@quenty/promise": "6.8.0",
+    "@quenty/rx": "7.15.1-canary.411.a43e0f9.0",
+    "@quenty/servicebag": "6.9.0",
+    "@quenty/signal": "2.4.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3b7e47e2180964b6b0b156d07814810e063ef7ed"
+  "gitHead": "a43e0f99169bd624fbb8ec2c81e61ca7ff0dce08"
 }

package/src/Server/ReceiptProcessingService.lua

@@ -12,6 +12,8 @@ local Promise = require("Promise")
 local EnumUtils = require("EnumUtils")
 local Signal = require("Signal")
 local Maid = require("Maid")
+local ObservableSubscriptionTable = require("ObservableSubscriptionTable")
+local ValueObject = require("ValueObject")
 
 local ReceiptProcessingService = {}
 ReceiptProcessingService.ServiceName = "ReceiptProcessingService"
@@ -21,11 +23,11 @@ function ReceiptProcessingService:Init(serviceBag)
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._maid = Maid.new()
 
-	self.ReceiptCreated = Signal.new() -- :Fire(receiptInfo)
-	self._maid:GiveTask(self.ReceiptCreated)
+	self.ReceiptCreated = self._maid:Add(Signal.new()) -- :Fire(receiptInfo)
+	self.ReceiptProcessed = self._maid:Add(Signal.new()) -- :Fire(receiptInfo, productPurchaseDecision)
 
-	self.ReceiptProcessed = Signal.new() -- :Fire(receiptInfo, productPurchaseDecision)
-	self._maid:GiveTask(self.ReceiptProcessed)
+	self._receiptProcessedForUserId = self._maid:Add(ObservableSubscriptionTable.new()) -- :Fire(receiptInfo, productPurchaseDecision)
+	self._defaultDecision = self._maid:Add(ValueObject.new(Enum.ProductPurchaseDecision.PurchaseGranted, "EnumItem"))
 
 	self._processors = {}
 end
@@ -36,6 +38,39 @@ function ReceiptProcessingService:Start()
 	end
 end
 
+--[=[
+	Sets the default purchase decision in case you want more control
+	@param productPurchaseDecision ProductPurchaseDecision
+]=]
+function ReceiptProcessingService:SetDefaultPurchaseDecision(productPurchaseDecision)
+	assert(EnumUtils.isOfType(Enum.ProductPurchaseDecision, productPurchaseDecision), "Bad productPurchaseDecision")
+
+	self._defaultDecision.Value = productPurchaseDecision
+end
+
+--[=[
+	Observes receipt by player
+
+	@param player Player
+	@return Observable<ReceiptInfo>
+]=]
+function ReceiptProcessingService:ObserveReceiptProcessedForPlayer(player)
+	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
+
+	return self:ObserveReceiptProcessedForUserId(player.UserId)
+end
+--[=[
+	Observes receipt by userId
+
+	@param userId number
+	@return Observable<ReceiptInfo>
+]=]
+function ReceiptProcessingService:ObserveReceiptProcessedForUserId(userId)
+	assert(type(userId) == "number", "Bad userId")
+
+	return self._receiptProcessedForUserId:Observe(userId)
+end
+
 --[=[
 	Registers a new receipt processor. This works exactly like a normal receipt processor except it will also
 	take a Promise as a result (of which an error).
@@ -98,7 +133,7 @@ function ReceiptProcessingService:_handleProcessReceiptAsync(receiptInfo)
 		end
 
 		if EnumUtils.isOfType(Enum.ProductPurchaseDecision, result) then
-			self.ReceiptProcessed:Fire(receiptInfo, result)
+			self:_fireProcessed(receiptInfo, result)
 			return result
 		elseif result == nil then
 			continue
@@ -108,8 +143,20 @@ function ReceiptProcessingService:_handleProcessReceiptAsync(receiptInfo)
 	end
 
 	-- Retry in the future
-	self.ReceiptProcessed:Fire(receiptInfo, Enum.ProductPurchaseDecision.NotProcessedYet)
-	return Enum.ProductPurchaseDecision.NotProcessedYet
+	self:_fireProcessed(receiptInfo, self._defaultDecision.Value)
+	return self._defaultDecision.Value
+end
+
+function ReceiptProcessingService:_fireProcessed(receiptInfo, productPurchaseDecision)
+	assert(EnumUtils.isOfType(Enum.ProductPurchaseDecision, productPurchaseDecision), "Bad productPurchaseDecision")
+
+	self.ReceiptProcessed:Fire(receiptInfo, productPurchaseDecision)
+
+	if type(receiptInfo.PlayerId) == "number" then
+		self._receiptProcessedForUserId:Fire(receiptInfo.PlayerId, receiptInfo, productPurchaseDecision)
+	else
+		warn("[ReceiptProcessingService._fireProcessed] - No receiptInfo.PlayerId")
+	end
 end
 
 function ReceiptProcessingService:Destroy()