@bleedingdev/modern-js-plugin-bff-extensions 3.9.0-ultramodern.11 → 3.9.0-ultramodern.13
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 +3 -3
- package/dist/cjs/backend-federation/identity.js +23 -22
- package/dist/cjs/backend-federation/node-evaluator.js +48 -0
- package/dist/cjs/backend-federation/node.js +2 -2
- package/dist/cjs/backend-federation-manifest/node.js +2 -2
- package/dist/cjs/backend-federation-manifest/validation.js +11 -7
- package/dist/cjs/cross-project-policy/node.js +8 -28
- package/dist/cjs/{effect-adapter → effect-server}/cross-project-policy.js +5 -5
- package/dist/cjs/effect-server/entry.js +63 -0
- package/dist/cjs/{effect-adapter → effect-server}/error-response.js +4 -4
- package/dist/cjs/effect-server/index.js +199 -0
- package/dist/cjs/effect-source-loader/built-entry.js +4 -5
- package/dist/cjs/effect-source-loader/loader.js +2 -1
- package/dist/cjs/effect-source-loader/operation-contracts.js +8 -31
- package/dist/cjs/effect-source-loader/paths.js +38 -10
- package/dist/esm/backend-federation/identity.mjs +18 -23
- package/dist/esm/backend-federation/node-evaluator.mjs +7 -0
- package/dist/esm/backend-federation/node.mjs +2 -2
- package/dist/esm/backend-federation-manifest/node.mjs +2 -2
- package/dist/esm/backend-federation-manifest/validation.mjs +12 -8
- package/dist/esm/cross-project-policy/node.mjs +9 -19
- package/dist/esm/{effect-adapter → effect-server}/cross-project-policy.mjs +3 -3
- package/dist/esm/effect-server/entry.mjs +15 -0
- package/dist/esm/{effect-adapter → effect-server}/error-response.mjs +2 -2
- package/dist/esm/effect-server/index.mjs +151 -0
- package/dist/esm/effect-source-loader/built-entry.mjs +5 -6
- package/dist/esm/effect-source-loader/loader.mjs +2 -1
- package/dist/esm/effect-source-loader/operation-contracts.mjs +10 -33
- package/dist/esm/effect-source-loader/paths.mjs +30 -11
- package/dist/esm-node/backend-federation/identity.mjs +18 -23
- package/dist/esm-node/backend-federation/node-evaluator.mjs +8 -0
- package/dist/esm-node/backend-federation/node.mjs +2 -2
- package/dist/esm-node/backend-federation-manifest/node.mjs +2 -2
- package/dist/esm-node/backend-federation-manifest/validation.mjs +12 -8
- package/dist/esm-node/cross-project-policy/node.mjs +9 -19
- package/dist/esm-node/{effect-adapter → effect-server}/cross-project-policy.mjs +3 -3
- package/dist/esm-node/effect-server/entry.mjs +16 -0
- package/dist/esm-node/{effect-adapter → effect-server}/error-response.mjs +2 -2
- package/dist/esm-node/effect-server/index.mjs +152 -0
- package/dist/esm-node/effect-source-loader/built-entry.mjs +5 -6
- package/dist/esm-node/effect-source-loader/loader.mjs +2 -1
- package/dist/esm-node/effect-source-loader/operation-contracts.mjs +10 -33
- package/dist/esm-node/effect-source-loader/paths.mjs +30 -11
- package/dist/types/backend-federation/identity.d.ts +3 -6
- package/dist/types/backend-federation/node-evaluator.d.ts +2 -0
- package/dist/types/cross-project-policy/node.d.ts +2 -2
- package/dist/types/effect-server/cross-project-policy.d.ts +5 -0
- package/dist/types/{effect-adapter → effect-server}/entry.d.ts +1 -1
- package/dist/types/effect-server/error-response.d.ts +2 -0
- package/dist/types/effect-server/index.d.ts +4 -0
- package/dist/types/effect-source-loader/paths.d.ts +20 -2
- package/package.json +27 -27
- package/src/backend-federation/identity.ts +39 -47
- package/src/backend-federation/node-evaluator.ts +13 -0
- package/src/backend-federation/node.ts +2 -3
- package/src/backend-federation-manifest/node.ts +2 -3
- package/src/backend-federation-manifest/validation.ts +22 -29
- package/src/cross-project-policy/node.ts +7 -38
- package/src/{effect-adapter → effect-server}/cross-project-policy.ts +8 -2
- package/src/effect-server/entry.ts +18 -0
- package/src/{effect-adapter → effect-server}/error-response.ts +1 -1
- package/src/effect-server/index.ts +242 -0
- package/src/effect-source-loader/built-entry.ts +11 -9
- package/src/effect-source-loader/loader.ts +10 -5
- package/src/effect-source-loader/operation-contracts.ts +7 -41
- package/src/effect-source-loader/paths.ts +55 -21
- package/dist/cjs/effect-adapter/entry.js +0 -99
- package/dist/cjs/effect-adapter/index.js +0 -194
- package/dist/esm/effect-adapter/entry.mjs +0 -51
- package/dist/esm/effect-adapter/index.mjs +0 -143
- package/dist/esm-node/effect-adapter/entry.mjs +0 -52
- package/dist/esm-node/effect-adapter/index.mjs +0 -144
- package/dist/types/effect-adapter/cross-project-policy.d.ts +0 -4
- package/dist/types/effect-adapter/error-response.d.ts +0 -2
- package/dist/types/effect-adapter/index.d.ts +0 -21
- package/src/effect-adapter/entry.ts +0 -96
- package/src/effect-adapter/index.ts +0 -251
|
@@ -34,44 +34,21 @@ const effect_namespaceObject = require("@modern-js/bff-effect/effect");
|
|
|
34
34
|
const node_namespaceObject = require("@modern-js/server-runtime-extensions/bff-policy/node");
|
|
35
35
|
const utils_namespaceObject = require("@modern-js/utils");
|
|
36
36
|
const external_http_api_runtime_js_namespaceObject = require("./http-api-runtime.js");
|
|
37
|
-
function getPackageInfo(resourcePath, appDir, onDependency) {
|
|
38
|
-
for (const startDir of [
|
|
39
|
-
utils_namespaceObject.upath.dirname(resourcePath),
|
|
40
|
-
appDir
|
|
41
|
-
]){
|
|
42
|
-
let current = utils_namespaceObject.upath.resolve(startDir);
|
|
43
|
-
for(let depth = 0; depth < 32; depth += 1){
|
|
44
|
-
const packageJsonPath = utils_namespaceObject.upath.join(current, 'package.json');
|
|
45
|
-
if (utils_namespaceObject.fs.existsSync(packageJsonPath)) {
|
|
46
|
-
onDependency?.(packageJsonPath);
|
|
47
|
-
try {
|
|
48
|
-
const packageJson = utils_namespaceObject.fs.readJSONSync(packageJsonPath);
|
|
49
|
-
return {
|
|
50
|
-
name: packageJson.name,
|
|
51
|
-
version: packageJson.version
|
|
52
|
-
};
|
|
53
|
-
} catch {
|
|
54
|
-
return {};
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
const parent = utils_namespaceObject.upath.dirname(current);
|
|
58
|
-
if (parent === current) break;
|
|
59
|
-
current = parent;
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
return {};
|
|
63
|
-
}
|
|
64
37
|
async function resolveEffectOperationContracts(options) {
|
|
65
38
|
const api = await (0, external_http_api_runtime_js_namespaceObject.loadEffectApi)(options);
|
|
66
39
|
if (null === api) return null;
|
|
67
40
|
const runtime = await (0, external_http_api_runtime_js_namespaceObject.getHttpApiRuntime)();
|
|
68
41
|
const endpoints = (0, effect_namespaceObject.collectEffectEndpoints)(runtime.reflect, api, options.prefix);
|
|
69
|
-
const packageInfo = getPackageInfo(options.resourcePath, options.appDir, options.onDependency);
|
|
70
|
-
const requestId = options.requestId?.trim() || packageInfo.name || 'default';
|
|
71
42
|
return (0, node_namespaceObject.buildOperationContractMap)({
|
|
72
43
|
handlers: (0, effect_namespaceObject.toOperationContractSources)(endpoints),
|
|
73
|
-
|
|
74
|
-
|
|
44
|
+
...(0, node_namespaceObject.resolveOperationProducer)({
|
|
45
|
+
directories: [
|
|
46
|
+
utils_namespaceObject.upath.dirname(options.resourcePath),
|
|
47
|
+
options.appDir
|
|
48
|
+
],
|
|
49
|
+
requestId: options.requestId,
|
|
50
|
+
onDependency: options.onDependency
|
|
51
|
+
})
|
|
75
52
|
});
|
|
76
53
|
}
|
|
77
54
|
exports.resolveEffectOperationContracts = __webpack_exports__.resolveEffectOperationContracts;
|
|
@@ -28,6 +28,9 @@ var __webpack_require__ = {};
|
|
|
28
28
|
var __webpack_exports__ = {};
|
|
29
29
|
__webpack_require__.r(__webpack_exports__);
|
|
30
30
|
__webpack_require__.d(__webpack_exports__, {
|
|
31
|
+
emittedEffectEntry: ()=>emittedEffectEntry,
|
|
32
|
+
relativeEffectAppPath: ()=>relativeEffectAppPath,
|
|
33
|
+
resolveEffectEntry: ()=>resolveEffectEntry,
|
|
31
34
|
resolveEffectEntryFile: ()=>resolveEffectEntryFile
|
|
32
35
|
});
|
|
33
36
|
const utils_namespaceObject = require("@modern-js/utils");
|
|
@@ -41,20 +44,45 @@ const JS_OR_TS_EXTS = [
|
|
|
41
44
|
'.cjs',
|
|
42
45
|
'.cts'
|
|
43
46
|
];
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
const emittedEffectEntry = (entry)=>entry.replace(/\.(?:[cm]?ts|tsx|jsx)$/u, '.js');
|
|
48
|
+
function relativeEffectAppPath(appDir, entry) {
|
|
49
|
+
const relative = utils_namespaceObject.upath.relative(appDir, entry);
|
|
50
|
+
return '..' === relative || relative.startsWith('../') || relative.split('/').includes('node_modules') ? void 0 : relative;
|
|
51
|
+
}
|
|
52
|
+
function existingEntry(entry) {
|
|
53
|
+
return utils_namespaceObject.upath.extname(entry) ? utils_namespaceObject.fs.existsSync(entry) ? entry : void 0 : (0, utils_namespaceObject.findExists)(JS_OR_TS_EXTS.map((ext)=>`${entry}${ext}`)) || void 0;
|
|
54
|
+
}
|
|
55
|
+
function resolveEffectEntry(options) {
|
|
56
|
+
const { appDir, apiDir, effectEntry, distDir } = options;
|
|
57
|
+
const entry = utils_namespaceObject.upath.resolve(appDir, effectEntry || utils_namespaceObject.upath.join(apiDir, 'index'));
|
|
58
|
+
if (distDir && void 0 !== relativeEffectAppPath(distDir, entry)) return {
|
|
59
|
+
kind: 'built-output',
|
|
60
|
+
path: existingEntry(emittedEffectEntry(entry))
|
|
61
|
+
};
|
|
62
|
+
const relative = relativeEffectAppPath(appDir, entry);
|
|
63
|
+
if (void 0 === relative) return {
|
|
64
|
+
kind: 'external-sdk',
|
|
65
|
+
path: existingEntry(entry)
|
|
49
66
|
};
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
|
|
67
|
+
return distDir ? {
|
|
68
|
+
kind: 'built-output',
|
|
69
|
+
path: existingEntry(emittedEffectEntry(utils_namespaceObject.upath.resolve(distDir, relative)))
|
|
70
|
+
} : {
|
|
71
|
+
kind: 'app-source',
|
|
72
|
+
path: existingEntry(entry)
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
function resolveEffectEntryFile(options) {
|
|
76
|
+
return resolveEffectEntry(options).path;
|
|
55
77
|
}
|
|
78
|
+
exports.emittedEffectEntry = __webpack_exports__.emittedEffectEntry;
|
|
79
|
+
exports.relativeEffectAppPath = __webpack_exports__.relativeEffectAppPath;
|
|
80
|
+
exports.resolveEffectEntry = __webpack_exports__.resolveEffectEntry;
|
|
56
81
|
exports.resolveEffectEntryFile = __webpack_exports__.resolveEffectEntryFile;
|
|
57
82
|
for(var __rspack_i in __webpack_exports__)if (-1 === [
|
|
83
|
+
"emittedEffectEntry",
|
|
84
|
+
"relativeEffectAppPath",
|
|
85
|
+
"resolveEffectEntry",
|
|
58
86
|
"resolveEffectEntryFile"
|
|
59
87
|
].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
|
|
60
88
|
Object.defineProperty(exports, '__esModule', {
|
|
@@ -1,35 +1,30 @@
|
|
|
1
1
|
import { isRecord } from "./utils.mjs";
|
|
2
|
-
function
|
|
3
|
-
const issues = [];
|
|
2
|
+
function backendFederationCompatibility(loaded) {
|
|
4
3
|
const contract = isRecord(loaded) ? loaded.backendFederationContract : void 0;
|
|
5
4
|
const compatibility = isRecord(contract) ? contract.compatibility : void 0;
|
|
6
|
-
|
|
5
|
+
return isRecord(compatibility) ? compatibility : void 0;
|
|
6
|
+
}
|
|
7
|
+
function validateBackendFederationCompatibility(compatibility, expected) {
|
|
8
|
+
return Object.entries(expected).flatMap(([field, value])=>void 0 === value || 'string' == typeof compatibility[field] && compatibility[field].length > 0 && compatibility[field] === value ? [] : [
|
|
9
|
+
{
|
|
10
|
+
path: `backendFederationContract.compatibility.${field}`,
|
|
11
|
+
message: `expected ${value}, received ${'string' == typeof compatibility[field] ? compatibility[field] : typeof compatibility[field]}`
|
|
12
|
+
}
|
|
13
|
+
]);
|
|
14
|
+
}
|
|
15
|
+
function validateExpectedBackendFederationIdentity(loaded, expected) {
|
|
16
|
+
const compatibility = backendFederationCompatibility(loaded);
|
|
17
|
+
return compatibility ? validateBackendFederationCompatibility(compatibility, {
|
|
18
|
+
unitId: expected.unitId,
|
|
19
|
+
build: expected.buildMarker
|
|
20
|
+
}) : [
|
|
7
21
|
{
|
|
8
22
|
path: 'backendFederationContract.compatibility',
|
|
9
23
|
message: 'loaded module declares no compatibility metadata; delivery-unit identity cannot be validated'
|
|
10
24
|
}
|
|
11
25
|
];
|
|
12
|
-
const unitId = compatibility.unitId;
|
|
13
|
-
if ('string' != typeof unitId || 0 === unitId.length) issues.push({
|
|
14
|
-
path: 'backendFederationContract.compatibility.unitId',
|
|
15
|
-
message: `missing delivery-unit id; expected ${expected.unitId}`
|
|
16
|
-
});
|
|
17
|
-
else if (unitId !== expected.unitId) issues.push({
|
|
18
|
-
path: 'backendFederationContract.compatibility.unitId',
|
|
19
|
-
message: `expected ${expected.unitId}, received ${unitId}`
|
|
20
|
-
});
|
|
21
|
-
const build = compatibility.build;
|
|
22
|
-
if ('string' != typeof build || 0 === build.length) issues.push({
|
|
23
|
-
path: 'backendFederationContract.compatibility.build',
|
|
24
|
-
message: `missing build marker; expected ${expected.buildMarker}`
|
|
25
|
-
});
|
|
26
|
-
else if (build !== expected.buildMarker) issues.push({
|
|
27
|
-
path: 'backendFederationContract.compatibility.build',
|
|
28
|
-
message: `expected ${expected.buildMarker}, received ${build}`
|
|
29
|
-
});
|
|
30
|
-
return issues;
|
|
31
26
|
}
|
|
32
27
|
function formatBackendFederationIdentityIssues(issues) {
|
|
33
28
|
return issues.map((issue)=>`${issue.path}: ${issue.message}`).join('; ');
|
|
34
29
|
}
|
|
35
|
-
export { formatBackendFederationIdentityIssues, validateExpectedBackendFederationIdentity };
|
|
30
|
+
export { backendFederationCompatibility, formatBackendFederationIdentityIssues, validateBackendFederationCompatibility, validateExpectedBackendFederationIdentity };
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { createRequire } from "node:module";
|
|
2
|
+
import { evaluateNodeBackendFederationCommonJs } from "@modern-js/server-runtime-extensions/backend-federation-security/node";
|
|
3
|
+
const fromAdapter = createRequire(import.meta.url);
|
|
4
|
+
const fromEffectPackage = createRequire(fromAdapter.resolve('@modern-js/bff-effect/package.json'));
|
|
5
|
+
const privateRegistry = fromEffectPackage("#effect-entry-shape-registry");
|
|
6
|
+
const evaluateEffectBackendFederationCommonJs = (source, context)=>evaluateNodeBackendFederationCommonJs(source, context, privateRegistry);
|
|
7
|
+
export { evaluateEffectBackendFederationCommonJs };
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { evaluateNodeBackendFederationCommonJs } from "@modern-js/server-runtime-extensions/backend-federation-security/node";
|
|
2
1
|
import { loadBackendFederatedEffectApi } from "./load.mjs";
|
|
2
|
+
import { evaluateEffectBackendFederationCommonJs } from "./node-evaluator.mjs";
|
|
3
3
|
function node_loadBackendFederatedEffectApi(options) {
|
|
4
4
|
return loadBackendFederatedEffectApi({
|
|
5
5
|
...options,
|
|
6
6
|
entryPolicy: {
|
|
7
7
|
...options.entryPolicy,
|
|
8
|
-
evaluateCommonJs: options.entryPolicy?.evaluateCommonJs ??
|
|
8
|
+
evaluateCommonJs: options.entryPolicy?.evaluateCommonJs ?? evaluateEffectBackendFederationCommonJs
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { evaluateEffectBackendFederationCommonJs } from "../backend-federation/node-evaluator.mjs";
|
|
2
2
|
import { loadBackendFederatedEffectApiFromManifest } from "./load.mjs";
|
|
3
3
|
function node_loadBackendFederatedEffectApiFromManifest(options) {
|
|
4
4
|
return loadBackendFederatedEffectApiFromManifest({
|
|
5
5
|
...options,
|
|
6
6
|
entryPolicy: {
|
|
7
7
|
...options.entryPolicy,
|
|
8
|
-
evaluateCommonJs: options.entryPolicy?.evaluateCommonJs ??
|
|
8
|
+
evaluateCommonJs: options.entryPolicy?.evaluateCommonJs ?? evaluateEffectBackendFederationCommonJs
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { formatBackendFederationValidationErrors, validateBackendFederationManifest } from "@modern-js/backend-federation-contracts";
|
|
2
2
|
import { BACKEND_FEDERATION_CONTRACT_VERSION, BACKEND_FEDERATION_NODE_ADAPTER_VERSION } from "../backend-federation/index.mjs";
|
|
3
|
+
import { backendFederationCompatibility, formatBackendFederationIdentityIssues, validateBackendFederationCompatibility } from "../backend-federation/identity.mjs";
|
|
3
4
|
import { BackendFederationManifestAdapterError, assertConsistentValue, assertManifestAdapter, assertVersionValue } from "./errors.mjs";
|
|
4
|
-
import { backendFederationMetadata, manifestDeliveryUnit,
|
|
5
|
+
import { backendFederationMetadata, manifestDeliveryUnit, stringValue, versionBoundaryMetadata } from "./metadata.mjs";
|
|
5
6
|
function resolveExpectedBuildMarker(expected) {
|
|
6
7
|
if (void 0 !== expected.buildVersion && void 0 !== expected.buildMarker && expected.buildVersion !== expected.buildMarker) throw new BackendFederationManifestAdapterError('version_mismatch', `[BFF][Effect] Backend federation expected buildVersion/buildMarker mismatch: buildVersion ${expected.buildVersion}, buildMarker ${expected.buildMarker}.`, void 0, {
|
|
7
8
|
label: 'expected.buildVersion/buildMarker',
|
|
@@ -42,19 +43,22 @@ function validateLoadedBackendFederationContract(loaded, manifest, remote) {
|
|
|
42
43
|
const loadedContract = loaded.backendFederationContract;
|
|
43
44
|
const backendFederation = backendFederationMetadata(manifest);
|
|
44
45
|
const boundary = versionBoundaryMetadata(manifest);
|
|
45
|
-
const compatibility =
|
|
46
|
+
const compatibility = backendFederationCompatibility(loaded);
|
|
46
47
|
assertManifestAdapter(compatibility, 'version_mismatch', `[BFF][Effect] Backend federation expose ${remote.name}/${remote.expose?.replace(/^\.\//u, '')} must declare compatibility metadata.`);
|
|
47
48
|
assertVersionValue(stringValue(loadedContract?.role), 'microvertical-server', 'expose role');
|
|
48
49
|
assertVersionValue(stringValue(loadedContract?.name), remote.name, 'expose name');
|
|
49
|
-
assertVersionValue(stringValue(compatibility.contractVersion), stringValue(backendFederation?.contractVersion), 'expose contractVersion');
|
|
50
|
-
assertVersionValue(stringValue(compatibility.nodeAdapterVersion), stringValue(backendFederation?.nodeAdapterVersion), 'expose nodeAdapterVersion');
|
|
51
|
-
assertVersionValue(stringValue(compatibility.packageName), stringValue(boundary?.packageName), 'expose packageName');
|
|
52
|
-
assertVersionValue(stringValue(compatibility.build), stringValue(boundary?.buildVersion), 'expose buildVersion');
|
|
53
50
|
const deliveryUnit = manifestDeliveryUnit(backendFederation, boundary);
|
|
54
51
|
const manifestUnitId = stringValue(deliveryUnit.boundary?.unitId) ?? stringValue(deliveryUnit.top?.unitId);
|
|
55
52
|
const manifestBuildMarker = stringValue(deliveryUnit.boundary?.buildMarker);
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
const issues = validateBackendFederationCompatibility(compatibility, {
|
|
54
|
+
contractVersion: stringValue(backendFederation?.contractVersion),
|
|
55
|
+
nodeAdapterVersion: stringValue(backendFederation?.nodeAdapterVersion),
|
|
56
|
+
packageName: stringValue(boundary?.packageName),
|
|
57
|
+
unitId: manifestUnitId,
|
|
58
|
+
build: manifestBuildMarker ?? stringValue(boundary?.buildVersion)
|
|
59
|
+
});
|
|
60
|
+
assertVersionValue(stringValue(compatibility.build), stringValue(boundary?.buildVersion), 'expose buildVersion');
|
|
61
|
+
assertManifestAdapter(0 === issues.length, 'version_mismatch', `[BFF][Effect] ${formatBackendFederationIdentityIssues(issues)}.`);
|
|
58
62
|
}
|
|
59
63
|
function classifyLoadError(error) {
|
|
60
64
|
const message = error instanceof Error ? error.message : String(error);
|
|
@@ -1,29 +1,19 @@
|
|
|
1
|
-
import { readFileSync } from "node:fs";
|
|
2
|
-
import node_path from "node:path";
|
|
3
1
|
import "@modern-js/server-runtime-extensions/server-config";
|
|
4
|
-
import {
|
|
5
|
-
const
|
|
6
|
-
if (!startDir) return;
|
|
7
|
-
let current = node_path.resolve(startDir);
|
|
8
|
-
for(let depth = 0; depth < 10; depth += 1){
|
|
9
|
-
try {
|
|
10
|
-
const packageJson = JSON.parse(readFileSync(node_path.join(current, 'package.json'), 'utf8'));
|
|
11
|
-
if ('string' == typeof packageJson.version) return packageJson.version;
|
|
12
|
-
} catch {}
|
|
13
|
-
const parent = node_path.dirname(current);
|
|
14
|
-
if (parent === current) break;
|
|
15
|
-
current = parent;
|
|
16
|
-
}
|
|
17
|
-
};
|
|
18
|
-
const resolveAdapterCrossProjectPolicy = (api, handlers)=>{
|
|
2
|
+
import { resolveCrossProjectPolicy, resolveOperationProducer } from "@modern-js/server-runtime-extensions/bff-policy/node";
|
|
3
|
+
const resolveAdapterCrossProjectPolicy = (api, handlers, producer)=>{
|
|
19
4
|
const bff = api.getServerConfig()?.bff;
|
|
20
5
|
const { apiDirectory, appDirectory } = api.getServerContext();
|
|
21
6
|
return resolveCrossProjectPolicy({
|
|
22
7
|
crossProjectPolicy: bff?.crossProjectPolicy,
|
|
23
8
|
handlers,
|
|
24
|
-
requestId: bff?.requestId,
|
|
25
9
|
isCrossProjectServer: bff?.isCrossProjectServer,
|
|
26
|
-
|
|
10
|
+
...producer ?? resolveOperationProducer({
|
|
11
|
+
directories: [
|
|
12
|
+
apiDirectory,
|
|
13
|
+
appDirectory
|
|
14
|
+
],
|
|
15
|
+
requestId: bff?.requestId || 'default'
|
|
16
|
+
})
|
|
27
17
|
});
|
|
28
18
|
};
|
|
29
19
|
export { resolveAdapterCrossProjectPolicy };
|
|
@@ -2,7 +2,7 @@ import { collectEffectEndpoints, extractHttpApiFromModule, toOperationContractSo
|
|
|
2
2
|
import { logger } from "@modern-js/utils";
|
|
3
3
|
import { HttpApi } from "effect/unstable/httpapi";
|
|
4
4
|
import { resolveAdapterCrossProjectPolicy } from "../cross-project-policy/index.mjs";
|
|
5
|
-
function
|
|
5
|
+
function resolveEffectServerCrossProjectPolicy(api, prefix, mod, producer) {
|
|
6
6
|
const contractSourcesPromise = null === mod ? Promise.resolve([]) : Promise.resolve().then(()=>extractHttpApiFromModule(mod, HttpApi.isHttpApi)).then((effectApi)=>{
|
|
7
7
|
if (null === effectApi) return [];
|
|
8
8
|
const reflect = (apiValue, handlers)=>{
|
|
@@ -18,9 +18,9 @@ function resolveEffectAdapterCrossProjectPolicy(api, prefix, mod) {
|
|
|
18
18
|
return [];
|
|
19
19
|
});
|
|
20
20
|
return contractSourcesPromise.then((contractSources)=>{
|
|
21
|
-
const policy = resolveAdapterCrossProjectPolicy(api, contractSources);
|
|
21
|
+
const policy = resolveAdapterCrossProjectPolicy(api, contractSources, producer);
|
|
22
22
|
if (policy?.enabled === true && 0 === contractSources.length) logger.warn('[BFF][Effect] Cross-project policy enabled but no HttpApi endpoints could be reflected; requests fail operation-contract matching unless allowUnknownOperations is enabled.');
|
|
23
23
|
return policy;
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
|
-
export {
|
|
26
|
+
export { resolveEffectServerCrossProjectPolicy };
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import node_path from "node:path";
|
|
2
|
+
import "@modern-js/server-runtime-extensions/server-config";
|
|
3
|
+
import { API_DIR, isProd } from "@modern-js/utils";
|
|
4
|
+
import { resolveEffectEntry } from "../effect-source-loader/paths.mjs";
|
|
5
|
+
function resolveEffectServerEntryFile(api) {
|
|
6
|
+
const { appDirectory, apiDirectory, distDirectory } = api.getServerContext();
|
|
7
|
+
const appDir = node_path.resolve(appDirectory || process.cwd());
|
|
8
|
+
return resolveEffectEntry({
|
|
9
|
+
appDir,
|
|
10
|
+
apiDir: node_path.resolve(appDir, apiDirectory || API_DIR),
|
|
11
|
+
effectEntry: api.getServerConfig()?.bff?.effect?.entry,
|
|
12
|
+
distDir: isProd() && distDirectory ? node_path.resolve(distDirectory) : void 0
|
|
13
|
+
}).path;
|
|
14
|
+
}
|
|
15
|
+
export { resolveEffectServerEntryFile };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createSafeFailureResponse } from "@modern-js/runtime-extensions/safe-failure";
|
|
2
2
|
import { logger } from "@modern-js/utils";
|
|
3
|
-
function
|
|
3
|
+
function createEffectServerRuntimeErrorResponse(api, error, context) {
|
|
4
4
|
try {
|
|
5
5
|
const onError = api.getServerConfig()?.onError;
|
|
6
6
|
if (void 0 !== onError) return Promise.resolve(onError(error instanceof Error ? error : new Error(String(error)), ensureJsonContext(context))).then((result)=>result instanceof Response ? result : createSafeFailureResponse(error)).catch((configError)=>{
|
|
@@ -34,4 +34,4 @@ function ensureJsonContext(context) {
|
|
|
34
34
|
}
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
-
export {
|
|
37
|
+
export { createEffectServerRuntimeErrorResponse };
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import node_path from "node:path";
|
|
2
|
+
import "@modern-js/server-runtime-extensions/server-config";
|
|
3
|
+
import { dispatchEffectBffRequest, resolveEffectBffModuleHandler, useEffectContext } from "@modern-js/bff-effect/effect";
|
|
4
|
+
import { resolveOperationProducer } from "@modern-js/server-runtime-extensions/bff-policy/node";
|
|
5
|
+
import { createDisposableServerRuntimeHandle, registerServerRuntimeDisposer } from "@modern-js/server-runtime-extensions/runtime-lifecycle";
|
|
6
|
+
import { fs, isProd, logger } from "@modern-js/utils";
|
|
7
|
+
import { checkCrossProjectPolicyForRequest } from "../cross-project-policy/evaluation.mjs";
|
|
8
|
+
import { loadEffectBuiltModule, loadEffectSourceModule } from "../effect-source-loader/loader.mjs";
|
|
9
|
+
import { resolveEffectServerCrossProjectPolicy } from "./cross-project-policy.mjs";
|
|
10
|
+
import { resolveEffectServerEntryFile } from "./entry.mjs";
|
|
11
|
+
import { createEffectServerRuntimeErrorResponse } from "./error-response.mjs";
|
|
12
|
+
const EFFECT_MIDDLEWARE_BEFORE = [
|
|
13
|
+
'custom-server-hook',
|
|
14
|
+
'custom-server-middleware',
|
|
15
|
+
'render'
|
|
16
|
+
];
|
|
17
|
+
const effect_server = ()=>({
|
|
18
|
+
name: '@modern-js/plugin-bff-extensions/effect-server',
|
|
19
|
+
setup (api) {
|
|
20
|
+
const runtimeFramework = api.getServerContext().bffRuntimeFramework;
|
|
21
|
+
if ('effect' !== runtimeFramework) throw new Error(`Effect BFF server plugin requires Effect; received "${runtimeFramework}".`);
|
|
22
|
+
let handler = null;
|
|
23
|
+
let unregisterRuntimeDisposer;
|
|
24
|
+
let prefix = '/api';
|
|
25
|
+
let prefixes = [
|
|
26
|
+
'/api'
|
|
27
|
+
];
|
|
28
|
+
let matchingPrefixes = [
|
|
29
|
+
'/api'
|
|
30
|
+
];
|
|
31
|
+
let retired = false;
|
|
32
|
+
const dispose = async ()=>{
|
|
33
|
+
retired = true;
|
|
34
|
+
unregisterRuntimeDisposer?.();
|
|
35
|
+
unregisterRuntimeDisposer = void 0;
|
|
36
|
+
const previous = handler;
|
|
37
|
+
handler = null;
|
|
38
|
+
await previous?.dispose();
|
|
39
|
+
};
|
|
40
|
+
const loadHandler = async ()=>{
|
|
41
|
+
const entryFile = resolveEffectServerEntryFile(api);
|
|
42
|
+
if (!entryFile || !await fs.pathExists(entryFile)) {
|
|
43
|
+
handler = null;
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
const { appDirectory } = api.getServerContext();
|
|
47
|
+
let mod;
|
|
48
|
+
try {
|
|
49
|
+
mod = await (isProd() ? loadEffectBuiltModule(entryFile) : loadEffectSourceModule({
|
|
50
|
+
resourcePath: entryFile,
|
|
51
|
+
appDir: appDirectory || node_path.dirname(entryFile)
|
|
52
|
+
}));
|
|
53
|
+
} catch (error) {
|
|
54
|
+
logger.error(`[BFF][Effect] Failed to load Effect entry: ${entryFile}\n${String(error)}`);
|
|
55
|
+
throw error;
|
|
56
|
+
}
|
|
57
|
+
const producer = resolveOperationProducer({
|
|
58
|
+
directories: [
|
|
59
|
+
node_path.dirname(entryFile),
|
|
60
|
+
appDirectory
|
|
61
|
+
],
|
|
62
|
+
requestId: api.getServerConfig()?.bff?.requestId
|
|
63
|
+
});
|
|
64
|
+
const crossProjectPolicies = new Map(await Promise.all(prefixes.map(async (prefix)=>[
|
|
65
|
+
prefix,
|
|
66
|
+
await resolveEffectServerCrossProjectPolicy(api, prefix, mod, producer)
|
|
67
|
+
])));
|
|
68
|
+
const effectConfig = api.getServerConfig()?.bff?.effect;
|
|
69
|
+
const loaded = await resolveEffectBffModuleHandler(mod, {
|
|
70
|
+
openapi: effectConfig?.openapi,
|
|
71
|
+
dataPlatform: effectConfig?.dataPlatform,
|
|
72
|
+
validateRequest: (request)=>{
|
|
73
|
+
const { path: mountedPathname } = useEffectContext();
|
|
74
|
+
const prefix = matchingPrefixes.find((item)=>'/' === item || mountedPathname === item || mountedPathname.startsWith(`${item}/`));
|
|
75
|
+
if (!prefix) return null;
|
|
76
|
+
const requestUrl = new URL(request.url);
|
|
77
|
+
if ('/' !== prefix) requestUrl.pathname = '/' === requestUrl.pathname ? prefix : `${prefix}${requestUrl.pathname}`;
|
|
78
|
+
return checkCrossProjectPolicyForRequest(new Request(requestUrl, request), crossProjectPolicies.get(prefix));
|
|
79
|
+
},
|
|
80
|
+
onWarning: (message)=>logger.warn(message)
|
|
81
|
+
});
|
|
82
|
+
if (!loaded) {
|
|
83
|
+
const error = new Error(`[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export defineEffectBff(...) or a { api, layer } HttpApi module.`);
|
|
84
|
+
logger.warn(error.message);
|
|
85
|
+
throw error;
|
|
86
|
+
}
|
|
87
|
+
const candidateOwner = {};
|
|
88
|
+
if (loaded.dispose) registerServerRuntimeDisposer(candidateOwner, loaded.dispose);
|
|
89
|
+
const candidate = createDisposableServerRuntimeHandle(candidateOwner, loaded.handler);
|
|
90
|
+
if (retired) {
|
|
91
|
+
await candidate.dispose();
|
|
92
|
+
throw new Error('Cannot initialize a retired Effect server.');
|
|
93
|
+
}
|
|
94
|
+
handler = candidate;
|
|
95
|
+
};
|
|
96
|
+
api.onPrepare(async ()=>{
|
|
97
|
+
const { middlewares: globalMiddlewares } = api.getServerContext();
|
|
98
|
+
const configuredPrefix = api.getServerConfig()?.bff?.prefix;
|
|
99
|
+
const enableHandleWeb = api.getServerConfig()?.bff?.enableHandleWeb;
|
|
100
|
+
const configuredPrefixes = Array.isArray(configuredPrefix) ? configuredPrefix.filter(Boolean) : [
|
|
101
|
+
configuredPrefix || '/api'
|
|
102
|
+
];
|
|
103
|
+
prefixes = [
|
|
104
|
+
...new Set(configuredPrefixes.length > 0 ? configuredPrefixes : [
|
|
105
|
+
'/api'
|
|
106
|
+
])
|
|
107
|
+
];
|
|
108
|
+
matchingPrefixes = [
|
|
109
|
+
...prefixes
|
|
110
|
+
].sort((left, right)=>right.length - left.length);
|
|
111
|
+
prefix = prefixes[0] || '/api';
|
|
112
|
+
const { serverBase } = api.getServerContext();
|
|
113
|
+
if (serverBase) unregisterRuntimeDisposer = registerServerRuntimeDisposer(serverBase, dispose);
|
|
114
|
+
try {
|
|
115
|
+
await loadHandler();
|
|
116
|
+
} catch (error) {
|
|
117
|
+
await dispose();
|
|
118
|
+
throw error;
|
|
119
|
+
}
|
|
120
|
+
const middlewarePrefixes = enableHandleWeb ? [
|
|
121
|
+
prefix
|
|
122
|
+
] : matchingPrefixes;
|
|
123
|
+
const middlewares = middlewarePrefixes.map((middlewarePrefix)=>({
|
|
124
|
+
name: 'effect-api-handler',
|
|
125
|
+
path: enableHandleWeb ? '*' : `${middlewarePrefix}/*`,
|
|
126
|
+
method: 'all',
|
|
127
|
+
order: 'post',
|
|
128
|
+
before: EFFECT_MIDDLEWARE_BEFORE,
|
|
129
|
+
handler: async (context, next)=>{
|
|
130
|
+
const activeHandler = handler;
|
|
131
|
+
if (!activeHandler) {
|
|
132
|
+
if (enableHandleWeb) return void await next();
|
|
133
|
+
return createEffectServerRuntimeErrorResponse(api, new Error('[BFF][Effect] Missing Effect entry. Define api/index or configure bff.effect.entry.'), context);
|
|
134
|
+
}
|
|
135
|
+
const mountedPrefix = enableHandleWeb ? matchingPrefixes.find((item)=>'/' === item || context.req.path === item || context.req.path.startsWith(`${item}/`)) || prefix : middlewarePrefix;
|
|
136
|
+
const response = await dispatchEffectBffRequest(activeHandler, context.req.raw, {
|
|
137
|
+
prefix: mountedPrefix,
|
|
138
|
+
env: context.env,
|
|
139
|
+
path: context.req.path,
|
|
140
|
+
method: context.req.method,
|
|
141
|
+
onError: (error)=>createEffectServerRuntimeErrorResponse(api, error, context)
|
|
142
|
+
});
|
|
143
|
+
if (404 === response.status && enableHandleWeb) return void await next();
|
|
144
|
+
return new Response(response.body, response);
|
|
145
|
+
}
|
|
146
|
+
}));
|
|
147
|
+
globalMiddlewares.push(...middlewares);
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
export default effect_server;
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { fs, upath } from "@modern-js/utils";
|
|
2
|
-
import { resolveEffectEntryFile } from "./paths.mjs";
|
|
3
|
-
const BUILT_ENTRY_EXT = /\.(?:[cm]?ts|tsx|jsx)$/u;
|
|
2
|
+
import { emittedEffectEntry, relativeEffectAppPath, resolveEffectEntryFile } from "./paths.mjs";
|
|
4
3
|
function resolveBuiltEffectEntry(appDirectory, distDirectory, sourceEntry) {
|
|
5
4
|
if (void 0 === sourceEntry || 0 === sourceEntry.length) return;
|
|
6
|
-
const relativeEntry =
|
|
7
|
-
if (
|
|
8
|
-
const builtEntry = upath.resolve(distDirectory, relativeEntry)
|
|
5
|
+
const relativeEntry = relativeEffectAppPath(appDirectory, sourceEntry);
|
|
6
|
+
if (void 0 === relativeEntry) throw new Error(`Effect BFF entry must be inside the application directory: ${sourceEntry}`);
|
|
7
|
+
const builtEntry = emittedEffectEntry(upath.resolve(distDirectory, relativeEntry));
|
|
9
8
|
return fs.existsSync(builtEntry) ? builtEntry : void 0;
|
|
10
9
|
}
|
|
11
10
|
async function bundleBuiltEffectEntryForNode(options) {
|
|
@@ -31,7 +30,7 @@ function resolveEffectEntryPaths(options) {
|
|
|
31
30
|
apiDir,
|
|
32
31
|
effectEntry
|
|
33
32
|
});
|
|
34
|
-
const relativeEffectEntry = void 0 !== sourceEffectEntry && sourceEffectEntry.length > 0 ? upath.relative(appDir, sourceEffectEntry)
|
|
33
|
+
const relativeEffectEntry = void 0 !== sourceEffectEntry && sourceEffectEntry.length > 0 ? emittedEffectEntry(upath.relative(appDir, sourceEffectEntry)) : '';
|
|
35
34
|
return {
|
|
36
35
|
sourceEffectEntry,
|
|
37
36
|
relativeEffectEntry
|
|
@@ -130,7 +130,8 @@ function externalizeInstalledDependencies(options) {
|
|
|
130
130
|
path: args.path
|
|
131
131
|
};
|
|
132
132
|
const realPath = await node_fs.promises.realpath(resolution.path).catch(()=>resolution.path);
|
|
133
|
-
|
|
133
|
+
const loader = SOURCE_LOADERS.get(node_path.extname(realPath).toLowerCase());
|
|
134
|
+
if (realPath.includes(`${node_path.sep}node_modules${node_path.sep}`) && 'ts' !== loader && 'tsx' !== loader && 'jsx' !== loader) {
|
|
134
135
|
const runtimeResolution = await buildApi.resolve(args.path, {
|
|
135
136
|
importer: '',
|
|
136
137
|
kind: args.kind,
|
|
@@ -1,45 +1,22 @@
|
|
|
1
1
|
import { collectEffectEndpoints, toOperationContractSources } from "@modern-js/bff-effect/effect";
|
|
2
|
-
import { buildOperationContractMap,
|
|
3
|
-
import {
|
|
2
|
+
import { buildOperationContractMap, resolveOperationProducer } from "@modern-js/server-runtime-extensions/bff-policy/node";
|
|
3
|
+
import { upath } from "@modern-js/utils";
|
|
4
4
|
import { getHttpApiRuntime, loadEffectApi } from "./http-api-runtime.mjs";
|
|
5
|
-
function getPackageInfo(resourcePath, appDir, onDependency) {
|
|
6
|
-
for (const startDir of [
|
|
7
|
-
upath.dirname(resourcePath),
|
|
8
|
-
appDir
|
|
9
|
-
]){
|
|
10
|
-
let current = upath.resolve(startDir);
|
|
11
|
-
for(let depth = 0; depth < 32; depth += 1){
|
|
12
|
-
const packageJsonPath = upath.join(current, 'package.json');
|
|
13
|
-
if (fs.existsSync(packageJsonPath)) {
|
|
14
|
-
onDependency?.(packageJsonPath);
|
|
15
|
-
try {
|
|
16
|
-
const packageJson = fs.readJSONSync(packageJsonPath);
|
|
17
|
-
return {
|
|
18
|
-
name: packageJson.name,
|
|
19
|
-
version: packageJson.version
|
|
20
|
-
};
|
|
21
|
-
} catch {
|
|
22
|
-
return {};
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
const parent = upath.dirname(current);
|
|
26
|
-
if (parent === current) break;
|
|
27
|
-
current = parent;
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
return {};
|
|
31
|
-
}
|
|
32
5
|
async function resolveEffectOperationContracts(options) {
|
|
33
6
|
const api = await loadEffectApi(options);
|
|
34
7
|
if (null === api) return null;
|
|
35
8
|
const runtime = await getHttpApiRuntime();
|
|
36
9
|
const endpoints = collectEffectEndpoints(runtime.reflect, api, options.prefix);
|
|
37
|
-
const packageInfo = getPackageInfo(options.resourcePath, options.appDir, options.onDependency);
|
|
38
|
-
const requestId = options.requestId?.trim() || packageInfo.name || 'default';
|
|
39
10
|
return buildOperationContractMap({
|
|
40
11
|
handlers: toOperationContractSources(endpoints),
|
|
41
|
-
|
|
42
|
-
|
|
12
|
+
...resolveOperationProducer({
|
|
13
|
+
directories: [
|
|
14
|
+
upath.dirname(options.resourcePath),
|
|
15
|
+
options.appDir
|
|
16
|
+
],
|
|
17
|
+
requestId: options.requestId,
|
|
18
|
+
onDependency: options.onDependency
|
|
19
|
+
})
|
|
43
20
|
});
|
|
44
21
|
}
|
|
45
22
|
export { resolveEffectOperationContracts };
|
|
@@ -9,16 +9,35 @@ const JS_OR_TS_EXTS = [
|
|
|
9
9
|
'.cjs',
|
|
10
10
|
'.cts'
|
|
11
11
|
];
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
const emittedEffectEntry = (entry)=>entry.replace(/\.(?:[cm]?ts|tsx|jsx)$/u, '.js');
|
|
13
|
+
function relativeEffectAppPath(appDir, entry) {
|
|
14
|
+
const relative = upath.relative(appDir, entry);
|
|
15
|
+
return '..' === relative || relative.startsWith('../') || relative.split('/').includes('node_modules') ? void 0 : relative;
|
|
16
|
+
}
|
|
17
|
+
function existingEntry(entry) {
|
|
18
|
+
return upath.extname(entry) ? fs.existsSync(entry) ? entry : void 0 : findExists(JS_OR_TS_EXTS.map((ext)=>`${entry}${ext}`)) || void 0;
|
|
19
|
+
}
|
|
20
|
+
function resolveEffectEntry(options) {
|
|
21
|
+
const { appDir, apiDir, effectEntry, distDir } = options;
|
|
22
|
+
const entry = upath.resolve(appDir, effectEntry || upath.join(apiDir, 'index'));
|
|
23
|
+
if (distDir && void 0 !== relativeEffectAppPath(distDir, entry)) return {
|
|
24
|
+
kind: 'built-output',
|
|
25
|
+
path: existingEntry(emittedEffectEntry(entry))
|
|
26
|
+
};
|
|
27
|
+
const relative = relativeEffectAppPath(appDir, entry);
|
|
28
|
+
if (void 0 === relative) return {
|
|
29
|
+
kind: 'external-sdk',
|
|
30
|
+
path: existingEntry(entry)
|
|
17
31
|
};
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
}
|
|
22
|
-
|
|
32
|
+
return distDir ? {
|
|
33
|
+
kind: 'built-output',
|
|
34
|
+
path: existingEntry(emittedEffectEntry(upath.resolve(distDir, relative)))
|
|
35
|
+
} : {
|
|
36
|
+
kind: 'app-source',
|
|
37
|
+
path: existingEntry(entry)
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
function resolveEffectEntryFile(options) {
|
|
41
|
+
return resolveEffectEntry(options).path;
|
|
23
42
|
}
|
|
24
|
-
export { resolveEffectEntryFile };
|
|
43
|
+
export { emittedEffectEntry, relativeEffectAppPath, resolveEffectEntry, resolveEffectEntryFile };
|