wn/MqttDispatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove leading underscore, fix next call in mongosave

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2017-08-24 15:51:34 +02:00
parent a0a922f851
commit 25116aae89
14 changed files with 230 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dist/callchain.js vendored
View File

@ -6,53 +6,68 @@ class LastChainItem {
begin() {
}
send(message) {
log.info(`Last chain item, final result ${message}`);
log.info(`Last chain item, final result ${JSON.stringify(message)}`);
}
}
let lastChainItem = new LastChainItem();
class AChainItem extends events.EventEmitter {
constructor(label) {
super();
this._label = label;
this._next = lastChainItem;
this.label = label;
this.next = lastChainItem;
}
toString() {
return `<${this._label}>`;
return `<${this.label}>`;
}
registerNext(next) {
this._next = next;
this.next = next;
}
send(message) {
this.emit('yourturn', message);
}
}
exports.AChainItem = AChainItem;
class AAsyncBaseChainItem extends AChainItem {
constructor(label) {
super(label);
}
begin() {
if (this.next != null) {
this.next.begin();
}
this.addListener('yourturn', (message) => {
log.info(`Calling ${this.toString()}`);
this.func(message, this.next.send);
});
}
}
exports.AAsyncBaseChainItem = AAsyncBaseChainItem;
class ABaseChainItem extends AChainItem {
constructor(label) {
super(label);
}
begin() {
if (this._next != null) {
this._next.begin();
if (this.next != null) {
this.next.begin();
}
this.addListener('yourturn', (message) => {
log.info(`Calling ${this.toString()}`);
let result = this.func(message);
this._next.send(result);
this.next.send(result);
});
}
}
exports.ABaseChainItem = ABaseChainItem;
class ChainItem extends ABaseChainItem {
toString() {
let funcName = (this._chainItemFunc.name === "") ? "lambda" : this._chainItemFunc.name;
return `<${funcName}, ${this._label}>`;
let funcName = (this.chainItemFunc.name === "") ? "lambda" : this.chainItemFunc.name;
return `<${funcName}, ${this.label}>`;
}
registerFunc(func) {
this._chainItemFunc = func;
this.chainItemFunc = func;
}
func(message) {
return this._chainItemFunc(message);
return this.chainItemFunc(message);
}
}
exports.ChainItem = ChainItem;

33
dist/espthermtojson.js vendored
View File

@ -1,12 +1,37 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const utils = require("./utils");
class EspThermData {
constructor(temperature, voltage, timeConsumed) {
this.temperature = temperature;
this.voltage = voltage;
this.timeConsumed = timeConsumed;
}
toString() {
return JSON.stringify(this);
}
toJSON() {
return utils.jsonPrepaper(this, []);
}
}
exports.EspThermData = EspThermData;
class EspThermMetadata {
constructor(client, timestamp) {
this.client = client;
this.timestamp = (timestamp) ? timestamp : new Date();
}
toString() {
return JSON.stringify(this);
}
toJSON() {
return utils.jsonPrepaper(this, []);
}
}
exports.EspThermMetadata = EspThermMetadata;
class EspThermMessage {
constructor(client, temperature, voltage, timeConsumed) {
this._client = client;
this._temperature = temperature;
this._voltage = voltage;
this._timeConsumed = timeConsumed;
this.data = new EspThermData(temperature, voltage, timeConsumed);
this.metadata = new EspThermMetadata(client);
}
toString() {
return JSON.stringify(this);

32
dist/mongosave.js vendored
View File

@ -3,47 +3,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
const CallChain = require("./callchain");
const log = require("./log");
const MongoDB = require("mongodb");
class MongoSave extends CallChain.ABaseChainItem {
class MongoSave extends CallChain.AAsyncBaseChainItem {
constructor(url) {
super('MongoSave');
this._url = url;
this._mongoClient = new MongoDB.MongoClient();
this._connectPending = false;
this.url = url;
this.mongoClient = new MongoDB.MongoClient();
this.connectPending = false;
}
func(message) {
if (!this._dbh) {
func(message, finished) {
if (!this.dbh) {
log.info("Not database connection yet");
if (!this._connectPending) {
this._connectPending = true;
this._mongoClient.connect(this._url)
if (!this.connectPending) {
this.connectPending = true;
this.mongoClient.connect(this.url)
.then((db) => {
log.info("Successfully opened MongoDB connect");
this._dbh = db;
this.dbh = db;
})
.catch((err) => {
log.error(`Failure when opening MongoDB connect: ${err}`);
this._dbh = undefined;
this.dbh = undefined;
});
}
else {
log.info("Connecting to database is pending");
}
}
if (this._dbh) {
if (this.dbh) {
log.info("Database handle is available");
let coll = this._dbh.collection("iot");
let coll = this.dbh.collection("iot");
coll.insertOne(message)
.then((res) => {
log.info(`Successfully wrote one item in database: ${res.insertedId}`);
let nextValue = { id: res.insertedId, payload: message };
finished(nextValue);
})
.catch((err) => {
log.error(`Failure when trying to write one item in database: ${err}`);
log.error("Chain interrupted");
});
}
else {
log.error(`No database connection yet, drop message ${message}`);
log.error("Chain interrupted");
}
return "<<" + message + ">>";
log.info(`Returning from ${this.label}`);
}
}
exports.MongoSave = MongoSave;

36
dist/mqttdispatcher.js vendored
View File

@ -11,17 +11,17 @@ function passThrough(message) {
exports.passThrough = passThrough;
class MqttDispatcher {
constructor(mqttBrokerUrl, mqttUser, mqttPass, mqttCAFile) {
this._mqttOptions = {};
this._mqttBrokerUrl = (mqttBrokerUrl) ? mqttBrokerUrl : MQTT_BROKER_DEFAULT_URL;
this.mqttOptions = {};
this.mqttBrokerUrl = (mqttBrokerUrl) ? mqttBrokerUrl : MQTT_BROKER_DEFAULT_URL;
if (mqttUser && mqttPass) {
this._mqttOptions.username = mqttUser;
this._mqttOptions.password = mqttPass;
this.mqttOptions.username = mqttUser;
this.mqttOptions.password = mqttPass;
}
if (mqttCAFile) {
this._mqttOptions.ca = fs.readFileSync(mqttCAFile, 'ascii');
this._mqttOptions.rejectUnauthorized = true;
this.mqttOptions.ca = fs.readFileSync(mqttCAFile, 'ascii');
this.mqttOptions.rejectUnauthorized = true;
}
this._topicHandlers = [];
this.topicHandlers = [];
}
register(topic, label, newChainItemOrCallbackFunc) {
let newChainItem;
@ -34,7 +34,7 @@ class MqttDispatcher {
newChainItem = myNewChainItem;
}
let done = false;
for (let topicHandler of this._topicHandlers) {
for (let topicHandler of this.topicHandlers) {
if (topicHandler.topic === topic) {
topicHandler.last.registerNext(newChainItem);
topicHandler.last = newChainItem;
@ -43,26 +43,26 @@ class MqttDispatcher {
}
}
if (!done) {
this._topicHandlers.push({ topic: topic, root: newChainItem, last: newChainItem });
this.topicHandlers.push({ topic: topic, root: newChainItem, last: newChainItem });
log.info(`first callback ${newChainItem.toString()} added for topic ${topic}`);
}
}
exec() {
for (let topicHandler of this._topicHandlers) {
for (let topicHandler of this.topicHandlers) {
topicHandler.root.begin();
}
log.info(`connecting to ${this._mqttBrokerUrl}`);
this._mqttClient = Mqtt.connect(this._mqttBrokerUrl, this._mqttOptions);
this._mqttClient.on('error', log.error);
this._mqttClient.on('connect', () => {
log.info(`connecting to ${this.mqttBrokerUrl}`);
this.mqttClient = Mqtt.connect(this.mqttBrokerUrl, this.mqttOptions);
this.mqttClient.on('error', log.error);
this.mqttClient.on('connect', () => {
log.info("connected to mqtt broker");
for (let topicHandler of this._topicHandlers) {
this._mqttClient.subscribe(topicHandler.topic);
for (let topicHandler of this.topicHandlers) {
this.mqttClient.subscribe(topicHandler.topic);
}
});
this._mqttClient.on('message', (topic, payload) => {
this.mqttClient.on('message', (topic, payload) => {
log.info(`message received, topic ${topic}, payload ${payload}`);
for (let topicHandler of this._topicHandlers) {
for (let topicHandler of this.topicHandlers) {
if (this.topicMatch(topicHandler.topic, topic)) {
log.info(`received topic ${topic} matches registered topic ${topicHandler.topic}`);
topicHandler.root.send(payload);

8
dist/processor.js vendored
View File

@ -5,19 +5,19 @@ const events = require("events");
class AProcessor extends events.EventEmitter {
constructor(label) {
super();
this._label = label;
this.label = label;
this.addListener('input', this.process);
log.info(`Processor object instanciated: ${this.constructor.name}, ${this._label}`);
log.info(`Processor object instanciated: ${this.constructor.name}, ${this.label}`);
}
in(message) {
log.info(`Routing ${message} to Processor class ${this.constructor.name}, ${this._label}`);
log.info(`Routing ${message} to Processor class ${this.constructor.name}, ${this.label}`);
this.emit('input', message);
}
}
exports.AProcessor = AProcessor;
class ExProc1 extends AProcessor {
process(message) {
log.info(`ExRoute1.process: ${this._label}, ${message}`);
log.info(`ExRoute1.process: ${this.label}, ${message}`);
}
}
exports.ExProc1 = ExProc1;

5
dist/utils.js vendored
View File

@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
function jsonPrepaper(obj, hideKeys) {
let dup = {};
for (let key in obj) {
if ((hideKeys.indexOf(key) == -1) && !((key[0] == "_") && (key[1] == "_"))) {
let dkey = (key[0] == "_") ? key.slice(1) : key;
dup[dkey] = obj[key];
if ((hideKeys.indexOf(key) == -1) && !(key[0] == "_")) {
dup[key] = obj[key];
}
}
return dup;

45
npm-debug.log
View File

@ -1,45 +0,0 @@
0 info it worked if it ends with ok
1 verbose cli [ '/usr/bin/nodejs', '/usr/bin/npm', 'start' ]
2 info using npm@3.10.10
3 info using node@v6.11.2
4 verbose run-script [ 'prestart', 'start', 'poststart' ]
5 info lifecycle dispatcher@1.0.0~prestart: dispatcher@1.0.0
6 silly lifecycle dispatcher@1.0.0~prestart: no script for prestart, continuing
7 info lifecycle dispatcher@1.0.0~start: dispatcher@1.0.0
8 verbose lifecycle dispatcher@1.0.0~start: unsafe-perm in lifecycle true
9 verbose lifecycle dispatcher@1.0.0~start: PATH: /usr/lib/node_modules/npm/bin/node-gyp-bin:/home/wn/workspace-node/Dispatcher/node_modules/.bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/home/wn/.local/bin:/home/wn/bin:/opt/jdk/bin:/opt/apache-maven/bin:/home/wn/mos/bin
10 verbose lifecycle dispatcher@1.0.0~start: CWD: /home/wn/workspace-node/Dispatcher
11 silly lifecycle dispatcher@1.0.0~start: Args: [ '-c', 'node dist/main.js' ]
12 silly lifecycle dispatcher@1.0.0~start: Returned: code: 1 signal: null
13 info lifecycle dispatcher@1.0.0~start: Failed to exec start script
14 verbose stack Error: dispatcher@1.0.0 start: `node dist/main.js`
14 verbose stack Exit status 1
14 verbose stack at EventEmitter.<anonymous> (/usr/lib/node_modules/npm/lib/utils/lifecycle.js:255:16)
14 verbose stack at emitTwo (events.js:106:13)
14 verbose stack at EventEmitter.emit (events.js:191:7)
14 verbose stack at ChildProcess.<anonymous> (/usr/lib/node_modules/npm/lib/utils/spawn.js:40:14)
14 verbose stack at emitTwo (events.js:106:13)
14 verbose stack at ChildProcess.emit (events.js:191:7)
14 verbose stack at maybeClose (internal/child_process.js:891:16)
14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:226:5)
15 verbose pkgid dispatcher@1.0.0
16 verbose cwd /home/wn/workspace-node/Dispatcher
17 error Linux 4.9.0-3-amd64
18 error argv "/usr/bin/nodejs" "/usr/bin/npm" "start"
19 error node v6.11.2
20 error npm v3.10.10
21 error code ELIFECYCLE
22 error dispatcher@1.0.0 start: `node dist/main.js`
22 error Exit status 1
23 error Failed at the dispatcher@1.0.0 start script 'node dist/main.js'.
23 error Make sure you have the latest version of node.js and npm installed.
23 error If you do, this is most likely a problem with the dispatcher package,
23 error not with npm itself.
23 error Tell the author that this fails on your system:
23 error node dist/main.js
23 error You can get information on how to open an issue for this project with:
23 error npm bugs dispatcher
23 error Or if that isn't available, you can get their info via:
23 error npm owner ls dispatcher
23 error There is likely additional logging output above.
24 verbose exit [ 1, true ]

1
queries/time-temp.js Normal file
View File

@ -0,0 +1 @@
db.iot.aggregate([{'$match':{'metadata.client':'espClient3'}}, {'$sort':{'metadata.timestamp':1}}, {'$project': {'_id':0, 'time':'$metadata.timestamp', 'temp':'$data.temperature'}}]);

48
src/callchain.ts
View File

@ -13,29 +13,29 @@ class LastChainItem implements Receivable {
}
public send(message: any) {
log.info(`Last chain item, final result ${message}`)
log.info(`Last chain item, final result ${JSON.stringify(message)}`)
}
}
let lastChainItem : LastChainItem = new LastChainItem();
export abstract class AChainItem extends events.EventEmitter implements Receivable {
protected _label : string
protected _next : Receivable
protected label : string
protected next : Receivable
constructor(label : string) {
super()
this._label = label
this._next = lastChainItem
this.label = label
this.next = lastChainItem
}
public toString() : string {
return `<${this._label}>`
return `<${this.label}>`
}
public registerNext(next : AChainItem) :void {
this._next = next
this.next = next
}
public send(message : any) : void {
@ -45,6 +45,24 @@ export abstract class AChainItem extends events.EventEmitter implements Receivab
public abstract begin() : void
}
export abstract class AAsyncBaseChainItem extends AChainItem {
constructor(label : string) {
super(label)
}
protected abstract func(message : any, finished : (message : any) => void) : void;
public begin() :void {
if (this.next != null) {
this.next.begin()
}
this.addListener('yourturn', (message : any) : void => {
log.info(`Calling ${this.toString()}`)
this.func(message, this.next.send)
})
}
}
export abstract class ABaseChainItem extends AChainItem {
constructor(label : string) {
super(label)
@ -53,31 +71,31 @@ export abstract class ABaseChainItem extends AChainItem {
protected abstract func(message : any) : any;
public begin() :void {
if (this._next != null) {
this._next.begin()
if (this.next != null) {
this.next.begin()
}
this.addListener('yourturn', (message : any) : void => {
log.info(`Calling ${this.toString()}`)
let result : any = this.func(message)
this._next.send(result)
this.next.send(result)
})
}
}
export class ChainItem extends ABaseChainItem {
private _chainItemFunc : ChainItemFunc
private chainItemFunc : ChainItemFunc
public toString() : string {
let funcName : string = (this._chainItemFunc.name === "") ? "lambda" : this._chainItemFunc.name
return `<${funcName}, ${this._label}>`
let funcName : string = (this.chainItemFunc.name === "") ? "lambda" : this.chainItemFunc.name
return `<${funcName}, ${this.label}>`
}
public registerFunc(func : ChainItemFunc) : void {
this._chainItemFunc = func
this.chainItemFunc = func
}
protected func(message : any) : any {
return this._chainItemFunc(message)
return this.chainItemFunc(message)
}
}

51
src/espthermtojson.ts
View File

@ -1,17 +1,52 @@
import * as log from './log'
import * as utils from './utils'
export class EspThermData {
private temperature : number
private voltage : number
private timeConsumed : number
constructor(temperature:number, voltage:number, timeConsumed:number) {
this.temperature = temperature
this.voltage = voltage
this.timeConsumed = timeConsumed
}
toString() :string {
return JSON.stringify(this)
}
toJSON() : any {
return utils.jsonPrepaper(this, [])
}
}
export class EspThermMetadata {
private client : string
private timestamp : Date
constructor(client : string, timestamp? : Date) {
this.client = client
this.timestamp = (timestamp) ? timestamp : new Date()
}
toString() :string {
return JSON.stringify(this)
}
toJSON() : any {
return utils.jsonPrepaper(this, [])
}
}
export class EspThermMessage {
private _client : string
private _temperature : number
private _voltage : number
private _timeConsumed : number
private data : EspThermData
private metadata : EspThermMetadata
constructor(client:string, temperature:number, voltage:number, timeConsumed:number) {
this._client = client
this._temperature = temperature
this._voltage = voltage
this._timeConsumed = timeConsumed
this.data = new EspThermData(temperature, voltage, timeConsumed)
this.metadata = new EspThermMetadata(client)
}
toString() :string {

45
src/mongosave.ts
View File

@ -3,51 +3,60 @@ import * as log from './log'
import * as MongoDB from 'mongodb'
export class MongoSave extends CallChain.ABaseChainItem {
private _url : string
private _mongoClient : MongoDB.MongoClient
private _dbh : MongoDB.Db | undefined
private _connectPending : boolean
export interface MongoItem {
id : MongoDB.ObjectID
payload : any
}
export class MongoSave extends CallChain.AAsyncBaseChainItem {
private url : string
private mongoClient : MongoDB.MongoClient
private dbh : MongoDB.Db | undefined
private connectPending : boolean
constructor(url:string) {
super('MongoSave')
this._url = url
this._mongoClient = new MongoDB.MongoClient()
this._connectPending = false
this.url = url
this.mongoClient = new MongoDB.MongoClient()
this.connectPending = false
}
protected func(message : any) : any {
if (! this._dbh) {
protected func(message : any, finished : (message : any) => void) : void {
if (! this.dbh) {
log.info("Not database connection yet")
if (! this._connectPending) {
this._connectPending = true
this._mongoClient.connect(this._url)
if (! this.connectPending) {
this.connectPending = true
this.mongoClient.connect(this.url)
.then((db:MongoDB.Db) => {
log.info("Successfully opened MongoDB connect")
this._dbh = db
this.dbh = db
})
.catch((err) => {
log.error(`Failure when opening MongoDB connect: ${err}`)
this._dbh = undefined
this.dbh = undefined
})
} else {
log.info("Connecting to database is pending")
}
}
if (this._dbh) {
if (this.dbh) {
log.info("Database handle is available")
let coll : MongoDB.Collection = this._dbh.collection("iot")
let coll : MongoDB.Collection = this.dbh.collection("iot")
coll.insertOne(message)
.then((res : MongoDB.InsertOneWriteOpResult) => {
log.info(`Successfully wrote one item in database: ${res.insertedId}`)
let nextValue = <MongoItem>{id: res.insertedId, payload: message}
finished(nextValue)
})
.catch((err : any) => {
log.error(`Failure when trying to write one item in database: ${err}`)
log.error("Chain interrupted")
})
} else {
log.error(`No database connection yet, drop message ${message}`)
log.error("Chain interrupted")
}
return "<<" + message + ">>"
log.info(`Returning from ${this.label}`)
}
/*

42
src/mqttdispatcher.ts
View File

@ -25,24 +25,24 @@ export interface IDispatcher {
}
export class MqttDispatcher implements IDispatcher {
private _mqttClient: Mqtt.Client
private _mqttOptions: Mqtt.IClientOptions = {}
private _mqttBrokerUrl: string
private _topicHandlers: TopicHandler[]
private mqttClient: Mqtt.Client
private mqttOptions: Mqtt.IClientOptions = {}
private mqttBrokerUrl: string
private topicHandlers: TopicHandler[]
constructor(mqttBrokerUrl? : string, mqttUser? : string, mqttPass? : string, mqttCAFile? : string) {
this._mqttBrokerUrl = (mqttBrokerUrl) ? mqttBrokerUrl : MQTT_BROKER_DEFAULT_URL
this.mqttBrokerUrl = (mqttBrokerUrl) ? mqttBrokerUrl : MQTT_BROKER_DEFAULT_URL
if (mqttUser && mqttPass) {
this._mqttOptions.username = mqttUser
this._mqttOptions.password = mqttPass
this.mqttOptions.username = mqttUser
this.mqttOptions.password = mqttPass
}
if (mqttCAFile) {
this._mqttOptions.ca = fs.readFileSync(mqttCAFile, 'ascii')
this._mqttOptions.rejectUnauthorized = true
this.mqttOptions.ca = fs.readFileSync(mqttCAFile, 'ascii')
this.mqttOptions.rejectUnauthorized = true
}
this._topicHandlers = []
this.topicHandlers = []
}
register(topic: string, label: string,
@ -56,7 +56,7 @@ export class MqttDispatcher implements IDispatcher {
newChainItem = myNewChainItem
}
let done: boolean = false
for (let topicHandler of this._topicHandlers) {
for (let topicHandler of this.topicHandlers) {
if (topicHandler.topic === topic) {
(topicHandler.last as callchain.AChainItem).registerNext(newChainItem)
topicHandler.last = newChainItem
@ -65,28 +65,28 @@ export class MqttDispatcher implements IDispatcher {
}
}
if (! done) {
this._topicHandlers.push({topic: topic, root: newChainItem, last: newChainItem})
this.topicHandlers.push({topic: topic, root: newChainItem, last: newChainItem})
log.info(`first callback ${newChainItem.toString()} added for topic ${topic}`)
}
}
exec() : void {
for (let topicHandler of this._topicHandlers) {
for (let topicHandler of this.topicHandlers) {
(topicHandler.root as callchain.ChainItem).begin()
}
log.info(`connecting to ${this._mqttBrokerUrl}`)
this._mqttClient = Mqtt.connect(this._mqttBrokerUrl, this._mqttOptions)
this._mqttClient.on('error', log.error)
this._mqttClient.on('connect', (): void => {
log.info(`connecting to ${this.mqttBrokerUrl}`)
this.mqttClient = Mqtt.connect(this.mqttBrokerUrl, this.mqttOptions)
this.mqttClient.on('error', log.error)
this.mqttClient.on('connect', (): void => {
log.info("connected to mqtt broker")
for (let topicHandler of this._topicHandlers) {
this._mqttClient.subscribe(topicHandler.topic)
for (let topicHandler of this.topicHandlers) {
this.mqttClient.subscribe(topicHandler.topic)
}
})
this._mqttClient.on('message', (topic: string, payload: Buffer): void => {
this.mqttClient.on('message', (topic: string, payload: Buffer): void => {
log.info(`message received, topic ${topic}, payload ${payload}`)
for (let topicHandler of this._topicHandlers) {
for (let topicHandler of this.topicHandlers) {
if (this.topicMatch(topicHandler.topic, topic)) {
log.info(`received topic ${topic} matches registered topic ${topicHandler.topic}`);
(topicHandler.root as callchain.ChainItem).send(payload)

10
src/processor.ts
View File

@ -3,17 +3,17 @@ import * as events from 'events'
export abstract class AProcessor extends events.EventEmitter {
protected _label : string
protected label : string
constructor(label : string) {
super()
this._label = label
this.label = label
this.addListener('input', this.process)
log.info(`Processor object instanciated: ${this.constructor.name}, ${this._label}`)
log.info(`Processor object instanciated: ${this.constructor.name}, ${this.label}`)
}
public in(message : any) : void {
log.info(`Routing ${message} to Processor class ${this.constructor.name}, ${this._label}`)
log.info(`Routing ${message} to Processor class ${this.constructor.name}, ${this.label}`)
this.emit('input', message)
}
@ -23,6 +23,6 @@ export abstract class AProcessor extends events.EventEmitter {
export class ExProc1 extends AProcessor {
protected process(message : any) : void {
log.info(`ExRoute1.process: ${this._label}, ${message}`)
log.info(`ExRoute1.process: ${this.label}, ${message}`)
}
}

5
src/utils.ts
View File

@ -1,9 +1,8 @@
export function jsonPrepaper(obj:any, hideKeys:string[]) : any {
let dup = {}
for (let key in obj) {
if ((hideKeys.indexOf(key) == -1) && ! ((key[0] == "_") && (key[1] == "_"))) {
let dkey = (key[0] == "_") ? key.slice(1) : key
dup[dkey] = obj[key]
if ((hideKeys.indexOf(key) == -1) && ! (key[0] == "_")) {
dup[key] = obj[key]
}
}
return dup