@h-ai/storage 1.0.0-beta.1 → 1.0.0-beta.11

package/dist/node.js

@@ -1,7 +1,7 @@
-import { HaiStorageError, StorageConfigSchema, PresignUploadOptionsSchema, PresignOptionsSchema } from './chunk-P4NA6BCH.js';
-export { HaiStorageError, LocalConfigSchema, PresignOptionsSchema, PresignUploadOptionsSchema, S3ConfigSchema, StorageConfigSchema, StorageOperationLogConfigSchema, StorageTypeSchema } from './chunk-P4NA6BCH.js';
-import { storageM, MIME_TYPES, MIME_TYPE_DEFAULT } from './chunk-KVFEQHRX.js';
-export { downloadAndSave, downloadWithPresignedUrl, formatFileSize, getFileExtension, getMimeType, uploadWithPresignedUrl } from './chunk-KVFEQHRX.js';
+import { HaiStorageError, StorageConfigSchema, PresignUploadOptionsSchema, PresignOptionsSchema } from './chunk-ANAESRWS.js';
+export { HaiStorageError, LocalConfigSchema, PresignOptionsSchema, PresignUploadOptionsSchema, S3ConfigSchema, StorageConfigSchema, StorageOperationLogConfigSchema, StorageTypeSchema } from './chunk-ANAESRWS.js';
+import { storageM, MIME_TYPES, MIME_TYPE_DEFAULT } from './chunk-TLZY4IP6.js';
+export { downloadAndSave, downloadWithPresignedUrl, formatFileSize, getFileExtension, getMimeType, uploadWithPresignedUrl } from './chunk-TLZY4IP6.js';
 export { STORAGE_DELETE_MAX_KEYS, STORAGE_KEY_MAX_BYTES, StorageDeleteKeysSchema, StorageKeySchema, StoragePrefixSchema, StoragePresignExpiresInSchema, getStorageKeyIssue } from './chunk-P65WYXJG.js';
 import process from 'node:process';
 import { core, err, ok } from '@h-ai/core';
