@lark-apaas/fullstack-cli 1.1.59-alpha.20260802191336 → 1.1.59-alpha.20260804172442
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/index.js +36 -39
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -8727,11 +8727,6 @@ function previewArtifactSourceTreeValidation(identity) {
|
|
|
8727
8727
|
}
|
|
8728
8728
|
return identity.sourceTreeValidation;
|
|
8729
8729
|
}
|
|
8730
|
-
function samePreviewArtifactSourceTreeValidation(left, right) {
|
|
8731
|
-
return left.enabled === right.enabled && left.includePaths.length === right.includePaths.length && left.includePaths.every(
|
|
8732
|
-
(value, index) => value === right.includePaths[index]
|
|
8733
|
-
);
|
|
8734
|
-
}
|
|
8735
8730
|
function runGit(projectRoot, args, environment, allowFailure = false) {
|
|
8736
8731
|
const result = spawnSync7("git", args, {
|
|
8737
8732
|
cwd: projectRoot,
|
|
@@ -9822,24 +9817,6 @@ function resolveCurrentPreviewArtifactMetadata(options) {
|
|
|
9822
9817
|
};
|
|
9823
9818
|
}
|
|
9824
9819
|
if (requestedSourceTreeValidation.enabled) {
|
|
9825
|
-
const generationSourceTreeValidation = previewArtifactSourceTreeValidation(
|
|
9826
|
-
validation.manifest
|
|
9827
|
-
);
|
|
9828
|
-
const workspaceSourceTreeValidation = previewArtifactSourceTreeValidation(
|
|
9829
|
-
options.workspaceManifest
|
|
9830
|
-
);
|
|
9831
|
-
if (!samePreviewArtifactSourceTreeValidation(
|
|
9832
|
-
requestedSourceTreeValidation,
|
|
9833
|
-
generationSourceTreeValidation
|
|
9834
|
-
) || !samePreviewArtifactSourceTreeValidation(
|
|
9835
|
-
requestedSourceTreeValidation,
|
|
9836
|
-
workspaceSourceTreeValidation
|
|
9837
|
-
)) {
|
|
9838
|
-
return {
|
|
9839
|
-
resolved: false,
|
|
9840
|
-
reasons: ["workspace source tree validation policy mismatch"]
|
|
9841
|
-
};
|
|
9842
|
-
}
|
|
9843
9820
|
if (options.workspaceManifest.workspaceVersion !== validation.manifest.workspaceVersion) {
|
|
9844
9821
|
return {
|
|
9845
9822
|
resolved: false,
|
|
@@ -10218,19 +10195,37 @@ ${headers}\r
|
|
|
10218
10195
|
upstream.on("error", () => socket.destroy());
|
|
10219
10196
|
socket.on("error", () => upstream.destroy());
|
|
10220
10197
|
}
|
|
10221
|
-
|
|
10198
|
+
function targetAcceptsConnection(target, timeoutMs = 1e3) {
|
|
10199
|
+
return new Promise((resolve10) => {
|
|
10200
|
+
const socket = net2.connect(target.port, target.host);
|
|
10201
|
+
let settled = false;
|
|
10202
|
+
const finish = (ready) => {
|
|
10203
|
+
if (settled) return;
|
|
10204
|
+
settled = true;
|
|
10205
|
+
socket.destroy();
|
|
10206
|
+
resolve10(ready);
|
|
10207
|
+
};
|
|
10208
|
+
socket.setTimeout(timeoutMs);
|
|
10209
|
+
socket.once("connect", () => finish(true));
|
|
10210
|
+
socket.once("timeout", () => finish(false));
|
|
10211
|
+
socket.once("error", () => finish(false));
|
|
10212
|
+
});
|
|
10213
|
+
}
|
|
10214
|
+
async function freshTargetReady(clientTarget, serverTarget, healthPath) {
|
|
10222
10215
|
try {
|
|
10223
|
-
const
|
|
10224
|
-
|
|
10225
|
-
|
|
10226
|
-
|
|
10227
|
-
|
|
10228
|
-
|
|
10229
|
-
|
|
10230
|
-
|
|
10231
|
-
|
|
10232
|
-
|
|
10233
|
-
|
|
10216
|
+
const [clientReady, serverReady] = await Promise.all([
|
|
10217
|
+
(async () => {
|
|
10218
|
+
const response = await fetch(
|
|
10219
|
+
new URL(healthPath, targetOrigin(clientTarget)),
|
|
10220
|
+
{ signal: AbortSignal.timeout(1e3) }
|
|
10221
|
+
);
|
|
10222
|
+
if (response.status !== 200) return false;
|
|
10223
|
+
const body = await response.json();
|
|
10224
|
+
return body.ready === true;
|
|
10225
|
+
})(),
|
|
10226
|
+
targetAcceptsConnection(serverTarget)
|
|
10227
|
+
]);
|
|
10228
|
+
return clientReady && serverReady;
|
|
10234
10229
|
} catch {
|
|
10235
10230
|
return false;
|
|
10236
10231
|
}
|
|
@@ -10252,7 +10247,9 @@ function createPreviewArtifactSwitcher(options) {
|
|
|
10252
10247
|
response.writeHead(200, { "content-type": "application/json" });
|
|
10253
10248
|
response.end(
|
|
10254
10249
|
JSON.stringify({
|
|
10255
|
-
|
|
10250
|
+
schemaVersion: 1,
|
|
10251
|
+
ready: active === "fresh",
|
|
10252
|
+
previewReady: true,
|
|
10256
10253
|
active,
|
|
10257
10254
|
generationId: options.generationId
|
|
10258
10255
|
})
|
|
@@ -10276,8 +10273,8 @@ function createPreviewArtifactSwitcher(options) {
|
|
|
10276
10273
|
pollTimer = setTimeout(async () => {
|
|
10277
10274
|
if (await freshTargetReady(
|
|
10278
10275
|
options.freshTarget,
|
|
10279
|
-
|
|
10280
|
-
|
|
10276
|
+
options.freshServerTarget,
|
|
10277
|
+
healthPath
|
|
10281
10278
|
)) {
|
|
10282
10279
|
active = "fresh";
|
|
10283
10280
|
settleCutover?.({
|
|
@@ -10589,7 +10586,7 @@ async function startPreviewArtifactRuntime(options) {
|
|
|
10589
10586
|
generationId: resolved.generationId,
|
|
10590
10587
|
cachedTarget: { host: "127.0.0.1", port: cachedServerPort },
|
|
10591
10588
|
freshTarget: { host: "127.0.0.1", port: options.freshClientPort },
|
|
10592
|
-
|
|
10589
|
+
freshServerTarget: { host: "127.0.0.1", port: options.freshServerPort },
|
|
10593
10590
|
cachedAssetFiles,
|
|
10594
10591
|
pollIntervalMs: options.pollIntervalMs
|
|
10595
10592
|
});
|