@kubohiroya/turbowarp-asset-cache 0.3.2 → 0.4.0

package/dist/composition.js

@@ -1,3 +1,20 @@
+//#region src/config.ts
+var extensionConfig = {
+	id: "kubohiroyaassetcache",
+	slug: "asset-cache",
+	name: "Asset Cache",
+	description: "Register, cache, display, and play image, audio, and runtime text assets in TurboWarp.",
+	descriptions: { ja: "TurboWarpで画像・音声・実行時テキストの素材を登録・保持し、表示・再生します。" },
+	author: "Hiroya Kubo",
+	license: "MPL-2.0",
+	unsandboxed: "required",
+	docsURI: "https://kubohiroya.github.io/turbowarp-asset-cache/",
+	color1: "#5b7cfa",
+	color2: "#425ed8",
+	color3: "#2f46aa",
+	blockIconURI: `data:image/svg+xml,${encodeURIComponent("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 48 48\"><rect x=\"4\" y=\"8\" width=\"40\" height=\"32\" rx=\"6\" fill=\"#59C059\"/><path d=\"M14 20h12l3 3h7v12a2 2 0 0 1-2 2H14a2 2 0 0 1-2-2V22a2 2 0 0 1 2-2z\" fill=\"#fff\"/><path d=\"M24 17v8M21 22l3 3 3-3\" fill=\"none\" stroke=\"#59C059\" stroke-width=\"2.6\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/></svg>")}`
+};
+//#endregion
 //#region src/audio-output.ts
 /** Media volume handles attenuation and fades; this shared graph adds amplification. */
 var shared;
@@ -693,7 +710,7 @@ var block_definitions_default = {
 	]
 };
 //#endregion
