various fixes

Author: mariusandra

.github/workflows/pull-request-tests.yml

@@ -10,9 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
-          ref: ${{ github.head_ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
 
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -58,6 +59,7 @@ jobs:
           make
 
       - name: Commit updated snapshots
+        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
         uses: EndBug/add-and-commit@v9
         id: commit
         with:

backend/app/api/tests/test_apps.py

@@ -28,6 +28,7 @@ async def test_api_apps_source(async_client):
     assert response.status_code == 200, "Expected /api/apps/source to return status 200"
     assert 'app.nim' in data, "Expected 'app.nim' to be part of the returned sources"
     assert 'config.json' in data, "Expected 'config.json' to be part of the returned sources"
+    assert 'app_loader.nim' not in data, "Autogenerated files should not be returned"
     assert 'AppRoot' in data['app.nim'], "Expected 'AppRoot' text within app.nim source"
 
 

backend/app/models/apps.py

@@ -46,6 +46,8 @@ def get_one_app_sources(keyword: str) -> dict[str, str]:
         local_app_path = os.path.join(local_apps_path, keyword)
         files = os.listdir(local_app_path)
         for file in files:
+            if file == "app_loader.nim":
+                continue
             full_path = os.path.join(local_app_path, file)
             if os.path.isfile(full_path):
                 # TODO: also support folders and binary files

frameos/src/frameos/server.nim

@@ -4,6 +4,7 @@ import times
 import assets/web as webAssets
 import asyncdispatch
 import httpclient
+import httpcore
 import threadpool
 import jester
 import locks
@@ -42,6 +43,18 @@ proc h(message: string): string =
 proc s(message: string): string =
   message.replace("'", "\\'").replace("\n", "\\n")
 
+proc shouldReturnNotModified*(headers: HttpHeaders, lastUpdate: float): bool {.gcsafe.} =
+  if lastUpdate <= 0.0:
+    return false
+  let ifModifiedSince = seq[string](headers.getOrDefault("if-modified-since")).join(", ")
+  if ifModifiedSince == "":
+    return false
+  try:
+    let ifModifiedTime = parse(ifModifiedSince, "ddd, dd MMM yyyy HH:mm:ss 'GMT'", utc())
+    return int64(lastUpdate) <= ifModifiedTime.toTime().toUnix()
+  except CatchableError:
+    return false
+
 const AUTH_HEADER = "authorization"
 const AUTH_TYPE = "Bearer"
 
@@ -125,20 +138,14 @@ router myrouter:
     log(%*{"event": "http", "get": request.pathInfo})
     {.gcsafe.}: # We're reading immutable globals and png data via a lock. It's fine.
       let (sceneId, _, _, lastUpdate) = getLastPublicState()
-      let ifModifiedSince = seq[string](request.headers.getOrDefault("if-modified-since")).join(", ")
-      if ifModifiedSince != "" and lastUpdate > 0.0:
-        try:
-          let ifModifiedTime = parse(ifModifiedSince, "ddd, dd MMM yyyy HH:mm:ss 'GMT'", utc())
-          if int64(lastUpdate) <= ifModifiedTime.toTime().toUnix():
-            resp Http304, [("X-Scene-Id", $sceneId), ("Access-Control-Expose-Headers", "X-Scene-Id")], ""
-            return
-        except:
-          discard # Invalid date, proceed
+      if shouldReturnNotModified(request.headers, lastUpdate):
+        resp Http304, [("X-Scene-Id", $sceneId), ("Access-Control-Expose-Headers", "X-Scene-Id")], ""
+        return
       var headers = @[
-      ("Content-Type", "image/png"),
-      ("Content-Disposition", &"inline; filename=\"{sceneId}.png\""),
-      ("X-Scene-Id", $sceneId),
-      ("Access-Control-Expose-Headers", "X-Scene-Id")
+        ("Content-Type", "image/png"),
+        ("Content-Disposition", &"inline; filename=\"{sceneId}.png\""),
+        ("X-Scene-Id", $sceneId),
+        ("Access-Control-Expose-Headers", "X-Scene-Id")
       ]
       if lastUpdate > 0.0:
         let lastModified = format(fromUnix(int64(lastUpdate)), "ddd, dd MMM yyyy HH:mm:ss 'GMT'", utc())

frameos/src/frameos/tests/.gitignore

@@ -1,3 +1,4 @@
 test_config
 test_logger
 test_scheduler
+test_server

frameos/src/frameos/tests/test_server.nim

@@ -0,0 +1,42 @@
+import unittest
+import times
+import httpcore
+
+import ../server
+
+proc buildHeaders(values: seq[string]): HttpHeaders =
+  result = newHttpHeaders()
+  for value in values:
+    result.add("If-Modified-Since", value)
+
+suite "Server If-Modified-Since handling":
+  let referenceTime = parse("Wed, 21 Oct 2015 07:28:00 GMT", "ddd, dd MMM yyyy HH:mm:ss 'GMT'", utc())
+  let referenceUnix = referenceTime.toTime().toUnix().float
+
+  test "matches single header value":
+    let headers = buildHeaders(@["Wed, 21 Oct 2015 07:28:00 GMT"])
+    check shouldReturnNotModified(headers, referenceUnix)
+
+  test "matches split header value":
+    let headers = buildHeaders(@["Wed", "21 Oct 2015 07:28:00 GMT"])
+    check shouldReturnNotModified(headers, referenceUnix)
+
+  test "newer frame timestamp bypasses cache":
+    let headers = buildHeaders(@["Wed, 21 Oct 2015 07:28:00 GMT"])
+    check not shouldReturnNotModified(headers, referenceUnix + 60.0)
+
+  test "older frame timestamp returns cached image":
+    let headers = buildHeaders(@["Wed, 21 Oct 2015 07:28:00 GMT"])
+    check shouldReturnNotModified(headers, referenceUnix - 60.0)
+
+  test "invalid header value is ignored":
+    let headers = buildHeaders(@["not a real date"])
+    check not shouldReturnNotModified(headers, referenceUnix)
+
+  test "missing header is ignored":
+    let headers = newHttpHeaders()
+    check not shouldReturnNotModified(headers, referenceUnix)
+
+  test "non-positive last update is ignored":
+    let headers = buildHeaders(@["Wed, 21 Oct 2015 07:28:00 GMT"])
+    check not shouldReturnNotModified(headers, 0.0)

frontend/src/scenes/frame/panels/EditApp/editAppLogic.tsx

@@ -97,6 +97,10 @@ export const editAppLogic = kea<editAppLogicType>([
             const response = await apiFetch(`/api/apps/source?keyword=${encodeURIComponent(values.savedKeyword)}`)
             sources = await response.json()
           }
+          if (sources['app_loader.nim'] !== undefined) {
+            const { ['app_loader.nim']: _ignored, ...filteredSources } = sources
+            sources = filteredSources
+          }
           for (const file of files) {
             if (file in sources) {
               actions.setActiveFile(file)