@axium/storage 0.22.0 → 0.22.1

package/dist/client/api.js

@@ -64,7 +64,6 @@ export async function uploadItem(file, opt = {}) {
     if (!opt.name)
         throw 'item name is required';
     const content = await file.bytes();
-    opt.onProgress?.(0, content.length);
     /** For big files, it takes a *really* long time to compute the hash, so we just don't do it ahead of time and leave it up to the server. */
     const hash = content.length < uploadConfig.hashThreshold * 1_000_000 ? blake2b(content).toHex() : null;
     const upload = await fetchAPI('PUT', 'storage', {
@@ -77,6 +76,7 @@ export async function uploadItem(file, opt = {}) {
     if (upload.status == 'created')
         return upload.item;
     const chunkSize = Math.min(upload.max_transfer_size, globalThis.navigator?.connection ? conTypeToSpeed[globalThis.navigator.connection.effectiveType] : uploadConfig.uxChunkSize) * 1_000_000;
+    opt.onProgress?.(0, content.length);
     let response;
     for (let offset = 0; offset < content.length; offset += chunkSize) {
         const size = Math.min(chunkSize, content.length - offset);
@@ -87,6 +87,7 @@ export async function uploadItem(file, opt = {}) {
                 'x-offset': offset.toString(),
                 'content-length': size.toString(),
                 'content-type': 'application/octet-stream',
+                authorization: 'Bearer ' + token,
             },
             body: content.slice(offset, offset + size),
         }).catch(handleFetchFailed);
@@ -117,6 +118,7 @@ export async function uploadItemStream(stream, opt) {
                 'x-offset': offset.toString(),
                 'content-length': size.toString(),
                 'content-type': 'application/octet-stream',
+                authorization: 'Bearer ' + token,
             },
             body: new ReadableStream({
                 type: 'bytes',

package/dist/client/cli/commands.js

@@ -59,6 +59,7 @@ import { Readable } from 'node:stream';
 import { colorItem, formatItems } 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')
@@ -140,10 +141,9 @@ export const upload = new Command('upload')
             size: stats.size,
             type,
             onProgress(uploaded, total) {
-                io.progress(uploaded, total, Math.round((uploaded / total) * 100) + '%');
+                io.progress(uploaded, total, Math.round((uploaded / total) * 100) + '%', `${formatBytes(BigInt(uploaded))}/${formatBytes(BigInt(total))}`);
             },
         });
-        io.done();
         const { items } = await syncCache();
         items.push(item);
         writeCache();
@@ -169,18 +169,18 @@ export const download = new Command('download')
         if (item.type == 'inode/directory')
             throw "Can't download directories yet.";
         localPath ||= item.name;
-        const _ = __addDisposableResource(env_2, io.start('Downloading to' + localPath), false);
+        const _ = __addDisposableResource(env_2, io.start('Downloading to ' + localPath), false);
         const stream = await api.downloadItemStream(item.id);
-        io.progress(0, Number(item.size));
+        const size = Number(item.size);
+        io.progress(0, size);
         let downloaded = 0;
         const fileStream = fs.createWriteStream(localPath);
         for await (const chunk of stream) {
             fileStream.write(chunk);
             downloaded += chunk.length;
-            io.progress(downloaded, Number(item.size));
+            io.progress(downloaded, size, Math.round((downloaded / size) * 100) + '%', `${formatBytes(BigInt(downloaded))}/${formatBytes(item.size)}`);
         }
         fileStream.end();
-        io.done();
     }
     catch (e_2) {
         env_2.error = e_2;

package/dist/client/local.js

@@ -4,13 +4,13 @@ import { UserPublic } from '@axium/core';
 import * as io from 'ioium/node';
 import { ENOENT, ENOTDIR } from 'node:constants';
 import { stat } from 'node:fs/promises';
-import { join, parse } from 'node:path';
+import { join, parse, resolve } from 'node:path';
 import * as z from 'zod';
 import { StorageItemMetadata } from '../common.js';
 import { getUserStats, getUserStorage } from './api.js';
 export let remotePWD = '/';
 export function resolvePath(path) {
-    path = join(remotePWD, path);
+    path = resolve(remotePWD, path);
     if (path != '/' && path.endsWith('/'))
         path = path.slice(0, -1);
     return path;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.22.0",
+	"version": "0.22.1",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {
@@ -45,7 +45,7 @@
 		"@axium/server": ">=0.39.0",
 		"@sveltejs/kit": "^2.27.3",
 		"commander": "^14.0.0",
-		"ioium": "^1.1.0",
+		"ioium": "^1.2.0",
 		"kysely": "^0.28.15",
 		"mime": "^4.1.0",
 		"utilium": "^3.1.0"