Merge pull request #103 from duality-solutions/1.0.0-rc

Merge v1.0.0 Changes

.prettierrc

@@ -0,0 +1 @@
+{ "tabWidth": 4, "trailingComma": "es5", "arrowParens": "avoid" }

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 10.16.2
+  - lts/dubnium
 os:
   - linux
 dist: bionic
@@ -11,7 +11,7 @@ before_install:
   - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
   - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
   - sudo apt-get update && sudo apt-get install --no-install-recommends yarn
-  - nvm install 10.16.2 && nvm use 10.16.2  && npm install -g yarn
+  - nvm install lts/dubnium && nvm use lts/dubnium  && npm install -g yarn
   - yarn install
 cache:
   apt: true

README.md

@@ -1,4 +1,4 @@
-## Private Share
+## pShare
 
 ### Software Objectives:
 - Privately and securely share data with friends, family, and business associates.
@@ -91,6 +91,32 @@ New binaries can be created by following https://github.com/HiddenField/dynamic-
 
 Information about the architecture of the application can be found in [this document](documentation/electron-redux-architecture.md)
 
+### Talking to an installed pShare's instance of dynamicd
+
+#### Linux *.deb*-based installation from `bash`
+
+In the terminal, it is possible to make an alias `dyncli` to point to the running dynamicd:
+
+```shell
+$ alias dyncli='/opt/pShare/resources/static/dynamicd/linux/dynamic-cli "-conf=$HOME/.pshare/.dynamic/dynamic.conf" "-datadir=$HOME/.pshare/.dynamic"'
+```
+
+then we can use it to issue RPC commands against the running `dynamicd` as follows:
+
+```shell
+$ dyncli syncstatus
+```
+
+#### Windows-based installation from `cmd`
+
+In windows, we can use the following:
+
+```shell
+> "%LOCALAPPDATA%\Programs\pshare\resources\static\dynamicd\win32\dynamic-cli.exe" "-conf=%USERPROFILE%\.pshare\.dynamic\dynamic.conf" "-datadir=%USERPROFILE%\.pshare\.dynamic" syncstatus
+```
+
+to do the same thing. No `alias` command to ease usage, unfortunately.
+
 ### License
 
 See LICENSE.md file for copying and use information.

getVersion.ts

@@ -0,0 +1 @@
+export const version: string = require('./package.json').version

package.json

@@ -1,14 +1,18 @@
 {
   "name": "pshare",
-  "version": "0.5.8",
+  "version": "1.0.0",
   "description": "Secure and private peer to peer file sharing",
   "homepage": "https://duality.solutions/pshare",
-  "license": "UNLICENSED",
+  "license": "SEE LICENSE IN LICENSE.md",
   "author": {
     "name": "HiddenField",
     "email": "[email protected]",
     "url": "https://duality.solutions/pshare"
   },
+  "repository": {
+      "type": "git",
+      "url": "https://github.com/duality-solutions/pShare.git"
+  },
   "build": {
     "appId": "solutions.duality.pshare",
     "productName": "pShare",
@@ -17,9 +21,7 @@
     },
     "linux": {
       "target": [
-        "AppImage",
-        "deb",
-        "tar.gz"
+        "deb"
       ]
     }
   },
@@ -47,7 +49,10 @@
     "is-in-subnet": "^1.9.0",
     "mime-types": "^2.1.22",
     "pify": "^4.0.1",
+    "progress-stream": "^2.0.0",
+    "qrcode-generator": "^1.4.3",
     "react": "^16.8.6",
+    "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.8.6",
     "react-dropzone": "^10.0.0",
     "react-redux": "^5.1.1",
@@ -65,6 +70,7 @@
     "seedrandom": "^2.4.4",
     "sjcl-git": "https://github.com/bitwiseshiftleft/sjcl.git#1.0.8",
     "source-map-support": "^0.5.9",
+    "stream-buffers": "^3.0.2",
     "styled-components": "^4.2.0",
     "symbol-observable": "^1.2.0",
     "ts-deep-equal": "^1.1.1",
@@ -86,24 +92,26 @@
     "@types/jest": "^23.3.10",
     "@types/mime-types": "^2.1.0",
     "@types/pify": "^3.0.2",
+    "@types/progress-stream": "^2.0.0",
     "@types/react": "^16.7.9",
     "@types/react-dom": "^16.0.11",
     "@types/react-redux": "^6.0.10",
     "@types/react-router": "^4.4.1",
     "@types/react-router-dom": "^4.3.1",
     "@types/react-transition-group": "1.1.5",
     "@types/seedrandom": "^2.4.27",
+    "@types/stream-buffers": "^3.0.3",
     "@types/styled-components": "^4.1.6",
     "@types/uuid": "^3.4.4",
     "@types/webdriverio": "^4.13.0",
     "electron": "3.0.10",
     "electron-builder": "^20.36.2",
     "electron-webpack": "^2.6.1",
     "electron-webpack-ts": "^3.1.0",
-    "jest": "^23.6.0",
+    "jest": "^24.9.0",
     "redux-saga-test-plan": "^3.7.0",
     "spectron": "^5.0.0",
-    "ts-jest": "^23.10.5",
+    "ts-jest": "^24.0.2",
     "tslint": "^5.11.0",
     "webdriverio": "^4.14.1",
     "webpack": "^4.26.0",

src/main/getRpcClient.ts

@@ -40,7 +40,7 @@ async function createRpcClient(cancellationToken: CancellationToken): Promise<{
 
     const client = await createJsonRpcClient({
         host: "localhost",
-        port: "33650",
+        port: "33350",
         username: processInfo.rpcUser,
         password: processInfo.rpcPassword,
         timeout: 20000,