Skip to content

refactor: reducing the complexity of the SupabaseRealtimeClient and SupabaseClient classes #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2021
Merged

refactor: reducing the complexity of the SupabaseRealtimeClient and SupabaseClient classes #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/SupabaseClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export default class SupabaseClient {
* @param params The parameters to pass to the function call.
*/
rpc<T = any>(fn: string, params?: object) {
let rest = this._initPostgRESTClient()
const rest = this._initPostgRESTClient()
return rest.rpc<T>(fn, params)
}

Expand All @@ -97,12 +97,11 @@ export default class SupabaseClient {
removeSubscription(subscription: RealtimeSubscription) {
return new Promise(async (resolve) => {
try {
if (!subscription.isClosed()) {
await this._closeChannel(subscription)
}
let openSubscriptions = this.realtime.channels.length
await this._closeSubscription(subscription)

const openSubscriptions = this.getSubscriptions().length
if (!openSubscriptions) {
let { error } = await this.realtime.disconnect()
const { error } = await this.realtime.disconnect()
if (error) return resolve({ error })
}
return resolve({ error: null, data: { openSubscriptions } })
Expand All @@ -112,6 +111,12 @@ export default class SupabaseClient {
})
}

private async _closeSubscription(subscription: RealtimeSubscription) {
if (!subscription.isClosed()) {
await this._closeChannel(subscription)
}
}

/**
* Returns an array of all your subscriptions.
*/
Expand Down Expand Up @@ -152,8 +157,8 @@ export default class SupabaseClient {
}

private _getAuthHeaders(): { [key: string]: string } {
let headers: { [key: string]: string } = {}
let authBearer = this.auth.session()?.access_token ?? this.supabaseKey
const headers: { [key: string]: string } = {}
const authBearer = this.auth.session()?.access_token ?? this.supabaseKey
headers['apikey'] = this.supabaseKey
headers['Authorization'] = `Bearer ${authBearer}`
return headers
Expand All @@ -167,9 +172,7 @@ export default class SupabaseClient {
this.realtime.remove(subscription)
return resolve(true)
})
.receive('error', (e: Error) => {
return reject(e)
})
.receive('error', (e: Error) => reject(e))
})
}
}
17 changes: 5 additions & 12 deletions src/lib/SupabaseRealtimeClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,12 @@ export class SupabaseRealtimeClient {
old: {},
}

switch (payload.type) {
case 'INSERT':
records.new = Transformers.convertChangeData(payload.columns, payload.record)
break

case 'UPDATE':
records.new = Transformers.convertChangeData(payload.columns, payload.record)
records.old = Transformers.convertChangeData(payload.columns, payload.old_record)
break
if (payload.type === 'INSERT' || payload.type === 'UPDATE') {
records.new = Transformers.convertChangeData(payload.columns, payload.record)
}

case 'DELETE':
records.old = Transformers.convertChangeData(payload.columns, payload.old_record)
break
if (payload.type === 'UPDATE' || payload.type === 'DELETE') {
records.old = Transformers.convertChangeData(payload.columns, payload.old_record)
}

return records
Expand Down