From ea867e8efe55e1a5925d8b474efa58e1a5a91e20 Mon Sep 17 00:00:00 2001
From: nuzulul <nuzulz@gmail.com>
Date: Fri, 2 Feb 2024 21:44:02 +0700
Subject: [PATCH] fix : fix bug deno runtime, merge & reduce unused script

---
 README.md                                     |  22 ++--
 package.json                                  |   7 +-
 src/bun-kv-storage.ts                         | 121 ------------------
 ...eno-kv-storage.ts => kv-storage-module.ts} |   6 +-
 src/kv-storage.ts                             | 114 +++++++++--------
 src/node-kv-storage.ts                        | 121 ------------------
 test/test-cf/server-cf.ts                     |   2 +-
 wrangler.toml                                 |   7 -
 8 files changed, 83 insertions(+), 317 deletions(-)
 delete mode 100644 src/bun-kv-storage.ts
 rename src/{deno-kv-storage.ts => kv-storage-module.ts} (96%)
 delete mode 100644 src/node-kv-storage.ts

diff --git a/README.md b/README.md
index 89af9c5..2534541 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ npm install kv-storage
 ```
 CDN (browser)
 ```javascript
-<script src="https://cdn.jsdelivr.net/npm/kv-storage@0.0.5/dist/umd/kv-storage.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/kv-storage@0.0.6/dist/umd/kv-storage.js"></script>
 ```
 
 ## Initialization
@@ -38,15 +38,17 @@ import {KVStorage} from 'kv-storage'
 //Deno import style
 import {KVStorage} from 'npm:kv-storage'
 
+//Node, Browser, Deno & Bun Initialization
 const db = await KVStorage({
 	runtime:'node', //node | browser | deno | bun
 	storageName:'storage'
 })
 
+//Cloudflare Initialization
 const db = await KVStorage({
 	runtime:'cloudflare',
-	storageName:'storage',
-	databaseBindings:env.D1 //Cloudflare D1 database bindings env
+	storageName:'storage', //Cloudflare D1 database name
+	databaseBinding:env.D1 //Cloudflare D1 database binding env
 })
 ```
 CDN
@@ -97,7 +99,7 @@ void async function main() {
 }()
 ```
 ```javascript
-<script src="https://cdn.jsdelivr.net/npm/kv-storage@0.0.5/dist/umd/kv-storage.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/kv-storage@0.0.6/dist/umd/kv-storage.js"></script>
 <script>
 //Browser using CDN example
 
