nats: rewrite open files tracker to use new dkv

src/packages/frontend/client/client.ts

@@ -348,14 +348,14 @@ class Client extends EventEmitter implements WebappClient {
   touchOpenFile = async ({
     project_id,
     path,
-    id,
+    // id,
   }: {
     project_id: string;
     path: string;
     id?: number;
   }) => {
     const x = await this.nats_client.openFiles(project_id);
-    await x.touch({ path, id });
+    await x.touch({ path });
   };
 }
 

src/packages/frontend/nats/client.ts

@@ -15,7 +15,7 @@ import { type ProjectApi, initProjectApi } from "@cocalc/nats/project-api";
 import { type BrowserApi, initBrowserApi } from "@cocalc/nats/browser-api";
 import { getPrimusConnection } from "@cocalc/nats/primus";
 import { isValidUUID } from "@cocalc/util/misc";
-import { OpenFiles } from "@cocalc/nats/sync/open-files";
+import { createOpenFiles, OpenFiles } from "@cocalc/nats/sync/open-files";
 import { PubSub } from "@cocalc/nats/sync/pubsub";
 import type { ChatOptions } from "@cocalc/util/types/llm";
 import { kv, type KVOptions } from "@cocalc/nats/sync/kv";
@@ -333,10 +333,13 @@ export class NatsClient {
 
   openFiles = reuseInFlight(async (project_id: string) => {
     if (this.openFilesCache[project_id] == null) {
-      this.openFilesCache[project_id] = new OpenFiles({
+      this.openFilesCache[project_id] = await createOpenFiles({
         project_id,
         env: await this.getEnv(),
       });
+      this.openFilesCache[project_id].on("closed", () => {
+        delete this.openFilesCache[project_id];
+      });
     }
     return this.openFilesCache[project_id]!;
   });

src/packages/nats/sync/dkv.ts

@@ -118,9 +118,19 @@ export class DKV extends EventEmitter {
     if (this.generalDKV == null) {
       throw Error("closed");
     }
-    return this.generalDKV.time(
+    const times = this.generalDKV.time(
       key ? `${this.prefix}.${this.sha1(key)}` : undefined,
     );
+    if (key != null || times == null) {
+      return times;
+    }
+    const obj = this.generalDKV.get();
+    const x: any = {};
+    for (const k in obj) {
+      const { key } = obj[k];
+      x[key] = times[k];
+    }
+    return x;
   };
 
   get = (key?) => {

src/packages/nats/sync/general-dkv.ts

@@ -147,7 +147,7 @@ export class GeneralDKV extends EventEmitter {
     delete this.merge;
   };
 
-  private handleRemoteChange = ({ key, remote, prev }) => {
+  private handleRemoteChange = ({ key, value: remote, prev }) => {
     const local = this.local[key];
     let value: any = remote;
     if (local !== undefined) {