@bidspark/analytics 0.46.0 → 0.46.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.mjs CHANGED
@@ -27,18 +27,6 @@ var COLORS = {
27
27
  eventError: "color: #ef4444; font-weight: bold",
28
28
  reset: "color: inherit"
29
29
  };
30
- var logCounter = 0;
31
- var localGlobalListeners = /* @__PURE__ */ new Set();
32
- function getGlobalListeners() {
33
- if (typeof window !== "undefined") {
34
- const win = window;
35
- if (!win.__bidsparkLogListeners) {
36
- win.__bidsparkLogListeners = /* @__PURE__ */ new Set();
37
- }
38
- return win.__bidsparkLogListeners;
39
- }
40
- return localGlobalListeners;
41
- }
42
30
  function formatTime(ms) {
43
31
  if (ms < 0 || !Number.isFinite(ms)) ms = 0;
44
32
  if (ms < 1e3) return `${ms.toFixed(2)}ms`;
@@ -64,15 +52,11 @@ var Logger = class {
64
52
  _loadedAt;
65
53
  _now;
66
54
  _console;
67
- _listeners = /* @__PURE__ */ new Set();
68
55
  constructor(options = {}) {
69
56
  this._prefix = options.prefix ?? "[ads]";
70
57
  this._level = normalizeLogLevel(options.logLevel ?? LogLevel.INFO);
71
58
  this._now = options.now;
72
59
  this._console = options.console;
73
- if (options.onLog) {
74
- this._listeners.add(options.onLog);
75
- }
76
60
  this._loadedAt = options.loadedAt ?? (this._now ? this._now() : typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now());
77
61
  }
78
62
  get prefix() {
@@ -105,15 +89,6 @@ var Logger = class {
105
89
  getLoadedAt() {
106
90
  return this._loadedAt;
107
91
  }
108
- addListener(listener) {
109
- this._listeners.add(listener);
110
- return () => {
111
- this._listeners.delete(listener);
112
- };
113
- }
114
- removeListener(listener) {
115
- this._listeners.delete(listener);
116
- }
117
92
  isEnabled(level) {
118
93
  const target = normalizeLogLevel(level);
119
94
  return (LOG_LEVEL_MAP[target] ?? 20) >= (LOG_LEVEL_MAP[this._level] ?? 20);
@@ -127,23 +102,6 @@ var Logger = class {
127
102
  const current = this._now ? this._now() : typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
128
103
  return Math.max(0, current - this._loadedAt);
129
104
  }
130
- _dispatchRecord(record) {
131
- for (const l of this._listeners) {
132
- try {
133
- l(record);
134
- } catch {
135
- }
136
- }
137
- const globalListeners = getGlobalListeners();
138
- for (const gl of globalListeners) {
139
- if (!this._listeners.has(gl)) {
140
- try {
141
- gl(record);
142
- } catch {
143
- }
144
- }
145
- }
146
- }
147
105
  log(level, nameOrMsg, ...args) {
148
106
  const normLevel = normalizeLogLevel(level);
149
107
  if (!this.isEnabled(normLevel)) {
@@ -151,19 +109,6 @@ var Logger = class {
151
109
  }
152
110
  const elapsed = this._getElapsed();
153
111
  const formattedTimeStr = formatTime(elapsed);
154
- const nowEpoch = Date.now();
155
- const recordId = `bk_log_${nowEpoch}_${++logCounter}`;
156
- const record = {
157
- id: recordId,
158
- timestamp: nowEpoch,
159
- elapsedMs: elapsed,
160
- level: normLevel,
161
- prefix: this._prefix,
162
- message: nameOrMsg,
163
- args,
164
- data: args.length === 1 ? args[0] : args.length > 1 ? args : void 0
165
- };
166
- this._dispatchRecord(record);
167
112
  const c = this._getConsole();
168
113
  if (!c) return;
169
114
  let badgeStyle = COLORS.badge;
@@ -3981,6 +3926,8 @@ function registerPrebidAnalytics(pbjsGlobalName = "pbjs", defaults) {
3981
3926
  var internals = (analytics) => analytics;
3982
3927
  var adsLoaderListenerMap = /* @__PURE__ */ new WeakMap();
3983
3928
  var adsLoadersWithErrorListener = /* @__PURE__ */ new WeakSet();
3929
+ var hookedImaFns = /* @__PURE__ */ new WeakSet();
3930
+ var attachedImaManagers = /* @__PURE__ */ new WeakMap();
3984
3931
  function describeImaError(event) {
3985
3932
  const err = typeof event?.getError === "function" ? event.getError() : event?.error || event;
3986
3933
  const call = (name) => err && typeof err[name] === "function" ? err[name]() : void 0;
@@ -4040,7 +3987,7 @@ function hookAdsManagerLoadedEvent(loadedEventCtor) {
4040
3987
  if (!loadedEventCtor) return;
4041
3988
  try {
4042
3989
  const loadedProto = loadedEventCtor.prototype;
4043
- if (loadedProto && typeof loadedProto.getAdsManager === "function" && !loadedProto.getAdsManager.__bidsparkHooked) {
3990
+ if (loadedProto && typeof loadedProto.getAdsManager === "function" && !hookedImaFns.has(loadedProto.getAdsManager)) {
4044
3991
  const originalGetAdsManager = loadedProto.getAdsManager;
4045
3992
  const hookedGetAdsManager = function(...args) {
4046
3993
  const adsManager = originalGetAdsManager.apply(this, args);
@@ -4054,7 +4001,7 @@ function hookAdsManagerLoadedEvent(loadedEventCtor) {
4054
4001
  }
4055
4002
  return adsManager;
4056
4003
  };
4057
- hookedGetAdsManager.__bidsparkHooked = true;
4004
+ hookedImaFns.add(hookedGetAdsManager);
4058
4005
  loadedProto.getAdsManager = hookedGetAdsManager;
4059
4006
  }
4060
4007
  } catch {
@@ -4064,7 +4011,7 @@ function hookAdsManagerPrototype(adsManagerCtorOrProto) {
4064
4011
  if (!adsManagerCtorOrProto) return;
4065
4012
  try {
4066
4013
  const proto = adsManagerCtorOrProto.prototype || adsManagerCtorOrProto;
4067
- if (proto && typeof proto.init === "function" && !proto.init.__bidsparkHooked) {
4014
+ if (proto && typeof proto.init === "function" && !hookedImaFns.has(proto.init)) {
4068
4015
  const origInit = proto.init;
4069
4016
  const hookedInit = function(...args) {
4070
4017
  for (const instance of BidsparkPrebidAnalytics.getActiveInstances()) {
@@ -4075,10 +4022,10 @@ function hookAdsManagerPrototype(adsManagerCtorOrProto) {
4075
4022
  }
4076
4023
  return origInit.apply(this, args);
4077
4024
  };
4078
- hookedInit.__bidsparkHooked = true;
4025
+ hookedImaFns.add(hookedInit);
4079
4026
  proto.init = hookedInit;
4080
4027
  }
4081
- if (proto && typeof proto.start === "function" && !proto.start.__bidsparkHooked) {
4028
+ if (proto && typeof proto.start === "function" && !hookedImaFns.has(proto.start)) {
4082
4029
  const origStart = proto.start;
4083
4030
  const hookedStart = function(...args) {
4084
4031
  for (const instance of BidsparkPrebidAnalytics.getActiveInstances()) {
@@ -4089,7 +4036,7 @@ function hookAdsManagerPrototype(adsManagerCtorOrProto) {
4089
4036
  }
4090
4037
  return origStart.apply(this, args);
4091
4038
  };
4092
- hookedStart.__bidsparkHooked = true;
4039
+ hookedImaFns.add(hookedStart);
4093
4040
  proto.start = hookedStart;
4094
4041
  }
4095
4042
  } catch {
@@ -4100,7 +4047,7 @@ function hookAdsLoader(adsLoaderCtor) {
4100
4047
  try {
4101
4048
  const proto = adsLoaderCtor.prototype;
4102
4049
  if (!proto) return;
4103
- if (typeof proto.addEventListener === "function" && !proto.addEventListener.__bidsparkHooked) {
4050
+ if (typeof proto.addEventListener === "function" && !hookedImaFns.has(proto.addEventListener)) {
4104
4051
  const origAddEventListener = proto.addEventListener;
4105
4052
  const hookedAddEventListener = function(type, listener, ...rest) {
4106
4053
  ensureAdsLoaderErrorListener(this, origAddEventListener);
@@ -4108,9 +4055,9 @@ function hookAdsLoader(adsLoaderCtor) {
4108
4055
  let wrappedListener = adsLoaderListenerMap.get(listener);
4109
4056
  if (!wrappedListener) {
4110
4057
  wrappedListener = function(event) {
4111
- if (event && typeof event.getAdsManager === "function" && !event.getAdsManager.__bidsparkHooked) {
4058
+ if (event && typeof event.getAdsManager === "function" && !hookedImaFns.has(event.getAdsManager)) {
4112
4059
  const origGetAdsManager = event.getAdsManager;
4113
- event.getAdsManager = function(...args) {
4060
+ const hookedGetAdsManager = function(...args) {
4114
4061
  const adsManager = origGetAdsManager.apply(this, args);
4115
4062
  if (adsManager) {
4116
4063
  for (const sdk of BidsparkPrebidAnalytics.getActiveInstances()) {
@@ -4122,7 +4069,8 @@ function hookAdsLoader(adsLoaderCtor) {
4122
4069
  }
4123
4070
  return adsManager;
4124
4071
  };
4125
- event.getAdsManager.__bidsparkHooked = true;
4072
+ hookedImaFns.add(hookedGetAdsManager);
4073
+ event.getAdsManager = hookedGetAdsManager;
4126
4074
  }
4127
4075
  return listener.apply(this, arguments);
4128
4076
  };
@@ -4132,16 +4080,16 @@ function hookAdsLoader(adsLoaderCtor) {
4132
4080
  }
4133
4081
  return origAddEventListener.call(this, type, listener, ...rest);
4134
4082
  };
4135
- hookedAddEventListener.__bidsparkHooked = true;
4083
+ hookedImaFns.add(hookedAddEventListener);
4136
4084
  proto.addEventListener = hookedAddEventListener;
4137
4085
  }
4138
- if (typeof proto.removeEventListener === "function" && !proto.removeEventListener.__bidsparkHooked) {
4086
+ if (typeof proto.removeEventListener === "function" && !hookedImaFns.has(proto.removeEventListener)) {
4139
4087
  const origRemoveEventListener = proto.removeEventListener;
4140
4088
  const hookedRemoveEventListener = function(type, listener, ...rest) {
4141
4089
  const wrapped = typeof listener === "function" ? adsLoaderListenerMap.get(listener) : void 0;
4142
4090
  return origRemoveEventListener.call(this, type, wrapped || listener, ...rest);
4143
4091
  };
4144
- hookedRemoveEventListener.__bidsparkHooked = true;
4092
+ hookedImaFns.add(hookedRemoveEventListener);
4145
4093
  proto.removeEventListener = hookedRemoveEventListener;
4146
4094
  }
4147
4095
  } catch {
@@ -4283,9 +4231,6 @@ function initImaInterception() {
4283
4231
  }
4284
4232
  }
4285
4233
  }
4286
- if (typeof window !== "undefined") {
4287
- initImaInterception();
4288
- }
4289
4234
  function findCachedWinningBid(analytics, filter) {
4290
4235
  const self = internals(analytics);
4291
4236
  const now = Date.now();
@@ -4356,18 +4301,11 @@ function attachImaAdsManager(analytics, adsManager, options) {
4356
4301
  return () => {
4357
4302
  };
4358
4303
  }
4359
- if (!adsManager.__bidsparkAttachedInstances) {
4360
- try {
4361
- Object.defineProperty(adsManager, "__bidsparkAttachedInstances", {
4362
- value: /* @__PURE__ */ new Map(),
4363
- configurable: true,
4364
- writable: true
4365
- });
4366
- } catch {
4367
- adsManager.__bidsparkAttachedInstances = /* @__PURE__ */ new Map();
4368
- }
4304
+ let attached = attachedImaManagers.get(adsManager);
4305
+ if (!attached) {
4306
+ attached = /* @__PURE__ */ new Map();
4307
+ attachedImaManagers.set(adsManager, attached);
4369
4308
  }
4370
- const attached = adsManager.__bidsparkAttachedInstances;
4371
4309
  const previous = attached.get(analytics);
4372
4310
  if (previous) {
4373
4311
  if (!options) return () => {
@@ -4579,7 +4517,9 @@ function attachImaAdsManager(analytics, adsManager, options) {
4579
4517
  }
4580
4518
  const cleanup = () => {
4581
4519
  activeAdSession = null;
4582
- attached.delete(analytics);
4520
+ if (attached.get(analytics) === cleanup) {
4521
+ attached.delete(analytics);
4522
+ }
4583
4523
  for (const { type, handler } of listeners) {
4584
4524
  try {
4585
4525
  adsManager.removeEventListener(type, handler);
@@ -4624,14 +4564,22 @@ function attachVideoPlayer(analytics, target, options) {
4624
4564
  const getWinningBid = () => {
4625
4565
  return (auctionId ? self.getCachedBid(`${auctionId}:${adUnitCode}`) : void 0) || (auctionId && slotId !== adUnitCode ? self.getCachedBid(`${auctionId}:${slotId}`) : void 0) || self.getCachedBid(adUnitCode) || (slotId !== adUnitCode ? self.getCachedBid(slotId) : void 0);
4626
4566
  };
4627
- let videoEl = null;
4628
- if (el) {
4629
- if (el.tagName && el.tagName.toLowerCase() === "video") {
4630
- videoEl = el;
4631
- } else {
4632
- videoEl = el.querySelector("video");
4567
+ const isVideoEl = Boolean(el?.tagName && el.tagName.toLowerCase() === "video");
4568
+ const resolveTargetVideo = (e) => {
4569
+ const target2 = e?.target;
4570
+ if (target2 && (typeof HTMLVideoElement !== "undefined" && target2 instanceof HTMLVideoElement || target2.tagName?.toLowerCase() === "video")) {
4571
+ return target2;
4633
4572
  }
4634
- }
4573
+ if (target2 && typeof target2.closest === "function") {
4574
+ const parentVideo = target2.closest("video");
4575
+ if (parentVideo) return parentVideo;
4576
+ }
4577
+ if (target2 && target2 !== el) {
4578
+ return null;
4579
+ }
4580
+ return isVideoEl ? el : el?.querySelector?.("video") ?? null;
4581
+ };
4582
+ const isForeignChildEvent = (e, targetVideo) => Boolean(e?.target && e.target !== el && !targetVideo);
4635
4583
  const quartilesFired = {
4636
4584
  q1: false,
4637
4585
  q2: false,
@@ -4639,7 +4587,7 @@ function attachVideoPlayer(analytics, target, options) {
4639
4587
  q4: false
4640
4588
  };
4641
4589
  const triggerPlaybackImpression = (activeVideo) => {
4642
- const vEl = activeVideo || videoEl || (el?.querySelector ? el.querySelector("video") : null);
4590
+ const vEl = activeVideo || resolveTargetVideo();
4643
4591
  const cached = getWinningBid();
4644
4592
  const mergedBid = {
4645
4593
  ...cached?.rawBid || options?.bid,
@@ -4666,12 +4614,13 @@ function attachVideoPlayer(analytics, target, options) {
4666
4614
  }
4667
4615
  };
4668
4616
  const handlePlaying = (e) => {
4617
+ const targetVideo = resolveTargetVideo(e);
4618
+ if (isForeignChildEvent(e, targetVideo)) return;
4669
4619
  self.log("DEBUG", "HTML5 video playing event received");
4670
- const targetVideo = e?.target instanceof HTMLVideoElement ? e.target : videoEl;
4671
4620
  triggerPlaybackImpression(targetVideo);
4672
4621
  };
4673
4622
  const handleTimeUpdate = (e) => {
4674
- const targetVideo = e?.target instanceof HTMLVideoElement ? e.target : videoEl;
4623
+ const targetVideo = resolveTargetVideo(e);
4675
4624
  if (targetVideo && targetVideo.currentTime > 0) {
4676
4625
  triggerPlaybackImpression(targetVideo);
4677
4626
  if (Number.isFinite(targetVideo.duration) && targetVideo.duration > 0) {
@@ -4691,15 +4640,17 @@ function attachVideoPlayer(analytics, target, options) {
4691
4640
  }
4692
4641
  }
4693
4642
  };
4694
- const handleEnded = () => {
4643
+ const handleEnded = (e) => {
4644
+ if (isForeignChildEvent(e, resolveTargetVideo(e))) return;
4695
4645
  if (!quartilesFired.q4) {
4696
4646
  quartilesFired.q4 = true;
4697
4647
  options?.onMilestone?.("complete", slotId);
4698
4648
  }
4699
4649
  };
4700
4650
  const handleError = (e) => {
4701
- const targetVideo = e?.target instanceof HTMLVideoElement ? e.target : videoEl;
4702
- const err = targetVideo?.error || videoEl?.error;
4651
+ const targetVideo = resolveTargetVideo(e);
4652
+ if (isForeignChildEvent(e, targetVideo)) return;
4653
+ const err = targetVideo?.error;
4703
4654
  const cached = getWinningBid();
4704
4655
  const msg = err ? `HTML5 video error code ${err.code}: ${err.message}` : "Video playback error";
4705
4656
  self.log("WARN", msg);
@@ -4724,41 +4675,13 @@ function attachVideoPlayer(analytics, target, options) {
4724
4675
  }
4725
4676
  }
4726
4677
  };
4727
- const attachListenersToVideo = (targetVideo) => {
4728
- targetVideo.addEventListener("playing", handlePlaying);
4729
- targetVideo.addEventListener("play", handlePlaying);
4730
- targetVideo.addEventListener("timeupdate", handleTimeUpdate);
4731
- targetVideo.addEventListener("ended", handleEnded);
4732
- targetVideo.addEventListener("error", handleError);
4733
- };
4734
- const removeListenersFromVideo = (targetVideo) => {
4735
- targetVideo.removeEventListener("playing", handlePlaying);
4736
- targetVideo.removeEventListener("play", handlePlaying);
4737
- targetVideo.removeEventListener("timeupdate", handleTimeUpdate);
4738
- targetVideo.removeEventListener("ended", handleEnded);
4739
- targetVideo.removeEventListener("error", handleError);
4740
- };
4741
- let mutationObserver = null;
4742
- if (el && el !== videoEl) {
4743
- el.addEventListener("playing", handlePlaying, true);
4744
- el.addEventListener("play", handlePlaying, true);
4745
- el.addEventListener("timeupdate", handleTimeUpdate, true);
4746
- el.addEventListener("ended", handleEnded, true);
4747
- el.addEventListener("error", handleError, true);
4748
- }
4749
- if (videoEl) {
4750
- attachListenersToVideo(videoEl);
4751
- }
4752
- if (el && el.tagName?.toLowerCase() !== "video" && typeof MutationObserver !== "undefined") {
4753
- mutationObserver = new MutationObserver(() => {
4754
- const found = el.querySelector("video");
4755
- if (found && found !== videoEl) {
4756
- if (videoEl) removeListenersFromVideo(videoEl);
4757
- videoEl = found;
4758
- if (videoEl) attachListenersToVideo(videoEl);
4759
- }
4760
- });
4761
- mutationObserver.observe(el, { childList: true, subtree: true });
4678
+ const useCapture = !isVideoEl;
4679
+ if (el) {
4680
+ el.addEventListener("playing", handlePlaying, useCapture);
4681
+ el.addEventListener("play", handlePlaying, useCapture);
4682
+ el.addEventListener("timeupdate", handleTimeUpdate, useCapture);
4683
+ el.addEventListener("ended", handleEnded, useCapture);
4684
+ el.addEventListener("error", handleError, useCapture);
4762
4685
  }
4763
4686
  const cachedInitial = getWinningBid();
4764
4687
  if (options?.trackViewability !== false && el) {
@@ -4772,19 +4695,12 @@ function attachVideoPlayer(analytics, target, options) {
4772
4695
  });
4773
4696
  }
4774
4697
  const cleanup = () => {
4775
- if (mutationObserver) {
4776
- mutationObserver.disconnect();
4777
- mutationObserver = null;
4778
- }
4779
- if (el && el !== videoEl) {
4780
- el.removeEventListener("playing", handlePlaying, true);
4781
- el.removeEventListener("play", handlePlaying, true);
4782
- el.removeEventListener("timeupdate", handleTimeUpdate, true);
4783
- el.removeEventListener("ended", handleEnded, true);
4784
- el.removeEventListener("error", handleError, true);
4785
- }
4786
- if (videoEl) {
4787
- removeListenersFromVideo(videoEl);
4698
+ if (el) {
4699
+ el.removeEventListener("playing", handlePlaying, useCapture);
4700
+ el.removeEventListener("play", handlePlaying, useCapture);
4701
+ el.removeEventListener("timeupdate", handleTimeUpdate, useCapture);
4702
+ el.removeEventListener("ended", handleEnded, useCapture);
4703
+ el.removeEventListener("error", handleError, useCapture);
4788
4704
  }
4789
4705
  self.videoDetachCleanups.delete(cleanup);
4790
4706
  };
@@ -4797,16 +4713,17 @@ BidsparkPrebidAnalytics.prototype.attachImaAdsManager = function(adsManager, opt
4797
4713
  BidsparkPrebidAnalytics.prototype.attachVideoPlayer = function(target, options) {
4798
4714
  return attachVideoPlayer(this, target, options);
4799
4715
  };
4800
- var coreEnable = BidsparkPrebidAnalytics.prototype.enable;
4801
- BidsparkPrebidAnalytics.prototype.enable = function() {
4802
- coreEnable.call(this);
4803
- if (typeof window !== "undefined") {
4716
+ var imaAutoInterceptionInstalled = false;
4717
+ function installImaAutoInterception() {
4718
+ if (imaAutoInterceptionInstalled) return;
4719
+ imaAutoInterceptionInstalled = true;
4720
+ initImaInterception();
4721
+ const coreEnable = BidsparkPrebidAnalytics.prototype.enable;
4722
+ BidsparkPrebidAnalytics.prototype.enable = function() {
4723
+ coreEnable.call(this);
4804
4724
  initImaInterception();
4805
- if (window.google?.ima) {
4806
- hookImaPrototype(window.google.ima);
4807
- }
4808
- }
4809
- };
4725
+ };
4726
+ }
4810
4727
  function normalizeImaEventName(name) {
4811
4728
  if (!name) return "";
4812
4729
  const lower = name.toLowerCase().replace(/[_-]/g, "");
@@ -4925,6 +4842,7 @@ var ImaAdsManagerStub = class {
4925
4842
  };
4926
4843
 
4927
4844
  // src/index.ts
4845
+ installImaAutoInterception();
4928
4846
  function getAdsGlobal(alias = DEFAULT_ALIAS) {
4929
4847
  if (typeof window === "undefined") {
4930
4848
  return { q: [] };
@@ -4995,6 +4913,7 @@ export {
4995
4913
  getPrebidEventKey,
4996
4914
  idToBytes,
4997
4915
  idToString,
4916
+ installImaAutoInterception,
4998
4917
  isAutomatedClient,
4999
4918
  isSessionActive,
5000
4919
  isTrustedEndpoint,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bidspark/analytics",
3
- "version": "0.46.0",
3
+ "version": "0.46.1",
4
4
  "description": "Bidspark auction analytics: a standalone Prebid.js analytics adapter, plus TypeScript bindings for the Bidspark ad SDK.",
5
5
  "keywords": [
6
6
  "advertising",