@aeternity/aepp-sdk 13.0.0-alpha.0 → 13.0.0-alpha.1

package/es/channel/internal.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"internal.mjs","names":["JsonBig","pascalToSnake","ChannelCallError","ChannelPingTimedOutError","UnexpectedTsError","UnknownChannelStateError","ChannelIncomingMessageError","ChannelError","PING_TIMEOUT_MS","PONG_TIMEOUT_MS","emit","channel","args","eventName","rest","_eventEmitter","enterState","nextState","_fsm","handler","enter","dequeueAction","changeStatus","newStatus","_status","changeState","newState","_state","send","message","_options","debug","console","log","_websocket","stringify","jsonrpc","notify","method","params","_isActionQueueLocked","queue","_actionQueue","length","index","findIndex","action","guard","filter","_","i","enqueueAction","promise","Promise","resolve","reject","push","res","state","handleMessage","st","dequeueMessage","_isMessageQueueLocked","_messageQueue","shift","error","disconnect","close","clearTimeout","_pingTimeoutId","ping","setTimeout","onMessage","data","parse","id","callback","_rpcCallbacks","get","delete","channel_id","_channelId","call","_nextRpcMessageId","set","details","result","initialize","connectionHandler","openHandler","url","channelOptions","wsUrl","URL","Object","entries","key","includes","forEach","value","searchParams","toString","W3CWebSocket","assign","onerror","onopen","reconnectTx","signedTx","signed_tx","onclose","onmessage"],"sources":["../../src/channel/internal.ts"],"sourcesContent":["/*\n * ISC License (ISC)\n * Copyright (c) 2018 aeternity developers\n *\n *  Permission to use, copy, modify, and/or distribute this software for any\n *  purpose with or without fee is hereby granted, provided that the above\n *  copyright notice and this permission notice appear in all copies.\n *\n *  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\n *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n *  PERFORMANCE OF THIS SOFTWARE.\n */\n\nimport { w3cwebsocket as W3CWebSocket } from 'websocket';\nimport BigNumber from 'bignumber.js';\nimport type Channel from './Base';\nimport JsonBig from '../utils/json-big';\nimport { pascalToSnake } from '../utils/string';\nimport { Encoded } from '../utils/encoder';\nimport {\n  BaseError,\n  ChannelCallError,\n  ChannelPingTimedOutError,\n  UnexpectedTsError,\n  UnknownChannelStateError,\n  ChannelIncomingMessageError,\n  ChannelError,\n} from '../utils/errors';\n\nexport interface ChannelAction {\n  guard: (channel: Channel, state?: ChannelFsm) => boolean;\n  action: (channel: Channel, state?: ChannelFsm) => ChannelFsm;\n}\n\ninterface SignOptions {\n  updates?: any[];\n  [k: string]: any;\n}\nexport type SignTxWithTag = (tag: string, tx: Encoded.Transaction, options?: SignOptions) => (\n  Promise<Encoded.Transaction>\n);\n// TODO: SignTx shouldn't return number or null\nexport type SignTx = (tx: Encoded.Transaction, options?: SignOptions) => (\n  Promise<Encoded.Transaction | number | null>\n);\n\nexport interface ChannelOptions {\n  existingFsmId?: Encoded.Bytearray;\n  url: string;\n\n  /**\n   * @see {@link https://github.com/aeternity/protocol/blob/6734de2e4c7cce7e5e626caa8305fb535785131d/node/api/channels_api_usage.md#channel-establishing-parameters}\n   */\n  initiatorId: Encoded.AccountAddress;\n  responderId: Encoded.AccountAddress;\n  lockPeriod: number;\n  pushAmount: number;\n  initiatorAmount: BigNumber;\n  responderAmount: BigNumber;\n  channelReserve?: BigNumber | number;\n  ttl?: number;\n  host: string;\n  port: number;\n  role: 'initiator' | 'responder';\n  minimumDepthStrategy?: 'txfee' | 'plain';\n  minimumDepth?: number;\n  fee?: BigNumber | number;\n  gasPrice?: BigNumber | number;\n\n  signedTx?: string;\n  existingChannelId?: string;\n  offChainTx?: string;\n  reconnectTx?: string;\n  timeoutIdle?: number;\n  timeoutFundingCreate?: number;\n  timeoutFundingSign?: number;\n  timeoutFundingLock?: number;\n  timeoutSign?: number;\n  timeoutAccept?: number;\n  timeoutInitialized?: number;\n  timeoutAwaitingOpen?: number;\n  statePassword?: string;\n  debug: boolean;\n  sign: SignTxWithTag;\n  offchainTx?: string;\n}\n\nexport interface ChannelHandler extends Function {\n  enter?: Function;\n}\n\nexport interface ChannelState {\n  signedTx: Encoded.Transaction;\n  resolve: (r?: any) => void;\n  reject: (e: BaseError) => void;\n  sign: SignTx;\n  handler?: ChannelHandler;\n  onOnChainTx?: (tx: Encoded.Transaction) => void;\n  onOwnWithdrawLocked?: () => void;\n  onWithdrawLocked?: () => void;\n  onOwnDepositLocked?: () => void;\n  onDepositLocked?: () => void;\n  closeTx?: string;\n}\n\nexport interface ChannelFsm {\n  handler: ChannelHandler;\n  state?: ChannelState | {\n    resolve: Function;\n    reject: Function;\n  };\n}\n\nexport interface ChannelMessage {\n  id?: number;\n  method: string;\n  params: any;\n  payload?: any;\n  data?: any;\n  error?: ChannelMessageError;\n}\n\ninterface ChannelMessageError {\n  code: number;\n  message: string;\n  data: [{\n    message: string;\n    code: number;\n  }];\n  request: ChannelMessage;\n}\n\n// Send ping message every 10 seconds\nconst PING_TIMEOUT_MS = 10000;\n// Close connection if pong message is not received within 15 seconds\nconst PONG_TIMEOUT_MS = 15000;\n\nexport function emit(channel: Channel, ...args: any[]): void {\n  const [eventName, ...rest] = args;\n  channel._eventEmitter.emit(eventName, ...rest);\n}\n\nfunction enterState(channel: Channel, nextState: ChannelFsm): void {\n  if (nextState == null) {\n    throw new UnknownChannelStateError();\n  }\n  channel._fsm = nextState;\n  if (nextState?.handler?.enter != null) {\n    nextState.handler.enter(channel);\n  }\n  // eslint-disable-next-line @typescript-eslint/no-use-before-define\n  void dequeueAction(channel);\n}\n\n// TODO: rewrite to enum\nexport type ChannelStatus = 'connecting' | 'connected' | 'accepted' | 'halfSigned' | 'signed'\n| 'open' | 'closing' | 'closed' | 'died' | 'disconnected';\n\nexport function changeStatus(channel: Channel, newStatus: ChannelStatus): void {\n  if (newStatus === channel._status) return;\n  channel._status = newStatus;\n  emit(channel, 'statusChanged', newStatus);\n}\n\nexport function changeState(channel: Channel, newState: Encoded.Transaction): void {\n  channel._state = newState;\n  emit(channel, 'stateChanged', newState);\n}\n\nfunction send(channel: Channel, message: ChannelMessage): void {\n  if (channel._options.debug) console.log('Send message: ', message);\n  channel._websocket.send(JsonBig.stringify({ jsonrpc: '2.0', ...message }));\n}\n\nexport function notify(channel: Channel, method: string, params: object = {}): void {\n  send(channel, { method, params });\n}\n\nasync function dequeueAction(channel: Channel): Promise<void> {\n  if (channel._isActionQueueLocked) return;\n  const queue = channel._actionQueue;\n  if (queue.length === 0) return;\n  const index = queue.findIndex((action) => action.guard(channel, channel._fsm));\n  if (index === -1) return;\n  channel._actionQueue = queue.filter((_, i) => index !== i);\n  channel._isActionQueueLocked = true;\n  const nextState: ChannelFsm = await queue[index].action(channel, channel._fsm);\n  channel._isActionQueueLocked = false;\n  enterState(channel, nextState);\n}\n\nexport async function enqueueAction(\n  channel: Channel,\n  guard: ChannelAction['guard'],\n  action: () => { handler: ChannelHandler; state?: Partial<ChannelState> },\n): Promise<any> {\n  const promise = new Promise((resolve, reject) => {\n    channel._actionQueue.push({\n      guard,\n      action() {\n        const res = action();\n        return { ...res, state: { ...res.state, resolve, reject } };\n      },\n    });\n  });\n  void dequeueAction(channel);\n  return promise;\n}\n\nasync function handleMessage(channel: Channel, message: object): Promise<void> {\n  const { handler, state: st } = channel._fsm;\n  enterState(channel, await Promise.resolve(handler(channel, message, st)));\n}\n\nasync function dequeueMessage(channel: Channel): Promise<void> {\n  if (channel._isMessageQueueLocked) return;\n  channel._isMessageQueueLocked = true;\n  while (channel._messageQueue.length > 0) {\n    const message = channel._messageQueue.shift();\n    if (message == null) throw new UnexpectedTsError();\n    try {\n      await handleMessage(channel, message);\n    } catch (error) {\n      emit(channel, 'error', new ChannelIncomingMessageError(error, message));\n    }\n  }\n  channel._isMessageQueueLocked = false;\n}\n\nexport function disconnect(channel: Channel): void {\n  channel._websocket.close();\n  clearTimeout(channel._pingTimeoutId);\n}\n\nfunction ping(channel: Channel): void {\n  clearTimeout(channel._pingTimeoutId);\n  channel._pingTimeoutId = setTimeout(() => {\n    notify(channel, 'channels.system', { action: 'ping' });\n    channel._pingTimeoutId = setTimeout(() => {\n      disconnect(channel);\n      emit(channel, 'error', new ChannelPingTimedOutError());\n    }, PONG_TIMEOUT_MS);\n  }, PING_TIMEOUT_MS);\n}\n\nfunction onMessage(channel: Channel, data: string): void {\n  const message = JsonBig.parse(data);\n  if (channel._options.debug) console.log('Receive message: ', message);\n  if (message.id != null) {\n    const callback = channel._rpcCallbacks.get(message.id);\n    if (callback == null) {\n      emit(channel, 'error', new ChannelError(`Can't find callback by id: ${message.id}`));\n      return;\n    }\n    try {\n      callback(message);\n    } finally {\n      channel._rpcCallbacks.delete(message.id);\n    }\n    return;\n  }\n  if (message.method === 'channels.message') {\n    emit(channel, 'message', message.params.data.message);\n    return;\n  }\n  if (message.method === 'channels.system.pong') {\n    if (message.params.channel_id === channel._channelId || channel._channelId == null) {\n      ping(channel);\n    }\n    return;\n  }\n  channel._messageQueue.push(message);\n  void dequeueMessage(channel);\n}\n\nexport async function call(channel: Channel, method: string, params: any): Promise<any> {\n  return new Promise((resolve, reject) => {\n    const id = channel._nextRpcMessageId;\n    channel._nextRpcMessageId += 1;\n    channel._rpcCallbacks.set(id, (\n      message: { result: PromiseLike<any>; error?: ChannelMessageError },\n    ) => {\n      if (message.error != null) {\n        const details = message.error.data[0].message ?? '';\n        reject(new ChannelCallError(message.error.message + details));\n      } else resolve(message.result);\n    });\n    send(channel, { method, id, params });\n  });\n}\n\nexport async function initialize(\n  channel: Channel,\n  connectionHandler: Function,\n  openHandler: Function,\n  { url, ...channelOptions }: ChannelOptions,\n): Promise<void> {\n  channel._options = { url, ...channelOptions };\n  channel._fsm = { handler: connectionHandler };\n\n  const wsUrl = new URL(url);\n  Object.entries(channelOptions)\n    .filter(([key]) => !['sign', 'debug'].includes(key))\n    .forEach(([key, value]) => wsUrl.searchParams.set(pascalToSnake(key), value.toString()));\n  wsUrl.searchParams.set('protocol', 'json-rpc');\n  changeStatus(channel, 'connecting');\n  channel._websocket = new W3CWebSocket(wsUrl.toString());\n  await new Promise<void>((resolve, reject) => {\n    Object.assign(channel._websocket, {\n      onerror: reject,\n      onopen: async () => {\n        resolve();\n        changeStatus(channel, 'connected');\n        if (channelOptions.reconnectTx != null) {\n          enterState(channel, { handler: openHandler });\n          const signedTx = (await call(channel, 'channels.get.offchain_state', {})).signed_tx;\n          changeState(channel, signedTx);\n        }\n        ping(channel);\n      },\n      onclose: () => {\n        changeStatus(channel, 'disconnected');\n        clearTimeout(channel._pingTimeoutId);\n      },\n      onmessage: ({ data }: { data: string }) => onMessage(channel, data),\n    });\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"internal.mjs","names":["JsonBig","pascalToSnake","ChannelCallError","ChannelPingTimedOutError","UnexpectedTsError","UnknownChannelStateError","ChannelIncomingMessageError","ChannelError","PING_TIMEOUT_MS","PONG_TIMEOUT_MS","emit","channel","args","eventName","rest","_eventEmitter","enterState","nextState","_fsm","handler","enter","dequeueAction","changeStatus","newStatus","_status","changeState","newState","_state","send","message","_options","debug","console","log","_websocket","stringify","jsonrpc","notify","method","params","_isActionQueueLocked","queue","_actionQueue","length","index","findIndex","action","guard","filter","_","i","enqueueAction","promise","Promise","resolve","reject","push","res","state","handleMessage","st","dequeueMessage","_isMessageQueueLocked","_messageQueue","shift","error","disconnect","close","clearTimeout","_pingTimeoutId","ping","setTimeout","onMessage","data","parse","id","callback","_rpcCallbacks","get","delete","channel_id","_channelId","call","_nextRpcMessageId","set","details","result","initialize","connectionHandler","openHandler","url","channelOptions","wsUrl","URL","Object","entries","key","includes","forEach","value","searchParams","toString","W3CWebSocket","assign","onerror","onopen","reconnectTx","signedTx","onclose","onmessage"],"sources":["../../src/channel/internal.ts"],"sourcesContent":["/*\n * ISC License (ISC)\n * Copyright (c) 2018 aeternity developers\n *\n *  Permission to use, copy, modify, and/or distribute this software for any\n *  purpose with or without fee is hereby granted, provided that the above\n *  copyright notice and this permission notice appear in all copies.\n *\n *  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\n *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n *  PERFORMANCE OF THIS SOFTWARE.\n */\n\nimport { w3cwebsocket as W3CWebSocket } from 'websocket';\nimport BigNumber from 'bignumber.js';\nimport type Channel from './Base';\nimport JsonBig from '../utils/json-big';\nimport { pascalToSnake } from '../utils/string';\nimport { Encoded } from '../utils/encoder';\nimport {\n  BaseError,\n  ChannelCallError,\n  ChannelPingTimedOutError,\n  UnexpectedTsError,\n  UnknownChannelStateError,\n  ChannelIncomingMessageError,\n  ChannelError,\n} from '../utils/errors';\n\nexport interface ChannelAction {\n  guard: (channel: Channel, state?: ChannelFsm) => boolean;\n  action: (channel: Channel, state?: ChannelFsm) => ChannelFsm;\n}\n\ninterface SignOptions {\n  updates?: any[];\n  [k: string]: any;\n}\nexport type SignTxWithTag = (tag: string, tx: Encoded.Transaction, options?: SignOptions) => (\n  Promise<Encoded.Transaction>\n);\n// TODO: SignTx shouldn't return number or null\nexport type SignTx = (tx: Encoded.Transaction, options?: SignOptions) => (\n  Promise<Encoded.Transaction | number | null>\n);\n\nexport interface ChannelOptions {\n  existingFsmId?: Encoded.Bytearray;\n  url: string;\n\n  /**\n   * @see {@link https://github.com/aeternity/protocol/blob/6734de2e4c7cce7e5e626caa8305fb535785131d/node/api/channels_api_usage.md#channel-establishing-parameters}\n   */\n  initiatorId: Encoded.AccountAddress;\n  responderId: Encoded.AccountAddress;\n  lockPeriod: number;\n  pushAmount: number;\n  initiatorAmount: BigNumber;\n  responderAmount: BigNumber;\n  channelReserve?: BigNumber | number;\n  ttl?: number;\n  host: string;\n  port: number;\n  role: 'initiator' | 'responder';\n  minimumDepthStrategy?: 'txfee' | 'plain';\n  minimumDepth?: number;\n  fee?: BigNumber | number;\n  gasPrice?: BigNumber | number;\n\n  signedTx?: string;\n  existingChannelId?: string;\n  offChainTx?: string;\n  reconnectTx?: string;\n  timeoutIdle?: number;\n  timeoutFundingCreate?: number;\n  timeoutFundingSign?: number;\n  timeoutFundingLock?: number;\n  timeoutSign?: number;\n  timeoutAccept?: number;\n  timeoutInitialized?: number;\n  timeoutAwaitingOpen?: number;\n  statePassword?: string;\n  debug: boolean;\n  sign: SignTxWithTag;\n  offchainTx?: string;\n}\n\nexport interface ChannelHandler extends Function {\n  enter?: Function;\n}\n\nexport interface ChannelState {\n  signedTx: Encoded.Transaction;\n  resolve: (r?: any) => void;\n  reject: (e: BaseError) => void;\n  sign: SignTx;\n  handler?: ChannelHandler;\n  onOnChainTx?: (tx: Encoded.Transaction) => void;\n  onOwnWithdrawLocked?: () => void;\n  onWithdrawLocked?: () => void;\n  onOwnDepositLocked?: () => void;\n  onDepositLocked?: () => void;\n  closeTx?: string;\n}\n\nexport interface ChannelFsm {\n  handler: ChannelHandler;\n  state?: ChannelState | {\n    resolve: Function;\n    reject: Function;\n  };\n}\n\nexport interface ChannelMessage {\n  id?: number;\n  method: string;\n  params: any;\n  payload?: any;\n  data?: any;\n  error?: ChannelMessageError;\n}\n\ninterface ChannelMessageError {\n  code: number;\n  message: string;\n  data: [{\n    message: string;\n    code: number;\n  }];\n  request: ChannelMessage;\n}\n\n// Send ping message every 10 seconds\nconst PING_TIMEOUT_MS = 10000;\n// Close connection if pong message is not received within 15 seconds\nconst PONG_TIMEOUT_MS = 15000;\n\nexport function emit(channel: Channel, ...args: any[]): void {\n  const [eventName, ...rest] = args;\n  channel._eventEmitter.emit(eventName, ...rest);\n}\n\nfunction enterState(channel: Channel, nextState: ChannelFsm): void {\n  if (nextState == null) {\n    throw new UnknownChannelStateError();\n  }\n  channel._fsm = nextState;\n  if (nextState?.handler?.enter != null) {\n    nextState.handler.enter(channel);\n  }\n  // eslint-disable-next-line @typescript-eslint/no-use-before-define\n  void dequeueAction(channel);\n}\n\n// TODO: rewrite to enum\nexport type ChannelStatus = 'connecting' | 'connected' | 'accepted' | 'halfSigned' | 'signed'\n| 'open' | 'closing' | 'closed' | 'died' | 'disconnected';\n\nexport function changeStatus(channel: Channel, newStatus: ChannelStatus): void {\n  if (newStatus === channel._status) return;\n  channel._status = newStatus;\n  emit(channel, 'statusChanged', newStatus);\n}\n\nexport function changeState(channel: Channel, newState: Encoded.Transaction): void {\n  channel._state = newState;\n  emit(channel, 'stateChanged', newState);\n}\n\nfunction send(channel: Channel, message: ChannelMessage): void {\n  if (channel._options.debug) console.log('Send message: ', message);\n  channel._websocket.send(JsonBig.stringify({ jsonrpc: '2.0', ...message }));\n}\n\nexport function notify(channel: Channel, method: string, params: object = {}): void {\n  send(channel, { method, params });\n}\n\nasync function dequeueAction(channel: Channel): Promise<void> {\n  if (channel._isActionQueueLocked) return;\n  const queue = channel._actionQueue;\n  if (queue.length === 0) return;\n  const index = queue.findIndex((action) => action.guard(channel, channel._fsm));\n  if (index === -1) return;\n  channel._actionQueue = queue.filter((_, i) => index !== i);\n  channel._isActionQueueLocked = true;\n  const nextState: ChannelFsm = await queue[index].action(channel, channel._fsm);\n  channel._isActionQueueLocked = false;\n  enterState(channel, nextState);\n}\n\nexport async function enqueueAction(\n  channel: Channel,\n  guard: ChannelAction['guard'],\n  action: () => { handler: ChannelHandler; state?: Partial<ChannelState> },\n): Promise<any> {\n  const promise = new Promise((resolve, reject) => {\n    channel._actionQueue.push({\n      guard,\n      action() {\n        const res = action();\n        return { ...res, state: { ...res.state, resolve, reject } };\n      },\n    });\n  });\n  void dequeueAction(channel);\n  return promise;\n}\n\nasync function handleMessage(channel: Channel, message: object): Promise<void> {\n  const { handler, state: st } = channel._fsm;\n  enterState(channel, await Promise.resolve(handler(channel, message, st)));\n}\n\nasync function dequeueMessage(channel: Channel): Promise<void> {\n  if (channel._isMessageQueueLocked) return;\n  channel._isMessageQueueLocked = true;\n  while (channel._messageQueue.length > 0) {\n    const message = channel._messageQueue.shift();\n    if (message == null) throw new UnexpectedTsError();\n    try {\n      await handleMessage(channel, message);\n    } catch (error) {\n      emit(channel, 'error', new ChannelIncomingMessageError(error, message));\n    }\n  }\n  channel._isMessageQueueLocked = false;\n}\n\nexport function disconnect(channel: Channel): void {\n  channel._websocket.close();\n  clearTimeout(channel._pingTimeoutId);\n}\n\nfunction ping(channel: Channel): void {\n  clearTimeout(channel._pingTimeoutId);\n  channel._pingTimeoutId = setTimeout(() => {\n    notify(channel, 'channels.system', { action: 'ping' });\n    channel._pingTimeoutId = setTimeout(() => {\n      disconnect(channel);\n      emit(channel, 'error', new ChannelPingTimedOutError());\n    }, PONG_TIMEOUT_MS);\n  }, PING_TIMEOUT_MS);\n}\n\nfunction onMessage(channel: Channel, data: string): void {\n  const message = JsonBig.parse(data);\n  if (channel._options.debug) console.log('Receive message: ', message);\n  if (message.id != null) {\n    const callback = channel._rpcCallbacks.get(message.id);\n    if (callback == null) {\n      emit(channel, 'error', new ChannelError(`Can't find callback by id: ${message.id}`));\n      return;\n    }\n    try {\n      callback(message);\n    } finally {\n      channel._rpcCallbacks.delete(message.id);\n    }\n    return;\n  }\n  if (message.method === 'channels.message') {\n    emit(channel, 'message', message.params.data.message);\n    return;\n  }\n  if (message.method === 'channels.system.pong') {\n    if (message.params.channel_id === channel._channelId || channel._channelId == null) {\n      ping(channel);\n    }\n    return;\n  }\n  channel._messageQueue.push(message);\n  void dequeueMessage(channel);\n}\n\nexport async function call(channel: Channel, method: string, params: any): Promise<any> {\n  return new Promise((resolve, reject) => {\n    const id = channel._nextRpcMessageId;\n    channel._nextRpcMessageId += 1;\n    channel._rpcCallbacks.set(id, (\n      message: { result: PromiseLike<any>; error?: ChannelMessageError },\n    ) => {\n      if (message.error != null) {\n        const details = message.error.data[0].message ?? '';\n        reject(new ChannelCallError(message.error.message + details));\n      } else resolve(message.result);\n    });\n    send(channel, { method, id, params });\n  });\n}\n\nexport async function initialize(\n  channel: Channel,\n  connectionHandler: Function,\n  openHandler: Function,\n  { url, ...channelOptions }: ChannelOptions,\n): Promise<void> {\n  channel._options = { url, ...channelOptions };\n  channel._fsm = { handler: connectionHandler };\n\n  const wsUrl = new URL(url);\n  Object.entries(channelOptions)\n    .filter(([key]) => !['sign', 'debug'].includes(key))\n    .forEach(([key, value]) => wsUrl.searchParams.set(pascalToSnake(key), value.toString()));\n  wsUrl.searchParams.set('protocol', 'json-rpc');\n  changeStatus(channel, 'connecting');\n  channel._websocket = new W3CWebSocket(wsUrl.toString());\n  await new Promise<void>((resolve, reject) => {\n    Object.assign(channel._websocket, {\n      onerror: reject,\n      onopen: async () => {\n        resolve();\n        changeStatus(channel, 'connected');\n        if (channelOptions.reconnectTx != null) {\n          enterState(channel, { handler: openHandler });\n          const { signedTx } = await channel.state();\n          changeState(channel, signedTx);\n        }\n        ping(channel);\n      },\n      onclose: () => {\n        changeStatus(channel, 'disconnected');\n        clearTimeout(channel._pingTimeoutId);\n      },\n      onmessage: ({ data }: { data: string }) => onMessage(channel, data),\n    });\n  });\n}\n"],"mappings":"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"}

package/es/contract/Contract.d.ts

@@ -8,33 +8,15 @@
 import { Encoder as Calldata } from '@aeternity/aepp-calldata';
 import { Tag, AensName } from '../tx/builder/constants';
 import { unpackTx } from '../tx/builder';
-import { send } from '../spend';
+import { BuildTxOptions } from '../tx';
+import { send, SendOptions } from '../spend';
 import { Encoded } from '../utils/encoder';
-import { Aci as BaseAci } from '../apis/compiler';
 import { ContractCallObject as NodeContractCallObject, ContractCallReturnType, Event as NodeEvent } from '../apis/node';
-import CompilerHttp from './CompilerHttp';
+import CompilerBase, { Aci } from './compiler/Base';
 import Node, { TransformNodeType } from '../Node';
+import { txDryRun } from '../chain';
 import AccountBase from '../account/Base';
-interface FunctionACI {
-    arguments: any[];
-    name: string;
-    payable: boolean;
-    returns: string;
-    stateful: boolean;
-}
-interface Aci extends BaseAci {
-    encodedAci: {
-        contract: {
-            name: string;
-            event: any;
-            kind: string;
-            state: any;
-            type_defs: any[];
-            functions: FunctionACI[];
-        };
-    };
-    externalEncodedAci: any[];
-}
+type FunctionAci = Aci['encodedAci']['contract']['functions'][0];
 interface Event extends NodeEvent {
     address: Encoded.ContractAddress;
     data: Encoded.ContractBytearray;
@@ -143,7 +125,7 @@ declare class Contract<M extends ContractMethodsBase> {
         returnType: ContractCallReturnType;
         returnValue: Encoded.ContractBytearray;
     }, transaction: string): void;
-    protected _sendAndProcess(tx: Encoded.Transaction, options: any): Promise<SendAndProcessReturnType>;
+    protected _sendAndProcess(tx: Encoded.Transaction, options: SendOptions): Promise<SendAndProcessReturnType>;
     _estimateGas<Fn extends MethodNames<M>>(name: Fn, params: MethodParameters<M, Fn>, options?: object): Promise<number>;
     /**
      * Deploy contract
@@ -151,17 +133,18 @@ declare class Contract<M extends ContractMethodsBase> {
      * @param options - Options
      * @returns deploy info
      */
-    $deploy(params: MethodParameters<M, 'init'>, options?: Parameters<Contract<M>['$call']>[2] & Parameters<Contract<M>['_sendAndProcess']>[1]): Promise<Omit<SendAndProcessReturnType, 'hash'> & {
+    $deploy(params: MethodParameters<M, 'init'>, options?: Parameters<Contract<M>['$call']>[2] & Partial<BuildTxOptions<Tag.ContractCreateTx, 'ownerId' | 'code' | 'callData'>>): Promise<Omit<SendAndProcessReturnType, 'hash'> & {
         transaction?: Encoded.TxHash;
         owner?: Encoded.AccountAddress;
         address?: Encoded.ContractAddress;
+        decodedEvents?: ReturnType<Contract<M>['$decodeEvents']>;
     }>;
     /**
      * Get function schema from contract ACI object
      * @param name - Function name
      * @returns function ACI
      */
-    protected _getFunctionACI(name: string): Partial<FunctionACI>;
+    protected _getFunctionACI(name: string): Partial<FunctionAci>;
     /**
      * Call contract function
      * @param fn - Function name
@@ -169,7 +152,11 @@ declare class Contract<M extends ContractMethodsBase> {
      * @param options - Array of function arguments
      * @returns CallResult
      */
-    $call<Fn extends MethodNames<M>>(fn: Fn, params: MethodParameters<M, Fn>, options?: object): Promise<{
+    $call<Fn extends MethodNames<M>>(fn: Fn, params: MethodParameters<M, Fn>, options?: Partial<BuildTxOptions<Tag.ContractCallTx, 'callerId' | 'contractId' | 'callData'>> & Parameters<Contract<M>['$decodeEvents']>[1] & Omit<Parameters<Contract<M>['_sendAndProcess']>[1], 'onAccount' | 'onNode'> & Omit<Parameters<typeof txDryRun>[2], 'onNode'> & {
+        onAccount?: AccountBase;
+        onNode?: Node;
+        callStatic?: boolean;
+    }): Promise<{
         decodedResult?: any;
         decodedEvents?: ReturnType<Contract<M>['$decodeEvents']>;
     } & SendAndProcessReturnType>;
@@ -195,7 +182,7 @@ declare class Contract<M extends ContractMethodsBase> {
     $decodeEvents(events: Event[], { omitUnknown, ...opt }?: {
         omitUnknown?: boolean;
     } & Parameters<Contract<M>['_getContractNameByEvent']>[2]): DecodedEvent[];
-    static initialize<M extends ContractMethodsBase>({ onCompiler, onNode, sourceCode, bytecode, aci, address, fileSystem, validateBytecode, ...otherOptions }: Omit<ConstructorParameters<typeof Contract>[0], 'aci' | 'address'> & {
+    static initialize<M extends ContractMethodsBase>({ onCompiler, onNode, bytecode, aci, address, sourceCodePath, sourceCode, fileSystem, validateBytecode, ...otherOptions }: Omit<ConstructorParameters<typeof Contract>[0], 'aci' | 'address'> & {
         validateBytecode?: boolean;
         aci?: Aci;
         address?: Encoded.ContractAddress | AensName;
@@ -203,29 +190,17 @@ declare class Contract<M extends ContractMethodsBase> {
     _aci: Aci;
     _name: string;
     _calldata: Calldata;
-    $options: {
-        sourceCode?: string;
-        bytecode?: Encoded.ContractBytearray;
-        address?: Encoded.ContractAddress;
-        onCompiler: CompilerHttp;
-        onNode: Node;
-        omitUnknown?: boolean;
-        contractAddressToName?: {
-            [key: Encoded.ContractAddress]: string;
-        };
-        [key: string]: any;
-    };
+    $options: Omit<ConstructorParameters<typeof Contract>[0], 'aci'>;
     constructor({ aci, ...otherOptions }: {
-        onAccount?: AccountBase;
-        onCompiler: CompilerHttp;
+        onCompiler?: CompilerBase;
         onNode: Node;
-        sourceCode?: string;
         bytecode?: Encoded.ContractBytearray;
         aci: Aci;
         address?: Encoded.ContractAddress;
-        fileSystem?: Record<string, string>;
-        [key: string]: any;
-    });
+        sourceCodePath?: Parameters<CompilerBase['compile']>[0];
+        sourceCode?: Parameters<CompilerBase['compileBySourceCode']>[0];
+        fileSystem?: Parameters<CompilerBase['compileBySourceCode']>[1];
+    } & Parameters<Contract<M>['$deploy']>[1]);
 }
 interface ContractWithMethodsClass {
     new <M extends ContractMethodsBase>(options: ConstructorParameters<typeof Contract>[0]): ContractWithMethods<M>;

package/es/contract/Contract.mjs

@@ -38,7 +38,7 @@ import { send } from "../spend.mjs";
 import { decode } from "../utils/encoder.mjs";
 import { MissingContractDefError, MissingContractAddressError, InactiveContractError, BytecodeMismatchError, DuplicateContractError, MissingFunctionNameError, InvalidMethodInvocationError, NotPayableFunctionError, TypeError, NodeInvocationError, IllegalArgumentError, NoSuchContractFunctionError, MissingEventDefinitionError, AmbiguousEventDefinitionError, UnexpectedTsError, InternalError, NoWalletConnectedError } from "../utils/errors.mjs";
 import { hash as calcHash } from "../utils/crypto.mjs";
-import { getAccount, getContract, getContractByteCode, getKeyBlock, resolveName, txDryRun } from "../chain.mjs";
+import { getAccount, getContract, getContractByteCode, resolveName, txDryRun } from "../chain.mjs";
 import { concatBuffers } from "../utils/other.mjs";
 import { isNameValid, produceNameId } from "../tx/builder/helpers.mjs";
 /**
@@ -114,12 +114,8 @@ class Contract {
   async $compile() {
     if (this.$options.bytecode != null) return this.$options.bytecode;
     if (this.$options.sourceCode == null) throw new IllegalArgumentError('Can\'t compile without source code');
-    this.$options.bytecode = (await this.$options.onCompiler.compileContract({
-      code: this.$options.sourceCode,
-      options: {
-        fileSystem: this.$options.fileSystem
-      }
-    })).bytecode;
+    if (this.$options.onCompiler == null) throw new IllegalArgumentError('Can\'t compile without compiler');
+    this.$options.bytecode = (await this.$options.onCompiler.compileBySourceCode(this.$options.sourceCode, this.$options.fileSystem)).bytecode;
     return this.$options.bytecode;
   }
   _handleCallError(_ref, transaction) {
@@ -143,11 +139,10 @@ class Contract {
     throw new NodeInvocationError(message, transaction);
   }
   async _sendAndProcess(tx, options) {
-    options = {
+    const txData = await send(tx, {
       ...this.$options,
       ...options
-    };
-    const txData = await send(tx, options);
+    });
     const result = {
       hash: txData.hash,
       tx: unpackTx(txData.rawTx),
@@ -189,15 +184,23 @@ class Contract {
    * @returns deploy info
    */
   async $deploy(params, options) {
-    var _opt$gasLimit;
-    const opt = {
+    var _opt$gasLimit, _other$result;
+    const {
+      callStatic,
+      ...opt
+    } = {
       ...this.$options,
       ...options
     };
     if (this.$options.bytecode == null) await this.$compile();
-    if (opt.callStatic === true) return this.$call('init', params, opt);
+    if (callStatic === true) return this.$call('init', params, {
+      ...opt,
+      callStatic
+    });
     if (this.$options.address != null) throw new DuplicateContractError();
+    if (opt.onAccount == null) throw new IllegalArgumentError('Can\'t deploy without account');
     const ownerId = opt.onAccount.address;
+    if (this.$options.bytecode == null) throw new IllegalArgumentError('Can\'t deploy without bytecode');
     const tx = await _buildTx(Tag.ContractCreateTx, {
       ...opt,
       gasLimit: (_opt$gasLimit = opt.gasLimit) !== null && _opt$gasLimit !== void 0 ? _opt$gasLimit : await this._estimateGas('init', params, opt),
@@ -209,9 +212,15 @@ class Contract {
     const {
       hash,
       ...other
-    } = await this._sendAndProcess(tx, opt);
+    } = await this._sendAndProcess(tx, {
+      ...opt,
+      onAccount: opt.onAccount
+    });
     return {
       ...other,
+      ...(((_other$result = other.result) === null || _other$result === void 0 ? void 0 : _other$result.log) != null && {
+        decodedEvents: this.$decodeEvents(other.result.log, opt)
+      }),
       owner: ownerId,
       transaction: hash,
       address: this.$options.address
@@ -243,7 +252,11 @@ class Contract {
    */
   async $call(fn, params) {
     let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    const opt = {
+    const {
+      callStatic,
+      top,
+      ...opt
+    } = {
       ...this.$options,
       ...options
     };
@@ -253,35 +266,34 @@ class Contract {
       onNode
     } = opt;
     if (fn == null) throw new MissingFunctionNameError();
-    if (fn === 'init' && opt.callStatic === false) throw new InvalidMethodInvocationError('"init" can be called only via dryRun');
-    if (fn !== 'init' && opt.amount > 0 && fnACI.payable === false) throw new NotPayableFunctionError(opt.amount, fn);
+    if (fn === 'init' && callStatic !== true) throw new InvalidMethodInvocationError('"init" can be called only via dryRun');
+    if (fn !== 'init' && opt.amount != null && opt.amount > 0 && fnACI.payable === false) {
+      throw new NotPayableFunctionError(opt.amount, fn);
+    }
     let callerId;
     try {
+      if (opt.onAccount == null) throw new InternalError('Use fallback account');
       callerId = opt.onAccount.address;
     } catch (error) {
-      const useFallbackAccount = opt.callStatic === true && (error instanceof TypeError && error.message === 'Account should be an address (ak-prefixed string), or instance of AccountBase, got undefined instead' || error instanceof NoWalletConnectedError);
+      const useFallbackAccount = callStatic === true && (error instanceof TypeError && error.message === 'Account should be an address (ak-prefixed string), or instance of AccountBase, got undefined instead' || error instanceof NoWalletConnectedError);
       if (!useFallbackAccount) throw error;
       callerId = DRY_RUN_ACCOUNT.pub;
     }
     const callData = this._calldata.encode(this._name, fn, params);
     let res;
-    if (opt.callStatic === true) {
-      if (typeof opt.top === 'number') {
-        opt.top = (await getKeyBlock(opt.top, {
+    if (callStatic === true) {
+      if (opt.nonce == null && top != null) {
+        const topKey = typeof top === 'number' ? 'height' : 'hash';
+        opt.nonce = (await getAccount(callerId, {
+          [topKey]: top,
           onNode
-        })).hash;
+        })).nonce + 1;
       }
       const txOpt = {
         ...opt,
         onNode,
         callData
       };
-      if (opt.nonce == null && opt.top != null) {
-        opt.nonce = (await getAccount(callerId, {
-          hash: opt.top,
-          onNode
-        })).nonce + 1;
-      }
       let tx;
       if (fn === 'init') {
         if (this.$options.bytecode == null) throw new IllegalArgumentError('Can\'t dry-run "init" without bytecode');
@@ -301,7 +313,10 @@ class Contract {
       const {
         callObj,
         ...dryRunOther
-      } = await txDryRun(tx, callerId, opt);
+      } = await txDryRun(tx, callerId, {
+        ...opt,
+        top
+      });
       if (callObj == null) throw new UnexpectedTsError();
       this._handleCallError({
         returnType: callObj.returnType,
@@ -314,6 +329,7 @@ class Contract {
       };
     } else {
       var _opt$gasLimit2;
+      if (top != null) throw new IllegalArgumentError('Can\'t handle `top` option in on-chain contract call');
       if (contractId == null) throw new MissingContractAddressError('Can\'t call contract without address');
       const tx = await _buildTx(Tag.ContractCallTx, {
         ...opt,
@@ -322,9 +338,13 @@ class Contract {
         contractId,
         callData
       });
-      res = await this._sendAndProcess(tx, opt);
+      if (opt.onAccount == null) throw new IllegalArgumentError('Can\'t call contract on chain without account');
+      res = await this._sendAndProcess(tx, {
+        ...opt,
+        onAccount: opt.onAccount
+      });
     }
-    if (opt.callStatic === true || res.txData.blockHeight != null) {
+    if (callStatic === true || res.txData.blockHeight != null) {
       res.decodedResult = fnACI.returns != null && fnACI.returns !== 'unit' && fn !== 'init' && this._calldata.decode(this._name, fn, res.result.returnValue);
       res.decodedEvents = this.$decodeEvents(res.result.log, opt);
     }
@@ -417,22 +437,24 @@ class Contract {
     let {
       onCompiler,
       onNode,
-      sourceCode,
       bytecode,
       aci,
       address,
+      sourceCodePath,
+      sourceCode,
       fileSystem,
       validateBytecode,
       ...otherOptions
     } = _ref8;
-    if (aci == null && sourceCode != null) {
-      // TODO: should be fixed when the compiledAci interface gets updated
-      aci = await onCompiler.generateACI({
-        code: sourceCode,
-        options: {
-          fileSystem
-        }
-      });
+    if (aci == null && onCompiler != null) {
+      let res;
+      if (sourceCodePath != null) res = await onCompiler.compile(sourceCodePath);
+      if (sourceCode != null) res = await onCompiler.compileBySourceCode(sourceCode, fileSystem);
+      if (res != null) {
+        var _bytecode;
+        aci = res.aci;
+        (_bytecode = bytecode) !== null && _bytecode !== void 0 ? _bytecode : bytecode = res.bytecode;
+      }
     }
     if (aci == null) throw new MissingContractDefError();
     if (address != null) {
@@ -450,18 +472,16 @@ class Contract {
       });
       if (contract.active == null) throw new InactiveContractError(address);
     }
-    if (validateBytecode != null) {
+    if (validateBytecode === true) {
       if (address == null) throw new MissingContractAddressError('Can\'t validate bytecode without contract address');
       const onChanBytecode = (await getContractByteCode(address, {
         onNode
       })).bytecode;
-      const isValid = sourceCode != null ? await onCompiler.validateByteCode({
-        bytecode: onChanBytecode,
-        source: sourceCode,
-        options: {
-          fileSystem
-        }
-      }).then(() => true, () => false) : bytecode === onChanBytecode;
+      let isValid = false;
+      if (bytecode != null) isValid = bytecode === onChanBytecode;else if (sourceCode != null) {
+        if (onCompiler == null) throw new IllegalArgumentError('Can\'t validate bytecode without compiler');
+        isValid = await onCompiler.validateBySourceCode(onChanBytecode, sourceCode, fileSystem);
+      }
       if (!isValid) throw new BytecodeMismatchError(sourceCode != null ? 'source code' : 'bytecode');
     }
     return new ContractWithMethods({
@@ -484,10 +504,7 @@ class Contract {
     this._aci = aci;
     this._name = aci.encodedAci.contract.name;
     this._calldata = new Calldata([aci.encodedAci, ...aci.externalEncodedAci]);
-    this.$options = {
-      callStatic: false,
-      ...otherOptions
-    };
+    this.$options = otherOptions;
 
     /**
      * Generate proto function based on contract function using Contract ACI schema