@package-broker/core 0.10.12 → 0.12.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/dist/db/schema.d.ts +18 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +3 -1
- package/dist/db/schema.js.map +1 -1
- package/dist/factory.js +4 -4
- package/dist/factory.js.map +1 -1
- package/dist/middleware/auth.d.ts.map +1 -1
- package/dist/middleware/auth.js +56 -59
- package/dist/middleware/auth.js.map +1 -1
- package/dist/modules/admin/admin.handlers.d.ts +5 -5
- package/dist/modules/admin/admin.handlers.d.ts.map +1 -1
- package/dist/modules/admin/admin.handlers.js +19 -8
- package/dist/modules/admin/admin.handlers.js.map +1 -1
- package/dist/modules/admin/index.d.ts +8 -0
- package/dist/modules/admin/index.d.ts.map +1 -1
- package/dist/modules/admin/index.js +9 -7
- package/dist/modules/admin/index.js.map +1 -1
- package/dist/modules/packages/index.d.ts.map +1 -1
- package/dist/modules/packages/index.js +2 -0
- package/dist/modules/packages/index.js.map +1 -1
- package/dist/modules/packages/packages.handlers.d.ts +17 -0
- package/dist/modules/packages/packages.handlers.d.ts.map +1 -1
- package/dist/modules/packages/packages.handlers.js +303 -0
- package/dist/modules/packages/packages.handlers.js.map +1 -1
- package/dist/modules/packages/packages.routes.d.ts +127 -0
- package/dist/modules/packages/packages.routes.d.ts.map +1 -1
- package/dist/modules/packages/packages.routes.js +121 -0
- package/dist/modules/packages/packages.routes.js.map +1 -1
- package/dist/modules/tokens/tokens.handlers.d.ts.map +1 -1
- package/dist/modules/tokens/tokens.handlers.js +3 -4
- package/dist/modules/tokens/tokens.handlers.js.map +1 -1
- package/dist/routes/api/tokens.d.ts.map +1 -1
- package/dist/routes/api/tokens.js +3 -6
- package/dist/routes/api/tokens.js.map +1 -1
- package/dist/routes/composer.d.ts.map +1 -1
- package/dist/routes/composer.js +119 -85
- package/dist/routes/composer.js.map +1 -1
- package/dist/sync/strategies/composer-repo.js +7 -4
- package/dist/sync/strategies/composer-repo.js.map +1 -1
- package/dist/utils/package-validator.d.ts +77 -0
- package/dist/utils/package-validator.d.ts.map +1 -0
- package/dist/utils/package-validator.js +217 -0
- package/dist/utils/package-validator.js.map +1 -0
- package/package.json +1 -1
|
@@ -157,4 +157,125 @@ export const getPackageChangelogRouteDef = createRoute({
|
|
|
157
157
|
},
|
|
158
158
|
tags: ['Packages'],
|
|
159
159
|
});
|
|
160
|
+
export const uploadPackageRouteDef = createRoute({
|
|
161
|
+
method: 'post',
|
|
162
|
+
path: '/upload',
|
|
163
|
+
summary: 'Upload package',
|
|
164
|
+
description: 'Upload a package archive (zip) with composer.json metadata',
|
|
165
|
+
security: [{ Bearer: [] }],
|
|
166
|
+
request: {
|
|
167
|
+
body: {
|
|
168
|
+
content: {
|
|
169
|
+
'multipart/form-data': {
|
|
170
|
+
schema: z.object({
|
|
171
|
+
file: z
|
|
172
|
+
.instanceof(File)
|
|
173
|
+
.openapi({
|
|
174
|
+
type: 'string',
|
|
175
|
+
format: 'binary',
|
|
176
|
+
}),
|
|
177
|
+
}),
|
|
178
|
+
},
|
|
179
|
+
},
|
|
180
|
+
},
|
|
181
|
+
},
|
|
182
|
+
responses: {
|
|
183
|
+
201: {
|
|
184
|
+
content: {
|
|
185
|
+
'application/json': {
|
|
186
|
+
schema: z.object({
|
|
187
|
+
message: z.string(),
|
|
188
|
+
package: z.object({
|
|
189
|
+
id: z.string(),
|
|
190
|
+
name: z.string(),
|
|
191
|
+
version: z.string(),
|
|
192
|
+
description: z.string().nullable(),
|
|
193
|
+
}),
|
|
194
|
+
}),
|
|
195
|
+
},
|
|
196
|
+
},
|
|
197
|
+
description: 'Package uploaded successfully',
|
|
198
|
+
},
|
|
199
|
+
400: {
|
|
200
|
+
content: {
|
|
201
|
+
'application/json': {
|
|
202
|
+
schema: z.object({
|
|
203
|
+
error: z.string(),
|
|
204
|
+
message: z.string(),
|
|
205
|
+
details: z.array(z.string()).optional(),
|
|
206
|
+
}),
|
|
207
|
+
},
|
|
208
|
+
},
|
|
209
|
+
description: 'Invalid package archive or metadata',
|
|
210
|
+
},
|
|
211
|
+
409: {
|
|
212
|
+
content: {
|
|
213
|
+
'application/json': {
|
|
214
|
+
schema: errorResponseSchema,
|
|
215
|
+
},
|
|
216
|
+
},
|
|
217
|
+
description: 'Package version already exists',
|
|
218
|
+
},
|
|
219
|
+
413: {
|
|
220
|
+
content: {
|
|
221
|
+
'application/json': {
|
|
222
|
+
schema: errorResponseSchema,
|
|
223
|
+
},
|
|
224
|
+
},
|
|
225
|
+
description: 'Package archive too large',
|
|
226
|
+
},
|
|
227
|
+
},
|
|
228
|
+
tags: ['Packages'],
|
|
229
|
+
});
|
|
230
|
+
export const deletePackageVersionRouteDef = createRoute({
|
|
231
|
+
method: 'delete',
|
|
232
|
+
path: '/{name}/{version}',
|
|
233
|
+
summary: 'Delete package version',
|
|
234
|
+
description: 'Delete a specific package version. Removes the package record, artifact, and stored files.',
|
|
235
|
+
security: [{ Bearer: [] }],
|
|
236
|
+
request: {
|
|
237
|
+
params: z.object({
|
|
238
|
+
name: z.string().openapi({
|
|
239
|
+
param: {
|
|
240
|
+
name: 'name',
|
|
241
|
+
in: 'path',
|
|
242
|
+
},
|
|
243
|
+
description: 'Package name (e.g., vendor/package)',
|
|
244
|
+
}),
|
|
245
|
+
version: z.string().openapi({
|
|
246
|
+
param: {
|
|
247
|
+
name: 'version',
|
|
248
|
+
in: 'path',
|
|
249
|
+
},
|
|
250
|
+
description: 'Package version to delete',
|
|
251
|
+
}),
|
|
252
|
+
}),
|
|
253
|
+
},
|
|
254
|
+
responses: {
|
|
255
|
+
200: {
|
|
256
|
+
content: {
|
|
257
|
+
'application/json': {
|
|
258
|
+
schema: z.object({
|
|
259
|
+
message: z.string(),
|
|
260
|
+
deleted: z.object({
|
|
261
|
+
name: z.string(),
|
|
262
|
+
version: z.string(),
|
|
263
|
+
filesRemoved: z.number(),
|
|
264
|
+
}),
|
|
265
|
+
}),
|
|
266
|
+
},
|
|
267
|
+
},
|
|
268
|
+
description: 'Package version deleted successfully',
|
|
269
|
+
},
|
|
270
|
+
404: {
|
|
271
|
+
content: {
|
|
272
|
+
'application/json': {
|
|
273
|
+
schema: errorResponseSchema,
|
|
274
|
+
},
|
|
275
|
+
},
|
|
276
|
+
description: 'Package version not found',
|
|
277
|
+
},
|
|
278
|
+
},
|
|
279
|
+
tags: ['Packages'],
|
|
280
|
+
});
|
|
160
281
|
//# sourceMappingURL=packages.routes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packages.routes.js","sourceRoot":"","sources":["../../../src/modules/packages/packages.routes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"packages.routes.js","sourceRoot":"","sources":["../../../src/modules/packages/packages.routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.handlers.d.ts","sourceRoot":"","sources":["../../../src/modules/tokens/tokens.handlers.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAUhD,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE;QACR,EAAE,EAAE,UAAU,CAAC;QACf,EAAE,CAAC,EAAE,WAAW,CAAC;KAClB,CAAC;IACF,SAAS,EAAE;QACT,QAAQ,EAAE,YAAY,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7C,CAAC;CACH;AAaD,wBAAsB,UAAU,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAerF;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"tokens.handlers.d.ts","sourceRoot":"","sources":["../../../src/modules/tokens/tokens.handlers.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAUhD,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE;QACR,EAAE,EAAE,UAAU,CAAC;QACf,EAAE,CAAC,EAAE,WAAW,CAAC;KAClB,CAAC;IACF,SAAS,EAAE;QACT,QAAQ,EAAE,YAAY,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7C,CAAC;CACH;AAaD,wBAAsB,UAAU,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAerF;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAqDlI;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsBtF;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6DlI"}
|
|
@@ -49,9 +49,7 @@ export async function createToken(c) {
|
|
|
49
49
|
const tokenId = nanoid();
|
|
50
50
|
const token = generateToken();
|
|
51
51
|
const tokenHash = hashToken(token);
|
|
52
|
-
const rateLimitMax = validated.rate_limit_max
|
|
53
|
-
? validated.rate_limit_max
|
|
54
|
-
: 1000;
|
|
52
|
+
const rateLimitMax = validated.rate_limit_max && validated.rate_limit_max > 0 ? validated.rate_limit_max : null;
|
|
55
53
|
await db.insert(tokens).values({
|
|
56
54
|
id: tokenId,
|
|
57
55
|
description: validated.description,
|
|
@@ -120,7 +118,8 @@ export async function updateToken(c) {
|
|
|
120
118
|
updateData.description = validated.description;
|
|
121
119
|
}
|
|
122
120
|
if (validated.rate_limit_max !== undefined) {
|
|
123
|
-
updateData.rate_limit_max =
|
|
121
|
+
updateData.rate_limit_max =
|
|
122
|
+
validated.rate_limit_max && validated.rate_limit_max > 0 ? validated.rate_limit_max : null;
|
|
124
123
|
}
|
|
125
124
|
if (Object.keys(updateData).length > 0) {
|
|
126
125
|
await db
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.handlers.js","sourceRoot":"","sources":["../../../src/modules/tokens/tokens.handlers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,aAAa,GAAG,cAAc,CAAC,gEAAgE,EAAE,EAAE,CAAC,CAAC;AAc3G,SAAS,SAAS,CAAC,KAAa;IAC9B,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,4BAA4B,CAAC,EAA2B;IAC/D,OAAO,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,IAAI,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,CAAiC;IAChE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC7B,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAE5E,MAAM,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC;QAC/C,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,UAAU;QAC5C,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;KACjC,CAAC,CAAC,CAAC;IAEJ,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,CAA6E;IAC7G,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEtC,IAAI,SAAS,CAAC,cAAc,KAAK,IAAI;QACnC,SAAS,CAAC,cAAc,KAAK,SAAS;QACtC,SAAS,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;QAC/B,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC5C,OAAO,CAAC,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE,aAAa;gBACpB,OAAO,EAAE,gJAAgJ;aAC1J,EAAE,GAAG,CAAC,CAAC;QACV,CAAC;IACH,CAAC;IAED,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC;IACzB,MAAM,KAAK,GAAG,aAAa,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAEnC,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"tokens.handlers.js","sourceRoot":"","sources":["../../../src/modules/tokens/tokens.handlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../../src/routes/api/tokens.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAWhD,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE;QACR,EAAE,EAAE,UAAU,CAAC;QACf,EAAE,CAAC,EAAE,WAAW,CAAC;KAClB,CAAC;IACF,SAAS,EAAE;QACT,QAAQ,EAAE,YAAY,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7C,CAAC;CACH;AAmBD;;;GAGG;AACH,wBAAsB,UAAU,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAerF;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../../src/routes/api/tokens.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAWhD,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE;QACR,EAAE,EAAE,UAAU,CAAC;QACf,EAAE,CAAC,EAAE,WAAW,CAAC;KAClB,CAAC;IACF,SAAS,EAAE;QACT,QAAQ,EAAE,YAAY,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7C,CAAC;CACH;AAmBD;;;GAGG;AACH,wBAAsB,UAAU,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAerF;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAwDlI;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAwBtF;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAmElI"}
|
|
@@ -66,10 +66,7 @@ export async function createToken(c) {
|
|
|
66
66
|
const tokenId = nanoid();
|
|
67
67
|
const token = generateToken(); // Generate high-entropy token
|
|
68
68
|
const tokenHash = hashToken(token);
|
|
69
|
-
|
|
70
|
-
const rateLimitMax = validated.rate_limit_max !== null && validated.rate_limit_max !== undefined
|
|
71
|
-
? validated.rate_limit_max
|
|
72
|
-
: 1000;
|
|
69
|
+
const rateLimitMax = validated.rate_limit_max && validated.rate_limit_max > 0 ? validated.rate_limit_max : null;
|
|
73
70
|
await db.insert(tokens).values({
|
|
74
71
|
id: tokenId,
|
|
75
72
|
description: validated.description,
|
|
@@ -154,8 +151,8 @@ export async function updateToken(c) {
|
|
|
154
151
|
updateData.description = validated.description;
|
|
155
152
|
}
|
|
156
153
|
if (validated.rate_limit_max !== undefined) {
|
|
157
|
-
|
|
158
|
-
|
|
154
|
+
updateData.rate_limit_max =
|
|
155
|
+
validated.rate_limit_max && validated.rate_limit_max > 0 ? validated.rate_limit_max : null;
|
|
159
156
|
}
|
|
160
157
|
// Only update if there are fields to update
|
|
161
158
|
if (Object.keys(updateData).length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../../src/routes/api/tokens.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,yDAAyD;AACzD,MAAM,aAAa,GAAG,cAAc,CAAC,gEAAgE,EAAE,EAAE,CAAC,CAAC;AAc3G;;GAEG;AACH,SAAS,SAAS,CAAC,KAAa;IAC9B,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,SAAS,4BAA4B,CAAC,EAA2B;IAC/D,OAAO,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,IAAI,CAAC;AACzC,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,CAAiC;IAChE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC7B,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAE5E,MAAM,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC;QAC/C,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,UAAU,EAAE,+BAA+B;QAC7E,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;KACjC,CAAC,CAAC,CAAC;IAEJ,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,CAA6E;IAC7G,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEtC,sCAAsC;IACtC,IAAI,SAAS,CAAC,cAAc,KAAK,IAAI;QACnC,SAAS,CAAC,cAAc,KAAK,SAAS;QACtC,SAAS,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;QAC/B,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC5C,OAAO,CAAC,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE,aAAa;gBACpB,OAAO,EAAE,gJAAgJ;aAC1J,EAAE,GAAG,CAAC,CAAC;QACV,CAAC;IACH,CAAC;IAED,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC;IACzB,MAAM,KAAK,GAAG,aAAa,EAAE,CAAC,CAAC,8BAA8B;IAC7D,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAEnC,
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../../src/routes/api/tokens.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composer.d.ts","sourceRoot":"","sources":["../../src/routes/composer.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,EAAE,YAAY,EAAa,MAAM,UAAU,CAAC;AACxD,OAAO,EAAgB,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAQvD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE;QACR,EAAE,EAAE,UAAU,CAAC;QACf,EAAE,CAAC,EAAE,WAAW,CAAC;QACjB,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,wBAAwB,CAAC,EAAE,QAAQ,CAAC;QACpC,cAAc,EAAE,MAAM,CAAC;QACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;KAC/B,CAAC;IACF,SAAS,EAAE;QACT,OAAO,EAAE,aAAa,CAAC;QACvB,QAAQ,EAAE,YAAY,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAKD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CA0EvF;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8PpF;AAmED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,KAAK,CAAC,OAAO,QAAQ,CAAC,YAAY,CAAC,EACpD,WAAW,GAAE,MAA6B,GACzC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"composer.d.ts","sourceRoot":"","sources":["../../src/routes/composer.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/composer.js
CHANGED
|
@@ -387,113 +387,126 @@ export function buildP2Response(packageName, packageVersions, maxVersions = DEFA
|
|
|
387
387
|
if (pkg.dist_reference) {
|
|
388
388
|
dist.reference = pkg.dist_reference;
|
|
389
389
|
}
|
|
390
|
-
|
|
390
|
+
let fullMetadata = null;
|
|
391
|
+
if (pkg.metadata) {
|
|
392
|
+
try {
|
|
393
|
+
fullMetadata = JSON.parse(pkg.metadata);
|
|
394
|
+
}
|
|
395
|
+
catch {
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
const displayVersion = typeof fullMetadata?.version === 'string' ? fullMetadata.version : pkg.version;
|
|
399
|
+
const normalizedVersion = typeof fullMetadata?.version_normalized === 'string'
|
|
400
|
+
? fullMetadata.version_normalized
|
|
401
|
+
: deriveVersionNormalized(displayVersion);
|
|
402
|
+
const versionDataBase = {
|
|
391
403
|
name: packageName,
|
|
392
|
-
version:
|
|
404
|
+
version: displayVersion,
|
|
405
|
+
...(normalizedVersion ? { version_normalized: normalizedVersion } : {}),
|
|
393
406
|
dist,
|
|
394
407
|
};
|
|
395
408
|
if (pkg.description) {
|
|
396
|
-
|
|
409
|
+
versionDataBase.description = pkg.description;
|
|
397
410
|
}
|
|
398
411
|
if (pkg.license) {
|
|
399
412
|
try {
|
|
400
|
-
// License is stored as JSON string (for array support)
|
|
401
413
|
const license = JSON.parse(pkg.license);
|
|
402
414
|
if (typeof license === 'string' || Array.isArray(license)) {
|
|
403
|
-
|
|
415
|
+
versionDataBase.license = license;
|
|
404
416
|
}
|
|
405
417
|
}
|
|
406
418
|
catch {
|
|
407
|
-
|
|
408
|
-
versionData.license = pkg.license; // pkg.license is not null here due to if check
|
|
419
|
+
versionDataBase.license = pkg.license;
|
|
409
420
|
}
|
|
410
421
|
}
|
|
411
422
|
if (pkg.package_type) {
|
|
412
|
-
|
|
423
|
+
versionDataBase.type = pkg.package_type;
|
|
413
424
|
}
|
|
414
425
|
if (pkg.homepage) {
|
|
415
|
-
|
|
426
|
+
versionDataBase.homepage = pkg.homepage;
|
|
416
427
|
}
|
|
417
428
|
if (pkg.released_at) {
|
|
418
|
-
|
|
429
|
+
versionDataBase.time = new Date(pkg.released_at * 1000).toISOString();
|
|
419
430
|
}
|
|
420
|
-
if (
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
...(fullMetadata.source.reference && { reference: fullMetadata.source.reference }),
|
|
434
|
-
};
|
|
435
|
-
}
|
|
436
|
-
if (fullMetadata.dist?.type && fullMetadata.dist.type !== 'zip') {
|
|
437
|
-
dist.type = fullMetadata.dist.type;
|
|
438
|
-
}
|
|
439
|
-
if (fullMetadata.dist?.shasum) {
|
|
440
|
-
dist.shasum = fullMetadata.dist.shasum;
|
|
441
|
-
}
|
|
442
|
-
if (fullMetadata.require && typeof fullMetadata.require === 'object' && !Array.isArray(fullMetadata.require)) {
|
|
443
|
-
versionData.require = fullMetadata.require;
|
|
444
|
-
}
|
|
445
|
-
if (fullMetadata['require-dev'] && typeof fullMetadata['require-dev'] === 'object' && !Array.isArray(fullMetadata['require-dev'])) {
|
|
446
|
-
versionData['require-dev'] = fullMetadata['require-dev'];
|
|
447
|
-
}
|
|
448
|
-
if (fullMetadata.autoload && typeof fullMetadata.autoload === 'object' && !Array.isArray(fullMetadata.autoload)) {
|
|
449
|
-
versionData.autoload = fullMetadata.autoload;
|
|
450
|
-
}
|
|
451
|
-
if (fullMetadata['autoload-dev'] && typeof fullMetadata['autoload-dev'] === 'object' && !Array.isArray(fullMetadata['autoload-dev'])) {
|
|
452
|
-
versionData['autoload-dev'] = fullMetadata['autoload-dev'];
|
|
453
|
-
}
|
|
454
|
-
// Conflict/replace/provide (important for dependency resolution)
|
|
455
|
-
if (fullMetadata.conflict && typeof fullMetadata.conflict === 'object' && !Array.isArray(fullMetadata.conflict)) {
|
|
456
|
-
versionData.conflict = fullMetadata.conflict;
|
|
457
|
-
}
|
|
458
|
-
if (fullMetadata.replace && typeof fullMetadata.replace === 'object' && !Array.isArray(fullMetadata.replace)) {
|
|
459
|
-
versionData.replace = fullMetadata.replace;
|
|
460
|
-
}
|
|
461
|
-
if (fullMetadata.provide && typeof fullMetadata.provide === 'object' && !Array.isArray(fullMetadata.provide)) {
|
|
462
|
-
versionData.provide = fullMetadata.provide;
|
|
463
|
-
}
|
|
464
|
-
// Optional but commonly used fields
|
|
465
|
-
if (fullMetadata.suggest && typeof fullMetadata.suggest === 'object' && !Array.isArray(fullMetadata.suggest)) {
|
|
466
|
-
versionData.suggest = fullMetadata.suggest;
|
|
467
|
-
}
|
|
468
|
-
if (fullMetadata.extra && typeof fullMetadata.extra === 'object' && !Array.isArray(fullMetadata.extra)) {
|
|
469
|
-
versionData.extra = fullMetadata.extra;
|
|
470
|
-
}
|
|
471
|
-
if (fullMetadata.bin) {
|
|
472
|
-
versionData.bin = fullMetadata.bin;
|
|
473
|
-
}
|
|
474
|
-
if (fullMetadata.keywords && Array.isArray(fullMetadata.keywords)) {
|
|
475
|
-
versionData.keywords = fullMetadata.keywords;
|
|
476
|
-
}
|
|
477
|
-
if (fullMetadata.authors && Array.isArray(fullMetadata.authors)) {
|
|
478
|
-
versionData.authors = fullMetadata.authors;
|
|
479
|
-
}
|
|
480
|
-
if (fullMetadata['notification-url'] !== undefined) {
|
|
481
|
-
versionData['notification-url'] = fullMetadata['notification-url'];
|
|
482
|
-
}
|
|
431
|
+
if (fullMetadata) {
|
|
432
|
+
if (fullMetadata.source !== null &&
|
|
433
|
+
fullMetadata.source !== undefined &&
|
|
434
|
+
fullMetadata.source !== '__unset' &&
|
|
435
|
+
typeof fullMetadata.source === 'object' &&
|
|
436
|
+
!Array.isArray(fullMetadata.source) &&
|
|
437
|
+
typeof fullMetadata.source.type === 'string' &&
|
|
438
|
+
typeof fullMetadata.source.url === 'string') {
|
|
439
|
+
versionDataBase.source = {
|
|
440
|
+
type: fullMetadata.source.type,
|
|
441
|
+
url: fullMetadata.source.url,
|
|
442
|
+
...(fullMetadata.source.reference && { reference: fullMetadata.source.reference }),
|
|
443
|
+
};
|
|
483
444
|
}
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
445
|
+
if (fullMetadata.dist?.type && fullMetadata.dist.type !== 'zip') {
|
|
446
|
+
dist.type = fullMetadata.dist.type;
|
|
447
|
+
}
|
|
448
|
+
if (fullMetadata.dist?.shasum) {
|
|
449
|
+
dist.shasum = fullMetadata.dist.shasum;
|
|
450
|
+
}
|
|
451
|
+
if (fullMetadata.require && typeof fullMetadata.require === 'object' && !Array.isArray(fullMetadata.require)) {
|
|
452
|
+
versionDataBase.require = fullMetadata.require;
|
|
453
|
+
}
|
|
454
|
+
if (fullMetadata['require-dev'] && typeof fullMetadata['require-dev'] === 'object' && !Array.isArray(fullMetadata['require-dev'])) {
|
|
455
|
+
versionDataBase['require-dev'] = fullMetadata['require-dev'];
|
|
456
|
+
}
|
|
457
|
+
if (fullMetadata.autoload && typeof fullMetadata.autoload === 'object' && !Array.isArray(fullMetadata.autoload)) {
|
|
458
|
+
versionDataBase.autoload = fullMetadata.autoload;
|
|
459
|
+
}
|
|
460
|
+
if (fullMetadata['autoload-dev'] && typeof fullMetadata['autoload-dev'] === 'object' && !Array.isArray(fullMetadata['autoload-dev'])) {
|
|
461
|
+
versionDataBase['autoload-dev'] = fullMetadata['autoload-dev'];
|
|
462
|
+
}
|
|
463
|
+
// Conflict/replace/provide (important for dependency resolution)
|
|
464
|
+
if (fullMetadata.conflict && typeof fullMetadata.conflict === 'object' && !Array.isArray(fullMetadata.conflict)) {
|
|
465
|
+
versionDataBase.conflict = fullMetadata.conflict;
|
|
466
|
+
}
|
|
467
|
+
if (fullMetadata.replace && typeof fullMetadata.replace === 'object' && !Array.isArray(fullMetadata.replace)) {
|
|
468
|
+
versionDataBase.replace = fullMetadata.replace;
|
|
469
|
+
}
|
|
470
|
+
if (fullMetadata.provide && typeof fullMetadata.provide === 'object' && !Array.isArray(fullMetadata.provide)) {
|
|
471
|
+
versionDataBase.provide = fullMetadata.provide;
|
|
472
|
+
}
|
|
473
|
+
// Optional but commonly used fields
|
|
474
|
+
if (fullMetadata.suggest && typeof fullMetadata.suggest === 'object' && !Array.isArray(fullMetadata.suggest)) {
|
|
475
|
+
versionDataBase.suggest = fullMetadata.suggest;
|
|
476
|
+
}
|
|
477
|
+
if (fullMetadata.extra && typeof fullMetadata.extra === 'object' && !Array.isArray(fullMetadata.extra)) {
|
|
478
|
+
versionDataBase.extra = fullMetadata.extra;
|
|
492
479
|
}
|
|
480
|
+
if (fullMetadata.bin) {
|
|
481
|
+
versionDataBase.bin = fullMetadata.bin;
|
|
482
|
+
}
|
|
483
|
+
if (fullMetadata.keywords && Array.isArray(fullMetadata.keywords)) {
|
|
484
|
+
versionDataBase.keywords = fullMetadata.keywords;
|
|
485
|
+
}
|
|
486
|
+
if (fullMetadata.authors && Array.isArray(fullMetadata.authors)) {
|
|
487
|
+
versionDataBase.authors = fullMetadata.authors;
|
|
488
|
+
}
|
|
489
|
+
if (fullMetadata['notification-url'] !== undefined) {
|
|
490
|
+
versionDataBase['notification-url'] = fullMetadata['notification-url'];
|
|
491
|
+
}
|
|
492
|
+
}
|
|
493
|
+
else if (pkg.metadata) {
|
|
494
|
+
const logger = getLogger();
|
|
495
|
+
logger.warn('Failed to parse stored metadata', {
|
|
496
|
+
packageName: pkg.name,
|
|
497
|
+
version: pkg.version,
|
|
498
|
+
});
|
|
493
499
|
}
|
|
494
500
|
// Update dist with any metadata overrides
|
|
495
|
-
|
|
496
|
-
versions.push(
|
|
501
|
+
versionDataBase.dist = dist;
|
|
502
|
+
versions.push(versionDataBase);
|
|
503
|
+
if (normalizedVersion && normalizedVersion !== displayVersion) {
|
|
504
|
+
versions.push({
|
|
505
|
+
...versionDataBase,
|
|
506
|
+
version: normalizedVersion,
|
|
507
|
+
version_normalized: normalizedVersion,
|
|
508
|
+
});
|
|
509
|
+
}
|
|
497
510
|
}
|
|
498
511
|
return {
|
|
499
512
|
packages: {
|
|
@@ -501,6 +514,23 @@ export function buildP2Response(packageName, packageVersions, maxVersions = DEFA
|
|
|
501
514
|
},
|
|
502
515
|
};
|
|
503
516
|
}
|
|
517
|
+
function deriveVersionNormalized(version) {
|
|
518
|
+
const v = version.startsWith('v') ? version.slice(1) : version;
|
|
519
|
+
const patchMatch = v.match(/^(\d+\.\d+\.\d+)-p(\d+)$/);
|
|
520
|
+
if (patchMatch) {
|
|
521
|
+
const [, base, patch] = patchMatch;
|
|
522
|
+
return `${base}.0-patch${patch}`;
|
|
523
|
+
}
|
|
524
|
+
const numericMatch = v.match(/^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.(\d+))?$/);
|
|
525
|
+
if (numericMatch) {
|
|
526
|
+
const major = numericMatch[1];
|
|
527
|
+
const minor = numericMatch[2] ?? '0';
|
|
528
|
+
const patch = numericMatch[3] ?? '0';
|
|
529
|
+
const build = numericMatch[4] ?? '0';
|
|
530
|
+
return `${major}.${minor}.${patch}.${build}`;
|
|
531
|
+
}
|
|
532
|
+
return undefined;
|
|
533
|
+
}
|
|
504
534
|
/**
|
|
505
535
|
* Ensure Packagist repository exists in database
|
|
506
536
|
* Creates it if it doesn't exist
|
|
@@ -838,13 +868,17 @@ function transformDistUrlsInMemory(packageData, repoId, proxyBaseUrl, maxVersion
|
|
|
838
868
|
function normalizePackageVersions(versions) {
|
|
839
869
|
if (Array.isArray(versions)) {
|
|
840
870
|
return versions.map((metadata) => ({
|
|
841
|
-
|
|
871
|
+
// Use original `version` field, NOT `version_normalized`
|
|
872
|
+
// Composer lock files use original versions (e.g., "v7.17.3", "103.0.7-p7")
|
|
873
|
+
// while version_normalized is a 4-part format (e.g., "7.17.3.0", "103.0.7.0-patch7")
|
|
874
|
+
version: metadata.version || metadata.version_normalized || String(metadata),
|
|
842
875
|
metadata,
|
|
843
876
|
}));
|
|
844
877
|
}
|
|
845
878
|
else if (typeof versions === 'object' && versions !== null) {
|
|
846
879
|
return Object.entries(versions).map(([key, val]) => ({
|
|
847
|
-
|
|
880
|
+
// Use original `version` field, NOT `version_normalized`
|
|
881
|
+
version: val?.version || val?.version_normalized || key,
|
|
848
882
|
metadata: val,
|
|
849
883
|
}));
|
|
850
884
|
}
|