@arcjet/node 1.0.0-beta.16 → 1.0.0-beta.18

package/index.d.ts

@@ -4,12 +4,22 @@ type Simplify<T> = {
     [KeyType in keyof T]: T[KeyType];
 } & {};
 declare const emptyObjectSymbol: unique symbol;
-type WithoutCustomProps = {
-    [emptyObjectSymbol]?: never;
-};
 type PlainObject = {
     [key: string]: unknown;
 };
+/**
+ * Dynamically generate whether zero or one `properties` object must or can be passed.
+ */
+type MaybeProperties<T> = {
+    [P in keyof T]?: T[P];
+} extends T ? T extends {
+    [emptyObjectSymbol]?: never;
+} ? [
+] : [
+    properties?: T
+] : [
+    properties: T
+];
 /**
  * Configuration for {@linkcode createRemoteClient}.
  */
@@ -47,30 +57,30 @@ export interface ArcjetNodeRequest {
     /**
      * Headers of the request.
      */
-    headers?: Record<string, string | string[] | undefined>;
+    headers?: Record<string, string | string[] | undefined> | undefined;
     /**
      * `net.Socket` object associated with the connection.
      *
      * See <https://nodejs.org/api/http.html#messagesocket>.
      */
     socket?: Partial<{
-        remoteAddress: string;
+        remoteAddress?: string | undefined;
         encrypted: boolean;
-    }>;
+    }> | undefined;
     /**
      * HTTP method of the request.
      */
-    method?: string;
+    method?: string | undefined;
     /**
      * HTTP version sent by the client.
      *
      * See <https://nodejs.org/api/http.html#messagehttpversion>.
      */
-    httpVersion?: string;
+    httpVersion?: string | undefined;
     /**
      * URL.
      */
-    url?: string;
+    url?: string | undefined;
     /**
      * Request body.
      */
@@ -82,7 +92,7 @@ export interface ArcjetNodeRequest {
      *
      * See <https://nodejs.org/api/events.html#emitteroneventname-listener>.
      */
-    on?: EventHandlerLike;
+    on?: EventHandlerLike | undefined;
     /**
      * Remove event handlers.
      *
@@ -90,7 +100,7 @@ export interface ArcjetNodeRequest {
      *
      * See <https://nodejs.org/api/events.html#emitterremovelistenereventname-listener>.
      */
-    removeListener?: EventHandlerLike;
+    removeListener?: EventHandlerLike | undefined;
     /**
      * Whether the readable stream is readable.
      *
@@ -98,7 +108,7 @@ export interface ArcjetNodeRequest {
      *
      * See <https://nodejs.org/api/stream.html#readablereadable>.
      */
-    readable?: boolean;
+    readable?: boolean | undefined;
 }
 /**
  * Configuration for the Node.js integration of Arcjet.
@@ -140,7 +150,7 @@ export interface ArcjetNode<Props extends PlainObject> {
      *   Promise that resolves to an {@linkcode ArcjetDecision} indicating
      *   Arcjet’s decision about the request.
      */
-    protect(request: ArcjetNodeRequest, ...props: Props extends WithoutCustomProps ? [] : [Props]): Promise<ArcjetDecision>;
+    protect(request: ArcjetNodeRequest, ...props: MaybeProperties<Props>): Promise<ArcjetDecision>;
     /**
      * Augment the client with another rule.
      *
@@ -154,7 +164,7 @@ export interface ArcjetNode<Props extends PlainObject> {
      * @returns
      *   Arcjet instance augmented with the given rule.
      */
-    withRule<Rule extends Primitive | Product>(rule: Rule): ArcjetNode<Simplify<Props & ExtraProps<Rule>>>;
+    withRule<ChildProperties extends PlainObject>(rule: Primitive<ChildProperties> | Product<ChildProperties>): ArcjetNode<Props & ChildProperties>;
 }
 /**
  * Create a new Node.js integration of Arcjet.
@@ -174,4 +184,4 @@ export interface ArcjetNode<Props extends PlainObject> {
  * @returns
  *   Node.js integration of Arcjet.
  */
-export default function arcjet<const Rules extends (Primitive | Product)[], const Characteristics extends readonly string[]>(options: ArcjetOptions<Rules, Characteristics>): ArcjetNode<Simplify<ExtraProps<Rules> & CharacteristicProps<Characteristics>>>;
+export default function arcjet<const Rules extends (Primitive | Product)[], const Characteristics extends readonly string[]>(options: ArcjetOptions<Rules, Characteristics>): ArcjetNode<ExtraProps<Rules> & CharacteristicProps<Characteristics>>;

package/index.js

@@ -41,20 +41,7 @@ const env = {
         return process.env.FIREBASE_CONFIG;
     },
 };
