feat: Logger API/Helpers

.changeset/giant-moose-crash.md

@@ -0,0 +1,5 @@
+---
+'@powersync/web': minor
+---
+
+Removed `js-logger` dependency, using the logger helper exposed by `@powersync/common`.

.changeset/lemon-shrimps-pretend.md

@@ -0,0 +1,5 @@
+---
+'@powersync/common': minor
+---
+
+Added logger helpers, which can be used instead of the `js-logger` dependency.

packages/common/rollup.config.mjs

@@ -32,9 +32,7 @@ export default (commandLineArgs) => {
     // This makes life easier
     external: [
       // This has dynamic logic - makes bundling hard
-      'cross-fetch',
-      // TODO: make the useDefaults logic better. Currently need access to this package directly
-      'js-logger'
+      'cross-fetch'
     ]
   };
 };

packages/common/src/index.ts

@@ -34,6 +34,7 @@ export * from './db/DBAdapter.js';
 export * from './utils/AbortOperation.js';
 export * from './utils/BaseObserver.js';
 export * from './utils/DataStream.js';
+export * from './utils/Logger.js';
 export * from './utils/parseQuery.js';
 
 export * from './types/types.js';

packages/common/src/utils/Logger.ts

@@ -0,0 +1,32 @@
+import Logger, { type ILogger, type ILogLevel } from 'js-logger';
+
+export { GlobalLogger, ILogger, ILoggerOpts, ILogHandler, ILogLevel } from 'js-logger';
+
+const TypedLogger: ILogger = Logger as any;
+
+export const LogLevel = {
+  TRACE: TypedLogger.TRACE,
+  DEBUG: TypedLogger.DEBUG,
+  INFO: TypedLogger.INFO,
+  TIME: TypedLogger.TIME,
+  WARN: TypedLogger.WARN,
+  ERROR: TypedLogger.ERROR,
+  OFF: TypedLogger.OFF
+};
+
+export interface CreateLoggerOptions {
+  logLevel?: ILogLevel;
+}
+
+export function createBaseLogger() {
+  return Logger;
+}
+
+export function createLogger(name: string, options: CreateLoggerOptions = {}): ILogger {
+  const logger = Logger.get(name);
+  if (options.logLevel) {
+    logger.setLevel(options.logLevel);
+  }
+
+  return logger;
+}

packages/web/package.json

@@ -68,8 +68,7 @@
     "async-mutex": "^0.4.0",
     "bson": "^6.6.0",
     "comlink": "^4.4.2",
