@supersdk/supercli 0.1.0-dev.1
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/api/consoleClient.js +132 -0
- package/dist/api/consoleClient.js.map +1 -0
- package/dist/auth/browserAuth.js +163 -0
- package/dist/auth/browserAuth.js.map +1 -0
- package/dist/auth/refresh.js +32 -0
- package/dist/auth/refresh.js.map +1 -0
- package/dist/cli.js +46 -0
- package/dist/cli.js.map +1 -0
- package/dist/commands/accounts.js +46 -0
- package/dist/commands/accounts.js.map +1 -0
- package/dist/commands/createApp.js +225 -0
- package/dist/commands/createApp.js.map +1 -0
- package/dist/commands/login.js +54 -0
- package/dist/commands/login.js.map +1 -0
- package/dist/commands/logout.js +99 -0
- package/dist/commands/logout.js.map +1 -0
- package/dist/commands/publishSite.js +361 -0
- package/dist/commands/publishSite.js.map +1 -0
- package/dist/commands/switchaccount.js +35 -0
- package/dist/commands/switchaccount.js.map +1 -0
- package/dist/commands/update.js +95 -0
- package/dist/commands/update.js.map +1 -0
- package/dist/config/environments.js +53 -0
- package/dist/config/environments.js.map +1 -0
- package/dist/createApp/copyTemplate.js +237 -0
- package/dist/createApp/copyTemplate.js.map +1 -0
- package/dist/publish/orgResolve.js +30 -0
- package/dist/publish/orgResolve.js.map +1 -0
- package/dist/publish/responseClassifier.js +111 -0
- package/dist/publish/responseClassifier.js.map +1 -0
- package/dist/publish/siteClient.js +113 -0
- package/dist/publish/siteClient.js.map +1 -0
- package/dist/publish/siteConfig.js +190 -0
- package/dist/publish/siteConfig.js.map +1 -0
- package/dist/publish/siteZip.js +172 -0
- package/dist/publish/siteZip.js.map +1 -0
- package/dist/store/accountStore.js +236 -0
- package/dist/store/accountStore.js.map +1 -0
- package/dist/store/backends/encryptedFile.js +162 -0
- package/dist/store/backends/encryptedFile.js.map +1 -0
- package/dist/store/backends/osKeyring.js +283 -0
- package/dist/store/backends/osKeyring.js.map +1 -0
- package/dist/store/credentialStore.js +65 -0
- package/dist/store/credentialStore.js.map +1 -0
- package/dist/template/README.md +144 -0
- package/dist/template/android/.gitkeep +1 -0
- package/dist/template/android/app/build.gradle.kts +122 -0
- package/dist/template/android/app/src/main/AndroidManifest.xml +19 -0
- package/dist/template/android/app/src/main/java/com/supersdk/simple/MainActivity.java +17 -0
- package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +22 -0
- package/dist/template/android/app/src/test/java/com/supersdk/simple/AppNameResourceTest.java +19 -0
- package/dist/template/android/build.gradle.kts +3 -0
- package/dist/template/android/gradle/supersdk-config-reader.gradle +61 -0
- package/dist/template/android/gradle/wrapper/gradle-wrapper.jar +0 -0
- package/dist/template/android/gradle/wrapper/gradle-wrapper.properties +8 -0
- package/dist/template/android/gradle.properties +3 -0
- package/dist/template/android/gradlew +251 -0
- package/dist/template/android/settings.gradle.kts +25 -0
- package/dist/template/android/supersdk-default.config.json +17 -0
- package/dist/template/ios/MockSuperSDKPackage/Package.swift +15 -0
- package/dist/template/ios/MockSuperSDKPackage/Sources/SuperSDK/SuperSDK.swift +25 -0
- package/dist/template/ios/Resources/Info.plist +43 -0
- package/dist/template/ios/Sources/App/AppDelegate.swift +20 -0
- package/dist/template/ios/Sources/App/SceneDelegate.swift +14 -0
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +7 -0
- package/dist/template/ios/Sources/App/SimpleSDKProbe.swift +26 -0
- package/dist/template/ios/Sources/App/SimpleSDKProvider.swift +4 -0
- package/dist/template/ios/Sources/App/SimpleViewController.swift +20 -0
- package/dist/template/ios/Tests/SimpleAppTests/SimpleSDKInitializationTests.swift +17 -0
- package/dist/template/ios/project.yml +67 -0
- package/dist/template/scripts/android_snapshot_canary.py +136 -0
- package/dist/template/scripts/build_android.sh +240 -0
- package/dist/template/scripts/build_ios.sh +261 -0
- package/dist/template/scripts/build_web.sh +12 -0
- package/dist/template/scripts/serve_web.py +51 -0
- package/dist/template/scripts/super_build_orchestrator.py +400 -0
- package/dist/template/scripts/supersdk_template.py +611 -0
- package/dist/template/scripts/web_host_validator.py +103 -0
- package/dist/template/scripts/web_package.py +202 -0
- package/dist/template/scripts/ws03_shared_schema_merge_guard.py +73 -0
- package/dist/template/super_build.sh +116 -0
- package/dist/template/supersdk.yaml +15 -0
- package/dist/template/web/src/css/style.css +83 -0
- package/dist/template/web/src/index.html +37 -0
- package/dist/template/web/src/js/app.js +99 -0
- package/dist/template/web/src/js/supersdk.js +1848 -0
- package/dist/template/web/src/js/supersdk.provenance.json +6 -0
- package/dist/update/channelResolver.js +183 -0
- package/dist/update/channelResolver.js.map +1 -0
- package/dist/update/installSafety.js +135 -0
- package/dist/update/installSafety.js.map +1 -0
- package/dist/util/fsAtomic.js +294 -0
- package/dist/util/fsAtomic.js.map +1 -0
- package/dist/util/log.js +55 -0
- package/dist/util/log.js.map +1 -0
- package/dist/util/origin.js +66 -0
- package/dist/util/origin.js.map +1 -0
- package/dist/util/prompt.js +113 -0
- package/dist/util/prompt.js.map +1 -0
- package/package.json +43 -0
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"source_path": "jssdk:supersdk.js",
|
|
3
|
+
"source_sha256": "5a07b36511a7b3b003448c62b0e9a62233d42112be5aa0e607431458e326bf72",
|
|
4
|
+
"source_version": "vendored-from-monorepo-2026-06-20",
|
|
5
|
+
"vendored_sha256": "5a07b36511a7b3b003448c62b0e9a62233d42112be5aa0e607431458e326bf72"
|
|
6
|
+
}
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.CHANNEL_FILE_VERSION = exports.PACKAGE_NAME = void 0;
|
|
40
|
+
exports.channelFilePath = channelFilePath;
|
|
41
|
+
exports.channelToDistTag = channelToDistTag;
|
|
42
|
+
exports.inferChannelFromVersion = inferChannelFromVersion;
|
|
43
|
+
exports.readChannelFile = readChannelFile;
|
|
44
|
+
exports.writeChannelFile = writeChannelFile;
|
|
45
|
+
exports.resolveCurrentChannel = resolveCurrentChannel;
|
|
46
|
+
exports.defaultNpmView = defaultNpmView;
|
|
47
|
+
exports.resolveVersionForChannel = resolveVersionForChannel;
|
|
48
|
+
// BL-006 channel resolution (AC-P1/P3/P4).
|
|
49
|
+
//
|
|
50
|
+
// Two release channels map onto npm dist-tags:
|
|
51
|
+
// main -> `latest` (stable; main == latest, immutable per version)
|
|
52
|
+
// dev -> `dev` (preview; dev != latest, unique per pre-release)
|
|
53
|
+
//
|
|
54
|
+
// The resolver asks the registry for the EXACT version behind a channel's
|
|
55
|
+
// dist-tag and validates it with semver.valid() *before* it is ever allowed to
|
|
56
|
+
// reach an install argv (defends against a garbage/injected `npm view` result,
|
|
57
|
+
// AC-P3/P6/EXT-9). channel.json lives beside accounts.json in configDir()
|
|
58
|
+
// (~/.supersdk/cli), written atomically via fsAtomic.
|
|
59
|
+
const node_child_process_1 = require("node:child_process");
|
|
60
|
+
const fs = __importStar(require("node:fs"));
|
|
61
|
+
const path = __importStar(require("node:path"));
|
|
62
|
+
const semver_1 = __importDefault(require("semver"));
|
|
63
|
+
const fsAtomic_1 = require("../util/fsAtomic");
|
|
64
|
+
const accountStore_1 = require("../store/accountStore");
|
|
65
|
+
const log_1 = require("../util/log");
|
|
66
|
+
exports.PACKAGE_NAME = '@supersdk/supercli';
|
|
67
|
+
exports.CHANNEL_FILE_VERSION = 1;
|
|
68
|
+
/**
|
|
69
|
+
* channel.json path — derived from accountsFilePath()'s directory so it always
|
|
70
|
+
* tracks the same configDir()/SUPERCLI_HOME seam without duplicating that logic.
|
|
71
|
+
*/
|
|
72
|
+
function channelFilePath() {
|
|
73
|
+
return path.join(path.dirname((0, accountStore_1.accountsFilePath)()), 'channel.json');
|
|
74
|
+
}
|
|
75
|
+
/** main follows `latest`; dev is its own tag. (main is NOT a lookup of a tag literally named "main".) */
|
|
76
|
+
function channelToDistTag(channel) {
|
|
77
|
+
return channel === 'main' ? 'latest' : 'dev';
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* The ONLY permitted channel inference: an installed version whose prerelease
|
|
81
|
+
* id is `dev` (e.g. 1.3.0-dev.4) implies the dev channel; anything else is main.
|
|
82
|
+
* Everything else must come from channel.json or an explicit --channel.
|
|
83
|
+
*/
|
|
84
|
+
function inferChannelFromVersion(version) {
|
|
85
|
+
const pre = semver_1.default.prerelease(version);
|
|
86
|
+
if (pre && pre.length > 0 && String(pre[0]) === 'dev')
|
|
87
|
+
return 'dev';
|
|
88
|
+
return 'main';
|
|
89
|
+
}
|
|
90
|
+
function readChannelFile() {
|
|
91
|
+
let raw;
|
|
92
|
+
try {
|
|
93
|
+
raw = fs.readFileSync(channelFilePath(), 'utf8');
|
|
94
|
+
}
|
|
95
|
+
catch (err) {
|
|
96
|
+
if (err.code !== 'ENOENT') {
|
|
97
|
+
// Unreadable channel.json is treated as absent (fall back to inference),
|
|
98
|
+
// never a hard crash of `update` — but an UNEXPECTED read error (perms,
|
|
99
|
+
// I/O) should not be silently swallowed (EXT-11).
|
|
100
|
+
log_1.log.warn('channelResolver.read: failed reading channel.json, falling back to inference', {
|
|
101
|
+
error: err.message,
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
return null;
|
|
105
|
+
}
|
|
106
|
+
try {
|
|
107
|
+
const parsed = JSON.parse(raw);
|
|
108
|
+
if (!parsed || (parsed.channel !== 'main' && parsed.channel !== 'dev'))
|
|
109
|
+
return null;
|
|
110
|
+
return parsed;
|
|
111
|
+
}
|
|
112
|
+
catch {
|
|
113
|
+
return null;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
function writeChannelFile(channel, installedVersion, now = Date.now()) {
|
|
117
|
+
const file = { version: exports.CHANNEL_FILE_VERSION, channel, updatedAt: now };
|
|
118
|
+
if (installedVersion)
|
|
119
|
+
file.installedVersion = installedVersion;
|
|
120
|
+
(0, fsAtomic_1.atomicWriteFileSync)(channelFilePath(), `${JSON.stringify(file, null, 2)}\n`);
|
|
121
|
+
}
|
|
122
|
+
/** channel.json > infer from installed version's -dev. prerelease > default main. */
|
|
123
|
+
function resolveCurrentChannel(installedVersion, channelFile = readChannelFile()) {
|
|
124
|
+
if (channelFile)
|
|
125
|
+
return channelFile.channel;
|
|
126
|
+
if (installedVersion)
|
|
127
|
+
return inferChannelFromVersion(installedVersion);
|
|
128
|
+
return 'main';
|
|
129
|
+
}
|
|
130
|
+
/** Default: `npm view @supersdk/supercli@<tag> version` over the HTTPS registry. */
|
|
131
|
+
function defaultNpmView(distTag) {
|
|
132
|
+
const spec = `${exports.PACKAGE_NAME}@${distTag}`;
|
|
133
|
+
try {
|
|
134
|
+
const stdout = (0, node_child_process_1.execFileSync)('npm', ['view', spec, 'version'], { encoding: 'utf8' });
|
|
135
|
+
const trimmed = (stdout ?? '').trim();
|
|
136
|
+
return { ok: true, stdout: trimmed, notFound: trimmed === '' };
|
|
137
|
+
}
|
|
138
|
+
catch (err) {
|
|
139
|
+
const e = err;
|
|
140
|
+
const text = `${String(e.stderr ?? '')}${e.message ?? ''}`;
|
|
141
|
+
const notFound = /E404|404 Not Found|is not in this registry|No match|no such package|not in the npm registry/i.test(text);
|
|
142
|
+
return { ok: false, stdout: String(e.stdout ?? '').trim(), notFound };
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Resolves a channel to an exact, semver-valid version. Refuses to return any
|
|
147
|
+
* unvalidated string (garbage / injection / not-yet-published all fail here,
|
|
148
|
+
* before any install can be attempted).
|
|
149
|
+
*/
|
|
150
|
+
function resolveVersionForChannel(channel, npmView = defaultNpmView) {
|
|
151
|
+
const distTag = channelToDistTag(channel);
|
|
152
|
+
const outcome = npmView(distTag);
|
|
153
|
+
if (outcome.notFound || (outcome.ok && outcome.stdout.trim() === '')) {
|
|
154
|
+
return {
|
|
155
|
+
ok: false,
|
|
156
|
+
channel,
|
|
157
|
+
distTag,
|
|
158
|
+
kind: 'unpublished',
|
|
159
|
+
message: `渠道 ${channel}(dist-tag ${distTag})尚未发布任何版本,请稍后再试或联系维护者`,
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
if (!outcome.ok) {
|
|
163
|
+
return {
|
|
164
|
+
ok: false,
|
|
165
|
+
channel,
|
|
166
|
+
distTag,
|
|
167
|
+
kind: 'npm_error',
|
|
168
|
+
message: `无法从 registry 查询 ${channel} 渠道版本(npm view 执行失败)`,
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
const version = outcome.stdout.trim();
|
|
172
|
+
if (!semver_1.default.valid(version)) {
|
|
173
|
+
return {
|
|
174
|
+
ok: false,
|
|
175
|
+
channel,
|
|
176
|
+
distTag,
|
|
177
|
+
kind: 'invalid_version',
|
|
178
|
+
message: `registry 返回的版本号不是合法 semver: "${version}",已中止(未执行任何安装)`,
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
return { ok: true, channel, distTag, version };
|
|
182
|
+
}
|
|
183
|
+
//# sourceMappingURL=channelResolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channelResolver.js","sourceRoot":"","sources":["../../src/update/channelResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.defaultExec = void 0;
|
|
40
|
+
exports.buildInstallArgv = buildInstallArgv;
|
|
41
|
+
exports.buildPrefixArgv = buildPrefixArgv;
|
|
42
|
+
exports.buildVersionArgv = buildVersionArgv;
|
|
43
|
+
exports.recoveryCommand = recoveryCommand;
|
|
44
|
+
exports.resolveBinPath = resolveBinPath;
|
|
45
|
+
exports.installAndVerify = installAndVerify;
|
|
46
|
+
// BL-006 install safety (AC-P3/P5/P6).
|
|
47
|
+
//
|
|
48
|
+
// Installs an EXACT, pre-validated version and then verifies the installed bin
|
|
49
|
+
// by running the exact executable under `npm prefix -g` (NOT a PATH lookup —
|
|
50
|
+
// multi-prefix/nvm setups can have a different `supercli` earlier on PATH, which
|
|
51
|
+
// would make a stale install "verify" green, EXT-9). On any verify failure the
|
|
52
|
+
// caller must NOT advance the channel record and must print the exact recovery
|
|
53
|
+
// command. No privilege escalation is ever spawned (no sudo/runas in argv, P6).
|
|
54
|
+
const node_child_process_1 = require("node:child_process");
|
|
55
|
+
const fs = __importStar(require("node:fs"));
|
|
56
|
+
const path = __importStar(require("node:path"));
|
|
57
|
+
const semver_1 = __importDefault(require("semver"));
|
|
58
|
+
const channelResolver_1 = require("./channelResolver");
|
|
59
|
+
exports.defaultExec = {
|
|
60
|
+
run(cmd, args) {
|
|
61
|
+
try {
|
|
62
|
+
const stdout = (0, node_child_process_1.execFileSync)(cmd, args, { encoding: 'utf8' });
|
|
63
|
+
return { status: 0, stdout: stdout ?? '', stderr: '' };
|
|
64
|
+
}
|
|
65
|
+
catch (err) {
|
|
66
|
+
const e = err;
|
|
67
|
+
return {
|
|
68
|
+
status: e.status ?? 1,
|
|
69
|
+
stdout: String(e.stdout ?? ''),
|
|
70
|
+
stderr: String(e.stderr ?? e.message ?? ''),
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
},
|
|
74
|
+
};
|
|
75
|
+
const defaultDeps = { exec: exports.defaultExec, platform: process.platform, existsSync: fs.existsSync };
|
|
76
|
+
// ---- argv builders (kept pure so a spawn-arg audit can assert no escalation) ----
|
|
77
|
+
/** `npm install -g <spec>` — never `sudo npm ...` (AC-P6). Registry stays npm's default HTTPS. */
|
|
78
|
+
function buildInstallArgv(spec) {
|
|
79
|
+
return { cmd: 'npm', args: ['install', '-g', spec, '--no-audit', '--no-fund'] };
|
|
80
|
+
}
|
|
81
|
+
function buildPrefixArgv() {
|
|
82
|
+
return { cmd: 'npm', args: ['prefix', '-g'] };
|
|
83
|
+
}
|
|
84
|
+
function buildVersionArgv(binPath) {
|
|
85
|
+
return { cmd: binPath, args: ['--version'] };
|
|
86
|
+
}
|
|
87
|
+
/** Exact one-liner a user can paste to roll back after a half-failed update (AC-P5). */
|
|
88
|
+
function recoveryCommand(prevVersion) {
|
|
89
|
+
return `npm i -g ${channelResolver_1.PACKAGE_NAME}@${prevVersion}`;
|
|
90
|
+
}
|
|
91
|
+
/** The exact installed bin under a global prefix (NOT a PATH lookup). */
|
|
92
|
+
function resolveBinPath(prefix, platform) {
|
|
93
|
+
if (platform === 'win32')
|
|
94
|
+
return path.join(prefix, 'supercli.cmd');
|
|
95
|
+
return path.join(prefix, 'bin', 'supercli');
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* Installs `exactVersion` globally then verifies it by executing the exact bin
|
|
99
|
+
* under `npm prefix -g`. Returns ok only if the bin reports back exactly the
|
|
100
|
+
* version we installed.
|
|
101
|
+
*/
|
|
102
|
+
function installAndVerify(exactVersion, deps = defaultDeps) {
|
|
103
|
+
// Defense in depth: an unvalidated string must never reach a child argv.
|
|
104
|
+
if (!semver_1.default.valid(exactVersion)) {
|
|
105
|
+
return { ok: false, message: `拒绝安装非法版本号 "${exactVersion}"(semver 校验失败),未执行任何子进程` };
|
|
106
|
+
}
|
|
107
|
+
const spec = `${channelResolver_1.PACKAGE_NAME}@${exactVersion}`;
|
|
108
|
+
const installArgv = buildInstallArgv(spec);
|
|
109
|
+
const install = deps.exec.run(installArgv.cmd, installArgv.args);
|
|
110
|
+
if (install.status !== 0) {
|
|
111
|
+
return { ok: false, message: `npm 全局安装失败(exit ${install.status}): ${install.stderr.trim()}` };
|
|
112
|
+
}
|
|
113
|
+
const prefixArgv = buildPrefixArgv();
|
|
114
|
+
const prefixOut = deps.exec.run(prefixArgv.cmd, prefixArgv.args);
|
|
115
|
+
const prefix = (prefixOut.stdout || '').trim();
|
|
116
|
+
if (prefixOut.status !== 0 || !prefix) {
|
|
117
|
+
return { ok: false, verifyFailed: true, message: '无法定位 npm 全局前缀(npm prefix -g 失败),无法校验安装' };
|
|
118
|
+
}
|
|
119
|
+
const binPath = resolveBinPath(prefix, deps.platform);
|
|
120
|
+
if (!deps.existsSync(binPath)) {
|
|
121
|
+
return { ok: false, verifyFailed: true, message: `安装后未在全局前缀找到 bin: ${binPath}` };
|
|
122
|
+
}
|
|
123
|
+
const versionArgv = buildVersionArgv(binPath);
|
|
124
|
+
const verify = deps.exec.run(versionArgv.cmd, versionArgv.args);
|
|
125
|
+
const reported = (verify.stdout || '').trim();
|
|
126
|
+
if (verify.status !== 0 || !semver_1.default.valid(reported) || reported !== exactVersion) {
|
|
127
|
+
return {
|
|
128
|
+
ok: false,
|
|
129
|
+
verifyFailed: true,
|
|
130
|
+
message: `安装后校验失败:期望 ${exactVersion},实际 "${reported}"(exit ${verify.status})`,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
return { ok: true, installedVersion: exactVersion };
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=installSafety.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"installSafety.js","sourceRoot":"","sources":["../../src/update/installSafety.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,294 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.atomicWriteFileSync = atomicWriteFileSync;
|
|
37
|
+
exports.acquireLockSync = acquireLockSync;
|
|
38
|
+
exports.cleanupOrphanTempFiles = cleanupOrphanTempFiles;
|
|
39
|
+
// Shared low-level primitives for accountStore.ts (and, for its own on-disk
|
|
40
|
+
// vault file, encryptedFile.ts): atomic temp+rename writes and a cross-process
|
|
41
|
+
// advisory lock built on O_EXCL. No external dependency (proper-lockfile et al)
|
|
42
|
+
// — TECH.md accepted either "proper-lockfile or an O_EXCL-class primitive"; an
|
|
43
|
+
// in-repo O_EXCL lock keeps the npm install dependency-free (AC-1/R4) and is
|
|
44
|
+
// small enough to unit-test exhaustively (TC-31).
|
|
45
|
+
const fs = __importStar(require("node:fs"));
|
|
46
|
+
const path = __importStar(require("node:path"));
|
|
47
|
+
function atomicWriteFileSync(filePath, content) {
|
|
48
|
+
const dir = path.dirname(filePath);
|
|
49
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
50
|
+
const tmpPath = path.join(dir, `.${path.basename(filePath)}.${process.pid}.${Date.now()}.tmp`);
|
|
51
|
+
const fd = fs.openSync(tmpPath, 'w', 0o600);
|
|
52
|
+
try {
|
|
53
|
+
fs.writeSync(fd, content);
|
|
54
|
+
fs.fsyncSync(fd);
|
|
55
|
+
}
|
|
56
|
+
finally {
|
|
57
|
+
fs.closeSync(fd);
|
|
58
|
+
}
|
|
59
|
+
// fs.renameSync is atomic-replace on both POSIX (rename(2)) and Windows
|
|
60
|
+
// (Node maps it to MoveFileExW with MOVEFILE_REPLACE_EXISTING) — the
|
|
61
|
+
// destination never observes a partially-written file.
|
|
62
|
+
fs.renameSync(tmpPath, filePath);
|
|
63
|
+
}
|
|
64
|
+
const DEFAULT_OPTS = {
|
|
65
|
+
staleMs: 10_000,
|
|
66
|
+
timeoutMs: 5_000,
|
|
67
|
+
retryDelayMs: 50,
|
|
68
|
+
staleConfirmDelayMs: 120,
|
|
69
|
+
};
|
|
70
|
+
function isPidAlive(pid) {
|
|
71
|
+
if (!Number.isFinite(pid) || pid <= 0)
|
|
72
|
+
return false;
|
|
73
|
+
try {
|
|
74
|
+
process.kill(pid, 0);
|
|
75
|
+
return true;
|
|
76
|
+
}
|
|
77
|
+
catch (err) {
|
|
78
|
+
return err.code === 'EPERM';
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
function sleepSync(ms) {
|
|
82
|
+
const sab = new SharedArrayBuffer(4);
|
|
83
|
+
Atomics.wait(new Int32Array(sab), 0, 0, ms);
|
|
84
|
+
}
|
|
85
|
+
function parseLockInfo(raw) {
|
|
86
|
+
try {
|
|
87
|
+
const info = JSON.parse(raw);
|
|
88
|
+
if (typeof info.pid !== 'number' || typeof info.at !== 'number')
|
|
89
|
+
return null;
|
|
90
|
+
return { pid: info.pid, at: info.at };
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
/** Corrupt/unparseable content is treated as abandoned (nothing sane to wait on). */
|
|
97
|
+
function isAbandoned(raw, staleMs) {
|
|
98
|
+
const info = parseLockInfo(raw);
|
|
99
|
+
if (!info)
|
|
100
|
+
return true;
|
|
101
|
+
return info.pid <= 0 || !isPidAlive(info.pid) || Date.now() - info.at > staleMs;
|
|
102
|
+
}
|
|
103
|
+
function lockContent() {
|
|
104
|
+
return JSON.stringify({ pid: process.pid, at: Date.now() });
|
|
105
|
+
}
|
|
106
|
+
function makeReleaseClosure(lockPath) {
|
|
107
|
+
let released = false;
|
|
108
|
+
return () => {
|
|
109
|
+
if (released)
|
|
110
|
+
return;
|
|
111
|
+
released = true;
|
|
112
|
+
try {
|
|
113
|
+
fs.unlinkSync(lockPath);
|
|
114
|
+
}
|
|
115
|
+
catch {
|
|
116
|
+
// Already gone (e.g. stolen by another process) — nothing to do.
|
|
117
|
+
}
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
/**
|
|
121
|
+
* Acquires an exclusive cross-process lock at `lockPath` (O_EXCL create).
|
|
122
|
+
* A lock left behind by a crashed/killed process is detected (pid no longer
|
|
123
|
+
* alive, or the lock is older than staleMs) and stolen rather than dead-locking
|
|
124
|
+
* every future `supercli` invocation (TC-31).
|
|
125
|
+
*
|
|
126
|
+
* Returns a release() function; callers must call it in a finally block.
|
|
127
|
+
*/
|
|
128
|
+
function acquireLockSync(lockPath, opts = {}) {
|
|
129
|
+
const { staleMs, timeoutMs, retryDelayMs, staleConfirmDelayMs } = { ...DEFAULT_OPTS, ...opts };
|
|
130
|
+
fs.mkdirSync(path.dirname(lockPath), { recursive: true });
|
|
131
|
+
const start = Date.now();
|
|
132
|
+
for (;;) {
|
|
133
|
+
try {
|
|
134
|
+
const fd = fs.openSync(lockPath, 'wx');
|
|
135
|
+
fs.writeSync(fd, lockContent());
|
|
136
|
+
fs.closeSync(fd);
|
|
137
|
+
return makeReleaseClosure(lockPath);
|
|
138
|
+
}
|
|
139
|
+
catch (err) {
|
|
140
|
+
if (err.code !== 'EEXIST')
|
|
141
|
+
throw err;
|
|
142
|
+
if (tryStealAndAcquire(lockPath, staleMs, staleConfirmDelayMs)) {
|
|
143
|
+
return makeReleaseClosure(lockPath);
|
|
144
|
+
}
|
|
145
|
+
if (Date.now() - start > timeoutMs) {
|
|
146
|
+
throw new Error(`could not acquire account store lock at ${lockPath} within ${timeoutMs}ms ` +
|
|
147
|
+
'(another `supercli` process may be running)');
|
|
148
|
+
}
|
|
149
|
+
sleepSync(retryDelayMs);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
// EXTR-2 fix (multi-process TOCTOU on stale-lock stealing).
|
|
154
|
+
//
|
|
155
|
+
// Two things were wrong with the original implementation:
|
|
156
|
+
// 1. It decided "abandoned" from a single read, then unlinked lockPath by
|
|
157
|
+
// PATH alone. Two processes could both read the same stale content, both
|
|
158
|
+
// decide abandoned=true, and both unlink — each believing it alone stole
|
|
159
|
+
// the lock and proceeding to hold it concurrently (the atomic temp+rename
|
|
160
|
+
// writer only prevents a corrupt/partial accounts.json, not a LOST UPDATE
|
|
161
|
+
// from two simultaneous critical sections).
|
|
162
|
+
// 2. A closely related second race: even with unlink replaced by an atomic
|
|
163
|
+
// "rename-to-claim" (only one of N concurrent stealers can ever consume a
|
|
164
|
+
// given directory entry — the same idiom maildir/procmail use), a SLOW
|
|
165
|
+
// straggler that read the ORIGINAL stale content can still, after enough
|
|
166
|
+
// scheduling delay, end up renaming-away a DIFFERENT process's brand-new,
|
|
167
|
+
// perfectly live lock that reoccupied the same path in the meantime —
|
|
168
|
+
// because rename() only cares about the path, not the content that used
|
|
169
|
+
// to be (or now is) there. Reactively detecting the mismatch and trying
|
|
170
|
+
// to put it back has its own residual gap (a third process can grab the
|
|
171
|
+
// now-briefly-empty slot before the restore completes), which was
|
|
172
|
+
// reproduced empirically with 8 concurrent processes racing a single
|
|
173
|
+
// pre-seeded stale lock (~1 in 3 runs).
|
|
174
|
+
//
|
|
175
|
+
// The fix has two parts:
|
|
176
|
+
// a) Require staleness to be confirmed on TWO reads separated by
|
|
177
|
+
// staleConfirmDelayMs (120ms default) before ANY steal is attempted at
|
|
178
|
+
// all — same technique proper-lockfile uses. Our own critical sections
|
|
179
|
+
// complete in low single-digit milliseconds, so by the time a straggler's
|
|
180
|
+
// second read fires, any legitimate fresh acquisition that happened in
|
|
181
|
+
// between is already visible and the straggler correctly backs off
|
|
182
|
+
// *before* ever touching the path — this is what actually closes the
|
|
183
|
+
// window that caused the reproduction above, not just narrows it.
|
|
184
|
+
// b) The final "install" step is a fs.linkSync (fails EEXIST if the slot
|
|
185
|
+
// is occupied) rather than a blind write/rename-over, so even in the
|
|
186
|
+
// residual, now much narrower window, a would-be stealer can never
|
|
187
|
+
// clobber a lock some other process legitimately holds — it just loses
|
|
188
|
+
// that round and retries.
|
|
189
|
+
function tryStealAndAcquire(lockPath, staleMs, staleConfirmDelayMs) {
|
|
190
|
+
let firstRaw;
|
|
191
|
+
try {
|
|
192
|
+
firstRaw = fs.readFileSync(lockPath, 'utf8');
|
|
193
|
+
}
|
|
194
|
+
catch {
|
|
195
|
+
return false; // vanished already; let the caller's normal retry pick it up
|
|
196
|
+
}
|
|
197
|
+
if (!isAbandoned(firstRaw, staleMs))
|
|
198
|
+
return false;
|
|
199
|
+
sleepSync(staleConfirmDelayMs);
|
|
200
|
+
let secondRaw;
|
|
201
|
+
try {
|
|
202
|
+
secondRaw = fs.readFileSync(lockPath, 'utf8');
|
|
203
|
+
}
|
|
204
|
+
catch {
|
|
205
|
+
return false; // released normally in the interim; let the normal retry pick it up
|
|
206
|
+
}
|
|
207
|
+
// Require the SAME holder identity (pid+at) on both reads — if anything
|
|
208
|
+
// changed (new holder, or the same holder somehow refreshed), it's live.
|
|
209
|
+
if (secondRaw !== firstRaw || !isAbandoned(secondRaw, staleMs))
|
|
210
|
+
return false;
|
|
211
|
+
const claimPath = `${lockPath}.steal.${process.pid}.${Date.now()}.${Math.random().toString(36).slice(2)}`;
|
|
212
|
+
try {
|
|
213
|
+
fs.renameSync(lockPath, claimPath);
|
|
214
|
+
}
|
|
215
|
+
catch (err) {
|
|
216
|
+
if (err.code === 'ENOENT')
|
|
217
|
+
return false; // someone else won this exact race
|
|
218
|
+
throw err;
|
|
219
|
+
}
|
|
220
|
+
// Belt-and-suspenders: re-check whatever we actually ended up consuming
|
|
221
|
+
// (not just trust the pre-rename reads) before discarding it.
|
|
222
|
+
let claimedRaw;
|
|
223
|
+
try {
|
|
224
|
+
claimedRaw = fs.readFileSync(claimPath, 'utf8');
|
|
225
|
+
}
|
|
226
|
+
catch {
|
|
227
|
+
claimedRaw = '';
|
|
228
|
+
}
|
|
229
|
+
if (!isAbandoned(claimedRaw, staleMs)) {
|
|
230
|
+
// We consumed something live after all (vanishingly rare given the
|
|
231
|
+
// double-confirm above, but handle it without ever clobbering). Put it
|
|
232
|
+
// back into an empty slot only — linkSync fails EEXIST rather than
|
|
233
|
+
// silently overwriting if some other process has since recreated a real
|
|
234
|
+
// lock at lockPath.
|
|
235
|
+
try {
|
|
236
|
+
fs.linkSync(claimPath, lockPath);
|
|
237
|
+
}
|
|
238
|
+
catch {
|
|
239
|
+
// Occupied again by someone else's legitimate lock — correct outcome:
|
|
240
|
+
// leave it alone (their content is orphaned in claimPath; discarded below).
|
|
241
|
+
}
|
|
242
|
+
try {
|
|
243
|
+
fs.unlinkSync(claimPath);
|
|
244
|
+
}
|
|
245
|
+
catch {
|
|
246
|
+
// Best-effort cleanup.
|
|
247
|
+
}
|
|
248
|
+
return false;
|
|
249
|
+
}
|
|
250
|
+
// Confirmed abandoned. Install our own fresh lock in its place atomically:
|
|
251
|
+
// linkSync fails EEXIST instead of clobbering if the slot got occupied in
|
|
252
|
+
// the (now sub-syscall-scale) window since our rename.
|
|
253
|
+
try {
|
|
254
|
+
fs.writeFileSync(claimPath, lockContent());
|
|
255
|
+
fs.linkSync(claimPath, lockPath);
|
|
256
|
+
fs.unlinkSync(claimPath);
|
|
257
|
+
return true;
|
|
258
|
+
}
|
|
259
|
+
catch (err) {
|
|
260
|
+
try {
|
|
261
|
+
fs.unlinkSync(claimPath);
|
|
262
|
+
}
|
|
263
|
+
catch {
|
|
264
|
+
// Best-effort cleanup.
|
|
265
|
+
}
|
|
266
|
+
if (err.code === 'EEXIST')
|
|
267
|
+
return false;
|
|
268
|
+
throw err;
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
/** Cleans up any leftover `.tmp` files from a write interrupted mid-rename. */
|
|
272
|
+
function cleanupOrphanTempFiles(filePath) {
|
|
273
|
+
const dir = path.dirname(filePath);
|
|
274
|
+
const base = path.basename(filePath);
|
|
275
|
+
let entries;
|
|
276
|
+
try {
|
|
277
|
+
entries = fs.readdirSync(dir);
|
|
278
|
+
}
|
|
279
|
+
catch {
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
282
|
+
const prefix = `.${base}.`;
|
|
283
|
+
for (const entry of entries) {
|
|
284
|
+
if (entry.startsWith(prefix) && entry.endsWith('.tmp')) {
|
|
285
|
+
try {
|
|
286
|
+
fs.unlinkSync(path.join(dir, entry));
|
|
287
|
+
}
|
|
288
|
+
catch {
|
|
289
|
+
// Best-effort cleanup only.
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
//# sourceMappingURL=fsAtomic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fsAtomic.js","sourceRoot":"","sources":["../../src/util/fsAtomic.ts"],"names":[],"mappings":"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"}
|