-// 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";
-}
+let warnedForAutomaticBodyRead = false;
 /**
  * Create a remote client.
  *
@@ -69,7 +56,7 @@ function createRemoteClient(options) {
     // Transport is the HTTP client that the client uses to make requests.
     const transport = createTransport(url);
     const sdkStack = "NODEJS";
-    const sdkVersion = "1.0.0-beta.16";
+    const sdkVersion = "1.0.0-beta.18";
     return createClient({
         transport,
         baseUrl: url,
@@ -186,62 +173,41 @@ function arcjet(options) {
         };
     }
     function withClient(aj) {
-        return Object.freeze({
+        const client = {
             withRule(rule) {
                 const client = aj.withRule(rule);
                 return withClient(client);
             },
-            async protect(request, ...[props]) {
-                // TODO(#220): The generic manipulations get really mad here, so we cast
-                // 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 ?? {});
+            async protect(request, props) {
+                // Cast of `{}` because here we switch from `undefined` to `Properties`.
+                const req = toArcjetRequest(request, props || {});
                 const getBody = async () => {
-                    try {
-                        // If request.body is present then the body was likely read by a package like express' `body-parser`.
-                        // If it's not present then we attempt to read the bytes from the IncomingMessage ourselves.
-                        if (typeof request.body === "string") {
-                            return request.body;
+                    // Read the stream if the body is not present.
+                    if (request.body === null || request.body === undefined) {
+                        let expectedLength;
+                        // TODO: This shouldn't need to build headers again but the type
+                        // for `req` above is overly relaxed
+                        const headers = new ArcjetHeaders(request.headers);
+                        const expectedLengthStr = headers.get("content-length");
+                        if (typeof expectedLengthStr === "string") {
+                            expectedLength = parseInt(expectedLengthStr, 10);
                         }
-                        else if (typeof request.body !== "undefined" &&
-                            // BigInt cannot be serialized with JSON.stringify
-                            typeof request.body !== "bigint") {
-                            return JSON.stringify(request.body);
+                        if (!warnedForAutomaticBodyRead) {
+                            warnedForAutomaticBodyRead = true;
+                            log.warn("Automatically reading the request body is deprecated; please pass an explicit `sensitiveInfoValue` field. See <https://docs.arcjet.com/upgrading/sdk-migration>.");
                         }
-                        if (typeof request.on === "function" &&
-                            typeof request.removeListener === "function") {
-                            let expectedLength;
-                            // TODO: This shouldn't need to build headers again but the type
-                            // for `req` above is overly relaxed
-                            const headers = new ArcjetHeaders(request.headers);
-                            const expectedLengthStr = headers.get("content-length");
-                            if (typeof expectedLengthStr === "string") {
-                                try {
-                                    expectedLength = parseInt(expectedLengthStr, 10);
-                                }
-                                catch {
-                                    // If the expected length couldn't be parsed we'll just not set one.
-                                }
-                            }
-                            // Awaited to throw if it rejects and we'll just return undefined
-                            const body = await readBody(request, {
-                                // We will process 1mb bodies
-                                limit: 1048576,
-                                expectedLength,
-                            });
-                            return body;
-                        }
-                        log.warn("no body available");
-                        return;
+                        return readBody(request, { expectedLength });
                     }
-                    catch (e) {
-                        log.error("failed to get request body: %s", errorMessage(e));
-                        return;
+                    // A package like `body-parser` was used to read the stream.
+                    if (typeof request.body === "string") {
+                        return request.body;
                     }
+                    return JSON.stringify(request.body);
                 };
                 return aj.protect({ getBody }, req);
             },
-        });
+        };
+        return Object.freeze(client);
     }
     const aj = core__default({ ...options, client, log });
     return withClient(aj);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcjet/node",
-  "version": "1.0.0-beta.16",
+  "version": "1.0.0-beta.18",
   "description": "Arcjet SDK for Node.js",
   "keywords": [
     "analyze",
@@ -50,20 +50,20 @@
     "test": "npm run build && npm run lint && npm run test-coverage"
   },
   "dependencies": {
-    "@arcjet/env": "1.0.0-beta.16",
-    "@arcjet/headers": "1.0.0-beta.16",
-    "@arcjet/ip": "1.0.0-beta.16",
-    "@arcjet/logger": "1.0.0-beta.16",
-    "@arcjet/protocol": "1.0.0-beta.16",
-    "@arcjet/transport": "1.0.0-beta.16",
-    "@arcjet/body": "1.0.0-beta.16",
-    "arcjet": "1.0.0-beta.16"
+    "@arcjet/env": "1.0.0-beta.18",
+    "@arcjet/headers": "1.0.0-beta.18",
+    "@arcjet/ip": "1.0.0-beta.18",
+    "@arcjet/logger": "1.0.0-beta.18",
+    "@arcjet/protocol": "1.0.0-beta.18",
+    "@arcjet/transport": "1.0.0-beta.18",
+    "@arcjet/body": "1.0.0-beta.18",
+    "arcjet": "1.0.0-beta.18"
   },
   "devDependencies": {
-    "@arcjet/eslint-config": "1.0.0-beta.16",
-    "@arcjet/rollup-config": "1.0.0-beta.16",
-    "@types/node": "25.0.3",
-    "@rollup/wasm-node": "4.54.0",
+    "@arcjet/eslint-config": "1.0.0-beta.18",
+    "@arcjet/rollup-config": "1.0.0-beta.18",
+    "@types/node": "25.0.8",
+    "@rollup/wasm-node": "4.55.1",
     "eslint": "9.39.2",
     "typescript": "5.9.3"
   },