Skip to content

fix: reflector-logs cleanup — orphan URL, sources lineCount, fetch cap #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simons-plugins wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: reflector-logs cleanup — orphan URL, sources lineCount, fetch cap #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions LogsOverReflector.indigoPlugin/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,14 @@
<plist version="1.0">
<dict>
<key>PluginVersion</key>
<string>2026.0.6</string>
<string>2026.0.7</string>
<key>ServerApiVersion</key>
<string>3.6</string>
<key>CFBundleDisplayName</key>
<string>LogsOverReflector</string>
<key>CFBundleIdentifier</key>
<string>com.simons-plugins.logs-over-reflector</string>
<key>CFBundleVersion</key>
<string>2026.0.6</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>/com.simons-plugins.logs-over-reflector/static/html/about.html</string>
</dict>
</array>
<string>2026.0.7</string>
</dict>
</plist>
33 changes: 29 additions & 4 deletions LogsOverReflector.indigoPlugin/Contents/Server Plugin/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ def log(self, action, dev=None, caller_waiting_for_result=None):
# Fetch extra entries so we can detect whether more history exists.
# Without filters: fetch offset + lines + 1 so we can see beyond the page.
# With filters: multiply by 3 since many raw entries may be filtered out.
fetch_count = (offset + line_count + 1) * (3 if has_filter else 1)
fetch_count = min(fetch_count, 10000)
RAW_FETCH_CAP = 10000
desired_fetch = (offset + line_count + 1) * (3 if has_filter else 1)
fetch_count = min(desired_fetch, RAW_FETCH_CAP)
fetch_capped = desired_fetch > RAW_FETCH_CAP

raw_entries = indigo.server.getEventLogList(
returnAsList=True,
Expand Down Expand Up @@ -126,6 +128,14 @@ def log(self, action, dev=None, caller_waiting_for_result=None):
"hasMore": has_more,
"entries": entries,
}
# When we hit the raw fetch cap there may be older matching
# entries we never saw. hasMore=false is not authoritative in
# that case — the client should switch to /history for older
# data or narrow filters.
if fetch_capped:
result["fetchCapReached"] = True
if not has_more:
result["hasMore"] = None

reply["status"] = 200
reply["content"] = json.dumps(result, indent=None)
Expand All @@ -138,15 +148,30 @@ def log(self, action, dev=None, caller_waiting_for_result=None):
return reply

def sources(self, action, dev=None, caller_waiting_for_result=None):
"""Return distinct log source names (TypeStr values) from recent log."""
"""Return distinct log source names (TypeStr values) from recent log.

Query params:
lines - number of entries to scan for source names
(default 5000, max 20000). Low-frequency sources that
have not emitted within the scanned window will not
appear — raise `lines` to find them.
"""
reply = indigo.Dict()
reply["headers"] = indigo.Dict({"Content-Type": "application/json"})

try:
props = dict(action.props)
query_args = props.get("url_query_args", {})
try:
line_count = int(query_args.get("lines", 5000))
except (TypeError, ValueError):
line_count = 5000
line_count = max(100, min(line_count, 20000))

raw_entries = indigo.server.getEventLogList(
returnAsList=True,
showTimeStamp=True,
lineCount=2000,
lineCount=line_count,
)

source_set = set()
Expand Down
Loading