@git.zone/tspack 1.2.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.2.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=
@@ -4,14 +4,18 @@ export { TsPackError } from './validation.js';
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;
10
11
  private readArtifactSet;
11
12
  verify(directoryArg: string, optionsArg?: ITsPackVerifyOptions): Promise<ITsPackResult>;
13
+ private verifyRecord;
12
14
  private readBundle;
13
15
  /** Verify a selected-only download: complete metadata plus exactly one archive. */
14
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>;
15
19
  /** Extract code/assets into a fresh private directory. The caller owns installation and activation. */
16
20
  extractBundle(directoryArg: string, bundleIdArg: string, parentArg: string, optionsArg: ITsPackBundleOptions): Promise<ITsPackExtractResult>;
17
21
  }
@@ -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);
@@ -168,19 +183,49 @@ export class TsPack {
168
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.');
169
184
  const checksumPath = plugins.path.join(directory, 'SHA256SUMS.txt');
170
185
  const checksumStat = await plugins.fs.lstat(checksumPath);
171
- requireValue(checksumStat.isFile() && checksumStat.size <= 32 * 1024 &&
186
+ requireValue(checksumStat.isFile() && checksumStat.size <= 64 * 1024 &&
172
187
  await plugins.fs.readFile(checksumPath, 'utf8') === this.checksums(manifest, manifestSha256), 'integrity', 'Artifact-set checksums disagree.');
173
188
  return { directory, manifest, manifestSha256, reused: false };
174
189
  }
175
190
  async verify(directoryArg, optionsArg = {}) {
176
191
  const result = await this.readArtifactSet(directoryArg, optionsArg);
177
192
  for (const artifact of result.manifest.artifacts) {
178
- const file = plugins.path.join(result.directory, artifact.name);
179
- const { ['tspack.json']: _metadata, ...files } = artifact.files;
180
- await verifyArchive(file, artifact, bundleMetadata(result.manifest, artifact.id, files));
193
+ await this.verifyRecord(result.directory, result.manifest, artifact);
181
194
  }
182
195
  return result;
183
196
  }
197
+ async verifyRecord(directory, manifest, artifact, signal) {
198
+ const file = plugins.path.join(directory, artifact.name);
199
+ if (artifact.kind !== 'file') {
200
+ const { ['tspack.json']: _metadata, ...files } = artifact.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
+ }
184
229
  async readBundle(directoryArg, bundleIdArg, optionsArg) {
185
230
  object(optionsArg, ['expectedManifestSha256', 'expectedSourceCommit', 'requireRelease', 'signal']);
186
231
  requireValue(isName(bundleIdArg) && isDigest(optionsArg.expectedManifestSha256) &&
@@ -195,14 +240,22 @@ export class TsPack {
195
240
  async verifyBundle(directoryArg, bundleIdArg, optionsArg) {
196
241
  const { result, signal } = await this.readBundle(directoryArg, bundleIdArg, optionsArg);
197
242
  const { artifact } = result;
198
- const { ['tspack.json']: _metadata, ...files } = artifact.files;
199
- await verifyArchive(plugins.path.join(result.directory, artifact.name), artifact, bundleMetadata(result.manifest, artifact.id, files), { signal });
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);
200
252
  signal?.throwIfAborted();
201
253
  return result;
202
254
  }
203
255
  /** Extract code/assets into a fresh private directory. The caller owns installation and activation. */
204
256
  async extractBundle(directoryArg, bundleIdArg, parentArg, optionsArg) {
205
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.');
206
259
  requireValue(typeof parentArg === 'string' && parentArg.length > 0, 'unsafe_input', 'An extraction parent is required.');
207
260
  const parent = plugins.path.resolve(this.cwd, parentArg);
208
261
  requireValue((await plugins.fs.lstat(parent)).isDirectory() && await plugins.fs.realpath(parent) === parent, 'unsafe_input', 'Extraction requires an existing canonical parent directory.');
@@ -225,4 +278,4 @@ export class TsPack {
225
278
  }
226
279
  }
227
280
  }
228
- //# 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;
@@ -43,11 +43,13 @@ export async function runCli(args = process.argv.slice(2)) {
43
43
  ? await pack.verify(directory, { requireRelease: release, expectedManifestSha256 })
44
44
  : (() => { throw new TsPackError('arguments', 'Expected pack or verify with its required arguments.'); })();
45
45
  console.log(JSON.stringify({ directory: result.directory, manifestSha256: result.manifestSha256,
46
- publishable: result.manifest.publishable, reused: result.reused, bundles: result.manifest.artifacts.length }));
46
+ publishable: result.manifest.publishable, reused: result.reused,
47
+ bundles: result.manifest.artifacts.filter((artifact) => artifact.kind !== 'file').length,
48
+ assets: result.manifest.artifacts.filter((artifact) => artifact.kind === 'file').length }));
47
49
  }
48
50
  catch (error) {
49
51
  console.error(error instanceof TsPackError ? `tspack: ${error.code}: ${error.message}` : 'tspack: operation failed.');
50
52
  process.exitCode = 1;
51
53
  }
52
54
  }
53
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNwYWNrLmNsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3RzcGFjay5jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFM0MsTUFBTSxDQUFDLEtBQUssVUFBVSxNQUFNLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUN2RCxJQUFJLENBQUM7UUFDSCxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxRQUFRLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDO1lBQ3BFLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUlBQXVJLENBQUMsQ0FBQztZQUNySixPQUFPO1FBQ1QsQ0FBQztRQUNELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN4QixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzdCLE1BQU0sU0FBUyxHQUFHLE9BQU8sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1FBQ3BFLElBQUksT0FBTyxHQUFHLEtBQUssQ0FBQztRQUNwQixJQUFJLEtBQUssR0FBRyxLQUFLLENBQUM7UUFDbEIsSUFBSSxVQUE4QixDQUFDO1FBQ25DLElBQUksc0JBQTBDLENBQUM7UUFDL0MsTUFBTSxJQUFJLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUN2QixPQUFPLE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FB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
55
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNwYWNrLmNsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3RzcGFjay5jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFM0MsTUFBTSxDQUFDLEtBQUssVUFBVSxNQUFNLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUN2RCxJQUFJLENBQUM7UUFDSCxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxRQUFRLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDO1lBQ3BFLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUlBQXVJLENBQUMsQ0FBQztZQUNySixPQUFPO1FBQ1QsQ0FBQztRQUNELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN4QixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzdCLE1BQU0sU0FBUyxHQUFHLE9BQU8sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1FBQ3BFLElBQUksT0FBTyxHQUFHLEtBQUssQ0FBQztRQUNwQixJQUFJLEtBQUssR0FBRyxLQUFLLENBQUM7UUFDbEIsSUFBSSxVQUE4QixDQUFDO1FBQ25DLElBQUksc0JBQTBDLENBQUM7UUFDL0MsTUFBTSxJQUFJLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUN2QixPQUFPLE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FB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
@@ -16,9 +16,10 @@ export declare const isCommit: (value: unknown) => value is string;
16
16
  export declare const isName: (value: unknown) => value is string;
