Throw an error if deleting a kv store key which does not exist

Author: Jake Champion

documentation/docs/fastly:kv-store/KVStore/prototype/delete.mdx

@@ -31,6 +31,7 @@ Returns `undefined`
     - Starts with the string `".well-known/acme-challenge/"`
     - Contains any of the characters `"#?*[]\n\r"`
     - Is longer than 1024 characters
+    - Does not exist
 
 ## Examples
 

integration-tests/js-compute/fixtures/app/src/kv-store.js

@@ -1,7 +1,7 @@
 /* globals KVStoreEntry */
 import { pass, assert, assertThrows, assertRejects, assertResolves } from "./assertions.js";
 import { KVStore } from "fastly:kv-store";
-import { routes } from "./routes.js";
+import { routes, isRunningLocally } from "./routes.js";
 // KVStore
 {
     routes.set("/kv-store/exposed-as-global", async () => {
@@ -616,8 +616,11 @@ import { routes } from "./routes.js";
             return pass()
         });
         routes.set("/kv-store/delete/key-does-not-exist-returns-undefined", async () => {
+            if (isRunningLocally()) {
+                return pass()
+            }
             let store = createValidStore()
-            let error = await assertRejects(() => store.delete(Math.random()), "KVStore.prototype.delete: can not delete key which does not exist")
+            let error = await assertRejects(() => store.delete(Math.random()), TypeError, "KVStore.prototype.delete: can not delete key which does not exist")
             if (error) { return error }
             return pass()
         });
@@ -634,6 +637,9 @@ import { routes } from "./routes.js";
             return pass()
         });
         routes.set("/kv-store/delete/delete-key-twice", async () => {
+            if (isRunningLocally()) {
+                return pass()
+            }
             let store = createValidStore()
             let key = `key-exists-${Math.random()}`;
             await store.put(key, 'hello')
@@ -643,7 +649,7 @@ import { routes } from "./routes.js";
             result = await result
             error = assert(result, undefined, `(await store.delete(key) === undefined)`)
             if (error) { return error }
-            error = await assertRejects(() => store.delete(key), "KVStore.prototype.delete: can not delete key which does not exist")
+            error = await assertRejects(() => store.delete(key), TypeError, "KVStore.prototype.delete: can not delete key which does not exist")
             if (error) { return error }
             return pass()
         });

runtime/js-compute-runtime/builtins/kv-store.cpp

@@ -185,16 +185,20 @@ bool parse_and_validate_key(JSContext *cx, const char *key, size_t len) {
 
 bool KVStore::process_pending_kv_store_delete(JSContext *cx, int32_t handle,
                                               JS::HandleObject context, JS::HandleObject promise) {
-  host_api::ObjectStorePendingDelete pending_lookup(handle);
+  host_api::ObjectStorePendingDelete pending_delete(handle);
 
-  auto res = pending_lookup.wait();
+  auto res = pending_delete.wait();
   if (auto *err = res.to_err()) {
-    HANDLE_ERROR(cx, *err);
+    if (host_api::error_is_invalid_argument(*err)) {
+      JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
+                                JSMSG_KV_STORE_DELETE_KEY_DOES_NOT_EXIST);
+    } else {
+      HANDLE_ERROR(cx, *err);
+    }
     return RejectPromiseWithPendingError(cx, promise);
   }
 
   JS::ResolvePromise(cx, promise, JS::UndefinedHandleValue);
-
   return true;
 }
 

runtime/js-compute-runtime/error-numbers.msg

@@ -60,6 +60,7 @@ MSG_DEF(JSMSG_KV_STORE_NAME_EMPTY,                             0, JSEXN_TYPEERR,
 MSG_DEF(JSMSG_KV_STORE_NAME_TOO_LONG,                          0, JSEXN_TYPEERR, "KVStore constructor: name can not be more than 255 characters")
 MSG_DEF(JSMSG_KV_STORE_NAME_NO_CONTROL_CHARACTERS,             0, JSEXN_TYPEERR, "KVStore constructor: name can not contain control characters (\\u0000-\\u001F)")
 MSG_DEF(JSMSG_KV_STORE_DOES_NOT_EXIST,                         1, JSEXN_TYPEERR, "KVStore constructor: No KVStore named '{0}' exists")
+MSG_DEF(JSMSG_KV_STORE_DELETE_KEY_DOES_NOT_EXIST,              0, JSEXN_TYPEERR, "KVStore.prototype.delete: can not delete key which does not exist")
 MSG_DEF(JSMSG_KV_STORE_KEY_EMPTY,                              0, JSEXN_TYPEERR, "KVStore key can not be an empty string")
 MSG_DEF(JSMSG_KV_STORE_KEY_TOO_LONG,                           0, JSEXN_TYPEERR, "KVStore key can not be more than 1024 characters")
 MSG_DEF(JSMSG_KV_STORE_KEY_INVALID_CHARACTER,                  1, JSEXN_TYPEERR, "KVStore key can not contain {0} character")