ultra/cryptopad
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch to CF KV instead of D1, more appropriate for the purpose

Browse Source
This commit is contained in:
Your Name
2024-07-24 01:47:20 -04:00
parent 491a1a3a4f
commit 808e848561
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
functions/dump/[dump].js
View File

@@ -1,11 +1,20 @@
export async function onRequest(context) { export async function onRequest(context) {
console.log(context);
if (context.params.dump !== context.env.DUMP_KEY) { if (context.params.dump !== context.env.DUMP_KEY) {
return new Response("Wrong key"); return new Response("Wrong key");
} }
const db = context.env.D1DB; const db = context.env.cryptopad;
const dump = await db.dump(); console.log(db)
return new Response(dump, { let accum = []
let cursor = undefined;
do {
const listResult = await db.list({cursor});
cursor = listResult.cursor;
accum = accum.concat(listResult.keys.map(x => x.name));
} while (cursor !== undefined);
const results = await Promise.all(accum.map(async x => ({key: x, value: await db.get(x)})));
return new Response(JSON.stringify(results), {
status: 200, status: 200,
headers: { headers: {
'Content-Type': 'application/octet-stream' 'Content-Type': 'application/octet-stream'

8
functions/storage/[[storage]].js
View File

@@ -1,8 +1,8 @@
export async function onRequest(context) { export async function onRequest(context) {
const db = context.env.D1DB; const db = context.env.cryptopad;
if (context.params.storage[0] == "delete") { if (context.params.storage[0] == "delete") {
const deleteReq = context.params.storage[1]; const deleteReq = context.params.storage[1];
await db.prepare("DELETE FROM data WHERE k=?").bind(deleteReq).run(); await db.delete(deleteReq);
return new Response(); return new Response();
} }
const key = context.params.storage[0]; const key = context.params.storage[0];
@@ -13,10 +13,10 @@ export async function onRequest(context) {
console.log("Inserting", key, value); console.log("Inserting", key, value);
// this doesn't use numbered parameters because miniflare behaves differently because better-sqlite3 doesn't handled numbered params well // this doesn't use numbered parameters because miniflare behaves differently because better-sqlite3 doesn't handled numbered params well
// CF really needs named support and better-sqlite3 really needs to fix this // CF really needs named support and better-sqlite3 really needs to fix this
console.log(await db.prepare("INSERT INTO data (k, v) VALUES (?,?) ON CONFLICT(k) DO UPDATE SET v=? WHERE k=?").bind(key, value, value, key).run()); await db.put(key, value);
return new Response(); return new Response();
} }
const value = await db.prepare("SELECT v FROM data WHERE k=?").bind(key).first("v"); const value = await db.get(key);
return new Response(JSON.stringify(value)); return new Response(JSON.stringify(value));
} }

2
package.json
View File

@@ -4,7 +4,7 @@
"devDependencies": { "devDependencies": {
"better-sqlite3": "^8.0.1", "better-sqlite3": "^8.0.1",
"jest": "^29.5.0", "jest": "^29.5.0",
"wrangler": "2.12.3" "wrangler": "3.66.0"
}, },
"private": true, "private": true,
"scripts": { "scripts": {

6
wrangler.toml
View File

@@ -7,4 +7,8 @@ DUMP_KEY = "dump"
[[ d1_databases ]] [[ d1_databases ]]
binding = "D1DB" binding = "D1DB"
database_name = "cryptopad" database_name = "cryptopad"
database_id = "17080b9e-80c5-4253-8e7c-451ece72ed42" database_id = "17080b9e-80c5-4253-8e7c-451ece72ed42"
[[kv_namespaces]]
binding = "cryptopad"
id = "f3899275342e429987dc34d37100b5b5"