From 2ffeaff8139c71725d0dff51cb42e30f6954f1c4 Mon Sep 17 00:00:00 2001 From: nick-delirium Date: Mon, 22 Jan 2024 12:32:50 +0100 Subject: [PATCH] fix(tracker): fix versions in package.json, update changelog etc --- tracker/tracker-assist/CHANGELOG.md | 4 + tracker/tracker-assist/bun.lockb | Bin 249605 -> 244828 bytes tracker/tracker-assist/package.json | 4 +- tracker/tracker/package.json | 2 +- .../src/main/modules/conditionsManager.ts | 79 +++++++++++------- 5 files changed, 56 insertions(+), 33 deletions(-) diff --git a/tracker/tracker-assist/CHANGELOG.md b/tracker/tracker-assist/CHANGELOG.md index 464985ec8..bc41bbe33 100644 --- a/tracker/tracker-assist/CHANGELOG.md +++ b/tracker/tracker-assist/CHANGELOG.md @@ -1,3 +1,7 @@ +## 8.0.0 + +- Keeping up with major tracker release. + ## 7.0.3 - small fix for canvas context tracking diff --git a/tracker/tracker-assist/bun.lockb b/tracker/tracker-assist/bun.lockb index 7136f43beb6bd0b0021b5fcda14ef1399eaf7489..d81b618bf299007adb30fd59ad1e78ca81c5a580 100755 GIT binary patch delta 10535 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 delta 15343 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 diff --git a/tracker/tracker-assist/package.json b/tracker/tracker-assist/package.json index 363e9910c..7e670cda2 100644 --- a/tracker/tracker-assist/package.json +++ b/tracker/tracker-assist/package.json @@ -1,7 +1,7 @@ { "name": "@openreplay/tracker-assist", "description": "Tracker plugin for screen assistance through the WebRTC", - "version": "7.0.4", + "version": "8.0.0", "keywords": [ "WebRTC", "assistance", @@ -20,7 +20,7 @@ "build-cjs": "rm -Rf cjs && tsc --project tsconfig-cjs.json && echo '{ \"type\": \"commonjs\" }' > cjs/package.json && bun run replace-paths && bun run replace-req-version", "replace-paths": "replace-in-files cjs/* --string='@openreplay/tracker' --replacement='@openreplay/tracker/cjs' && replace-in-files cjs/* --string='/lib/' --replacement='/'", "replace-pkg-version": "sh pkgver.sh", - "replace-req-version": "replace-in-files lib/* cjs/* --string='REQUIRED_TRACKER_VERSION' --replacement='11.0.0'", + "replace-req-version": "replace-in-files lib/* cjs/* --string='REQUIRED_TRACKER_VERSION' --replacement='12.0.0'", "prepublishOnly": "bun run test && bun run build", "prepare": "cd ../../ && husky install tracker/.husky/", "lint-front": "lint-staged", diff --git a/tracker/tracker/package.json b/tracker/tracker/package.json index a996172db..b99cc9dfb 100644 --- a/tracker/tracker/package.json +++ b/tracker/tracker/package.json @@ -1,7 +1,7 @@ { "name": "@openreplay/tracker", "description": "The OpenReplay tracker main package", - "version": "12.0.1-2", + "version": "12.0.0", "keywords": [ "logging", "replay" diff --git a/tracker/tracker/src/main/modules/conditionsManager.ts b/tracker/tracker/src/main/modules/conditionsManager.ts index 53ef7c52a..8344ff411 100644 --- a/tracker/tracker/src/main/modules/conditionsManager.ts +++ b/tracker/tracker/src/main/modules/conditionsManager.ts @@ -56,8 +56,18 @@ export default class ConditionsManager { filters.forEach((filter) => { let cond: Condition | undefined if (filter.type === 'fetch') { + cond = { + type: 'network_request', + subConditions: [], + name: c.name, + } filter.filters.forEach((f) => { - cond = this.createConditionFromFilter(f as unknown as Filter) + const subCond = this.createConditionFromFilter(f as unknown as Filter) + if (subCond) { + ;(cond as unknown as NetworkRequestCondition).subConditions.push( + subCond as unknown as SubCondition, + ) + } }) } else { cond = this.createConditionFromFilter(filter) @@ -155,36 +165,41 @@ export default class ConditionsManager { const reqConds = this.conditions.filter( (c) => c.type === 'network_request', ) as NetworkRequestCondition[] - const withoutAny = reqConds.filter((c) => c.operator !== 'isAny') - if (withoutAny.length) { - withoutAny.forEach((reqCond) => { - let value - switch (reqCond.key) { - case 'url': - value = message[3] - break - case 'status': - value = message[6] - break - case 'method': - value = message[2] - break - case 'duration': - value = message[8] - break - default: - break - } - const operator = operators[reqCond.operator] as (a: string, b: string[]) => boolean - // @ts-ignore - if (operator && operator(value, reqCond.value)) { + if (!reqConds.length) return + reqConds.forEach((reqCond) => { + const validSubConditions = reqCond.subConditions.filter((c) => c.operator !== 'isAny') + if (validSubConditions.length) { + const allPass = validSubConditions.every((subCond) => { + let value + switch (subCond.key) { + case 'url': + value = message[3] + break + case 'status': + value = message[6] + break + case 'method': + value = message[2] + break + case 'duration': + value = message[8] + break + default: + break + } + const operator = operators[subCond.operator] as (a: string, b: string[]) => boolean + // @ts-ignore + if (operator && operator(value, subCond.value)) { + return true + } + }) + if (allPass) { this.trigger(reqCond.name) } - }) - } - if (withoutAny.length === 0 && reqConds.length) { - this.trigger(reqConds[0].name) - } + } else if (validSubConditions.length === 0 && reqCond.subConditions.length) { + this.trigger(reqCond.name) + } + }) } customEvent(message: CustomEvent) { @@ -277,11 +292,15 @@ type SessionDurationCondition = { value: number[] name: string } -type NetworkRequestCondition = { +type SubCondition = { type: 'network_request' key: 'url' | 'status' | 'method' | 'duration' operator: keyof typeof operators value: string[] +} +type NetworkRequestCondition = { + type: 'network_request' + subConditions: SubCondition[] name: string } type Condition =