fix name of yml

.github/workflows/ci.yml → .github/workflows/build.yml

@@ -1,16 +1,9 @@
-name: Artifact
+name: Build
 
 on:
-  release:
-    types: [released]
   pull_request:
-    types: [closed]
-    branches: [ master ]
   workflow_dispatch:
-
-env:
-  CI: false
-
+
 jobs:
   build:
     runs-on: ubuntu-22.04
@@ -19,7 +12,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
 
@@ -59,32 +52,3 @@ jobs:
 
       - name: Run build backend server
         run: npm run backend:build
-
-  deploy:
-    runs-on: ubuntu-22.04
-    needs: build
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v3
-
-      - name: Cache build frontend
-        uses: actions/cache@v3
-        id: cache-build-frontend
-        with:
-          path: apps/frontend
-          key: ${{ runner.os }}-frontend-${{ github.sha }}
-
-      - name: Cache build backend
-        uses: actions/cache@v3
-        id: cache-build-backend
-        with:
-          path: apps/backend
-          key: ${{ runner.os }}-backend-${{ github.sha }}
-
-      - name: Compress files
-        run: tar -czf /tmp/clnapp.tar.gz apps/frontend/build apps/backend/dist package.json package-lock.json
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: clnapp-build$VERSION
-          path: /tmp/clnapp.tar.gz

.github/workflows/lint.yml

@@ -0,0 +1,36 @@
+name: Lint
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  eslint:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Use Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18.x
+
+    - name: Get version from package.json
+      id: package-version
+      run: |
+        echo "VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+        echo "Project Version: $VERSION"
+
+    - name: Cache node_modules
+      uses: actions/cache@v3
+      id: cache-npm-packages
+      with:
+        path: node_modules
+        key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
+
+    - name: Install NPM dependencies
+      if: steps.cache-npm-packages.outputs.cache-hit != 'true'
+      run: npm clean-install
+
+    - name: Check lint errors
+      run: npm run lint

.github/workflows/github.yml → .github/workflows/release.yml

@@ -1,14 +1,39 @@
-name: Build and publish Github image
+name: Build artifact and package
 
 on:
   release:
     types: [released]
-  pull_request:
-    types: [closed]
-    branches: [ master ]
   workflow_dispatch:
 
 jobs:
+  artifact:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+
+      - name: Cache build frontend
+        uses: actions/cache@v3
+        id: cache-build-frontend
+        with:
+          path: apps/frontend
+          key: ${{ runner.os }}-frontend-${{ github.sha }}
+
+      - name: Cache build backend
+        uses: actions/cache@v3
+        id: cache-build-backend
+        with:
+          path: apps/backend
+          key: ${{ runner.os }}-backend-${{ github.sha }}
+
+      - name: Compress files
+        run: tar -czf /tmp/clnapp.tar.gz apps/frontend/build apps/backend/dist package.json package-lock.json
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: clnapp-build$VERSION
+          path: /tmp/clnapp.tar.gz
+
   build:
     name: Build image
     runs-on: ubuntu-22.04

.github/workflows/test.yml

@@ -0,0 +1,38 @@
+name: Unit tests
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.x
+
+      - name: Get version from package.json
+        id: package-version
+        run: |
+          echo "VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+          echo "Project Version: $VERSION"
+
+      - name: Cache node_modules
+        uses: actions/cache@v3
+        id: cache-npm-packages
+        with:
+          path: node_modules
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
+
+      - name: Install NPM dependencies
+        if: steps.cache-npm-packages.outputs.cache-hit != 'true'
+        run: npm clean-install
+
+      - name: Run frontend unit tests
+        run: npm run frontend:test
+

README.md

@@ -64,7 +64,6 @@
       - LIGHTNING_IP: IP address of Core lightning node container (required)
       - LIGHTNING_PATH: Path for core lightning (optional; required for entrypoint.sh)
       - HIDDEN_SERVICE_URL: REST hidden service url (optional; for connect wallet screen; Used for Tor Domain also)
-      - LIGHTNING_NODE_TYPE: Choose Core lightning node type (valid values: CLN/GREENLIGHT, default: CLN)
       - COMMANDO_CONFIG: Full Path including file name for commando auth with PUBKEY & RUNE (required)
       - LIGHTNING_WEBSOCKET_PORT: Core lightning's websocket port (required; from cln's config.json; starting with `bind-addr=ws:`)
       - LIGHTNING_REST_PROTOCOL: Protocol on which REST is served (valid values: http/https, default: https)

apps/backend/dist/controllers/auth.js

@@ -3,7 +3,7 @@ import * as fs from 'fs';
 import { APP_CONSTANTS, HttpStatusCode, SECRET_KEY } from '../shared/consts.js';
 import { logger } from '../shared/logger.js';
 import handleError from '../shared/error-handler.js';
-import { verifyPassword, isAuthenticated, isValidPassword, applicationConfig, } from '../shared/utils.js';
+import { verifyPassword, isAuthenticated, isValidPassword } from '../shared/utils.js';
 import { AuthError } from '../models/errors.js';
 class AuthController {
     userLogin(req, res, next) {
@@ -46,9 +46,6 @@ class AuthController {
                     const config = JSON.parse(fs.readFileSync(APP_CONSTANTS.APP_CONFIG_FILE, 'utf-8'));
                     if (config.password === currPassword || !isValid) {
                         try {
-                            if (typeof config.singleSignOn === 'undefined') {
-                                config.singleSignOn = process.env.SINGLE_SIGN_ON || false;
-                            }
                             config.password = newPassword;
                             try {
                                 fs.writeFileSync(APP_CONSTANTS.APP_CONFIG_FILE, JSON.stringify(config, null, 2), 'utf-8');
@@ -85,7 +82,7 @@ class AuthController {
             const uaRes = isAuthenticated(req.cookies.token);
             if (req.body.returnResponse) {
                 // Frontend is asking if user is authenticated or not
-                if (applicationConfig?.singleSignOn === true) {
+                if (APP_CONSTANTS.SINGLE_SIGN_ON === 'true') {
                     return res.status(201).json({ isAuthenticated: true, isValidPassword: true });
                 }
                 else {
@@ -105,7 +102,7 @@ class AuthController {
             }
             else {
                 // Backend APIs are asking if user is authenticated or not
-                if (uaRes === true || applicationConfig?.singleSignOn === true) {
+                if (uaRes === true || APP_CONSTANTS.SINGLE_SIGN_ON === 'true') {
                     return next();
                 }
                 else {

apps/backend/dist/controllers/shared.js

@@ -4,7 +4,7 @@ import { APP_CONSTANTS, DEFAULT_CONFIG, FIAT_RATE_API, FIAT_VENUES, HttpStatusCo
 import { logger } from '../shared/logger.js';
 import handleError from '../shared/error-handler.js';
 import { APIError } from '../models/errors.js';
-import { setSharedApplicationConfig, overrideSettingsWithEnvVariables, refreshEnvVariables, } from '../shared/utils.js';
+import { addServerConfig, refreshEnvVariables } from '../shared/utils.js';
 import { CLNService } from '../service/lightning.service.js';
 class SharedController {
     getApplicationSettings(req, res, next) {
@@ -13,10 +13,14 @@ class SharedController {
             if (!fs.existsSync(APP_CONSTANTS.APP_CONFIG_FILE)) {
                 fs.writeFileSync(APP_CONSTANTS.APP_CONFIG_FILE, JSON.stringify(DEFAULT_CONFIG, null, 2), 'utf-8');
             }
-            let config = JSON.parse(fs.readFileSync(APP_CONSTANTS.APP_CONFIG_FILE, 'utf-8'));
-            config = overrideSettingsWithEnvVariables(config);
-            setSharedApplicationConfig(config);
-            delete config.password;
+            let config = {
+                uiConfig: JSON.parse(fs.readFileSync(APP_CONSTANTS.APP_CONFIG_FILE, 'utf-8')),
+            };
+            delete config.uiConfig.password;
+            delete config.uiConfig.isLoading;
+            delete config.uiConfig.error;
+            delete config.uiConfig.singleSignOn;
+            config = addServerConfig(config);
             res.status(200).json(config);
         }
         catch (error) {
@@ -27,8 +31,8 @@ class SharedController {
         try {
             logger.info('Updating Application Settings: ' + JSON.stringify(req.body));
             const config = JSON.parse(fs.readFileSync(APP_CONSTANTS.APP_CONFIG_FILE, 'utf-8'));
-            req.body.password = config.password; // Before saving, add password in the config received from frontend
-            fs.writeFileSync(APP_CONSTANTS.APP_CONFIG_FILE, JSON.stringify(req.body, null, 2), 'utf-8');
+            req.body.uiConfig.password = config.password; // Before saving, add password in the config received from frontend
+            fs.writeFileSync(APP_CONSTANTS.APP_CONFIG_FILE, JSON.stringify(req.body.uiConfig, null, 2), 'utf-8');
             res.status(201).json({ message: 'Application Settings Updated Successfully' });
         }
         catch (error) {

apps/backend/dist/server.js

@@ -14,15 +14,15 @@ import { AuthRoutes } from './routes/v1/auth.js';
 import { APIError } from './models/errors.js';
 import { APP_CONSTANTS, Environment, HttpStatusCode } from './shared/consts.js';
 import handleError from './shared/error-handler.js';
-let directoryName = dirname(fileURLToPath(import.meta.url));
-let routes = [];
+const directoryName = dirname(fileURLToPath(import.meta.url));
+const routes = [];
 const app = express();
 const server = http.createServer(app);
 const LIGHTNING_PORT = normalizePort(process.env.APP_PORT || '2103');
 const APP_IP = process.env.APP_IP || 'localhost';
 const APP_PROTOCOL = process.env.APP_PROTOCOL || 'http';
 function normalizePort(val) {
-    var port = parseInt(val, 10);
+    const port = parseInt(val, 10);
     if (isNaN(port)) {
         return val;
     }

apps/backend/dist/service/grpc.service.js

@@ -153,14 +153,14 @@ export class GRPCService {
                 : errorMessage;
         }
         catch (error) {
+            logger.error('Error extracting RPC error message: ', error);
             return errorMessage;
         }
     }
     decodeResponse(method, response) {
         const responseType = this.clnNode.lookupType(`cln.${method}Response`);
         const dataBuffer = Buffer.from(response.data || '');
-        const resFlag = dataBuffer.subarray(0, 1);
-        const resDataLength = dataBuffer.subarray(1, 5);
+        // resFlag (0, 1) and resDataLength (1, 5) not used in code
         const responseData = dataBuffer.subarray(5);
         const grpcStatus = Number(response.headers['grpc-status']);
         if (grpcStatus !== 0) {

apps/backend/dist/service/lightning.service.js

@@ -45,7 +45,7 @@ export class LightningService {
             case AppConnect.REST:
                 const headers = new AxiosHeaders();
                 headers.set('rune', APP_CONSTANTS.COMMANDO_RUNE);
-                let axiosConfig = {
+                const axiosConfig = {
                     baseURL: REST_CONFIG.url + '/v1/',
                     headers,
                 };

apps/backend/dist/shared/consts.js

@@ -15,7 +15,6 @@ export var AppConnect;
 export var NodeType;
 (function (NodeType) {
     NodeType["CLN"] = "CLN";
-    NodeType["GREENLIGHT"] = "GREENLIGHT";
 })(NodeType || (NodeType = {}));
 export var HttpStatusCode;
 (function (HttpStatusCode) {
@@ -121,7 +120,6 @@ export const API_VERSION = '/v1';
 export const FIAT_RATE_API = 'https://green-bitcoin-mainnet.blockstream.com/prices/v0/venues/';
 export const FIAT_VENUES = {
     USD: 'KRAKEN',
-    CAD: 'BULLBITCOIN',
     EUR: 'KRAKEN',
     NZD: 'KIWICOIN',
 };

apps/backend/dist/shared/error-handler.js

@@ -1,8 +1,8 @@
 import { HttpStatusCode } from './consts.js';
 import { logger } from './logger.js';
 function handleError(error, req, res, next) {
-    var route = req.url || '';
-    var message = error.message
+    const route = req.url || '';
+    const message = error.message
         ? error.message
         : typeof error === 'object'
             ? JSON.stringify(error)

apps/backend/dist/shared/utils.js

@@ -3,20 +3,17 @@ import * as fs from 'fs';
 import { sep } from 'path';
 import { logger } from '../shared/logger.js';
 import { APP_CONSTANTS, GRPC_CONFIG, LN_MESSAGE_CONFIG, SECRET_KEY } from '../shared/consts.js';
-export var applicationConfig = null;
-export function overrideSettingsWithEnvVariables(config) {
-    config.singleSignOn =
-        (process.env.SINGLE_SIGN_ON && process.env.SINGLE_SIGN_ON === 'true') || false;
+export function addServerConfig(config) {
+    config.serverConfig = {
+        appConnect: APP_CONSTANTS.APP_CONNECT,
+        appPort: APP_CONSTANTS.APP_PORT,
+        appProtocol: APP_CONSTANTS.APP_PROTOCOL,
+        appVersion: APP_CONSTANTS.APP_VERSION,
+        lightningNodeType: APP_CONSTANTS.LIGHTNING_NODE_TYPE,
+        singleSignOn: APP_CONSTANTS.SINGLE_SIGN_ON,
+    };
     return config;
 }
-export function setSharedApplicationConfig(config) {
-    try {
-        applicationConfig = config;
-    }
-    catch (error) {
-        throw error;
-    }
-}
 export function isAuthenticated(token) {
     try {
         if (!token) {
@@ -109,7 +106,7 @@ export function refreshEnvVariables() {
     let clientCert = '';
     let caCert = '';
     if (fs.existsSync('package.json')) {
-        let packageData = Buffer.from(fs.readFileSync('package.json')).toString();
+        const packageData = Buffer.from(fs.readFileSync('package.json')).toString();
         APP_CONSTANTS.APP_VERSION = JSON.parse(packageData).version;
     }
     if (fs.existsSync(APP_CONSTANTS.LIGHTNING_CERTS_PATH + 'client-key.pem')) {

apps/backend/eslint.config.js

@@ -0,0 +1,23 @@
+import tseslint from 'typescript-eslint';
+import globals from 'globals';
+
+export default [
+  ...tseslint.configs.recommended,
+  {
+    files: ['**/*.{js,ts}'],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+      parserOptions: {
+        sourceType: 'module',
+        project: './tsconfig.json',
+      },
+    },
+    rules: {
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unused-vars': 'off',
+    },
+  },
+];