wrangler
Advanced tools
Comparing version
#!/usr/bin/env node | ||
const { spawn } = require("child_process"); | ||
const path = require("path"); | ||
const fs = require("fs"); | ||
const os = require("os"); | ||
const MIN_NODE_VERSION = "16.13.0"; | ||
const debug = | ||
process.env["WRANGLER_LOG"] === "debug" | ||
? (...args) => console.log(...args) | ||
: () => {}; | ||
const MIN_NODE_VERSION = "18.0.0"; | ||
@@ -31,26 +25,2 @@ let wranglerProcess; | ||
let pathToCACerts = process.env.NODE_EXTRA_CA_CERTS; | ||
if (pathToCACerts) { | ||
// TODO: | ||
// - should we log a warning here? | ||
// - maybe we can generate a certificate that concatenates with ours? | ||
// | ||
// I do think it'll be rare that someone wants to add a cert AND | ||
// use Cloudflare WARP, but let's wait till the situation actually | ||
// arises before we do anything about it | ||
} else { | ||
const osTempDir = os.tmpdir(); | ||
const certDir = path.join(osTempDir, "wrangler-cert"); | ||
const certPath = path.join(certDir, "Cloudflare_CA.pem"); | ||
// copy cert to the system temp dir if needed | ||
if (!fs.existsSync(certPath)) { | ||
fs.mkdirSync(certDir, { recursive: true }); | ||
fs.writeFileSync( | ||
certPath, | ||
fs.readFileSync(path.join(__dirname, "../Cloudflare_CA.pem"), "utf-8") | ||
); | ||
} | ||
pathToCACerts = certPath; | ||
} | ||
return spawn( | ||
@@ -67,6 +37,2 @@ process.execPath, | ||
stdio: ["inherit", "inherit", "inherit", "ipc"], | ||
env: { | ||
...process.env, | ||
NODE_EXTRA_CA_CERTS: pathToCACerts, | ||
}, | ||
} | ||
@@ -73,0 +39,0 @@ ) |
174
package.json
{ | ||
"name": "wrangler", | ||
"version": "0.0.0-1c6a55d8", | ||
"version": "0.0.0-1c94eee00", | ||
"description": "Command-line interface for all things Cloudflare Workers", | ||
@@ -50,118 +50,64 @@ "keywords": [ | ||
"kv-asset-handler.js", | ||
"Cloudflare_CA.pem" | ||
"config-schema.json" | ||
], | ||
"jest": { | ||
"coverageReporters": [ | ||
"json", | ||
"html", | ||
"text", | ||
"cobertura" | ||
], | ||
"moduleNameMapper": { | ||
"clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js", | ||
"miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js" | ||
}, | ||
"restoreMocks": true, | ||
"setupFilesAfterEnv": [ | ||
"<rootDir>/src/__tests__/jest.setup.ts" | ||
], | ||
"testRegex": "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$", | ||
"testTimeout": 50000, | ||
"transform": { | ||
"^.+\\.c?(t|j)sx?$": [ | ||
"esbuild-jest", | ||
{ | ||
"sourcemap": true | ||
} | ||
] | ||
}, | ||
"transformIgnorePatterns": [ | ||
"node_modules/.pnpm/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes)" | ||
], | ||
"snapshotFormat": { | ||
"escapeString": true, | ||
"printBasicPrototype": true | ||
} | ||
}, | ||
"dependencies": { | ||
"@esbuild-plugins/node-globals-polyfill": "^0.2.3", | ||
"@esbuild-plugins/node-modules-polyfill": "^0.2.2", | ||
"blake3-wasm": "^2.1.5", | ||
"chokidar": "^3.5.3", | ||
"esbuild": "0.17.19", | ||
"nanoid": "^3.3.3", | ||
"path-to-regexp": "^6.2.0", | ||
"resolve": "^1.22.8", | ||
"resolve.exports": "^2.0.2", | ||
"selfsigned": "^2.0.1", | ||
"source-map": "0.6.1", | ||
"xxhash-wasm": "^1.0.1", | ||
"miniflare": "3.20240223.1", | ||
"@cloudflare/kv-asset-handler": "0.3.1" | ||
"@cloudflare/unenv-preset": "2.3.0", | ||
"blake3-wasm": "2.1.5", | ||
"esbuild": "0.24.2", | ||
"path-to-regexp": "6.3.0", | ||
"unenv": "2.0.0-rc.15", | ||
"workerd": "1.20250319.0", | ||
"@cloudflare/kv-asset-handler": "0.4.0", | ||
"miniflare": "0.0.0-1c94eee00" | ||
}, | ||
"devDependencies": { | ||
"@cloudflare/ai": "^1.0.35", | ||
"@cloudflare/eslint-config-worker": "*", | ||
"@cloudflare/types": "^6.18.4", | ||
"@cloudflare/workers-types": "^4.20230914.0", | ||
"@aws-sdk/client-s3": "^3.721.0", | ||
"@cloudflare/types": "6.18.4", | ||
"@cloudflare/workers-types": "^4.20250319.0", | ||
"@cspotcode/source-map-support": "0.8.1", | ||
"@iarna/toml": "^3.0.0", | ||
"@microsoft/api-extractor": "^7.28.3", | ||
"@microsoft/api-extractor": "^7.47.0", | ||
"@sentry/node": "^7.86.0", | ||
"@sentry/types": "^7.86.0", | ||
"@sentry/utils": "^7.86.0", | ||
"@types/body-parser": "^1.19.2", | ||
"@types/busboy": "^1.5.0", | ||
"@types/command-exists": "^1.2.0", | ||
"@types/express": "^4.17.13", | ||
"@types/glob-to-regexp": "0.4.1", | ||
"@types/glob-to-regexp": "^0.4.1", | ||
"@types/is-ci": "^3.0.0", | ||
"@types/javascript-time-ago": "^2.0.3", | ||
"@types/jest": "^29.5.5", | ||
"@types/mime": "^2.0.3", | ||
"@types/mime": "^3.0.4", | ||
"@types/minimatch": "^5.1.2", | ||
"@types/node": "^18.19.75", | ||
"@types/node-forge": "^1.3.11", | ||
"@types/prompts": "^2.0.14", | ||
"@types/react": "^17.0.37", | ||
"@types/resolve": "^1.20.6", | ||
"@types/serve-static": "^1.13.10", | ||
"@types/shell-quote": "^1.7.2", | ||
"@types/signal-exit": "^3.0.1", | ||
"@types/source-map-support": "^0.5.7", | ||
"@types/supports-color": "^8.1.1", | ||
"@types/ws": "^8.5.3", | ||
"@types/yargs": "^17.0.10", | ||
"@types/ws": "^8.5.7", | ||
"@types/yargs": "^17.0.22", | ||
"@vitest/ui": "~3.0.8", | ||
"@webcontainer/env": "^1.1.0", | ||
"body-parser": "^1.20.0", | ||
"chalk": "^2.4.2", | ||
"chalk": "^5.2.0", | ||
"chokidar": "^4.0.1", | ||
"cli-table3": "^0.6.3", | ||
"clipboardy": "^3.0.0", | ||
"cmd-shim": "^4.1.0", | ||
"command-exists": "^1.2.9", | ||
"concurrently": "^7.2.2", | ||
"devtools-protocol": "^0.0.955664", | ||
"dotenv": "^16.0.0", | ||
"esbuild-jest": "0.5.0", | ||
"concurrently": "^8.2.2", | ||
"date-fns": "^4.1.0", | ||
"devtools-protocol": "^0.0.1182435", | ||
"dotenv": "^16.3.1", | ||
"execa": "^6.1.0", | ||
"express": "^4.18.1", | ||
"finalhandler": "^1.2.0", | ||
"find-up": "^6.3.0", | ||
"get-port": "^6.1.2", | ||
"glob-to-regexp": "0.4.1", | ||
"http-terminator": "^3.2.0", | ||
"get-port": "^7.0.0", | ||
"glob-to-regexp": "^0.4.1", | ||
"https-proxy-agent": "7.0.2", | ||
"ignore": "^5.2.0", | ||
"ink": "^3.2.0", | ||
"ink-select-input": "^4.2.1", | ||
"ink-spinner": "^4.0.3", | ||
"ink-table": "^3.0.0", | ||
"ink-testing-library": "^2.1.0", | ||
"ink-text-input": "^4.0.3", | ||
"is-ci": "^3.0.1", | ||
"itty-time": "^1.0.6", | ||
"javascript-time-ago": "^2.5.4", | ||
"jest": "^29.7.0", | ||
"jest-fetch-mock": "^3.0.3", | ||
"jest-websocket-mock": "^2.5.0", | ||
"md5-file": "5.0.0", | ||
"mime": "^3.0.0", | ||
"minimatch": "^5.1.0", | ||
"msw": "^0.49.1", | ||
"mock-socket": "^9.3.1", | ||
"msw": "2.4.3", | ||
"node-forge": "^1.3.1", | ||
"open": "^8.4.0", | ||
@@ -172,29 +118,31 @@ "p-queue": "^7.2.0", | ||
"prompts": "^2.4.2", | ||
"react": "^17.0.2", | ||
"react-error-boundary": "^3.1.4", | ||
"remove-accents-esm": "^0.0.1", | ||
"resolve": "^1.22.8", | ||
"rimraf": "^5.0.10", | ||
"selfsigned": "^2.0.1", | ||
"semiver": "^1.1.0", | ||
"serve-static": "^1.15.0", | ||
"shell-quote": "^1.8.1", | ||
"shellac": "^0.8.0", | ||
"signal-exit": "^3.0.7", | ||
"strip-ansi": "^7.0.1", | ||
"source-map": "^0.6.1", | ||
"strip-ansi": "^7.1.0", | ||
"supports-color": "^9.2.2", | ||
"timeago.js": "^4.0.2", | ||
"ts-dedent": "^2.2.0", | ||
"undici": "5.28.3", | ||
"ts-json-schema-generator": "^1.5.0", | ||
"typescript": "^5.7.2", | ||
"undici": "^5.28.5", | ||
"update-check": "^1.5.4", | ||
"ws": "^8.5.0", | ||
"vitest": "~3.0.8", | ||
"vitest-websocket-mock": "^0.4.0", | ||
"ws": "8.18.0", | ||
"xdg-app-paths": "^8.3.0", | ||
"xxhash-wasm": "^1.0.1", | ||
"yargs": "^17.7.2", | ||
"yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz", | ||
"@cloudflare/cli": "1.1.1", | ||
"@cloudflare/pages-shared": "^0.11.16", | ||
"@cloudflare/eslint-config-worker": "1.1.0", | ||
"@cloudflare/pages-shared": "^0.13.17", | ||
"@cloudflare/workers-shared": "0.0.0-1c94eee00", | ||
"@cloudflare/workers-tsconfig": "0.0.0" | ||
}, | ||
"optionalDependencies": { | ||
"fsevents": "~2.3.2" | ||
}, | ||
"peerDependencies": { | ||
"@cloudflare/workers-types": "^4.20230914.0" | ||
"@cloudflare/workers-types": "^4.20250319.0" | ||
}, | ||
@@ -206,5 +154,12 @@ "peerDependenciesMeta": { | ||
}, | ||
"optionalDependencies": { | ||
"fsevents": "~2.3.2", | ||
"sharp": "^0.33.5" | ||
}, | ||
"engines": { | ||
"node": ">=16.17.0" | ||
"node": ">=18.0.0" | ||
}, | ||
"volta": { | ||
"extends": "../../package.json" | ||
}, | ||
"workers-sdk": { | ||
@@ -215,14 +170,15 @@ "prerelease": true | ||
"assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts", | ||
"build": "pnpm run clean && pnpm run bundle && pnpm run emit-types", | ||
"build": "pnpm run clean && pnpm run bundle && pnpm run emit-types && pnpm run generate-json-schema", | ||
"bundle": "node -r esbuild-register scripts/bundle.ts", | ||
"check:lint": "eslint .", | ||
"check:type": "tsc", | ||
"check:lint": "eslint . --max-warnings=0", | ||
"check:type": "tsc -p ./tsconfig.json && tsc -p ./templates/tsconfig.json", | ||
"clean": "rimraf wrangler-dist miniflare-dist emitted-types", | ||
"dev": "pnpm run clean && concurrently -c black,blue --kill-others-on-fail false \"pnpm run bundle --watch\" \"pnpm run check:type --watch --preserveWatchOutput\"", | ||
"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts", | ||
"generate-json-schema": "node -r esbuild-register scripts/generate-json-schema.ts", | ||
"start": "pnpm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js", | ||
"test": "pnpm run assert-git-version && jest", | ||
"test:ci": "pnpm run test --coverage", | ||
"test": "dotenv -- pnpm run assert-git-version && dotenv -- vitest", | ||
"test:ci": "pnpm run test run", | ||
"test:debug": "pnpm run test --silent=false --verbose=true", | ||
"test:e2e": "vitest -c ./e2e/vitest.config.ts", | ||
"test:e2e": "dotenv -- vitest -c ./e2e/vitest.config.mts", | ||
"test:watch": "pnpm run test --testTimeout=50000 --watch", | ||
@@ -229,0 +185,0 @@ "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json" |
@@ -6,3 +6,3 @@ <h1 align="center"> ⛅️ wrangler </h1> | ||
<img alt="GitHub commit activity (branch)" src="https://img.shields.io/github/commit-activity/w/cloudflare/workers-sdk/main?style=flat-square"> | ||
<a href="https://discord.gg/CloudflareDev"><img alt="Discord" src="https://img.shields.io/discord/595317990191398933?color=%23F48120&style=flat-square"></a> | ||
<a href="https://discord.cloudflare.com"><img alt="Discord" src="https://img.shields.io/discord/595317990191398933?color=%23F48120&style=flat-square"></a> | ||
</section> | ||
@@ -14,38 +14,36 @@ | ||
To get started quickly with a Hello World worker, run the command below: | ||
```bash | ||
# Make a javascript file | ||
echo "export default { fetch() { return new Response('hello world') } }" > index.js | ||
# try it out | ||
npx wrangler dev index.js | ||
# and then deploy it | ||
npx wrangler deploy index.js --name my-worker | ||
# visit https://my-worker.<your workers subdomain>.workers.dev | ||
npx wrangler init my-worker -y | ||
``` | ||
## Create a Project | ||
For more info, visit our [Getting Started](https://developers.cloudflare.com/workers/get-started/guide/) guide. | ||
```bash | ||
# Generate a new project | ||
npx wrangler init my-worker --no-delegate-c3 | ||
# try it out | ||
cd my-worker && npm run start | ||
# and then deploy it | ||
npm run deploy | ||
``` | ||
<details><summary>Wrangler System Requirements</summary> | ||
## Installation: | ||
We support running the Wrangler CLI with the [Current, Active, and Maintenance](https://nodejs.org/en/about/previous-releases) versions of Node.js. Your Worker will always be executed in `workerd`, the open source Cloudflare Workers runtime. | ||
```bash | ||
$ npm install wrangler --save-dev | ||
``` | ||
Wrangler is only supported on macOS 13.5+, Windows 11, and Linux distros that support glib 2.35. This follows [`workerd`'s OS support policy](https://github.com/cloudflare/workerd?tab=readme-ov-file#running-workerd). | ||
## Configuration: | ||
</details> | ||
Wrangler is configured via a `wrangler.toml` file in the project root. When utilizing the `wrangler init` command, a `wrangler.toml` file will be created for you. | ||
## Documentation | ||
Example: | ||
For the latest Wrangler documentation, [click here](https://developers.cloudflare.com/workers/wrangler/). | ||
To read more about Workers in general: | ||
- [Getting Started](https://developers.cloudflare.com/workers/get-started/guide/) | ||
- [How Workers works](https://developers.cloudflare.com/workers/reference/how-workers-works/) | ||
- [Observability](https://developers.cloudflare.com/workers/observability/) | ||
- [Platform](https://developers.cloudflare.com/workers/platform/) | ||
## Configuration | ||
Wrangler is configured via a `wrangler.toml` or `wrangler.json` file in the project root. An example configuration generated by `npx wrangler init` or `npx create cloudflare` is as follows: | ||
```toml | ||
name = "my-worker" | ||
main = "./src/index.ts" # init w/ TypeScript | ||
main = "./src/index.ts" | ||
compatibility_date = "YYYY-MM-DD" | ||
@@ -58,21 +56,19 @@ ``` | ||
### `wrangler init [name]` | ||
### Workers | ||
Creates a Worker project. For details on configuration keys and values, refer to the [documentation](https://developers.cloudflare.com/workers/wrangler/commands/#init). | ||
#### `wrangler dev` | ||
### `wrangler dev` | ||
Start a local development server, with live reloading and devtools. | ||
### `wrangler deploy` | ||
#### `wrangler deploy` | ||
Publish the given script to the worldwide Cloudflare network. | ||
Publish the given script to Cloudflare's global network. | ||
For more commands and options, refer to the [documentation](https://developers.cloudflare.com/workers/wrangler/commands/). | ||
## Pages | ||
### Pages | ||
### `wrangler pages dev [directory] [-- command]` | ||
#### `wrangler pages dev [directory]` | ||
Either serves a static build asset directory, or proxies itself in front of a command. | ||
Serves a static build asset directory. | ||
@@ -82,5 +78,1 @@ Builds and runs functions from a `./functions` directory or uses a `_worker.js` file inside the static build asset directory. | ||
For more commands and options, refer to the [documentation](https://developers.cloudflare.com/pages/platform/functions#develop-and-preview-locally) or run `wrangler pages dev --help`. | ||
## Documentation | ||
For the latest Wrangler documentation, [click here](https://developers.cloudflare.com/workers/wrangler/). |
@@ -12,3 +12,3 @@ const urls = new Set(); | ||
).url | ||
); | ||
); | ||
if (url.port && url.port !== "443" && url.protocol === "https:") { | ||
@@ -15,0 +15,0 @@ if (!urls.has(url.toString())) { |
declare module "__ENTRY_POINT__" { | ||
import type { Middleware } from "./middleware/common"; | ||
const worker: ExportedHandler & { | ||
middleware?: Middleware[]; | ||
envWrappers: ((env: Record<string, unknown>) => Record<string, unknown>)[]; | ||
}; | ||
import { Middleware } from "./middleware/common"; | ||
import { WorkerEntrypoint } from "cloudflare:workers"; | ||
export type WorkerEntrypointConstructor = typeof WorkerEntrypoint; | ||
const worker: ExportedHandler | WorkerEntrypointConstructor; | ||
export default worker; | ||
export const __INTERNAL_WRANGLER_MIDDLEWARE__: Middleware[]; | ||
} | ||
@@ -9,0 +11,0 @@ |
import { afterAll, beforeAll, describe, expect, it } from "vitest"; | ||
import { unstable_dev } from "wrangler"; | ||
import type { UnstableDevWorker } from "wrangler"; | ||
import type { Unstable_DevWorker } from "wrangler"; | ||
describe("Worker", () => { | ||
let worker: UnstableDevWorker; | ||
let worker: Unstable_DevWorker; | ||
@@ -8,0 +8,0 @@ beforeAll(async () => { |
@@ -1,20 +0,15 @@ | ||
// // This loads all middlewares exposed on the middleware object | ||
// // and then starts the invocation chain. | ||
// // The big idea is that we can add these to the middleware export dynamically | ||
// // through wrangler, or we can potentially let users directly add them as a sort | ||
// // of "plugin" system. | ||
// This loads all middlewares exposed on the middleware object and then starts | ||
// the invocation chain. The big idea is that we can add these to the middleware | ||
// export dynamically through wrangler, or we can potentially let users directly | ||
// add them as a sort of "plugin" system. | ||
import worker from "__ENTRY_POINT__"; | ||
import { | ||
__facade_invoke__, | ||
__facade_register__, | ||
Dispatcher, | ||
Middleware, | ||
} from "./common"; | ||
import ENTRY, { __INTERNAL_WRANGLER_MIDDLEWARE__ } from "__ENTRY_POINT__"; | ||
import { __facade_invoke__, __facade_register__, Dispatcher } from "./common"; | ||
import type { WorkerEntrypointConstructor } from "__ENTRY_POINT__"; | ||
// We need to preserve all of the exports from the worker | ||
// Preserve all the exports from the worker | ||
export * from "__ENTRY_POINT__"; | ||
class __Facade_ScheduledController__ implements ScheduledController { | ||
#noRetry: ScheduledController["noRetry"]; | ||
readonly #noRetry: ScheduledController["noRetry"]; | ||
@@ -38,67 +33,30 @@ constructor( | ||
const __facade_modules_fetch__: ExportedHandlerFetchHandler = function ( | ||
request, | ||
env, | ||
ctx | ||
) { | ||
if (worker.fetch === undefined) | ||
throw new Error("Handler does not export a fetch() function."); | ||
return worker.fetch(request, env, ctx); | ||
}; | ||
function wrapExportedHandler(worker: ExportedHandler): ExportedHandler { | ||
// If we don't have any middleware defined, just return the handler as is | ||
if ( | ||
__INTERNAL_WRANGLER_MIDDLEWARE__ === undefined || | ||
__INTERNAL_WRANGLER_MIDDLEWARE__.length === 0 | ||
) { | ||
return worker; | ||
} | ||
// Otherwise, register all middleware once | ||
for (const middleware of __INTERNAL_WRANGLER_MIDDLEWARE__) { | ||
__facade_register__(middleware); | ||
} | ||
function getMaskedEnv(rawEnv: unknown) { | ||
let env = rawEnv as Record<string, unknown>; | ||
if (worker.envWrappers && worker.envWrappers.length > 0) { | ||
for (const wrapFn of worker.envWrappers) { | ||
env = wrapFn(env); | ||
const fetchDispatcher: ExportedHandlerFetchHandler = function ( | ||
request, | ||
env, | ||
ctx | ||
) { | ||
if (worker.fetch === undefined) { | ||
throw new Error("Handler does not export a fetch() function."); | ||
} | ||
} | ||
return env; | ||
} | ||
return worker.fetch(request, env, ctx); | ||
}; | ||
/** | ||
* This type is here to cause a type error if a new export handler is added to | ||
* `ExportHandler` without it being included in the `facade` below. | ||
*/ | ||
type MissingExportHandlers = Omit< | ||
Required<ExportedHandler>, | ||
"tail" | "trace" | "scheduled" | "queue" | "test" | "email" | "fetch" | ||
>; | ||
let registeredMiddleware = false; | ||
const facade: ExportedHandler<unknown> & MissingExportHandlers = { | ||
...(worker.tail && { | ||
tail: maskHandlerEnv(worker.tail), | ||
}), | ||
...(worker.trace && { | ||
trace: maskHandlerEnv(worker.trace), | ||
}), | ||
...(worker.scheduled && { | ||
scheduled: maskHandlerEnv(worker.scheduled), | ||
}), | ||
...(worker.queue && { | ||
queue: maskHandlerEnv(worker.queue), | ||
}), | ||
...(worker.test && { | ||
test: maskHandlerEnv(worker.test), | ||
}), | ||
...(worker.email && { | ||
email: maskHandlerEnv(worker.email), | ||
}), | ||
fetch(request, rawEnv, ctx) { | ||
const env = getMaskedEnv(rawEnv); | ||
// Get the chain of middleware from the worker object | ||
if (worker.middleware && worker.middleware.length > 0) { | ||
// Make sure we only register middleware once: | ||
// https://github.com/cloudflare/workers-sdk/issues/2386#issuecomment-1614715911 | ||
if (!registeredMiddleware) { | ||
registeredMiddleware = true; | ||
for (const middleware of worker.middleware) { | ||
__facade_register__(middleware); | ||
} | ||
} | ||
const __facade_modules_dispatch__: Dispatcher = function (type, init) { | ||
return { | ||
...worker, | ||
fetch(request, env, ctx) { | ||
const dispatcher: Dispatcher = function (type, init) { | ||
if (type === "scheduled" && worker.scheduled !== undefined) { | ||
@@ -113,26 +71,66 @@ const controller = new __Facade_ScheduledController__( | ||
}; | ||
return __facade_invoke__(request, env, ctx, dispatcher, fetchDispatcher); | ||
}, | ||
}; | ||
} | ||
function wrapWorkerEntrypoint( | ||
klass: WorkerEntrypointConstructor | ||
): WorkerEntrypointConstructor { | ||
// If we don't have any middleware defined, just return the handler as is | ||
if ( | ||
__INTERNAL_WRANGLER_MIDDLEWARE__ === undefined || | ||
__INTERNAL_WRANGLER_MIDDLEWARE__.length === 0 | ||
) { | ||
return klass; | ||
} | ||
// Otherwise, register all middleware once | ||
for (const middleware of __INTERNAL_WRANGLER_MIDDLEWARE__) { | ||
__facade_register__(middleware); | ||
} | ||
// `extend`ing `klass` here so other RPC methods remain callable | ||
return class extends klass { | ||
#fetchDispatcher: ExportedHandlerFetchHandler<Record<string, unknown>> = ( | ||
request, | ||
env, | ||
ctx | ||
) => { | ||
this.env = env; | ||
this.ctx = ctx; | ||
if (super.fetch === undefined) { | ||
throw new Error("Entrypoint class does not define a fetch() function."); | ||
} | ||
return super.fetch(request); | ||
}; | ||
#dispatcher: Dispatcher = (type, init) => { | ||
if (type === "scheduled" && super.scheduled !== undefined) { | ||
const controller = new __Facade_ScheduledController__( | ||
Date.now(), | ||
init.cron ?? "", | ||
() => {} | ||
); | ||
return super.scheduled(controller); | ||
} | ||
}; | ||
fetch(request: Request<unknown, IncomingRequestCfProperties>) { | ||
return __facade_invoke__( | ||
request, | ||
env, | ||
ctx, | ||
__facade_modules_dispatch__, | ||
__facade_modules_fetch__ | ||
this.env, | ||
this.ctx, | ||
this.#dispatcher, | ||
this.#fetchDispatcher | ||
); | ||
} else { | ||
// We didn't have any middleware so we can skip the invocation chain, | ||
// and just call the fetch handler directly | ||
// We "don't care" if this is undefined as we want to have the same behavior | ||
// as if the worker completely bypassed middleware. | ||
return __facade_modules_fetch__(request, env, ctx); | ||
} | ||
}, | ||
}; | ||
}; | ||
} | ||
type HandlerFn<D, R> = (data: D, env: unknown, ctx: ExecutionContext) => R; | ||
function maskHandlerEnv<D, R>(handler: HandlerFn<D, R>): HandlerFn<D, R> { | ||
return (data, env, ctx) => handler(data, getMaskedEnv(env), ctx); | ||
let WRAPPED_ENTRY: ExportedHandler | WorkerEntrypointConstructor | undefined; | ||
if (typeof ENTRY === "object") { | ||
WRAPPED_ENTRY = wrapExportedHandler(ENTRY); | ||
} else if (typeof ENTRY === "function") { | ||
WRAPPED_ENTRY = wrapWorkerEntrypoint(ENTRY); | ||
} | ||
export default facade; | ||
export default WRAPPED_ENTRY; |
@@ -19,2 +19,1 @@ import type { Middleware } from "./common"; | ||
export default drainBody; | ||
export const wrap = undefined; |
@@ -33,2 +33,1 @@ import type { Middleware } from "./common"; | ||
export default jsonError; | ||
export const wrap = undefined; |
@@ -12,5 +12,19 @@ import type { Middleware } from "./common"; | ||
} | ||
return middlewareCtx.next(request, env); | ||
const resp = await middlewareCtx.next(request, env); | ||
// If you open the `/__scheduled` page in a browser, the browser will automatically make a request to `/favicon.ico`. | ||
// For scheduled Workers _without_ a fetch handler, this will result in a 500 response that clutters the log with unhelpful error messages. | ||
// To avoid this, inject a 404 response to favicon.ico loads on the `/__scheduled` page | ||
if ( | ||
request.headers.get("referer")?.endsWith("/__scheduled") && | ||
url.pathname === "/favicon.ico" && | ||
resp.status === 500 | ||
) { | ||
return new Response(null, { status: 404 }); | ||
} | ||
return resp; | ||
}; | ||
export default scheduled; |
@@ -23,6 +23,7 @@ // @ts-ignore entry point will get replaced | ||
if (isRoutingRuleMatch(pathname, include)) { | ||
if (worker.fetch === undefined) { | ||
const workerAsHandler = worker as ExportedHandler; | ||
if (workerAsHandler.fetch === undefined) { | ||
throw new TypeError("Entry point missing `fetch` handler"); | ||
} | ||
return worker.fetch(request, env, context); | ||
return workerAsHandler.fetch(request, env, context); | ||
} | ||
@@ -29,0 +30,0 @@ } |
@@ -44,3 +44,3 @@ import { match } from "path-to-regexp"; | ||
P extends string = string, | ||
Data extends Record<string, unknown> = Record<string, unknown> | ||
Data extends Record<string, unknown> = Record<string, unknown>, | ||
> = (context: EventContext<Env, P, Data>) => Response | Promise<Response>; | ||
@@ -52,3 +52,3 @@ | ||
Data extends Record<string, unknown> = Record<string, unknown>, | ||
PluginArgs = unknown | ||
PluginArgs = unknown, | ||
> = ( | ||
@@ -55,0 +55,0 @@ context: EventPluginContext<Env, P, Data, PluginArgs> |
@@ -32,3 +32,3 @@ import { match } from "path-to-regexp"; | ||
P extends string = string, | ||
Data extends Record<string, unknown> = Record<string, unknown> | ||
Data extends Record<string, unknown> = Record<string, unknown>, | ||
> = (context: EventContext<Env, P, Data>) => Response | Promise<Response>; | ||
@@ -35,0 +35,0 @@ /* end @cloudflare/workers-types */ |
@@ -63,3 +63,6 @@ import assert from "node:assert"; | ||
export class InspectorProxyWorker implements DurableObject { | ||
constructor(_state: DurableObjectState, readonly env: Env) {} | ||
constructor( | ||
_state: DurableObjectState, | ||
readonly env: Env | ||
) {} | ||
@@ -66,0 +69,0 @@ websockets: { |
@@ -36,3 +36,6 @@ import { | ||
export class ProxyWorker implements DurableObject { | ||
constructor(readonly state: DurableObjectState, readonly env: Env) {} | ||
constructor( | ||
readonly state: DurableObjectState, | ||
readonly env: Env | ||
) {} | ||
@@ -125,7 +128,14 @@ proxyData?: ProxyData; | ||
// set request.url in the UserWorker | ||
const innerUrl = new URL(request.url); | ||
Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides); | ||
const innerUrl = urlFromParts( | ||
proxyData.userWorkerInnerUrlOverrides ?? {}, | ||
request.url | ||
); | ||
headers.set("MF-Original-URL", innerUrl.href); | ||
headers.set("MF-Disable-Pretty-Error", "true"); // disables the UserWorker miniflare instance from rendering the pretty error -- instead the ProxyWorker miniflare instance will intercept the json error response and render the pretty error page | ||
// Preserve client `Accept-Encoding`, rather than using Worker's default | ||
// of `Accept-Encoding: br, gzip` | ||
const encoding = request.cf?.clientAcceptEncoding; | ||
if (encoding !== undefined) headers.set("Accept-Encoding", encoding); | ||
rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl); | ||
@@ -273,24 +283,3 @@ | ||
end.append( | ||
` | ||
<script> | ||
(function() { | ||
var ws; | ||
function recover() { | ||
ws = null; | ||
setTimeout(initLiveReload, 100); | ||
} | ||
function initLiveReload() { | ||
if (ws) return; | ||
var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host; | ||
ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}"); | ||
ws.onclose = recover; | ||
ws.onerror = recover; | ||
ws.onmessage = location.reload.bind(location); | ||
} | ||
})(); | ||
</script> | ||
`, | ||
{ html: true } | ||
); | ||
end.append(liveReloadScript, { html: true }); | ||
} | ||
@@ -303,2 +292,23 @@ }, | ||
const liveReloadScript = ` | ||
<script defer type="application/javascript"> | ||
(function() { | ||
var ws; | ||
function recover() { | ||
ws = null; | ||
setTimeout(initLiveReload, 100); | ||
} | ||
function initLiveReload() { | ||
if (ws) return; | ||
var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host; | ||
ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}"); | ||
ws.onclose = recover; | ||
ws.onerror = recover; | ||
ws.onmessage = location.reload.bind(location); | ||
} | ||
initLiveReload(); | ||
})(); | ||
</script> | ||
`; | ||
/** | ||
@@ -305,0 +315,0 @@ * Rewrite references to URLs in request/response headers. |
{ | ||
"compilerOptions": { | ||
/* Visit https://aka.ms/tsconfig.json to read more about this file */ | ||
/* Projects */ | ||
// "incremental": true, /* Enable incremental compilation */ | ||
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ | ||
// "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */ | ||
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */ | ||
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ | ||
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ | ||
/* Language and Environment */ | ||
"target": "es2021" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, | ||
@@ -18,89 +7,17 @@ "lib": [ | ||
] /* Specify a set of bundled library declaration files that describe the target runtime environment. */, | ||
"jsx": "react" /* Specify what JSX code is generated. */, | ||
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ | ||
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ | ||
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */ | ||
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ | ||
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */ | ||
// "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */ | ||
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ | ||
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ | ||
/* Modules */ | ||
"module": "es2022" /* Specify what module code is generated. */, | ||
// "rootDir": "./", /* Specify the root folder within your source files. */ | ||
"moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */, | ||
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ | ||
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ | ||
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ | ||
// "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */ | ||
"jsx": "react-jsx" /* Specify what JSX code is generated. */, | ||
"module": "ESNext" /* Specify what module code is generated. */, | ||
"moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */, | ||
"types": [ | ||
"@cloudflare/workers-types" | ||
] /* Specify type package names to be included without being referenced in a source file. */, | ||
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ | ||
"resolveJsonModule": true /* Enable importing .json files */, | ||
// "noResolve": true, /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */ | ||
/* JavaScript Support */ | ||
"allowJs": true /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */, | ||
"checkJs": false /* Enable error reporting in type-checked JavaScript files. */, | ||
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */ | ||
/* Emit */ | ||
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ | ||
// "declarationMap": true, /* Create sourcemaps for d.ts files. */ | ||
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ | ||
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */ | ||
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ | ||
// "outDir": "./", /* Specify an output folder for all emitted files. */ | ||
// "removeComments": true, /* Disable emitting comments. */ | ||
"noEmit": true /* Disable emitting files from a compilation. */, | ||
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ | ||
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */ | ||
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ | ||
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ | ||
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ | ||
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ | ||
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ | ||
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ | ||
// "newLine": "crlf", /* Set the newline character for emitting files. */ | ||
// "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */ | ||
// "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */ | ||
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ | ||
// "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */ | ||
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */ | ||
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ | ||
/* Interop Constraints */ | ||
"isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */, | ||
"allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */, | ||
// "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */, | ||
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ | ||
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, | ||
/* Type Checking */ | ||
"strict": true /* Enable all strict type-checking options. */, | ||
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */ | ||
// "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */ | ||
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ | ||
// "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */ | ||
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ | ||
// "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */ | ||
// "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */ | ||
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ | ||
// "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */ | ||
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */ | ||
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ | ||
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ | ||
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ | ||
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ | ||
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ | ||
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */ | ||
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ | ||
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ | ||
/* Completeness */ | ||
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ | ||
"noUncheckedIndexedAccess": true, | ||
"skipLibCheck": true /* Skip type checking all .d.ts files. */ | ||
} | ||
} |
@@ -7,3 +7,10 @@ { | ||
"include": ["**/*.ts"], | ||
"exclude": ["__tests__", "./init-tests/**"] | ||
"exclude": [ | ||
"__tests__", | ||
"./init-tests/**", | ||
// Note: `startDevWorker` and `middleware` should also be included but some work is needed | ||
// for that first (see: https://github.com/cloudflare/workers-sdk/issues/8303) | ||
"startDevWorker", | ||
"middleware" | ||
] | ||
} |
@@ -191,4 +191,3 @@ // templates/startDevWorker/InspectorProxyWorker.ts | ||
tryDrainRuntimeMessageBuffer = () => { | ||
if (this.websockets.devtools === void 0) | ||
return; | ||
if (this.websockets.devtools === void 0) return; | ||
for (const msg of this.runtimeMessageBuffer.splice(0)) { | ||
@@ -348,4 +347,3 @@ if (isDevToolsEvent(msg, "Debugger.scriptParsed")) { | ||
let hostHeader = req.headers.get("Host"); | ||
if (hostHeader == null) | ||
return new Response(null, { status: 400 }); | ||
if (hostHeader == null) return new Response(null, { status: 400 }); | ||
try { | ||
@@ -369,6 +367,4 @@ const host = new URL(`http://${hostHeader}`); | ||
const allowed = ALLOWED_ORIGIN_HOSTNAMES.some((rule) => { | ||
if (typeof rule === "string") | ||
return origin.hostname === rule; | ||
else | ||
return rule.test(origin.hostname); | ||
if (typeof rule === "string") return origin.hostname === rule; | ||
else return rule.test(origin.hostname); | ||
}); | ||
@@ -375,0 +371,0 @@ if (!allowed) { |
@@ -88,4 +88,3 @@ // src/api/startDevWorker/utils.ts | ||
const { proxyData } = this; | ||
if (proxyData === void 0) | ||
return; | ||
if (proxyData === void 0) return; | ||
for (const [request, deferredResponse] of this.getOrderedQueue()) { | ||
@@ -98,10 +97,13 @@ this.requestRetryQueue.delete(request); | ||
Object.assign(userWorkerUrl, proxyData.userWorkerUrl); | ||
const innerUrl = new URL(request.url); | ||
Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides); | ||
const innerUrl = urlFromParts( | ||
proxyData.userWorkerInnerUrlOverrides ?? {}, | ||
request.url | ||
); | ||
headers.set("MF-Original-URL", innerUrl.href); | ||
headers.set("MF-Disable-Pretty-Error", "true"); | ||
const encoding = request.cf?.clientAcceptEncoding; | ||
if (encoding !== void 0) headers.set("Accept-Encoding", encoding); | ||
rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl); | ||
for (const [key, value] of Object.entries(proxyData.headers ?? {})) { | ||
if (value === void 0) | ||
continue; | ||
if (value === void 0) continue; | ||
if (key.toLowerCase() === "cookie") { | ||
@@ -187,24 +189,3 @@ const existing = request.headers.get("cookie") ?? ""; | ||
websocketUrl.protocol = websocketUrl.protocol === "http:" ? "ws:" : "wss:"; | ||
end.append( | ||
` | ||
<script> | ||
(function() { | ||
var ws; | ||
function recover() { | ||
ws = null; | ||
setTimeout(initLiveReload, 100); | ||
} | ||
function initLiveReload() { | ||
if (ws) return; | ||
var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host; | ||
ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}"); | ||
ws.onclose = recover; | ||
ws.onerror = recover; | ||
ws.onmessage = location.reload.bind(location); | ||
} | ||
})(); | ||
</script> | ||
`, | ||
{ html: true } | ||
); | ||
end.append(liveReloadScript, { html: true }); | ||
} | ||
@@ -215,2 +196,22 @@ } | ||
} | ||
var liveReloadScript = ` | ||
<script defer type="application/javascript"> | ||
(function() { | ||
var ws; | ||
function recover() { | ||
ws = null; | ||
setTimeout(initLiveReload, 100); | ||
} | ||
function initLiveReload() { | ||
if (ws) return; | ||
var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host; | ||
ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}"); | ||
ws.onclose = recover; | ||
ws.onerror = recover; | ||
ws.onmessage = location.reload.bind(location); | ||
} | ||
initLiveReload(); | ||
})(); | ||
</script> | ||
`; | ||
function rewriteUrlRelatedHeaders(headers, from, to) { | ||
@@ -217,0 +218,0 @@ const setCookie = headers.getAll("Set-Cookie"); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Environment variable access
Supply chain riskPackage accesses environment variables, which may be a sign of credential stuffing or data theft.
Found 3 instances in 1 package
Filesystem access
Supply chain riskAccesses the file system, and could potentially read sensitive data.
Found 1 instance in 1 package
11
-31.25%80
-11.11%31228
17.89%0
-100%6790916
-13.25%48
-2.04%75
-9.64%+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
+ Added
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
Updated
Updated
Updated
Updated