@heroku/plugin-compute 0.4.3 → 0.4.6

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.
@@ -15,8 +15,10 @@
15
15
  */
16
16
  import { Messages } from '@salesforce/core';
17
17
  import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
18
+ import { mkdir, rm, writeFile } from 'node:fs/promises';
19
+ import { dirname, join } from 'node:path';
18
20
  import { pathExists, resolveAppDir, validateName } from '../../../shared/computeApp.js';
19
- import { unpackComputeBundle } from '../../../shared/computeBundle.js';
21
+ import { decodeComputeBundle, writeBundleFiles } from '../../../shared/computeBundle.js';
20
22
  import { downloadComputeSource } from '../../../shared/computeConnectApi.js';
21
23
  import { retrieveComputeMetadata } from '../../../shared/metadataRetrieve.js';
22
24
  import { PLUGIN_NAME } from '../../../shared/plugin-name.js';
@@ -53,18 +55,43 @@ export default class Retrieve extends SfCommand {
53
55
  const connection = flags['target-org'].getConnection(flags['api-version']);
54
56
  const username = connection.getUsername() ?? flags['target-org'].getUsername() ?? '<org>';
55
57
  this.log(messages.getMessage('info.retrieving', [name, username]));
56
- // No rollback on failure below -- if the source download fails, appDir is left in place,
57
- // partially populated, same as generate.ts/deploy.ts's own "no automatic rollback" style
58
- // elsewhere in this plugin. A retry after a failure here will need the directory removed
59
- // first, since it now exists and would otherwise hit error.appAlreadyExists.
60
- await retrieveComputeMetadata(connection, appDir, name);
61
- this.log(messages.getMessage('info.retrievedMetadata', [`${name}.computeApp-meta.xml`]));
58
+ // Finish every network call before touching disk (as generate.ts does), so a failed retrieve
59
+ // or download leaves nothing behind for a retry to trip over.
60
+ const metadata = await retrieveComputeMetadata(connection, name);
61
+ this.log(messages.getMessage('info.retrievedMetadata', [metadata.fileName]));
62
62
  this.log(messages.getMessage('info.downloadingSource'));
63
63
  const bundle = await downloadComputeSource(connection, { appIdOrName: name });
64
- const { fileCount } = await unpackComputeBundle(bundle, appDir);
65
- this.log(messages.getMessage('info.extractedSource', [fileCount]));
64
+ // Check the archive and every entry path now, so a bad bundle fails before anything touches
65
+ // disk and the cleanup below only has to cover real I/O failures (ENOSPC, EACCES, ...).
66
+ const files = await decodeComputeBundle(bundle, appDir);
67
+ // The existence check above ran before two slow network calls, so claim appDir itself with a
68
+ // non-recursive mkdir: it throws EEXIST if the folder appeared in the meantime. That makes
69
+ // the cleanup below safe -- it only ever removes a folder this run created.
70
+ await mkdir(dirname(appDir), { recursive: true });
71
+ try {
72
+ await mkdir(appDir);
73
+ }
74
+ catch (error) {
75
+ if (error.code === 'EEXIST') {
76
+ throw messages.createError('error.appAlreadyExists', [name, appDir]);
77
+ }
78
+ throw error;
79
+ }
80
+ try {
81
+ await writeFile(join(appDir, metadata.fileName), metadata.contents);
82
+ await writeBundleFiles(files);
83
+ }
84
+ catch (error) {
85
+ // Remove the half-written folder so a retry isn't blocked by error.appAlreadyExists. A
86
+ // failed cleanup must not replace the error that caused it, so warn and rethrow the original.
87
+ await rm(appDir, { force: true, recursive: true }).catch((rmError) => {
88
+ this.warn(messages.getMessage('warning.cleanupFailed', [appDir, String(rmError)]));
89
+ });
90
+ throw error;
91
+ }
92
+ this.log(messages.getMessage('info.extractedSource', [files.length]));
66
93
  this.logSuccess(messages.getMessage('info.done', [name, appDir]));
67
- return { name, path: appDir, files: fileCount };
94
+ return { name, path: appDir, files: files.length };
68
95
  }
69
96
  }
