@hanzo/event 0.3.49 → 0.3.50

package/dist/tags.d.ts

@@ -22,6 +22,14 @@ export interface TagOptions {
  * given a key.
  */
 export declare const SITE_KEY: Readonly<Record<string, string>>;
+/**
+ * Resolves once every tag this visitor's choice loads has taken the page view, or after
+ * `limit` ms, whichever is first: the tag set has answered, gtag.js has loaded or failed,
+ * and Meta's library has replaced the stub that queued the call. A page that is about to
+ * leave waits on this so the visit is counted where it arrived. A tag the choice does not
+ * load is not waited for.
+ */
+export declare function ready(limit?: number): Promise<void>;
 /**
  * Starts the tag manager: fetches the site's tag set and loads what consent
  * allows, again on every consent change. Safe to call on every page load, and

package/dist/tags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tags.d.ts","sourceRoot":"","sources":["../src/tags.ts"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAEvC,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,wDAAwD;IACxD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,0DAA0D;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,wDAAwD;IACxD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUpD,CAAA;AAuNF;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,CAAC,GAAE,UAAe,GAAG,MAAM,IAAI,CAmCpD;AAOD,uFAAuF;AACvF,wBAAgB,KAAK,IAAI,MAAM,CAc9B;AA+CD;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,SAAU,GAAG,IAAI,CAiCpG;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,KAAK,CACnB,MAAM,EAAE,SAAS,GAAG,SAAS,EAC7B,IAAI,EAAE,MAAM,EACZ,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;AACpC,kGAAkG;AAClG,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CAsBN;AAED,gGAAgG;AAChG,wBAAgB,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAG/C"}
+{"version":3,"file":"tags.d.ts","sourceRoot":"","sources":["../src/tags.ts"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAEvC,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,wDAAwD;IACxD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,0DAA0D;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,wDAAwD;IACxD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAepD,CAAA;AAqCF;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,KAAK,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAcjD;AAoLD;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,CAAC,GAAE,UAAe,GAAG,MAAM,IAAI,CAmCpD;AAOD,uFAAuF;AACvF,wBAAgB,KAAK,IAAI,MAAM,CAc9B;AA+CD;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,SAAU,GAAG,IAAI,CAiCpG;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,KAAK,CACnB,MAAM,EAAE,SAAS,GAAG,SAAS,EAC7B,IAAI,EAAE,MAAM,EACZ,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;AACpC,kGAAkG;AAClG,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CAsBN;AAED,gGAAgG;AAChG,wBAAgB,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAG/C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/event",
-  "version": "0.3.49",
+  "version": "0.3.50",
   "description": "Hanzo Event — the ONE telemetry client. Emits pageview/event/identify/group to the Hanzo Cloud event stream (POST /v1/event), AND reports errors to Sentry as real Sentry envelopes — the error plane needs a DSN, without one nothing reaches Sentry. First-touch attribution, beacon-on-unload, auto error capture, client-side secret/PII scrubbing, a shared event + goal vocabulary. Subsumes @sentry.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/src/core.test.ts

@@ -396,17 +396,17 @@ describe('Analytics capture', () => {
     expect(tx.sent[0].ingestKey).toBeUndefined()
   })
 
-  it('a signed-in bearer WINS over a key from the build env', () => {
-    // The leak this closes: one console bundle is served to several brands, and a
-    // pk- names ONE org. If an env-sourced key displaced the bearer, every
-    // signed-in user's events would re-file under whichever org minted the key.
+  it('a signed-in page sends the key AND the bearer; the bearer never replaces the key', () => {
+    // The person is the bearer and the project is the key. The server files the event
+    // under the key's project only when it belongs to the bearer's own org, so a key
+    // from the build env cannot re-file a person's events under another org.
     process.env.NEXT_PUBLIC_PUBLISHABLE_KEY = 'pk-live-one-org'
     try {
       const a = mk({ getToken: () => 'jwt-of-a-real-person' })
       a.capture('x')
       a.flush()
       expect(tx.sent[0].token).toBe('jwt-of-a-real-person')
-      expect(tx.sent[0].ingestKey).toBeUndefined()
+      expect(tx.sent[0].ingestKey).toBe('pk-live-one-org')
     } finally {
       delete process.env.NEXT_PUBLIC_PUBLISHABLE_KEY
     }

package/src/core.ts

@@ -105,6 +105,12 @@ function normalizeError(err: unknown): Exception {
 // unload listeners RN doesn't have), while `capture()`/`flush()` — which are NOT
 // gated on this and post through plain `fetch` — still emit. So the client is
 // inert-safe under SSR/Node and live on RN, without a second transport.
+/** The screen and language a page view carries, for the readers that derive device and locale. */
+const viewport = (): Record<string, string> =>
+  isBrowser()
+    ? { screen: `${window.screen?.width ?? 0}x${window.screen?.height ?? 0}`, language: navigator.language || '' }
+    : {}
+
 const isBrowser = () => typeof window !== 'undefined' && typeof document !== 'undefined'
 
 /** serializeBatch stringifies a batch, salvaging what it can. `properties` is
@@ -186,13 +192,15 @@ class DefaultTransport implements Transport {
     // for an origin that cannot pass one. A JWT is first-party by construction, so
     // it keeps the header and the session it travels with, and so does the error
     // plane, which names its own envelope type.
-    const simple = opts.ingestKey !== undefined && opts.contentType === undefined
+    const simple = opts.ingestKey !== undefined && opts.token === undefined && opts.contentType === undefined
     const headers: Record<string, string> = {
       'Content-Type': simple ? BEACON_CONTENT_TYPE : (opts.contentType ?? 'application/json'),
     }
-    const bearer = simple ? undefined : (opts.ingestKey ?? opts.token)
+    // A signed-in page sends the key (which project) in the query AND the person's bearer
+    // (who) in the header; the bearer never replaces the key.
+    const bearer = simple ? undefined : (opts.token ?? opts.ingestKey)
     if (bearer) headers.Authorization = `Bearer ${bearer}`
-    void fetch(simple ? appendQuery(url, 'ingest_key', opts.ingestKey!) : url, {
+    void fetch(opts.ingestKey ? appendQuery(url, 'ingest_key', opts.ingestKey) : url, {
       method: 'POST',
       headers,
       body,
@@ -375,7 +383,7 @@ export class Analytics {
     const view = (p ?? '') + '\0' + (isBrowser() ? window.location.href : '')
     if (view === this.counted) return
     this.counted = view
-    this.enqueue('pageview', PAGEVIEW, { path: p, properties })
+    this.enqueue('pageview', PAGEVIEW, { path: p, properties: { ...viewport(), ...properties } })
   }
 
   /** capture records a named product event with optional properties. Commerce
@@ -441,20 +449,10 @@ export class Analytics {
     this.queue = []
     this.clearTimer()
 
-    // A publishable key and a bearer JWT are mutually exclusive credentials, and the
-    // BEARER WINS. It names a real principal and resolves to THAT person's org;
-    // a pk- names one org for everybody holding it. So the key is what attributes
-    // a visitor nobody has vouched for, and it must never displace someone who
-    // has been.
-    //
-    // The precedence used to run the other way, which was survivable only while
-    // the key had to be passed in code. Once it also resolves from the build env,
-    // key-wins means setting one variable silently blanks every signed-in user's
-    // token and re-files their events under whichever org minted the key — on a
-    // console served to several brands from one bundle, that is a cross-tenant
-    // leak introduced by an env var.
+    // Two kinds of credential, and both ride when both are held: the publishable key
+    // names the project, the bearer names the person. The bearer never replaces the key.
     const token = this.cfg.getToken?.() ?? undefined
-    const key = token ? undefined : this.cfg.ingestKey?.trim() || undefined
+    const key = this.cfg.ingestKey?.trim() || undefined
     // Only a bearer JWT blocks the beacon: sendBeacon cannot set an Authorization
     // header. A pk- rides ?ingest_key; a cookie rides credentials.
     const useBeacon = beacon && !token

package/src/index.ts

@@ -29,7 +29,7 @@ export {
 } from './consent'
 export type { Choice, Region } from './consent'
 export { CLICK_IDS, capture as captureClick, touch } from './touch'
-export { start as startTags, track, mirror, reach, visit, SITE_KEY } from './tags'
+export { start as startTags, ready as tagsReady, track, mirror, reach, visit, SITE_KEY } from './tags'
 export type { BrowserTag, TagOptions } from './tags'
 export { commerceItem, worth } from './items'
 export type { CommerceItem, PlanLine } from './items'

package/src/org.test.ts

@@ -127,3 +127,12 @@ describe('a surface that configures nothing', () => {
     expect((none as unknown as { cfg: { ingestKey?: string } }).cfg.ingestKey).toBeUndefined()
   })
 })
+
+describe('the hanzo org files under the hanzo.ai project', () => {
+  it('names hanzo.network, hanzo.market, hanzo.industries and hanzo.agency', () => {
+    for (const host of ['hanzo.network', 'hanzo.market', 'hanzo.industries', 'hanzo.agency']) {
+      expect(orgOf(host)).toBe('hanzo')
+      expect(keyFor(host)).toBe('pk-CmfLA2K6kvsPflrS9DSkt06H_kSoQB_21sjedt6VJdc')
+    }
+  })
+})

package/src/org.ts

@@ -93,7 +93,7 @@ export const ORG_DOMAIN: Readonly<Record<string, readonly string[]>> = Object.fr
  * recreate a project, move BOTH.
  */
 export const ORG_KEY: Keyring = Object.freeze({
-  hanzo: 'pk-rM_CdaF2MQckGCrla113SrR1oH4zvqN8xh2I95Z9tY8',
+  hanzo: 'pk-CmfLA2K6kvsPflrS9DSkt06H_kSoQB_21sjedt6VJdc',
   lux: 'pk-gUZp6ZVfhJzSwK-rb4oLbVkpCnMBx5uSCpxf_5yEhQk',
   zoo: 'pk-3TKpKnERV9AQSsBUERWkZejC1O1mUxc1jRzsP3MPbs4',
 })

package/src/tags.ts

@@ -69,6 +69,11 @@ export const SITE_KEY: Readonly<Record<string, string>> = Object.freeze({
   'platform.hanzo.ai': 'pk-My1RpZLEUnTj8vAdPbWKYdDUuhxZJ4dVjHcwjZN4rZ8',
   'docs.hanzo.ai': 'pk-jukhtjMT2ymoeBDAeFjINQWlBv-v9sNn1TPztiCrrwk',
   'hanzo.bot': 'pk-W5d7Mn7ZukT7igyscIy6Pqe8JpA0Ge604Yn4xNR4JCU',
+  'hanzo.chat': 'pk-ATxWeB2jNyRSxDgqnkGoDj3CCbzrmTxSktUh9zlrO-E',
+  'hanzo.id': 'pk-_GVF3KlaqprlPHDumBMRFeFU1lIGOaarQfgimNVDIo8',
+  'hanzo.industries': 'pk-Vh1wvL2HqIAv9qpVvmrznTI9uMHrTD-jyIC-vnlBsgY',
+  'hanzo.market': 'pk-DN3xQFa0H61epUVg9OkiOYLzCdteNt9hE6f-S-ednjQ',
+  'hanzo.network': 'pk-YJ2eiA_7ckLStMPte8Ar8FsmRp_ycmeIeRbpGprZYmM',
   'cloud.hanzo.ai': 'pk-RAfEGHPoNdCEU9fnA_cPd_Xo9Tci44rlYQV9xuJ1Ob0',
 })
 
@@ -107,6 +112,29 @@ function flush(): void {
   if (settled() || leaving) held.splice(0).forEach((send) => send())
 }
 
+/**
+ * Resolves once every tag this visitor's choice loads has taken the page view, or after
+ * `limit` ms, whichever is first: the tag set has answered, gtag.js has loaded or failed,
+ * and Meta's library has replaced the stub that queued the call. A page that is about to
+ * leave waits on this so the visit is counted where it arrived. A tag the choice does not
+ * load is not waited for.
+ */
+export function ready(limit = 3000): Promise<void> {
+  if (typeof window === 'undefined') return Promise.resolve()
+  const start = Date.now()
+  const meta = () => {
+    const fbq = page().fbq
+    return ![...loaded].some((k) => k.startsWith('meta:')) || typeof fbq?.callMethod === 'function'
+  }
+  return new Promise((resolve) => {
+    const tick = () => {
+      if ((configured && settled() && meta()) || Date.now() - start >= limit) return resolve()
+      setTimeout(tick, 100)
+    }
+    tick()
+  })
+}
+
 function script(src: string, onload?: () => void, onerror?: () => void): void {
   const s = document.createElement('script')
   s.async = true