wip

Author: silesky

packages/signals/signals/src/core/emitter/index.ts

@@ -11,7 +11,7 @@ const logSignal = (signal: Signal) => {
     'New signal:',
     signal.type,
     signal.data,
-    signal.type === 'interaction'
+    signal.type === 'interaction' && signal.data.eventType === 'change'
       ? {
           value: signal.data.target.value,
           changedAttribute: signal.data.target.changedAttribute,

packages/signals/signals/src/core/signal-generators/dom-gen/dom-gen.ts

@@ -272,7 +272,7 @@ export class OnChangeGenerator implements SignalGenerator {
             changedValue: ev.newValue,
             changedAttribute: ev.attributeName,
           },
-          listener: 'mutation-observer',
+          listener: 'mutation',
         })
       )
     })
@@ -294,7 +294,7 @@ export class OnChangeGenerator implements SignalGenerator {
             changedValue: el.value,
             changedAttribute: 'value',
           },
-          listener: 'on-change',
+          listener: 'onchange',
         })
       )
     }, 300)

packages/signals/signals/src/core/signal-generators/network-gen/__tests__/network-generator.test.ts

@@ -283,7 +283,7 @@ describe(NetworkGenerator, () => {
     unregister()
   })
 
-  it('emits signals for same domain if networkSignalsAllowSameDomain = false', async () => {
+  it('will not emit signals for same domain if networkSignalsAllowSameDomain = false', async () => {
     const mockEmitter = { emit: jest.fn() }
     const networkGenerator = new TestNetworkGenerator({
       networkSignalsAllowList: ['foo.com'],
@@ -301,7 +301,10 @@ describe(NetworkGenerator, () => {
     })
 
     await sleep(100)
-    expect(mockEmitter.emit.mock.calls.length).toBe(0)
+    let requests = mockEmitter.emit.mock.calls.filter(
+      (c) => c[0].data.action === 'request'
+    )
+    expect(requests.length).toBe(0)
 
     await window.fetch(`http://foo.com/test`, {
       method: 'POST',
@@ -310,7 +313,10 @@ describe(NetworkGenerator, () => {
     })
 
     await sleep(100)
-    expect(mockEmitter.emit.mock.calls.length).toBe(2)
+    requests = mockEmitter.emit.mock.calls.filter(
+      (c) => c[0].data.action === 'request'
+    )
+    expect(requests.length).toBe(1)
 
     unregister()
   })
@@ -336,6 +342,36 @@ describe(NetworkGenerator, () => {
     unregister()
   })
 
+  it('allows an explicit disallow list to override same-domain signals', async () => {
+    const mockEmitter = { emit: jest.fn() }
+    const networkGenerator = new TestNetworkGenerator({
+      networkSignalsDisallowList: ['/foo'],
+    })
+    const unregister = networkGenerator.register(
+      mockEmitter as unknown as SignalEmitter
+    )
+
+    await window.fetch(`/test/foo`, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ key: 'value' }),
+    })
+
+    await window.fetch(`/test/bar`, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ key: 'value' }),
+    })
+
+    await sleep(100)
+    const requests = mockEmitter.emit.mock.calls
+      .filter((c) => c[0].data.action === 'request')
+      .flatMap((c) => c[0].data.url)
+    expect(requests.length).toBe(1)
+    expect(requests[0]).toBe('http://localhost/test/bar')
+    unregister()
+  })
+
   it('always disallows segment api network signals', async () => {
     const mockEmitter = { emit: jest.fn() }
     const networkGenerator = new TestNetworkGenerator({

packages/signals/signals/src/core/signal-generators/network-gen/network-signals-filter.ts

@@ -65,10 +65,17 @@ export class NetworkSignalsFilterList {
     ])
   }
 
-  isAllowed(url: string): boolean {
-    const disallowed =
-      this.disallowed.test(url) || this.disallowedDefaults.test(url)
-    const allowed = this.allowed.test(url)
+  isExplicitlyDisallowed(url: string): boolean {
+    return this.disallowed.test(url) || this.disallowedDefaults.test(url)
+  }
+
+  isExplicityAllowed(url: string): boolean {
+    return this.allowed.test(url)
+  }
+
+  test(url: string): boolean {
+    const disallowed = this.isExplicitlyDisallowed(url)
+    const allowed = this.isExplicityAllowed(url)
     return allowed && !disallowed
   }
 
@@ -93,9 +100,12 @@ export class NetworkSignalsFilter {
     const { networkSignalsFilterList, networkSignalsAllowSameDomain } =
       this.settings
 
-    const passesNetworkFilter = networkSignalsFilterList.isAllowed(url)
+    const passesNetworkFilter = networkSignalsFilterList.test(url)
     const allowedBecauseSameDomain =
-      networkSignalsAllowSameDomain && isSameDomain(url)
+      networkSignalsAllowSameDomain &&
+      isSameDomain(url) &&
+      !networkSignalsFilterList.isExplicitlyDisallowed(url)
+
     const allowed = passesNetworkFilter || allowedBecauseSameDomain
     return allowed
   }