@ccci/micro-server 1.0.136 → 1.0.137

package/dist/index.js

@@ -245794,12 +245794,12 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
           const password = request3.password ?? "";
           auth = `${username}:${password}`;
         }
-        let path5 = request3.path;
+        let path4 = request3.path;
         if (queryString) {
-          path5 += `?${queryString}`;
+          path4 += `?${queryString}`;
         }
         if (request3.fragment) {
-          path5 += `#${request3.fragment}`;
+          path4 += `#${request3.fragment}`;
         }
         let hostname = request3.hostname ?? "";
         if (hostname[0] === "[" && hostname.endsWith("]")) {
@@ -245811,7 +245811,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
           headers: request3.headers,
           host: hostname,
           method: request3.method,
-          path: path5,
+          path: path4,
           port: request3.port,
           agent,
           auth
@@ -246070,16 +246070,16 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
           reject(err);
         }, "rejectWithDestroy");
         const queryString = (0, import_querystring_builder.buildQueryString)(query || {});
-        let path5 = request3.path;
+        let path4 = request3.path;
         if (queryString) {
-          path5 += `?${queryString}`;
+          path4 += `?${queryString}`;
         }
         if (request3.fragment) {
-          path5 += `#${request3.fragment}`;
+          path4 += `#${request3.fragment}`;
         }
         const req = session.request({
           ...request3.headers,
-          [import_http22.constants.HTTP2_HEADER_PATH]: path5,
+          [import_http22.constants.HTTP2_HEADER_PATH]: path4,
           [import_http22.constants.HTTP2_HEADER_METHOD]: method
         });
         session.ref();
