@@ -25,7 +25,7 @@ import {
2525type ClawHubPackageCompatibility,
2626type ClawHubPackageDetail,
2727type ClawHubPackageFamily,
28-type ClawHubPackageStorePackSummary,
28+type ClawHubPackageClawPackSummary,
2929type ClawHubPackageVersion,
3030} from "../infra/clawhub.js";
3131import { formatErrorMessage } from "../infra/errors.js";
@@ -66,10 +66,10 @@ export type ClawHubPluginInstallRecordFields = {
6666integrity?: string;
6767resolvedAt?: string;
6868installedAt?: string;
69-storepackSha256?: string;
70-storepackSpecVersion?: number;
71-storepackManifestSha256?: string;
72-storepackSize?: number;
69+clawpackSha256?: string;
70+clawpackSpecVersion?: number;
71+clawpackManifestSha256?: string;
72+clawpackSize?: number;
7373};
74747575type ClawHubInstallFailure = {
@@ -127,38 +127,36 @@ type ClawHubArchiveEntryLimits = {
127127addArchiveBytes: (bytes: number) => boolean;
128128};
129129130-function normalizeClawHubStorePackInstallFields(
131-storepack: ClawHubPackageStorePackSummary | null | undefined,
130+function normalizeClawHubClawPackInstallFields(
131+clawpack: ClawHubPackageClawPackSummary | null | undefined,
132132): Pick<
133133ClawHubPluginInstallRecordFields,
134-"storepackSha256" | "storepackSpecVersion" | "storepackManifestSha256" | "storepackSize"
134+"clawpackSha256" | "clawpackSpecVersion" | "clawpackManifestSha256" | "clawpackSize"
135135> {
136-if (storepack?.available !== true) {
136+if (clawpack?.available !== true) {
137137return {};
138138}
139-const storepackSha256 =
140-typeof storepack.sha256 === "string" ? normalizeClawHubSha256Hex(storepack.sha256) : null;
141-const storepackManifestSha256 =
142-typeof storepack.manifestSha256 === "string"
143- ? normalizeClawHubSha256Hex(storepack.manifestSha256)
139+const clawpackSha256 =
140+typeof clawpack.sha256 === "string" ? normalizeClawHubSha256Hex(clawpack.sha256) : null;
141+const clawpackManifestSha256 =
142+typeof clawpack.manifestSha256 === "string"
143+ ? normalizeClawHubSha256Hex(clawpack.manifestSha256)
144144 : null;
145-const storepackSpecVersion =
146-typeof storepack.specVersion === "number" &&
147-Number.isSafeInteger(storepack.specVersion) &&
148-storepack.specVersion >= 0
149- ? storepack.specVersion
145+const clawpackSpecVersion =
146+typeof clawpack.specVersion === "number" &&
147+Number.isSafeInteger(clawpack.specVersion) &&
148+clawpack.specVersion >= 0
149+ ? clawpack.specVersion
150150 : undefined;
151-const storepackSize =
152-typeof storepack.size === "number" &&
153-Number.isSafeInteger(storepack.size) &&
154-storepack.size >= 0
155- ? storepack.size
151+const clawpackSize =
152+typeof clawpack.size === "number" && Number.isSafeInteger(clawpack.size) && clawpack.size >= 0
153+ ? clawpack.size
156154 : undefined;
157155return {
158- ...(storepackSha256 ? { storepackSha256 } : {}),
159- ...(storepackSpecVersion !== undefined ? { storepackSpecVersion } : {}),
160- ...(storepackManifestSha256 ? { storepackManifestSha256 } : {}),
161- ...(storepackSize !== undefined ? { storepackSize } : {}),
156+ ...(clawpackSha256 ? { clawpackSha256 } : {}),
157+ ...(clawpackSpecVersion !== undefined ? { clawpackSpecVersion } : {}),
158+ ...(clawpackManifestSha256 ? { clawpackManifestSha256 } : {}),
159+ ...(clawpackSize !== undefined ? { clawpackSize } : {}),
162160};
163161}
164162@@ -641,7 +639,7 @@ async function resolveCompatiblePackageVersion(params: {
641639version: string;
642640compatibility?: ClawHubPackageCompatibility | null;
643641verification: ClawHubArchiveVerification | null;
644-storepack?: ClawHubPackageStorePackSummary | null;
642+clawpack?: ClawHubPackageClawPackSummary | null;
645643}
646644| ClawHubInstallFailure
647645> {
@@ -676,7 +674,7 @@ async function resolveCompatiblePackageVersion(params: {
676674compatibility:
677675versionDetail.version?.compatibility ?? params.detail.package?.compatibility ?? null,
678676verification: null,
679-storepack: versionDetail.version?.storepack ?? null,
677+clawpack: versionDetail.version?.clawpack ?? null,
680678};
681679}
682680const verificationState = resolveClawHubArchiveVerification(
@@ -693,7 +691,7 @@ async function resolveCompatiblePackageVersion(params: {
693691compatibility:
694692versionDetail.version?.compatibility ?? params.detail.package?.compatibility ?? null,
695693verification: verificationState.verification,
696-storepack: versionDetail.version?.storepack ?? null,
694+clawpack: versionDetail.version?.clawpack ?? null,
697695};
698696}
699697@@ -922,7 +920,7 @@ export async function installPluginFromClawHub(
922920}
923921924922const pkg = detail.package!;
925-const storepackFields = normalizeClawHubStorePackInstallFields(versionState.storepack);
923+const clawpackFields = normalizeClawHubClawPackInstallFields(versionState.clawpack);
926924const clawhubFamily =
927925pkg.family === "code-plugin" || pkg.family === "bundle-plugin" ? pkg.family : null;
928926if (!clawhubFamily) {
@@ -948,7 +946,7 @@ export async function installPluginFromClawHub(
948946// server-attested sha256hash from ClawHub version metadata.
949947integrity: archive.integrity,
950948resolvedAt: new Date().toISOString(),
951- ...storepackFields,
949+ ...clawpackFields,
952950},
953951};
954952} finally {
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。