From da1c645d21ee299e23dc315817f0ee33380ba9eb Mon Sep 17 00:00:00 2001 From: Alex Kaminskii Date: Wed, 3 Aug 2022 11:32:17 +0200 Subject: [PATCH] style(mobs): rename 'js' option to 'tracker' --- mobs/messages.rb | 40 +++++++++---------- mobs/run.rb | 7 ++-- ...stributor~messages~RawMessageReader.ts.erb | 2 +- ...MessageDistributor~messages~message.ts.erb | 4 +- ...yer~MessageDistributor~messages~raw.ts.erb | 6 +-- ...tracker~tracker~src~common~messages.ts.erb | 6 +-- ...acker~tracker~src~main~app~messages.ts.erb | 2 +- ...racker~src~webworker~MessageEncoder.ts.erb | 2 +- 8 files changed, 35 insertions(+), 34 deletions(-) diff --git a/mobs/messages.rb b/mobs/messages.rb index f1c5ee5cb..5e9cc204e 100644 --- a/mobs/messages.rb +++ b/mobs/messages.rb @@ -1,6 +1,6 @@ # Special one for Batch Meta. Message id could define the version # Depricated since tracker 3.6.0 in favor of BatchMetadata -message 80, 'BatchMeta', :js => false, :replayer => false do +message 80, 'BatchMeta', :tracker => false, :replayer => false do uint 'PageNo' uint 'FirstIndex' int 'Timestamp' @@ -25,7 +25,7 @@ end message 0, 'Timestamp' do uint 'Timestamp' end -message 1, 'SessionStart', :js => false, :replayer => false do +message 1, 'SessionStart', :tracker => false, :replayer => false do uint 'Timestamp' uint 'ProjectID' string 'TrackerVersion' @@ -44,10 +44,10 @@ message 1, 'SessionStart', :js => false, :replayer => false do string 'UserID' end # Depricated (not used) since OpenReplay tracker 3.0.0 -message 2, 'SessionDisconnect', :js => false do +message 2, 'SessionDisconnect', :tracker => false do uint 'Timestamp' end -message 3, 'SessionEnd', :js => false, :replayer => false do +message 3, 'SessionEnd', :tracker => false, :replayer => false do uint 'Timestamp' end message 4, 'SetPageLocation' do @@ -98,7 +98,7 @@ message 14, 'SetNodeData' do uint 'ID' string 'Data' end -message 15, 'SetCSSData', :js => false do +message 15, 'SetCSSData', :tracker => false do uint 'ID' string 'Data' end @@ -125,7 +125,7 @@ message 20, 'MouseMove' do uint 'Y' end # Depricated since OpenReplay 1.2.0 -message 21, 'MouseClickDepricated', :js => false, :replayer => false do +message 21, 'MouseClickDepricated', :tracker => false, :replayer => false do uint 'ID' uint 'HesitationTime' string 'Label' @@ -155,7 +155,7 @@ message 25, 'JSException', :replayer => false do string 'Message' string 'Payload' end -message 26, 'IntegrationEvent', :js => false, :replayer => false do +message 26, 'IntegrationEvent', :tracker => false, :replayer => false do uint 'Timestamp' string 'Source' string 'Name' @@ -176,7 +176,7 @@ message 30, 'Metadata', :replayer => false do string 'Key' string 'Value' end -message 31, 'PageEvent', :js => false, :replayer => false do +message 31, 'PageEvent', :tracker => false, :replayer => false do uint 'MessageID' uint 'Timestamp' string 'URL' @@ -195,21 +195,21 @@ message 31, 'PageEvent', :js => false, :replayer => false do uint 'VisuallyComplete' uint 'TimeToInteractive' end -message 32, 'InputEvent', :js => false, :replayer => false do +message 32, 'InputEvent', :tracker => false, :replayer => false do uint 'MessageID' uint 'Timestamp' string 'Value' boolean 'ValueMasked' string 'Label' end -message 33, 'ClickEvent', :js => false, :replayer => false do +message 33, 'ClickEvent', :tracker => false, :replayer => false do uint 'MessageID' uint 'Timestamp' uint 'HesitationTime' string 'Label' string 'Selector' end -message 34, 'ErrorEvent', :js => false, :replayer => false do +message 34, 'ErrorEvent', :tracker => false, :replayer => false do uint 'MessageID' uint 'Timestamp' string 'Source' @@ -217,7 +217,7 @@ message 34, 'ErrorEvent', :js => false, :replayer => false do string 'Message' string 'Payload' end -message 35, 'ResourceEvent', :js => false, :replayer => false do +message 35, 'ResourceEvent', :tracker => false, :replayer => false do uint 'MessageID' uint 'Timestamp' uint 'Duration' @@ -231,7 +231,7 @@ message 35, 'ResourceEvent', :js => false, :replayer => false do string 'Method' uint 'Status' end -message 36, 'CustomEvent', :js => false, :replayer => false do +message 36, 'CustomEvent', :tracker => false, :replayer => false do uint 'MessageID' uint 'Timestamp' string 'Name' @@ -272,7 +272,7 @@ end message 42, 'StateAction', :replayer => false do string 'Type' end -message 43, 'StateActionEvent', :js => false, :replayer => false do +message 43, 'StateActionEvent', :tracker => false, :replayer => false do uint 'MessageID' uint 'Timestamp' string 'Type' @@ -308,7 +308,7 @@ message 49, 'PerformanceTrack' do uint 'TotalJSHeapSize' uint 'UsedJSHeapSize' end -message 50, 'GraphQLEvent', :js => false, :replayer => false do +message 50, 'GraphQLEvent', :tracker => false, :replayer => false do uint 'MessageID' uint 'Timestamp' string 'OperationKind' @@ -316,7 +316,7 @@ message 50, 'GraphQLEvent', :js => false, :replayer => false do string 'Variables' string 'Response' end -message 51, 'FetchEvent', :js => false, :replayer => false do +message 51, 'FetchEvent', :tracker => false, :replayer => false do uint 'MessageID' uint 'Timestamp' string 'Method' @@ -326,7 +326,7 @@ message 51, 'FetchEvent', :js => false, :replayer => false do uint 'Status' uint 'Duration' end -message 52, 'DOMDrop', :js => false, :replayer => false do +message 52, 'DOMDrop', :tracker => false, :replayer => false do uint 'Timestamp' end message 53, 'ResourceTiming', :replayer => false do @@ -346,7 +346,7 @@ end message 55, 'SetPageVisibility' do boolean 'hidden' end -message 56, 'PerformanceTrackAggr', :js => false, :replayer => false do +message 56, 'PerformanceTrackAggr', :tracker => false, :replayer => false do uint 'TimestampStart' uint 'TimestampEnd' uint 'MinFPS' @@ -383,7 +383,7 @@ message 61, 'SetCSSDataURLBased', :replayer => false do string 'Data' string 'BaseURL' end -message 62, 'IssueEvent', :replayer => false, :js => false do +message 62, 'IssueEvent', :replayer => false, :tracker => false do uint 'MessageID' uint 'Timestamp' string 'Type' @@ -399,7 +399,7 @@ message 64, 'CustomIssue', :replayer => false do string 'Name' string 'Payload' end -message 66, 'AssetCache', :replayer => false, :js => false do +message 66, 'AssetCache', :replayer => false, :tracker => false do string 'URL' end message 67, 'CSSInsertRuleURLBased', :replayer => false do diff --git a/mobs/run.rb b/mobs/run.rb index ed9999e88..1ec55fa37 100644 --- a/mobs/run.rb +++ b/mobs/run.rb @@ -85,16 +85,17 @@ end $context = :web class Message - attr_reader :id, :name, :js, :replayer, :swift, :seq_index, :attributes, :context - def initialize(name:, id:, js: $context == :web, replayer: $context == :web, swift: $context == :ios, seq_index: false, &block) + attr_reader :id, :name, :tracker, :replayer, :swift, :seq_index, :attributes, :context + def initialize(name:, id:, tracker: $context == :web, replayer: $context == :web, swift: $context == :ios, seq_index: false, &block) @id = id @name = name - @js = js + @tracker = tracker @replayer = replayer @swift = swift @seq_index = seq_index @context = $context @attributes = [] + # opts.each { |key, value| send "#{key}=", value } instance_eval &block end diff --git a/mobs/templates/frontend~app~player~MessageDistributor~messages~RawMessageReader.ts.erb b/mobs/templates/frontend~app~player~MessageDistributor~messages~RawMessageReader.ts.erb index 337dfb803..48aaa7178 100644 --- a/mobs/templates/frontend~app~player~MessageDistributor~messages~RawMessageReader.ts.erb +++ b/mobs/templates/frontend~app~player~MessageDistributor~messages~RawMessageReader.ts.erb @@ -16,7 +16,7 @@ export default class RawMessageReader extends PrimitiveReader { if (tp === null) { return resetPointer() } switch (tp) { - <% $messages.select { |msg| msg.js || msg.replayer }.each do |msg| %> + <% $messages.select { |msg| msg.tracker || msg.replayer }.each do |msg| %> case <%= msg.id %>: { <%= msg.attributes.map { |attr| " const #{attr.name.first_lower} = this.read#{attr.type.to_s.camel_case}(); if (#{attr.name.first_lower} === null) { return resetPointer() }" }.join "\n" %> diff --git a/mobs/templates/frontend~app~player~MessageDistributor~messages~message.ts.erb b/mobs/templates/frontend~app~player~MessageDistributor~messages~message.ts.erb index e81bddd7c..a5cc39600 100644 --- a/mobs/templates/frontend~app~player~MessageDistributor~messages~message.ts.erb +++ b/mobs/templates/frontend~app~player~MessageDistributor~messages~message.ts.erb @@ -3,11 +3,11 @@ import type { Timed } from './timed' import type { RawMessage } from './raw' import type { -<%= $messages.select { |msg| msg.js || msg.replayer }.map { |msg| " Raw#{msg.name.underscore.camel_case}," }.join "\n" %> +<%= $messages.select { |msg| msg.tracker || msg.replayer }.map { |msg| " Raw#{msg.name.underscore.camel_case}," }.join "\n" %> } from './raw' export type Message = RawMessage & Timed -<% $messages.select { |msg| msg.js || msg.replayer }.each do |msg| %> +<% $messages.select { |msg| msg.tracker || msg.replayer }.each do |msg| %> export type <%= msg.name.underscore.camel_case %> = Raw<%= msg.name.underscore.camel_case %> & Timed <% end %> \ No newline at end of file diff --git a/mobs/templates/frontend~app~player~MessageDistributor~messages~raw.ts.erb b/mobs/templates/frontend~app~player~MessageDistributor~messages~raw.ts.erb index bb441f810..26171fe94 100644 --- a/mobs/templates/frontend~app~player~MessageDistributor~messages~raw.ts.erb +++ b/mobs/templates/frontend~app~player~MessageDistributor~messages~raw.ts.erb @@ -1,14 +1,14 @@ // Auto-generated, do not edit export const TP_MAP = { -<%= $messages.select { |msg| msg.js || msg.replayer }.map { |msg| " #{msg.id}: \"#{msg.name.underscore}\"," }.join "\n" %> +<%= $messages.select { |msg| msg.tracker || msg.replayer }.map { |msg| " #{msg.id}: \"#{msg.name.underscore}\"," }.join "\n" %> } -<% $messages.select { |msg| msg.js || msg.replayer }.each do |msg| %> +<% $messages.select { |msg| msg.tracker || msg.replayer }.each do |msg| %> export interface Raw<%= msg.name.underscore.camel_case %> { tp: "<%= msg.name.underscore %>", <%= msg.attributes.map { |attr| " #{attr.name.first_lower}: #{attr.type_js}," }.join "\n" %> } <% end %> -export type RawMessage = <%= $messages.select { |msg| msg.js || msg.replayer }.map { |msg| "Raw#{msg.name.underscore.camel_case}" }.join " | " %>; +export type RawMessage = <%= $messages.select { |msg| msg.tracker || msg.replayer }.map { |msg| "Raw#{msg.name.underscore.camel_case}" }.join " | " %>; diff --git a/mobs/templates/tracker~tracker~src~common~messages.ts.erb b/mobs/templates/tracker~tracker~src~common~messages.ts.erb index 51eaeb042..241c77bf9 100644 --- a/mobs/templates/tracker~tracker~src~common~messages.ts.erb +++ b/mobs/templates/tracker~tracker~src~common~messages.ts.erb @@ -1,15 +1,15 @@ // Auto-generated, do not edit export enum Type { - <%= $messages.select { |msg| msg.js }.map { |msg| "#{ msg.name } = #{ msg.id }," }.join "\n " %> + <%= $messages.select { |msg| msg.tracker }.map { |msg| "#{ msg.name } = #{ msg.id }," }.join "\n " %> } -<% $messages.select { |msg| msg.js }.each do |msg| %> +<% $messages.select { |msg| msg.tracker }.each do |msg| %> export type <%= msg.name %> = [ type: Type.<%= msg.name %>, <%= msg.attributes.map { |attr| "#{attr.name.first_lower}: #{attr.type_js}," }.join "\n " %> ] <% end %> -type Message = <%= $messages.select { |msg| msg.js }.map { |msg| "#{msg.name}" }.join " | " %> +type Message = <%= $messages.select { |msg| msg.tracker }.map { |msg| "#{msg.name}" }.join " | " %> export default Message diff --git a/mobs/templates/tracker~tracker~src~main~app~messages.ts.erb b/mobs/templates/tracker~tracker~src~main~app~messages.ts.erb index 3993362a3..e7c021227 100644 --- a/mobs/templates/tracker~tracker~src~main~app~messages.ts.erb +++ b/mobs/templates/tracker~tracker~src~main~app~messages.ts.erb @@ -3,7 +3,7 @@ import * as Messages from '../../common/messages.js' export { default } from '../../common/messages.js' -<% $messages.select { |msg| msg.js }.each do |msg| %> +<% $messages.select { |msg| msg.tracker }.each do |msg| %> export function <%= msg.name %>( <%= msg.attributes.map { |attr| "#{attr.name.first_lower}: #{attr.type_js}," }.join "\n " %> ): Messages.<%= msg.name %> { diff --git a/mobs/templates/tracker~tracker~src~webworker~MessageEncoder.ts.erb b/mobs/templates/tracker~tracker~src~webworker~MessageEncoder.ts.erb index 0d98e99ea..e71a3af3b 100644 --- a/mobs/templates/tracker~tracker~src~webworker~MessageEncoder.ts.erb +++ b/mobs/templates/tracker~tracker~src~webworker~MessageEncoder.ts.erb @@ -8,7 +8,7 @@ import PrimitiveEncoder from './PrimitiveEncoder.js' export default class MessageEncoder extends PrimitiveEncoder { encode(msg: Message): boolean { switch(msg[0]) { - <% $messages.select { |msg| msg.js }.each do |msg| %> + <% $messages.select { |msg| msg.tracker }.each do |msg| %> case Messages.Type.<%= msg.name %>: return <% if msg.attributes.size == 0 %> true <% else %> <%= msg.attributes.map.with_index { |attr, index| "this.#{attr.type}(msg[#{index+1}])" }.join " && " %> <% end %> break