fix

2023-12-15 20:54:19 +01:00 · 2023-12-15 20:54:19 +01:00 · 81e1e9b51b
commit 81e1e9b51b
parent b41a867f53
6 changed files with 2164 additions and 2162 deletions
--- a/proto/autogenerated/client.md
+++ b/proto/autogenerated/client.md
@ -414,54 +414,34 @@ The nostr server will send back a message response, and inside the body there wi
 ## Messages
 ### The content of requests and response from the methods

-### LndGetInfoResponse
-  - __alias__: _string_
+### LnurlWithdrawInfoResponse
+  - __tag__: _string_
+  - __callback__: _string_
+  - __k1__: _string_
+  - __defaultDescription__: _string_
+  - __minWithdrawable__: _number_
+  - __maxWithdrawable__: _number_
+  - __balanceCheck__: _string_
+  - __payLink__: _string_

-### AuthAppRequest
-  - __name__: _string_
-  - __allow_user_creation__: _boolean_ *this field is optional
+### UsageMetrics
+  - __metrics__: ARRAY of: _[UsageMetric](#UsageMetric)_

-### PayAddressRequest
-  - __address__: _string_
-  - __amoutSats__: _number_
-  - __satsPerVByte__: _number_
-
-### OpenChannelResponse
-  - __channelId__: _string_
-
-### UserOperation
-  - __paidAtUnix__: _number_
-  - __type__: _[UserOperationType](#UserOperationType)_
-  - __inbound__: _boolean_
+### SetMockInvoiceAsPaidRequest
+  - __invoice__: _string_
  - __amount__: _number_
-  - __identifier__: _string_
-  - __operationId__: _string_
+
+### SetMockAppBalanceRequest
+  - __amount__: _number_
+
+### NewAddressRequest
+  - __addressType__: _[AddressType](#AddressType)_
+
+### PayAddressResponse
+  - __txId__: _string_
+  - __operation_id__: _string_
  - __service_fee__: _number_
  - __network_fee__: _number_
-  - __confirmed__: _boolean_
-
-### UserOperations
-  - __fromIndex__: _number_
-  - __toIndex__: _number_
-  - __operations__: ARRAY of: _[UserOperation](#UserOperation)_
-
-### AddAppRequest
-  - __name__: _string_
-  - __allow_user_creation__: _boolean_
-
-### AppUser
-  - __identifier__: _string_
-  - __info__: _[UserInfo](#UserInfo)_
-  - __max_withdrawable__: _number_
-
-### NewInvoiceRequest
-  - __amountSats__: _number_
-  - __memo__: _string_
-
-### UserInfo
-  - __userId__: _string_
-  - __balance__: _number_
-  - __max_withdrawable__: _number_

 ### LnurlPayInfoResponse
  - __tag__: _string_
@ -476,65 +456,46 @@ The nostr server will send back a message response, and inside the body there wi
  - __pr__: _string_
  - __routes__: ARRAY of: _[Empty](#Empty)_

-### SetMockInvoiceAsPaidRequest
-  - __invoice__: _string_
-  - __amount__: _number_
+### UserInfo
+  - __userId__: _string_
+  - __balance__: _number_
+  - __max_withdrawable__: _number_

-### AddAppUserInvoiceRequest
-  - __receiver_identifier__: _string_
+### AddAppInvoiceRequest
  - __payer_identifier__: _string_
  - __http_callback_url__: _string_
  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_

-### SendAppUserToAppPaymentRequest
-  - __from_user_identifier__: _string_
-  - __amount__: _number_
-
-### DecodeInvoiceRequest
-  - __invoice__: _string_
-
-### OpenChannelRequest
-  - __destination__: _string_
-  - __fundingAmount__: _number_
-  - __pushAmount__: _number_
-  - __closeAddress__: _string_
-
-### LnurlWithdrawInfoResponse
-  - __tag__: _string_
-  - __callback__: _string_
-  - __k1__: _string_
-  - __defaultDescription__: _string_
-  - __minWithdrawable__: _number_
-  - __maxWithdrawable__: _number_
-  - __balanceCheck__: _string_
-  - __payLink__: _string_
-
-### GetProductBuyLinkResponse
-  - __link__: _string_
-
-### Application
-  - __name__: _string_
-  - __id__: _string_
-  - __balance__: _number_
-  - __npub__: _string_
-
-### SendAppUserToAppUserPaymentRequest
-  - __from_user_identifier__: _string_
-  - __to_user_identifier__: _string_
-  - __amount__: _number_
+### GetAppUserLNURLInfoRequest
+  - __user_identifier__: _string_
+  - __base_url_override__: _string_

 ### SetMockAppUserBalanceRequest
  - __user_identifier__: _string_
  - __amount__: _number_

-### SetMockAppBalanceRequest
+### NewAddressResponse
+  - __address__: _string_
+
+### DecodeInvoiceResponse
  - __amount__: _number_

-### PayAddressResponse
-  - __txId__: _string_
-  - __operation_id__: _string_
-  - __service_fee__: _number_
-  - __network_fee__: _number_
+### AddProductRequest
+  - __name__: _string_
+  - __price_sats__: _number_
+
+### EncryptionExchangeRequest
+  - __publicKey__: _string_
+  - __deviceId__: _string_
+
+### PayAppUserInvoiceRequest
+  - __user_identifier__: _string_
+  - __invoice__: _string_
+  - __amount__: _number_
+
+### NewInvoiceRequest
+  - __amountSats__: _number_
+  - __memo__: _string_

 ### GetUserOperationsResponse
  - __latestOutgoingInvoiceOperations__: _[UserOperations](#UserOperations)_
@ -544,19 +505,8 @@ The nostr server will send back a message response, and inside the body there wi
  - __latestOutgoingUserToUserPayemnts__: _[UserOperations](#UserOperations)_
  - __latestIncomingUserToUserPayemnts__: _[UserOperations](#UserOperations)_

-### EncryptionExchangeRequest
-  - __publicKey__: _string_
-  - __deviceId__: _string_
-
-### NewAddressResponse
-  - __address__: _string_
-
-### NewInvoiceResponse
-  - __invoice__: _string_
-
-### LnurlLinkResponse
-  - __lnurl__: _string_
-  - __k1__: _string_
+### LiveUserOperation
+  - __operation__: _[UserOperation](#UserOperation)_

 ### GetUserOperationsRequest
  - __latestIncomingInvoice__: _number_
@ -566,6 +516,102 @@ The nostr server will send back a message response, and inside the body there wi
  - __latestIncomingUserToUserPayment__: _number_
  - __latestOutgoingUserToUserPayment__: _number_

+### GetProductBuyLinkResponse
+  - __link__: _string_
+
+### LndGetInfoResponse
+  - __alias__: _string_
+
+### AddAppUserInvoiceRequest
+  - __receiver_identifier__: _string_
+  - __payer_identifier__: _string_
+  - __http_callback_url__: _string_
+  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
+
+### NewInvoiceResponse
+  - __invoice__: _string_
+
+### UserOperations
+  - __fromIndex__: _number_
+  - __toIndex__: _number_
+  - __operations__: ARRAY of: _[UserOperation](#UserOperation)_
+
+### MigrationUpdate
+  - __closure__: _[ClosureMigration](#ClosureMigration)_ *this field is optional
+  - __relays__: _[RelaysMigration](#RelaysMigration)_ *this field is optional
+
+### SendAppUserToAppPaymentRequest
+  - __from_user_identifier__: _string_
+  - __amount__: _number_
+
+### DecodeInvoiceRequest
+  - __invoice__: _string_
+
+### UserOperation
+  - __paidAtUnix__: _number_
+  - __type__: _[UserOperationType](#UserOperationType)_
+  - __inbound__: _boolean_
+  - __amount__: _number_
+  - __identifier__: _string_
+  - __operationId__: _string_
+  - __service_fee__: _number_
+  - __network_fee__: _number_
+  - __confirmed__: _boolean_
+
+### PayAddressRequest
+  - __address__: _string_
+  - __amoutSats__: _number_
+  - __satsPerVByte__: _number_
+
+### PayInvoiceRequest
+  - __invoice__: _string_
+  - __amount__: _number_
+
+### OpenChannelResponse
+  - __channelId__: _string_
+
+### LndGetInfoRequest
+  - __nodeId__: _number_
+
+### AuthAppRequest
+  - __name__: _string_
+  - __allow_user_creation__: _boolean_ *this field is optional
+
+### AuthApp
+  - __app__: _[Application](#Application)_
+  - __auth_token__: _string_
+
+### GetAppUserRequest
+  - __user_identifier__: _string_
+
+### SendAppUserToAppUserPaymentRequest
+  - __from_user_identifier__: _string_
+  - __to_user_identifier__: _string_
+  - __amount__: _number_
+
+### RelaysMigration
+  - __relays__: ARRAY of: _string_
+
+### AppUser
+  - __identifier__: _string_
+  - __info__: _[UserInfo](#UserInfo)_
+  - __max_withdrawable__: _number_
+
+### PayInvoiceResponse
+  - __preimage__: _string_
+  - __amount_paid__: _number_
+  - __operation_id__: _string_
+  - __service_fee__: _number_
+  - __network_fee__: _number_
+
+### OpenChannelRequest
+  - __destination__: _string_
+  - __fundingAmount__: _number_
+  - __pushAmount__: _number_
+  - __closeAddress__: _string_
+
+### Empty
+
 ### UsageMetric
  - __processed_at_nano__: _string_
  - __parsed_in_nano__: _number_
@ -577,78 +623,32 @@ The nostr server will send back a message response, and inside the body there wi
  - __nostr__: _boolean_
  - __batch_size__: _number_

-### UsageMetrics
-  - __metrics__: ARRAY of: _[UsageMetric](#UsageMetric)_
+### AddAppRequest
+  - __name__: _string_
+  - __allow_user_creation__: _boolean_

-### AuthApp
-  - __app__: _[Application](#Application)_
-  - __auth_token__: _string_
+### Application
+  - __name__: _string_
+  - __id__: _string_
+  - __balance__: _number_
+  - __npub__: _string_

 ### AddAppUserRequest
  - __identifier__: _string_
  - __fail_if_exists__: _boolean_
  - __balance__: _number_

-### NewAddressRequest
-  - __addressType__: _[AddressType](#AddressType)_
-
-### DecodeInvoiceResponse
-  - __amount__: _number_
-
-### ClosureMigration
-  - __closes_at_unix__: _number_
-
-### RelaysMigration
-  - __relays__: ARRAY of: _string_
-
-### MigrationUpdate
-  - __closure__: _[ClosureMigration](#ClosureMigration)_ *this field is optional
-  - __relays__: _[RelaysMigration](#RelaysMigration)_ *this field is optional
-
-### LndGetInfoRequest
-  - __nodeId__: _number_
-
-### PayAppUserInvoiceRequest
-  - __user_identifier__: _string_
-  - __invoice__: _string_
-  - __amount__: _number_
-
-### GetAppUserLNURLInfoRequest
-  - __user_identifier__: _string_
-  - __base_url_override__: _string_
-
-### PayInvoiceResponse
-  - __preimage__: _string_
-  - __amount_paid__: _number_
-  - __operation_id__: _string_
-  - __service_fee__: _number_
-  - __network_fee__: _number_
-
-### AddProductRequest
-  - __name__: _string_
-  - __price_sats__: _number_
+### LnurlLinkResponse
+  - __lnurl__: _string_
+  - __k1__: _string_

 ### Product
  - __id__: _string_
  - __name__: _string_
  - __price_sats__: _number_

-### Empty
-
-### AddAppInvoiceRequest
-  - __payer_identifier__: _string_
-  - __http_callback_url__: _string_
-  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
-
-### GetAppUserRequest
-  - __user_identifier__: _string_
-
-### PayInvoiceRequest
-  - __invoice__: _string_
-  - __amount__: _number_
-
-### LiveUserOperation
-  - __operation__: _[UserOperation](#UserOperation)_
+### ClosureMigration
+  - __closes_at_unix__: _number_
 ## Enums
 ### The enumerators used in the messages

--- a/proto/autogenerated/debug.txt
+++ b/proto/autogenerated/debug.txt
--- a/proto/autogenerated/ts/express_server.ts
+++ b/proto/autogenerated/ts/express_server.ts
@ -957,6 +957,7 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
                    }
                } catch(ex) {const e = ex as any; logger.error(e.message || e); callsMetrics.push({ ...opInfo, ...opStats, ...ctx, error: e.message }); responses.push({ status: 'ERROR', reason: e.message || e })}
            }
+            stats.handle = process.hrtime.bigint()
            res.json({ status: 'OK', responses })
            opts.metricsCallback([{ ...info, ...stats, ...ctx }, ...callsMetrics])
        } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
--- a/proto/autogenerated/ts/nostr_transport.ts
+++ b/proto/autogenerated/ts/nostr_transport.ts
@ -418,6 +418,7 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                            }
                        } catch(ex) {const e = ex as any; logger.error(e.message || e); callsMetrics.push({ ...opInfo, ...opStats, ...ctx, error: e.message }); responses.push({ status: 'ERROR', reason: e.message || e })}
                    }
+                    stats.handle = process.hrtime.bigint()
                    res({ status: 'OK', responses })
                    opts.metricsCallback([{ ...info, ...stats, ...ctx }, ...callsMetrics])
                }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
--- a/proto/autogenerated/ts/types.ts
+++ b/proto/autogenerated/ts/types.ts
--- a/proto/protoc-gen-pub
+++ b/proto/protoc-gen-pub