add alerter endpoints
This commit is contained in:
parent
74e6d5b3ca
commit
ed6036ce1e
20 changed files with 414 additions and 11 deletions
|
|
@ -158,6 +158,11 @@ The nostr server will send back a message response, and inside the body there wi
|
||||||
- input: [GetPaymentStateRequest](#GetPaymentStateRequest)
|
- input: [GetPaymentStateRequest](#GetPaymentStateRequest)
|
||||||
- output: [PaymentState](#PaymentState)
|
- output: [PaymentState](#PaymentState)
|
||||||
|
|
||||||
|
- GetProvidersDisruption
|
||||||
|
- auth type: __Metrics__
|
||||||
|
- This methods has an __empty__ __request__ body
|
||||||
|
- output: [ProvidersDisruption](#ProvidersDisruption)
|
||||||
|
|
||||||
- GetSeed
|
- GetSeed
|
||||||
- auth type: __Admin__
|
- auth type: __Admin__
|
||||||
- This methods has an __empty__ __request__ body
|
- This methods has an __empty__ __request__ body
|
||||||
|
|
@ -250,6 +255,11 @@ The nostr server will send back a message response, and inside the body there wi
|
||||||
- input: [PayInvoiceRequest](#PayInvoiceRequest)
|
- input: [PayInvoiceRequest](#PayInvoiceRequest)
|
||||||
- output: [PayInvoiceResponse](#PayInvoiceResponse)
|
- output: [PayInvoiceResponse](#PayInvoiceResponse)
|
||||||
|
|
||||||
|
- PingSubProcesses
|
||||||
|
- auth type: __Metrics__
|
||||||
|
- This methods has an __empty__ __request__ body
|
||||||
|
- This methods has an __empty__ __response__ body
|
||||||
|
|
||||||
- ResetDebit
|
- ResetDebit
|
||||||
- auth type: __User__
|
- auth type: __User__
|
||||||
- input: [DebitOperation](#DebitOperation)
|
- input: [DebitOperation](#DebitOperation)
|
||||||
|
|
@ -617,6 +627,13 @@ The nostr server will send back a message response, and inside the body there wi
|
||||||
- input: [GetPaymentStateRequest](#GetPaymentStateRequest)
|
- input: [GetPaymentStateRequest](#GetPaymentStateRequest)
|
||||||
- output: [PaymentState](#PaymentState)
|
- output: [PaymentState](#PaymentState)
|
||||||
|
|
||||||
|
- GetProvidersDisruption
|
||||||
|
- auth type: __Metrics__
|
||||||
|
- http method: __post__
|
||||||
|
- http route: __/api/metrics/providers/disruption__
|
||||||
|
- This methods has an __empty__ __request__ body
|
||||||
|
- output: [ProvidersDisruption](#ProvidersDisruption)
|
||||||
|
|
||||||
- GetSeed
|
- GetSeed
|
||||||
- auth type: __Admin__
|
- auth type: __Admin__
|
||||||
- http method: __get__
|
- http method: __get__
|
||||||
|
|
@ -790,6 +807,13 @@ The nostr server will send back a message response, and inside the body there wi
|
||||||
- input: [PayInvoiceRequest](#PayInvoiceRequest)
|
- input: [PayInvoiceRequest](#PayInvoiceRequest)
|
||||||
- output: [PayInvoiceResponse](#PayInvoiceResponse)
|
- output: [PayInvoiceResponse](#PayInvoiceResponse)
|
||||||
|
|
||||||
|
- PingSubProcesses
|
||||||
|
- auth type: __Metrics__
|
||||||
|
- http method: __post__
|
||||||
|
- http route: __/api/metrics/ping__
|
||||||
|
- This methods has an __empty__ __request__ body
|
||||||
|
- This methods has an __empty__ __response__ body
|
||||||
|
|
||||||
- RequestNPubLinkingToken
|
- RequestNPubLinkingToken
|
||||||
- auth type: __App__
|
- auth type: __App__
|
||||||
- http method: __post__
|
- http method: __post__
|
||||||
|
|
@ -1352,6 +1376,14 @@ The nostr server will send back a message response, and inside the body there wi
|
||||||
- __noffer__: _string_
|
- __noffer__: _string_
|
||||||
- __price_sats__: _number_
|
- __price_sats__: _number_
|
||||||
|
|
||||||
|
### ProviderDisruption
|
||||||
|
- __provider_pubkey__: _string_
|
||||||
|
- __provider_type__: _string_
|
||||||
|
- __since_unix__: _number_
|
||||||
|
|
||||||
|
### ProvidersDisruption
|
||||||
|
- __disruptions__: ARRAY of: _[ProviderDisruption](#ProviderDisruption)_
|
||||||
|
|
||||||
### RelaysMigration
|
### RelaysMigration
|
||||||
- __relays__: ARRAY of: _string_
|
- __relays__: ARRAY of: _string_
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -93,6 +93,7 @@ type Client struct {
|
||||||
GetMigrationUpdate func() (*MigrationUpdate, error)
|
GetMigrationUpdate func() (*MigrationUpdate, error)
|
||||||
GetNPubLinkingState func(req GetNPubLinking) (*NPubLinking, error)
|
GetNPubLinkingState func(req GetNPubLinking) (*NPubLinking, error)
|
||||||
GetPaymentState func(req GetPaymentStateRequest) (*PaymentState, error)
|
GetPaymentState func(req GetPaymentStateRequest) (*PaymentState, error)
|
||||||
|
GetProvidersDisruption func() (*ProvidersDisruption, error)
|
||||||
GetSeed func() (*LndSeed, error)
|
GetSeed func() (*LndSeed, error)
|
||||||
GetSingleBundleMetrics func(req SingleMetricReq) (*BundleData, error)
|
GetSingleBundleMetrics func(req SingleMetricReq) (*BundleData, error)
|
||||||
GetSingleUsageMetrics func(req SingleMetricReq) (*UsageMetricTlv, error)
|
GetSingleUsageMetrics func(req SingleMetricReq) (*UsageMetricTlv, error)
|
||||||
|
|
@ -116,6 +117,7 @@ type Client struct {
|
||||||
PayAddress func(req PayAddressRequest) (*PayAddressResponse, error)
|
PayAddress func(req PayAddressRequest) (*PayAddressResponse, error)
|
||||||
PayAppUserInvoice func(req PayAppUserInvoiceRequest) (*PayInvoiceResponse, error)
|
PayAppUserInvoice func(req PayAppUserInvoiceRequest) (*PayInvoiceResponse, error)
|
||||||
PayInvoice func(req PayInvoiceRequest) (*PayInvoiceResponse, error)
|
PayInvoice func(req PayInvoiceRequest) (*PayInvoiceResponse, error)
|
||||||
|
PingSubProcesses func() error
|
||||||
RequestNPubLinkingToken func(req RequestNPubLinkingTokenRequest) (*RequestNPubLinkingTokenResponse, error)
|
RequestNPubLinkingToken func(req RequestNPubLinkingTokenRequest) (*RequestNPubLinkingTokenResponse, error)
|
||||||
ResetDebit func(req DebitOperation) error
|
ResetDebit func(req DebitOperation) error
|
||||||
ResetMetricsStorages func() error
|
ResetMetricsStorages func() error
|
||||||
|
|
@ -1096,6 +1098,32 @@ func NewClient(params ClientParams) *Client {
|
||||||
}
|
}
|
||||||
return &res, nil
|
return &res, nil
|
||||||
},
|
},
|
||||||
|
GetProvidersDisruption: func() (*ProvidersDisruption, error) {
|
||||||
|
auth, err := params.RetrieveMetricsAuth()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
finalRoute := "/api/metrics/providers/disruption"
|
||||||
|
body := []byte{}
|
||||||
|
resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := ResultError{}
|
||||||
|
err = json.Unmarshal(resBody, &result)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if result.Status == "ERROR" {
|
||||||
|
return nil, fmt.Errorf(result.Reason)
|
||||||
|
}
|
||||||
|
res := ProvidersDisruption{}
|
||||||
|
err = json.Unmarshal(resBody, &res)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &res, nil
|
||||||
|
},
|
||||||
GetSeed: func() (*LndSeed, error) {
|
GetSeed: func() (*LndSeed, error) {
|
||||||
auth, err := params.RetrieveAdminAuth()
|
auth, err := params.RetrieveAdminAuth()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -1726,6 +1754,27 @@ func NewClient(params ClientParams) *Client {
|
||||||
}
|
}
|
||||||
return &res, nil
|
return &res, nil
|
||||||
},
|
},
|
||||||
|
PingSubProcesses: func() error {
|
||||||
|
auth, err := params.RetrieveMetricsAuth()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
finalRoute := "/api/metrics/ping"
|
||||||
|
body := []byte{}
|
||||||
|
resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
result := ResultError{}
|
||||||
|
err = json.Unmarshal(resBody, &result)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if result.Status == "ERROR" {
|
||||||
|
return fmt.Errorf(result.Reason)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
},
|
||||||
RequestNPubLinkingToken: func(req RequestNPubLinkingTokenRequest) (*RequestNPubLinkingTokenResponse, error) {
|
RequestNPubLinkingToken: func(req RequestNPubLinkingTokenRequest) (*RequestNPubLinkingTokenResponse, error) {
|
||||||
auth, err := params.RetrieveAppAuth()
|
auth, err := params.RetrieveAppAuth()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -527,6 +527,14 @@ type Product struct {
|
||||||
Noffer string `json:"noffer"`
|
Noffer string `json:"noffer"`
|
||||||
Price_sats int64 `json:"price_sats"`
|
Price_sats int64 `json:"price_sats"`
|
||||||
}
|
}
|
||||||
|
type ProviderDisruption struct {
|
||||||
|
Provider_pubkey string `json:"provider_pubkey"`
|
||||||
|
Provider_type string `json:"provider_type"`
|
||||||
|
Since_unix int64 `json:"since_unix"`
|
||||||
|
}
|
||||||
|
type ProvidersDisruption struct {
|
||||||
|
Disruptions []ProviderDisruption `json:"disruptions"`
|
||||||
|
}
|
||||||
type RelaysMigration struct {
|
type RelaysMigration struct {
|
||||||
Relays []string `json:"relays"`
|
Relays []string `json:"relays"`
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1138,6 +1138,25 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
|
||||||
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
||||||
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
||||||
})
|
})
|
||||||
|
if (!opts.allowNotImplementedMethods && !methods.GetProvidersDisruption) throw new Error('method: GetProvidersDisruption is not implemented')
|
||||||
|
app.post('/api/metrics/providers/disruption', async (req, res) => {
|
||||||
|
const info: Types.RequestInfo = { rpcName: 'GetProvidersDisruption', batch: false, nostr: false, batchSize: 0}
|
||||||
|
const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
|
||||||
|
let authCtx: Types.AuthContext = {}
|
||||||
|
try {
|
||||||
|
if (!methods.GetProvidersDisruption) throw new Error('method: GetProvidersDisruption is not implemented')
|
||||||
|
const authContext = await opts.MetricsAuthGuard(req.headers['authorization'])
|
||||||
|
authCtx = authContext
|
||||||
|
stats.guard = process.hrtime.bigint()
|
||||||
|
stats.validate = stats.guard
|
||||||
|
const query = req.query
|
||||||
|
const params = req.params
|
||||||
|
const response = await methods.GetProvidersDisruption({rpcName:'GetProvidersDisruption', ctx:authContext })
|
||||||
|
stats.handle = process.hrtime.bigint()
|
||||||
|
res.json({status: 'OK', ...response})
|
||||||
|
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
||||||
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
||||||
|
})
|
||||||
if (!opts.allowNotImplementedMethods && !methods.GetSeed) throw new Error('method: GetSeed is not implemented')
|
if (!opts.allowNotImplementedMethods && !methods.GetSeed) throw new Error('method: GetSeed is not implemented')
|
||||||
app.get('/api/admin/seed', async (req, res) => {
|
app.get('/api/admin/seed', async (req, res) => {
|
||||||
const info: Types.RequestInfo = { rpcName: 'GetSeed', batch: false, nostr: false, batchSize: 0}
|
const info: Types.RequestInfo = { rpcName: 'GetSeed', batch: false, nostr: false, batchSize: 0}
|
||||||
|
|
@ -1617,6 +1636,25 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
|
||||||
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
||||||
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
||||||
})
|
})
|
||||||
|
if (!opts.allowNotImplementedMethods && !methods.PingSubProcesses) throw new Error('method: PingSubProcesses is not implemented')
|
||||||
|
app.post('/api/metrics/ping', async (req, res) => {
|
||||||
|
const info: Types.RequestInfo = { rpcName: 'PingSubProcesses', batch: false, nostr: false, batchSize: 0}
|
||||||
|
const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
|
||||||
|
let authCtx: Types.AuthContext = {}
|
||||||
|
try {
|
||||||
|
if (!methods.PingSubProcesses) throw new Error('method: PingSubProcesses is not implemented')
|
||||||
|
const authContext = await opts.MetricsAuthGuard(req.headers['authorization'])
|
||||||
|
authCtx = authContext
|
||||||
|
stats.guard = process.hrtime.bigint()
|
||||||
|
stats.validate = stats.guard
|
||||||
|
const query = req.query
|
||||||
|
const params = req.params
|
||||||
|
await methods.PingSubProcesses({rpcName:'PingSubProcesses', ctx:authContext })
|
||||||
|
stats.handle = process.hrtime.bigint()
|
||||||
|
res.json({status: 'OK'})
|
||||||
|
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
||||||
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
||||||
|
})
|
||||||
if (!opts.allowNotImplementedMethods && !methods.RequestNPubLinkingToken) throw new Error('method: RequestNPubLinkingToken is not implemented')
|
if (!opts.allowNotImplementedMethods && !methods.RequestNPubLinkingToken) throw new Error('method: RequestNPubLinkingToken is not implemented')
|
||||||
app.post('/api/app/user/npub/token', async (req, res) => {
|
app.post('/api/app/user/npub/token', async (req, res) => {
|
||||||
const info: Types.RequestInfo = { rpcName: 'RequestNPubLinkingToken', batch: false, nostr: false, batchSize: 0}
|
const info: Types.RequestInfo = { rpcName: 'RequestNPubLinkingToken', batch: false, nostr: false, batchSize: 0}
|
||||||
|
|
|
||||||
|
|
@ -507,6 +507,20 @@ export default (params: ClientParams) => ({
|
||||||
}
|
}
|
||||||
return { status: 'ERROR', reason: 'invalid response' }
|
return { status: 'ERROR', reason: 'invalid response' }
|
||||||
},
|
},
|
||||||
|
GetProvidersDisruption: async (): Promise<ResultError | ({ status: 'OK' }& Types.ProvidersDisruption)> => {
|
||||||
|
const auth = await params.retrieveMetricsAuth()
|
||||||
|
if (auth === null) throw new Error('retrieveMetricsAuth() returned null')
|
||||||
|
let finalRoute = '/api/metrics/providers/disruption'
|
||||||
|
const { data } = await axios.post(params.baseUrl + finalRoute, {}, { headers: { 'authorization': auth } })
|
||||||
|
if (data.status === 'ERROR' && typeof data.reason === 'string') return data
|
||||||
|
if (data.status === 'OK') {
|
||||||
|
const result = data
|
||||||
|
if(!params.checkResult) return { status: 'OK', ...result }
|
||||||
|
const error = Types.ProvidersDisruptionValidate(result)
|
||||||
|
if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
|
||||||
|
}
|
||||||
|
return { status: 'ERROR', reason: 'invalid response' }
|
||||||
|
},
|
||||||
GetSeed: async (): Promise<ResultError | ({ status: 'OK' }& Types.LndSeed)> => {
|
GetSeed: async (): Promise<ResultError | ({ status: 'OK' }& Types.LndSeed)> => {
|
||||||
const auth = await params.retrieveAdminAuth()
|
const auth = await params.retrieveAdminAuth()
|
||||||
if (auth === null) throw new Error('retrieveAdminAuth() returned null')
|
if (auth === null) throw new Error('retrieveAdminAuth() returned null')
|
||||||
|
|
@ -827,6 +841,17 @@ export default (params: ClientParams) => ({
|
||||||
}
|
}
|
||||||
return { status: 'ERROR', reason: 'invalid response' }
|
return { status: 'ERROR', reason: 'invalid response' }
|
||||||
},
|
},
|
||||||
|
PingSubProcesses: async (): Promise<ResultError | ({ status: 'OK' })> => {
|
||||||
|
const auth = await params.retrieveMetricsAuth()
|
||||||
|
if (auth === null) throw new Error('retrieveMetricsAuth() returned null')
|
||||||
|
let finalRoute = '/api/metrics/ping'
|
||||||
|
const { data } = await axios.post(params.baseUrl + finalRoute, {}, { headers: { 'authorization': auth } })
|
||||||
|
if (data.status === 'ERROR' && typeof data.reason === 'string') return data
|
||||||
|
if (data.status === 'OK') {
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
return { status: 'ERROR', reason: 'invalid response' }
|
||||||
|
},
|
||||||
RequestNPubLinkingToken: async (request: Types.RequestNPubLinkingTokenRequest): Promise<ResultError | ({ status: 'OK' }& Types.RequestNPubLinkingTokenResponse)> => {
|
RequestNPubLinkingToken: async (request: Types.RequestNPubLinkingTokenRequest): Promise<ResultError | ({ status: 'OK' }& Types.RequestNPubLinkingTokenResponse)> => {
|
||||||
const auth = await params.retrieveAppAuth()
|
const auth = await params.retrieveAppAuth()
|
||||||
if (auth === null) throw new Error('retrieveAppAuth() returned null')
|
if (auth === null) throw new Error('retrieveAppAuth() returned null')
|
||||||
|
|
|
||||||
|
|
@ -422,6 +422,20 @@ export default (params: NostrClientParams, send: (to:string, message: NostrRequ
|
||||||
}
|
}
|
||||||
return { status: 'ERROR', reason: 'invalid response' }
|
return { status: 'ERROR', reason: 'invalid response' }
|
||||||
},
|
},
|
||||||
|
GetProvidersDisruption: async (): Promise<ResultError | ({ status: 'OK' }& Types.ProvidersDisruption)> => {
|
||||||
|
const auth = await params.retrieveNostrMetricsAuth()
|
||||||
|
if (auth === null) throw new Error('retrieveNostrMetricsAuth() returned null')
|
||||||
|
const nostrRequest: NostrRequest = {}
|
||||||
|
const data = await send(params.pubDestination, {rpcName:'GetProvidersDisruption',authIdentifier:auth, ...nostrRequest })
|
||||||
|
if (data.status === 'ERROR' && typeof data.reason === 'string') return data
|
||||||
|
if (data.status === 'OK') {
|
||||||
|
const result = data
|
||||||
|
if(!params.checkResult) return { status: 'OK', ...result }
|
||||||
|
const error = Types.ProvidersDisruptionValidate(result)
|
||||||
|
if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
|
||||||
|
}
|
||||||
|
return { status: 'ERROR', reason: 'invalid response' }
|
||||||
|
},
|
||||||
GetSeed: async (): Promise<ResultError | ({ status: 'OK' }& Types.LndSeed)> => {
|
GetSeed: async (): Promise<ResultError | ({ status: 'OK' }& Types.LndSeed)> => {
|
||||||
const auth = await params.retrieveNostrAdminAuth()
|
const auth = await params.retrieveNostrAdminAuth()
|
||||||
if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
|
if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
|
||||||
|
|
@ -685,6 +699,17 @@ export default (params: NostrClientParams, send: (to:string, message: NostrRequ
|
||||||
}
|
}
|
||||||
return { status: 'ERROR', reason: 'invalid response' }
|
return { status: 'ERROR', reason: 'invalid response' }
|
||||||
},
|
},
|
||||||
|
PingSubProcesses: async (): Promise<ResultError | ({ status: 'OK' })> => {
|
||||||
|
const auth = await params.retrieveNostrMetricsAuth()
|
||||||
|
if (auth === null) throw new Error('retrieveNostrMetricsAuth() returned null')
|
||||||
|
const nostrRequest: NostrRequest = {}
|
||||||
|
const data = await send(params.pubDestination, {rpcName:'PingSubProcesses',authIdentifier:auth, ...nostrRequest })
|
||||||
|
if (data.status === 'ERROR' && typeof data.reason === 'string') return data
|
||||||
|
if (data.status === 'OK') {
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
return { status: 'ERROR', reason: 'invalid response' }
|
||||||
|
},
|
||||||
ResetDebit: async (request: Types.DebitOperation): Promise<ResultError | ({ status: 'OK' })> => {
|
ResetDebit: async (request: Types.DebitOperation): Promise<ResultError | ({ status: 'OK' })> => {
|
||||||
const auth = await params.retrieveNostrUserAuth()
|
const auth = await params.retrieveNostrUserAuth()
|
||||||
if (auth === null) throw new Error('retrieveNostrUserAuth() returned null')
|
if (auth === null) throw new Error('retrieveNostrUserAuth() returned null')
|
||||||
|
|
|
||||||
|
|
@ -812,6 +812,19 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
|
||||||
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
|
case 'GetProvidersDisruption':
|
||||||
|
try {
|
||||||
|
if (!methods.GetProvidersDisruption) throw new Error('method: GetProvidersDisruption is not implemented')
|
||||||
|
const authContext = await opts.NostrMetricsAuthGuard(req.appId, req.authIdentifier)
|
||||||
|
stats.guard = process.hrtime.bigint()
|
||||||
|
authCtx = authContext
|
||||||
|
stats.validate = stats.guard
|
||||||
|
const response = await methods.GetProvidersDisruption({rpcName:'GetProvidersDisruption', ctx:authContext })
|
||||||
|
stats.handle = process.hrtime.bigint()
|
||||||
|
res({status: 'OK', ...response})
|
||||||
|
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
||||||
|
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
||||||
|
break
|
||||||
case 'GetSeed':
|
case 'GetSeed':
|
||||||
try {
|
try {
|
||||||
if (!methods.GetSeed) throw new Error('method: GetSeed is not implemented')
|
if (!methods.GetSeed) throw new Error('method: GetSeed is not implemented')
|
||||||
|
|
@ -1085,6 +1098,19 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
|
||||||
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
|
case 'PingSubProcesses':
|
||||||
|
try {
|
||||||
|
if (!methods.PingSubProcesses) throw new Error('method: PingSubProcesses is not implemented')
|
||||||
|
const authContext = await opts.NostrMetricsAuthGuard(req.appId, req.authIdentifier)
|
||||||
|
stats.guard = process.hrtime.bigint()
|
||||||
|
authCtx = authContext
|
||||||
|
stats.validate = stats.guard
|
||||||
|
await methods.PingSubProcesses({rpcName:'PingSubProcesses', ctx:authContext })
|
||||||
|
stats.handle = process.hrtime.bigint()
|
||||||
|
res({status: 'OK'})
|
||||||
|
opts.metricsCallback([{ ...info, ...stats, ...authContext }])
|
||||||
|
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
|
||||||
|
break
|
||||||
case 'ResetDebit':
|
case 'ResetDebit':
|
||||||
try {
|
try {
|
||||||
if (!methods.ResetDebit) throw new Error('method: ResetDebit is not implemented')
|
if (!methods.ResetDebit) throw new Error('method: ResetDebit is not implemented')
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@ export type MetricsContext = {
|
||||||
app_id: string
|
app_id: string
|
||||||
operator_id: string
|
operator_id: string
|
||||||
}
|
}
|
||||||
export type MetricsMethodInputs = GetAppsMetrics_Input | GetBundleMetrics_Input | GetErrorStats_Input | GetLndMetrics_Input | GetSingleBundleMetrics_Input | GetSingleUsageMetrics_Input | GetUsageMetrics_Input | ResetMetricsStorages_Input | SubmitWebRtcMessage_Input | ZipMetricsStorages_Input
|
export type MetricsMethodInputs = GetAppsMetrics_Input | GetBundleMetrics_Input | GetErrorStats_Input | GetLndMetrics_Input | GetProvidersDisruption_Input | GetSingleBundleMetrics_Input | GetSingleUsageMetrics_Input | GetUsageMetrics_Input | PingSubProcesses_Input | ResetMetricsStorages_Input | SubmitWebRtcMessage_Input | ZipMetricsStorages_Input
|
||||||
export type MetricsMethodOutputs = GetAppsMetrics_Output | GetBundleMetrics_Output | GetErrorStats_Output | GetLndMetrics_Output | GetSingleBundleMetrics_Output | GetSingleUsageMetrics_Output | GetUsageMetrics_Output | ResetMetricsStorages_Output | SubmitWebRtcMessage_Output | ZipMetricsStorages_Output
|
export type MetricsMethodOutputs = GetAppsMetrics_Output | GetBundleMetrics_Output | GetErrorStats_Output | GetLndMetrics_Output | GetProvidersDisruption_Output | GetSingleBundleMetrics_Output | GetSingleUsageMetrics_Output | GetUsageMetrics_Output | PingSubProcesses_Output | ResetMetricsStorages_Output | SubmitWebRtcMessage_Output | ZipMetricsStorages_Output
|
||||||
export type UserContext = {
|
export type UserContext = {
|
||||||
app_id: string
|
app_id: string
|
||||||
app_user_id: string
|
app_user_id: string
|
||||||
|
|
@ -162,6 +162,9 @@ export type GetNPubLinkingState_Output = ResultError | ({ status: 'OK' } & NPubL
|
||||||
export type GetPaymentState_Input = {rpcName:'GetPaymentState', req: GetPaymentStateRequest}
|
export type GetPaymentState_Input = {rpcName:'GetPaymentState', req: GetPaymentStateRequest}
|
||||||
export type GetPaymentState_Output = ResultError | ({ status: 'OK' } & PaymentState)
|
export type GetPaymentState_Output = ResultError | ({ status: 'OK' } & PaymentState)
|
||||||
|
|
||||||
|
export type GetProvidersDisruption_Input = {rpcName:'GetProvidersDisruption'}
|
||||||
|
export type GetProvidersDisruption_Output = ResultError | ({ status: 'OK' } & ProvidersDisruption)
|
||||||
|
|
||||||
export type GetSeed_Input = {rpcName:'GetSeed'}
|
export type GetSeed_Input = {rpcName:'GetSeed'}
|
||||||
export type GetSeed_Output = ResultError | ({ status: 'OK' } & LndSeed)
|
export type GetSeed_Output = ResultError | ({ status: 'OK' } & LndSeed)
|
||||||
|
|
||||||
|
|
@ -247,6 +250,9 @@ export type PayAppUserInvoice_Output = ResultError | ({ status: 'OK' } & PayInvo
|
||||||
export type PayInvoice_Input = {rpcName:'PayInvoice', req: PayInvoiceRequest}
|
export type PayInvoice_Input = {rpcName:'PayInvoice', req: PayInvoiceRequest}
|
||||||
export type PayInvoice_Output = ResultError | ({ status: 'OK' } & PayInvoiceResponse)
|
export type PayInvoice_Output = ResultError | ({ status: 'OK' } & PayInvoiceResponse)
|
||||||
|
|
||||||
|
export type PingSubProcesses_Input = {rpcName:'PingSubProcesses'}
|
||||||
|
export type PingSubProcesses_Output = ResultError | { status: 'OK' }
|
||||||
|
|
||||||
export type RequestNPubLinkingToken_Input = {rpcName:'RequestNPubLinkingToken', req: RequestNPubLinkingTokenRequest}
|
export type RequestNPubLinkingToken_Input = {rpcName:'RequestNPubLinkingToken', req: RequestNPubLinkingTokenRequest}
|
||||||
export type RequestNPubLinkingToken_Output = ResultError | ({ status: 'OK' } & RequestNPubLinkingTokenResponse)
|
export type RequestNPubLinkingToken_Output = ResultError | ({ status: 'OK' } & RequestNPubLinkingTokenResponse)
|
||||||
|
|
||||||
|
|
@ -340,6 +346,7 @@ export type ServerMethods = {
|
||||||
GetMigrationUpdate?: (req: GetMigrationUpdate_Input & {ctx: UserContext }) => Promise<void>
|
GetMigrationUpdate?: (req: GetMigrationUpdate_Input & {ctx: UserContext }) => Promise<void>
|
||||||
GetNPubLinkingState?: (req: GetNPubLinkingState_Input & {ctx: AppContext }) => Promise<NPubLinking>
|
GetNPubLinkingState?: (req: GetNPubLinkingState_Input & {ctx: AppContext }) => Promise<NPubLinking>
|
||||||
GetPaymentState?: (req: GetPaymentState_Input & {ctx: UserContext }) => Promise<PaymentState>
|
GetPaymentState?: (req: GetPaymentState_Input & {ctx: UserContext }) => Promise<PaymentState>
|
||||||
|
GetProvidersDisruption?: (req: GetProvidersDisruption_Input & {ctx: MetricsContext }) => Promise<ProvidersDisruption>
|
||||||
GetSeed?: (req: GetSeed_Input & {ctx: AdminContext }) => Promise<LndSeed>
|
GetSeed?: (req: GetSeed_Input & {ctx: AdminContext }) => Promise<LndSeed>
|
||||||
GetSingleBundleMetrics?: (req: GetSingleBundleMetrics_Input & {ctx: MetricsContext }) => Promise<BundleData>
|
GetSingleBundleMetrics?: (req: GetSingleBundleMetrics_Input & {ctx: MetricsContext }) => Promise<BundleData>
|
||||||
GetSingleUsageMetrics?: (req: GetSingleUsageMetrics_Input & {ctx: MetricsContext }) => Promise<UsageMetricTlv>
|
GetSingleUsageMetrics?: (req: GetSingleUsageMetrics_Input & {ctx: MetricsContext }) => Promise<UsageMetricTlv>
|
||||||
|
|
@ -363,6 +370,7 @@ export type ServerMethods = {
|
||||||
PayAddress?: (req: PayAddress_Input & {ctx: UserContext }) => Promise<PayAddressResponse>
|
PayAddress?: (req: PayAddress_Input & {ctx: UserContext }) => Promise<PayAddressResponse>
|
||||||
PayAppUserInvoice?: (req: PayAppUserInvoice_Input & {ctx: AppContext }) => Promise<PayInvoiceResponse>
|
PayAppUserInvoice?: (req: PayAppUserInvoice_Input & {ctx: AppContext }) => Promise<PayInvoiceResponse>
|
||||||
PayInvoice?: (req: PayInvoice_Input & {ctx: UserContext }) => Promise<PayInvoiceResponse>
|
PayInvoice?: (req: PayInvoice_Input & {ctx: UserContext }) => Promise<PayInvoiceResponse>
|
||||||
|
PingSubProcesses?: (req: PingSubProcesses_Input & {ctx: MetricsContext }) => Promise<void>
|
||||||
RequestNPubLinkingToken?: (req: RequestNPubLinkingToken_Input & {ctx: AppContext }) => Promise<RequestNPubLinkingTokenResponse>
|
RequestNPubLinkingToken?: (req: RequestNPubLinkingToken_Input & {ctx: AppContext }) => Promise<RequestNPubLinkingTokenResponse>
|
||||||
ResetDebit?: (req: ResetDebit_Input & {ctx: UserContext }) => Promise<void>
|
ResetDebit?: (req: ResetDebit_Input & {ctx: UserContext }) => Promise<void>
|
||||||
ResetMetricsStorages?: (req: ResetMetricsStorages_Input & {ctx: MetricsContext }) => Promise<void>
|
ResetMetricsStorages?: (req: ResetMetricsStorages_Input & {ctx: MetricsContext }) => Promise<void>
|
||||||
|
|
@ -3030,6 +3038,57 @@ export const ProductValidate = (o?: Product, opts: ProductOptions = {}, path: st
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type ProviderDisruption = {
|
||||||
|
provider_pubkey: string
|
||||||
|
provider_type: string
|
||||||
|
since_unix: number
|
||||||
|
}
|
||||||
|
export const ProviderDisruptionOptionalFields: [] = []
|
||||||
|
export type ProviderDisruptionOptions = OptionsBaseMessage & {
|
||||||
|
checkOptionalsAreSet?: []
|
||||||
|
provider_pubkey_CustomCheck?: (v: string) => boolean
|
||||||
|
provider_type_CustomCheck?: (v: string) => boolean
|
||||||
|
since_unix_CustomCheck?: (v: number) => boolean
|
||||||
|
}
|
||||||
|
export const ProviderDisruptionValidate = (o?: ProviderDisruption, opts: ProviderDisruptionOptions = {}, path: string = 'ProviderDisruption::root.'): Error | null => {
|
||||||
|
if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
|
||||||
|
if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
|
||||||
|
|
||||||
|
if (typeof o.provider_pubkey !== 'string') return new Error(`${path}.provider_pubkey: is not a string`)
|
||||||
|
if (opts.provider_pubkey_CustomCheck && !opts.provider_pubkey_CustomCheck(o.provider_pubkey)) return new Error(`${path}.provider_pubkey: custom check failed`)
|
||||||
|
|
||||||
|
if (typeof o.provider_type !== 'string') return new Error(`${path}.provider_type: is not a string`)
|
||||||
|
if (opts.provider_type_CustomCheck && !opts.provider_type_CustomCheck(o.provider_type)) return new Error(`${path}.provider_type: custom check failed`)
|
||||||
|
|
||||||
|
if (typeof o.since_unix !== 'number') return new Error(`${path}.since_unix: is not a number`)
|
||||||
|
if (opts.since_unix_CustomCheck && !opts.since_unix_CustomCheck(o.since_unix)) return new Error(`${path}.since_unix: custom check failed`)
|
||||||
|
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
export type ProvidersDisruption = {
|
||||||
|
disruptions: ProviderDisruption[]
|
||||||
|
}
|
||||||
|
export const ProvidersDisruptionOptionalFields: [] = []
|
||||||
|
export type ProvidersDisruptionOptions = OptionsBaseMessage & {
|
||||||
|
checkOptionalsAreSet?: []
|
||||||
|
disruptions_ItemOptions?: ProviderDisruptionOptions
|
||||||
|
disruptions_CustomCheck?: (v: ProviderDisruption[]) => boolean
|
||||||
|
}
|
||||||
|
export const ProvidersDisruptionValidate = (o?: ProvidersDisruption, opts: ProvidersDisruptionOptions = {}, path: string = 'ProvidersDisruption::root.'): Error | null => {
|
||||||
|
if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
|
||||||
|
if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
|
||||||
|
|
||||||
|
if (!Array.isArray(o.disruptions)) return new Error(`${path}.disruptions: is not an array`)
|
||||||
|
for (let index = 0; index < o.disruptions.length; index++) {
|
||||||
|
const disruptionsErr = ProviderDisruptionValidate(o.disruptions[index], opts.disruptions_ItemOptions, `${path}.disruptions[${index}]`)
|
||||||
|
if (disruptionsErr !== null) return disruptionsErr
|
||||||
|
}
|
||||||
|
if (opts.disruptions_CustomCheck && !opts.disruptions_CustomCheck(o.disruptions)) return new Error(`${path}.disruptions: custom check failed`)
|
||||||
|
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
export type RelaysMigration = {
|
export type RelaysMigration = {
|
||||||
relays: string[]
|
relays: string[]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -240,6 +240,19 @@ service LightningPub {
|
||||||
option (http_route) = "/api/metrics/zip";
|
option (http_route) = "/api/metrics/zip";
|
||||||
option (nostr) = true;
|
option (nostr) = true;
|
||||||
}
|
}
|
||||||
|
rpc PingSubProcesses(structs.Empty) returns (structs.Empty) {
|
||||||
|
option (auth_type) = "Metrics";
|
||||||
|
option (http_method) = "post";
|
||||||
|
option (http_route) = "/api/metrics/ping";
|
||||||
|
option (nostr) = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
rpc GetProvidersDisruption(structs.Empty) returns (structs.ProvidersDisruption) {
|
||||||
|
option (auth_type) = "Metrics";
|
||||||
|
option (http_method) = "post";
|
||||||
|
option (http_route) = "/api/metrics/providers/disruption";
|
||||||
|
option (nostr) = true;
|
||||||
|
}
|
||||||
|
|
||||||
rpc ResetMetricsStorages(structs.Empty) returns (structs.Empty) {
|
rpc ResetMetricsStorages(structs.Empty) returns (structs.Empty) {
|
||||||
option (auth_type) = "Metrics";
|
option (auth_type) = "Metrics";
|
||||||
|
|
|
||||||
|
|
@ -750,3 +750,15 @@ message OfferInvoice {
|
||||||
int64 amount = 4;
|
int64 amount = 4;
|
||||||
map<string,string> data = 5;
|
map<string,string> data = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
message ProviderDisruption {
|
||||||
|
string provider_pubkey = 1;
|
||||||
|
string provider_type = 2;
|
||||||
|
int64 since_unix = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ProvidersDisruption {
|
||||||
|
repeated ProviderDisruption disruptions = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,13 +24,14 @@ const start = async () => {
|
||||||
const serverMethods = GetServerMethods(mainHandler)
|
const serverMethods = GetServerMethods(mainHandler)
|
||||||
const nostrSettings = LoadNosrtSettingsFromEnv()
|
const nostrSettings = LoadNosrtSettingsFromEnv()
|
||||||
log("initializing nostr middleware")
|
log("initializing nostr middleware")
|
||||||
const { Send, Stop } = nostrMiddleware(serverMethods, mainHandler,
|
const { Send, Stop, Ping } = nostrMiddleware(serverMethods, mainHandler,
|
||||||
{ ...nostrSettings, apps, clients: [liquidityProviderInfo] },
|
{ ...nostrSettings, apps, clients: [liquidityProviderInfo] },
|
||||||
(e, p) => mainHandler.liquidityProvider.onEvent(e, p)
|
(e, p) => mainHandler.liquidityProvider.onEvent(e, p)
|
||||||
)
|
)
|
||||||
exitHandler(() => { Stop() })
|
exitHandler(() => { Stop() })
|
||||||
log("starting server")
|
log("starting server")
|
||||||
mainHandler.attachNostrSend(Send)
|
mainHandler.attachNostrSend(Send)
|
||||||
|
mainHandler.attachNostrProcessPing(Ping)
|
||||||
mainHandler.StartBeacons()
|
mainHandler.StartBeacons()
|
||||||
const appNprofile = nprofileEncode({ pubkey: liquidityProviderInfo.publicKey, relays: nostrSettings.relays })
|
const appNprofile = nprofileEncode({ pubkey: liquidityProviderInfo.publicKey, relays: nostrSettings.relays })
|
||||||
if (wizard) {
|
if (wizard) {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import { ERROR, getLogger } from "./services/helpers/logger.js";
|
||||||
import { NdebitData } from "nostr-tools/lib/types/nip68.js";
|
import { NdebitData } from "nostr-tools/lib/types/nip68.js";
|
||||||
import { NofferData } from "nostr-tools/lib/types/nip69.js";
|
import { NofferData } from "nostr-tools/lib/types/nip69.js";
|
||||||
|
|
||||||
export default (serverMethods: Types.ServerMethods, mainHandler: Main, nostrSettings: NostrSettings, onClientEvent: (e: { requestId: string }, fromPub: string) => void): { Stop: () => void, Send: NostrSend } => {
|
export default (serverMethods: Types.ServerMethods, mainHandler: Main, nostrSettings: NostrSettings, onClientEvent: (e: { requestId: string }, fromPub: string) => void): { Stop: () => void, Send: NostrSend, Ping: () => Promise<void> } => {
|
||||||
const log = getLogger({})
|
const log = getLogger({})
|
||||||
const nostrTransport = NewNostrTransport(serverMethods, {
|
const nostrTransport = NewNostrTransport(serverMethods, {
|
||||||
NostrUserAuthGuard: async (appId, pub) => {
|
NostrUserAuthGuard: async (appId, pub) => {
|
||||||
|
|
@ -68,7 +68,7 @@ export default (serverMethods: Types.ServerMethods, mainHandler: Main, nostrSett
|
||||||
nostr.Send({ type: 'app', appId: event.appId }, { type: 'content', pub: event.pub, content: JSON.stringify({ ...res, requestId: j.requestId }) })
|
nostr.Send({ type: 'app', appId: event.appId }, { type: 'content', pub: event.pub, content: JSON.stringify({ ...res, requestId: j.requestId }) })
|
||||||
}, event.startAtNano, event.startAtMs)
|
}, event.startAtNano, event.startAtMs)
|
||||||
})
|
})
|
||||||
return { Stop: () => nostr.Stop, Send: (...args) => nostr.Send(...args) }
|
return { Stop: () => nostr.Stop, Send: (...args) => nostr.Send(...args), Ping: () => nostr.Ping() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -57,6 +57,7 @@ export default class {
|
||||||
unlocker: Unlocker
|
unlocker: Unlocker
|
||||||
//webRTC: webRTC
|
//webRTC: webRTC
|
||||||
nostrSend: NostrSend = () => { getLogger({})("nostr send not initialized yet") }
|
nostrSend: NostrSend = () => { getLogger({})("nostr send not initialized yet") }
|
||||||
|
nostrProcessPing: (() => Promise<void>) | null = null
|
||||||
constructor(settings: MainSettings, storage: Storage, adminManager: AdminManager, utils: Utils, unlocker: Unlocker) {
|
constructor(settings: MainSettings, storage: Storage, adminManager: AdminManager, utils: Utils, unlocker: Unlocker) {
|
||||||
this.settings = settings
|
this.settings = settings
|
||||||
this.storage = storage
|
this.storage = storage
|
||||||
|
|
@ -102,6 +103,37 @@ export default class {
|
||||||
//this.webRTC.attachNostrSend(f)
|
//this.webRTC.attachNostrSend(f)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
attachNostrProcessPing(f: () => Promise<void>) {
|
||||||
|
this.nostrProcessPing = f
|
||||||
|
}
|
||||||
|
|
||||||
|
async pingSubProcesses() {
|
||||||
|
if (!this.nostrProcessPing) {
|
||||||
|
throw new Error("nostr process ping not initialized")
|
||||||
|
}
|
||||||
|
const storageP = this.storage.dbs.Ping()
|
||||||
|
const metricsP = this.storage.metricsStorage.dbs.Ping()
|
||||||
|
const tlvP = this.utils.tlvStorageFactory.Ping()
|
||||||
|
const nostrP = this.nostrProcessPing()
|
||||||
|
const timeout = new Promise<true>(res => setTimeout(() => res(true), 2 * 1000))
|
||||||
|
const storageFail = await Promise.race([storageP, timeout])
|
||||||
|
const metricsFail = await Promise.race([metricsP, timeout])
|
||||||
|
const tlvFail = await Promise.race([tlvP, timeout])
|
||||||
|
const nostrFail = await Promise.race([nostrP, timeout])
|
||||||
|
if (storageFail) {
|
||||||
|
throw new Error("storage ping failed")
|
||||||
|
}
|
||||||
|
if (metricsFail) {
|
||||||
|
throw new Error("metrics ping failed")
|
||||||
|
}
|
||||||
|
if (tlvFail) {
|
||||||
|
throw new Error("tlv ping failed")
|
||||||
|
}
|
||||||
|
if (nostrFail) {
|
||||||
|
throw new Error("nostr ping failed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
htlcCb: HtlcCb = (e) => {
|
htlcCb: HtlcCb = (e) => {
|
||||||
this.metricsManager.HtlcCb(e)
|
this.metricsManager.HtlcCb(e)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,18 @@ export default class Handler {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async GetProvidersDisruption(): Promise<Types.ProvidersDisruption> {
|
||||||
|
const providers = await this.storage.liquidityStorage.GetTrackedProviders()
|
||||||
|
const disruptions = providers.filter(p => p.latest_distruption_at_unix > 0)
|
||||||
|
return {
|
||||||
|
disruptions: disruptions.map(d => ({
|
||||||
|
provider_pubkey: d.provider_pubkey,
|
||||||
|
provider_type: d.provider_type,
|
||||||
|
since_unix: d.latest_distruption_at_unix
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
async HtlcCb(htlc: HtlcEvent) {
|
async HtlcCb(htlc: HtlcEvent) {
|
||||||
|
|
|
||||||
|
|
@ -38,12 +38,21 @@ type SettingsRequest = {
|
||||||
settings: NostrSettings
|
settings: NostrSettings
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type PingRequest = {
|
||||||
|
type: 'ping'
|
||||||
|
}
|
||||||
|
|
||||||
type SendRequest = {
|
type SendRequest = {
|
||||||
type: 'send'
|
type: 'send'
|
||||||
initiator: SendInitiator
|
initiator: SendInitiator
|
||||||
data: SendData
|
data: SendData
|
||||||
relays?: string[]
|
relays?: string[]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type PingResponse = {
|
||||||
|
type: 'pong'
|
||||||
|
}
|
||||||
|
|
||||||
type ReadyResponse = {
|
type ReadyResponse = {
|
||||||
type: 'ready'
|
type: 'ready'
|
||||||
}
|
}
|
||||||
|
|
@ -56,8 +65,8 @@ type ProcessMetricsResponse = {
|
||||||
metrics: ProcessMetrics
|
metrics: ProcessMetrics
|
||||||
}
|
}
|
||||||
|
|
||||||
export type ChildProcessRequest = SettingsRequest | SendRequest
|
export type ChildProcessRequest = SettingsRequest | SendRequest | PingRequest
|
||||||
export type ChildProcessResponse = ReadyResponse | EventResponse | ProcessMetricsResponse
|
export type ChildProcessResponse = ReadyResponse | EventResponse | ProcessMetricsResponse | PingResponse
|
||||||
const send = (message: ChildProcessResponse) => {
|
const send = (message: ChildProcessResponse) => {
|
||||||
if (process.send) {
|
if (process.send) {
|
||||||
process.send(message, undefined, undefined, err => {
|
process.send(message, undefined, undefined, err => {
|
||||||
|
|
@ -77,6 +86,9 @@ process.on("message", (message: ChildProcessRequest) => {
|
||||||
case 'send':
|
case 'send':
|
||||||
sendToNostr(message.initiator, message.data, message.relays)
|
sendToNostr(message.initiator, message.data, message.relays)
|
||||||
break
|
break
|
||||||
|
case 'ping':
|
||||||
|
send({ type: 'pong' })
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
getLogger({ component: "nostrMiddleware" })(ERROR, "unknown nostr request", message)
|
getLogger({ component: "nostrMiddleware" })(ERROR, "unknown nostr request", message)
|
||||||
break
|
break
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ export default class NostrSubprocess {
|
||||||
settings: NostrSettings
|
settings: NostrSettings
|
||||||
childProcess: ChildProcess
|
childProcess: ChildProcess
|
||||||
utils: Utils
|
utils: Utils
|
||||||
|
awaitingPongs: (() => void)[] = []
|
||||||
constructor(settings: NostrSettings, utils: Utils, eventCallback: EventCallback) {
|
constructor(settings: NostrSettings, utils: Utils, eventCallback: EventCallback) {
|
||||||
this.utils = utils
|
this.utils = utils
|
||||||
this.childProcess = fork("./build/src/services/nostr/handler")
|
this.childProcess = fork("./build/src/services/nostr/handler")
|
||||||
|
|
@ -34,6 +35,10 @@ export default class NostrSubprocess {
|
||||||
case 'processMetrics':
|
case 'processMetrics':
|
||||||
this.utils.tlvStorageFactory.ProcessMetrics(message.metrics, 'nostr')
|
this.utils.tlvStorageFactory.ProcessMetrics(message.metrics, 'nostr')
|
||||||
break
|
break
|
||||||
|
case 'pong':
|
||||||
|
this.awaitingPongs.forEach(resolve => resolve())
|
||||||
|
this.awaitingPongs = []
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
console.error("unknown nostr event response", message)
|
console.error("unknown nostr event response", message)
|
||||||
break;
|
break;
|
||||||
|
|
@ -44,6 +49,13 @@ export default class NostrSubprocess {
|
||||||
this.childProcess.send(message)
|
this.childProcess.send(message)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ping() {
|
||||||
|
this.sendToChildProcess({ type: 'ping' })
|
||||||
|
return new Promise<void>((resolve) => {
|
||||||
|
this.awaitingPongs.push(resolve)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
Send(initiator: SendInitiator, data: SendData, relays?: string[]) {
|
Send(initiator: SendInitiator, data: SendData, relays?: string[]) {
|
||||||
this.sendToChildProcess({ type: 'send', data, initiator, relays })
|
this.sendToChildProcess({ type: 'send', data, initiator, relays })
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import {
|
||||||
SumOperation,
|
SumOperation,
|
||||||
DBNames,
|
DBNames,
|
||||||
SuccessOperationResponse,
|
SuccessOperationResponse,
|
||||||
|
PingOperation,
|
||||||
} from './storageProcessor.js';
|
} from './storageProcessor.js';
|
||||||
import { PickKeysByType } from 'typeorm/common/PickKeysByType.js';
|
import { PickKeysByType } from 'typeorm/common/PickKeysByType.js';
|
||||||
import { serializeRequest, WhereCondition } from './serializationHelpers.js';
|
import { serializeRequest, WhereCondition } from './serializationHelpers.js';
|
||||||
|
|
@ -67,6 +68,12 @@ export class StorageInterface extends EventEmitter {
|
||||||
this.isConnected = true;
|
this.isConnected = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ping(): Promise<void> {
|
||||||
|
const opId = Math.random().toString()
|
||||||
|
const pingOp: PingOperation = { type: 'ping', opId }
|
||||||
|
return this.handleOp<void>(pingOp)
|
||||||
|
}
|
||||||
|
|
||||||
Connect(settings: DbSettings, dbType: 'main' | 'metrics'): Promise<number> {
|
Connect(settings: DbSettings, dbType: 'main' | 'metrics'): Promise<number> {
|
||||||
const opId = Math.random().toString()
|
const opId = Math.random().toString()
|
||||||
this.dbType = dbType
|
this.dbType = dbType
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,12 @@ export type ConnectOperation = {
|
||||||
debug?: boolean
|
debug?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type PingOperation = {
|
||||||
|
type: 'ping'
|
||||||
|
opId: string
|
||||||
|
debug?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
export type StartTxOperation = {
|
export type StartTxOperation = {
|
||||||
type: 'startTx'
|
type: 'startTx'
|
||||||
opId: string
|
opId: string
|
||||||
|
|
@ -133,7 +139,7 @@ export interface IStorageOperation {
|
||||||
}
|
}
|
||||||
|
|
||||||
export type StorageOperation<T> = ConnectOperation | StartTxOperation | EndTxOperation<T> | DeleteOperation<T> | RemoveOperation<T> | UpdateOperation<T> |
|
export type StorageOperation<T> = ConnectOperation | StartTxOperation | EndTxOperation<T> | DeleteOperation<T> | RemoveOperation<T> | UpdateOperation<T> |
|
||||||
FindOneOperation<T> | FindOperation<T> | CreateAndSaveOperation<T> | IncrementOperation<T> | DecrementOperation<T> | SumOperation<T>
|
FindOneOperation<T> | FindOperation<T> | CreateAndSaveOperation<T> | IncrementOperation<T> | DecrementOperation<T> | SumOperation<T> | PingOperation
|
||||||
|
|
||||||
export type SuccessOperationResponse<T> = { success: true, type: string, data: T, opId: string }
|
export type SuccessOperationResponse<T> = { success: true, type: string, data: T, opId: string }
|
||||||
export type OperationResponse<T> = SuccessOperationResponse<T> | ErrorOperationResponse
|
export type OperationResponse<T> = SuccessOperationResponse<T> | ErrorOperationResponse
|
||||||
|
|
@ -222,6 +228,9 @@ class StorageProcessor {
|
||||||
case 'createAndSave':
|
case 'createAndSave':
|
||||||
await this.handleCreateAndSave(operation);
|
await this.handleCreateAndSave(operation);
|
||||||
break;
|
break;
|
||||||
|
case 'ping':
|
||||||
|
await this.handlePing(operation);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
this.sendResponse({
|
this.sendResponse({
|
||||||
success: false,
|
success: false,
|
||||||
|
|
@ -239,6 +248,14 @@ class StorageProcessor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async handlePing(operation: PingOperation) {
|
||||||
|
this.sendResponse({
|
||||||
|
success: true,
|
||||||
|
type: 'ping',
|
||||||
|
data: null,
|
||||||
|
opId: operation.opId
|
||||||
|
});
|
||||||
|
}
|
||||||
private async handleConnect(operation: ConnectOperation) {
|
private async handleConnect(operation: ConnectOperation) {
|
||||||
let migrationsExecuted = 0
|
let migrationsExecuted = 0
|
||||||
if (this.mode !== '') {
|
if (this.mode !== '') {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import { ChildProcess, fork } from 'child_process';
|
import { ChildProcess, fork } from 'child_process';
|
||||||
import { EventEmitter } from 'events';
|
import { EventEmitter } from 'events';
|
||||||
import { AddTlvOperation, ITlvStorageOperation, SuccessTlvOperationResponse, LoadLatestTlvOperation, LoadTlvFileOperation, NewTlvStorageOperation, SerializableLatestData, SerializableTlvFile, TlvOperationResponse, TlvStorageSettings, WebRtcMessageOperation, ProcessMetricsTlvOperation, ZipStoragesOperation, ResetTlvStorageOperation } from './tlvFilesStorageProcessor';
|
import { AddTlvOperation, ITlvStorageOperation, SuccessTlvOperationResponse, LoadLatestTlvOperation, LoadTlvFileOperation, NewTlvStorageOperation, SerializableLatestData, SerializableTlvFile, TlvOperationResponse, TlvStorageSettings, WebRtcMessageOperation, ProcessMetricsTlvOperation, ZipStoragesOperation, ResetTlvStorageOperation, PingTlvOperation } from './tlvFilesStorageProcessor';
|
||||||
import { LatestData, TlvFile } from './tlvFilesStorage';
|
import { LatestData, TlvFile } from './tlvFilesStorage';
|
||||||
import { NostrSend, SendData, SendInitiator } from '../../nostr/handler';
|
import { NostrSend, SendData, SendInitiator } from '../../nostr/handler';
|
||||||
import { WebRtcUserInfo } from '../../webRTC';
|
import { WebRtcUserInfo } from '../../webRTC';
|
||||||
|
|
@ -63,6 +63,12 @@ export class TlvStorageFactory extends EventEmitter {
|
||||||
this.isConnected = true;
|
this.isConnected = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ping(): Promise<void> {
|
||||||
|
const opId = Math.random().toString()
|
||||||
|
const op: PingTlvOperation = { type: 'ping', opId }
|
||||||
|
return this.handleOp<void>(op)
|
||||||
|
}
|
||||||
|
|
||||||
ZipStorages(): Promise<string> {
|
ZipStorages(): Promise<string> {
|
||||||
const opId = Math.random().toString()
|
const opId = Math.random().toString()
|
||||||
const op: ZipStoragesOperation = { type: 'zipStorages', opId }
|
const op: ZipStoragesOperation = { type: 'zipStorages', opId }
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,12 @@ export type ProcessMetricsTlvOperation = {
|
||||||
debug?: boolean
|
debug?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type PingTlvOperation = {
|
||||||
|
type: 'ping'
|
||||||
|
opId: string
|
||||||
|
debug?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
export type ErrorTlvOperationResponse = { success: false, error: string, opId: string }
|
export type ErrorTlvOperationResponse = { success: false, error: string, opId: string }
|
||||||
|
|
||||||
export interface ITlvStorageOperation {
|
export interface ITlvStorageOperation {
|
||||||
|
|
@ -88,7 +94,7 @@ export interface ITlvStorageOperation {
|
||||||
debug?: boolean
|
debug?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type TlvStorageOperation = NewTlvStorageOperation | AddTlvOperation | LoadLatestTlvOperation | LoadTlvFileOperation | WebRtcMessageOperation | ProcessMetricsTlvOperation | ResetTlvStorageOperation | ZipStoragesOperation
|
export type TlvStorageOperation = NewTlvStorageOperation | AddTlvOperation | LoadLatestTlvOperation | LoadTlvFileOperation | WebRtcMessageOperation | ProcessMetricsTlvOperation | ResetTlvStorageOperation | ZipStoragesOperation | PingTlvOperation
|
||||||
|
|
||||||
export type SuccessTlvOperationResponse<T> = { success: true, type: string, data: T, opId: string }
|
export type SuccessTlvOperationResponse<T> = { success: true, type: string, data: T, opId: string }
|
||||||
export type TlvOperationResponse<T> = SuccessTlvOperationResponse<T> | ErrorTlvOperationResponse
|
export type TlvOperationResponse<T> = SuccessTlvOperationResponse<T> | ErrorTlvOperationResponse
|
||||||
|
|
@ -186,6 +192,9 @@ class TlvFilesStorageProcessor {
|
||||||
case 'zipStorages':
|
case 'zipStorages':
|
||||||
await this.handleZipStorages(operation);
|
await this.handleZipStorages(operation);
|
||||||
break;
|
break;
|
||||||
|
case 'ping':
|
||||||
|
await this.handlePing(operation);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
this.sendResponse({
|
this.sendResponse({
|
||||||
success: false,
|
success: false,
|
||||||
|
|
@ -203,6 +212,14 @@ class TlvFilesStorageProcessor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async handlePing(operation: PingTlvOperation) {
|
||||||
|
this.sendResponse({
|
||||||
|
success: true,
|
||||||
|
type: 'ping',
|
||||||
|
data: null,
|
||||||
|
opId: operation.opId
|
||||||
|
});
|
||||||
|
}
|
||||||
private async handleResetStorage(operation: ResetTlvStorageOperation) {
|
private async handleResetStorage(operation: ResetTlvStorageOperation) {
|
||||||
for (const storageName in this.storages) {
|
for (const storageName in this.storages) {
|
||||||
this.storages[storageName].Reset()
|
this.storages[storageName].Reset()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue