npm - @astrale-os/sdk - Versions diffs - 0.1.7 → 0.1.8 - Mend

@astrale-os/sdk 0.1.7 → 0.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/cli/run.d.ts +16 -11
package/dist/cli/run.d.ts.map +1 -1
package/dist/cli/run.js +51 -17
package/dist/cli/run.js.map +1 -1
package/dist/server/worker-entry.d.ts +40 -0
package/dist/server/worker-entry.d.ts.map +1 -1
package/dist/server/worker-entry.js +50 -18
package/dist/server/worker-entry.js.map +1 -1
package/package.json +1 -1
package/src/cli/run.ts +55 -20
package/src/server/worker-entry.ts +61 -17

package/dist/cli/run.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * The `astrale-domain` CLI — dev | build | deploy.
+ * The `astrale-domain` CLI — dev | build | deploy | publish.
  *
  * Thin by design: it reads `astrale.config.ts`, resolves `envs[<env>] → params`
  * via the adapter, loads the env's secrets file, then drives `adapter.watch`
@@ -18,30 +18,35 @@
  *   astrale-domain prod              # = deploy prod
  *   astrale-domain deploy <env>      # any env key
  *   astrale-domain build             # rebuild spec only (placeholder URL)
- *   astrale-domain publish [env]     # = deploy [prod] then register the URL
+ *   astrale-domain publish [env]     # register the deployed URL in the admin catalog (NO deploy)
  *
- * `publish` (and the `--publish` tail-flag on deploy) deploys, then registers
- * the resulting URL in the admin catalog by SHELLING OUT to the operator CLI
- * (`astrale domain publish --origin --name --public-url`). Auth lives entirely
- * in that CLI — this build tool never touches credentials; it just hands off the
- * fresh URL it alone knows. Requires `astrale` on PATH (the same CLI the deploy
- * footer already points you at for `domain install`).
+ * `publish` registers a domain's ALREADY-deployed URL in the admin catalog by
+ * SHELLING OUT to the operator CLI (`astrale domain publish --origin --name
+ * --public-url`); it does NOT deploy — run `prod` / `deploy <env>` first, or use
+ * `deploy --publish` to deploy AND register in one step. Standalone publish
+ * defaults the registered address to `https://<origin>` (what every fleet domain
+ * serves at); pass `--public-url` for workers.dev / split-host deploys. Auth
+ * lives entirely in the operator CLI — this build tool never touches
+ * credentials. Requires `astrale` on PATH (the same CLI the deploy footer
+ * already points you at for `domain install`).
  */
 import type { DeployConfig } from '../config/deploy';
 type ParsedArgs = {
-    command: 'dev' | 'build' | 'deploy';
+    command: 'dev' | 'build' | 'deploy' | 'publish';
     env: string;
     watch: boolean;
     /** `--port <n>` (dev only) — overrides the env's local dev port. */
     port?: number;
     /** `--host <url>` (dev only) — public URL of a tunnel/proxy front: binds 0.0.0.0 + pins WORKER_URL. */
     host?: string;
-    /** Register the deployed URL in the admin catalog (the `publish` command / `--publish` flag). */
+    /** `--publish` tail-flag on deploy/prod: ALSO register the freshly-deployed URL (deploy + register). */
     publish?: boolean;
-    /** `--name <slug>` — registry name to publish under (default: package.json `name`). */
+    /** `--name <slug>` — registry name to publish under (default: the origin's first label, e.g. `ai-gateway`). */
     name?: string;
     /** `--install-by-default` — mark the published domain for install on every new instance. */
     installByDefault?: boolean;
+    /** `--public-url <url>` — (publish only) the address the catalog points at (default: `https://<origin>`). */
+    publicUrl?: string;
 };
 export declare function run(argv: readonly string[]): Promise<number>;
 /**

package/dist/cli/run.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"AAAA~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG~~;AAUH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAOpD,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAA;~~IACnC~~,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,CAAA;IACd,oEAAoE;IACpE,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,uGAAuG;IACvG,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,~~iGAAiG~~;~~IACjG~~,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB~~,uFAAuF~~;~~IACvF~~,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,4FAA4F;IAC5F,gBAAgB,CAAC,EAAE,OAAO,CAAA;~~CAC3B~~,CAAA;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,~~CAyIlE~~;AAqHD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,YAAY,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,4EAA4E;IAC5E,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,MAAM,IAAI,CAAA;CACrB,GAAG,MAAM,IAAI,CAiFb;AAwGD,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,~~CA6E7D~~"}
1	+ {"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAUH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAOpD,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAA;IAC/C,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,CAAA;IACd,oEAAoE;IACpE,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,uGAAuG;IACvG,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,wGAAwG;IACxG,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,+GAA+G;IAC/G,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,4FAA4F;IAC5F,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,6GAA6G;IAC7G,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA6JlE;AAqHD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,YAAY,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,4EAA4E;IAC5E,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,MAAM,IAAI,CAAA;CACrB,GAAG,MAAM,IAAI,CAiFb;AAwGD,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,CAsF7D"}

package/dist/cli/run.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * The `astrale-domain` CLI — dev | build | deploy.
+ * The `astrale-domain` CLI — dev | build | deploy | publish.
  *
  * Thin by design: it reads `astrale.config.ts`, resolves `envs[<env>] → params`
  * via the adapter, loads the env's secrets file, then drives `adapter.watch`
@@ -18,14 +18,17 @@
  *   astrale-domain prod              # = deploy prod
  *   astrale-domain deploy <env>      # any env key
  *   astrale-domain build             # rebuild spec only (placeholder URL)
- *   astrale-domain publish [env]     # = deploy [prod] then register the URL
+ *   astrale-domain publish [env]     # register the deployed URL in the admin catalog (NO deploy)
  *
- * `publish` (and the `--publish` tail-flag on deploy) deploys, then registers
- * the resulting URL in the admin catalog by SHELLING OUT to the operator CLI
- * (`astrale domain publish --origin --name --public-url`). Auth lives entirely
- * in that CLI — this build tool never touches credentials; it just hands off the
- * fresh URL it alone knows. Requires `astrale` on PATH (the same CLI the deploy
- * footer already points you at for `domain install`).
+ * `publish` registers a domain's ALREADY-deployed URL in the admin catalog by
+ * SHELLING OUT to the operator CLI (`astrale domain publish --origin --name
+ * --public-url`); it does NOT deploy — run `prod` / `deploy <env>` first, or use
+ * `deploy --publish` to deploy AND register in one step. Standalone publish
+ * defaults the registered address to `https://<origin>` (what every fleet domain
+ * serves at); pass `--public-url` for workers.dev / split-host deploys. Auth
+ * lives entirely in the operator CLI — this build tool never touches
+ * credentials. Requires `astrale` on PATH (the same CLI the deploy footer
+ * already points you at for `domain install`).
  */
 import { spawn } from 'node:child_process';
 import { existsSync, readFileSync, watch as watchFs } from 'node:fs';
@@ -100,6 +103,24 @@ export async function run(argv) {
         info(`note: built at placeholder ${placeholderUrl} — its schemaHash differs from a deployed worker.`);
         return 0;
     }
