@arcjet/bun 1.0.0-alpha.20 → 1.0.0-alpha.22

package/index.js

@@ -1,4 +1,3 @@
-import { createConnectTransport } from '@connectrpc/connect-node';
 import core__default from 'arcjet';
 export * from 'arcjet';
 import findIP from '@arcjet/ip';
@@ -7,8 +6,23 @@ import { env } from 'bun';
 import { logLevel, baseUrl, isDevelopment, platform } from '@arcjet/env';
 import { Logger } from '@arcjet/logger';
 import { createClient } from '@arcjet/protocol/client.js';
+import { createTransport } from '@arcjet/transport';
 
 /// <reference types="bun-types/bun.d.ts" />
+// TODO: Deduplicate with other packages
+function errorMessage(err) {
+    if (err) {
+        if (typeof err === "string") {
+            return err;
+        }
+        if (typeof err === "object" &&
+            "message" in err &&
+            typeof err.message === "string") {
+            return err.message;
+        }
+    }
+    return "Unknown problem";
+}
 function createRemoteClient(options) {
     // The base URL for the Arcjet API. Will default to the standard production
     // API unless environment variable `ARCJET_BASE_URL` is set.
@@ -17,12 +31,9 @@ function createRemoteClient(options) {
     // in production so calls fail open.
     const timeout = options?.timeout ?? (isDevelopment(env) ? 1000 : 500);
     // Transport is the HTTP client that the client uses to make requests.
-    const transport = createConnectTransport({
-        baseUrl: url,
-        httpVersion: "1.1",
-    });
+    const transport = createTransport(url);
     const sdkStack = "BUN";
-    const sdkVersion = "1.0.0-alpha.20";
+    const sdkVersion = "1.0.0-alpha.22";
     return createClient({
         transport,
         baseUrl: url,
@@ -95,7 +106,19 @@ function arcjet(options) {
                 // Further investigation makes it seem like it has something to do with
                 // the definition of `props` in the signature but it's hard to track down
                 const req = toArcjetRequest(request, props ?? {});
-                return aj.protect({}, req);
+                const getBody = async () => {
+                    try {
+                        const clonedRequest = request.clone();
+                        // Awaited to throw if it rejects and we'll just return undefined
+                        const body = await clonedRequest.text();
+                        return body;
+                    }
+                    catch (e) {
+                        log.error("failed to get request body: %s", errorMessage(e));
+                        return;
+                    }
+                };
+                return aj.protect({ getBody }, req);
             },
             handler(fetch) {
                 return async function (request, server) {

package/index.ts

@@ -1,5 +1,4 @@
 /// <reference types="bun-types/bun.d.ts" />
-import { createConnectTransport } from "@connectrpc/connect-node";
 import core from "arcjet";
 import type {
   ArcjetDecision,
@@ -18,10 +17,30 @@ import { env } from "bun";
 import { baseUrl, isDevelopment, logLevel, platform } from "@arcjet/env";
 import { Logger } from "@arcjet/logger";
 import { createClient } from "@arcjet/protocol/client.js";
+import { createTransport } from "@arcjet/transport";
 
 // Re-export all named exports from the generic SDK
 export * from "arcjet";
 
+// TODO: Deduplicate with other packages
+function errorMessage(err: unknown): string {
+  if (err) {
+    if (typeof err === "string") {
+      return err;
+    }
+
+    if (
+      typeof err === "object" &&
+      "message" in err &&
+      typeof err.message === "string"
+    ) {
+      return err.message;
+    }
+  }
+
+  return "Unknown problem";
+}
+
 // Type helpers from https://github.com/sindresorhus/type-fest but adjusted for
 // our use.
 //
@@ -74,10 +93,7 @@ export function createRemoteClient(options?: RemoteClientOptions) {
   const timeout = options?.timeout ?? (isDevelopment(env) ? 1000 : 500);
 
   // Transport is the HTTP client that the client uses to make requests.
-  const transport = createConnectTransport({
-    baseUrl: url,
-    httpVersion: "1.1",
-  });
+  const transport = createTransport(url);
 
   const sdkStack = "BUN";
   const sdkVersion = "__ARCJET_SDK_VERSION__";
@@ -238,7 +254,19 @@ export default function arcjet<
           ExtraProps<Rules>
         >;
 
-        return aj.protect({}, req);
+        const getBody = async () => {
+          try {
+            const clonedRequest = request.clone();
+            // Awaited to throw if it rejects and we'll just return undefined
+            const body = await clonedRequest.text();
+            return body;
+          } catch (e) {
+            log.error("failed to get request body: %s", errorMessage(e));
+            return;
+          }
+        };
+
+        return aj.protect({ getBody }, req);
       },
       handler(
         fetch: (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcjet/bun",
-  "version": "1.0.0-alpha.20",
+  "version": "1.0.0-alpha.22",
   "description": "Arcjet SDK for Bun.sh",
   "license": "Apache-2.0",
   "homepage": "https://arcjet.com",
@@ -38,22 +38,22 @@
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests"
   },
   "dependencies": {
-    "@arcjet/env": "1.0.0-alpha.20",
-    "@arcjet/headers": "1.0.0-alpha.20",
-    "@arcjet/ip": "1.0.0-alpha.20",
-    "@arcjet/logger": "1.0.0-alpha.20",
-    "@arcjet/protocol": "1.0.0-alpha.20",
-    "@connectrpc/connect-node": "1.4.0",
-    "arcjet": "1.0.0-alpha.20"
+    "@arcjet/env": "1.0.0-alpha.22",
+    "@arcjet/headers": "1.0.0-alpha.22",
+    "@arcjet/ip": "1.0.0-alpha.22",
+    "@arcjet/logger": "1.0.0-alpha.22",
+    "@arcjet/protocol": "1.0.0-alpha.22",
+    "@arcjet/transport": "1.0.0-alpha.22",
+    "arcjet": "1.0.0-alpha.22"
   },
   "devDependencies": {
-    "@arcjet/eslint-config": "1.0.0-alpha.20",
-    "@arcjet/rollup-config": "1.0.0-alpha.20",
-    "@arcjet/tsconfig": "1.0.0-alpha.20",
+    "@arcjet/eslint-config": "1.0.0-alpha.22",
+    "@arcjet/rollup-config": "1.0.0-alpha.22",
+    "@arcjet/tsconfig": "1.0.0-alpha.22",
     "@jest/globals": "29.7.0",
     "@types/node": "20.12.12",
-    "@rollup/wasm-node": "4.19.0",
-    "bun-types": "1.1.20",
+    "@rollup/wasm-node": "4.21.0",
+    "bun-types": "1.1.26",
     "jest": "29.7.0",
     "typescript": "5.5.4"
   },