@vincenthanxiaodu/pi-web 1.202608.39 → 1.202608.41
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.js +2 -1
- package/dist/cli.js.map +1 -1
- package/dist/client/assets/{CodeViewer-DWMYXHbj.js → CodeViewer-935R1s95.js} +1 -1
- package/dist/client/assets/{TerminalPanel-FojQLt0o.js → TerminalPanel-BY9VIA1-.js} +1 -1
- package/dist/client/assets/{index-CCOS1IF6.js → index-ClEsGRm4.js} +207 -185
- package/dist/client/index.html +1 -1
- package/dist/nativeServices/serviceAction.js +25 -0
- package/dist/nativeServices/serviceAction.js.map +1 -1
- package/dist/nativeServices/serviceEnvironment.js +15 -0
- package/dist/nativeServices/serviceEnvironment.js.map +1 -1
- package/package.json +1 -1
package/dist/client/index.html
CHANGED
|
@@ -123,7 +123,7 @@
|
|
|
123
123
|
html, body { margin: 0; height: 100%; overflow: hidden; background: var(--pi-bg); color: var(--pi-text); }
|
|
124
124
|
body { min-height: 100dvh; }
|
|
125
125
|
</style>
|
|
126
|
-
<script type="module" crossorigin src="./assets/index-
|
|
126
|
+
<script type="module" crossorigin src="./assets/index-ClEsGRm4.js"></script>
|
|
127
127
|
<link rel="modulepreload" crossorigin href="./assets/vendor-editor-core-CXO8gGab.js">
|
|
128
128
|
<link rel="modulepreload" crossorigin href="./assets/vendor-editor-languages-CpW4sJsX.js">
|
|
129
129
|
</head>
|
|
@@ -36,6 +36,24 @@ export function launchdEnableArgs(target) {
|
|
|
36
36
|
export function launchdKickstartArgs(target) {
|
|
37
37
|
return ["kickstart", target];
|
|
38
38
|
}
|
|
39
|
+
/**
|
|
40
|
+
* Restart a job without the caller having to survive it.
|
|
41
|
+
*
|
|
42
|
+
* `bootout` then `bootstrap` needs the command to be alive for the second
|
|
43
|
+
* step. A command running inside the service it is restarting is killed by the
|
|
44
|
+
* bootout, so the bootstrap never runs and the label is left not-loaded, where
|
|
45
|
+
* KeepAlive cannot bring it back. `kickstart -k` hands the stop and the start
|
|
46
|
+
* to launchd in one instruction instead.
|
|
47
|
+
*/
|
|
48
|
+
export function launchdRestartInPlaceArgs(target) {
|
|
49
|
+
return ["kickstart", "-k", target];
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Whether restarting this service would kill the command doing the restarting.
|
|
53
|
+
*/
|
|
54
|
+
export function restartsInPlace(serviceId, hostingServiceId) {
|
|
55
|
+
return hostingServiceId !== undefined && serviceId === hostingServiceId;
|
|
56
|
+
}
|
|
39
57
|
export function launchdServiceTarget(domain, ref) {
|
|
40
58
|
return `${domain}/${ref.launchdLabel}`;
|
|
41
59
|
}
|
|
@@ -111,6 +129,13 @@ export function startLaunchdService(ref, context, deps) {
|
|
|
111
129
|
*/
|
|
112
130
|
export async function restartLaunchdService(ref, context, deps, timing = {}) {
|
|
113
131
|
const target = launchdServiceTarget(context.domain, ref);
|
|
132
|
+
// Restarting the service this command runs inside cannot be done in steps:
|
|
133
|
+
// the bootout kills the command, and the bootstrap that would bring the
|
|
134
|
+
// service back never runs. launchd does both itself instead.
|
|
135
|
+
if (restartsInPlace(ref.id, context.hostingServiceId)) {
|
|
136
|
+
deps.run("launchctl", launchdRestartInPlaceArgs(target));
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
114
139
|
deps.runQuiet("launchctl", launchdBootoutArgs(target));
|
|
115
140
|
await settleLaunchdServiceUnload(target, deps, timing);
|
|
116
141
|
startLaunchdService(ref, context, deps);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serviceAction.js","sourceRoot":"","sources":["../../src/nativeServices/serviceAction.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,iBAAiB,GAA+B,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAC1F,MAAM,CAAC,MAAM,gBAAgB,GAA+B,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACzF,yEAAyE;AACzE,8EAA8E;AAC9E,sDAAsD;AACtD,MAAM,CAAC,MAAM,mBAAmB,GAA+B,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AAE5F,MAAM,gCAAgC,GAAG,MAAM,CAAC;AAChD,MAAM,iCAAiC,GAAG,GAAG,CAAC;AAC9C,MAAM,4BAA4B,GAAG,MAAM,CAAC;AAC5C,MAAM,6BAA6B,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"serviceAction.js","sourceRoot":"","sources":["../../src/nativeServices/serviceAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,4 +35,19 @@ export function deploymentServiceEnvironment(source) {
|
|
|
35
35
|
}
|
|
36
36
|
return environment;
|
|
37
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* Which installed service the running command sits inside, when it is one.
|
|
40
|
+
*
|
|
41
|
+
* Restarting that service cannot be done as a teardown followed by a start:
|
|
42
|
+
* the teardown kills the command before it reaches the start, leaving the
|
|
43
|
+
* label not-loaded, where KeepAlive does not bring it back. A self-update
|
|
44
|
+
* started from the pi-web UI runs in the session daemon, which is exactly that
|
|
45
|
+
* case.
|
|
46
|
+
*
|
|
47
|
+
* PI_WEB_SESSION is set for every process spawned from a pi-web session.
|
|
48
|
+
*/
|
|
49
|
+
export function hostingServiceId(source) {
|
|
50
|
+
const inSession = source["PI_WEB_SESSION"];
|
|
51
|
+
return inSession === undefined || inSession === "" ? undefined : "sessiond";
|
|
52
|
+
}
|
|
38
53
|
//# sourceMappingURL=serviceEnvironment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serviceEnvironment.js","sourceRoot":"","sources":["../../src/nativeServices/serviceEnvironment.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,mCAAmC,GAAG,CAAC,uBAAuB,EAAE,oBAAoB,CAAU,CAAC;AAE5G;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAAoD;IAC/F,MAAM,WAAW,GAA2B,EAAE,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,mCAAmC,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,SAAS;QACzD,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAC3B,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
|
1
|
+
{"version":3,"file":"serviceEnvironment.js","sourceRoot":"","sources":["../../src/nativeServices/serviceEnvironment.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,mCAAmC,GAAG,CAAC,uBAAuB,EAAE,oBAAoB,CAAU,CAAC;AAE5G;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAAoD;IAC/F,MAAM,WAAW,GAA2B,EAAE,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,mCAAmC,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,SAAS;QACzD,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAC3B,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAoD;IACnF,MAAM,SAAS,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAC3C,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;AAC9E,CAAC"}
|
package/package.json
CHANGED