-//#region node_modules/.pnpm/@kubohiroya+turbowarp-extension-data-editor@0.2.1_react@18.3.1/node_modules/@kubohiroya/turbowarp-extension-data-editor/dist/fixed-input-schema.js
+//#region node_modules/.pnpm/@kubohiroya+turbowarp-extension-data-editor@0.3.4_react@18.3.1/node_modules/@kubohiroya/turbowarp-extension-data-editor/dist/fixed-input-schema.js
 var numberToken = /^-?(?:0|[1-9][0-9]*)(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?$/u;
 var invalidNumber = Object.freeze({
 	kind: "invalid",
@@ -1090,7 +1107,7 @@ function fixedInputRegistration(scratch) {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@kubohiroya+turbowarp-named-data@0.3.1/node_modules/@kubohiroya/turbowarp-named-data/dist/composition.js
+//#region node_modules/.pnpm/@kubohiroya+turbowarp-named-data@0.5.0/node_modules/@kubohiroya/turbowarp-named-data/dist/composition.js
 var NAMED_DATA_REGISTRY_SYMBOL_KEY = "@kubohiroya/turbowarp-named-data/registry";
 var NAMED_DATA_REGISTRY_SYMBOL = Symbol.for(NAMED_DATA_REGISTRY_SYMBOL_KEY);
 var NAMED_DATA_NAMESPACE_PATTERN = /^[a-z][a-z0-9.-]{0,63}$/u;
@@ -1181,7 +1198,7 @@ var NamedDataRegistry = class {
 		const provider = this.resolveProvider(reference, representation, context);
 		throwIfAborted(context.signal);
 		try {
-			const metadata = await provider.stat(reference, representation, context);
+			const metadata = snapshotMetadata(await provider.stat(reference, representation, context));
 			throwIfAborted(context.signal);
 			validateMetadata(metadata, reference, representation);
 			return metadata;
@@ -1193,9 +1210,11 @@ var NamedDataRegistry = class {
 		const provider = this.resolveProvider(reference, representation, context);
 		throwIfAborted(context.signal);
 		let opened;
+		let metadata;
 		try {
 			opened = await provider.openBody(reference, representation, context);
-			validateMetadata(opened, reference, representation);
+			metadata = snapshotMetadata(opened);
+			validateMetadata(metadata, reference, representation);
 			if (!(opened.body instanceof Uint8Array) && !(opened.body instanceof ReadableStream)) throw new NamedDataError("NAMED_DATA_INVALID_METADATA", "Provider returned an invalid body.");
 		} catch (error) {
 			throw normalizeProviderError(error);
@@ -1229,14 +1248,7 @@ var NamedDataRegistry = class {
 			}
 		}
 		return Object.freeze({
-			reference: Object.freeze({ ...opened.reference }),
-			nativeRepresentation: opened.nativeRepresentation,
-			representation: opened.representation,
-			mediaType: opened.mediaType,
-			...opened.byteLength === void 0 ? {} : { byteLength: opened.byteLength },
-			...opened.digest === void 0 ? {} : { digest: opened.digest },
-			revision: opened.revision,
-			replayable: opened.replayable,
+			...metadata,
 			body: opened.body,
 			release: tracked.release
 		});
@@ -1347,15 +1359,61 @@ function validateReferenceShape(reference, representation) {
 	if (reference.schemaRef !== void 0) validateSchemaRef(reference.kind, reference.schemaRef);
 }
 function validateMetadata(metadata, reference, representation) {
-	if (metadata.representation !== representation || !isNativeRepresentation(metadata.reference.kind, metadata.nativeRepresentation) || metadata.reference.namespace !== reference.namespace || metadata.reference.name !== reference.name || metadata.reference.kind !== reference.kind || metadata.reference.scope !== reference.scope || typeof metadata.mediaType !== "string" || metadata.mediaType.length === 0 || typeof metadata.revision !== "string" || metadata.revision.length === 0 || typeof metadata.replayable !== "boolean" || metadata.byteLength !== void 0 && (!Number.isSafeInteger(metadata.byteLength) || metadata.byteLength < 0) || metadata.digest !== void 0 && !/^sha256-[A-Za-z0-9_-]+$/u.test(metadata.digest)) throw new NamedDataError("NAMED_DATA_INVALID_METADATA", "Provider returned invalid metadata.");
+	if (metadata.representation !== representation || !isNativeRepresentation(metadata.reference.kind, metadata.nativeRepresentation) || metadata.reference.namespace !== reference.namespace || metadata.reference.name !== reference.name || metadata.reference.kind !== reference.kind || metadata.reference.scope !== reference.scope || typeof metadata.mediaType !== "string" || metadata.mediaType.length === 0 || typeof metadata.revision !== "string" || metadata.revision.length === 0 || typeof metadata.replayable !== "boolean" || metadata.byteLength !== void 0 && (!Number.isSafeInteger(metadata.byteLength) || metadata.byteLength < 0) || metadata.digest !== void 0 && !/^sha256-[A-Za-z0-9_-]+$/u.test(metadata.digest)) throw invalidMetadata();
 	const expectedSchema = reference.schemaRef;
 	const actualSchema = metadata.schemaRef;
 	if (actualSchema !== void 0) validateSchemaRef(metadata.reference.kind, actualSchema, "NAMED_DATA_INVALID_METADATA");
 	if (metadata.reference.schemaRef !== void 0) validateSchemaRef(metadata.reference.kind, metadata.reference.schemaRef, "NAMED_DATA_INVALID_METADATA");
 	if (!sameSchemaRef(expectedSchema, actualSchema) || !sameSchemaRef(expectedSchema, metadata.reference.schemaRef)) throw new NamedDataError("NAMED_DATA_SCHEMA_VERSION_MISMATCH", "Provider schemaRef does not match the requested reference.");
 }
+/**
+* Copies provider metadata once so validation and consumers observe the same frozen identity.
+* Fields are read exactly once; payload bodies are never part of the snapshot.
+*/
+function snapshotMetadata(metadata) {
+	if (typeof metadata !== "object" || metadata === null) throw invalidMetadata();
+	const source = metadata.reference;
+	if (typeof source !== "object" || source === null) throw invalidMetadata();
+	const { namespace, name, kind, scope, schemaRef: referenceSchemaRef } = source;
+	const { nativeRepresentation, representation, mediaType, byteLength, digest, revision, replayable, schemaRef } = metadata;
+	const reference = snapshotSchemaRef(referenceSchemaRef);
+	const resolved = snapshotSchemaRef(schemaRef);
+	return Object.freeze({
+		reference: Object.freeze({
+			namespace,
+			name,
+			kind,
+			scope,
+			...reference === void 0 ? {} : { schemaRef: reference }
+		}),
+		nativeRepresentation,
+		representation,
+		mediaType,
+		...byteLength === void 0 ? {} : { byteLength },
+		...digest === void 0 ? {} : { digest },
+		revision,
+		replayable,
+		...resolved === void 0 ? {} : { schemaRef: resolved }
+	});
+}
+function snapshotSchemaRef(schemaRef) {
+	if (schemaRef === void 0) return void 0;
+	if (typeof schemaRef !== "object" || schemaRef === null || Object.keys(schemaRef).some((key) => key !== "id" && key !== "version")) throw invalidSchemaRef("NAMED_DATA_INVALID_METADATA");
+	const { id, version } = schemaRef;
+	if (typeof id !== "string" || typeof version !== "string") throw invalidSchemaRef("NAMED_DATA_INVALID_METADATA");
+	return Object.freeze({
+		id,
+		version
+	});
+}
 function validateSchemaRef(kind, schemaRef, errorCode = "NAMED_DATA_INVALID_REF") {
-	if (kind !== "structured" || typeof schemaRef !== "object" || schemaRef === null || !NAMED_DATA_SCHEMA_ID_PATTERN.test(String(schemaRef.id ?? "")) || !NAMED_DATA_SCHEMA_VERSION_PATTERN.test(String(schemaRef.version ?? "")) || Object.keys(schemaRef).some((key) => key !== "id" && key !== "version")) throw new NamedDataError(errorCode, "Invalid schemaRef; schema references require a structured value, stable id, and full SemVer version.");
+	if (kind !== "structured" || typeof schemaRef !== "object" || schemaRef === null || !NAMED_DATA_SCHEMA_ID_PATTERN.test(String(schemaRef.id ?? "")) || !NAMED_DATA_SCHEMA_VERSION_PATTERN.test(String(schemaRef.version ?? "")) || Object.keys(schemaRef).some((key) => key !== "id" && key !== "version")) throw invalidSchemaRef(errorCode);
+}
+function invalidSchemaRef(errorCode) {
+	return new NamedDataError(errorCode, "Invalid schemaRef; schema references require a structured value, stable id, and full SemVer version.");
+}
+function invalidMetadata() {
+	return new NamedDataError("NAMED_DATA_INVALID_METADATA", "Provider returned invalid metadata.");
 }
 function sameSchemaRef(left, right) {
 	return left === void 0 ? right === void 0 : right !== void 0 && left.id === right.id && left.version === right.version;
@@ -1781,10 +1839,10 @@ function throwIfNamedBodyAborted(signal) {
 }
 //#endregion
 //#region src/extension.ts
-var EXTENSION_ID = "kubohiroyaassetcache";
+var EXTENSION_ID = extensionConfig.id;
 var EXTENSION_VERSION = "0.14.0";
-var EXTENSION_DOCS_URI = "https://kubohiroya.github.io/turbowarp-asset-cache/";
-var BLOCK_ICON_URI = `data:image/svg+xml,${encodeURIComponent("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 64 64\"><path fill=\"#fff\" d=\"M19 47 29 17h7l10 30h-7l-2-7H27l-2 7h-6Zm10-13h6l-3-10-3 10Z\"/></svg>")}`;
+var EXTENSION_DOCS_URI = extensionConfig.docsURI;
+var BLOCK_ICON_URI = extensionConfig.blockIconURI;
 var DB_NAME = "tw-asset-cache";
 var DB_VERSION = 1;
 var STORE_NAME = "assets";
@@ -2359,9 +2417,9 @@ var AssetManagerExtension = class {
 			name: Scratch.translate(block_definitions_default.extensionName),
 			docsURI: EXTENSION_DOCS_URI,
 			blockIconURI: BLOCK_ICON_URI,
-			color1: "#5b7cfa",
-			color2: "#425ed8",
-			color3: "#2f46aa",
+			color1: extensionConfig.color1,
+			color2: extensionConfig.color2,
+			color3: extensionConfig.color3,
 			blocks
 		};
 	}
@@ -4039,7 +4097,7 @@ function createOpfsBinaryObjectStore(options = {}) {
 	async function committedObjectMatches(location, descriptor, signal) {
 		assertActive(released, signal);
 		try {
-			await verify(await readFileBytes(await (await location.directory.getFileHandle(location.name)).getFile(), signal), descriptor, subtleCrypto);
+			await verify(await readCommittedBytes(location, signal, false), descriptor, subtleCrypto);
 			assertActive(released, signal);
 			return true;
 		} catch (error) {
@@ -4049,6 +4107,18 @@ function createOpfsBinaryObjectStore(options = {}) {
 			throw error;
 		}
 	}
+	async function readCommittedBytes(location, signal, retryMissing = true) {
+		for (let attempt = 0;; attempt += 1) {
+			assertActive(released, signal);
+			try {
+				return await readFileBytes(await (await location.directory.getFileHandle(location.name)).getFile(), signal);
+			} catch (error) {
+				assertActive(released, signal);
+				if (!(error instanceof DOMException && (error.name === "NotReadableError" || retryMissing && error.name === "NotFoundError")) || attempt >= 3) throw error;
+				await new Promise((resolve) => setTimeout(resolve, 20 * (attempt + 1)));
+			}
+		}
+	}
 	function writableConflict(error) {
 		return error instanceof DOMException && (error.name === "InvalidStateError" || error.name === "NoModificationAllowedError");
 	}
@@ -4077,13 +4147,12 @@ function createOpfsBinaryObjectStore(options = {}) {
 				assertActive(released, operationOptions.signal);
 				let retryDelayMs = 20;
 				while (!await committedObjectMatches(location, descriptor, operationOptions.signal)) try {
-					const finalHandle = await location.directory.getFileHandle(location.name, { create: true });
-					writable = await finalHandle.createWritable();
+					writable = await (await location.directory.getFileHandle(location.name, { create: true })).createWritable();
 					activeWritables.add(writable);
 					await copyFileToWritable(stagedFile, writable, operationOptions.signal);
 					activeWritables.delete(writable);
 					writable = null;
-					await verify(await readFileBytes(await finalHandle.getFile(), operationOptions.signal), descriptor, subtleCrypto);
+					await verify(await readCommittedBytes(location, operationOptions.signal), descriptor, subtleCrypto);
 					break;
 				} catch (error) {
 					if (writable) {
@@ -4111,8 +4180,7 @@ function createOpfsBinaryObjectStore(options = {}) {
 			const descriptor = validateDescriptor(descriptorValue);
 			assertActive(released, operationOptions.signal);
 			try {
-				const location = await objectLocation(descriptor.key);
-				const bytes = await readFileBytes(await (await location.directory.getFileHandle(location.name)).getFile(), operationOptions.signal);
+				const bytes = await readCommittedBytes(await objectLocation(descriptor.key), operationOptions.signal);
 				assertActive(released, operationOptions.signal);
 				await verify(bytes, descriptor, subtleCrypto);
 				assertActive(released, operationOptions.signal);
@@ -4145,9 +4213,13 @@ function createOpfsBinaryObjectStore(options = {}) {
 			for await (const entry of staging.values()) {
 				assertActive(released, operationOptions.signal);
 				if (entry.kind !== "file") continue;
-				if ((await entry.getFile()).lastModified > createdBefore) continue;
-				await staging.removeEntry(entry.name);
-				removed += 1;
+				try {
+					if ((await entry.getFile()).lastModified > createdBefore) continue;
+					await staging.removeEntry(entry.name);
+					removed += 1;
+				} catch (error) {
+					if (!(error instanceof DOMException && error.name === "NotFoundError")) throw error;
+				}
 				if (removed >= limit) break;
 			}
 			return removed;

package/dist/types/config.d.ts

@@ -0,0 +1,17 @@
+export declare const extensionConfig: {
+    readonly id: "kubohiroyaassetcache";
+    readonly slug: "asset-cache";
+    readonly name: "Asset Cache";
+    readonly description: "Register, cache, display, and play image, audio, and runtime text assets in TurboWarp.";
+    readonly descriptions: {
+        readonly ja: "TurboWarpで画像・音声・実行時テキストの素材を登録・保持し、表示・再生します。";
+    };
+    readonly author: "Hiroya Kubo";
+    readonly license: "MPL-2.0";
+    readonly unsandboxed: "required";
+    readonly docsURI: "https://kubohiroya.github.io/turbowarp-asset-cache/";
+    readonly color1: "#5b7cfa";
+    readonly color2: "#425ed8";
+    readonly color3: "#2f46aa";
+    readonly blockIconURI: `data:image/svg+xml,${string}`;
+};

package/dist/types/extension.d.ts

@@ -4,10 +4,10 @@ import { type AssetManagerFeatureFlags } from './feature-flags.js';
 import { type DOMImageResource } from './dom-image-resource.js';
 import { type AssetManagerAudioVoice, type AssetManagerAudioVoiceOptions } from './audio-voice.js';
 import { type NamedAssetBodyProvider } from './named-body-provider.js';
-export declare const EXTENSION_ID = "kubohiroyaassetcache";
+export declare const EXTENSION_ID: "kubohiroyaassetcache";
 export declare const EXTENSION_VERSION = "0.14.0";
-export declare const EXTENSION_DOCS_URI = "https://kubohiroya.github.io/turbowarp-asset-cache/";
-export declare const BLOCK_ICON_URI: string;
+export declare const EXTENSION_DOCS_URI: "https://kubohiroya.github.io/turbowarp-asset-cache/";
+export declare const BLOCK_ICON_URI: `data:image/svg+xml,${string}`;
 type BlockArgs = Record<string, unknown>;
 export type AssetKind = 'external' | 'costume' | 'backdrop' | 'sound' | 'text';
 export interface EmbeddedAssetBytesInput {
@@ -132,13 +132,13 @@ export declare class AssetManagerExtension {
     loadingBackdrop(): string;
     loadingCostumeAt(args: BlockArgs): string;
     getInfo(): {
-        id: string;
+        id: "kubohiroyaassetcache";
         name: string;
-        docsURI: string;
-        blockIconURI: string;
-        color1: string;
-        color2: string;
-        color3: string;
+        docsURI: "https://kubohiroya.github.io/turbowarp-asset-cache/";
+        blockIconURI: `data:image/svg+xml,${string}`;
+        color1: "#5b7cfa";
+        color2: "#425ed8";
+        color3: "#2f46aa";
         blocks: Record<string, unknown>[];
     };
     /** Release only this optional editor registration; runtime data remains unchanged. */

package/docs/audio-playback.md

@@ -1,6 +1,6 @@
 # 音声instanceの共通controller
 
-追跡: [Issue #6](https://github.com/kubohiroya/turbowarp-asset-cache/issues/6)。開発中の追加APIで、既存公開版に同名APIがあることを示す文書ではありません。
+追跡: [Issue #6](https://github.com/kubohiroya/turbowarp-asset-cache/issues/6)。ここで説明するAPIは0.3.0以降の公開版に含まれます。
 
 `createAudioPlayback({asset: 'Music'}, {gain: 0.7, muted: false, playbackRate: 1, fadeIn: 0.5, fadeOut: 1.5})` は、停止状態の独立したinstanceを返します。`asset` と `url` のどちらか一つが必須です。直接URLは認証情報を含まないHTTP(S)に限定し、anonymous CORSで読み込みます。別originのサーバーにはAccess-Control-Allow-Originが必要です。これは後からsetGainで増幅する場合も必要となる[Web AudioのCORS仕様](https://webaudio.github.io/web-audio-api/#MediaElementAudioSourceNode-security)に従います。準備だけではnative `play()` を呼びません。有効化フラグは不要です。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubohiroya/turbowarp-asset-cache",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "A browser-local image, audio, and runtime-text asset cache for TurboWarp projects.",
   "author": "Hiroya Kubo <hiroya@cuc.ac.jp>",
   "type": "module",
@@ -21,6 +21,7 @@
     "./package.json": "./package.json"
   },
   "files": [
+    "assets/",
     "dist/",
     "schemas/",
     "docs/fixed-input-editors.ja.md",
@@ -64,10 +65,10 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.39.5",
-    "@kubohiroya/turbowarp-extension-data-editor": "0.2.1",
-    "@kubohiroya/turbowarp-extension-manifest": "0.3.2",
-    "@kubohiroya/turbowarp-named-data": "0.3.1",
-    "@kubohiroya/vite-plugin-turbowarp-extension": "0.7.0",
+    "@kubohiroya/turbowarp-extension-data-editor": "^0.3.4",
+    "@kubohiroya/turbowarp-extension-manifest": "^0.3.2",
+    "@kubohiroya/turbowarp-named-data": "^0.5.0",
+    "@kubohiroya/vite-plugin-turbowarp-extension": "^0.8.0",
     "@types/node": "^22.20.1",
     "@xmldom/xmldom": "0.9.11",
     "eslint": "^9.39.5",
@@ -78,7 +79,7 @@
     "vitest": "^4.1.10"
   },
   "peerDependencies": {
-    "@kubohiroya/turbowarp-named-data": "0.3.1"
+    "@kubohiroya/turbowarp-named-data": "^0.5.0"
   },
   "keywords": [
     "turbowarp",