fix(core): only add wal mode if not readonly db

ulixee · May 24, 2023 · f74ecc4 · f74ecc4
1 parent d9e41f5
commit f74ecc4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/client/lib/DetachedElements.ts b/client/lib/DetachedElements.ts
@@ -36,7 +36,7 @@ export default class DetachedElements {
   }
 
   getRawDetailsByElement(element: Element): IDetachedElement {
-    return this.#rawDetailsByElement.get(element)  ;
+    return this.#rawDetailsByElement.get(element);
   }
 
   async get(name: string): Promise<Element> {
@@ -49,7 +49,6 @@ export default class DetachedElements {
 
   async getAll(name: string): Promise<Element[]> {
     const detachedElements = await this.getRawDetails(name);
-    if (detachedElements.length === 0) return null;
     return detachedElements.map(x => {
       const element = DetachedElement.load(x.outerHTML);
       this.#rawDetailsByElement.set(element, detachedElements[0]);

diff --git a/core/dbs/SessionDb.ts b/core/dbs/SessionDb.ts
@@ -1,37 +1,37 @@
-import * as Database from 'better-sqlite3';
-import { Database as SqliteDatabase, Transaction } from 'better-sqlite3';
 import Log from '@ulixee/commons/lib/Logger';
 import SqliteTable from '@ulixee/commons/lib/SqliteTable';
+import * as Database from 'better-sqlite3';
+import { Database as SqliteDatabase, Transaction } from 'better-sqlite3';
 import * as Fs from 'fs';
 import * as Path from 'path';
-import ResourcesTable from '../models/ResourcesTable';
-import DomChangesTable from '../models/DomChangesTable';
+import env from '../env';
+import Core from '../index';
+import AwaitedEventsTable from '../models/AwaitedEventsTable';
 import CommandsTable from '../models/CommandsTable';
-import WebsocketMessagesTable from '../models/WebsocketMessagesTable';
+import DetachedElementsTable from '../models/DetachedElementsTable';
+import DetachedResourcesTable from '../models/DetachedResourcesTable';
+import DevtoolsMessagesTable from '../models/DevtoolsMessagesTable';
+import DomChangesTable from '../models/DomChangesTable';
+import FlowCommandsTable from '../models/FlowCommandsTable';
+import FlowHandlersTable from '../models/FlowHandlersTable';
+import FocusEventsTable from '../models/FocusEventsTable';
 import FrameNavigationsTable from '../models/FrameNavigationsTable';
 import FramesTable from '../models/FramesTable';
-import PageLogsTable from '../models/PageLogsTable';
-import SessionTable from '../models/SessionTable';
+import InteractionStepsTable from '../models/InteractionStepsTable';
 import MouseEventsTable from '../models/MouseEventsTable';
-import FocusEventsTable from '../models/FocusEventsTable';
+import OutputTable from '../models/OutputTable';
+import PageLogsTable from '../models/PageLogsTable';
+import ResourceStatesTable from '../models/ResourceStatesTable';
+import ResourcesTable from '../models/ResourcesTable';
+import ScreenshotsTable from '../models/ScreenshotsTable';
 import ScrollEventsTable from '../models/ScrollEventsTable';
 import SessionLogsTable from '../models/SessionLogsTable';
-import ScreenshotsTable from '../models/ScreenshotsTable';
-import DevtoolsMessagesTable from '../models/DevtoolsMessagesTable';
-import TabsTable from '../models/TabsTable';
-import ResourceStatesTable from '../models/ResourceStatesTable';
+import SessionTable from '../models/SessionTable';
+import SnippetsTable from '../models/SnippetsTable';
 import SocketsTable from '../models/SocketsTable';
-import Core from '../index';
 import StorageChangesTable from '../models/StorageChangesTable';
-import AwaitedEventsTable from '../models/AwaitedEventsTable';
-import DetachedElementsTable from '../models/DetachedElementsTable';
-import SnippetsTable from '../models/SnippetsTable';
-import DetachedResourcesTable from '../models/DetachedResourcesTable';
-import OutputTable from '../models/OutputTable';
-import FlowHandlersTable from '../models/FlowHandlersTable';
-import FlowCommandsTable from '../models/FlowCommandsTable';
-import InteractionStepsTable from '../models/InteractionStepsTable';
-import env from '../env';
+import TabsTable from '../models/TabsTable';
+import WebsocketMessagesTable from '../models/WebsocketMessagesTable';
 
 const { log } = Log(module);
 
@@ -96,7 +96,7 @@ export default class SessionDb {
     if (!customPath) SessionDb.createDefaultDir();
     this.path = customPath ?? Path.join(SessionDb.defaultDatabaseDir, `${sessionId}.db`);
     this.db = new Database(this.path, { readonly, fileMustExist });
-    if (env.enableSqliteWal) {
+    if (env.enableSqliteWal && !dbOptions.readonly) {
       this.db.unsafeMode(false);
       this.db.pragma('journal_mode = WAL');
     }