@git.zone/tspack 1.1.0 → 1.3.0

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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/tspack',
6
- version: '1.1.0',
6
+ version: '1.3.0',
7
7
  description: 'Verified executable and asset bundles for GitZone projects.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDZEQUE2RDtDQUMzRSxDQUFBIn0=
@@ -1,3 +1,6 @@
1
1
  import type { ITsPackArtifact, ITsPackFileRecord } from './interfaces.js';
2
2
  export declare function packArchive(directory: string, output: string, files: Record<string, ITsPackFileRecord>): Promise<void>;
3
- export declare function verifyArchive(file: string, artifact: ITsPackArtifact, expectedMetadata: unknown): Promise<void>;
3
+ export declare function verifyArchive(file: string, artifact: ITsPackArtifact, expectedMetadata: unknown, options?: {
4
+ destination?: string;
5
+ signal?: AbortSignal;
6
+ }): Promise<void>;
@@ -19,11 +19,15 @@ export async function packArchive(directory, output, files) {
19
19
  throw error;
20
20
  }
21
21
  }
22
- export async function verifyArchive(file, artifact, expectedMetadata) {
22
+ export async function verifyArchive(file, artifact, expectedMetadata, options = {}) {
23
+ options.signal?.throwIfAborted();
24
+ const input = await plugins.fs.open(file, plugins.nodeFs.constants.O_RDONLY | plugins.nodeFs.constants.O_NOFOLLOW);
23
25
  const extract = new plugins.smartarchive.TarTools().getExtractStream();
24
26
  const seen = new Set();
27
+ let active = Promise.resolve();
25
28
  extract.on('entry', (header, entry, next) => {
26
- void (async () => {
29
+ active = (async () => {
30
+ options.signal?.throwIfAborted();
27
31
  const expected = Object.hasOwn(artifact.files, header.name) ? artifact.files[header.name] : undefined;
28
32
  requireValue(header.type === 'file' && expected && !seen.has(header.name) && header.size === expected.size &&
29
33
  header.mode === expected.mode, 'archive', 'Unexpected, duplicate or changed archive member.');
@@ -31,30 +35,95 @@ export async function verifyArchive(file, artifact, expectedMetadata) {
31
35
  const hash = plugins.crypto.createHash('sha256');
32
36
  const chunks = [];
33
37
  let bytes = 0;
34
- for await (const chunk of entry) {
35
- requireValue(Buffer.isBuffer(chunk), 'archive', 'Expected binary archive content.');
36
- bytes += chunk.length;
37
- requireValue(bytes <= expected.size, 'archive', 'Archive member exceeds its declared size.');
38
- hash.update(chunk);
38
+ let output;
39
+ try {
40
+ if (options.destination) {
41
+ const destination = plugins.path.join(options.destination, header.name);
42
+ await plugins.fs.mkdir(plugins.path.dirname(destination), { recursive: true, mode: 0o700 });
43
+ output = await plugins.fs.open(destination, 'wx', 0o600);
44
+ }
45
+ for await (const chunk of entry) {
46
+ options.signal?.throwIfAborted();
47
+ requireValue(Buffer.isBuffer(chunk), 'archive', 'Expected binary archive content.');
48
+ const position = bytes;
49
+ bytes += chunk.length;
50
+ requireValue(bytes <= expected.size, 'archive', 'Archive member exceeds its declared size.');
51
+ hash.update(chunk);
52
+ if (header.name === 'tspack.json') {
53
+ requireValue(bytes <= limits.json, 'archive', 'Bundle metadata exceeds its limit.');
54
+ chunks.push(chunk);
55
+ }
56
+ if (output) {
57
+ let offset = 0;
58
+ while (offset < chunk.length) {
59
+ options.signal?.throwIfAborted();
60
+ const { bytesWritten } = await output.write(chunk, offset, chunk.length - offset, position + offset);
61
+ requireValue(bytesWritten > 0, 'archive', 'Archive member write made no progress.');
62
+ offset += bytesWritten;
63
+ }
64
+ }
65
+ }
66
+ requireValue(bytes === expected.size && hash.digest('hex') === expected.sha256, 'integrity', 'Archive member integrity mismatch.');
39
67
  if (header.name === 'tspack.json') {
40
- requireValue(bytes <= limits.json, 'archive', 'Bundle metadata exceeds its limit.');
41
- chunks.push(chunk);
68
+ requireValue(sha256(Buffer.concat(chunks)) === sha256(jsonBytes(expectedMetadata)), 'integrity', 'Bundle and artifact-set metadata disagree.');
42
69
  }
70
+ if (output)
71
+ await output.chmod(expected.mode);
43
72
  }
44
- requireValue(bytes === expected.size && hash.digest('hex') === expected.sha256, 'integrity', 'Archive member integrity mismatch.');
45
- if (header.name === 'tspack.json') {
46
- requireValue(sha256(Buffer.concat(chunks)) === sha256(jsonBytes(expectedMetadata)), 'integrity', 'Bundle and artifact-set metadata disagree.');
73
+ finally {
74
+ await output?.close();
47
75
  }
48
- })().then(() => next(), (error) => extract.destroy(error instanceof Error ? error : new Error('Archive verification failed.')));
76
+ })();
77
+ void active.then(() => next(), (error) => extract.destroy(error instanceof Error ? error : new Error('Archive verification failed.')));
49
78
  });
50
79
  try {
51
- await plugins.streamPromises.pipeline(plugins.nodeFs.createReadStream(file), plugins.zlib.createGunzip(), extract);
80
+ const before = await input.stat({ bigint: true });
81
+ requireValue(before.isFile() && before.size === BigInt(artifact.size), 'integrity', 'Archive size mismatch.');
82
+ // Authenticate compressed bytes before parsing or writing members. Reuse this
83
+ // descriptor and hash the parsing pass too, so a path swap cannot substitute input.
84
+ const initialHash = plugins.crypto.createHash('sha256');
85
+ let initialBytes = 0;
86
+ await plugins.streamPromises.pipeline(input.createReadStream({ start: 0, autoClose: false }), new plugins.stream.Writable({ write(chunk, _encoding, callback) {
87
+ initialBytes += chunk.length;
88
+ if (initialBytes > artifact.size) {
89
+ callback(new TsPackError('integrity', 'Archive exceeds its declared size.'));
90
+ return;
91
+ }
92
+ initialHash.update(chunk);
93
+ callback();
94
+ } }), { signal: options.signal });
95
+ requireValue(initialBytes === artifact.size && initialHash.digest('hex') === artifact.sha256, 'integrity', 'Archive integrity mismatch.');
96
+ const hash = plugins.crypto.createHash('sha256');
97
+ let bytes = 0;
98
+ const meter = new plugins.stream.Transform({ transform(chunk, _encoding, callback) {
99
+ bytes += chunk.length;
100
+ if (bytes > artifact.size) {
101
+ callback(new TsPackError('integrity', 'Archive exceeds its declared size.'));
102
+ return;
103
+ }
104
+ hash.update(chunk);
105
+ callback(null, chunk);
106
+ } });
107
+ await plugins.streamPromises.pipeline(input.createReadStream({ start: 0, autoClose: false }), meter, plugins.zlib.createGunzip(), extract, { signal: options.signal });
108
+ await active;
109
+ const after = await input.stat({ bigint: true });
110
+ const named = await plugins.fs.lstat(file, { bigint: true });
111
+ requireValue(bytes === artifact.size && hash.digest('hex') === artifact.sha256 &&
112
+ ['dev', 'ino', 'size', 'mtimeNs', 'ctimeNs'].every((key) => before[key] === after[key] &&
113
+ before[key] === named[key]), 'integrity', 'Archive bytes or identity changed while reading.');
114
+ requireValue(seen.size === Object.keys(artifact.files).length, 'archive', 'Archive members are missing.');
52
115
  }
53
116
  catch (error) {
117
+ options.signal?.throwIfAborted();
54
118
  if (error instanceof TsPackError)
55
119
  throw error;
56
120
  throw new TsPackError('archive', 'Invalid or incomplete archive.');
57
121
  }
58
- requireValue(seen.size === Object.keys(artifact.files).length, 'archive', 'Archive members are missing.');
122
+ finally {
123
+ extract.destroy();
124
+ // A destroyed parser can still have an awaited member write in flight.
125
+ await active.catch(() => undefined);
126
+ await input.close();
127
+ }
59
128
  }
60
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2FyY2hpdmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFFeEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV2RixNQUFNLENBQUMsS0FBSyxVQUFVLFdBQVcsQ0FBQyxTQUFpQixFQUFFLE1BQWMsRUFBRSxLQUF3QztJQUMzRyxNQUFNLEdBQUcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDaEUsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQ3hGLE9BQU8sQ0FBQyxNQUFNLENBQUMsaUJBQWlCLENBQUMsTUFBTSxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzFFLEtBQUssT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNwQyxJQUFJLENBQUM7UUFDSCxLQUFLLE1BQU0sSUFBSSxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQztZQUM3QyxNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFFLENBQUM7WUFDMUIsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLElB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
129
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archive.js","sourceRoot":"","sources":["../ts/archive.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,21 @@
1
- import type { ITsPackConfig, ITsPackOptions, ITsPackResult, ITsPackVerifyOptions } from './interfaces.js';
1
+ import type { ITsPackConfig, ITsPackOptions, ITsPackResult, ITsPackVerifyOptions, ITsPackBundleOptions, ITsPackBundleResult, ITsPackExtractResult } from './interfaces.js';
2
2
  export { TsPackError } from './validation.js';
3
3
  /** Packages explicit code/assets. Compilation, publishing and runtime installation have separate owners. */
4
4
  export declare class TsPack {
5
5
  private readonly cwd;
6
6
  constructor(cwd?: string);
7
+ private copyInput;
7
8
  private source;
8
9
  pack(configArg?: ITsPackConfig, optionsArg?: ITsPackOptions): Promise<ITsPackResult>;
9
10
  private checksums;
11
+ private readArtifactSet;
10
12
  verify(directoryArg: string, optionsArg?: ITsPackVerifyOptions): Promise<ITsPackResult>;
13
+ private verifyRecord;
14
+ private readBundle;
15
+ /** Verify a selected-only download: complete metadata plus exactly one archive. */
16
+ verifyBundle(directoryArg: string, bundleIdArg: string, optionsArg: ITsPackBundleOptions): Promise<ITsPackBundleResult>;
17
+ /** Verify one selected archive or standalone file against the complete trusted release identity. */
18
+ verifyArtifact(directoryArg: string, artifactIdArg: string, optionsArg: ITsPackBundleOptions): Promise<ITsPackBundleResult>;
19
+ /** Extract code/assets into a fresh private directory. The caller owns installation and activation. */
20
+ extractBundle(directoryArg: string, bundleIdArg: string, parentArg: string, optionsArg: ITsPackBundleOptions): Promise<ITsPackExtractResult>;
11
21
  }
@@ -1,6 +1,6 @@
1
1
  import * as plugins from './plugins.js';
2
2
  import { packArchive, verifyArchive } from './archive.js';
3
- import { digestFile, isCommit, isDigest, isPath, isVersion, jsonBytes, limits, noSymlinks, normalizeConfig, object, readJson, requireValue, sha256, validateManifest } from './validation.js';
3
+ import { digestFile, isCommit, isDigest, isName, isPath, isVersion, jsonBytes, limits, noSymlinks, normalizeConfig, object, readJson, requireValue, sha256, validateManifest } from './validation.js';
4
4
  export { TsPackError } from './validation.js';
5
5
  const exec = plugins.util.promisify(plugins.childProcess.execFile);
6
6
  const bundleMetadata = (manifest, id, files) => ({
@@ -14,6 +14,38 @@ export class TsPack {
14
14
  constructor(cwd = process.cwd()) {
15
15
  this.cwd = cwd;
16
16
  }
17
+ async copyInput(root, source, destination, remaining, options) {
18
+ const input = await noSymlinks(root, source);
19
+ const handle = await plugins.fs.open(input, plugins.nodeFs.constants.O_RDONLY | plugins.nodeFs.constants.O_NOFOLLOW);
20
+ try {
21
+ const before = await handle.stat({ bigint: true });
22
+ requireValue(before.isFile() && before.size <= BigInt(limits.file), 'unsafe_input', 'Expected a bounded regular input file.');
23
+ requireValue(before.size <= BigInt(remaining), 'unsafe_input', 'Package inputs exceed the total byte limit.');
24
+ await plugins.fs.mkdir(plugins.path.dirname(destination), { recursive: true });
25
+ const hash = plugins.crypto.createHash('sha256');
26
+ let size = 0;
27
+ const meter = new plugins.stream.Transform({ transform(chunk, _encoding, callback) {
28
+ size += chunk.length;
29
+ if (size > Number(before.size)) {
30
+ callback(new Error('Input changed while copying.'));
31
+ return;
32
+ }
33
+ hash.update(chunk);
34
+ callback(null, chunk);
35
+ } });
36
+ await plugins.streamPromises.pipeline(handle.createReadStream({ autoClose: false }), meter, plugins.nodeFs.createWriteStream(destination, { flags: 'wx', mode: 0o600 }));
37
+ const after = await handle.stat({ bigint: true });
38
+ const current = await plugins.fs.lstat(input, { bigint: true });
39
+ requireValue(size === Number(before.size) && ['dev', 'ino', 'size', 'mtimeNs', 'ctimeNs'].every((key) => before[key] === after[key] &&
40
+ before[key] === current[key]), 'integrity', 'Input changed while copying.');
41
+ const record = { sha256: hash.digest('hex'), size, mode: options.executable ? 0o755 : 0o644 };
42
+ requireValue(!options.sha256 || options.sha256 === record.sha256, 'integrity', 'Input does not match its pinned digest.');
43
+ return record;
44
+ }
45
+ finally {
46
+ await handle.close();
47
+ }
48
+ }
17
49
  async source(root, version, release) {
18
50
  const run = async (...args) => (await exec('git', args, { cwd: root, maxBuffer: 4 * 1024 ** 2 })).stdout.trim();
19
51
  const commit = await run('rev-parse', 'HEAD');
@@ -35,6 +67,9 @@ export class TsPack {
35
67
  requireValue(typeof packageJson.name === 'string' && packageJson.name.length <= 214 && isVersion(packageJson.version), 'invalid_config', 'Package metadata requires a name and version.');
36
68
  const config = normalizeConfig(configArg ?? new plugins.smartconfig.Smartconfig(root).dataFor('@git.zone/tspack', {}), packageJson.name);
37
69
  requireValue(config.bundles.every((bundle) => isPath(`${config.name}-${packageJson.version}-${bundle.id}.tar.gz`)), 'invalid_config', 'Archive names exceed the portable path limit.');
70
+ const names = [...config.bundles.map((bundle) => `${config.name}-${packageJson.version}-${bundle.id}.tar.gz`),
71
+ ...(config.assets ?? []).map((asset) => asset.name)].map((name) => name.toLowerCase());
72
+ requireValue(new Set(names).size === names.length, 'invalid_config', 'Archive and standalone asset names collide.');
38
73
  const configurationSha256 = sha256(jsonBytes(config));
39
74
  const source = await this.source(root, packageJson.version, optionsArg.release === true);
40
75
  const outputRoot = await noSymlinks(root, config.outputDirectory, true);
@@ -65,7 +100,7 @@ export class TsPack {
65
100
  await plugins.fs.mkdir(plugins.path.join(stage, 'bundles'));
66
101
  try {
67
102
  const manifest = {
68
- format: 'tspack.release.v1', packageName: packageJson.name, name: config.name, version: packageJson.version,
103
+ format: config.assets?.length ? 'tspack.release.v2' : 'tspack.release.v1', packageName: packageJson.name, name: config.name, version: packageJson.version,
69
104
  sourceCommit: source.commit, sourceDirty: source.dirty, publishable: optionsArg.release === true,
70
105
  configurationSha256, artifacts: [],
71
106
  };
@@ -75,38 +110,9 @@ export class TsPack {
75
110
  await plugins.fs.mkdir(directory);
76
111
  const files = Object.create(null);
77
112
  for (const file of bundle.files) {
78
- const input = await noSymlinks(root, file.source);
79
- const handle = await plugins.fs.open(input, plugins.nodeFs.constants.O_RDONLY | plugins.nodeFs.constants.O_NOFOLLOW);
80
- try {
81
- const before = await handle.stat({ bigint: true });
82
- requireValue(before.isFile() && before.size <= BigInt(limits.file), 'unsafe_input', 'Expected a bounded regular input file.');
83
- total += Number(before.size);
84
- requireValue(total <= limits.total, 'unsafe_input', 'Package inputs exceed the total byte limit.');
85
- const destination = plugins.path.join(directory, file.path);
86
- await plugins.fs.mkdir(plugins.path.dirname(destination), { recursive: true });
87
- const hash = plugins.crypto.createHash('sha256');
88
- let size = 0;
89
- const meter = new plugins.stream.Transform({ transform(chunk, _encoding, callback) {
90
- size += chunk.length;
91
- if (size > Number(before.size)) {
92
- callback(new Error('Input changed while copying.'));
93
- return;
94
- }
95
- hash.update(chunk);
96
- callback(null, chunk);
97
- } });
98
- await plugins.streamPromises.pipeline(handle.createReadStream({ autoClose: false }), meter, plugins.nodeFs.createWriteStream(destination, { flags: 'wx', mode: 0o600 }));
99
- const after = await handle.stat({ bigint: true });
100
- const current = await plugins.fs.lstat(input, { bigint: true });
101
- requireValue(size === Number(before.size) && ['dev', 'ino', 'size', 'mtimeNs', 'ctimeNs'].every((key) => before[key] === after[key] &&
102
- before[key] === current[key]), 'integrity', 'Input changed while copying.');
103
- const record = { sha256: hash.digest('hex'), size, mode: (file.executable ? 0o755 : 0o644) };
104
- requireValue(!file.sha256 || file.sha256 === record.sha256, 'integrity', 'Input does not match its pinned digest.');
105
- files[file.path] = record;
106
- }
107
- finally {
108
- await handle.close();
109
- }
113
+ const record = await this.copyInput(root, file.source, plugins.path.join(directory, file.path), limits.total - total, file);
114
+ total += record.size;
115
+ files[file.path] = record;
110
116
  }
111
117
  const metadata = jsonBytes(bundleMetadata(manifest, bundle.id, files));
112
118
  requireValue(metadata.length <= limits.json, 'invalid_config', 'Bundle metadata exceeds its limit.');
@@ -116,6 +122,15 @@ export class TsPack {
116
122
  await packArchive(directory, plugins.path.join(assets, name), files);
117
123
  manifest.artifacts.push({ id: bundle.id, name, ...await digestFile(plugins.path.join(assets, name)), files });
118
124
  }
125
+ for (const asset of config.assets ?? []) {
126
+ const file = plugins.path.join(assets, asset.name);
127
+ const record = await this.copyInput(root, asset.source, file, limits.total - total, asset);
128
+ total += record.size;
129
+ await plugins.fs.chmod(file, record.mode);
130
+ manifest.artifacts.push({ kind: 'file', id: asset.id, name: asset.name, sha256: record.sha256,
131
+ size: record.size, files: { [asset.name]: record } });
132
+ }
133
+ manifest.artifacts.sort((a, b) => a.id.localeCompare(b.id, 'en'));
119
134
  const finalSource = await this.source(root, packageJson.version, optionsArg.release === true);
120
135
  requireValue(finalSource.commit === source.commit && finalSource.dirty === source.dirty, 'source_state', 'Source identity changed while packaging.');
121
136
  validateManifest(manifest);
@@ -148,7 +163,7 @@ export class TsPack {
148
163
  return [...manifest.artifacts.map((artifact) => [artifact.name, artifact.sha256]), ['tspack-manifest.json', manifestSha256]]
149
164
  .sort(([a], [b]) => a.localeCompare(b, 'en')).map(([name, hash]) => `${hash} ${name}`).join('\n') + '\n';
150
165
  }
151
- async verify(directoryArg, optionsArg = {}) {
166
+ async readArtifactSet(directoryArg, optionsArg, bundleId) {
152
167
  object(optionsArg, ['expectedManifestSha256', 'expectedSourceCommit', 'requireRelease']);
153
168
  requireValue((optionsArg.expectedManifestSha256 === undefined || isDigest(optionsArg.expectedManifestSha256)) &&
154
169
  (optionsArg.expectedSourceCommit === undefined || isCommit(optionsArg.expectedSourceCommit)) &&
@@ -162,20 +177,105 @@ export class TsPack {
162
177
  requireValue((!optionsArg.expectedManifestSha256 || optionsArg.expectedManifestSha256 === manifestSha256) &&
163
178
  (!optionsArg.expectedSourceCommit || optionsArg.expectedSourceCommit === manifest.sourceCommit) &&
164
179
  (!optionsArg.requireRelease || manifest.publishable), 'integrity', 'Artifact set does not match its required identity.');
180
+ const selected = bundleId === undefined ? manifest.artifacts : manifest.artifacts.filter((artifact) => artifact.id === bundleId);
181
+ requireValue(selected.length > 0, 'invalid_config', 'The requested bundle does not exist.');
165
182
  const names = (await plugins.fs.readdir(directory)).sort();
166
- requireValue(names.join('\n') === [...manifest.artifacts.map((artifact) => artifact.name), 'tspack-manifest.json', 'SHA256SUMS.txt'].sort().join('\n'), 'integrity', 'Artifact directory has an unexpected file set.');
183
+ requireValue(names.join('\n') === [...selected.map((artifact) => artifact.name), 'tspack-manifest.json', 'SHA256SUMS.txt'].sort().join('\n'), 'integrity', 'Artifact directory has an unexpected file set.');
167
184
  const checksumPath = plugins.path.join(directory, 'SHA256SUMS.txt');
168
185
  const checksumStat = await plugins.fs.lstat(checksumPath);
169
- requireValue(checksumStat.isFile() && checksumStat.size <= 32 * 1024 &&
186
+ requireValue(checksumStat.isFile() && checksumStat.size <= 64 * 1024 &&
170
187
  await plugins.fs.readFile(checksumPath, 'utf8') === this.checksums(manifest, manifestSha256), 'integrity', 'Artifact-set checksums disagree.');
171
- for (const artifact of manifest.artifacts) {
172
- const file = plugins.path.join(directory, artifact.name);
173
- const actual = await digestFile(file);
174
- requireValue(actual.size === artifact.size && actual.sha256 === artifact.sha256, 'integrity', 'Archive integrity mismatch.');
188
+ return { directory, manifest, manifestSha256, reused: false };
189
+ }
190
+ async verify(directoryArg, optionsArg = {}) {
191
+ const result = await this.readArtifactSet(directoryArg, optionsArg);
192
+ for (const artifact of result.manifest.artifacts) {
193
+ await this.verifyRecord(result.directory, result.manifest, artifact);
194
+ }
195
+ return result;
196
+ }
197
+ async verifyRecord(directory, manifest, artifact, signal) {
198
+ const file = plugins.path.join(directory, artifact.name);
199
+ if (artifact.kind !== 'file') {
175
200
  const { ['tspack.json']: _metadata, ...files } = artifact.files;
176
- await verifyArchive(file, artifact, bundleMetadata(manifest, artifact.id, files));
201
+ await verifyArchive(file, artifact, bundleMetadata(manifest, artifact.id, files), { signal });
202
+ return;
203
+ }
204
+ signal?.throwIfAborted();
205
+ requireValue((await plugins.fs.lstat(file)).isFile(), 'integrity', 'Expected a regular standalone artifact.');
206
+ const handle = await plugins.fs.open(file, plugins.nodeFs.constants.O_RDONLY | plugins.nodeFs.constants.O_NOFOLLOW);
207
+ try {
208
+ const before = await handle.stat({ bigint: true });
209
+ requireValue(before.isFile() && before.size === BigInt(artifact.size), 'integrity', 'Standalone artifact size differs.');
210
+ const hash = plugins.crypto.createHash('sha256');
211
+ let size = 0;
212
+ for await (const chunk of handle.createReadStream({ autoClose: false })) {
213
+ signal?.throwIfAborted();
214
+ size += chunk.length;
215
+ requireValue(size <= artifact.size, 'integrity', 'Standalone artifact grew while reading.');
216
+ hash.update(chunk);
217
+ }
218
+ const after = await handle.stat({ bigint: true });
219
+ const current = await plugins.fs.lstat(file, { bigint: true });
220
+ requireValue(size === artifact.size && hash.digest('hex') === artifact.sha256 && current.isFile() &&
221
+ ['dev', 'ino', 'size', 'mtimeNs', 'ctimeNs'].every((key) => before[key] === after[key] &&
222
+ before[key] === current[key]), 'integrity', 'Standalone artifact changed or does not match its identity.');
223
+ signal?.throwIfAborted();
224
+ }
225
+ finally {
226
+ await handle.close();
227
+ }
228
+ }
229
+ async readBundle(directoryArg, bundleIdArg, optionsArg) {
230
+ object(optionsArg, ['expectedManifestSha256', 'expectedSourceCommit', 'requireRelease', 'signal']);
231
+ requireValue(isName(bundleIdArg) && isDigest(optionsArg.expectedManifestSha256) &&
232
+ (optionsArg.signal === undefined || optionsArg.signal instanceof AbortSignal), 'invalid_config', 'Bundle consumption requires a selected bundle and trusted manifest digest.');
233
+ const { signal, ...identity } = optionsArg;
234
+ signal?.throwIfAborted();
235
+ const result = await this.readArtifactSet(directoryArg, identity, bundleIdArg);
236
+ signal?.throwIfAborted();
237
+ return { result: { ...result, artifact: result.manifest.artifacts.find((artifact) => artifact.id === bundleIdArg) }, signal };
238
+ }
239
+ /** Verify a selected-only download: complete metadata plus exactly one archive. */
240
+ async verifyBundle(directoryArg, bundleIdArg, optionsArg) {
241
+ const { result, signal } = await this.readBundle(directoryArg, bundleIdArg, optionsArg);
242
+ const { artifact } = result;
243
+ requireValue(artifact.kind !== 'file', 'invalid_config', 'Selected artifact is a standalone file, not an archive bundle.');
244
+ await this.verifyRecord(result.directory, result.manifest, artifact, signal);
245
+ signal?.throwIfAborted();
246
+ return result;
247
+ }
248
+ /** Verify one selected archive or standalone file against the complete trusted release identity. */
249
+ async verifyArtifact(directoryArg, artifactIdArg, optionsArg) {
250
+ const { result, signal } = await this.readBundle(directoryArg, artifactIdArg, optionsArg);
251
+ await this.verifyRecord(result.directory, result.manifest, result.artifact, signal);
252
+ signal?.throwIfAborted();
253
+ return result;
254
+ }
255
+ /** Extract code/assets into a fresh private directory. The caller owns installation and activation. */
256
+ async extractBundle(directoryArg, bundleIdArg, parentArg, optionsArg) {
257
+ const { result, signal } = await this.readBundle(directoryArg, bundleIdArg, optionsArg);
258
+ requireValue(result.artifact.kind !== 'file', 'invalid_config', 'Selected artifact is a standalone file, not an archive bundle.');
259
+ requireValue(typeof parentArg === 'string' && parentArg.length > 0, 'unsafe_input', 'An extraction parent is required.');
260
+ const parent = plugins.path.resolve(this.cwd, parentArg);
261
+ requireValue((await plugins.fs.lstat(parent)).isDirectory() && await plugins.fs.realpath(parent) === parent, 'unsafe_input', 'Extraction requires an existing canonical parent directory.');
262
+ signal?.throwIfAborted();
263
+ const directory = await plugins.fs.mkdtemp(plugins.path.join(parent, '.tspack-extract-'));
264
+ const owner = await plugins.fs.lstat(directory, { bigint: true });
265
+ try {
266
+ const { artifact } = result;
267
+ const { ['tspack.json']: _metadata, ...files } = artifact.files;
268
+ await verifyArchive(plugins.path.join(result.directory, artifact.name), artifact, bundleMetadata(result.manifest, artifact.id, files), { destination: directory, signal });
269
+ signal?.throwIfAborted();
270
+ return { ...result, sourceDirectory: result.directory, directory };
271
+ }
272
+ catch (error) {
273
+ const current = await plugins.fs.lstat(directory, { bigint: true });
274
+ requireValue(current.isDirectory() && current.dev === owner.dev && current.ino === owner.ino &&
275
+ await plugins.fs.realpath(directory) === directory, 'unsafe_input', 'Extraction directory ownership changed; cleanup refused.');
276
+ await plugins.fs.rm(directory, { recursive: true });
277
+ throw error;
177
278
  }
178
- return { directory, manifest, manifestSha256, reused: false };
179
279
  }
180
280
  }
181
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tspack.js","sourceRoot":"","sources":["../ts/classes.tspack.ts"],"names":[],"mappings":"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"}
281
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tspack.js","sourceRoot":"","sources":["../ts/classes.tspack.ts"],"names":[],"mappings":"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"}
@@ -11,12 +11,21 @@ export interface ITsPackBundle {
11
11
  id: string;
12
12
  files: ITsPackFile[];
13
13
  }
14
+ /** A named release asset whose bytes are published without an archive wrapper. */
15
+ export interface ITsPackAsset {
16
+ id: string;
17
+ source: string;
18
+ name: string;
19
+ executable?: boolean;
20
+ sha256?: string;
21
+ }
14
22
  export interface ITsPackConfig {
15
23
  schemaVersion: 1;
16
24
  /** Defaults to the package name with its scope separator replaced by a hyphen. */
17
25
  name?: string;
18
26
  outputDirectory?: string;
19
27
  bundles: ITsPackBundle[];
28
+ assets?: ITsPackAsset[];
20
29
  }
21
30
  export interface ITsPackOptions {
22
31
  /** Requires clean source at the package's vVERSION tag. */
@@ -30,6 +39,8 @@ export interface ITsPackFileRecord {
30
39
  mode: 420 | 493;
31
40
  }
32
41
  export interface ITsPackArtifact {
42
+ /** Omitted for v1-compatible tar.gz bundles; explicit for standalone files in v2 sets. */
43
+ kind?: 'file';
33
44
  id: string;
34
45
  name: string;
35
46
  sha256: string;
@@ -37,7 +48,7 @@ export interface ITsPackArtifact {
37
48
  files: Record<string, ITsPackFileRecord>;
38
49
  }
39
50
  export interface ITsPackManifest {
40
- format: 'tspack.release.v1';
51
+ format: 'tspack.release.v1' | 'tspack.release.v2';
41
52
  packageName: string;
42
53
  name: string;
43
54
  version: string;
@@ -58,3 +69,15 @@ export interface ITsPackVerifyOptions {
58
69
  expectedSourceCommit?: string;
59
70
  requireRelease?: boolean;
60
71
  }
72
+ export interface ITsPackBundleOptions extends ITsPackVerifyOptions {
73
+ /** The caller's trusted digest of the complete release manifest. */
74
+ expectedManifestSha256: string;
75
+ signal?: AbortSignal;
76
+ }
77
+ export interface ITsPackBundleResult extends ITsPackResult {
78
+ artifact: ITsPackArtifact;
79
+ }
80
+ export interface ITsPackExtractResult extends ITsPackBundleResult {
81
+ /** Input artifact directory. `directory` is the new private extraction directory. */
82
+ sourceDirectory: string;
83
+ }