Dep deprecations (#63)

sevenbitbyte · Alan M · sevenbitbyte · web-flow · commit ab2132256819 · 2023-04-04T18:11:24.000-07:00
* use latest crypto

* version bump

* change deprecated dependencies

* update joi

* deep-set to lodash.set

---------

Co-authored-by: Alan M &lt;alanm@dev1.lxd&gt;
Co-authored-by: sevenbitbyte &lt;code@nullagent.com&gt;
diff --git a/examples/test-peer-party-service.js b/examples/test-peer-party-service.js
@@ -18,6 +18,8 @@ class ExampleService extends Dataparty.IService {
     this.addEndpoint(Dataparty.endpoint_paths.secureecho)
     this.addEndpoint(Dataparty.endpoint_paths.identity)
     this.addEndpoint(Dataparty.endpoint_paths.version)
+
+    this.addSchema(Path.join(__dirname, './party/schema/user.js'))
   }
 
 }
diff --git a/examples/test-service-node-host.js b/examples/test-service-node-host.js
@@ -80,7 +80,7 @@ async function main(){
 
   console.log('started')
   
-  //process.exit()
+  process.exit()
 }
 
 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dataparty/api",
   "private": false,
-  "version": "1.2.20",
+  "version": "1.2.21",
   "main": "dist/dataparty.js",
   "frontend": "dist/dataparty-browser.js",
   "backend": "dist/dataparty.js",
@@ -62,9 +62,8 @@
     "@dataparty/crypto": "1.0.3",
     "@dataparty/tasker": "^0.0.2",
     "@diva.exchange/i2p-sam": "^4.1.8",
-    "@hapi/joi": "^17.1.1",
     "@markwylde/liferaft": "^1.3.4",
-    "@zeit/ncc": "^0.22.3",
+    "@vercel/ncc": "^0.36.1",
     "ajv": "6.9.1",
     "axios": "^0.27.2",
     "bleno": "npm:@abandonware/bleno@^0.5.1-4",
@@ -80,11 +79,12 @@
     "express": "^4.17.1",
     "express-list-routes": "^0.1.4",
     "git-repo-info": "^2.1.1",
+    "joi": "^17.9.1",
     "joi-objectid": "^4.0.2",
     "jshashes": "^1.0.8",
     "jsonpath-plus": "^0.20.1",
     "last-eventemitter": "^1.1.1",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.21",
     "lokijs": "1.5.6",
     "mkdirp": "^0.5.1",
     "moment": "^2.29.4",
diff --git a/src/comms/host/host-protocol-scheme.js b/src/comms/host/host-protocol-scheme.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 Joi.objectId = require('joi-objectid')(Joi)
 
 const ID_SCHEME = Joi.alternatives().try(Joi.string(), Joi.number())
diff --git a/src/comms/peer-comms.js b/src/comms/peer-comms.js
@@ -5,7 +5,7 @@ const HttpMocks = require('node-mocks-http')
 const SocketOp = require('./op/socket-op')
 const ISocketComms = require('./isocket-comms')
 
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const HostOp = require('./host/host-op')
 const HostProtocolScheme = require('./host/host-protocol-scheme')
 
diff --git a/src/config/json-file.js b/src/config/json-file.js
@@ -3,7 +3,7 @@
 const fs = require('fs')
 const Path = require('path')
 const mkdirp = require('mkdirp')
-const deepSet = require('deep-set')
+const deepSet = require('lodash').set
 const reach = require('../utils/reach')
 const logger = require('debug')('dataparty.config.json-file')
 
diff --git a/src/config/local-storage.js b/src/config/local-storage.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const deepSet = require('deep-set')
+const deepSet = require('lodash').set
 const reach = require('../utils/reach')
 const logger = require('debug')('dataparty.config.local-storage');
 
diff --git a/src/config/memory.js b/src/config/memory.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const deepSet = require('deep-set')
+const deepSet = require('lodash').set
 const reach = require('../utils/reach')
 const logger = require('debug')('dataparty.config.memory');
 
