fixies
This commit is contained in:
parent
a0a5989890
commit
7784beabad
1 changed files with 39 additions and 38 deletions
|
|
@ -10,11 +10,12 @@ export type NostrRequest = {
|
||||||
body?: any
|
body?: any
|
||||||
authIdentifier?: string
|
authIdentifier?: string
|
||||||
requestId?: string
|
requestId?: string
|
||||||
|
appId?: string
|
||||||
}
|
}
|
||||||
export type NostrOptions = {
|
export type NostrOptions = {
|
||||||
logger?: Logger
|
logger?: Logger
|
||||||
throwErrors?: true
|
throwErrors?: true
|
||||||
NostrUserAuthGuard: (identifier?: string) => Promise<Types.UserContext>
|
NostrUserAuthGuard: (appId?: string, identifier?: string) => Promise<Types.UserContext>
|
||||||
}
|
}
|
||||||
const logErrorAndReturnResponse = (error: Error, response: string, res: NostrResponse, logger: Logger) => { logger.error(error.message || error); res({ status: 'ERROR', reason: response }) }
|
const logErrorAndReturnResponse = (error: Error, response: string, res: NostrResponse, logger: Logger) => { logger.error(error.message || error); res({ status: 'ERROR', reason: response }) }
|
||||||
export default (methods: Types.ServerMethods, opts: NostrOptions) => {
|
export default (methods: Types.ServerMethods, opts: NostrOptions) => {
|
||||||
|
|
@ -24,148 +25,148 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
|
||||||
case 'GetUserInfo':
|
case 'GetUserInfo':
|
||||||
try {
|
try {
|
||||||
if (!methods.GetUserInfo) throw new Error('method: GetUserInfo is not implemented')
|
if (!methods.GetUserInfo) throw new Error('method: GetUserInfo is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.GetUserInfo({ ...authContext, ...query, ...params })
|
const response = await methods.GetUserInfo({ ...authContext, ...query, ...params })
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'AddProduct':
|
case 'AddProduct':
|
||||||
try {
|
try {
|
||||||
if (!methods.AddProduct) throw new Error('method: AddProduct is not implemented')
|
if (!methods.AddProduct) throw new Error('method: AddProduct is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const request = req.body
|
const request = req.body
|
||||||
const error = Types.AddProductRequestValidate(request)
|
const error = Types.AddProductRequestValidate(request)
|
||||||
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.AddProduct({ ...authContext, ...query, ...params }, request)
|
const response = await methods.AddProduct({ ...authContext, ...query, ...params }, request)
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'NewProductInvoice':
|
case 'NewProductInvoice':
|
||||||
try {
|
try {
|
||||||
if (!methods.NewProductInvoice) throw new Error('method: NewProductInvoice is not implemented')
|
if (!methods.NewProductInvoice) throw new Error('method: NewProductInvoice is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.NewProductInvoice({ ...authContext, ...query, ...params })
|
const response = await methods.NewProductInvoice({ ...authContext, ...query, ...params })
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'GetUserOperations':
|
case 'GetUserOperations':
|
||||||
try {
|
try {
|
||||||
if (!methods.GetUserOperations) throw new Error('method: GetUserOperations is not implemented')
|
if (!methods.GetUserOperations) throw new Error('method: GetUserOperations is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const request = req.body
|
const request = req.body
|
||||||
const error = Types.GetUserOperationsRequestValidate(request)
|
const error = Types.GetUserOperationsRequestValidate(request)
|
||||||
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.GetUserOperations({ ...authContext, ...query, ...params }, request)
|
const response = await methods.GetUserOperations({ ...authContext, ...query, ...params }, request)
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'NewAddress':
|
case 'NewAddress':
|
||||||
try {
|
try {
|
||||||
if (!methods.NewAddress) throw new Error('method: NewAddress is not implemented')
|
if (!methods.NewAddress) throw new Error('method: NewAddress is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const request = req.body
|
const request = req.body
|
||||||
const error = Types.NewAddressRequestValidate(request)
|
const error = Types.NewAddressRequestValidate(request)
|
||||||
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.NewAddress({ ...authContext, ...query, ...params }, request)
|
const response = await methods.NewAddress({ ...authContext, ...query, ...params }, request)
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'PayAddress':
|
case 'PayAddress':
|
||||||
try {
|
try {
|
||||||
if (!methods.PayAddress) throw new Error('method: PayAddress is not implemented')
|
if (!methods.PayAddress) throw new Error('method: PayAddress is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const request = req.body
|
const request = req.body
|
||||||
const error = Types.PayAddressRequestValidate(request)
|
const error = Types.PayAddressRequestValidate(request)
|
||||||
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.PayAddress({ ...authContext, ...query, ...params }, request)
|
const response = await methods.PayAddress({ ...authContext, ...query, ...params }, request)
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'NewInvoice':
|
case 'NewInvoice':
|
||||||
try {
|
try {
|
||||||
if (!methods.NewInvoice) throw new Error('method: NewInvoice is not implemented')
|
if (!methods.NewInvoice) throw new Error('method: NewInvoice is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const request = req.body
|
const request = req.body
|
||||||
const error = Types.NewInvoiceRequestValidate(request)
|
const error = Types.NewInvoiceRequestValidate(request)
|
||||||
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.NewInvoice({ ...authContext, ...query, ...params }, request)
|
const response = await methods.NewInvoice({ ...authContext, ...query, ...params }, request)
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'DecodeInvoice':
|
case 'DecodeInvoice':
|
||||||
try {
|
try {
|
||||||
if (!methods.DecodeInvoice) throw new Error('method: DecodeInvoice is not implemented')
|
if (!methods.DecodeInvoice) throw new Error('method: DecodeInvoice is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const request = req.body
|
const request = req.body
|
||||||
const error = Types.DecodeInvoiceRequestValidate(request)
|
const error = Types.DecodeInvoiceRequestValidate(request)
|
||||||
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.DecodeInvoice({ ...authContext, ...query, ...params }, request)
|
const response = await methods.DecodeInvoice({ ...authContext, ...query, ...params }, request)
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'PayInvoice':
|
case 'PayInvoice':
|
||||||
try {
|
try {
|
||||||
if (!methods.PayInvoice) throw new Error('method: PayInvoice is not implemented')
|
if (!methods.PayInvoice) throw new Error('method: PayInvoice is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const request = req.body
|
const request = req.body
|
||||||
const error = Types.PayInvoiceRequestValidate(request)
|
const error = Types.PayInvoiceRequestValidate(request)
|
||||||
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.PayInvoice({ ...authContext, ...query, ...params }, request)
|
const response = await methods.PayInvoice({ ...authContext, ...query, ...params }, request)
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'OpenChannel':
|
case 'OpenChannel':
|
||||||
try {
|
try {
|
||||||
if (!methods.OpenChannel) throw new Error('method: OpenChannel is not implemented')
|
if (!methods.OpenChannel) throw new Error('method: OpenChannel is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const request = req.body
|
const request = req.body
|
||||||
const error = Types.OpenChannelRequestValidate(request)
|
const error = Types.OpenChannelRequestValidate(request)
|
||||||
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.OpenChannel({ ...authContext, ...query, ...params }, request)
|
const response = await methods.OpenChannel({ ...authContext, ...query, ...params }, request)
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'GetLnurlWithdrawLink':
|
case 'GetLnurlWithdrawLink':
|
||||||
try {
|
try {
|
||||||
if (!methods.GetLnurlWithdrawLink) throw new Error('method: GetLnurlWithdrawLink is not implemented')
|
if (!methods.GetLnurlWithdrawLink) throw new Error('method: GetLnurlWithdrawLink is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.GetLnurlWithdrawLink({ ...authContext, ...query, ...params })
|
const response = await methods.GetLnurlWithdrawLink({ ...authContext, ...query, ...params })
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
case 'GetLNURLChannelLink':
|
case 'GetLNURLChannelLink':
|
||||||
try {
|
try {
|
||||||
if (!methods.GetLNURLChannelLink) throw new Error('method: GetLNURLChannelLink is not implemented')
|
if (!methods.GetLNURLChannelLink) throw new Error('method: GetLNURLChannelLink is not implemented')
|
||||||
const authContext = await opts.NostrUserAuthGuard(req.authIdentifier)
|
const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
|
||||||
const query = req.query
|
const query = req.query
|
||||||
const params = req.params
|
const params = req.params
|
||||||
const response = await methods.GetLNURLChannelLink({ ...authContext, ...query, ...params })
|
const response = await methods.GetLNURLChannelLink({ ...authContext, ...query, ...params })
|
||||||
res({status: 'OK', ...response})
|
res({ status: 'OK', ...response })
|
||||||
}catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
} catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger); if (opts.throwErrors) throw e }
|
||||||
break
|
break
|
||||||
default: logger.error('unknown rpc call name from nostr event:'+req.rpcName)
|
default: logger.error('unknown rpc call name from nostr event:' + req.rpcName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue