@phreshos/node 0.1.12 → 0.1.13

package/dist/uploads.d.ts

@@ -3,8 +3,10 @@ type Ask = (request: object) => Promise<unknown>;
 /** Owner-local implementation of the System's opaque upload collection. */
 export default class Uploads implements SystemUploads {
     private readonly ask;
+    private readonly lifetime;
     private accessPromise;
-    constructor(ask: Ask);
+    constructor(ask: Ask, lifetime: () => AbortSignal);
+    path(): Promise<string>;
     write(value: unknown): Promise<Upload>;
     stream(file: string): Promise<ReadableStream<Uint8Array<ArrayBufferLike>>>;
     bytes(file: string): Promise<Uint8Array<ArrayBuffer>>;
@@ -17,5 +19,6 @@ export default class Uploads implements SystemUploads {
         time: number;
     }> | null>;
     private access;
+    private active;
 }
 export {};

package/dist/uploads.js

@@ -2,17 +2,23 @@ import { isUploadFile } from "@phreshos/core";
 import { randomUUID } from "node:crypto";
 import { createReadStream, createWriteStream, mkdirSync } from "node:fs";
 import { rename, rm } from "node:fs/promises";
-import { join } from "node:path";
+import { isAbsolute, join } from "node:path";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 /** Owner-local implementation of the System's opaque upload collection. */
 export default class Uploads {
     ask;
+    lifetime;
     accessPromise = null;
-    constructor(ask) {
+    constructor(ask, lifetime) {
         this.ask = ask;
+        this.lifetime = lifetime;
+    }
+    async path() {
+        return (await this.access()).path;
     }
     async write(value) {
+        const signal = this.active();
         const access = await this.access();
         const source = content(value);
         const identity = randomUUID();
@@ -29,7 +35,8 @@ export default class Uploads {
                         throw new Error(`The upload exceeds ${access.limit / 1024 / 1024 / 1024} GB`);
                     yield chunk;
                 }
-            }, createWriteStream(temporary, { flags: "wx" }));
+            }, createWriteStream(temporary, { flags: "wx" }), { signal });
+            signal.throwIfAborted();
             await rename(temporary, destination);
         }
         catch (error) {
@@ -42,22 +49,25 @@ export default class Uploads {
         return upload;
     }
     async stream(file) {
+        const signal = this.active();
         requireFile(file);
         const access = await this.access();
-        return Readable.toWeb(createReadStream(join(access.path, file)));
+        return Readable.toWeb(createReadStream(join(access.path, file), { signal }));
     }
     async bytes(file) { return new Uint8Array(await new Response(await this.stream(file)).arrayBuffer()); }
     async text(file) { return new Response(await this.stream(file)).text(); }
     async json(file) { return JSON.parse(await this.text(file)); }
     async stat(file) {
+        this.active();
         requireFile(file);
         return await this.ask({ capability: "uploads", operation: "stat", file });
     }
     access() {
+        this.active();
         if (!this.accessPromise) {
             const resolving = this.ask({ capability: "uploads", operation: "access" }).then(value => {
                 const access = value;
-                if (!access || typeof access.path !== "string" || typeof access.limit !== "number")
+                if (!access || typeof access.path !== "string" || !isAbsolute(access.path) || typeof access.limit !== "number")
                     throw new Error("The System returned invalid upload access");
                 return { path: access.path, limit: access.limit };
             });
@@ -70,6 +80,11 @@ export default class Uploads {
         }
         return this.accessPromise;
     }
+    active() {
+        const signal = this.lifetime();
+        signal.throwIfAborted();
+        return signal;
+    }
 }
 function requireFile(file) {
     if (!isUploadFile(file))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phreshos/node",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Node.js access to PhreshOS and Program projects.",
   "type": "module",
   "main": "dist/main.js",
@@ -36,7 +36,7 @@
     "prepack": "node --run build"
   },
   "dependencies": {
-    "@phreshos/core": "^0.1.36",
+    "@phreshos/core": "^0.1.37",
     "adm-zip": "^0.6.0",
     "jiti": "^2.7.0"
   },