Add D1 template

Author: G4brym

django_cf/d1_binding/database.py

@@ -8,12 +8,6 @@
 from django.conf import settings
 from django.utils import timezone
 
-try:
-    from workers import import_from_javascript
-    from pyodide.ffi import run_sync
-except ImportError:
-    raise Exception("Code not running inside a worker, please change to django_cf.d1_api database backend")
-
 class D1Result:
     lastrowid = None
     rowcount = -1
@@ -48,6 +42,14 @@ class D1Database:
     def __init__(self, binding):
         self.binding = binding
 
+        try:
+            from workers import import_from_javascript
+            from pyodide.ffi import run_sync
+            self.import_from_javascript = import_from_javascript
+            self.run_sync = run_sync
+        except ImportError:
+            raise Exception("Code not running inside a worker, please change to django_cf.d1_api database backend")
+
     DataError = DataError
 
     OperationalError = OperationalError
@@ -122,7 +124,7 @@ def run_query(self, query, params=None):
         # print(query)
         # print(params)
 
-        cf_workers = import_from_javascript("cloudflare:workers")
+        cf_workers = self.import_from_javascript("cloudflare:workers")
         # print(dir(cf_workers.env))
         db = getattr(cf_workers.env, self.binding)
 
@@ -132,7 +134,7 @@ def run_query(self, query, params=None):
             stmt = db.prepare(proc_query);
 
         try:
-            resp = run_sync(stmt.all())
+            resp = self.run_sync(stmt.all())
         except:
             from js import Error
             Error.stackTraceLimit = 1e10

package.json

@@ -13,7 +13,9 @@
   },
   "license": "MIT",
   "scripts": {
-    "setup-test": "pip install -e .[dev] && cd templates/durable-objects && npm run dependencies && cp -r ../../django_cf src/vendor/django_cf",
+    "setup-durable-objects": "cd templates/durable-objects && npm run dependencies && cp -r ../../django_cf src/vendor/django_cf",
+    "setup-d1": "cd templates/d1 && npm run dependencies && cp -r ../../django_cf src/vendor/django_cf",
+    "setup-test": "pip install -e .[dev] && npm run setup-durable-objects && npm run setup-d1",
     "test": "pytest"
   },
   "devDependencies": {

pnpm-lock.yaml

@@ -0,0 +1,72 @@
+# Logs
+
+logs
+_.log
+npm-debug.log_
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+
+report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+
+# Runtime data
+
+pids
+_.pid
+_.seed
+\*.pid.lock
+
+# Dependency directories
+
+node_modules/
+jspm_packages/
+
+# TypeScript cache
+
+\*.tsbuildinfo
+
+# Optional npm cache directory
+
+.npm
+
+# Optional eslint cache
+
+.eslintcache
+
+# Optional stylelint cache
+
+.stylelintcache
+
+# Optional REPL history
+
+.node_repl_history
+
+# Output of 'npm pack'
+
+\*.tgz
+
+# dotenv environment variable files
+
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# public
+
+# Stores VSCode versions used for testing VSCode extensions
+
+.vscode-test
+
+# wrangler project
+
+.dev.vars
+.wrangler/
+.idea
+node_modules
+staticfiles
+src/vendor/

templates/d1/.gitignore

@@ -0,0 +1 @@
+# Django + D1 Template for Cloudflare Workers

templates/d1/README.md

@@ -0,0 +1,14 @@
+{
+  "name": "django-on-workers",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "dependencies": "pip3 install -t src/vendor -r vendor.txt && pip3 install -r requirements-dev.txt",
+    "deploy": "npm run dependencies && wrangler deploy",
+    "dev": "wrangler dev",
+    "start": "wrangler dev"
+  },
+  "devDependencies": {
+    "wrangler": "^4.22.0"
+  }
+}

templates/d1/__init__.py

@@ -0,0 +1,2 @@
+django==5.1.2
+django-cf