@e-mc/types 0.7.20 → 0.7.21

package/constant.d.ts

@@ -1,5 +1,5 @@
 export const enum INTERNAL {
-    VERSION = '0.7.20',
+    VERSION = '0.7.21',
     TEMP_DIR = 'tmp',
     CJS = '__cjs__'
 }

package/index.js

@@ -146,7 +146,6 @@ function recurseObject(data, parseString, completed, cache) {
     }
     return data;
 }
-const convertScrypt = (key, iv, data) => crypto.scryptSync(key, iv, Math.ceil(data.length / 16) * 16);
 const isFunction = (value) => typeof value === 'function';
 var LOG_TYPE;
 (function (LOG_TYPE) {
@@ -832,23 +831,29 @@ function getEncoding(value, fallback = 'utf-8') {
 exports.getEncoding = getEncoding;
 function encryptUTF8(algorithm, key, iv, data, encoding = 'hex') {
     if (checkCipherType(algorithm) && isString(data)) {
+        let result;
         try {
-            const gcm = crypto.createCipheriv(algorithm, convertScrypt(key, iv, data), iv);
-            return gcm.update(data, 'utf-8', encoding) + gcm.final(encoding);
+            const gcm = crypto.createCipheriv(algorithm, crypto.scryptSync(key, iv, 32), iv);
+            result = gcm.update(data, 'utf8', encoding);
+            result += gcm.final(encoding);
         }
         catch {
         }
+        return result;
     }
 }
 exports.encryptUTF8 = encryptUTF8;
 function decryptUTF8(algorithm, key, iv, data, encoding = 'hex') {
     if (checkCipherType(algorithm) && isString(data)) {
+        let result;
         try {
-            const gcm = crypto.createDecipheriv(algorithm, convertScrypt(key, iv, data), iv);
-            return gcm.update(data, encoding, 'utf-8') + gcm.final('utf-8');
+            const gcm = crypto.createDecipheriv(algorithm, crypto.scryptSync(key, iv, 32), iv);
+            result = gcm.update(data, encoding, 'utf8');
+            result += gcm.final('utf8');
         }
         catch {
         }
+        return result;
     }
 }
 exports.decryptUTF8 = decryptUTF8;

package/lib/index.d.ts

@@ -286,7 +286,7 @@ declare namespace functions {
         createServer(port: number, secure?: Null<SecureOptions>, active?: boolean): Null<ws.Server>;
         shutdown(): void;
         setTimeout(value: NumString): void;
-        checkTimeout(client: ws | ws.WebSocket): boolean;
+        checkTimeout(client: ws.WebSocket): boolean;
         readonly prototype: IWatch<T, U, V, W>;
         new(module?: V): IWatch<T, U, V, W>;
         new(interval?: number, port?: number, securePort?: number, extensions?: unknown[]): IWatch<T, U, V, W>;

package/lib/watch.d.ts

@@ -58,8 +58,8 @@ export interface IFileGroup<T extends ExternalAsset = ExternalAsset> extends IAb
 
 export interface FileGroupConstructor<T extends ExternalAsset = ExternalAsset> {
     CONNECTION_TIMEOUT: number;
-    CLIENT_SESSION: Map<typeof ws, number>;
-    checkTimeout(client: ws | ws.WebSocket): boolean;
+    CLIENT_SESSION: Map<ws.WebSocket, number>;
+    checkTimeout(client: ws.WebSocket): boolean;
     cloneAsset(asset: T): T;
     readonly prototype: IFileGroup<T>;
     new(uri: string, assets: T[], abortable: boolean): IFileGroup<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/types",
-  "version": "0.7.20",
+  "version": "0.7.21",
   "description": "Type definitions for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",