@quenty/gameproductservice 7.4.0 → 7.5.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.5.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/gameproductservice@7.4.0...@quenty/gameproductservice@7.5.0) (2023-05-26)
+
+
+### Bug Fixes
+
+* Fix purchase processing for products ([af9621c](https://github.com/Quenty/NevermoreEngine/commit/af9621c5afd5a8189aa25081ce069c2279e30a37))
+* Fix SetIsOwned call ([ebbec3c](https://github.com/Quenty/NevermoreEngine/commit/ebbec3cf0b4bd34ad39fbb079e311bde4bffed31))
+
+
+### Features
+
+* Initial refactor of guis to use ValueObject instead of ValueObject ([723aba0](https://github.com/Quenty/NevermoreEngine/commit/723aba0208cae7e06c9d8bf2d8f0092d042d70ea))
+
+
+
+
+
 # [7.4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/gameproductservice@7.3.1...@quenty/gameproductservice@7.4.0) (2023-05-08)
 
 **Note:** Version bump only for package @quenty/gameproductservice

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/gameproductservice",
-  "version": "7.4.0",
+  "version": "7.5.0",
   "description": "Generalized monetization system for handling products and purchases correctly.",
   "keywords": [
     "Roblox",
@@ -27,28 +27,28 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/attributeutils": "^8.14.0",
+    "@quenty/attributeutils": "^8.15.0",
     "@quenty/baseobject": "^6.2.1",
-    "@quenty/binder": "^8.15.0",
-    "@quenty/brio": "^8.12.0",
-    "@quenty/gameconfig": "^5.26.0",
-    "@quenty/instanceutils": "^7.13.0",
+    "@quenty/binder": "^8.16.0",
+    "@quenty/brio": "^8.13.0",
+    "@quenty/gameconfig": "^5.27.0",
+    "@quenty/instanceutils": "^7.14.0",
     "@quenty/loader": "^6.2.1",
     "@quenty/maid": "^2.5.0",
     "@quenty/marketplaceutils": "^6.6.0",
-    "@quenty/observablecollection": "^5.15.0",
-    "@quenty/playerbinder": "^8.15.0",
+    "@quenty/observablecollection": "^5.16.0",
+    "@quenty/playerbinder": "^8.16.0",
     "@quenty/promise": "^6.5.0",
-    "@quenty/receiptprocessing": "^1.1.0",
+    "@quenty/receiptprocessing": "^1.2.0",
     "@quenty/remoting": "^6.5.0",
-    "@quenty/rx": "^7.10.0",
-    "@quenty/rxbinderutils": "^8.16.0",
-    "@quenty/servicebag": "^6.6.1",
-    "@quenty/signal": "^2.3.0",
-    "@quenty/statestack": "^8.13.0",
+    "@quenty/rx": "^7.11.0",
+    "@quenty/rxbinderutils": "^8.17.0",
+    "@quenty/servicebag": "^6.7.0",
+    "@quenty/signal": "^2.4.0",
+    "@quenty/statestack": "^8.14.0",
     "@quenty/string": "^3.1.0",
     "@quenty/table": "^3.2.0",
-    "@quenty/valueobject": "^7.13.0"
+    "@quenty/valueobject": "^7.14.0"
   },
-  "gitHead": "2ad8cea7dd3ad79a39afd7d7b785b489b90553fd"
+  "gitHead": "11058e90e51ea83d3dad6ae9abe59cc19c36b94b"
 }

package/src/Shared/Ownership/PlayerAssetOwnershipTracker.lua

@@ -16,7 +16,6 @@ local Promise = require("Promise")
 local Rx = require("Rx")
 local RxAttributeUtils = require("RxAttributeUtils")
 local RxBrioUtils = require("RxBrioUtils")
-local RxInstanceUtils = require("RxInstanceUtils")
 local RxStateStackUtils = require("RxStateStackUtils")
 local ValueObject = require("ValueObject")
 local WellKnownAssetOwnershipHandler = require("WellKnownAssetOwnershipHandler")
@@ -38,8 +37,7 @@ function PlayerAssetOwnershipTracker.new(player, configPicker, assetType, market
 
 	self._assetOwnershipPromiseCache = {}
 
-	self._attributesEnabled = Instance.new("BoolValue")
-	self._attributesEnabled.Value = false
+	self._attributesEnabled = ValueObject.new(false, "boolean")
 	self._maid:GiveTask(self._attributesEnabled)
 
 	self._assetIdToWellKnownOwnershipTracker = ObservableMapSet.new()
@@ -52,8 +50,8 @@ function PlayerAssetOwnershipTracker.new(player, configPicker, assetType, market
 		self:SetOwnership(idOrKey, true)
 	end))
 
-	self._maid:GiveTask(RxInstanceUtils.observeProperty(self._attributesEnabled, "Value"):Subscribe(function()
-		if self._attributesEnabled.Value then
+	self._maid:GiveTask(self._attributesEnabled:Observe():Subscribe(function(isEnabled)
+		if isEnabled then
 			self._maid._wellKnown = self:_cacheWellKnownAssets()
 		else
 			self._maid._wellKnown = nil
@@ -161,7 +159,7 @@ function PlayerAssetOwnershipTracker:SetOwnership(idOrKey, ownsPass)
 
 	-- Update trackers
 	for _, wellOwnedAsset in pairs(self:_getWellKnownAssets(idOrKey)) do
-		wellOwnedAsset:SetIsOwned(idOrKey, ownsPass)
+		wellOwnedAsset:SetIsOwned(ownsPass)
 	end
 end
 

package/src/Shared/Ownership/WellKnownAssetOwnershipHandler.lua

@@ -6,7 +6,7 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local PlayerAssetOwnershipUtils = require("PlayerAssetOwnershipUtils")
-local RxInstanceUtils = require("RxInstanceUtils")
+local ValueObject = require("ValueObject")
 
 local WellKnownAssetOwnershipHandler = setmetatable({}, BaseObject)
 WellKnownAssetOwnershipHandler.ClassName = "WellKnownAssetOwnershipHandler"
@@ -17,8 +17,7 @@ function WellKnownAssetOwnershipHandler.new(adornee, gameConfigAsset)
 
 	self._gameConfigAsset = assert(gameConfigAsset, "No gameConfigAsset")
 
-	self._isOwned = Instance.new("BoolValue")
-	self._isOwned.Value = false
+	self._isOwned = ValueObject.new(false, "boolean")
 	self._maid:GiveTask(self._isOwned)
 
 	self._maid:GiveTask(self:_observeAttributeNamesBrio():Subscribe(function(brio)
@@ -48,6 +47,8 @@ function WellKnownAssetOwnershipHandler.new(adornee, gameConfigAsset)
 end
 
 function WellKnownAssetOwnershipHandler:SetIsOwned(isOwned)
+	assert(type(isOwned) == "boolean", "Bad isOwned")
+
 	self._isOwned.Value = isOwned
 end
 
@@ -56,7 +57,7 @@ function WellKnownAssetOwnershipHandler:GetIsOwned()
 end
 
 function WellKnownAssetOwnershipHandler:ObserveIsOwned()
-	return RxInstanceUtils.observeProperty(self._isOwned, "Value")
+	return self._isOwned:Observe()
 end
 
 function WellKnownAssetOwnershipHandler:_observeAttributeNamesBrio()

package/src/Shared/Trackers/PlayerAssetMarketTracker.lua

@@ -135,11 +135,20 @@ function PlayerAssetMarketTracker:HandlePurchaseEvent(id, isPurchased)
 	assert(type(id) == "number", "Bad id")
 	assert(type(isPurchased) == "boolean", "Bad isPurchased")
 
+	self:_handlePurchaseEvent(id, isPurchased, false)
+end
+
+function PlayerAssetMarketTracker:_handlePurchaseEvent(id, isPurchased, isFromReceipt)
+	assert(type(id) == "number", "Bad id")
+	assert(type(isPurchased) == "boolean", "Bad isPurchased")
+
 	local promise = self._pendingPromises[id]
 
 	-- Zero out promise resolution in receipt processing scenario (safety)
-	if self._receiptProcessingExpected and isPurchased then
-		promise = nil
+	if self._receiptProcessingExpected then
+		if isPurchased and not isFromReceipt then
+			promise = nil
+		end
 	end
 
 	if promise then
@@ -173,7 +182,7 @@ function PlayerAssetMarketTracker:HandleProcessReceipt(_player, receiptInfo)
 	local pendingForAssetId = self._pendingPromises[productId]
 
 	if pendingForAssetId then
-		self:HandlePurchaseEvent(productId, true)
+		self:_handlePurchaseEvent(productId, true, true)
 
 		return Enum.ProductPurchaseDecision.PurchaseGranted
 	end