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

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/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,7 +65,7 @@ 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,

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.37",
   "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.34"
   },
   "devDependencies": {
     "@astrale-os/ox": ">=0.1.0 <1.0.0",