fix: KVStore error handling (#1060)

Author: Guy Bedford

integration-tests/js-compute/fixtures/module-mode/src/kv-store.js

@@ -8,9 +8,26 @@ import {
 } from './assertions.js';
 import { KVStore } from 'fastly:kv-store';
 import { routes, isRunningLocally } from './routes.js';
+import { sdkVersion } from 'fastly:experimental';
+
+const debug = sdkVersion.endsWith('-debug');
 
 // kvstore e2e tests
 {
+  routes.set('/kv-store/debug-error', async () => {
+    if (!debug) return;
+
+    // special debug function to create a kv entry with an invalid handle
+    const entry = fastly.dump(null, 'invalidkv');
+
+    // we can then test the invalid handle error
+    try {
+      await entry.text();
+    } catch (e) {
+      strictEqual(e.message.includes('Invalid handle'), true);
+    }
+  });
+
   routes.set('/kv-store-e2e/list', async () => {
     const store = new KVStore('example-test-kv-store');
     try {

integration-tests/js-compute/fixtures/module-mode/tests.json

@@ -147,6 +147,7 @@
       "body": "hello world!"
     }
   },
+  "GET /kv-store/debug-error": {},
   "GET /kv-store/delete/called-as-constructor": {},
   "GET /kv-store/delete/called-unbound": {},
   "GET /kv-store/delete/key-parameter-calls-7.1.17-ToString": {},

runtime/fastly/builtins/backend.cpp

@@ -28,9 +28,9 @@
 #include "fastly.h"
 
 using builtins::BuiltinImpl;
+using fastly::FastlyGetErrorMessage;
 using fastly::common::parse_and_validate_timeout;
 using fastly::fastly::Fastly;
-using fastly::fastly::FastlyGetErrorMessage;
 using fastly::fetch::RequestOrResponse;
 using fastly::secret_store::SecretStoreEntry;
 

runtime/fastly/builtins/body.cpp

@@ -15,8 +15,8 @@
 #include "js/Stream.h"
 
 using builtins::web::streams::NativeStreamSource;
+using fastly::FastlyGetErrorMessage;
 using fastly::fastly::convertBodyInit;
-using fastly::fastly::FastlyGetErrorMessage;
 using fastly::fetch::RequestOrResponse;
 
 namespace fastly::body {

runtime/fastly/builtins/cache-override.cpp

@@ -13,7 +13,7 @@
 #include "host_api.h"
 
 using builtins::BuiltinImpl;
-using fastly::fastly::FastlyGetErrorMessage;
+using fastly::FastlyGetErrorMessage;
 
 namespace fastly::cache_override {
 

runtime/fastly/builtins/cache-simple.cpp

@@ -13,8 +13,8 @@
 
 using builtins::BuiltinNoConstructor;
 using builtins::web::streams::NativeStreamSource;
+using fastly::FastlyGetErrorMessage;
 using fastly::fastly::convertBodyInit;
-using fastly::fastly::FastlyGetErrorMessage;
 using fastly::fetch::RequestOrResponse;
 
 namespace fastly::cache_simple {

runtime/fastly/builtins/config-store.cpp

@@ -4,7 +4,7 @@
 #include "fastly.h"
 
 using builtins::BuiltinImpl;
-using fastly::fastly::FastlyGetErrorMessage;
+using fastly::FastlyGetErrorMessage;
 
 namespace fastly::config_store {
 

runtime/fastly/builtins/dictionary.cpp

@@ -3,7 +3,7 @@
 #include "../host-api/host_api_fastly.h"
 #include "fastly.h"
 
-using fastly::fastly::FastlyGetErrorMessage;
+using fastly::FastlyGetErrorMessage;
 
 namespace fastly::dictionary {
 

runtime/fastly/builtins/fastly.cpp

@@ -11,6 +11,7 @@
 #include "fastly.h"
 #include "js/Conversions.h"
 #include "js/JSON.h"
+#include "kv-store.h"
 #include "logger.h"
 #include <arpa/inet.h>
 
@@ -38,14 +39,6 @@ bool debug_logging_enabled() { return DEBUG_LOGGING_ENABLED; }
 
 namespace fastly::fastly {
 
-const JSErrorFormatString *FastlyGetErrorMessage(void *userRef, unsigned errorNumber) {
-  if (errorNumber > 0 && errorNumber < JSErrNum_Limit) {
-    return &fastly_ErrorFormatString[errorNumber];
-  }
-
-  return nullptr;
-}
-
 JS::PersistentRooted<JSObject *> Fastly::env;
 JS::PersistentRooted<JSObject *> Fastly::baseURL;
 JS::PersistentRooted<JSString *> Fastly::defaultBackend;
@@ -57,6 +50,26 @@ bool Fastly::dump(JSContext *cx, unsigned argc, JS::Value *vp) {
   if (!args.requireAtLeast(cx, __func__, 1))
     return false;
 
+// special debug mode operations
+#ifndef NDEBUG
+  if (args.get(0).isNull() && args.get(1).isString()) {
+    JS::RootedString str(cx, args.get(1).toString());
+    auto str_chars = core::encode(cx, str);
+    if (!str_chars) {
+      return false;
+    }
+    if (!strcmp(str_chars.ptr.get(), "invalidkv")) {
+      host_api::HttpBody body(-1);
+      host_api::HostBytes metadata{};
+      // uint32_t gen = std::get<2>(res.unwrap());
+      JS::RootedObject entry(
+          cx, ::fastly::kv_store::KVStoreEntry::create(cx, body, std::move(metadata)));
+      args.rval().setObject(*entry);
+      return true;
+    }
+  }
+#endif
+
   ENGINE->dump_value(args[0], stdout);
 
   args.rval().setUndefined();

runtime/fastly/builtins/fastly.h

@@ -26,8 +26,6 @@ class Env : public builtins::BuiltinNoConstructor<Env> {
   static JSObject *create(JSContext *cx);
 };
 
-const JSErrorFormatString *FastlyGetErrorMessage(void *userRef, unsigned errorNumber);
-
 class Fastly : public builtins::BuiltinNoConstructor<Fastly> {
 private:
   static bool log(JSContext *cx, unsigned argc, JS::Value *vp);