@axium/storage 0.23.1 → 0.23.3

package/dist/client/cli/commands.js

@@ -50,16 +50,15 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
+import { formatBytes } from '@axium/core';
 import { Command } from 'commander';
 import * as io from 'ioium/node';
 import mime from 'mime';
 import * as fs from 'node:fs';
 import { basename } from 'node:path';
-import { Readable } from 'node:stream';
-import { colorItem, formatItems } from '../../node.js';
+import { colorItem, formatItems, streamRead } from '../../node.js';
 import * as api from '../api.js';
 import { getDirectory, resolveItem, resolvePathWithParent, syncCache, writeCache } from '../local.js';
-import { formatBytes } from '@axium/core';
 export const ls = new Command('ls')
     .alias('list')
     .description('List the contents of a folder')
@@ -132,10 +131,9 @@ export const upload = new Command('upload')
         }
         else if (existingTarget && !opts.force)
             throw 'File exists at remote path, use --force to overwrite it';
-        const stream = Readable.toWeb(fs.createReadStream(local));
         const type = mime.getType(local) || 'application/octet-stream';
         const _ = __addDisposableResource(env_1, io.start('Uploading ' + name), false);
-        const item = await api.createItem(stream, {
+        const item = await api.createItem(streamRead(local), {
             parentId: parent?.id,
             name,
             size: stats.size,

package/dist/client/sync.js

@@ -5,11 +5,11 @@ import mime from 'mime';
 import { createHash } from 'node:crypto';
 import * as fs from 'node:fs';
 import { basename, dirname, join, matchesGlob, relative } from 'node:path';
-import { Readable, Writable } from 'node:stream';
 import { pick } from 'utilium';
 import * as z from 'zod';
+import { streamRead, streamWrite } from '../node.js';
 import '../polyfills.js';
-import { deleteItem, downloadItemStream, updateItem, createItem, createDirectory } from './api.js';
+import { createDirectory, createItem, deleteItem, downloadItemStream, updateItem } from './api.js';
 /**
  * A Sync is a storage item that has been selected for synchronization by the user.
  * Importantly, it is *only* the "top-level" item.
@@ -141,8 +141,7 @@ export async function doSync(sync, opt) {
         else {
             const type = mime.getType(dirent._path) || 'application/octet-stream';
             const { size } = fs.statSync(join(sync.local_path, dirent._path));
-            // cast because Node.js' internals use different types from lib.dom.d.ts
-            const stream = Readable.toWeb(fs.createReadStream(join(sync.local_path, dirent._path)));
+            const stream = streamRead(join(sync.local_path, dirent._path));
             const file = await createItem(stream, { ...uploadOpts, type, size });
             _items.set(dirent._path, Object.assign(pick(file, 'id', 'modifiedAt', 'hash'), { path: dirent._path }));
         }
@@ -168,23 +167,19 @@ export async function doSync(sync, opt) {
             fs.mkdirSync(fullPath, { recursive: true });
         }
         else {
-            const writeStream = fs.createWriteStream(fullPath);
-            const stream = await downloadItemStream(item.id);
-            await stream.pipeTo(Writable.toWeb(writeStream));
+            await streamWrite(fullPath, await downloadItemStream(item.id));
         }
     });
     if (!opt.verbose && delta.modified.length)
         io.start('Syncing modified items');
     await applyAction(opt, delta.modified, item => (opt.verbose ? 'Updating ' : '') + item.path, async (item) => {
         if (item.modifiedAt.getTime() > fs.statSync(join(sync.local_path, item.path)).mtime.getTime()) {
-            const writeStream = fs.createWriteStream(join(sync.local_path, item.path));
-            const stream = await downloadItemStream(item.id);
-            await stream.pipeTo(Writable.toWeb(writeStream));
+            await streamWrite(join(sync.local_path, item.path), await downloadItemStream(item.id));
             return 'server.';
         }
         else {
             const { size } = fs.statSync(join(sync.local_path, item.path));
-            const stream = Readable.toWeb(fs.createReadStream(join(sync.local_path, item.path)));
+            const stream = streamRead(join(sync.local_path, item.path));
             const updated = await updateItem(item.id, size, stream);
             _items.set(item.path, Object.assign(pick(updated, 'id', 'modifiedAt', 'hash'), { path: item.path }));
             return 'local.';

package/dist/node.d.ts

@@ -10,4 +10,6 @@ interface FormatItemsConfig {
     humanReadable: boolean;
 }
 export declare function formatItems({ items, users, humanReadable }: FormatItemsConfig): Generator<string>;
+export declare function streamRead(path: string, start?: number, end?: number): ReadableStream<Uint8Array<ArrayBuffer>>;
+export declare function streamWrite(path: string, stream: ReadableStream): Promise<void>;
 export {};

package/dist/node.js

@@ -1,5 +1,7 @@
 import { formatBytes } from '@axium/core/format';
 import { styleText } from 'node:util';
+import { Readable, Writable } from 'node:stream';
+import { createReadStream, createWriteStream } from 'node:fs';
 const executables = ['application/x-pie-executable', 'application/x-sharedlib', 'application/vnd.microsoft.portable-executable'];
 const archives = [
     'application/gzip',
@@ -48,3 +50,12 @@ export function* formatItems({ items, users, humanReadable }) {
         yield `${type}${ownerPerm}${ownerPerm}. ${owner.padEnd(nameWidth)} ${item.__size.padStart(sizeWidth)} ${formatDate(item.modifiedAt)} ${colorItem(item)}`;
     }
 }
+// 2 MiB
+const highWaterMark = 1024 * 1024 * 2;
+export function streamRead(path, start, end) {
+    // cast because Node.js' internals use different types from lib.dom.d.ts
+    return Readable.toWeb(createReadStream(path, { start, end, highWaterMark }));
+}
+export async function streamWrite(path, stream) {
+    await stream.pipeTo(Writable.toWeb(createWriteStream(path, { highWaterMark })));
+}

package/dist/server/raw.js

@@ -4,10 +4,10 @@ import { authRequestForItem, requireSession } from '@axium/server/auth';
 import { error, withError } from '@axium/server/requests';
 import { addRoute } from '@axium/server/routes';
 import { createHash } from 'node:crypto';
-import { copyFileSync, createReadStream, renameSync, unlinkSync, writeFileSync } from 'node:fs';
+import { copyFileSync, renameSync, unlinkSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path/posix';
-import { Readable } from 'node:stream';
 import * as z from 'zod';
+import { streamRead } from '../node.js';
 import '../polyfills.js';
 import { getLimits } from './config.js';
 import { getUserStats } from './db.js';
@@ -139,7 +139,7 @@ addRoute({
                 headers: { 'Content-Range': `bytes */${item.size}` },
             });
         }
-        const content = Readable.toWeb(createReadStream(path, { start, end }));
+        const content = streamRead(path, start, end);
         return new Response(content, {
             status: BigInt(length) == item.size ? 200 : 206,
             headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.23.1",
+	"version": "0.23.3",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {

package/routes/files/trash/+page.svelte

@@ -27,11 +27,13 @@
 	}
 
 	function useAndClearActive(thunk: () => any) {
-		if (!activeItem) throw text('storage.generic.no_item');
-		const result = thunk();
-		const index = items.findIndex(item => item.id === activeId);
-		if (index !== -1) items.splice(index, 1);
-		return result;
+		return () => {
+			if (!activeItem) throw text('storage.generic.no_item');
+			const result = thunk();
+			const index = items.findIndex(item => item.id === activeId);
+			if (index !== -1) items.splice(index, 1);
+			return result;
+		};
 	}
 </script>