Merge upstream develop

Author: github-actions[bot]

Cargo.lock

@@ -23,6 +23,9 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     infoPlist: {
       NSCameraUsageDescription: '$(PRODUCT_NAME) needs access to your Camera.',
     },
+    entitlements: {
+      'aps-environment': 'production',
+    },
   },
   android: {
     adaptiveIcon: {
@@ -68,6 +71,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       },
     ],
     'expo-image',
+    'expo-notifications',
   ],
   experiments: {
     typedRoutes: true,

apps/polycentric/app.config.ts

@@ -35,12 +35,14 @@
     "expo-clipboard": "~55.0.13",
     "expo-constants": "~55.0.7",
     "expo-dev-client": "~55.0.10",
+    "expo-device": "~55.0.0",
     "expo-document-picker": "~55.0.8",
     "expo-font": "~55.0.4",
     "expo-haptics": "~55.0.8",
     "expo-image": "~55.0.5",
     "expo-image-picker": "~55.0.10",
     "expo-linking": "~55.0.7",
+    "expo-notifications": "~55.0.0",
     "expo-router": "~55.0.3",
     "expo-server": "~55.0.8",
     "expo-splash-screen": "~55.0.10",

apps/polycentric/package.json

@@ -0,0 +1,34 @@
+import Constants from 'expo-constants';
+import * as Device from 'expo-device';
+import * as Notifications from 'expo-notifications';
+import { Platform } from 'react-native';
+
+export async function registerForPushNotifications(): Promise<string | null> {
+  if (Platform.OS === 'web' || !Device.isDevice) return null;
+
+  if (Platform.OS === 'android') {
+    await Notifications.setNotificationChannelAsync('default', {
+      name: 'default',
+      importance: Notifications.AndroidImportance.DEFAULT,
+    });
+  }
+
+  const existing = await Notifications.getPermissionsAsync();
+  let granted = existing.granted;
+  if (!granted) {
+    const req = await Notifications.requestPermissionsAsync();
+    granted = req.granted;
+  }
+  if (!granted) return null;
+
+  const projectId =
+    Constants.expoConfig?.extra?.eas?.projectId ??
+    Constants.easConfig?.projectId;
+  if (!projectId) {
+    console.warn('Expo projectId missing — cannot fetch push token');
+    return null;
+  }
+
+  const token = await Notifications.getExpoPushTokenAsync({ projectId });
+  return token.data;
+}

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

@@ -1,4 +1,5 @@
 import { DEFAULT_IDENTITY_NAME } from '@/src/common/constants';
+import useFollows from '@/src/features/follow/hooks/useFollows';
 import {
   PolycentricClient,
   createPolycentricClient,
@@ -16,15 +17,14 @@ import {
   useState,
   type ReactNode,
 } from 'react';
-import { ActivityIndicator, Platform, Text, View } from 'react-native';
-import useFollows from '@/src/features/follow/hooks/useFollows';
-import { pubkeyStr } from './helpers';
+import { Platform, Text, View } from 'react-native';
+import { Atoms, useTheme } from '../../theme';
+import { registerForPushNotifications } from '../notifications/registerPushToken';
 import {
   createPolycentricStore,
   useStore,
   type PolycentricStoreApi,
 } from './store';
-import { Atoms, useTheme } from '../../theme';
 
 export interface PolycentricContextValue {
   client: PolycentricClient;
@@ -126,6 +126,22 @@ export function PolycentricProvider({
     }
   }, [isLoading, onInitialized]);
 
+  useEffect(() => {
+    if (!client || !currentIdentity) return;
+    void (async () => {
+      try {
+        const token = await registerForPushNotifications();
+        if (!token) return;
+        await client.registerPushNotifications(DEFAULT_SEED_SERVERS, {
+          service: 'expo',
+          token,
+        });
+      } catch (err) {
+        console.warn('Push registration failed:', err);
+      }
+    })();
+  }, [client, currentIdentity?.identityKey]);
+
   useEffect(() => {
     let cancelled = false;
 

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

@@ -15,9 +15,13 @@
     "run:web": "pnpm -C apps/polycentric run web"
   },
   "devDependencies": {
+    "@types/react": "~19.2.10",
     "eslint": "^9.38.0",
     "prettier": "^3.8.0",
     "turbo": "^2.6.1",
     "typescript-eslint": "^8.46.2"
+  },
+  "dependencies": {
+    "expo": "^55.0.15"
   }
 }

package.json

@@ -15,7 +15,7 @@
     "dist"
   ],
   "scripts": {
-    "generate": "mkdir -p ./src/proto && protoc --ts_out=./src/proto --proto_path=../../protos --experimental_allow_proto3_optional ../../protos/polycentric.proto ../../protos/polycentric/v2/keypair.proto ../../protos/polycentric/v2/event_key.proto ../../protos/polycentric/v2/identity.proto ../../protos/polycentric/v2/content.proto ../../protos/polycentric/v2/events.proto ../../protos/polycentric/v2/feeds.proto ../../protos/polycentric/v2/server.proto ../../protos/polycentric/v2/pairing_service.proto",
+    "generate": "mkdir -p ./src/proto && protoc --ts_out=./src/proto --proto_path=../../protos --experimental_allow_proto3_optional ../../protos/polycentric.proto ../../protos/polycentric/v2/keypair.proto ../../protos/polycentric/v2/event_key.proto ../../protos/polycentric/v2/identity.proto ../../protos/polycentric/v2/content.proto ../../protos/polycentric/v2/events.proto ../../protos/polycentric/v2/feeds.proto ../../protos/polycentric/v2/server.proto ../../protos/polycentric/v2/pairing_service.proto ../../protos/polycentric/v2/notifications.proto",
     "build": "webpack",
     "dev": "webpack --watch",
     "test": "echo 'No tests'"

packages/js-core/package.json

@@ -7,6 +7,7 @@ export {
   joinPairingSession,
   listEvents,
   putEvents,
+  registerPushNotifications,
   setGrpcWebFetch,
   uploadBlob,
 } from './transport';

packages/js-core/src/grpc/index.ts

@@ -148,3 +148,12 @@ export async function joinPairingSession(
   }
   return response.session;
 }
+
+export async function registerPushNotifications(
+  serverUrl: string,
+  signedMessage: Proto.SignedMessage,
+): Promise<void> {
+  await new Proto.NotificationServiceClient(
+    grpcWebTransport(serverUrl),
+  ).registerPushNotifications(signedMessage).response;
+}

packages/js-core/src/grpc/transport.ts

@@ -198,4 +198,16 @@ export interface IPolycentricCore {
    * @returns Serialized `GetServerInfoResponse` proto bytes
    */
   get_server_info(server_url: string): Promise<Uint8Array>;
+
+  /**
+   * Register a push notification token with a server via gRPC-web.
+   *
+   * @param server_url - Base URL of the gRPC-web server
+   * @param signed_message_bytes - Serialized `SignedMessage` proto bytes
+   *   wrapping a `RegisterPushNotificationRequest`
+   */
+  register_push_notifications(
+    server_url: string,
+    signed_message_bytes: Uint8Array,
+  ): Promise<void>;
 }