17
17
  export declare const isVersion: (value: unknown) => value is string;
18
18
  export declare const isPath: (value: unknown) => value is string;
19
+ export declare const isAssetName: (value: unknown) => value is string;
19
20
  export declare const jsonBytes: (value: unknown) => Buffer<ArrayBuffer>;
20
21
  export declare function object(value: unknown, allowed?: readonly string[]): asserts value is Record<string, unknown>;
21
- export declare function normalizeConfig(value: unknown, packageName: string): Required<ITsPackConfig>;
22
+ export declare function normalizeConfig(value: unknown, packageName: string): Omit<Required<ITsPackConfig>, 'assets'> & Pick<ITsPackConfig, 'assets'>;
22
23
  export declare function validateFileRecord(value: unknown): asserts value is ITsPackFileRecord;
23
24
  export declare function validateManifest(value: unknown): asserts value is ITsPackManifest;
24
25
  export declare function noSymlinks(root: string, relative: string, allowMissing?: boolean): Promise<string>;
@@ -19,6 +19,8 @@ export const isName = (value) => typeof value === 'string' && /^[a-z0-9][a-z0-9.
19
19
  export const isVersion = (value) => typeof value === 'string' && value.length <= 64 && /^\d+\.\d+\.\d+(?:-[a-zA-Z0-9.-]+)?$/.test(value);
20
20
  export const isPath = (value) => typeof value === 'string' && value.length <= 240 &&
21
21
  /^[a-zA-Z0-9@_+./-]+$/.test(value) && !value.startsWith('/') && value.split('/').every((part) => part && part !== '.' && part !== '..');
22
+ export const isAssetName = (value) => isPath(value) && !value.includes('/') &&
23
+ !['tspack-manifest.json', 'sha256sums.txt', 'tspack.json'].includes(value.toLowerCase());
22
24
  export const jsonBytes = (value) => Buffer.from(JSON.stringify(value, null, 2) + '\n');
23
25
  export function object(value, allowed) {
24
26
  requireValue(value && typeof value === 'object' && !Array.isArray(value) && !plugins.util.types.isProxy(value) &&
@@ -28,11 +30,22 @@ export function object(value, allowed) {
28
30
  'value' in Object.getOwnPropertyDescriptor(value, key)), 'invalid_config', 'Unexpected record property.');
29
31
  }
30
32
  export function normalizeConfig(value, packageName) {
31
- object(value, ['schemaVersion', 'name', 'outputDirectory', 'bundles']);
33
+ object(value, ['schemaVersion', 'name', 'outputDirectory', 'bundles', 'assets']);
32
34
  const name = value.name ?? packageName.replace(/^@/, '').replace('/', '-');
33
35
  const outputDirectory = value.outputDirectory ?? 'dist_pack';
34
36
  requireValue(value.schemaVersion === 1 && isName(name) && isPath(outputDirectory) &&
35
- Array.isArray(value.bundles) && value.bundles.length > 0 && value.bundles.length <= 128, 'invalid_config', 'Invalid tspack configuration.');
37
+ Array.isArray(value.bundles) && value.bundles.length <= 128 &&
38
+ (!Object.hasOwn(value, 'assets') || Array.isArray(value.assets)), 'invalid_config', 'Invalid tspack configuration.');
39
+ const assetInputs = (value.assets ?? []);
40
+ requireValue(assetInputs.length + value.bundles.length > 0 && assetInputs.length + value.bundles.length <= 128, 'invalid_config', 'A release requires between one and 128 artifacts.');
41
+ const assets = assetInputs.map((asset) => {
42
+ object(asset, ['id', 'source', 'name', 'executable', 'sha256']);
43
+ requireValue(isName(asset.id) && isPath(asset.source) && isAssetName(asset.name) &&
44
+ (!Object.hasOwn(asset, 'executable') || typeof asset.executable === 'boolean') &&
45
+ (!Object.hasOwn(asset, 'sha256') || isDigest(asset.sha256)), 'invalid_config', 'Invalid standalone asset.');
46
+ return { id: asset.id, source: asset.source, name: asset.name, executable: asset.executable === true,
47
+ ...(asset.sha256 ? { sha256: asset.sha256 } : {}) };
48
+ }).sort((a, b) => a.id.localeCompare(b.id, 'en'));
36
49
  let count = 0;
37
50
  const bundles = value.bundles.map((bundle) => {
38
51
  object(bundle, ['id', 'files']);
@@ -50,8 +63,11 @@ export function normalizeConfig(value, packageName) {
50
63
  files.every((file) => !files.some((other) => other.path.startsWith(file.path + '/'))), 'invalid_config', 'Bundle paths collide.');
51
64
  return { id: bundle.id, files };
52
65
  }).sort((a, b) => a.id.localeCompare(b.id, 'en'));
53
- requireValue(count <= limits.files && new Set(bundles.map((bundle) => bundle.id)).size === bundles.length, 'invalid_config', 'Too many files or duplicate bundle identifiers.');
54
- return { schemaVersion: 1, name, outputDirectory, bundles };
66
+ const ids = [...bundles, ...assets].map((artifact) => artifact.id);
67
+ requireValue(count + assets.length <= limits.files && new Set(ids).size === ids.length &&
68
+ new Set(assets.map((asset) => asset.name.toLowerCase())).size === assets.length, 'invalid_config', 'Too many files or duplicate bundle identifiers.');
69
+ // Omit an empty extension so archive-only v1 configuration hashes remain unchanged.
70
+ return { schemaVersion: 1, name, outputDirectory, bundles, ...(assets.length ? { assets } : {}) };
55
71
  }
