miniflare 0.0.0-e771fe990 → 0.0.0-e7c7235fd

package/dist/src/index.d.ts

@@ -75,12 +75,18 @@ export declare const AssetsOptionsSchema: z.ZodObject<{
         routingConfig: z.ZodOptional<z.ZodObject<{
             has_user_worker: z.ZodOptional<z.ZodBoolean>;
             invoke_user_worker_ahead_of_assets: z.ZodOptional<z.ZodBoolean>;
+            account_id: z.ZodOptional<z.ZodNumber>;
+            script_id: z.ZodOptional<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             has_user_worker?: boolean;
             invoke_user_worker_ahead_of_assets?: boolean;
+            account_id?: number;
+            script_id?: number;
         }, {
             has_user_worker?: boolean;
             invoke_user_worker_ahead_of_assets?: boolean;
+            account_id?: number;
+            script_id?: number;
         }>>;
         assetConfig: z.ZodOptional<z.ZodObject<{
             html_handling: z.ZodOptional<z.ZodEnum<["auto-trailing-slash", "force-trailing-slash", "drop-trailing-slash", "none"]>>;
@@ -102,6 +108,8 @@ export declare const AssetsOptionsSchema: z.ZodObject<{
         routingConfig?: {
             has_user_worker?: boolean;
             invoke_user_worker_ahead_of_assets?: boolean;
+            account_id?: number;
+            script_id?: number;
         } | undefined;
         assetConfig?: {
             html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
@@ -115,6 +123,8 @@ export declare const AssetsOptionsSchema: z.ZodObject<{
         routingConfig?: {
             has_user_worker?: boolean;
             invoke_user_worker_ahead_of_assets?: boolean;
+            account_id?: number;
+            script_id?: number;
         } | undefined;
         assetConfig?: {
             html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
@@ -130,6 +140,8 @@ export declare const AssetsOptionsSchema: z.ZodObject<{
         routingConfig?: {
             has_user_worker?: boolean;
             invoke_user_worker_ahead_of_assets?: boolean;
+            account_id?: number;
+            script_id?: number;
         } | undefined;
         assetConfig?: {
             html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
@@ -145,6 +157,8 @@ export declare const AssetsOptionsSchema: z.ZodObject<{
         routingConfig?: {
             has_user_worker?: boolean;
             invoke_user_worker_ahead_of_assets?: boolean;
+            account_id?: number;
+            script_id?: number;
         } | undefined;
         assetConfig?: {
             html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
@@ -1445,8 +1459,6 @@ export declare const DurableObjectsSharedOptionsSchema: z.ZodObject<{
 
 export declare function encodeSitesKey(key: string): string;
 
-export declare const ENTRY_SOCKET_HTTP_OPTIONS: HttpOptions;
-
 export declare class ErrorEvent extends Event {
     readonly error: Error | null;
     constructor(type: "error", init?: {
@@ -3274,12 +3286,18 @@ export declare const PLUGINS: {
     routingConfig: z.ZodOptional<z.ZodObject<{
     has_user_worker: z.ZodOptional<z.ZodBoolean>;
     invoke_user_worker_ahead_of_assets: z.ZodOptional<z.ZodBoolean>;
+    account_id: z.ZodOptional<z.ZodNumber>;
+    script_id: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
     has_user_worker?: boolean;
     invoke_user_worker_ahead_of_assets?: boolean;
+    account_id?: number;
+    script_id?: number;
     }, {
     has_user_worker?: boolean;
     invoke_user_worker_ahead_of_assets?: boolean;
+    account_id?: number;
+    script_id?: number;
     }>>;
     assetConfig: z.ZodOptional<z.ZodObject<{
     html_handling: z.ZodOptional<z.ZodEnum<["auto-trailing-slash", "force-trailing-slash", "drop-trailing-slash", "none"]>>;
@@ -3301,6 +3319,8 @@ export declare const PLUGINS: {
     routingConfig?: {
     has_user_worker?: boolean;
     invoke_user_worker_ahead_of_assets?: boolean;
+    account_id?: number;
+    script_id?: number;
     } | undefined;
     assetConfig?: {
     html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
@@ -3314,6 +3334,8 @@ export declare const PLUGINS: {
     routingConfig?: {
     has_user_worker?: boolean;
     invoke_user_worker_ahead_of_assets?: boolean;
+    account_id?: number;
+    script_id?: number;
     } | undefined;
     assetConfig?: {
     html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
@@ -3329,6 +3351,8 @@ export declare const PLUGINS: {
     routingConfig?: {
     has_user_worker?: boolean;
     invoke_user_worker_ahead_of_assets?: boolean;
+    account_id?: number;
+    script_id?: number;
     } | undefined;
     assetConfig?: {
     html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
@@ -3344,6 +3368,8 @@ export declare const PLUGINS: {
     routingConfig?: {
     has_user_worker?: boolean;
     invoke_user_worker_ahead_of_assets?: boolean;
+    account_id?: number;
+    script_id?: number;
     } | undefined;
     assetConfig?: {
     html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";

package/dist/src/index.js

@@ -2456,7 +2456,6 @@ __export(src_exports, {
   DispatchFetchDispatcher: () => DispatchFetchDispatcher,
   DurableObjectsOptionsSchema: () => DurableObjectsOptionsSchema,
   DurableObjectsSharedOptionsSchema: () => DurableObjectsSharedOptionsSchema,
-  ENTRY_SOCKET_HTTP_OPTIONS: () => ENTRY_SOCKET_HTTP_OPTIONS,
   ErrorEvent: () => ErrorEvent,
   File: () => import_undici4.File,
   FormData: () => import_undici4.FormData,
@@ -4540,11 +4539,6 @@ ez/dHA==
 `;
 
 // src/http/server.ts
-var ENTRY_SOCKET_HTTP_OPTIONS = {
-  // Even though we inject a `cf` object in the entry worker, allow it to
-  // be customised via `dispatchFetch`
-  cfBlobHeader: CoreHeaders.CF_BLOB
-};
 async function getEntrySocketHttpOptions(coreOpts) {
   let privateKey = void 0;
   let certificateChain = void 0;
@@ -4561,7 +4555,6 @@ async function getEntrySocketHttpOptions(coreOpts) {
   if (privateKey && certificateChain) {
     return {
       https: {
-        options: ENTRY_SOCKET_HTTP_OPTIONS,
         tlsOptions: {
           keypair: {
             privateKey,
@@ -4571,7 +4564,7 @@ async function getEntrySocketHttpOptions(coreOpts) {
       }
     };
   } else {
-    return { http: ENTRY_SOCKET_HTTP_OPTIONS };
+    return { http: {} };
   }
 }
 function valueOrFile(value, filePath) {
@@ -4617,7 +4610,10 @@ var MAX_ASSET_SIZE = 25 * 1024 * 1024;
 var import_zod4 = require("zod");
 var RoutingConfigSchema = import_zod4.z.object({
   has_user_worker: import_zod4.z.boolean().optional(),
-  invoke_user_worker_ahead_of_assets: import_zod4.z.boolean().optional()
+  invoke_user_worker_ahead_of_assets: import_zod4.z.boolean().optional(),
+  // Used for analytics and reporting
+  account_id: import_zod4.z.number().optional(),
+  script_id: import_zod4.z.number().optional()
 });
 var AssetConfigSchema = import_zod4.z.object({
   html_handling: import_zod4.z.enum([
@@ -4629,6 +4625,15 @@ var AssetConfigSchema = import_zod4.z.object({
   not_found_handling: import_zod4.z.enum(["single-page-application", "404-page", "none"]).optional(),
   serve_directly: import_zod4.z.boolean().optional()
 });
+var InternalConfigSchema = import_zod4.z.object({
+  // Used for analytics and reporting
+  account_id: import_zod4.z.number().optional(),
+  script_id: import_zod4.z.number().optional()
+});
+var AssetWorkerConfigShema = import_zod4.z.object({
+  ...AssetConfigSchema.shape,
+  ...InternalConfigSchema.shape
+});
 
 // ../workers-shared/utils/helpers.ts
 var import_node_path = require("node:path");
@@ -4647,7 +4652,7 @@ var getContentType = (absFilePath) => {
   return contentType;
 };
 
-// ../../node_modules/.pnpm/pretty-bytes@6.0.0/node_modules/pretty-bytes/index.js
+// ../../node_modules/.pnpm/pretty-bytes@6.1.1/node_modules/pretty-bytes/index.js
 var BYTE_UNITS = [
   "B",
   "kB",
@@ -4661,7 +4666,7 @@ var BYTE_UNITS = [
 ];
 var BIBYTE_UNITS = [
   "B",
-  "kiB",
+  "KiB",
   "MiB",
   "GiB",
   "TiB",
@@ -4708,11 +4713,13 @@ function prettyBytes(number, options) {
   options = {
     bits: false,
     binary: false,
+    space: true,
     ...options
   };
   const UNITS = options.bits ? options.binary ? BIBIT_UNITS : BIT_UNITS : options.binary ? BIBYTE_UNITS : BYTE_UNITS;
+  const separator = options.space ? " " : "";
   if (options.signed && number === 0) {
-    return ` 0 ${UNITS[0]}`;
+    return ` 0${separator}${UNITS[0]}`;
   }
   const isNegative = number < 0;
   const prefix = isNegative ? "-" : options.signed ? "+" : "";
@@ -4728,7 +4735,7 @@ function prettyBytes(number, options) {
   }
   if (number < 1) {
     const numberString2 = toLocaleString(number, options.locale, localeOptions);
-    return prefix + numberString2 + " " + UNITS[0];
+    return prefix + numberString2 + separator + UNITS[0];
   }
   const exponent = Math.min(Math.floor(options.binary ? Math.log(number) / Math.log(1024) : Math.log10(number) / 3), UNITS.length - 1);
   number /= (options.binary ? 1024 : 1e3) ** exponent;
@@ -4737,7 +4744,7 @@ function prettyBytes(number, options) {
   }
   const numberString = toLocaleString(Number(number), options.locale, localeOptions);
   const unit = UNITS[exponent];
-  return prefix + numberString + " " + unit;
+  return prefix + numberString + separator + unit;
 }
 
 // embed-worker:/home/runner/work/workers-sdk/workers-sdk/packages/miniflare/src/workers/assets/assets.worker.ts
@@ -7087,11 +7094,20 @@ function validateCompatibilityDate(log, compatibilityDate) {
   }
   return compatibilityDate;
 }
-function buildJsonBindings(bindings) {
-  return Object.entries(bindings).map(([name, value]) => ({
-    name,
-    json: JSON.stringify(value)
-  }));
+function buildBindings(bindings) {
+  return Object.entries(bindings).map(([name, value]) => {
+    if (typeof value === "string") {
+      return {
+        name,
+        text: value
+      };
+    } else {
+      return {
+        name,
+        json: JSON.stringify(value)
+      };
+    }
+  });
 }
 var WRAPPED_MODULE_PREFIX = "miniflare-internal:wrapped:";
 function workerNameToWrappedModule(workerName) {
@@ -7108,7 +7124,7 @@ var CORE_PLUGIN = {
   getBindings(options, workerIndex) {
     const bindings = [];
     if (options.bindings !== void 0) {
-      bindings.push(...buildJsonBindings(options.bindings));
+      bindings.push(...buildBindings(options.bindings));
     }
     if (options.wasmBindings !== void 0) {
       bindings.push(
@@ -7157,7 +7173,7 @@ var CORE_PLUGIN = {
           const entrypoint = isObject ? designator.entrypoint : void 0;
           const bindings2 = isObject ? designator.bindings : void 0;
           const moduleName2 = workerNameToWrappedModule(scriptName);
-          const innerBindings = bindings2 === void 0 ? [] : buildJsonBindings(bindings2);
+          const innerBindings = bindings2 === void 0 ? [] : buildBindings(bindings2);
           return {
             name,
             wrapped: { moduleName: moduleName2, entrypoint, innerBindings }
@@ -8548,7 +8564,7 @@ var RatelimitOptionsSchema = import_zod19.z.object({
 var RATELIMIT_PLUGIN_NAME = "ratelimit";
 var SERVICE_RATELIMIT_PREFIX = `${RATELIMIT_PLUGIN_NAME}`;
 var SERVICE_RATELIMIT_MODULE = `cloudflare-internal:${SERVICE_RATELIMIT_PREFIX}:module`;
-function buildJsonBindings2(bindings) {
+function buildJsonBindings(bindings) {
   return Object.entries(bindings).map(([name, value]) => ({
     name,
     json: JSON.stringify(value)
@@ -8565,7 +8581,7 @@ var RATELIMIT_PLUGIN = {
         name,
         wrapped: {
           moduleName: SERVICE_RATELIMIT_MODULE,
-          innerBindings: buildJsonBindings2({
+          innerBindings: buildJsonBindings({
             namespaceId: name,
             limit: config.simple.limit,
             period: config.simple.period
@@ -9766,7 +9782,7 @@ var Miniflare2 = class {
       sockets.push({
         name: SOCKET_ENTRY_LOCAL,
         service: { name: SERVICE_ENTRY },
-        http: ENTRY_SOCKET_HTTP_OPTIONS,
+        http: {},
         address: "127.0.0.1:0"
       });
     }
@@ -10320,7 +10336,6 @@ var Miniflare2 = class {
   DispatchFetchDispatcher,
   DurableObjectsOptionsSchema,
   DurableObjectsSharedOptionsSchema,
-  ENTRY_SOCKET_HTTP_OPTIONS,
   ErrorEvent,
   File,
   FormData,