From ed9f346e380c81ff29ecf56f59fee0688c600237 Mon Sep 17 00:00:00 2001
From: Johnny King <31927132+jkinggg@users.noreply.github.com>
Date: Wed, 8 Jan 2025 02:10:36 -0800
Subject: [PATCH] upgrade to deno2, fixes #6739 (#6742)

* upgrade to deno2, fixes #6739

* upgrade to deno2, fixes #6739

* upgrade to deno2, fixes #6739
---
 .github/workflows/main.yml                               | 2 +-
 config/deno-import-map.json                              | 6 ++++++
 package.json                                             | 6 +++---
 src/plugins/storage-denokv/rx-storage-instance-denokv.ts | 3 ++-
 src/plugins/test-utils/config.ts                         | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 config/deno-import-map.json

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 179b2dc718f..ccd7ee72a82 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -862,7 +862,7 @@ jobs:
       - uses: denoland/setup-deno@v1
         with:
           # https://github.com/denoland/deno/releases
-          deno-version: "1.46.3"
+          deno-version: "2.0.6"
       - name: run deno tests:dexie
         run: |
           sudo npm i -g cross-env
diff --git a/config/deno-import-map.json b/config/deno-import-map.json
new file mode 100644
index 00000000000..8aee2f7a066
--- /dev/null
+++ b/config/deno-import-map.json
@@ -0,0 +1,6 @@
+{
+  "imports": {
+    "node:assert": "node:assert",
+    "assert": "node:assert"
+  }
+}
diff --git a/package.json b/package.json
index 930fef61686..9a6c8ee27cb 100644
--- a/package.json
+++ b/package.json
@@ -356,10 +356,10 @@
     "test:node:memory-random-delay": "npm run transpile && cross-env DEFAULT_STORAGE=memory-random-delay mocha --expose-gc --config ./config/.mocharc.cjs ./test_tmp/unit.test.js",
     "test:node:dexie": "npm run transpile && cross-env DEFAULT_STORAGE=dexie mocha --expose-gc --config ./config/.mocharc.cjs ./test_tmp/unit.test.js",
     "test:bun:dexie": "npm run transpile && cross-env DEFAULT_STORAGE=dexie NODE_ENV=fast bun run ./node_modules/mocha/bin/mocha test_tmp/unit.test.js --bail",
-    "test:deno:dexie": "npm run transpile && cross-env DEFAULT_STORAGE=dexie deno run --unstable --allow-env --unstable-byonm --allow-read -A npm:mocha ./test/unit.test.ts --bail",
-    "test:deno:denokv": "npm run transpile && cross-env DEFAULT_STORAGE=denokv deno run --unstable-kv --unstable-broadcast-channel --allow-env --unstable-byonm --allow-read -A npm:mocha ./test/unit.test.ts --bail --timeout 15000",
+    "test:deno:dexie": "npm run transpile && cross-env DEFAULT_STORAGE=dexie deno run --unstable --unstable-broadcast-channel --unstable-byonm --import-map=config/deno-import-map.json -A npm:mocha ./test/unit.test.ts --bail",
+    "test:deno:denokv": "npm run transpile && cross-env DEFAULT_STORAGE=denokv deno run --unstable-kv --unstable-broadcast-channel --unstable-byonm --import-map=config/deno-import-map.json -A npm:mocha ./test/unit.test.ts --bail --timeout 150000",
     "test:deno:denokv:loop": "npm run test:deno:denokv && npm run test:deno:denokv:loop",
-    "test:deno:memory": "npm run transpile && cross-env DEFAULT_STORAGE=memory deno run --unstable --allow-env --unstable-byonm --allow-read -A npm:mocha ./test/unit.test.ts --bail",
+    "test:deno:memory": "npm run transpile && cross-env DEFAULT_STORAGE=memory deno run --unstable --unstable-broadcast-channel --unstable-byonm --import-map=config/deno-import-map.json -A npm:mocha ./test/unit.test.ts --bail",
     "test:node:foundationdb": "npm run transpile && cross-env DEFAULT_STORAGE=foundationdb mocha --expose-gc --config ./config/.mocharc.cjs ./test_tmp/unit.test.js",
     "test:node:mongodb": "npm run transpile && cross-env DEFAULT_STORAGE=mongodb mocha --expose-gc --config ./config/.mocharc.cjs ./test_tmp/unit.test.js",
     "test:node:mongodb:loop": "npm run test:node:mongodb && npm run test:node:mongodb:loop",
diff --git a/src/plugins/storage-denokv/rx-storage-instance-denokv.ts b/src/plugins/storage-denokv/rx-storage-instance-denokv.ts
index 7694683a53d..302f7c58b25 100644
--- a/src/plugins/storage-denokv/rx-storage-instance-denokv.ts
+++ b/src/plugins/storage-denokv/rx-storage-instance-denokv.ts
@@ -180,7 +180,8 @@ export class RxStorageInstanceDenoKV<RxDocType> implements RxStorageInstance<
                 } catch (err: any) {
                     if (
                         err.message.includes('Error code 5:') ||
-                        err.message.includes('Error code 517:')
+                        err.message.includes('Error code 517:') ||
+                        err.message.includes('database is locked')
                     ) {
                         // retry
                     } else {
diff --git a/src/plugins/test-utils/config.ts b/src/plugins/test-utils/config.ts
index 69b3b9508fc..b7246d53fb4 100644
--- a/src/plugins/test-utils/config.ts
+++ b/src/plugins/test-utils/config.ts
@@ -17,7 +17,7 @@ export type TestConfig = {
     storage: RxTestStorage;
 };
 
-export const isDeno = typeof window !== 'undefined' && 'Deno' in window;
+export const isDeno = typeof Deno !== 'undefined' || (typeof window !== 'undefined' && 'Deno' in window);
 export const isBun = typeof process !== 'undefined' && !!process.versions.bun;
 export const isNode = !isDeno && !isBun && typeof window === 'undefined';