live user op

proto/autogenerated/client.md

@@ -80,6 +80,11 @@ The nostr server will send back a message response, and inside the body there wi
   - This methods has an __empty__ __request__ body
   - output: [LnurlLinkResponse](#LnurlLinkResponse)
 
+- GetLiveUserOperations
+  - auth type: __User__
+  - This methods has an __empty__ __request__ body
+  - output: [LiveUserOperation](#LiveUserOperation)
+
 # HTTP API DEFINITION
 
 ## Supported HTTP Auths
@@ -90,9 +95,9 @@ The nostr server will send back a message response, and inside the body there wi
 
 - __User__:
   - expected context content
+    - __app_id__: _string_
     - __app_user_id__: _string_
     - __user_id__: _string_
-    - __app_id__: _string_
 
 - __Admin__:
   - expected context content
@@ -355,41 +360,48 @@ The nostr server will send back a message response, and inside the body there wi
   - This methods has an __empty__ __request__ body
   - output: [LnurlLinkResponse](#LnurlLinkResponse)
 
+- GetLiveUserOperations
+  - auth type: __User__
+  - http method: __post__
+  - http route: __/api/user/operations/sub__
+  - This methods has an __empty__ __request__ body
+  - output: [LiveUserOperation](#LiveUserOperation)
+
 # INPUTS AND OUTPUTS
 
 ## Messages
 ### The content of requests and response from the methods
 
-### EncryptionExchangeRequest
-  - __publicKey__: _string_
-  - __deviceId__: _string_
-
-### PayInvoiceResponse
-  - __preimage__: _string_
-  - __amount_paid__: _number_
-
 ### SetMockAppUserBalanceRequest
   - __user_identifier__: _string_
   - __amount__: _number_
 
-### HandleLnurlPayResponse
-  - __pr__: _string_
-  - __routes__: ARRAY of: _[Empty](#Empty)_
+### LndGetInfoRequest
+  - __nodeId__: _number_
 
-### UserOperations
-  - __fromIndex__: _number_
-  - __toIndex__: _number_
-  - __operations__: ARRAY of: _[UserOperation](#UserOperation)_
-
-### Empty
+### AddAppUserInvoiceRequest
+  - __receiver_identifier__: _string_
+  - __payer_identifier__: _string_
+  - __http_callback_url__: _string_
+  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
 
 ### GetAppUserLNURLInfoRequest
   - __user_identifier__: _string_
   - __base_url_override__: _string_
 
-### SendAppUserToAppPaymentRequest
-  - __from_user_identifier__: _string_
-  - __amount__: _number_
+### Product
+  - __id__: _string_
+  - __name__: _string_
+  - __price_sats__: _number_
+
+### PayAddressRequest
+  - __address__: _string_
+  - __amoutSats__: _number_
+  - __satsPerVByte__: _number_
+
+### HandleLnurlPayResponse
+  - __pr__: _string_
+  - __routes__: ARRAY of: _[Empty](#Empty)_
 
 ### GetUserOperationsRequest
   - __latestIncomingInvoice__: _number_
@@ -399,54 +411,117 @@ The nostr server will send back a message response, and inside the body there wi
   - __latestIncomingUserToUserPayment__: _number_
   - __latestOutgoingUserToUserPayment__: _number_
 
-### UserOperation
-  - __paidAtUnix__: _number_
-  - __type__: _[UserOperationType](#UserOperationType)_
-  - __inbound__: _boolean_
-  - __amount__: _number_
+### NewAddressResponse
+  - __address__: _string_
 
-### Product
-  - __id__: _string_
-  - __name__: _string_
-  - __price_sats__: _number_
-
-### LndGetInfoResponse
-  - __alias__: _string_
-
-### AddAppUserRequest
-  - __identifier__: _string_
-  - __fail_if_exists__: _boolean_
-  - __balance__: _number_
-
-### OpenChannelResponse
-  - __channelId__: _string_
-
-### LnurlLinkResponse
-  - __lnurl__: _string_
-  - __k1__: _string_
+### NewInvoiceRequest
+  - __amountSats__: _number_
+  - __memo__: _string_
 
 ### AddProductRequest
   - __name__: _string_
   - __price_sats__: _number_
 
-### DecodeInvoiceResponse
+### UserOperations
+  - __fromIndex__: _number_
+  - __toIndex__: _number_
+  - __operations__: ARRAY of: _[UserOperation](#UserOperation)_
+
+### PayAddressResponse
+  - __txId__: _string_
+
+### LnurlPayInfoResponse
+  - __tag__: _string_
+  - __callback__: _string_
+  - __maxSendable__: _number_
+  - __minSendable__: _number_
+  - __metadata__: _string_
+
+### UserInfo
+  - __userId__: _string_
+  - __balance__: _number_
+
+### SendAppUserToAppPaymentRequest
+  - __from_user_identifier__: _string_
   - __amount__: _number_
 
+### SetMockAppBalanceRequest
+  - __amount__: _number_
+
+### OpenChannelRequest
+  - __destination__: _string_
+  - __fundingAmount__: _number_
+  - __pushAmount__: _number_
+  - __closeAddress__: _string_
+
+### GetUserOperationsResponse
+  - __latestOutgoingInvoiceOperations__: _[UserOperations](#UserOperations)_
+  - __latestIncomingInvoiceOperations__: _[UserOperations](#UserOperations)_
+  - __latestOutgoingTxOperations__: _[UserOperations](#UserOperations)_
+  - __latestIncomingTxOperations__: _[UserOperations](#UserOperations)_
+  - __latestOutgoingUserToUserPayemnts__: _[UserOperations](#UserOperations)_
+  - __latestIncomingUserToUserPayemnts__: _[UserOperations](#UserOperations)_
+
+### LiveUserOperation
+  - __id__: _string_
+
+### LndGetInfoResponse
+  - __alias__: _string_
+
+### AuthApp
+  - __app__: _[Application](#Application)_
+  - __auth_token__: _string_
+
+### SendAppUserToAppUserPaymentRequest
+  - __from_user_identifier__: _string_
+  - __to_user_identifier__: _string_
+  - __amount__: _number_
+
+### AddAppInvoiceRequest
+  - __payer_identifier__: _string_
+  - __http_callback_url__: _string_
+  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
+
+### PayAppUserInvoiceResponse
+  - __preimage__: _string_
+  - __amount_paid__: _number_
+
+### NewAddressRequest
+  - __addressType__: _[AddressType](#AddressType)_
+
+### NewInvoiceResponse
+  - __invoice__: _string_
+
 ### PayInvoiceRequest
   - __invoice__: _string_
   - __amount__: _number_
 
-### AuthApp
-  - __app__: _[Application](#Application)_
-  - __auth_token__: _string_
+### AddAppRequest
+  - __name__: _string_
+  - __allow_user_creation__: _boolean_
+
+### Application
+  - __name__: _string_
+  - __id__: _string_
+  - __balance__: _number_
+  - __npub__: _string_
 
 ### AppUser
   - __identifier__: _string_
   - __info__: _[UserInfo](#UserInfo)_
   - __max_withdrawable__: _number_
 
-### PayAddressResponse
-  - __txId__: _string_
+### GetProductBuyLinkResponse
+  - __link__: _string_
+
+### PayAppUserInvoiceRequest
+  - __user_identifier__: _string_
+  - __invoice__: _string_
+  - __amount__: _number_
+
+### PayInvoiceResponse
+  - __preimage__: _string_
+  - __amount_paid__: _number_
 
 ### LnurlWithdrawInfoResponse
   - __tag__: _string_
@@ -458,106 +533,46 @@ The nostr server will send back a message response, and inside the body there wi
   - __balanceCheck__: _string_
   - __payLink__: _string_
 
-### LndGetInfoRequest
-  - __nodeId__: _number_
+### UserOperation
+  - __paidAtUnix__: _number_
+  - __type__: _[UserOperationType](#UserOperationType)_
+  - __inbound__: _boolean_
+  - __amount__: _number_
+
+### Empty
+
+### AddAppUserRequest
+  - __identifier__: _string_
+  - __fail_if_exists__: _boolean_
+  - __balance__: _number_
+
+### GetAppUserRequest
+  - __user_identifier__: _string_
+
+### DecodeInvoiceRequest
+  - __invoice__: _string_
+
+### DecodeInvoiceResponse
+  - __amount__: _number_
+
+### OpenChannelResponse
+  - __channelId__: _string_
+
+### LnurlLinkResponse
+  - __lnurl__: _string_
+  - __k1__: _string_
+
+### EncryptionExchangeRequest
+  - __publicKey__: _string_
+  - __deviceId__: _string_
 
 ### SetMockInvoiceAsPaidRequest
   - __invoice__: _string_
   - __amount__: _number_
 
-### PayAppUserInvoiceRequest
-  - __user_identifier__: _string_
-  - __invoice__: _string_
-  - __amount__: _number_
-
-### SendAppUserToAppUserPaymentRequest
-  - __from_user_identifier__: _string_
-  - __to_user_identifier__: _string_
-  - __amount__: _number_
-
-### SetMockAppBalanceRequest
-  - __amount__: _number_
-
-### NewAddressRequest
-  - __addressType__: _[AddressType](#AddressType)_
-
-### NewAddressResponse
-  - __address__: _string_
-
-### NewInvoiceResponse
-  - __invoice__: _string_
-
-### AddAppRequest
-  - __name__: _string_
-  - __allow_user_creation__: _boolean_
-
-### GetAppUserRequest
-  - __user_identifier__: _string_
-
-### GetUserOperationsResponse
-  - __latestOutgoingInvoiceOperations__: _[UserOperations](#UserOperations)_
-  - __latestIncomingInvoiceOperations__: _[UserOperations](#UserOperations)_
-  - __latestOutgoingTxOperations__: _[UserOperations](#UserOperations)_
-  - __latestIncomingTxOperations__: _[UserOperations](#UserOperations)_
-  - __latestOutgoingUserToUserPayemnts__: _[UserOperations](#UserOperations)_
-  - __latestIncomingUserToUserPayemnts__: _[UserOperations](#UserOperations)_
-
-### GetProductBuyLinkResponse
-  - __link__: _string_
-
-### OpenChannelRequest
-  - __destination__: _string_
-  - __fundingAmount__: _number_
-  - __pushAmount__: _number_
-  - __closeAddress__: _string_
-
-### LnurlPayInfoResponse
-  - __tag__: _string_
-  - __callback__: _string_
-  - __maxSendable__: _number_
-  - __minSendable__: _number_
-  - __metadata__: _string_
-
-### AddAppUserInvoiceRequest
-  - __receiver_identifier__: _string_
-  - __payer_identifier__: _string_
-  - __http_callback_url__: _string_
-  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
-
-### UserInfo
-  - __userId__: _string_
-  - __balance__: _number_
-
-### AddAppInvoiceRequest
-  - __payer_identifier__: _string_
-  - __http_callback_url__: _string_
-  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
-
-### PayAppUserInvoiceResponse
-  - __preimage__: _string_
-  - __amount_paid__: _number_
-
-### PayAddressRequest
-  - __address__: _string_
-  - __amoutSats__: _number_
-  - __satsPerVByte__: _number_
-
-### NewInvoiceRequest
-  - __amountSats__: _number_
-  - __memo__: _string_
-
-### DecodeInvoiceRequest
-  - __invoice__: _string_
-
 ### AuthAppRequest
   - __name__: _string_
   - __allow_user_creation__: _boolean_ *this field is optional
-
-### Application
-  - __name__: _string_
-  - __id__: _string_
-  - __balance__: _number_
-  - __npub__: _string_
 ## Enums
 ### The enumerators used in the messages
 

proto/autogenerated/ts/express_server.ts

@@ -519,4 +519,5 @@ export type MethodsOverride = {
     GetLnurlWithdrawLink_Override?: (httpRes:Response, handlerRes:Types.LnurlLinkResponse) => Promise<void>
     GetLnurlPayLink_Override?: (httpRes:Response, handlerRes:Types.LnurlLinkResponse) => Promise<void>
     GetLNURLChannelLink_Override?: (httpRes:Response, handlerRes:Types.LnurlLinkResponse) => Promise<void>
+    GetLiveUserOperations_Override?: (httpRes:Response, handlerRes:Types.LiveUserOperation) => Promise<void>
 }

proto/autogenerated/ts/http_client.ts

@@ -477,4 +477,5 @@ export default (params: ClientParams) => ({
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    GetLiveUserOperations: async (cb: (v:ResultError | ({ status: 'OK' }& Types.LiveUserOperation)) => void): Promise<void> => { throw  new Error('http streams are not supported')}
 })

proto/autogenerated/ts/nostr_client.ts

@@ -8,7 +8,7 @@ export type NostrClientParams = {
     retrieveNostrUserAuth: () => Promise<string | null>
     checkResult?: true
 }
-export default (params: NostrClientParams,  send: (to:string, message: NostrRequest) => Promise<any>) => ({
+export default (params: NostrClientParams, send: (to: string, message: NostrRequest) => Promise<any>, subscribe: (to: string, message: NostrRequest, cb: (res: any) => void) => void) => ({
     GetUserInfo: async (): Promise<ResultError | ({ status: 'OK' } & Types.UserInfo)> => {
         const auth = await params.retrieveNostrUserAuth()
         if (auth === null) throw new Error('retrieveNostrUserAuth() returned null')
@@ -200,4 +200,19 @@ export default (params: NostrClientParams,  send: (to:string, message: NostrRequ
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    GetLiveUserOperations: async (cb: (res: ResultError | ({ status: 'OK' } & Types.LiveUserOperation)) => void): Promise<void> => {
+        const auth = await params.retrieveNostrUserAuth()
+        if (auth === null) throw new Error('retrieveNostrUserAuth() returned null')
+        const nostrRequest: NostrRequest = {}
+        subscribe(params.pubDestination, { rpcName: 'GetLiveUserOperations', authIdentifier: auth, ...nostrRequest }, (data) => {
+            if (data.status === 'ERROR' && typeof data.reason === 'string') return cb(data)
+            if (data.status === 'OK') {
+                const result = data
+                if (!params.checkResult) return { status: 'OK', ...result }
+                const error = Types.LiveUserOperationValidate(result)
+                if (error === null) { return cb({ status: 'OK', ...result }) } else return cb({ status: 'ERROR', reason: error.message })
+            }
+            return cb({ status: 'ERROR', reason: 'invalid response' })
+        })
+    },
 })

proto/autogenerated/ts/nostr_transport.ts

@@ -176,6 +176,17 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                     res({status: 'OK', ...response})
                 }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
                 break
+            case 'GetLiveUserOperations':
+                try {
+                    if (!methods.GetLiveUserOperations) throw new Error('method: GetLiveUserOperations is not implemented')
+                    const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
+                    const query = req.query
+                    const params = req.params
+                    methods.GetLiveUserOperations({ ...authContext, ...query, ...params }, (response, err) => {
+                    if (err) { logErrorAndReturnResponse(err, err.message, res, logger)} else { res({status: 'OK', ...response})}
+                    })
+                }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
+                break
             default: logger.error('unknown rpc call name from nostr event:'+req.rpcName) 
         }
     }

proto/service/methods.proto

@@ -298,5 +298,11 @@ service LightningPub {
         option (http_route) = "/api/user/lnurl_channel/url";
         option (nostr) = true;
     }
+    rpc GetLiveUserOperations(structs.Empty) returns (stream structs.LiveUserOperation){
+        option (auth_type)  = "User";
+        option (http_method) = "post";
+        option (http_route) = "/api/user/operations/sub";
+        option (nostr) = true;
+    }
     // </User>
 }

proto/service/structs.proto

@@ -253,3 +253,7 @@ message Product {
 message GetProductBuyLinkResponse {
     string link = 1;
 }
+
+message LiveUserOperation {
+    string id = 1;
+}

src/services/main/paymentManager.ts

@@ -23,6 +23,7 @@ export default class {
         this.settings = settings
         this.lnd = lnd
     }
+
     getServiceFee(action: Types.UserOperationType, amount: number, appUser: boolean): number {
         switch (action) {
             case Types.UserOperationType.INCOMING_TX:

src/services/storage/paymentStorage.ts

@@ -50,7 +50,7 @@ export default class {
     async AddUserAddress(userId: string, address: string, opts: { callbackUrl?: string, linkedApplication?: Application } = {}, entityManager = this.DB): Promise<UserReceivingAddress> {
         const newUserAddress = entityManager.getRepository(UserReceivingAddress).create({
             address,
-            callbackUrl: opts.callbackUrl,
+            callbackUrl: opts.callbackUrl || "",
             linkedApplication: opts.linkedApplication,
             user: await this.userStorage.GetUser(userId, entityManager)
         })