@@ -246294,13 +246294,13 @@ var require_dist_cjs13 = __commonJS((exports, module) => {
         abortError.name = "AbortError";
         return Promise.reject(abortError);
       }
-      let path5 = request3.path;
+      let path4 = request3.path;
       const queryString = (0, import_querystring_builder.buildQueryString)(request3.query || {});
       if (queryString) {
-        path5 += `?${queryString}`;
+        path4 += `?${queryString}`;
       }
       if (request3.fragment) {
-        path5 += `#${request3.fragment}`;
+        path4 += `#${request3.fragment}`;
       }
       let auth = "";
       if (request3.username != null || request3.password != null) {
@@ -246309,7 +246309,7 @@ var require_dist_cjs13 = __commonJS((exports, module) => {
         auth = `${username}:${password}@`;
       }
       const { port, method } = request3;
-      const url = `${request3.protocol}//${auth}${request3.hostname}${port ? `:${port}` : ""}${path5}`;
+      const url = `${request3.protocol}//${auth}${request3.hostname}${port ? `:${port}` : ""}${path4}`;
       const body = method === "GET" || method === "HEAD" ? undefined : request3.body;
       const requestOptions = {
         body,
@@ -247016,8 +247016,8 @@ var require_protocols = __commonJS((exports, module) => {
       return this;
     }
     p(memberName, labelValueProvider, uriLabel, isGreedyLabel) {
-      this.resolvePathStack.push((path5) => {
-        this.path = resolvedPath2(path5, this.input, memberName, labelValueProvider, uriLabel, isGreedyLabel);
+      this.resolvePathStack.push((path4) => {
+        this.path = resolvedPath2(path4, this.input, memberName, labelValueProvider, uriLabel, isGreedyLabel);
       });
       return this;
     }
@@ -247252,9 +247252,9 @@ var require_dist_cjs16 = __commonJS((exports, module) => {
     return await client2.send(new CommandCtor(input), ...args);
   }, "makePagedClientRequest");
   __name(createPaginator, "createPaginator");
-  var get = __name((fromObject, path5) => {
+  var get = __name((fromObject, path4) => {
     let cursor = fromObject;
-    const pathComponents = path5.split(".");
+    const pathComponents = path4.split(".");
     for (const step of pathComponents) {
       if (!cursor || typeof cursor !== "object") {
         return;
@@ -247986,10 +247986,10 @@ ${longDate}
 ${credentialScope}
 ${(0, import_util_hex_encoding.toHex)(hashedRequest)}`;
     }
-    getCanonicalPath({ path: path5 }) {
+    getCanonicalPath({ path: path4 }) {
       if (this.uriEscapePath) {
         const normalizedPathSegments = [];
-        for (const pathSegment of path5.split("/")) {
+        for (const pathSegment of path4.split("/")) {
           if ((pathSegment == null ? undefined : pathSegment.length) === 0)
             continue;
           if (pathSegment === ".")
@@ -248000,11 +248000,11 @@ ${(0, import_util_hex_encoding.toHex)(hashedRequest)}`;
             normalizedPathSegments.push(pathSegment);
           }
         }
-        const normalizedPath = `${(path5 == null ? undefined : path5.startsWith("/")) ? "/" : ""}${normalizedPathSegments.join("/")}${normalizedPathSegments.length > 0 && (path5 == null ? undefined : path5.endsWith("/")) ? "/" : ""}`;
+        const normalizedPath = `${(path4 == null ? undefined : path4.startsWith("/")) ? "/" : ""}${normalizedPathSegments.join("/")}${normalizedPathSegments.length > 0 && (path4 == null ? undefined : path4.endsWith("/")) ? "/" : ""}`;
         const doubleEncoded = (0, import_util_uri_escape.escapeUri)(normalizedPath);
         return doubleEncoded.replace(/%2F/g, "/");
       }
-      return path5;
+      return path4;
     }
     async getSignature(longDate, credentialScope, keyPromise, canonicalRequest) {
       const stringToSign = await this.createStringToSign(longDate, credentialScope, canonicalRequest);
@@ -253687,18 +253687,18 @@ var require_dist_cjs32 = __commonJS((exports, module) => {
   __name(_EndpointError, "EndpointError");
   var EndpointError2 = _EndpointError;
   var booleanEquals = __name((value1, value2) => value1 === value2, "booleanEquals");
-  var getAttrPathList = __name((path5) => {
-    const parts = path5.split(".");
+  var getAttrPathList = __name((path4) => {
+    const parts = path4.split(".");
     const pathList = [];
     for (const part of parts) {
       const squareBracketIndex = part.indexOf("[");
       if (squareBracketIndex !== -1) {
         if (part.indexOf("]") !== part.length - 1) {
-          throw new EndpointError2(`Path: '${path5}' does not end with ']'`);
+          throw new EndpointError2(`Path: '${path4}' does not end with ']'`);
         }
         const arrayIndex = part.slice(squareBracketIndex + 1, -1);
         if (Number.isNaN(parseInt(arrayIndex))) {
-          throw new EndpointError2(`Invalid array index: '${arrayIndex}' in path: '${path5}'`);
+          throw new EndpointError2(`Invalid array index: '${arrayIndex}' in path: '${path4}'`);
         }
         if (squareBracketIndex !== 0) {
           pathList.push(part.slice(0, squareBracketIndex));
@@ -253710,9 +253710,9 @@ var require_dist_cjs32 = __commonJS((exports, module) => {
     }
     return pathList;
   }, "getAttrPathList");
-  var getAttr = __name((value, path5) => getAttrPathList(path5).reduce((acc, index2) => {
+  var getAttr = __name((value, path4) => getAttrPathList(path4).reduce((acc, index2) => {
     if (typeof acc !== "object") {
-      throw new EndpointError2(`Index '${index2}' in '${path5}' not found in '${JSON.stringify(value)}'`);
+      throw new EndpointError2(`Index '${index2}' in '${path4}' not found in '${JSON.stringify(value)}'`);
     } else if (Array.isArray(acc)) {
       return acc[parseInt(index2)];
     }
@@ -253732,8 +253732,8 @@ var require_dist_cjs32 = __commonJS((exports, module) => {
           return value;
         }
         if (typeof value === "object" && "hostname" in value) {
-          const { hostname: hostname2, port, protocol: protocol2 = "", path: path5 = "", query = {} } = value;
-          const url = new URL(`${protocol2}//${hostname2}${port ? `:${port}` : ""}${path5}`);
+          const { hostname: hostname2, port, protocol: protocol2 = "", path: path4 = "", query = {} } = value;
+          const url = new URL(`${protocol2}//${hostname2}${port ? `:${port}` : ""}${path4}`);
           url.search = Object.entries(query).map(([k, v]) => `${k}=${v}`).join("&");
           return url;
         }
@@ -256231,11 +256231,11 @@ var require_slurpFile = __commonJS((exports) => {
   var fs_1 = __require("fs");
   var { readFile } = fs_1.promises;
   var filePromisesHash = {};
-  var slurpFile = (path5, options) => {
-    if (!filePromisesHash[path5] || (options === null || options === undefined ? undefined : options.ignoreCache)) {
-      filePromisesHash[path5] = readFile(path5, "utf8");
+  var slurpFile = (path4, options) => {
+    if (!filePromisesHash[path4] || (options === null || options === undefined ? undefined : options.ignoreCache)) {
+      filePromisesHash[path4] = readFile(path4, "utf8");
     }
-    return filePromisesHash[path5];
+    return filePromisesHash[path4];
   };
   exports.slurpFile = slurpFile;
 });
@@ -256293,13 +256293,13 @@ var require_dist_cjs42 = __commonJS((exports, module) => {
   }, {
     ...data.default && { default: data.default }
   }), "getConfigData");
-  var import_path3 = __require("path");
+  var import_path2 = __require("path");
   var import_getHomeDir = require_getHomeDir();
   var ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
-  var getConfigFilepath = __name(() => process.env[ENV_CONFIG_PATH] || (0, import_path3.join)((0, import_getHomeDir.getHomeDir)(), ".aws", "config"), "getConfigFilepath");
+  var getConfigFilepath = __name(() => process.env[ENV_CONFIG_PATH] || (0, import_path2.join)((0, import_getHomeDir.getHomeDir)(), ".aws", "config"), "getConfigFilepath");
   var import_getHomeDir2 = require_getHomeDir();
   var ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
-  var getCredentialsFilepath = __name(() => process.env[ENV_CREDENTIALS_PATH] || (0, import_path3.join)((0, import_getHomeDir2.getHomeDir)(), ".aws", "credentials"), "getCredentialsFilepath");
+  var getCredentialsFilepath = __name(() => process.env[ENV_CREDENTIALS_PATH] || (0, import_path2.join)((0, import_getHomeDir2.getHomeDir)(), ".aws", "credentials"), "getCredentialsFilepath");
   var import_getHomeDir3 = require_getHomeDir();
   var prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-@\+\.%:/]+)\2$/;
   var profileNameBlockList = ["__proto__", "profile __proto__"];
@@ -256357,11 +256357,11 @@ var require_dist_cjs42 = __commonJS((exports, module) => {
     const relativeHomeDirPrefix = "~/";
     let resolvedFilepath = filepath;
     if (filepath.startsWith(relativeHomeDirPrefix)) {
-      resolvedFilepath = (0, import_path3.join)(homeDir, filepath.slice(2));
+      resolvedFilepath = (0, import_path2.join)(homeDir, filepath.slice(2));
     }
     let resolvedConfigFilepath = configFilepath;
     if (configFilepath.startsWith(relativeHomeDirPrefix)) {
-      resolvedConfigFilepath = (0, import_path3.join)(homeDir, configFilepath.slice(2));
+      resolvedConfigFilepath = (0, import_path2.join)(homeDir, configFilepath.slice(2));
     }
     const parsedFiles = await Promise.all([
       (0, import_slurpFile.slurpFile)(resolvedConfigFilepath, {
@@ -256705,8 +256705,8 @@ var require_dist_cjs46 = __commonJS((exports, module) => {
             return endpoint.url.href;
           }
           if ("hostname" in endpoint) {
-            const { protocol, hostname, port, path: path5 } = endpoint;
-            return `${protocol}//${hostname}${port ? ":" + port : ""}${path5}`;
+            const { protocol, hostname, port, path: path4 } = endpoint;
+            return `${protocol}//${hostname}${port ? ":" + port : ""}${path4}`;
           }
         }
         return endpoint;
@@ -262436,14 +262436,14 @@ var require_dist_cjs60 = __commonJS((exports, module) => {
     cfId: output.headers["x-amz-cf-id"]
   }), "deserializeMetadata");
   var throwDefaultError = (0, import_smithy_client.withBaseException)(STSServiceException);
-  var buildHttpRpcRequest = __name(async (context, headers, path5, resolvedHostname, body) => {
+  var buildHttpRpcRequest = __name(async (context, headers, path4, resolvedHostname, body) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const contents = {
       protocol,
       hostname,
       port,
       method: "POST",
-      path: basePath.endsWith("/") ? basePath.slice(0, -1) + path5 : basePath + path5,
+      path: basePath.endsWith("/") ? basePath.slice(0, -1) + path4 : basePath + path4,
       headers
     };
     if (resolvedHostname !== undefined) {
@@ -281549,6 +281549,150 @@ class WebSocketServer {
   }
 }
 
+// src/utils/uploader-s3.ts
+var client_s3 = __toESM(require_dist_cjs73(), 1);
+class UploaderS3 {
+  static client;
+  static uploadSessions = {};
+  static async init(options) {
+    try {
+      if (!UploaderS3.client && UploaderS3.hasValidConfig(options)) {
+        Logger.info("Connecting to S3 server...");
+        UploaderS3.client = new client_s3.S3({
+          forcePathStyle: options.s3ForcePathStyle,
+          endpoint: options.s3Endpoint,
+          region: options.s3region,
+          credentials: {
+            accessKeyId: options.s3AccessKeyId,
+            secretAccessKey: options.s3SecretAccessKey
+          }
+        });
+        Logger.info("Connected to S3 server successfully!");
+      }
+    } catch (error) {
+      Logger.error(error);
+      throw error;
+    }
+  }
+  static hasValidConfig(options) {
+    return Boolean(options.s3AccessKeyId && options.s3Endpoint && options.s3SecretAccessKey && options.s3region);
+  }
+  static async listBuckets() {
+    if (!UploaderS3.client) {
+      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
+    }
+    try {
+      Logger.info("Fetching list of buckets...");
+      const data = await UploaderS3.client.send(new client_s3.ListBucketsCommand({}));
+      Logger.info("Buckets:", data.Buckets);
+    } catch (error) {
+      Logger.error(error);
+      throw error;
+    }
+  }
+  static async startMultipartUpload(bucketName, key) {
+    if (!UploaderS3.client) {
+      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
+    }
+    try {
+      const upload = await UploaderS3.client.send(new client_s3.CreateMultipartUploadCommand({
+        Bucket: bucketName,
+        Key: key
+      }));
+      UploaderS3.uploadSessions[key] = upload.UploadId;
+      return upload.UploadId;
+    } catch (error) {
+      Logger.error(error);
+      throw error;
+    }
+  }
+  static async uploadPart(bucketName, key, uploadId, partNumber, chunk) {
+    if (!UploaderS3.client) {
+      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
+    }
+    try {
+      Logger.info("Uploading part", { bucketName, partNumber });
+      const response4 = await UploaderS3.client.send(new client_s3.UploadPartCommand({
+        Bucket: bucketName,
+        Key: key,
+        UploadId: uploadId,
+        PartNumber: partNumber,
+        Body: chunk
+      }));
+      Logger.info("Part uploaded successfully:", response4);
+      return response4.ETag ?? null;
+    } catch (error) {
+      Logger.error(error);
+      throw error;
+    }
+  }
+  static async completeMultipartUpload(bucketName, key, uploadId, parts) {
+    if (!UploaderS3.client) {
+      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
+    }
+    try {
+      Logger.info("Completing multipart upload for key:", key);
+      await UploaderS3.client.send(new client_s3.CompleteMultipartUploadCommand({
+        Bucket: bucketName,
+        Key: key,
+        UploadId: uploadId,
+        MultipartUpload: { Parts: parts }
+      }));
+      Logger.info("Multipart upload completed successfully.");
+    } catch (error) {
+      Logger.error(error);
+      throw error;
+    }
+  }
+  static async abortMultipartUpload(bucketName, key, uploadId) {
+    if (!UploaderS3.client) {
+      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
+    }
+    try {
+      await UploaderS3.client.send(new client_s3.AbortMultipartUploadCommand({
+        Bucket: bucketName,
+        Key: key,
+        UploadId: uploadId
+      }));
+      Logger.info("Multipart upload aborted successfully.");
+    } catch (error) {
+      Logger.error(error);
+      throw error;
+    }
+  }
+  static async deleteIncompleteUploads(bucketName) {
+    if (!UploaderS3.client) {
+      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
+    }
+    try {
+      let isTruncated = true;
+      let marker;
+      while (isTruncated) {
+        const listUploadsResponse = await UploaderS3.client.send(new client_s3.ListMultipartUploadsCommand({
+          Bucket: bucketName,
+          KeyMarker: marker
+        }));
+        for (const upload of listUploadsResponse.Uploads || []) {
+          const uploadId = upload.UploadId;
+          const key = upload.Key;
+          await UploaderS3.client.send(new client_s3.AbortMultipartUploadCommand({
+            Bucket: bucketName,
+            Key: key,
+            UploadId: uploadId
+          }));
+          Logger.info(`Aborted incomplete upload: ${key} with UploadId: ${uploadId}`);
+        }
+        marker = listUploadsResponse.NextKeyMarker;
+        isTruncated = listUploadsResponse.IsTruncated ?? false;
+      }
+      Logger.info("Completed deleting all incomplete uploads.");
+    } catch (error) {
+      Logger.error(error);
+      throw error;
+    }
+  }
+}
+
 // src/utils/ApplicationServer.ts
 class ApplicationServer {
   static app;
@@ -281574,6 +281718,9 @@ class ApplicationServer {
       if (options?.enableMinio) {
         await Uploader.init(options);
       }
+      if (options?.enableS3) {
+        await UploaderS3.init(options);
+      }
       if (options?.enablePushNotifications) {
         new PushNotifier(process.cwd());
       }
@@ -282212,149 +282359,6 @@ class BaseSocketHandler {
     return params;
   }
 }
-// src/utils/uploader-s3.ts
-var client_s3 = __toESM(require_dist_cjs73(), 1);
-class UploaderS3 {
-  static client;
-  static uploadSessions = {};
-  static async init(options) {
-    try {
-      if (!UploaderS3.client && UploaderS3.hasValidConfig(options)) {
-        Logger.info("Connecting to S3 server...");
-        UploaderS3.client = new client_s3.S3({
-          forcePathStyle: options.s3ForcePathStyle,
-          endpoint: options.s3Endpoint,
-          region: options.s3region,
-          credentials: {
-            accessKeyId: options.s3AccessKeyId,
-            secretAccessKey: options.s3SecretAccessKey
-          }
-        });
-        Logger.info("Connected to S3 server successfully!");
-      }
-    } catch (error) {
-      Logger.error(error);
-      throw error;
-    }
-  }
-  static hasValidConfig(options) {
-    return Boolean(options.s3AccessKeyId && options.s3Endpoint && options.s3SecretAccessKey && options.s3region);
-  }
-  static async listBuckets() {
-    if (!UploaderS3.client) {
-      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
-    }
-    try {
-      Logger.info("Fetching list of buckets...");
-      const data = await UploaderS3.client.send(new client_s3.ListBucketsCommand({}));
-      Logger.info("Buckets:", data.Buckets);
-    } catch (error) {
-      Logger.error(error);
-      throw error;
-    }
-  }
-  static async startMultipartUpload(bucketName, key) {
-    if (!UploaderS3.client) {
-      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
-    }
-    try {
-      const upload = await UploaderS3.client.send(new client_s3.CreateMultipartUploadCommand({
-        Bucket: bucketName,
-        Key: key
-      }));
-      UploaderS3.uploadSessions[key] = upload.UploadId;
-      return upload.UploadId;
-    } catch (error) {
-      Logger.error(error);
-      throw error;
-    }
-  }
-  static async uploadPart(bucketName, key, uploadId, partNumber, chunk) {
-    if (!UploaderS3.client) {
-      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
-    }
-    try {
-      Logger.info("Uploading part", { bucketName, partNumber });
-      const response4 = await UploaderS3.client.send(new client_s3.UploadPartCommand({
-        Bucket: bucketName,
-        Key: key,
-        UploadId: uploadId,
-        PartNumber: partNumber,
-        Body: chunk
-      }));
-      Logger.info("Part uploaded successfully:", response4);
-      return response4.ETag ?? null;
-    } catch (error) {
-      Logger.error(error);
-      throw error;
-    }
-  }
-  static async completeMultipartUpload(bucketName, key, uploadId, parts) {
-    if (!UploaderS3.client) {
-      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
-    }
-    try {
-      Logger.info("Completing multipart upload for key:", key);
-      await UploaderS3.client.send(new client_s3.CompleteMultipartUploadCommand({
-        Bucket: bucketName,
-        Key: key,
-        UploadId: uploadId,
-        MultipartUpload: { Parts: parts }
-      }));
-      Logger.info("Multipart upload completed successfully.");
-    } catch (error) {
-      Logger.error(error);
-      throw error;
-    }
-  }
-  static async abortMultipartUpload(bucketName, key, uploadId) {
-    if (!UploaderS3.client) {
-      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
-    }
-    try {
-      await UploaderS3.client.send(new client_s3.AbortMultipartUploadCommand({
-        Bucket: bucketName,
-        Key: key,
-        UploadId: uploadId
-      }));
-      Logger.info("Multipart upload aborted successfully.");
-    } catch (error) {
-      Logger.error(error);
-      throw error;
-    }
-  }
-  static async deleteIncompleteUploads(bucketName) {
-    if (!UploaderS3.client) {
-      throw new Error("S3 client is not initialized. Call `UploaderS3.init()` first.");
-    }
-    try {
-      let isTruncated = true;
-      let marker;
-      while (isTruncated) {
-        const listUploadsResponse = await UploaderS3.client.send(new client_s3.ListMultipartUploadsCommand({
-          Bucket: bucketName,
-          KeyMarker: marker
-        }));
-        for (const upload of listUploadsResponse.Uploads || []) {
-          const uploadId = upload.UploadId;
-          const key = upload.Key;
-          await UploaderS3.client.send(new client_s3.AbortMultipartUploadCommand({
-            Bucket: bucketName,
-            Key: key,
-            UploadId: uploadId
-          }));
-          Logger.info(`Aborted incomplete upload: ${key} with UploadId: ${uploadId}`);
-        }
-        marker = listUploadsResponse.NextKeyMarker;
-        isTruncated = listUploadsResponse.IsTruncated ?? false;
-      }
-      Logger.info("Completed deleting all incomplete uploads.");
-    } catch (error) {
-      Logger.error(error);
-      throw error;
-    }
-  }
-}
 // src/decorators/Endpoints.ts
 var endpoint = (target, methodName, descriptor) => {
 };

package/dist/types/ApplicationOptionType.d.ts

@@ -8,6 +8,7 @@ export type ApplicationOptionType = {
     websocketDir?: string;
     enableRedis?: boolean;
     enableMinio?: boolean;
+    enableS3?: boolean;
     enableWebSocket?: boolean;
     enableFirebase?: boolean;
     enableEmail?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccci/micro-server",
-  "version": "1.0.136",
+  "version": "1.0.137",
   "module": "index.ts",
   "type": "module",
   "main": "dist/index.js",