@foss.global/codefeed 5.3.0 → 5.4.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.
- package/changelog.md +22 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.giteasourceinventory.d.ts +11 -1
- package/dist_ts/classes.giteasourceinventory.js +77 -10
- package/dist_ts/classes.giteasourcetransfer.js +8 -103
- package/dist_ts/forgeinventory.transfer.d.ts +24 -0
- package/dist_ts/forgeinventory.transfer.js +77 -1
- package/dist_ts/giteasourceinventory.packages.d.ts +49 -0
- package/dist_ts/giteasourceinventory.packages.js +180 -1
- package/dist_ts/giteasourcetransfer.documents.d.ts +19 -4
- package/dist_ts/giteasourcetransfer.documents.js +49 -5
- package/package.json +3 -3
- package/readme.md +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.giteasourceinventory.ts +100 -14
- package/ts/classes.giteasourcetransfer.ts +10 -104
- package/ts/forgeinventory.transfer.ts +88 -0
- package/ts/giteasourceinventory.packages.ts +168 -0
- package/ts/giteasourcetransfer.documents.ts +47 -4
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import * as validation from './forgeinventory.validation.js';
|
|
3
|
+
import { swiftManifestKey } from './giteasourcetransfer.documents.js';
|
|
3
4
|
/** Media types Gitea serves an index or a manifest list as; an index candidate must be one of them. */
|
|
4
5
|
export const containerIndexMediaTypes = Object.freeze([
|
|
5
6
|
'application/vnd.oci.image.index.v1+json',
|
|
@@ -50,6 +51,184 @@ export const swiftPackageParts = (nameArg) => {
|
|
|
50
51
|
throw new validation.ForgeInventoryError('invalid-swift-name');
|
|
51
52
|
return { scope: match[1], name: match[2] };
|
|
52
53
|
};
|
|
54
|
+
/**
|
|
55
|
+
* A Swift release's `Package.swift`, or with `swiftVersionArg` its alternate
|
|
56
|
+
* manifest, read with `clientArg`'s `token` authorization; null when Gitea
|
|
57
|
+
* redirects the alternate one to the release's own `Package.swift` (303),
|
|
58
|
+
* which is how it answers a version it holds no manifest for. No redirect is
|
|
59
|
+
* followed: any other redirect rejects with `swift-manifest-redirect-unexpected`,
|
|
60
|
+
* a redirect of `Package.swift` itself with `http-<status>`, and a body that
|
|
61
|
+
* is not `text/x-swift` with `invalid-content-type`. The read counts no
|
|
62
|
+
* download.
|
|
63
|
+
*/
|
|
64
|
+
export const readSwiftManifest = async (clientArg, baseUrlArg, ownerArg, partsArg, versionArg, swiftVersionArg, signalArg) => {
|
|
65
|
+
const url = new URL(`${baseUrlArg}/api/packages/${encodeURIComponent(ownerArg)}/swift/${encodeURIComponent(partsArg.scope)}/${encodeURIComponent(partsArg.name)}/${encodeURIComponent(versionArg)}/Package.swift`);
|
|
66
|
+
if (swiftVersionArg !== null)
|
|
67
|
+
url.searchParams.set('swift-version', swiftVersionArg);
|
|
68
|
+
const response = await clientArg.requestBytesOrRedirect(url, { accept: 'application/vnd.swift.registry.v1+swift', signal: signalArg });
|
|
69
|
+
if (response.kind === 'redirect') {
|
|
70
|
+
if (swiftVersionArg === null)
|
|
71
|
+
throw new validation.ForgeInventoryError(`http-${response.status}`);
|
|
72
|
+
// Gitea's answer for a missing alternate manifest: 303 to the release's
|
|
73
|
+
// `Package.swift` under its configured root, with the owner lowercased
|
|
74
|
+
// and scope, name and version as the request named them.
|
|
75
|
+
const expected = new URL(`${baseUrlArg}/api/packages/${ownerArg.toLowerCase()}/swift/${partsArg.scope}/${partsArg.name}/${versionArg}/Package.swift`);
|
|
76
|
+
let location = null;
|
|
77
|
+
try {
|
|
78
|
+
location = response.location === null ? null : new URL(response.location, url);
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
location = null;
|
|
82
|
+
}
|
|
83
|
+
if (response.status !== 303 || location === null || location.href !== expected.href) {
|
|
84
|
+
throw new validation.ForgeInventoryError('swift-manifest-redirect-unexpected');
|
|
85
|
+
}
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
if (response.mediaType !== 'text/x-swift')
|
|
89
|
+
throw new validation.ForgeInventoryError('invalid-content-type');
|
|
90
|
+
return { bytes: response.bytes, mediaType: 'text/x-swift' };
|
|
91
|
+
};
|
|
92
|
+
/** Distinct manifest keys read per Swift version, `''` included; Gitea keeps at most 64 manifests (`maxManifestFiles`). */
|
|
93
|
+
const maxSwiftManifestCandidates = 64;
|
|
94
|
+
/**
|
|
95
|
+
* The name of every central-directory entry of a zip archive, in directory
|
|
96
|
+
* order, each byte one code unit (Go strings are bytes, and only ASCII names
|
|
97
|
+
* can match `manifestPattern`). It reads the directory as Go 1.27.2's
|
|
98
|
+
* `archive/zip` `NewReader` does, the archive/zip Gitea 28.2.0 builds with:
|
|
99
|
+
* - the end record is the last signature in the final 65 KiB whose comment
|
|
100
|
+
* fits in the archive;
|
|
101
|
+
* - its zip64 locator and end record are used when a count, size or offset
|
|
102
|
+
* is saturated and a locator for disk 0 of 1 sits right before it;
|
|
103
|
+
* - the base offset of data prepended to the archive is the end record's
|
|
104
|
+
* position minus the directory's size and offset, unless a directory
|
|
105
|
+
* header sits at the unadjusted offset;
|
|
106
|
+
* - headers are read one after another until one is malformed or cut off
|
|
107
|
+
* (a zip64 field too short for the saturated sizes and offset it stands
|
|
108
|
+
* for is malformed), and their count must agree with the end record's in
|
|
109
|
+
* its low 16 bits.
|
|
110
|
+
* Anything Go refuses rejects with `swift-archive-invalid`.
|
|
111
|
+
*/
|
|
112
|
+
export const zipEntryNames = (archiveArg) => {
|
|
113
|
+
const invalid = () => new validation.ForgeInventoryError('swift-archive-invalid');
|
|
114
|
+
const size = archiveArg.byteLength;
|
|
115
|
+
const sizeBig = BigInt(size);
|
|
116
|
+
let endOffset = -1;
|
|
117
|
+
for (let index = size - 22; index >= Math.max(0, size - 65 * 1024); index--) {
|
|
118
|
+
if (archiveArg.readUInt32LE(index) === 0x06054b50) {
|
|
119
|
+
endOffset = index;
|
|
120
|
+
break;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
if (endOffset < 0 || endOffset + 22 + archiveArg.readUInt16LE(endOffset + 20) > size)
|
|
124
|
+
throw invalid();
|
|
125
|
+
let directoryEnd = BigInt(endOffset);
|
|
126
|
+
let records = BigInt(archiveArg.readUInt16LE(endOffset + 10));
|
|
127
|
+
let directorySize = BigInt(archiveArg.readUInt32LE(endOffset + 12));
|
|
128
|
+
let directoryOffset = BigInt(archiveArg.readUInt32LE(endOffset + 16));
|
|
129
|
+
if (records === 0xffffn || directorySize === 0xffffffffn || directoryOffset === 0xffffffffn) {
|
|
130
|
+
const locator = endOffset - 20;
|
|
131
|
+
if (locator >= 0 && archiveArg.readUInt32LE(locator) === 0x07064b50 && archiveArg.readUInt32LE(locator + 4) === 0
|
|
132
|
+
&& archiveArg.readUInt32LE(locator + 16) === 1) {
|
|
133
|
+
// Go reads the offset as an int64: one past its range is negative and leaves the archive as zip32.
|
|
134
|
+
const record = archiveArg.readBigInt64LE(locator + 8);
|
|
135
|
+
if (record >= 0n) {
|
|
136
|
+
if (record + 56n > sizeBig || archiveArg.readUInt32LE(Number(record)) !== 0x06064b50)
|
|
137
|
+
throw invalid();
|
|
138
|
+
directoryEnd = record;
|
|
139
|
+
records = archiveArg.readBigUInt64LE(Number(record) + 32);
|
|
140
|
+
directorySize = archiveArg.readBigUInt64LE(Number(record) + 40);
|
|
141
|
+
directoryOffset = archiveArg.readBigUInt64LE(Number(record) + 48);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
if (directorySize > 0x7fffffffffffffffn || directoryOffset > 0x7fffffffffffffffn)
|
|
146
|
+
throw invalid();
|
|
147
|
+
let baseOffset = directoryEnd - directorySize - directoryOffset;
|
|
148
|
+
if (baseOffset + directoryOffset < 0n || baseOffset + directoryOffset >= sizeBig)
|
|
149
|
+
throw invalid();
|
|
150
|
+
if (baseOffset > 0n && directoryHeader(archiveArg, Number(directoryOffset)).kind === 'entry')
|
|
151
|
+
baseOffset = 0n;
|
|
152
|
+
const names = [];
|
|
153
|
+
let offset = Number(baseOffset + directoryOffset);
|
|
154
|
+
while (true) {
|
|
155
|
+
const header = directoryHeader(archiveArg, offset);
|
|
156
|
+
if (header.kind === 'end')
|
|
157
|
+
break;
|
|
158
|
+
// Go's `io.ReadFull` reports a read that gets no byte at all as `io.EOF`, which fails the archive.
|
|
159
|
+
if (header.kind === 'eof')
|
|
160
|
+
throw invalid();
|
|
161
|
+
names.push(header.name);
|
|
162
|
+
offset = header.next;
|
|
163
|
+
}
|
|
164
|
+
if ((BigInt(names.length) & 0xffffn) !== (records & 0xffffn))
|
|
165
|
+
throw invalid();
|
|
166
|
+
return names;
|
|
167
|
+
};
|
|
168
|
+
/**
|
|
169
|
+
* The central-directory header at `offsetArg`, as Go 1.27.2's
|
|
170
|
+
* `readDirectoryHeader` reads it: `entry` with its name and the offset of the
|
|
171
|
+
* next header; `end` where Go stops reading headers (a header cut off by the
|
|
172
|
+
* archive's end, another signature, or a zip64 field shorter than 8 bytes for
|
|
173
|
+
* each saturated size and offset); `eof` where a read gets no byte at all.
|
|
174
|
+
*/
|
|
175
|
+
const directoryHeader = (archiveArg, offsetArg) => {
|
|
176
|
+
const available = archiveArg.byteLength - offsetArg;
|
|
177
|
+
if (available <= 0)
|
|
178
|
+
return { kind: 'eof' };
|
|
179
|
+
if (available < 46)
|
|
180
|
+
return { kind: 'end' };
|
|
181
|
+
if (archiveArg.readUInt32LE(offsetArg) !== 0x02014b50)
|
|
182
|
+
return { kind: 'end' };
|
|
183
|
+
const nameLength = archiveArg.readUInt16LE(offsetArg + 28);
|
|
184
|
+
const extraLength = archiveArg.readUInt16LE(offsetArg + 30);
|
|
185
|
+
const commentLength = archiveArg.readUInt16LE(offsetArg + 32);
|
|
186
|
+
const variable = nameLength + extraLength + commentLength;
|
|
187
|
+
if (variable > 0 && available === 46)
|
|
188
|
+
return { kind: 'eof' };
|
|
189
|
+
if (available - 46 < variable)
|
|
190
|
+
return { kind: 'end' };
|
|
191
|
+
const saturated = [20, 24, 42].filter((fieldArg) => archiveArg.readUInt32LE(offsetArg + fieldArg) === 0xffffffff).length;
|
|
192
|
+
let extra = offsetArg + 46 + nameLength;
|
|
193
|
+
const extraEnd = extra + extraLength;
|
|
194
|
+
while (extraEnd - extra >= 4) {
|
|
195
|
+
const tag = archiveArg.readUInt16LE(extra);
|
|
196
|
+
const fieldSize = archiveArg.readUInt16LE(extra + 2);
|
|
197
|
+
extra += 4;
|
|
198
|
+
if (extraEnd - extra < fieldSize)
|
|
199
|
+
break;
|
|
200
|
+
// The zip64 field holds 8 bytes for each saturated field, in order.
|
|
201
|
+
if (tag === 0x0001 && fieldSize < 8 * saturated)
|
|
202
|
+
return { kind: 'end' };
|
|
203
|
+
extra += fieldSize;
|
|
204
|
+
}
|
|
205
|
+
return { kind: 'entry', name: archiveArg.toString('latin1', offsetArg + 46, offsetArg + 46 + nameLength), next: offsetArg + 46 + variable };
|
|
206
|
+
};
|
|
207
|
+
/**
|
|
208
|
+
* The keys of the manifests Gitea 28.2.0 may hold for a Swift source
|
|
209
|
+
* archive, sorted in code-unit order: `''`, and the key of every
|
|
210
|
+
* central-directory entry, in any directory, whose name does not end in `/`
|
|
211
|
+
* and whose base name matches Gitea's `manifestPattern` and parses
|
|
212
|
+
* (`swiftManifestKey`). Gitea keeps only the manifests of the shallowest
|
|
213
|
+
* directory, so the keys are a superset of what it holds, and its answer for
|
|
214
|
+
* each key decides. More than `maxSwiftManifestCandidates` distinct keys
|
|
215
|
+
* reject with `swift-manifest-candidates-over-bound`; an archive Go's
|
|
216
|
+
* `archive/zip` refuses with `swift-archive-invalid`.
|
|
217
|
+
*/
|
|
218
|
+
export const swiftManifestCandidates = (archiveArg) => {
|
|
219
|
+
const keys = new Set(['']);
|
|
220
|
+
for (const name of zipEntryNames(archiveArg)) {
|
|
221
|
+
if (name.endsWith('/'))
|
|
222
|
+
continue;
|
|
223
|
+
const key = swiftManifestKey(name.slice(name.lastIndexOf('/') + 1));
|
|
224
|
+
if (key === null)
|
|
225
|
+
continue;
|
|
226
|
+
keys.add(key);
|
|
227
|
+
if (keys.size > maxSwiftManifestCandidates)
|
|
228
|
+
throw new validation.ForgeInventoryError('swift-manifest-candidates-over-bound');
|
|
229
|
+
}
|
|
230
|
+
return [...keys].sort(compareText);
|
|
231
|
+
};
|
|
53
232
|
/**
|
|
54
233
|
* The digest of the manifest a container version holds: `sha256:` and the
|
|
55
234
|
* SHA-256 of the blob holding the version's `manifest.json`; null for a
|
|
@@ -136,4 +315,4 @@ export const composeGiteaPackageContent = (discoveredArg, packagesArg) => {
|
|
|
136
315
|
owners: owners.map((ownerArg) => ({ owner: ownerArg, ...group(refs.filter((refArg) => refArg.owner === ownerArg), records) })),
|
|
137
316
|
};
|
|
138
317
|
};
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"giteasourceinventory.packages.js","sourceRoot":"","sources":["../ts/giteasourceinventory.packages.ts"],"names":[],"mappings":"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"}
|
|
318
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"giteasourceinventory.packages.js","sourceRoot":"","sources":["../ts/giteasourceinventory.packages.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,8 +28,23 @@ export interface IGiteaCanonicalPackageDocument {
|
|
|
28
28
|
*/
|
|
29
29
|
export declare const canonicalPackageDocument: (kindArg: TGiteaCanonicalPackageDocumentKind, bytesArg: Uint8Array) => IGiteaCanonicalPackageDocument;
|
|
30
30
|
/**
|
|
31
|
-
*
|
|
32
|
-
*
|
|
33
|
-
*
|
|
31
|
+
* Whether `valueArg` is a Swift version Gitea 28.2.0 can key an alternate
|
|
32
|
+
* manifest (`Package@swift-<v>.swift`) by. Gitea parses the file name's
|
|
33
|
+
* version with go-version's `NewSemver`, refuses an archive whose version
|
|
34
|
+
* does not parse (`ErrInvalidManifestVersion`), and keys the manifest by
|
|
35
|
+
* `TrimmedVersionString`: major and minor, and the patch only when it is not
|
|
36
|
+
* zero, each in decimal without leading zeros (`modules/packages/swift/metadata.go`).
|
|
37
|
+
* So a key has two or three segments, no leading zeros, no zero patch, and
|
|
38
|
+
* every segment at most 9223372036854775807, compared by value.
|
|
34
39
|
*/
|
|
35
|
-
export declare const
|
|
40
|
+
export declare const isSwiftManifestVersion: (valueArg: unknown) => valueArg is string;
|
|
41
|
+
/**
|
|
42
|
+
* The key Gitea 28.2.0 would hold a manifest with base name `baseNameArg`
|
|
43
|
+
* by: `''` for `Package.swift`; for `Package@swift-<v>.swift`, `<v>` parsed
|
|
44
|
+
* as go-version's `NewSemver` parses it (leading zeros allowed, every segment
|
|
45
|
+
* a signed 64-bit integer, missing segments zero) and written as
|
|
46
|
+
* `TrimmedVersionString` writes it, a key `isSwiftManifestVersion` accepts.
|
|
47
|
+
* Null when the name is not a manifest name, or when a segment is over int64,
|
|
48
|
+
* which `NewSemver` refuses, so Gitea can never hold the key.
|
|
49
|
+
*/
|
|
50
|
+
export declare const swiftManifestKey: (baseNameArg: string) => string | null;
|
|
@@ -78,9 +78,53 @@ export const canonicalPackageDocument = (kindArg, bytesArg) => {
|
|
|
78
78
|
return { bytes, sha256: plugins.crypto.createHash('sha256').update(bytes).digest('hex') };
|
|
79
79
|
};
|
|
80
80
|
/**
|
|
81
|
-
*
|
|
82
|
-
*
|
|
83
|
-
*
|
|
81
|
+
* The largest segment Gitea's version parser reads: hashicorp/go-version
|
|
82
|
+
* (v1.9.0 in Gitea 28.2.0) parses every segment as a signed 64-bit integer
|
|
83
|
+
* and refuses a larger one.
|
|
84
84
|
*/
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
const maxSwiftVersionSegment = 9223372036854775807n;
|
|
86
|
+
/** Major and minor, and an optional patch, in decimal without leading zeros. */
|
|
87
|
+
const trimmedSwiftVersionShape = /^(0|[1-9]\d*)\.(0|[1-9]\d*)(?:\.([1-9]\d*))?$/;
|
|
88
|
+
/**
|
|
89
|
+
* Whether `valueArg` is a Swift version Gitea 28.2.0 can key an alternate
|
|
90
|
+
* manifest (`Package@swift-<v>.swift`) by. Gitea parses the file name's
|
|
91
|
+
* version with go-version's `NewSemver`, refuses an archive whose version
|
|
92
|
+
* does not parse (`ErrInvalidManifestVersion`), and keys the manifest by
|
|
93
|
+
* `TrimmedVersionString`: major and minor, and the patch only when it is not
|
|
94
|
+
* zero, each in decimal without leading zeros (`modules/packages/swift/metadata.go`).
|
|
95
|
+
* So a key has two or three segments, no leading zeros, no zero patch, and
|
|
96
|
+
* every segment at most 9223372036854775807, compared by value.
|
|
97
|
+
*/
|
|
98
|
+
export const isSwiftManifestVersion = (valueArg) => {
|
|
99
|
+
if (typeof valueArg !== 'string')
|
|
100
|
+
return false;
|
|
101
|
+
const match = trimmedSwiftVersionShape.exec(valueArg);
|
|
102
|
+
if (!match)
|
|
103
|
+
return false;
|
|
104
|
+
return match.slice(1).every((segmentArg) => segmentArg === undefined || BigInt(segmentArg) <= maxSwiftVersionSegment);
|
|
105
|
+
};
|
|
106
|
+
/** Gitea 28.2.0's `manifestPattern` (`modules/packages/swift/metadata.go:27`), matched against a file's base name. */
|
|
107
|
+
const swiftManifestNamePattern = /^Package(?:@swift-(\d+(?:\.\d+)?(?:\.\d+)?))?\.swift$/;
|
|
108
|
+
/**
|
|
109
|
+
* The key Gitea 28.2.0 would hold a manifest with base name `baseNameArg`
|
|
110
|
+
* by: `''` for `Package.swift`; for `Package@swift-<v>.swift`, `<v>` parsed
|
|
111
|
+
* as go-version's `NewSemver` parses it (leading zeros allowed, every segment
|
|
112
|
+
* a signed 64-bit integer, missing segments zero) and written as
|
|
113
|
+
* `TrimmedVersionString` writes it, a key `isSwiftManifestVersion` accepts.
|
|
114
|
+
* Null when the name is not a manifest name, or when a segment is over int64,
|
|
115
|
+
* which `NewSemver` refuses, so Gitea can never hold the key.
|
|
116
|
+
*/
|
|
117
|
+
export const swiftManifestKey = (baseNameArg) => {
|
|
118
|
+
const match = swiftManifestNamePattern.exec(baseNameArg);
|
|
119
|
+
if (!match)
|
|
120
|
+
return null;
|
|
121
|
+
if (match[1] === undefined)
|
|
122
|
+
return '';
|
|
123
|
+
const segments = match[1].split('.').map((segmentArg) => BigInt(segmentArg));
|
|
124
|
+
if (segments.some((segmentArg) => segmentArg > maxSwiftVersionSegment))
|
|
125
|
+
return null;
|
|
126
|
+
const [major, minor = 0n, patch = 0n] = segments;
|
|
127
|
+
const key = patch === 0n ? `${major}.${minor}` : `${major}.${minor}.${patch}`;
|
|
128
|
+
return isSwiftManifestVersion(key) ? key : null;
|
|
129
|
+
};
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0ZWFzb3VyY2V0cmFuc2Zlci5kb2N1bWVudHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9naXRlYXNvdXJjZXRyYW5zZmVyLmRvY3VtZW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssVUFBVSxNQUFNLGdDQUFnQyxDQUFDO0FBaUI3RDs7OztHQUlHO0FBQ0gsTUFBTSxtQkFBbUIsR0FBd0UsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUM3RyxhQUFhLEVBQUUsWUFBWTtJQUMzQixlQUFlLEVBQUUsSUFBSTtJQUNyQixtQkFBbUIsRUFBRSxRQUFRO0lBQzdCLG1CQUFtQixFQUFFLElBQUk7Q0FDMUIsQ0FBQyxDQUFDO0FBRUg7OztHQUdHO0FBQ0gsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLE9BQWUsRUFBRSxRQUFnQixFQUFVLEVBQUU7SUFDdEUsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDO0lBQ2IsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsT0FBTyxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sSUFBSSxLQUFLLEdBQUcsUUFBUSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ3hELE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFFLENBQUM7UUFDN0MsTUFBTSxVQUFVLEdBQUcsUUFBUSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUUsQ0FBQztRQUNoRCxJQUFJLFNBQVMsS0FBSyxVQUFVO1lBQUUsT0FBTyxTQUFTLEdBQUcsVUFBVSxDQUFDO1FBQzVELElBQUksSUFBSSxTQUFTLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNuQyxLQUFLLElBQUksVUFBVSxHQUFHLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENB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LEdBQUcsQ0FBQyxDQUFDLFVBQVUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7SUFDN0UsSUFBSSxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQyxVQUFVLEdBQUcsc0JBQXNCLENBQUM7UUFBRSxPQUFPLElBQUksQ0FBQztJQUNwRixNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssR0FBRyxFQUFFLEVBQUUsS0FBSyxHQUFHLEVBQUUsQ0FBQyxHQUFHLFFBQVEsQ0FBQztJQUNqRCxNQUFNLEdBQUcsR0FBRyxLQUFLLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLElBQUksS0FBSyxJQUFJLEtBQUssRUFBRSxDQUFDO0lBQzlFLE9BQU8sc0JBQXNCLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0FBQ2xELENBQUMsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@foss.global/codefeed",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.4.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The @foss.global/codefeed module generates commit/activity feeds from forge providers including Gitea and GitManager.",
|
|
6
6
|
"exports": {
|
|
@@ -11,14 +11,14 @@
|
|
|
11
11
|
"author": "Task Venture Capital GmbH",
|
|
12
12
|
"license": "MIT",
|
|
13
13
|
"devDependencies": {
|
|
14
|
-
"@foss.global/forgefixtures": "^1.
|
|
14
|
+
"@foss.global/forgefixtures": "^1.1.0",
|
|
15
15
|
"@git.zone/tsrepo": "^2.1.0",
|
|
16
16
|
"@push.rocks/qenv": "^8.2.1",
|
|
17
17
|
"@types/node": "^26.6.6"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@foss.global/gitmanager": "^2.4.0",
|
|
21
|
-
"@foss.global/interfaces": "^3.
|
|
21
|
+
"@foss.global/interfaces": "^3.3.0",
|
|
22
22
|
"@push.rocks/lik": "^6.4.4",
|
|
23
23
|
"@push.rocks/smartnpm": "^2.1.3",
|
|
24
24
|
"@push.rocks/smarttime": "^5.0.1"
|
package/readme.md
CHANGED
|
@@ -200,7 +200,7 @@ The package reads take selectors from the inventory's package records: the packa
|
|
|
200
200
|
- `readPackageDocument(package, version, kind, options?)` returns a version's metadata with the SHA-256 of the returned bytes, which a consumer records beside the version id:
|
|
201
201
|
- `npm-version`: the version document.
|
|
202
202
|
- `swift-release`: the release metadata.
|
|
203
|
-
- `swift-manifest`: `Package.swift`, which must answer 200. With `{ swiftVersion }` (`5.8`, `5.9.1`: trimmed as Gitea keys alternate manifests, the patch only when it is not zero; anything else rejects with `swift-version-invalid` before any request) it reads `Package@swift-<v>.swift` through `?swift-version=` without following a redirect, and resolves `null` only when Gitea answers 303 to the release's own `Package.swift` URL, its answer for a version it holds no manifest for. Any other redirect rejects with `swift-manifest-redirect-unexpected`, any other status with `http-<status>`.
|
|
203
|
+
- `swift-manifest`: `Package.swift`, which must answer 200. With `{ swiftVersion }` (`5.8`, `5.9.1`: trimmed as Gitea keys alternate manifests, two or three segments without leading zeros, the patch only when it is not zero, each segment at most 9223372036854775807; anything else rejects with `swift-version-invalid` before any request) it reads `Package@swift-<v>.swift` through `?swift-version=` without following a redirect, and resolves `null` only when Gitea answers 303 to the release's own `Package.swift` URL, its answer for a version it holds no manifest for. Any other redirect rejects with `swift-manifest-redirect-unexpected`, any other status with `http-<status>`.
|
|
204
204
|
- `cargo-index-entry`: the version's line of the sparse index; a missing line rejects with `package-document-missing`.
|
|
205
205
|
- `cargo-description`: `{"description":…}` from the crate's entry in the Cargo search (`api/v1/crates?q=<name>`, the entry with exactly that name, read page by page, at most 200 pages of 50). Gitea's search describes only the version with the highest id, so its `max_version` must be the requested version; otherwise, or when no entry has the name, it rejects with `package-document-missing`, and a search that has not run out after 200 pages with `cargo-search-over-bound`.
|
|
206
206
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,9 +3,11 @@ import * as transport from './forgeinventory.transport.js';
|
|
|
3
3
|
import * as validation from './forgeinventory.validation.js';
|
|
4
4
|
import { ForgeRequestClient } from './forgeinventory.client.js';
|
|
5
5
|
import type { IForgeRequestMetrics, IForgeRequestOptions } from './forgeinventory.client.js';
|
|
6
|
+
import { verifiedPackageDownload } from './forgeinventory.transfer.js';
|
|
6
7
|
import { measureGiteaMirror } from './giteasourceinventory.git.js';
|
|
7
8
|
import {
|
|
8
9
|
cargoIndexPath, comparePackages, composeGiteaPackageContent, containerIndexMediaTypes, npmPackagePath, packageKey, packageTypePattern,
|
|
10
|
+
readSwiftManifest, swiftManifestCandidates, swiftPackageParts,
|
|
9
11
|
} from './giteasourceinventory.packages.js';
|
|
10
12
|
|
|
11
13
|
type TMeasure = plugins.fossInterfaces.data.TForgeSourceMeasure;
|
|
@@ -32,6 +34,7 @@ type IPackageRef = plugins.fossInterfaces.data.IForgeSourcePackageRef;
|
|
|
32
34
|
type IPackageRecord = plugins.fossInterfaces.data.IForgeSourcePackageInventory;
|
|
33
35
|
type IPackageVersion = plugins.fossInterfaces.data.IForgeSourcePackageVersion;
|
|
34
36
|
type IPackageBlob = plugins.fossInterfaces.data.IForgeSourcePackageBlob;
|
|
37
|
+
type ISwiftManifest = plugins.fossInterfaces.data.IForgeSourceSwiftManifest;
|
|
35
38
|
|
|
36
39
|
export interface IGiteaSourceInventoryOptions {
|
|
37
40
|
/** Operator-assigned identity of the source instance. */
|
|
@@ -58,8 +61,18 @@ export interface IGiteaSourceInventoryOptions {
|
|
|
58
61
|
pageSize?: number;
|
|
59
62
|
/** Pages read per listing before the listing counts as partial. */
|
|
60
63
|
maxPages?: number;
|
|
64
|
+
/** Deadline of one REST, registry or LFS batch request, and the idle limit of a Swift archive download; defaults to 60 s, at most 300 s. */
|
|
61
65
|
requestTimeoutMs?: number;
|
|
62
66
|
maxResponseBytes?: number;
|
|
67
|
+
/**
|
|
68
|
+
* The largest Swift source archive, in bytes, that the inventory reads for
|
|
69
|
+
* the version's `manifests`; defaults to 128 MiB, at most 1 GiB. A version
|
|
70
|
+
* whose recorded archive is larger is not read and records `manifests:
|
|
71
|
+
* null`. A consumer passes the cap its own store puts on an archive.
|
|
72
|
+
*/
|
|
73
|
+
maxSwiftArchiveBytes?: number;
|
|
74
|
+
/** Wall-clock limit of one Swift archive download; defaults to 30 minutes, at most six hours. */
|
|
75
|
+
packageTransferTimeoutMs?: number;
|
|
63
76
|
}
|
|
64
77
|
|
|
65
78
|
/** A class of source data a run measures only when its discovery selects it. */
|
|
@@ -88,6 +101,9 @@ export type TGiteaSourceRepositoryLookup =
|
|
|
88
101
|
| { status: 'present'; id: string; owner: string; name: string }
|
|
89
102
|
| { status: 'absent'; id: string };
|
|
90
103
|
|
|
104
|
+
/** A file of a version as its listing reports it: the name, and the content's SHA-256 and size as a canonical decimal. */
|
|
105
|
+
interface IVersionFile { name: string; sha256: string; size: string }
|
|
106
|
+
|
|
91
107
|
interface IListing {
|
|
92
108
|
items: unknown[];
|
|
93
109
|
/** A sanitized reason when the listing did not finish. */
|
|
@@ -415,11 +431,13 @@ const compareText = (aArg: string, bArg: string): number => aArg < bArg ? -1 : a
|
|
|
415
431
|
export class GiteaSourceInventory {
|
|
416
432
|
readonly #options: {
|
|
417
433
|
instanceId: string; baseUrl: string; pageSize: number; maxPages: number; requestTimeoutMs: number; maxResponseBytes: number;
|
|
418
|
-
token: string; caCertificates?: string[]; gitWorkDir: string; gitTimeoutMs: number;
|
|
434
|
+
token: string; caCertificates?: string[]; gitWorkDir: string; gitTimeoutMs: number; maxSwiftArchiveBytes: number; packageTransferTimeoutMs: number;
|
|
419
435
|
};
|
|
420
436
|
readonly #transport: transport.TForgeTransport;
|
|
421
437
|
readonly #client: ForgeRequestClient;
|
|
422
438
|
#lfsClient: ForgeRequestClient | null = null;
|
|
439
|
+
/** The Swift archive GETs, which go through `verifiedPackageDownload` instead of a request client. */
|
|
440
|
+
readonly #archiveMetrics: IForgeRequestMetrics = { requests: 0, responseBytes: 0, rateLimitedRequests: 0 };
|
|
423
441
|
#readerLogin: Promise<string> | null = null;
|
|
424
442
|
|
|
425
443
|
constructor(optionsArg: IGiteaSourceInventoryOptions) {
|
|
@@ -435,9 +453,12 @@ export class GiteaSourceInventory {
|
|
|
435
453
|
requestTimeoutMs: optionsArg.requestTimeoutMs ?? 60_000,
|
|
436
454
|
maxResponseBytes: optionsArg.maxResponseBytes ?? 16 * 1024 * 1024,
|
|
437
455
|
gitTimeoutMs: optionsArg.gitTimeoutMs ?? 30 * 60 * 1000,
|
|
456
|
+
maxSwiftArchiveBytes: optionsArg.maxSwiftArchiveBytes ?? 128 * 1024 * 1024,
|
|
457
|
+
packageTransferTimeoutMs: optionsArg.packageTransferTimeoutMs ?? 30 * 60 * 1000,
|
|
438
458
|
};
|
|
439
459
|
for (const [name, maximum] of [
|
|
440
460
|
['pageSize', 100], ['maxPages', 1_000_000], ['requestTimeoutMs', 300_000], ['maxResponseBytes', 64 * 1024 * 1024], ['gitTimeoutMs', 6 * 60 * 60 * 1000],
|
|
461
|
+
['maxSwiftArchiveBytes', 1024 * 1024 * 1024], ['packageTransferTimeoutMs', 6 * 60 * 60 * 1000],
|
|
441
462
|
] as const) {
|
|
442
463
|
const value = limits[name];
|
|
443
464
|
if (!Number.isSafeInteger(value) || value < 1 || value > maximum) throw new validation.ForgeInventoryError('invalid-limits');
|
|
@@ -459,14 +480,15 @@ export class GiteaSourceInventory {
|
|
|
459
480
|
/** Validated, normalized instance root; contains no credentials or API suffix. */
|
|
460
481
|
public get baseUrl(): string { return this.#options.baseUrl; }
|
|
461
482
|
|
|
462
|
-
/** REST and LFS batch requests together. */
|
|
483
|
+
/** REST, registry and LFS batch requests and Swift archive GETs together. */
|
|
463
484
|
public get metrics(): IForgeRequestMetrics {
|
|
464
485
|
const rest = this.#client.metrics;
|
|
465
486
|
const lfs = this.#lfsClient?.metrics ?? { requests: 0, responseBytes: 0, rateLimitedRequests: 0 };
|
|
487
|
+
const archives = this.#archiveMetrics;
|
|
466
488
|
return {
|
|
467
|
-
requests: rest.requests + lfs.requests,
|
|
468
|
-
responseBytes: rest.responseBytes + lfs.responseBytes,
|
|
469
|
-
rateLimitedRequests: rest.rateLimitedRequests + lfs.rateLimitedRequests,
|
|
489
|
+
requests: rest.requests + lfs.requests + archives.requests,
|
|
490
|
+
responseBytes: rest.responseBytes + lfs.responseBytes + archives.responseBytes,
|
|
491
|
+
rateLimitedRequests: rest.rateLimitedRequests + lfs.rateLimitedRequests + archives.rateLimitedRequests,
|
|
470
492
|
};
|
|
471
493
|
}
|
|
472
494
|
|
|
@@ -805,9 +827,11 @@ export class GiteaSourceInventory {
|
|
|
805
827
|
* whose only file is `manifest.json`, are read by digest for their
|
|
806
828
|
* references; no other manifest is read. npm packages add the dist-tags Gitea
|
|
807
829
|
* serves (a derived `latest` included) and each version's deprecation,
|
|
808
|
-
* Cargo crates each version's yank from the sparse index
|
|
809
|
-
*
|
|
810
|
-
*
|
|
830
|
+
* Cargo crates each version's yank from the sparse index, Swift packages
|
|
831
|
+
* each version's manifests, read from its archive's file names and Gitea's
|
|
832
|
+
* manifest route. Every read is a GET; reading an index or a Swift archive
|
|
833
|
+
* counts a download of its version, an accepted read stamp (S10 ruling,
|
|
834
|
+
* Addendum 1; S10 C5 ruling, Addendum 2).
|
|
811
835
|
*/
|
|
812
836
|
async #package(refArg: IPackageRef, signalArg?: AbortSignal): Promise<IPackageRecord> {
|
|
813
837
|
const packagePath = `/packages/${encodeURIComponent(refArg.owner)}/${encodeURIComponent(refArg.type)}/${encodeURIComponent(refArg.name)}`;
|
|
@@ -838,11 +862,11 @@ export class GiteaSourceInventory {
|
|
|
838
862
|
}
|
|
839
863
|
versions.sort((aArg, bArg) => compareDecimal(aArg.id, bArg.id));
|
|
840
864
|
const blobs = new Map<string, IPackageBlob>();
|
|
841
|
-
const filesByVersion = new Map<string,
|
|
865
|
+
const filesByVersion = new Map<string, IVersionFile[]>();
|
|
842
866
|
for (const version of versions) {
|
|
843
867
|
const files = (await this.#get(`${packagePath}/${encodeURIComponent(version.version)}/files`, { signal: signalArg })).body;
|
|
844
868
|
if (!Array.isArray(files)) throw new validation.ForgeInventoryError('invalid-page');
|
|
845
|
-
const read:
|
|
869
|
+
const read: IVersionFile[] = [];
|
|
846
870
|
for (const fileArg of files) {
|
|
847
871
|
const file = validation.record(fileArg);
|
|
848
872
|
const sha256 = requiredString(file.sha256);
|
|
@@ -853,7 +877,7 @@ export class GiteaSourceInventory {
|
|
|
853
877
|
const name = requiredString(file.name);
|
|
854
878
|
blob.files.push({ versionId: version.id, id: validation.decimal(file.id), name });
|
|
855
879
|
blobs.set(sha256, blob);
|
|
856
|
-
read.push({ name, sha256 });
|
|
880
|
+
read.push({ name, sha256, size });
|
|
857
881
|
}
|
|
858
882
|
filesByVersion.set(version.id, read);
|
|
859
883
|
}
|
|
@@ -866,6 +890,7 @@ export class GiteaSourceInventory {
|
|
|
866
890
|
if (record.type === 'container') await this.#containerReferences(record, filesByVersion, signalArg);
|
|
867
891
|
if (record.type === 'npm') await this.#npmState(record, signalArg);
|
|
868
892
|
if (record.type === 'cargo') await this.#cargoYanks(record, signalArg);
|
|
893
|
+
if (record.type === 'swift') await this.#swiftManifests(record, filesByVersion, signalArg);
|
|
869
894
|
return record;
|
|
870
895
|
}
|
|
871
896
|
|
|
@@ -876,9 +901,7 @@ export class GiteaSourceInventory {
|
|
|
876
901
|
* bytes must hash to the listed SHA-256 and the response must be an index or
|
|
877
902
|
* a manifest list, else the unit fails with `unexpected-manifest-shape`.
|
|
878
903
|
*/
|
|
879
|
-
async #containerReferences(
|
|
880
|
-
recordArg: IPackageRecord, filesArg: ReadonlyMap<string, Array<{ name: string; sha256: string }>>, signalArg?: AbortSignal,
|
|
881
|
-
): Promise<void> {
|
|
904
|
+
async #containerReferences(recordArg: IPackageRecord, filesArg: ReadonlyMap<string, IVersionFile[]>, signalArg?: AbortSignal): Promise<void> {
|
|
882
905
|
if (!/^[a-z0-9]+(?:(?:[._]|__|-+)[a-z0-9]+)*(?:\/[a-z0-9]+(?:(?:[._]|__|-+)[a-z0-9]+)*)*$/.test(recordArg.name)) {
|
|
883
906
|
throw new validation.ForgeInventoryError('invalid-image-name');
|
|
884
907
|
}
|
|
@@ -911,6 +934,69 @@ export class GiteaSourceInventory {
|
|
|
911
934
|
}
|
|
912
935
|
}
|
|
913
936
|
|
|
937
|
+
/**
|
|
938
|
+
* Each Swift version's `manifests`. Gitea stores one file per version, its
|
|
939
|
+
* source archive, and anything else fails the unit with
|
|
940
|
+
* `swift-version-files-unexpected`. An archive over `maxSwiftArchiveBytes`
|
|
941
|
+
* by its recorded size is not read and records `null`. Otherwise the
|
|
942
|
+
* archive is read once and verified against its recorded size and SHA-256,
|
|
943
|
+
* its central directory gives the candidate keys (`swiftManifestCandidates`),
|
|
944
|
+
* and the manifest route is asked for each: a 200 is recorded with the size
|
|
945
|
+
* and SHA-256 of the bytes, the 303 to the release's `Package.swift` means
|
|
946
|
+
* Gitea holds no such manifest, and `''` must answer 200. A failed read
|
|
947
|
+
* fails the unit; it never records `null`.
|
|
948
|
+
*/
|
|
949
|
+
async #swiftManifests(recordArg: IPackageRecord, filesArg: ReadonlyMap<string, IVersionFile[]>, signalArg?: AbortSignal): Promise<void> {
|
|
950
|
+
const parts = swiftPackageParts(recordArg.name);
|
|
951
|
+
for (const version of recordArg.versions) {
|
|
952
|
+
const files = filesArg.get(version.id)!;
|
|
953
|
+
if (files.length !== 1) throw new validation.ForgeInventoryError('swift-version-files-unexpected');
|
|
954
|
+
// The native store's comparison: an archive of exactly the bound is held.
|
|
955
|
+
if (BigInt(files[0].size) > BigInt(this.#options.maxSwiftArchiveBytes)) {
|
|
956
|
+
version.manifests = null;
|
|
957
|
+
continue;
|
|
958
|
+
}
|
|
959
|
+
const keys = swiftManifestCandidates(await this.#swiftArchive(recordArg, parts, version, files[0], signalArg));
|
|
960
|
+
const manifests: ISwiftManifest[] = [];
|
|
961
|
+
for (const key of keys) {
|
|
962
|
+
const manifest = await readSwiftManifest(this.#client, this.#options.baseUrl, recordArg.owner, parts, version.version, key === '' ? null : key, signalArg);
|
|
963
|
+
if (manifest === null) continue;
|
|
964
|
+
manifests.push({ key, size: manifest.bytes.byteLength, sha256: plugins.crypto.createHash('sha256').update(manifest.bytes).digest('hex') });
|
|
965
|
+
}
|
|
966
|
+
version.manifests = manifests;
|
|
967
|
+
}
|
|
968
|
+
}
|
|
969
|
+
|
|
970
|
+
/**
|
|
971
|
+
* A Swift version's source archive, read once with the reader's `token`
|
|
972
|
+
* authorization through `verifiedPackageDownload` (exact size, SHA-256
|
|
973
|
+
* before the last chunk) into one buffer of the recorded size. The read
|
|
974
|
+
* counts a download of the version, an accepted read stamp (S10 ruling
|
|
975
|
+
* item 8; S10 C5 ruling, Addendum 2).
|
|
976
|
+
*/
|
|
977
|
+
async #swiftArchive(
|
|
978
|
+
recordArg: IPackageRecord, partsArg: { scope: string; name: string }, versionArg: IPackageVersion, fileArg: IVersionFile, signalArg?: AbortSignal,
|
|
979
|
+
): Promise<Buffer> {
|
|
980
|
+
const url = new URL(`${this.#options.baseUrl}/api/packages/${encodeURIComponent(recordArg.owner)}/swift/${encodeURIComponent(partsArg.scope)}/${
|
|
981
|
+
encodeURIComponent(partsArg.name)}/${encodeURIComponent(versionArg.version)}.zip`);
|
|
982
|
+
const bytes = Number(fileArg.size);
|
|
983
|
+
const stream = await verifiedPackageDownload(
|
|
984
|
+
{
|
|
985
|
+
caCertificates: this.#options.caCertificates, packageTransferTimeoutMs: this.#options.packageTransferTimeoutMs,
|
|
986
|
+
requestTimeoutMs: this.#options.requestTimeoutMs, metrics: this.#archiveMetrics,
|
|
987
|
+
},
|
|
988
|
+
url, { authorization: `token ${this.#options.token}`, accept: 'application/vnd.swift.registry.v1+zip' },
|
|
989
|
+
{ sha256: fileArg.sha256, size: fileArg.size, bytes }, signalArg, null,
|
|
990
|
+
);
|
|
991
|
+
const archive = Buffer.alloc(bytes);
|
|
992
|
+
let offset = 0;
|
|
993
|
+
for await (const chunk of stream as AsyncIterable<Uint8Array>) {
|
|
994
|
+
archive.set(chunk, offset);
|
|
995
|
+
offset += chunk.byteLength;
|
|
996
|
+
}
|
|
997
|
+
return archive;
|
|
998
|
+
}
|
|
999
|
+
|
|
914
1000
|
/** Every dist-tag Gitea serves, a `latest` it derives included, and each version's deprecation from the package document. */
|
|
915
1001
|
async #npmState(recordArg: IPackageRecord, signalArg?: AbortSignal): Promise<void> {
|
|
916
1002
|
const registry = `${this.#options.baseUrl}/api/packages/${encodeURIComponent(recordArg.owner)}/npm`;
|