Merge upstream develop

Author: github-actions[bot]

.gitlab-ci.yml

@@ -11,15 +11,16 @@ include:
   - local: '.gitlab/ci/deploy_services.yml'
   - local: '.gitlab/ci/deploy_pages.yml'
   - local: '.gitlab/ci/scan_dependencies.yml'
+  - local: '.gitlab/ci/test_moderation.yml'
   - local: '.gitlab/ci/release.yml'
 stages:
   - setup
   - check
   - build
+  - test
   - publish
   - deploy
   - release
-  - test
 variables:
   CARGO_HOME: ${CI_PROJECT_DIR}/.cargo
   CARGO_TARGET_DIR: ${CI_PROJECT_DIR}/target

.gitlab/ci/build_js_sdks.yml

@@ -30,6 +30,13 @@ js-sdks-format-check:
     - pnpm format
   allow_failure: true
 
+js-core-tests-check:
+  extends: .js-sdks-base
+  stage: check
+  allow_failure: true
+  script:
+    - pnpm --filter js-core test:run
+
 js-sdks-build:
   extends: .js-sdks-base
   stage: build

.gitlab/ci/deploy_app.yml

@@ -15,24 +15,25 @@
   stage: deploy
   image:
     name: gcr.io/go-containerregistry/crane:debug
-    entrypoint: ['']
+    entrypoint: [""]
   script:
     - crane auth login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-    - crane tag $CI_REGISTRY_IMAGE/app:$CI_COMMIT_SHA $CI_ENVIRONMENT_NAME
+    - ENVIRONMENT_TAG="${CI_ENVIRONMENT_NAME%%/*}"
+    - crane tag $CI_REGISTRY_IMAGE/app:$CI_COMMIT_SHA $ENVIRONMENT_TAG
   needs:
     - job: app-web-image
       artifacts: false
 
 app-deploy-image-staging:
   extends: .app-deploy-image
   environment:
-    name: staging
+    name: staging/app
 
 app-deploy-image-production:
   extends: .app-deploy-image
   when: manual
   environment:
-    name: production
+    name: production/app
 
 ###############################
 # Rolling restart on Manifest #
@@ -47,7 +48,7 @@ app-deploy-image-production:
     strategy: depend
   variables:
     MANIFEST_SETUP_COMMAND: quick
-    MANIFEST_STAGGER_TIME: '10'
+    MANIFEST_STAGGER_TIME: "10"
 
 app-deploy-manifest-staging:
   extends: .app-deploy-manifest

.gitlab/ci/deploy_services.yml

@@ -5,7 +5,8 @@
     entrypoint: ['']
   script:
     - crane auth login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-    - crane tag $CI_REGISTRY_IMAGE/${SERVICE_NAME}:$CI_COMMIT_SHA $ENVIRONMENT
+    - ENVIRONMENT_TAG="${CI_ENVIRONMENT_NAME%%/*}"
+    - crane tag $CI_REGISTRY_IMAGE/${SERVICE_NAME}:$CI_COMMIT_SHA $ENVIRONMENT_TAG
 
 .service-deploy-manifest:
   stage: deploy
@@ -46,14 +47,14 @@
 
 server-deploy-image-staging:
   extends: .server-deploy-image
-  variables:
-    ENVIRONMENT: staging
+  environment:
+    name: staging/server
 
 server-deploy-image-production:
   extends: .server-deploy-image
   when: manual
-  variables:
-    ENVIRONMENT: production
+  environment:
+    name: production/server
 
 ###############################
 # Rolling restart on Manifest #
@@ -101,8 +102,8 @@ moderation-deploy-image-production:
     - .moderation-deploy-workflow
     - .service-deploy-image
   when: manual
-  variables:
-    ENVIRONMENT: production
+  environment:
+    name: production/moderation-service
   needs:
     - job: moderation-image
       artifacts: false
@@ -144,8 +145,8 @@ notifications-deploy-image-production:
     - .notifications-deploy-workflow
     - .service-deploy-image
   when: manual
-  variables:
-    ENVIRONMENT: production
+  environment:
+    name: production/notifications-service
   needs:
     - job: notifications-image
       artifacts: false

