Merge pull request #33 from datapartyjs/browser-bundle

sevenbitbyte · web-flow · commit dc6242cd0c02 · 2022-09-30T01:16:27.000-07:00
Browser bundle
diff --git a/package.json b/package.json
@@ -1,19 +1,24 @@
 {
   "name": "@dataparty/api",
   "private": false,
-  "version": "1.2.12",
+  "version": "1.2.13",
   "main": "dist/dataparty.js",
   "frontend": "dist/dataparty-browser.js",
   "backend": "dist/dataparty.js",
   "embedded": "dist/dataparty-embedded.js",
   "alias": {
-    "events": "eventemitter3"
+    "events": "eventemitter3",
+    "process": "process/browser.js",
+    "assert": "assert",
+    "crypto": "crypto-browserify"
   },
   "targets": {
     "frontend": {
       "context": "browser",
       "source": "src/index-browser.js",
+      "optimize": false,
       "includeNodeModules": true,
+      "scopeHoist": false,
       "engines": {
         "browsers": "Chrome 80"
       }
@@ -43,9 +48,10 @@
   ],
   "scripts": {
     "test": "npx lab",
-    "build": "parcel build --no-scope-hoist",
+    "build": "npx parcel build",
     "prepare": "npm run build",
     "watch": "parcel watch",
+    "clean": "rm -rf node_modules; rm package-lock.json; npm i",
     "build-test": "node ./examples/party/example-build.js",
     "watch-test": "DEBUG=* nodemon --ignore service test/test-service-compile.js",
     "build-docs": "npx jsdoc -c jsdoc.json"
@@ -54,9 +60,9 @@
     "@dataparty/bouncer-db": "1.0.1",
     "@dataparty/crypto": "datapartyjs/dataparty-crypto#parcel-build",
     "@hapi/joi": "^17.1.1",
-    "@hapi/wreck": "18.0.0",
     "@zeit/ncc": "^0.22.3",
     "ajv": "6.9.1",
+    "axios": "^0.27.2",
     "body-parser": "^1.19.0",
     "bson": "^4.6.1",
     "bson-objectid": "^1.3.0",
@@ -79,14 +85,13 @@
     "morgan": "^1.10.0",
     "nconf": "^0.10.0",
     "node-persist": "^3.0.1",
-    "nodemon-webpack-plugin": "^3.0.1",
     "origin-router": "^1.6.4",
     "parse-url": "^5.0.1",
     "promisfy": "^1.2.0",
     "prompt": "^1.0.0",
-    "roslib": "^0.20.0",
+    "roslib": "^1.3.0",
     "sanitize-filename": "^1.6.3",
-    "simple-peer": "^9.7.2",
+    "simple-peer": "9.7.2",
     "source-map": "^0.7.3",
     "store-js": "^2.0.4",
     "tingodb": "^0.6.1",
@@ -102,14 +107,24 @@
     "@dataparty/bouncer-model": "1.4.3",
     "@hapi/code": "^9.0.1",
     "@hapi/lab": "^25.0.1",
+    "assert": "^2.0.0",
     "better-docs": "^1.1.6",
+    "browserify-zlib": "^0.2.0",
+    "crypto-browserify": "^3.12.0",
     "docdash": "^1.1.1",
     "fake-indexeddb": "^4.0.0",
+    "https-browserify": "^1.0.0",
     "jsdoc": "^3.6.2",
     "minami": "^1.2.3",
     "mongodb-client-encryption": "^2.2.1",
     "parcel": "^2.3.1",
+    "process": "^0.11.10",
+    "querystring-es3": "^0.2.1",
+    "stream-browserify": "^3.0.0",
+    "stream-http": "^3.2.0",
     "tmp": "^0.2.1",
+    "url": "^0.11.0",
+    "util": "^0.12.4",
     "wrtc": "^0.4.7"
   },
   "repository": {
diff --git a/public/example.html b/public/example.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<script src="dist/dataparty-browser.js">
+
+</script>
+</head>
+
+</html>
diff --git a/src/comms/rest-comms.js b/src/comms/rest-comms.js
@@ -1,12 +1,16 @@
-const Wreck = require('@hapi/wreck')
+const axios = require('axios')
 const EventEmitter = require('eventemitter3')
 const debug = require('debug')('dataparty.comms.rest')
 
-const WebsocketComms = require('./websocket-comms')
 const dataparty_crypto = require('@dataparty/crypto')
 
+const WebsocketComms = require('./websocket-comms')
 const AuthError = require('../errors/auth-error')
 
+
+const DEFAULT_REST_TIMEOUT = 30000
+
+
 class RestComms extends EventEmitter {
   constructor({ remoteIdentity, config, party }) {
     super()
@@ -348,30 +352,18 @@ class RestComms extends EventEmitter {
   }
 
   static async HttpRequest(verb, url, data) {
-    // debug(typeof data)
-    const payload = JSON.stringify(data)
-    debug(`${verb} - ${url}`)
-    // debug('sending - ', payload)
-    try {
-      const res = await Wreck.request(verb, url, {
-        payload,
-        headers: {
-          'content-type': 'application/json'
-        }
-      })
-
-      const body = await Wreck.read(res, {
-        timeout: 30000
-      })
 
-      const str = body.toString()
+    debug(`${verb} - ${url}`)
 
-      debug(str)
+    const response = await axios({
+      method: verb,
+      url,
+      data,
+      headers: {'Content-Type': 'application/json'},
+      timeout: DEFAULT_REST_TIMEOUT
+    })
 
-      return str
-    } catch (error) {
-      throw error
-    }
+    return response.data
   }
 
   static async HttpGet(url) {
diff --git a/src/comms/ros-shim.js b/src/comms/ros-shim.js
@@ -1,5 +1,5 @@
 const debug = require('debug')('dataparty.comms.ros-shim')
-const ROSLIB = require('roslib/src/RosLib')
+const ROSLIB = require('roslib')
 
 class RosShim extends ROSLIB.Ros {
     constructor(socket){
diff --git a/test/zango-party-test.js b/test/zango-party-test.js
@@ -10,8 +10,8 @@ if (!process.browser) {
 const fs = require('fs/promises')
 const debug = require('debug')('test.local-db')
 const ExampleModel = require('../examples/dataparty/@dataparty-api.dataparty-schema.json')
-//const Dataparty = require('../dist/dataparty.js')
-const Dataparty = require('../src/index')
+const Dataparty = require('../dist/dataparty.js')
+//const Dataparty = require('../src/index')
 
 const Lab = require('@hapi/lab')
 const { expect } = require('@hapi/code');

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +<html>
 +<head>
 +<script src="dist/dataparty-browser.js">
++
 +</script>
 +</head>
++
 +</html>