Syncing with ct-unstable. Fixing merge conflict

LICENSE.md

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2021-2023 Permissionless Software Foundation
+Copyright (c) 2021-2024 Permissionless Software Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -47,9 +47,9 @@ This web server spins up an embedded IPFS ([Helia](https://github.com/ipfs/helia
 
 ## Requirements
 
-- node **^16.20.2**
-- npm **^8.19.4**
-- Docker **^20.10.8**
+- node **^20.16.0**
+- npm **^10.8.1**
+- Docker **^24.0.7**
 - Docker Compose **^1.27.4**
 
 ## Installation

bin/server.js

@@ -49,6 +49,7 @@ class Server {
       const app = new Koa()
       app.keys = [this.config.session]
 
+      if (!this.config.noMongo) {
         // Connect to the Mongo Database.
         this.mongoose.Promise = global.Promise
         this.mongoose.set('useCreateIndex', true) // Stop deprecation warning.
@@ -59,6 +60,7 @@ class Server {
           useUnifiedTopology: true,
           useNewUrlParser: true
         })
+      }
 
       console.log(`Starting environment: ${this.config.env}`)
       console.log(`Debug level: ${this.config.debugLevel}`)
@@ -107,9 +109,11 @@ class Server {
       this.server = await app.listen(this.config.port)
       console.log(`Server started on ${this.config.port}`)
 
+      if (!this.config.noMongo) {
         // Create the system admin user.
         const success = await this.adminLib.createSystemUser()
         if (success) console.log('System admin user created.')
+      }
 
       // Attach the other IPFS controllers.
       // Skip if this is a test environment.

config/env/common.js

@@ -43,6 +43,9 @@ export default {
     ? process.env.EMAILPASS
     : 'emailpassword',
 
+  // Enable or Disable the usage of Mongo DB.
+  noMongo: process.env.NO_MONGO ? true : false,
+
   // BEGIN WALLET CONFIGURATION
 
   // BCH Mnemonic for generating encryption keys and payment address

package.json

@@ -24,24 +24,26 @@
   },
   "repository": "Permissionless-Software-Foundation/ipfs-service-provider",
   "dependencies": {
-    "@chainsafe/libp2p-gossipsub": "11.0.1",
-    "@chainsafe/libp2p-noise": "14.1.0",
-    "@chainsafe/libp2p-yamux": "6.0.1",
-    "@helia/unixfs": "3.0.1",
-    "@libp2p/bootstrap": "10.0.7",
-    "@libp2p/circuit-relay-v2": "1.0.13",
-    "@libp2p/identify": "1.0.6",
-    "@libp2p/keychain": "4.0.7",
-    "@libp2p/logger": "4.0.5",
-    "@libp2p/tcp": "9.0.7",
-    "@libp2p/webrtc": "4.0.17",
+    "@chainsafe/libp2p-gossipsub": "13.1.1",
+    "@chainsafe/libp2p-noise": "15.1.1",
+    "@chainsafe/libp2p-yamux": "6.0.2",
+    "@helia/unixfs": "3.0.7",
+    "@libp2p/bootstrap": "10.1.5",
+    "@libp2p/circuit-relay-v2": "1.1.5",
+    "@libp2p/identify": "2.1.5",
+    "@libp2p/keychain": "4.1.5",
+    "@libp2p/logger": "4.0.20",
+    "@libp2p/tcp": "9.1.5",
+    "@libp2p/webrtc": "4.1.7",
+    "@libp2p/websockets": "8.2.0",
+    "@multiformats/multiaddr": "12.3.0",
     "axios": "0.27.2",
     "bcryptjs": "2.4.3",
-    "blockstore-fs": "1.1.8",
-    "datastore-fs": "9.1.6",
+    "blockstore-fs": "2.0.0",
+    "datastore-fs": "9.1.7",
     "glob": "7.1.6",
-    "helia": "2.1.0",
-    "helia-coord": "1.5.7",
+    "helia": "4.2.5",
+    "helia-coord": "1.5.15",
     "jsonrpc-lite": "2.2.0",
     "jsonwebtoken": "8.5.1",
     "jwt-bch-lib": "1.3.0",
@@ -56,9 +58,9 @@
     "koa-router": "10.0.0",
     "koa-static": "5.0.0",
     "koa2-ratelimit": "0.9.1",
-    "libp2p": "1.2.1",
+    "libp2p": "1.9.1",
     "line-reader": "0.4.0",
-    "minimal-slp-wallet": "5.11.1",
+    "minimal-slp-wallet": "5.12.0",
     "mongoose": "5.13.14",
     "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
     "nodemailer": "6.7.5",

production/docker/Dockerfile

@@ -15,7 +15,7 @@ RUN apt-get install -y sudo git curl nano gnupg wget
 RUN sudo apt-get install -y ca-certificates curl gnupg
 RUN sudo mkdir -p /etc/apt/keyrings
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
 RUN sudo apt-get update
 RUN sudo apt-get install -y nodejs build-essential
 
@@ -66,8 +66,6 @@ RUN npm install
 # Generate the API docs
 RUN npm run docs
 
-VOLUME /home/safeuser/keys
-
 # Expose the port the API will be served on.
 EXPOSE 5010
 

production/docker/docker-compose.yml

@@ -22,7 +22,7 @@ services:
       options:
         max-size: '10m'
         max-file: '10'
-    #mem_limit: 500mb
+    mem_limit: 1000mb
     links:
       - mongo-ipfs-service
     ports:

src/adapters/ipfs/ipfs.js

@@ -20,13 +20,13 @@ import { yamux } from '@chainsafe/libp2p-yamux'
 // import { bootstrap } from '@libp2p/bootstrap'
 // import { identifyService } from 'libp2p/identify'
 import { identify } from '@libp2p/identify'
-// import { circuitRelayServer, circuitRelayTransport } from 'libp2p/circuit-relay'
-import { circuitRelayServer, circuitRelayTransport } from '@libp2p/circuit-relay-v2'
+// import { circuitRelayServer, circuitRelayTransport } from '@libp2p/circuit-relay-v2'
+import { circuitRelayServer } from '@libp2p/circuit-relay-v2'
 import { gossipsub } from '@chainsafe/libp2p-gossipsub'
 import { webSockets } from '@libp2p/websockets'
 import { publicIpv4 } from 'public-ip'
 import { multiaddr } from '@multiformats/multiaddr'
-import { webRTC } from '@libp2p/webrtc'
+// import { webRTC } from '@libp2p/webrtc'
 import { keychain } from '@libp2p/keychain'
 import { defaultLogger } from '@libp2p/logger'
 import { unixfs } from '@helia/unixfs'
@@ -154,7 +154,7 @@ class IpfsAdapter {
       // Configure services
       const services = {
         identify: identify(),
-        pubsub: gossipsub({ allowPublishToZeroPeers: true })
+        pubsub: gossipsub({ allowPublishToZeroTopicPeers: true })
       }
       if (this.config.isCircuitRelay) {
         console.log('Helia (IPFS) node IS configured as Circuit Relay')
@@ -175,25 +175,15 @@ class IpfsAdapter {
         console.log('Helia (IPFS) node IS NOT configured as Circuit Relay')
       }
 
-      // Configure transports
-      let transports
-      if (process.env.CONNECT_PREF === 'direct') {
-        transports = [
+      const transports = [
         tcp(),
-          webSockets(),
-          webRTC()
+        webSockets()
+        // circuitRelayTransport({
+        //   discoverRelays: 3,
+        //   reservationConcurrency: 3
+        // }),
+        // webRTC()
       ]
-      } else {
-        transports = [
-          tcp(),
-          webSockets(),
-          circuitRelayTransport({
-            discoverRelays: 3,
-            reservationConcurrency: 3
-          }),
-          webRTC()
-        ]
-      }
 
       // libp2p is the networking layer that underpins Helia
       const libp2p = await this.createLibp2p({
@@ -203,8 +193,8 @@ class IpfsAdapter {
           listen: [
             '/ip4/127.0.0.1/tcp/0',
             `/ip4/0.0.0.0/tcp/${this.config.ipfsTcpPort}`,
-            `/ip4/0.0.0.0/tcp/${this.config.ipfsWsPort}/ws`,
-            '/webrtc'
+            `/ip4/0.0.0.0/tcp/${this.config.ipfsWsPort}/ws`
+            // '/webrtc'
           ]
         },
         transports,
@@ -254,6 +244,8 @@ class IpfsAdapter {
 
       !this.fs.existsSync(`${IPFS_DIR}/datastore`) && this.fs.mkdirSync(`${IPFS_DIR}/datastore`)
 
+      // !fs.existsSync(`${IPFS_DIR}/datastore/peers`) && fs.mkdirSync(`${IPFS_DIR}/datastore/peers`)
+
       return true
     } catch (err) {
       console.error('Error in adapters/ipfs.js/ensureBlocksDir(): ', err)

src/controllers/rest-api/index.js

@@ -12,6 +12,7 @@ import UserRouter from './users/index.js'
 import ContactRESTController from './contact/index.js'
 import LogsRESTController from './logs/index.js'
 import IpfsRESTController from './ipfs/index.js'
+import config from '../../../config/index.js'
 
 class RESTControllers {
   constructor (localConfig = {}) {
@@ -31,6 +32,9 @@ class RESTControllers {
 
     // Bind 'this' object to all subfunctions.
     this.attachRESTControllers = this.attachRESTControllers.bind(this)
+
+    // Encapsulate dependencies
+    this.config = config
   }
 
   attachRESTControllers (app) {
@@ -39,6 +43,7 @@ class RESTControllers {
       useCases: this.useCases
     }
 
+    if (!this.config.noMongo) {
       // Attach the REST API Controllers associated with the /auth route
       const authRESTController = new AuthRESTController(dependencies)
       authRESTController.attach(app)
@@ -46,6 +51,7 @@ class RESTControllers {
       // Attach the REST API Controllers associated with the /user route
       const userRouter = new UserRouter(dependencies)
       userRouter.attach(app)
+    }
 
     // Attach the REST API Controllers associated with the /contact route
     const contactRESTController = new ContactRESTController(dependencies)

test/e2e/automated/a01-auth.rest-e2e.js

@@ -13,7 +13,6 @@ import axios from 'axios'
 
 // Local support libraries
 import config from '../../../config/index.js'
-
 import Server from '../../../bin/server.js'
 import testUtils from '../../utils/test-utils.js'
 import AdminLib from '../../../src/adapters/admin.js'
@@ -24,6 +23,7 @@ const context = {}
 
 const LOCALHOST = `http://localhost:${config.port}`
 
+if (!config.noMongo) {
   describe('Auth', () => {
     before(async () => {
       const app = new Server()
@@ -126,3 +126,4 @@ describe('Auth', () => {
       })
     })
   })
+}

test/e2e/automated/a02-users.rest-e2e.js

@@ -19,6 +19,7 @@ let sandbox
 
 // const mockContext = require('../../unit/mocks/ctx-mock').context
 
+if (!config.noMongo) {
   describe('Users', () => {
     before(async () => {
       // console.log(`config: ${JSON.stringify(config, null, 2)}`)
@@ -785,3 +786,4 @@ describe('Users', () => {
       })
     })
   })
+}

test/e2e/automated/a09-admin.rest-e2e.js

@@ -2,6 +2,8 @@ import { assert } from 'chai'
 import Admin from '../../../src/adapters/admin.js'
 import sinon from 'sinon'
 import util from 'util'
+import config from '../../../config/index.js'
+
 util.inspect.defaultOptions = { depth: 1 }
 
 let sandbox
@@ -15,6 +17,7 @@ describe('Admin', () => {
 
   afterEach(() => sandbox.restore())
 
+  if (!config.noMongo) {
     describe('loginAdmin()', () => {
       it('should logind admin', async () => {
         try {
@@ -112,4 +115,5 @@ describe('Admin', () => {
         }
       })
     })
+  }
 })