.gitlab/ci/scripts/integration-moderation.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+#
+# Runs the server stack with Docker, then runs the moderation service
+# end-to-end CSAM test using cargo.
+#
+# Env:
+#   KEEP_STACK=1   leave the Docker stack running on exit (default: tear down)
+set -euo pipefail
+
+cd "$(dirname "$0")/../../.."
+
+# A fixed project name keeps the network name (<project>_default) independent
+# of the checkout directory, for both the connect below and teardown.
+export COMPOSE_PROJECT_NAME=polycentric
+NETWORK="${COMPOSE_PROJECT_NAME}_default"
+
+# Host:port the readiness probe waits on (and, locally, the test connects to).
+SERVER_HOST=localhost
+SERVER_PORT=3000
+
+# The job's own container ID. GitLab sets the build container's hostname to a
+# short predefined name (runner-…-concurrent-N) that the daemon does not know
+# it by, so `docker network connect <hostname>` fails. Recover the real 64-hex
+# ID from the bind mounts Docker sets up for /etc/hostname, /etc/hosts, etc.
+# (sourced from /var/lib/docker/containers/<id>/…), falling back to hostname.
+self_container() {
+  local id
+  id=$(grep -oE 'containers/[0-9a-f]{64}' /proc/self/mountinfo | head -1 | cut -d/ -f2)
+  echo "${id:-$(cat /etc/hostname)}"
+}
+
+cleanup() {
+  if [[ "${CI:-}" == "true" ]]; then
+    docker network disconnect "$NETWORK" "$(self_container)" >/dev/null 2>&1 || true
+  fi
+  if [[ "${KEEP_STACK:-0}" != "1" ]]; then
+    docker compose down -v >/dev/null 2>&1 || true
+  fi
+}
+trap cleanup EXIT
+
+echo "==> Bringing up the server stack…"
+docker compose up -d --build --wait postgres rustfs kafka server
+
+if [[ "${CI:-}" == "true" ]]; then
+  echo "==> Joining the job container to the stack network ($NETWORK)…"
+  docker network connect "$NETWORK" "$(self_container)"
+  # Reach the services by their in-network names instead of localhost. Kafka
+  # is reached on its INTERNAL listener, which advertises kafka:19092 on this
+  # network (the EXTERNAL listener advertises localhost:9092, for local use).
+  SERVER_HOST=server
+  export POLYCENTRIC_TEST_SERVER="http://server:3000"
+  export POLYCENTRIC_TEST_DATABASE_URL="postgres://postgres:testing@postgres:5432"
+  export POLYCENTRIC_TEST_OS_ENDPOINT="http://rustfs:9000"
+  export POLYCENTRIC_TEST_KAFKA_BROKERS="kafka:19092"
+fi
+
+echo "==> Waiting for the server gRPC port ($SERVER_HOST:$SERVER_PORT)…"
+for _ in $(seq 1 60); do
+  if (exec 3<>"/dev/tcp/$SERVER_HOST/$SERVER_PORT") 2>/dev/null; then
+    exec 3>&- 3<&-
+    echo "    server is accepting connections"
+    break
+  fi
+  sleep 1
+done
+
+echo "==> Applying server database migrations…"
+docker compose exec -T server /app/migration up
+
+echo "==> Running the moderation CSAM pipeline test…"
+cargo test -p moderation-service --test csam_pipeline -- --ignored --nocapture

.gitlab/ci/setup_images.yml

@@ -1,5 +1,6 @@
 variables:
   RUST_IMAGE: '${CI_REGISTRY}/${CI_PROJECT_PATH}:rust'
+  RUST_DIND_IMAGE: '${CI_REGISTRY}/${CI_PROJECT_PATH}:rust-dind'
 
 .setup-images-workflow:
   stage: setup
@@ -32,3 +33,17 @@ setup-image-rust:
         --import-cache type=registry,ref=$RUST_IMAGE \
         --export-cache type=inline \
         --output type=image,name=$RUST_IMAGE,push=true
+
+setup-image-rust-dind:
+  extends: .setup-images-workflow
+  needs: ['setup-image-rust']
+  script:
+    - |
+      buildctl-daemonless.sh build \
+        --frontend dockerfile.v0 \
+        --opt build-arg:RUST_IMAGE=$RUST_IMAGE \
+        --local context=.gitlab/images/rust-dind \
+        --local dockerfile=.gitlab/images/rust-dind \
+        --import-cache type=registry,ref=$RUST_DIND_IMAGE \
+        --export-cache type=inline \
+        --output type=image,name=$RUST_DIND_IMAGE,push=true

.gitlab/ci/test_moderation.yml

