Convert JS to TS (commits 7-13 of PR435) - attempt#2 #585

webwarrior-ws · 2024-09-03T09:00:43Z

Supersedes #557. Added a commit that should fix bug in disputes.

Catrya

Hi @webwarrior-ws @Mersho
When the admin goes to take a dispute this error appears in the logs:

[2024-09-04T10:09:59.680-04:00] error: Community was not found in DB Error: Community was not found in DB
    at /home/catry/bot/bot/validations.js:208:27
    at step (/home/catry/bot/bot/validations.js:56:23)
    at Object.next (/home/catry/bot/bot/validations.js:37:53)
    at fulfilled (/home/catry/bot/bot/validations.js:28:58)
    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)

Catrya

It also happened to me that the wizard_add_invoice_init message was not being sent in any order even though it entered the wizard because any command or invoice that I sent to it would delete it. However, I stopped it and started it again and it worked.

Catrya

When sending an invoice to receive, it always returns this error to the buyer: Invoice expiry is too short

webwarrior-ws · 2024-09-05T13:02:19Z

The bugs should be fixed now, but I haven't tested.

webwarrior-ws · 2024-09-05T13:03:36Z

It also happened to me that the wizard_add_invoice_init message was not being sent in any order even though it entered the wizard because any command or invoice that I sent to it would delete it. However, I stopped it and started it again and it worked.

Not sure about this one. Maybe it was because validateAdmin failed.

Catrya · 2024-09-06T18:54:12Z

Hola@webwarrior-ws @Mersho Cuando el administrador va a tomar una disputa aparece este error en los registros:

[2024-09-04T10:09:59.680-04:00] error: Community was not found in DB Error: Community was not found in DB
    at /home/catry/bot/bot/validations.js:208:27
    at step (/home/catry/bot/bot/validations.js:56:23)
    at Object.next (/home/catry/bot/bot/validations.js:37:53)
    at fulfilled (/home/catry/bot/bot/validations.js:28:58)
    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)

This error has already been solved

Catrya

Al enviar una factura para recibir, siempre devuelve este error al comprador:Invoice expiry is too short

@webwarrior-ws @Mersho That error is still there, it always says Invoice expiry is too short but if I change to or any other branch and put the same invoice it accepts it without problem

webwarrior-ws · 2024-09-09T11:29:29Z

Al enviar una factura para recibir, siempre devuelve este error al comprador:Invoice expiry is too short

@webwarrior-ws @Mersho That error is still there, it always says Invoice expiry is too short but if I change to or any other branch and put the same invoice it accepts it without problem

I tried with my test setup and could not reproduce this bug.

Catrya · 2024-09-09T13:02:58Z

@grunch could you try to reproduce it? I can't get that error not to appear, thanks :)

webwarrior-ws · 2024-09-09T13:20:38Z

Added some debug logging. Maybe that will help with identifying the problem.

Catrya · 2024-09-09T13:54:31Z

Added some debug logging. Maybe that will help with identifying the problem.

Well, the bot did not show the wizard_add_invoice_init message and this error appeared:
[2024-09-09T09:49:10.191-04:00] error: All promises were rejected AggregateError: All promises were rejected

But I knew it was 500 sats so I put the invoice and this appears:

Date(invoice.expires_at) = Mon Sep 09 2024 10:49:28 GMT-0400 (hora de verano de Cuba)
latestDate = Mon Sep 09 2024 10:49:47 GMT-0400 (hora de verano de Cuba)
INVOICE_EXPIRATION_WINDOW = 3600000

webwarrior-ws · 2024-09-10T08:18:54Z

I don't see any bug in lnp2pBot code here. Invoice expires less than INVOICE_EXPIRATION_WINDOW (1 hour) from time of running, and that results in error.
I don't know why main branch doesn't result in error in the same scenario. Maybe this code never worked as intended? I noticed that in original code, Date is compared to string.

knocte · 2024-09-10T08:25:02Z

Maybe this code never worked as intended? I noticed that in original code, Date is compared to string.

Looks like we need @grunch's input here?

grunch · 2024-09-10T14:50:23Z

Hi guys!

I'm testing it, after I take a dispute of an order created in the global channel is works perfectly, after I take a dispute of an order created on a community it doesn't work, here the log