@@ -119,7 +121,7 @@ void async function main() {
 ```javascript
 <script type="module">
 //Browser ES Modules example
-import {KVStorage} from 'https://cdn.jsdelivr.net/npm/kv-storage@0.0.5/dist/mjs/kv-storage.js'
+import {KVStorage} from 'https://cdn.jsdelivr.net/npm/kv-storage@0.0.6/dist/mjs/kv-storage.js'
 
 void async function main() {
 	const db = await KVStorage({
@@ -162,8 +164,8 @@ export default {
 
 		const db = await KVStorage({
 			runtime:'cloudflare',
-			storageName:'storage',
-			databaseBindings:env.D1
+			storageName:'storage', //Cloudflare D1 database name
+			databaseBinding:env.D1 //Cloudflare D1 database binding env
 		})
 		
 		let data = []		
@@ -189,20 +191,20 @@ export default {
 await init({
 	runtime?:string,
 	storageName?:string,
-	databaseBindings?:any //Cloudflare only
+	databaseBinding?:any
 })
 ```
 ```
 runtime =  Javascript runtime 
 storageName = Alphanumeric storage name
-databaseBindings = Cloudflare D1 database bindings env
+databaseBinding = Cloudflare only D1 database binding env
 ```
 Supported runtime :
 - [x] `node`
 - [x] `deno` need `--allow-read --allow-write`
 - [x] `browser` use IndexedDB
 - [x] `bun`
-- [x] `cloudflare` workers use D1 Database [docs](https://developers.cloudflare.com/d1/get-started/#4-bind-your-worker-to-your-d1-database)
+- [x] `cloudflare` workers use D1 Database [docs](https://developers.cloudflare.com/d1/get-started/#4-bind-your-worker-to-your-d1-database) example [wrangler.toml](https://github.com/nuzulul/kv-storage/blob/main/wrangler.toml)
 
 ### Write key-value pairs
 
diff --git a/package.json b/package.json
index 6630e26..4cf9cc7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kv-storage",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Create data storage that uses a simple key-value method for Node, Browser, Deno, Bun, Cloudflare Workers",
   "main": "dist/cjs/kv-storage.js",
   "module": "dist/mjs/kv-storage.js",
@@ -12,8 +12,9 @@
   },
   "scripts": {
 		"dev-node": "nodemon -e js,ts --watch src --watch test --exec \"npm run build && npm start\"",
+		"dev-bun": "nodemon -e js,ts --watch src --watch test --exec \"bun run test/server.ts\"",
 		"dev-deno": "nodemon -e js,ts --watch src --watch test --exec \"deno run --allow-read --allow-write test/test-deno/server-deno.ts\"",
-		"dev-cf": "nodemon -e js,ts,html --watch src --watch test --exec \"npm run prepare-public && tsc -p tsconfig-browser.json && wrangler dev --env dev\"",
+		"dev-cf": "nodemon -e js,ts,html --watch src --watch test --exec \"npm run prepare-public && tsc -p tsconfig-browser.json && wrangler dev\"",
 		"dev-browser": "nodemon -e js,ts,html --watch src --watch test --exec \"npm run prepare-public && tsc -p tsconfig-browser.json && tsc -p tsconfig-umd.json && rollup -c public/config/rollup.config.js && ts-node test/server-browser.ts\"",
 		"build-win": "npm run prepare-build-win && tsc -p tsconfig-mjs.json && tsc -p tsconfig-cjs.json && tsc -p tsconfig-umd.json && rollup -c public/config/rollup.config.umd.js && echo {\"type\": \"commonjs\"}>dist\\cjs\\package.json && echo {\"type\": \"module\"}>dist\\mjs\\package.json",
 		"gh-deploydoc": "npm run typedoc && git add docs -f && git commit -m \"docs\" && npm run gh-deploy && git reset --soft HEAD~ && git restore --staged .",
@@ -27,7 +28,7 @@
 		"prepare-build-win": "if not exist .\\dist (mkdir dist) else (rmdir /S /Q .\\dist\\)",
 		"prepare-typedoc": "if not exist .\\docs (mkdir docs) else (rmdir /S /Q .\\docs\\)",
 		"prepare-public": "if not exist .\\public (mkdir public) else (rmdir /S /Q .\\public\\)",
-		"typedoc": "npm run prepare-typedoc && typedoc src/kv-storage.ts src/node-kv-storage.ts src/deno-kv-storage.ts src/bun-kv-storage.ts",
+		"typedoc": "npm run prepare-typedoc && typedoc src/kv-storage.ts src/kv-storage-module.ts",
 		"gh-deploy": "git push origin :gh-pages && git subtree push --prefix docs origin gh-pages",
 		"gh-deploy-init": "git push origin && git subtree push --prefix docs origin gh-pages",
 		
diff --git a/src/bun-kv-storage.ts b/src/bun-kv-storage.ts
deleted file mode 100644
index 21d36c3..0000000
--- a/src/bun-kv-storage.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import fs from 'fs'
-
-export class BunKVStorage{
-
-	_storageDir:string
-	
-	private constructor({
-		storageDir
-	}:{
-
-		storageDir:string
-	}){
-
-		this._storageDir = storageDir
-	}
-
-	private isAlphanumeric(str:string) {
-	  return /^[a-zA-Z0-9]+$/.test(str);
-	}
-	
-	private showError(msg:string = 'Error'){
-		throw new Error(msg)
-	}
-	
-	public static async init({
-		dataDirName = "data",
-		storageName
-	}:{
-		dataDirName?:string,
-		storageName:string
-	}): Promise<BunKVStorage>{
-	
-		function isAlphanumeric(str:string) {
-		  return /^[a-zA-Z0-9]+$/.test(str);
-		}
-		
-		function showError(msg:string = 'Error'){
-			throw new Error(msg)
-		}
-
-		async function makeDir(dir:string): Promise<boolean>{
-			return new Promise((resolve) => {
-				fs.stat(dir, (err)=>{
-					if (err) {
-						fs.mkdir(dir, { recursive: true }, (err,path) => {
-							if (err) {throw err}else{resolve(true)}
-						})
-					}else{resolve(true)}
-				})
-			})
-		}
-
-		if(!isAlphanumeric(dataDirName))showError('dataDirName must be Alphanumeric')
-		if(!isAlphanumeric(storageName))showError('storageName must be Alphanumeric')
-		let _dataDirName = "./"+dataDirName
-		let storageDir = _dataDirName+'/'+storageName
-		await makeDir(storageDir)
-		return new BunKVStorage({storageDir})
-	}
-	
-	public async put(key:string,value:string){
-		return new Promise((resolve) => {
-			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
-			const keyFilePath = this._storageDir+'/'+key
-			fs.writeFile(keyFilePath, value,(err)=>{
-				if (err) {resolve(false)}else{resolve(true)}
-			});
-		})
-	}
-	
-	public async get(key:string){
-		return new Promise((resolve) => {
-			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
-			const keyFilePath = this._storageDir+'/'+key
-
-
-				  fs.readFile(keyFilePath,(err,data)=>{
-					if (err) {resolve(false)}else{resolve(data.toString('utf8', 0, data.length))}
-				  });
-				
-		})
-	}
-
-	public async delete(key:string){
-		return new Promise((resolve) => {
-			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
-			const keyFilePath = this._storageDir+'/'+key
-			
-				  fs.unlink(keyFilePath,(err)=>{
-					if (err) {resolve(false)}else{resolve(true)}
-				  });
-				
-		})
-	}
-
-	public async has(key:string){
-		return new Promise((resolve) => {
-			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
-			const keyFilePath = this._storageDir+'/'+key
-			
-				  fs.stat(keyFilePath, (err)=>{
-					if (err) {resolve(false)}else{resolve(true)}
-				  });
-				
-		})
-	}
-	
-	public async list(){
-		return new Promise((resolve) => {
-			  fs.readdir(this._storageDir,(err,files)=>{
-				if (err) {resolve(false)}else{
-					let result = {
-						keys:files,
-						complete:true
-					}
-					resolve(result)
-				}
-			  });
-		})
-	}
-}
diff --git a/src/deno-kv-storage.ts b/src/kv-storage-module.ts
similarity index 96%
rename from src/deno-kv-storage.ts
rename to src/kv-storage-module.ts
index 7801ced..1d4bbe6 100644
--- a/src/deno-kv-storage.ts
+++ b/src/kv-storage-module.ts
@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 
-export class DenoKVStorage{
+export class KVStorageModule{
 
 	_storageDir:string
 	
@@ -28,7 +28,7 @@ export class DenoKVStorage{
 	}:{
 		dataDirName?:string,
 		storageName:string
-	}): Promise<DenoKVStorage>{
+	}): Promise<KVStorageModule>{
 	
 		function isAlphanumeric(str:string) {
 		  return /^[a-zA-Z0-9]+$/.test(str);
@@ -55,7 +55,7 @@ export class DenoKVStorage{
 		let _dataDirName = "./"+dataDirName
 		let storageDir = _dataDirName+'/'+storageName
 		await makeDir(storageDir)
-		return new DenoKVStorage({storageDir})
+		return new KVStorageModule({storageDir})
 	}
 	
 	public async put(key:string,value:string){
diff --git a/src/kv-storage.ts b/src/kv-storage.ts
index 91fef3a..b26978c 100644
--- a/src/kv-storage.ts
+++ b/src/kv-storage.ts
@@ -2,12 +2,12 @@ export async function KVStorage({
 	runtime = 'node',
 	databaseName = 'kvstorage',
 	storageName = 'storage',
-	databaseBindings
+	databaseBinding
 	}:{
 		runtime?:string,
 		storageName?:string,
 		databaseName?:string,
-		databaseBindings?:any
+		databaseBinding?:any
 	}): Promise<any> {
 
 	function isAlphanumeric(str:string) {
@@ -24,36 +24,47 @@ export async function KVStorage({
 
 	switch(runtime.toLowerCase()){
 		case 'node':
-			let nodepkg = './node-kv-storage'
-		    if(typeof caches !== "undefined" && typeof global === "undefined" && typeof window === "undefined")nodepkg = ''
-			const runnode = await import(nodepkg)
-			const dbnode = await runnode.NodeKVStorage.init({
-				dataDirName:databaseName,
-				storageName
-			})
-			return dbnode
+		    if(typeof caches === "undefined" && typeof global !== "undefined" && typeof window === "undefined"){
+				let nodepkg = './kv-storage-module'
+				const runnode = await import(nodepkg)
+				const dbnode = await runnode.KVStorageModule.init({
+					dataDirName:databaseName,
+					storageName
+				})
+				return dbnode
+			}
 			break
 		case 'deno':
-			let denopkg = './deno-kv-storage.ts'
-			const rundeno = await import(denopkg)
-			const dbdeno = await rundeno.DenoKVStorage.init({
-				dataDirName:databaseName,
-				storageName
-			})
-			return dbdeno
+			if(typeof caches !== "undefined" && typeof global === "undefined" && typeof window !== "undefined"){
+				let rundeno
+				try{
+					const url = './kv-storage-module.ts'
+					rundeno = await import(url)
+				}catch{
+					const url = './kv-storage-module.js'
+					rundeno = await import(url)
+				}
+				const dbdeno = await rundeno.KVStorageModule.init({
+					dataDirName:databaseName,
+					storageName
+				})
+				return dbdeno
+			}
 			break
 		case 'bun':
-			let bunpkg = './bun-kv-storage'
-			const runbun = await import(bunpkg)
-			const dbbun = await runbun.BunKVStorage.init({
-				dataDirName:databaseName,
-				storageName
-			})
-			return dbbun
+			if(typeof caches === "undefined" && typeof global !== "undefined" && typeof window === "undefined"){
+				let bunpkg = './kv-storage-module'
+				const runbun = await import(bunpkg)
+				const dbbun = await runbun.KVStorageModule.init({
+					dataDirName:databaseName,
+					storageName
+				})
+				return dbbun
+			}
 			break
 		case 'browser':
 			if(typeof window !== "undefined" && typeof window.document !== "undefined"){
-				const dbbrowser = BrowserKVStorage.init({
+				const dbbrowser = KVStorageBrowser.init({
 					databaseName,
 					storageName
 				})
@@ -61,12 +72,13 @@ export async function KVStorage({
 			}
 			break
 		case 'cloudflare':
-			if(typeof caches !== "undefined" && typeof global === "undefined" && typeof window === "undefined")console.log('cloudflare')
-			const dbcloudflare = await CloudflareKVStorage.init({
-				databaseBindings,
-				storageName
-			})
-			return dbcloudflare
+			if(typeof caches !== "undefined" && typeof global === "undefined" && typeof window === "undefined"){
+				const dbcloudflare = await KVStorageCloudflare.init({
+					databaseBinding,
+					storageName
+				})
+				return dbcloudflare
+			}
 			break
 		default:
 			showError('Runtime unknown')
@@ -74,20 +86,20 @@ export async function KVStorage({
 
 }
 
-class CloudflareKVStorage{
+class KVStorageCloudflare{
 
 	private _storageName:string
-	private _databaseBindings:any
+	private _databaseBinding:any
 	
 	private constructor({
-		databaseBindings,
+		databaseBinding,
 		storageName
 	}:{
-		databaseBindings:any,
+		databaseBinding:any,
 		storageName:string
 	}){
 
-		this._databaseBindings = databaseBindings
+		this._databaseBinding = databaseBinding
 		this._storageName = storageName
 	}
 
@@ -100,12 +112,12 @@ class CloudflareKVStorage{
 	}
 	
 	public static async init({
-		databaseBindings,
+		databaseBinding,
 		storageName,
 	}:{
-		databaseBindings:any,
+		databaseBinding:any,
 		storageName:string
-	}): Promise<CloudflareKVStorage>{
+	}): Promise<KVStorageCloudflare>{
 	
 		function isAlphanumeric(str:string) {
 		  return /^[a-zA-Z0-9]+$/.test(str);
@@ -117,25 +129,25 @@ class CloudflareKVStorage{
 
 		if(!isAlphanumeric(storageName))showError('storageName must be Alphanumeric')		
 		
-		const stmt = databaseBindings.prepare('CREATE TABLE IF NOT EXISTS '+storageName+' (key text NOT NULL PRIMARY KEY,value text NOT NULL)')
+		const stmt = databaseBinding.prepare('CREATE TABLE IF NOT EXISTS '+storageName+' (key text NOT NULL PRIMARY KEY,value text NOT NULL)')
 		
 		const values = await stmt.run()
 		
-		return new CloudflareKVStorage({databaseBindings,storageName})
+		return new KVStorageCloudflare({databaseBinding,storageName})
 	}	
 	
 	public async put(key:string,value:string){
 		
 			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
 			
-			const stmt = this._databaseBindings.prepare('SELECT value FROM '+this._storageName+' WHERE key = ?1').bind(key);
+			const stmt = this._databaseBinding.prepare('SELECT value FROM '+this._storageName+' WHERE key = ?1').bind(key);
 			const values = await stmt.first()
 			if(values == null){
-			  const stmt = this._databaseBindings.prepare('INSERT INTO '+this._storageName+' (key,value) VALUES (?1,?2)').bind(key,value);
+			  const stmt = this._databaseBinding.prepare('INSERT INTO '+this._storageName+' (key,value) VALUES (?1,?2)').bind(key,value);
 			  const values = await stmt.run()
 			  return values.success
 			}else{
-			  const stmt = this._databaseBindings.prepare('UPDATE '+this._storageName+' SET value = ?2 WHERE key = ?1').bind(key,value);
+			  const stmt = this._databaseBinding.prepare('UPDATE '+this._storageName+' SET value = ?2 WHERE key = ?1').bind(key,value);
 			  const values = await stmt.run()
 			  return values.success
 			}
@@ -146,7 +158,7 @@ class CloudflareKVStorage{
 		
 			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
 
-			const stmt = this._databaseBindings.prepare('SELECT value FROM '+this._storageName+' WHERE key = ?1').bind(key);
+			const stmt = this._databaseBinding.prepare('SELECT value FROM '+this._storageName+' WHERE key = ?1').bind(key);
 			const values = await stmt.first();
 			let output
 			if(values == null){
@@ -162,7 +174,7 @@ class CloudflareKVStorage{
 		
 			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
 			
-			const stmt = this._databaseBindings.prepare('DELETE FROM '+this._storageName+' WHERE key = ?1').bind(key);
+			const stmt = this._databaseBinding.prepare('DELETE FROM '+this._storageName+' WHERE key = ?1').bind(key);
 			const values = await stmt.run();
 			return values.success				
 		
@@ -172,7 +184,7 @@ class CloudflareKVStorage{
 		
 			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
 			
-			const stmt = this._databaseBindings.prepare('SELECT value FROM '+this._storageName+' WHERE key = ?1').bind(key);
+			const stmt = this._databaseBinding.prepare('SELECT value FROM '+this._storageName+' WHERE key = ?1').bind(key);
 			const values = await stmt.run();
 			let output
 			if(values.results == 0){
@@ -186,7 +198,7 @@ class CloudflareKVStorage{
 	
 	public async list(){
 		
-			const stmt = this._databaseBindings.prepare('SELECT key FROM '+this._storageName).bind();
+			const stmt = this._databaseBinding.prepare('SELECT key FROM '+this._storageName).bind();
 			const values = await stmt.all();
 			let output
 			if(values.success){
@@ -207,7 +219,7 @@ class CloudflareKVStorage{
 	}
 }
 
-class BrowserKVStorage{
+class KVStorageBrowser{
 
 	private _databaseName:string
 	private _storageName:string
@@ -246,7 +258,7 @@ class BrowserKVStorage{
 	}:{
 		databaseName?:string,
 		storageName:string
-	}): Promise<BrowserKVStorage>{
+	}): Promise<KVStorageBrowser>{
 	
 		function isAlphanumeric(str:string) {
 		  return /^[a-zA-Z0-9]+$/.test(str);
@@ -296,7 +308,7 @@ class BrowserKVStorage{
 		
 		const iDB = await createdb
 		
-		return new BrowserKVStorage({databaseName,storageName,dbVersion,iDB})
+		return new KVStorageBrowser({databaseName,storageName,dbVersion,iDB})
 	}	
 	
 	public async put(key:string,value:string){
diff --git a/src/node-kv-storage.ts b/src/node-kv-storage.ts
deleted file mode 100644
index bb29f4a..0000000
--- a/src/node-kv-storage.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import fs from 'fs'
-
-export class NodeKVStorage{
-
-	_storageDir:string
-	
-	private constructor({
-		storageDir
-	}:{
-
-		storageDir:string
-	}){
-
-		this._storageDir = storageDir
-	}
-
-	private isAlphanumeric(str:string) {
-	  return /^[a-zA-Z0-9]+$/.test(str);
-	}
-	
-	private showError(msg:string = 'Error'){
-		throw new Error(msg)
-	}
-	
-	public static async init({
-		dataDirName = "data",
-		storageName
-	}:{
-		dataDirName?:string,
-		storageName:string
-	}): Promise<NodeKVStorage>{
-	
-		function isAlphanumeric(str:string) {
-		  return /^[a-zA-Z0-9]+$/.test(str);
-		}
-		
-		function showError(msg:string = 'Error'){
-			throw new Error(msg)
-		}
-
-		async function makeDir(dir:string): Promise<boolean>{
-			return new Promise((resolve) => {
-				fs.stat(dir, (err)=>{
-					if (err) {
-						fs.mkdir(dir, { recursive: true }, (err,path) => {
-							if (err) {throw err}else{resolve(true)}
-						})
-					}else{resolve(true)}
-				})
-			})
-		}
-
-		if(!isAlphanumeric(dataDirName))showError('dataDirName must be Alphanumeric')
-		if(!isAlphanumeric(storageName))showError('storageName must be Alphanumeric')
-		let _dataDirName = "./"+dataDirName
-		let storageDir = _dataDirName+'/'+storageName
-		await makeDir(storageDir)
-		return new NodeKVStorage({storageDir})
-	}
-	
-	public async put(key:string,value:string){
-		return new Promise((resolve) => {
-			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
-			const keyFilePath = this._storageDir+'/'+key
-			fs.writeFile(keyFilePath, value,(err)=>{
-				if (err) {resolve(false)}else{resolve(true)}
-			});
-		})
-	}
-	
-	public async get(key:string){
-		return new Promise((resolve) => {
-			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
-			const keyFilePath = this._storageDir+'/'+key
-
-
-				  fs.readFile(keyFilePath,(err,data)=>{
-					if (err) {resolve(false)}else{resolve(data.toString('utf8', 0, data.length))}
-				  });
-				
-		})
-	}
-
-	public async delete(key:string){
-		return new Promise((resolve) => {
-			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
-			const keyFilePath = this._storageDir+'/'+key
-			
-				  fs.unlink(keyFilePath,(err)=>{
-					if (err) {resolve(false)}else{resolve(true)}
-				  });
-				
-		})
-	}
-
-	public async has(key:string){
-		return new Promise((resolve) => {
-			if(!this.isAlphanumeric(key))this.showError('Key must be Alphanumeric')
-			const keyFilePath = this._storageDir+'/'+key
-			
-				  fs.stat(keyFilePath, (err)=>{
-					if (err) {resolve(false)}else{resolve(true)}
-				  });
-				
-		})
-	}
-	
-	public async list(){
-		return new Promise((resolve) => {
-			  fs.readdir(this._storageDir,(err,files)=>{
-				if (err) {resolve(false)}else{
-					let result = {
-						keys:files,
-						complete:true
-					}
-					resolve(result)
-				}
-			  });
-		})
-	}
-}
diff --git a/test/test-cf/server-cf.ts b/test/test-cf/server-cf.ts
index 3400e8b..377a0d4 100644
--- a/test/test-cf/server-cf.ts
+++ b/test/test-cf/server-cf.ts
@@ -6,7 +6,7 @@ export default {
 		const db = await KVStorage({
 			runtime:'cloudflare',
 			storageName:'storage',
-			databaseBindings:env.D1
+			databaseBinding:env.D1
 		})
 		
 		let data = []
diff --git a/wrangler.toml b/wrangler.toml
index 26d88a3..6aa9a24 100644
--- a/wrangler.toml
+++ b/wrangler.toml
@@ -7,10 +7,3 @@ binding = "D1"
 database_name = "kv-storage"
 database_id = "8cf9edd1-1ac4-4075-918b-29445e49be59"
 
-[env]
-
-  [env.dev] 
-
-    d1_databases = [
-      { binding = "D1", database_name = "kv-storage", database_id = "8cf9edd1-1ac4-4075-918b-29445e49be59" }
-    ]
\ No newline at end of file