added latest mesh node support fluidtrends#55

package.json

@@ -145,7 +145,7 @@
     "@babel/plugin-proposal-private-methods": "^7.12.1",
     "@babel/plugin-transform-runtime": "^7.12.10",
     "@babel/preset-env": "^7.12.10",
-    "@carmel/mesh": "^1.1.7",
+    "@carmel/mesh": "^1.1.8",
     "@hapi/hapi": "^20.0.3",
     "@heroicons/react": "^1.0.4",
     "@react-native-community/async-storage": "^1.11.0",
@@ -204,6 +204,7 @@
     "decompress": "^4.2.1",
     "decompress-targz": "^4.1.1",
     "deep-extend": "^0.6.0",
+    "deepmerge": "^4.2.2",
     "electron-dl": "^3.0.1",
     "electron-serve": "^1.0.0",
     "electron-squirrel-startup": "^1.0.0",

src/main/events/auth.ts

@@ -55,21 +55,22 @@ const _sign = async (message: string) => {
 
 
 export const fetchIdentity = async (data: any) => {
-     const identity = await system.server.gateway.fetchIdentity(data.username)
+    //  const identity = await system.server.gateway.fetchIdentity(data.username)
 
-     await send({ 
-        id: data.id, 
-        type: 'fetchIdentity', 
-        identity: identity ? identity.data : false
-    })
+    //  await send({ 
+    //     id: data.id, 
+    //     type: 'fetchIdentity', 
+    //     identity: identity ? identity.data : false
+    // })
 }
 
 export const saveAccount = async (props: any) => {
     const data: any = {}
     Object.keys(props.data).map((k: string) => data[k] = props.data[k].value)
 
-    const update = await system.server.identity.update(data, _sign)
-    console.log(update)
+    const result = await system.mesh.send("stats:utils", { id: "time", data: { format: "YYYY" } }, { id: props.id })
+    // const update = await system.server.identity.update(data, _sign)
+    // console.log(update)
     // const { privateKey } = await system.getSecret('identity')
 
     // const identity = await system.server.chain.getId()
@@ -92,7 +93,7 @@ export const saveAccount = async (props: any) => {
     await send({ 
         id: props.id, 
         type: 'saveAccount', 
-        error: "Oops"
+        result
     })
 }
 
@@ -112,9 +113,9 @@ export const register = async (credentials: any) => {
     //     return
     // }
 
-    await system.server.identity.create({
-        publicKey, username
-    }, _sign)
+    // await system.server.identity.create({
+    //     publicKey, username
+    // }, _sign)
 
     // if (credentials.plan.requiredTokens > 0) {
     //     // Make a payment

src/main/events/index.ts

@@ -5,4 +5,3 @@ export * from './commands'
 export * from './security'
 export * from './challenges'
 export * from './auth'
-

src/main/events/setup.ts

@@ -114,8 +114,7 @@ export const setup = async (e: any) => {
 
     const now = Date.now()
 
-   await system.init({
-        createdTimestamp: now,
+    system.update({
         loadedTimestamp: now,
         identity,
         node: {
@@ -128,7 +127,7 @@ export const setup = async (e: any) => {
         },
         bundles: {
         }
-    }, e.password)    
+    })    
 
     await system.setSecret('identity', { privateKey, username })
     await send({ 

src/main/node/functions/index.ts

@@ -0,0 +1,3 @@
+export * as register from './register'
+export * as update from './update'
+export * as time from './time'

src/main/node/functions/register.ts

@@ -0,0 +1,10 @@
+export const request = async ({ session, event, log }: any) => {
+    const { data } = event 
+    const { username, publicKey, did } = data 
+
+    log(`registering ${username} ...`)
+
+    const result = await session.chain.system("caccount", { username, pub_key: publicKey, did })
+
+    return result 
+}

src/main/node/functions/time.ts

@@ -0,0 +1,16 @@
+import moment from 'moment'
+import { mesh } from '../../system'
+
+export const request = async ({ log, session, channel, id, from, type, data }: any) => {
+    log(`getting time ...`, data)
+
+    return { timestamp: `${Date.now()}`, formatted: `${moment().format(data.format)}` } 
+}
+
+export const response = async ({ log, session, channel, data }: any) => {
+    log(`getting time response ...`, data)
+
+    mesh.onResponse(data)
+
+    return data
+}

src/main/node/functions/update.ts

@@ -0,0 +1,10 @@
+export const request = async ({ session, event, log }: any) => {
+    const { data } = event 
+    const { username, signature, did } = data 
+
+    log(`updating ${username} ...`)
+
+    const result = await session.chain.system("uaccount", { username, sig: signature, did })
+
+    return result 
+}

src/main/node/index.ts

@@ -1,2 +1,2 @@
 export * from './server'
-import * as handlers from './handlers'
+import * as functions from './functions'

src/main/node/server.ts

@@ -5,13 +5,15 @@ import cors from 'cors'
 import { asset } from '../assets'
 import cookieParser from 'cookie-parser'
 import http from 'http'
+import * as system from '../system'
 import path from 'path'
 import getPort from 'get-port'
 import { Session } from '@carmel/mesh/src'
 import debug from 'debug'
 import { ipfsConfig } from './config'
 import fs from 'fs-extra'
-import * as handlers from './handlers'
+import * as functions from './functions'
+import merge from 'deepmerge'
 
 const USER_HOME = process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME']
 const CARMEL_HOME = path.resolve(USER_HOME, '.carmel')
@@ -29,19 +31,12 @@ export class Server {
     private _session: Session
     private _root: string 
 
-    constructor(env: any) {
+    constructor() {
         this._app = express()
-        this._env = env
         this._root = DEFAULT_ROOT
+        this._env = system.env()
 
         fs.existsSync(this.root) || fs.mkdirpSync(this.root)
-
-        this._session = new Session({
-            isOperator: false,
-            revision: DEFAULT_REVISION,
-            handlers,
-            root: this.root
-        })
     }
 
     get root () {
@@ -73,6 +68,17 @@ export class Server {
     }
 
     async init() {
+        const channels = await system.getSetting('channels')
+
+        this._session = new Session({
+            isOperator: false,
+            channels,
+            revision: DEFAULT_REVISION,
+            root: this.root
+        })
+
+        this.session.registerFunctions(functions)
+
         this._port = await getPort()
         this.app.set('port', this.port)
         // this.app.set('views', this.dir.path!)
@@ -110,8 +116,8 @@ export class Server {
     async startNode () {         
         LOG('starting node ...')
 
-        const relays = await this.session.server.resolveRelays()
-        const config = ipfsConfig(relays, `${this.root}ipfs`, [4902, 4903, 5902, 5903, 9990])
+        const relays = await this.session.chain.fetch.relays()
+        const config = ipfsConfig(relays, `${this.root}/ipfs`, this.session.config.isOperator ? [4402, 4403, 5402, 5403, 9490] : [4302, 4303, 5302, 5303, 9390])
 
         try {
             const { ipfsBin } = config 
@@ -149,26 +155,5 @@ export class Server {
         }))
 
         await this.startNode()
-        await this.send.ping({ message: "Hello from Studio" })
-    }
-
-    get send () {
-        return this.session.server.send
-    }
-
-    get push () {
-        return this.session.server._push
-    }
-
-    get pull () {
-        return this.session.server._pull
-    }
-
-    get identity() {
-        return this.session.identity
-    }
-
-    get gateway() {
-        return this.session
     }
 }