@e-mc/types 0.11.4 → 0.11.7

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.4/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.7/index.d.ts)
 
 ```typescript
 import type { LogArguments } from "./lib/logger";
@@ -198,10 +198,10 @@ const IMPORT_MAP: Record<string, string | undefined>;
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.11.4/index.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.4/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.4/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.4/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.7/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.7/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.7/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.7/lib/node.d.ts
 
 * https://developer.mozilla.org/en-US/docs/Web/API/DOMException
 * https://www.npmjs.com/package/@types/bytes

package/constant.d.ts

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

package/index.js

@@ -356,7 +356,6 @@ function checkFlags(value, flags) {
     return typeof value === 'number' && (value & flags) === flags;
 }
 const padStart = (value, char) => value > 9 ? value.toString() : char + value;
-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) {
@@ -980,22 +979,28 @@ function getEncoding(value, fallback = 'utf-8') {
 }
 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;
     }
 }
 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;
     }
 }
 function randomString(format, dictionary) {
@@ -1088,7 +1093,7 @@ async function importESM(name, isDefault, fromPath) {
     if (fromPath && path.isAbsolute(name)) {
         name = (0, node_url_1.pathToFileURL)(name).toString();
     }
-    const result = Function(`return import("${name}")`)();
+    const result = import(name);
     if (isDefault) {
         const out = await result;
         if (isObject(out) && 'default' in out) {

package/lib/index.d.ts

@@ -27,6 +27,7 @@ import type { LookupFunction } from 'node:net';
 import type { Readable, Writable } from 'node:stream';
 import type { SecureContextOptions } from 'node:tls';
 import type { BrotliCompress, Gzip } from 'node:zlib';
+// @ts-ignore
 import type { FileTypeResult } from 'file-type';
 
 import type * as EventEmitter from 'node:events';
@@ -307,7 +308,7 @@ declare namespace functions {
         createServer(port: number, secure?: SecureOptions | null, active?: boolean): ws.Server | null;
         shutdown(): void;
         setTimeout(value: number | string): void;
-        checkTimeout(client: ws | ws.WebSocket): boolean;
+        checkTimeout(client: ws.WebSocket): boolean;
         isConnectionError(err: unknown): boolean;
         readonly prototype: IWatch<T, U, V, W>;
         new(module?: V): 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.11.4",
+  "version": "0.11.7",
   "description": "Type definitions for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",