miniflare - npm Package Compare versions

Comparing version 0.0.0-fd68f6b43 to 0.0.0-fe1e34403

dist/src/workers/assets/assets-kv.worker.js

@@ -13,3 +13,7 @@ // src/workers/assets/assets-kv.worker.ts
     let { filePath, contentType } = entry, response = await env[SharedBindings.MAYBE_SERVICE_BLOBS].fetch(
-      new URL(filePath, "http://placeholder")
+      new URL(
+        // somewhere in blobservice I think this is being decoded again
+        filePath.split("/").map((x) => encodeURIComponent(x)).join("/"),
+        "http://placeholder"
+      )
     ), newResponse = new Response(response.body, response);
@@ -16,0 +20,0 @@ return newResponse.headers.append(

dist/src/workers/cache/cache.worker.js

@@ -29,5 +29,5 @@ var __create = Object.create;
 
-// ../../node_modules/.pnpm/http-cache-semantics@4.1.0/node_modules/http-cache-semantics/index.js
+// ../../node_modules/.pnpm/http-cache-semantics@4.1.1/node_modules/http-cache-semantics/index.js
 var require_http_cache_semantics = __commonJS({
-  "../../node_modules/.pnpm/http-cache-semantics@4.1.0/node_modules/http-cache-semantics/index.js"(exports, module) {
+  "../../node_modules/.pnpm/http-cache-semantics@4.1.1/node_modules/http-cache-semantics/index.js"(exports, module) {
     "use strict";
@@ -41,2 +41,3 @@ var statusCodeCacheableByDefault = /* @__PURE__ */ new Set([
       301,
+      308,
       404,
@@ -96,6 +97,6 @@ 405,
         return cc;
-      let parts = header.trim().split(/\s*,\s*/);
+      let parts = header.trim().split(/,/);
       for (let part of parts) {
-        let [k, v] = part.split(/\s*=\s*/, 2);
-        cc[k] = v === void 0 ? !0 : v.replace(/^"|"$/g, "");
+        let [k, v] = part.split(/=/, 2);
+        cc[k.trim()] = v === void 0 ? !0 : v.trim().replace(/^"|"$/g, "");
       }
@@ -102,0 +103,0 @@ return cc;

dist/src/workers/core/entry.worker.js

@@ -689,3 +689,3 @@ // ../../node_modules/.pnpm/kleur@4.1.5/node_modules/kleur/colors.mjs
 function isObject(value) {
-  return value && typeof value == "object";
+  return !!value && typeof value == "object";
 }
@@ -695,2 +695,5 @@ function getType(value) {
 }
+function isInternal(value) {
+  return isObject(value) && value[Symbol.for("cloudflare:internal-class")];
+}
 var ProxyServer = class {
@@ -710,3 +713,3 @@ constructor(_state, env) {
       let type = getType(value);
-      if (type === "Object" && !isPlainObject(value) || type === "Promise") {
+      if ((type === "Object" || isInternal(value)) && !isPlainObject(value) || type === "Promise") {
         let address = this.nextHeapAddress++;
@@ -869,3 +872,3 @@ this.heap.set(address, value), assert2(value !== null);
 var encoder = new TextEncoder();
-function getUserRequest(request, env) {
+function getUserRequest(request, env, clientIp) {
   let originalUrl = request.headers.get(CoreHeaders.ORIGINAL_URL), url = new URL(originalUrl ?? request.url), rewriteHeadersFromOriginalUrl = !1, proxySharedSecret = request.headers.get(
@@ -889,12 +892,7 @@ CoreHeaders.PROXY_SHARED_SECRET
   }
-  if (request = new Request(url, request), request.cf === void 0) {
-    let cf = {
-      ...env[CoreBindings.JSON_CF_BLOB],
-      // Defaulting to empty string to preserve undefined `Accept-Encoding`
-      // through Wrangler's proxy worker.
-      clientAcceptEncoding: request.headers.get("Accept-Encoding") ?? ""
-    };
-    request = new Request(request, { cf });
+  if (request = new Request(url, request), request.headers.set("Accept-Encoding", "br, gzip"), rewriteHeadersFromOriginalUrl && request.headers.set("Host", url.host), clientIp && !request.headers.get("CF-Connecting-IP")) {
+    let ipv4Regex = /(?<ip>.*?):\d+/, ipv6Regex = /\[(?<ip>.*?)\]:\d+/, ip = clientIp.match(ipv6Regex)?.groups?.ip ?? clientIp.match(ipv4Regex)?.groups?.ip;
+    ip && request.headers.set("CF-Connecting-IP", ip);
   }
-  return request.headers.set("Accept-Encoding", "br, gzip"), rewriteHeadersFromOriginalUrl && request.headers.set("Host", url.host), request.headers.delete(CoreHeaders.PROXY_SHARED_SECRET), request.headers.delete(CoreHeaders.ORIGINAL_URL), request.headers.delete(CoreHeaders.DISABLE_PRETTY_ERROR), request;
+  return request.headers.delete(CoreHeaders.PROXY_SHARED_SECRET), request.headers.delete(CoreHeaders.ORIGINAL_URL), request.headers.delete(CoreHeaders.DISABLE_PRETTY_ERROR), request;
 }
@@ -1014,8 +1012,13 @@ function getTargetService(request, url, env) {
   async fetch(request, env, ctx) {
-    let startTime = Date.now();
-    if (request.headers.get(CoreHeaders.OP) !== null)
+    let startTime = Date.now(), clientIp = request.cf?.clientIp, clientCfBlobHeader = request.headers.get(CoreHeaders.CF_BLOB), cf = clientCfBlobHeader ? JSON.parse(clientCfBlobHeader) : {
+      ...env[CoreBindings.JSON_CF_BLOB],
+      // Defaulting to empty string to preserve undefined `Accept-Encoding`
+      // through Wrangler's proxy worker.
+      clientAcceptEncoding: request.headers.get("Accept-Encoding") ?? ""
+    };
+    if (request = new Request(request, { cf }), request.headers.get(CoreHeaders.OP) !== null)
       return handleProxy(request, env);
     let disablePrettyErrorPage = request.headers.get(CoreHeaders.DISABLE_PRETTY_ERROR) !== null, clientAcceptEncoding = request.headers.get("Accept-Encoding");
     try {
-      request = getUserRequest(request, env);
+      request = getUserRequest(request, env, clientIp);
     } catch (e) {
@@ -1022,0 +1025,0 @@ if (e instanceof HttpError)

dist/src/workers/d1/database.worker.js

@@ -53,3 +53,3 @@ var __defProp = Object.defineProperty;
         let colType = columns[i].type, cellType = typeof cell;
-        return cell === null ? "NULL" : colType === "INTEGER" || cellType === "number" ? cell : colType === "TEXT" || cellType === "string" ? outputQuotedEscapedString(cell) : cell instanceof ArrayBuffer ? `X'${Array.prototype.map.call(new Uint8Array(cell), (b) => b.toString(16)).join("")}'` : (console.log({ colType, cellType, cell, column: columns[i] }), "ERROR");
+        return cell === null ? "NULL" : colType === "INTEGER" || cellType === "number" ? cell : colType === "TEXT" || cellType === "string" ? outputQuotedEscapedString(cell) : cell instanceof ArrayBuffer ? `X'${Array.prototype.map.call(new Uint8Array(cell), (b) => b.toString(16).padStart(2, "0")).join("")}'` : (console.log({ colType, cellType, cell, column: columns[i] }), "ERROR");
       });
@@ -56,0 +56,0 @@ yield `INSERT INTO ${sqliteQuote(table)} VALUES(${formattedCells.join(",")});`;

dist/src/workers/queues/broker.worker.js

@@ -57,8 +57,10 @@ var __defProp = Object.defineProperty;
   maxBatchSize: z.number().min(0).max(100).optional(),
-  maxBatchTimeout: z.number().min(0).max(30).optional(),
+  maxBatchTimeout: z.number().min(0).max(60).optional(),
   // seconds
   maxRetires: z.number().min(0).max(100).optional(),
+  // deprecated
+  maxRetries: z.number().min(0).max(100).optional(),
   deadLetterQueue: z.ostring(),
   retryDelay: QueueMessageDelaySchema
-}), QueueConsumerSchema = /* @__PURE__ */ z.intersection(
+}).transform((queue) => (queue.maxRetires !== void 0 && (queue.maxRetries = queue.maxRetires), queue)), QueueConsumerSchema = /* @__PURE__ */ z.intersection(
   QueueConsumerOptionsSchema,
@@ -202,3 +204,3 @@ z.object({ workerName: z.string() })
     assert(consumer !== void 0);
-    let batchSize = consumer.maxBatchSize ?? DEFAULT_BATCH_SIZE, maxAttempts = (consumer.maxRetires ?? DEFAULT_RETRIES) + 1, maxAttemptsS = maxAttempts === 1 ? "" : "s", batch = this.#messages.splice(0, batchSize), startTime = Date.now(), endTime, response;
+    let batchSize = consumer.maxBatchSize ?? DEFAULT_BATCH_SIZE, maxAttempts = (consumer.maxRetries ?? DEFAULT_RETRIES) + 1, maxAttemptsS = maxAttempts === 1 ? "" : "s", batch = this.#messages.splice(0, batchSize), startTime = Date.now(), endTime, response;
     try {
@@ -205,0 +207,0 @@ response = await this.#dispatchBatch(consumer.workerName, batch), endTime = Date.now();

package.json

 {
   "name": "miniflare",
-  "version": "0.0.0-fd68f6b43",
+  "version": "0.0.0-fe1e34403",
   "description": "Fun, full-featured, fully-local simulator for Cloudflare Workers",
@@ -41,4 +41,4 @@ "keywords": [
     "undici": "^5.28.4",
-    "workerd": "1.20240909.0",
-    "ws": "^8.17.1",
+    "workerd": "1.20241230.0",
+    "ws": "^8.18.0",
     "youch": "^3.2.2",
@@ -49,3 +49,3 @@ "zod": "^3.22.3"
     "@ava/typescript": "^4.1.0",
-    "@cloudflare/workers-types": "^4.20240909.0",
+    "@cloudflare/workers-types": "^4.20241230.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -57,4 +57,3 @@ "@types/debug": "^4.1.7",
     "@types/mime": "^3.0.4",
-    "@types/node": "20.8.3",
-    "@types/rimraf": "^4.0.5",
+    "@types/node": "^18.19.59",
     "@types/stoppable": "^1.1.1",
@@ -77,2 +76,3 @@ "@types/which": "^2.0.1",
     "expect-type": "^0.15.0",
+    "heap-js": "^2.5.0",
     "http-cache-semantics": "^4.1.0",
@@ -82,7 +82,8 @@ "kleur": "^4.1.5",
     "pretty-bytes": "^6.0.0",
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.10",
     "source-map": "^0.6.1",
     "which": "^2.0.2",
     "@cloudflare/kv-asset-handler": "0.3.4",
-    "@cloudflare/workers-shared": "0.0.0-fd68f6b43"
+    "@cloudflare/workers-shared": "0.0.0-fe1e34403",
+    "@cloudflare/workflows-shared": "0.2.2"
   },
@@ -89,0 +90,0 @@ "engines": {

README.md

@@ -217,2 +217,16 @@ # 🔥 Miniflare
 
+### `interface WorkflowOptions`
+
+- `name: string`
+
+  The name of the Workflow.
+
+- `className: string`
+
+  The name of the class exported from the Worker that implements the `WorkflowEntrypoint`.
+
+- `scriptName?`: string
+
+  The name of the script that includes the `WorkflowEntrypoint`. This is optional because it defaults to the current script if not set.
+
 #### Core
@@ -578,2 +592,18 @@
 
+#### Assets
+
+- `directory?: string`
+  Path to serve Workers static asset files from.
+
+- `binding?: string`
+  Binding name to inject as a `Fetcher` binding to allow access to static assets from within the Worker.
+
+- `assetOptions?: { html_handling?: HTMLHandlingOptions, not_found_handling?: NotFoundHandlingOptions}`
+  Configuration for file-based asset routing - see [docs](https://developers.cloudflare.com/workers/static-assets/routing/#routing-configuration) for options
+
+#### Workflows
+
+- `workflows?: WorkflowOptions[]`
+  Configuration for one or more Workflows in your project.
+
 #### Analytics Engine, Sending Email, Vectorize and Workers for Platforms
@@ -719,2 +749,6 @@
 
+- `workflowsPersist?: Persistence`
+
+Where to persist data stored in Workflows. See docs for `Persistence`.
+
 #### Analytics Engine, Browser Rendering, Sending Email, Vectorize, Workers AI and Workers for Platforms
@@ -721,0 +755,0 @@

No alert changes

Improved metrics

Total package byte prevSize

2714625

increased by7.21%

Number of package files

40

increased by5.26%

Lines of code

42312

increased by6.85%

Number of lines in readme file

882

increased by4.01%

Worsened metrics

Dev dependency count

37

increased by2.78%

Number of low supply chain risk alerts

50

increased by4.17%

Dependency changes

• + Added@cloudflare/workerd-darwin-64@1.20241230.0(transitive)

• + Added@cloudflare/workerd-darwin-arm64@1.20241230.0(transitive)

• + Added@cloudflare/workerd-linux-64@1.20241230.0(transitive)

• + Added@cloudflare/workerd-linux-arm64@1.20241230.0(transitive)

• + Added@cloudflare/workerd-windows-64@1.20241230.0(transitive)

• + Addedworkerd@1.20241230.0(transitive)

• - Removed@cloudflare/workerd-darwin-64@1.20240909.0(transitive)

• - Removed@cloudflare/workerd-darwin-arm64@1.20240909.0(transitive)

• - Removed@cloudflare/workerd-linux-64@1.20240909.0(transitive)

• - Removed@cloudflare/workerd-linux-arm64@1.20240909.0(transitive)

• - Removed@cloudflare/workerd-windows-64@1.20240909.0(transitive)

• - Removedworkerd@1.20240909.0(transitive)

• Updatedworkerd@1.20241230.0

• Updatedws@^8.18.0