loro-repo 0.3.0 → 0.4.0

package/dist/{index-DsCaL9JX.d.cts → index.d.cts}

@@ -2,7 +2,7 @@ import { Flock } from "@loro-dev/flock";
 import { Frontiers, LoroDoc } from "loro-crdt";
 import { JoinError, JoinResponseOk, RoomId, UpdateError } from "loro-protocol";
 import { LoroWebsocketClientOptions } from "loro-websocket";
-import { FlockAdaptorConfig } from "loro-adaptors";
+import { FlockAdaptorConfig } from "loro-adaptors/flock";
 
 //#region src/types.d.ts
 type GlobalBlob = typeof globalThis extends {
@@ -714,5 +714,5 @@ declare class LoroRepo<Meta extends JsonObject = JsonObject> {
   destroy(): Promise<void>;
 }
 //#endregion
-export { AssetContent, AssetDownload, AssetId, AssetTransportAdapter, AssetUploadMetadata, BroadcastChannelTransportAdapter, type BroadcastChannelTransportOptions, FileSystemStorageAdaptor, type FileSystemStorageAdaptorOptions, GarbageCollectionOptions, IndexedDBStorageAdaptor, type IndexedDBStorageAdaptorOptions, JsonObject, JsonValue, LinkAssetOptions, ListDocQuery, LoroRepo, LoroRepoOptions, RepoAssetMetadata, RepoDocHandle, RepoDocMeta, RepoEvent, RepoEventBy, RepoEventFilter, RepoEventKind, RepoEventListener, RepoEventType, type RepoSyncOptions, RepoWatchHandle, StorageAdapter, StorageSavePayload, SyncScope, TransportAdapter, type TransportJoinParams, type TransportSubscription, TransportSyncRequest, type TransportSyncResult, UploadAssetOptions, WebSocketTransportAdapter, WebSocketTransportOptions };
-//# sourceMappingURL=index-DsCaL9JX.d.cts.map
+export { AssetContent, AssetDownload, AssetId, AssetTransportAdapter, AssetUploadMetadata, BroadcastChannelTransportAdapter, type BroadcastChannelTransportOptions, FileSystemStorageAdaptor, type FileSystemStorageAdaptorOptions, GarbageCollectionOptions, IndexedDBStorageAdaptor, type IndexedDBStorageAdaptorOptions, JsonObject, JsonValue, LinkAssetOptions, ListDocQuery, LoroRepo, LoroRepoOptions, RepoAssetMetadata, RepoDocHandle, RepoDocMeta, RepoEvent, RepoEventBy, RepoEventFilter, RepoEventKind, RepoEventListener, RepoEventType, type RepoSyncOptions, RepoWatchHandle, StorageAdapter, StorageSavePayload, SyncScope, TransportAdapter, type TransportJoinParams, type TransportSubscription, TransportSyncRequest, type TransportSyncResult, UploadAssetOptions, WebSocketTransportAdapter, type WebSocketTransportOptions };
+//# sourceMappingURL=index.d.cts.map

package/dist/{index-tq65q3qY.d.ts → index.d.ts}

@@ -1,8 +1,9 @@
 import { Flock } from "@loro-dev/flock";
-import { FlockAdaptor, FlockAdaptorConfig, LoroAdaptor } from "loro-adaptors";
+import { LoroAdaptor } from "loro-adaptors/loro";
 import { JoinError, JoinResponseOk, RoomId, UpdateError } from "loro-protocol";
 import { LoroWebsocketClientOptions } from "loro-websocket";
 import { Frontiers, LoroDoc } from "loro-crdt";
+import { FlockAdaptor, FlockAdaptorConfig } from "loro-adaptors/flock";
 
 //#region src/types.d.ts
 type GlobalBlob = typeof globalThis extends {
@@ -714,5 +715,5 @@ declare class LoroRepo<Meta extends JsonObject = JsonObject> {
   destroy(): Promise<void>;
 }
 //#endregion
-export { AssetContent, AssetDownload, AssetId, AssetTransportAdapter, AssetUploadMetadata, BroadcastChannelTransportAdapter, type BroadcastChannelTransportOptions, FileSystemStorageAdaptor, type FileSystemStorageAdaptorOptions, GarbageCollectionOptions, IndexedDBStorageAdaptor, type IndexedDBStorageAdaptorOptions, JsonObject, JsonValue, LinkAssetOptions, ListDocQuery, LoroRepo, LoroRepoOptions, RepoAssetMetadata, RepoDocHandle, RepoDocMeta, RepoEvent, RepoEventBy, RepoEventFilter, RepoEventKind, RepoEventListener, RepoEventType, type RepoSyncOptions, RepoWatchHandle, StorageAdapter, StorageSavePayload, SyncScope, TransportAdapter, type TransportJoinParams, type TransportSubscription, TransportSyncRequest, type TransportSyncResult, UploadAssetOptions, WebSocketTransportAdapter, WebSocketTransportOptions };
-//# sourceMappingURL=index-tq65q3qY.d.ts.map
+export { AssetContent, AssetDownload, AssetId, AssetTransportAdapter, AssetUploadMetadata, BroadcastChannelTransportAdapter, type BroadcastChannelTransportOptions, FileSystemStorageAdaptor, type FileSystemStorageAdaptorOptions, GarbageCollectionOptions, IndexedDBStorageAdaptor, type IndexedDBStorageAdaptorOptions, JsonObject, JsonValue, LinkAssetOptions, ListDocQuery, LoroRepo, LoroRepoOptions, RepoAssetMetadata, RepoDocHandle, RepoDocMeta, RepoEvent, RepoEventBy, RepoEventFilter, RepoEventKind, RepoEventListener, RepoEventType, type RepoSyncOptions, RepoWatchHandle, StorageAdapter, StorageSavePayload, SyncScope, TransportAdapter, type TransportJoinParams, type TransportSubscription, TransportSyncRequest, type TransportSyncResult, UploadAssetOptions, WebSocketTransportAdapter, type WebSocketTransportOptions };
+//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,8 +1,9 @@
 import { Flock } from "@loro-dev/flock";
-import { FlockAdaptor, LoroAdaptor } from "loro-adaptors";
+import { LoroAdaptor } from "loro-adaptors/loro";
 import { CrdtType, bytesToHex } from "loro-protocol";
 import { LoroWebsocketClient } from "loro-websocket";
 import { LoroDoc } from "loro-crdt";
+import { FlockAdaptor } from "loro-adaptors/flock";
 import { promises } from "node:fs";
 import * as path from "node:path";
 import { randomUUID } from "node:crypto";
@@ -1867,13 +1868,11 @@ var AssetManager = class {
 		if (params.assetId && params.assetId !== assetId) throw new Error("Provided assetId does not match content digest");
 		const existing = this.assets.get(assetId);
 		if (existing) {
-			if (!existing.data) {
-				const clone = bytes.slice();
-				existing.data = clone;
-				if (this.storage) await this.storage.save({
+			if (this.storage) {
+				if (!await this.storage.loadAsset(assetId)) await this.storage.save({
 					type: "asset",
 					assetId,
-					data: clone.slice()
+					data: bytes.slice()
 				});
 			}
 			let metadataMutated = false;
@@ -1900,7 +1899,7 @@ var AssetManager = class {
 				await this.persistMeta();
 				this.eventBus.emit({
 					kind: "asset-metadata",
-					asset: this.createAssetDownload(assetId, metadata$1, existing.data),
+					asset: this.createAssetDownload(assetId, metadata$1, bytes),
 					by: "local"
 				});
 			}
@@ -1930,7 +1929,8 @@ var AssetManager = class {
 			assetId,
 			data: storedBytes.slice()
 		});
-		this.rememberAsset(metadata, storedBytes);
+		this.rememberAsset(metadata);
+		this.markAssetAsOrphan(assetId, metadata);
 		this.updateDocAssetMetadata(assetId, metadata);
 		this.metaFlock.put(["a", assetId], assetMetaToJson(metadata));
 		await this.persistMeta();
@@ -1951,13 +1951,11 @@ var AssetManager = class {
 		const existing = this.assets.get(assetId);
 		if (existing) {
 			metadata = existing.metadata;
-			if (!existing.data) {
-				const clone = bytes.slice();
-				existing.data = clone;
-				if (this.storage) await this.storage.save({
+			if (this.storage) {
+				if (!await this.storage.loadAsset(assetId)) await this.storage.save({
 					type: "asset",
 					assetId,
-					data: clone.slice()
+					data: bytes.slice()
 				});
 			}
 			let nextMetadata = metadata;
@@ -1997,11 +1995,11 @@ var AssetManager = class {
 				await this.persistMeta();
 				this.eventBus.emit({
 					kind: "asset-metadata",
-					asset: this.createAssetDownload(assetId, metadata, existing.data),
+					asset: this.createAssetDownload(assetId, metadata, bytes),
 					by: "local"
 				});
 			} else metadata = existing.metadata;
-			storedBytes = existing.data;
+			storedBytes = bytes;
 			this.rememberAsset(metadata);
 		} else {
 			metadata = {
@@ -2027,7 +2025,7 @@ var AssetManager = class {
 				assetId,
 				data: storedBytes.slice()
 			});
-			this.rememberAsset(metadata, storedBytes);
+			this.rememberAsset(metadata);
 			this.updateDocAssetMetadata(assetId, metadata);
 			this.metaFlock.put(["a", assetId], assetMetaToJson(metadata));
 			created = true;
@@ -2035,9 +2033,7 @@ var AssetManager = class {
 		const mapping = this.docAssets.get(docId) ?? /* @__PURE__ */ new Map();
 		mapping.set(assetId, metadata);
 		this.docAssets.set(docId, mapping);
-		const refs = this.assetToDocRefs.get(assetId) ?? /* @__PURE__ */ new Set();
-		refs.add(docId);
-		this.assetToDocRefs.set(assetId, refs);
+		this.addDocReference(assetId, docId);
 		this.metaFlock.put([
 			"ld",
 			docId,
@@ -2067,20 +2063,7 @@ var AssetManager = class {
 			docId,
 			assetId
 		]);
-		const refs = this.assetToDocRefs.get(assetId);
-		if (refs) {
-			refs.delete(docId);
-			if (refs.size === 0) {
-				this.assetToDocRefs.delete(assetId);
-				const record = this.assets.get(assetId);
-				if (record) this.orphanedAssets.set(assetId, {
-					metadata: record.metadata,
-					deletedAt: Date.now()
-				});
-				this.metaFlock.delete(["a", assetId]);
-				this.assets.delete(assetId);
-			}
-		}
+		this.removeDocAssetReference(assetId, docId);
 		await this.persistMeta();
 		this.eventBus.emit({
 			kind: "asset-unlink",
@@ -2167,12 +2150,11 @@ var AssetManager = class {
 			this.handleAssetRemoval(assetId, by);
 			return;
 		}
-		const existingData = previous?.data;
-		this.rememberAsset(metadata, existingData);
+		this.rememberAsset(metadata);
 		this.updateDocAssetMetadata(assetId, cloneRepoAssetMetadata(metadata));
 		if (!previous || !assetMetadataEqual(previous.metadata, metadata)) this.eventBus.emit({
 			kind: "asset-metadata",
-			asset: this.createAssetDownload(assetId, metadata, existingData),
+			asset: this.createAssetDownload(assetId, metadata),
 			by
 		});
 	}
@@ -2187,11 +2169,7 @@ var AssetManager = class {
 			if (typeof assetId !== "string") continue;
 			const metadata = assetMetaFromJson(row.value);
 			if (!metadata) continue;
-			const existing = this.assets.get(assetId);
-			nextAssets.set(assetId, {
-				metadata,
-				data: existing?.data
-			});
+			nextAssets.set(assetId, { metadata });
 		}
 		const nextDocAssets = /* @__PURE__ */ new Map();
 		const linkRows = this.metaFlock.scan({ prefix: ["ld"] });
@@ -2227,12 +2205,18 @@ var AssetManager = class {
 			this.assetToDocRefs.set(assetId, refs);
 		}
 		this.assets.clear();
-		for (const record of nextAssets.values()) this.rememberAsset(record.metadata, record.data);
+		for (const record of nextAssets.values()) this.rememberAsset(record.metadata);
+		for (const assetId of nextAssets.keys()) {
+			const refs = this.assetToDocRefs.get(assetId);
+			if (!refs || refs.size === 0) {
+				if (!this.orphanedAssets.has(assetId)) this.markAssetAsOrphan(assetId, nextAssets.get(assetId).metadata);
+			} else this.orphanedAssets.delete(assetId);
+		}
 		for (const [assetId, record] of nextAssets) {
 			const previous = prevAssets.get(assetId)?.metadata;
 			if (!assetMetadataEqual(previous, record.metadata)) this.eventBus.emit({
 				kind: "asset-metadata",
-				asset: this.createAssetDownload(assetId, record.metadata, record.data),
+				asset: this.createAssetDownload(assetId, record.metadata),
 				by
 			});
 		}
@@ -2328,36 +2312,24 @@ var AssetManager = class {
 		};
 	}
 	async materializeAsset(assetId) {
-		let record = this.assets.get(assetId);
-		if (record?.data) return {
-			metadata: record.metadata,
-			bytes: record.data.slice()
-		};
+		const record = this.assets.get(assetId);
 		if (record && this.storage) {
 			const stored = await this.storage.loadAsset(assetId);
-			if (stored) {
-				const clone = stored.slice();
-				record.data = clone.slice();
-				return {
-					metadata: record.metadata,
-					bytes: clone
-				};
-			}
+			if (stored) return {
+				metadata: record.metadata,
+				bytes: stored
+			};
 		}
 		if (!record && this.storage) {
 			const stored = await this.storage.loadAsset(assetId);
 			if (stored) {
 				const metadata$1 = this.getAssetMetadata(assetId);
 				if (!metadata$1) throw new Error(`Missing metadata for asset ${assetId}`);
-				const clone = stored.slice();
-				this.assets.set(assetId, {
-					metadata: metadata$1,
-					data: clone.slice()
-				});
+				this.assets.set(assetId, { metadata: metadata$1 });
 				this.updateDocAssetMetadata(assetId, metadata$1);
 				return {
 					metadata: metadata$1,
-					bytes: clone
+					bytes: stored
 				};
 			}
 		}
@@ -2373,10 +2345,7 @@ var AssetManager = class {
 			...remote.policy ? { policy: remote.policy } : {},
 			...remote.tag ? { tag: remote.tag } : {}
 		};
-		this.assets.set(assetId, {
-			metadata,
-			data: remoteBytes.slice()
-		});
+		this.assets.set(assetId, { metadata });
 		this.updateDocAssetMetadata(assetId, metadata);
 		this.metaFlock.put(["a", assetId], assetMetaToJson(metadata));
 		await this.persistMeta();
@@ -2398,18 +2367,14 @@ var AssetManager = class {
 			if (assets) assets.set(assetId, metadata);
 		}
 	}
-	rememberAsset(metadata, bytes) {
-		const data = bytes ? bytes.slice() : this.assets.get(metadata.assetId)?.data;
-		this.assets.set(metadata.assetId, {
-			metadata,
-			data
-		});
-		this.orphanedAssets.delete(metadata.assetId);
+	rememberAsset(metadata) {
+		this.assets.set(metadata.assetId, { metadata });
 	}
 	addDocReference(assetId, docId) {
 		const refs = this.assetToDocRefs.get(assetId) ?? /* @__PURE__ */ new Set();
 		refs.add(docId);
 		this.assetToDocRefs.set(assetId, refs);
+		this.orphanedAssets.delete(assetId);
 	}
 	removeDocAssetReference(assetId, docId) {
 		const refs = this.assetToDocRefs.get(assetId);