fix: misc fixes to swift script on macos, incl URL inspection #69

iloveitaly · 2022-09-27T03:09:22Z

Missing clean statement in makefile
Extract url from safari and chrome-like browsers

The new macos window watcher is working great so far! Will do some more testing over the next couple weeks.

iloveitaly · 2022-09-30T16:25:30Z

@ErikBjare @modderme123 mind taking a look at this one?

milomg · 2022-09-30T19:47:48Z

Looks good, although if you are removing the idle detection loop you might be able to remove the system idle time function as well

iloveitaly · 2022-10-01T12:47:47Z

Nice tip! Just removed in the latest commit.

@modderme123 do you recall what this comment is referring to?

TODO: set proper pulsetime

What's not right about the current pulsetime setup?

milomg · 2022-10-01T16:59:05Z

Here's how I understand pulsetime is used: https://docs.activitywatch.net/en/latest/_modules/aw_transform/heartbeats.html#heartbeat_reduce

This is very much intended for a polling system so that it doesn't ever need to diff anything, and can just send the latest value, and it will get merged if the pulsetime is long enough.

Because we intentionally don't poll, pulsetime doesn't make as much sense for us. On a new event, we just want to make sure the previous event duration is extended until the start of our new event, and the new event is created ASAP.

To extend the previous duration, we send the previous event again (except at the current time), with a pulsetime long enough that it gets merged. Then it doesn't really matter what the new event pulsetime is, because it shouldn't get merged (it necessarily has a different value, because our notifier was triggered).

I assume the original comment added by @ErikBjare was referring to wanting to switch partially over to a hyrbrid polling model like the chrome extension does (use a notifier for precise updates and then send them on a timeout, which seems like it accidentally loses resolution if you rapidly switch between apps, but will also automatically extend events even without switching between apps)...

Reason the existing logic wasn't working is the previous heartbeat is not sent with the current timestamp to the server does not merge it

iloveitaly · 2022-10-04T15:49:06Z

@modderme123 thanks for the comment, very helpful!

@ErikBjare this is ready for review and is working great for me locally. The main changes here are:

improved the logging with levels & timestamp
extract url information from safari
refactored logic and added lots more comments. I think I broke something when I refactored, which is what caused the conversation in discord.

aw_watcher_window/macos.swift

milomg · 2022-10-04T15:50:17Z

aw_watcher_window/macos.swift

@@ -342,6 +390,7 @@ class MainThing {
  }
 }

+// TODO I believe this is handled by the python wrapper so it isn't needed here


Hmm, probably just so long as they are not separate binaries. (Note that the built in one should probably use a while loop because otherwise you can accidentally silence it by opening settings)

Yeah, I don't think it's a massive deal either way just additional overhead to make sure they are hitting the right server APIs.

milomg · 2022-10-04T15:51:58Z

aw_watcher_window/macos.swift

+        let refreshedOldHeartbeat = Heartbeat(
+          // it is important to refresh the hearbeat using the timestamp where the user stopped working on the previous application
+          // TODO unsure if this is necessary: does the timestamp of the old vs new event need to be distinct
+          timestamp: heartbeat.timestamp - 1,


Why timestamp-1? (I think it would be better to make pulsetime extra long instead of making anything with inaccurate timestamps)

What I wasn't certain about here if we can send two events with the same timestamp (i.e. the old, refreshed heartbeat) and the new heartbeat. Sounds like you didn't have any issues with that?

(this was me being lazy and not testng)

Oh I understand what this is doing now. Are the units ms or s? This seems reasonable if it is ms

Pretty certain all units on the aw-server side of things are in seconds. Do we know if we can send two events with the same timestamp without causing any issues?

Do we know if we can send two events with the same timestamp without causing any issues?

It shouldn't cause issues, but I've guarded for similar situations in other places by subtracting/adding 1ms to events.

Got it, I'll drop it to a millisecond subtraction and call it a day. I think all comments are addressed—good to merge!

milomg · 2022-10-04T15:53:15Z

aw_watcher_window/macos.swift


-  // Then, send heartbeat starting new event
-  let payload_new = heartbeat
+  // if you resize a window a ton of events (subsecond) will be fired


We should probably instead just compare if the new title is the same and then skip that message (and/or decrease this to 0.1), that way we don't lose rapid tab switches

Ah, this is definitely better. We can compare app & title instead—I'll do this.

Actually, thinking about this further I am not sure the title comparison works. In my situation, resizing an iterm window changes the reported title of the window to represent the size of the terminal. I imagine there are other scenarios like this as well where the title changes during resize.

Ideas:

Add an additional check to ensure app names are the same

Drop interval requirement to 0.5s

I think the interval change makes the most sense—it's simple, and will handle most cases (who is switching tabs more than once a second?)

aw_watcher_window/macos.swift

ErikBjare · 2022-10-10T09:12:41Z

@iloveitaly Waiting for you to address @modderme123's comments :)

iloveitaly · 2022-10-20T15:41:40Z

@ErikBjare @modderme123 comments addressed!

ErikBjare · 2022-10-26T13:41:40Z

@iloveitaly Before merging this, does this resolve ActivityWatch/activitywatch#787?

iloveitaly · 2022-10-26T14:23:24Z

@ErikBjare I think so, although I wasn't running into the identical issue he experienced. My window bucket was empty, but I had no issues with accessibility permissions. I've been running this for a couple weeks at this point and my window activity is back to normal on macos.

ErikBjare · 2022-10-26T14:44:58Z

Alright, I tested it and it worked for both Chrome and Safari.

However, I decided to dig a bit deeper, and removed the Automation permissions for my terminal (Alacritty). After that, titles and URLs were blank again.

At minimum, it feels like we should at least get a window title even without Automation permissions, right?

(took the screenshot after I enabled again, at which point it started working again)

ErikBjare

Trying to get to the bottom of this browser issue.

aw_watcher_window/macos.swift

…tion-provided window title

ErikBjare · 2023-01-11T13:38:38Z

Not at my Macbook, so can't test it myself, but going to eagerly assume this is good to merge.

Thanks again for the contributions @iloveitaly! Sorry for the slow merge :)

