@astrale-os/adapter-cloudflare 0.5.0-beta.36 → 0.5.0-beta.38

package/dist/adapter.js

@@ -7,6 +7,8 @@ import { artifact, materialize } from './build/artifact.js';
 import { generateWranglerConfig } from './build/codegen/wrangler.js';
 import { resolveRouter, workerName } from './build/configuration.js';
 import { startFrontend } from './build/frontend-v1.js';
+import { loadWorkerArtifact } from './build/worker/index.js';
+import { workerModules } from './build/worker/modules.js';
 import { ensureWranglerDispatchNamespace, runWranglerDeploymentStatus, runWranglerDeploy, runWranglerDev, runWranglerReleaseDeploy, } from './build/wrangler-cli.js';
 import { deployCloudflare } from './deploy/index.js';
 import { signingIdentitySecrets } from './identity/secret.js';
@@ -34,6 +36,7 @@ export function cloudflareWithDependencies(environments, dependencies) {
         environments,
         prepare: dependencies.artifact,
         async watch(parameters, context) {
+            const workerArtifact = loadWorkerArtifact(context.artifact);
             const identity = await dependencies.signingIdentity({
                 projectDir: context.projectDir,
                 source: parameters.signingIdentity,
@@ -57,7 +60,8 @@ export function cloudflareWithDependencies(environments, dependencies) {
             const configPath = join(directory, 'wrangler.watch.jsonc');
             await writeFile(configPath, generateWranglerConfig({
                 workerName: name,
-                main: `./${context.artifact.entrypoint}`,
+                main: `./${workerArtifact.release.entrypoint}`,
+                modules: workerModules(workerArtifact.release),
                 vars: {
                     ...parameters.vars,
                     ...(parameters.host === undefined ? {} : { WORKER_URL: parameters.host }),

package/dist/build/artifact.js

@@ -57,7 +57,7 @@ async function prepare(params, context, direct) {
         main: `./${RELEASE_ENTRY}`,
         vars: runtimeVars(params, configuredIssuer),
         secretBindings: [SIGNING_IDENTITY_BINDING],
-        modules: { baseDir: './bundle', globs: ['service.mjs'] },
+        modules: { baseDir: './bundle', rules: [{ type: 'ESModule', globs: ['service.mjs'] }] },
         ...(context.build.frontend?.source.kind === 'vite'
             ? {
                 frontend: {

package/dist/build/codegen/wrangler.d.ts

@@ -27,10 +27,13 @@ export interface WranglerCodegenOptions {
     vars?: Record<string, string>;
     /** Secret binding names required by generated Worker code. */
     secretBindings?: readonly string[];
-    /** JavaScript modules retained outside the startup entry and loaded on demand. */
+    /** Modules retained outside the startup entry and loaded on demand. */
     modules?: {
         readonly baseDir: string;
-        readonly globs: readonly string[];
+        readonly rules: readonly {
+            readonly type: 'ESModule' | 'CompiledWasm' | 'Text' | 'Data';
+            readonly globs: readonly string[];
+        }[];
     };
     /** Add the SELF service binding (autobinding). */
     selfBinding: boolean;

package/dist/build/codegen/wrangler.js

@@ -64,13 +64,11 @@ export function generateWranglerConfig(opts) {
     if (opts.modules !== undefined) {
         config.find_additional_modules = true;
         config.base_dir = opts.modules.baseDir;
-        config.rules = [
-            {
-                type: 'ESModule',
-                globs: [...opts.modules.globs],
-                fallthrough: true,
-            },
-        ];
+        config.rules = opts.modules.rules.map((rule) => ({
+            type: rule.type,
+            globs: [...rule.globs],
+            fallthrough: true,
+        }));
     }
     if (opts.releases !== undefined) {
         config.dispatch_namespaces = [opts.releases];

package/dist/build/direct.js

@@ -1,14 +1,13 @@
-import { posix } from 'node:path';
 import { isDeepStrictEqual } from 'node:util';
 import { releaseNamespace, releaseWorkerName } from '../release/index.js';
 import { generateWranglerConfig } from './codegen/wrangler.js';
 import { resolveRouter, workerName } from './configuration.js';
 import { frontendRoutes } from './frontend/routes.js';
+import { workerModules } from './worker/modules.js';
 export function admitDirectPlacement(artifact, worker, parameters) {
     const name = workerName(parameters, worker.origin);
     const release = config(artifact, 'wrangler.release.jsonc');
     const gateway = config(artifact, 'wrangler.gateway.jsonc');
-    const directory = posix.dirname(worker.release.entrypoint);
     const router = resolveRouter(parameters.router);
     const frontend = artifact.build.frontend;
     const hasViteFrontend = frontend?.source.kind === 'vite';
@@ -22,10 +21,7 @@ export function admitDirectPlacement(artifact, worker, parameters) {
         main: `./${worker.release.entrypoint}`,
         vars: worker.bindings.vars,
         secretBindings: worker.bindings.requiredSecrets,
-        modules: {
-            baseDir: `./${directory}`,
-            globs: moduleGlobs(worker, directory),
-        },
+        modules: directModules(worker.release),
         ...(hasViteFrontend
             ? {
                 frontend: {
@@ -53,15 +49,13 @@ export function admitDirectPlacement(artifact, worker, parameters) {
         selfBinding: false,
     }));
 }
-function moduleGlobs(worker, directory) {
-    return worker.release.modules
-        .filter((module) => module.path !== worker.release.entrypoint)
-        .map((module) => {
-        const relative = posix.relative(directory, module.path);
-        if (relative === '' || relative === '..' || relative.startsWith('../'))
-            mismatch();
-        return relative;
-    });
+function directModules(worker) {
+    try {
+        return workerModules(worker);
+    }
+    catch {
+        mismatch();
+    }
 }
 function generated(input) {
     return JSON.parse(generateWranglerConfig(input));

package/dist/build/gateway/prepare.js

@@ -3,11 +3,12 @@ import { dirname, join } from 'node:path';
 import { admitWorkerBundle } from '../bundle/admit.js';
 import { generateWranglerConfig } from '../codegen/wrangler.js';
 import { qualifyWorkerBundle } from '../qualification.js';
+import { workerModuleSpecifier } from '../worker/specifier.js';
 import { runWranglerBundle } from '../wrangler-cli.js';
 import { generateGatewayEntry } from './source.js';
 export async function prepareGateway(input) {
     const gatewaySource = join(input.directory, 'gateway.gen.ts');
-    await writeFile(gatewaySource, generateGatewayEntry(input.revision));
+    await writeFile(gatewaySource, generateGatewayEntry(input.revision, workerModuleSpecifier()));
     const configPath = join(input.directory, 'wrangler.gateway.prepare.jsonc');
     await writeFile(configPath, generateWranglerConfig({
         workerName: input.name,

package/dist/build/gateway/source.d.ts

@@ -1 +1 @@
-export declare function generateGatewayEntry(revision: string): string;
+export declare function generateGatewayEntry(revision: string, workerSpecifier?: string): string;

package/dist/build/gateway/source.js

@@ -1,6 +1,6 @@
-export function generateGatewayEntry(revision) {
+export function generateGatewayEntry(revision, workerSpecifier = '@astrale-os/adapter-cloudflare/worker') {
     return `// AUTO-GENERATED by @astrale-os/adapter-cloudflare — do not edit.
-import { cloudflareGatewayEntry } from '@astrale-os/adapter-cloudflare/worker'
+import { cloudflareGatewayEntry } from ${JSON.stringify(workerSpecifier)}
 
 export default cloudflareGatewayEntry({ current: ${JSON.stringify(revision)} })
 `;

package/dist/build/worker/artifact.load.js

@@ -19,6 +19,9 @@ export function loadWorkerArtifact(artifact) {
         throw new TypeError('Cloudflare Worker artifact manifest is invalid JSON.', { cause });
     }
     const manifest = admitManifest(decoded);
+    if (artifact.entrypoint !== manifest.release.entrypoint) {
+        throw new TypeError('Cloudflare Worker artifact entrypoint differs from its manifest.');
+    }
     const origin = artifact.build.schema.compiled.root.origin;
     const revision = artifact.build.schema.compiled.root.revision;
     if (manifest.origin !== origin || manifest.revision !== revision) {
@@ -82,6 +85,9 @@ function executable(artifact, manifest, claimed, label) {
     if (!manifest.modules.some((module) => module.path === manifest.entrypoint)) {
         throw new TypeError(`Cloudflare Worker ${label} entrypoint is not a module.`);
     }
+    if (manifest.modules.find((module) => module.path === manifest.entrypoint)?.kind !== 'esm') {
+        throw new TypeError(`Cloudflare Worker ${label} entrypoint is not an ES module.`);
+    }
     return Object.freeze({ entrypoint: manifest.entrypoint, modules: Object.freeze(modules) });
 }
 function admitManifest(input) {

package/dist/build/worker/codegen/entry.d.ts

@@ -1,2 +1,2 @@
 /** Generate the isolate-startup entry that realizes the heavy Service on first request. */
-export declare function generateExecutionEntry(serviceSpecifier: string): string;
+export declare function generateExecutionEntry(serviceSpecifier: string, workerSpecifier?: string): string;

package/dist/build/worker/codegen/entry.js

@@ -1,7 +1,7 @@
 /** Generate the isolate-startup entry that realizes the heavy Service on first request. */
-export function generateExecutionEntry(serviceSpecifier) {
+export function generateExecutionEntry(serviceSpecifier, workerSpecifier = '@astrale-os/adapter-cloudflare/worker') {
     return `// AUTO-GENERATED by @astrale-os/adapter-cloudflare — do not edit.
-import type { CloudflareWorker } from '@astrale-os/adapter-cloudflare/worker'
+import type { CloudflareWorker } from ${JSON.stringify(workerSpecifier)}
 
 const SERVICE_SPECIFIER = ${JSON.stringify(serviceSpecifier)}
 let servicePromise: Promise<CloudflareWorker<CloudflareEnv>> | undefined

package/dist/build/worker/codegen/service.d.ts

@@ -2,6 +2,7 @@ import type { BuildMaterial } from '@astrale-os/sdk/deployment/build';
 export interface ExecutionCodegenOptions {
     readonly origin: string;
     readonly runtimeSpecifier: string;
+    readonly workerSpecifier?: string;
     readonly material: BuildMaterial;
     readonly maximumRequestBytes?: number;
     readonly providerAssignedWorker?: string;

package/dist/build/worker/codegen/service.js

@@ -1,4 +1,5 @@
 export function generateExecutionService(options) {
+    const workerSpecifier = options.workerSpecifier ?? '@astrale-os/adapter-cloudflare/worker';
     const router = options.router;
     const routerPredicate = router === undefined
         ? ''
@@ -19,10 +20,10 @@ function isInstanceHost(host: string): boolean {
     return `// AUTO-GENERATED by @astrale-os/adapter-cloudflare — do not edit.
 // Domain origin: ${options.origin}
 import type { BuildMaterial } from '@astrale-os/sdk/deployment/build'
-import type { CloudflareAdapterBindings } from '@astrale-os/adapter-cloudflare/worker'
+import type { CloudflareAdapterBindings } from ${JSON.stringify(workerSpecifier)}
 
-import { cloudflareWorkerEntry } from '@astrale-os/adapter-cloudflare/worker'
-import { decodeSigningIdentity, runtimeBindings } from '@astrale-os/adapter-cloudflare/worker'
+import { cloudflareWorkerEntry } from ${JSON.stringify(workerSpecifier)}
+import { decodeSigningIdentity, runtimeBindings } from ${JSON.stringify(workerSpecifier)}
 
 type WorkerEnv = CloudflareEnv & CloudflareAdapterBindings & {
   readonly ASTRALE_SIGNING_IDENTITY: string

package/dist/build/worker/execution.prepare.js

@@ -8,15 +8,18 @@ import { generateWranglerConfig } from '../codegen/wrangler.js';
 import { workerRequestLimit } from '../configuration.js';
 import { qualifyWorkerBundle } from '../qualification.js';
 import { runWranglerBundle } from '../wrangler-cli.js';
+import { workerModuleSpecifier } from './specifier.js';
 export const RELEASE_ENTRY = 'bundle/index.mjs';
 export const RELEASE_SERVICE = 'bundle/service.mjs';
 export async function prepareExecution(input) {
     const runtimePath = resolve(input.context.projectDir, input.context.runtime.reference.path);
     const runtimeSpecifier = moduleSpecifier(relative(input.directory, runtimePath));
+    const workerSpecifier = workerModuleSpecifier();
     const maximumRequestBytes = workerRequestLimit(input.params.maximumRequestBytes);
     const serviceSource = generateExecutionService({
         origin: input.context.build.schema.compiled.root.origin,
         runtimeSpecifier,
+        workerSpecifier,
         material: material(input.context.build),
         ...(maximumRequestBytes === undefined ? {} : { maximumRequestBytes }),
         ...(input.configuredIssuer === undefined && input.direct
@@ -62,14 +65,14 @@ export async function prepareExecution(input) {
     await mkdir(dirname(join(input.directory, RELEASE_SERVICE)), { recursive: true });
     await writeFile(join(input.directory, RELEASE_SERVICE), service);
     const sourcePath = join(input.directory, 'worker.gen.ts');
-    await writeFile(sourcePath, generateExecutionEntry('./service.mjs'));
+    await writeFile(sourcePath, generateExecutionEntry('./service.mjs', workerSpecifier));
     const configPath = join(input.directory, 'wrangler.prepare.jsonc');
     await writeFile(configPath, generateWranglerConfig({
         workerName: input.name,
         ...(input.params.route === undefined ? {} : { route: input.params.route }),
         vars: runtimeVars(input.params, input.configuredIssuer),
         secretBindings: [SIGNING_IDENTITY_BINDING],
-        modules: { baseDir: '.', globs: [RELEASE_SERVICE] },
+        modules: { baseDir: '.', rules: [{ type: 'ESModule', globs: [RELEASE_SERVICE] }] },
         ...(input.router === undefined
             ? {}
             : { router: { binding: input.router.binding, service: input.router.service } }),

package/dist/build/worker/modules.d.ts

@@ -0,0 +1,11 @@
+import type { WorkerArtifact } from './artifact.js';
+type WranglerModuleType = 'ESModule' | 'CompiledWasm' | 'Text' | 'Data';
+/** Project one admitted Worker module inventory into Wrangler's relative module discovery. */
+export declare function workerModules(worker: WorkerArtifact['release']): {
+    readonly baseDir: string;
+    readonly rules: readonly {
+        readonly type: WranglerModuleType;
+        readonly globs: readonly string[];
+    }[];
+};
+export {};

package/dist/build/worker/modules.js

@@ -0,0 +1,26 @@
+import { posix } from 'node:path';
+const TYPES = Object.freeze({
+    esm: 'ESModule',
+    wasm: 'CompiledWasm',
+    text: 'Text',
+    data: 'Data',
+});
+/** Project one admitted Worker module inventory into Wrangler's relative module discovery. */
+export function workerModules(worker) {
+    const directory = posix.dirname(worker.entrypoint);
+    const groups = new Map();
+    for (const module of worker.modules) {
+        if (module.path === worker.entrypoint)
+            continue;
+        const relative = posix.relative(directory, module.path);
+        if (relative === '' || relative === '..' || relative.startsWith('../')) {
+            throw new TypeError('Cloudflare Worker module escapes its entrypoint directory.');
+        }
+        const type = TYPES[module.kind];
+        const globs = groups.get(type) ?? [];
+        globs.push(relative);
+        groups.set(type, globs);
+    }
+    const rules = [...groups].map(([type, globs]) => Object.freeze({ type, globs: Object.freeze(globs) }));
+    return Object.freeze({ baseDir: `./${directory}`, rules: Object.freeze(rules) });
+}

package/dist/build/worker/specifier.d.ts

@@ -0,0 +1 @@
+export declare function workerModuleSpecifier(): string;

package/dist/build/worker/specifier.js

@@ -0,0 +1,5 @@
+import { fileURLToPath } from 'node:url';
+const workerModule = import.meta.resolve('@astrale-os/adapter-cloudflare/worker');
+export function workerModuleSpecifier() {
+    return fileURLToPath(workerModule);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrale-os/adapter-cloudflare",
-  "version": "0.5.0-beta.36",
+  "version": "0.5.0-beta.38",
   "description": "Deploy an Astrale application through Cloudflare Workers",
   "keywords": [
     "adapter",
@@ -45,7 +45,7 @@
     "hono": "^4.6.20",
     "jose": "^6.1.3",
     "wrangler": "4.123.0",
-    "@astrale-os/sdk": "^0.5.0-beta.33"
+    "@astrale-os/sdk": "^0.5.0-beta.35"
   },
   "devDependencies": {
     "@astrale-os/ox": ">=0.1.0 <1.0.0",