Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

Add websocket listener for failed messages

Acho Arnold296108dd14c2
diff --git a/api/pkg/listeners/websocket_listener.go b/api/pkg/listeners/websocket_listener.go
index e7682969..02e9a36a 100644
--- a/api/pkg/listeners/websocket_listener.go
+++ b/api/pkg/listeners/websocket_listener.go
@@ -32,10 +32,50 @@ func NewWebsocketListener(
}
return l, map[string]events.EventListener{
- events.EventTypePhoneUpdated: l.onPhoneUpdated,
+ events.EventTypePhoneUpdated: l.onPhoneUpdated,
+ events.EventTypeMessagePhoneSent: l.onMessagePhoneSent,
+ events.EventTypeMessageSendFailed: l.onMessagePhoneFailed,
}
}
+// onMessagePhoneSent handles the events.EventTypeMessagePhoneSent event
+func (listener *WebsocketListener) onMessagePhoneSent(ctx context.Context, event cloudevents.Event) error {
+ ctx, span, _ := listener.tracer.StartWithLogger(ctx, listener.logger)
+ defer span.End()
+
+ var payload events.MessagePhoneSentPayload
+ if err := event.DataAs(&payload); err != nil {
+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)
+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ if err := listener.client.Trigger(payload.UserID.String(), event.Type(), event.ID()); err != nil {
+ msg := fmt.Sprintf("cannot trigger websocket [%s] event with ID [%s] for user with ID [%s]", event.Type(), event.ID(), payload.UserID)
+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ return nil
+}
+
+// onMessagePhoneFailed handles the events.EventTypeMessageSendFailed event
+func (listener *WebsocketListener) onMessagePhoneFailed(ctx context.Context, event cloudevents.Event) error {
+ ctx, span, _ := listener.tracer.StartWithLogger(ctx, listener.logger)
+ defer span.End()
+
+ var payload events.MessageSendFailedPayload
+ if err := event.DataAs(&payload); err != nil {
+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)
+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ if err := listener.client.Trigger(payload.UserID.String(), event.Type(), event.ID()); err != nil {
+ msg := fmt.Sprintf("cannot trigger websocket [%s] event with ID [%s] for user with ID [%s]", event.Type(), event.ID(), payload.UserID)
+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ return nil
+}
+
// onPhoneUpdated handles the events.EventTypePhoneUpdated event
func (listener *WebsocketListener) onPhoneUpdated(ctx context.Context, event cloudevents.Event) error {
ctx, span, _ := listener.tracer.StartWithLogger(ctx, listener.logger)
@@ -47,7 +87,7 @@ func (listener *WebsocketListener) onPhoneUpdated(ctx context.Context, event clo
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
}
- if err := listener.client.Trigger(payload.UserID.String(), event.Type(), event); err != nil {
+ if err := listener.client.Trigger(payload.UserID.String(), event.Type(), event.ID()); err != nil {
msg := fmt.Sprintf("cannot trigger websocket [%s] event with ID [%s] for user with ID [%s]", event.Type(), event.ID(), payload.UserID)
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
}
diff --git a/web/layouts/default.vue b/web/layouts/default.vue
index f2eea4a4..9e0483d2 100644
--- a/web/layouts/default.vue
+++ b/web/layouts/default.vue
@@ -28,14 +28,13 @@
<script lang="ts">
import { Vue, Component } from 'vue-property-decorator'
-import { mdiBullhorn } from '@mdi/js'
import Pusher from 'pusher-js'
import { setAuthHeader } from '~/plugins/axios'
@Component
export default class DefaultLayout extends Vue {
poller: number | null = null
- mdiBullhorn: string = mdiBullhorn
+ canPoll: boolean = false
get hasDrawer(): boolean {
return ['threads', 'threads-id'].includes(this.$route.name ?? '')
@@ -49,11 +48,17 @@ export default class DefaultLayout extends Vue {
const channel = pusher.subscribe(this.$store.getters.getAuthUser.id)
channel.bind('phone.updated', () => {
- this.$store.dispatch('setCanPoll', true)
+ this.canPoll = true
+ })
+ channel.bind('message.phone.sent', () => {
+ this.canPoll = true
+ })
+ channel.bind('message.send.failed', () => {
+ this.canPoll = true
})
this.startPoller()
- }, 5000) // delay so that the auth user is present
+ }, 10_000) // delay so that the auth user is present
}
beforeDestroy(): void {
@@ -64,10 +69,7 @@ export default class DefaultLayout extends Vue {
startPoller() {
this.poller = window.setInterval(async () => {
- if (
- !this.$store.getters.getCanPoll ||
- this.$store.getters.getAuthUser == null
- ) {
+ if (!this.canPoll || this.$store.getters.getAuthUser == null) {
return
}
@@ -81,11 +83,9 @@ export default class DefaultLayout extends Vue {
this.$store.dispatch('getHeartbeat'),
)
}
- promises.push(
- this.$store.dispatch('loadPhones', true),
- this.$store.dispatch('setCanPoll', false),
- )
+ promises.push(this.$store.dispatch('loadPhones', true))
+ this.canPoll = false
if (this.$store.getters.hasThread) {
promises.push(
this.$store.dispatch(
@@ -99,7 +99,7 @@ export default class DefaultLayout extends Vue {
setTimeout(() => {
this.$store.dispatch('setPolling', false)
}, 1000)
- }, 10000)
+ }, 10_000)
}
}
</script>
diff --git a/web/store/index.ts b/web/store/index.ts
index 30f83ae8..92c15c5d 100644
--- a/web/store/index.ts
+++ b/web/store/index.ts
@@ -69,7 +69,6 @@ export type State = {
threadId: string | null
heartbeat: null | Heartbeat
pooling: boolean
- canPoll: boolean
notification: Notification
}
@@ -84,7 +83,6 @@ export const state = (): State => ({
billingUsageHistory: [],
archivedThreads: false,
pooling: false,
- canPoll: true,
phones: [],
user: null,
owner: null,
@@ -196,10 +194,6 @@ export const getters = {
return state.pooling
},
- getCanPoll(state: State): boolean {
- return state.canPoll
- },
-
getIsArchived(state: State): boolean {
return state.archivedThreads
},
@@ -273,10 +267,6 @@ export const mutations = {
state.loadingThreads = payload
},
- setCanPoll(state: State, payload: boolean) {
- state.canPoll = payload
- },
-
resetState(state: State) {
state.threads = []
state.billingUsage = null
@@ -285,7 +275,6 @@ export const mutations = {
state.user = null
state.threadId = null
state.archivedThreads = false
- state.canPoll = false
state.pooling = false
state.owner = null
setApiKey('')
@@ -339,10 +328,6 @@ export const actions = {
context.commit('setArchivedThreads', !context.getters.getIsArchived)
},
- setCanPoll(context: ActionContext<State, State>, payload: boolean) {
- context.commit('setCanPoll', payload)
- },
-
async loadPhones(context: ActionContext<State, State>, force: boolean) {
if (context.getters.getPhones.length > 0 && !force) {
return