@camstack/addon-pipeline 1.2.59 → 1.2.60

package/dist/stream-broker/index.js

@@ -21552,11 +21552,13 @@ var AdaptiveController = class {
 	*/
 	armed = false;
 	failures;
+	upgradeCount;
 	constructor(opts) {
 		this.opts = opts;
 		this.tracker = new LossTracker(opts.config);
 		this.tier = opts.initialTier;
 		this.failures = new Map(opts.priorFailures ?? []);
+		this.upgradeCount = Math.max(0, opts.priorUpgradeCount ?? 0);
 	}
 	get currentTier() {
 		return this.tier;
@@ -21569,6 +21571,9 @@ var AdaptiveController = class {
 	get failureCounts() {
 		return this.failures;
 	}
+	get successfulUpgradeCount() {
+		return this.upgradeCount;
+	}
 	onLoss(sample, now) {
 		this.tracker.track(sample, now);
 	}
@@ -21621,8 +21626,9 @@ var AdaptiveController = class {
 	*/
 	requiredHealthyMs(tier) {
 		const failures = this.failures.get(tier) ?? 0;
-		if (failures <= 0) return this.opts.config.upgradeHealthyMs;
-		return Math.min(this.opts.config.upgradeHealthyMs * 2 ** failures, this.opts.config.maxUpgradeBackoffMs);
+		const progressiveMs = Math.min(this.opts.config.upgradeHealthyMs * this.opts.config.upgradeHealthyGrowthFactor ** this.upgradeCount, this.opts.config.maxProgressiveUpgradeHealthyMs);
+		if (failures <= 0) return progressiveMs;
+		return Math.min(progressiveMs * 2 ** failures, this.opts.config.maxUpgradeBackoffMs);
 	}
 	commitChange(now) {
 		this.lastChangeAt = now;
@@ -21659,6 +21665,7 @@ var AdaptiveController = class {
 		this.tier = next;
 		this.mtuReduced = false;
 		this.transcodeEngaged = false;
+		this.upgradeCount += 1;
 		this.opts.onSwitchTier(next);
 		this.commitChange(now);
 		this.healthySince = now;
@@ -31397,8 +31404,10 @@ var ADAPTIVE_CONFIG = {
 	analyzeWindowMs: 15e3,
 	minFailPercent: .05,
 	waitAfterResetMs: 8e3,
-	upgradeHealthyMs: 2e4,
-	minTimeBetweenChangesMs: 2e4,
+	upgradeHealthyMs: 4e3,
+	upgradeHealthyGrowthFactor: 3,
+	maxProgressiveUpgradeHealthyMs: 3e4,
+	minTimeBetweenChangesMs: 4e3,
 	maxUpgradeBackoffMs: 9e5
 };
 /**
@@ -32466,7 +32475,7 @@ var BrokerWebrtcServer = class {
 		};
 		if (streamId.endsWith("/adaptive")) {
 			const initialTier = this.profileTierResolver?.(brokerId) ?? "high";
-			this.startAdaptive(entry, deviceId, initialTier, sessionId, intent?.failures);
+			this.startAdaptive(entry, deviceId, initialTier, sessionId, intent?.failures, intent?.upgradeCount);
 		}
 		return {
 			sessionId,
@@ -32567,10 +32576,11 @@ var BrokerWebrtcServer = class {
 	* whichever produces the higher loss ratio across its window. The async
 	* poll is guarded against overlapping ticks via `tickInFlight`.
 	*/
-	startAdaptive(entry, deviceId, initialTier, sessionId, priorFailures) {
+	startAdaptive(entry, deviceId, initialTier, sessionId, priorFailures, priorUpgradeCount) {
 		const controller = new AdaptiveController({
 			initialTier,
 			priorFailures,
+			priorUpgradeCount,
 			config: ADAPTIVE_CONFIG,
 			onSwitchTier: (tier) => {
 				this.switchSessionTier(entry, deviceId, tier, sessionId);
@@ -32628,10 +32638,12 @@ var BrokerWebrtcServer = class {
 	switchSessionTier(entry, deviceId, tier, sessionId, forceTranscodeDown = false) {
 		const prev = this.adaptiveIntent.get(sessionId);
 		const failures = new Map(entry.adaptiveController?.failureCounts ?? prev?.failures);
+		const upgradeCount = entry.adaptiveController?.successfulUpgradeCount ?? prev?.upgradeCount ?? 0;
 		this.adaptiveIntent.set(sessionId, {
 			prefersTier: tier,
 			forceTranscodeDown: forceTranscodeDown || (prev?.forceTranscodeDown ?? false),
-			failures
+			failures,
+			upgradeCount
 		});
 		const epoch = (entry.session.pendingRenegotiation?.epoch ?? 0) + 1;
 		entry.session.pendingRenegotiation = {
@@ -32646,7 +32658,8 @@ var BrokerWebrtcServer = class {
 				tier,
 				forceTranscodeDown,
 				epoch,
-				failures: Object.fromEntries(failures)
+				failures: Object.fromEntries(failures),
+				upgradeCount
 			}
 		});
 	}

package/dist/stream-broker/index.mjs

@@ -21546,11 +21546,13 @@ var AdaptiveController = class {
 	*/
 	armed = false;
 	failures;
+	upgradeCount;
 	constructor(opts) {
 		this.opts = opts;
 		this.tracker = new LossTracker(opts.config);
 		this.tier = opts.initialTier;
 		this.failures = new Map(opts.priorFailures ?? []);
+		this.upgradeCount = Math.max(0, opts.priorUpgradeCount ?? 0);
 	}
 	get currentTier() {
 		return this.tier;
@@ -21563,6 +21565,9 @@ var AdaptiveController = class {
 	get failureCounts() {
 		return this.failures;
 	}
+	get successfulUpgradeCount() {
+		return this.upgradeCount;
+	}
 	onLoss(sample, now) {
 		this.tracker.track(sample, now);
 	}
@@ -21615,8 +21620,9 @@ var AdaptiveController = class {
 	*/
 	requiredHealthyMs(tier) {
 		const failures = this.failures.get(tier) ?? 0;
-		if (failures <= 0) return this.opts.config.upgradeHealthyMs;
-		return Math.min(this.opts.config.upgradeHealthyMs * 2 ** failures, this.opts.config.maxUpgradeBackoffMs);
+		const progressiveMs = Math.min(this.opts.config.upgradeHealthyMs * this.opts.config.upgradeHealthyGrowthFactor ** this.upgradeCount, this.opts.config.maxProgressiveUpgradeHealthyMs);
+		if (failures <= 0) return progressiveMs;
+		return Math.min(progressiveMs * 2 ** failures, this.opts.config.maxUpgradeBackoffMs);
 	}
 	commitChange(now) {
 		this.lastChangeAt = now;
@@ -21653,6 +21659,7 @@ var AdaptiveController = class {
 		this.tier = next;
 		this.mtuReduced = false;
 		this.transcodeEngaged = false;
+		this.upgradeCount += 1;
 		this.opts.onSwitchTier(next);
 		this.commitChange(now);
 		this.healthySince = now;
@@ -31388,8 +31395,10 @@ var ADAPTIVE_CONFIG = {
 	analyzeWindowMs: 15e3,
 	minFailPercent: .05,
 	waitAfterResetMs: 8e3,
-	upgradeHealthyMs: 2e4,
-	minTimeBetweenChangesMs: 2e4,
+	upgradeHealthyMs: 4e3,
+	upgradeHealthyGrowthFactor: 3,
+	maxProgressiveUpgradeHealthyMs: 3e4,
+	minTimeBetweenChangesMs: 4e3,
 	maxUpgradeBackoffMs: 9e5
 };
 /**
@@ -32457,7 +32466,7 @@ var BrokerWebrtcServer = class {
 		};
 		if (streamId.endsWith("/adaptive")) {
 			const initialTier = this.profileTierResolver?.(brokerId) ?? "high";
-			this.startAdaptive(entry, deviceId, initialTier, sessionId, intent?.failures);
+			this.startAdaptive(entry, deviceId, initialTier, sessionId, intent?.failures, intent?.upgradeCount);
 		}
 		return {
 			sessionId,
@@ -32558,10 +32567,11 @@ var BrokerWebrtcServer = class {
 	* whichever produces the higher loss ratio across its window. The async
 	* poll is guarded against overlapping ticks via `tickInFlight`.
 	*/
-	startAdaptive(entry, deviceId, initialTier, sessionId, priorFailures) {
+	startAdaptive(entry, deviceId, initialTier, sessionId, priorFailures, priorUpgradeCount) {
 		const controller = new AdaptiveController({
 			initialTier,
 			priorFailures,
+			priorUpgradeCount,
 			config: ADAPTIVE_CONFIG,
 			onSwitchTier: (tier) => {
 				this.switchSessionTier(entry, deviceId, tier, sessionId);
@@ -32619,10 +32629,12 @@ var BrokerWebrtcServer = class {
 	switchSessionTier(entry, deviceId, tier, sessionId, forceTranscodeDown = false) {
 		const prev = this.adaptiveIntent.get(sessionId);
 		const failures = new Map(entry.adaptiveController?.failureCounts ?? prev?.failures);
+		const upgradeCount = entry.adaptiveController?.successfulUpgradeCount ?? prev?.upgradeCount ?? 0;
 		this.adaptiveIntent.set(sessionId, {
 			prefersTier: tier,
 			forceTranscodeDown: forceTranscodeDown || (prev?.forceTranscodeDown ?? false),
-			failures
+			failures,
+			upgradeCount
 		});
 		const epoch = (entry.session.pendingRenegotiation?.epoch ?? 0) + 1;
 		entry.session.pendingRenegotiation = {
@@ -32637,7 +32649,8 @@ var BrokerWebrtcServer = class {
 				tier,
 				forceTranscodeDown,
 				epoch,
-				failures: Object.fromEntries(failures)
+				failures: Object.fromEntries(failures),
+				upgradeCount
 			}
 		});
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-pipeline",
-  "version": "1.2.59",
+  "version": "1.2.60",
   "description": "Pipeline bundle — runner, detection, motion, audio + stream broker. Multi-entry npm package shipping pipeline addons under a single bundle.",
   "keywords": [
     "camstack",