From 8fecae2f0eb24b067fdbc16d0de7fcc3489cff82 Mon Sep 17 00:00:00 2001 From: Mehrshad Date: Thu, 31 Aug 2023 17:32:51 +0330 Subject: [PATCH] WIP1-3 --- app.js => app.ts | 18 ++++++++------- bot/messages.ts | 4 ++-- bot/start.ts | 2 +- db_connect.js => db_connect.ts | 9 ++++---- ...ngs.js => calculate_community_earnings.ts} | 8 +++---- jobs/{cancel_orders.js => cancel_orders.ts} | 11 ++++++---- jobs/{communities.js => communities.ts} | 11 ++++++---- ...d_orders.js => delete_published_orders.ts} | 11 ++++++---- jobs/{node_info.js => node_info.ts} | 9 +++++--- jobs/pending_payments.ts | 2 +- ln/{connect.js => connect.ts} | 10 ++++----- ln/{hold_invoice.js => hold_invoice.ts} | 22 +++++++++---------- ln/info.js | 13 ----------- ln/info.ts | 11 ++++++++++ ...be_invoices.js => resubscribe_invoices.ts} | 14 +++++++----- ...scribe_invoice.js => subscribe_invoice.ts} | 10 +++++---- lnurl/{lnurl-pay.js => lnurl-pay.ts} | 15 +++++-------- logger.js => logger.ts | 10 ++++----- tests/bot_test.js | 2 +- 19 files changed, 103 insertions(+), 89 deletions(-) rename app.js => app.ts (69%) rename db_connect.js => db_connect.ts (72%) rename jobs/{calculate_community_earnings.js => calculate_community_earnings.ts} (86%) rename jobs/{cancel_orders.js => cancel_orders.ts} (92%) rename jobs/{communities.js => communities.ts} (77%) rename jobs/{delete_published_orders.js => delete_published_orders.ts} (79%) rename jobs/{node_info.js => node_info.ts} (66%) rename ln/{connect.js => connect.ts} (89%) rename ln/{hold_invoice.js => hold_invoice.ts} (63%) delete mode 100644 ln/info.js create mode 100644 ln/info.ts rename ln/{resubscribe_invoices.js => resubscribe_invoices.ts} (70%) rename ln/{subscribe_invoice.js => subscribe_invoice.ts} (93%) rename lnurl/{lnurl-pay.js => lnurl-pay.ts} (77%) rename logger.js => logger.ts (82%) diff --git a/app.js b/app.ts similarity index 69% rename from app.js rename to app.ts index 2fbc6604..3db3da54 100644 --- a/app.js +++ b/app.ts @@ -1,9 +1,10 @@ -require('dotenv').config(); -const { SocksProxyAgent } = require('socks-proxy-agent'); -const { start } = require('./bot'); -const mongoConnect = require('./db_connect'); +import * as dotenv from "dotenv"; +dotenv.config() +import { SocksProxyAgent } from "socks-proxy-agent"; +import { start } from "./bot/start"; +import mongoConnect from './db_connect' const { resubscribeInvoices } = require('./ln'); -const logger = require('./logger'); +import logger from "./logger"; const { delay } = require('./util'); (async () => { @@ -30,12 +31,13 @@ const { delay } = require('./util'); telegram: { agent, }, - }; + } as any; } - const bot = start(process.env.BOT_TOKEN, options); + const bot = start(String(process.env.BOT_TOKEN), options); // Wait 1 seconds before try to resubscribe hold invoices await delay(1000); await resubscribeInvoices(bot); }) - .on('error', error => logger.error(`Error connecting to Mongo: ${error}`)); + .on('error', (error: Error) => logger.error(`Error connecting to Mongo: ${error}`)); })(); + diff --git a/bot/messages.ts b/bot/messages.ts index 1b9c8b43..96aa23e9 100644 --- a/bot/messages.ts +++ b/bot/messages.ts @@ -1,4 +1,4 @@ -const { TelegramError } = require('telegraf'); +import { TelegramError } from 'telegraf' const QR = require('qrcode'); const { getCurrency, @@ -12,7 +12,7 @@ const { decimalRound, getUserAge } = require('../util'); -const logger = require('../logger'); +import logger from "../logger"; import { MainContext } from './start'; import { UserDocument } from '../models/user' import { IOrder } from '../models/order' diff --git a/bot/start.ts b/bot/start.ts index 7758cdcd..4597d259 100644 --- a/bot/start.ts +++ b/bot/start.ts @@ -68,7 +68,7 @@ const { deleteCommunity, nodeInfo, } = require('../jobs'); -const logger = require('../logger'); +import logger from "../logger"; export interface MainContext extends Context { match: Array | null; diff --git a/db_connect.js b/db_connect.ts similarity index 72% rename from db_connect.js rename to db_connect.ts index e38fbd10..1353b6f0 100644 --- a/db_connect.js +++ b/db_connect.ts @@ -1,5 +1,5 @@ -const mongoose = require('mongoose'); -const logger = require('./logger'); +import mongoose from "mongoose"; +import logger from "./logger"; // connect to database const credentials = process.env.DB_USER @@ -12,12 +12,13 @@ if (!MONGO_URI) { throw new Error('You must provide a MongoDB URI'); } logger.info(`Connecting to: ${MONGO_URI}`); +// TODO: Update mongoose to latest version const connect = () => { mongoose.connect(MONGO_URI, { useNewUrlParser: true, useUnifiedTopology: true, - }); + } as any); // older version of mongoose that does not have the ConnectOptions type defined. return mongoose; }; -module.exports = connect; +export default connect; diff --git a/jobs/calculate_community_earnings.js b/jobs/calculate_community_earnings.ts similarity index 86% rename from jobs/calculate_community_earnings.js rename to jobs/calculate_community_earnings.ts index 56151d48..d394a922 100644 --- a/jobs/calculate_community_earnings.js +++ b/jobs/calculate_community_earnings.ts @@ -1,5 +1,5 @@ const { Order, Community } = require('../models'); -const logger = require('../logger'); +import logger from "../logger"; const calculateEarnings = async () => { try { @@ -12,9 +12,9 @@ const calculateEarnings = async () => { for (const order of orders) { const amount = order.amount; const fee = order.fee; - const botFee = order.bot_fee || parseFloat(process.env.MAX_FEE); + const botFee = order.bot_fee || Number(process.env.MAX_FEE); const communityFeePercent = - order.community_fee || parseFloat(process.env.FEE_PERCENT); + order.community_fee || Number(process.env.FEE_PERCENT); const maxFee = amount * botFee; const communityFee = fee - maxFee * communityFeePercent; const earnings = earningsMap.get(order.community_id) || [0, 0]; @@ -36,7 +36,7 @@ const calculateEarnings = async () => { ); } } catch (error) { - const message = error.toString(); + const message = String(error); logger.error(`calculateEarnings catch error: ${message}`); } }; diff --git a/jobs/cancel_orders.js b/jobs/cancel_orders.ts similarity index 92% rename from jobs/cancel_orders.js rename to jobs/cancel_orders.ts index 00cef019..01c2739b 100644 --- a/jobs/cancel_orders.js +++ b/jobs/cancel_orders.ts @@ -1,15 +1,18 @@ +import { Telegraf } from "telegraf"; +import { MainContext } from "../bot/start"; + const { User, Order } = require('../models'); const { cancelShowHoldInvoice, cancelAddInvoice } = require('../bot/commands'); const messages = require('../bot/messages'); const { getUserI18nContext, holdInvoiceExpirationInSecs } = require('../util'); -const logger = require('../logger'); +import logger from "../logger"; -const cancelOrders = async bot => { +const cancelOrders = async (bot: Telegraf) => { try { const holdInvoiceTime = new Date(); holdInvoiceTime.setSeconds( holdInvoiceTime.getSeconds() - - parseInt(process.env.HOLD_INVOICE_EXPIRATION_WINDOW) + Number(process.env.HOLD_INVOICE_EXPIRATION_WINDOW) ); // We get the orders where the seller didn't pay the hold invoice before expired // or where the buyer didn't add the invoice @@ -70,7 +73,7 @@ const cancelOrders = async bot => { // Now we cancel orders expired // ============================== orderTime = new Date(); - let orderExpirationTime = parseInt( + let orderExpirationTime = Number( process.env.ORDER_PUBLISHED_EXPIRATION_WINDOW ); orderExpirationTime = orderExpirationTime + orderExpirationTime * 0.2; diff --git a/jobs/communities.js b/jobs/communities.ts similarity index 77% rename from jobs/communities.js rename to jobs/communities.ts index e9ddb503..026a6446 100644 --- a/jobs/communities.js +++ b/jobs/communities.ts @@ -1,12 +1,15 @@ +import { Telegraf } from "telegraf"; +import { MainContext } from "../bot/start"; + const { Order, Community } = require('../models'); -const logger = require('../logger'); +import logger from "../logger"; -const deleteCommunity = async bot => { +const deleteCommunity = async (bot: Telegraf) => { try { const communities = await Community.find(); for (const community of communities) { // Delete communities with COMMUNITY_TTL days without a successful order - const days = 86400 * parseInt(process.env.COMMUNITY_TTL); + const days = 86400 * Number(process.env.COMMUNITY_TTL); const time = new Date(); time.setSeconds(time.getSeconds() - days); // If is a new community we don't do anything @@ -26,7 +29,7 @@ const deleteCommunity = async bot => { } } } catch (error) { - const message = error.toString(); + const message = String(error); logger.error(`deleteCommunity catch error: ${message}`); } }; diff --git a/jobs/delete_published_orders.js b/jobs/delete_published_orders.ts similarity index 79% rename from jobs/delete_published_orders.js rename to jobs/delete_published_orders.ts index b4e284ae..d16dc1e4 100644 --- a/jobs/delete_published_orders.js +++ b/jobs/delete_published_orders.ts @@ -1,13 +1,16 @@ +import { Telegraf } from "telegraf"; +import { MainContext } from "../bot/start"; + const { Order } = require('../models'); const { deleteOrderFromChannel } = require('../util'); -const logger = require('../logger'); +import logger from "../logger"; -const deleteOrders = async bot => { +const deleteOrders = async (bot: Telegraf) => { try { const windowTime = new Date(); windowTime.setSeconds( windowTime.getSeconds() - - parseInt(process.env.ORDER_PUBLISHED_EXPIRATION_WINDOW) + Number(process.env.ORDER_PUBLISHED_EXPIRATION_WINDOW) ); // We get the pending orders where time is expired const pendingOrders = await Order.find({ @@ -25,7 +28,7 @@ const deleteOrders = async bot => { await deleteOrderFromChannel(orderCloned, bot.telegram); } } catch (error) { - const message = error.toString(); + const message = String(error); logger.error(`deleteOrders catch error: ${message}`); } }; diff --git a/jobs/node_info.js b/jobs/node_info.ts similarity index 66% rename from jobs/node_info.js rename to jobs/node_info.ts index bad5d904..d0dce4ce 100644 --- a/jobs/node_info.js +++ b/jobs/node_info.ts @@ -1,8 +1,11 @@ +import { Telegraf } from "telegraf"; +import { MainContext } from "../bot/start"; + const { Config } = require('../models'); const { getInfo } = require('../ln'); -const logger = require('../logger'); +import logger from "../logger"; -const info = async bot => { +const info = async (bot: Telegraf) => { try { const config = await Config.findOne({}); const info = await getInfo(); @@ -12,7 +15,7 @@ const info = async bot => { config.node_uri = info.uris[0]; await config.save(); } catch (error) { - const message = error.toString(); + const message = String(error); logger.error(`node info catch error: ${message}`); } }; diff --git a/jobs/pending_payments.ts b/jobs/pending_payments.ts index 80b79135..fd292313 100644 --- a/jobs/pending_payments.ts +++ b/jobs/pending_payments.ts @@ -2,7 +2,7 @@ const { payRequest, isPendingPayment } = require('../ln'); const { PendingPayment, Order, User, Community } = require('../models'); const messages = require('../bot/messages'); const { getUserI18nContext } = require('../util'); -const logger = require('../logger'); +import logger from "../logger"; import { Telegraf } from 'telegraf'; import { I18nContext } from '@grammyjs/i18n'; import { MainContext } from '../bot/start'; diff --git a/ln/connect.js b/ln/connect.ts similarity index 89% rename from ln/connect.js rename to ln/connect.ts index 167d5445..0e1e03e7 100644 --- a/ln/connect.js +++ b/ln/connect.ts @@ -1,7 +1,7 @@ -const fs = require('fs'); -const path = require('path'); -const lightning = require('lightning'); -const logger = require('../logger'); +import * as fs from 'fs'; +import path = require('path'); +import * as lightning from "lightning"; +import logger from "../logger"; const { authenticatedLndGrpc } = lightning; @@ -47,4 +47,4 @@ const { lnd } = authenticatedLndGrpc({ socket, }); -module.exports = lnd; +export { lnd }; diff --git a/ln/hold_invoice.js b/ln/hold_invoice.ts similarity index 63% rename from ln/hold_invoice.js rename to ln/hold_invoice.ts index 1a36c39c..9717dfd5 100644 --- a/ln/hold_invoice.js +++ b/ln/hold_invoice.ts @@ -1,26 +1,26 @@ -const { createHash, randomBytes } = require('crypto'); -const lightning = require('lightning'); -const lnd = require('./connect'); -const logger = require('../logger'); +import { randomBytes, createHash } from 'crypto'; +import * as lightning from "lightning"; +import { lnd } from './connect' +import logger from "../logger"; -const createHoldInvoice = async ({ description, amount }) => { +const createHoldInvoice = async (description: string, amount: number ) => { try { const randomSecret = () => randomBytes(32); - const sha256 = buffer => createHash('sha256').update(buffer).digest('hex'); + const sha256 = (buffer: Buffer): string => createHash('sha256').update(buffer).digest('hex'); // We create a random secret const secret = randomSecret(); const expiresAt = new Date(); expiresAt.setSeconds(expiresAt.getSeconds() + 3600); const hash = sha256(secret); - const cltv_delta = parseInt(process.env.HOLD_INVOICE_CLTV_DELTA); + const cltv_delta = Number(process.env.HOLD_INVOICE_CLTV_DELTA); const { request, id } = await lightning.createHodlInvoice({ cltv_delta, lnd, description, id: hash, tokens: amount, - expires_at: expiresAt, + expires_at: expiresAt.toISOString(), }); // We sent back the response hash (id) to be used on testing @@ -30,7 +30,7 @@ const createHoldInvoice = async ({ description, amount }) => { } }; -const settleHoldInvoice = async ({ secret }) => { +const settleHoldInvoice = async ( secret: string ) => { try { await lightning.settleHodlInvoice({ lnd, secret }); } catch (error) { @@ -38,7 +38,7 @@ const settleHoldInvoice = async ({ secret }) => { } }; -const cancelHoldInvoice = async ({ hash }) => { +const cancelHoldInvoice = async ( hash: string ) => { try { await lightning.cancelHodlInvoice({ lnd, id: hash }); } catch (error) { @@ -46,7 +46,7 @@ const cancelHoldInvoice = async ({ hash }) => { } }; -const getInvoice = async ({ hash }) => { +const getInvoice = async ( hash: string ) => { try { return await lightning.getInvoice({ lnd, id: hash }); } catch (error) { diff --git a/ln/info.js b/ln/info.js deleted file mode 100644 index da731135..00000000 --- a/ln/info.js +++ /dev/null @@ -1,13 +0,0 @@ -const lightning = require('lightning'); -const lnd = require('./connect'); -const logger = require('../logger'); - -const getInfo = async () => { - try { - return await lightning.getWalletInfo({ lnd }); - } catch (error) { - logger.error(error); - } -}; - -module.exports = { getInfo }; diff --git a/ln/info.ts b/ln/info.ts new file mode 100644 index 00000000..179fb82e --- /dev/null +++ b/ln/info.ts @@ -0,0 +1,11 @@ +import * as lightning from "lightning"; +import { lnd } from './connect' +import logger from "../logger"; + +export const getInfo = async () => { + try { + return await lightning.getWalletInfo({ lnd }); + } catch (error) { + logger.error(error); + } +}; diff --git a/ln/resubscribe_invoices.js b/ln/resubscribe_invoices.ts similarity index 70% rename from ln/resubscribe_invoices.js rename to ln/resubscribe_invoices.ts index 644dbbba..8fa91527 100644 --- a/ln/resubscribe_invoices.js +++ b/ln/resubscribe_invoices.ts @@ -1,13 +1,15 @@ -const { getInvoices } = require('lightning'); -const lnd = require('./connect'); +import { Telegraf } from 'telegraf'; +import { MainContext } from "../bot/start"; +import { getInvoices, GetInvoicesResult } from 'lightning'; +import { lnd } from './connect'; const subscribeInvoice = require('./subscribe_invoice'); const { Order } = require('../models'); -const logger = require('../logger'); +import logger from "../logger"; -const resubscribeInvoices = async bot => { +const resubscribeInvoices = async (bot: Telegraf) => { try { let invoicesReSubscribed = 0; - const isHeld = invoice => !!invoice.is_held; + const isHeld = (invoice: any) => !!invoice.is_held; const unconfirmedInvoices = ( await getInvoices({ lnd, @@ -29,7 +31,7 @@ const resubscribeInvoices = async bot => { } logger.info(`Invoices resubscribed: ${invoicesReSubscribed}`); } catch (error) { - logger.error(`ResuscribeInvoice catch: ${error.toString()}`); + logger.error(`ResuscribeInvoice catch: ${String(error)}`); return false; } }; diff --git a/ln/subscribe_invoice.js b/ln/subscribe_invoice.ts similarity index 93% rename from ln/subscribe_invoice.js rename to ln/subscribe_invoice.ts index 2f96e36a..bcdc82ad 100644 --- a/ln/subscribe_invoice.js +++ b/ln/subscribe_invoice.ts @@ -1,13 +1,15 @@ -const { subscribeToInvoice } = require('lightning'); +import { Telegraf } from "telegraf"; +import { MainContext } from "../bot/start"; +import {subscribeToInvoice} from 'lightning' const { Order, User } = require('../models'); const { payToBuyer } = require('./pay_request'); -const lnd = require('./connect'); +import { lnd } from "./connect"; const messages = require('../bot/messages'); const ordersActions = require('../bot/ordersActions'); const { getUserI18nContext, getEmojiRate, decimalRound } = require('../util'); -const logger = require('../logger'); +import logger from "../logger"; -const subscribeInvoice = async (bot, id, resub) => { +const subscribeInvoice = async (bot: Telegraf, id: string, resub: boolean) => { try { const sub = subscribeToInvoice({ id, lnd }); sub.on('invoice_updated', async invoice => { diff --git a/lnurl/lnurl-pay.js b/lnurl/lnurl-pay.ts similarity index 77% rename from lnurl/lnurl-pay.js rename to lnurl/lnurl-pay.ts index 45235898..4ebc2e99 100644 --- a/lnurl/lnurl-pay.js +++ b/lnurl/lnurl-pay.ts @@ -1,11 +1,11 @@ -const axios = require('axios').default; -const logger = require('../logger'); +import axios from 'axios'; +import logger from "../logger"; // { // pr: String, // bech32-serialized lightning invoice // routes: [], // an empty array // } -const resolvLightningAddress = async (address, amountMsat) => { +const resolvLightningAddress = async (address: string, amountMsat: number) => { const [user, domain] = address.split('@'); const lnAddressQuery = `https://${domain}/.well-known/lnurlp/${user}`; @@ -17,7 +17,7 @@ const resolvLightningAddress = async (address, amountMsat) => { } if ( - (lnAddressRes.minSendable > amountMsat) | + (lnAddressRes.minSendable > amountMsat) || (lnAddressRes.maxSendable < amountMsat) ) { logger.info('lnAddress invalid amount'); @@ -31,7 +31,7 @@ const resolvLightningAddress = async (address, amountMsat) => { return res; }; -const existLightningAddress = async address => { +const existLightningAddress = async (address: string) => { const [user, domain] = address.split('@'); const lnAddressQuery = `https://${domain}/.well-known/lnurlp/${user}`; @@ -49,7 +49,4 @@ const existLightningAddress = async address => { } }; -module.exports = { - resolvLightningAddress, - existLightningAddress, -}; +export { resolvLightningAddress, existLightningAddress } diff --git a/logger.js b/logger.ts similarity index 82% rename from logger.js rename to logger.ts index ada7ed8e..d5fe6e2a 100644 --- a/logger.js +++ b/logger.ts @@ -1,4 +1,4 @@ -const winston = require('winston'); +import * as winston from 'winston'; const level = process.env.LOG_LEVEL || 'notice'; @@ -9,9 +9,8 @@ const logger = winston.createLogger({ }), winston.format.colorize(), winston.format.printf(info => { - return `[${info.timestamp}] ${info.level}: ${info.message} ${ - info.stack ? info.stack : '' - }`; + return `[${info.timestamp}] ${info.level}: ${info.message} ${info.stack ? info.stack : '' + }`; }) ), levels: winston.config.syslog.levels, @@ -24,4 +23,5 @@ const logger = winston.createLogger({ exitOnError: false, }); -module.exports = logger; + +export default logger; diff --git a/tests/bot_test.js b/tests/bot_test.js index df4ceca5..0feb9570 100644 --- a/tests/bot_test.js +++ b/tests/bot_test.js @@ -10,7 +10,7 @@ const ordersActions = require('../bot/ordersActions'); const testUser = require('./user'); const testOrder = require('./order'); const { getCurrenciesWithPrice } = require('../util'); -const mongoConnect = require('../db_connect'); +const mongoConnect = require('../db_connect').default; mongoConnect();