Merge branch 'dev'

Author: tibetsprague

apps/backend/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [6.1.14] - 2025-08-14
+
+### Fixed
+- Push notifications get sent right away after a post is created
+- Fixed bugs that were preventing some digest emails and comment digest emails from being sent
+
 ## [6.1.13] - 2025-08-08
 
 ### Changed

apps/backend/api/models/Notification.js

@@ -967,6 +967,9 @@ module.exports = bookshelf.Model.extend({
       .fetchAll(options)
   },
 
+  // Process a bounded batch of unsent notifications and return.
+  // If there may be more to process, re-enqueue another job so we don't
+  // hold a Kue worker slot indefinitely.
   sendUnsent: function () {
     // FIXME empty out this withRelated list and just load things on demand when
     // creating push notifications / emails
@@ -992,16 +995,21 @@ module.exports = bookshelf.Model.extend({
         'activity.track'
       ]
     })
-      .then(ns => ns.length > 0 &&
-        Promise.each(ns.models,
-          n => n.send().catch(err => {
+      .then(async ns => {
+        if (!ns || ns.length === 0) return
+        await Promise.each(ns.models, n =>
+          n.send().catch(err => {
             console.error('Error sending notification', err, n.attributes)
             rollbar.error(err, null, { notification: n.attributes })
             return n.save({ failed_at: new Date() }, { patch: true })
-          }))
-          .then(() => new Promise(resolve => {
-            setTimeout(() => resolve(Notification.sendUnsent()), 1000)
-          })))
+          })
+        )
+        // If we hit the limit (200), there may be more to process.
+        if (ns.length >= 200) {
+          // Re-enqueue another pass shortly.
+          Queue.classMethod('Notification', 'sendUnsent', {}, 1000)
+        }
+      })
   },
 
   priorityReason: function (reasons) {

apps/backend/package.json

@@ -5,7 +5,7 @@
   "author": "Hylo <hello@hylo.com>",
   "license": "Apache-2.0",
   "private": true,
-  "version": "6.1.13",
+  "version": "6.1.14",
   "nyc": {
     "sourceMap": false,
     "instrument": false,

apps/backend/worker.js

@@ -59,12 +59,13 @@ const throttledLog = throttle(error => {
   if (rollbar.disabled) {
     sails.log.error(error.message)
   } else {
+    sails.log.error(error.message)
     rollbar.error(error)
   }
 }, 30000)
 
 function handleRedisError (err) {
-  if (err && err.message && err.message.includes('Redis connection')) {
+  if (err && err.message) {
     throttledLog(err)
   }
 }

apps/mobile/README.md

@@ -14,7 +14,8 @@
 10. `cd ..` (leave the ios folder)
 11. `yarn start` (must be within apps/mobile) launches `metro`, the heart of the mobile dev experience
 12. You will see the metro options for launching the different environments and the devtools, and reload
-13. You will also need to run `yarn run android` to open the correct ports for the android emulator to be able to access the backend. Once it opens the ports, you can just cancel the rest of its actions
+13. To build/install the android app run `yarn run android` in a different terminal window.
+13. To build/install the ios app run `yarn run ios` in a different terminal window. If it fails with error code 70 you need to specify the destination device or simulator you want to build for. You can select which to build for by running `yarn react-native run-ios --list-devices`
 
 ## Quick debug
 1. Most code changes will hot-reload into the devices; sometimes you need to hit 'r' in the metro terminal instance to reload (what you see afer hitting `yarn start`)
@@ -123,4 +124,4 @@ Real-time updates are handled in urql by subscriptions. These are integrated int
 ### Push Notification testing
 This requires tweaks to your local backend env; PUSH_NOTIFICATIONS_TESTING_ENABLED needs to be set to TRUE or sometimes you can get away with just adding specific hylo user ids to the HYLO_TESTER_IDS. And you'll need to add valid OneSignal ID and key to your backend env
 
-After you have done this, the quick-n-dirty way to test is to go to the OneSignal model in the backend, insert a url you want to test, and then trigger a notification on a user that you have control of, and that exists in both in your local db and the prod db. 
+After you have done this, the quick-n-dirty way to test is to go to the OneSignal model in the backend, insert a url you want to test, and then trigger a notification on a user that you have control of, and that exists in both in your local db and the prod db.

apps/mobile/package.json

@@ -12,7 +12,7 @@
     "lint": "standard",
     "bump-version": "node scripts/bump-version.js",
     "postversion": "react-native-version --never-amend",
-    "start": "adb reverse tcp:3001 tcp:3001 && adb reverse tcp:3000 tcp:3000 && rm -f node_modules/react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m node_modules/react-native-config/android/build/generated/source/buildConfig/debug/com/lugg/RNCConfig/BuildConfig.java node_modules/react-native-config/android/build/generated/source/buildConfig/release/com/lugg/RNCConfig/BuildConfig.java && react-native start",
+    "start": "rm -f node_modules/react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m node_modules/react-native-config/android/build/generated/source/buildConfig/debug/com/lugg/RNCConfig/BuildConfig.java node_modules/react-native-config/android/build/generated/source/buildConfig/release/com/lugg/RNCConfig/BuildConfig.java && react-native start",
     "test": "yarn jest",
     "test:linking": "yarn test src/navigation/linking/getStateFromPath.test.js",
     "open-link": "scripts/open-link.sh",

apps/mobile/src/screens/GroupWelcome/GroupWelcome.js

@@ -50,7 +50,7 @@ export default function GroupWelcome () {
   const [{ currentUser }] = useCurrentUser()
   const [{ currentGroup }] = useCurrentGroup()
   const currentMemberships = currentUser?.memberships
-  const currentMembership = currentMemberships.find(m => m.group.id === currentGroup?.id)
+  const currentMembership = currentMemberships?.find(m => m.group.id === currentGroup?.id)
   const routeNames = getRouteNames(currentGroup, currentMembership)
 
   const { name, avatarUrl, purpose, bannerUrl, description, agreements, joinQuestions, settings, welcomePage } = currentGroup

apps/mobile/src/screens/Thread/Thread.js

@@ -137,7 +137,7 @@ export default function Thread () {
         inverted
         keyExtractor={(item) => item.id}
         keyboardDismissMode='on-drag'
-        keyboardShouldPersistTaps
+        keyboardShouldPersistTaps='always'
         refreshing={fetching}
         onEndReached={fetchMore}
         onEndReachedThreshold={0.3}

apps/mobile/src/screens/ThreadList/ThreadList.js

@@ -4,6 +4,7 @@ import { FlashList } from '@shopify/flash-list'
 import { useFocusEffect, useNavigation } from '@react-navigation/native'
 import { useTranslation } from 'react-i18next'
 import { useMutation, useQuery } from 'urql'
+import { v4 as uuidv4 } from 'uuid'
 import updateUserSettingsMutation from '@hylo/graphql/mutations/updateUserSettingsMutation'
 import messageThreadsQuery from '@hylo/graphql/queries/messageThreadsQuery'
 import useCurrentUser from '@hylo/hooks/useCurrentUser'
@@ -12,7 +13,6 @@ import ThreadCard from 'components/ThreadCard'
 import styles from './ThreadList.styles'
 
 export default function ThreadList () {
-  const { t } = useTranslation()
   const navigation = useNavigation()
   const [{ currentUser }] = useCurrentUser()
   const [offset, setOffset] = useState(0)
@@ -60,12 +60,12 @@ export default function ThreadList () {
         data={threads}
         estimatedItemSize={93}
         estimatedListSize={Dimensions.get('screen')}
-        keyExtractor={item => item.id.toString()}
+        keyExtractor={item => item?.id?.toString() || uuidv4()}
         onEndReached={fetchMoreThreads}
         onRefresh={refreshThreads}
         refreshing={fetching}
         renderItem={({ item, index }) => (
-          <ThreadCard
+          item && <ThreadCard
             currentUser={currentUser}
             isLast={index === threads.length - 1}
             message={getLatestMessage(item)}

apps/mobile/src/urql/mobileSubscriptionExchange.js

@@ -1,6 +1,7 @@
 import { subscriptionExchange } from 'urql'
 import EventSource from 'react-native-sse'
 import { URL } from 'react-native-url-polyfill'
+import { Platform } from 'react-native'
 import { GRAPHQL_ENDPOINT_URL } from '@hylo/urql/makeUrqlClient'
 import { getSessionCookie } from 'util/session'
 
@@ -13,8 +14,11 @@ const subscriptionLoggingOn = process.env.NODE_ENV === 'development' && true //
 const exponentialBackoff = (attempt) => Math.min(BASE_RETRY_DELAY_MS * (2 ** attempt), RETRY_CAP_MS)
 
 const connectSubscription = async (url, sink) => {
+  // Extract query details for logging
+  const queryText = url.searchParams.get('query')?.substring(0, 50) + '...'
+  
   if (subscriptionLoggingOn) {
-    console.log('Connecting graphql subscription for:', url.searchParams.get('query')?.substring(0, 50) + '...')
+    console.log(`📱 [${Platform.OS.toUpperCase()}] Connecting graphql subscription for:`, queryText)
   }
 
   let retryCount = 0
@@ -30,6 +34,16 @@ const connectSubscription = async (url, sink) => {
     // Get session cookie for authentication
     const sessionCookie = await getSessionCookie()
 
+    if (!sessionCookie) {
+      console.warn(`📱 [${Platform.OS.toUpperCase()}] No session cookie found, cannot establish subscription connection`)
+      // Don't retry if there's no session - this will cause authentication issues
+      handleConnectionError({ 
+        message: 'No session cookie - authentication required',
+        isAuthError: true
+      })
+      return
+    }
+    
     const headers = {}
     if (sessionCookie) {
       headers.Cookie = sessionCookie
@@ -45,7 +59,7 @@ const connectSubscription = async (url, sink) => {
 
     eventSource.addEventListener('open', () => {
       if (subscriptionLoggingOn) {
-        console.log('Subscription connection opened for:', url.searchParams.get('query')?.substring(0, 50) + '...')
+        console.log(`📱 [${Platform.OS.toUpperCase()}] Subscription connection opened for:`, queryText)
       }
       resetRetryState()
     })
@@ -55,7 +69,7 @@ const connectSubscription = async (url, sink) => {
         const data = JSON.parse(event.data)
 
         if (subscriptionLoggingOn) {
-          console.log('📱 SSE received data:', {
+          console.log(`📱 [${Platform.OS.toUpperCase()}] SSE received data:`, {
             type: data.type || data.event || 'unknown',
             keys: Object.keys(data),
             errors: data.errors,
@@ -64,19 +78,55 @@ const connectSubscription = async (url, sink) => {
           })
 
           if (data?.data?.allUpdates?.__typename === 'Post') {
-            console.log('📱 SSE received Post update:', data.data.allUpdates.id)
+            console.log(`📱 [${Platform.OS.toUpperCase()}] SSE received Post update:`, data.data.allUpdates.id)
+          }
+          
+          // Handle Heartbeat type to keep connection alive
+          if (data?.data?.allUpdates?.__typename === 'Heartbeat') {
+            if (subscriptionLoggingOn) {
+              console.log(`📱 [${Platform.OS.toUpperCase()}] SSE received Heartbeat:`, data.data.allUpdates.timestamp)
+            }
+            // Don't forward heartbeat to sink, just keep connection alive
+            return
           }
         }
+
+        // Check for the specific "Subscription field must return Async Iterable" error
+        if (data?.errors && data.errors.some(error => 
+          error.message && error.message.includes('Subscription field must return Async Iterable')
+        )) {
+          console.error(`📱 [${Platform.OS.toUpperCase()}] Critical subscription error detected:`, data.errors)
+          
+          // Log additional details about the error
+          if (process.env.NODE_ENV === 'development') {
+            console.error(`📱 [${Platform.OS.toUpperCase()}] Error details:`, {
+              errorCount: data.errors.length,
+              firstError: data.errors[0],
+              errorMessages: data.errors.map(e => e.message),
+              errorPaths: data.errors.map(e => e.path),
+              errorLocations: data.errors.map(e => e.locations)
+            })
+          }
+          
+          // Don't forward this error to the sink as it will cause issues
+          // Instead, close the connection and let it retry
+          handleConnectionError({ 
+            message: 'Backend subscription configuration error - Async Iterable issue',
+            isBackendError: true,
+            errorDetails: data.errors
+          })
+          return
+        }
 
         sink.next(data)
       } catch (error) {
-        console.error('Error parsing SSE message:', error)
+        console.warn(`📱 [${Platform.OS.toUpperCase()}] Error parsing SSE message:`, error)
       }
     })
 
     eventSource.addEventListener('close', (event) => {
       if (subscriptionLoggingOn) {
-        console.log('Subscription connection closed.', JSON.stringify(event, null, 2))
+        console.log(`📱 [${Platform.OS.toUpperCase()}] Subscription connection closed.`, JSON.stringify(event, null, 2))
       }
       // This event doesn't automatically mean an error, but in our case,
       // a close is unexpected, so we'll trigger the reconnection logic.
@@ -86,10 +136,18 @@ const connectSubscription = async (url, sink) => {
     const handleConnectionError = (event) => {
       if (isReconnecting) return
 
-      console.error('Subscription error. Full event:', JSON.stringify(event, null, 2))
-      console.error('Subscription error message:', event?.message || 'Unknown error')
+      // console.warn(`📱 [${Platform.OS.toUpperCase()}] Subscription error. Full event:`, JSON.stringify(event, null, 2))
+      console.warn(`📱 [${Platform.OS.toUpperCase()}] Query text:`, queryText)
+      console.warn(`📱 [${Platform.OS.toUpperCase()}] Subscription error message:`, event?.message || 'Unknown error')
+
+      // For backend configuration errors, use a longer delay to avoid overwhelming the server
+      if (event?.isBackendError) {
+        console.warn(`📱 [${Platform.OS.toUpperCase()}] Backend subscription error detected, using extended retry delay`)
+        retryCount += 2 // Increment retry count more aggressively for backend errors
+      } else {
+        retryCount++
+      }
 
-      retryCount++
       isReconnecting = true
 
       if (eventSource) {
@@ -98,13 +156,13 @@ const connectSubscription = async (url, sink) => {
 
       // Stop retrying if MAX_RETRIES is set and exceeded (unless it's 0 for infinite retries)
       if (MAX_RETRIES > 0 && retryCount >= MAX_RETRIES) {
-        console.error('Max retries reached. No further attempts.')
+        console.warn(`📱 [${Platform.OS.toUpperCase()}] Max retries reached. No further attempts.`)
         return
       }
 
       const retryDelay = exponentialBackoff(retryCount)
       if (subscriptionLoggingOn) {
-        console.log(`Retrying subscription in ${retryDelay / 1000} seconds...`)
+        console.log(`📱 [${Platform.OS.toUpperCase()}] Retrying subscription for: ${queryText} in ${retryDelay / 1000} seconds...`)
       }
 
       setTimeout(() => {
@@ -122,7 +180,7 @@ const connectSubscription = async (url, sink) => {
     unsubscribe: () => {
       if (eventSource) {
         if (subscriptionLoggingOn) {
-          console.log('Unsubscribing from SSE stream')
+          console.log(`📱 [${Platform.OS.toUpperCase()}] Unsubscribing from SSE stream for:`, queryText)
         }
         eventSource.close()
       }