@skylandnpm/octopus-proxy 0.1.42 → 0.1.43
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 +2 -2
- package/dist/cli.js +3 -18
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -98,9 +98,9 @@ octopus-proxy onboard --tool pi
|
|
|
98
98
|
octopus-proxy update
|
|
99
99
|
```
|
|
100
100
|
|
|
101
|
-
命令通过 `npm view @skylandnpm/octopus-proxy@latest version` 查询最新版本。存在新版本时,输入 `y` 或 `yes`
|
|
101
|
+
命令通过 `npm view @skylandnpm/octopus-proxy@latest version` 查询最新版本。存在新版本时,输入 `y` 或 `yes` 确认覆盖安装;直接回车或输入其他内容会取消。确认后使用 npm 全局安装查到的版本,校验安装版本成功后才重启已安装的服务,并检查运行状态后反馈结果。安装期间不会主动停止服务。配置、主机身份和已有服务定义会保留;未安装服务时仅更新 npm 包。
|
|
102
102
|
|
|
103
|
-
|
|
103
|
+
安装或版本校验失败时不会触发服务重启;包安装失败不保证旧版本文件完整保留。已安装新版本但重启失败时会单独提示,可运行 `octopus-proxy doctor` 和 `octopus-proxy logs` 排查。此命令用于 npm 全局安装,覆盖安装前会检查 npm 安装目录是否与当前命令一致;源码、本地安装或 Node.js 环境不一致时会中止并给出提示。
|
|
104
104
|
|
|
105
105
|
## 发布
|
|
106
106
|
|
package/dist/cli.js
CHANGED
|
@@ -721,7 +721,7 @@ async function confirmUpdate(latest) {
|
|
|
721
721
|
if (!stdin2.isTTY) throw new Error("\u66F4\u65B0\u9700\u8981\u5728\u4EA4\u4E92\u5F0F\u7EC8\u7AEF\u4E2D\u786E\u8BA4\uFF1B\u8BF7\u5728\u7EC8\u7AEF\u8FD0\u884C octopus-proxy update");
|
|
722
722
|
const rl = createInterface2({ input: stdin2, output: stdout2 });
|
|
723
723
|
try {
|
|
724
|
-
return /^(y|yes|是|确认)$/i.test((await rl.question(`\u662F\u5426\u8986\u76D6\u5B89\u88C5 ${proxyVersion} \u2192 ${latest}\uFF1F\
|
|
724
|
+
return /^(y|yes|是|确认)$/i.test((await rl.question(`\u662F\u5426\u8986\u76D6\u5B89\u88C5 ${proxyVersion} \u2192 ${latest}\uFF1F\u5B89\u88C5\u5E76\u6821\u9A8C\u6210\u529F\u540E\u4F1A\u91CD\u542F\u670D\u52A1 [y/N]: `)).trim());
|
|
725
725
|
} finally {
|
|
726
726
|
rl.close();
|
|
727
727
|
}
|
|
@@ -768,27 +768,12 @@ async function runUpdate() {
|
|
|
768
768
|
}
|
|
769
769
|
const state = await serviceStatus();
|
|
770
770
|
try {
|
|
771
|
-
if (state.installed) {
|
|
772
|
-
console.log("\u6B63\u5728\u505C\u6B62\u670D\u52A1\u2026");
|
|
773
|
-
await controlService("stop");
|
|
774
|
-
if ((await serviceStatus()).active) throw new Error("\u670D\u52A1\u4ECD\u5728\u8FD0\u884C\uFF0C\u5DF2\u4E2D\u6B62\u8986\u76D6\u5B89\u88C5");
|
|
775
|
-
}
|
|
776
771
|
console.log(`\u6B63\u5728\u5B89\u88C5 ${PACKAGE}@${latest}\u2026`);
|
|
777
772
|
await installVersion(latest, prefix);
|
|
778
773
|
const installed = JSON.parse(await readFile3(join3(target, "package.json"), "utf8"));
|
|
779
774
|
if (installed.version !== latest) throw new Error(`\u5B89\u88C5\u7248\u672C\u6821\u9A8C\u5931\u8D25\uFF1A\u671F\u671B ${latest}\uFF0C\u5B9E\u9645 ${installed.version ?? "\u672A\u77E5"}`);
|
|
780
775
|
} catch (error) {
|
|
781
|
-
|
|
782
|
-
if (state.active) {
|
|
783
|
-
console.log("\u66F4\u65B0\u5931\u8D25\uFF0C\u6B63\u5728\u5C1D\u8BD5\u6062\u590D\u670D\u52A1\u2026");
|
|
784
|
-
try {
|
|
785
|
-
await restartAndVerify();
|
|
786
|
-
recovery = "\uFF1B\u670D\u52A1\u5DF2\u6062\u590D\u8FD0\u884C";
|
|
787
|
-
} catch (restartError) {
|
|
788
|
-
recovery = `\uFF1B\u670D\u52A1\u6062\u590D\u5931\u8D25\uFF1A${message(restartError)}`;
|
|
789
|
-
}
|
|
790
|
-
}
|
|
791
|
-
throw new Error(`\u66F4\u65B0\u5931\u8D25\uFF1A${message(error)}${recovery}`);
|
|
776
|
+
throw new Error(`\u66F4\u65B0\u5931\u8D25\uFF1A${message(error)}`);
|
|
792
777
|
}
|
|
793
778
|
if (state.installed) {
|
|
794
779
|
console.log("\u5B89\u88C5\u5B8C\u6210\uFF0C\u6B63\u5728\u91CD\u542F\u670D\u52A1\u2026");
|
|
@@ -811,7 +796,7 @@ var USAGE = `octopus-proxy \u2014 Octopus \u4E3B\u673A\u4EE3\u7406
|
|
|
811
796
|
projects \u5217\u51FA\u6388\u6743\u9879\u76EE\uFF1B\u53EF\u6309\u5E8F\u53F7\u5220\u9664\u9519\u8BEF\u914D\u7F6E\u9879
|
|
812
797
|
install \u6821\u9A8C\u914D\u7F6E\u540E\u5B89\u88C5/\u66F4\u65B0\u7CFB\u7EDF\u670D\u52A1\uFF08\u5E42\u7B49\uFF0C\u81EA\u52A8\u542F\u52A8\uFF09
|
|
813
798
|
uninstall \u505C\u6B62\u5E76\u79FB\u9664\u7CFB\u7EDF\u670D\u52A1\uFF08\u4FDD\u7559\u914D\u7F6E\u4E0E\u72B6\u6001\u6570\u636E\uFF09
|
|
814
|
-
update \u68C0\u67E5 npm \u6700\u65B0\u7248\u672C\uFF0C\u786E\u8BA4\u540E\
|
|
799
|
+
update \u68C0\u67E5 npm \u6700\u65B0\u7248\u672C\uFF0C\u786E\u8BA4\u540E\u8986\u76D6\u5B89\u88C5\uFF0C\u6821\u9A8C\u6210\u529F\u540E\u91CD\u542F
|
|
815
800
|
start \u542F\u52A8\u670D\u52A1
|
|
816
801
|
stop \u505C\u6B62\u670D\u52A1
|
|
817
802
|
restart \u91CD\u542F\u670D\u52A1
|