wyseman - npm Package Compare versions

Comparing version 1.1.4 to 1.1.5

lib/index.js

@@ -5,5 +5,8 @@ //Copyright WyattERP.org; See license in root of this package
 module.exports = {
-  Wyseman:	require('./wyseman.js'),
-  dbClient:	require('./dbclient.js'),
-  Client:	require('./client.js')
+  Wyseman:		require('./wyseman.js'),
+  dbClient:		require('./dbclient.js'),
+  ClientWs:		require('./client_ws.js'),
+  ClientNP:		require('./client_np.js'),
+  ClientMessage:	require('./client_msg.js'),
+  Encrypt:		require('./encrypt.js'),
 }

lib/wyseman.js

@@ -33,7 +33,7 @@ //Manage the connection between a User Interface and the backend database
       , { port, credentials, delta } = websock
-      , server = credentials ? Https.createServer(credentials) : Http.createServer()	//websocket rides on this server
-      , wsport = port
+      , wsport = port || 54320
+    this.server = credentials ? Https.createServer(credentials) : Http.createServer()	//websocket rides on this server
     this.log = dbConf.log || sockConf.log || adminConf.log || require('./log')		//Try to find a logger
     this.adminDB = new DbClient(adminConf)						//Open Admin connection to the DB
-    this.maxDelta = delta
+    this.maxDelta = delta || 60000
 
