Fix destroy of workspace

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucla-irl/ndnts-aux",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "NDNts Auxiliary Package for Web and Deno",
   "scripts": {
     "test": "deno test --no-check",

src/adaptors/yjs-state-manager.ts

@@ -8,7 +8,7 @@ const SnapshotKey = 'localSnapshot';
  * YjsStateManager manages updates transported by SyncAgent.
  * It receives and emits updates, encodes and loads local state as updates.
  */
-export class YjsStateManager {
+export class YjsStateManager implements AsyncDisposable {
   private readonly callback = this.docUpdateHandler.bind(this);
   private counter = 0;
 
@@ -21,11 +21,15 @@ export class YjsStateManager {
     doc.on('update', this.callback);
   }
 
-  public destroy() {
-    this.saveLocalSnapshot(this.getState());
+  public async destroy() {
+    await this.saveLocalSnapshot(this.getState());
     this.doc.off('update', this.callback);
   }
 
+  async [Symbol.asyncDispose]() {
+    return await this.destroy();
+  }
+
   private docUpdateHandler(_update: Uint8Array, origin: undefined) {
     if (origin !== this) { // This condition must be true
       this.counter += 1;

src/sync-agent/sync-agent.ts

@@ -12,7 +12,7 @@ import { panic } from '../utils/panic.ts';
 export type ChannelType = 'update' | 'blob' | 'status' | 'blobUpdate';
 const AllChannelValues = ['update', 'blob', 'status', 'blobUpdate'];
 
-export class SyncAgent {
+export class SyncAgent implements AsyncDisposable {
   private _ready = false;
   readonly listeners: { [key: string]: (content: Uint8Array, id: Name) => void } = {};
   readonly producer;
@@ -56,13 +56,17 @@ export class SyncAgent {
     });
   }
 
-  public destroy() {
-    this.atLeastOnce.destroy();
-    this.latestOnly.destroy();
+  public async destroy() {
+    await this.atLeastOnce.destroy();
+    await this.latestOnly.destroy();
     this.trafficAttractor.close();
     this.producer.close();
   }
 
+  async [Symbol.asyncDispose]() {
+    return await this.destroy();
+  }
+
   public reset() {
     this.atLeastOnce.reset();
     this.latestOnly.reset();

src/utils/name-lit.ts

@@ -4,6 +4,14 @@ import { Encoder, NNI } from '@ndn/tlv';
 /**
  * NDN Name generator for test. Allows to use tag literals to generate NDN name from boilerplate.
  * Designed for unit tests only. Do not use in production, as it is slow and not guaranteed to reflect the latest spec.
+ *
+ * @remarks
+ *
+ * 1. Alternative URI only works for templates, e.g. `` name`/aa/seg=${1}` ``.
+ * 2. Do not try to fool this function on purpuse. It is designed for test use only and
+ *    does not handle corner cases at all.
+ *    For example, `` name`/8=seg=${0}` ``.
+ *
  * @param templates Name boilerplate
  * @param values Values
  */

src/workspace/workspace.ts

@@ -5,7 +5,7 @@ import { encodeSyncState, parseSyncState, SyncAgent } from '../sync-agent/mod.ts
 import { NdnSvsAdaptor, YjsStateManager } from '../adaptors/mod.ts';
 import * as Y from 'yjs';
 
-export class Workspace {
+export class Workspace implements AsyncDisposable {
   private constructor(
     public readonly nodeId: Name,
     public readonly persistStore: Storage,
@@ -79,10 +79,16 @@ export class Workspace {
     this.syncAgent.fire();
   }
 
-  public destroy() {
+  public async destroy() {
     this.syncAgent.ready = false;
-    this.yjsSnapshotMgr.destroy();
-    this.syncAgent.destroy();
+    await Promise.all([
+      this.yjsSnapshotMgr.destroy(),
+      this.syncAgent.destroy(),
+    ]);
     // persistStore is not created by workspace
   }
+
+  async [Symbol.asyncDispose]() {
+    return await this.destroy();
+  }
 }