update testing setup.js
This commit is contained in:
+92
-68
@@ -1,33 +1,33 @@
|
|||||||
/* jshint -W097 */// jshint strict:false
|
/* jshint -W097 */// jshint strict:false
|
||||||
/*jslint node: true */
|
/*jslint node: true */
|
||||||
// check if tmp directory exists
|
// check if tmp directory exists
|
||||||
var fs = require('fs');
|
const fs = require('fs');
|
||||||
var path = require('path');
|
const path = require('path');
|
||||||
var child_process = require('child_process');
|
const child_process = require('child_process');
|
||||||
var rootDir = path.normalize(__dirname + '/../../');
|
const rootDir = path.normalize(__dirname + '/../../');
|
||||||
var pkg = require(rootDir + 'package.json');
|
const pkg = require(rootDir + 'package.json');
|
||||||
var debug = typeof v8debug === 'object';
|
const debug = typeof v8debug === 'object';
|
||||||
pkg.main = pkg.main || 'main.js';
|
pkg.main = pkg.main || 'main.js';
|
||||||
|
|
||||||
var adapterName = path.normalize(rootDir).replace(/\\/g, '/').split('/');
|
let adapterName = path.normalize(rootDir).replace(/\\/g, '/').split('/');
|
||||||
adapterName = adapterName[adapterName.length - 2];
|
adapterName = adapterName[adapterName.length - 2];
|
||||||
var adapterStarted = false;
|
let adapterStarted = false;
|
||||||
|
|
||||||
function getAppName() {
|
function getAppName() {
|
||||||
var parts = __dirname.replace(/\\/g, '/').split('/');
|
const parts = __dirname.replace(/\\/g, '/').split('/');
|
||||||
return parts[parts.length - 3].split('.')[0];
|
return parts[parts.length - 3].split('.')[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
var appName = getAppName().toLowerCase();
|
const appName = getAppName().toLowerCase();
|
||||||
|
|
||||||
var objects;
|
let objects;
|
||||||
var states;
|
let states;
|
||||||
|
|
||||||
var pid = null;
|
let pid = null;
|
||||||
|
|
||||||
function copyFileSync(source, target) {
|
function copyFileSync(source, target) {
|
||||||
|
|
||||||
var targetFile = target;
|
let targetFile = target;
|
||||||
|
|
||||||
//if target is a directory a new file with the same name will be created
|
//if target is a directory a new file with the same name will be created
|
||||||
if (fs.existsSync(target)) {
|
if (fs.existsSync(target)) {
|
||||||
@@ -40,19 +40,19 @@ function copyFileSync(source, target) {
|
|||||||
fs.writeFileSync(targetFile, fs.readFileSync(source));
|
fs.writeFileSync(targetFile, fs.readFileSync(source));
|
||||||
}
|
}
|
||||||
catch (err) {
|
catch (err) {
|
||||||
console.log("file copy error: " +source +" -> " + targetFile + " (error ignored)");
|
console.log('file copy error: ' +source +' -> ' + targetFile + ' (error ignored)');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function copyFolderRecursiveSync(source, target, ignore) {
|
function copyFolderRecursiveSync(source, target, ignore) {
|
||||||
var files = [];
|
let files = [];
|
||||||
|
|
||||||
var base = path.basename(source);
|
let base = path.basename(source);
|
||||||
if (base === adapterName) {
|
if (base === adapterName) {
|
||||||
base = pkg.name;
|
base = pkg.name;
|
||||||
}
|
}
|
||||||
//check if folder needs to be created or integrated
|
//check if folder needs to be created or integrated
|
||||||
var targetFolder = path.join(target, base);
|
const targetFolder = path.join(target, base);
|
||||||
if (!fs.existsSync(targetFolder)) {
|
if (!fs.existsSync(targetFolder)) {
|
||||||
fs.mkdirSync(targetFolder);
|
fs.mkdirSync(targetFolder);
|
||||||
}
|
}
|
||||||
@@ -65,8 +65,8 @@ function copyFolderRecursiveSync(source, target, ignore) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var curSource = path.join(source, file);
|
const curSource = path.join(source, file);
|
||||||
var curTarget = path.join(targetFolder, file);
|
const curTarget = path.join(targetFolder, file);
|
||||||
if (fs.lstatSync(curSource).isDirectory()) {
|
if (fs.lstatSync(curSource).isDirectory()) {
|
||||||
// ignore grunt files
|
// ignore grunt files
|
||||||
if (file.indexOf('grunt') !== -1) return;
|
if (file.indexOf('grunt') !== -1) return;
|
||||||
@@ -86,10 +86,10 @@ if (!fs.existsSync(rootDir + 'tmp')) {
|
|||||||
|
|
||||||
function storeOriginalFiles() {
|
function storeOriginalFiles() {
|
||||||
console.log('Store original files...');
|
console.log('Store original files...');
|
||||||
var dataDir = rootDir + 'tmp/' + appName + '-data/';
|
const dataDir = rootDir + 'tmp/' + appName + '-data/';
|
||||||
|
|
||||||
var f = fs.readFileSync(dataDir + 'objects.json');
|
let f = fs.readFileSync(dataDir + 'objects.json');
|
||||||
var objects = JSON.parse(f.toString());
|
const objects = JSON.parse(f.toString());
|
||||||
if (objects['system.adapter.admin.0'] && objects['system.adapter.admin.0'].common) {
|
if (objects['system.adapter.admin.0'] && objects['system.adapter.admin.0'].common) {
|
||||||
objects['system.adapter.admin.0'].common.enabled = false;
|
objects['system.adapter.admin.0'].common.enabled = false;
|
||||||
}
|
}
|
||||||
@@ -109,9 +109,9 @@ function storeOriginalFiles() {
|
|||||||
|
|
||||||
function restoreOriginalFiles() {
|
function restoreOriginalFiles() {
|
||||||
console.log('restoreOriginalFiles...');
|
console.log('restoreOriginalFiles...');
|
||||||
var dataDir = rootDir + 'tmp/' + appName + '-data/';
|
const dataDir = rootDir + 'tmp/' + appName + '-data/';
|
||||||
|
|
||||||
var f = fs.readFileSync(dataDir + 'objects.json.original');
|
let f = fs.readFileSync(dataDir + 'objects.json.original');
|
||||||
fs.writeFileSync(dataDir + 'objects.json', f);
|
fs.writeFileSync(dataDir + 'objects.json', f);
|
||||||
try {
|
try {
|
||||||
f = fs.readFileSync(dataDir + 'states.json.original');
|
f = fs.readFileSync(dataDir + 'states.json.original');
|
||||||
@@ -126,12 +126,12 @@ function restoreOriginalFiles() {
|
|||||||
function checkIsAdapterInstalled(cb, counter, customName) {
|
function checkIsAdapterInstalled(cb, counter, customName) {
|
||||||
customName = customName || pkg.name.split('.').pop();
|
customName = customName || pkg.name.split('.').pop();
|
||||||
counter = counter || 0;
|
counter = counter || 0;
|
||||||
var dataDir = rootDir + 'tmp/' + appName + '-data/';
|
const dataDir = rootDir + 'tmp/' + appName + '-data/';
|
||||||
console.log('checkIsAdapterInstalled...');
|
console.log('checkIsAdapterInstalled...');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
var f = fs.readFileSync(dataDir + 'objects.json');
|
const f = fs.readFileSync(dataDir + 'objects.json');
|
||||||
var objects = JSON.parse(f.toString());
|
const objects = JSON.parse(f.toString());
|
||||||
if (objects['system.adapter.' + customName + '.0']) {
|
if (objects['system.adapter.' + customName + '.0']) {
|
||||||
console.log('checkIsAdapterInstalled: ready!');
|
console.log('checkIsAdapterInstalled: ready!');
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
@@ -158,12 +158,12 @@ function checkIsAdapterInstalled(cb, counter, customName) {
|
|||||||
|
|
||||||
function checkIsControllerInstalled(cb, counter) {
|
function checkIsControllerInstalled(cb, counter) {
|
||||||
counter = counter || 0;
|
counter = counter || 0;
|
||||||
var dataDir = rootDir + 'tmp/' + appName + '-data/';
|
const dataDir = rootDir + 'tmp/' + appName + '-data/';
|
||||||
|
|
||||||
console.log('checkIsControllerInstalled...');
|
console.log('checkIsControllerInstalled...');
|
||||||
try {
|
try {
|
||||||
var f = fs.readFileSync(dataDir + 'objects.json');
|
const f = fs.readFileSync(dataDir + 'objects.json');
|
||||||
var objects = JSON.parse(f.toString());
|
const objects = JSON.parse(f.toString());
|
||||||
if (objects['system.certificates']) {
|
if (objects['system.certificates']) {
|
||||||
console.log('checkIsControllerInstalled: installed!');
|
console.log('checkIsControllerInstalled: installed!');
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
@@ -193,7 +193,7 @@ function installAdapter(customName, cb) {
|
|||||||
}
|
}
|
||||||
customName = customName || pkg.name.split('.').pop();
|
customName = customName || pkg.name.split('.').pop();
|
||||||
console.log('Install adapter...');
|
console.log('Install adapter...');
|
||||||
var startFile = 'node_modules/' + appName + '.js-controller/' + appName + '.js';
|
const startFile = 'node_modules/' + appName + '.js-controller/' + appName + '.js';
|
||||||
// make first install
|
// make first install
|
||||||
if (debug) {
|
if (debug) {
|
||||||
child_process.execSync('node ' + startFile + ' add ' + customName + ' --enabled false', {
|
child_process.execSync('node ' + startFile + ' add ' + customName + ' --enabled false', {
|
||||||
@@ -207,7 +207,7 @@ function installAdapter(customName, cb) {
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// add controller
|
// add controller
|
||||||
var _pid = child_process.fork(startFile, ['add', customName, '--enabled', 'false'], {
|
const _pid = child_process.fork(startFile, ['add', customName, '--enabled', 'false'], {
|
||||||
cwd: rootDir + 'tmp',
|
cwd: rootDir + 'tmp',
|
||||||
stdio: [0, 1, 2, 'ipc']
|
stdio: [0, 1, 2, 'ipc']
|
||||||
});
|
});
|
||||||
@@ -252,7 +252,7 @@ function installJsController(cb) {
|
|||||||
// copy all
|
// copy all
|
||||||
// stop controller
|
// stop controller
|
||||||
console.log('Stop controller if running...');
|
console.log('Stop controller if running...');
|
||||||
var _pid;
|
let _pid;
|
||||||
if (debug) {
|
if (debug) {
|
||||||
// start controller
|
// start controller
|
||||||
_pid = child_process.exec('node ' + appName + '.js stop', {
|
_pid = child_process.exec('node ' + appName + '.js stop', {
|
||||||
@@ -277,7 +277,7 @@ function installJsController(cb) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
console.log('Setup js-controller...');
|
console.log('Setup js-controller...');
|
||||||
var __pid;
|
let __pid;
|
||||||
if (debug) {
|
if (debug) {
|
||||||
// start controller
|
// start controller
|
||||||
_pid = child_process.exec('node ' + appName + '.js setup first --console', {
|
_pid = child_process.exec('node ' + appName + '.js setup first --console', {
|
||||||
@@ -293,7 +293,7 @@ function installJsController(cb) {
|
|||||||
waitForEnd(__pid, function () {
|
waitForEnd(__pid, function () {
|
||||||
checkIsControllerInstalled(function () {
|
checkIsControllerInstalled(function () {
|
||||||
// change ports for object and state DBs
|
// change ports for object and state DBs
|
||||||
var config = require(rootDir + 'tmp/' + appName + '-data/' + appName + '.json');
|
const config = require(rootDir + 'tmp/' + appName + '-data/' + appName + '.json');
|
||||||
config.objects.port = 19001;
|
config.objects.port = 19001;
|
||||||
config.states.port = 19000;
|
config.states.port = 19000;
|
||||||
fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/' + appName + '.json', JSON.stringify(config, null, 2));
|
fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/' + appName + '.json', JSON.stringify(config, null, 2));
|
||||||
@@ -310,7 +310,7 @@ function installJsController(cb) {
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// check if port 9000 is free, else admin adapter will be added to running instance
|
// check if port 9000 is free, else admin adapter will be added to running instance
|
||||||
var client = new require('net').Socket();
|
const client = new require('net').Socket();
|
||||||
client.on('error', () => {});
|
client.on('error', () => {});
|
||||||
client.connect(9000, '127.0.0.1', function() {
|
client.connect(9000, '127.0.0.1', function() {
|
||||||
console.error('Cannot initiate fisrt run of test, because one instance of application is running on this PC. Stop it and repeat.');
|
console.error('Cannot initiate fisrt run of test, because one instance of application is running on this PC. Stop it and repeat.');
|
||||||
@@ -320,15 +320,15 @@ function installJsController(cb) {
|
|||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
client.destroy();
|
client.destroy();
|
||||||
if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller')) {
|
if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller')) {
|
||||||
console.log('installJsController: no js-controller => install from git');
|
console.log('installJsController: no js-controller => install dev build from npm');
|
||||||
|
|
||||||
child_process.execSync('npm install https://github.com/' + appName + '/' + appName + '.js-controller/tarball/master --prefix ./ --production', {
|
child_process.execSync('npm install ' + appName + '.js-controller@dev --prefix ./ --production', {
|
||||||
cwd: rootDir + 'tmp/',
|
cwd: rootDir + 'tmp/',
|
||||||
stdio: [0, 1, 2]
|
stdio: [0, 1, 2]
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
console.log('Setup js-controller...');
|
console.log('Setup js-controller...');
|
||||||
var __pid;
|
let __pid;
|
||||||
if (debug) {
|
if (debug) {
|
||||||
// start controller
|
// start controller
|
||||||
child_process.exec('node ' + appName + '.js setup first', {
|
child_process.exec('node ' + appName + '.js setup first', {
|
||||||
@@ -345,7 +345,7 @@ function installJsController(cb) {
|
|||||||
|
|
||||||
// let npm install admin and run setup
|
// let npm install admin and run setup
|
||||||
checkIsControllerInstalled(function () {
|
checkIsControllerInstalled(function () {
|
||||||
var _pid;
|
let _pid;
|
||||||
|
|
||||||
if (fs.existsSync(rootDir + 'node_modules/' + appName + '.js-controller/' + appName + '.js')) {
|
if (fs.existsSync(rootDir + 'node_modules/' + appName + '.js-controller/' + appName + '.js')) {
|
||||||
_pid = child_process.fork(appName + '.js', ['stop'], {
|
_pid = child_process.fork(appName + '.js', ['stop'], {
|
||||||
@@ -356,7 +356,7 @@ function installJsController(cb) {
|
|||||||
|
|
||||||
waitForEnd(_pid, function () {
|
waitForEnd(_pid, function () {
|
||||||
// change ports for object and state DBs
|
// change ports for object and state DBs
|
||||||
var config = require(rootDir + 'tmp/' + appName + '-data/' + appName + '.json');
|
const config = require(rootDir + 'tmp/' + appName + '-data/' + appName + '.json');
|
||||||
config.objects.port = 19001;
|
config.objects.port = 19001;
|
||||||
config.states.port = 19000;
|
config.states.port = 19000;
|
||||||
fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/' + appName + '.json', JSON.stringify(config, null, 2));
|
fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/' + appName + '.json', JSON.stringify(config, null, 2));
|
||||||
@@ -387,8 +387,8 @@ function copyAdapterToController() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function clearControllerLog() {
|
function clearControllerLog() {
|
||||||
var dirPath = rootDir + 'tmp/log';
|
const dirPath = rootDir + 'tmp/log';
|
||||||
var files;
|
let files;
|
||||||
try {
|
try {
|
||||||
if (fs.existsSync(dirPath)) {
|
if (fs.existsSync(dirPath)) {
|
||||||
console.log('Clear controller log...');
|
console.log('Clear controller log...');
|
||||||
@@ -404,8 +404,8 @@ function clearControllerLog() {
|
|||||||
}
|
}
|
||||||
if (files.length > 0) {
|
if (files.length > 0) {
|
||||||
try {
|
try {
|
||||||
for (var i = 0; i < files.length; i++) {
|
for (let i = 0; i < files.length; i++) {
|
||||||
var filePath = dirPath + '/' + files[i];
|
const filePath = dirPath + '/' + files[i];
|
||||||
fs.unlinkSync(filePath);
|
fs.unlinkSync(filePath);
|
||||||
}
|
}
|
||||||
console.log('Controller log cleared');
|
console.log('Controller log cleared');
|
||||||
@@ -416,8 +416,8 @@ function clearControllerLog() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function clearDB() {
|
function clearDB() {
|
||||||
var dirPath = rootDir + 'tmp/iobroker-data/sqlite';
|
const dirPath = rootDir + 'tmp/iobroker-data/sqlite';
|
||||||
var files;
|
let files;
|
||||||
try {
|
try {
|
||||||
if (fs.existsSync(dirPath)) {
|
if (fs.existsSync(dirPath)) {
|
||||||
console.log('Clear sqlite DB...');
|
console.log('Clear sqlite DB...');
|
||||||
@@ -433,8 +433,8 @@ function clearDB() {
|
|||||||
}
|
}
|
||||||
if (files.length > 0) {
|
if (files.length > 0) {
|
||||||
try {
|
try {
|
||||||
for (var i = 0; i < files.length; i++) {
|
for (let i = 0; i < files.length; i++) {
|
||||||
var filePath = dirPath + '/' + files[i];
|
const filePath = dirPath + '/' + files[i];
|
||||||
fs.unlinkSync(filePath);
|
fs.unlinkSync(filePath);
|
||||||
}
|
}
|
||||||
console.log('Clear sqlite DB');
|
console.log('Clear sqlite DB');
|
||||||
@@ -454,9 +454,9 @@ function setupController(cb) {
|
|||||||
copyAdapterToController();
|
copyAdapterToController();
|
||||||
}
|
}
|
||||||
// read system.config object
|
// read system.config object
|
||||||
var dataDir = rootDir + 'tmp/' + appName + '-data/';
|
const dataDir = rootDir + 'tmp/' + appName + '-data/';
|
||||||
|
|
||||||
var objs;
|
let objs;
|
||||||
try {
|
try {
|
||||||
objs = fs.readFileSync(dataDir + 'objects.json');
|
objs = fs.readFileSync(dataDir + 'objects.json');
|
||||||
objs = JSON.parse(objs);
|
objs = JSON.parse(objs);
|
||||||
@@ -473,6 +473,28 @@ function setupController(cb) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getSecret() {
|
||||||
|
var dataDir = rootDir + 'tmp/' + appName + '-data/';
|
||||||
|
|
||||||
|
try {
|
||||||
|
var objs = fs.readFileSync(dataDir + 'objects.json');
|
||||||
|
objs = JSON.parse(objs);
|
||||||
|
|
||||||
|
return objs['system.config'].native.secret;
|
||||||
|
} catch (e) {
|
||||||
|
console.warn("Could not load secret. Reason: " + e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function encrypt (key, value) {
|
||||||
|
var result = '';
|
||||||
|
for (var i = 0; i < value.length; ++i) {
|
||||||
|
result += String.fromCharCode(key[i % key.length].charCodeAt(0) ^ value.charCodeAt(i));
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
function startAdapter(objects, states, callback) {
|
function startAdapter(objects, states, callback) {
|
||||||
if (adapterStarted) {
|
if (adapterStarted) {
|
||||||
console.log('Adapter already started ...');
|
console.log('Adapter already started ...');
|
||||||
@@ -523,19 +545,19 @@ function startController(isStartAdapter, onObjectChange, onStateChange, callback
|
|||||||
} else {
|
} else {
|
||||||
console.log('startController...');
|
console.log('startController...');
|
||||||
adapterStarted = false;
|
adapterStarted = false;
|
||||||
var isObjectConnected;
|
let isObjectConnected;
|
||||||
var isStatesConnected;
|
let isStatesConnected;
|
||||||
|
|
||||||
var Objects = require(rootDir + 'tmp/node_modules/' + appName + '.js-controller/lib/objects/objectsInMemServer');
|
const Objects = require(rootDir + 'tmp/node_modules/' + appName + '.js-controller/lib/objects/objectsInMemServer');
|
||||||
objects = new Objects({
|
objects = new Objects({
|
||||||
connection: {
|
connection: {
|
||||||
"type" : "file",
|
'type' : 'file',
|
||||||
"host" : "127.0.0.1",
|
'host' : '127.0.0.1',
|
||||||
"port" : 19001,
|
'port' : 19001,
|
||||||
"user" : "",
|
'user' : '',
|
||||||
"pass" : "",
|
'pass' : '',
|
||||||
"noFileCache": false,
|
'noFileCache': false,
|
||||||
"connectTimeout": 2000
|
'connectTimeout': 2000
|
||||||
},
|
},
|
||||||
logger: {
|
logger: {
|
||||||
silly: function (msg) {
|
silly: function (msg) {
|
||||||
@@ -572,7 +594,7 @@ function startController(isStartAdapter, onObjectChange, onStateChange, callback
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Just open in memory DB itself
|
// Just open in memory DB itself
|
||||||
var States = require(rootDir + 'tmp/node_modules/' + appName + '.js-controller/lib/states/statesInMemServer');
|
const States = require(rootDir + 'tmp/node_modules/' + appName + '.js-controller/lib/states/statesInMemServer');
|
||||||
states = new States({
|
states = new States({
|
||||||
connection: {
|
connection: {
|
||||||
type: 'file',
|
type: 'file',
|
||||||
@@ -660,7 +682,7 @@ function _stopController() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function stopController(cb) {
|
function stopController(cb) {
|
||||||
var timeout;
|
let timeout;
|
||||||
if (objects) {
|
if (objects) {
|
||||||
console.log('Set system.adapter.' + pkg.name + '.0');
|
console.log('Set system.adapter.' + pkg.name + '.0');
|
||||||
objects.setObject('system.adapter.' + pkg.name + '.0', {
|
objects.setObject('system.adapter.' + pkg.name + '.0', {
|
||||||
@@ -700,8 +722,8 @@ function stopController(cb) {
|
|||||||
|
|
||||||
// Setup the adapter
|
// Setup the adapter
|
||||||
function setAdapterConfig(common, native, instance) {
|
function setAdapterConfig(common, native, instance) {
|
||||||
var objects = JSON.parse(fs.readFileSync(rootDir + 'tmp/' + appName + '-data/objects.json').toString());
|
const objects = JSON.parse(fs.readFileSync(rootDir + 'tmp/' + appName + '-data/objects.json').toString());
|
||||||
var id = 'system.adapter.' + adapterName.split('.').pop() + '.' + (instance || 0);
|
const id = 'system.adapter.' + adapterName.split('.').pop() + '.' + (instance || 0);
|
||||||
if (common) objects[id].common = common;
|
if (common) objects[id].common = common;
|
||||||
if (native) objects[id].native = native;
|
if (native) objects[id].native = native;
|
||||||
fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/objects.json', JSON.stringify(objects));
|
fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/objects.json', JSON.stringify(objects));
|
||||||
@@ -709,8 +731,8 @@ function setAdapterConfig(common, native, instance) {
|
|||||||
|
|
||||||
// Read config of the adapter
|
// Read config of the adapter
|
||||||
function getAdapterConfig(instance) {
|
function getAdapterConfig(instance) {
|
||||||
var objects = JSON.parse(fs.readFileSync(rootDir + 'tmp/' + appName + '-data/objects.json').toString());
|
const objects = JSON.parse(fs.readFileSync(rootDir + 'tmp/' + appName + '-data/objects.json').toString());
|
||||||
var id = 'system.adapter.' + adapterName.split('.').pop() + '.' + (instance || 0);
|
const id = 'system.adapter.' + adapterName.split('.').pop() + '.' + (instance || 0);
|
||||||
return objects[id];
|
return objects[id];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -726,4 +748,6 @@ if (typeof module !== undefined && module.parent) {
|
|||||||
module.exports.appName = appName;
|
module.exports.appName = appName;
|
||||||
module.exports.adapterName = adapterName;
|
module.exports.adapterName = adapterName;
|
||||||
module.exports.adapterStarted = adapterStarted;
|
module.exports.adapterStarted = adapterStarted;
|
||||||
|
module.exports.getSecret = getSecret;
|
||||||
|
module.exports.encrypt = encrypt;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user