@@ -0,0 +1,37 @@
+########################################################################
+# moderation — integration tests
+#
+# End-to-end CSAM pipeline test verifying that the moderation service
+# purges and reports PhotoDNA CSAM matches. Uses a mock PhotoDNA
+# endpoint which always returns a match.
+########################################################################
+
+.moderation-integration-workflow:
+  image: $RUST_DIND_IMAGE
+  stage: test
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^moderation-/
+      when: always
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - services/moderation/**/*
+        - services/server/**/*
+        - compose.yml
+        - .gitlab/ci/test_moderation.yml
+        - .gitlab/ci/scripts/integration-moderation.sh
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      changes:
+        - services/moderation/**/*
+        - services/server/**/*
+        - compose.yml
+        - .gitlab/ci/test_moderation.yml
+        - .gitlab/ci/scripts/integration-moderation.sh
+  variables:
+    RUNNER_SCRIPT_TIMEOUT: 30m
+
+moderation-integration-csam:
+  extends: .moderation-integration-workflow
+  script:
+    - .gitlab/ci/scripts/integration-moderation.sh

.gitlab/images/rust-dind/Dockerfile

@@ -0,0 +1,12 @@
+ARG RUST_IMAGE
+
+# Debian bookworm (the rust base) has no Compose v2 plugin in its repos, so
+# we copy the binaries from the official docker image, pinned by tag.
+FROM docker:28-cli AS docker
+FROM ${RUST_IMAGE}
+
+COPY --from=docker /usr/local/bin/docker /usr/local/bin/docker
+COPY --from=docker /usr/local/libexec/docker/cli-plugins/docker-compose /usr/local/libexec/docker/cli-plugins/docker-compose
+
+# Fail the build if the CLI can't find the compose plugin.
+RUN docker compose version

apps/polycentric/src/common/lib/notifications/useNotificationNavigation.ts

@@ -0,0 +1,54 @@
+import * as Linking from 'expo-linking';
+import * as Notifications from 'expo-notifications';
+import { router } from 'expo-router';
+import { useEffect } from 'react';
+
+/**
+ * Navigate in response to a tapped push notification. The notifications
+ * service attaches a deep-link URL as `data.url`
+ * (e.g. `polycentric:///{identity}/post/{keyFingerprint}/{sequence}` or
+ * `polycentric:///{identity}`); we parse its path and route to it in-app.
+ */
+function navigateFromResponse(response: Notifications.NotificationResponse) {
+  const data = response.notification.request.content.data;
+  const url = typeof data?.url === 'string' ? data.url : undefined;
+  if (!url) return;
+
+  // `polycentric:///id/post/fp/seq` -> path "id/post/fp/seq" -> route "/id/post/fp/seq".
+  const { path } = Linking.parse(url);
+  if (!path) return;
+
+  router.push(`/${path}` as never);
+}
+
+/**
+ * Wire up navigation for notification taps. Handles both a tap while the app
+ * is running/backgrounded and a tap that cold-starts the app.
+ *
+ * `ready` must be `true` only once the router is mounted (i.e. the provider
+ * has finished initializing and is rendering the navigation tree), otherwise
+ * `router.push` has no navigator to act on and the navigation is silently lost.
+ */
+export function useNotificationNavigation(ready: boolean) {
+  useEffect(() => {
+    if (!ready) return;
+
+    let cancelled = false;
+
+    // Cold start: the app was launched by tapping a notification.
+    Notifications.getLastNotificationResponseAsync().then((response) => {
+      if (response && !cancelled) navigateFromResponse(response);
+    });
+
+    // Warm: tapped while the app was already running or backgrounded.
+    const subscription =
+      Notifications.addNotificationResponseReceivedListener(
+        navigateFromResponse,
+      );
+
+    return () => {
+      cancelled = true;
+      subscription.remove();
+    };
+  }, [ready]);
+}

apps/polycentric/src/common/lib/polycentric-hooks/PolycentricProvider.tsx

@@ -19,6 +19,7 @@ import {
 import { Platform, Text, View } from 'react-native';
 import { Atoms, useTheme } from '../../theme';
 import { registerForPushNotifications } from '../notifications/registerPushToken';
+import { useNotificationNavigation } from '../notifications/useNotificationNavigation';
 import {
   createPolycentricStore,
   useStore,
@@ -138,6 +139,10 @@ export function PolycentricProvider({
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
 
+  // Route to the deep link carried by a tapped push notification, once the
+  // router is mounted (provider initialized without error).
+  useNotificationNavigation(!isLoading && !error);
+
   useEffect(() => {
     if (!isLoading) {
       onInitialized?.();
@@ -175,8 +180,6 @@ export function PolycentricProvider({
 
         if (cancelled) return;
 
-        c.servers = [DEFAULT_SERVER];
-
         const s = createPolycentricStore(c);
         await s.getState().refreshIdentities();