@@ -45,4 +45,4 @@ //For future noise-protocol connection:
     if (wsport) {
-      let wss = new Ws.Server({			//Initiate a new websocket server
-        server, 
+      this.wss = new Ws.Server({		//Initiate a new websocket server
+        server: this.server, 
         clientTracking: true,
@@ -55,7 +55,7 @@ verifyClient: (info, cb) => {
       })
+      if (!this.wss) return
+
 this.log.info("Wyseman listening on websocket:", wsport)
-
-      if (!wss) return
-      server.listen(wsport)
-      wss.on('connection', (ws, req) => {	//When connection from view client is open
+      this.server.listen(wsport)
+      this.wss.on('connection', (ws, req) => {		//When connection from view client is open
         let payload = req.WysemanPayload
@@ -92,3 +92,3 @@ , config = Object.assign({}, dbConf, payload)		//user,listen was passed to us from verifyClient
         })
-this.log.debug("Connected clients: ", wss.clients.size)
+this.log.debug("Connected clients: ", this.wss.clients.size)
       })		//wss.on connection
@@ -98,2 +98,11 @@ }			//if (wsport)
 
+//Close this server instance
+// -----------------------------------------------------------------------------
+  close() {
+this.log.trace("Closing wyseman: ", this.wss.clients.size)
+    this.wss.close()
+    this.server.close()
+    this.adminDB.disconnect()
+  }
+
 //Validate a user who is presenting a one-time connection token
@@ -100,0 +109,0 @@ // -----------------------------------------------------------------------------

package.json

 {
   "name": "wyseman",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "PostgreSQL Schema Manager with Javascript, Ruby, TCL API",
@@ -34,5 +34,9 @@ "main": "lib/index.js",
   "dependencies": {
+    "b64u-lite": "^1.1.0",
+    "buffer": "^6.0.3",
     "node-fetch": "^2.6.2",
     "pg": "^8.7.3",
     "pg-format": "^1.0.4",
+    "web-encoding": "^1.1.5",
+    "winston": "^3.8.2",
     "ws": "^7.5.5"
@@ -39,0 +43,0 @@ },

test/all.js

@@ -17,2 +17,4 @@ //Run all tests in order
 
+require('./client.js')
+
 after('Delete history, delta, schema files', function() {
@@ -19,0 +21,0 @@ Fs.rmSync(Path.join(SchemaDir, 'Wyseman.delta'))

No alert changes

Improved metrics

Total package byte prevSize

522303

increased by5.22%

Number of package files

97

increased by11.49%

Lines of code

3020

increased by20.85%

Worsened metrics

Dependency count

8

increased by100%

Number of low supply chain risk alerts

16

increased by6.67%

Number of medium supply chain risk alerts

11

increased by10%

Dependency changes

• + Addedb64u-lite@^1.1.0

• + Addedbuffer@^6.0.3

• + Addedweb-encoding@^1.1.5

• + Addedwinston@^3.8.2

• + Added@colors/colors@1.6.0(transitive)

• + Added@dabh/diagnostics@2.0.3(transitive)

• + Added@types/triple-beam@1.3.5(transitive)

• + Added@zxing/text-encoding@0.9.0(transitive)

• + Addedasync@3.2.6(transitive)

• + Addedavailable-typed-arrays@1.0.7(transitive)

• + Addedb64-lite@1.4.0(transitive)

• + Addedb64u-lite@1.1.0(transitive)

• + Addedbase-64@0.1.0(transitive)

• + Addedbase64-js@1.5.1(transitive)

• + Addedbuffer@6.0.3(transitive)

• + Addedcall-bind@1.0.8(transitive)

• + Addedcall-bind-apply-helpers@1.0.2(transitive)

• + Addedcall-bound@1.0.4(transitive)

• + Addedcolor@3.2.1(transitive)

• + Addedcolor-convert@1.9.3(transitive)

• + Addedcolor-name@1.1.3(transitive)

• + Addedcolor-string@1.9.1(transitive)

• + Addedcolorspace@1.1.4(transitive)

• + Addeddefine-data-property@1.1.4(transitive)

• + Addeddunder-proto@1.0.1(transitive)

• + Addedenabled@2.0.0(transitive)

• + Addedes-define-property@1.0.1(transitive)

• + Addedes-errors@1.3.0(transitive)

• + Addedes-object-atoms@1.1.1(transitive)

• + Addedfecha@4.2.3(transitive)

• + Addedfn.name@1.1.0(transitive)

• + Addedfor-each@0.3.5(transitive)

• + Addedfunction-bind@1.1.2(transitive)

• + Addedget-intrinsic@1.3.0(transitive)

• + Addedget-proto@1.0.1(transitive)

• + Addedgopd@1.2.0(transitive)

• + Addedhas-property-descriptors@1.0.2(transitive)

• + Addedhas-symbols@1.1.0(transitive)

• + Addedhas-tostringtag@1.0.2(transitive)

• + Addedhasown@2.0.2(transitive)

• + Addedieee754@1.2.1(transitive)

• + Addedinherits@2.0.4(transitive)

• + Addedis-arguments@1.2.0(transitive)

• + Addedis-arrayish@0.3.2(transitive)

• + Addedis-callable@1.2.7(transitive)

• + Addedis-generator-function@1.1.0(transitive)

• + Addedis-regex@1.2.1(transitive)

• + Addedis-stream@2.0.1(transitive)

• + Addedis-typed-array@1.1.15(transitive)

• + Addedkuler@2.0.0(transitive)

• + Addedlogform@2.7.0(transitive)

• + Addedmath-intrinsics@1.1.0(transitive)

• + Addedms@2.1.3(transitive)

• + Addedone-time@1.0.0(transitive)

• + Addedpossible-typed-array-names@1.1.0(transitive)

• + Addedreadable-stream@3.6.2(transitive)

• + Addedsafe-buffer@5.2.1(transitive)

• + Addedsafe-regex-test@1.1.0(transitive)

• + Addedsafe-stable-stringify@2.5.0(transitive)

• + Addedset-function-length@1.2.2(transitive)

• + Addedsimple-swizzle@0.2.2(transitive)

• + Addedstack-trace@0.0.10(transitive)

• + Addedstring_decoder@1.3.0(transitive)

• + Addedtext-hex@1.0.0(transitive)

• + Addedtriple-beam@1.4.1(transitive)

• + Addedutil@0.12.5(transitive)

• + Addedutil-deprecate@1.0.2(transitive)

• + Addedweb-encoding@1.1.5(transitive)

• + Addedwhich-typed-array@1.1.18(transitive)

• + Addedwinston@3.17.0(transitive)

• + Addedwinston-transport@4.9.0(transitive)