iloveitaly added 2 commits September 26, 2022 20:00

Missing clean statement in makefile

3e6ff3b

Extract url from safari and chrome-like browsers

f3573dc

Removing system idle time

218bc25

iloveitaly added 2 commits October 4, 2022 09:41

Fixed old heartbeat and added log levels

9bb8e43

Reason the existing logic wasn't working is the previous heartbeat is not sent with the current timestamp to the server does not merge it

Additional comments

6c9b854

milomg reviewed Oct 4, 2022

View reviewed changes

aw_watcher_window/macos.swift Outdated Show resolved Hide resolved

Update aw_watcher_window/macos.swift

63e72a3

iloveitaly mentioned this pull request Oct 20, 2022

[macos] detect incognito on safari #71

Open

iloveitaly added 2 commits October 20, 2022 09:41

dont' allocate formatter each time

fc1110d

Drop timestamp interval

a94e0fa

Drop to millisecond subtraction

7dfd8ed

ErikBjare mentioned this pull request Oct 26, 2022

Window tracking not working after upgrade to v0.12.0 ActivityWatch/activitywatch#787

Open

2 tasks

ErikBjare reviewed Oct 26, 2022

View reviewed changes

aw_watcher_window/macos.swift Outdated Show resolved Hide resolved

aw_watcher_window/macos.swift Outdated Show resolved Hide resolved

Check for empty tab titles before using them in place of the notifica…

91b210b

…tion-provided window title

iloveitaly mentioned this pull request Jan 1, 2023

[Windows] aw watcher window does not track correctly #82

Closed

ErikBjare changed the title ~~Safari url extraction support on macos~~ fix: misc fixes to swift script on macos, incl URL inspection Jan 11, 2023

ErikBjare merged commit f08afe8 into ActivityWatch:master Jan 11, 2023

ErikBjare mentioned this pull request Feb 6, 2023

big periods of 'loginwindow' recorded when macbook is closed ActivityWatch/activitywatch#810

Open

2 tasks

ErikBjare mentioned this pull request Dec 23, 2023

feat: added hybrid polling method for macOS #95

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: misc fixes to swift script on macos, incl URL inspection #69

fix: misc fixes to swift script on macos, incl URL inspection #69

iloveitaly commented Sep 27, 2022 •

edited

Loading

iloveitaly commented Sep 30, 2022

milomg commented Sep 30, 2022

iloveitaly commented Oct 1, 2022

milomg commented Oct 1, 2022 •

edited

Loading

iloveitaly commented Oct 4, 2022

milomg Oct 4, 2022 •

edited

Loading

iloveitaly Oct 20, 2022

milomg Oct 4, 2022 •

edited

Loading

iloveitaly Oct 4, 2022

milomg Oct 4, 2022 •

edited

Loading

iloveitaly Oct 20, 2022

ErikBjare Oct 24, 2022

iloveitaly Oct 25, 2022

milomg Oct 4, 2022

iloveitaly Oct 4, 2022

iloveitaly Oct 20, 2022

ErikBjare commented Oct 10, 2022

iloveitaly commented Oct 20, 2022

ErikBjare commented Oct 26, 2022

iloveitaly commented Oct 26, 2022

ErikBjare commented Oct 26, 2022

ErikBjare left a comment

ErikBjare commented Jan 11, 2023

fix: misc fixes to swift script on macos, incl URL inspection #69

fix: misc fixes to swift script on macos, incl URL inspection #69

Conversation

iloveitaly commented Sep 27, 2022 • edited Loading

iloveitaly commented Sep 30, 2022

milomg commented Sep 30, 2022

iloveitaly commented Oct 1, 2022

milomg commented Oct 1, 2022 • edited Loading

iloveitaly commented Oct 4, 2022

milomg Oct 4, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

milomg Oct 4, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

milomg Oct 4, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ErikBjare commented Oct 10, 2022

iloveitaly commented Oct 20, 2022

ErikBjare commented Oct 26, 2022

iloveitaly commented Oct 26, 2022

ErikBjare commented Oct 26, 2022

ErikBjare left a comment

Choose a reason for hiding this comment

ErikBjare commented Jan 11, 2023

iloveitaly commented Sep 27, 2022 •

edited

Loading

milomg commented Oct 1, 2022 •

edited

Loading

milomg Oct 4, 2022 •

edited

Loading

milomg Oct 4, 2022 •

edited

Loading

milomg Oct 4, 2022 •

edited

Loading