Replace mime with mime-type

liranmauda · liranmauda · commit 99829752e742 · 2025-03-19T14:45:02.000+02:00
- Replace mime with mime-type

Signed-off-by: liranmauda &lt;liran.mauda@gmail.com&gt;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -97,7 +97,7 @@
     "jsonwebtoken": "9.0.2",
     "linux-blockutils": "0.2.0",
     "lodash": "4.17.21",
-    "mime": "3.0.0",
+    "mime-type": "5.0.2",
     "minimist": "1.2.8",
     "moment": "2.30.1",
     "moment-timezone": "0.5.47",
diff --git a/src/endpoint/blob/ops/blob_put_blob.js b/src/endpoint/blob/ops/blob_put_blob.js
@@ -4,7 +4,7 @@
 const blob_utils = require('../blob_utils');
 const http_utils = require('../../../util/http_utils');
 const time_utils = require('../../../util/time_utils');
-const mime = require('mime');
+const mime = require('mime-types');
 
 
 /**
@@ -16,7 +16,7 @@ async function put_blob(req, res) {
     const { etag } = await req.object_sdk.upload_object({
         bucket: req.params.bucket,
         key: req.params.key,
-        content_type: req.headers['x-ms-blob-content-type'] || (copy_source ? undefined : (mime.getType(req.params.key) || 'application/octet-stream')),
+        content_type: req.headers['x-ms-blob-content-type'] || (copy_source ? undefined : (mime.lookup(req.params.key) || 'application/octet-stream')),
         size: req.content_length >= 0 ? req.content_length : undefined,
         md5_b64: req.content_md5 ? req.content_md5.toString('base64') : undefined,
         sha256_b64: req.content_sha256_buf ? req.content_sha256_buf.toString('base64') : undefined,
diff --git a/src/endpoint/blob/ops/blob_put_blob_blocklist.js b/src/endpoint/blob/ops/blob_put_blob_blocklist.js
@@ -5,7 +5,7 @@ const _ = require('lodash');
 
 const blob_utils = require('../blob_utils');
 const http_utils = require('../../../util/http_utils');
-const mime = require('mime');
+const mime = require('mime-types');
 
 /**
  * https://docs.microsoft.com/en-us/rest/api/storageservices/put-block-list
@@ -19,7 +19,7 @@ async function put_blob_blocklist(req, res) {
     const reply = await req.object_sdk.commit_blob_block_list({
         bucket: req.params.bucket,
         key: req.params.key,
-        content_type: req.headers['x-ms-blob-content-type'] || mime.getType(req.params.key) || 'application/octet-stream',
+        content_type: req.headers['x-ms-blob-content-type'] || mime.lookup(req.params.key) || 'application/octet-stream',
         md_conditions: http_utils.get_md_conditions(req),
         xattr: blob_utils.get_request_xattr(req),
         block_list
diff --git a/src/endpoint/s3/ops/s3_post_object_uploads.js b/src/endpoint/s3/ops/s3_post_object_uploads.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const s3_utils = require('../s3_utils');
-const mime = require('mime');
+const mime = require('mime-types');
 const config = require('../../../../config');
 const S3Error = require('../s3_errors').S3Error;
 
@@ -21,7 +21,7 @@ async function post_object_uploads(req, res) {
     const reply = await req.object_sdk.create_object_upload({
         bucket: req.params.bucket,
         key: req.params.key,
-        content_type: req.headers['content-type'] || mime.getType(req.params.key) || 'application/octet-stream',
+        content_type: req.headers['content-type'] || mime.lookup(req.params.key) || 'application/octet-stream',
         content_encoding: req.headers['content-encoding'],
         xattr: s3_utils.get_request_xattr(req),
         storage_class,
diff --git a/src/endpoint/s3/ops/s3_put_object.js b/src/endpoint/s3/ops/s3_put_object.js
@@ -5,7 +5,7 @@ const dbg = require('../../../util/debug_module')(__filename);
 const s3_utils = require('../s3_utils');
 const S3Error = require('../s3_errors').S3Error;
 const http_utils = require('../../../util/http_utils');
-const mime = require('mime');
+const mime = require('mime-types');
 const config = require('../../../../config');
 
 const s3_error_options = {
@@ -41,7 +41,7 @@ async function put_object(req, res) {
     const reply = await req.object_sdk.upload_object({
         bucket: req.params.bucket,
         key: req.params.key,
-        content_type: req.headers['content-type'] || (copy_source ? undefined : (mime.getType(req.params.key) || 'application/octet-stream')),
+        content_type: req.headers['content-type'] || (copy_source ? undefined : (mime.lookup(req.params.key) || 'application/octet-stream')),
         content_encoding: req.headers['content-encoding'],
         copy_source,
         source_stream,
diff --git a/src/sdk/endpoint_stats_collector.js b/src/sdk/endpoint_stats_collector.js
@@ -2,15 +2,16 @@
 'use strict';
 
 const _ = require('lodash');
-const mime = require('mime');
+const mime = require('mime-types');
 
 const dbg = require('../util/debug_module')(__filename);
 const prom_report = require('../server/analytic_services/prometheus_reporting');
 const stats_aggregator = require('../server/system_services/stats_aggregator');
 const DelayedCollector = require('../util/delayed_collector');
 const config = require('../../config');
 const cluster = /** @type {import('node:cluster').Cluster} */ (
-    /** @type {unknown} */ (require('node:cluster'))
+    /** @type {unknown} */
+    (require('node:cluster'))
 );
 
 /**
@@ -239,16 +240,20 @@ class EndpointStatsCollector {
     }
 
     update_bucket_read_counters({ bucket_name, key, content_type, }) {
-        content_type = content_type || mime.getType(key) || 'application/octet-stream';
+        content_type = content_type || mime.lookup(key) || 'application/octet-stream';
         this.endpoint_stats_collector.update({
-            bucket_counters: { [bucket_name]: { [content_type]: { read_count: 1 } } }
+            bucket_counters: {
+                [bucket_name]: {
+                    [content_type]: { read_count: 1 } } }
         });
     }
 
     update_bucket_write_counters({ bucket_name, key, content_type, }) {
-        content_type = content_type || mime.getType(key) || 'application/octet-stream';
+        content_type = content_type || mime.lookup(key) || 'application/octet-stream';
         this.endpoint_stats_collector.update({
-            bucket_counters: { [bucket_name]: { [content_type]: { write_count: 1 } } }
+            bucket_counters: {
+                [bucket_name]: {
+                    [content_type]: { write_count: 1 } } }
         });
     }
 
@@ -361,7 +366,7 @@ class EndpointStatsCollector {
     update_fork_counter() {
         // add fork related metrics to prometheus
         const code = `worker_${cluster.worker.id}`;
-        this.prom_metrics_report.inc('fork_counter', {code});
+        this.prom_metrics_report.inc('fork_counter', { code });
     }
 }
 if (cluster.isWorker) {
diff --git a/src/sdk/namespace_fs.js b/src/sdk/namespace_fs.js
@@ -7,7 +7,7 @@ const _ = require('lodash');
 const fs = require('fs');
 const path = require('path');
 const util = require('util');
-const mime = require('mime');
+const mime = require('mime-types');
 const P = require('../util/promise');
 const dbg = require('../util/debug_module')(__filename);
 const config = require('../../config');
@@ -2546,7 +2546,7 @@ class NamespaceFS {
         const dir_content_type = stat.xattr?.[XATTR_DIR_CONTENT] && ((Number(stat.xattr?.[XATTR_DIR_CONTENT]) > 0 && 'application/octet-stream') || 'application/x-directory');
         const content_type = stat.xattr?.[XATTR_CONTENT_TYPE] ||
             (isDir && dir_content_type) ||
-            mime.getType(key) || 'application/octet-stream';
+            mime.lookup(key) || 'application/octet-stream';
 
         const storage_class = Glacier.storage_class_from_xattr(stat.xattr);
         const size = Number(stat.xattr?.[XATTR_DIR_CONTENT] || stat.size);
diff --git a/src/sdk/namespace_net_storage.js b/src/sdk/namespace_net_storage.js
@@ -5,7 +5,7 @@ const _ = require('lodash');
 const util = require('util');
 
 const P = require('../util/promise');
-const mime = require('mime');
+const mime = require('mime-types');
 const dbg = require('../util/debug_module')(__filename);
 const NetStorage = require('../util/NetStorageKit-Node-master/lib/netstorage');
 
@@ -158,7 +158,7 @@ class NamespaceNetStorage {
             size: res.size,
             etag,
             create_time: new Date(Number(res.mtime || 0) * 1000),
-            content_type: mime.getType(res.name) || 'application/octet-stream',
+            content_type: mime.lookup(res.name) || 'application/octet-stream',
             xattr,
         };
     }
diff --git a/src/server/object_services/md_store.js b/src/server/object_services/md_store.js
@@ -7,7 +7,7 @@ const _ = require('lodash');
 const assert = require('assert');
 const moment = require('moment');
 const mongodb = require('mongodb');
-const mime = require('mime');
+const mime = require('mime-types');
 
 const P = require('../../util/promise');
 const dbg = require('../../util/debug_module')(__filename);
@@ -292,7 +292,7 @@ class MDStore {
             system: obj.system,
             bucket: obj.bucket,
             key: obj.key,
-            content_type: obj.content_type || mime.getType(obj.key) || 'application/octet-stream',
+            content_type: obj.content_type || mime.lookup(obj.key) || 'application/octet-stream',
             delete_marker: true,
             create_time: new Date(),
             version_seq,
diff --git a/src/server/object_services/object_server.js b/src/server/object_services/object_server.js
@@ -7,7 +7,7 @@ require('../../util/fips');
 const _ = require('lodash');
 const os = require('os');
 const util = require('util');
-const mime = require('mime');
+const mime = require('mime-types');
 const crypto = require('crypto');
 const assert = require('assert');
 const glob_to_regexp = require('glob-to-regexp');
@@ -69,7 +69,7 @@ async function create_object_upload(req) {
         bucket: req.bucket._id,
         key: req.rpc_params.key,
         content_type: req.rpc_params.content_type ||
-            mime.getType(req.rpc_params.key) ||
+            mime.lookup(req.rpc_params.key) ||
             'application/octet-stream',
         tagging: req.rpc_params.tagging,
         storage_class: req.rpc_params.storage_class,
@@ -1638,19 +1638,19 @@ function check_object_mode(req, obj, rpc_code) {
  * @returns {string}
  */
 function get_etag(entity, updates) {
-   const etag = updates?.etag || entity.etag;
-   if (etag) return etag;
+    const etag = updates?.etag || entity.etag;
+    if (etag) return etag;
 
-   const md5_b64 = updates?.md5_b64 || entity.md5_b64;
-   if (md5_b64) return Buffer.from(md5_b64, 'base64').toString('hex');
+    const md5_b64 = updates?.md5_b64 || entity.md5_b64;
+    if (md5_b64) return Buffer.from(md5_b64, 'base64').toString('hex');
 
-   const sha256_b64 = updates?.sha256_b64 || entity.sha256_b64;
-   if (sha256_b64) return 'sha256-' + Buffer.from(sha256_b64, 'base64').toString('hex');
+    const sha256_b64 = updates?.sha256_b64 || entity.sha256_b64;
+    if (sha256_b64) return 'sha256-' + Buffer.from(sha256_b64, 'base64').toString('hex');
 
-   const id = updates?._id || entity._id;
-   if (id) return 'id-' + id.toHexString();
+    const id = updates?._id || entity._id;
+    if (id) return 'id-' + id.toHexString();
 
-   return '';
+    return '';
 }
 
 function throw_if_maintenance(req) {
diff --git a/src/tools/s3cat.js b/src/tools/s3cat.js
@@ -7,7 +7,7 @@ const _ = require('lodash');
 const fs = require('fs');
 const AWS = require('aws-sdk');
 const minimist = require('minimist');
-const mime = require('mime');
+const mime = require('mime-types');
 const http = require('http');
 const https = require('https');
 const crypto = require('crypto');
@@ -299,7 +299,7 @@ function upload_object() {
             Bucket: argv.bucket,
             Key: upload_key,
             CopySource: argv.bucket + '/' + argv.copy,
-            ContentType: mime.getType(upload_key) || '',
+            ContentType: mime.lookup(upload_key) || '',
         };
         if (argv.presign) return make_simple_request('copyObject', params);
         return s3.copyObject(params, on_finish);
@@ -310,7 +310,7 @@ function upload_object() {
             Bucket: argv.bucket,
             Key: upload_key,
             Body: data_source,
-            ContentType: mime.getType(file_path) || '',
+            ContentType: mime.lookup(file_path) || '',
             ContentLength: data_size
         };
         if (argv.presign) return make_simple_request('putObject', params);
@@ -322,7 +322,7 @@ function upload_object() {
                 Bucket: argv.bucket,
                 Key: upload_key,
                 Body: data_source,
-                ContentType: mime.getType(file_path),
+                ContentType: mime.lookup(file_path),
                 ContentLength: data_size
             }, {
                 partSize: part_size,
@@ -339,7 +339,7 @@ function upload_object() {
         s3.createMultipartUpload({
             Bucket: argv.bucket,
             Key: upload_key,
-            ContentType: mime.getType(file_path),
+            ContentType: mime.lookup(file_path),
         }, (err, create_res) => {
             if (err) {
                 console.error('s3.createMultipartUpload ERROR', err);