56
72
  export function validateFileRecord(value) {
57
73
  object(value, ['sha256', 'size', 'mode']);
@@ -60,7 +76,7 @@ export function validateFileRecord(value) {
60
76
  }
61
77
  export function validateManifest(value) {
62
78
  object(value, ['format', 'packageName', 'name', 'version', 'sourceCommit', 'sourceDirty', 'publishable', 'configurationSha256', 'artifacts']);
63
- requireValue(value.format === 'tspack.release.v1' && typeof value.packageName === 'string' && value.packageName.length <= 214 &&
79
+ requireValue(['tspack.release.v1', 'tspack.release.v2'].includes(value.format) && typeof value.packageName === 'string' && value.packageName.length <= 214 &&
64
80
  isName(value.name) && isVersion(value.version) && isCommit(value.sourceCommit) &&
65
81
  typeof value.sourceDirty === 'boolean' && typeof value.publishable === 'boolean' &&
66
82
  (!value.publishable || !value.sourceDirty) && isDigest(value.configurationSha256) &&
@@ -69,17 +85,31 @@ export function validateManifest(value) {
69
85
  const names = new Set();
70
86
  let total = 0;
71
87
  let count = 0;
88
+ let standaloneCount = 0;
72
89
  for (const artifact of value.artifacts) {
73
- object(artifact, ['id', 'name', 'sha256', 'size', 'files']);
90
+ object(artifact, ['id', 'name', 'sha256', 'size', 'files', ...(value.format === 'tspack.release.v2' ? ['kind'] : [])]);
91
+ requireValue(!Object.hasOwn(artifact, 'kind') || artifact.kind === 'file', 'invalid_manifest', 'Invalid artifact kind.');
92
+ const standalone = artifact.kind === 'file';
74
93
  requireValue(isName(artifact.id) && !ids.has(artifact.id) &&
75
- isPath(artifact.name) && artifact.name === `${value.name}-${value.version}-${artifact.id}.tar.gz` && !names.has(artifact.name) &&
94
+ isPath(artifact.name) && (standalone ? isAssetName(artifact.name) : artifact.name === `${value.name}-${value.version}-${artifact.id}.tar.gz`) &&
95
+ !names.has(artifact.name.toLowerCase()) &&
76
96
  isDigest(artifact.sha256) && typeof artifact.size === 'number' && Number.isSafeInteger(artifact.size) &&
77
- artifact.size > 0 && artifact.size <= limits.total, 'invalid_manifest', 'Invalid archive identity.');
97
+ (standalone ? artifact.size >= 0 && artifact.size <= limits.file : artifact.size > 0 && artifact.size <= limits.total), 'invalid_manifest', 'Invalid artifact identity.');
78
98
  ids.add(artifact.id);
79
- names.add(artifact.name);
99
+ names.add(artifact.name.toLowerCase());
80
100
  object(artifact.files);
81
101
  const fileRecords = artifact.files;
82
102
  const paths = Object.keys(fileRecords);
103
+ if (standalone) {
104
+ standaloneCount++;
105
+ requireValue(paths.length === 1 && paths[0] === artifact.name, 'invalid_manifest', 'A standalone asset requires its exact file record.');
106
+ const record = fileRecords[artifact.name];
107
+ validateFileRecord(record);
108
+ requireValue(record.sha256 === artifact.sha256 && record.size === artifact.size, 'invalid_manifest', 'Standalone file identities disagree.');
109
+ total += record.size;
110
+ count++;
111
+ continue;
112
+ }
83
113
  requireValue(Object.hasOwn(artifact.files, 'tspack.json') && paths.length > 1, 'invalid_manifest', 'Bundle metadata or selected files are missing.');
84
114
  requireValue(paths.every((name) => name.split('/').slice(0, -1).every((_part, index, parents) => !Object.hasOwn(fileRecords, parents.slice(0, index + 1).join('/')))), 'invalid_manifest', 'Archive member paths collide.');
85
115
  for (const [name, record] of Object.entries(artifact.files)) {
@@ -89,6 +119,7 @@ export function validateManifest(value) {
89
119
  count++;
90
120
  }
91
121
  }
122
+ requireValue(value.format === 'tspack.release.v1' || standaloneCount > 0, 'invalid_manifest', 'Manifest v2 requires a standalone asset.');
92
123
  requireValue(total <= limits.total && count <= limits.files + 128, 'invalid_manifest', 'Artifact set exceeds its limits.');
93
124
  }
94
125
  export async function noSymlinks(root, relative, allowMissing = false) {
@@ -132,4 +163,4 @@ export async function digestFile(file) {
132
163
  requireValue(size === stat.size, 'integrity', 'Artifact size changed while reading.');
133
164
  return { sha256: hash.digest('hex'), size };
134
165
  }
135
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validation.js","sourceRoot":"","sources":["../ts/validation.ts"],"names":[],"mappings":"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"}
166
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validation.js","sourceRoot":"","sources":["../ts/validation.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@git.zone/tspack",
3
- "version": "1.2.0",
3
+ "version": "1.3.0",
4
4
  "description": "Verified executable and asset bundles for GitZone projects.",
5
5
  "type": "module",
6
6
  "main": "dist_ts/index.js",
@@ -19,7 +19,7 @@
19
19
  "@git.zone/tsbuild": "4.4.2",
20
20
  "@git.zone/tsrun": "2.0.6",
21
21
  "@git.zone/tstest": "4.0.0",
22
- "@types/node": "26.4.0"
22
+ "@types/node": "26.4.1"
23
23
  },
24
24
  "files": [
25
25
  "ts/**/*",
package/readme.md CHANGED
@@ -1,8 +1,9 @@
1
1
  # @git.zone/tspack
2
2
 
3
3
  TsPack packages compiled executables and supporting assets into verified tar.gz
4
- bundles. It records each file's digest and executable role, seals the complete
5
- artifact set, and verifies archive contents without extracting filesystem paths.
4
+ bundles and named standalone files. It records each file's digest and executable
5
+ role, seals the complete artifact set, and verifies archive contents without
6
+ extracting filesystem paths.
6
7
  TsDeno and TsRust own compilation; GitZone and CI own publication.
7
8
 
8
9
  ## Issue Reporting and Security
@@ -51,6 +52,42 @@ materials explicitly according to the component's distribution requirements.
51
52
  TsPack does not automatically publish application source, vendor dependencies,
52
53
  rebuild runtimes or reject accepted licenses such as LGPL.
53
54
 
55
+ ### Standalone release assets
56
+
57
+ Add `assets` when an installer needs a bare executable or script with a fixed
58
+ download name. Each asset participates in the same sealed set as the archives:
59
+
60
+ ```json
61
+ {
62
+ "schemaVersion": 1,
63
+ "bundles": [],
64
+ "assets": [
65
+ {
66
+ "id": "bootstrap-linux-amd64",
67
+ "source": "dist_binary/bootstrap",
68
+ "name": "app-linux-x64",
69
+ "executable": true
70
+ },
71
+ { "id": "installer", "source": "install.sh", "name": "install.sh" }
72
+ ]
73
+ }
74
+ ```
75
+
76
+ You can combine `bundles` and `assets`, or leave `bundles` empty for a file-only
77
+ release. Asset IDs are unique across both kinds. Names are single portable path
78
+ components; metadata names, duplicate names differing only by case, and collisions
79
+ with generated archive names are rejected. Standalone inputs accept the same
80
+ optional `sha256` pin and executable role as bundle files. Their original bytes
81
+ are copied without an archive wrapper. Verification does not execute them.
82
+
83
+ Archive-only configurations retain their v1 manifest and configuration identity,
84
+ including when `assets` is empty. A set with standalone files uses
85
+ `tspack.release.v2`; each standalone artifact has `kind: "file"` and one exact
86
+ entry in `files`. Consumers must support v2 before such a release is published.
87
+ TsPack continues to verify and extract published v1 bundles. A downloader applies
88
+ the recorded role when installing a standalone file; retention services may discard
89
+ the downloaded file's filesystem executable bit without changing its identity.
90
+
54
91
  ## Package and verify
55
92
 
56
93
  ```sh
@@ -69,14 +106,15 @@ pnpm exec tspack verify dist_pack/example-control-1.2.3-COMMITPREFIX \
69
106
  ```
70
107
 
71
108
  Commands return one JSON result with the output directory, manifest digest,
72
- publishable state, reuse state and bundle count. Invalid arguments or failed
109
+ publishable state, reuse state, bundle count and standalone asset count. Invalid arguments or failed
73
110
  verification return a nonzero exit code.
74
111
 
75
112
  Each artifact directory contains:
76
113
 
77
114
  - One `NAME-VERSION-BUNDLE.tar.gz` per configured bundle.
115
+ - Each configured standalone asset under its exact `name`.
78
116
  - `tspack-manifest.json`: package, source, configuration, archive and file identities.
79
- - `SHA256SUMS.txt`: digests of the manifest and every archive.
117
+ - `SHA256SUMS.txt`: digests of the manifest and every archive or standalone file.
80
118
 
81
119
  Each bundle includes its selected files plus `tspack.json`, which binds the same
82
120
  source/configuration identity and selected file records. `tspack.json` is reserved.
@@ -92,7 +130,7 @@ packaging/compression toolchain; this does not claim the compilers themselves ar
92
130
  reproducible. Failed packaging removes only its own temporary staging directory.
93
131
 
94
132
  Limits are 2 GiB per selected file, 8 GiB total uncompressed content, 10,000 selected
95
- files, 128 bundles, and 16 MiB for JSON metadata. Paths are portable ASCII relative
133
+ files, 128 artifacts, 64 KiB for the checksum list, and 16 MiB for JSON metadata. Paths are portable ASCII relative
96
134
  names up to 240 characters. The source checkout, selected build tools and local
97
135
  filesystem are trusted; these checks do not sandbox malicious project code or a
98
136
  concurrent privileged writer. A checksum establishes content identity. Obtain the
@@ -144,7 +182,14 @@ await packer.verify(result.directory, {
144
182
  For a platform-specific download, keep the complete `tspack-manifest.json` and
145
183
  `SHA256SUMS.txt` alongside exactly the selected archive. `verifyBundle(directory,
146
184
  bundleId, options)` checks this selected-only set, including the complete manifest
147
- and checksum list. Ordinary `verify` continues to require every archive.
185
+ and checksum list. Ordinary `verify` requires every archive and standalone file.
186
+
187
+ `verifyArtifact(directory, artifactId, options)` accepts a selected-only archive
188
+ or standalone file with the same required trusted manifest pin, optional source
189
+ pin, release requirement and `AbortSignal`. Standalone verification holds the
190
+ actual file descriptor while checking its size, digest and identity. It returns
191
+ only after closing the descriptor, including on cancellation. `verifyBundle` and
192
+ `extractBundle` reject standalone selections; they never treat bare bytes as tar.
148
193
 
149
194
  `extractBundle` verifies the selected archive and returns a fresh private directory
150
195
  under an existing canonical staging parent:
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/tspack',
6
- version: '1.2.0',
6
+ version: '1.3.0',
7
7
  description: 'Verified executable and asset bundles for GitZone projects.'
8
8
  }
@@ -1,5 +1,5 @@
1
1
  import * as plugins from './plugins.js';
2
- import type { ITsPackConfig, ITsPackOptions, ITsPackResult, ITsPackVerifyOptions, ITsPackFileRecord, ITsPackManifest,
2
+ import type { ITsPackConfig, ITsPackOptions, ITsPackResult, ITsPackVerifyOptions, ITsPackFileRecord, ITsPackManifest, ITsPackArtifact,
3
3
  ITsPackBundleOptions, ITsPackBundleResult, ITsPackExtractResult } from './interfaces.js';
4
4
  import { packArchive, verifyArchive } from './archive.js';
5
5
  import { digestFile, isCommit, isDigest, isName, isPath, isVersion, jsonBytes, limits, noSymlinks, normalizeConfig, object,
@@ -17,6 +17,36 @@ const bundleMetadata = (manifest: Omit<ITsPackManifest, 'artifacts'>, id: string
17
17
  export class TsPack {
18
18
  constructor(private readonly cwd = process.cwd()) {}
19
19
 
20
+ private async copyInput(root: string, source: string, destination: string, remaining: number,
21
+ options: { executable?: boolean; sha256?: string }): Promise<ITsPackFileRecord> {
22
+ const input = await noSymlinks(root, source);
23
+ const handle = await plugins.fs.open(input, plugins.nodeFs.constants.O_RDONLY | plugins.nodeFs.constants.O_NOFOLLOW);
24
+ try {
25
+ const before = await handle.stat({ bigint: true });
26
+ requireValue(before.isFile() && before.size <= BigInt(limits.file), 'unsafe_input', 'Expected a bounded regular input file.');
27
+ requireValue(before.size <= BigInt(remaining), 'unsafe_input', 'Package inputs exceed the total byte limit.');
28
+ await plugins.fs.mkdir(plugins.path.dirname(destination), { recursive: true });
29
+ const hash = plugins.crypto.createHash('sha256');
30
+ let size = 0;
31
+ const meter = new plugins.stream.Transform({ transform(chunk: Buffer, _encoding, callback) {
32
+ size += chunk.length;
33
+ if (size > Number(before.size)) { callback(new Error('Input changed while copying.')); return; }
34
+ hash.update(chunk); callback(null, chunk);
35
+ } });
36
+ await plugins.streamPromises.pipeline(handle.createReadStream({ autoClose: false }), meter,
37
+ plugins.nodeFs.createWriteStream(destination, { flags: 'wx', mode: 0o600 }));
38
+ const after = await handle.stat({ bigint: true });
39
+ const current = await plugins.fs.lstat(input, { bigint: true });
40
+ requireValue(size === Number(before.size) && ['dev', 'ino', 'size', 'mtimeNs', 'ctimeNs'].every((key) =>
41
+ before[key as keyof typeof before] === after[key as keyof typeof after] &&
42
+ before[key as keyof typeof before] === current[key as keyof typeof current]),
43
+ 'integrity', 'Input changed while copying.');
44
+ const record: ITsPackFileRecord = { sha256: hash.digest('hex'), size, mode: options.executable ? 0o755 : 0o644 };
45
+ requireValue(!options.sha256 || options.sha256 === record.sha256, 'integrity', 'Input does not match its pinned digest.');
46
+ return record;
47
+ } finally { await handle.close(); }
48
+ }
49
+
20
50
  private async source(root: string, version: string, release: boolean) {
21
51
  const run = async (...args: string[]) => (await exec('git', args, { cwd: root, maxBuffer: 4 * 1024 ** 2 })).stdout.trim();
22
52
  const commit = await run('rev-parse', 'HEAD');
@@ -42,6 +72,9 @@ export class TsPack {
42
72
  const config = normalizeConfig(configArg ?? new plugins.smartconfig.Smartconfig(root).dataFor('@git.zone/tspack', {}), packageJson.name);
43
73
  requireValue(config.bundles.every((bundle) => isPath(`${config.name}-${packageJson.version}-${bundle.id}.tar.gz`)),
44
74
  'invalid_config', 'Archive names exceed the portable path limit.');
75
+ const names = [...config.bundles.map((bundle) => `${config.name}-${packageJson.version}-${bundle.id}.tar.gz`),
76
+ ...(config.assets ?? []).map((asset) => asset.name)].map((name) => name.toLowerCase());
77
+ requireValue(new Set(names).size === names.length, 'invalid_config', 'Archive and standalone asset names collide.');
45
78
  const configurationSha256 = sha256(jsonBytes(config));
46
79
  const source = await this.source(root, packageJson.version, optionsArg.release === true);
47
80
  const outputRoot = await noSymlinks(root, config.outputDirectory, true);
@@ -65,7 +98,7 @@ export class TsPack {
65
98
  await plugins.fs.mkdir(plugins.path.join(stage, 'bundles'));
66
99
  try {
67
100
  const manifest: ITsPackManifest = {
68
- format: 'tspack.release.v1', packageName: packageJson.name, name: config.name, version: packageJson.version,
101
+ format: config.assets?.length ? 'tspack.release.v2' : 'tspack.release.v1', packageName: packageJson.name, name: config.name, version: packageJson.version,
69
102
  sourceCommit: source.commit, sourceDirty: source.dirty, publishable: optionsArg.release === true,
70
103
  configurationSha256, artifacts: [],
71
104
  };
@@ -75,34 +108,9 @@ export class TsPack {
75
108
  await plugins.fs.mkdir(directory);
76
109
  const files: Record<string, ITsPackFileRecord> = Object.create(null);
77
110
  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: Buffer, _encoding, callback) {
90
- size += chunk.length;
91
- if (size > Number(before.size)) { callback(new Error('Input changed while copying.')); return; }
92
- hash.update(chunk); callback(null, chunk);
93
- } });
94
- await plugins.streamPromises.pipeline(handle.createReadStream({ autoClose: false }), meter,
95
- plugins.nodeFs.createWriteStream(destination, { flags: 'wx', mode: 0o600 }));
96
- const after = await handle.stat({ bigint: true });
97
- const current = await plugins.fs.lstat(input, { bigint: true });
98
- requireValue(size === Number(before.size) && ['dev', 'ino', 'size', 'mtimeNs', 'ctimeNs'].every((key) =>
99
- before[key as keyof typeof before] === after[key as keyof typeof after] &&
100
- before[key as keyof typeof before] === current[key as keyof typeof current]),
101
- 'integrity', 'Input changed while copying.');
102
- const record = { sha256: hash.digest('hex'), size, mode: (file.executable ? 0o755 : 0o644) as 493 | 420 };
103
- requireValue(!file.sha256 || file.sha256 === record.sha256, 'integrity', 'Input does not match its pinned digest.');
104
- files[file.path] = record;
105
- } finally { await handle.close(); }
111
+ const record = await this.copyInput(root, file.source, plugins.path.join(directory, file.path), limits.total - total, file);
112
+ total += record.size;
113
+ files[file.path] = record;
106
114
  }
107
115
  const metadata = jsonBytes(bundleMetadata(manifest, bundle.id, files));
108
116
  requireValue(metadata.length <= limits.json, 'invalid_config', 'Bundle metadata exceeds its limit.');
@@ -112,6 +120,15 @@ export class TsPack {
112
120
  await packArchive(directory, plugins.path.join(assets, name), files);
113
121
  manifest.artifacts.push({ id: bundle.id, name, ...await digestFile(plugins.path.join(assets, name)), files });
114
122
  }
123
+ for (const asset of config.assets ?? []) {
124
+ const file = plugins.path.join(assets, asset.name);
125
+ const record = await this.copyInput(root, asset.source, file, limits.total - total, asset);
126
+ total += record.size;
127
+ await plugins.fs.chmod(file, record.mode);
128
+ manifest.artifacts.push({ kind: 'file', id: asset.id, name: asset.name, sha256: record.sha256,
129
+ size: record.size, files: { [asset.name]: record } });
130
+ }
131
+ manifest.artifacts.sort((a, b) => a.id.localeCompare(b.id, 'en'));
115
132
  const finalSource = await this.source(root, packageJson.version, optionsArg.release === true);
116
133
  requireValue(finalSource.commit === source.commit && finalSource.dirty === source.dirty, 'source_state', 'Source identity changed while packaging.');
117
134
  validateManifest(manifest);
@@ -160,7 +177,7 @@ export class TsPack {
160
177
  'integrity', 'Artifact directory has an unexpected file set.');
161
178
  const checksumPath = plugins.path.join(directory, 'SHA256SUMS.txt');
162
179
  const checksumStat = await plugins.fs.lstat(checksumPath);
163
- requireValue(checksumStat.isFile() && checksumStat.size <= 32 * 1024 &&
180
+ requireValue(checksumStat.isFile() && checksumStat.size <= 64 * 1024 &&
164
181
  await plugins.fs.readFile(checksumPath, 'utf8') === this.checksums(manifest, manifestSha256), 'integrity', 'Artifact-set checksums disagree.');
165
182
  return { directory, manifest, manifestSha256, reused: false };
166
183
  }
@@ -168,13 +185,43 @@ export class TsPack {
168
185
  public async verify(directoryArg: string, optionsArg: ITsPackVerifyOptions = {}): Promise<ITsPackResult> {
169
186
  const result = await this.readArtifactSet(directoryArg, optionsArg);
170
187
  for (const artifact of result.manifest.artifacts) {
171
- const file = plugins.path.join(result.directory, artifact.name);
172
- const { ['tspack.json']: _metadata, ...files } = artifact.files;
173
- await verifyArchive(file, artifact, bundleMetadata(result.manifest, artifact.id, files));
188
+ await this.verifyRecord(result.directory, result.manifest, artifact);
174
189
  }
175
190
  return result;
176
191
  }
177
192
 
193
+ private async verifyRecord(directory: string, manifest: ITsPackManifest, artifact: ITsPackArtifact, signal?: AbortSignal): Promise<void> {
194
+ const file = plugins.path.join(directory, artifact.name);
195
+ if (artifact.kind !== 'file') {
196
+ const { ['tspack.json']: _metadata, ...files } = artifact.files;
197
+ await verifyArchive(file, artifact, bundleMetadata(manifest, artifact.id, files), { signal });
198
+ return;
199
+ }
200
+ signal?.throwIfAborted();
201
+ requireValue((await plugins.fs.lstat(file)).isFile(), 'integrity', 'Expected a regular standalone artifact.');
202
+ const handle = await plugins.fs.open(file, plugins.nodeFs.constants.O_RDONLY | plugins.nodeFs.constants.O_NOFOLLOW);
203
+ try {
204
+ const before = await handle.stat({ bigint: true });
205
+ requireValue(before.isFile() && before.size === BigInt(artifact.size), 'integrity', 'Standalone artifact size differs.');
206
+ const hash = plugins.crypto.createHash('sha256');
207
+ let size = 0;
208
+ for await (const chunk of handle.createReadStream({ autoClose: false })) {
209
+ signal?.throwIfAborted();
210
+ size += chunk.length;
211
+ requireValue(size <= artifact.size, 'integrity', 'Standalone artifact grew while reading.');
212
+ hash.update(chunk);
213
+ }
214
+ const after = await handle.stat({ bigint: true });
215
+ const current = await plugins.fs.lstat(file, { bigint: true });
216
+ requireValue(size === artifact.size && hash.digest('hex') === artifact.sha256 && current.isFile() &&
217
+ ['dev', 'ino', 'size', 'mtimeNs', 'ctimeNs'].every((key) =>
218
+ before[key as keyof typeof before] === after[key as keyof typeof after] &&
219
+ before[key as keyof typeof before] === current[key as keyof typeof current]),
220
+ 'integrity', 'Standalone artifact changed or does not match its identity.');
221
+ signal?.throwIfAborted();
222
+ } finally { await handle.close(); }
223
+ }
224
+
178
225
  private async readBundle(directoryArg: string, bundleIdArg: string,
179
226
  optionsArg: ITsPackBundleOptions): Promise<{ result: ITsPackBundleResult; signal?: AbortSignal }> {
180
227
  object(optionsArg, ['expectedManifestSha256', 'expectedSourceCommit', 'requireRelease', 'signal']);
@@ -193,9 +240,17 @@ export class TsPack {
193
240
  optionsArg: ITsPackBundleOptions): Promise<ITsPackBundleResult> {
194
241
  const { result, signal } = await this.readBundle(directoryArg, bundleIdArg, optionsArg);
195
242
  const { artifact } = result;
196
- const { ['tspack.json']: _metadata, ...files } = artifact.files;
197
- await verifyArchive(plugins.path.join(result.directory, artifact.name), artifact,
198
- bundleMetadata(result.manifest, artifact.id, files), { signal });
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
+
249
+ /** Verify one selected archive or standalone file against the complete trusted release identity. */
250
+ public async verifyArtifact(directoryArg: string, artifactIdArg: string,
251
+ optionsArg: ITsPackBundleOptions): Promise<ITsPackBundleResult> {
252
+ const { result, signal } = await this.readBundle(directoryArg, artifactIdArg, optionsArg);
253
+ await this.verifyRecord(result.directory, result.manifest, result.artifact, signal);
199
254
  signal?.throwIfAborted();
200
255
  return result;
201
256
  }
@@ -204,6 +259,7 @@ export class TsPack {
204
259
  public async extractBundle(directoryArg: string, bundleIdArg: string, parentArg: string,
205
260
  optionsArg: ITsPackBundleOptions): Promise<ITsPackExtractResult> {
206
261
  const { result, signal } = await this.readBundle(directoryArg, bundleIdArg, optionsArg);
262
+ requireValue(result.artifact.kind !== 'file', 'invalid_config', 'Selected artifact is a standalone file, not an archive bundle.');
207
263
  requireValue(typeof parentArg === 'string' && parentArg.length > 0, 'unsafe_input', 'An extraction parent is required.');
208
264
  const parent = plugins.path.resolve(this.cwd, parentArg);
209
265
  requireValue((await plugins.fs.lstat(parent)).isDirectory() && await plugins.fs.realpath(parent) === parent,
package/ts/interfaces.ts CHANGED
@@ -13,12 +13,22 @@ export interface ITsPackBundle {
13
13
  files: ITsPackFile[];
14
14
  }
15
15
 
16
+ /** A named release asset whose bytes are published without an archive wrapper. */
17
+ export interface ITsPackAsset {
18
+ id: string;
19
+ source: string;
20
+ name: string;
21
+ executable?: boolean;
22
+ sha256?: string;
23
+ }
24
+
16
25
  export interface ITsPackConfig {
17
26
  schemaVersion: 1;
18
27
  /** Defaults to the package name with its scope separator replaced by a hyphen. */
19
28
  name?: string;
20
29
  outputDirectory?: string;
21
30
  bundles: ITsPackBundle[];
31
+ assets?: ITsPackAsset[];
22
32
  }
23
33
 
24
34
  export interface ITsPackOptions {
@@ -35,6 +45,8 @@ export interface ITsPackFileRecord {
35
45
  }
36
46
 
37
47
  export interface ITsPackArtifact {
48
+ /** Omitted for v1-compatible tar.gz bundles; explicit for standalone files in v2 sets. */
49
+ kind?: 'file';
38
50
  id: string;
39
51
  name: string;
40
52
  sha256: string;
@@ -43,7 +55,7 @@ export interface ITsPackArtifact {
43
55
  }
44
56
 
45
57
  export interface ITsPackManifest {
46
- format: 'tspack.release.v1';
58
+ format: 'tspack.release.v1' | 'tspack.release.v2';
47
59
  packageName: string;
48
60
  name: string;
49
61
  version: string;
package/ts/tspack.cli.ts CHANGED
@@ -36,7 +36,9 @@ export async function runCli(args = process.argv.slice(2)): Promise<void> {
36
36
  ? await pack.verify(directory, { requireRelease: release, expectedManifestSha256 })
37
37
  : (() => { throw new TsPackError('arguments', 'Expected pack or verify with its required arguments.'); })();
38
38
  console.log(JSON.stringify({ directory: result.directory, manifestSha256: result.manifestSha256,
39
- publishable: result.manifest.publishable, reused: result.reused, bundles: result.manifest.artifacts.length }));
39
+ publishable: result.manifest.publishable, reused: result.reused,
40
+ bundles: result.manifest.artifacts.filter((artifact) => artifact.kind !== 'file').length,
41
+ assets: result.manifest.artifacts.filter((artifact) => artifact.kind === 'file').length }));
40
42
  } catch (error) {
41
43
  console.error(error instanceof TsPackError ? `tspack: ${error.code}: ${error.message}` : 'tspack: operation failed.');
42
44
  process.exitCode = 1;
package/ts/validation.ts CHANGED
@@ -18,6 +18,8 @@ export const isName = (value: unknown): value is string => typeof value === 'str
18
18
  export const isVersion = (value: unknown): value is string => typeof value === 'string' && value.length <= 64 && /^\d+\.\d+\.\d+(?:-[a-zA-Z0-9.-]+)?$/.test(value);
19
19
  export const isPath = (value: unknown): value is string => typeof value === 'string' && value.length <= 240 &&
20
20
  /^[a-zA-Z0-9@_+./-]+$/.test(value) && !value.startsWith('/') && value.split('/').every((part) => part && part !== '.' && part !== '..');
21
+ export const isAssetName = (value: unknown): value is string => isPath(value) && !value.includes('/') &&
22
+ !['tspack-manifest.json', 'sha256sums.txt', 'tspack.json'].includes(value.toLowerCase());
21
23
  export const jsonBytes = (value: unknown) => Buffer.from(JSON.stringify(value, null, 2) + '\n');
22
24
 
23
25
  export function object(value: unknown, allowed?: readonly string[]): asserts value is Record<string, unknown> {
@@ -28,13 +30,25 @@ export function object(value: unknown, allowed?: readonly string[]): asserts val
28
30
  'value' in Object.getOwnPropertyDescriptor(value, key)!), 'invalid_config', 'Unexpected record property.');
29
31
  }
30
32
 
31
- export function normalizeConfig(value: unknown, packageName: string): Required<ITsPackConfig> {
32
- object(value, ['schemaVersion', 'name', 'outputDirectory', 'bundles']);
33
+ export function normalizeConfig(value: unknown, packageName: string): Omit<Required<ITsPackConfig>, 'assets'> & Pick<ITsPackConfig, 'assets'> {
34
+ object(value, ['schemaVersion', 'name', 'outputDirectory', 'bundles', 'assets']);
33
35
  const name = value.name ?? packageName.replace(/^@/, '').replace('/', '-');
34
36
  const outputDirectory = value.outputDirectory ?? 'dist_pack';
35
37
  requireValue(value.schemaVersion === 1 && isName(name) && isPath(outputDirectory) &&
36
- Array.isArray(value.bundles) && value.bundles.length > 0 && value.bundles.length <= 128,
38
+ Array.isArray(value.bundles) && value.bundles.length <= 128 &&
39
+ (!Object.hasOwn(value, 'assets') || Array.isArray(value.assets)),
37
40
  'invalid_config', 'Invalid tspack configuration.');
41
+ const assetInputs = (value.assets ?? []) as unknown[];
42
+ requireValue(assetInputs.length + value.bundles.length > 0 && assetInputs.length + value.bundles.length <= 128,
43
+ 'invalid_config', 'A release requires between one and 128 artifacts.');
44
+ const assets = assetInputs.map((asset) => {
45
+ object(asset, ['id', 'source', 'name', 'executable', 'sha256']);
46
+ requireValue(isName(asset.id) && isPath(asset.source) && isAssetName(asset.name) &&
47
+ (!Object.hasOwn(asset, 'executable') || typeof asset.executable === 'boolean') &&
48
+ (!Object.hasOwn(asset, 'sha256') || isDigest(asset.sha256)), 'invalid_config', 'Invalid standalone asset.');
49
+ return { id: asset.id, source: asset.source, name: asset.name, executable: asset.executable === true,
50
+ ...(asset.sha256 ? { sha256: asset.sha256 as string } : {}) };
51
+ }).sort((a, b) => a.id.localeCompare(b.id, 'en'));
38
52
  let count = 0;
39
53
  const bundles = value.bundles.map((bundle: unknown) => {
40
54
  object(bundle, ['id', 'files']);
@@ -54,9 +68,12 @@ export function normalizeConfig(value: unknown, packageName: string): Required<I
54
68
  'invalid_config', 'Bundle paths collide.');
55
69
  return { id: bundle.id, files };
56
70
  }).sort((a, b) => a.id.localeCompare(b.id, 'en'));
57
- requireValue(count <= limits.files && new Set(bundles.map((bundle) => bundle.id)).size === bundles.length,
71
+ const ids = [...bundles, ...assets].map((artifact) => artifact.id);
72
+ requireValue(count + assets.length <= limits.files && new Set(ids).size === ids.length &&
73
+ new Set(assets.map((asset) => asset.name.toLowerCase())).size === assets.length,
58
74
  'invalid_config', 'Too many files or duplicate bundle identifiers.');
59
- return { schemaVersion: 1, name, outputDirectory, bundles };
75
+ // Omit an empty extension so archive-only v1 configuration hashes remain unchanged.
76
+ return { schemaVersion: 1, name, outputDirectory, bundles, ...(assets.length ? { assets } : {}) };
60
77
  }
61
78
 
62
79
  export function validateFileRecord(value: unknown): asserts value is ITsPackFileRecord {
@@ -68,7 +85,7 @@ export function validateFileRecord(value: unknown): asserts value is ITsPackFile
68
85
 
69
86
  export function validateManifest(value: unknown): asserts value is ITsPackManifest {
70
87
  object(value, ['format', 'packageName', 'name', 'version', 'sourceCommit', 'sourceDirty', 'publishable', 'configurationSha256', 'artifacts']);
71
- requireValue(value.format === 'tspack.release.v1' && typeof value.packageName === 'string' && value.packageName.length <= 214 &&
88
+ requireValue(['tspack.release.v1', 'tspack.release.v2'].includes(value.format as string) && typeof value.packageName === 'string' && value.packageName.length <= 214 &&
72
89
  isName(value.name) && isVersion(value.version) && isCommit(value.sourceCommit) &&
73
90
  typeof value.sourceDirty === 'boolean' && typeof value.publishable === 'boolean' &&
74
91
  (!value.publishable || !value.sourceDirty) && isDigest(value.configurationSha256) &&
@@ -78,16 +95,30 @@ export function validateManifest(value: unknown): asserts value is ITsPackManife
78
95
  const names = new Set();
79
96
  let total = 0;
80
97
  let count = 0;
98
+ let standaloneCount = 0;
81
99
  for (const artifact of value.artifacts) {
82
- object(artifact, ['id', 'name', 'sha256', 'size', 'files']);
100
+ object(artifact, ['id', 'name', 'sha256', 'size', 'files', ...(value.format === 'tspack.release.v2' ? ['kind'] : [])]);
101
+ requireValue(!Object.hasOwn(artifact, 'kind') || artifact.kind === 'file', 'invalid_manifest', 'Invalid artifact kind.');
102
+ const standalone = artifact.kind === 'file';
83
103
  requireValue(isName(artifact.id) && !ids.has(artifact.id) &&
84
- isPath(artifact.name) && artifact.name === `${value.name}-${value.version}-${artifact.id}.tar.gz` && !names.has(artifact.name) &&
104
+ isPath(artifact.name) && (standalone ? isAssetName(artifact.name) : artifact.name === `${value.name}-${value.version}-${artifact.id}.tar.gz`) &&
105
+ !names.has(artifact.name.toLowerCase()) &&
85
106
  isDigest(artifact.sha256) && typeof artifact.size === 'number' && Number.isSafeInteger(artifact.size) &&
86
- artifact.size > 0 && artifact.size <= limits.total, 'invalid_manifest', 'Invalid archive identity.');
87
- ids.add(artifact.id); names.add(artifact.name);
107
+ (standalone ? artifact.size >= 0 && artifact.size <= limits.file : artifact.size > 0 && artifact.size <= limits.total),
108
+ 'invalid_manifest', 'Invalid artifact identity.');
109
+ ids.add(artifact.id); names.add(artifact.name.toLowerCase());
88
110
  object(artifact.files);
89
111
  const fileRecords = artifact.files;
90
112
  const paths = Object.keys(fileRecords);
113
+ if (standalone) {
114
+ standaloneCount++;
115
+ requireValue(paths.length === 1 && paths[0] === artifact.name, 'invalid_manifest', 'A standalone asset requires its exact file record.');
116
+ const record = fileRecords[artifact.name];
117
+ validateFileRecord(record);
118
+ requireValue(record.sha256 === artifact.sha256 && record.size === artifact.size, 'invalid_manifest', 'Standalone file identities disagree.');
119
+ total += record.size; count++;
120
+ continue;
121
+ }
91
122
  requireValue(Object.hasOwn(artifact.files, 'tspack.json') && paths.length > 1,
92
123
  'invalid_manifest', 'Bundle metadata or selected files are missing.');
93
124
  requireValue(paths.every((name) => name.split('/').slice(0, -1).every((_part, index, parents) =>
@@ -99,6 +130,7 @@ export function validateManifest(value: unknown): asserts value is ITsPackManife
99
130
  total += record.size; count++;
100
131
  }
101
132
  }
133
+ requireValue(value.format === 'tspack.release.v1' || standaloneCount > 0, 'invalid_manifest', 'Manifest v2 requires a standalone asset.');
102
134
  requireValue(total <= limits.total && count <= limits.files + 128, 'invalid_manifest', 'Artifact set exceeds its limits.');
103
135
  }
104
136
 
package/readme.plan.md DELETED
@@ -1,26 +0,0 @@
1
- # tspack implementation
2
-
3
- Create the shared owner for packaging existing executables and supporting assets.
4
- TsDeno and TsRust retain compilation; GitZone and CI retain publication. Pallet
5
- will consume the published tool instead of maintaining its own archive scripts.
6
-
7
- - Expose a typed TsPack API and `tspack pack` / `tspack verify` CLI, configured
8
- under `@git.zone/tspack` in `.smartconfig.json`.
9
- - Package explicit file sets into deterministic streaming tar.gz bundles using
10
- SmartArchive's public streaming API. Preserve executable roles, hash every file,
11
- reject unsafe paths and changed inputs, and publish output directories atomically.
12
- - Record package/version, Git source identity, configuration identity, bundle
13
- contents and archive hashes in a sealed artifact set. Release mode requires a
14
- clean matching tag; development artifacts remain explicitly unpublishable.
15
- - Verify both archive bytes and every declared member without extracting paths.
16
- Reuse a retained sealed release set only after verification; never substitute
17
- freshly rebuilt bytes into an existing immutable release.
18
- - Include only explicitly selected assets/notices. Do not automatically disclose
19
- application source, vendor dependency trees or rebuild runtimes for LGPL.
20
- - Test real archives, deterministic repacking, corruption, unsafe paths, closed
21
- file sets, stale/dirty release identities and retained-output reuse. Build and
22
- type-check directly, run stable checker gates, release the tool, then consume it.
23
-
24
- Global policy now accepts LGPL; its specific obligations remain separate from
25
- license acceptance. The previous Pallet runtime-reconstruction experiment was
26
- stopped and its uncommitted distribution prototype removed from active source.