@arcjet/bun 1.0.0-alpha.13 → 1.0.0-alpha.15

package/README.md

@@ -1,7 +1,7 @@
 <a href="https://arcjet.com" target="_arcjet-home">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://arcjet.com/arcjet-logo-dark-planet-arrival.svg">
-    <img src="https://arcjet.com/arcjet-logo-light-planet-arrival.svg" alt="Arcjet Logo" height="144" width="auto">
+    <source media="(prefers-color-scheme: dark)" srcset="https://arcjet.com/logo/arcjet-dark-lockup-voyage-horizontal.svg">
+    <img src="https://arcjet.com/logo/arcjet-light-lockup-voyage-horizontal.svg" alt="Arcjet Logo" height="128" width="auto">
   </picture>
 </a>
 
@@ -17,11 +17,20 @@
 </p>
 
 [Arcjet][arcjet] helps developers protect their apps in just a few lines of
-code. Implement rate limiting, bot protection, email verification & defense
+code. Implement rate limiting, bot protection, email verification, and defense
 against common attacks.
 
 This is the [Arcjet][arcjet] SDK for [Bun.sh][bun-sh].
 
+## Getting started
+
+Visit the [quick start guide][quick-start] to get started.
+
+## Example app
+
+Try an Arcjet protected app live at [https://example.arcjet.com][example-url]
+([source code][example-source]).
+
 ## Installation
 
 ```shell
@@ -75,8 +84,8 @@ export default {
 ## Shield example
 
 [Arcjet Shield][shield-concepts-docs] protects your application against common
-attacks, including the OWASP Top 10. It’s enabled by default and runs on every
-request with negligible performance impact.
+attacks, including the OWASP Top 10. You can run Shield on every request with
+negligible performance impact.
 
 ```ts
 import arcjet, { shield } from "@arcjet/bun";
@@ -110,6 +119,9 @@ Licensed under the [Apache License, Version 2.0][apache-license].
 
 [arcjet]: https://arcjet.com
 [bun-sh]: https://bun.sh/
+[example-url]: https://example.arcjet.com
+[quick-start]: https://docs.arcjet.com/get-started/bun
+[example-source]: https://github.com/arcjet/arcjet-js-example
 [rate-limit-concepts-docs]: https://docs.arcjet.com/rate-limiting/concepts
 [shield-concepts-docs]: https://docs.arcjet.com/shield/concepts
 [apache-license]: http://www.apache.org/licenses/LICENSE-2.0

package/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bun-types/bun.d.ts" />
-import { ArcjetDecision, ArcjetOptions, Primitive, Product, Runtime, ExtraProps, RemoteClient, RemoteClientOptions } from "arcjet";
+import { ArcjetDecision, ArcjetOptions, Primitive, Product, ExtraProps } from "arcjet";
 import type { Server } from "bun";
 export * from "arcjet";
 type Simplify<T> = {
@@ -12,13 +12,16 @@ type WithoutCustomProps = {
 type PlainObject = {
     [key: string]: unknown;
 };
-export declare function createBunRemoteClient(options?: RemoteClientOptions): RemoteClient;
+export type RemoteClientOptions = {
+    baseUrl?: string;
+    timeout?: number;
+};
+export declare function createRemoteClient(options?: RemoteClientOptions): import("@arcjet/protocol/client.js").Client;
 /**
  * The ArcjetBun client provides a public `protect()` method to
  * make a decision about how a Bun.sh request should be handled.
  */
 export interface ArcjetBun<Props extends PlainObject> {
-    get runtime(): Runtime;
     /**
      * Runs a request through the configured protections. The request is
      * analyzed and then a decision made on whether to allow, deny, or challenge

package/index.js

@@ -1,23 +1,35 @@
 import { createConnectTransport } from '@connectrpc/connect-node';
-import core__default, { defaultBaseUrl, createRemoteClient, ArcjetHeaders } from 'arcjet';
+import core__default from 'arcjet';
 export * from 'arcjet';
 import findIP from '@arcjet/ip';
+import ArcjetHeaders from '@arcjet/headers';
+import { env } from 'bun';
+import { logLevel, baseUrl, isProduction, platform, isDevelopment } from '@arcjet/env';
+import { Logger } from '@arcjet/logger';
+import { createClient } from '@arcjet/protocol/client.js';
 
 /// <reference types="bun-types/bun.d.ts" />
-function createBunRemoteClient(options) {
+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.
-    const baseUrl = options?.baseUrl ?? defaultBaseUrl();
+    const url = options?.baseUrl ?? baseUrl(env);
+    // The timeout for the Arcjet API in milliseconds. This is set to a low value
+    // in production so calls fail open.
+    const timeout = options?.timeout ?? (isProduction(env) ? 500 : 1000);
     // Transport is the HTTP client that the client uses to make requests.
-    const transport = options?.transport ??
-        createConnectTransport({
-            baseUrl,
-            httpVersion: "1.1",
-        });
-    // TODO(#223): Do we want to allow overrides to either of these? If not, we should probably define a separate type for `options`
+    const transport = createConnectTransport({
+        baseUrl: url,
+        httpVersion: "1.1",
+    });
     const sdkStack = "BUN";
-    const sdkVersion = "1.0.0-alpha.13";
-    return createRemoteClient({ ...options, transport, sdkStack, sdkVersion });
+    const sdkVersion = "1.0.0-alpha.15";
+    return createClient({
+        transport,
+        baseUrl: url,
+        timeout,
+        sdkStack,
+        sdkVersion,
+    });
 }
 // This is provided with an `ipCache` where it attempts to lookup the IP. This
 // is primarily a workaround to the API design in Bun that requires access to
@@ -27,9 +39,18 @@ function toArcjetRequest(ipCache, request, props) {
     // We construct an ArcjetHeaders to normalize over Headers
     const headers = new ArcjetHeaders(request.headers);
     const url = new URL(request.url);
-    const ip = findIP({
+    let ip = findIP({
         ip: ipCache.get(request),
-    }, headers);
+    }, headers, { platform: platform(env) });
+    if (ip === "") {
+        // If the `ip` is empty but we're in development mode, we default the IP
+        // so the request doesn't fail.
+        if (isDevelopment(env)) {
+            // TODO: Log that the fingerprint is being overridden once the adapter
+            // constructs the logger
+            ip = "127.0.0.1";
+        }
+    }
     return {
         ...props,
         ip,
@@ -48,9 +69,6 @@ function withClient(aj) {
     // `server.requestIP()`
     const ipCache = new WeakMap();
     return Object.freeze({
-        get runtime() {
-            return aj.runtime;
-        },
         withRule(rule) {
             const client = aj.withRule(rule);
             return withClient(client);
@@ -60,7 +78,7 @@ function withClient(aj) {
             // 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(ipCache, request, props ?? {});
-            return aj.protect(req);
+            return aj.protect({}, req);
         },
         handler(fetch) {
             return async function (request, server) {
@@ -82,9 +100,14 @@ function withClient(aj) {
  * @param options - Arcjet configuration options to apply to all requests.
  */
 function arcjet(options) {
-    const client = options.client ?? createBunRemoteClient();
-    const aj = core__default({ ...options, client });
+    const client = options.client ?? createRemoteClient();
+    const log = options.log
+        ? options.log
+        : new Logger({
+            level: logLevel(env),
+        });
+    const aj = core__default({ ...options, client, log });
     return withClient(aj);
 }
 
-export { createBunRemoteClient, arcjet as default };
+export { createRemoteClient, arcjet as default };

package/index.ts

@@ -5,18 +5,23 @@ import core, {
   ArcjetOptions,
   Primitive,
   Product,
-  ArcjetHeaders,
-  Runtime,
   ArcjetRequest,
   ExtraProps,
-  RemoteClient,
-  RemoteClientOptions,
-  defaultBaseUrl,
-  createRemoteClient,
   Arcjet,
 } from "arcjet";
 import findIP from "@arcjet/ip";
+import ArcjetHeaders from "@arcjet/headers";
 import type { Server } from "bun";
+import { env } from "bun";
+import {
+  baseUrl,
+  isDevelopment,
+  isProduction,
+  logLevel,
+  platform,
+} from "@arcjet/env";
+import { Logger } from "@arcjet/logger";
+import { createClient } from "@arcjet/protocol/client.js";
 
 // Re-export all named exports from the generic SDK
 export * from "arcjet";
@@ -58,26 +63,36 @@ type PlainObject = {
   [key: string]: unknown;
 };
 
-export function createBunRemoteClient(
-  options?: RemoteClientOptions,
-): RemoteClient {
+export type RemoteClientOptions = {
+  baseUrl?: string;
+  timeout?: number;
+};
+
+export function createRemoteClient(options?: RemoteClientOptions) {
   // The base URL for the Arcjet API. Will default to the standard production
   // API unless environment variable `ARCJET_BASE_URL` is set.
-  const baseUrl = options?.baseUrl ?? defaultBaseUrl();
+  const url = options?.baseUrl ?? baseUrl(env);
+
+  // The timeout for the Arcjet API in milliseconds. This is set to a low value
+  // in production so calls fail open.
+  const timeout = options?.timeout ?? (isProduction(env) ? 500 : 1000);
 
   // Transport is the HTTP client that the client uses to make requests.
-  const transport =
-    options?.transport ??
-    createConnectTransport({
-      baseUrl,
-      httpVersion: "1.1",
-    });
-
-  // TODO(#223): Do we want to allow overrides to either of these? If not, we should probably define a separate type for `options`
+  const transport = createConnectTransport({
+    baseUrl: url,
+    httpVersion: "1.1",
+  });
+
   const sdkStack = "BUN";
   const sdkVersion = "__ARCJET_SDK_VERSION__";
 
-  return createRemoteClient({ ...options, transport, sdkStack, sdkVersion });
+  return createClient({
+    transport,
+    baseUrl: url,
+    timeout,
+    sdkStack,
+    sdkVersion,
+  });
 }
 
 /**
@@ -85,7 +100,6 @@ export function createBunRemoteClient(
  * make a decision about how a Bun.sh request should be handled.
  */
 export interface ArcjetBun<Props extends PlainObject> {
-  get runtime(): Runtime;
   /**
    * Runs a request through the configured protections. The request is
    * analyzed and then a decision made on whether to allow, deny, or challenge
@@ -146,12 +160,22 @@ function toArcjetRequest<Props extends PlainObject>(
   const headers = new ArcjetHeaders(request.headers);
 
   const url = new URL(request.url);
-  const ip = findIP(
+  let ip = findIP(
     {
       ip: ipCache.get(request),
     },
     headers,
+    { platform: platform(env) },
   );
+  if (ip === "") {
+    // If the `ip` is empty but we're in development mode, we default the IP
+    // so the request doesn't fail.
+    if (isDevelopment(env)) {
+      // TODO: Log that the fingerprint is being overridden once the adapter
+      // constructs the logger
+      ip = "127.0.0.1";
+    }
+  }
 
   return {
     ...props,
@@ -175,9 +199,6 @@ function withClient<const Rules extends (Primitive | Product)[]>(
   const ipCache = new WeakMap<Request, string>();
 
   return Object.freeze({
-    get runtime() {
-      return aj.runtime;
-    },
     withRule(rule: Primitive | Product) {
       const client = aj.withRule(rule);
       return withClient(client);
@@ -197,7 +218,7 @@ function withClient<const Rules extends (Primitive | Product)[]>(
         props ?? {},
       ) as ArcjetRequest<ExtraProps<Rules>>;
 
-      return aj.protect(req);
+      return aj.protect({}, req);
     },
     handler(
       fetch: (
@@ -232,9 +253,15 @@ function withClient<const Rules extends (Primitive | Product)[]>(
 export default function arcjet<const Rules extends (Primitive | Product)[]>(
   options: ArcjetOptions<Rules>,
 ): ArcjetBun<Simplify<ExtraProps<Rules>>> {
-  const client = options.client ?? createBunRemoteClient();
+  const client = options.client ?? createRemoteClient();
+
+  const log = options.log
+    ? options.log
+    : new Logger({
+        level: logLevel(env),
+      });
 
-  const aj = core({ ...options, client });
+  const aj = core({ ...options, client, log });
 
   return withClient(aj);
 }

package/package.json

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