@hot-updater/plugin-core 0.36.7 → 1.0.0-rc.0

package/dist/assetStorageLayout.cjs

@@ -1,38 +1,56 @@
 const require_contentAddressedAssets = require("./contentAddressedAssets.cjs");
-const require_legacyAssetStorageLayout = require("./legacyAssetStorageLayout.cjs");
+const require_createStorageKeyBuilder = require("./createStorageKeyBuilder.cjs");
+const require_parseStorageUri = require("./parseStorageUri.cjs");
 //#region src/assetStorageLayout.ts
 const isBrotliManifestAssetPath = (assetPath) => /(^|\/)index\.[^/]+\.bundle$/.test(assetPath.replace(/\\/g, "/"));
 const getManifestAssetDownloadPath = (assetPath) => isBrotliManifestAssetPath(assetPath) ? `${assetPath}.br` : assetPath;
 const createStorageUriWithRelativePath = ({ baseStorageUri, relativePath }) => {
-	const storageUrl = new URL(baseStorageUri);
-	storageUrl.pathname = `${storageUrl.pathname.replace(/\/+$/, "")}/${relativePath.replace(/\\/g, "/").split("/").filter(Boolean).map((segment) => encodeURIComponent(segment)).join("/")}`;
-	return storageUrl.toString();
-};
-const getAssetStorageLayout = (assetBaseStorageUri) => {
-	const pathname = new URL(assetBaseStorageUri).pathname.replace(/\/+$/, "");
-	return pathname.endsWith("/assets") || pathname === "/assets" ? "content-addressed" : "legacy-files";
+	const parsed = require_parseStorageUri.parseStorageUri(baseStorageUri, new URL(baseStorageUri).protocol.replace(":", ""));
+	const childKey = require_createStorageKeyBuilder.createStorageKeyBuilder(void 0)(relativePath);
+	if (!childKey) throw new Error("Relative storage key must not be empty.");
+	return require_parseStorageUri.createStorageUri({
+		protocol: parsed.protocol,
+		bucket: parsed.bucket,
+		key: require_createStorageKeyBuilder.createStorageKeyBuilder(parsed.key)(childKey)
+	});
 };
