Initial implementation NIP-04, disable drivers cleanup

OpenAgentsInc · Apr 21, 2024 · 21b7ade · 21b7ade
1 parent 8fffd5f
commit 21b7ade
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/src/HyperdrivePool.ts b/src/HyperdrivePool.ts
@@ -38,21 +38,25 @@ export class SharedDrive {
 
 
     async put(path: string, data: string|Uint8Array) {
+        this.lastAccess = Date.now();
         for (const drive of this.drives) {
             if (drive.writable) {
                 await drive.put(path, data);
             }
         }
+
     }
 
     async get(path: string) : Promise<Buffer> {
         // TODO: Pick newer
+        this.lastAccess = Date.now();
         for (const drive of this.drives) {
             if (await drive.exists(path)) {
                 return drive.get(path);
             }
         }
         throw "File not found";
+
     }
 
 
@@ -115,28 +119,29 @@ export class SharedDrive {
     }
 
     async exists(path: string) {
+        this.lastAccess = Date.now();
         for (const drive of this.drives) {
             if (await drive.exists(path)) {
                 return true;
             }
         }
-        this.lastAccess = Date.now();
         return false;
     }
 
     async list(path: string) {
+        this.lastAccess = Date.now();
         const files = [];
         for (const drive of this.drives) {
             for await (const entry of drive.list(path)) {
                 const path = entry.key;
                 if (!files.includes(path)) files.push(path);
             }
         }
-        this.lastAccess = Date.now();
         return files;
     }
 
     async inputStream(path: string): Promise<ReadableGreedy> {
+        this.lastAccess = Date.now();
         let newestEntryInDrive;
         let newestEntryTimestamp = 0;
         for (const drive of this.drives) {
@@ -149,7 +154,6 @@ export class SharedDrive {
             }
         }
         if (!newestEntryInDrive) throw "File not found";
-        this.lastAccess = Date.now();
         const rs = newestEntryInDrive.createReadStream(path);
         rs.readAll = async () => {
             const buffers = [];
@@ -162,6 +166,7 @@ export class SharedDrive {
     }
 
     async del(key: string) {
+        this.lastAccess = Date.now();
         for (const drive of this.drives) {
             if (drive.writable) {
                 await drive.del(key);
@@ -171,6 +176,7 @@ export class SharedDrive {
     }
 
     async close() {
+        this.lastAccess = Date.now();
         for (const drive of this.drives) {
             await drive.close();
         }
@@ -233,15 +239,15 @@ export default class HyperdrivePool {
 
     _cleanup(){
         if(this.isClosed) return;
-        const now = Date.now();
-        for (const key in this.drives) {
-            const sharedDrive = this.drives[key];
-            if (sharedDrive.isClosed || now-sharedDrive.lastAccess>this.driverTimeout) {
-                sharedDrive.close();
-                delete this.drives[key];
-            }
-        }
-        setTimeout(()=>this._cleanup(),1000*60*5);        
+        // const now = Date.now();
+        // for (const key in this.drives) {
+        //     const sharedDrive = this.drives[key];
+        //     if (sharedDrive.isClosed || now-sharedDrive.lastAccess>this.driverTimeout) {
+        //         sharedDrive.close();
+        //         delete this.drives[key];
+        //     }
+        // }
+        // setTimeout(()=>this._cleanup(),1000*60*5);        
     }
 
     createHyperUrl(diskName: string, diskKey: string, encryptionKey?: string) {

diff --git a/src/Utils.ts b/src/Utils.ts
@@ -1,4 +1,4 @@
-import { Event } from "nostr-tools";
+import { Event, nip04 } from "nostr-tools";
 import { uuid as uuidv4 } from "uuidv4";
 import crypto from "crypto";
 
@@ -7,6 +7,18 @@ export default class Utils {
         return uuidv4();
     }
 
+    static async encryptNostr(
+        text: string,
+        ourPrivateKey: string | Uint8Array,
+        theirPublicKey: string
+    ): Promise<string> {
+        return await nip04.encrypt(ourPrivateKey, theirPublicKey, text);
+    }
+
+    static async decryptNostr(text: string, ourPrivateKey: string, theirPublicKey: string): Promise<string> {
+        return await nip04.decrypt(ourPrivateKey, theirPublicKey, text);
+    }
+
     static encrypt(v: string, secret: string): string {
         const key = crypto.createHash("sha256").update(String(secret)).digest();
         const cipher = crypto.createCipheriv("aes-256-ecb", key, null);