[2024-09-10T11:48:18.398-03:00] error: 400: Bad Request: can't parse entities: Character '.' is reserved and must be escaped with the preceding '\' Error: 400: Bad Request: can't parse entities: Character '.' is reserved and must be escaped with the preceding '\'
    at Telegram.callApi (/home/grunch/dev/bot-warrior/node_modules/telegraf/lib/core/network/client.js:264:19)
    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
    at async exports.disputeData (/home/grunch/dev/bot-warrior/bot/modules/dispute/messages.js:90:5)
    at async exports.takeDispute (/home/grunch/dev/bot-warrior/bot/modules/dispute/actions.js:39:3)
    at async execute (/home/grunch/dev/bot-warrior/node_modules/telegraf/lib/composer.js:468:17)
    at async /home/grunch/dev/bot-warrior/node_modules/telegraf/lib/composer.js:469:21

webwarrior-ws · 2024-09-12T09:58:41Z

@grunch I have tried to reproduce the bug, but I can't take a dispute - when I click on "Take dispute" button I get a message "You have been banned!". As I only have 2 telegram accounts, solver user is one of the participants, maybe that's the issue?

webwarrior-ws · 2024-09-12T12:45:41Z

Me and @knocte managed to take and resolve dispute in community. That error looks like contents of some variable is not escaped properly. I've seen a commit in main that adds escaping. I rebased this branch. Maybe this will also solve the bug. If not, I added a commit that dumps contents of the problematic message into console.

grunch · 2024-09-12T18:13:19Z

@grunch I have tried to reproduce the bug, but I can't take a dispute - when I click on "Take dispute" button I get a message "You have been banned!". As I only have 2 telegram accounts, solver user is one of the participants, maybe that's the issue?

Yes, we ban users after being involved on n disputes, I think that restriction is not useful and we should remove it in the future, but to continue just remove the ban on the document for that user, change field banned to false, then try again

knocte · 2024-09-13T05:50:53Z

change field banned to false, then try again

Francisco, that is old info. After webwarrior wrote that message, I assisted him in his testing, being the 3rd user in his setup (the solver, in particular), and he couldn't reproduce the issue. See #585 (comment) , and test again with the new logs added please.

grunch · 2024-09-16T20:24:59Z

@grunch I have tried to reproduce the bug, but I can't take a dispute - when I click on "Take dispute" button I get a message "You have been banned!". As I only have 2 telegram accounts, solver user is one of the participants, maybe that's the issue?

Hi @webwarrior-ws sorry for the delay, are you able to run the bot in this branch? I'm testing and I'm getting this errors

[2024-09-16T17:22:26.672-03:00] error: ResubcribeInvoice catch: 503,UnexpectedGetInvoicesError,[object Object] 
[2024-09-16T17:23:00.027-03:00] error: 503,FailedToConnectToDaemon 
[2024-09-16T17:23:00.028-03:00] error: node info catch error: TypeError: Cannot read properties of undefined (reading 'is_synced_to_chain') 
[2024-09-16T17:24:00.022-03:00] error: 503,FailedToConnectToDaemon 
[2024-09-16T17:24:00.022-03:00] error: node info catch error: TypeError: Cannot read properties of undefined (reading 'is_synced_to_chain')

I that we are having conflics, can you solve them and we can try again?

The languageModel & fiatModel interface created to type-check the data and ensure that it conforms to the expected structure and format. This can help you avoid errors and bugs when working with the data in your code. This commit enables resolveJsonModule to import module with '.json' extension. Co-authored-by: webwarrior <[email protected]>

The --downlevelIteration flag is a TypeScript compiler option that enables support for iterating over new concepts like Map, Set, or Generator in older JavaScript runtimes. By default, TypeScript targets ES3, which does not support these features. If you use a for...of loop or a spread operator on an iterable object, you may get an error. Use Date instead of Date.toISOString cause paid_at has type Date and during the conversion from js to ts, we got compilation errors. Co-authored-by: webwarrior <[email protected]>

Co-authored-by: webwarrior <[email protected]>

Using null instead of a boolean/undefined type is better.

I had to change the '|', otherwise typescript would complain this error msg: ``` The '|' operator is not allowed for boolean types. Consider using '||' instead. ``` Co-authored-by: webwarrior <[email protected]>

Fix bugs in validations.ts introduced in d36a6b7 when porting to TypeScript.

Fixed bug in validateAdmin that would throw an error when community is null even though null value is valid in this case.

Don't convert dates to strings in isValidInvoice.

