Retry sending message with deleting invalid token from settings and adjusted en/ja locales

Author: sanak

app/views/settings/_expo_push_settings.html.erb

@@ -0,0 +1,6 @@
+<p>
+  <%= content_tag(:label, l(:label_expo_push_experience_id)) %>
+  <%= text_field_tag('settings[experience_id]',
+      @settings['experience_id'],
+      :size => 30) %>
+</p>

config/locales/en.yml

@@ -12,3 +12,5 @@ en:
           zero: Currently no devices are registered.
           one: Currently one device is registered.
           other: "Currently %{count} devices are registered."
+  field_push_notifications: Push notifications
+  label_expo_push_experience_id: Expo Experience ID

config/locales/ja.yml

@@ -0,0 +1,16 @@
+ja:
+  hooks:
+    redmine_expo_push:
+      my_account_preferences:
+        delete: 削除
+        delete_all: すべて削除
+        push_notifications:
+          enabled: 有効
+          disabled: 無効
+          enabled_no_email: 無効・メールなし
+        x_devices_registered:
+          zero: 現在、デバイスは登録されていません。
+          one: 現在、1台のデバイスが登録されています。
+          other: "現在、%{count}台のデバイスが登録されています。"
+  field_push_notifications: Push通知
+  label_expo_push_experience_id: Expo Experience ID

init.rb

@@ -14,23 +14,10 @@
   description 'Notify mobile app users through push notifications'
   version '1.0.0'
 
-  requires_redmine version_or_higher: '3.4.0'
+  requires_redmine version_or_higher: '4.0.0'
 
-  #settings default: {
-  #}, partial: 'redmine_text_blocks/settings'
-
-#   project_module :text_blocks do
-# 
-#     permission :view_text_blocks, {}, require: :member, read: true
-#     permission :manage_text_blocks, {
-#       text_blocks: %i( new edit update create destroy ),
-#       projects: %i( manage_text_blocks )
-#     }, require: :member
-#   end
-
-#  menu :admin_menu, :text_blocks,
-#    { controller: 'text_blocks', action: 'index' },
-#    caption: :label_text_block_plural, :html => {:class => 'icon'}
+  settings default: {
+    'experience_id' => "@owner/slug(projectname)",
+  }, partial: 'settings/expo_push_settings'
 
 end
-

lib/redmine_expo_push/notification.rb

@@ -36,15 +36,49 @@ def deliver
       if messages.any?
         messages.each_slice(100) {|message_list|
           begin
+            if message_list.length == 0
+              next
+            end
+            tokens = message_list.map {|message|
+              message[:to]
+            }
+            Rails.logger.info "tokens: #{tokens}"
             handler = Exponent::Push::Client.new(gzip: true).send_messages message_list
             if handler.errors.present?
-              Rails.logger.error "handler.errors:#{handler.errors}"
+              Rails.logger.error "handler.errors: #{handler.errors}"
             end
             if handler.receipt_ids.present?
-              Rails.logger.info "handler.receipt_ids:#{handler.receipt_ids}"
+              Rails.logger.info "handler.receipt_ids: #{handler.receipt_ids}"
+            end
+          rescue Exception => e
+            Rails.logger.error "error sending push notifications: #{e}"
+            if e.message.present? and e.message.start_with?("Unknown error format: ") \
+                and Setting.plugin_redmine_expo_push['experience_id'].present?
+              # https://github.com/expo/expo/issues/6771#issuecomment-780095144
+              begin
+                response = JSON.parse(e.message.sub(/^Unknown error format: /, ''))
+                error = response.fetch("errors").first
+                code = error.fetch("code")
+                if code == "PUSH_TOO_MANY_EXPERIENCE_IDS"
+                  Rails.logger.info "retrying to send messages"
+                  message = error.fetch("message")
+                  details = error.fetch("details")
+                  details.keys.each {|key|
+                    if key != Setting.plugin_redmine_expo_push['experience_id']
+                      details[key].each {|token|
+                        message_list.reject! {|message|
+                          message[:to] == token
+                        }
+                      }
+                    end
+                  }
+                  # Retry with cleaned up message_list
+                  retry
+                end
+              rescue Exception => e2
+                Rails.logger.info "retrying to send messages failed: #{e2}"
+              end
             end
-          rescue Exception
-            Rails.logger.error "error sending push notifications:\n#{$!}\n" + $!.backtrace.join("\n")
           end
         }
       end