for next AppEcosystem update (#18)

Author: bigcat88

.github/workflows/analysis-coverage.yml

@@ -136,8 +136,7 @@ jobs:
           echo $! > /tmp/_install.pid
           cd ..
           sleep 5s
-          php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0 \
-          --net=host --host="127.0.0.1" --expose="local"
+          php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0
           php occ app_ecosystem_v2:app:register \
           "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_id\":1,\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"port\":$APP_PORT}" \
           -e --force-scopes --system-app
@@ -263,8 +262,7 @@ jobs:
           echo $! > /tmp/_install.pid
           cd ..
           sleep 5s
-          php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0 \
-          --net=host --host="127.0.0.1" --expose="local"
+          php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0
           php occ app_ecosystem_v2:app:register \
           "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_id\":1,\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"port\":$APP_PORT}" \
           -e --force-scopes --system-app
@@ -383,8 +381,7 @@ jobs:
           echo $! > /tmp/_install.pid
           cd ..
           sleep 5s
-          php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0 \
-          --net=host --host="127.0.0.1" --expose="local"
+          php occ app_ecosystem_v2:daemon:register docker-install Docker unix-socket 0 0
           php occ app_ecosystem_v2:app:register \
           "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_id\":1,\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"port\":$APP_PORT}" \
           -e --force-scopes --system-app

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.0.23 - 2023-07-07]
+
+### Fixed
+
+- `nextcloud_url` can contain `/` at the end.
+- work of `logs` during `enable`/`disable` events.
+
 ## [0.0.22 - 2023-07-05]
 
 ### Added

Makefile

@@ -8,9 +8,9 @@ stop:
 	docker container stop to_gif
 
 register_app:
-	nextcloud_url=http://nextcloud.local/index.php app_name=nc_py_api app_version=1.0.0 \
-	app_secret=tC6vkwPhcppjMykD1r0n9NlI95uJMBYjs5blpIcA1PAdoPDmc5qoAjaBAkyocZ6E\
-	X1T8Pi+T5papEolTLxz3fJSPS8ffC4204YmggxPsbJdCkXHWNPHKWS9B+vTj2SIV \
+	NEXTCLOUD_URL=http://nextcloud.local/index.php APP_ID=nc_py_api APP_VERSION=1.0.0 \
+	APP_SECRET=tC6vkwPhcppjMykD1r0n9NlI95uJMBYjs5blpIcA1PAdoPDmc5qoAjaBAkyocZ6E\
+	X1T8Pi+T5papEolTLxz3fJSPS8ffC4204YmggxPsbJdCkXHWNPHKWS9B+vTj2SIV APP_PORT=9002 \
 	python3 tests/_install.py
 
 remove:

nc_py_api/_session.py

@@ -38,7 +38,7 @@ class BasicConfig:
 
     def __init__(self, **kwargs):
         self.full_nc_url = self._get_value("nextcloud_url", **kwargs)
-        self.endpoint = self.full_nc_url.removesuffix("/index.php")
+        self.endpoint = self.full_nc_url.removesuffix("/index.php").removesuffix("/")
         self.dav_url_suffix = self._get_value("dav_url_suffix", raise_not_found=False, **kwargs)
         if not self.dav_url_suffix:
             self.dav_url_suffix = options.DAV_URL_SUFFIX

nc_py_api/integration_fastapi.py

@@ -2,7 +2,7 @@
 Directly related stuff to FastAPI.
 """
 
-from typing import Annotated, Callable
+from typing import Annotated, Callable, Optional
 
 from fastapi import Depends, FastAPI, HTTPException, Request, status
 from fastapi.responses import JSONResponse
@@ -39,7 +39,10 @@ def enabled_handler(
         return JSONResponse(content={"error": r}, status_code=200)
 
 
-def enable_heartbeat(fast_api_app: FastAPI):
+def enable_heartbeat(fast_api_app: FastAPI, callback: Optional[Callable[[], str]] = None):
     @fast_api_app.get("/heartbeat")
     def heartbeat_handler():
-        return JSONResponse(content={"status": "ok"}, status_code=200)
+        return_status = "ok"
+        if callback is not None:
+            return_status = callback()
+        return JSONResponse(content={"status": return_status}, status_code=200)

nc_py_api/nextcloud.py

@@ -87,7 +87,7 @@ def __init__(self, **kwargs):
     def log(self, log_lvl: LogLvl, content: str):
         if self.check_capabilities("app_ecosystem_v2"):
             return
-        if int(log_lvl) < self.capabilities["app_ecosystem_v2"].get("loglevel", 4):
+        if int(log_lvl) < self.capabilities["app_ecosystem_v2"].get("loglevel", 0):
             return
         self._session.ocs(
             method="POST", path=f"{APP_V2_BASIC_URL}/log", json={"level": int(log_lvl), "message": content}

tests/_install.py

@@ -3,13 +3,17 @@
 import uvicorn
 from fastapi import FastAPI
 
-from nc_py_api import NextcloudApp, set_enabled_handler, ApiScope, set_scopes
+from nc_py_api import NextcloudApp, set_enabled_handler, ApiScope, set_scopes, enable_heartbeat, LogLvl
 
 APP = FastAPI()
 
 
-def enabled_handler(enabled: bool, _nc: NextcloudApp) -> str:
-    print(f"enabled_handler: enabled={enabled}")
+def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
+    print(f"enabled_handler: enabled={enabled}", flush=True)
+    if enabled:
+        nc.log(LogLvl.WARNING, f"Hello from {nc.app_cfg.app_name} :)")
+    else:
+        nc.log(LogLvl.WARNING, f"Bye bye from {nc.app_cfg.app_name} :(")
     return ""
 
 
@@ -30,10 +34,10 @@ def initialization():
             "optional": [],
         },
     )
+    enable_heartbeat(APP)
 
 
 if __name__ == "__main__":
-    app_host = environ.get("APP_HOST", "")
     uvicorn.run(
-        "_install:APP", host=app_host if app_host else "0.0.0.0", port=int(environ["APP_PORT"]), log_level="trace"
+        "_install:APP", host=environ.get("APP_HOST", "127.0.0.1"), port=int(environ["APP_PORT"]), log_level="trace"
     )