@@ -167,7 +167,8 @@ function calculateEtag(stat2) {
   return `"${stat2.size.toString(16)}-${stat2.mtimeMs.toString(16)}"`;
 }
 function isMetaFile(key) {
-  return key.endsWith(".meta.json") || key.endsWith(".upload.tmp");
+  const normalized = key.toLowerCase();
+  return normalized.endsWith(".meta.json") || normalized.endsWith(".upload.tmp");
 }
 function createInvalidPathError() {
   const error = new Error(storageM("storage_pathTraversal"));
@@ -182,7 +183,7 @@ function safePath(root, key) {
   if (path.isAbsolute(key)) {
     throw createInvalidPathError();
   }
-  if (key.includes("\0") || hasPathTraversalSegment(key)) {
+  if (key.includes("\0") || hasPathTraversalSegment(key) || process.platform === "win32" && key.split(PATH_SEGMENT_SPLIT_REGEX).some((segment) => /[:. ]$/.test(segment) || segment.includes(":"))) {
     throw createInvalidPathError();
   }
   const normalized = path.normalize(key);
@@ -203,8 +204,22 @@ function createLocalProvider() {
     }
     return config;
   }
-  function fullPath(key) {
-    return safePath(getConfig().root, key);
+  async function fullPath(key) {
+    const root = getConfig().root;
+    const target = safePath(root, key);
+    let current = root;
+    for (const segment of path.relative(root, target).split(path.sep).filter(Boolean)) {
+      current = path.join(current, segment);
+      try {
+        if ((await fsp.lstat(current)).isSymbolicLink())
+          throw createInvalidPathError();
+      } catch (error) {
+        if (error.code === "ENOENT")
+          break;
+        throw error;
+      }
+    }
+    return target;
   }
   function logOperation(category, operation, payload) {
     logStorageOperation(logger, config?.operationLog, category, operation, payload);
@@ -219,7 +234,8 @@ function createLocalProvider() {
       }
       let temporaryPath;
       try {
-        const filePath = fullPath(key);
+        const filePath = await fullPath(key);
+        const metaPath = await fullPath(`${key}.meta.json`);
         logOperation("write", "file.put", { key, options });
         const dir2 = path.dirname(filePath);
         await fsp.mkdir(dir2, { recursive: true, mode: getConfig().directoryMode });
@@ -244,11 +260,12 @@ function createLocalProvider() {
           metadata: options.metadata
         };
         if (options.metadata || options.contentType) {
-          const metaPath = `${filePath}.meta.json`;
           await fsp.writeFile(metaPath, JSON.stringify({
             contentType: options.contentType,
             metadata: options.metadata
           }));
+        } else {
+          await fsp.rm(metaPath, { force: true });
         }
         return ok(metadata);
       } catch (error) {
@@ -281,7 +298,7 @@ function createLocalProvider() {
         );
       }
       try {
-        const filePath = fullPath(key);
+        const filePath = await fullPath(key);
         logOperation("read", "file.getStream", { key, options });
         options.signal?.throwIfAborted();
         const stat2 = await fsp.stat(filePath);
@@ -305,7 +322,7 @@ function createLocalProvider() {
         );
       }
       try {
-        const filePath = fullPath(key);
+        const filePath = await fullPath(key);
         logOperation("read", "file.head", { key });
         const stat2 = await fsp.stat(filePath);
         if (stat2.isDirectory()) {
@@ -316,7 +333,7 @@ function createLocalProvider() {
         }
         let customMetadata = {};
         try {
-          const metaPath = `${filePath}.meta.json`;
+          const metaPath = await fullPath(`${key}.meta.json`);
           const metaContent = await fsp.readFile(metaPath, "utf-8");
           customMetadata = JSON.parse(metaContent);
         } catch {
@@ -342,7 +359,7 @@ function createLocalProvider() {
         );
       }
       try {
-        const filePath = fullPath(key);
+        const filePath = await fullPath(key);
         logOperation("read", "file.exists", { key });
         await fsp.access(filePath, fs.constants.F_OK);
         return ok(true);
@@ -361,7 +378,7 @@ function createLocalProvider() {
         );
       }
       try {
-        const filePath = fullPath(key);
+        const filePath = await fullPath(key);
         logOperation("write", "file.delete", { key });
         logger.debug("Deleting file", { key });
         await fsp.unlink(filePath);
@@ -398,40 +415,17 @@ function createLocalProvider() {
       return toStorageDeleteResult(summary);
     },
     async copy(sourceKey, destKey, options = {}) {
-      if (isMetaFile(sourceKey) || isMetaFile(destKey)) {
-        return err(
-          HaiStorageError.INVALID_PATH,
-          storageM("storage_metaFileAccess", { params: { key: sourceKey } }),
-          sourceKey
-        );
-      }
-      try {
-        const sourcePath = fullPath(sourceKey);
-        const destPath = fullPath(destKey);
-        logOperation("write", "file.copy", { sourceKey, destKey, options });
-        logger.debug("Copying file", { sourceKey, destKey });
-        await fsp.mkdir(path.dirname(destPath), { recursive: true, mode: getConfig().directoryMode });
-        await fsp.copyFile(sourcePath, destPath);
-        const stat2 = await fsp.stat(destPath);
-        const metadata = {
-          key: destKey,
-          size: stat2.size,
-          contentType: options.contentType || getMimeType2(destKey),
-          lastModified: stat2.mtime,
-          etag: calculateEtag(stat2),
-          metadata: options.metadata
-        };
-        if (options.contentType || options.metadata) {
-          const metaPath = `${destPath}.meta.json`;
-          await fsp.writeFile(metaPath, JSON.stringify({
-            contentType: options.contentType,
-            metadata: options.metadata
-          }));
-        }
-        return ok(metadata);
-      } catch (error) {
-        return err(toStorageError(error, sourceKey));
-      }
+      logOperation("write", "file.copy", { sourceKey, destKey, options });
+      const source = await file.head(sourceKey);
+      if (!source.success)
+        return source;
+      const stream = await file.getStream(sourceKey);
+      if (!stream.success)
+        return stream;
+      return file.put(destKey, stream.data, {
+        contentType: options.contentType ?? source.data.contentType,
+        metadata: options.metadata ?? source.data.metadata
+      });
     }
   };
   const dir = {
@@ -524,7 +518,7 @@ function createLocalProvider() {
     },
     async delete(prefix) {
       try {
-        const dirPath = fullPath(prefix);
+        const dirPath = await fullPath(prefix);
         logOperation("write", "dir.delete", { prefix });
         await fsp.rm(dirPath, { recursive: true, force: true });
         return ok(void 0);
@@ -566,6 +560,7 @@ function createLocalProvider() {
         config = cfg;
         logger.info("Connecting local provider", { root: cfg.root });
         await fsp.mkdir(cfg.root, { recursive: true, mode: cfg.directoryMode });
+        config = { ...cfg, root: await fsp.realpath(cfg.root) };
         connected = true;
         logger.info("Local provider connected", { root: cfg.root });
         return ok(void 0);
@@ -646,12 +641,14 @@ function createS3Provider() {
   let client = null;
   let deleteClient = null;
   let presignClient = null;
+  let publicBasePath = "";
   let config = null;
   let ready = false;
   let closing = null;
   function closeClients() {
     ready = false;
     config = null;
+    publicBasePath = "";
     if (closing)
       return closing;
     closing = Promise.resolve().then(() => {
@@ -685,6 +682,12 @@ function createS3Provider() {
     }
     return selected;
   }
+  function publicPresignedUrl(url, basePath) {
+    if (!basePath)
+      return url;
+    const pathOffset = url.indexOf("/", url.indexOf("://") + 3);
+    return `${url.slice(0, pathOffset)}${basePath}${url.slice(pathOffset)}`;
+  }
   function getConfig() {
     if (!ready || !config) {
       throw new Error(storageM("storage_s3ConfigNotInitialized"));
@@ -1002,6 +1005,7 @@ function createS3Provider() {
         const s3Config = getConfig();
         const fullPath = fullKey(key);
         logOperation("read", "presign.getUrl", { key, fullPath, options });
+        const basePath = publicBasePath;
         const command = new GetObjectCommand({
           Bucket: s3Config.bucket,
           Key: fullPath,
@@ -1011,7 +1015,7 @@ function createS3Provider() {
         const url = await getSignedUrl(s3Client, command, {
           expiresIn: parsed.expiresIn
         });
-        return ok(url);
+        return ok(publicPresignedUrl(url, basePath));
       } catch (error) {
         return err(
           HaiStorageError.PRESIGN_FAILED,
@@ -1027,6 +1031,7 @@ function createS3Provider() {
         const s3Config = getConfig();
         const fullPath = fullKey(key);
         logOperation("write", "presign.putUrl", { key, fullPath, options });
+        const basePath = publicBasePath;
         const command = new PutObjectCommand({
           Bucket: s3Config.bucket,
           Key: fullPath,
@@ -1035,7 +1040,7 @@ function createS3Provider() {
         const url = await getSignedUrl(s3Client, command, {
           expiresIn: parsed.expiresIn
         });
-        return ok(url);
+        return ok(publicPresignedUrl(url, basePath));
       } catch (error) {
         return err(
           HaiStorageError.PRESIGN_FAILED,
@@ -1088,8 +1093,11 @@ function createS3Provider() {
         };
         client = new S3Client(clientConfig);
         deleteClient = new S3Client({ ...clientConfig, maxAttempts: 1 });
-        if (cfg.publicEndpoint)
-          presignClient = new S3Client({ ...clientConfig, endpoint: cfg.publicEndpoint });
+        if (cfg.publicEndpoint) {
+          const endpoint = new URL(cfg.publicEndpoint);
+          publicBasePath = endpoint.pathname.replace(TRAILING_SLASHES_REGEX, "");
+          presignClient = new S3Client({ ...clientConfig, endpoint: endpoint.origin, forcePathStyle: publicBasePath ? true : cfg.forcePathStyle });
+        }
         if (cfg.createBucket) {
           try {
             await client.send(new HeadBucketCommand({ Bucket: cfg.bucket }));