+    if (parsed.command === 'publish') {
+        // Register the already-deployed URL in the admin catalog — NO deploy. The
+        // public address defaults to `https://<origin>` (the canonical custom-domain
+        // prod URL — what every fleet domain serves at); `--public-url` overrides it
+        // for workers.dev / split-host deploys. No adapter, secrets, or params: this
+        // only points the registry at an address the author already deployed.
+        const pkg = readPackageMeta(projectDir);
+        const name = parsed.name ?? def.origin.split('.')[0] ?? def.origin;
+        const url = parsed.publicUrl ?? `https://${def.origin}`;
+        info(`registering ${def.origin} → ${url} in the admin catalog (no deploy)`);
+        return await publishToAdmin({
+            origin: def.origin,
+            name,
+            url,
+            ...(pkg.description ? { description: pkg.description } : {}),
+            ...(parsed.installByDefault ? { installByDefault: true } : {}),
+        });
+    }
     const adapter = def.adapter;
     // CLI param overrides — applied over the env's params here AND re-applied by
     // the config hot-regen path, which re-resolves `adapter.params` from the
@@ -150,9 +171,10 @@ export async function run(argv) {
     if (parsed.publish) {
         const pkg = readPackageMeta(projectDir);
         // The registry `name` is a short catalog slug, distinct from the FQDN-like
-        // `origin`. It isn't in the domain definition, so default to the project's
-        // package.json `name`, then the origin's first label; `--name` overrides.
-        const name = parsed.name ?? pkg.name ?? def.origin.split('.')[0] ?? def.origin;
+        // `origin` AND from the npm package name (`@scope/…` for a published domain —
+        // illegal as a catalog slug). Default to the origin's first label (the fleet
+        // convention, e.g. `ai-gateway`); `--name` overrides.
+        const name = parsed.name ?? def.origin.split('.')[0] ?? def.origin;
         return await publishToAdmin({
             origin: def.origin,
             name,
@@ -439,6 +461,7 @@ export function parseArgs(argv) {
     let port;
     let host;
     let name;
+    let publicUrl;
     const cleaned = [];
     for (let i = 0; i < rest.length; i++) {
         const a = rest[i];
@@ -467,6 +490,14 @@ export function parseArgs(argv) {
         else if (a.startsWith('--name=')) {
             name = a.slice('--name='.length);
         }
+        else if (a === '--public-url') {
+            publicUrl = rest[++i];
+            if (!publicUrl)
+                throw new Error('--public-url needs a value (the address the catalog points at)');
+        }
+        else if (a.startsWith('--public-url=')) {
+            publicUrl = a.slice('--public-url='.length);
+        }
         else {
             cleaned.push(a);
         }
@@ -496,13 +527,15 @@ export function parseArgs(argv) {
             return { command: 'deploy', env, watch, ...(publish ? { publish } : {}), ...pub };
         }
         case 'publish':
-            // Sugar for `deploy [prod] --publish`: deploy, then register the URL.
+            // Register the ALREADY-deployed URL in the admin catalog — NO deploy.
+            // (Use `deploy [env] --publish` to deploy AND register in one step.) The
+            // public address defaults to `https://<origin>`; `--public-url` overrides.
             return {
-                command: 'deploy',
+                command: 'publish',
                 env: positionals[0] ?? 'prod',
                 watch: false,
-                publish: true,
                 ...pub,
+                ...(publicUrl !== undefined ? { publicUrl } : {}),
             };
         case 'build':
             // Spec-only — no env resolution happens on this path.
@@ -558,11 +591,12 @@ function printUsage(msg) {
         `  astrale-domain dev               # deploy dev --watch (hot-reload, prints URL)\n` +
         `  astrale-domain prod              # deploy prod\n` +
         `  astrale-domain deploy <env>      # deploy any env key (--watch optional)\n` +
-        `  astrale-domain publish [env]     # deploy [prod], then register the URL in the admin catalog\n` +
+        `  astrale-domain publish [env]     # register the already-deployed URL in the admin catalog (NO deploy)\n` +
         `  astrale-domain build             # rebuild the diagnostic spec only\n` +
         `\nFlags:\n` +
-        `  --publish                        # on deploy/prod: register the deployed URL (= the publish command)\n` +
-        `  --name <slug>                    # registry name to publish under (default: package.json name)\n` +
+        `  --publish                        # on deploy/prod: ALSO register the deployed URL (deploy + register)\n` +
+        `  --name <slug>                    # registry name to publish under (default: the origin's first label)\n` +
+        `  --public-url <url>               # (publish) address the catalog points at (default: https://<origin>)\n` +
         `  --install-by-default             # mark the published domain for install on every new instance\n` +
         `\n  publish shells out to \`astrale domain publish\` (needs \`astrale\` on PATH).\n\n`);
 }

package/dist/cli/run.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,KAAK,IAAI,OAAO,EAAE,MAAM,SAAS,CAAA;AACpE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAKxC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AAEzC,MAAM,YAAY,GAAG,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;AAoBrF,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,IAAuB;IAC/C,wEAAwE;IACxE,qEAAqE;IACrE,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,UAAU,EAAE,CAAA;QACZ,OAAO,CAAC,CAAA;IACV,CAAC;IACD,IAAI,MAAkB,CAAA;IACtB,IAAI,CAAC;QACH,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,UAAU,CAAE,GAAa,CAAC,OAAO,CAAC,CAAA;QAClC,OAAO,CAAC,CAAA;IACV,CAAC;IAED,6EAA6E;IAC7E,4EAA4E;IAC5E,sEAAsE;IACtE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC1B,KAAK,CACH,4EAA4E;YAC1E,8CAA8C,CACjD,CAAA;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAChC,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;IACzC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,KAAK,CAAC,iCAAiC,UAAU,wCAAwC,CAAC,CAAA;QAC1F,OAAO,CAAC,CAAA;IACV,CAAC;IAED,IAAI,GAAiB,CAAA;IACrB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,CAAA;IACpC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,wEAAwE;QACxE,wEAAwE;QACxE,MAAM,CAAC,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACjF,IAAI,CAAC,EAAE,CAAC;YACN,KAAK,CACH,kCAAkC,CAAC,CAAC,CAAC,CAAC,4BAA4B;gBAChE,wEAAwE;gBACxE,gBAAgB,CAAC,CAAC,CAAC,CAAC,4CAA4C;gBAChE,gBAAgB,CAAC,CAAC,CAAC,CAAC,WAAW,CAClC,CAAA;YACD,OAAO,CAAC,CAAA;QACV,CAAC;QACD,MAAM,GAAG,CAAA;IACX,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC,CAAA;IAE1D,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;QAC/B,qEAAqE;QACrE,sEAAsE;QACtE,sEAAsE;QACtE,yBAAyB;QACzB,MAAM,cAAc,GAAG,WAAW,GAAG,CAAC,MAAM,EAAE,CAAA;QAC9C,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAA;QACrE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,KAAK,CAAC,sBAAuB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAA;YACrD,OAAO,CAAC,CAAA;QACV,CAAC;QACD,IAAI,CAAC,gBAAgB,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,cAAc,GAAG,CAAC,MAAM,GAAG,CAAC,CAAA;QAC1E,IAAI,CACF,8BAA8B,cAAc,mDAAmD,CAChG,CAAA;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACjC,0EAA0E;QAC1E,6EAA6E;QAC7E,6EAA6E;QAC7E,6EAA6E;QAC7E,sEAAsE;QACtE,MAAM,GAAG,GAAG,eAAe,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAA;QAClE,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,WAAW,GAAG,CAAC,MAAM,EAAE,CAAA;QACvD,IAAI,CAAC,eAAe,GAAG,CAAC,MAAM,MAAM,GAAG,mCAAmC,CAAC,CAAA;QAC3E,OAAO,MAAM,cAAc,CAAC;YAC1B,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,IAAI;YACJ,GAAG;YACH,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/D,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,OAAiC,CAAA;IACrD,6EAA6E;IAC7E,yEAAyE;IACzE,4EAA4E;IAC5E,uEAAuE;IACvE,MAAM,cAAc,GAA4B,EAAE,CAAA;IAClD,wEAAwE;IACxE,2BAA2B;IAC3B,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;QAAE,cAAc,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IAC5F,0EAA0E;IAC1E,6EAA6E;IAC7E,2DAA2D;IAC3D,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;QAAE,cAAc,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IAC5F,MAAM,MAAM,GAAG,EAAE,GAAI,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAA6B,EAAE,GAAG,cAAc,EAAE,CAAA;IAEhG,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;IAEhC,2EAA2E;IAC3E,2EAA2E;IAC3E,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC3E,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;IAExD,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9E,OAAO,QAAQ,CAAC;YACd,OAAO;YACP,MAAM;YACN,cAAc;YACd,UAAU;YACV,QAAQ;YACR,SAAS;YACT,OAAO;YACP,MAAM;YACN,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,GAAG;YACH,UAAU;SACX,CAAC,CAAA;IACJ,CAAC;IAED,oBAAoB;IACpB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAC1C,UAAU;QACV,QAAQ;QACR,OAAO;QACP,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,MAAM;QACN,GAAG,EAAE,MAAM,CAAC,GAAG;KAChB,CAAC,CAAA;IACF,MAAM,mBAAmB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;IACzE,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAE1B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,GAAG,GAAG,eAAe,CAAC,UAAU,CAAC,CAAA;QACvC,2EAA2E;QAC3E,8EAA8E;QAC9E,6EAA6E;QAC7E,sDAAsD;QACtD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAA;QAClE,OAAO,MAAM,cAAc,CAAC;YAC1B,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,IAAI;YACJ,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/D,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,cAAc,CAAC,IAM7B;IACC,4EAA4E;IAC5E,gEAAgE;IAChE,MAAM,OAAO,GAAG;QACd,QAAQ;QACR,SAAS;QACT,UAAU;QACV,IAAI,CAAC,MAAM;QACX,QAAQ;QACR,IAAI,CAAC,IAAI;QACT,cAAc;QACd,IAAI,CAAC,GAAG;KACT,CAAA;IACD,IAAI,IAAI,CAAC,WAAW;QAAE,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;IACrE,IAAI,IAAI,CAAC,gBAAgB;QAAE,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;IAE/D,IAAI,CAAC,6CAA6C,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACtE,OAAO,MAAM,IAAI,OAAO,CAAS,CAAC,WAAW,EAAE,EAAE;QAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAA;QAC7D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACrD,KAAK,CACH,iFAAiF;oBAC/E,iBAAiB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACvC,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,6CAA6C,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;YACnE,CAAC;YACD,WAAW,CAAC,CAAC,CAAC,CAAA;QAChB,CAAC,CAAC,CAAA;QACF,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,8FAA8F;AAC9F,SAAS,eAAe,CAAC,UAAkB;IACzC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAG5E,CAAA;QACD,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAA;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,IAYvB;IACC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAC5F,IAAI,OAAO,GAAG,CAAC,CAAA;IACf,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,OAAO,IAAI,CAAC,CAAA;QACZ,IAAI,CAAC,gBAAgB,OAAO,qDAAqD,CAAC,CAAA;IACpF,CAAC,CAAA;IACD,MAAM,MAAM,GAAgB,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE;QACtD,UAAU;QACV,QAAQ;QACR,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,OAAO;QACP,MAAM;QACN,GAAG;QACH,QAAQ;KACT,CAAC,CAAA;IACF,MAAM,mBAAmB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;IACzE,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAEjC,MAAM,eAAe,GAAG,mBAAmB,CAAC;QAC1C,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,OAAO,EAAE,GAAG;QACZ,GAAG;QACH,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,UAAU;QACV,QAAQ;QACR,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,QAAQ;KACT,CAAC,CAAA;IAEF,MAAM,IAAI,OAAO,CAAO,CAAC,WAAW,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,GAAG,EAAE;YAChB,eAAe,EAAE,CAAA;YACjB,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QACzC,CAAC,CAAA;QACD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAC1B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;IACF,OAAO,CAAC,CAAA;AACV,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAWnC;IACC,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,KAAgD,CAAA;IAEpD,KAAK,UAAU,KAAK;QAClB,IAAI,OAAO;YAAE,OAAM;QACnB,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,GAAG,IAAI,CAAA;YACd,OAAM;QACR,CAAC;QACD,OAAO,GAAG,IAAI,CAAA;QACd,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;YAC9D,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzF,IAAI,CACF,+EAA+E;oBAC7E,oDAAoD,CACvD,CAAA;gBACD,OAAM;YACR,CAAC;YACD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAiC,CAAA;YACrD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACxB,IAAI,CACF,uCAAuC,OAAO,CAAC,IAAI,oCAAoC;oBACrF,0CAA0C,CAC7C,CAAA;gBACD,OAAM;YACR,CAAC;YACD,MAAM,MAAM,GAAG;gBACb,GAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAA6B;gBACxD,GAAG,IAAI,CAAC,cAAc;aACvB,CAAA;YACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;YAChC,MAAM,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC;gBACtD,MAAM;gBACN,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB,CAAC,CAAA;YACF,MAAM,mBAAmB,CAAC;gBACxB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,GAAG;gBACH,GAAG,EAAE,IAAI,CAAC,GAAG;aACd,CAAC,CAAA;YACF,IAAI,CACF,+EAA+E;gBAC7E,6DAA6D,CAChE,CAAA;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CACF,kFAAkF;gBAChF,GAAI,GAAa,CAAC,OAAO,EAAE,CAC9B,CAAA;QACH,CAAC;gBAAS,CAAC;YACT,OAAO,GAAG,KAAK,CAAA;YACf,IAAI,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;gBACxB,OAAO,GAAG,KAAK,CAAA;gBACf,KAAK,KAAK,EAAE,CAAA;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACjE,IAAI,IAAI,IAAI,IAAI,KAAK,UAAU;YAAE,OAAM;QACvC,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,sEAAsE;QACtE,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,KAAK,EAAE,EAAE,GAAG,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,OAAO,GAAG,EAAE;QACV,OAAO,GAAG,IAAI,CAAA;QACd,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,OAAO,CAAC,KAAK,EAAE,CAAA;IACjB,CAAC,CAAA;AACH,CAAC;AAED,4EAA4E;AAE5E,KAAK,UAAU,SAAS,CAAC,IAKxB;IACC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;IACvE,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACxD,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AAClF,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,mBAAmB,CAAC,IAKlC;IACC,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAI,GAAa,CAAC,OAAO,CAAA;QAClC,IAAI,CAAC,mFAAmF,GAAG,EAAE,CAAC,CAAA;QAC9F,IAAI,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAChC,IAAI,CACF,oFAAoF;gBAClF,0EAA0E,CAC7E,CAAA;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,8EAA8E;AAE9E,SAAS,WAAW,CAClB,OAA+B,EAC/B,MAAe,EACf,UAAkB;IAElB,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAA;IAC1C,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAA;IACpB,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAC5D,OAAO,cAAc,CAAC,GAAG,CAAC,CAAA;AAC5B,CAAC;AAED,SAAS,UAAU,CAAC,GAAW;IAC7B,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACjC,IAAI,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAA;IAC7C,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,YAAY,CAAC,GAAiB;IACrC,OAAO;QACL,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,8EAA8E;QAC9E,QAAQ,EAAE,GAAG,CAAC,KAAK,KAAK,SAAS;QACjC,YAAY,EAAE,GAAG,CAAC,SAAS,KAAK,SAAS;QACzC,SAAS,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS;QACnC,OAAO,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS;KAChC,CAAA;AACH,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAY,EAAE,IAAyB;IAC/D,6EAA6E;IAC7E,wEAAwE;IACxE,4EAA4E;IAC5E,wEAAwE;IACxE,2EAA2E;IAC3E,kCAAkC;IAClC,IAAI,IAAI,EAAE,KAAK;QAAE,OAAO,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAClE,MAAM,GAAG,GAAG,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAA0B,CAAA;IAC7E,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAA;IACvB,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,EAAE,CAAC;QACjF,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,0EAA0E;YAC/E,wEAAwE,CAC3E,CAAA;IACH,CAAC;IACD,OAAO,GAAmB,CAAA;AAC5B,CAAC;AAED,gFAAgF;AAChF,SAAS,aAAa,CAAC,GAAuB;IAC5C,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAA;IACjG,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,GAAG,EAAE,CAAA;IAC7D,IAAI,CAAC;QACH,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,GAAG,CAAC,CAAA;IAC3D,CAAC;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAuB;IAC/C,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAA;IAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IACtC,0EAA0E;IAC1E,uEAAuE;IACvE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;IAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAA;IAC9D,yEAAyE;IACzE,4EAA4E;IAC5E,IAAI,IAAwB,CAAA;IAC5B,IAAI,IAAwB,CAAA;IAC5B,IAAI,IAAwB,CAAA;IAC5B,IAAI,SAA6B,CAAA;IACjC,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAE,CAAA;QAClB,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YACnB,MAAM,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;YACnB,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YAChB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,GAAG,CAAC,CAAA;QAC7D,CAAC;aAAM,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;YACxC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,GAAG,CAAC,CAAA;QAC7D,CAAC;aAAM,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC1B,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACjC,CAAC;aAAM,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;QACjD,CAAC;aAAM,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC1B,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;YAChB,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;QACzF,CAAC;aAAM,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAClC,CAAC;aAAM,IAAI,CAAC,KAAK,cAAc,EAAE,CAAC;YAChC,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;YACrB,IAAI,CAAC,SAAS;gBACZ,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAA;QACrF,CAAC;aAAM,IAAI,CAAC,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACzC,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QAC7C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACH,CAAC;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;IAE7D,0EAA0E;IAC1E,uEAAuE;IACvE,MAAM,GAAG,GAAG;QACV,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClD,CAAA;IAED,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,KAAK;YACR,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,KAAK;gBAC5B,KAAK,EAAE,IAAI;gBACX,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvC,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACxC,CAAA;QACH,KAAK,MAAM;YACT,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,EAAE,CAAA;QAC3F,KAAK,QAAQ,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;YAC1B,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;YAC9E,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,EAAE,CAAA;QACnF,CAAC;QACD,KAAK,SAAS;YACZ,sEAAsE;YACtE,yEAAyE;YACzE,2EAA2E;YAC3E,OAAO;gBACL,OAAO,EAAE,SAAS;gBAClB,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,MAAM;gBAC7B,KAAK,EAAE,KAAK;gBACZ,GAAG,GAAG;gBACN,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClD,CAAA;QACH,KAAK,OAAO;YACV,sDAAsD;YACtD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;QACvD;YACE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAA;IAC3E,CAAC;AACH,CAAC;AAED,SAAS,GAAG,CAAC,IAAY,EAAE,EAAU;IACnC,OAAO,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AAC/D,CAAC;AAED,4EAA4E;AAE5E,MAAM,KAAK,GAAG,UAAU,CAAA;AACxB,MAAM,GAAG,GAAG,SAAS,CAAA;AACrB,MAAM,IAAI,GAAG,SAAS,CAAA;AACtB,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,GAAG,GAAG,UAAU,CAAA;AACtB,MAAM,KAAK,GAAG,SAAS,CAAA;AAEvB,SAAS,IAAI,CAAC,GAAW;IACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,CAAC,CAAA;AAClD,CAAC;AACD,SAAS,IAAI,CAAC,GAAW;IACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,KAAK,IAAI,GAAG,IAAI,CAAC,CAAA;AACrD,CAAC;AACD,SAAS,KAAK,CAAC,GAAW;IACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,CAAC,CAAA;AAClD,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,MAAkB;IACpD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,KAAK,KAAK,IAAI,KAAK,IAAI,IAAI,GAAG,MAAM,CAAC,MAAM,GAAG,KAAK,8BAA8B;QAC/E,KAAK,IAAI,MAAM,KAAK,KAAK,KAAK,GAAG,GAAG,GAAG,KAAK,IAAI;QAChD,KAAK,GAAG,0BAA0B,KAAK,IAAI;QAC3C,SAAS,IAAI,0BAA0B,GAAG,YAAY,KAAK,IAAI;QAC/D,KAAK,GAAG,yEAAyE,KAAK,MAAM,CAC/F,CAAA;AACH,CAAC;AAED,SAAS,aAAa,CAAC,MAAoB,EAAE,GAAiB;IAC5D,uEAAuE;IACvE,yEAAyE;IACzE,MAAM,MAAM,GACV,MAAM,CAAC,SAAS,KAAK,SAAS;QAC5B,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,EAAE;YACvB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,IAAI;QAC3B,CAAC,CAAC,KAAK,GAAG,0BAA0B,KAAK,IAAI;YAC3C,SAAS,IAAI,0BAA0B,MAAM,CAAC,GAAG,YAAY,KAAK,IAAI,CAAA;IAC5E,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,KAAK,KAAK,IAAI,KAAK,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,GAAG,KAAK,aAAa;QAC3D,KAAK,IAAI,MAAM,KAAK,KAAK,KAAK,GAAG,MAAM,CAAC,GAAG,GAAG,KAAK,IAAI;QACvD,MAAM;QACN,IAAI,CACP,CAAA;AACH,CAAC;AAED,SAAS,UAAU,CAAC,GAAY;IAC9B,IAAI,GAAG;QAAE,KAAK,CAAC,GAAG,CAAC,CAAA;IACnB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,YAAY;QACV,oFAAoF;QACpF,oDAAoD;QACpD,8EAA8E;QAC9E,2GAA2G;QAC3G,yEAAyE;QACzE,YAAY;QACZ,2GAA2G;QAC3G,2GAA2G;QAC3G,4GAA4G;QAC5G,oGAAoG;QACpG,uFAAuF,CAC1F,CAAA;AACH,CAAC"}

package/dist/server/worker-entry.d.ts CHANGED Viewed

@@ -25,6 +25,46 @@ import type { RemoteServerConfig } from './config';
 type Fetcher = {
     fetch(request: Request): Response | Promise<Response>;
 };
+type App = {
+    fetch(request: Request): Response | Promise<Response>;
+};
+/** A built app cached by its serving URL: `origin` for same-origin matching,
+ * `app` for in-process self-dispatch. */
+type CachedApp = {
+    origin: string;
+    app: App;
+};
+/**
+ * Choose where an OUTBOUND subrequest to `u` is routed — or `null` to let the
+ * real `fetch` handle it. Order matters and same-origin wins FIRST: a call to
+ * this worker's OWN serving origin is a self-dispatch, not an edge fetch — and
+ * the caller's `routeSubrequest` policy may itself match our own host (e.g. an
+ * `isInstanceHost` predicate matches every `*.svc.astrale.ai`, ours included),
+ * so it must never get first look at a same-origin call.
+ *
+ *   • same-origin + SELF binding present → the SELF fetcher: a fresh same-script
+ *     invocation. The normal Cloudflare path — a Worker can't fetch its own
+ *     hostname over the edge, so it re-enters itself through the binding.
+ *   • same-origin + NO SELF binding → the cached app, dispatched IN-PROCESS. A
+ *     Workers-for-Platforms dispatch-namespace tenant can't service-bind to
+ *     itself (its script name is platform-renamed), so it has no SELF binding; an
+ *     in-process dispatch reaches the same script with no edge hop and no binding.
+ *     `App` and the SELF `Fetcher` share the `{ fetch(request) }` shape, so the
+ *     caller drives both identically.
+ *   • else, the caller's `routeSubrequest` policy matched → its fetcher.
+ *   • else → `null`: passthrough to the real network fetch.
+ *
+ * Pure (no closure over instance state) so the routing decision is unit-testable
+ * without standing up a real app.
+ */
+export declare function selectSubrequestTarget<TDeps>(u: URL, ctx: {
+    self: Fetcher | null;
+    apps: Iterable<CachedApp>;
+    routeEnv: TDeps | null;
+    routeSubrequest?: (url: URL, env: TDeps) => Fetcher | null | undefined;
+}): {
+    fetch(request: Request): Response | Promise<Response>;
+} | null;
 export interface WorkerEntryConfig<TDeps> {
     /**
      * Build the `createRemoteServer` config for the resolved serving `url`. Called

package/dist/server/worker-entry.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"worker-entry.d.ts","sourceRoot":"","sources":["../../src/server/worker-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAMlD,KAAK,OAAO,GAAG;IAAE,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;CAAE,CAAA;~~AAGxE~~,MAAM,WAAW,iBAAiB,CAAC,KAAK;IACtC;;;;OAIG;IACH,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,KAAK,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAC7D;;;;;;;;;OASG;IACH,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,KAAK,MAAM,CAAA;IAC1D,gFAAgF;IAChF,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;IACxD;;;;;;;;;OASG;IACH,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,KAAK,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;IACtE;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CACP,GAAG,EAAE,KAAK,EACV,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,KACb,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;IACzD;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAA;CAC3D;AAED,MAAM,WAAW,WAAW,CAAC,KAAK;IAChC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;CAClE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CAM/D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE;IAClC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;IACnD,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CACrD,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,SAAS,CAiBvF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,~~CA0E7F~~"}
1	+ {"version":3,"file":"worker-entry.d.ts","sourceRoot":"","sources":["../../src/server/worker-entry.ts"],"names":[],"mappings":"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"}

package/dist/server/worker-entry.js CHANGED Viewed

@@ -24,6 +24,43 @@
 import { createRemoteServer } from './create';
 import { requireEnv } from './require-env';
 import { canonicalizeServingUrl } from './serving-url';
+/**
+ * Choose where an OUTBOUND subrequest to `u` is routed — or `null` to let the
+ * real `fetch` handle it. Order matters and same-origin wins FIRST: a call to
+ * this worker's OWN serving origin is a self-dispatch, not an edge fetch — and
+ * the caller's `routeSubrequest` policy may itself match our own host (e.g. an
+ * `isInstanceHost` predicate matches every `*.svc.astrale.ai`, ours included),
+ * so it must never get first look at a same-origin call.
+ *
+ *   • same-origin + SELF binding present → the SELF fetcher: a fresh same-script
+ *     invocation. The normal Cloudflare path — a Worker can't fetch its own
+ *     hostname over the edge, so it re-enters itself through the binding.
+ *   • same-origin + NO SELF binding → the cached app, dispatched IN-PROCESS. A
+ *     Workers-for-Platforms dispatch-namespace tenant can't service-bind to
+ *     itself (its script name is platform-renamed), so it has no SELF binding; an
+ *     in-process dispatch reaches the same script with no edge hop and no binding.
+ *     `App` and the SELF `Fetcher` share the `{ fetch(request) }` shape, so the
+ *     caller drives both identically.
+ *   • else, the caller's `routeSubrequest` policy matched → its fetcher.
+ *   • else → `null`: passthrough to the real network fetch.
+ *
+ * Pure (no closure over instance state) so the routing decision is unit-testable
+ * without standing up a real app.
+ */
+export function selectSubrequestTarget(u, ctx) {
+    // Same-origin self-subrequest → the same script (SELF binding, else in-process).
+    for (const cached of ctx.apps) {
+        if (cached.origin === u.origin)
+            return ctx.self ?? cached.app;
+    }
+    // Caller policy (e.g. a platform router on the same zone) → its fetcher.
+    if (ctx.routeSubrequest && ctx.routeEnv) {
+        const via = ctx.routeSubrequest(u, ctx.routeEnv);
+        if (via)
+            return via;
+    }
+    return null;
+}
 /**
  * The request origin as the CLIENT reached it — i.e. the origin a fallback
  * serving URL (and therefore the `iss`) may be derived from. Behind a
@@ -104,31 +141,26 @@ export function createWorkerEntry(config) {
         apps.set(url, { origin: new URL(url).origin, app });
         return app;
     }
-    // A Worker can't fetch its own hostname (SELF), nor — on Cloudflare — a
+    // A Worker can't fetch its own hostname over the edge, nor — on Cloudflare — a
     // same-zone hostname routed to another Worker (the `routeSubrequest` case).
     // When either is configured, override `globalThis.fetch` to redirect those
-    // subrequests through the caller's fetcher. Workers with neither get no global
-    // mutation. (A self-issued credential's JWKS is resolved in-memory by the
-    // verifier, not fetched — see `auth/verify.ts` — so no self-JWKS shim is needed.)
+    // subrequests through the right target (see `selectSubrequestTarget`). Workers
+    // with neither selfBinding nor routeSubrequest get no global mutation. (A
+    // self-issued credential's JWKS is resolved in-memory by the verifier, not
+    // fetched — see `auth/verify.ts` — so no self-JWKS shim is needed.)
     if (config.selfBinding || config.routeSubrequest) {
         const originalFetch = globalThis.fetch;
         globalThis.fetch = (async (input, init) => {
             const href = typeof input === 'string' ? input : input instanceof URL ? input.href : input.url;
             try {
-                const u = new URL(href);
-                // same-origin → SELF (a Worker can't fetch its own hostname)
-                if (self && apps.size > 0) {
-                    for (const cached of apps.values()) {
-                        if (cached.origin === u.origin)
-                            return self.fetch(new Request(input, init));
-                    }
-                }
-                // caller policy → its fetcher (e.g. a platform router on the same zone)
-                if (config.routeSubrequest && routeEnv) {
-                    const via = config.routeSubrequest(u, routeEnv);
-                    if (via)
-                        return via.fetch(new Request(input, init));
-                }
+                const target = selectSubrequestTarget(new URL(href), {
+                    self,
+                    apps: apps.values(),
+                    routeEnv,
+                    routeSubrequest: config.routeSubrequest,
+                });
+                if (target)
+                    return target.fetch(new Request(input, init));
             }
             catch {
                 // non-absolute URL — fall through to the original fetch

package/dist/server/worker-entry.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"worker-entry.js","sourceRoot":"","sources":["../../src/server/worker-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAIH,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;~~AA2DtD~~;;;;;;;;;;GAUG;AACH,MAAM,UAAU,YAAY,CAAC,GAAQ,EAAE,OAAgB;IACrD,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO,GAAG,CAAC,MAAM,CAAA;IAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC1D,mFAAmF;IACnF,MAAM,MAAM,GAAG,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;IAC7D,OAAO,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAA;AAChE,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,MAAM,CAAQ,IAI7B;IACC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACrD,MAAM,MAAM,GAAG,GAAG,IAAI,GAAG,CAAA;IACzB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACjC,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAA;QAC9B,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,OAAO,SAAS,CAAA;QAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAA;QACnC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YAC1C,OAAO,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,OAAO,GAAG,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;QAC9E,CAAC;QACD,oEAAoE;QACpE,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAA;QACvD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QAC5D,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;IACvD,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAQ,MAAgC;IACvE,6EAA6E;IAC7E,yEAAyE;IACzE,wEAAwE;IACxE,0EAA0E;IAC1E,qEAAqE;IACrE,uDAAuD;IACvD,MAAM,eAAe,GAAG,CAAC,CAAA;IACzB,MAAM,IAAI,GAAG,IAAI,GAAG,~~EAAwC~~,CAAA;~~IAC5D~~,IAAI,IAAI,GAAmB,IAAI,CAAA;IAC/B,IAAI,QAAQ,GAAiB,IAAI,CAAA;IAEjC,SAAS,MAAM,CAAC,GAAW,EAAE,GAAU;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC5B,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,GAAG,CAAA;QAC7B,MAAM,EAAE,GAAG,EAAE,GAAG,kBAAkB,CAAQ,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;QACjE,IAAI,IAAI,CAAC,IAAI,IAAI,eAAe,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAA;YACvC,IAAI,MAAM,KAAK,SAAS;gBAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC/C,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QACnD,OAAO,GAAG,CAAA;IACZ,CAAC;IAED~~,wEAAwE~~;~~IACxE~~,4EAA4E;IAC5E,2EAA2E;IAC3E,+EAA+E;IAC/E,0EAA0E;IAC1E,~~kFAAkF~~;~~IAClF~~,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QACjD,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAA;QACtC,UAAU,CAAC,KAAK,GAAG,CAAC,KAAK,EAAE,KAAwB,EAAE,IAAkB,EAAE,EAAE;YACzE,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAA;YAC9F,IAAI,CAAC;gBACH,MAAM,~~CAAC~~,GAAG,~~IAAI~~,~~GAAG,~~CAAC,IAAI,~~CAAC~~,~~CAAA;gBACvB,6DAA6D;gBAC7D,IAAI,IAAI,IAAI,IAAI,~~CAAC,IAAI,~~GAAG,~~CAAC,EAAE~~,CAAC~~;~~oBAC1B~~,~~KAAK,MAAM,MAAM,~~IAAI,IAAI,~~CAAC,MAAM,~~EAAE,~~EAAE,CAAC;wBACnC,~~IAAI,~~MAAM,~~CAAC,MAAM,~~KAAK,CAAC,CAAC,MAAM;4BAAE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,~~EAAE~~,IAAI,CAAC,CAAC,CAAA~~;~~oBAC7E~~,~~CAAC~~;~~gBACH~~,~~CAAC;gBACD,wEAAwE;gBACxE,IAAI,MAAM,CAAC,~~eAAe,~~IAAI,QAAQ,~~EAAE,~~CAAC;oBACvC,~~MAAM,~~GAAG,GAAG,MAAM,~~CAAC,eAAe,CAAC,~~CAAC,EAAE,QAAQ,CAAC,~~CAAA;~~oBAC/C~~,IAAI,~~GAAG~~;~~wBAAE~~,OAAO,~~GAAG~~,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;~~gBACrD~~,CAAC;~~YACH,CAAC;~~YAAC,MAAM,CAAC;gBACP,wDAAwD;YAC1D,CAAC;YACD,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QACnC,CAAC,CAAiB,CAAA;IACpB,CAAC;IAED,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,OAAgB,EAAE,GAAU;YACtC,IAAI,MAAM,CAAC,WAAW;gBAAE,IAAI,KAAK,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,IAAI,CAAA;YAChE,IAAI,MAAM,CAAC,eAAe;gBAAE,QAAQ,GAAG,GAAG,CAAA;YAC1C,4DAA4D;YAC5D,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YACnF,IAAI,MAAM,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;gBAChC,wEAAwE;gBACxE,2EAA2E;gBAC3E,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;gBAC7D,IAAI,OAAO,KAAK,SAAS;oBAAE,OAAO,OAAO,CAAA;YAC3C,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU;gBAC3B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,YAAY,CAAC,UAAW,EAAE,OAAO,CAAC,CAAC;gBAC5D,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,oDAAoD,CAAC,CAAA;YACvF,MAAM,GAAG,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;YACvC,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;YACxF,OAAO,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAC3C,CAAC;KACF,CAAA;AACH,CAAC"}
1	+ {"version":3,"file":"worker-entry.js","sourceRoot":"","sources":["../../src/server/worker-entry.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@astrale-os/sdk",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Astrale Remote Domain SDK - Define and deploy domains as standalone Hono servers",
   "keywords": [
     "astrale",

package/src/cli/run.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * The `astrale-domain` CLI — dev | build | deploy.
+ * The `astrale-domain` CLI — dev | build | deploy | publish.
  *
  * Thin by design: it reads `astrale.config.ts`, resolves `envs[<env>] → params`
  * via the adapter, loads the env's secrets file, then drives `adapter.watch`
@@ -18,14 +18,17 @@
  *   astrale-domain prod              # = deploy prod
  *   astrale-domain deploy <env>      # any env key
  *   astrale-domain build             # rebuild spec only (placeholder URL)
- *   astrale-domain publish [env]     # = deploy [prod] then register the URL
+ *   astrale-domain publish [env]     # register the deployed URL in the admin catalog (NO deploy)
  *
- * `publish` (and the `--publish` tail-flag on deploy) deploys, then registers
- * the resulting URL in the admin catalog by SHELLING OUT to the operator CLI
- * (`astrale domain publish --origin --name --public-url`). Auth lives entirely
- * in that CLI — this build tool never touches credentials; it just hands off the
- * fresh URL it alone knows. Requires `astrale` on PATH (the same CLI the deploy
- * footer already points you at for `domain install`).
+ * `publish` registers a domain's ALREADY-deployed URL in the admin catalog by
+ * SHELLING OUT to the operator CLI (`astrale domain publish --origin --name
+ * --public-url`); it does NOT deploy — run `prod` / `deploy <env>` first, or use
+ * `deploy --publish` to deploy AND register in one step. Standalone publish
+ * defaults the registered address to `https://<origin>` (what every fleet domain
+ * serves at); pass `--public-url` for workers.dev / split-host deploys. Auth
+ * lives entirely in the operator CLI — this build tool never touches
+ * credentials. Requires `astrale` on PATH (the same CLI the deploy footer
+ * already points you at for `domain install`).
  */
 import { spawn } from 'node:child_process'
@@ -44,19 +47,21 @@ import { buildProjectSpec } from './spec'
 const CONFIG_NAMES = ['astrale.config.ts', 'astrale.config.js', 'astrale.config.mjs']
 type ParsedArgs = {
-  command: 'dev' | 'build' | 'deploy'
+  command: 'dev' | 'build' | 'deploy' | 'publish'
   env: string
   watch: boolean
   /** `--port <n>` (dev only) — overrides the env's local dev port. */
   port?: number
   /** `--host <url>` (dev only) — public URL of a tunnel/proxy front: binds 0.0.0.0 + pins WORKER_URL. */
   host?: string
-  /** Register the deployed URL in the admin catalog (the `publish` command / `--publish` flag). */
+  /** `--publish` tail-flag on deploy/prod: ALSO register the freshly-deployed URL (deploy + register). */
   publish?: boolean
-  /** `--name <slug>` — registry name to publish under (default: package.json `name`). */
+  /** `--name <slug>` — registry name to publish under (default: the origin's first label, e.g. `ai-gateway`). */
   name?: string
   /** `--install-by-default` — mark the published domain for install on every new instance. */
   installByDefault?: boolean
+  /** `--public-url <url>` — (publish only) the address the catalog points at (default: `https://<origin>`). */
+  publicUrl?: string
 }
 export async function run(argv: readonly string[]): Promise<number> {
@@ -131,6 +136,25 @@ export async function run(argv: readonly string[]): Promise<number> {
     return 0
   }
+  if (parsed.command === 'publish') {
+    // Register the already-deployed URL in the admin catalog — NO deploy. The
+    // public address defaults to `https://<origin>` (the canonical custom-domain
+    // prod URL — what every fleet domain serves at); `--public-url` overrides it
+    // for workers.dev / split-host deploys. No adapter, secrets, or params: this
+    // only points the registry at an address the author already deployed.
+    const pkg = readPackageMeta(projectDir)
+    const name = parsed.name ?? def.origin.split('.')[0] ?? def.origin
+    const url = parsed.publicUrl ?? `https://${def.origin}`
+    info(`registering ${def.origin} → ${url} in the admin catalog (no deploy)`)
+    return await publishToAdmin({
+      origin: def.origin,
+      name,
+      url,
+      ...(pkg.description ? { description: pkg.description } : {}),
+      ...(parsed.installByDefault ? { installByDefault: true } : {}),
+    })
+  }
   const adapter = def.adapter as DomainAdapter<unknown>
   // CLI param overrides — applied over the env's params here AND re-applied by
   // the config hot-regen path, which re-resolves `adapter.params` from the
@@ -184,9 +208,10 @@ export async function run(argv: readonly string[]): Promise<number> {
   if (parsed.publish) {
     const pkg = readPackageMeta(projectDir)
     // The registry `name` is a short catalog slug, distinct from the FQDN-like
-    // `origin`. It isn't in the domain definition, so default to the project's
-    // package.json `name`, then the origin's first label; `--name` overrides.
-    const name = parsed.name ?? pkg.name ?? def.origin.split('.')[0] ?? def.origin
+    // `origin` AND from the npm package name (`@scope/…` for a published domain —
+    // illegal as a catalog slug). Default to the origin's first label (the fleet
+    // convention, e.g. `ai-gateway`); `--name` overrides.
+    const name = parsed.name ?? def.origin.split('.')[0] ?? def.origin
     return await publishToAdmin({
       origin: def.origin,
       name,
@@ -539,6 +564,7 @@ export function parseArgs(argv: readonly string[]): ParsedArgs {
   let port: number | undefined
   let host: string | undefined
   let name: string | undefined
+  let publicUrl: string | undefined
   const cleaned: string[] = []
   for (let i = 0; i < rest.length; i++) {
     const a = rest[i]!
@@ -560,6 +586,12 @@ export function parseArgs(argv: readonly string[]): ParsedArgs {
       if (!name) throw new Error('--name needs a value (the registry slug to publish under)')
     } else if (a.startsWith('--name=')) {
       name = a.slice('--name='.length)
+    } else if (a === '--public-url') {
+      publicUrl = rest[++i]
+      if (!publicUrl)
+        throw new Error('--public-url needs a value (the address the catalog points at)')
+    } else if (a.startsWith('--public-url=')) {
+      publicUrl = a.slice('--public-url='.length)
     } else {
       cleaned.push(a)
     }
@@ -590,13 +622,15 @@ export function parseArgs(argv: readonly string[]): ParsedArgs {
       return { command: 'deploy', env, watch, ...(publish ? { publish } : {}), ...pub }
     }
     case 'publish':
-      // Sugar for `deploy [prod] --publish`: deploy, then register the URL.
+      // Register the ALREADY-deployed URL in the admin catalog — NO deploy.
+      // (Use `deploy [env] --publish` to deploy AND register in one step.) The
+      // public address defaults to `https://<origin>`; `--public-url` overrides.
       return {
-        command: 'deploy',
+        command: 'publish',
         env: positionals[0] ?? 'prod',
         watch: false,
-        publish: true,
         ...pub,
+        ...(publicUrl !== undefined ? { publicUrl } : {}),
       }
     case 'build':
       // Spec-only — no env resolution happens on this path.
@@ -664,11 +698,12 @@ function printUsage(msg?: string): void {
       `  astrale-domain dev               # deploy dev --watch (hot-reload, prints URL)\n` +
       `  astrale-domain prod              # deploy prod\n` +
       `  astrale-domain deploy <env>      # deploy any env key (--watch optional)\n` +
-      `  astrale-domain publish [env]     # deploy [prod], then register the URL in the admin catalog\n` +
+      `  astrale-domain publish [env]     # register the already-deployed URL in the admin catalog (NO deploy)\n` +
       `  astrale-domain build             # rebuild the diagnostic spec only\n` +
       `\nFlags:\n` +
-      `  --publish                        # on deploy/prod: register the deployed URL (= the publish command)\n` +
-      `  --name <slug>                    # registry name to publish under (default: package.json name)\n` +
+      `  --publish                        # on deploy/prod: ALSO register the deployed URL (deploy + register)\n` +
+      `  --name <slug>                    # registry name to publish under (default: the origin's first label)\n` +
+      `  --public-url <url>               # (publish) address the catalog points at (default: https://<origin>)\n` +
       `  --install-by-default             # mark the published domain for install on every new instance\n` +
       `\n  publish shells out to \`astrale domain publish\` (needs \`astrale\` on PATH).\n\n`,
   )

package/src/server/worker-entry.ts CHANGED Viewed

@@ -31,6 +31,54 @@ import { canonicalizeServingUrl } from './serving-url'
 type Fetcher = { fetch(request: Request): Response | Promise<Response> }
 type App = { fetch(request: Request): Response | Promise<Response> }
+/** A built app cached by its serving URL: `origin` for same-origin matching,
+ * `app` for in-process self-dispatch. */
+type CachedApp = { origin: string; app: App }
+/**
+ * Choose where an OUTBOUND subrequest to `u` is routed — or `null` to let the
+ * real `fetch` handle it. Order matters and same-origin wins FIRST: a call to
+ * this worker's OWN serving origin is a self-dispatch, not an edge fetch — and
+ * the caller's `routeSubrequest` policy may itself match our own host (e.g. an
+ * `isInstanceHost` predicate matches every `*.svc.astrale.ai`, ours included),
+ * so it must never get first look at a same-origin call.
+ *
+ *   • same-origin + SELF binding present → the SELF fetcher: a fresh same-script
+ *     invocation. The normal Cloudflare path — a Worker can't fetch its own
+ *     hostname over the edge, so it re-enters itself through the binding.
+ *   • same-origin + NO SELF binding → the cached app, dispatched IN-PROCESS. A
+ *     Workers-for-Platforms dispatch-namespace tenant can't service-bind to
+ *     itself (its script name is platform-renamed), so it has no SELF binding; an
+ *     in-process dispatch reaches the same script with no edge hop and no binding.
+ *     `App` and the SELF `Fetcher` share the `{ fetch(request) }` shape, so the
+ *     caller drives both identically.
+ *   • else, the caller's `routeSubrequest` policy matched → its fetcher.
+ *   • else → `null`: passthrough to the real network fetch.
+ *
+ * Pure (no closure over instance state) so the routing decision is unit-testable
+ * without standing up a real app.
+ */
+export function selectSubrequestTarget<TDeps>(
+  u: URL,
+  ctx: {
+    self: Fetcher | null
+    apps: Iterable<CachedApp>
+    routeEnv: TDeps | null
+    routeSubrequest?: (url: URL, env: TDeps) => Fetcher | null | undefined
+  },
+): { fetch(request: Request): Response | Promise<Response> } | null {
+  // Same-origin self-subrequest → the same script (SELF binding, else in-process).
+  for (const cached of ctx.apps) {
+    if (cached.origin === u.origin) return ctx.self ?? cached.app
+  }
+  // Caller policy (e.g. a platform router on the same zone) → its fetcher.
+  if (ctx.routeSubrequest && ctx.routeEnv) {
+    const via = ctx.routeSubrequest(u, ctx.routeEnv)
+    if (via) return via
+  }
+  return null
+}
 export interface WorkerEntryConfig<TDeps> {
   /**
    * Build the `createRemoteServer` config for the resolved serving `url`. Called
@@ -152,7 +200,7 @@ export function createWorkerEntry<TDeps>(config: WorkerEntryConfig<TDeps>): Work
   // every alternation. The bound caps abuse via attacker-minted Host /
   // X-Forwarded-Proto values on that same fallback path.
   const MAX_CACHED_APPS = 4
-  const apps = new Map<string, { origin: string; app: App }>()
+  const apps = new Map<string, CachedApp>()
   let self: Fetcher | null = null
   let routeEnv: TDeps | null = null
@@ -168,29 +216,25 @@ export function createWorkerEntry<TDeps>(config: WorkerEntryConfig<TDeps>): Work
     return app
   }
-  // A Worker can't fetch its own hostname (SELF), nor — on Cloudflare — a
+  // A Worker can't fetch its own hostname over the edge, nor — on Cloudflare — a
   // same-zone hostname routed to another Worker (the `routeSubrequest` case).
   // When either is configured, override `globalThis.fetch` to redirect those
-  // subrequests through the caller's fetcher. Workers with neither get no global
-  // mutation. (A self-issued credential's JWKS is resolved in-memory by the
-  // verifier, not fetched — see `auth/verify.ts` — so no self-JWKS shim is needed.)
+  // subrequests through the right target (see `selectSubrequestTarget`). Workers
+  // with neither selfBinding nor routeSubrequest get no global mutation. (A
+  // self-issued credential's JWKS is resolved in-memory by the verifier, not
+  // fetched — see `auth/verify.ts` — so no self-JWKS shim is needed.)
   if (config.selfBinding || config.routeSubrequest) {
     const originalFetch = globalThis.fetch
     globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
       const href = typeof input === 'string' ? input : input instanceof URL ? input.href : input.url
       try {
-        const u = new URL(href)
-        // same-origin → SELF (a Worker can't fetch its own hostname)
-        if (self && apps.size > 0) {
-          for (const cached of apps.values()) {
-            if (cached.origin === u.origin) return self.fetch(new Request(input, init))
-          }
-        }
-        // caller policy → its fetcher (e.g. a platform router on the same zone)
-        if (config.routeSubrequest && routeEnv) {
-          const via = config.routeSubrequest(u, routeEnv)
-          if (via) return via.fetch(new Request(input, init))
-        }
+        const target = selectSubrequestTarget(new URL(href), {
+          self,
+          apps: apps.values(),
+          routeEnv,
+          routeSubrequest: config.routeSubrequest,
+        })
+        if (target) return target.fetch(new Request(input, init))
       } catch {
         // non-absolute URL — fall through to the original fetch
       }