-    "commander": "^12.1.0",
-    "js-logger": "^1.6.1"
+    "commander": "^12.1.0"
   },
   "devDependencies": {
     "@journeyapps/wa-sqlite": "^1.2.2",

packages/web/src/db/adapters/AbstractWebSQLOpenFactory.ts

@@ -1,5 +1,4 @@
-import { DBAdapter, SQLOpenFactory } from '@powersync/common';
-import Logger, { ILogger } from 'js-logger';
+import { type ILogger, createLogger, DBAdapter, SQLOpenFactory } from '@powersync/common';
 import { SSRDBAdapter } from './SSRDBAdapter';
 import { ResolvedWebSQLFlags, WebSQLOpenFactoryOptions, isServerSide, resolveWebSQLFlags } from './web-sql-flags';
 
@@ -9,7 +8,7 @@ export abstract class AbstractWebSQLOpenFactory implements SQLOpenFactory {
 
   constructor(protected options: WebSQLOpenFactoryOptions) {
     this.resolvedFlags = resolveWebSQLFlags(options.flags);
-    this.logger = options.logger ?? Logger.get(`AbstractWebSQLOpenFactory - ${this.options.dbFilename}`);
+    this.logger = options.logger ?? createLogger(`AbstractWebSQLOpenFactory - ${this.options.dbFilename}`);
   }
 
   /**

packages/web/src/db/adapters/LockedAsyncDatabaseAdapter.ts

@@ -1,5 +1,7 @@
 import {
+  type ILogger,
   BaseObserver,
+  createLogger,
   DBAdapter,
   DBAdapterListener,
   DBGetUtils,
@@ -8,7 +10,6 @@ import {
   QueryResult,
   Transaction
 } from '@powersync/common';
-import Logger, { ILogger } from 'js-logger';
 import { getNavigatorLocks } from '../..//shared/navigator';
 import { AsyncDatabaseConnection } from './AsyncDatabaseConnection';
 import { SharedConnectionWorker, WebDBAdapter } from './WebDBAdapter';
@@ -50,7 +51,7 @@ export class LockedAsyncDatabaseAdapter
   constructor(protected options: LockedAsyncDatabaseAdapterOptions) {
     super();
     this._dbIdentifier = options.name;
-    this.logger = options.logger ?? Logger.get(`LockedAsyncDatabaseAdapter - ${this._dbIdentifier}`);
+    this.logger = options.logger ?? createLogger(`LockedAsyncDatabaseAdapter - ${this._dbIdentifier}`);
     // Set the name if provided. We can query for the name if not available yet
     this.debugMode = options.debugMode ?? false;
     if (this.debugMode) {

packages/web/src/db/adapters/web-sql-flags.ts

@@ -1,5 +1,4 @@
-import { SQLOpenOptions } from '@powersync/common';
-import { ILogger } from 'js-logger';
+import { type ILogger, SQLOpenOptions } from '@powersync/common';
 
 /**
  * Common settings used when creating SQL connections on web.

packages/web/src/db/sync/WebRemote.ts

@@ -1,12 +1,11 @@
-import { type ILogger } from 'js-logger';
-
 import {
   AbstractRemote,
   AbstractRemoteOptions,
   BSONImplementation,
   DEFAULT_REMOTE_LOGGER,
   FetchImplementation,
   FetchImplementationProvider,
+  ILogger,
   RemoteConnector
 } from '@powersync/common';
 

packages/web/src/worker/sync/BroadcastLogger.ts

@@ -1,4 +1,4 @@
-import Logger, { type ILogLevel, type ILogger } from 'js-logger';
+import { type ILogger, type ILogLevel, LogLevel } from '@powersync/common';
 import { type WrappedSyncPort } from './SharedSyncImplementation';
 
 /**
@@ -14,13 +14,13 @@ export class BroadcastLogger implements ILogger {
   OFF: ILogLevel;
 
   constructor(protected clients: WrappedSyncPort[]) {
-    this.TRACE = Logger.TRACE;
-    this.DEBUG = Logger.DEBUG;
-    this.INFO = Logger.INFO;
-    this.TIME = Logger.TIME;
-    this.WARN = Logger.WARN;
-    this.ERROR = Logger.ERROR;
-    this.OFF = Logger.OFF;
+    this.TRACE = LogLevel.TRACE;
+    this.DEBUG = LogLevel.DEBUG;
+    this.INFO = LogLevel.INFO;
+    this.TIME = LogLevel.TIME;
+    this.WARN = LogLevel.WARN;
+    this.ERROR = LogLevel.ERROR;
+    this.OFF = LogLevel.OFF;
   }
 
   trace(...x: any[]): void {
@@ -75,7 +75,7 @@ export class BroadcastLogger implements ILogger {
 
   getLevel(): ILogLevel {
     // Levels are not adjustable on this level.
-    return Logger.INFO;
+    return LogLevel.INFO;
   }
 
   enabledFor(level: ILogLevel): boolean {

packages/web/src/worker/sync/SharedSyncImplementation.ts

@@ -1,19 +1,20 @@
 import {
   type AbstractStreamingSyncImplementation,
+  type ILogger,
   type LockOptions,
   type PowerSyncConnectionOptions,
   type StreamingSyncImplementation,
   type StreamingSyncImplementationListener,
   type SyncStatusOptions,
   AbortOperation,
   BaseObserver,
+  createLogger,
   DBAdapter,
   SqliteBucketStorage,
   SyncStatus
 } from '@powersync/common';
 import { Mutex } from 'async-mutex';
 import * as Comlink from 'comlink';
-import Logger, { type ILogger } from 'js-logger';
 import { WebRemote } from '../../db/sync/WebRemote';
 import {
   WebStreamingSyncImplementation,
@@ -107,7 +108,7 @@ export class SharedSyncImplementation
     this.dbAdapter = null;
     this.syncParams = null;
     this.syncStreamClient = null;
-    this.logger = Logger.get('shared-sync');
+    this.logger = createLogger('shared-sync');
     this.lastConnectOptions = undefined;
 
     this.isInitialized = new Promise((resolve) => {

packages/web/src/worker/sync/SharedSyncImplementation.worker.ts

@@ -4,10 +4,12 @@ import {
   SharedSyncClientEvent,
   type ManualSharedSyncPayload
 } from './SharedSyncImplementation';
-import Logger from 'js-logger';
+import { createBaseLogger } from '@powersync/common';
 
 const _self: SharedWorkerGlobalScope = self as any;
-Logger.useDefaults();
+const logger = createBaseLogger();
+logger.useDefaults();
+
 const sharedSyncImplementation = new SharedSyncImplementation();
 
 _self.onconnect = function (event: MessageEvent<string>) {

packages/web/tests/multiple_instances.test.ts

@@ -1,11 +1,17 @@
-import { AbstractPowerSyncDatabase, SqliteBucketStorage, SyncStatus } from '@powersync/common';
+import {
+  AbstractPowerSyncDatabase,
+  createBaseLogger,
+  createLogger,
+  SqliteBucketStorage,
+  SyncStatus
+} from '@powersync/common';
 import {
   SharedWebStreamingSyncImplementation,
   SharedWebStreamingSyncImplementationOptions,
   WebRemote
 } from '@powersync/web';
 import { Mutex } from 'async-mutex';
-import Logger from 'js-logger';
+
 import { beforeAll, describe, expect, it, vi } from 'vitest';
 import { WebDBAdapter } from '../src/db/adapters/WebDBAdapter';
 import { TestConnector } from './utils/MockStreamOpenFactory';
@@ -20,7 +26,7 @@ describe('Multiple Instances', { sequential: true }, () => {
       schema: testSchema
     });
 
-  beforeAll(() => Logger.useDefaults());
+  beforeAll(() => createBaseLogger().useDefaults());
 
   function createAsset(powersync: AbstractPowerSyncDatabase) {
     return powersync.execute('INSERT INTO assets(id, description) VALUES(uuid(), ?)', ['test']);
@@ -39,7 +45,7 @@ describe('Multiple Instances', { sequential: true }, () => {
   });
 
   it('should broadcast logs from shared sync worker', { timeout: 20000 }, async () => {
-    const logger = Logger.get('test-logger');
+    const logger = createLogger('test-logger');
     const spiedErrorLogger = vi.spyOn(logger, 'error');
     const spiedDebugLogger = vi.spyOn(logger, 'debug');
 

packages/web/tests/uploads.test.ts

@@ -1,5 +1,4 @@
-import { WebPowerSyncDatabaseOptions } from '@powersync/web';
-import Logger from 'js-logger';
+import { createBaseLogger, createLogger, WebPowerSyncDatabaseOptions } from '@powersync/web';
 import p from 'p-defer';
 import { v4 } from 'uuid';
 import { beforeAll, describe, expect, it, vi } from 'vitest';
@@ -40,10 +39,10 @@ describe(
 
 function describeCrudUploadTests(getDatabaseOptions: () => WebPowerSyncDatabaseOptions) {
   return () => {
-    beforeAll(() => Logger.useDefaults());
+    beforeAll(() => createBaseLogger().useDefaults());
 
     it('should warn for missing upload operations in uploadData', async () => {
-      const logger = Logger.get('crud-logger');
+      const logger = createLogger('crud-logger');
 
       const options = getDatabaseOptions();
 
@@ -83,7 +82,7 @@ function describeCrudUploadTests(getDatabaseOptions: () => WebPowerSyncDatabaseO
     });
 
     it('should immediately upload sequential transactions', async () => {
-      const logger = Logger.get('crud-logger');
+      const logger = createLogger('crud-logger');
 
       const options = getDatabaseOptions();
 

packages/web/webpack.config.js

@@ -49,7 +49,6 @@ module.exports = () => {
       '@powersync/common': '@powersync/common',
       'async-mutex': 'async-mutex',
       comlink: 'comlink',
-      'js-logger': 'js-logger',
       lodash: 'lodash'
     },
     devtool: production ? 'source-map' : 'cheap-module-source-map',