@e-mc/types 0.13.6 → 0.13.8

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/types
 
-* NodeJS 18.20.5 LTS
+* NodeJS 18.20 LTS
 * ES2022
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.6/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.8/index.d.ts)
 
 ```typescript
 import type { LogArguments } from "./lib/logger";
@@ -81,6 +81,7 @@ function supported(major: number, minor: number, lts: boolean): boolean;
 function supported(major: number, minor?: number, patch?: number, lts?: boolean): boolean;
 function importESM(name: string | URL, isDefault: boolean, fromPath?: boolean): Promise<unknown>;
 function importESM(name: string | URL, options?: ImportAttributes, fromPath?: boolean): Promise<unknown>;
+function requireESM(name: string, expect?: string): unknown;
 function purgeMemory(percent?: number): number;
 
 interface LOG_TYPE {
@@ -208,10 +209,10 @@ const IMPORT_MAP: Record<string, string | undefined>;
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.6/index.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/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.13.6',
+    VERSION = '0.13.8',
     TEMP_DIR = 'tmp',
     CJS = '__cjs__'
 }

package/index.d.ts

@@ -350,6 +350,7 @@ declare namespace types {
     function supported(major: number, minor?: number, patch?: number, lts?: boolean): boolean;
     function importESM<T = unknown>(name: string | URL, isDefault: boolean, fromPath?: boolean): Promise<T>;
     function importESM<T = unknown>(name: string | URL, options?: ImportAttributes, fromPath?: boolean): Promise<T>;
+    function requireESM<T = unknown>(name: string, expect?: string): T;
     function purgeMemory(percent?: number): number;
 }
 

package/index.js

@@ -48,6 +48,7 @@ exports.incrementUUID = incrementUUID;
 exports.hashKey = hashKey;
 exports.supported = supported;
 exports.importESM = importESM;
+exports.requireESM = requireESM;
 const path = require("node:path");
 const fs = require("node:fs");
 const crypto = require("node:crypto");
@@ -57,6 +58,7 @@ const node_url_1 = require("node:url");
 const PATTERN_CHARS = {
     '&': '\\x26',
     '!': '\\x21',
+    '"': '\\x22',
     '#': '\\x23',
     '%': '\\x25',
     ',': '\\x2c',
@@ -102,6 +104,7 @@ let CACHE_COERCED = new WeakSet();
 let LOG_CURRENT = null;
 let SUPPORTED_HASHSINGLE = false;
 let SUPPORTED_IMPORTATTRIBUTES = false;
+let SUPPORTED_REGEXPESCAPE = false;
 let TEMP_DIR = path.join(process.cwd(), "tmp");
 let INCREMENT_COUNT = 65536;
 let INCREMENT_PREFIX = '';
@@ -176,7 +179,7 @@ function fromObject(value, typedArray, structured, shared) {
 function trimQuote(value) {
     value = value.trim();
     const first = value[0];
-    return first === value.at(-1) && (first === '"' || first === "'" || first === "`") ? value.substring(1, value.length - 1) : value;
+    return first === value.at(-1) && (first === '"' || first === "'" || first === "`") ? value.slice(1, -1) : value;
 }
 function checkCipherType(value) {
     switch (value) {
@@ -761,6 +764,9 @@ function hasGlob(value) {
 function escapePattern(value, symbols) {
     switch (typeof value) {
         case 'string': {
+            if (symbols && SUPPORTED_REGEXPESCAPE) {
+                return RegExp.escape(value);
+            }
             let result = '', j = 0;
             for (let i = 0, length = value.length, ch; i < length; ++i) {
                 switch (ch = value[i]) {
@@ -1051,18 +1057,18 @@ function asFunction(value, sync = true) {
 }
 function getEncoding(value, fallback) {
     if (typeof value === 'string') {
-        switch (value = value.trim().toLowerCase()) {
-            case 'utf8':
-            case 'utf-8':
-                return 'utf8';
-            case 'utf16le':
-            case 'utf-16le':
-            case 'utf16':
-            case 'utf-16':
-                return 'utf16le';
+        const result = value.trim().toLowerCase();
+        if (result.slice(0, 3) === 'utf') {
+            switch (result.slice(result[3] === '-' ? 4 : 3)) {
+                case '8':
+                    return 'utf8';
+                case '16le':
+                case '16':
+                    return 'utf16le';
+            }
         }
-        if (Buffer.isEncoding(value)) {
-            return value;
+        else if (Buffer.isEncoding(result)) {
+            return result;
         }
     }
     return fallback || 'utf8';
@@ -1102,7 +1108,7 @@ function randomString(format, dictionary) {
                 let length = 0, available;
                 if (b.startsWith('[') && b.endsWith(']')) {
                     length = 1;
-                    available = b.substring(1, b.length - 1);
+                    available = b.slice(1, -1);
                 }
                 else {
                     if (isNaN(length = +b)) {
@@ -1260,5 +1266,10 @@ async function importESM(name, isDefault, fromPath) {
     }
     return result;
 }
+function requireESM(name, expect) {
+    const result = require(name);
+    return process.features.require_module && isObject(result) && result.__esModule && 'default' in result && (!expect || typeof result.default === expect) ? result.default : result;
+}
 SUPPORTED_HASHSINGLE = supported(20, 12, true) || supported(21, 7);
-SUPPORTED_IMPORTATTRIBUTES = supported(18, 20, 5, true) || supported(20, 18, 3, true) || supported(22, 12, true) || supported(23, 1);
+SUPPORTED_IMPORTATTRIBUTES = supported(18, 20, true) || supported(20, 10);
+SUPPORTED_REGEXPESCAPE = supported(24);

package/lib/core.d.ts

@@ -40,11 +40,11 @@ export interface IClientDb<T extends IHost, U extends ClientModule<ClientDbSetti
     hasCache(source: string, sessionKey?: string): boolean;
     hasCoerce(source: string, component: keyof DbCoerceSettings, uuidKey: string | undefined): boolean;
     hasCoerce(source: string, component: keyof DbCoerceSettings, credential?: unknown): boolean;
+    getQueryResult(source: string, credential: unknown, queryString: string, options: CacheOptions): QueryResult | undefined;
     getQueryResult(source: string, credential: unknown, queryString: string, renewCache: boolean): QueryResult | undefined;
-    getQueryResult(source: string, credential: unknown, queryString: string, sessionKey?: string, renewCache?: boolean): QueryResult | undefined;
-    getQueryResult(source: string, credential: unknown, queryString: string, options?: CacheOptions | string, renewCache?: boolean): QueryResult | undefined;
-    setQueryResult(source: string, credential: unknown, queryString: string, result: unknown, sessionKey?: string): QueryResult;
-    setQueryResult(source: string, credential: unknown, queryString: string, result: unknown, options?: CacheOptions | string): QueryResult;
+    getQueryResult(source: string, credential: unknown, queryString: string, sessionKey?: string | CacheOptions, renewCache?: boolean): QueryResult | undefined;
+    setQueryResult(source: string, credential: unknown, queryString: string, result: unknown, options: CacheOptions): QueryResult;
+    setQueryResult(source: string, credential: unknown, queryString: string, result: unknown, sessionKey?: string | CacheOptions): QueryResult;
     getCacheResult(source: string, credential: unknown, queryString: string, cacheValue: CacheOptions, ignoreCache?: IntBool | FirstOf<number, number>): QueryResult | undefined;
     applyState(items: V | V[], value: number, as?: boolean): void;
     commit(items?: V[]): Promise<boolean>;
@@ -68,6 +68,7 @@ export interface ClientDbConstructor<T extends IHost = IHost, U extends ClientMo
     loadSettings(settings: Pick<Settings, "process" | "memory">, password?: string): boolean;
     getTimeout(value: number | string | TimeoutAction | undefined): number;
     convertTime(value: number | string): number;
+    findResult(source: string, credential: unknown, queryString: string, timeout: number, renewCache: boolean): QueryResult | undefined;
     findResult(source: string, credential: unknown, queryString: string, timeout: number, sessionKey?: string | boolean, renewCache?: boolean): QueryResult | undefined;
     storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, options: StoreResultOptions): QueryResult;
     /** @deprecated */

package/lib/http.d.ts

@@ -112,7 +112,8 @@ export interface AuthValue {
 }
 
 export type HttpRequestClient = ClientRequest | ClientHttp2Stream;
-export type HttpOutgoingHeaders = ObjectMap<OutgoingHttpHeaders>;
+export type HttpHeaders = OutgoingHttpHeaders | Headers;
+export type HttpOutgoingHeaders = ObjectMap<HttpHeaders>;
 export type HttpAgentOptions = Pick<AgentOptions, "timeout" | "maxSockets" | "maxTotalSockets" | "keepAliveMsecs" | "maxFreeSockets" | "proxyEnv">;
 export type HttpProtocolVersion = 1 | 2 | 3;
 export type InternetProtocolVersion = 0 | 4 | 6;

package/lib/index.d.ts

@@ -14,7 +14,7 @@ import type { CommandData, CropData, QualityData, ResizeData, RotateData, Transf
 import type { ExecCommand, LOG_TYPE, LogArguments, LogComponent, LogDate, LogFailOptions, LogMessageOptions, LogOptions, LogProcessOptions, LogState, LogTime, LogType, LogValue, STATUS_TYPE, StatusType } from './logger';
 import type { AsHashOptions, CheckSemVerOptions, CopyDirOptions, CopyDirResult, CopyFileOptions, CreateDirOptions, DeleteFileOptions, DirectoryActionType, FileActionType, FileTypeFormat, GlobDirOptions, MoveFileOptions, PackageVersionOptions, ParseFunctionOptions, PermissionOptions, PermissionType, ProtocolType, ReadBufferOptions, ReadFileCallback, ReadFileOptions, ReadHashOptions, ReadTextOptions, RemoveDirOptions, TempDirOptions, WriteFileOptions } from './module';
 import type { ErrorCode, HighResolutionTime, RequestData, Settings } from './node';
-import type { ApplyOptions, Aria2Options, BufferFormat, DataEncodedResult, DataObjectResult, FormDataPart, HeadersOnCallback, HostConfig, IHttpAdapter, OpenOptions, PostOptions, ProxySettings, PutOptions, RcloneOptions, ReadExpectType, RequestInit, StatusOnCallback } from './request';
+import type { ApplyOptions, Aria2Options, BufferFormat, DataEncodedResult, DataObjectResult, HeadersOnCallback, HostConfig, IHttpAdapter, OpenOptions, PostFileParts as PostFileParts, PostOptions, ProxySettings, PutOptions, RcloneOptions, ReadExpectType, RequestInit, StatusOnCallback } from './request';
 import type { ClientModule, CloudAuthSettings, CloudModule, CloudServiceOptions, CompressModule, CompressSettings, DbCoerceSettings, DbModule, DbSourceOptions, DnsLookupSettings, DocumentComponent, DocumentComponentOption, DocumentModule, HandlerSettings, HttpConnectSettings, HttpMemorySettings, ImageModule, LoggerFormat, LoggerFormatSettings, PoolConfig, RequestModule, RequestSettings, TaskModule, WatchModule } from './settings';
 import type { Command, SpawnResult } from './task';
 import type { IFileGroup, ModifiedPostFinalizeListener, SecureOptions, WatchInitResult } from './watch';
@@ -159,8 +159,8 @@ declare namespace functions {
         executeQuery(item: V, sessionKey: string): Promise<QueryResult>;
         executeQuery(item: V, options?: ExecuteQueryOptions | string): Promise<QueryResult>;
         executeBatchQuery(batch: V[], callback: ErrorQueryCallback, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
-        executeBatchQuery(batch: V[], sessionKey: string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
-        executeBatchQuery(batch: V[], options?: ExecuteBatchQueryOptions | string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
+        executeBatchQuery(batch: V[], sessionKey: string | undefined, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
+        executeBatchQuery(batch: V[], options?: ExecuteBatchQueryOptions, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
         processRows(batch: V[], tasks: Promise<QueryResult | null>[], parallel: boolean): Promise<BatchQueryResult>;
         processRows(batch: V[], tasks: Promise<QueryResult | null>[], options?: ProcessRowsOptions | boolean, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
         handleFail(err: unknown, item: V, options?: HandleFailOptions): boolean;
@@ -409,10 +409,10 @@ declare namespace functions {
         put<V extends PutOptions>(uri: string | URL, data: unknown, options: V): Promise<DataObjectResult<V>>;
         put<V extends PutOptions>(uri: string | URL, data: unknown, contentType?: string | V, options?: V): Promise<DataObjectResult<V>>;
         post<V extends { format: undefined; encoding: undefined }>(uri: string | URL, data: unknown, contentType: string): Promise<DataObjectResult<V>>;
-        post<V extends { format: undefined; encoding: undefined }>(uri: string | URL, parts: FormDataPart[]): Promise<DataObjectResult<V>>;
-        post<V extends { format: undefined; encoding: undefined }>(uri: string | URL, form: AnyObject, parts: FormDataPart[]): Promise<DataObjectResult<V>>;
+        post<V extends { format: undefined; encoding: undefined }>(uri: string | URL, parts: PostFileParts): Promise<DataObjectResult<V>>;
+        post<V extends { format: undefined; encoding: undefined }>(uri: string | URL, form: AnyObject, parts: PostFileParts): Promise<DataObjectResult<V>>;
         post<V extends PostOptions>(uri: string | URL, data: unknown, options: V): Promise<DataObjectResult<V>>;
-        post<V extends PostOptions>(uri: string | URL, data: unknown, contentType?: string | FormDataPart[] | V, options?: V): Promise<DataObjectResult<V>>;
+        post<V extends PostOptions>(uri: string | URL, data: unknown, contentType?: string | PostFileParts | V, options?: V): Promise<DataObjectResult<V>>;
         get<V extends OpenOptions & { encoding: BufferEncoding }>(uri: string | URL, options: V): Promise<string>;
         get<V extends BufferFormat>(uri: string | URL, format: V): Promise<object | null>;
         get<V extends OpenOptions, W extends V | BufferFormat>(uri: string | URL, options?: W): Promise<W extends BufferFormat ? object | null : DataEncodedResult<V>>;
@@ -680,6 +680,7 @@ declare namespace functions {
         getThreadCount(full: true): ThreadCountStat;
         getThreadCount(username: string, iv?: BinaryLike): ThreadCountStat;
         getThreadCount(username?: string | boolean, iv?: BinaryLike): number;
+        parseIp(value: unknown, kind?: "ipv4" | "ipv6"): string;
         getLogDelayed(): FormatMessageArgs[];
         getPermissionFromSettings(freeze?: boolean): IPermission;
         readonly prototype: IHost;
@@ -883,11 +884,17 @@ declare namespace functions {
         readBuffer(value: string | URL, cache?: boolean | ReadBufferOptions): Buffer | null;
         resolveMime(data: FileTypeFormat): Promise<FileTypeResult | undefined>;
         lookupMime(value: string, extension?: boolean): string;
-        initCpuUsage(instance?: IModule): CpuUsage;
-        getCpuUsage(start: CpuUsage, format: true): string;
-        getCpuUsage(start: CpuUsage, format?: boolean): number;
+        /** @deprecated class */
+        initCpuUsage(instance?: IModule, thread?: boolean): CpuUsage;
+        /** @deprecated private */
+        getCpuUsage(start: CpuUsage, format: true, thread?: boolean): string;
+        /** @deprecated private */
+        getCpuUsage(start: CpuUsage, format?: boolean, thread?: boolean): number;
+        /** @deprecated private */
         getMemUsage(format: true | "%" | Unit, free?: boolean): string;
+        /** @deprecated private */
         getMemUsage(format?: boolean, free?: boolean): number;
+        /** @deprecated private */
         formatCpuMem(start: CpuUsage, all?: boolean): string;
         getPackageVersion(name: string | [string, string], options?: PackageVersionOptions): string;
         checkSemVer(name: string | [string, string], options: CheckSemVerOptions): boolean;

package/lib/module.d.ts

@@ -57,6 +57,7 @@ export interface CopyFileOptions extends FileSystemOptions {
     overwrite?: boolean;
     createDir?: boolean;
     outSrc?: string;
+    mode?: number;
 }
 
 export interface RemoveDirOptions extends FileSystemOptions {

package/lib/object.d.ts

@@ -34,4 +34,8 @@ interface MinMax<T = number> {
 }
 
 /** @deprecated lib/node **/
-type HighResolutionTime = bigint | [number, number];
+type HighResolutionTime = bigint | [number, number];
+
+interface RegExpConstructor {
+    escape(value: string): string;
+}

package/lib/request.d.ts

@@ -38,13 +38,20 @@ export interface IHttpHost {
     success(version: HttpProtocolVersion, status?: boolean): number;
     failed(version: HttpProtocolVersion, status?: boolean): number;
     error(version: HttpProtocolVersion, status?: boolean): number;
+    /** @deprecated altSvc.did */
     didAltSvc(version: HttpProtocolVersion): boolean;
+    /** @deprecated altSvc.next */
     nextAltSvc(): boolean;
+    /** @deprecated altSvc.close */
     closeAltSvc(error?: boolean): boolean;
+    /** @deprecated altSvc.clear */
     clearAltSvc(version?: HttpProtocolVersion): void;
+    /** @deprecated altSvc.flag */
     flagAltSvc(version: HttpProtocolVersion, value: number): void;
     reset(): void;
+    v1(): boolean;
     v2(): boolean;
+    get altSvc(): IHttpHostAltSvc;
     set version(value);
     get version(): HttpProtocolVersion;
     get protocol(): string;
@@ -66,6 +73,25 @@ export interface HttpHostConstructor {
     new(url: URL, httpVersion?: HttpProtocolVersion): IHttpHost;
 }
 
+export interface IHttpHostAltSvc {
+    did(version: HttpProtocolVersion): boolean;
+    next(): boolean;
+    close(error?: boolean): boolean;
+    clear(version?: HttpProtocolVersion): void;
+    flag(version: HttpProtocolVersion, value: number): void;
+    valid(hostname: string, port: string, version: number): boolean;
+    set available(value: unknown[]);
+    get errors(): AltSvcInfo[];
+    get hostname(): string | undefined;
+    get port(): string | undefined;
+    get origin(): string | undefined;
+}
+
+export interface HttpHostAltSvcConstructor {
+    readonly prototype: IHttpHostAltSvc;
+    new(host: IHttpHost, versionData: AltSvcData): IHttpHostAltSvc;
+}
+
 export interface IHttpAdapter<T extends OpenOptions = OpenOptions> {
     instance: IRequest;
     state: ControllerState;
@@ -163,7 +189,7 @@ export interface PutOptions extends OpenOptions {
 }
 
 export interface PostOptions extends PutOptions {
-    formData?: FormDataPart | FormDataPart[];
+    formData?: FormDataPart | File | PostFileParts;
 }
 
 export interface FormDataPart {
@@ -218,9 +244,34 @@ export interface ControllerState {
     readonly config: Required<ClientConfig>;
 }
 
+export interface AltSvcInfo {
+    hostname: string;
+    port: string;
+    version: number;
+}
+
+export interface AltSvcLocation extends Partial<AltSvcInfo> {
+    origin?: string;
+    timeout?: NodeJS.Timeout | null;
+}
+
+export interface AltSvcAvailability extends AltSvcInfo {
+    expires: number;
+    persist: boolean;
+}
+
+export interface AltSvcData {
+    success: number;
+    failed: number;
+    errors: number;
+    alpn: number;
+    status: number;
+}
+
 export type HttpMethod = "GET" | "POST" | "PUT" | "HEAD" | "DELETE";
 export type BufferFormat = "json" | "yaml" | "json5" | "xml" | "toml";
 export type ReadExpectType = "always" | "string" | "none";
+export type PostFileParts = (File | FormDataPart)[];
 export type DataEncodedResult<T extends { encoding?: BufferEncoding }> = T extends { encoding: BufferEncoding } ? string : Bufferable | null;
 export type DataObjectResult<T extends { format?: unknown; encoding?: BufferEncoding }> = T extends { format: string | PlainObject } ? object | null : DataEncodedResult<T>;
 export type StatusOnCallback = (code: number, headers: IncomingHttpHeaders, url?: URL) => boolean | void;

package/lib/settings.d.ts

@@ -1,4 +1,4 @@
-import type { WatchInterval } from './squared';
+import type { ExpiresAction, WatchInterval } from './squared';
 
 import type { HashAlgorithm } from './asset';
 import type { CloudSource } from './cloud';
@@ -74,20 +74,18 @@ export interface ProcessModule<T = PlainObject> extends HandlerSettings<T> {
         };
         queue?: {
             limit?: number | string;
-            expires?: number | string;
             priority: { bypass?: number | string } & MinMax<number | string>;
-        };
+        } & ExpiresAction;
         worker?: {
             users?: boolean | string[];
             max?: number | string;
             max_expires?: number | string;
             locked?: boolean;
-            channel?: MinMax<number | string> & { expires?: number | string; verbose?: boolean };
+            channel?: MinMax<number | string> & ExpiresAction & { verbose?: boolean };
         };
         limit?: number | string;
         sub_limit?: number | string;
-        expires?: number | string;
-    };
+    } & ExpiresAction;
     cipher?: CipherConfig;
     password?: string;
 }
@@ -114,8 +112,7 @@ export interface PermissionSettings extends PlainObject {
     minimatch?: MinimatchOptions | null;
 }
 
-export interface DownloadModule<T = PlainObject> extends HandlerSettings<T> {
-    expires?: number | string;
+export interface DownloadModule<T = PlainObject> extends HandlerSettings<T>, ExpiresAction {
     aria2?: DownloadAction & {
         check_integrity?: boolean;
         update_status?: number | string | { interval?: number | string; broadcast_only?: boolean };
@@ -233,7 +230,7 @@ export interface DocumentDirectory extends StringMap {
 export type DocumentComponentOptions = DocumentComponent<DocumentComponentOption<DocumentTransform>, DocumentComponentOption<boolean>>;
 
 export interface ClientDbSettings<T = PlainObject> extends ClientSettings<T>, PurgeAction {
-    session_expires?: number;
+    session_expires?: number | string;
     user_key?: ObjectMap<DbSourceOptions>;
     imports?: StringMap;
 }
@@ -246,13 +243,13 @@ export interface MemorySettings extends PlainObject {
         file_count?: boolean;
     };
     cache_disk?: MemoryCacheDiskSettings;
+    gc?: { interval?: number | string; expires_limit?: number | string } & ExpiresAction;
 }
 
-export interface MemoryCacheDiskSettings<T = number | string, U = string[] | null> extends IncludeAction<U> {
+export interface MemoryCacheDiskSettings<T = number | string, U = string[] | null> extends IncludeAction<U>, ExpiresAction<T> {
     enabled?: boolean;
     min_size?: T;
     max_size?: T;
-    expires?: T;
 }
 
 export interface DbModule<T = DbSettings> extends ClientModule<T>, DbSourceDataType<ObjectMap<AnyObject>>, PlainObject {
@@ -282,6 +279,7 @@ export interface DbCoerceSettings<T = boolean> {
 
 export interface PurgeBase<T = number | string> extends MinMax {
     enabled?: boolean;
+    type?: "lru" | "lfu";
     percent?: T;
     limit?: T;
 }
@@ -504,10 +502,9 @@ export interface HttpSettings {
     certs?: ObjectMap<SecureConfig<string | string[]>>;
 }
 
-export interface HttpDiskSettings extends IncludeAction {
+export interface HttpDiskSettings extends IncludeAction, ExpiresAction {
     enabled?: boolean;
     limit?: number | string;
-    expires?: number | string;
 }
 
 export interface HttpMemorySettings extends HttpDiskSettings {
@@ -524,17 +521,15 @@ export interface HttpConnectSettings {
     redirect_limit?: number | string;
 }
 
-export interface DnsLookupSettings {
+export interface DnsLookupSettings extends ExpiresAction {
     family?: number | string;
-    expires?: number | string;
     resolve?: ObjectMap<Partial<LookupAddress>>;
 }
 
-export interface HashConfig extends IncludeAction<ObjectMap<string[] | "*">> {
+export interface HashConfig extends IncludeAction<ObjectMap<string[] | "*">>, ExpiresAction {
     enabled?: boolean;
     algorithm?: HashAlgorithm;
     etag?: boolean;
-    expires?: number | string;
     renew?: boolean;
     limit?: number | string;
 }
@@ -552,10 +547,9 @@ export interface PurgeAction {
     purge?: PurgeComponent;
 }
 
-export interface CacheDirAction {
+export interface CacheDirAction extends ExpiresAction {
     enabled?: boolean;
     dir?: string;
-    expires?: number | string;
 }
 
 export interface PoolConfig<T = number> extends MinMax {

package/lib/squared.d.ts

@@ -149,6 +149,10 @@ export interface FromAction {
     from?: string[];
 }
 
+export interface ExpiresAction<T = number | string> {
+    expires?: T;
+}
+
 export interface TaskCommand<T = PlainObject> {
     handler?: string;
     task?: string | T;
@@ -204,11 +208,10 @@ export interface LocationUri {
     filename: string;
 }
 
-export interface ViewEngine<T = unknown, U = PlainObject> {
+export interface ViewEngine<T = unknown, U = PlainObject> extends ExpiresAction {
     name?: string;
     singleRow?: boolean;
     outputEmpty?: boolean;
-    expires?: number | string;
     options?: {
         compile?: T;
         output?: U;
@@ -323,9 +326,8 @@ export interface ResponseError {
     hint?: string;
 }
 
-export interface RequestObserve extends WebSocketClient {
+export interface RequestObserve extends WebSocketClient, ExpiresAction {
     action?: string;
-    expires?: number | string;
 }
 
 export interface ChecksumBase<T = BinaryToTextEncoding> {
@@ -342,10 +344,9 @@ export interface ChecksumOutput<T = BinaryToTextEncoding> extends ChecksumBase<T
     recursive?: boolean | 1;
 }
 
-export interface TaskBase {
+export interface TaskBase extends ExpiresAction {
     interval?: number | string;
     start?: number | string;
-    expires?: number | string;
 }
 
 export type WebSocketEvent = "close" | "error";

package/package.json

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