@lcap/nasl 3.2.0-beta.3 → 3.3.0-alpha

package/src/common/Messager.ts

@@ -1,39 +1,39 @@
 import { v4 as uuidv4 } from 'uuid';
 
 export interface Message {
-    id?: string;
-    protocol: string;
-    sender: string;
-    type: 'send' | 'request' | 'response';
-    command?: string;
-    args?: Array<any>;
-    data?: any;
-    result?: any;
-    error?: any;
-    res?: (value: unknown) => void;
-    rej?: (value: unknown) => void;
-    [prop: string]: any;
+  id?: string;
+  protocol: string;
+  sender: string;
+  type: 'send' | 'request' | 'response';
+  command?: string;
+  args?: Array<any>;
+  data?: any;
+  result?: any;
+  error?: any;
+  res?: (value: unknown) => void;
+  rej?: (value: unknown) => void;
+  [prop: string]: any;
 }
 
 export interface Options {
-    protocol?: string;
-    sender?: string;
-    logLevel?: string;
-    timeout?: number;
-    onlySend?: boolean;
-    context: any;
-    /**
-     * 获取目标 Window
-     * @example iframe.contentWindow
-     * @example window.parent
-     */
-    getSender?: () => Window | Worker;
-    getReceiver?: () => Window | Worker;
-    /**
-     * 处理接收的数据
-     * @override
-     */
-    handleMessage?: (message: Message) => void;
+  protocol?: string;
+  sender?: string;
+  logLevel?: string;
+  timeout?: number;
+  onlySend?: boolean;
+  context: any;
+  /**
+   * 获取目标 Window
+   * @example iframe.contentWindow
+   * @example window.parent
+   */
+  getSender?: () => Window | Worker;
+  getReceiver?: () => Window | Worker;
+  /**
+   * 处理接收的数据
+   * @override
+   */
+  handleMessage?: (message: Message) => void;
 }
 
 /**
@@ -41,206 +41,205 @@ export interface Options {
  * 除了基本的发送消息，提供了如命令式等更多方法
  */
 export default class Messager {
-    options: Options;
-    requests: Map<string, Message>;
-    constructor(options: Options) {
-        this.options = Object.assign({
-            protocol: 'vusion',
-            sender: 'platform',
-            logLevel: 'info',
-            timeout: 30000,
-            onlySend: false,
-            getSender() {
-                return window.parent;
-            },
-            getReceiver() {
-                return window;
-            },
-            handleMessage(message: any) {
-                // handle
-            },
-        }, options);
-        this.requests = new Map();
-
-        this.onMessageReceived = this.onMessageReceived.bind(this);
-        this.onDataReceived = this.onDataReceived.bind(this);
-        if (!this.options.onlySend) {
-            const receiver = this.options.getReceiver.call(this.options.context);
-            if (receiver.addEventListener)
-                receiver.addEventListener('message', this.onMessageReceived);
-            else if (receiver.addListener)
-                receiver.addListener('message', this.onDataReceived);
-        }
-    }
+  options: Options;
 
-    destroy() {
-        if (!this.options.onlySend) {
-            const receiver = this.options.getReceiver.call(this.options.context);
-            if (receiver.removeEventListener)
-                receiver.removeEventListener('message', this.onMessageReceived);
-            else if (receiver.addListener)
-                receiver.removeListener('message', this.onDataReceived);
-        }
-    }
+  requests: Map<string, Message>;
 
-    /**
-     * 发送信息
-     * 所有下面方法的基础方法
-     * 比较原生，直接给目标 window 中 postMessage
-     */
-    sendMessage(message: Message) {
-        const logLevel = message.logLevel || this.options.logLevel;
-        if (logLevel === 'info') {
-            const str = JSON.stringify(message);
-            // console.info(`[messager]`, str);
-        }
-
-        const sender = this.options.getSender.call(this.options.context) as Window | Worker;
-        if (typeof window !== 'undefined' && sender instanceof Window)
-            sender.postMessage(message, '*');
-        else
-            sender.postMessage(message);
-    }
-    /**
-     * 发送数据
-     * 包装了协议和发送者。Window 的 message 可能来自不同地方，统一格式区分。
-     * @param data 数据
-     */
-    sendData(data: any) {
-        return this.sendMessage({
-            protocol: this.options.protocol,
-            sender: this.options.sender,
-            type: 'send',
-            data,
-        });
-    }
-    /**
-     * 发送命令
-     * 直接发送一个命令
-     * 包装了协议和发送者。Window 的 message 可能来自不同地方，统一格式区分。
-     * @param command 命令名
-     * @param args 参数
-     */
-    sendCommand(command: string, ...args: any[]) {
-        return this.sendMessage({
-            protocol: this.options.protocol,
-            sender: this.options.sender,
-            type: 'send',
-            command,
-            args,
-        });
+  constructor(options: Options) {
+    this.options = {
+      protocol: 'vusion',
+      sender: 'platform',
+      logLevel: 'info',
+      timeout: 30000,
+      onlySend: false,
+      getSender() {
+        return window.parent;
+      },
+      getReceiver() {
+        return window;
+      },
+      handleMessage(message: any) {
+        // handle
+      },
+      ...options,
+    };
+    this.requests = new Map();
+
+    this.onMessageReceived = this.onMessageReceived.bind(this);
+    this.onDataReceived = this.onDataReceived.bind(this);
+    if (!this.options.onlySend) {
+      const receiver = this.options.getReceiver.call(this.options.context);
+      if (receiver.addEventListener) receiver.addEventListener('message', this.onMessageReceived);
+      else if (receiver.addListener) receiver.addListener('message', this.onDataReceived);
     }
-    /**
-     * 请求信息
-     * 与 send 系列的区别是接收返回数据
-     */
-    requestMessage(message: Message, options?: { id?: string | number }) {
-        if (options) {
-            Object.assign(message, options);
-        }
-
-        this.sendMessage(message);
-        return new Promise((res, rej) => {
-            this.requests.set(message.id, Object.assign({ res, rej }, message));
-            setTimeout(() => {
-                this.requests.delete(message.id);
-                rej(Object.assign({ error: 'Timeout' }, message));
-            }, this.options.timeout || 2000);
-        });
+  }
+
+  destroy() {
+    if (!this.options.onlySend) {
+      const receiver = this.options.getReceiver.call(this.options.context);
+      if (receiver.removeEventListener) receiver.removeEventListener('message', this.onMessageReceived);
+      else if (receiver.addListener) receiver.removeListener('message', this.onDataReceived);
     }
-    /**
-     * 请求数据
-     * 与 sendData 系列的区别是接收返回数据
-     */
-    requestData(data: any) {
-        const message: Message = {
-            id: uuidv4(), // 必须要用 uuid，不能用 +new Date
-            protocol: this.options.protocol,
-            sender: this.options.sender,
-            type: 'request',
-            data,
-        };
-        return this.requestMessage(message);
+  }
+
+  /**
+   * 发送信息
+   * 所有下面方法的基础方法
+   * 比较原生，直接给目标 window 中 postMessage
+   */
+  sendMessage(message: Message) {
+    const logLevel = message.logLevel || this.options.logLevel;
+    if (logLevel === 'info') {
+      const str = JSON.stringify(message);
+      // console.info(`[messager]`, str);
     }
-    /**
-     * 请求命令
-     * 与 sendCommand 系列的区别是接收返回数据
-     */
-    requestCommand(command: string, ...args: any[]) {
-        const message: Message = {
-            id: uuidv4(), // 必须要用 uuid，不能用 +new Date
-            protocol: this.options.protocol,
-            sender: this.options.sender,
-            type: 'request',
-            command,
-            args,
-        };
-        return this.requestMessage(message);
+
+    const sender = this.options.getSender.call(this.options.context) as Window | Worker;
+    if (typeof window !== 'undefined' && sender instanceof Window) sender.postMessage(message, '*');
+    else sender.postMessage(message);
+  }
+
+  /**
+   * 发送数据
+   * 包装了协议和发送者。Window 的 message 可能来自不同地方，统一格式区分。
+   * @param data 数据
+   */
+  sendData(data: any) {
+    return this.sendMessage({
+      protocol: this.options.protocol,
+      sender: this.options.sender,
+      type: 'send',
+      data,
+    });
+  }
+
+  /**
+   * 发送命令
+   * 直接发送一个命令
+   * 包装了协议和发送者。Window 的 message 可能来自不同地方，统一格式区分。
+   * @param command 命令名
+   * @param args 参数
+   */
+  sendCommand(command: string, ...args: any[]) {
+    return this.sendMessage({
+      protocol: this.options.protocol,
+      sender: this.options.sender,
+      type: 'send',
+      command,
+      args,
+    });
+  }
+
+  /**
+   * 请求信息
+   * 与 send 系列的区别是接收返回数据
+   */
+  requestMessage(message: Message, options?: { id?: string | number }) {
+    if (options) {
+      Object.assign(message, options);
     }
-    /**
-     * 内置处理接收的 MessageEvent 事件
-     * @override
-     */
-    onMessageReceived(e: MessageEvent) {
-        if (!e.data)
-            return;
-        this.onDataReceived(e.data);
+
+    this.sendMessage(message);
+    return new Promise<any>((res, rej) => {
+      this.requests.set(message.id, { res, rej, ...message });
+      setTimeout(() => {
+        this.requests.delete(message.id);
+        rej({ error: 'Timeout', ...message });
+      }, this.options.timeout || 2000);
+    });
+  }
+
+  /**
+   * 请求数据
+   * 与 sendData 系列的区别是接收返回数据
+   */
+  requestData(data: any) {
+    const message: Message = {
+      id: uuidv4(), // 必须要用 uuid，不能用 +new Date
+      protocol: this.options.protocol,
+      sender: this.options.sender,
+      type: 'request',
+      data,
+    };
+    return this.requestMessage(message);
+  }
+
+  /**
+   * 请求命令
+   * 与 sendCommand 系列的区别是接收返回数据
+   */
+  requestCommand<T = void>(command: string, ...args: any[]): Promise<T> {
+    const message: Message = {
+      id: uuidv4(), // 必须要用 uuid，不能用 +new Date
+      protocol: this.options.protocol,
+      sender: this.options.sender,
+      type: 'request',
+      command,
+      args,
+    };
+    return this.requestMessage(message) as Promise<T>;
+  }
+
+  /**
+   * 内置处理接收的 MessageEvent 事件
+   * @override
+   */
+  onMessageReceived(e: MessageEvent) {
+    if (!e.data) return;
+    this.onDataReceived(e.data);
+  }
+
+  /**
+   * 内置处理接收的数据
+   * @override
+   */
+  onDataReceived(data: any) {
+    // console.log('nasl onDataReceived: ', data);
+    if (data.protocol !== this.options.protocol) return;
+    if (data.type === 'response') {
+      const message = this.requests.get(data.id);
+      if (message) {
+        message.error ? message.rej(data.error) : message.res(data.result);
+      }
+      return;
     }
-    /**
-     * 内置处理接收的数据
-     * @override
-     */
-    onDataReceived(data: any) {
-        // console.log('nasl onDataReceived: ', data);
-        if (data.protocol !== this.options.protocol)
-            return;
-        if (data.type === 'response') {
-            const message = this.requests.get(data.id);
-            if (message) {
-                message.error ? message.rej(data.error) : message.res(data.result);
-            }
-            return;
-        }
-        if (data.command) {
-            const func = this.options.context[data.command];
-            if (!func)
-                // 函数不存在时不 response
-                return;
-
-            let res: any;
-            if (typeof func === 'function')
-                res = func.call(this.options.context, ...data.args, data.id);
-            else
-                res = func;
-            if (data.type === 'request') {
-                return Promise.resolve(res)
-                    .then((result) => {
-                        this.sendMessage({
-                            id: data.id,
-                            protocol: this.options.protocol,
-                            sender: this.options.sender,
-                            logLevel: data.logLevel,
-                            type: 'response',
-                            command: data.command,
-                            result,
-                        });
-                    })
-                    .catch((error) => {
-                        console.error(error);
-                        this.sendMessage({
-                            id: data.id,
-                            protocol: this.options.protocol,
-                            sender: this.options.sender,
-                            logLevel: data.logLevel,
-                            type: 'response',
-                            command: data.command,
-                            error,
-                        });
-                    });
-            } else {
-                return;
-            }
-        }
-        this.options.handleMessage(data);
+    if (data.command) {
+      const func = this.options.context[data.command];
+      if (!func)
+        // 函数不存在时不 response
+        return;
+
+      let res: any;
+      if (typeof func === 'function') res = func.call(this.options.context, ...data.args, data.id);
+      else res = func;
+      if (data.type === 'request') {
+        return Promise.resolve(res)
+          .then((result) => {
+            this.sendMessage({
+              id: data.id,
+              protocol: this.options.protocol,
+              sender: this.options.sender,
+              logLevel: data.logLevel,
+              type: 'response',
+              command: data.command,
+              result,
+            });
+          })
+          .catch((error) => {
+            console.error(error);
+            this.sendMessage({
+              id: data.id,
+              protocol: this.options.protocol,
+              sender: this.options.sender,
+              logLevel: data.logLevel,
+              type: 'response',
+              command: data.command,
+              error,
+            });
+          });
+      }
+      return;
     }
+    this.options.handleMessage(data);
+  }
 }

package/src/common/asyncFuncMap.ts

@@ -1,14 +1,14 @@
-const asyncFuncMap:Record<string, string> = {
-    ListSort: 'ListSortAsync', 
-    ListFind: 'ListFindAsync',
-    ListFilter: 'ListFilterAsync',
-    ListFindIndex: 'ListFindIndexAsync',
-    ListDistinctBy: 'ListDistinctByAsync', 
-    ListGroupBy: 'ListGroupByAsync',
-    ListTransform: 'ListTransformAsync',
-    MapFilter: 'MapFilterAsync',
-    MapTransform: 'MapTransformAsync',
-    ListToMap: 'ListToMapAsync', 
+const asyncFuncMap: Record<string, string> = {
+  ListSort: 'ListSortAsync',
+  ListFind: 'ListFindAsync',
+  ListFilter: 'ListFilterAsync',
+  ListFindIndex: 'ListFindIndexAsync',
+  ListDistinctBy: 'ListDistinctByAsync',
+  ListGroupBy: 'ListGroupByAsync',
+  ListTransform: 'ListTransformAsync',
+  MapFilter: 'MapFilterAsync',
+  MapTransform: 'MapTransformAsync',
+  ListToMap: 'ListToMapAsync',
 };
 
-export default asyncFuncMap;
+export default asyncFuncMap;

package/src/concepts/Abort__.ts

@@ -1,13 +1,13 @@
+import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, indent } from '../translator';
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
-import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
@@ -17,74 +17,67 @@ import LogicItem from './LogicItem__';
  */
 @concept('中止表达式')
 export class Abort extends LogicItem {
-    /**
-     * 产品概念
-     */
-    @property()
-    concept: 'Abort' = 'Abort';
-
-    /**
-     * 中止表达式标题
-     */
-    @property()
-    label: string = '中止表达式';
-
-    
-
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source?: Partial<Abort>) {
-        source = Object.assign({}, Abort.getDefaultOptions(), source);
-        super(source);
-        super.subConstructor(source);
-    }
-    getClassName() {
-        return 'Abort';
-    }
+  /**
+   * 产品概念
+   */
+  @property()
+  concept: 'Abort' = 'Abort';
 
-    static from(source: any, parentNode?: any, parentKey?: string): Abort {
-        return super.from(source, parentNode, parentKey) as Abort;
-    }
+  /**
+   * 中止表达式标题
+   */
+  @property()
+  label: string = '中止表达式';
 
-    
-    
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<Abort>) {
+    // @ts-ignore
+    source = { ...Abort.getDefaultOptions(), ...source };
+    super(source);
+    super.subConstructor(source);
+  }
 
-    
+  getClassName() {
+    return 'Abort';
+  }
 
-    
+  static from(source: any, parentNode?: any, parentKey?: string): Abort {
+    return super.from(source, parentNode, parentKey) as Abort;
+  }
 
-    //================================================================================
-    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-    // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
-    toUI(): string {
-        return '中止';
-    }
+  //= ===============================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //= ===============================================================================
+  toUI(): string {
+    return '中止';
+  }
 
-    toJS(state?: TranslatorState): string {
-        const code = `throw Error('程序中止');`;
-        return code;
-    }
+  toJS(state?: TranslatorState): string {
+    const code = `throw Error('程序中止');`;
+    return code;
+  }
 
-    toEmbeddedTS(state?: TranslatorState): string {
-        let code = '';
-        // 中止放入表达式中，处理翻译就跳过
-        // 别的就增加一个 return;
-        if (this.parentNode?.concept !== 'MatchCase') {
-            code += 'return;';
-        }
-        return code;
+  toEmbeddedTS(state?: TranslatorState): string {
+    let code = '';
+    // 中止放入表达式中，处理翻译就跳过
+    // 别的就增加一个 return;
+    if (this.parentNode?.concept !== 'MatchCase') {
+      code += 'return;';
     }
-    //================================================================================
-    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
-    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-    //================================================================================
+    return code;
+  }
+  //= ===============================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //= ===============================================================================
 }
 
 classMap.Abort = Abort;
 export default Abort;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================