-const isContentAddressedAssetBaseStorageUri = (assetBaseStorageUri) => getAssetStorageLayout(assetBaseStorageUri) === "content-addressed";
-const getManifestAssetStoragePath = ({ assetBaseStorageUri, assetPath, fileHash }) => {
-	if (getAssetStorageLayout(assetBaseStorageUri) === "content-addressed") return require_contentAddressedAssets.getContentAddressedAssetStoragePath({
-		assetPath,
-		fileHash
+const replaceStorageUriKeySuffix = ({ storageUri, keySuffix, replacement }) => {
+	const parsed = require_parseStorageUri.parseStorageUri(storageUri, new URL(storageUri).protocol.replace(":", ""));
+	const normalizedSuffix = require_createStorageKeyBuilder.createStorageKeyBuilder(void 0)(keySuffix);
+	const normalizedReplacement = require_createStorageKeyBuilder.createStorageKeyBuilder(void 0)(replacement);
+	if (!normalizedSuffix || !normalizedReplacement) throw new Error("Storage URI key suffix and replacement must not be empty.");
+	const keySegments = parsed.key.split("/");
+	const suffixSegments = normalizedSuffix.split("/");
+	const suffixOffset = keySegments.length - suffixSegments.length;
+	if (suffixOffset < 0 || suffixSegments.some((segment, index) => keySegments[suffixOffset + index] !== segment)) throw new Error("Storage URI key does not end with the expected suffix.");
+	const prefix = keySegments.slice(0, suffixOffset).join("/");
+	return require_parseStorageUri.createStorageUri({
+		protocol: parsed.protocol,
+		bucket: parsed.bucket,
+		key: require_createStorageKeyBuilder.createStorageKeyBuilder(prefix)(normalizedReplacement)
 	});
-	return require_legacyAssetStorageLayout.getLegacyManifestAssetStoragePath({ assetPath });
 };
-const resolveManifestAssetStorageUri = ({ assetBaseStorageUri, assetPath, fileHash }) => createStorageUriWithRelativePath({
+const resolveManifestAssetStorageFileHash = ({ downloadFileHash, fileHash }) => require_contentAddressedAssets.isContentAddressedAssetFileHash(downloadFileHash) ? downloadFileHash : fileHash;
+const getManifestAssetStoragePath = ({ assetPath, downloadFileHash, fileHash }) => require_contentAddressedAssets.getContentAddressedAssetStoragePath({
+	assetPath,
+	fileHash: resolveManifestAssetStorageFileHash({
+		downloadFileHash,
+		fileHash
+	})
+});
+const resolveManifestAssetStorageUri = ({ assetBaseStorageUri, assetPath, downloadFileHash, fileHash }) => createStorageUriWithRelativePath({
 	baseStorageUri: assetBaseStorageUri,
 	relativePath: getManifestAssetStoragePath({
-		assetBaseStorageUri,
 		assetPath,
+		downloadFileHash,
 		fileHash
 	})
 });
 //#endregion
 exports.createStorageUriWithRelativePath = createStorageUriWithRelativePath;
-exports.getAssetStorageLayout = getAssetStorageLayout;
 exports.getManifestAssetDownloadPath = getManifestAssetDownloadPath;
 exports.getManifestAssetStoragePath = getManifestAssetStoragePath;
 exports.isBrotliManifestAssetPath = isBrotliManifestAssetPath;
-exports.isContentAddressedAssetBaseStorageUri = isContentAddressedAssetBaseStorageUri;
+exports.replaceStorageUriKeySuffix = replaceStorageUriKeySuffix;
+exports.resolveManifestAssetStorageFileHash = resolveManifestAssetStorageFileHash;
 exports.resolveManifestAssetStorageUri = resolveManifestAssetStorageUri;

package/dist/assetStorageLayout.d.cts

@@ -1,5 +1,4 @@
 //#region src/assetStorageLayout.d.ts
-type AssetStorageLayout = "content-addressed" | "legacy-files";
 declare const isBrotliManifestAssetPath: (assetPath: string) => boolean;
 declare const getManifestAssetDownloadPath: (assetPath: string) => string;
 declare const createStorageUriWithRelativePath: ({
@@ -9,25 +8,41 @@ declare const createStorageUriWithRelativePath: ({
   baseStorageUri: string;
   relativePath: string;
 }) => string;
-declare const getAssetStorageLayout: (assetBaseStorageUri: string) => AssetStorageLayout;
-declare const isContentAddressedAssetBaseStorageUri: (assetBaseStorageUri: string) => boolean;
+declare const replaceStorageUriKeySuffix: ({
+  storageUri,
+  keySuffix,
+  replacement
+}: {
+  storageUri: string;
+  keySuffix: string;
+  replacement: string;
+}) => string;
+declare const resolveManifestAssetStorageFileHash: ({
+  downloadFileHash,
+  fileHash
+}: {
+  downloadFileHash?: unknown;
+  fileHash: string;
+}) => string;
 declare const getManifestAssetStoragePath: ({
-  assetBaseStorageUri,
   assetPath,
+  downloadFileHash,
   fileHash
 }: {
-  assetBaseStorageUri: string;
   assetPath: string;
+  downloadFileHash?: unknown;
   fileHash: string;
 }) => string;
 declare const resolveManifestAssetStorageUri: ({
   assetBaseStorageUri,
   assetPath,
+  downloadFileHash,
   fileHash
 }: {
   assetBaseStorageUri: string;
   assetPath: string;
+  downloadFileHash?: unknown;
   fileHash: string;
 }) => string;
 //#endregion
-export { AssetStorageLayout, createStorageUriWithRelativePath, getAssetStorageLayout, getManifestAssetDownloadPath, getManifestAssetStoragePath, isBrotliManifestAssetPath, isContentAddressedAssetBaseStorageUri, resolveManifestAssetStorageUri };
+export { createStorageUriWithRelativePath, getManifestAssetDownloadPath, getManifestAssetStoragePath, isBrotliManifestAssetPath, replaceStorageUriKeySuffix, resolveManifestAssetStorageFileHash, resolveManifestAssetStorageUri };

package/dist/assetStorageLayout.d.mts

@@ -1,5 +1,4 @@
 //#region src/assetStorageLayout.d.ts
-type AssetStorageLayout = "content-addressed" | "legacy-files";
 declare const isBrotliManifestAssetPath: (assetPath: string) => boolean;
 declare const getManifestAssetDownloadPath: (assetPath: string) => string;
 declare const createStorageUriWithRelativePath: ({
@@ -9,25 +8,41 @@ declare const createStorageUriWithRelativePath: ({
   baseStorageUri: string;
   relativePath: string;
 }) => string;
-declare const getAssetStorageLayout: (assetBaseStorageUri: string) => AssetStorageLayout;
-declare const isContentAddressedAssetBaseStorageUri: (assetBaseStorageUri: string) => boolean;
+declare const replaceStorageUriKeySuffix: ({
+  storageUri,
+  keySuffix,
+  replacement
+}: {
+  storageUri: string;
+  keySuffix: string;
+  replacement: string;
+}) => string;
+declare const resolveManifestAssetStorageFileHash: ({
+  downloadFileHash,
+  fileHash
+}: {
+  downloadFileHash?: unknown;
+  fileHash: string;
+}) => string;
 declare const getManifestAssetStoragePath: ({
-  assetBaseStorageUri,
   assetPath,
+  downloadFileHash,
   fileHash
 }: {
-  assetBaseStorageUri: string;
   assetPath: string;
+  downloadFileHash?: unknown;
   fileHash: string;
 }) => string;
 declare const resolveManifestAssetStorageUri: ({
   assetBaseStorageUri,
   assetPath,
+  downloadFileHash,
   fileHash
 }: {
   assetBaseStorageUri: string;
   assetPath: string;
+  downloadFileHash?: unknown;
   fileHash: string;
 }) => string;
 //#endregion
-export { AssetStorageLayout, createStorageUriWithRelativePath, getAssetStorageLayout, getManifestAssetDownloadPath, getManifestAssetStoragePath, isBrotliManifestAssetPath, isContentAddressedAssetBaseStorageUri, resolveManifestAssetStorageUri };
+export { createStorageUriWithRelativePath, getManifestAssetDownloadPath, getManifestAssetStoragePath, isBrotliManifestAssetPath, replaceStorageUriKeySuffix, resolveManifestAssetStorageFileHash, resolveManifestAssetStorageUri };

package/dist/assetStorageLayout.mjs

@@ -1,32 +1,50 @@
-import { getContentAddressedAssetStoragePath } from "./contentAddressedAssets.mjs";
-import { getLegacyManifestAssetStoragePath } from "./legacyAssetStorageLayout.mjs";
+import { getContentAddressedAssetStoragePath, isContentAddressedAssetFileHash } from "./contentAddressedAssets.mjs";
+import { createStorageKeyBuilder } from "./createStorageKeyBuilder.mjs";
+import { createStorageUri, parseStorageUri } from "./parseStorageUri.mjs";
 //#region src/assetStorageLayout.ts
 const isBrotliManifestAssetPath = (assetPath) => /(^|\/)index\.[^/]+\.bundle$/.test(assetPath.replace(/\\/g, "/"));
 const getManifestAssetDownloadPath = (assetPath) => isBrotliManifestAssetPath(assetPath) ? `${assetPath}.br` : assetPath;
 const createStorageUriWithRelativePath = ({ baseStorageUri, relativePath }) => {
-	const storageUrl = new URL(baseStorageUri);
-	storageUrl.pathname = `${storageUrl.pathname.replace(/\/+$/, "")}/${relativePath.replace(/\\/g, "/").split("/").filter(Boolean).map((segment) => encodeURIComponent(segment)).join("/")}`;
-	return storageUrl.toString();
-};
-const getAssetStorageLayout = (assetBaseStorageUri) => {
-	const pathname = new URL(assetBaseStorageUri).pathname.replace(/\/+$/, "");
-	return pathname.endsWith("/assets") || pathname === "/assets" ? "content-addressed" : "legacy-files";
+	const parsed = parseStorageUri(baseStorageUri, new URL(baseStorageUri).protocol.replace(":", ""));
+	const childKey = createStorageKeyBuilder(void 0)(relativePath);
+	if (!childKey) throw new Error("Relative storage key must not be empty.");
+	return createStorageUri({
+		protocol: parsed.protocol,
+		bucket: parsed.bucket,
+		key: createStorageKeyBuilder(parsed.key)(childKey)
+	});
 };
-const isContentAddressedAssetBaseStorageUri = (assetBaseStorageUri) => getAssetStorageLayout(assetBaseStorageUri) === "content-addressed";
-const getManifestAssetStoragePath = ({ assetBaseStorageUri, assetPath, fileHash }) => {
-	if (getAssetStorageLayout(assetBaseStorageUri) === "content-addressed") return getContentAddressedAssetStoragePath({
-		assetPath,
-		fileHash
+const replaceStorageUriKeySuffix = ({ storageUri, keySuffix, replacement }) => {
+	const parsed = parseStorageUri(storageUri, new URL(storageUri).protocol.replace(":", ""));
+	const normalizedSuffix = createStorageKeyBuilder(void 0)(keySuffix);
+	const normalizedReplacement = createStorageKeyBuilder(void 0)(replacement);
+	if (!normalizedSuffix || !normalizedReplacement) throw new Error("Storage URI key suffix and replacement must not be empty.");
+	const keySegments = parsed.key.split("/");
+	const suffixSegments = normalizedSuffix.split("/");
+	const suffixOffset = keySegments.length - suffixSegments.length;
+	if (suffixOffset < 0 || suffixSegments.some((segment, index) => keySegments[suffixOffset + index] !== segment)) throw new Error("Storage URI key does not end with the expected suffix.");
+	const prefix = keySegments.slice(0, suffixOffset).join("/");
+	return createStorageUri({
+		protocol: parsed.protocol,
+		bucket: parsed.bucket,
+		key: createStorageKeyBuilder(prefix)(normalizedReplacement)
 	});
-	return getLegacyManifestAssetStoragePath({ assetPath });
 };
-const resolveManifestAssetStorageUri = ({ assetBaseStorageUri, assetPath, fileHash }) => createStorageUriWithRelativePath({
+const resolveManifestAssetStorageFileHash = ({ downloadFileHash, fileHash }) => isContentAddressedAssetFileHash(downloadFileHash) ? downloadFileHash : fileHash;
+const getManifestAssetStoragePath = ({ assetPath, downloadFileHash, fileHash }) => getContentAddressedAssetStoragePath({
+	assetPath,
+	fileHash: resolveManifestAssetStorageFileHash({
+		downloadFileHash,
+		fileHash
+	})
+});
+const resolveManifestAssetStorageUri = ({ assetBaseStorageUri, assetPath, downloadFileHash, fileHash }) => createStorageUriWithRelativePath({
 	baseStorageUri: assetBaseStorageUri,
 	relativePath: getManifestAssetStoragePath({
-		assetBaseStorageUri,
 		assetPath,
+		downloadFileHash,
 		fileHash
 	})
 });
 //#endregion
-export { createStorageUriWithRelativePath, getAssetStorageLayout, getManifestAssetDownloadPath, getManifestAssetStoragePath, isBrotliManifestAssetPath, isContentAddressedAssetBaseStorageUri, resolveManifestAssetStorageUri };
+export { createStorageUriWithRelativePath, getManifestAssetDownloadPath, getManifestAssetStoragePath, isBrotliManifestAssetPath, replaceStorageUriKeySuffix, resolveManifestAssetStorageFileHash, resolveManifestAssetStorageUri };

package/dist/bundleStorageLayout.cjs

@@ -9,9 +9,8 @@ const createStorageRootUriWithPath = (storageUri, bundleId, relativePath) => {
 	const storageUrl = new URL(storageUri);
 	const segments = storageUrl.pathname.split("/").filter(Boolean);
 	const bundleIndex = segments.lastIndexOf(bundleId);
-	if (bundleIndex < 0) throw new Error(`Storage URI does not contain bundle id: ${bundleId}`);
-	const rootSegments = segments.slice(0, bundleIndex);
-	if (rootSegments.at(-1) === "bundles") rootSegments.pop();
+	if (bundleIndex < 1 || segments[bundleIndex - 1] !== "bundles") throw new Error(`Storage URI does not contain canonical bundle path: ${BUNDLE_STORAGE_PREFIX}/${bundleId}`);
+	const rootSegments = segments.slice(0, bundleIndex - 1);
 	const relativeSegments = relativePath.split("/").filter(Boolean).map((segment) => encodeURIComponent(segment));
 	storageUrl.pathname = `/${[...rootSegments, ...relativeSegments].join("/")}`;
 	return storageUrl.toString();

package/dist/bundleStorageLayout.mjs

@@ -9,9 +9,8 @@ const createStorageRootUriWithPath = (storageUri, bundleId, relativePath) => {
 	const storageUrl = new URL(storageUri);
 	const segments = storageUrl.pathname.split("/").filter(Boolean);
 	const bundleIndex = segments.lastIndexOf(bundleId);
-	if (bundleIndex < 0) throw new Error(`Storage URI does not contain bundle id: ${bundleId}`);
-	const rootSegments = segments.slice(0, bundleIndex);
-	if (rootSegments.at(-1) === "bundles") rootSegments.pop();
+	if (bundleIndex < 1 || segments[bundleIndex - 1] !== "bundles") throw new Error(`Storage URI does not contain canonical bundle path: ${BUNDLE_STORAGE_PREFIX}/${bundleId}`);
+	const rootSegments = segments.slice(0, bundleIndex - 1);
 	const relativeSegments = relativePath.split("/").filter(Boolean).map((segment) => encodeURIComponent(segment));
 	storageUrl.pathname = `/${[...rootSegments, ...relativeSegments].join("/")}`;
 	return storageUrl.toString();

package/dist/contentAddressedAssets.cjs

@@ -1,5 +1,9 @@
 //#region src/contentAddressedAssets.ts
 const CONTENT_ADDRESSED_ASSET_PREFIX = "assets";
+const SHA256_FILE_HASH_RE = /^[0-9a-f]{64}$/;
+const isContentAddressedAssetFileHash = (value) => {
+	return typeof value === "string" && SHA256_FILE_HASH_RE.test(value);
+};
 const getContentAddressedAssetStoragePath = ({ assetPath, fileHash }) => {
 	const extension = assetPath.endsWith(".br") ? ".br" : assetPath.includes(".") ? `.${assetPath.split(".").pop()}` : "";
 	return `sha256/${fileHash.slice(0, 2)}/${fileHash}${extension}`;
@@ -7,3 +11,4 @@ const getContentAddressedAssetStoragePath = ({ assetPath, fileHash }) => {
 //#endregion
 exports.CONTENT_ADDRESSED_ASSET_PREFIX = CONTENT_ADDRESSED_ASSET_PREFIX;
 exports.getContentAddressedAssetStoragePath = getContentAddressedAssetStoragePath;
+exports.isContentAddressedAssetFileHash = isContentAddressedAssetFileHash;

package/dist/contentAddressedAssets.d.cts

@@ -1,5 +1,6 @@
 //#region src/contentAddressedAssets.d.ts
 declare const CONTENT_ADDRESSED_ASSET_PREFIX = "assets";
+declare const isContentAddressedAssetFileHash: (value: unknown) => value is string;
 declare const getContentAddressedAssetStoragePath: ({
   assetPath,
   fileHash
@@ -8,4 +9,4 @@ declare const getContentAddressedAssetStoragePath: ({
   fileHash: string;
 }) => string;
 //#endregion
-export { CONTENT_ADDRESSED_ASSET_PREFIX, getContentAddressedAssetStoragePath };
+export { CONTENT_ADDRESSED_ASSET_PREFIX, getContentAddressedAssetStoragePath, isContentAddressedAssetFileHash };

package/dist/contentAddressedAssets.d.mts

@@ -1,5 +1,6 @@
 //#region src/contentAddressedAssets.d.ts
 declare const CONTENT_ADDRESSED_ASSET_PREFIX = "assets";
+declare const isContentAddressedAssetFileHash: (value: unknown) => value is string;
 declare const getContentAddressedAssetStoragePath: ({
   assetPath,
   fileHash
@@ -8,4 +9,4 @@ declare const getContentAddressedAssetStoragePath: ({
   fileHash: string;
 }) => string;
 //#endregion
-export { CONTENT_ADDRESSED_ASSET_PREFIX, getContentAddressedAssetStoragePath };
+export { CONTENT_ADDRESSED_ASSET_PREFIX, getContentAddressedAssetStoragePath, isContentAddressedAssetFileHash };

package/dist/contentAddressedAssets.mjs

@@ -1,8 +1,12 @@
 //#region src/contentAddressedAssets.ts
 const CONTENT_ADDRESSED_ASSET_PREFIX = "assets";
+const SHA256_FILE_HASH_RE = /^[0-9a-f]{64}$/;
+const isContentAddressedAssetFileHash = (value) => {
+	return typeof value === "string" && SHA256_FILE_HASH_RE.test(value);
+};
 const getContentAddressedAssetStoragePath = ({ assetPath, fileHash }) => {
 	const extension = assetPath.endsWith(".br") ? ".br" : assetPath.includes(".") ? `.${assetPath.split(".").pop()}` : "";
 	return `sha256/${fileHash.slice(0, 2)}/${fileHash}${extension}`;
 };
 //#endregion
-export { CONTENT_ADDRESSED_ASSET_PREFIX, getContentAddressedAssetStoragePath };
+export { CONTENT_ADDRESSED_ASSET_PREFIX, getContentAddressedAssetStoragePath, isContentAddressedAssetFileHash };