@bleedingdev/modern-js-plugin-bff-extensions 3.8.3-ultramodern.6 → 3.9.0-ultramodern.10
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/README.md +6 -3
- package/dist/cjs/backend-federation/edge-runtime.js +3 -15
- package/dist/cjs/backend-federation/edge.js +8 -9
- package/dist/cjs/backend-federation/identity.js +17 -23
- package/dist/cjs/backend-federation/index.js +5 -5
- package/dist/cjs/backend-federation/load.js +3 -13
- package/dist/cjs/backend-federation/validate-loaded.js +2 -4
- package/dist/cjs/backend-federation-manifest/load.js +9 -7
- package/dist/cjs/backend-federation-manifest/metadata.js +3 -3
- package/dist/cjs/backend-federation-manifest/remote.js +2 -2
- package/dist/cjs/backend-federation-manifest/validation.js +7 -7
- package/dist/cjs/cross-project-policy/evaluation.js +3 -3
- package/dist/cjs/cross-project-policy/node.js +4 -3
- package/dist/cjs/{backend-federation/legacy-warning.js → cross-project-policy/producer-runtime.js} +23 -5
- package/dist/cjs/effect-adapter/entry.js +1 -0
- package/dist/cjs/effect-adapter/index.js +9 -2
- package/dist/cjs/{client-generator → effect-source-loader}/built-entry.js +1 -1
- package/dist/cjs/{client-generator/runtime.js → effect-source-loader/http-api-runtime.js} +12 -20
- package/dist/cjs/effect-source-loader/index.js +18 -6
- package/dist/cjs/effect-source-loader/loader.js +10 -27
- package/dist/cjs/effect-source-loader/operation-contracts.js +83 -0
- package/dist/cjs/effect-source-loader/rspack-loader.js +73 -0
- package/dist/cjs/effect-source-loader/worker-runtime-source.js +71 -0
- package/dist/cjs/effect-source-loader/worker-runtime-wrapper.js +7 -50
- package/dist/cjs/hono/cross-project-policy.js +2 -1
- package/dist/cjs/hono/node.js +51 -0
- package/dist/esm/backend-federation/edge-runtime.mjs +2 -11
- package/dist/esm/backend-federation/edge.mjs +4 -5
- package/dist/esm/backend-federation/identity.mjs +17 -23
- package/dist/esm/backend-federation/index.mjs +1 -1
- package/dist/esm/backend-federation/load.mjs +2 -12
- package/dist/esm/backend-federation/validate-loaded.mjs +2 -4
- package/dist/esm/backend-federation-manifest/load.mjs +9 -7
- package/dist/esm/backend-federation-manifest/metadata.mjs +1 -1
- package/dist/esm/backend-federation-manifest/remote.mjs +1 -1
- package/dist/esm/backend-federation-manifest/validation.mjs +5 -5
- package/dist/esm/cross-project-policy/evaluation.mjs +1 -1
- package/dist/esm/cross-project-policy/node.mjs +2 -1
- package/dist/esm/cross-project-policy/producer-runtime.mjs +20 -0
- package/dist/esm/effect-adapter/entry.mjs +1 -0
- package/dist/esm/effect-adapter/index.mjs +5 -1
- package/dist/esm/{client-generator → effect-source-loader}/built-entry.mjs +1 -1
- package/dist/esm/effect-source-loader/http-api-runtime.mjs +19 -0
- package/dist/esm/effect-source-loader/index.mjs +5 -2
- package/dist/esm/effect-source-loader/loader.mjs +10 -27
- package/dist/esm/effect-source-loader/operation-contracts.mjs +45 -0
- package/dist/esm/effect-source-loader/rspack-loader.mjs +35 -0
- package/dist/esm/effect-source-loader/worker-runtime-source.mjs +23 -0
- package/dist/esm/effect-source-loader/worker-runtime-wrapper.mjs +5 -45
- package/dist/esm/hono/cross-project-policy.mjs +2 -1
- package/dist/esm-node/backend-federation/edge-runtime.mjs +2 -11
- package/dist/esm-node/backend-federation/edge.mjs +4 -5
- package/dist/esm-node/backend-federation/identity.mjs +17 -23
- package/dist/esm-node/backend-federation/index.mjs +1 -1
- package/dist/esm-node/backend-federation/load.mjs +2 -12
- package/dist/esm-node/backend-federation/validate-loaded.mjs +2 -4
- package/dist/esm-node/backend-federation-manifest/load.mjs +9 -7
- package/dist/esm-node/backend-federation-manifest/metadata.mjs +1 -1
- package/dist/esm-node/backend-federation-manifest/remote.mjs +1 -1
- package/dist/esm-node/backend-federation-manifest/validation.mjs +5 -5
- package/dist/esm-node/cross-project-policy/evaluation.mjs +1 -1
- package/dist/esm-node/cross-project-policy/node.mjs +2 -1
- package/dist/esm-node/cross-project-policy/producer-runtime.mjs +21 -0
- package/dist/esm-node/effect-adapter/entry.mjs +1 -0
- package/dist/esm-node/effect-adapter/index.mjs +5 -1
- package/dist/esm-node/{client-generator → effect-source-loader}/built-entry.mjs +1 -1
- package/dist/esm-node/effect-source-loader/http-api-runtime.mjs +20 -0
- package/dist/esm-node/effect-source-loader/index.mjs +5 -2
- package/dist/esm-node/effect-source-loader/loader.mjs +10 -27
- package/dist/esm-node/effect-source-loader/operation-contracts.mjs +46 -0
- package/dist/esm-node/effect-source-loader/rspack-loader.mjs +37 -0
- package/dist/esm-node/effect-source-loader/worker-runtime-source.mjs +24 -0
- package/dist/esm-node/effect-source-loader/worker-runtime-wrapper.mjs +5 -45
- package/dist/esm-node/hono/cross-project-policy.mjs +2 -1
- package/dist/esm-node/hono/node.mjs +14 -0
- package/dist/types/backend-federation/edge-runtime.d.ts +2 -7
- package/dist/types/backend-federation/edge.d.ts +6 -8
- package/dist/types/backend-federation/entry.d.ts +1 -1
- package/dist/types/backend-federation/identity.d.ts +2 -11
- package/dist/types/backend-federation/index.d.ts +5 -5
- package/dist/types/backend-federation/load.d.ts +1 -7
- package/dist/types/backend-federation/node.d.ts +1 -3
- package/dist/types/backend-federation/plugin.d.ts +1 -1
- package/dist/types/backend-federation/remotes.d.ts +2 -2
- package/dist/types/backend-federation/runtime.d.ts +1 -1
- package/dist/types/backend-federation/types.d.ts +2 -8
- package/dist/types/backend-federation/validate-loaded.d.ts +3 -4
- package/dist/types/backend-federation-manifest/index.d.ts +5 -5
- package/dist/types/backend-federation-manifest/load.d.ts +2 -2
- package/dist/types/backend-federation-manifest/metadata.d.ts +1 -7
- package/dist/types/backend-federation-manifest/node.d.ts +2 -2
- package/dist/types/backend-federation-manifest/reference.d.ts +1 -1
- package/dist/types/backend-federation-manifest/remote.d.ts +2 -2
- package/dist/types/backend-federation-manifest/types.d.ts +2 -2
- package/dist/types/backend-federation-manifest/validation.d.ts +2 -2
- package/dist/types/cross-project-generation/index.d.ts +1 -1
- package/dist/types/cross-project-policy/evaluation.d.ts +1 -1
- package/dist/types/cross-project-policy/index.d.ts +1 -1
- package/dist/types/cross-project-policy/node.d.ts +3 -2
- package/dist/types/cross-project-policy/producer-runtime.d.ts +20 -0
- package/dist/types/effect-adapter/cross-project-policy.d.ts +1 -1
- package/dist/types/effect-adapter/entry.d.ts +1 -0
- package/dist/types/effect-adapter/index.d.ts +2 -0
- package/dist/types/effect-source-loader/index.d.ts +6 -3
- package/dist/types/effect-source-loader/operation-contracts.d.ts +8 -0
- package/dist/types/effect-source-loader/rspack-loader.d.ts +9 -0
- package/dist/types/effect-source-loader/worker-runtime-source.d.ts +4 -0
- package/dist/types/effect-source-loader/worker-runtime-wrapper.d.ts +4 -22
- package/dist/types/hono/bind-route-handlers.d.ts +1 -1
- package/dist/types/hono/cross-project-policy.d.ts +1 -1
- package/dist/types/hono/index.d.ts +1 -1
- package/dist/types/hono/node.d.ts +4 -0
- package/package.json +51 -23
- package/src/backend-federation/edge-runtime.ts +2 -13
- package/src/backend-federation/edge.ts +9 -17
- package/src/backend-federation/identity.ts +9 -27
- package/src/backend-federation/index.ts +1 -1
- package/src/backend-federation/load.ts +7 -34
- package/src/backend-federation/node.ts +0 -11
- package/src/backend-federation/types.ts +1 -7
- package/src/backend-federation/validate-loaded.ts +2 -7
- package/src/backend-federation-manifest/load.ts +20 -14
- package/src/backend-federation-manifest/metadata.ts +1 -7
- package/src/backend-federation-manifest/remote.ts +1 -1
- package/src/backend-federation-manifest/validation.ts +10 -13
- package/src/cross-project-policy/evaluation.ts +1 -1
- package/src/cross-project-policy/node.ts +3 -3
- package/src/cross-project-policy/producer-runtime.ts +43 -0
- package/src/effect-adapter/entry.ts +1 -0
- package/src/effect-adapter/index.ts +5 -0
- package/src/{client-generator → effect-source-loader}/built-entry.ts +1 -3
- package/src/effect-source-loader/http-api-runtime.ts +39 -0
- package/src/effect-source-loader/index.ts +8 -5
- package/src/effect-source-loader/loader.ts +31 -45
- package/src/effect-source-loader/operation-contracts.ts +72 -0
- package/src/effect-source-loader/rspack-loader.ts +72 -0
- package/src/effect-source-loader/worker-runtime-source.ts +34 -0
- package/src/effect-source-loader/worker-runtime-wrapper.ts +5 -75
- package/src/hono/cross-project-policy.ts +2 -1
- package/src/hono/node.ts +24 -0
- package/dist/cjs/client-generator/generator.js +0 -73
- package/dist/cjs/client-generator/index.js +0 -54
- package/dist/cjs/client-generator/rendering.js +0 -253
- package/dist/cjs/client-generator/types.js +0 -18
- package/dist/esm/backend-federation/legacy-warning.mjs +0 -2
- package/dist/esm/client-generator/generator.mjs +0 -32
- package/dist/esm/client-generator/index.mjs +0 -3
- package/dist/esm/client-generator/rendering.mjs +0 -209
- package/dist/esm/client-generator/runtime.mjs +0 -27
- package/dist/esm/client-generator/types.mjs +0 -0
- package/dist/esm-node/backend-federation/legacy-warning.mjs +0 -3
- package/dist/esm-node/client-generator/generator.mjs +0 -33
- package/dist/esm-node/client-generator/index.mjs +0 -4
- package/dist/esm-node/client-generator/rendering.mjs +0 -210
- package/dist/esm-node/client-generator/runtime.mjs +0 -29
- package/dist/esm-node/client-generator/types.mjs +0 -1
- package/dist/types/backend-federation/legacy-warning.d.ts +0 -1
- package/dist/types/client-generator/generator.d.ts +0 -3
- package/dist/types/client-generator/index.d.ts +0 -4
- package/dist/types/client-generator/rendering.d.ts +0 -24
- package/dist/types/client-generator/types.d.ts +0 -33
- package/src/backend-federation/legacy-warning.ts +0 -2
- package/src/client-generator/generator.ts +0 -52
- package/src/client-generator/index.ts +0 -10
- package/src/client-generator/rendering.ts +0 -307
- package/src/client-generator/runtime.ts +0 -69
- package/src/client-generator/types.ts +0 -35
- /package/dist/cjs/{client-generator → effect-source-loader}/paths.js +0 -0
- /package/dist/esm/{client-generator → effect-source-loader}/paths.mjs +0 -0
- /package/dist/esm-node/{client-generator → effect-source-loader}/paths.mjs +0 -0
- /package/dist/types/{client-generator → effect-source-loader}/built-entry.d.ts +0 -0
- /package/dist/types/{client-generator/runtime.d.ts → effect-source-loader/http-api-runtime.d.ts} +0 -0
- /package/dist/types/{client-generator → effect-source-loader}/paths.d.ts +0 -0
- /package/src/{client-generator → effect-source-loader}/paths.ts +0 -0
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
import { BACKEND_FEDERATION_EFFECT_EXPOSE } from '@modern-js/
|
|
2
|
-
import * as Effect from 'effect/Effect';
|
|
3
|
-
import * as Logger from 'effect/Logger';
|
|
1
|
+
import { BACKEND_FEDERATION_EFFECT_EXPOSE } from '@modern-js/backend-federation-contracts';
|
|
4
2
|
|
|
5
|
-
import { type BackendFederationExpectedIdentity } from './identity';
|
|
6
|
-
import { LEGACY_LOAD_WARNING } from './legacy-warning';
|
|
7
3
|
import { collectRemotes } from './remotes';
|
|
8
4
|
import { createBackendFederationRuntime } from './runtime';
|
|
9
5
|
import type {
|
|
@@ -14,18 +10,6 @@ import type {
|
|
|
14
10
|
import { normalizeExpose } from './utils';
|
|
15
11
|
import { validateLoadedBackendFederatedEffectApi } from './validate-loaded';
|
|
16
12
|
|
|
17
|
-
const legacyWarningLogger = Logger.withLeveledConsole(Logger.formatLogFmt);
|
|
18
|
-
|
|
19
|
-
function warnLegacyLoad() {
|
|
20
|
-
Effect.runSync(
|
|
21
|
-
Effect.provideService(
|
|
22
|
-
Effect.logWarning(LEGACY_LOAD_WARNING),
|
|
23
|
-
Logger.CurrentLoggers,
|
|
24
|
-
new Set([legacyWarningLogger]),
|
|
25
|
-
),
|
|
26
|
-
);
|
|
27
|
-
}
|
|
28
|
-
|
|
29
13
|
/**
|
|
30
14
|
* Load a federated Effect API with mandatory delivery-unit identity
|
|
31
15
|
* validation (MV-G23): the loaded expose's compatibility metadata must match
|
|
@@ -33,20 +17,6 @@ function warnLegacyLoad() {
|
|
|
33
17
|
*/
|
|
34
18
|
export function loadBackendFederatedEffectApi(
|
|
35
19
|
options: BackendFederationIdentityLoadOptions,
|
|
36
|
-
): Promise<BackendFederatedEffectApiModule>;
|
|
37
|
-
/**
|
|
38
|
-
* @deprecated Pass `expected` (delivery-unit `unitId` + `buildMarker`).
|
|
39
|
-
* Loads without an expected identity cannot be validated against a resolved
|
|
40
|
-
* delivery-unit record and emit a runtime warning.
|
|
41
|
-
*/
|
|
42
|
-
export function loadBackendFederatedEffectApi(
|
|
43
|
-
options: BackendFederationLoadOptions,
|
|
44
|
-
): Promise<BackendFederatedEffectApiModule>;
|
|
45
|
-
export function loadBackendFederatedEffectApi(
|
|
46
|
-
options: BackendFederationLoadOptions & {
|
|
47
|
-
expected?: BackendFederationExpectedIdentity;
|
|
48
|
-
allowMissingIdentityMetadata?: boolean;
|
|
49
|
-
},
|
|
50
20
|
): Promise<BackendFederatedEffectApiModule> {
|
|
51
21
|
const remoteName = options.remote?.name ?? options.remoteName;
|
|
52
22
|
if (remoteName === undefined || remoteName.length === 0) {
|
|
@@ -55,8 +25,12 @@ export function loadBackendFederatedEffectApi(
|
|
|
55
25
|
);
|
|
56
26
|
}
|
|
57
27
|
|
|
58
|
-
if (options.expected
|
|
59
|
-
|
|
28
|
+
if (!options.expected?.unitId || !options.expected.buildMarker) {
|
|
29
|
+
return Promise.reject(
|
|
30
|
+
new Error(
|
|
31
|
+
'[BFF][Effect] Backend federation requires expected.unitId and expected.buildMarker.',
|
|
32
|
+
),
|
|
33
|
+
);
|
|
60
34
|
}
|
|
61
35
|
|
|
62
36
|
if (options.runtime !== undefined) {
|
|
@@ -93,7 +67,6 @@ export function loadBackendFederatedEffectApi(
|
|
|
93
67
|
const remoteRequest = `${remoteName}/${normalizeExpose(expose)}`;
|
|
94
68
|
return runtime.loadRemote(remoteRequest).then(loaded =>
|
|
95
69
|
validateLoadedBackendFederatedEffectApi(loaded, {
|
|
96
|
-
allowMissingIdentityMetadata: options.allowMissingIdentityMetadata,
|
|
97
70
|
expected: options.expected,
|
|
98
71
|
remoteName,
|
|
99
72
|
remoteRequest,
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { evaluateNodeBackendFederationCommonJs } from '@modern-js/server-runtime-extensions/backend-federation-security/node';
|
|
2
2
|
|
|
3
|
-
import type { BackendFederationExpectedIdentity } from './identity';
|
|
4
3
|
import { loadBackendFederatedEffectApi as loadUniversalBackendFederatedEffectApi } from './load';
|
|
5
4
|
import type {
|
|
6
5
|
BackendFederatedEffectApiModule,
|
|
@@ -10,16 +9,6 @@ import type {
|
|
|
10
9
|
|
|
11
10
|
export function loadBackendFederatedEffectApi(
|
|
12
11
|
options: BackendFederationIdentityLoadOptions,
|
|
13
|
-
): Promise<BackendFederatedEffectApiModule>;
|
|
14
|
-
/** @deprecated Pass `expected` delivery-unit identity. */
|
|
15
|
-
export function loadBackendFederatedEffectApi(
|
|
16
|
-
options: BackendFederationLoadOptions,
|
|
17
|
-
): Promise<BackendFederatedEffectApiModule>;
|
|
18
|
-
export function loadBackendFederatedEffectApi(
|
|
19
|
-
options: BackendFederationLoadOptions & {
|
|
20
|
-
expected?: BackendFederationExpectedIdentity;
|
|
21
|
-
allowMissingIdentityMetadata?: boolean;
|
|
22
|
-
},
|
|
23
12
|
): Promise<BackendFederatedEffectApiModule> {
|
|
24
13
|
return loadUniversalBackendFederatedEffectApi({
|
|
25
14
|
...options,
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import type { BACKEND_FEDERATION_EFFECT_EXPOSE } from '@modern-js/backend-federation-contracts';
|
|
1
2
|
import type { EffectApiModule } from '@modern-js/bff-effect/effect';
|
|
2
3
|
import type {
|
|
3
4
|
BackendFederationRemoteEntryPolicy,
|
|
4
5
|
BackendFederationRemoteEntryVerification,
|
|
5
6
|
} from '@modern-js/server-runtime-extensions/backend-federation-security';
|
|
6
|
-
import type { BACKEND_FEDERATION_EFFECT_EXPOSE } from '@modern-js/utils/universal';
|
|
7
7
|
import type {
|
|
8
8
|
ModuleFederation,
|
|
9
9
|
ModuleFederationRuntimePlugin,
|
|
@@ -85,12 +85,6 @@ export type BackendFederationLoadOptions = BackendFederationRuntimeOptions & {
|
|
|
85
85
|
export type BackendFederationIdentityLoadOptions =
|
|
86
86
|
BackendFederationLoadOptions & {
|
|
87
87
|
expected: BackendFederationExpectedIdentity;
|
|
88
|
-
/**
|
|
89
|
-
* Tolerate legacy exposes without identity metadata (mismatching declared
|
|
90
|
-
* values still fail). Prefer leaving this unset: identity-less exposes
|
|
91
|
-
* cannot be validated against a resolved delivery-unit record.
|
|
92
|
-
*/
|
|
93
|
-
allowMissingIdentityMetadata?: boolean;
|
|
94
88
|
};
|
|
95
89
|
|
|
96
90
|
export type BackendFederationLoadEntryPlugin = ModuleFederationRuntimePlugin & {
|
|
@@ -9,8 +9,7 @@ import { isRecord } from './utils';
|
|
|
9
9
|
export function validateLoadedBackendFederatedEffectApi(
|
|
10
10
|
loaded: unknown,
|
|
11
11
|
options: {
|
|
12
|
-
|
|
13
|
-
expected?: BackendFederationExpectedIdentity;
|
|
12
|
+
expected: BackendFederationExpectedIdentity;
|
|
14
13
|
remoteName: string;
|
|
15
14
|
remoteRequest: string;
|
|
16
15
|
},
|
|
@@ -52,14 +51,10 @@ export function validateLoadedBackendFederatedEffectApi(
|
|
|
52
51
|
);
|
|
53
52
|
}
|
|
54
53
|
|
|
55
|
-
|
|
54
|
+
{
|
|
56
55
|
const issues = validateExpectedBackendFederationIdentity(
|
|
57
56
|
loaded,
|
|
58
57
|
options.expected,
|
|
59
|
-
{
|
|
60
|
-
allowMissingIdentityMetadata:
|
|
61
|
-
options.allowMissingIdentityMetadata === true,
|
|
62
|
-
},
|
|
63
58
|
);
|
|
64
59
|
if (issues.length > 0) {
|
|
65
60
|
throw new Error(
|
|
@@ -7,6 +7,12 @@ import {
|
|
|
7
7
|
} from '../backend-federation';
|
|
8
8
|
import { loadBackendFederatedEffectApi } from '../backend-federation/load';
|
|
9
9
|
import { BackendFederationManifestAdapterError } from './errors';
|
|
10
|
+
import {
|
|
11
|
+
backendFederationMetadata,
|
|
12
|
+
manifestDeliveryUnit,
|
|
13
|
+
stringValue,
|
|
14
|
+
versionBoundaryMetadata,
|
|
15
|
+
} from './metadata';
|
|
10
16
|
import { loadBackendFederationManifest } from './reference';
|
|
11
17
|
import { resolveBackendFederationRemoteFromManifest } from './remote';
|
|
12
18
|
import type {
|
|
@@ -204,6 +210,19 @@ export async function loadBackendFederatedEffectApiFromManifest(
|
|
|
204
210
|
);
|
|
205
211
|
}
|
|
206
212
|
|
|
213
|
+
const deliveryUnit = manifestDeliveryUnit(
|
|
214
|
+
backendFederationMetadata(manifest),
|
|
215
|
+
versionBoundaryMetadata(manifest),
|
|
216
|
+
);
|
|
217
|
+
const unitId =
|
|
218
|
+
stringValue(deliveryUnit.boundary?.unitId) ??
|
|
219
|
+
stringValue(deliveryUnit.top?.unitId);
|
|
220
|
+
const buildMarker = stringValue(deliveryUnit.boundary?.buildMarker);
|
|
221
|
+
if (!unitId || !buildMarker)
|
|
222
|
+
throw new BackendFederationManifestAdapterError(
|
|
223
|
+
'manifest_invalid',
|
|
224
|
+
'Backend federation manifest requires delivery-unit identity.',
|
|
225
|
+
);
|
|
207
226
|
const loaded = await loadBackendFederatedEffectApi({
|
|
208
227
|
hostName: options.hostName,
|
|
209
228
|
remote,
|
|
@@ -214,20 +233,7 @@ export async function loadBackendFederatedEffectApiFromManifest(
|
|
|
214
233
|
timeoutMs: 0,
|
|
215
234
|
},
|
|
216
235
|
...(options.runtime ? { runtime: options.runtime } : {}),
|
|
217
|
-
|
|
218
|
-
// delivery-unit identity validation when an identity is expected.
|
|
219
|
-
...(options.expected?.unitId && options.expected.buildMarker
|
|
220
|
-
? {
|
|
221
|
-
expected: {
|
|
222
|
-
unitId: options.expected.unitId,
|
|
223
|
-
buildMarker: options.expected.buildMarker,
|
|
224
|
-
},
|
|
225
|
-
// The manifest's identity is already validated against
|
|
226
|
-
// `expected`; legacy exposes without identity metadata stay
|
|
227
|
-
// loadable (mismatching declared values still fail).
|
|
228
|
-
allowMissingIdentityMetadata: true,
|
|
229
|
-
}
|
|
230
|
-
: {}),
|
|
236
|
+
expected: { unitId, buildMarker },
|
|
231
237
|
}).catch((error: unknown) => {
|
|
232
238
|
throw new BackendFederationManifestAdapterError(
|
|
233
239
|
scope?.timedOut() === true ? 'timeout' : classifyLoadError(error),
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import {
|
|
4
4
|
backendFederationMetadata as sharedBackendFederationMetadata,
|
|
5
5
|
backendFederationVersionBoundary as sharedBackendFederationVersionBoundary,
|
|
6
|
-
} from '@modern-js/
|
|
6
|
+
} from '@modern-js/backend-federation-contracts';
|
|
7
7
|
import type { BackendFederationManifest } from './types';
|
|
8
8
|
|
|
9
9
|
export function stringValue(value: unknown) {
|
|
@@ -56,12 +56,6 @@ export function deliveryUnitMetadata(
|
|
|
56
56
|
return recordField(record, 'deliveryUnit');
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
/**
|
|
60
|
-
* Resolves the delivery-unit identity root for a manifest (ADR-0019 §3):
|
|
61
|
-
* prefers `versionBoundary.deliveryUnit`, falls back to the top-level
|
|
62
|
-
* `backendFederation.deliveryUnit` record. Both are additive/optional so
|
|
63
|
-
* legacy manifests without delivery-unit metadata continue to validate.
|
|
64
|
-
*/
|
|
65
59
|
export function manifestDeliveryUnit(
|
|
66
60
|
backendFederation: Record<string, unknown> | undefined,
|
|
67
61
|
boundary: Record<string, unknown> | undefined,
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
// @effect-diagnostics asyncFunction:off extendsNativeError:off globalTimers:off newPromise:off strictBooleanExpressions:off
|
|
2
2
|
|
|
3
|
+
import { backendFederationExposeNames } from '@modern-js/backend-federation-contracts';
|
|
3
4
|
import {
|
|
4
5
|
BackendFederationRemoteEntryError,
|
|
5
6
|
resolveBackendFederationRemoteEntryVerification,
|
|
6
7
|
} from '@modern-js/server-runtime-extensions/backend-federation-security';
|
|
7
|
-
import { backendFederationExposeNames } from '@modern-js/utils/universal';
|
|
8
8
|
import {
|
|
9
9
|
BACKEND_FEDERATION_EFFECT_EXPOSE,
|
|
10
10
|
type BackendFederationRemote,
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import {
|
|
4
4
|
formatBackendFederationValidationErrors,
|
|
5
5
|
validateBackendFederationManifest as validateBackendFederationManifestContract,
|
|
6
|
-
} from '@modern-js/
|
|
6
|
+
} from '@modern-js/backend-federation-contracts';
|
|
7
7
|
import {
|
|
8
8
|
BACKEND_FEDERATION_CONTRACT_VERSION,
|
|
9
9
|
BACKEND_FEDERATION_NODE_ADAPTER_VERSION,
|
|
@@ -48,11 +48,6 @@ function resolveExpectedBuildMarker(
|
|
|
48
48
|
);
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
// Intentionally no fallback to `buildVersion` here: this is only used to
|
|
52
|
-
// compare against manifest `deliveryUnit.buildMarker`, which is a
|
|
53
|
-
// separate, additive field. Callers that only pass `buildVersion` (the
|
|
54
|
-
// pre-ADR-0019 expectation shape) must not be forced to also match a
|
|
55
|
-
// delivery-unit build marker on the manifest.
|
|
56
51
|
return expected.buildMarker;
|
|
57
52
|
}
|
|
58
53
|
|
|
@@ -70,7 +65,6 @@ export function validateBackendFederationManifest(
|
|
|
70
65
|
const manifestShape = validateBackendFederationManifestContract(manifest, {
|
|
71
66
|
expectedContractVersion: false,
|
|
72
67
|
expectedNodeAdapterVersion: false,
|
|
73
|
-
validateDeliveryUnit: false,
|
|
74
68
|
});
|
|
75
69
|
assertManifestAdapter(
|
|
76
70
|
manifestShape.ok,
|
|
@@ -151,6 +145,11 @@ export function validateBackendFederationManifest(
|
|
|
151
145
|
const manifestUnitId =
|
|
152
146
|
stringValue(deliveryUnit.boundary?.unitId) ??
|
|
153
147
|
stringValue(deliveryUnit.top?.unitId);
|
|
148
|
+
assertManifestAdapter(
|
|
149
|
+
manifestUnitId && stringValue(deliveryUnit.boundary?.buildMarker),
|
|
150
|
+
'manifest_invalid',
|
|
151
|
+
'Backend federation manifest requires delivery-unit unitId and buildMarker.',
|
|
152
|
+
);
|
|
154
153
|
assertVersionValue(manifestUnitId, expected.unitId, 'deliveryUnit.unitId');
|
|
155
154
|
assertVersionValue(
|
|
156
155
|
stringValue(deliveryUnit.boundary?.buildMarker),
|
|
@@ -214,16 +213,14 @@ export function validateLoadedBackendFederationContract(
|
|
|
214
213
|
stringValue(deliveryUnit.top?.unitId);
|
|
215
214
|
const manifestBuildMarker = stringValue(deliveryUnit.boundary?.buildMarker);
|
|
216
215
|
|
|
217
|
-
|
|
218
|
-
// is a legacy manifest/expose and must stay backward compatible.
|
|
219
|
-
assertConsistentValue(
|
|
220
|
-
manifestUnitId,
|
|
216
|
+
assertVersionValue(
|
|
221
217
|
stringValue(compatibility.unitId),
|
|
218
|
+
manifestUnitId,
|
|
222
219
|
'deliveryUnit.unitId vs expose compatibility.unitId',
|
|
223
220
|
);
|
|
224
|
-
|
|
225
|
-
manifestBuildMarker,
|
|
221
|
+
assertVersionValue(
|
|
226
222
|
stringValue(compatibility.build),
|
|
223
|
+
manifestBuildMarker,
|
|
227
224
|
'deliveryUnit.buildMarker vs expose compatibility.build',
|
|
228
225
|
);
|
|
229
226
|
}
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
evaluateCrossProjectPolicy,
|
|
4
4
|
type NormalizedCrossProjectPolicy,
|
|
5
5
|
resolveCrossProjectRequestObservation,
|
|
6
|
-
} from '@modern-js/
|
|
6
|
+
} from '@modern-js/server-runtime-extensions/bff-policy';
|
|
7
7
|
|
|
8
8
|
export type ResolvedCrossProjectPolicy = NormalizedCrossProjectPolicy;
|
|
9
9
|
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { readFileSync } from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
|
|
3
|
+
import '@modern-js/server-runtime-extensions/server-config';
|
|
4
|
+
import type { ServerPluginAPI } from '@modern-js/server-core';
|
|
4
5
|
import {
|
|
5
6
|
deriveOperationVersion,
|
|
6
7
|
type OperationContractSource,
|
|
7
8
|
resolveCrossProjectPolicy,
|
|
8
|
-
} from '@modern-js/bff-
|
|
9
|
-
import type { ServerPluginAPI } from '@modern-js/server-core';
|
|
9
|
+
} from '@modern-js/server-runtime-extensions/bff-policy/node';
|
|
10
10
|
|
|
11
11
|
import type { ResolvedCrossProjectPolicy } from './evaluation';
|
|
12
12
|
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
interface ProducerClientOptions {
|
|
2
|
+
requestId?: string;
|
|
3
|
+
requireEnvelope?: boolean;
|
|
4
|
+
identityBinding?: {
|
|
5
|
+
enabled?: boolean;
|
|
6
|
+
strict?: boolean;
|
|
7
|
+
protectedHeaders?: string[];
|
|
8
|
+
};
|
|
9
|
+
operationContract?: {
|
|
10
|
+
enabled?: boolean;
|
|
11
|
+
strict?: boolean;
|
|
12
|
+
requireSchemaHash?: boolean;
|
|
13
|
+
requireOperationVersion?: boolean;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/** Bind producer defaults once while preserving every per-call nested override. */
|
|
18
|
+
export function createProducerClient<
|
|
19
|
+
Options extends ProducerClientOptions,
|
|
20
|
+
Result,
|
|
21
|
+
>(
|
|
22
|
+
configure: (options: Options) => Result,
|
|
23
|
+
{ requestId }: { requestId: string },
|
|
24
|
+
) {
|
|
25
|
+
return (options?: Options): Result =>
|
|
26
|
+
configure({
|
|
27
|
+
requestId,
|
|
28
|
+
requireEnvelope: true,
|
|
29
|
+
...options,
|
|
30
|
+
identityBinding: {
|
|
31
|
+
enabled: true,
|
|
32
|
+
strict: true,
|
|
33
|
+
...options?.identityBinding,
|
|
34
|
+
},
|
|
35
|
+
operationContract: {
|
|
36
|
+
enabled: true,
|
|
37
|
+
strict: true,
|
|
38
|
+
requireSchemaHash: true,
|
|
39
|
+
requireOperationVersion: true,
|
|
40
|
+
...options?.operationContract,
|
|
41
|
+
},
|
|
42
|
+
} as Options);
|
|
43
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// @effect-diagnostics nodeBuiltinImport:off strictBooleanExpressions:off
|
|
2
2
|
|
|
3
3
|
import path from 'node:path';
|
|
4
|
+
import '@modern-js/server-runtime-extensions/server-config';
|
|
4
5
|
import type { ServerPluginAPI } from '@modern-js/server-core';
|
|
5
6
|
import { API_DIR, findExists, fs, isProd } from '@modern-js/utils';
|
|
6
7
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// @effect-diagnostics anyUnknownInErrorContext:off asyncFunction:off nodeBuiltinImport:off strictBooleanExpressions:off
|
|
2
2
|
|
|
3
3
|
import path from 'node:path';
|
|
4
|
+
import '@modern-js/server-runtime-extensions/server-config';
|
|
4
5
|
import {
|
|
5
6
|
dispatchEffectBffRequest,
|
|
6
7
|
type EffectApiModule,
|
|
@@ -244,3 +245,7 @@ export class EffectAdapter {
|
|
|
244
245
|
this.handler = candidate;
|
|
245
246
|
}
|
|
246
247
|
}
|
|
248
|
+
|
|
249
|
+
export const createRuntimeAdapters = (api: ServerPluginAPI) => [
|
|
250
|
+
new EffectAdapter(api),
|
|
251
|
+
];
|
|
@@ -41,9 +41,7 @@ export async function bundleBuiltEffectEntryForNode(options: {
|
|
|
41
41
|
}`,
|
|
42
42
|
);
|
|
43
43
|
}
|
|
44
|
-
const { bundleEffectEntryForNode } = await import(
|
|
45
|
-
'../effect-source-loader/loader'
|
|
46
|
-
);
|
|
44
|
+
const { bundleEffectEntryForNode } = await import('./loader');
|
|
47
45
|
return bundleEffectEntryForNode({
|
|
48
46
|
appDir,
|
|
49
47
|
entryPath: builtEntry,
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import {
|
|
2
|
+
extractHttpApiFromModule,
|
|
3
|
+
type HttpApiLike,
|
|
4
|
+
type HttpApiReflect,
|
|
5
|
+
} from '@modern-js/bff-effect/effect';
|
|
6
|
+
import { HttpApi } from 'effect/unstable/httpapi';
|
|
7
|
+
import { loadEffectSourceModule } from './loader';
|
|
8
|
+
|
|
9
|
+
type HttpApiRuntime = {
|
|
10
|
+
isHttpApi: (value: unknown) => boolean;
|
|
11
|
+
reflect: HttpApiReflect;
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export function getHttpApiRuntime(): Promise<HttpApiRuntime> {
|
|
15
|
+
return Promise.resolve({
|
|
16
|
+
isHttpApi: HttpApi.isHttpApi,
|
|
17
|
+
reflect: (api, handlers) => {
|
|
18
|
+
if (!HttpApi.isHttpApi(api)) {
|
|
19
|
+
throw new TypeError('[BFF][Effect] Expected an HttpApi contract.');
|
|
20
|
+
}
|
|
21
|
+
HttpApi.reflect(api, {
|
|
22
|
+
onGroup: handlers.onGroup ?? (() => {}),
|
|
23
|
+
onEndpoint: handlers.onEndpoint,
|
|
24
|
+
});
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export function loadEffectApi(options: {
|
|
30
|
+
appDir: string;
|
|
31
|
+
resourcePath: string;
|
|
32
|
+
onDependency?: (dependency: string) => void;
|
|
33
|
+
}): Promise<HttpApiLike | null> {
|
|
34
|
+
return getHttpApiRuntime().then(httpApiRuntime =>
|
|
35
|
+
loadEffectSourceModule(options).then(mod =>
|
|
36
|
+
extractHttpApiFromModule(mod, httpApiRuntime.isHttpApi),
|
|
37
|
+
),
|
|
38
|
+
);
|
|
39
|
+
}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
export { resolveEffectEntryFile } from '../client-generator/paths';
|
|
2
|
-
export { bundleEffectEntryForNode } from './loader';
|
|
3
1
|
export {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
} from './
|
|
2
|
+
bundleBuiltEffectEntryForNode,
|
|
3
|
+
resolveEffectEntryPaths,
|
|
4
|
+
} from './built-entry';
|
|
5
|
+
export { bundleEffectEntryForNode } from './loader';
|
|
6
|
+
export { resolveEffectOperationContracts } from './operation-contracts';
|
|
7
|
+
export { resolveEffectEntryFile } from './paths';
|
|
8
|
+
export { bundleEffectWorkerRuntimeSource } from './worker-runtime-source';
|
|
9
|
+
export { generateEffectWorkerRuntimeWrapper } from './worker-runtime-wrapper';
|
|
@@ -39,29 +39,37 @@ function preserveSourceModuleSemantics(): Plugin {
|
|
|
39
39
|
return {
|
|
40
40
|
name: 'modern-js-effect-source-semantics',
|
|
41
41
|
setup(buildApi) {
|
|
42
|
-
buildApi.onLoad(
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
42
|
+
buildApi.onLoad(
|
|
43
|
+
{ filter: /\.[cm]?[jt]sx?$/, namespace: 'file' },
|
|
44
|
+
async args => {
|
|
45
|
+
const loader = sourceLoader(args);
|
|
46
|
+
if (!loader) {
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
47
49
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
50
|
+
const source = await fs.promises.readFile(args.path, 'utf8');
|
|
51
|
+
const canonicalSourcePath = await fs.promises.realpath(args.path);
|
|
52
|
+
const compiled = await transform(source, {
|
|
53
|
+
define: {
|
|
54
|
+
__dirname: JSON.stringify(path.dirname(canonicalSourcePath)),
|
|
55
|
+
__filename: JSON.stringify(canonicalSourcePath),
|
|
56
|
+
'import.meta.url': JSON.stringify(
|
|
57
|
+
pathToFileURL(canonicalSourcePath).href,
|
|
58
|
+
),
|
|
59
|
+
},
|
|
60
|
+
jsx: 'automatic',
|
|
61
|
+
loader,
|
|
62
|
+
sourcefile: args.path,
|
|
63
|
+
target: NODE_TARGET,
|
|
64
|
+
});
|
|
58
65
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
66
|
+
return {
|
|
67
|
+
contents: compiled.code,
|
|
68
|
+
loader: 'js',
|
|
69
|
+
resolveDir: path.dirname(args.path),
|
|
70
|
+
};
|
|
71
|
+
},
|
|
72
|
+
);
|
|
65
73
|
},
|
|
66
74
|
};
|
|
67
75
|
}
|
|
@@ -123,12 +131,8 @@ function isBareSpecifier(specifier: string) {
|
|
|
123
131
|
* generated entry is relocatable and directly executable by Node 26.7.
|
|
124
132
|
*/
|
|
125
133
|
function externalizeInstalledDependencies(options: {
|
|
126
|
-
format: 'cjs' | 'esm';
|
|
127
134
|
runtimeResolveDir: string;
|
|
128
135
|
}): Plugin {
|
|
129
|
-
const runtimeRequire = createRequire(
|
|
130
|
-
path.join(options.runtimeResolveDir, '__modern_effect_entry.cjs'),
|
|
131
|
-
);
|
|
132
136
|
return {
|
|
133
137
|
name: 'modern-js-effect-installed-dependencies',
|
|
134
138
|
setup(buildApi) {
|
|
@@ -174,24 +178,8 @@ function externalizeInstalledDependencies(options: {
|
|
|
174
178
|
resolveDir: options.runtimeResolveDir,
|
|
175
179
|
});
|
|
176
180
|
if (runtimeResolution.errors.length === 0 && runtimeResolution.path) {
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
try {
|
|
180
|
-
requiredPath = runtimeRequire.resolve(args.path);
|
|
181
|
-
} catch {
|
|
182
|
-
requiredPath = runtimeResolution.path;
|
|
183
|
-
}
|
|
184
|
-
if (await isEsmOnlyFile(requiredPath)) {
|
|
185
|
-
return {
|
|
186
|
-
namespace: resolution.namespace,
|
|
187
|
-
path: resolution.path,
|
|
188
|
-
pluginData: resolution.pluginData,
|
|
189
|
-
sideEffects: resolution.sideEffects,
|
|
190
|
-
suffix: resolution.suffix,
|
|
191
|
-
warnings: resolution.warnings,
|
|
192
|
-
};
|
|
193
|
-
}
|
|
194
|
-
}
|
|
181
|
+
// Node 26 loads installed ESM from CommonJS natively. Rebundling
|
|
182
|
+
// it here would split dependency identity from the BFF runtime.
|
|
195
183
|
return { external: true, path: args.path };
|
|
196
184
|
}
|
|
197
185
|
}
|
|
@@ -225,7 +213,6 @@ export async function bundleEffectEntryForNode(options: {
|
|
|
225
213
|
platform: 'node',
|
|
226
214
|
plugins: [
|
|
227
215
|
externalizeInstalledDependencies({
|
|
228
|
-
format: options.format,
|
|
229
216
|
runtimeResolveDir: options.appDir,
|
|
230
217
|
}),
|
|
231
218
|
preserveSourceModuleSemantics(),
|
|
@@ -363,7 +350,6 @@ export async function loadEffectSourceModule(
|
|
|
363
350
|
platform: 'node',
|
|
364
351
|
plugins: [
|
|
365
352
|
externalizeInstalledDependencies({
|
|
366
|
-
format: 'esm',
|
|
367
353
|
runtimeResolveDir: appDir,
|
|
368
354
|
}),
|
|
369
355
|
preserveSourceModuleSemantics(),
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import {
|
|
2
|
+
collectEffectEndpoints,
|
|
3
|
+
toOperationContractSources,
|
|
4
|
+
} from '@modern-js/bff-effect/effect';
|
|
5
|
+
import {
|
|
6
|
+
buildOperationContractMap,
|
|
7
|
+
deriveOperationVersion,
|
|
8
|
+
} from '@modern-js/server-runtime-extensions/bff-policy/node';
|
|
9
|
+
import { fs, upath as path } from '@modern-js/utils';
|
|
10
|
+
import { getHttpApiRuntime, loadEffectApi } from './http-api-runtime';
|
|
11
|
+
|
|
12
|
+
function getPackageInfo(
|
|
13
|
+
resourcePath: string,
|
|
14
|
+
appDir: string,
|
|
15
|
+
onDependency?: (dependency: string) => void,
|
|
16
|
+
): { name?: string; version?: string } {
|
|
17
|
+
for (const startDir of [path.dirname(resourcePath), appDir]) {
|
|
18
|
+
let current = path.resolve(startDir);
|
|
19
|
+
for (let depth = 0; depth < 32; depth += 1) {
|
|
20
|
+
const packageJsonPath = path.join(current, 'package.json');
|
|
21
|
+
if (fs.existsSync(packageJsonPath)) {
|
|
22
|
+
onDependency?.(packageJsonPath);
|
|
23
|
+
try {
|
|
24
|
+
const packageJson = fs.readJSONSync(packageJsonPath) as {
|
|
25
|
+
name?: string;
|
|
26
|
+
version?: string;
|
|
27
|
+
};
|
|
28
|
+
return { name: packageJson.name, version: packageJson.version };
|
|
29
|
+
} catch {
|
|
30
|
+
return {};
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
const parent = path.dirname(current);
|
|
34
|
+
if (parent === current) {
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
current = parent;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return {};
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** Derives server policy metadata without emitting or typing a client. */
|
|
44
|
+
export async function resolveEffectOperationContracts(options: {
|
|
45
|
+
appDir: string;
|
|
46
|
+
resourcePath: string;
|
|
47
|
+
prefix: string;
|
|
48
|
+
requestId?: string;
|
|
49
|
+
onDependency?: (dependency: string) => void;
|
|
50
|
+
}) {
|
|
51
|
+
const api = await loadEffectApi(options);
|
|
52
|
+
if (api === null) {
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
const runtime = await getHttpApiRuntime();
|
|
56
|
+
const endpoints = collectEffectEndpoints(
|
|
57
|
+
runtime.reflect,
|
|
58
|
+
api,
|
|
59
|
+
options.prefix,
|
|
60
|
+
);
|
|
61
|
+
const packageInfo = getPackageInfo(
|
|
62
|
+
options.resourcePath,
|
|
63
|
+
options.appDir,
|
|
64
|
+
options.onDependency,
|
|
65
|
+
);
|
|
66
|
+
const requestId = options.requestId?.trim() || packageInfo.name || 'default';
|
|
67
|
+
return buildOperationContractMap({
|
|
68
|
+
handlers: toOperationContractSources(endpoints),
|
|
69
|
+
requestId,
|
|
70
|
+
operationVersion: deriveOperationVersion(packageInfo.version),
|
|
71
|
+
});
|
|
72
|
+
}
|