diff --git a/services/lnd/lightning.js b/services/lnd/lightning.js index 8be1865e..caf232f2 100644 --- a/services/lnd/lightning.js +++ b/services/lnd/lightning.js @@ -1,7 +1,8 @@ +const Path = require("path"); const grpc = require("grpc"); const protoLoader = require("@grpc/proto-loader"); -const fs = require("../../utils/fs"); const logger = require("winston"); +const fs = require("../../utils/fs"); const errorConstants = require("../../constants/errors"); // expose the routes to our app with module.exports @@ -42,11 +43,9 @@ module.exports = async ({ enums: String, defaults: true, oneofs: true, - includeDirs: ["node_modules/google-proto-files", "proto"] + includeDirs: ["node_modules/google-proto-files", "proto", Path.resolve(__dirname, "../../config")] } - logger.info("Proto file location:", lnrpcProtoPath, routerProtoPath); - const [lnrpcProto, routerProto, walletUnlockerProto] = await Promise.all([protoLoader.load(lnrpcProtoPath, protoLoaderConfig), protoLoader.load(routerProtoPath, protoLoaderConfig), protoLoader.load(walletUnlockerProtoPath, protoLoaderConfig)]); const { lnrpc } = grpc.loadPackageDefinition(lnrpcProto); const { routerrpc } = grpc.loadPackageDefinition(routerProto); diff --git a/src/server.js b/src/server.js index d2bbe902..4ba0372f 100644 --- a/src/server.js +++ b/src/server.js @@ -212,7 +212,7 @@ const server = program => { }) app.use((req, res, next) => { - res.set('Version', program.version()) + res.set('Version', program.version ? program.version() : 'N/A') next() })