@supersdk/supercli 0.2.1-staging.19 → 0.2.1-staging.21
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 +17 -12
- package/dist/api/consoleClient.js.map +1 -1
- package/dist/auth/browserAuth.js +42 -44
- package/dist/auth/browserAuth.js.map +1 -1
- package/dist/auth/tokenAuth.js +46 -0
- package/dist/auth/tokenAuth.js.map +1 -0
- package/dist/cli.js +66 -6
- package/dist/cli.js.map +1 -1
- package/dist/commands/accounts.js +89 -31
- package/dist/commands/accounts.js.map +1 -1
- package/dist/commands/login.js +75 -48
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.js +20 -25
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/publishSite.js +190 -131
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/switchaccount.js +36 -24
- package/dist/commands/switchaccount.js.map +1 -1
- package/dist/commands/update.js +8 -6
- package/dist/commands/update.js.map +1 -1
- package/dist/config/environments.js +17 -1
- package/dist/config/environments.js.map +1 -1
- package/dist/exit/exitCodes.js +55 -0
- package/dist/exit/exitCodes.js.map +1 -0
- package/dist/output/envelope.js +104 -0
- package/dist/output/envelope.js.map +1 -0
- package/dist/output/resultPrinter.js +70 -0
- package/dist/output/resultPrinter.js.map +1 -0
- package/dist/publish/responseClassifier.js +12 -12
- package/dist/publish/responseClassifier.js.map +1 -1
- package/dist/publish/siteClient.js +15 -5
- package/dist/publish/siteClient.js.map +1 -1
- package/dist/publish/siteConfig.js +21 -21
- package/dist/publish/siteConfig.js.map +1 -1
- package/dist/publish/siteZip.js +8 -8
- package/dist/publish/siteZip.js.map +1 -1
- package/dist/store/accountStore.js +2 -2
- package/dist/store/accountStore.js.map +1 -1
- package/dist/store/backends/encryptedFile.js +4 -1
- package/dist/store/backends/encryptedFile.js.map +1 -1
- package/dist/store/backends/osKeyring.js +4 -8
- package/dist/store/backends/osKeyring.js.map +1 -1
- package/dist/store/credentialStore.js +22 -0
- package/dist/store/credentialStore.js.map +1 -1
- package/dist/update/channelResolver.js +3 -3
- package/dist/update/channelResolver.js.map +1 -1
- package/dist/update/installSafety.js +12 -5
- package/dist/update/installSafety.js.map +1 -1
- package/dist/util/log.js +10 -1
- package/dist/util/log.js.map +1 -1
- package/dist/util/prompt.js +25 -0
- package/dist/util/prompt.js.map +1 -1
- package/package.json +1 -1
- package/dist/auth/refresh.js +0 -32
- package/dist/auth/refresh.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responseClassifier.js","sourceRoot":"","sources":["../../src/publish/responseClassifier.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"responseClassifier.js","sourceRoot":"","sources":["../../src/publish/responseClassifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,7 +62,10 @@ class SiteClient {
|
|
|
62
62
|
const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? 60_000);
|
|
63
63
|
let res;
|
|
64
64
|
try {
|
|
65
|
-
const headers = this.headers(ctx,
|
|
65
|
+
const headers = this.headers(ctx, {
|
|
66
|
+
...(opts.jsonBody !== undefined ? { 'content-type': 'application/json' } : {}),
|
|
67
|
+
...(opts.extraHeaders ?? {}),
|
|
68
|
+
});
|
|
66
69
|
res = await this.fetchImpl(`${this.apiOrigin}${path}`, {
|
|
67
70
|
method,
|
|
68
71
|
headers,
|
|
@@ -96,10 +99,12 @@ class SiteClient {
|
|
|
96
99
|
if (input.zip.length > UPLOAD_FILE_LIMIT_BYTES) {
|
|
97
100
|
return Promise.resolve({
|
|
98
101
|
kind: 'infra_error',
|
|
99
|
-
message: `zip
|
|
102
|
+
message: `zip file is ${input.zip.length} bytes — over the 50 MiB upload limit`,
|
|
100
103
|
});
|
|
101
104
|
}
|
|
102
|
-
|
|
105
|
+
// A real deploy must reference a verified site id; a dry-run of a not-yet-
|
|
106
|
+
// created site legitimately has none (0), so the guard only applies off dry-run.
|
|
107
|
+
if (!input.dryRun && (!Number.isSafeInteger(input.expectedSiteId) || input.expectedSiteId <= 0)) {
|
|
103
108
|
return Promise.resolve({
|
|
104
109
|
kind: 'infra_error',
|
|
105
110
|
message: 'expectedSiteId must be a positive integer from a verified SiteView',
|
|
@@ -114,8 +119,13 @@ class SiteClient {
|
|
|
114
119
|
form.append('version', input.version);
|
|
115
120
|
if (input.description !== undefined)
|
|
116
121
|
form.append('description', input.description);
|
|
117
|
-
|
|
118
|
-
|
|
122
|
+
if (Number.isSafeInteger(input.expectedSiteId) && input.expectedSiteId > 0) {
|
|
123
|
+
form.append('expected_site_id', String(input.expectedSiteId));
|
|
124
|
+
}
|
|
125
|
+
if (input.dryRun)
|
|
126
|
+
form.append('dry_run', 'true');
|
|
127
|
+
const extraHeaders = input.idempotencyKey ? { 'x-idempotency-key': input.idempotencyKey } : undefined;
|
|
128
|
+
return this.send(ctx, 'POST', `/api/console/projects/${encodeURIComponent(spid)}/sites/${encodeURIComponent(slug)}/envs/${encodeURIComponent(env)}/deploys`, { formBody: form, extraHeaders });
|
|
119
129
|
}
|
|
120
130
|
}
|
|
121
131
|
exports.SiteClient = SiteClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteClient.js","sourceRoot":"","sources":["../../src/publish/siteClient.ts"],"names":[],"mappings":";;;AAAA,oEAAoE;AACpE,yBAAyB;AACzB,iFAAiF;AACjF,yDAAyD;AACzD,4EAA4E;AAC5E,4EAA4E;AAC5E,+EAA+E;AAC/E,gFAAgF;AAChF,6EAA6E;AAC7E,2BAA2B;AAC3B,6DAAiG;AAmBjG,+EAA+E;AAC/E,iFAAiF;AACjF,6CAA6C;AAC7C,MAAM,uBAAuB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"siteClient.js","sourceRoot":"","sources":["../../src/publish/siteClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,61 +113,61 @@ function parseConfig(raw, filePath) {
|
|
|
113
113
|
// 文件、还把它**写回**成只剩最后一个值的合法文件 —— 静默丢掉用户的一行配置。
|
|
114
114
|
const duplicate = (0, appConfig_1.findDuplicateKey)(raw);
|
|
115
115
|
if (duplicate) {
|
|
116
|
-
return invalid(filePath,
|
|
116
|
+
return invalid(filePath, `duplicate key "${duplicate}" — the build side rejects such a file outright; delete the extra line first`);
|
|
117
117
|
}
|
|
118
118
|
let document;
|
|
119
119
|
try {
|
|
120
120
|
document = JSON.parse(raw);
|
|
121
121
|
}
|
|
122
122
|
catch (error) {
|
|
123
|
-
return invalid(filePath,
|
|
123
|
+
return invalid(filePath, `not valid JSON: ${error.message}`);
|
|
124
124
|
}
|
|
125
125
|
if (!isPlainObject(document))
|
|
126
|
-
return invalid(filePath, '
|
|
126
|
+
return invalid(filePath, 'the top level must be a JSON object');
|
|
127
127
|
if (document.schemaVersion !== exports.SCHEMA_VERSION) {
|
|
128
|
-
const renamed = 'schema_version' in document ? '
|
|
129
|
-
return invalid(filePath, `schemaVersion
|
|
128
|
+
const renamed = 'schema_version' in document ? ' (the retired key schema_version is now schemaVersion)' : '';
|
|
129
|
+
return invalid(filePath, `schemaVersion must be the number ${exports.SCHEMA_VERSION}${renamed}`);
|
|
130
130
|
}
|
|
131
131
|
if (typeof document.spid !== 'string' || !isValidSpid(document.spid)) {
|
|
132
|
-
return invalid(filePath, 'spid
|
|
132
|
+
return invalid(filePath, 'spid must be 8 lowercase letters or digits');
|
|
133
133
|
}
|
|
134
134
|
let orgId;
|
|
135
135
|
if (document.orgId !== undefined) {
|
|
136
136
|
if (typeof document.orgId !== 'string')
|
|
137
|
-
return invalid(filePath, 'orgId
|
|
137
|
+
return invalid(filePath, 'orgId must be a string');
|
|
138
138
|
if (!isValidOrgId(document.orgId))
|
|
139
|
-
return invalid(filePath, 'orgId
|
|
139
|
+
return invalid(filePath, 'orgId must be a positive integer as a string');
|
|
140
140
|
orgId = document.orgId;
|
|
141
141
|
}
|
|
142
142
|
const sites = [];
|
|
143
143
|
if (document.sites !== undefined) {
|
|
144
144
|
if (!Array.isArray(document.sites))
|
|
145
|
-
return invalid(filePath, 'sites
|
|
145
|
+
return invalid(filePath, 'sites must be an array');
|
|
146
146
|
const seen = new Set();
|
|
147
147
|
for (let index = 0; index < document.sites.length; index += 1) {
|
|
148
148
|
const item = document.sites[index];
|
|
149
149
|
if (!isPlainObject(item))
|
|
150
|
-
return invalid(filePath, `sites[${index}]
|
|
150
|
+
return invalid(filePath, `sites[${index}] must be an object`);
|
|
151
151
|
if (typeof item.slug !== 'string' || !isValidSlug(item.slug)) {
|
|
152
|
-
return invalid(filePath, `sites[${index}].slug
|
|
152
|
+
return invalid(filePath, `sites[${index}].slug must be 1-32 lowercase letters or digits, and must not be stg`);
|
|
153
153
|
}
|
|
154
154
|
if (typeof item.env !== 'string' || !isValidEnvironment(item.env)) {
|
|
155
|
-
return invalid(filePath, `sites[${index}].env
|
|
155
|
+
return invalid(filePath, `sites[${index}].env must be 1-10 lowercase letters or digits`);
|
|
156
156
|
}
|
|
157
157
|
if (item.name !== undefined && typeof item.name !== 'string')
|
|
158
|
-
return invalid(filePath, `sites[${index}].name
|
|
158
|
+
return invalid(filePath, `sites[${index}].name must be a string`);
|
|
159
159
|
if (item.dir !== undefined && typeof item.dir !== 'string')
|
|
160
|
-
return invalid(filePath, `sites[${index}].dir
|
|
160
|
+
return invalid(filePath, `sites[${index}].dir must be a string`);
|
|
161
161
|
const name = typeof item.name === 'string' && item.name.trim().length > 0 ? item.name.trim() : item.slug;
|
|
162
162
|
if (Array.from(name).length > 50)
|
|
163
|
-
return invalid(filePath, `sites[${index}].name
|
|
163
|
+
return invalid(filePath, `sites[${index}].name must be 1-50 characters`);
|
|
164
164
|
// slug / env 都已按 ^[a-z0-9]+$ 校验过,`/` 不可能出现在任一侧,所以它是无歧义的
|
|
165
165
|
// 复合键分隔符。(这里曾经嵌的是一个**裸 NUL 字节**:git 会把整个源文件判成二进制,
|
|
166
166
|
// diff 显示 "Binary file not shown",改动无法 review,NUL 还会跟着 dist/ 发进 npm 包。
|
|
167
167
|
// 分隔符要写成源码里看得见的字符(或反斜杠 u0000 这种转义写法)—— 别再放裸控制字符。)
|
|
168
168
|
const key = `${item.slug}/${item.env}`;
|
|
169
169
|
if (seen.has(key))
|
|
170
|
-
return invalid(filePath, `sites
|
|
170
|
+
return invalid(filePath, `duplicate entry in sites: slug=${item.slug} env=${item.env}`);
|
|
171
171
|
seen.add(key);
|
|
172
172
|
sites.push({ slug: item.slug, name, env: item.env, dir: typeof item.dir === 'string' ? item.dir : '' });
|
|
173
173
|
}
|
|
@@ -185,7 +185,7 @@ function readConfigFile(filePath) {
|
|
|
185
185
|
if (error.code === 'ENOENT') {
|
|
186
186
|
return { kind: 'absent', searched: [path.dirname(filePath)], explicit: false };
|
|
187
187
|
}
|
|
188
|
-
return invalid(filePath,
|
|
188
|
+
return invalid(filePath, `cannot be read: ${error.message}`);
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
191
|
function exists(target) {
|
|
@@ -381,20 +381,20 @@ function updateConfig(configPath, update) {
|
|
|
381
381
|
const before = fs.readFileSync(configPath, 'utf8');
|
|
382
382
|
const parsed = parseConfig(before, configPath);
|
|
383
383
|
if (parsed.kind !== 'valid') {
|
|
384
|
-
throw new Error(
|
|
384
|
+
throw new Error(`refusing to write an unparseable ${exports.CONFIG_FILENAME}: ${parsed.kind === 'invalid' ? parsed.reason : parsed.kind}`);
|
|
385
385
|
}
|
|
386
386
|
const document = JSON.parse(before);
|
|
387
387
|
if (update.orgId !== undefined) {
|
|
388
388
|
const existing = document.orgId;
|
|
389
389
|
if (typeof existing === 'string' && existing !== update.orgId) {
|
|
390
|
-
throw new Error(
|
|
390
|
+
throw new Error(`refusing to overwrite the existing orgId (${existing} → ${update.orgId})`);
|
|
391
391
|
}
|
|
392
392
|
document.orgId = update.orgId;
|
|
393
393
|
}
|
|
394
394
|
if (update.appendSite) {
|
|
395
395
|
const entry = update.appendSite;
|
|
396
396
|
if (parsed.config.sites.some((site) => site.slug === entry.slug && site.env === entry.env)) {
|
|
397
|
-
throw new Error(`sites
|
|
397
|
+
throw new Error(`sites already has an entry for slug=${entry.slug} env=${entry.env} — refusing to append a duplicate`);
|
|
398
398
|
}
|
|
399
399
|
const sites = Array.isArray(document.sites) ? [...document.sites] : [];
|
|
400
400
|
sites.push({ slug: entry.slug, name: entry.name, env: entry.env, dir: entry.dir });
|
|
@@ -403,7 +403,7 @@ function updateConfig(configPath, update) {
|
|
|
403
403
|
const serialized = (0, exports.serializeConfig)(document);
|
|
404
404
|
const verified = parseConfig(serialized, configPath);
|
|
405
405
|
if (verified.kind !== 'valid') {
|
|
406
|
-
throw new Error(
|
|
406
|
+
throw new Error(`refusing to write an invalid ${exports.CONFIG_FILENAME}: ${verified.kind === 'invalid' ? verified.reason : verified.kind}`);
|
|
407
407
|
}
|
|
408
408
|
writePreservingMode(configPath, serialized);
|
|
409
409
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteConfig.js","sourceRoot":"","sources":["../../src/publish/siteConfig.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"siteConfig.js","sourceRoot":"","sources":["../../src/publish/siteConfig.ts"],"names":[],"mappings":"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"}
|
package/dist/publish/siteZip.js
CHANGED
|
@@ -82,12 +82,12 @@ function collectEntries(root, limits) {
|
|
|
82
82
|
const rel = relPrefix ? `${relPrefix}/${name}` : name;
|
|
83
83
|
// Reject symlinks anywhere (mirrors zipsafe Symlink).
|
|
84
84
|
if (dirent.isSymbolicLink()) {
|
|
85
|
-
throw new ZipBuildError('SYMLINK',
|
|
85
|
+
throw new ZipBuildError('SYMLINK', `symlink entries are not allowed: ${rel}`);
|
|
86
86
|
}
|
|
87
87
|
// Defensive path-traversal / illegal-name guard (local walk should never
|
|
88
88
|
// produce these, but assert anyway to mirror zipsafe PathTraversal).
|
|
89
89
|
if (name === '..' || name === '.' || name.includes('\\') || name.includes('/')) {
|
|
90
|
-
throw new ZipBuildError('PATH_TRAVERSAL',
|
|
90
|
+
throw new ZipBuildError('PATH_TRAVERSAL', `illegal path entry: ${rel}`);
|
|
91
91
|
}
|
|
92
92
|
// Exclusions: root supersdk.json + dotfiles/dotdirs (keep .well-known/).
|
|
93
93
|
// The root config carries spid/orgId — packaging it would publish the
|
|
@@ -105,11 +105,11 @@ function collectEntries(root, limits) {
|
|
|
105
105
|
continue; // skip fifos/sockets/etc.
|
|
106
106
|
const stat = fs.statSync(abs);
|
|
107
107
|
if (stat.size > limits.maxFileBytes) {
|
|
108
|
-
throw new ZipBuildError('FILE_TOO_LARGE',
|
|
108
|
+
throw new ZipBuildError('FILE_TOO_LARGE', `${rel} exceeds the 25MiB per-file limit: ${stat.size} bytes`);
|
|
109
109
|
}
|
|
110
110
|
const folded = rel.toLowerCase();
|
|
111
111
|
if (foldedPaths.has(folded)) {
|
|
112
|
-
throw new ZipBuildError('CASE_CONFLICT',
|
|
112
|
+
throw new ZipBuildError('CASE_CONFLICT', `duplicate path differing only in case: ${rel}`);
|
|
113
113
|
}
|
|
114
114
|
foldedPaths.add(folded);
|
|
115
115
|
entries.push({ abs, rel, size: stat.size });
|
|
@@ -117,7 +117,7 @@ function collectEntries(root, limits) {
|
|
|
117
117
|
};
|
|
118
118
|
walk(root, '');
|
|
119
119
|
if (entries.length > limits.maxFileCount) {
|
|
120
|
-
throw new ZipBuildError('FILE_COUNT_EXCEEDED',
|
|
120
|
+
throw new ZipBuildError('FILE_COUNT_EXCEEDED', `${entries.length} files exceeds the 2000-entry limit`);
|
|
121
121
|
}
|
|
122
122
|
return entries;
|
|
123
123
|
}
|
|
@@ -129,14 +129,14 @@ async function buildSiteZip(dir, limitsOverride) {
|
|
|
129
129
|
const limits = { ...exports.DEFAULT_ZIP_LIMITS, ...limitsOverride };
|
|
130
130
|
const entries = collectEntries(dir, limits);
|
|
131
131
|
if (!entries.some((e) => e.rel === 'index.html')) {
|
|
132
|
-
throw new ZipBuildError('MISSING_INDEX_HTML', '
|
|
132
|
+
throw new ZipBuildError('MISSING_INDEX_HTML', 'no index.html at the root of the publish dir — nothing to publish');
|
|
133
133
|
}
|
|
134
134
|
// Enforce the uncompressed-total limit BEFORE compressing (mirrors zipsafe.rs
|
|
135
135
|
// MAX_UNCOMPRESSED_BYTES) — a set of individually-legal files can still sum to
|
|
136
136
|
// a decompression-bomb-scale total (EXT-8).
|
|
137
137
|
const totalBytes = entries.reduce((sum, e) => sum + e.size, 0);
|
|
138
138
|
if (totalBytes > limits.maxUncompressedBytes) {
|
|
139
|
-
throw new ZipBuildError('UNCOMPRESSED_TOO_LARGE',
|
|
139
|
+
throw new ZipBuildError('UNCOMPRESSED_TOO_LARGE', `uncompressed total of ${totalBytes} bytes exceeds the 200MiB limit`);
|
|
140
140
|
}
|
|
141
141
|
const zip = new yazl.ZipFile();
|
|
142
142
|
for (const entry of entries) {
|
|
@@ -158,7 +158,7 @@ async function buildSiteZip(dir, limitsOverride) {
|
|
|
158
158
|
if (accumulated > limits.maxArchiveBytes) {
|
|
159
159
|
aborted = true;
|
|
160
160
|
stream.destroy?.();
|
|
161
|
-
reject(new ZipBuildError('ARCHIVE_TOO_LARGE',
|
|
161
|
+
reject(new ZipBuildError('ARCHIVE_TOO_LARGE', `archive exceeds the 50MiB limit — aborted at ${accumulated} bytes`));
|
|
162
162
|
return;
|
|
163
163
|
}
|
|
164
164
|
chunks.push(chunk);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteZip.js","sourceRoot":"","sources":["../../src/publish/siteZip.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0IA,oCA2DC;AArMD,iFAAiF;AACjF,+EAA+E;AAC/E,8EAA8E;AAC9E,uDAAuD;AACvD,EAAE;AACF,SAAS;AACT,iEAAiE;AACjE,yEAAyE;AACzE,wEAAwE;AACxE,oBAAoB;AACpB,2EAA2E;AAC3E,6EAA6E;AAC7E,4CAA8B;AAC9B,gDAAkC;AAClC,2CAA6B;AAC7B,6CAAoD;AAEpD,MAAM,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;AAUX,QAAA,kBAAkB,GAAc;IAC3C,YAAY,EAAE,EAAE,GAAG,GAAG;IACtB,YAAY,EAAE,IAAI;IAClB,eAAe,EAAE,EAAE,GAAG,GAAG;IACzB,oBAAoB,EAAE,GAAG,GAAG,GAAG;CAChC,CAAC;AAYF,MAAa,aAAc,SAAQ,KAAK;IAE3B;IADX,YACW,IAAkB,EAC3B,OAAe;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;QAHN,SAAI,GAAJ,IAAI,CAAc;QAI3B,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,CAAC;CACF;AARD,sCAQC;AAgBD,qFAAqF;AACrF,SAAS,iBAAiB,CAAC,OAAe;IACxC,OAAO,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,KAAK,aAAa,CAAC;AAC9D,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,MAAiB;IACrD,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IAEtC,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,SAAiB,EAAQ,EAAE;QACvD,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACpC,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAEtD,sDAAsD;YACtD,IAAI,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC5B,MAAM,IAAI,aAAa,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"siteZip.js","sourceRoot":"","sources":["../../src/publish/siteZip.ts"],"names":[],"mappings":"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"}
|
|
@@ -160,7 +160,7 @@ function upsertAccountAndSetCurrent(record) {
|
|
|
160
160
|
const accounts = { ...data.accounts, [record.accountKey]: record };
|
|
161
161
|
return { next: { version: FILE_VERSION, current: record.accountKey, accounts }, result: undefined };
|
|
162
162
|
});
|
|
163
|
-
log_1.log.info('account saved', { accountKey: record.accountKey, email: (0, log_1.maskEmail)(record.email) });
|
|
163
|
+
log_1.log.info('account saved', { accountKey: record.accountKey, email: record.email ? (0, log_1.maskEmail)(record.email) : undefined });
|
|
164
164
|
}
|
|
165
165
|
/** Marks an account as needing re-login (AC-9: the only path a 401 may take). If it was current, current becomes none — never auto-switches. */
|
|
166
166
|
function markAccountNeedsLogin(accountKey) {
|
|
@@ -200,7 +200,7 @@ function resolveSelector(accounts, selector) {
|
|
|
200
200
|
const byKey = accounts.find((a) => a.accountKey === selector);
|
|
201
201
|
if (byKey)
|
|
202
202
|
return { kind: 'found', account: byKey };
|
|
203
|
-
const byEmail = accounts.filter((a) => a.email.toLowerCase() === selector.toLowerCase());
|
|
203
|
+
const byEmail = accounts.filter((a) => a.email && a.email.toLowerCase() === selector.toLowerCase());
|
|
204
204
|
if (byEmail.length === 1)
|
|
205
205
|
return { kind: 'found', account: byEmail[0] };
|
|
206
206
|
if (byEmail.length > 1)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountStore.js","sourceRoot":"","sources":["../../src/store/accountStore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"accountStore.js","sourceRoot":"","sources":["../../src/store/accountStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,7 @@ const fs = __importStar(require("node:fs"));
|
|
|
51
51
|
const os = __importStar(require("node:os"));
|
|
52
52
|
const path = __importStar(require("node:path"));
|
|
53
53
|
const fsAtomic_1 = require("../../util/fsAtomic");
|
|
54
|
+
const credentialStore_1 = require("../credentialStore");
|
|
54
55
|
const SCRYPT_KEYLEN = 32;
|
|
55
56
|
// RFC 7914 "interactive" tier scrypt params — a passphrase is entered on
|
|
56
57
|
// every use, so this must stay fast enough not to be an annoyance while
|
|
@@ -151,7 +152,9 @@ function createEncryptedFileBackend(getPassphrase) {
|
|
|
151
152
|
decipher.setAuthTag(tag);
|
|
152
153
|
try {
|
|
153
154
|
const plaintext = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
|
|
154
|
-
|
|
155
|
+
// A legacy double-token payload decrypts fine but is not the new shape —
|
|
156
|
+
// downgrade to null (needs-login) rather than hand back a stale bundle (AC-8).
|
|
157
|
+
return (0, credentialStore_1.parseCredentialSecret)(plaintext.toString('utf8'));
|
|
155
158
|
}
|
|
156
159
|
catch {
|
|
157
160
|
// GCM tag verification failed before any plaintext was returned —
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encryptedFile.js","sourceRoot":"","sources":["../../../src/store/backends/encryptedFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgHA,
|
|
1
|
+
{"version":3,"file":"encryptedFile.js","sourceRoot":"","sources":["../../../src/store/backends/encryptedFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,19 +55,15 @@ exports.createOsKeyringBackend = createOsKeyringBackend;
|
|
|
55
55
|
// real-machine verification deferred to the BL-006 window.
|
|
56
56
|
const node_child_process_1 = require("node:child_process");
|
|
57
57
|
const os = __importStar(require("node:os"));
|
|
58
|
+
const credentialStore_1 = require("../credentialStore");
|
|
58
59
|
const SERVICE = 'supersdk-cli';
|
|
59
60
|
function serialize(secret) {
|
|
60
61
|
return JSON.stringify(secret);
|
|
61
62
|
}
|
|
63
|
+
// Returns null (never throws) for a malformed OR legacy double-token payload,
|
|
64
|
+
// so a stale keyring entry downgrades cleanly to needs-login (AC-8).
|
|
62
65
|
function deserialize(raw) {
|
|
63
|
-
|
|
64
|
-
if (typeof parsed.accessToken !== 'string' ||
|
|
65
|
-
typeof parsed.accessExpiresAt !== 'number' ||
|
|
66
|
-
typeof parsed.refreshToken !== 'string' ||
|
|
67
|
-
typeof parsed.refreshExpiresAt !== 'number') {
|
|
68
|
-
throw new Error('malformed credential payload read from OS keyring');
|
|
69
|
-
}
|
|
70
|
-
return parsed;
|
|
66
|
+
return (0, credentialStore_1.parseCredentialSecret)(raw);
|
|
71
67
|
}
|
|
72
68
|
// ---- macOS: /usr/bin/security ----
|
|
73
69
|
function darwinBackend() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"osKeyring.js","sourceRoot":"","sources":["../../../src/store/backends/osKeyring.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"osKeyring.js","sourceRoot":"","sources":["../../../src/store/backends/osKeyring.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NoCredentialBackendError = void 0;
|
|
4
|
+
exports.parseCredentialSecret = parseCredentialSecret;
|
|
4
5
|
exports.selectCredentialBackend = selectCredentialBackend;
|
|
5
6
|
exports.backendForAccount = backendForAccount;
|
|
6
7
|
// Credential (secret) storage abstraction (AC-8). Metadata lives in
|
|
@@ -18,6 +19,27 @@ exports.backendForAccount = backendForAccount;
|
|
|
18
19
|
const osKeyring_1 = require("./backends/osKeyring");
|
|
19
20
|
const encryptedFile_1 = require("./backends/encryptedFile");
|
|
20
21
|
const log_1 = require("../util/log");
|
|
22
|
+
/**
|
|
23
|
+
* Parses a stored credential payload into the single-token shape. Returns null
|
|
24
|
+
* (never throws) for anything that is not exactly `{ token: string }` — most
|
|
25
|
+
* importantly a legacy `{ accessToken, refreshToken, ... }` bundle, which must
|
|
26
|
+
* downgrade to needs-login instead of throwing a parse error (AC-8).
|
|
27
|
+
*/
|
|
28
|
+
function parseCredentialSecret(raw) {
|
|
29
|
+
let parsed;
|
|
30
|
+
try {
|
|
31
|
+
parsed = JSON.parse(raw);
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
36
|
+
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
|
|
37
|
+
return null;
|
|
38
|
+
const token = parsed.token;
|
|
39
|
+
if (typeof token !== 'string' || token.length === 0)
|
|
40
|
+
return null;
|
|
41
|
+
return { token };
|
|
42
|
+
}
|
|
21
43
|
class NoCredentialBackendError extends Error {
|
|
22
44
|
constructor() {
|
|
23
45
|
super('no OS credential service is available on this system (e.g. headless Linux without secret-tool), ' +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentialStore.js","sourceRoot":"","sources":["../../src/store/credentialStore.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"credentialStore.js","sourceRoot":"","sources":["../../src/store/credentialStore.ts"],"names":[],"mappings":";;;AA+BA,sDAWC;AAqCD,0DAaC;AASD,8CAeC;AApHD,oEAAoE;AACpE,0EAA0E;AAC1E,+BAA+B;AAC/B,2EAA2E;AAC3E,0FAA0F;AAC1F,4EAA4E;AAC5E,4EAA4E;AAC5E,EAAE;AACF,0EAA0E;AAC1E,0EAA0E;AAC1E,4EAA4E;AAC5E,sDAAsD;AACtD,oDAA8D;AAC9D,4DAA+F;AAC/F,qCAAkC;AAWlC;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAChF,MAAM,KAAK,GAAI,MAA8B,CAAC,KAAK,CAAC;IACpD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACjE,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC;AAYD,MAAa,wBAAyB,SAAQ,KAAK;IACjD;QACE,KAAK,CACH,kGAAkG;YAChG,kGAAkG;YAClG,8FAA8F,CACjG,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IACzC,CAAC;CACF;AATD,4DASC;AAWD;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,OAA6B,EAAE;IACrE,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAA,kCAAsB,GAAE,CAAC;IACpE,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,IAAI,CAAC,oBAAoB,IAAI,IAAA,0CAA0B,EAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC1F,CAAC;IACD,SAAG,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC;IACnF,MAAM,IAAI,wBAAwB,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAC/B,kBAAyC,EACzC,OAII,EAAE;IAEN,IAAI,kBAAkB,KAAK,YAAY,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC,gBAAgB,IAAI,IAAA,kCAAsB,GAAE,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,IAAI,CAAC,oBAAoB,IAAI,IAAA,0CAA0B,EAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAC1F,CAAC"}
|
|
@@ -156,7 +156,7 @@ function resolveVersionForChannel(channel, npmView = defaultNpmView) {
|
|
|
156
156
|
channel,
|
|
157
157
|
distTag,
|
|
158
158
|
kind: 'unpublished',
|
|
159
|
-
message:
|
|
159
|
+
message: `channel ${channel} (dist-tag ${distTag}) has no published version yet — retry later or contact the maintainers`,
|
|
160
160
|
};
|
|
161
161
|
}
|
|
162
162
|
if (!outcome.ok) {
|
|
@@ -165,7 +165,7 @@ function resolveVersionForChannel(channel, npmView = defaultNpmView) {
|
|
|
165
165
|
channel,
|
|
166
166
|
distTag,
|
|
167
167
|
kind: 'npm_error',
|
|
168
|
-
message:
|
|
168
|
+
message: `cannot query the ${channel} channel version from the registry (npm view failed)`,
|
|
169
169
|
};
|
|
170
170
|
}
|
|
171
171
|
const version = outcome.stdout.trim();
|
|
@@ -175,7 +175,7 @@ function resolveVersionForChannel(channel, npmView = defaultNpmView) {
|
|
|
175
175
|
channel,
|
|
176
176
|
distTag,
|
|
177
177
|
kind: 'invalid_version',
|
|
178
|
-
message: `registry
|
|
178
|
+
message: `the registry returned a version that is not valid semver: "${version}" — aborted; nothing was installed`,
|
|
179
179
|
};
|
|
180
180
|
}
|
|
181
181
|
return { ok: true, channel, distTag, version };
|