@astrale-os/sdk 0.1.6 → 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.
- package/dist/cli/bin.d.ts +7 -0
- package/dist/cli/bin.d.ts.map +1 -0
- package/dist/cli/bin.js +15 -0
- package/dist/cli/bin.js.map +1 -0
- package/dist/cli/dotenv.d.ts +13 -0
- package/dist/cli/dotenv.d.ts.map +1 -0
- package/dist/cli/dotenv.js +46 -0
- package/dist/cli/dotenv.js.map +1 -0
- package/dist/cli/index.d.ts +15 -0
- package/dist/cli/index.d.ts.map +1 -0
- package/dist/cli/index.js +15 -0
- package/dist/cli/index.js.map +1 -0
- package/dist/cli/run.d.ts +84 -0
- package/dist/cli/run.d.ts.map +1 -0
- package/dist/cli/run.js +603 -0
- package/dist/cli/run.js.map +1 -0
- package/dist/cli/spec.d.ts +19 -0
- package/dist/cli/spec.d.ts.map +1 -0
- package/dist/cli/spec.js +31 -0
- package/dist/cli/spec.js.map +1 -0
- package/dist/config/adapter.d.ts +140 -0
- package/dist/config/adapter.d.ts.map +1 -0
- package/dist/config/adapter.js +40 -0
- package/dist/config/adapter.js.map +1 -0
- package/dist/config/define-domain.d.ts +112 -0
- package/dist/config/define-domain.d.ts.map +1 -0
- package/dist/config/define-domain.js +98 -0
- package/dist/config/define-domain.js.map +1 -0
- package/dist/config/deploy.d.ts +28 -0
- package/dist/config/deploy.d.ts.map +1 -0
- package/dist/config/deploy.js +24 -0
- package/dist/config/deploy.js.map +1 -0
- package/dist/config/index.d.ts +21 -0
- package/dist/config/index.d.ts.map +1 -0
- package/dist/config/index.js +18 -0
- package/dist/config/index.js.map +1 -0
- package/dist/define/remote-function.d.ts +19 -11
- package/dist/define/remote-function.d.ts.map +1 -1
- package/dist/define/remote-function.js.map +1 -1
- package/dist/dispatch/call-remote.d.ts +7 -3
- package/dist/dispatch/call-remote.d.ts.map +1 -1
- package/dist/dispatch/call-remote.js.map +1 -1
- package/dist/dispatch/dispatcher.d.ts.map +1 -1
- package/dist/dispatch/dispatcher.js +8 -4
- package/dist/dispatch/dispatcher.js.map +1 -1
- package/dist/dispatch/index.d.ts +1 -1
- package/dist/dispatch/index.d.ts.map +1 -1
- package/dist/dispatch/index.js.map +1 -1
- package/dist/dispatch/self.d.ts +46 -10
- package/dist/dispatch/self.d.ts.map +1 -1
- package/dist/dispatch/self.js +65 -8
- package/dist/dispatch/self.js.map +1 -1
- package/dist/domain/define.d.ts +3 -3
- package/dist/domain/define.js +3 -3
- package/dist/index.d.ts +5 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -2
- package/dist/index.js.map +1 -1
- package/dist/method/class.d.ts.map +1 -1
- package/dist/method/class.js.map +1 -1
- package/dist/method/context.d.ts +32 -7
- package/dist/method/context.d.ts.map +1 -1
- package/dist/method/index.d.ts +1 -1
- package/dist/method/index.d.ts.map +1 -1
- package/dist/method/single.d.ts +16 -11
- package/dist/method/single.d.ts.map +1 -1
- package/dist/method/single.js.map +1 -1
- package/dist/server/domain-entry.d.ts +67 -0
- package/dist/server/domain-entry.d.ts.map +1 -0
- package/dist/server/domain-entry.js +58 -0
- package/dist/server/domain-entry.js.map +1 -0
- package/dist/server/index.d.ts +3 -1
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +2 -1
- package/dist/server/index.js.map +1 -1
- package/dist/server/worker-entry.d.ts +80 -5
- package/dist/server/worker-entry.d.ts.map +1 -1
- package/dist/server/worker-entry.js +105 -24
- package/dist/server/worker-entry.js.map +1 -1
- package/package.json +12 -3
- package/src/cli/bin.ts +15 -0
- package/src/cli/dotenv.ts +45 -0
- package/src/cli/index.ts +15 -0
- package/src/cli/run.ts +710 -0
- package/src/cli/spec.ts +42 -0
- package/src/config/adapter.ts +172 -0
- package/src/config/define-domain.ts +218 -0
- package/src/config/deploy.ts +35 -0
- package/src/config/index.ts +31 -0
- package/src/define/remote-function.ts +42 -13
- package/src/dispatch/call-remote.ts +7 -2
- package/src/dispatch/dispatcher.ts +8 -4
- package/src/dispatch/index.ts +1 -1
- package/src/dispatch/self.ts +96 -10
- package/src/domain/define.ts +3 -3
- package/src/index.ts +25 -4
- package/src/method/class.ts +4 -3
- package/src/method/context.ts +38 -7
- package/src/method/index.ts +1 -1
- package/src/method/single.ts +30 -11
- package/src/server/domain-entry.ts +113 -0
- package/src/server/index.ts +3 -1
- package/src/server/worker-entry.ts +128 -24
package/dist/method/single.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ import type { AuthPolicy, RouteBinding } from '@astrale-os/kernel-api/routed';
|
|
|
13
13
|
import type { MethodClassKeys, ClassMethodConfig, NonSealedMethodKeys, OwnMethodKeys } from '@astrale-os/kernel-core/domain';
|
|
14
14
|
import type { Schema } from '@astrale-os/kernel-dsl';
|
|
15
15
|
import type { SelfResult } from '../dispatch/self';
|
|
16
|
-
import type { RemoteContext } from './context';
|
|
16
|
+
import type { KernelForAuth, RemoteContext } from './context';
|
|
17
17
|
/**
|
|
18
18
|
* Remote function handler — execute with full typed context.
|
|
19
19
|
*
|
|
@@ -27,9 +27,9 @@ import type { RemoteContext } from './context';
|
|
|
27
27
|
* dispatcher throws — that's a programmer error indicating a stub leaked into
|
|
28
28
|
* a code path that was supposed to execute it.
|
|
29
29
|
*/
|
|
30
|
-
export type RemoteHandler<TParams, TResult, TSelf, TDeps> = {
|
|
30
|
+
export type RemoteHandler<TParams, TResult, TSelf, TDeps, TAuth extends AuthPolicy = 'required'> = {
|
|
31
31
|
/** The handler body. May be async or an async generator (for `output: 'stream'`). */
|
|
32
|
-
execute?: (ctx: RemoteContext<TParams, TSelf, TDeps
|
|
32
|
+
execute?: (ctx: RemoteContext<TParams, TSelf, TDeps, KernelForAuth<TAuth>>) => TResult | Promise<TResult> | AsyncGenerator<TResult>;
|
|
33
33
|
/**
|
|
34
34
|
* Optional REST binding — attaches a native HTTP route to this method.
|
|
35
35
|
* Uses the kernel's canonical `RouteBinding` type directly.
|
|
@@ -43,8 +43,13 @@ export type RemoteHandler<TParams, TResult, TSelf, TDeps> = {
|
|
|
43
43
|
remoteUrl?: string;
|
|
44
44
|
/** Optional human-readable description. Appears in generated docs. */
|
|
45
45
|
description?: string;
|
|
46
|
-
/**
|
|
47
|
-
|
|
46
|
+
/**
|
|
47
|
+
* Authentication policy. Defaults to `'required'` when absent. Captured as a
|
|
48
|
+
* literal type so it drives {@link KernelForAuth} on the `execute`/`authorize`
|
|
49
|
+
* context: omit it (or set `'required'`) and `ctx.kernel` is non-null;
|
|
50
|
+
* `'optional'` widens it to `… | null`; `'public'` makes it `null`.
|
|
51
|
+
*/
|
|
52
|
+
auth?: TAuth;
|
|
48
53
|
/**
|
|
49
54
|
* Optional pre-execute authorization check. Runs after auth resolution and
|
|
50
55
|
* `_self` resolution, before `execute`. Throw any error to deny the call —
|
|
@@ -59,19 +64,19 @@ export type RemoteHandler<TParams, TResult, TSelf, TDeps> = {
|
|
|
59
64
|
* The kernel still enforces `has_perm` independently — `authorize` is
|
|
60
65
|
* additive ergonomic gating on top, not a replacement.
|
|
61
66
|
*/
|
|
62
|
-
authorize?: (ctx: RemoteContext<TParams, TSelf, TDeps
|
|
67
|
+
authorize?: (ctx: RemoteContext<TParams, TSelf, TDeps, KernelForAuth<TAuth>>) => void | Promise<void>;
|
|
63
68
|
};
|
|
64
|
-
export type AnyRemoteHandler = RemoteHandler<any, any, any, any>;
|
|
69
|
+
export type AnyRemoteHandler = RemoteHandler<any, any, any, any, AuthPolicy>;
|
|
65
70
|
/**
|
|
66
71
|
* Fully typed method implementation — resolves params/result/self from the
|
|
67
72
|
* schema, wraps in `RemoteHandler` with deps.
|
|
68
73
|
*/
|
|
69
|
-
export type MethodImpl<S extends Schema, K extends MethodClassKeys<S> & string, M extends string, TDeps = unknown> = ClassMethodConfig<S, K, M> extends {
|
|
74
|
+
export type MethodImpl<S extends Schema, K extends MethodClassKeys<S> & string, M extends string, TDeps = unknown, TAuth extends AuthPolicy = 'required'> = ClassMethodConfig<S, K, M> extends {
|
|
70
75
|
params: infer P;
|
|
71
76
|
result: infer R;
|
|
72
77
|
self: unknown;
|
|
73
78
|
isStatic: infer St;
|
|
74
|
-
} ? RemoteHandler<P, R, St extends true ? undefined : SelfResult, TDeps> : never;
|
|
79
|
+
} ? RemoteHandler<P, R, St extends true ? undefined : SelfResult, TDeps, TAuth> : never;
|
|
75
80
|
type ImplementableMethodName<S extends Schema, K extends MethodClassKeys<S> & string> = (OwnMethodKeys<S, K> | NonSealedMethodKeys<S, K>) & string;
|
|
76
81
|
/**
|
|
77
82
|
* Identity helper for authoring one remote method with full schema-driven typing.
|
|
@@ -82,7 +87,7 @@ type ImplementableMethodName<S extends Schema, K extends MethodClassKeys<S> & st
|
|
|
82
87
|
* - `remoteMethod(schema, className, methodName, impl)` — direct form with
|
|
83
88
|
* `unknown` deps.
|
|
84
89
|
*/
|
|
85
|
-
export declare function remoteMethod<TDeps>(): <S extends Schema, K extends MethodClassKeys<S> & string, M extends ImplementableMethodName<S, K
|
|
86
|
-
export declare function remoteMethod<S extends Schema, K extends MethodClassKeys<S> & string, M extends ImplementableMethodName<S, K
|
|
90
|
+
export declare function remoteMethod<TDeps>(): <S extends Schema, K extends MethodClassKeys<S> & string, M extends ImplementableMethodName<S, K>, TAuth extends AuthPolicy = 'required'>(schema: S, className: K, methodName: M, impl: MethodImpl<S, K, M, TDeps, TAuth>) => MethodImpl<S, K, M, TDeps, TAuth>;
|
|
91
|
+
export declare function remoteMethod<S extends Schema, K extends MethodClassKeys<S> & string, M extends ImplementableMethodName<S, K>, TAuth extends AuthPolicy = 'required'>(schema: S, className: K, methodName: M, impl: MethodImpl<S, K, M, unknown, TAuth>): MethodImpl<S, K, M, unknown, TAuth>;
|
|
87
92
|
export {};
|
|
88
93
|
//# sourceMappingURL=single.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"single.d.ts","sourceRoot":"","sources":["../../src/method/single.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAC7E,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACd,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"single.d.ts","sourceRoot":"","sources":["../../src/method/single.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"single.js","sourceRoot":"","sources":["../../src/method/single.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"single.js","sourceRoot":"","sources":["../../src/method/single.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAuIH,MAAM,UAAU,YAAY,CAAC,GAAG,IAAe;IAC7C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,GAAG,SAAoB,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IAClD,CAAC;IAED,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;AAChB,CAAC"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `domainWorkerEntry` — the one-call worker entry for a standalone domain.
|
|
3
|
+
*
|
|
4
|
+
* It folds the three steps every hand-rolled worker used to wire by hand —
|
|
5
|
+
* compile the runtime domain (`defineRemoteDomain`), build the server
|
|
6
|
+
* (`createRemoteServer`), and wrap it in the shared fetch plumbing
|
|
7
|
+
* (`createWorkerEntry`) — into a single declaration. The author passes the raw
|
|
8
|
+
* modules (`schema` / `methods` / `views` / `functions`) plus the identity and
|
|
9
|
+
* deploy bits; the helper does the rest. This is what the cloudflare adapter's
|
|
10
|
+
* codegen emits, and the recommended surface for a hand-rolled worker.
|
|
11
|
+
*
|
|
12
|
+
* Drop down to `createWorkerEntry` + `defineRemoteDomain` (from
|
|
13
|
+
* `@astrale-os/sdk/domain`) only when the worker needs something this config
|
|
14
|
+
* can't express — e.g. a serving-URL-dependent domain build (views stamped with
|
|
15
|
+
* the live url) or a globally-injected signing key resolved per request.
|
|
16
|
+
*/
|
|
17
|
+
import type { Core, Schema } from '@astrale-os/kernel-dsl';
|
|
18
|
+
import type { Hono } from 'hono';
|
|
19
|
+
import type { AnyRemoteFunctionDef, ViewDef } from '../define';
|
|
20
|
+
import type { SchemaMethodsImpl } from '../method';
|
|
21
|
+
import type { RemoteServerConfig } from './config';
|
|
22
|
+
import type { WorkerEntry, WorkerEntryConfig } from './worker-entry';
|
|
23
|
+
export interface DomainWorkerEntryConfig<S extends Schema, TEnv, TDeps> {
|
|
24
|
+
/** The domain schema. */
|
|
25
|
+
schema: S;
|
|
26
|
+
/** Method implementations, typed against `schema` under `TDeps`. */
|
|
27
|
+
methods: SchemaMethodsImpl<S, TDeps>;
|
|
28
|
+
/** Optional Core override (extra genesis nodes / wiring). */
|
|
29
|
+
core?: Core<S>;
|
|
30
|
+
/** Views (iframe-mountable UIs) keyed by slug. */
|
|
31
|
+
views?: Record<string, ViewDef<TDeps>>;
|
|
32
|
+
/** Standalone Functions (callables not bound to a class) keyed by slug. */
|
|
33
|
+
functions?: Record<string, AnyRemoteFunctionDef>;
|
|
34
|
+
/**
|
|
35
|
+
* The worker's signing key (its `iss` identity material). A static JWK, or a
|
|
36
|
+
* resolver from `env` for keys injected as a secret / shared globally.
|
|
37
|
+
*/
|
|
38
|
+
privateKey: JsonWebKey | ((env: TEnv) => JsonWebKey);
|
|
39
|
+
/** Cross-domain deps by origin — verified present at install. */
|
|
40
|
+
requires?: readonly string[];
|
|
41
|
+
/** Typed colon-path the kernel calls once as __SYSTEM__ after install. */
|
|
42
|
+
postInstall?: string;
|
|
43
|
+
/** Provenance stamped on `/meta`. */
|
|
44
|
+
meta?: RemoteServerConfig<TDeps>['meta'];
|
|
45
|
+
/**
|
|
46
|
+
* Map the worker `env` to the handler dependency container. Defaults to
|
|
47
|
+
* passing `env` straight through (the common case where handlers read
|
|
48
|
+
* bindings directly).
|
|
49
|
+
*/
|
|
50
|
+
deps?: (env: TEnv, url: string) => TDeps;
|
|
51
|
+
/** Optional pre-built host Hono app (CORS / logging / extra routes). */
|
|
52
|
+
app?: (env: TEnv) => Hono;
|
|
53
|
+
resolveUrl?: WorkerEntryConfig<TEnv>['resolveUrl'];
|
|
54
|
+
selfBinding?: WorkerEntryConfig<TEnv>['selfBinding'];
|
|
55
|
+
routeSubrequest?: WorkerEntryConfig<TEnv>['routeSubrequest'];
|
|
56
|
+
before?: WorkerEntryConfig<TEnv>['before'];
|
|
57
|
+
rewriteRequest?: WorkerEntryConfig<TEnv>['rewriteRequest'];
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* Curried so `TDeps` can be fixed explicitly (it types `methods`/`views`) while
|
|
61
|
+
* `S` is inferred from `schema` — mirroring `defineRemoteDomain`. The common
|
|
62
|
+
* case `domainWorkerEntry<Env>()({ … })` leaves `TDeps = TEnv` (handlers read
|
|
63
|
+
* the env directly); pass both — `domainWorkerEntry<Env, Deps>()` — when the
|
|
64
|
+
* handler deps differ from the worker bindings and a `deps` mapper is supplied.
|
|
65
|
+
*/
|
|
66
|
+
export declare function domainWorkerEntry<TEnv, TDeps = TEnv>(): <S extends Schema>(config: DomainWorkerEntryConfig<S, TEnv, TDeps>) => WorkerEntry<TEnv>;
|
|
67
|
+
//# sourceMappingURL=domain-entry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"domain-entry.d.ts","sourceRoot":"","sources":["../../src/server/domain-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAEhC,OAAO,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAKpE,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,KAAK;IACpE,yBAAyB;IACzB,MAAM,EAAE,CAAC,CAAA;IACT,oEAAoE;IACpE,OAAO,EAAE,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;IACpC,6DAA6D;IAC7D,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;IACd,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;IACtC,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;IAEhD;;;OAGG;IACH,UAAU,EAAE,UAAU,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,KAAK,UAAU,CAAC,CAAA;IACpD,iEAAiE;IACjE,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,0EAA0E;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,qCAAqC;IACrC,IAAI,CAAC,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;IAExC;;;;OAIG;IACH,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,KAAK,CAAA;IACxC,wEAAwE;IACxE,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,IAAI,CAAA;IAGzB,UAAU,CAAC,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAA;IAClD,WAAW,CAAC,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAA;IACpD,eAAe,CAAC,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC,CAAA;IAC5D,MAAM,CAAC,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAA;IAC1C,cAAc,CAAC,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAA;CAC3D;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,MACjC,CAAC,SAAS,MAAM,UACvB,uBAAuB,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,KAC9C,WAAW,CAAC,IAAI,CAAC,CAiCrB"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `domainWorkerEntry` — the one-call worker entry for a standalone domain.
|
|
3
|
+
*
|
|
4
|
+
* It folds the three steps every hand-rolled worker used to wire by hand —
|
|
5
|
+
* compile the runtime domain (`defineRemoteDomain`), build the server
|
|
6
|
+
* (`createRemoteServer`), and wrap it in the shared fetch plumbing
|
|
7
|
+
* (`createWorkerEntry`) — into a single declaration. The author passes the raw
|
|
8
|
+
* modules (`schema` / `methods` / `views` / `functions`) plus the identity and
|
|
9
|
+
* deploy bits; the helper does the rest. This is what the cloudflare adapter's
|
|
10
|
+
* codegen emits, and the recommended surface for a hand-rolled worker.
|
|
11
|
+
*
|
|
12
|
+
* Drop down to `createWorkerEntry` + `defineRemoteDomain` (from
|
|
13
|
+
* `@astrale-os/sdk/domain`) only when the worker needs something this config
|
|
14
|
+
* can't express — e.g. a serving-URL-dependent domain build (views stamped with
|
|
15
|
+
* the live url) or a globally-injected signing key resolved per request.
|
|
16
|
+
*/
|
|
17
|
+
import { defineRemoteDomain } from '../domain';
|
|
18
|
+
import { createWorkerEntry } from './worker-entry';
|
|
19
|
+
/**
|
|
20
|
+
* Curried so `TDeps` can be fixed explicitly (it types `methods`/`views`) while
|
|
21
|
+
* `S` is inferred from `schema` — mirroring `defineRemoteDomain`. The common
|
|
22
|
+
* case `domainWorkerEntry<Env>()({ … })` leaves `TDeps = TEnv` (handlers read
|
|
23
|
+
* the env directly); pass both — `domainWorkerEntry<Env, Deps>()` — when the
|
|
24
|
+
* handler deps differ from the worker bindings and a `deps` mapper is supplied.
|
|
25
|
+
*/
|
|
26
|
+
export function domainWorkerEntry() {
|
|
27
|
+
return function (config) {
|
|
28
|
+
const domain = defineRemoteDomain()({
|
|
29
|
+
schema: config.schema,
|
|
30
|
+
methods: config.methods,
|
|
31
|
+
...(config.core ? { core: config.core } : {}),
|
|
32
|
+
...(config.views ? { views: config.views } : {}),
|
|
33
|
+
...(config.functions ? { remoteFunctions: config.functions } : {}),
|
|
34
|
+
});
|
|
35
|
+
return createWorkerEntry({
|
|
36
|
+
...(config.resolveUrl ? { resolveUrl: config.resolveUrl } : {}),
|
|
37
|
+
...(config.selfBinding ? { selfBinding: config.selfBinding } : {}),
|
|
38
|
+
...(config.routeSubrequest ? { routeSubrequest: config.routeSubrequest } : {}),
|
|
39
|
+
...(config.before ? { before: config.before } : {}),
|
|
40
|
+
...(config.rewriteRequest ? { rewriteRequest: config.rewriteRequest } : {}),
|
|
41
|
+
// `createWorkerEntry` conflates the worker env and the handler deps into a
|
|
42
|
+
// single type param; we keep them distinct in the public config and bridge
|
|
43
|
+
// here. The runtime deps (and the methods typed against them) are correct;
|
|
44
|
+
// only this assembly is cast.
|
|
45
|
+
build: (url, env) => ({
|
|
46
|
+
domain,
|
|
47
|
+
deps: config.deps ? config.deps(env, url) : env,
|
|
48
|
+
url,
|
|
49
|
+
privateKey: typeof config.privateKey === 'function' ? config.privateKey(env) : config.privateKey,
|
|
50
|
+
...(config.requires && config.requires.length > 0 ? { requires: config.requires } : {}),
|
|
51
|
+
...(config.postInstall ? { postInstall: config.postInstall } : {}),
|
|
52
|
+
...(config.meta ? { meta: config.meta } : {}),
|
|
53
|
+
...(config.app ? { app: config.app(env) } : {}),
|
|
54
|
+
}),
|
|
55
|
+
});
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=domain-entry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"domain-entry.js","sourceRoot":"","sources":["../../src/server/domain-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAUH,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AA2ClD;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB;IAC/B,OAAO,UACL,MAA+C;QAE/C,MAAM,MAAM,GAAG,kBAAkB,EAAS,CAAC;YACzC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC,CAAA;QAEF,OAAO,iBAAiB,CAAO;YAC7B,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9E,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnD,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3E,2EAA2E;YAC3E,2EAA2E;YAC3E,2EAA2E;YAC3E,8BAA8B;YAC9B,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAClB,CAAC;gBACC,MAAM;gBACN,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAE,GAAwB;gBACrE,GAAG;gBACH,UAAU,EACR,OAAO,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU;gBACtF,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvF,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChD,CAAwC;SAC5C,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -4,8 +4,10 @@ export type { RemoteServer, RemoteServerHandle } from './handle';
|
|
|
4
4
|
export { derivePublicJwk } from './jwks';
|
|
5
5
|
export { requireEnv } from './require-env';
|
|
6
6
|
export { canonicalizeServingUrl } from './serving-url';
|
|
7
|
-
export { createWorkerEntry } from './worker-entry';
|
|
7
|
+
export { assets, createWorkerEntry } from './worker-entry';
|
|
8
8
|
export type { WorkerEntry, WorkerEntryConfig } from './worker-entry';
|
|
9
|
+
export { domainWorkerEntry } from './domain-entry';
|
|
10
|
+
export type { DomainWorkerEntryConfig } from './domain-entry';
|
|
9
11
|
export { workerMeta } from './worker-meta';
|
|
10
12
|
export { startNodeServer } from './start';
|
|
11
13
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAClD,YAAY,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAClD,YAAY,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAC1D,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAClD,YAAY,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA"}
|
package/dist/server/index.js
CHANGED
|
@@ -2,7 +2,8 @@ export { createRemoteServer } from './create';
|
|
|
2
2
|
export { derivePublicJwk } from './jwks';
|
|
3
3
|
export { requireEnv } from './require-env';
|
|
4
4
|
export { canonicalizeServingUrl } from './serving-url';
|
|
5
|
-
export { createWorkerEntry } from './worker-entry';
|
|
5
|
+
export { assets, createWorkerEntry } from './worker-entry';
|
|
6
|
+
export { domainWorkerEntry } from './domain-entry';
|
|
6
7
|
export { workerMeta } from './worker-meta';
|
|
7
8
|
export { startNodeServer } from './start';
|
|
8
9
|
//# sourceMappingURL=index.js.map
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAG7C,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAG7C,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA"}
|
|
@@ -6,11 +6,13 @@
|
|
|
6
6
|
* • resolve the serving URL (== `iss`), canonicalize it (so the value matches
|
|
7
7
|
* what `createRemoteServer` signs with and the kernel pins), and cache the
|
|
8
8
|
* built app per distinct URL;
|
|
9
|
-
* • optional
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* `
|
|
9
|
+
* • optional subrequest routing: a `globalThis.fetch` override (installed ONLY
|
|
10
|
+
* when `selfBinding` and/or `routeSubrequest` is configured) redirects
|
|
11
|
+
* certain outbound fetches through a caller-supplied binding — `selfBinding`
|
|
12
|
+
* for same-host fetches (a Worker can't fetch its own hostname), and the
|
|
13
|
+
* vendor-neutral `routeSubrequest` for any caller policy (e.g. instance
|
|
14
|
+
* hostnames a same-zone Worker→Worker fetch would 522 on). The SDK names no
|
|
15
|
+
* backend or topology; the caller owns the predicate + the fetcher;
|
|
14
16
|
* • optional SPA hook (e.g. `/ui/*` served from an `ASSETS` binding).
|
|
15
17
|
*
|
|
16
18
|
* The worker's OWN JWKS (`<url>/.well-known/jwks.json`) is served as a normal
|
|
@@ -23,6 +25,46 @@ import type { RemoteServerConfig } from './config';
|
|
|
23
25
|
type Fetcher = {
|
|
24
26
|
fetch(request: Request): Response | Promise<Response>;
|
|
25
27
|
};
|
|
28
|
+
type App = {
|
|
29
|
+
fetch(request: Request): Response | Promise<Response>;
|
|
30
|
+
};
|
|
31
|
+
/** A built app cached by its serving URL: `origin` for same-origin matching,
|
|
32
|
+
* `app` for in-process self-dispatch. */
|
|
33
|
+
type CachedApp = {
|
|
34
|
+
origin: string;
|
|
35
|
+
app: App;
|
|
36
|
+
};
|
|
37
|
+
/**
|
|
38
|
+
* Choose where an OUTBOUND subrequest to `u` is routed — or `null` to let the
|
|
39
|
+
* real `fetch` handle it. Order matters and same-origin wins FIRST: a call to
|
|
40
|
+
* this worker's OWN serving origin is a self-dispatch, not an edge fetch — and
|
|
41
|
+
* the caller's `routeSubrequest` policy may itself match our own host (e.g. an
|
|
42
|
+
* `isInstanceHost` predicate matches every `*.svc.astrale.ai`, ours included),
|
|
43
|
+
* so it must never get first look at a same-origin call.
|
|
44
|
+
*
|
|
45
|
+
* • same-origin + SELF binding present → the SELF fetcher: a fresh same-script
|
|
46
|
+
* invocation. The normal Cloudflare path — a Worker can't fetch its own
|
|
47
|
+
* hostname over the edge, so it re-enters itself through the binding.
|
|
48
|
+
* • same-origin + NO SELF binding → the cached app, dispatched IN-PROCESS. A
|
|
49
|
+
* Workers-for-Platforms dispatch-namespace tenant can't service-bind to
|
|
50
|
+
* itself (its script name is platform-renamed), so it has no SELF binding; an
|
|
51
|
+
* in-process dispatch reaches the same script with no edge hop and no binding.
|
|
52
|
+
* `App` and the SELF `Fetcher` share the `{ fetch(request) }` shape, so the
|
|
53
|
+
* caller drives both identically.
|
|
54
|
+
* • else, the caller's `routeSubrequest` policy matched → its fetcher.
|
|
55
|
+
* • else → `null`: passthrough to the real network fetch.
|
|
56
|
+
*
|
|
57
|
+
* Pure (no closure over instance state) so the routing decision is unit-testable
|
|
58
|
+
* without standing up a real app.
|
|
59
|
+
*/
|
|
60
|
+
export declare function selectSubrequestTarget<TDeps>(u: URL, ctx: {
|
|
61
|
+
self: Fetcher | null;
|
|
62
|
+
apps: Iterable<CachedApp>;
|
|
63
|
+
routeEnv: TDeps | null;
|
|
64
|
+
routeSubrequest?: (url: URL, env: TDeps) => Fetcher | null | undefined;
|
|
65
|
+
}): {
|
|
66
|
+
fetch(request: Request): Response | Promise<Response>;
|
|
67
|
+
} | null;
|
|
26
68
|
export interface WorkerEntryConfig<TDeps> {
|
|
27
69
|
/**
|
|
28
70
|
* Build the `createRemoteServer` config for the resolved serving `url`. Called
|
|
@@ -43,6 +85,17 @@ export interface WorkerEntryConfig<TDeps> {
|
|
|
43
85
|
resolveUrl?: (env: TDeps, requestOrigin: string) => string;
|
|
44
86
|
/** Optional: the `SELF` service binding used to route same-host subrequests. */
|
|
45
87
|
selfBinding?: (env: TDeps) => Fetcher | null | undefined;
|
|
88
|
+
/**
|
|
89
|
+
* Optional, vendor-neutral: route an OUTBOUND subrequest through a
|
|
90
|
+
* caller-supplied fetcher instead of the network — for hosts a Worker can't
|
|
91
|
+
* reach directly over the edge (e.g. a platform router on the SAME zone:
|
|
92
|
+
* Cloudflare 522s a same-zone Worker→Worker public `fetch`). Return a `Fetcher`
|
|
93
|
+
* to route the request through, or null/undefined to fall through to the normal
|
|
94
|
+
* fetch. The SDK names no backend or topology — the CALLER owns BOTH the
|
|
95
|
+
* predicate (which hosts) and the fetcher (the binding). This generalizes
|
|
96
|
+
* `selfBinding` (same-origin → SELF) to any caller policy; both are honored.
|
|
97
|
+
*/
|
|
98
|
+
routeSubrequest?: (url: URL, env: TDeps) => Fetcher | null | undefined;
|
|
46
99
|
/**
|
|
47
100
|
* Optional: handle a request before it reaches the kernel app — e.g. serve a
|
|
48
101
|
* SPA under `/ui/*` or a same-origin `/api/*` endpoint the view calls. Return
|
|
@@ -72,6 +125,28 @@ export interface WorkerEntry<TDeps> {
|
|
|
72
125
|
* fails — it can never make this worker speak for another origin.
|
|
73
126
|
*/
|
|
74
127
|
export declare function clientOrigin(url: URL, request: Request): string;
|
|
128
|
+
/**
|
|
129
|
+
* Build a `before` hook that serves a static-asset `binding` (e.g. a Workers
|
|
130
|
+
* Assets binding) mounted under `base` (default `/ui`) — the runtime half of a
|
|
131
|
+
* domain's `client` binding. Returns `undefined` for non-matching paths (and
|
|
132
|
+
* when no binding is present) so the request falls through to domain dispatch.
|
|
133
|
+
*
|
|
134
|
+
* Asset URLs are rooted at `base` (a client bundler sets `base: '<base>/'`);
|
|
135
|
+
* this hook strips that prefix before delegating to the binding, so
|
|
136
|
+
* `<base>/x.js` resolves from the binding's root. When `devProxy` yields a URL
|
|
137
|
+
* (local dev), requests are proxied there instead — the seam for a bundler's
|
|
138
|
+
* HMR dev server. Whether unknown sub-paths fall back to `index.html` is the
|
|
139
|
+
* binding's own concern (e.g. wrangler's `not_found_handling`), not baked in
|
|
140
|
+
* here.
|
|
141
|
+
*
|
|
142
|
+
* Lives here, type-checked and testable, instead of being emitted as a string
|
|
143
|
+
* by every adapter's worker codegen.
|
|
144
|
+
*/
|
|
145
|
+
export declare function assets<TDeps>(opts: {
|
|
146
|
+
base?: string;
|
|
147
|
+
binding: (env: TDeps) => Fetcher | null | undefined;
|
|
148
|
+
devProxy?: (env: TDeps) => string | null | undefined;
|
|
149
|
+
}): (env: TDeps, url: URL, request: Request) => Response | Promise<Response> | undefined;
|
|
75
150
|
export declare function createWorkerEntry<TDeps>(config: WorkerEntryConfig<TDeps>): WorkerEntry<TDeps>;
|
|
76
151
|
export {};
|
|
77
152
|
//# sourceMappingURL=worker-entry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-entry.d.ts","sourceRoot":"","sources":["../../src/server/worker-entry.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"worker-entry.d.ts","sourceRoot":"","sources":["../../src/server/worker-entry.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,13 @@
|
|
|
6
6
|
* • resolve the serving URL (== `iss`), canonicalize it (so the value matches
|
|
7
7
|
* what `createRemoteServer` signs with and the kernel pins), and cache the
|
|
8
8
|
* built app per distinct URL;
|
|
9
|
-
* • optional
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* `
|
|
9
|
+
* • optional subrequest routing: a `globalThis.fetch` override (installed ONLY
|
|
10
|
+
* when `selfBinding` and/or `routeSubrequest` is configured) redirects
|
|
11
|
+
* certain outbound fetches through a caller-supplied binding — `selfBinding`
|
|
12
|
+
* for same-host fetches (a Worker can't fetch its own hostname), and the
|
|
13
|
+
* vendor-neutral `routeSubrequest` for any caller policy (e.g. instance
|
|
14
|
+
* hostnames a same-zone Worker→Worker fetch would 522 on). The SDK names no
|
|
15
|
+
* backend or topology; the caller owns the predicate + the fetcher;
|
|
14
16
|
* • optional SPA hook (e.g. `/ui/*` served from an `ASSETS` binding).
|
|
15
17
|
*
|
|
16
18
|
* The worker's OWN JWKS (`<url>/.well-known/jwks.json`) is served as a normal
|
|
@@ -22,6 +24,43 @@
|
|
|
22
24
|
import { createRemoteServer } from './create';
|
|
23
25
|
import { requireEnv } from './require-env';
|
|
24
26
|
import { canonicalizeServingUrl } from './serving-url';
|
|
27
|
+
/**
|
|
28
|
+
* Choose where an OUTBOUND subrequest to `u` is routed — or `null` to let the
|
|
29
|
+
* real `fetch` handle it. Order matters and same-origin wins FIRST: a call to
|
|
30
|
+
* this worker's OWN serving origin is a self-dispatch, not an edge fetch — and
|
|
31
|
+
* the caller's `routeSubrequest` policy may itself match our own host (e.g. an
|
|
32
|
+
* `isInstanceHost` predicate matches every `*.svc.astrale.ai`, ours included),
|
|
33
|
+
* so it must never get first look at a same-origin call.
|
|
34
|
+
*
|
|
35
|
+
* • same-origin + SELF binding present → the SELF fetcher: a fresh same-script
|
|
36
|
+
* invocation. The normal Cloudflare path — a Worker can't fetch its own
|
|
37
|
+
* hostname over the edge, so it re-enters itself through the binding.
|
|
38
|
+
* • same-origin + NO SELF binding → the cached app, dispatched IN-PROCESS. A
|
|
39
|
+
* Workers-for-Platforms dispatch-namespace tenant can't service-bind to
|
|
40
|
+
* itself (its script name is platform-renamed), so it has no SELF binding; an
|
|
41
|
+
* in-process dispatch reaches the same script with no edge hop and no binding.
|
|
42
|
+
* `App` and the SELF `Fetcher` share the `{ fetch(request) }` shape, so the
|
|
43
|
+
* caller drives both identically.
|
|
44
|
+
* • else, the caller's `routeSubrequest` policy matched → its fetcher.
|
|
45
|
+
* • else → `null`: passthrough to the real network fetch.
|
|
46
|
+
*
|
|
47
|
+
* Pure (no closure over instance state) so the routing decision is unit-testable
|
|
48
|
+
* without standing up a real app.
|
|
49
|
+
*/
|
|
50
|
+
export function selectSubrequestTarget(u, ctx) {
|
|
51
|
+
// Same-origin self-subrequest → the same script (SELF binding, else in-process).
|
|
52
|
+
for (const cached of ctx.apps) {
|
|
53
|
+
if (cached.origin === u.origin)
|
|
54
|
+
return ctx.self ?? cached.app;
|
|
55
|
+
}
|
|
56
|
+
// Caller policy (e.g. a platform router on the same zone) → its fetcher.
|
|
57
|
+
if (ctx.routeSubrequest && ctx.routeEnv) {
|
|
58
|
+
const via = ctx.routeSubrequest(u, ctx.routeEnv);
|
|
59
|
+
if (via)
|
|
60
|
+
return via;
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
25
64
|
/**
|
|
26
65
|
* The request origin as the CLIENT reached it — i.e. the origin a fallback
|
|
27
66
|
* serving URL (and therefore the `iss`) may be derived from. Behind a
|
|
@@ -41,6 +80,43 @@ export function clientOrigin(url, request) {
|
|
|
41
80
|
const scheme = forwarded?.split(',')[0]?.trim().toLowerCase();
|
|
42
81
|
return scheme === 'https' ? `https://${url.host}` : url.origin;
|
|
43
82
|
}
|
|
83
|
+
/**
|
|
84
|
+
* Build a `before` hook that serves a static-asset `binding` (e.g. a Workers
|
|
85
|
+
* Assets binding) mounted under `base` (default `/ui`) — the runtime half of a
|
|
86
|
+
* domain's `client` binding. Returns `undefined` for non-matching paths (and
|
|
87
|
+
* when no binding is present) so the request falls through to domain dispatch.
|
|
88
|
+
*
|
|
89
|
+
* Asset URLs are rooted at `base` (a client bundler sets `base: '<base>/'`);
|
|
90
|
+
* this hook strips that prefix before delegating to the binding, so
|
|
91
|
+
* `<base>/x.js` resolves from the binding's root. When `devProxy` yields a URL
|
|
92
|
+
* (local dev), requests are proxied there instead — the seam for a bundler's
|
|
93
|
+
* HMR dev server. Whether unknown sub-paths fall back to `index.html` is the
|
|
94
|
+
* binding's own concern (e.g. wrangler's `not_found_handling`), not baked in
|
|
95
|
+
* here.
|
|
96
|
+
*
|
|
97
|
+
* Lives here, type-checked and testable, instead of being emitted as a string
|
|
98
|
+
* by every adapter's worker codegen.
|
|
99
|
+
*/
|
|
100
|
+
export function assets(opts) {
|
|
101
|
+
const base = (opts.base ?? '/ui').replace(/\/+$/, '');
|
|
102
|
+
const prefix = `${base}/`;
|
|
103
|
+
return (env, url, request) => {
|
|
104
|
+
const binding = opts.binding(env);
|
|
105
|
+
if (!binding)
|
|
106
|
+
return undefined;
|
|
107
|
+
if (url.pathname !== base && !url.pathname.startsWith(prefix))
|
|
108
|
+
return undefined;
|
|
109
|
+
const devUrl = opts.devProxy?.(env);
|
|
110
|
+
if (devUrl) {
|
|
111
|
+
const devBase = devUrl.replace(/\/+$/, '');
|
|
112
|
+
return fetch(new Request(`${devBase}${url.pathname}${url.search}`, request));
|
|
113
|
+
}
|
|
114
|
+
// `<base>` → `/`, `<base>/x` → `/x`: serve from the binding's root.
|
|
115
|
+
const stripped = url.pathname.slice(base.length) || '/';
|
|
116
|
+
const rewritten = new URL(stripped + url.search, url.origin);
|
|
117
|
+
return binding.fetch(new Request(rewritten, request));
|
|
118
|
+
};
|
|
119
|
+
}
|
|
44
120
|
export function createWorkerEntry(config) {
|
|
45
121
|
// Cache the built app per distinct resolved URL — plural and bounded. On the
|
|
46
122
|
// request-origin fallback the URL legitimately alternates for one worker
|
|
@@ -51,6 +127,7 @@ export function createWorkerEntry(config) {
|
|
|
51
127
|
const MAX_CACHED_APPS = 4;
|
|
52
128
|
const apps = new Map();
|
|
53
129
|
let self = null;
|
|
130
|
+
let routeEnv = null;
|
|
54
131
|
function getApp(url, env) {
|
|
55
132
|
const cached = apps.get(url);
|
|
56
133
|
if (cached)
|
|
@@ -64,27 +141,29 @@ export function createWorkerEntry(config) {
|
|
|
64
141
|
apps.set(url, { origin: new URL(url).origin, app });
|
|
65
142
|
return app;
|
|
66
143
|
}
|
|
67
|
-
// A Worker can't fetch its own hostname
|
|
68
|
-
//
|
|
69
|
-
//
|
|
70
|
-
//
|
|
71
|
-
//
|
|
72
|
-
//
|
|
73
|
-
|
|
144
|
+
// A Worker can't fetch its own hostname over the edge, nor — on Cloudflare — a
|
|
145
|
+
// same-zone hostname routed to another Worker (the `routeSubrequest` case).
|
|
146
|
+
// When either is configured, override `globalThis.fetch` to redirect those
|
|
147
|
+
// subrequests through the right target (see `selectSubrequestTarget`). Workers
|
|
148
|
+
// with neither selfBinding nor routeSubrequest get no global mutation. (A
|
|
149
|
+
// self-issued credential's JWKS is resolved in-memory by the verifier, not
|
|
150
|
+
// fetched — see `auth/verify.ts` — so no self-JWKS shim is needed.)
|
|
151
|
+
if (config.selfBinding || config.routeSubrequest) {
|
|
74
152
|
const originalFetch = globalThis.fetch;
|
|
75
153
|
globalThis.fetch = (async (input, init) => {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
154
|
+
const href = typeof input === 'string' ? input : input instanceof URL ? input.href : input.url;
|
|
155
|
+
try {
|
|
156
|
+
const target = selectSubrequestTarget(new URL(href), {
|
|
157
|
+
self,
|
|
158
|
+
apps: apps.values(),
|
|
159
|
+
routeEnv,
|
|
160
|
+
routeSubrequest: config.routeSubrequest,
|
|
161
|
+
});
|
|
162
|
+
if (target)
|
|
163
|
+
return target.fetch(new Request(input, init));
|
|
164
|
+
}
|
|
165
|
+
catch {
|
|
166
|
+
// non-absolute URL — fall through to the original fetch
|
|
88
167
|
}
|
|
89
168
|
return originalFetch(input, init);
|
|
90
169
|
});
|
|
@@ -93,6 +172,8 @@ export function createWorkerEntry(config) {
|
|
|
93
172
|
async fetch(request, env) {
|
|
94
173
|
if (config.selfBinding)
|
|
95
174
|
self ??= config.selfBinding(env) ?? null;
|
|
175
|
+
if (config.routeSubrequest)
|
|
176
|
+
routeEnv = env;
|
|
96
177
|
// Only parse the request URL when a hook actually needs it.
|
|
97
178
|
const requestUrl = config.before || config.resolveUrl ? new URL(request.url) : null;
|
|
98
179
|
if (config.before && requestUrl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-entry.js","sourceRoot":"","sources":["../../src/server/worker-entry.ts"],"names":[],"mappings":"AAAA
|
|
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;AAStD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,sBAAsB,CACpC,CAAM,EACN,GAKC;IAED,iFAAiF;IACjF,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;YAAE,OAAO,GAAG,CAAC,IAAI,IAAI,MAAM,CAAC,GAAG,CAAA;IAC/D,CAAC;IACD,yEAAyE;IACzE,IAAI,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;QAChD,IAAI,GAAG;YAAE,OAAO,GAAG,CAAA;IACrB,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAwDD;;;;;;;;;;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,EAAqB,CAAA;IACzC,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,+EAA+E;IAC/E,4EAA4E;IAC5E,2EAA2E;IAC3E,+EAA+E;IAC/E,0EAA0E;IAC1E,2EAA2E;IAC3E,oEAAoE;IACpE,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,MAAM,GAAG,sBAAsB,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE;oBACnD,IAAI;oBACJ,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;oBACnB,QAAQ;oBACR,eAAe,EAAE,MAAM,CAAC,eAAe;iBACxC,CAAC,CAAA;gBACF,IAAI,MAAM;oBAAE,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;YAC3D,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"}
|