feat(utils): add converting extension to mimetype (#400)

Author: pcholuj

src/lib/client.ts

@@ -22,7 +22,7 @@ import { FilestackError } from './../filestack_error';
 import { metadata, MetadataOptions, remove, retrieve, RetrieveOptions } from './api/file';
 import { transform, TransformOptions } from './api/transform';
 import { storeURL } from './api/store';
-import { resolveHost, getVersion } from './utils';
+import * as Utils from './utils';
 import { Upload, InputFile, UploadOptions, StoreUploadOptions, UploadTags } from './api/upload';
 import { preview, PreviewOptions } from './api/preview';
 import { CloudClient } from './api/cloud';
@@ -100,6 +100,16 @@ export class Client extends EventEmitter {
 
   private forwardErrors: boolean = true;
 
+  /**
+   * Returns filestack utils
+   *
+   * @readonly
+   * @memberof Client
+   */
+  get utils() {
+    return Utils;
+  }
+
   constructor(apikey: string, options?: ClientOptions) {
     super();
 
@@ -111,7 +121,7 @@ export class Client extends EventEmitter {
     /* istanbul ignore next */
     Sentry.configureScope(scope => {
       scope.setTag('apikey', apikey);
-      scope.setTag('sdk-version', getVersion());
+      scope.setTag('sdk-version', Utils.getVersion());
       scope.setExtra('clientOptions', options);
     });
 
@@ -171,7 +181,7 @@ export class Client extends EventEmitter {
     }
 
     this.session.cname = cname;
-    this.session.urls = resolveHost(this.session.urls, cname);
+    this.session.urls = Utils.resolveHost(this.session.urls, cname);
   }
 
   /**

src/lib/request/adapters/http.ts

@@ -291,9 +291,7 @@ export class HttpAdapter implements AdapterInterface {
       });
 
       if (config.timeout) {
-        console.log(config.timeout);
         req.setTimeout(config.timeout, () => {
-          console.log('socket timeouted===========');
           req.abort();
 
           if (cancelListener) {

src/lib/utils/extensions.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-export const Map = {
+export const ExtensionsMap = {
   'application/andrew-inset': ['ez'],
   'application/applixware': ['aw'],
   'application/atom+xml': ['atom'],

src/lib/utils/index.spec.ts

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { resolveCdnUrl, resolveHost, removeEmpty, uniqueTime, uniqueId, md5, sanitizeName, filterObject, b64, getVersion, cleanUpCallbacks } from './index';
+import { resolveCdnUrl, resolveHost, removeEmpty, uniqueTime, uniqueId, md5, extensionToMime, sanitizeName, filterObject, b64, getVersion, cleanUpCallbacks } from './index';
 import { config } from '../../config';
 const v = require('../../../../package.json').version;
 
@@ -182,6 +182,34 @@ describe('utils:index', () => {
     });
   });
 
+  describe('extensionToMime', () => {
+    it('should return mimetype if mime is passed', () => {
+      expect(extensionToMime('')).toEqual(undefined);
+    });
+
+    it('should return same mime is passed', () => {
+      expect(extensionToMime('image/png')).toEqual('image/png');
+      expect(extensionToMime('image/jpg')).toEqual('image/jpg');
+      expect(extensionToMime('application/pdf')).toEqual('application/pdf');
+    });
+
+    it('it should return correct mimes for ext', () => {
+      expect(extensionToMime('.png')).toEqual('image/png');
+      expect(extensionToMime('.jpg')).toEqual('image/jpeg');
+      expect(extensionToMime('.pdf')).toEqual('application/pdf');
+
+      expect(extensionToMime('.key')).toEqual('application/vnd.apple.keynote');
+      expect(extensionToMime('.zip')).toEqual('application/zip');
+      expect(extensionToMime('.numbers')).toEqual('application/vnd.apple.numbers');
+    });
+
+    it('it should extract extensions form filename or ext with dot', () => {
+      expect(extensionToMime('test.png')).toEqual('image/png');
+      expect(extensionToMime('test.jpg')).toEqual('image/jpeg');
+      expect(extensionToMime('test.pdf')).toEqual('application/pdf');
+    });
+  });
+
   describe('CleanupCallbacks', () => {
     it('should set callbacks as undefined and return untouched object', () => {
       const testObj = {

src/lib/utils/index.ts

@@ -17,7 +17,7 @@
 
 import { Session } from '../client';
 import { Hosts } from './../../config';
-import { Map } from './extensions';
+import { ExtensionsMap } from './extensions';
 import fileType from 'file-type';
 import * as isutf8 from 'isutf8';
 
@@ -111,14 +111,10 @@ export const getMimetype = (file: Uint8Array | Buffer, name?: string): string =>
   }
 
   if (name && name.indexOf('.') > -1) {
-    const ext = name.split('.').pop();
-    const keys = Object.keys(Map);
-    const mapLen = keys.length;
-
-    for (let i = 0; i < mapLen; i++) {
-      if (Map[keys[i]].indexOf(ext) > -1) {
-        return keys[i];
-      }
+    const mime = extensionToMime(name);
+
+    if (mime) {
+      return mime;
     }
   }
 
@@ -141,6 +137,37 @@ export const getMimetype = (file: Uint8Array | Buffer, name?: string): string =>
   return 'application/octet-stream';
 };
 
+/**
+ * Change extension to according mimetype using ext=>mimetype map
+ *
+ * @param ext - string
+ * @return string|boolean
+ */
+export const extensionToMime = (ext: string) => {
+  if (!ext || ext.length === 0) {
+    return;
+  }
+
+  if (ext.split('/').length === 2) {
+    return ext;
+  }
+
+  if (ext.indexOf('.') > -1) {
+    ext = ext.split('.').pop();
+  }
+
+  const keys = Object.keys(ExtensionsMap);
+  const mapLen = keys.length;
+
+  for (let i = 0; i < mapLen; i++) {
+    if (ExtensionsMap[keys[i]].indexOf(ext) > -1) {
+      return keys[i];
+    }
+  }
+
+  return;
+};
+
 /**
  * Sanitizer Options
  */