diff --git a/src/party/idocument.js b/src/party/idocument.js
@@ -176,8 +176,8 @@ class IDocument extends EventEmitter {
 
     const rawDocuments = (await party.create(type, data))
     
-      debug('hydrating', rawDocuments)
-      return (await party.factory.hydrate(rawDocuments))[0]
+    debug('hydrating', rawDocuments)
+    return (await party.factory.hydrate(rawDocuments))[0]
 
     /*const docs = (await party.find()
       .type(rawDocument.$meta.type)
diff --git a/src/party/iparty.js b/src/party/iparty.js
@@ -77,6 +77,7 @@ class IParty {
   async createDocument(type, data, id){
     let Type = this.factory.getFactory(type)
 
+
     return await Type.create(this, {data, type, id})
   }
 
diff --git a/src/sandbox/sandbox.js b/src/sandbox/sandbox.js
@@ -33,7 +33,7 @@ class Sandbox {
         sandbox,
         require: {
           external: {
-            modules: ['debug', '@dataparty/crypto', '@hapi/joi', '@hapi/hoek']
+            modules: ['debug', '@dataparty/crypto', 'joi', '@hapi/hoek']
           },
           //builtin: ['*']
         }
diff --git a/src/service/endpoints/echo.js b/src/service/endpoints/echo.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const debug = require('debug')('dataparty.endpoint.echo')
 
 const IEndpoint = require('../iendpoint')
diff --git a/src/service/endpoints/secure-echo.js b/src/service/endpoints/secure-echo.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const {Message, Routines} = require('@dataparty/crypto')
 const debug = require('debug')('dataparty.endpoint.secure-echo')
diff --git a/src/service/endpoints/service-identity.js b/src/service/endpoints/service-identity.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const {Message, Routines} = require('@dataparty/crypto')
 const debug = require('debug')('dataparty.endpoint.identity')
diff --git a/src/service/endpoints/service-version.js b/src/service/endpoints/service-version.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const {Message, Routines} = require('@dataparty/crypto')
 const debug = require('debug')('dataparty.endpoint.version')
diff --git a/src/service/iservice.js b/src/service/iservice.js
@@ -1,12 +1,12 @@
 const fs = require('fs')
 const Path = require('path')
-const NCC = require('@zeit/ncc')
+const NCC = require('@vercel/ncc')
 const Hoek = require('@hapi/hoek')
 const {JSONPath} = require('jsonpath-plus')
 const gitRepoInfo = require('git-repo-info')
 const BouncerDb = require('@dataparty/bouncer-db')
 const mongoose = BouncerDb.mongoose()
-const { build } = require('@hapi/joi')
+const { build } = require('joi')
 const debug = require('debug')('dataparty.service.IService')
 
 module.exports = class IService {
@@ -79,7 +79,7 @@ module.exports = class IService {
       // provide a custom cache path or disable caching
       cache: false,
       // externals to leave as requires of the build
-      externals: ['debug', '@dataparty/crypto', '@dataparty/tasker', '@hapi/joi', '@hapi/hoek'],
+      externals: ['debug', '@dataparty/crypto', '@dataparty/tasker', 'joi', '@hapi/hoek'],
       // directory outside of which never to emit assets
       //filterAssetBase: process.cwd(), // default
       minify: false, // default
diff --git a/src/service/middleware/post/encrypt.js b/src/service/middleware/post/encrypt.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const {Message, Identity} = require('@dataparty/crypto')
 const debug = require('debug')('dataparty.middleware.post.encrypt')
diff --git a/src/service/middleware/post/validate.js b/src/service/middleware/post/validate.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const debug = require('debug')('dataparty.middleware.post.validate')
 
diff --git a/src/service/middleware/pre/decrypt.js b/src/service/middleware/pre/decrypt.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const {Message, Routines} = require('@dataparty/crypto')
 const debug = require('debug')('dataparty.middleware.pre.decrypt')
diff --git a/src/service/middleware/pre/validate.js b/src/service/middleware/pre/validate.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const debug = require('debug')('dataparty.middleware.pre.validate')
 
diff --git a/src/service/service-runner-node.js b/src/service/service-runner-node.js
@@ -1,5 +1,5 @@
 const Path = require('path')
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const Debug = require('debug')
 const debug = Debug('dataparty.service.runner-node')
diff --git a/src/service/service-runner.js b/src/service/service-runner.js
@@ -1,5 +1,5 @@
 const Path = require('path')
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const {VM, VMScript} = require('vm2')
 const Debug = require('debug')
diff --git a/src/venue/endpoints/create-service.js b/src/venue/endpoints/create-service.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const {Message, Routines} = require('@dataparty/crypto')
 const debug = require('debug')('dataparty.endpoint.create-service')
diff --git a/src/venue/middleware/pre/decrypt-nacl.js b/src/venue/middleware/pre/decrypt-nacl.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const {Message, Routines} = require('@dataparty/crypto')
 const debug = require('debug')('venue.middleware.pre.decrypt')
diff --git a/src/venue/middleware/pre/session-nacl.js b/src/venue/middleware/pre/session-nacl.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const Hoek = require('@hapi/hoek')
 const {Message, Routines} = require('@dataparty/crypto')
 const debug = require('debug')('venue.middleware.pre.decrypt')

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ class ExampleService extends Dataparty.IService {`
`18`	`18`	`this.addEndpoint(Dataparty.endpoint_paths.secureecho)`
`19`	`19`	`this.addEndpoint(Dataparty.endpoint_paths.identity)`
`20`	`20`	`this.addEndpoint(Dataparty.endpoint_paths.version)`
	`21`	`+`
	`22`	`+ this.addSchema(Path.join(__dirname, './party/schema/user.js'))`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ async function main(){`
`80`	`80`
`81`	`81`	`console.log('started')`
`82`	`82`
`83`		`- //process.exit()`
	`83`	`+ process.exit()`
`84`	`84`	`}`
`85`	`85`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const Joi = require('@hapi/joi')`
	`1`	`+const Joi = require('joi')`
`2`	`2`	`Joi.objectId = require('joi-objectid')(Joi)`
`3`	`3`
`4`	`4`	`const ID_SCHEME = Joi.alternatives().try(Joi.string(), Joi.number())`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ class IParty {`
`77`	`77`	`async createDocument(type, data, id){`
`78`	`78`	`let Type = this.factory.getFactory(type)`
`79`	`79`
	`80`	`+`
`80`	`81`	`return await Type.create(this, {data, type, id})`
`81`	`82`	`}`
`82`	`83`