From e37c45c88caebca3f35314cb9d8a5b98c303baf5 Mon Sep 17 00:00:00 2001
From: Felipe Forbeck <felipe.forbeck@gmail.com>
Date: Tue, 1 Oct 2024 16:36:45 -0300
Subject: [PATCH] revert get version

---
 package-lock.json          | 19 -------------------
 package.json               |  6 ++----
 scripts/set-version-env.js | 13 -------------
 src/bindings.d.ts          |  1 -
 src/middleware.js          |  5 +++--
 5 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 scripts/set-version-env.js

diff --git a/package-lock.json b/package-lock.json
index 28ef136..8b05811 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,6 @@
         "@web3-storage/upload-client": "^16.1.1",
         "carstream": "^2.1.0",
         "chai": "^5.1.1",
-        "cross-env": "^7.0.3",
         "esbuild": "^0.18.20",
         "files-from-path": "^0.2.6",
         "miniflare": "^3.20240909.5",
@@ -4613,24 +4612,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/cross-env": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
-      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.1"
-      },
-      "bin": {
-        "cross-env": "src/bin/cross-env.js",
-        "cross-env-shell": "src/bin/cross-env-shell.js"
-      },
-      "engines": {
-        "node": ">=10.14",
-        "npm": ">=6",
-        "yarn": ">=1"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
diff --git a/package.json b/package.json
index 2ae6e17..6c1401a 100644
--- a/package.json
+++ b/package.json
@@ -13,11 +13,10 @@
   },
   "scripts": {
     "prepare": "npm run build",
-    "set-version": "cross-env $(node ./scripts/set-version-env.js)",
     "start": "npm run dev",
     "dev": "npm run build:debug && miniflare dist/worker.mjs --watch --debug -m --r2-persist --global-async-io --global-timers",
-    "build": "npm run set-version && esbuild --bundle src/index.js --format=esm --sourcemap --minify --outfile=dist/worker.mjs && npm run build:tsc",
-    "build:debug": "npm run set-version && esbuild --bundle src/index.js --format=esm --outfile=dist/worker.mjs",
+    "build": "esbuild --bundle src/index.js --format=esm --sourcemap --minify --outfile=dist/worker.mjs && npm run build:tsc",
+    "build:debug": "esbuild --bundle src/index.js --format=esm --outfile=dist/worker.mjs",
     "build:tsc": "tsc --build",
     "test:miniflare": "npm run build:debug && mocha --experimental-vm-modules --recursive test/**/*.spec.js",
     "test:unit": "npm run build:debug && mocha --experimental-vm-modules --recursive test/unit/**/*.spec.js",
@@ -50,7 +49,6 @@
     "@web3-storage/upload-client": "^16.1.1",
     "carstream": "^2.1.0",
     "chai": "^5.1.1",
-    "cross-env": "^7.0.3",
     "esbuild": "^0.18.20",
     "files-from-path": "^0.2.6",
     "miniflare": "^3.20240909.5",
diff --git a/scripts/set-version-env.js b/scripts/set-version-env.js
deleted file mode 100644
index 616356b..0000000
--- a/scripts/set-version-env.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { readFileSync } from 'fs'
-import { fileURLToPath } from 'url'
-import { dirname, join } from 'path'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = dirname(__filename)
-
-const packageJsonPath = join(__dirname, '../package.json')
-const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'))
-
-const { version } = packageJson
-process.env.VERSION = version
-console.log(`VERSION=${process.env.VERSION}`)
diff --git a/src/bindings.d.ts b/src/bindings.d.ts
index 254c658..66ddd36 100644
--- a/src/bindings.d.ts
+++ b/src/bindings.d.ts
@@ -10,7 +10,6 @@ export interface Environment {
   DEBUG: string
   CARPARK: R2Bucket
   CONTENT_CLAIMS_SERVICE_URL?: string
-  RATE_LIMITS_SERVICE_URL?: string
   ACCOUNTING_SERVICE_URL: string
   RATE_LIMITER: RateLimit
   AUTH_TOKEN_METADATA: KVNamespace
diff --git a/src/middleware.js b/src/middleware.js
index 38f1371..8368c5c 100644
--- a/src/middleware.js
+++ b/src/middleware.js
@@ -3,6 +3,7 @@ import { Dagula } from 'dagula'
 import { HttpError } from '@web3-storage/gateway-lib/util'
 import * as BatchingFetcher from '@web3-storage/blob-fetcher/fetcher/batching'
 import * as ContentClaimsLocator from '@web3-storage/blob-fetcher/locator/content-claims'
+import { version } from '../package.json'
 import { CAR_CODE } from './constants.js'
 import { handleCarBlock } from './handlers/car-block.js'
 
@@ -20,7 +21,7 @@ import { handleCarBlock } from './handlers/car-block.js'
  *
  * @type {import('@web3-storage/gateway-lib').Middleware<IpfsUrlContext, IpfsUrlContext, Environment>}
  */
-export async function withCarBlockHandler (handler) {
+export function withCarBlockHandler (handler) {
   return async (request, env, ctx) => {
     const { dataCid, searchParams } = ctx
     if (!dataCid) throw new Error('missing data CID')
@@ -93,7 +94,7 @@ export function withContentClaimsDagula (handler) {
 export function withVersionHeader (handler) {
   return async (request, env, ctx) => {
     const response = await handler(request, env, ctx)
-    response.headers.set('x-freeway-version', env.VERSION)
+    response.headers.set('x-freeway-version', version)
     return response
   }
 }