Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions core/lib/mdk.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const worker = require('bfx-svc-boot-js/lib/worker')
const OrkBase = require('miningos-wrk-ork/workers/aggr.proc.ork.wrk')
const worker = require('@bitfinex/bfx-svc-boot-js/lib/worker')
const OrkBase = require('../packages/mdk/ork/workers/aggr.proc.ork.wrk')
const { WRK_TYPES, ORK_CLUSTER, MDK_ROOT, MDK_STORE } = require('./utils/constants')
const { createFacs } = require('./utils')
const path = require('path')
Expand Down
4 changes: 2 additions & 2 deletions core/lib/utils/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const WRK_TYPES = {
APP_NODE: 'wrk-node-http'
}
const LIB_TYPES = {
ORK: 'miningos-wrk-ork',
APP_NODE: 'miningos-app-node',
ORK: 'mdk/ork',
APP_NODE: 'mdk/app-node',
ANTMINER: 'miner-antminer',
AVALON: 'miner-avalon',
WHATSMINER: 'miner-whatsminer',
Expand Down
6 changes: 3 additions & 3 deletions core/lib/utils/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const IntervalsFacility = require('bfx-facs-interval')
const StoreFacility = require('hp-svc-facs-store')
const ActionApproverFacility = require('svc-facs-action-approver')
const IntervalsFacility = require('@bitfinex/bfx-facs-interval')
const StoreFacility = require('@tetherto/hp-svc-facs-store')
const ActionApproverFacility = require('@tetherto/svc-facs-action-approver')

const _startFacility = (facility) => {
return new Promise((resolve, reject) => {
Expand Down
36 changes: 19 additions & 17 deletions core/lib/utils/initialize.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,42 @@ const path = require('path')
const { MDK_ROOT, LIB_TYPES } = require('./constants')

const coreRoot = path.join(__dirname, '..', '..')
const deps = path.join(__dirname, '..', '..', 'node_modules')
const localPackages = path.join(__dirname, '..', '..', 'packages')
const THING_CONFIG_SOURCES = [
{
destDir: 'types/AntminerManagerS19xp/config',
srcDirs: [path.join(deps, LIB_TYPES.ANTMINER, 'config'), path.join(localPackages, 'miners', 'antminer', 'config')]
srcDirs: [path.join(localPackages, LIB_TYPES.ANTMINER, 'config'), path.join(localPackages, 'miners', 'antminer', 'config')]
},
{
destDir: 'types/AvalonMinerManagerA1346/config',
srcDirs: [path.join(deps, LIB_TYPES.AVALON, 'config'), path.join(localPackages, 'miners', 'avalon', 'config')]
srcDirs: [path.join(localPackages, LIB_TYPES.AVALON, 'config'), path.join(localPackages, 'miners', 'avalon', 'config')]
},
{
destDir: 'types/WhatsminerManagerM56s/config',
srcDirs: [path.join(deps, LIB_TYPES.WHATSMINER, 'config'), path.join(localPackages, 'miners', 'whatsminer', 'config')]
srcDirs: [path.join(localPackages, LIB_TYPES.WHATSMINER, 'config'), path.join(localPackages, 'miners', 'whatsminer', 'config')]
},
{
destDir: 'types/BitdeerManagerD40M56/config',
srcDirs: [path.join(deps, LIB_TYPES.BITDEER, 'config'), path.join(localPackages, 'containers', 'bitdeer', 'config')]
srcDirs: [path.join(localPackages, LIB_TYPES.BITDEER, 'config'), path.join(localPackages, 'containers', 'bitdeer', 'config')]
},
{
destDir: 'types/AnstspaceManagerHK3/config',
srcDirs: [path.join(deps, LIB_TYPES.ANTSPACE, 'config'), path.join(localPackages, 'containers', 'antspace', 'config')]
srcDirs: [path.join(localPackages, LIB_TYPES.ANTSPACE, 'config'), path.join(localPackages, 'containers', 'antspace', 'config')]
},
{
destDir: 'types/B23PowerMeterManager/config',
srcDirs: [path.join(deps, LIB_TYPES.ABB, 'config'), path.join(localPackages, 'powermeters', 'abb', 'config')]
srcDirs: [path.join(localPackages, LIB_TYPES.ABB, 'config'), path.join(localPackages, 'powermeters', 'abb', 'config')]
},
{
destDir: 'types/TempSenecaSensorManager/config',
srcDirs: [path.join(localPackages, LIB_TYPES.SENECA, 'config'), path.join(localPackages, 'sensors', 'seneca', 'config')]
}
]

// Resolved from core/tmp/workers/http.node.wrk.js → core/packages/mdk/app-node/...
const HTTP_NODE_WRK_STUB =
"module.exports = require('../../packages/mdk/app-node/workers/http.node.wrk')\n"

const TEMPLATE = {
dirs: [
'config/facs',
Expand All @@ -45,10 +52,11 @@ const TEMPLATE = {
'types/AnstspaceManagerHK3/config',
'types/MicroBTManagerHK3/config',
'types/B23PowerMeterManager/config',
'types/TempSenecaSensorManager/config',
'workers'
],
files: {
'workers/http.node.wrk.js': 'module.exports = require(\'miningos-app-node/workers/http.node.wrk\')\n'
'workers/http.node.wrk.js': HTTP_NODE_WRK_STUB
}
}

Expand Down Expand Up @@ -84,11 +92,11 @@ module.exports = () => {

const commonDest = path.join(rootStoreDir, 'config', 'common.json')
if (!fs.existsSync(commonDest)) {
const src = resolveSource(path.join(deps, LIB_TYPES.APP_NODE, 'config'), 'common.json')
const src = resolveSource(path.join(localPackages, LIB_TYPES.APP_NODE, 'config'), 'common.json')
if (src) fs.copyFileSync(src, commonDest)
}

const orkConfDir = path.join(deps, LIB_TYPES.ORK, 'config')
const orkConfDir = path.join(localPackages, LIB_TYPES.ORK, 'config')
for (const entry of fs.readdirSync(orkConfDir)) {
if (!entry.endsWith('.example')) continue
const filename = entry.slice(0, -'.example'.length)
Expand All @@ -98,7 +106,7 @@ module.exports = () => {
}
}

const appNodeConfigsDir = path.join(deps, LIB_TYPES.APP_NODE, 'config', 'facs')
const appNodeConfigsDir = path.join(localPackages, LIB_TYPES.APP_NODE, 'config', 'facs')
for (const entry of fs.readdirSync(appNodeConfigsDir)) {
if (!entry.endsWith('.example')) continue
const filename = entry.slice(0, -'.example'.length)
Expand All @@ -114,12 +122,6 @@ module.exports = () => {
fs.writeFileSync(filePath, content, 'utf8')
continue
}

// Backfill legacy template paths from older MDK initializations.
const current = fs.readFileSync(filePath, 'utf8')
if (current.includes('require(\'app-node/workers/http.node.wrk\')')) {
fs.writeFileSync(filePath, content, 'utf8')
}
}

if (fs.existsSync(rootStoreDir)) {
Expand Down
Loading
Loading