70
97
  //# sourceMappingURL=retrieve.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"retrieve.js","sourceRoot":"","sources":["../../../../src/commands/compute/source/retrieve.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"retrieve.js","sourceRoot":"","sources":["../../../../src/commands/compute/source/retrieve.ts"],"names":[],"mappings":"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"}
@@ -6,4 +6,10 @@ export declare function packageComputeBundle(appDir: string, name: string, proje
6
6
  export type UnpackedBundle = {
7
7
  fileCount: number;
8
8
  };
9
+ export type BundleFile = {
10
+ data: Buffer;
11
+ filePath: string;
12
+ };
13
+ export declare function decodeComputeBundle(buffer: Buffer, appDir: string): Promise<BundleFile[]>;
14
+ export declare function writeBundleFiles(files: readonly BundleFile[]): Promise<void>;
9
15
  export declare function unpackComputeBundle(buffer: Buffer, appDir: string): Promise<UnpackedBundle>;
@@ -60,12 +60,13 @@ export async function packageComputeBundle(appDir, name, projectRoot) {
60
60
  debug('packaged %s into %d bytes (%d files)', appDir, buffer.length, sourceEntries.length);
61
61
  return { buffer, fileCount: sourceEntries.length };
62
62
  }
63
- // Writes every file in the downloaded source.tar.gz into appDir. The download endpoint returns
64
- // that inner tarball directly (api-spec.yaml included), unlike the nested bundle packageComputeBundle
65
- // uploads -- the asymmetry is deliberate: the appserver inspects the upload's top-level files
66
- // without untarring the source. Used by sf compute source retrieve, the only caller that needs
67
- // to go this direction.
68
- export async function unpackComputeBundle(buffer, appDir) {
63
+ // Reads and checks the downloaded source.tar.gz without touching disk, so every archive or path
64
+ // problem (bad gzip/tar, empty or nested bundle, unsafe or duplicate entry paths) surfaces before
65
+ // the caller creates anything. The download endpoint returns that inner tarball directly
66
+ // (api-spec.yaml included), unlike the nested bundle packageComputeBundle uploads -- the
67
+ // asymmetry is deliberate: the appserver inspects the upload's top-level files without untarring
68
+ // the source. Used by sf compute source retrieve, the only caller that needs to go this direction.
69
+ export async function decodeComputeBundle(buffer, appDir) {
69
70
  const sourceEntries = await untarGzip(buffer);
70
71
  // Release ordering alone doesn't protect against an org still returning the old nested bundle
71
72
  // (api-spec.yaml + source.tar.gz), which would otherwise "succeed" with an unextracted blob.
@@ -78,23 +79,49 @@ export async function unpackComputeBundle(buffer, appDir) {
78
79
  ]);
79
80
  }
80
81
  const resolvedAppDir = resolve(appDir);
81
- await Promise.all(Object.entries(sourceEntries).map(async ([relativePath, data]) => {
82
+ // Keyed by resolved path so entries that name the same file ("a" and "./a") collapse to one
83
+ // write (the later entry wins, as in tar) instead of racing each other.
84
+ const filesByPath = new Map();
85
+ for (const [relativePath, data] of Object.entries(sourceEntries)) {
82
86
  const filePath = resolve(appDir, relativePath);
83
- // Guards against a tar-slip: a malicious (or corrupted) entry name like "../../etc/foo"
84
- // must not be allowed to write outside appDir. The bundle comes from the org's most
85
- // recently deployed source, which this plugin doesn't otherwise validate the shape of.
86
- if (filePath !== resolvedAppDir && !filePath.startsWith(resolvedAppDir + sep)) {
87
+ // A tar-slip guard: a malicious (or corrupted) entry name like "../../etc/foo" must not be
88
+ // allowed to write outside appDir, and a file entry can't be appDir itself. The bundle comes
89
+ // from the org's most recently deployed source, which this plugin doesn't otherwise validate
90
+ // the shape of.
91
+ if (!filePath.startsWith(resolvedAppDir + sep)) {
87
92
  throw messages.createError('error.sourceBundleMalformed', [`unsafe entry path "${relativePath}"`]);
88
93
  }
94
+ filesByPath.set(filePath, data);
95
+ }
96
+ return [...filesByPath].map(([filePath, data]) => ({ data, filePath }));
97
+ }
98
+ // Writes decoded files to disk. Waits for every write to settle before failing, so a caller that
99
+ // cleans up after an error never races writes that are still in flight (which could recreate
100
+ // directories it just removed, or make its rm fail with ENOTEMPTY).
101
+ export async function writeBundleFiles(files) {
102
+ const results = await Promise.allSettled(files.map(async ({ data, filePath }) => {
89
103
  await mkdir(dirname(filePath), { recursive: true });
90
104
  await writeFile(filePath, data);
91
105
  }));
92
- return { fileCount: Object.keys(sourceEntries).length };
106
+ const failed = results.find((result) => result.status === 'rejected');
107
+ if (failed) {
108
+ throw failed.reason;
109
+ }
93
110
  }
94
- // Inverse of tarGzip below -- decompress and read every tar entry into memory, keyed by name.
95
- // Wraps decompression/parse failures as error.sourceBundleMalformed rather than letting a raw
96
- // zlib/tar-stream error (e.g. "incorrect header check") reach the user -- a truncated download
97
- // or an HTTP error page returned with a 200 status both land here.
111
+ // Decode + write in one call. Kept as a convenience for tests; the retrieve command calls
112
+ // decodeComputeBundle and writeBundleFiles separately so it can create the app directory
113
+ // between the two.
114
+ export async function unpackComputeBundle(buffer, appDir) {
115
+ const files = await decodeComputeBundle(buffer, appDir);
116
+ await writeBundleFiles(files);
117
+ return { fileCount: files.length };
118
+ }
119
+ // Inverse of tarGzip below -- decompress and read every file entry into memory, keyed by name.
120
+ // Directory entries are skipped (writing a file mkdirs its parents), and anything that isn't a
121
+ // plain file or directory (symlinks, hardlinks, devices) is rejected rather than silently
122
+ // written as an empty file. Wraps decompression/parse failures as error.sourceBundleMalformed
123
+ // rather than letting a raw zlib/tar-stream error (e.g. "incorrect header check") reach the
124
+ // user -- a truncated download or an HTTP error page returned with a 200 status both land here.
98
125
  async function untarGzip(buffer) {
99
126
  return new Promise((resolveEntries, reject) => {
100
127
  let decompressed;
@@ -108,12 +135,23 @@ async function untarGzip(buffer) {
108
135
  const entries = {};
109
136
  const extract = tarStream.extract();
110
137
  extract.on('entry', (header, stream, next) => {
138
+ const isFile = header.type === 'file' || header.type === 'contiguous-file';
139
+ if (!isFile && header.type !== 'directory') {
140
+ // Stop reading the rest of the archive; the answer is already decided.
141
+ extract.destroy();
142
+ reject(messages.createError('error.sourceBundleMalformed', [
143
+ `unsupported entry type "${header.type}" for "${header.name}"`,
144
+ ]));
145
+ return;
146
+ }
111
147
  const chunks = [];
112
148
  stream.on('data', (chunk) => {
113
149
  chunks.push(chunk);
114
150
  });
115
151
  stream.on('end', () => {
116
- entries[header.name] = Buffer.concat(chunks);
152
+ if (isFile) {
153
+ entries[header.name] = Buffer.concat(chunks);
154
+ }
117
155
  next();
118
156
  });
119
157
  stream.on('error', reject);
@@ -1 +1 @@
1
- {"version":3,"file":"computeBundle.js","sourceRoot":"","sources":["../../src/shared/computeBundle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"computeBundle.js","sourceRoot":"","sources":["../../src/shared/computeBundle.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,6 @@
1
1
  import { type Connection } from '@salesforce/core';
2
- export declare function retrieveComputeMetadata(connection: Connection, appDir: string, name: string): Promise<void>;
2
+ export type RetrievedMetadata = {
3
+ contents: Buffer;
4
+ fileName: string;
5
+ };
6
+ export declare function retrieveComputeMetadata(connection: Connection, name: string): Promise<RetrievedMetadata>;
@@ -16,23 +16,13 @@
16
16
  import { getLogger } from '@oclif/core';
17
17
  import { Messages } from '@salesforce/core';
18
18
  import JSZip from 'jszip';
19
- import { mkdir, writeFile } from 'node:fs/promises';
20
- import { join } from 'node:path';
21
19
  import { resolveComputeApiVersion } from './metadataApiVersion.js';
22
20
  import { PLUGIN_NAME } from './plugin-name.js';
23
21
  Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
24
22
  const messages = Messages.loadMessages(PLUGIN_NAME, 'compute.errors');
25
23
  // Gated by DEBUG=sf:compute:metadataRetrieve (or DEBUG=*).
26
24
  const { debug } = getLogger('sf:compute:metadataRetrieve');
27
- // Inverse of deployComputeMetadata in metadataDeploy.ts, but NOT built on SDR's
28
- // ComponentSet/MetadataApiRetrieve the way that function is built on MetadataApiDeploy --
29
- // ComputeApp has no entry in SDR's metadata registry, and ComponentSet.getObject()
30
- // (called internally when building a retrieve request) requires resolving every member's type
31
- // against that registry, so it throws for this type today. This uses jsforce's lower-level
32
- // retrieve API directly instead. Note the asymmetry with deployComputeMetadata's
33
- // deployResult.complete(true): RetrieveResultLocator#complete() takes no argument (unlike
34
- // DeployResultLocator#complete(includeDetails?)), per @jsforce/jsforce-node's metadata.d.ts.
35
- export async function retrieveComputeMetadata(connection, appDir, name) {
25
+ export async function retrieveComputeMetadata(connection, name) {
36
26
  const version = resolveComputeApiVersion(connection);
37
27
  const retrieveResult = connection.metadata.retrieve({
38
28
  apiVersion: Number(version),
@@ -66,7 +56,6 @@ export async function retrieveComputeMetadata(connection, appDir, name) {
66
56
  `the retrieved metadata is missing computeApps/${wireFileName}${problemDetail}`,
67
57
  ]);
68
58
  }
69
- await mkdir(appDir, { recursive: true });
70
- await writeFile(join(appDir, metaFileName), await metaEntry.async('nodebuffer'));
59
+ return { contents: await metaEntry.async('nodebuffer'), fileName: metaFileName };
71
60
  }
72
61
  //# sourceMappingURL=metadataRetrieve.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"metadataRetrieve.js","sourceRoot":"","sources":["../../src/shared/metadataRetrieve.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"metadataRetrieve.js","sourceRoot":"","sources":["../../src/shared/metadataRetrieve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAkB,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,wBAAwB,EAAC,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;AAEtE,2DAA2D;AAC3D,MAAM,EAAC,KAAK,EAAC,GAAG,SAAS,CAAC,6BAA6B,CAAC,CAAC;AAiBzD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,UAAsB,EAAE,IAAY;IAChF,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAClD,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC;QAC3B,aAAa,EAAE,IAAI;QACnB,UAAU,EAAE;YACV,KAAK,EAAE,CAAC,EAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAC,CAAC;YAC9C,OAAO;YACP,oFAAoF;YACpF,kFAAkF;YAClF,iBAAiB,EAAE,EAAE;SACtB;KACF,CAAC,CAAC;IACH,KAAK,CAAC,0CAA0C,EAAE,IAAI,EAAE,UAAU,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,CAAC;IAC7F,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,CAAC;IAC/C,KAAK,CAAC,+CAA+C,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAE7E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,QAAQ,CAAC,WAAW,CAAC,8BAA8B,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,IAAI,gBAAgB,CAAC,CAAC,CAAC;IAC9G,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;IAClE,8FAA8F;IAC9F,2FAA2F;IAC3F,MAAM,YAAY,GAAG,GAAG,IAAI,aAAa,CAAC;IAC1C,MAAM,YAAY,GAAG,GAAG,IAAI,sBAAsB,CAAC;IACnD,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,eAAe,YAAY,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,0FAA0F;QAC1F,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACpE,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,MAAM,QAAQ,CAAC,WAAW,CAAC,8BAA8B,EAAE;YACzD,IAAI;YACJ,iDAAiD,YAAY,GAAG,aAAa,EAAE;SAChF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAC,QAAQ,EAAE,MAAM,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAC,CAAC;AACjF,CAAC"}
@@ -57,3 +57,7 @@ extracted %s files
57
57
  # info.done
58
58
 
59
59
  Retrieved compute app %s into %s.
60
+
61
+ # warning.cleanupFailed
62
+
63
+ Retrieving the compute app failed, and the partially written directory %s could not be removed (%s). Delete it before running this command again, or it will stop with "already exists".