Optimize Import

src/decrypt/ncm.js

@@ -1,15 +1,12 @@
 const CryptoJS = require("crypto-js");
 const ID3Writer = require("browser-id3-writer");
-const util = require("./util");
 const CORE_KEY = CryptoJS.enc.Hex.parse("687a4852416d736f356b496e62617857");
 const META_KEY = CryptoJS.enc.Hex.parse("2331346C6A6B5F215C5D2630553C2728");
+import {AudioMimeType, GetArrayBuffer} from "./util"
 
+export async function Decrypt(file) {
 
-export {Decrypt};
-
-async function Decrypt(file) {
-
-    const fileBuffer = await util.GetArrayBuffer(file);
+    const fileBuffer = await GetArrayBuffer(file);
     const dataView = new DataView(fileBuffer);
 
     if (dataView.getUint32(0, true) !== 0x4e455443 ||
@@ -38,7 +35,7 @@ async function Decrypt(file) {
             musicMeta.format = "mp3";
         }
     }
-    const mime = util.AudioMimeType[musicMeta.format];
+    const mime = AudioMimeType[musicMeta.format];
 
     const artists = [];
     musicMeta.artist.forEach(arr => {

src/decrypt/qmc.js

@@ -1,18 +1,18 @@
 import {AudioMimeType, GetArrayBuffer, GetCoverURL, GetFileInfo} from "./util";
-import * as mask from "./qmcMask"
+import {QmcMaskCreate58, QmcMaskGetDefault, QmcMaskDetectMgg, QmcMaskDetectMflac} from "./qmcMask";
 
 const musicMetadata = require("music-metadata-browser");
 
 const HandlerMap = {
-    "mgg": {handler: mask.QmcMaskDetectMgg, ext: "ogg", detect: true},
-    "mflac": {handler: mask.QmcMaskDetectMflac, ext: "flac", detect: true},
-    "qmc0": {handler: mask.QmcMaskGetDefault, ext: "mp3", detect: false},
-    "qmc3": {handler: mask.QmcMaskGetDefault, ext: "mp3", detect: false},
-    "qmcogg": {handler: mask.QmcMaskGetDefault, ext: "ogg", detect: false},
-    "qmcflac": {handler: mask.QmcMaskGetDefault, ext: "flac", detect: false},
-    "bkcmp3": {handler: mask.QmcMaskGetDefault, ext: "mp3", detect: false},
-    "bkcflac": {handler: mask.QmcMaskGetDefault, ext: "flac", detect: false},
-    "tkm": {handler: mask.QmcMaskGetDefault, ext: "m4a", detect: false}
+    "mgg": {handler: QmcMaskDetectMgg, ext: "ogg", detect: true},
+    "mflac": {handler: QmcMaskDetectMflac, ext: "flac", detect: true},
+    "qmc0": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
+    "qmc3": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
+    "qmcogg": {handler: QmcMaskGetDefault, ext: "ogg", detect: false},
+    "qmcflac": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
+    "bkcmp3": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
+    "bkcflac": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
+    "tkm": {handler: QmcMaskGetDefault, ext: "m4a", detect: false}
 };
 
 //todo: use header to detect media type
@@ -72,7 +72,7 @@ async function queryKeyInfo(keyData, filename, format) {
             body: JSON.stringify({Format: format, Key: Array.from(keyData), Filename: filename}),
         });
         let data = await resp.json();
-        return mask.QmcMaskCreate58(data.Matrix58, data.Super58A, data.Super58B);
+        return QmcMaskCreate58(data.Matrix58, data.Super58A, data.Super58B);
     } catch (e) {
     }
 }

src/decrypt/raw.js

@@ -1,19 +1,17 @@
 const musicMetadata = require("music-metadata-browser");
-const util = require("./util");
-export {Decrypt}
+import {GetCoverURL, GetFileInfo, AudioMimeType} from "./util";
 
-
-async function Decrypt(file, raw_filename, raw_ext) {
+export async function Decrypt(file, raw_filename, raw_ext) {
     const tag = await musicMetadata.parseBlob(file);
-    const info = util.GetFileInfo(tag.common.artist, tag.common.title, raw_filename);
+    const info = GetFileInfo(tag.common.artist, tag.common.title, raw_filename);
     return {
         status: true,
         title: info.title,
         artist: info.artist,
         ext: raw_ext,
         album: tag.common.album,
-        picture: util.GetCoverURL(tag),
+        picture: GetCoverURL(tag),
         file: URL.createObjectURL(file),
-        mime: util.AudioMimeType[raw_ext]
+        mime: AudioMimeType[raw_ext]
     }
 }

src/decrypt/tm.js

@@ -1,14 +1,14 @@
-const rawDecrypt = require("./raw");
-const util = require("./util");
-export {Decrypt}
-const header = [0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70];
+import {Decrypt as RawDecrypt} from "./raw";
+import {GetArrayBuffer} from "./util";
 
-async function Decrypt(file, raw_filename) {
-    const fileBuffer = await util.GetArrayBuffer(file);
+const TM_HEADER = [0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70];
+
+export async function Decrypt(file, raw_filename) {
+    const fileBuffer = await GetArrayBuffer(file);
     const audioData = new Uint8Array(fileBuffer);
     for (let cur = 0; cur < 8; ++cur) {
-        audioData[cur] = header[cur];
+        audioData[cur] = TM_HEADER[cur];
     }
     const musicData = new Blob([audioData], {type: "audio/mp4"});
-    return await rawDecrypt.Decrypt(musicData, raw_filename, "m4a")
+    return await RawDecrypt(musicData, raw_filename, "m4a")
 }

src/decrypt/util.js

@@ -1,10 +1,10 @@
+export const FLAC_HEADER = [0x66, 0x4C, 0x61, 0x43, 0x00];
 export const AudioMimeType = {
     mp3: "audio/mpeg",
     flac: "audio/flac",
     m4a: "audio/mp4",
     ogg: "audio/ogg"
 };
-export const FLAC_HEADER = [0x66, 0x4C, 0x61, 0x43, 0x00];
 
 // Also a new draft API: blob.arrayBuffer()
 export async function GetArrayBuffer(blobObject) {