Added debug logging for case when `Invoice expiry is too short` error is encountered.

Added debug logging of message that caused error when taking dispute in community.

webwarrior-ws · 2024-09-24T08:30:17Z

@grunch I've rebased PR branch and there are no merge conflicts now. I've also tested it with standard sell/buy procedure and got no 503 errors that you have mentioned.

grunch

Thank you for solving the conflicts, I just tested it again and I found a new bug, here the log:

[2024-09-24T14:56:16.092-03:00] error: 400: Bad Request: can't parse entities: Character '.' is reserved and must be escaped with the preceding '\' Error: 400: Bad Request: can't parse entities: Character '.' is reserved and must be escaped with the preceding '\'
    at Telegram.callApi (/home/grunch/dev/bot-warrior/node_modules/telegraf/lib/core/network/client.js:315:19)
    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
    at async exports.disputeData (/home/grunch/dev/bot-warrior/bot/modules/dispute/messages.js:114:5)

I dig in a bit and I found that you can't use object properties inside locales, so I changed, here the patch, can you apply this on the other languages? thanks

diff --git a/bot/modules/dispute/messages.js b/bot/modules/dispute/messages.js
index a887012..d8bc775 100644
--- a/bot/modules/dispute/messages.js
+++ b/bot/modules/dispute/messages.js
@@ -1,4 +1,8 @@
-const { getDisputeChannel, getDetailedOrder, sanitizeMD } = require('../../../util');
+const {
+  getDisputeChannel,
+  getDetailedOrder,
+  sanitizeMD,
+} = require('../../../util');
 const { logger } = require('../../../logger');
 
 exports.beginDispute = async (ctx, initiator, order, buyer, seller) => {
@@ -91,11 +95,11 @@ exports.disputeData = async (
     // Fix Issue 543: Escape underscores in usernames
     const escapedInitiatorUsername = sanitizeMD(initiatorUser.username);
     const escapedCounterPartyUsername = sanitizeMD(counterPartyUser.username);
-    
+
     const message = ctx.i18n.t('dispute_started_channel', {
-      initiatorUser: { ...initiatorUser, username: escapedInitiatorUsername },
+      initiatorUser: escapedInitiatorUsername,
       initiatorTgId: initiatorUser.tg_id,
-      counterPartyUser: { ...counterPartyUser, username: escapedCounterPartyUsername },
+      counterPartyUser: escapedCounterPartyUsername,
       counterPartyUserTgId: counterPartyUser.tg_id,
       buyer,
       seller,
@@ -107,11 +111,9 @@ exports.disputeData = async (
       buyerToken: order.buyer_dispute_token,
     });
     console.log(`Contens of message:\n${message}`);
-    await ctx.telegram.sendMessage(
-      solver.tg_id,
-      message,
-      { parse_mode: 'MarkdownV2' }
-    );
+    await ctx.telegram.sendMessage(solver.tg_id, message, {
+      parse_mode: 'MarkdownV2',
+    });
     // message to both parties letting them know the dispute
     // has been taken by a solver
     await ctx.telegram.sendMessage(
diff --git a/locales/es.yaml b/locales/es.yaml
index 9baf03f..26cbc22 100644
--- a/locales/es.yaml
+++ b/locales/es.yaml
@@ -202,16 +202,16 @@ order_detail: |
 seller: vendedor
 buyer: comprador
 dispute_started_channel: |
-  El ${type} @${initiatorUser.username} TG ID: ${initiatorTgId}
-  ha iniciado una disputa con @${counterPartyUser.username} TG ID: ${counterPartyUserTgId} en la orden:
+  El ${type} @${initiatorUser} TG ID: ${initiatorTgId}
+  ha iniciado una disputa con @${counterPartyUser} TG ID: ${counterPartyUserTgId} en la orden:
 
   ${detailedOrder}
 
   Seller Token: ${sellerToken}
   Buyer Token: ${buyerToken}
 
-  @${initiatorUser.username} ya tiene ${buyerDisputes} disputas
-  @${counterPartyUser.username} ya tiene ${sellerDisputes} disputas
+  @${initiatorUser} ya tiene ${buyerDisputes} disputas
+  @${counterPartyUser} ya tiene ${sellerDisputes} disputas
 you_started: '🥴 Has iniciado una disputa en tu orden con Id: ${orderId}.'
 counterpart_started: '🥴 Tu contraparte ha iniciado una disputa en tu orden con Id: ${orderId}.'
 dispute_started: '${who} Un solver te atenderá pronto, cuando él/la solver sea asignado a tu disputa el bot te dirá su username, solo él/ella podrá atenderte. Puedes escribirle directamente, pero si él/ella te contacta primero, debes pedirle que te diga cuál es el token de tu disputa, tu token es: ${token}.'
diff --git a/util/index.ts b/util/index.ts
index 0b1bc7e..902d9e4 100644
--- a/util/index.ts
+++ b/util/index.ts
@@ -368,7 +368,7 @@ const getDetailedOrder = (i18n: I18nContext, order: IOrder, buyer: UserDocument,
     takenAt = sanitizeMD(takenAt);
     const previousDisputeStatus = sanitizeMD(order.previous_dispute_status);
     const status = sanitizeMD(order.status);
-    const fee = order.fee ? Number(order.fee) : '';
+    const fee = order.fee ? sanitizeMD(Number(order.fee)) : '';
     const creator =
       order.creator_id === buyerId ? buyerUsername : sellerUsername;
     const buyerAge = buyer? getUserAge(buyer) : '';

Don't use object properties inside locales, as it doesn't work and leads to parse errors.

webwarrior-ws · 2024-09-26T12:38:59Z

@grunch applied your patch, updated locales and disputes test

grunch · 2024-09-26T14:59:39Z

@grunch applied your patch, updated locales and disputes test

great job, thanks for this contribution, as we are receiving some donations we want to give back some sats to our contributors, it's more of a symbolic gesture of gratitude 😃

Please add as a comment a lightning invoice with amount of 200,000 sats

webwarrior-ws · 2024-09-27T17:17:26Z

lnbc2m1pn0dtz0pp5ru28d55mfjw2aypjvsu7xnd5uj7363mz095slnwmca05mcequ9nscqpjsp5vuprh07ze5nk2k6rhx7zjy67axfqmsej9gmt6a7zudhsy7ej8zas9q7sqqqqqqqqqqqqqqqqqqqsqqqqqysgqdqqmqz9gxqyjw5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll6lyxlsu4fuhqqqqqlgqqqqqeqqjqu7s52ap9967fnyvqc9nphcccsqpl3txa679zpzw2f0h6gwqhex7qwf5y2eywlmd5wyjx9e7k5ckn2luml34c304mtyuze87zy5mkfdgpmqngrw

grunch · 2024-09-27T19:19:51Z

lnbc2m1pn0dtz0pp5ru28d55mfjw2aypjvsu7xnd5uj7363mz095slnwmca05mcequ9nscqpjsp5vuprh07ze5nk2k6rhx7zjy67axfqmsej9gmt6a7zudhsy7ej8zas9q7sqqqqqqqqqqqqqqqqqqqsqqqqqysgqdqqmqz9gxqyjw5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll6lyxlsu4fuhqqqqqlgqqqqqeqqjqu7s52ap9967fnyvqc9nphcccsqpl3txa679zpzw2f0h6gwqhex7qwf5y2eywlmd5wyjx9e7k5ckn2luml34c304mtyuze87zy5mkfdgpmqngrw

Payment hash: 1f1476d29b4c9cae90326439e34db4e4bd1d476279690fcddbc75f4de320e167
Payment status: SUCCEEDED, preimage: ed4600e227269b6d29068d1b7eb51e8bd77f9137b94e334e6bcb561b5ffcc7cf

grunch requested review from Catrya and grunch September 3, 2024 14:31

Catrya reviewed Sep 4, 2024

View reviewed changes

webwarrior-ws force-pushed the convert-to-ts-remaining branch 3 times, most recently from fae0e71 to e79a108 Compare September 5, 2024 08:39

webwarrior-ws requested a review from Catrya September 5, 2024 13:03

Catrya reviewed Sep 6, 2024

View reviewed changes

webwarrior-ws closed this Sep 12, 2024

webwarrior-ws force-pushed the convert-to-ts-remaining branch from 1e1d276 to 74a60e2 Compare September 12, 2024 12:39

webwarrior-ws reopened this Sep 12, 2024

Mersho and others added 2 commits September 24, 2024 10:12

Mersho and others added 10 commits September 24, 2024 10:12

bot/start: fixing types & import/exports

2501abc

Co-authored-by: webwarrior <[email protected]>

bot/validation: convert js to ts

df9681c

Using null instead of a boolean/undefined type is better.

lnurl/lnurl-pay: convert js to ts

ff52901

I had to change the '|', otherwise typescript would complain this error msg: ``` The '|' operator is not allowed for boolean types. Consider using '||' instead. ``` Co-authored-by: webwarrior <[email protected]>

refactor: correcting a bad practice

27c978e

refactor: there's no need for isInt()

4aeffd6

bot: fix bugs in validations.ts

8d7865a

Fix bugs in validations.ts introduced in d36a6b7 when porting to TypeScript.

bot,util: fix bug in validateAdmin

a256aaa

Fixed bug in validateAdmin that would throw an error when community is null even though null value is valid in this case.

bot: fix date comparison in isValidInvoice

8a22b8f

Don't convert dates to strings in isValidInvoice.

WIP: added some debug logging

20b6ccf

Added debug logging for case when `Invoice expiry is too short` error is encountered.

WIP: more debug logging

ba09fdd

Added debug logging of message that caused error when taking dispute in community.

webwarrior-ws closed this Sep 24, 2024

webwarrior-ws force-pushed the convert-to-ts-remaining branch from 867151c to 2ee0fce Compare September 24, 2024 08:14

webwarrior-ws reopened this Sep 24, 2024

grunch requested changes Sep 24, 2024

View reviewed changes

bot,util,locales,tests: don't use objects in locales

706b9fd

Don't use object properties inside locales, as it doesn't work and leads to parse errors.

webwarrior-ws force-pushed the convert-to-ts-remaining branch from ede5ef3 to 706b9fd Compare September 26, 2024 12:34

grunch approved these changes Sep 26, 2024

View reviewed changes

grunch merged commit a46260d into lnp2pBot:main Sep 26, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert JS to TS (commits 7-13 of PR435) - attempt#2 #585

Convert JS to TS (commits 7-13 of PR435) - attempt#2 #585

webwarrior-ws commented Sep 3, 2024

Catrya left a comment

Catrya left a comment •

edited

Loading

Catrya left a comment

webwarrior-ws commented Sep 5, 2024

webwarrior-ws commented Sep 5, 2024

Catrya commented Sep 6, 2024

Catrya left a comment

webwarrior-ws commented Sep 9, 2024

Catrya commented Sep 9, 2024

webwarrior-ws commented Sep 9, 2024

Catrya commented Sep 9, 2024

webwarrior-ws commented Sep 10, 2024

knocte commented Sep 10, 2024

grunch commented Sep 10, 2024

webwarrior-ws commented Sep 12, 2024

webwarrior-ws commented Sep 12, 2024

grunch commented Sep 12, 2024

knocte commented Sep 13, 2024

grunch commented Sep 16, 2024

webwarrior-ws commented Sep 24, 2024

grunch left a comment

webwarrior-ws commented Sep 26, 2024

grunch commented Sep 26, 2024

webwarrior-ws commented Sep 27, 2024

grunch commented Sep 27, 2024

Convert JS to TS (commits 7-13 of PR435) - attempt#2 #585

Convert JS to TS (commits 7-13 of PR435) - attempt#2 #585

Conversation

webwarrior-ws commented Sep 3, 2024

Catrya left a comment

Choose a reason for hiding this comment

Catrya left a comment • edited Loading

Choose a reason for hiding this comment

Catrya left a comment

Choose a reason for hiding this comment

webwarrior-ws commented Sep 5, 2024

webwarrior-ws commented Sep 5, 2024

Catrya commented Sep 6, 2024

Catrya left a comment

Choose a reason for hiding this comment

webwarrior-ws commented Sep 9, 2024

Catrya commented Sep 9, 2024

webwarrior-ws commented Sep 9, 2024

Catrya commented Sep 9, 2024

webwarrior-ws commented Sep 10, 2024

knocte commented Sep 10, 2024

grunch commented Sep 10, 2024

webwarrior-ws commented Sep 12, 2024

webwarrior-ws commented Sep 12, 2024

grunch commented Sep 12, 2024

knocte commented Sep 13, 2024

grunch commented Sep 16, 2024

webwarrior-ws commented Sep 24, 2024

grunch left a comment

Choose a reason for hiding this comment

webwarrior-ws commented Sep 26, 2024

grunch commented Sep 26, 2024

webwarrior-ws commented Sep 27, 2024

grunch commented Sep 27, 2024

Catrya left a comment •

edited

Loading