Merge branch 'master' into simon/search-bar-click-outside
This commit is contained in:
		
						commit
						cfb4fdb7a4
					
				@ -222,6 +222,10 @@
 | 
			
		||||
              "proxyConfig": "proxy.conf.local.js",
 | 
			
		||||
              "verbose": true
 | 
			
		||||
            },
 | 
			
		||||
            "local-esplora": {
 | 
			
		||||
              "proxyConfig": "proxy.conf.local-esplora.js",
 | 
			
		||||
              "verbose": true
 | 
			
		||||
            },
 | 
			
		||||
            "mixed": {
 | 
			
		||||
              "proxyConfig": "proxy.conf.mixed.js",
 | 
			
		||||
              "verbose": true
 | 
			
		||||
 | 
			
		||||
@ -29,6 +29,7 @@
 | 
			
		||||
    "serve:local-prod": "npm run generate-config && npm run ng -- serve -c local-prod",
 | 
			
		||||
    "serve:local-staging": "npm run generate-config && npm run ng -- serve -c local-staging",
 | 
			
		||||
    "start": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c local",
 | 
			
		||||
    "start:local-esplora": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c local-esplora",
 | 
			
		||||
    "start:stg": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c staging",
 | 
			
		||||
    "start:local-prod": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c local-prod",
 | 
			
		||||
    "start:local-staging": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c local-staging",
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										137
									
								
								frontend/proxy.conf.local-esplora.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										137
									
								
								frontend/proxy.conf.local-esplora.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,137 @@
 | 
			
		||||
const fs = require('fs');
 | 
			
		||||
 | 
			
		||||
const FRONTEND_CONFIG_FILE_NAME = 'mempool-frontend-config.json';
 | 
			
		||||
 | 
			
		||||
let configContent;
 | 
			
		||||
 | 
			
		||||
// Read frontend config 
 | 
			
		||||
try {
 | 
			
		||||
    const rawConfig = fs.readFileSync(FRONTEND_CONFIG_FILE_NAME);
 | 
			
		||||
    configContent = JSON.parse(rawConfig);
 | 
			
		||||
    console.log(`${FRONTEND_CONFIG_FILE_NAME} file found, using provided config`);
 | 
			
		||||
} catch (e) {
 | 
			
		||||
    console.log(e);
 | 
			
		||||
    if (e.code !== 'ENOENT') {
 | 
			
		||||
      throw new Error(e);
 | 
			
		||||
  } else {
 | 
			
		||||
      console.log(`${FRONTEND_CONFIG_FILE_NAME} file not found, using default config`);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
let PROXY_CONFIG = [];
 | 
			
		||||
 | 
			
		||||
if (configContent && configContent.BASE_MODULE === 'liquid') {
 | 
			
		||||
  PROXY_CONFIG.push(...[
 | 
			
		||||
    {
 | 
			
		||||
      context: ['/liquid/api/v1/**'],
 | 
			
		||||
      target: `http://127.0.0.1:8999`,
 | 
			
		||||
      secure: false,
 | 
			
		||||
      ws: true,
 | 
			
		||||
      changeOrigin: true,
 | 
			
		||||
      proxyTimeout: 30000,
 | 
			
		||||
      pathRewrite: {
 | 
			
		||||
          "^/liquid": ""
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
      context: ['/liquid/api/**'],
 | 
			
		||||
      target: `http://127.0.0.1:3000`,
 | 
			
		||||
      secure: false,
 | 
			
		||||
      changeOrigin: true,
 | 
			
		||||
      proxyTimeout: 30000,
 | 
			
		||||
      pathRewrite: {
 | 
			
		||||
          "^/liquid/api/": ""
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
      context: ['/liquidtestnet/api/v1/**'],
 | 
			
		||||
      target: `http://127.0.0.1:8999`,
 | 
			
		||||
      secure: false,
 | 
			
		||||
      ws: true,
 | 
			
		||||
      changeOrigin: true,
 | 
			
		||||
      proxyTimeout: 30000,
 | 
			
		||||
      pathRewrite: {
 | 
			
		||||
          "^/liquidtestnet": ""
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
      context: ['/liquidtestnet/api/**'],
 | 
			
		||||
      target: `http://127.0.0.1:3000`,
 | 
			
		||||
      secure: false,
 | 
			
		||||
      changeOrigin: true,
 | 
			
		||||
      proxyTimeout: 30000,
 | 
			
		||||
      pathRewrite: {
 | 
			
		||||
          "^/liquidtestnet/api/": "/"
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
  ]);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
if (configContent && configContent.BASE_MODULE === 'bisq') {
 | 
			
		||||
  PROXY_CONFIG.push(...[
 | 
			
		||||
    {
 | 
			
		||||
      context: ['/bisq/api/v1/ws'],
 | 
			
		||||
      target: `http://127.0.0.1:8999`,
 | 
			
		||||
      secure: false,
 | 
			
		||||
      ws: true,
 | 
			
		||||
      changeOrigin: true,
 | 
			
		||||
      proxyTimeout: 30000,
 | 
			
		||||
      pathRewrite: {
 | 
			
		||||
          "^/bisq": ""
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
      context: ['/bisq/api/v1/**'],
 | 
			
		||||
      target: `http://127.0.0.1:8999`,
 | 
			
		||||
      secure: false,
 | 
			
		||||
      changeOrigin: true,
 | 
			
		||||
      proxyTimeout: 30000,
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
      context: ['/bisq/api/**'],
 | 
			
		||||
      target: `http://127.0.0.1:8999`,
 | 
			
		||||
      secure: false,
 | 
			
		||||
      changeOrigin: true,
 | 
			
		||||
      proxyTimeout: 30000,
 | 
			
		||||
      pathRewrite: {
 | 
			
		||||
          "^/bisq/api/": "/api/v1/bisq/"
 | 
			
		||||
      },
 | 
			
		||||
    }
 | 
			
		||||
  ]);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
PROXY_CONFIG.push(...[
 | 
			
		||||
  {
 | 
			
		||||
    context: ['/testnet/api/v1/lightning/**'],
 | 
			
		||||
    target: `http://127.0.0.1:8999`,
 | 
			
		||||
    secure: false,
 | 
			
		||||
    changeOrigin: true,
 | 
			
		||||
    proxyTimeout: 30000,
 | 
			
		||||
    pathRewrite: {
 | 
			
		||||
        "^/testnet": ""
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    context: ['/api/v1/**'],
 | 
			
		||||
    target: `http://127.0.0.1:8999`,
 | 
			
		||||
    secure: false,
 | 
			
		||||
    ws: true,
 | 
			
		||||
    changeOrigin: true,
 | 
			
		||||
    proxyTimeout: 30000,
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    context: ['/api/**'],
 | 
			
		||||
    target: `http://127.0.0.1:3000`,
 | 
			
		||||
    secure: false,
 | 
			
		||||
    changeOrigin: true,
 | 
			
		||||
    proxyTimeout: 30000,
 | 
			
		||||
    pathRewrite: {
 | 
			
		||||
        "^/api": ""
 | 
			
		||||
    },
 | 
			
		||||
  }
 | 
			
		||||
]);
 | 
			
		||||
 | 
			
		||||
console.log(PROXY_CONFIG);
 | 
			
		||||
 | 
			
		||||
module.exports = PROXY_CONFIG;
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user