Fix some null-check issues.

Author: rkistner

packages/powersync-sdk-common/src/client/connection/PowerSyncBackendConnector.ts

@@ -2,7 +2,7 @@ import { PowerSyncCredentials } from './PowerSyncCredentials';
 import type { AbstractPowerSyncDatabase } from '../AbstractPowerSyncDatabase';
 
 export interface PowerSyncBackendConnector {
-  /** Allows the PowerSync client to retrieve an authentication token from your backend 
+  /** Allows the PowerSync client to retrieve an authentication token from your backend
    * which is used to authenticate against the PowerSync service.
    *
    * This should always fetch a fresh set of credentials - don't use cached
@@ -13,7 +13,7 @@ export interface PowerSyncBackendConnector {
    *
    * This token is kept for the duration of a sync connection.
    */
-  fetchCredentials: () => Promise<PowerSyncCredentials>;
+  fetchCredentials: () => Promise<PowerSyncCredentials | null>;
 
   /** Upload local changes to the app backend.
    *

packages/powersync-sdk-common/src/client/sync/stream/AbstractRemote.ts

@@ -2,23 +2,23 @@ import Logger, { ILogger } from 'js-logger';
 import { PowerSyncCredentials } from '../../connection/PowerSyncCredentials';
 
 export type RemoteConnector = {
-  fetchCredentials: () => Promise<PowerSyncCredentials>;
+  fetchCredentials: () => Promise<PowerSyncCredentials | null>;
 };
 
-//Refresh at least 30 sec before it expires
+// Refresh at least 30 sec before it expires
 const REFRESH_CREDENTIALS_SAFETY_PERIOD_MS = 30_000;
 
 export const DEFAULT_REMOTE_LOGGER = Logger.get('PowerSyncRemote');
 
 export abstract class AbstractRemote {
-  protected credentials?: PowerSyncCredentials;
+  protected credentials: PowerSyncCredentials | null = null;
 
   constructor(
     protected connector: RemoteConnector,
     protected logger: ILogger = DEFAULT_REMOTE_LOGGER
   ) {}
 
-  async getCredentials(): Promise<PowerSyncCredentials> {
+  async getCredentials(): Promise<PowerSyncCredentials | null> {
     const { expiresAt } = this.credentials ?? {};
     if (expiresAt && expiresAt > new Date(new Date().valueOf() + REFRESH_CREDENTIALS_SAFETY_PERIOD_MS)) {
       return this.credentials!;
@@ -27,22 +27,22 @@ export abstract class AbstractRemote {
     return this.credentials;
   }
 
-  async getToken() {
-    const { token } = await this.getCredentials();
-    if (!token) {
+  protected async buildRequest(path: string) {
+    const credentials = await this.getCredentials();
+    if (credentials != null && (credentials.endpoint == null || credentials.endpoint == '')) {
+      throw new Error('PowerSync endpoint not configured');
+    } else if (credentials?.token == null || credentials?.token == '') {
       const error: any = new Error(`Not signed in`);
       error.status = 401;
       throw error;
     }
 
-    return token;
-  }
-
-  async getHeaders() {
-    const credentials = await this.getCredentials();
     return {
-      'content-type': 'application/json',
-      Authorization: `Token ${credentials.token}}`
+      url: credentials.endpoint + path,
+      headers: {
+        'content-type': 'application/json',
+        Authorization: `Token ${credentials.token}`
+      }
     };
   }
 

packages/powersync-sdk-react-native/src/sync/stream/ReactNativeRemote.ts

@@ -5,12 +5,12 @@ export const STREAMING_POST_TIMEOUT_MS = 30_000;
 
 export class ReactNativeRemote extends AbstractRemote {
   async post(path: string, data: any, headers: Record<string, string> = {}): Promise<any> {
-    const credentials = await this.getCredentials();
-    const res = await fetch(credentials.endpoint + path, {
+    const request = await this.buildRequest(path);
+    const res = await fetch(request.url, {
       method: 'POST',
       headers: {
         ...headers,
-        ...(await this.getHeaders())
+        ...request.headers
       },
       body: JSON.stringify(data)
     });
@@ -23,13 +23,13 @@ export class ReactNativeRemote extends AbstractRemote {
   }
 
   async get(path: string, headers?: Record<string, string>): Promise<any> {
-    const credentials = await this.getCredentials();
+    const request = await this.buildRequest(path);
 
-    const res = await fetch(credentials.endpoint + path, {
+    const res = await fetch(request.url, {
       method: 'GET',
       headers: {
         ...headers,
-        ...(await this.getHeaders())
+        ...request.headers
       }
     });
 
@@ -59,7 +59,7 @@ export class ReactNativeRemote extends AbstractRemote {
       throw new Error(errorMessage);
     }
 
-    const credentials = await this.getCredentials();
+    const request = await this.buildRequest(path);
 
     const timeout =
       Platform.OS == 'android'
@@ -72,9 +72,9 @@ export class ReactNativeRemote extends AbstractRemote {
           }, STREAMING_POST_TIMEOUT_MS)
         : null;
 
-    const res = await fetch(credentials.endpoint + path, {
+    const res = await fetch(request.url, {
       method: 'POST',
-      headers: { ...headers, ...(await this.getHeaders()) },
+      headers: { ...headers, ...request.headers },
       body: JSON.stringify(data),
       signal,
       cache: 'no-store',

packages/powersync-sdk-web/src/db/sync/WebRemote.ts

@@ -2,12 +2,13 @@ import { AbstractRemote } from '@journeyapps/powersync-sdk-common';
 
 export class WebRemote extends AbstractRemote {
   async post(path: string, data: any, headers: Record<string, string> = {}): Promise<any> {
-    const credentials = await this.getCredentials();
-    const res = await fetch(credentials.endpoint + path, {
+    const request = await this.buildRequest(path);
+
+    const res = await fetch(request.url, {
       method: 'POST',
       headers: {
         ...headers,
-        ...(await this.getHeaders())
+        ...request.headers
       },
       body: JSON.stringify(data)
     });
@@ -20,13 +21,13 @@ export class WebRemote extends AbstractRemote {
   }
 
   async get(path: string, headers?: Record<string, string>): Promise<any> {
-    const credentials = await this.getCredentials();
+    const request = await this.buildRequest(path);
 
-    const res = await fetch(credentials.endpoint + path, {
+    const res = await fetch(request.url, {
       method: 'GET',
       headers: {
         ...headers,
-        ...(await this.getHeaders())
+        ...request.headers
       }
     });
 
@@ -43,11 +44,11 @@ export class WebRemote extends AbstractRemote {
     headers: Record<string, string> = {},
     signal?: AbortSignal
   ): Promise<any> {
-    const credentials = await this.getCredentials();
+    const request = await this.buildRequest(path);
 
-    const res = await fetch(credentials.endpoint + path, {
+    const res = await fetch(request.url, {
       method: 'POST',
-      headers: { ...headers, ...(await this.getHeaders()) },
+      headers: { ...headers, ...request.headers },
       body: JSON.stringify(data),
       signal,
       cache: 'no-store'

packages/powersync-sdk-web/tsconfig.json

@@ -18,5 +18,6 @@
     "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
     "strictNullChecks": true
   },
-  "include": ["src/**/*", "tests/**/*"]
+  "include": ["src/**/*", "tests/**/*"],
+  "references": [{ "path": "../powersync-sdk-common" }]
 }