pray-cli 1.9.0 → 1.9.2
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 +14 -1
- package/dist/archive/path-safety.d.ts +2 -0
- package/dist/archive/path-safety.d.ts.map +1 -0
- package/dist/archive/path-safety.js +18 -0
- package/dist/archive/path-safety.js.map +1 -0
- package/dist/archive/praypkg.d.ts.map +1 -1
- package/dist/archive/praypkg.js +35 -9
- package/dist/archive/praypkg.js.map +1 -1
- package/dist/archive/tar.d.ts +3 -0
- package/dist/archive/tar.d.ts.map +1 -0
- package/dist/archive/tar.js +157 -0
- package/dist/archive/tar.js.map +1 -0
- package/dist/auth/session.d.ts +1 -1
- package/dist/auth/session.d.ts.map +1 -1
- package/dist/auth/session.js +29 -4
- package/dist/auth/session.js.map +1 -1
- package/dist/cli/commands/update-latest.d.ts +1 -1
- package/dist/cli/commands/update-latest.d.ts.map +1 -1
- package/dist/cli/commands/update-latest.js +13 -6
- package/dist/cli/commands/update-latest.js.map +1 -1
- package/dist/cli/commands/update.js +4 -4
- package/dist/cli/commands/update.js.map +1 -1
- package/dist/http/body.d.ts +2 -0
- package/dist/http/body.d.ts.map +1 -0
- package/dist/http/body.js +32 -0
- package/dist/http/body.js.map +1 -0
- package/dist/http/client.d.ts.map +1 -1
- package/dist/http/client.js +3 -2
- package/dist/http/client.js.map +1 -1
- package/dist/lockfile/types.d.ts +2 -2
- package/dist/lockfile/types.js +1 -1
- package/dist/manifest/index.d.ts.map +1 -1
- package/dist/manifest/index.js +4 -1
- package/dist/manifest/index.js.map +1 -1
- package/dist/manifest/package-constraint.d.ts +2 -0
- package/dist/manifest/package-constraint.d.ts.map +1 -0
- package/dist/manifest/package-constraint.js +61 -0
- package/dist/manifest/package-constraint.js.map +1 -0
- package/dist/manifest/package-declaration.d.ts.map +1 -1
- package/dist/manifest/package-declaration.js +9 -5
- package/dist/manifest/package-declaration.js.map +1 -1
- package/dist/manifest/validate.d.ts +4 -0
- package/dist/manifest/validate.d.ts.map +1 -0
- package/dist/manifest/validate.js +37 -0
- package/dist/manifest/validate.js.map +1 -0
- package/dist/registry/cache.d.ts +2 -0
- package/dist/registry/cache.d.ts.map +1 -0
- package/dist/registry/cache.js +16 -0
- package/dist/registry/cache.js.map +1 -0
- package/dist/registry/index.d.ts +2 -2
- package/dist/registry/index.d.ts.map +1 -1
- package/dist/registry/index.js +18 -65
- package/dist/registry/index.js.map +1 -1
- package/dist/registry/install.d.ts +5 -0
- package/dist/registry/install.d.ts.map +1 -0
- package/dist/registry/install.js +55 -0
- package/dist/registry/install.js.map +1 -0
- package/dist/registry/signature.d.ts +4 -0
- package/dist/registry/signature.d.ts.map +1 -0
- package/dist/registry/signature.js +25 -0
- package/dist/registry/signature.js.map +1 -0
- package/dist/render/project.d.ts.map +1 -1
- package/dist/render/project.js +2 -0
- package/dist/render/project.js.map +1 -1
- package/dist/render/provisioned.d.ts.map +1 -1
- package/dist/render/provisioned.js +2 -0
- package/dist/render/provisioned.js.map +1 -1
- package/dist/resource-limits.d.ts +10 -0
- package/dist/resource-limits.d.ts.map +1 -0
- package/dist/resource-limits.js +10 -0
- package/dist/resource-limits.js.map +1 -0
- package/dist/serve/index.d.ts +2 -0
- package/dist/serve/index.d.ts.map +1 -1
- package/dist/serve/index.js +79 -29
- package/dist/serve/index.js.map +1 -1
- package/dist/sync/index.d.ts.map +1 -1
- package/dist/sync/index.js +27 -14
- package/dist/sync/index.js.map +1 -1
- package/dist/sync/path-safety.d.ts +5 -0
- package/dist/sync/path-safety.d.ts.map +1 -0
- package/dist/sync/path-safety.js +48 -0
- package/dist/sync/path-safety.js.map +1 -0
- package/package.json +7 -3
package/dist/lockfile/types.js
CHANGED
|
@@ -11,6 +11,6 @@ export function canonicalLockfile(lockfile) {
|
|
|
11
11
|
left.id.localeCompare(right.id)),
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
|
-
export const PACKAGE_VERSION = "1.9.
|
|
14
|
+
export const PACKAGE_VERSION = "1.9.2";
|
|
15
15
|
export const GENERATED_BY = `pray ${PACKAGE_VERSION} (typescript)`;
|
|
16
16
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,cAAc,EAEnB,KAAK,YAAY,EAClB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,cAAc,EAEnB,KAAK,YAAY,EAClB,MAAM,YAAY,CAAC;AAGpB,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAiB7D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAIpD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAGvD;AAED,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,qBAAqB,EACrB,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,GACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,KAAK,iBAAiB,EACtB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,YAAY,GAClB,CAAC"}
|
package/dist/manifest/index.js
CHANGED
|
@@ -3,6 +3,7 @@ import { PrayError } from "../errors.js";
|
|
|
3
3
|
import { sha256Prefixed } from "../hashing.js";
|
|
4
4
|
import { parseManifestText } from "./parser.js";
|
|
5
5
|
import { canonicalManifest, defaultRenderPolicy, manifestToJson, } from "./types.js";
|
|
6
|
+
import { validateManifestPaths } from "./validate.js";
|
|
6
7
|
export function readManifestText(manifestPath) {
|
|
7
8
|
try {
|
|
8
9
|
return readFileSync(manifestPath, "utf8");
|
|
@@ -19,7 +20,9 @@ export function readManifestText(manifestPath) {
|
|
|
19
20
|
}
|
|
20
21
|
}
|
|
21
22
|
export function parseManifest(text) {
|
|
22
|
-
|
|
23
|
+
const manifest = parseManifestText(text);
|
|
24
|
+
validateManifestPaths(manifest);
|
|
25
|
+
return manifest;
|
|
23
26
|
}
|
|
24
27
|
export function manifestHash(manifest) {
|
|
25
28
|
const bytes = Buffer.from(JSON.stringify(manifestToJson(manifest)), "utf8");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EAMnB,cAAc,GAEf,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EAMnB,cAAc,GAEf,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,MAAM,UAAU,gBAAgB,CAAC,YAAoB;IACnD,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,MAAM,IAAI,KAAK;YACf,KAAK,CAAC,IAAI,KAAK,QAAQ,EACvB,CAAC;YACD,MAAM,SAAS,CAAC,QAAQ,CACtB,WAAW,YAAY,+BAA+B,CACvD,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACzC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAChC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAAkB;IAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5E,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,qBAAqB,EACrB,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,GACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EAEjB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,iBAAiB,EACjB,mBAAmB,GAOpB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-constraint.d.ts","sourceRoot":"","sources":["../../src/manifest/package-constraint.ts"],"names":[],"mappings":"AAIA,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GACjB,MAAM,CAoCR"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { PrayError } from "../errors.js";
|
|
2
|
+
const PACKAGE_KEYWORDS = ["pray", "use", "include", "agent", "package"];
|
|
3
|
+
export function rewriteConstraintOnLine(line, constraint) {
|
|
4
|
+
const indentLength = line.length - line.trimStart().length;
|
|
5
|
+
const indent = line.slice(0, indentLength);
|
|
6
|
+
const trimmed = line.trimStart();
|
|
7
|
+
const afterKeyword = skipPackageKeyword(trimmed);
|
|
8
|
+
if (afterKeyword === undefined) {
|
|
9
|
+
throw PrayError.manifest("package declaration is missing a keyword");
|
|
10
|
+
}
|
|
11
|
+
const afterKeywordTrimmed = afterKeyword.trimStart();
|
|
12
|
+
const parsedName = parseQuoted(afterKeywordTrimmed);
|
|
13
|
+
if (!parsedName) {
|
|
14
|
+
throw PrayError.manifest("package declaration is missing a quoted name");
|
|
15
|
+
}
|
|
16
|
+
const [name, afterName] = parsedName;
|
|
17
|
+
const quotedConstraint = `"${constraint}"`;
|
|
18
|
+
const keywordAndName = trimmed.slice(0, trimmed.length - afterName.length);
|
|
19
|
+
const remainder = afterName.trimStart();
|
|
20
|
+
if (remainder.length === 0) {
|
|
21
|
+
return `${indent}${keywordAndName}, ${quotedConstraint}`;
|
|
22
|
+
}
|
|
23
|
+
if (!remainder.startsWith(",")) {
|
|
24
|
+
throw PrayError.manifest(`package ${name} declaration is missing a comma after the name`);
|
|
25
|
+
}
|
|
26
|
+
const afterComma = remainder.slice(1).trimStart();
|
|
27
|
+
if (afterComma.startsWith('"') || afterComma.startsWith("'")) {
|
|
28
|
+
const parsedConstraint = parseQuoted(afterComma);
|
|
29
|
+
if (!parsedConstraint) {
|
|
30
|
+
throw PrayError.manifest(`package ${name} declaration has an unclosed constraint`);
|
|
31
|
+
}
|
|
32
|
+
return `${indent}${keywordAndName}, ${quotedConstraint}${parsedConstraint[1]}`;
|
|
33
|
+
}
|
|
34
|
+
return `${indent}${keywordAndName}, ${quotedConstraint}, ${afterComma}`;
|
|
35
|
+
}
|
|
36
|
+
function skipPackageKeyword(input) {
|
|
37
|
+
for (const keyword of PACKAGE_KEYWORDS) {
|
|
38
|
+
if (!input.startsWith(keyword)) {
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
const rest = input.slice(keyword.length);
|
|
42
|
+
const next = rest[0];
|
|
43
|
+
if (next === undefined || next === '"' || next === "'" || /\s/.test(next)) {
|
|
44
|
+
return rest;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
function parseQuoted(input) {
|
|
50
|
+
const quote = input[0];
|
|
51
|
+
if (quote !== '"' && quote !== "'") {
|
|
52
|
+
return undefined;
|
|
53
|
+
}
|
|
54
|
+
const rest = input.slice(1);
|
|
55
|
+
const end = rest.indexOf(quote);
|
|
56
|
+
if (end === -1) {
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
return [rest.slice(0, end), rest.slice(end + 1)];
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=package-constraint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-constraint.js","sourceRoot":"","sources":["../../src/manifest/package-constraint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-declaration.d.ts","sourceRoot":"","sources":["../../src/manifest/package-declaration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package-declaration.d.ts","sourceRoot":"","sources":["../../src/manifest/package-declaration.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAMlD,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,eAAe,GAC5B,MAAM,CA8CR;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,eAAe,GAC5B,MAAM,CA6BR"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { PrayError } from "../errors.js";
|
|
2
|
+
import { rewriteConstraintOnLine } from "./package-constraint.js";
|
|
2
3
|
function formatStringKeywordList(values) {
|
|
3
4
|
return values.map((value) => `"${value}"`).join(", ");
|
|
4
5
|
}
|
|
@@ -63,14 +64,17 @@ export function replacePackageDeclaration(text, packageEntry) {
|
|
|
63
64
|
`package '${name}'`,
|
|
64
65
|
];
|
|
65
66
|
const lines = text.split(/\r?\n/);
|
|
66
|
-
|
|
67
|
+
let replaced = 0;
|
|
68
|
+
for (const [index, line] of lines.entries()) {
|
|
67
69
|
const trimmed = line.trimStart();
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
70
|
+
if (prefixes.some((prefix) => trimmed.startsWith(prefix))) {
|
|
71
|
+
lines[index] = rewriteConstraintOnLine(line, packageEntry.constraint);
|
|
72
|
+
replaced += 1;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
if (replaced === 0) {
|
|
71
76
|
throw PrayError.manifest(`package ${name} not found in manifest`);
|
|
72
77
|
}
|
|
73
|
-
lines[index] = formatPackageDeclaration(packageEntry);
|
|
74
78
|
let output = lines.join("\n");
|
|
75
79
|
if (text.endsWith("\n") && !output.endsWith("\n")) {
|
|
76
80
|
output += "\n";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-declaration.js","sourceRoot":"","sources":["../../src/manifest/package-declaration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"package-declaration.js","sourceRoot":"","sources":["../../src/manifest/package-declaration.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/manifest/validate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAgB9D;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAiBjE"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { isAbsolute, win32 } from "node:path";
|
|
2
|
+
import { PrayError } from "../errors.js";
|
|
3
|
+
export function validateManifestPaths(manifest) {
|
|
4
|
+
for (const target of manifest.targets) {
|
|
5
|
+
for (const path of [
|
|
6
|
+
...target.outputs,
|
|
7
|
+
...target.skills,
|
|
8
|
+
...target.commands,
|
|
9
|
+
...target.rules,
|
|
10
|
+
]) {
|
|
11
|
+
validateProjectRelativePath(path);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
for (const packageEntry of manifest.packages) {
|
|
15
|
+
if (packageEntry.path)
|
|
16
|
+
validateProjectRelativePath(packageEntry.path);
|
|
17
|
+
if (packageEntry.file)
|
|
18
|
+
validateProjectRelativePath(packageEntry.file);
|
|
19
|
+
}
|
|
20
|
+
for (const local of manifest.local)
|
|
21
|
+
validateProjectRelativePath(local.path);
|
|
22
|
+
}
|
|
23
|
+
export function validateProjectRelativePath(value) {
|
|
24
|
+
const path = value.trim();
|
|
25
|
+
if (path.length === 0 || isAbsolute(path) || win32.isAbsolute(path)) {
|
|
26
|
+
throw PrayError.manifest(`project path must be repository-relative: ${value}`);
|
|
27
|
+
}
|
|
28
|
+
const parts = path.replaceAll("\\", "/").split("/");
|
|
29
|
+
if (parts.includes("..") || path.includes("\0")) {
|
|
30
|
+
throw PrayError.manifest(`project path escapes repository root: ${value}`);
|
|
31
|
+
}
|
|
32
|
+
if (parts.every((part) => part.length === 0 || part === ".")) {
|
|
33
|
+
throw PrayError.manifest(`project path must be repository-relative: ${value}`);
|
|
34
|
+
}
|
|
35
|
+
return path;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=validate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/manifest/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,MAAM,UAAU,qBAAqB,CAAC,QAAkB;IACtD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,KAAK,MAAM,IAAI,IAAI;YACjB,GAAG,MAAM,CAAC,OAAO;YACjB,GAAG,MAAM,CAAC,MAAM;YAChB,GAAG,MAAM,CAAC,QAAQ;YAClB,GAAG,MAAM,CAAC,KAAK;SAChB,EAAE,CAAC;YACF,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IACD,KAAK,MAAM,YAAY,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAC7C,IAAI,YAAY,CAAC,IAAI;YAAE,2BAA2B,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,YAAY,CAAC,IAAI;YAAE,2BAA2B,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACxE,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,KAAK;QAAE,2BAA2B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,KAAa;IACvD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC1B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACpE,MAAM,SAAS,CAAC,QAAQ,CACtB,6CAA6C,KAAK,EAAE,CACrD,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpD,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,SAAS,CAAC,QAAQ,CAAC,yCAAyC,KAAK,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,SAAS,CAAC,QAAQ,CACtB,6CAA6C,KAAK,EAAE,CACrD,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/registry/cache.ts"],"names":[],"mappings":"AAQA,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CAqBR"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { join } from "node:path";
|
|
2
|
+
import { sha256Hex } from "../hashing.js";
|
|
3
|
+
import { resolveDistributionPath, validatePackageName, validatePathSegment, } from "../sync/path-safety.js";
|
|
4
|
+
export function registryCacheDirectory(projectRoot, sourceKey, packageName, version, artifactHash) {
|
|
5
|
+
validatePackageName(packageName);
|
|
6
|
+
validatePathSegment(version, "package version");
|
|
7
|
+
const identifier = [
|
|
8
|
+
sourceKey,
|
|
9
|
+
packageName,
|
|
10
|
+
version,
|
|
11
|
+
artifactHash ?? "no-artifact-hash",
|
|
12
|
+
].join(":");
|
|
13
|
+
const digest = sha256Hex(identifier).slice(0, 16);
|
|
14
|
+
return resolveDistributionPath(projectRoot, join(".pray", "cache", "registry", packageName.replaceAll("/", "-"), version, digest));
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/registry/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EACL,uBAAuB,EACvB,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,UAAU,sBAAsB,CACpC,WAAmB,EACnB,SAAiB,EACjB,WAAmB,EACnB,OAAe,EACf,YAAqB;IAErB,mBAAmB,CAAC,WAAW,CAAC,CAAC;IACjC,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG;QACjB,SAAS;QACT,WAAW;QACX,OAAO;QACP,YAAY,IAAI,kBAAkB;KACnC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClD,OAAO,uBAAuB,CAC5B,WAAW,EACX,IAAI,CACF,OAAO,EACP,OAAO,EACP,UAAU,EACV,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAChC,OAAO,EACP,MAAM,CACP,CACF,CAAC;AACJ,CAAC"}
|
package/dist/registry/index.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { ManifestPackage } from "../manifest/types.js";
|
|
2
|
+
export { registryCacheDirectory } from "./cache.js";
|
|
3
|
+
export { registryArtifactSignature } from "./signature.js";
|
|
2
4
|
import type { RegistryPackageMetadata, RegistryPackageResolution, RegistryPackageVersion } from "./types.js";
|
|
3
5
|
export declare function resolveRegistryPackageRoot(projectRoot: string, sourceUrl: string, declaration: ManifestPackage, options?: RegistryResolveOptions): Promise<RegistryPackageResolution>;
|
|
4
6
|
export declare function resolveLocalRegistryPackageRoot(projectRoot: string, sourceKey: string, sourceRoot: string, declaration: ManifestPackage, options?: RegistryResolveOptions): Promise<RegistryPackageResolution>;
|
|
@@ -11,7 +13,5 @@ export declare function parseMetadata(text: string): RegistryPackageMetadata;
|
|
|
11
13
|
export declare function versionFromHash(entry: Record<string, unknown>): RegistryPackageVersion;
|
|
12
14
|
export declare function selectPackageVersion(metadata: RegistryPackageMetadata, constraint: string, preferredVersion?: string): RegistryPackageVersion;
|
|
13
15
|
export declare function registryLatestVersionLabel(metadata: RegistryPackageMetadata): string | undefined;
|
|
14
|
-
export declare function registryCacheDirectory(projectRoot: string, sourceKey: string, packageName: string, version: string, artifactHash?: string): string;
|
|
15
|
-
export declare function registryArtifactSignature(artifactBytes: Buffer, treeHash: string, signer: string): string;
|
|
16
16
|
export { joinUrl } from "../http/client.js";
|
|
17
17
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/registry/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/registry/index.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAc5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAE3D,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAEpB,wBAAsB,0BAA0B,CAC9C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,eAAe,EAC5B,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,yBAAyB,CAAC,CAuCpC;AAED,wBAAsB,+BAA+B,CACnD,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,eAAe,EAC5B,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,yBAAyB,CAAC,CAqDpC;AAED,MAAM,WAAW,sBAAsB;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,uBAAuB,CAAC,CAclC;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,uBAAuB,CASnE;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,sBAAsB,CAoBxB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,uBAAuB,EACjC,UAAU,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,MAAM,GACxB,sBAAsB,CA8BxB;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,uBAAuB,GAChC,MAAM,GAAG,SAAS,CAWpB;AAmDD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC"}
|
package/dist/registry/index.js
CHANGED
|
@@ -1,16 +1,20 @@
|
|
|
1
|
-
import { existsSync,
|
|
1
|
+
import { existsSync, readFileSync } from "node:fs";
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import semver from "semver";
|
|
4
|
-
import { unpackPraypkg } from "../archive/praypkg.js";
|
|
5
4
|
import { versionSatisfies } from "../constraint.js";
|
|
6
5
|
import { PrayError } from "../errors.js";
|
|
7
|
-
import { sha256Hex, sha256Prefixed } from "../hashing.js";
|
|
8
6
|
import { httpGet, httpGetText, isLocalSourceUrl, joinUrl, } from "../http/client.js";
|
|
9
7
|
import { findPrayspecFile, parsePackageSpec, treeHashForRoot, } from "../package-spec/index.js";
|
|
8
|
+
import { rejectAbsoluteArtifactPath, resolveDistributionPath, validatePackageName, } from "../sync/path-safety.js";
|
|
9
|
+
import { registryCacheDirectory } from "./cache.js";
|
|
10
|
+
import { installArtifactToCache, requireIntegrityFields } from "./install.js";
|
|
11
|
+
export { registryCacheDirectory } from "./cache.js";
|
|
12
|
+
export { registryArtifactSignature } from "./signature.js";
|
|
10
13
|
export async function resolveRegistryPackageRoot(projectRoot, sourceUrl, declaration, options = {}) {
|
|
11
14
|
const metadata = await fetchPackageMetadata(sourceUrl, declaration.name);
|
|
12
15
|
const registryLatestVersion = registryLatestVersionLabel(metadata);
|
|
13
16
|
const selected = selectPackageVersion(metadata, declaration.constraint, options.preferredVersion);
|
|
17
|
+
requireIntegrityFields(declaration.name, selected);
|
|
14
18
|
const cacheDirectory = registryCacheDirectory(projectRoot, sourceUrl, declaration.name, selected.version, selected.artifactHash);
|
|
15
19
|
if (cacheReady(cacheDirectory, selected)) {
|
|
16
20
|
return {
|
|
@@ -22,12 +26,8 @@ export async function resolveRegistryPackageRoot(projectRoot, sourceUrl, declara
|
|
|
22
26
|
if (options.offline) {
|
|
23
27
|
throw PrayError.resolution(offlinePackageError(declaration.name, selected.version));
|
|
24
28
|
}
|
|
25
|
-
if (existsSync(cacheDirectory)) {
|
|
26
|
-
rmSync(cacheDirectory, { recursive: true, force: true });
|
|
27
|
-
}
|
|
28
|
-
mkdirSync(cacheDirectory, { recursive: true });
|
|
29
29
|
const artifactBytes = await readArtifactBytes(sourceUrl, selected.artifact);
|
|
30
|
-
|
|
30
|
+
installArtifactToCache(cacheDirectory, declaration, selected, artifactBytes);
|
|
31
31
|
return {
|
|
32
32
|
root: cacheDirectory,
|
|
33
33
|
signerFingerprint: selected.signerFingerprint,
|
|
@@ -44,6 +44,7 @@ export async function resolveLocalRegistryPackageRoot(projectRoot, sourceKey, so
|
|
|
44
44
|
const metadata = parseMetadata(readFileSync(metadataPath, "utf8"));
|
|
45
45
|
const registryLatestVersion = registryLatestVersionLabel(metadata);
|
|
46
46
|
const selected = selectPackageVersion(metadata, declaration.constraint, options.preferredVersion);
|
|
47
|
+
requireIntegrityFields(declaration.name, selected);
|
|
47
48
|
const cacheDirectory = registryCacheDirectory(projectRoot, sourceKey, declaration.name, selected.version, selected.artifactHash);
|
|
48
49
|
if (cacheReady(cacheDirectory, selected)) {
|
|
49
50
|
return {
|
|
@@ -55,12 +56,8 @@ export async function resolveLocalRegistryPackageRoot(projectRoot, sourceKey, so
|
|
|
55
56
|
if (options.offline) {
|
|
56
57
|
throw PrayError.resolution(offlinePackageError(declaration.name, selected.version));
|
|
57
58
|
}
|
|
58
|
-
if (existsSync(cacheDirectory)) {
|
|
59
|
-
rmSync(cacheDirectory, { recursive: true, force: true });
|
|
60
|
-
}
|
|
61
|
-
mkdirSync(cacheDirectory, { recursive: true });
|
|
62
59
|
const artifactBytes = readLocalArtifactBytes(sourceRoot, selected.artifact);
|
|
63
|
-
|
|
60
|
+
installArtifactToCache(cacheDirectory, declaration, selected, artifactBytes);
|
|
64
61
|
return {
|
|
65
62
|
root: cacheDirectory,
|
|
66
63
|
signerFingerprint: selected.signerFingerprint,
|
|
@@ -68,6 +65,7 @@ export async function resolveLocalRegistryPackageRoot(projectRoot, sourceKey, so
|
|
|
68
65
|
};
|
|
69
66
|
}
|
|
70
67
|
export async function fetchPackageMetadata(sourceUrl, packageName) {
|
|
68
|
+
validatePackageName(packageName);
|
|
71
69
|
if (isLocalSourceUrl(sourceUrl)) {
|
|
72
70
|
const metadataPath = join(sourceUrl, "v1", "packages", `${packageName}.json`);
|
|
73
71
|
return parseMetadata(readFileSync(metadataPath, "utf8"));
|
|
@@ -138,49 +136,6 @@ export function registryLatestVersionLabel(metadata) {
|
|
|
138
136
|
}
|
|
139
137
|
return highest?.version;
|
|
140
138
|
}
|
|
141
|
-
export function registryCacheDirectory(projectRoot, sourceKey, packageName, version, artifactHash) {
|
|
142
|
-
const identifier = [
|
|
143
|
-
sourceKey,
|
|
144
|
-
packageName,
|
|
145
|
-
version,
|
|
146
|
-
artifactHash ?? "no-artifact-hash",
|
|
147
|
-
].join(":");
|
|
148
|
-
const digest = sha256Hex(identifier).slice(0, 16);
|
|
149
|
-
return join(projectRoot, ".pray", "cache", "registry", packageName.replaceAll("/", "-"), version, digest);
|
|
150
|
-
}
|
|
151
|
-
export function registryArtifactSignature(artifactBytes, treeHash, signer) {
|
|
152
|
-
const payload = Buffer.concat([
|
|
153
|
-
artifactBytes,
|
|
154
|
-
Buffer.from("\0"),
|
|
155
|
-
Buffer.from(treeHash, "utf8"),
|
|
156
|
-
Buffer.from("\0"),
|
|
157
|
-
Buffer.from(signer, "utf8"),
|
|
158
|
-
]);
|
|
159
|
-
return sha256Prefixed(payload);
|
|
160
|
-
}
|
|
161
|
-
function validateAndUnpack(cacheDirectory, declaration, selected, artifactBytes) {
|
|
162
|
-
if (selected.artifactHash) {
|
|
163
|
-
const artifactHash = sha256Prefixed(artifactBytes);
|
|
164
|
-
if (artifactHash !== selected.artifactHash) {
|
|
165
|
-
throw PrayError.integrity(`package artifact hash mismatch for ${declaration.name} ${selected.version}`);
|
|
166
|
-
}
|
|
167
|
-
}
|
|
168
|
-
unpackPraypkg(artifactBytes, cacheDirectory);
|
|
169
|
-
const specPath = findPrayspecFile(cacheDirectory);
|
|
170
|
-
const spec = parsePackageSpec(readFileSync(specPath, "utf8"));
|
|
171
|
-
if (spec.name !== declaration.name) {
|
|
172
|
-
throw PrayError.resolution(`package path ${cacheDirectory} declares ${spec.name}, expected ${declaration.name}`);
|
|
173
|
-
}
|
|
174
|
-
if (spec.version !== selected.version) {
|
|
175
|
-
throw PrayError.resolution(`package ${declaration.name} version ${spec.version} does not match registry version ${selected.version}`);
|
|
176
|
-
}
|
|
177
|
-
if (selected.treeHash) {
|
|
178
|
-
const treeHash = treeHashForRoot(cacheDirectory, spec);
|
|
179
|
-
if (treeHash !== selected.treeHash) {
|
|
180
|
-
throw PrayError.integrity(`package tree hash mismatch for ${declaration.name} ${selected.version}`);
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
139
|
function cacheReady(cacheDirectory, selected) {
|
|
185
140
|
if (!existsSync(cacheDirectory)) {
|
|
186
141
|
return false;
|
|
@@ -188,7 +143,9 @@ function cacheReady(cacheDirectory, selected) {
|
|
|
188
143
|
try {
|
|
189
144
|
const specPath = findPrayspecFile(cacheDirectory);
|
|
190
145
|
const spec = parsePackageSpec(readFileSync(specPath, "utf8"));
|
|
191
|
-
return spec.version === selected.version
|
|
146
|
+
return (spec.version === selected.version &&
|
|
147
|
+
selected.treeHash !== undefined &&
|
|
148
|
+
treeHashForRoot(cacheDirectory, spec) === selected.treeHash);
|
|
192
149
|
}
|
|
193
150
|
catch {
|
|
194
151
|
return false;
|
|
@@ -198,19 +155,15 @@ async function readArtifactBytes(sourceUrl, artifact) {
|
|
|
198
155
|
if (isLocalSourceUrl(sourceUrl)) {
|
|
199
156
|
return readLocalArtifactBytes(sourceUrl, artifact);
|
|
200
157
|
}
|
|
201
|
-
|
|
202
|
-
return httpGet(artifact);
|
|
203
|
-
}
|
|
158
|
+
rejectAbsoluteArtifactPath(artifact);
|
|
204
159
|
return httpGet(joinUrl(sourceUrl, artifact));
|
|
205
160
|
}
|
|
206
161
|
function readLocalArtifactBytes(sourceRoot, artifact) {
|
|
207
|
-
if (artifact.startsWith("http://") || artifact.startsWith("https://")) {
|
|
208
|
-
throw PrayError.unsupported("remote artifact URLs in local distribution require async fetch");
|
|
209
|
-
}
|
|
210
162
|
if (artifact.startsWith("file://")) {
|
|
211
|
-
return readFileSync(artifact.slice("file://".length));
|
|
163
|
+
return readFileSync(resolveDistributionPath(sourceRoot, artifact.slice("file://".length)));
|
|
212
164
|
}
|
|
213
|
-
|
|
165
|
+
rejectAbsoluteArtifactPath(artifact);
|
|
166
|
+
const path = resolveDistributionPath(sourceRoot, artifact);
|
|
214
167
|
if (!existsSync(path)) {
|
|
215
168
|
throw PrayError.resolution(`package artifact missing at ${path}`);
|
|
216
169
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/registry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/registry/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { ManifestPackage } from "../manifest/types.js";
|
|
2
|
+
import type { RegistryPackageVersion } from "./types.js";
|
|
3
|
+
export declare function installArtifactToCache(cacheDirectory: string, declaration: ManifestPackage, selected: RegistryPackageVersion, artifactBytes: Buffer): void;
|
|
4
|
+
export declare function requireIntegrityFields(packageName: string, selected: RegistryPackageVersion): void;
|
|
5
|
+
//# sourceMappingURL=install.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/registry/install.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAO5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,eAAe,EAC5B,QAAQ,EAAE,sBAAsB,EAChC,aAAa,EAAE,MAAM,GACpB,IAAI,CAmBN;AAED,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,sBAAsB,GAC/B,IAAI,CAWN"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, } from "node:fs";
|
|
2
|
+
import { unpackPraypkg } from "../archive/praypkg.js";
|
|
3
|
+
import { PrayError } from "../errors.js";
|
|
4
|
+
import { sha256Prefixed } from "../hashing.js";
|
|
5
|
+
import { findPrayspecFile, parsePackageSpec, treeHashForRoot, } from "../package-spec/index.js";
|
|
6
|
+
import { verifyRegistrySignature } from "./signature.js";
|
|
7
|
+
export function installArtifactToCache(cacheDirectory, declaration, selected, artifactBytes) {
|
|
8
|
+
requireIntegrityFields(declaration.name, selected);
|
|
9
|
+
const stagingDirectory = `${cacheDirectory}.staging`;
|
|
10
|
+
rmSync(stagingDirectory, { recursive: true, force: true });
|
|
11
|
+
mkdirSync(stagingDirectory, { recursive: true });
|
|
12
|
+
const unpackedDirectory = `${stagingDirectory}/unpacked`;
|
|
13
|
+
mkdirSync(unpackedDirectory, { recursive: true });
|
|
14
|
+
try {
|
|
15
|
+
validateAndUnpack(unpackedDirectory, declaration, selected, artifactBytes);
|
|
16
|
+
if (existsSync(cacheDirectory)) {
|
|
17
|
+
rmSync(cacheDirectory, { recursive: true, force: true });
|
|
18
|
+
}
|
|
19
|
+
renameSync(unpackedDirectory, cacheDirectory);
|
|
20
|
+
}
|
|
21
|
+
catch (error) {
|
|
22
|
+
rmSync(stagingDirectory, { recursive: true, force: true });
|
|
23
|
+
throw error;
|
|
24
|
+
}
|
|
25
|
+
rmSync(stagingDirectory, { recursive: true, force: true });
|
|
26
|
+
}
|
|
27
|
+
export function requireIntegrityFields(packageName, selected) {
|
|
28
|
+
if (!selected.artifactHash) {
|
|
29
|
+
throw PrayError.integrity(`package ${packageName} ${selected.version} is missing artifact_hash`);
|
|
30
|
+
}
|
|
31
|
+
if (!selected.treeHash) {
|
|
32
|
+
throw PrayError.integrity(`package ${packageName} ${selected.version} is missing tree_hash`);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
function validateAndUnpack(cacheDirectory, declaration, selected, artifactBytes) {
|
|
36
|
+
const artifactHash = sha256Prefixed(artifactBytes);
|
|
37
|
+
if (artifactHash !== selected.artifactHash) {
|
|
38
|
+
throw PrayError.integrity(`package artifact hash mismatch for ${declaration.name} ${selected.version}`);
|
|
39
|
+
}
|
|
40
|
+
verifyRegistrySignature(declaration.name, selected, artifactBytes);
|
|
41
|
+
unpackPraypkg(artifactBytes, cacheDirectory);
|
|
42
|
+
const specPath = findPrayspecFile(cacheDirectory);
|
|
43
|
+
const spec = parsePackageSpec(readFileSync(specPath, "utf8"));
|
|
44
|
+
if (spec.name !== declaration.name) {
|
|
45
|
+
throw PrayError.resolution(`package path ${cacheDirectory} declares ${spec.name}, expected ${declaration.name}`);
|
|
46
|
+
}
|
|
47
|
+
if (spec.version !== selected.version) {
|
|
48
|
+
throw PrayError.resolution(`package ${declaration.name} version ${spec.version} does not match registry version ${selected.version}`);
|
|
49
|
+
}
|
|
50
|
+
const treeHash = treeHashForRoot(cacheDirectory, spec);
|
|
51
|
+
if (treeHash !== selected.treeHash) {
|
|
52
|
+
throw PrayError.integrity(`package tree hash mismatch for ${declaration.name} ${selected.version}`);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=install.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/registry/install.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { RegistryPackageVersion } from "./types.js";
|
|
2
|
+
export declare function registryArtifactSignature(artifactBytes: Buffer, treeHash: string, signer: string): string;
|
|
3
|
+
export declare function verifyRegistrySignature(packageName: string, selected: RegistryPackageVersion, artifactBytes: Buffer): void;
|
|
4
|
+
//# sourceMappingURL=signature.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signature.d.ts","sourceRoot":"","sources":["../../src/registry/signature.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,MAAM,CASR;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,sBAAsB,EAChC,aAAa,EAAE,MAAM,GACpB,IAAI,CAmBN"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { PrayError } from "../errors.js";
|
|
2
|
+
import { sha256Prefixed } from "../hashing.js";
|
|
3
|
+
export function registryArtifactSignature(artifactBytes, treeHash, signer) {
|
|
4
|
+
const payload = Buffer.concat([
|
|
5
|
+
artifactBytes,
|
|
6
|
+
Buffer.from("\0"),
|
|
7
|
+
Buffer.from(treeHash, "utf8"),
|
|
8
|
+
Buffer.from("\0"),
|
|
9
|
+
Buffer.from(signer, "utf8"),
|
|
10
|
+
]);
|
|
11
|
+
return sha256Prefixed(payload);
|
|
12
|
+
}
|
|
13
|
+
export function verifyRegistrySignature(packageName, selected, artifactBytes) {
|
|
14
|
+
if (!selected.signature) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
if (!selected.signer || !selected.treeHash) {
|
|
18
|
+
throw PrayError.integrity(`package signature metadata incomplete for ${packageName} ${selected.version}`);
|
|
19
|
+
}
|
|
20
|
+
const expected = registryArtifactSignature(artifactBytes, selected.treeHash, selected.signer);
|
|
21
|
+
if (expected !== selected.signature) {
|
|
22
|
+
throw PrayError.integrity(`package signature mismatch for ${packageName} ${selected.version}`);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=signature.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../src/registry/signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG/C,MAAM,UAAU,yBAAyB,CACvC,aAAqB,EACrB,QAAgB,EAChB,MAAc;IAEd,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,aAAa;QACb,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;QACjB,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;QACjB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;KAC5B,CAAC,CAAC;IACH,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,WAAmB,EACnB,QAAgC,EAChC,aAAqB;IAErB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QACxB,OAAO;IACT,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAC3C,MAAM,SAAS,CAAC,SAAS,CACvB,6CAA6C,WAAW,IAAI,QAAQ,CAAC,OAAO,EAAE,CAC/E,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,yBAAyB,CACxC,aAAa,EACb,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,MAAM,CAChB,CAAC;IACF,IAAI,QAAQ,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,SAAS,CAAC,SAAS,CACvB,kCAAkC,WAAW,IAAI,QAAQ,CAAC,OAAO,EAAE,CACpE,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/render/project.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/render/project.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAIrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAI3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,cAAc,EAAE,CAUxE;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,cAAc,EAAE,GACzB,IAAI,CAQN;AAaD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
|