lack 1.3.1 → 1.3.4

package/assets/ts/src/types/base.d.ts

@@ -5,11 +5,11 @@ import { ParsedUrlQuery } from 'querystring';
 import { Socket } from 'net';
 
 declare global {
- namespace WhistleBase {
-   class Request extends IncomingMessage {}
-   class Response extends ServerResponse {}
-   class HttpServer extends Server {}
-   class Socks extends Socket {}
-   type UrlQuery = ParsedUrlQuery;
- }
+  namespace WhistleBase {
+    class Request extends IncomingMessage {}
+    class Response extends ServerResponse {}
+    class HttpServer extends Server {}
+    class Socks extends Socket {}
+    type UrlQuery = ParsedUrlQuery;
+  }
 }

package/assets/ts/src/types/global.d.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/triple-slash-reference, @typescript-eslint/naming-convention */
+
 /// <reference path="base.d.ts" />
 
 declare module 'koa-onerror';
@@ -6,42 +8,42 @@ declare namespace Whistle {
   type Body = string | false;
 
   interface LRUOptions<K = any, V = any> {
-   max?: number;
-   maxAge?: number;
-   length?(value: V, key?: K): number;
-   dispose?(key: K, value: V): void;
-   stale?: boolean;
-   noDisposeOnSet?: boolean;
- }
+    max?: number;
+    maxAge?: number;
+    length?(value: V, key?: K): number;
+    dispose?(key: K, value: V): void;
+    stale?: boolean;
+    noDisposeOnSet?: boolean;
+  }
 
- interface LRUEntry<K, V> {
-   k: K;
-   v: V;
-   e: number;
- }
+  interface LRUEntry<K, V> {
+    k: K;
+    v: V;
+    e: number;
+  }
 
- interface LRUCache<K = any, V = any> {
-   new (options?: LRUOptions<K, V>): this;
-   readonly length: number;
-   readonly itemCount: number;
-   allowStale: boolean;
-   lengthCalculator(value: V): number;
-   max: number;
-   maxAge: number;
-   set(key: K, value: V, maxAge?: number): boolean;
-   get(key: K): V;
-   peek(key: K): V;
-   has(key: K): boolean;
-   del(key: K): void;
-   reset(): void;
-   prune(): void;
-   forEach<T = this>(callbackFn: (this: T, value: V, key: K, cache: this) => void, thisArg?: T): void;
-   rforEach<T = this>(callbackFn: (this: T, value: V, key: K, cache: this) => void, thisArg?: T): void;
-   keys(): K[];
-   values(): V[];
-   dump(): Array<LRUEntry<K, V>>;
-   load(cacheEntries: ReadonlyArray<LRUEntry<K, V>>): void;
- }
+  interface LRUCache<K = any, V = any> {
+    new (options?: LRUOptions<K, V>): this;
+    readonly length: number;
+    readonly itemCount: number;
+    allowStale: boolean;
+    lengthCalculator(value: V): number;
+    max: number;
+    maxAge: number;
+    set(key: K, value: V, maxAge?: number): boolean;
+    get(key: K): V;
+    peek(key: K): V;
+    has(key: K): boolean;
+    del(key: K): void;
+    reset(): void;
+    prune(): void;
+    forEach<T = this>(callbackFn: (this: T, value: V, key: K, cache: this) => void, thisArg?: T): void;
+    rforEach<T = this>(callbackFn: (this: T, value: V, key: K, cache: this) => void, thisArg?: T): void;
+    keys(): K[];
+    values(): V[];
+    dump(): Array<LRUEntry<K, V>>;
+    load(cacheEntries: ReadonlyArray<LRUEntry<K, V>>): void;
+  }
 
   interface Frame {
     reqId: string;
@@ -266,6 +268,7 @@ declare namespace Whistle {
       commonName: string;
       realUrl: string;
       relativeUrl: string;
+      extraUrl: string;
       method: string;
       clientPort: string;
       globalValue: string;
@@ -303,10 +306,10 @@ declare namespace Whistle {
   }
 
   class PluginServerSocket extends WhistleBase.Socks {
-   setReqRules: SetRules;
-   setResRules: SetRules;
-   disableTrailers?: boolean;
- }
+    setReqRules: SetRules;
+    setResRules: SetRules;
+    disableTrailers?: boolean;
+  }
   class PluginUIRequest extends WhistleBase.Request {
     clientIp: string;
     Storage: Storage;

package/bin/watch.js

@@ -9,7 +9,7 @@ const touch = () => {
 };
 
 module.exports = (dirs) => {
-  const watchList = ['index.js', 'rules.txt', '_rules.txt', 'reqRules.txt', 'resRules.txt', 'lib'];
+  const watchList = ['index.js', 'rules.txt', '_rules.txt', 'reqRules.txt', 'resRules.txt', 'lib', 'dist'];
   if (dirs && typeof dirs === 'string') {
     dirs.split(',').forEach((dir) => {
       dir = dir.trim();
@@ -19,7 +19,7 @@ module.exports = (dirs) => {
     });
   }
   let timer;
-  console.log(`Watching: ${watchList.join()}`); // eslint-disable-line
+  console.log(`Watching the following files/folders changes:\n${watchList.join('\n')}\n`); // eslint-disable-line
   chokidar.watch(watchList, {
     ignored: /(^|[/\\])(\..|node_modules([/\\]|$))/,
   }).on('raw', (_, filename) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lack",
-  "version": "1.3.1",
+  "version": "1.3.4",
   "description": "whistle extension tools",
   "author": "avenwu <avwu@qq.com>",
   "license": "MIT",