@fastly/hono-fastly-compute 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.3.2] - 2025-10-14
+
+### Added
+
+- Extend env with client and server info
+- Implement ConnInfo helpers
+
+## [0.3.1] - 2025-10-08
+
+### Fixed
+
+- Fix typings when bindings are empty
+
 ## [0.3.0] - 2025-10-06
 
 ### Changed
@@ -19,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial public release
 
-[unreleased]: https://github.com/fastly/hono-fastly-compute/compare/v0.3.0...HEAD
+[unreleased]: https://github.com/fastly/hono-fastly-compute/compare/v0.3.2...HEAD
+[0.3.2]: https://github.com/fastly/hono-fastly-compute/compare/v0.3.1...v0.3.2
+[0.3.1]: https://github.com/fastly/hono-fastly-compute/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/fastly/hono-fastly-compute/compare/v0.1.0...v0.3.0
 [0.1.0]: https://github.com/fastly/hono-fastly-compute/releases/tag/v0.1.0

package/README.md

@@ -38,7 +38,6 @@ const fire = buildFire({
 type Env = {
   Bindings: typeof fire.Bindings;
 };
-
 const app = new Hono<Env>();
 
 app.get('/', async (c) => {
@@ -95,10 +94,50 @@ The core adapter function that connects Hono to the Fastly Compute `FetchEvent`.
 - **`bindingsDefs`**: The environment bindings definition.
 - **`options`**: An optional object with a `fetch` property.
 
+### `clientInfo` and `serverInfo`
+
+`clientInfo` ([ClientInfo](https://github.com/fastly/js-compute-runtime/blob/f9d6a121f13efbb586d6af210dedec61661dfc6d/types/globals.d.ts#L419-L436)) and `serverInfo` ([ServerInfo](https://github.com/fastly/js-compute-runtime/blob/f9d6a121f13efbb586d6af210dedec61661dfc6d/types/globals.d.ts#L438-L446)) are defined on `fire.Bindings` and available on `c.env`, even if the bindings definitions are empty:
+
+```typescript
+import { Hono } from 'hono';
+import { buildFire } from '@fastly/hono-fastly-compute';
+
+const fire = buildFire({});
+const app = new Hono<{Bindings: typeof fire.Bindings}>();
+
+app.get('/', (c) => {
+  const clientInfo = c.env.clientInfo;
+  const serverInfo = c.env.serverInfo;
+
+  c.text(`${clientInfo.address} ${serverInfo.address}`);
+});
+
+fire(app);
+```
+
 ### `logFastlyServiceVersion()`
 
 A Hono middleware that logs to the console the string `FASTLY_SERVICE_VERSION` followed by the value of the environment variable **FASTLY_SERVICE_VERSION**.
 
+### `getConnInfo()`
+
+An implementation of the [ConnInfo helper](https://hono.dev/docs/helpers/conninfo) for Fastly Compute.
+
+```typescript
+import { Hono } from 'hono';
+import { buildFire, getConnInfo } from '@fastly/hono-fastly-compute';
+
+const fire = buildFire({});
+const app = new Hono();
+
+app.get('/', (c) => {
+  const info = getConnInfo(c); // info is `ConnInfo`
+  return c.text(`Your remote address is ${info.remote.address}`);
+});
+
+fire(app);
+```
+
 ## Issues
 
 If you encounter any non-security-related bug or unexpected behavior, please [file an issue][bug] using the bug report template.

package/build/conninfo.d.ts

@@ -0,0 +1,3 @@
+import type { GetConnInfo } from 'hono/conninfo';
+export declare const getConnInfo: GetConnInfo;
+//# sourceMappingURL=conninfo.d.ts.map

package/build/conninfo.js

@@ -0,0 +1,28 @@
+/*
+ * Copyright Fastly, Inc.
+ * Licensed under the MIT license. See LICENSE file for details.
+ */
+const ipv4Regex = /^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+const ipv6Regex = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/;
+export const getConnInfo = (c) => {
+    const clientInfo = c.env.clientInfo;
+    if (clientInfo == null) {
+        throw new TypeError('env has to include clientInfo.');
+    }
+    let address = undefined;
+    let addressType = undefined;
+    if (ipv4Regex.test(clientInfo.address)) {
+        address = clientInfo.address;
+        addressType = 'IPv4';
+    }
+    else if (ipv6Regex.test(clientInfo.address)) {
+        address = clientInfo.address;
+        addressType = 'IPv6';
+    }
+    return {
+        remote: {
+            address,
+            addressType,
+        },
+    };
+};

package/build/fire.d.ts

@@ -1,38 +1,41 @@
 import type { Schema } from 'hono';
 import type { HonoBase } from 'hono/hono-base';
-import type { ContextProxy, BindingsDefs } from '@fastly/compute-js-context';
-import { type HandleOptions } from './handler.js';
+import type { BindingsDefs, ContextProxy } from '@fastly/compute-js-context';
+import { type BindingsWithClientInfo, type HandleOptions } from './handler.js';
+/**
+ * Registers a Hono app to handle fetch events in Fastly Compute.
+ *
+ * This sets up `addEventListener('fetch', handle(app, envBindingsDefs, options))`
+ * using the bindings you passed to `buildFire()`.
+ *
+ * @param app - The Hono application instance to serve
+ * @param options - Options for handling requests (fetch defaults to undefined)
+ *
+ * @example
+ * const fire = buildFire({ foo: "KVStore" });
+ *
+ * type Env = {
+ *   Variables: Variables;
+ *   Bindings: typeof fire.Bindings;
+ * };
+ *
+ * const app = new Hono<Env>();
+ * fire(app);
+ */
 type FireFn<D extends BindingsDefs> = {
-    /**
-     * Registers a Hono app to handle fetch events in Fastly Compute.
-     *
-     * This sets up `addEventListener('fetch', handle(app, envBindingsDefs, options))`
-     * using the bindings you passed to `buildFire()`.
-     *
-     * @param app - The Hono application instance to serve
-     * @param options - Options for handling requests (fetch defaults to undefined)
-     *
-     * @example
-     * const fire = buildFire({ foo: "KVStore" });
-     *
-     * type Env = {
-     *   Variables: Variables;
-     *   Bindings: typeof fire.Bindings;
-     * };
-     *
-     * const app = new Hono<Env>();
-     * fire(app);
-     */
     <V extends {
         Variables?: object;
-    }, S extends Schema, BasePath extends string>(app: HonoBase<(keyof D extends never ? {} : {
+    }, S extends Schema, BasePath extends string>(app: HonoBase<(keyof D extends never ? {} : never) & V, S, BasePath>, options?: HandleOptions): void;
+    <V extends {
+        Variables?: object;
+    }, S extends Schema, BasePath extends string>(app: HonoBase<{
         Bindings: ContextProxy<D>;
-    }) & V, S, BasePath>, options?: HandleOptions): void;
+    } & V, S, BasePath>, options?: HandleOptions): void;
     /**
      * The inferred bindings type, derived from the defs passed to `buildFire()`.
      * Use this in your Env definition: `{ Bindings: typeof fire.Bindings }`.
      */
-    Bindings: ContextProxy<D>;
+    Bindings: BindingsWithClientInfo<D>;
     /** For debugging: the raw defs object you passed to buildFire */
     defs: D;
 };
@@ -48,8 +51,8 @@ type FireFn<D extends BindingsDefs> = {
  * const fire = buildFire({ grip: "ConfigStore", foo: "KVStore" });
  *
  * type Env = {
- *   Variables: Variables;
- *   Bindings: typeof fire.Bindings; // infer binding types automatically
+ *   Variables: Variables,
+ *   Bindings: typeof fire.Bindings, // infer binding types automatically
  * };
  *
  * const app = new Hono<Env>();

package/build/fire.js

@@ -1,3 +1,7 @@
+/*
+ * Copyright Fastly, Inc.
+ * Licensed under the MIT license. See LICENSE file for details.
+ */
 import { handle } from './handler.js';
 /**
  * Creates a `fire` function bound to a specific set of environment bindings.
@@ -11,8 +15,8 @@ import { handle } from './handler.js';
  * const fire = buildFire({ grip: "ConfigStore", foo: "KVStore" });
  *
  * type Env = {
- *   Variables: Variables;
- *   Bindings: typeof fire.Bindings; // infer binding types automatically
+ *   Variables: Variables,
+ *   Bindings: typeof fire.Bindings, // infer binding types automatically
  * };
  *
  * const app = new Hono<Env>();
@@ -34,9 +38,7 @@ import { handle } from './handler.js';
  *  - Exposes a `.Bindings` type inferred from the given defs
  */
 export function buildFire(bindingsDefs) {
-    const fireFn = ((app, options = {
-        fetch: undefined,
-    }) => {
+    const fireFn = ((app, options = { fetch: undefined, }) => {
         addEventListener('fetch', handle(app, bindingsDefs, options));
     });
     fireFn.defs = bindingsDefs;

package/build/handler.d.ts

@@ -1,18 +1,24 @@
 import type { Schema } from 'hono';
 import type { HonoBase } from 'hono/hono-base';
 import { type BindingsDefs, type ContextProxy } from '@fastly/compute-js-context';
+export type BindingsWithClientInfo<D extends BindingsDefs> = ContextProxy<D> & {
+    clientInfo: ClientInfo;
+    serverInfo: ServerInfo;
+};
 type Handler = (evt: FetchEvent) => void;
 export type HandleOptions = {
     fetch?: typeof fetch;
 };
-export type MaybeBindings<D extends BindingsDefs> = keyof D extends never ? {} : {
-    Bindings: ContextProxy<D>;
+type HandleFn = {
+    <D extends BindingsDefs, V extends {
+        Variables?: object;
+    }, S extends Schema, BasePath extends string>(app: HonoBase<{
+        Bindings: BindingsWithClientInfo<D>;
+    } & V, S, BasePath>, envBindingsDefs: D, opts?: HandleOptions): Handler;
 };
 /**
  * Adapter for Fastly Compute
  */
-export declare const handle: <D extends BindingsDefs, V extends {
-    Variables?: object;
-}, S extends Schema, BasePath extends string>(app: HonoBase<MaybeBindings<D> & V, S, BasePath>, envBindingsDefs: D, opts?: HandleOptions) => Handler;
+export declare const handle: HandleFn;
 export {};
 //# sourceMappingURL=handler.d.ts.map

package/build/handler.js

@@ -1,4 +1,8 @@
-import { createContext, buildContextProxy, } from '@fastly/compute-js-context';
+/*
+ * Copyright Fastly, Inc.
+ * Licensed under the MIT license. See LICENSE file for details.
+ */
+import { buildContextProxyOn, } from '@fastly/compute-js-context';
 /**
  * Adapter for Fastly Compute
  */
@@ -8,8 +12,11 @@ export const handle = (app, envBindingsDefs, opts = {
 }) => {
     return (evt) => {
         evt.respondWith((async () => {
-            const context = createContext();
-            const env = buildContextProxy(context, envBindingsDefs);
+            const envBase = {
+                clientInfo: evt.client,
+                serverInfo: evt.server,
+            };
+            const env = buildContextProxyOn(envBase, envBindingsDefs);
             const res = await app.fetch(evt.request, env, {
                 waitUntil: evt.waitUntil.bind(evt),
                 passThroughOnException() {

package/build/index.d.ts

@@ -1,5 +1,6 @@
 export * from './fire.js';
 export * from './handler.js';
 export * from './utils.js';
+export * from './conninfo.js';
 export type { ResourceType, Context, ContextProxy, BindingsDefs, } from '@fastly/compute-js-context';
 //# sourceMappingURL=index.d.ts.map

package/build/index.js

@@ -1,3 +1,8 @@
+/*
+ * Copyright Fastly, Inc.
+ * Licensed under the MIT license. See LICENSE file for details.
+ */
 export * from './fire.js';
 export * from './handler.js';
 export * from './utils.js';
+export * from './conninfo.js';

package/build/utils.js

@@ -1,3 +1,7 @@
+/*
+ * Copyright Fastly, Inc.
+ * Licensed under the MIT license. See LICENSE file for details.
+ */
 import { env } from 'fastly:env';
 import { createMiddleware } from 'hono/factory';
 export const logFastlyServiceVersion = () => createMiddleware(async (_, next) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastly/hono-fastly-compute",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Helper utilities for using Hono with Fastly Compute",
   "license": "MIT",
   "repository": {
@@ -26,8 +26,8 @@
     "clean": "rm -rf build"
   },
   "dependencies": {
-    "@fastly/js-compute": "^3.0.0",
-    "@fastly/compute-js-context": "^0.4.0"
+    "@fastly/compute-js-context": "^0.5.1",
+    "@fastly/js-compute": "^3.0.0"
   },
   "devDependencies": {
     "hono": "^4.9.5",