diff --git a/.gitignore b/.gitignore index caddd9f..bd8d34e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /syncd/ *.log /temp/ +*.lock diff --git a/examples/client.mjs b/examples/client.js similarity index 100% rename from examples/client.mjs rename to examples/client.js diff --git a/examples/client2.mjs b/examples/client2.js similarity index 100% rename from examples/client2.mjs rename to examples/client2.js diff --git a/examples/server.mjs b/examples/server.js similarity index 100% rename from examples/server.mjs rename to examples/server.js diff --git a/package.json b/package.json index c14589d..34f40cd 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,18 @@ { "name": "@uci/socket", - "version": "0.1.1", + "version": "0.1.2", "description": "JSON packet intra(named)/inter(TCP) host communication over socket", "main": "src", "scripts": { - "testw": "mocha -r @std/esm test/*.test.mjs --watch --recurse --watch-extensions mjs", - "test": "mocha -r @std/esm --timeout 10000 test/*.test.mjs", - "testlog": "DEBUG=true mocha -r @std/esm --timeout 10000 test/*.test.mjs", + "testw": "mocha -r esm test/*.test.mjs --watch --recurse --watch-extensions mjs", + "test": "mocha -r esm --timeout 10000 test/*.test.mjs", + "testlog": "DEBUG=true mocha -r esm --timeout 10000 test/*.test.mjs", "testci": "istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- -R spec --recursive && codecov || true", - "s": "DEBUG=true node -r @std/esm examples/server", - "devs": "SOCKETS_DIR=/opt/sockets DEBUG=true ./node_modules/.bin/nodemon -r @std/esm -e mjs examples/server", - "c": "DEBUG=true node -r @std/esm examples/client", - "devc": "SOCKETS_DIR=/opt/sockets DEBUG=true node -r @std/esm examples/client", - "c2": "node -r @std/esm examples/client2" + "s": "DEBUG=true node -r esm examples/server", + "devs": "SOCKETS_DIR=/opt/sockets DEBUG=true ./node_modules/.bin/nodemon -r esm-e mjs examples/server", + "c": "DEBUG=true node -r esm examples/client", + "devc": "SOCKETS_DIR=/opt/sockets DEBUG=true node -r esm examples/client", + "c2": "node -r esm examples/client2" }, "author": "David Kebler", "license": "MIT", @@ -35,17 +35,17 @@ "url": "https://github.com/uCOMmandIt/message/issues" }, "homepage": "https://github.com/uCOMmandIt/message#readme", - "@std/esm": "cjs", "devDependencies": { - "@std/esm": "^0.22.0", "chai": "^4.1.2", "chai-as-promised": "^7.1.1", "codecov": "^3.0.0", + "esm": "^3.0.21", "istanbul": "^0.4.5", "mocha": "^5.0.1", "nodemon": "^1.15.1" }, "dependencies": { + "@uci/logger": "^0.0.2", "better-try-catch": "^0.6.2", "clone": "^2.1.1", "death": "^1.1.0", diff --git a/src/consumer.mjs b/src/consumer.js similarity index 96% rename from src/consumer.mjs rename to src/consumer.js index b13ffb4..34c4c2f 100644 --- a/src/consumer.mjs +++ b/src/consumer.js @@ -7,14 +7,6 @@ import JsonStream from './json-stream' import logger from '@uci/logger' let log = {} -const LOG_OPTS = { - repo:'uci-socket', - npm:'@uci/socket', - file:'src/consumer.mjs', - class:'Consumer', - id:this.id, - instance_created:new Date().getTime() -} // TODO change default pipe dir for windows and mac os const DEFAULT_PIPE_DIR = (process.env.SOCKETS_DIR || '/tmp/UCI') @@ -23,7 +15,7 @@ const DEFAULT_SOCKET_NAME = 'uci-sock' export default class Consumer extends Socket { constructor (opts={}) { super() - log = logger.child(LOG_OPTS) + log = logger({file:'src/consumer.js',class:'Consumer',name:'socket',id:this.id}) this.id = opts.id || opts.name || 'socket:'+ new Date().getTime() if (!opts.path) { log.warn({opts:opts},'no host supplied using localhost...use named piped instead') diff --git a/src/index.mjs b/src/index.js similarity index 100% rename from src/index.mjs rename to src/index.js diff --git a/src/json-stream.mjs b/src/json-stream.js similarity index 100% rename from src/json-stream.mjs rename to src/json-stream.js diff --git a/src/socket.mjs b/src/socket.js similarity index 95% rename from src/socket.mjs rename to src/socket.js index 59d5214..bfe9c4c 100644 --- a/src/socket.mjs +++ b/src/socket.js @@ -10,14 +10,7 @@ import clone from 'clone' // import logger from '../../uci-logger/src/logger' import logger from '@uci/logger' let log = {} -const LOG_OPTS = { - repo:'uci-socket', - npm:'@uci/socket', - file:'src/socket.mjs', - class:'Socket', - id:this.id, - instance_created:new Date().getTime() -} + // TODO change default pipe dir for windows and mac os const DEFAULT_PIPE_DIR = (process.env.SOCKETS_DIR || '/tmp/UCI') const DEFAULT_SOCKET_NAME = 'uci-sock' @@ -37,7 +30,7 @@ export default class Socket extends Server { //self bindings this._listen = this._listen.bind(this) this.create = this.create.bind(this) - log = logger.child(LOG_OPTS) //create instance logger set LOG_OPTS above + log = logger({file:'src/socket.js',class:'Socket',name:'socket',id:this.id}) } // end constructor async create () { diff --git a/test/sockets/tcp-process.mjs b/test/sockets/tcp-process.js similarity index 100% rename from test/sockets/tcp-process.mjs rename to test/sockets/tcp-process.js diff --git a/test/sockets/tcpsocket-9080.mjs b/test/sockets/tcpsocket-9080.js similarity index 100% rename from test/sockets/tcpsocket-9080.mjs rename to test/sockets/tcpsocket-9080.js diff --git a/test/sockets/tcpsocket-default.mjs b/test/sockets/tcpsocket-default.js similarity index 100% rename from test/sockets/tcpsocket-default.mjs rename to test/sockets/tcpsocket-default.js diff --git a/test/sockets/usocket-default.mjs b/test/sockets/usocket-default.js similarity index 100% rename from test/sockets/usocket-default.mjs rename to test/sockets/usocket-default.js diff --git a/test/sockets/usocket.mjs b/test/sockets/usocket.js similarity index 100% rename from test/sockets/usocket.mjs rename to test/sockets/usocket.js diff --git a/test/tcp.test.mjs b/test/tcp.test.js similarity index 100% rename from test/tcp.test.mjs rename to test/tcp.test.js diff --git a/test/usocket-default.test.mjs b/test/usocket-default.test.js similarity index 100% rename from test/usocket-default.test.mjs rename to test/usocket-default.test.js diff --git a/test/usocket.test.mjs b/test/usocket.test.js similarity index 100% rename from test/usocket.test.mjs rename to test/usocket.test.js