openship 0.6.6 → 0.6.7
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/bare-7QD623QV.js +29 -0
- package/dist/{chunk-Q7WGTQQ5.js → chunk-2ANV5ZQ5.js} +1 -1
- package/dist/{chunk-UJ6JZM65.js → chunk-2VSW6Q6C.js} +601 -382
- package/dist/{chunk-PCPVTH6M.js → chunk-5T4UVOM3.js} +6 -4
- package/dist/{chunk-YMMQRE5J.js → chunk-BLEXTYRK.js} +1 -1
- package/dist/{chunk-OBPKYXQL.js → chunk-CIJV43LH.js} +71 -32
- package/dist/{chunk-NK5N5LXN.js → chunk-DDFUESPJ.js} +24 -9
- package/dist/{chunk-6FH4AXVY.js → chunk-E2X26PXR.js} +1 -1
- package/dist/{chunk-HKRQXPTI.js → chunk-FYPFEDPZ.js} +1 -1
- package/dist/{chunk-UVNMQM7W.js → chunk-FZ6QCF6B.js} +8 -6
- package/dist/{chunk-MLYSEZQB.js → chunk-GGIAIGUL.js} +15 -66
- package/dist/{chunk-2YM3NI2E.js → chunk-GIPJNNI5.js} +38 -44
- package/dist/{chunk-ZFJXPCQP.js → chunk-H3WT3A6R.js} +4 -3
- package/dist/chunk-H4FS5BED.js +936 -0
- package/dist/{chunk-CBLD2HS5.js → chunk-J2XM3QSP.js} +8 -5
- package/dist/{chunk-FE7ZZQSE.js → chunk-J3K6XABC.js} +3 -3
- package/dist/{chunk-77QDF6UD.js → chunk-LHFXSC36.js} +428 -93
- package/dist/{chunk-YIMOCZBZ.js → chunk-MEE6OZFP.js} +3 -3
- package/dist/chunk-N5YZMO33.js +111 -0
- package/dist/{chunk-QVW76WDL.js → chunk-NRTJRNAE.js} +58 -16
- package/dist/{chunk-WVAML4H6.js → chunk-PPEBIY5F.js} +247 -61
- package/dist/{chunk-4I2BM2DT.js → chunk-PVP4RGWT.js} +3 -3
- package/dist/{chunk-RSR7PFIQ.js → chunk-QHMDCYZ3.js} +4 -4
- package/dist/chunk-R4VDPFLS.js +106 -0
- package/dist/{chunk-VTGPEC6B.js → chunk-RDXT4BQB.js} +6 -4
- package/dist/{chunk-LFE5KQ7Y.js → chunk-S6B2Z3OO.js} +142 -57
- package/dist/chunk-UWEV6XTS.js +249 -0
- package/dist/{chunk-5DMWSTOM.js → chunk-VQM6JHJB.js} +940 -224
- package/dist/{chunk-SM26HDS2.js → chunk-VSTFHUCV.js} +44 -50
- package/dist/chunk-WU54BXFE.js +70 -0
- package/dist/{chunk-LUKYPVJ4.js → chunk-XWHWTHEL.js} +313 -469
- package/dist/{chunk-A4GXYE4L.js → chunk-ZPJ74LXE.js} +22 -20
- package/dist/cloud-KNNABE3O.js +40 -0
- package/dist/{detect-OIE5V3VZ.js → detect-G4DR3U2N.js} +9 -6
- package/dist/{docker-VTR2GK5Y.js → docker-YOVPCIB4.js} +11 -8
- package/dist/{docker-edge-executor-22IBXNYJ.js → docker-edge-executor-QFXD3337.js} +8 -6
- package/dist/edge-import-CRFVSR6P.js +56 -0
- package/dist/{edge-preflight-GBNCPNVU.js → edge-preflight-MXERVAMG.js} +15 -12
- package/dist/{ensure-container-edge-KPI2CVXJ.js → ensure-container-edge-F4JUNQIK.js} +13 -10
- package/dist/{executor-7LXXZPBR.js → executor-CVPAYYHR.js} +8 -6
- package/dist/host-channel-preflight-QTDNGLCK.js +54 -0
- package/dist/index.js +84 -48
- package/dist/{local-executor-WOFZD72X.js → local-executor-ODC6RANU.js} +3 -2
- package/dist/{nginx-KUFMLMAC.js → nginx-KLFF43TC.js} +11 -8
- package/dist/{openresty-lua-ATTH35BE.js → openresty-lua-VKWUV4GB.js} +6 -5
- package/dist/{privilege-I4W3ZNZK.js → privilege-7D3SSOL3.js} +6 -5
- package/dist/server/index.js +8813 -5232
- package/dist/setup-I5AJC6NJ.js +25 -0
- package/dist/{ssh-client-JBMA7SN4.js → ssh-client-625VWGKP.js} +3 -2
- package/dist/up-QXTOOVXC.js +61 -0
- package/package.json +1 -1
- package/dist/bare-OXJVW3AK.js +0 -25
- package/dist/chunk-LH2PLRQO.js +0 -434
- package/dist/cloud-75VIT4KV.js +0 -37
- package/dist/edge-import-WJUB4M7F.js +0 -52
- package/dist/host-channel-preflight-KE6OONYK.js +0 -50
- package/dist/setup-XGLGUUFW.js +0 -22
- package/dist/up-K4BV7466.js +0 -57
|
@@ -19,13 +19,16 @@ import {
|
|
|
19
19
|
rollbackEdgeTakeover,
|
|
20
20
|
scanImportableSites,
|
|
21
21
|
unreachableStaticRoots
|
|
22
|
-
} from "./chunk-
|
|
22
|
+
} from "./chunk-ZPJ74LXE.js";
|
|
23
23
|
import {
|
|
24
24
|
LocalExecutor
|
|
25
|
-
} from "./chunk-
|
|
25
|
+
} from "./chunk-E2X26PXR.js";
|
|
26
26
|
import {
|
|
27
27
|
ourEdgeContainerRunning
|
|
28
|
-
} from "./chunk-
|
|
28
|
+
} from "./chunk-GIPJNNI5.js";
|
|
29
|
+
import {
|
|
30
|
+
isOurEdgeContainer
|
|
31
|
+
} from "./chunk-UWEV6XTS.js";
|
|
29
32
|
|
|
30
33
|
// src/lib/edge-preflight.ts
|
|
31
34
|
import { spawnSync } from "child_process";
|
|
@@ -195,7 +198,7 @@ async function diagnoseEdge() {
|
|
|
195
198
|
} catch {
|
|
196
199
|
return { ...empty, containerExists: exists, containerRunning: running };
|
|
197
200
|
}
|
|
198
|
-
const foreignOccupants = status.occupants.filter((o) => o.containerName
|
|
201
|
+
const foreignOccupants = status.occupants.filter((o) => !isOurEdgeContainer(o.containerName));
|
|
199
202
|
const hostProxySquatting = !running && foreignOccupants.some((o) => !o.containerName);
|
|
200
203
|
let sites = [];
|
|
201
204
|
if (status.occupants.length > 0) {
|
|
@@ -240,7 +243,7 @@ async function repairEdgeConflict(mode, apiPort, onLog) {
|
|
|
240
243
|
}
|
|
241
244
|
spawnSync("docker", ["restart", "openship-edge"], { stdio: "ignore" });
|
|
242
245
|
if (mode === "migrate" && scan.sites.length > 0) {
|
|
243
|
-
const { importMigratedSites } = await import("./edge-import-
|
|
246
|
+
const { importMigratedSites } = await import("./edge-import-CRFVSR6P.js");
|
|
244
247
|
const outcome = await importMigratedSites(apiPort, scan.sites, certPems);
|
|
245
248
|
if (outcome.registered.length === 0) {
|
|
246
249
|
return {
|
|
@@ -8,14 +8,14 @@ import {
|
|
|
8
8
|
} from "./chunk-I3DPMTSF.js";
|
|
9
9
|
import {
|
|
10
10
|
LocalExecutor
|
|
11
|
-
} from "./chunk-
|
|
11
|
+
} from "./chunk-E2X26PXR.js";
|
|
12
12
|
import {
|
|
13
13
|
logEntry,
|
|
14
14
|
sq
|
|
15
|
-
} from "./chunk-
|
|
15
|
+
} from "./chunk-H3WT3A6R.js";
|
|
16
16
|
import {
|
|
17
17
|
edgeFailureReason
|
|
18
|
-
} from "./chunk-
|
|
18
|
+
} from "./chunk-GIPJNNI5.js";
|
|
19
19
|
|
|
20
20
|
// ../../packages/adapters/src/system/docker-edge-executor.ts
|
|
21
21
|
import Dockerode from "dockerode";
|