Fix GQL QueryLink (#45)

Reviewed-on: cerc-io/laconic-console#45
Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com>
Co-committed-by: Thomas E Lackey <telackey@bozemanpass.com>

.gitea/workflows/publish.yaml

@@ -0,0 +1,39 @@
+name: Publish npm package to gitea
+on:
+  release:
+    types: [published]
+jobs:
+  npm_publish:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [ 18.x ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Download yarn
+        run: |
+          curl -fsSL -o /usr/local/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.21/yarn-1.22.21.js
+          chmod +x /usr/local/bin/yarn
+      - name: Install jq
+        run: |
+          apt update && apt install -y jq
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn
+      - name: Run yarn build
+        run: |
+          LACONIC_HOSTED_CONFIG_FILE=config-hosted.yml yarn dist
+      - name: Configure git.vdb.to npm registry
+        run: |
+          npm config set registry https://git.vdb.to/api/packages/cerc-io/npm/
+      - name: Authenticate to git.vdb.to registry
+        run: |
+          npm config set -- '//git.vdb.to/api/packages/cerc-io/npm/:_authToken' "${{ secrets.CICD_PUBLISH_TOKEN }}"
+      - name: npm publish
+        run: |
+          npm publish

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

.idea/console.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,11 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-      <option name="processCode" value="true" />
-      <option name="processLiterals" value="true" />
-      <option name="processComments" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="JSX" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/console.iml" filepath="$PROJECT_DIR$/.idea/console.iml" />
-    </modules>
-  </component>
-</project>

.idea/runConfigurations/client.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="client" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/packages/console-app/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="start" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/server.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="server" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/packages/console-server/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="start" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

README.md

@@ -1,5 +1,90 @@
 # Console
 
-Laconic Kubenet GraphQL server and console application.
+Laconic console application.
 
-![Console](./docs/images/console.png)
+User interface for submitting and reading records registered on Laconic.
+
+## Development
+
+* Clone the required repos:
+  * [laconicd](https://github.com/cerc-io/laconicd)
+
+    ```bash
+    git clone git@github.com:cerc-io/laconicd.git
+    ```
+
+* Run the `laconicd` chain:
+  * In [laconicd](https://github.com/cerc-io/laconicd) repo, start the chain
+
+    ```bash
+    ./init.sh
+    ```
+  * For auction functionality enabled, add this environment variable:
+
+    ```bash
+    TEST_AUCTION_ENABLED=true ./init.sh
+    ```
+
+* Run the laconic-console app
+  * From the root of this repo, run:
+
+    ```bash
+    yarn
+    ```
+
+    *NOTE*: There is a warning containing error while installing dependencies
+
+    ```bash
+    warning Error running install script for optional dependency: ".../laconic-console/node_modules/sodium-native: Command failed.
+    Exit code: 1
+    ...
+    Error: ./configure exited with 127
+    ```
+
+    This can be ignored as it is an error for installing optional dependency
+
+  * Start the app:
+
+      ```bash 
+      CONFIG_FILE=config-local.yml yarn start
+      ```
+
+  * Open console at <http://localhost:8080>
+
+  * To view records in the console, the test suite in laconic-sdk can be run
+
+    * Clone the [laconic-sdk](https://github.com/cerc-io/laconic-sdk) repo:
+
+      ```bash
+      git clone git@github.com:cerc-io/laconic-sdk.git
+      ```
+
+    * In [laconic-sdk](https://github.com/cerc-io/laconic-sdk) repo, copy [.env.example](https://github.com/cerc-io/laconic-sdk/blob/main/.env.example) file and create a `.env` file
+
+      ```bash
+      cp .env.example .env
+      ```
+
+    * Export the private key using:
+
+      ```bash
+      laconicd keys export mykey --unarmored-hex --unsafe
+      ```
+
+    * Copy the private key exported above and assign it to variable `PRIVATE_KEY` in the `.env` file.
+
+    * Install dependencies
+
+      ```bash
+      yarn
+      ```
+
+    * Run the tests in laconic-sdk repo:
+
+      ```bash
+      yarn test
+      ```
+
+      *NOTE*: One test from [util.test.ts](https://github.com/cerc-io/laconic-sdk/blob/main/src/util.test.ts) fails as mentioned in the [PR](https://github.com/cerc-io/laconic-sdk/pull/5#issuecomment-1299572012)
+
+    * Open console at <http://localhost:8080> to view the records.

babel.config.js

@@ -12,7 +12,6 @@ module.exports = {
     'import-graphql',
     'inline-json-import',
 
-    '@babel/plugin-proposal-class-properties',
-    '@babel/plugin-proposal-export-default-from'
+    '@babel/plugin-proposal-class-properties'
   ]
 };

config-hosted.yml

@@ -0,0 +1,42 @@
+#
+# NODE_ENV=development
+# NOTE: Set CONFIG_FILE to swap out this config file.
+#
+
+# TODO: write a tool to automated insertion of the template strings in files like this.
+
+app:
+  title: 'Console'
+  org': 'Laconic'
+  theme: 'dark'
+  website: 'LACONIC_HOSTED_CONFIG_app_website' # e.g. https://laconic.com
+  publicUrl: '/console'
+
+api:
+  server: 'LACONIC_HOSTED_CONFIG_api_server' # e.g. http://127.0.0.1:9004
+  path: '/api'
+  intervalLog: 5000
+  pollInterval: 10000
+
+system:
+  debug: 'laconic:console:*'
+
+services:
+  app:
+    prefix: '/app'
+    server: 'LACONIC_HOSTED_CONFIG_services_app_server' # e.g. http://127.0.0.1:5999
+
+  wns:
+    server: 'LACONIC_HOSTED_CONFIG_services_wns_server' # e.g. http://127.0.0.1:9473/api
+    webui: 'LACONIC_HOSTED_CONFIG_services_wns_webui' # e.g. http://127.0.0.1:9473/console
+
+  signal:
+    server: 'LACONIC_HOSTED_CONFIG_services_signal_server' # e.g. ws://127.0.0.1:4000
+    api: 'LACONIC_HOSTED_CONFIG_services_signal_api' # e.g. http://127.0.0.1:4000/api
+
+  ipfs:
+    server: 'LACONIC_HOSTED_CONFIG_services_ipfs_server' # e.g. http://127.0.0.1:5001
+    gateway: 'LACONIC_HOSTED_CONFIG_services_ipfs_gateway' # e.g. http://127.0.0.1:8888/ipfs/
+
+  wellknown:
+    endpoint: 'LACONIC_HOSTED_CONFIG_services_wellknown_endpoint' # e.g. http://127.0.0.1:9000/.well-known/laconic

lerna.json

@@ -1,5 +0,0 @@
-{
-  "version": "1.2.9",
-  "useWorkspaces": true,
-  "npmClient": "yarn"
-}

package.json

@@ -1,69 +1,91 @@
 {
-  "name": "laconic-console",
-  "version": "1.2.9-alpha.0",
+  "name": "@cerc-io/console-app",
+  "version": "1.3.7",
   "description": "Laconic Console",
-  "main": "index.js",
-  "private": true,
+  "repository": "https://github.com/cerc-io/laconic-console",
+  "main": "dist/es/index.js",
+  "files": [
+    "dist/*", "src/*"
+  ],
   "scripts": {
-    "build": "lerna run build",
-    "clean": "lerna run clean",
-    "lint": "lerna run lint",
-    "lint:fix": "lerna run lint -- --fix",
-    "lint:staged": "lint-staged",
-    "sort-package-json": "lerna exec npx sort-package-json",
-    "test": "lerna run test"
+    "analyzer": "webpack --config webpack-analyzer.config.js",
+    "build": "yarn dist",
+    "build:babel": "babel ./src --out-dir ./dist/es --ignore \"**/*.test.js\" --source-maps inline",
+    "clean": "rm -rf dist",
+    "updatever": "scripts/update_version.sh > src/version.json",
+    "dist": "yarn clean && yarn updatever && yarn build:babel && CONFIG_FILE=${LACONIC_HOSTED_CONFIG_FILE:-config-production.yml} webpack",
+    "lint": "semistandard 'src/**/*.js'",
+    "start": "CONFIG_FILE=${CONFIG_FILE:-config-testnet.yml} VERBOSE=true webpack-dev-server --mode development",
+    "test": "jest --rootDir ./src --passWithNoTests --no-cache"
   },
   "author": "",
-  "license": "AGPLv3",
-  "workspaces": {
-    "packages": [
-      "packages/*"
-    ]
-  },
+  "license": "GPL-3.0",
   "browserslist": [
-    "> 5%"
+    "> 2%"
   ],
   "jest": {
     "testEnvironment": "node"
   },
   "dependencies": {
-    "lerna": "^3.19.0"
+    "@apollo/client": "^3.7.10",
+    "@apollo/react-components": "^4.0.0",
+    "@apollo/react-hooks": "^4.0.0",
+    "@babel/runtime": "^7.21.0",
+    "@cerc-io/laconic-sdk": "^0.1.14",
+    "@lirewine/debug": "1.0.0-beta.78",
+    "@lirewine/gem-core": "1.0.0-beta.28",
+    "@lirewine/react-ux": "1.1.0-beta.1",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
+    "@material-ui/lab": "^4.0.0-alpha.61",
+    "@rehooks/component-size": "^1.0.3",
+    "@visx/network": "^1.0.0",
+    "@visx/tooltip": "^1.0.0",
+    "@visx/zoom": "^1.0.0",
+    "build-url": "^2.0.0",
+    "clsx": "^1.1.0",
+    "compare-versions": "^3.6.0",
+    "d3-force": "^2.1.1",
+    "debug": "^4.1.1",
+    "graphql-tag": "^2.10.3",
+    "lodash.defaultsdeep": "^4.6.1",
+    "lodash.get": "^4.4.2",
+    "moment": "^2.26.0",
+    "node-polyfill-webpack-plugin": "^2.0.1",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "react-router": "^5.3.4",
+    "react-router-dom": "^5.3.4",
+    "source-map-support": "^0.5.12"
   },
   "devDependencies": {
-    "babel-eslint": "^10.0.3",
-    "eslint": "^6.7.2",
-    "eslint-config-semistandard": "^15.0.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-loader": "^3.0.3",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^23.13.1",
-    "eslint-plugin-jsdoc": "^21.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^4.0.1",
-    "lint-staged": "^9.5.0",
-    "pre-commit": "^1.2.2",
-    "webpack-cli": "^3.3.11"
+    "@babel/cli": "7.21.0",
+    "@babel/core": "^7.21.0",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-react": "^7.18.6",
+    "@webpack-cli/info": "^2.0.1",
+    "babel-jest": "^29.5.0",
+    "babel-loader": "^9.1.2",
+    "babel-plugin-import-graphql": "^2.7.0",
+    "babel-plugin-inline-import": "^3.0.0",
+    "babel-plugin-inline-json-import": "^0.3.2",
+    "dotenv-webpack": "^8.0.1",
+    "graphql": "^15.0.0",
+    "html-webpack-plugin": "^5.5.0",
+    "jest": "^29.5.0",
+    "webpack": "^5.76.2",
+    "webpack-bundle-analyzer": "^4.8.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.13.1",
+    "webpack-merge": "^5.8.0",
+    "webpack-version-file-plugin": "^0.5.0",
+    "yaml-loader": "^0.8.0"
   },
-  "eslintConfig": {
-    "parser": "babel-eslint",
-    "extends": [
-      "plugin:jest/recommended",
-      "semistandard"
-    ],
-    "plugins": [
-      "babel"
-    ],
-    "rules": {
-      "babel/semi": 1
-    }
+  "peerDependencies": {
+    "react": "16.12.0",
+    "react-dom": "^16.12.0"
   },
-  "semistandard": {
-    "parser": "babel-eslint",
-    "env": [
-      "jest",
-      "node",
-      "browser"
-    ]
+  "publishConfig": {
+    "access": "public"
   }
 }

packages/console-app/README.md

@@ -1,58 +0,0 @@
-# Console
-
-Apollo GraphQL client.
-
-## Usage
-
-First start the server:
-
-```bash
-  cd packages/console-server
-  yarn start
-```
-
-Then start the Webpack devserver.
-
-```bash
-  cd packages/console-app
-  yarn start
-```
-
-Then load the app: http://localhost:8080.
-
-## Using a KUBE
-
-To use your KUBE for testing, rather than running all the services locally, specify a different
-config file when starting: `config-kube.yml`, which connects to `kube.local` for all services.
-
-For example:
-
-```javascript
-  cd packages/console-app
-  CONFIG_FILE=config-kube.yml yarn start
-```
-
-## Deploy
-
-```bash
-  yarn build
-```
-
-This creates the following folders:
-
-```
-/dist
-  /es               # Module imports.
-  /production       # Production build.
-```
-
-NOTE: GQL and Production files and exported and may be used by the server.
-
-```javascript
-import SYSTEM_STATUS from '@cerc-io/console-app/src/gql/system_status.graphql';
-
-...
-
-const file = path.join(__dirname + '../../../../node_modules/@cerc-io/console-app/dist/production', 'index.html');
-res.sendFile(file);
-```

packages/console-app/package.json

@@ -1,131 +0,0 @@
-{
-  "name": "@cerc-io/console-app",
-  "version": "1.2.9",
-  "description": "Kubenet Console Client",
-  "repository": "https://github.com/cerc-io/laconic-console",
-  "main": "dist/es/index.js",
-  "files": [
-    "src/gql"
-  ],
-  "scripts": {
-    "analyzer": "webpack --config webpack-analyzer.config.js",
-    "build": "yarn dist",
-    "build:babel": "babel ./src --out-dir ./dist/es --ignore \"**/*.test.js\" --source-maps inline",
-    "clean": "rm -rf dist",
-    "dist": "yarn clean && yarn build:babel && CONFIG_FILE=config-production.yml webpack",
-    "lint": "semistandard 'src/**/*.js'",
-    "start": "CONFIG_FILE=${CONFIG_FILE:-config-testnet.yml} VERBOSE=true webpack-dev-server --mode development",
-    "test": "jest --rootDir ./src --passWithNoTests --no-cache"
-  },
-  "author": "",
-  "license": "GPL-3.0",
-  "browserslist": [
-    "> 2%"
-  ],
-  "jest": {
-    "testEnvironment": "node"
-  },
-  "dependencies": {
-    "@apollo/react-components": "^3.1.5",
-    "@apollo/react-hooks": "^3.1.5",
-    "@babel/runtime": "^7.8.7",
-    "@dxos/debug": "^1.0.0-beta.78",
-    "@dxos/gem-core": "^1.0.0-beta.25",
-    "@dxos/react-ux": "https://github.com/dxos-deprecated/sdk.git#v1.1.0-beta.0",
-    "@material-ui/core": "^4.10.0",
-    "@material-ui/icons": "^4.9.1",
-    "@material-ui/lab": "^4.0.0-alpha.54",
-    "@rehooks/component-size": "^1.0.3",
-    "@visx/network": "^1.0.0",
-    "@visx/tooltip": "^1.0.0",
-    "@visx/zoom": "^1.0.0",
-    "apollo-cache-inmemory": "^1.6.6",
-    "apollo-client": "^2.6.10",
-    "apollo-link": "^1.2.14",
-    "apollo-link-http": "^1.5.17",
-    "build-url": "^2.0.0",
-    "clsx": "^1.1.0",
-    "compare-versions": "^3.6.0",
-    "d3-force": "^2.1.1",
-    "debug": "^4.1.1",
-    "graphql-tag": "^2.10.3",
-    "lodash.defaultsdeep": "^4.6.1",
-    "lodash.get": "^4.4.2",
-    "moment": "^2.26.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
-    "source-map-support": "^0.5.12"
-  },
-  "devDependencies": {
-    "@babel/cli": "7.4.4",
-    "@babel/core": "^7.4.5",
-    "@babel/node": "^7.8.7",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-export-default-from": "^7.8.3",
-    "@babel/preset-env": "^7.4.5",
-    "@babel/preset-react": "^7.0.0",
-    "@webpack-cli/info": "^0.2.0",
-    "@webpack-cli/init": "^0.3.0",
-    "babel-eslint": "^10.0.2",
-    "babel-jest": "^24.8.0",
-    "babel-loader": "^8.0.0",
-    "babel-plugin-add-module-exports": "^1.0.2",
-    "babel-plugin-import-graphql": "^2.7.0",
-    "babel-plugin-inline-import": "^3.0.0",
-    "babel-plugin-inline-json-import": "^0.3.2",
-    "dotenv-webpack": "^1.8.0",
-    "eslint": "^6.7.2",
-    "eslint-config-semistandard": "^15.0.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-config-standard-jsx": "^8.1.0",
-    "eslint-loader": "^3.0.3",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^23.13.1",
-    "eslint-plugin-jsdoc": "^21.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^4.0.1",
-    "html-webpack-plugin": "^4.3.0",
-    "jest": "^24.8.0",
-    "react-scripts": "^3.4.1",
-    "semistandard": "^14.2.0",
-    "webpack": "^4.41.2",
-    "webpack-bundle-analyzer": "^3.6.0",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "^4.2.2",
-    "webpack-version-file-plugin": "^0.4.0",
-    "yaml-loader": "^0.6.0"
-  },
-  "peerDependencies": {
-    "react": "16.12.0",
-    "react-dom": "^16.12.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "eslintConfig": {
-    "parser": "babel-eslint",
-    "extends": [
-      "plugin:jest/recommended",
-      "semistandard",
-      "standard-jsx"
-    ],
-    "plugins": [
-      "babel"
-    ],
-    "rules": {
-      "babel/semi": 1
-    }
-  },
-  "semistandard": {
-    "parser": "babel-eslint",
-    "env": [
-      "jest",
-      "node",
-      "browser"
-    ]
-  }
-}

packages/console-app/src/version.json

@@ -1,7 +0,0 @@
-{
-  "build": {
-    "name":      "@cerc-io/console-app",
-    "buildDate": "2020-12-19T03:06:08.492Z",
-    "version":   "1.2.9-alpha.1"
-  }
-}

packages/console-app/version.ejs

@@ -1,7 +0,0 @@
-{
-  "build": {
-    "name":      "<%= package.name %>",
-    "buildDate": "<%= currentTime.toISOString() %>",
-    "version":   "<%= package.version %>"
-  }
-}

packages/console-server/README.md

@@ -1,44 +0,0 @@
-# Console
-
-Apollo GraphQL client.
-
-## Usage
-
-Use the following command to run the server at: http://localhost:9004
-
-```bash
-  yarn start  
-```
-
-To test the Console app, the `@cerc-io/console-app` must be built first:
-
-```bash
-  cd ../console-app
-  yarn build
-```
-
-Use the following command to run the client in development mode (via the `webpack-dev-server`) at http://localhost:8080
-
-```bash
-  yarn dev
-```
-
-To build the client and serve it directly from the server:
-
-```bash
-  yarn build
-  yarn start
-```
-
-Then open the app at: http://localhost:9004/console
-
-
-## Production
-
-When running the Console server, either set the `CONFIG_FILE` environment variable or set the `--config` option.
-
-```bash
-  ./bin/console.js --config ./config.yml
-```
-
-NOTE: The server passes its configuration directly to the Console app when it is loaded.

packages/console-server/babel.config.js

@@ -1,27 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-module.exports = {
-  presets: [
-    '@babel/preset-env',
-    '@babel/preset-react'
-  ],
-  plugins: [
-    [
-      'babel-plugin-inline-import', {
-        extensions: [
-          '.mustache',
-          '.graphql'
-        ]
-      }
-    ],
-
-    // Allows export of components importing GQL files (without webpack).
-    'import-graphql',
-    'inline-json-import',
-
-    '@babel/plugin-proposal-class-properties',
-    '@babel/plugin-proposal-export-default-from'
-  ]
-};

packages/console-server/bin/console.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-module.exports = require('../dist/es/server/main.js');

packages/console-server/config-kube.yml

@@ -1,40 +0,0 @@
-#
-# NODE_ENV=development
-# NOTE: Set CONFIG_FILE to swap out this config file.
-#
-
-app:
-  title: 'Console'
-  org': 'Laconic'
-  theme: 'dark'
-  website: 'https://laconic.com'
-  publicUrl: '/console'
-
-api:
-  path: '/api'
-  port: 9004
-  intervalLog: 5000
-  pollInterval: 10000
-
-system:
-  debug: 'laconic:console:*'
-
-services:
-  app:
-    prefix: '/app'
-    server: 'https://kube.local'
-
-  wns:
-    server: 'https://kube.local/laconic/wns/api'
-    webui: 'https://kube.local/laconic/wns/console'
-
-  signal:
-    server: 'wss://kube.local/laconic/signal/api'
-    api: 'https://kube.local/laconic/signal'
-
-  ipfs:
-    server: 'https://kube.local/laconic/ipfs/api'
-    gateway: 'https://kube.local/laconic/ipfs/gateway'
-
-  wellknown:
-    endpoint: 'https://kube.local/.well-known/laconic'

packages/console-server/config-testnet.yml

@@ -1,40 +0,0 @@
-#
-# NODE_ENV=development
-# NOTE: Set CONFIG_FILE to swap out this config file.
-#
-
-app:
-  title: 'Console'
-  org': 'Laconic'
-  theme: 'dark'
-  website: 'https://laconic.com'
-  publicUrl: '/console'
-
-api:
-  path: '/api'
-  port: 9004
-  intervalLog: 5000
-  pollInterval: 10000
-
-system:
-  debug: 'laconic:console:*'
-
-services:
-  app:
-    prefix: '/app'
-    server: 'https://apollo1.kube.moon.laconic.network'
-
-  wns:
-    server: 'https://apollo1.kube.moon.laconic.network/laconic/wns/api'
-    webui: 'https://apollo1.kube.moon.laconic.network/laconic/wns/console'
-
-  signal:
-    server: 'wss://apollo1.kube.moon.laconic.network/laconic/signal'
-    api: 'https://apollo1.kube.moon.laconic.network/laconic/signal/api'
-
-  ipfs:
-    server: 'https://apollo1.kube.moon.laconic.network/laconic/ipfs/api'
-    gateway: 'https://apollo1.kube.moon.laconic.network/laconic/ipfs/gateway'
-
-  wellknown:
-    endpoint: 'https://apollo1.kube.moon.laconic.network/.well-known/laconic'

packages/console-server/config.yml

@@ -1,40 +0,0 @@
-#
-# NODE_ENV=production
-# NOTE: Set CONFIG_FILE to swap out this config file.
-#
-
-app:
-  title: 'Console'
-  org': 'Laconic'
-  theme: 'dark'
-  website: 'https://laconic.com'
-  publicUrl: '/console'
-
-api:
-  path: '/api'
-  port: 9004
-  intervalLog: 5000
-  pollInterval: 10000
-
-system:
-  debug: 'laconic:console:*'
-
-services:
-  app:
-    prefix: '/app'
-    server: 'http://127.0.0.1:5999'
-
-  wns:
-    server: 'http://127.0.0.1:9473/api'
-    webui: 'http://127.0.0.1:9473/console'
-
-  signal:
-    server: 'ws://127.0.0.1:4000'
-    api: 'http://127.0.0.1:4000/api'
-
-  ipfs:
-    server: 'http://127.0.0.1:5001'
-    gateway: 'http://127.0.0.1:8888/ipfs/'
-
-  wellknown:
-    endpoint: 'http://127.0.0.1:9000/.well-known/laconic'

packages/console-server/package.json

@@ -1,114 +0,0 @@
-{
-  "name": "@cerc-io/console-server",
-  "version": "1.2.9",
-  "description": "Kubenet Console Server",
-  "main": "dist/es/index.js",
-  "bin": {
-    "laconic-console": "bin/console.js"
-  },
-  "files": [
-    "bin/",
-    "dist/es"
-  ],
-  "scripts": {
-    "build": "npm run clean && npm run build:client && npm run build:server",
-    "build:client": "PUBLIC_URL=/console webpack --mode development",
-    "build:server": "babel ./src --out-dir ./dist/es --ignore \"**/*.test.js\" --copy-files",
-    "clean": "rm -rf ./dist",
-    "dev": "VERBOSE=true webpack-dev-server --mode development --watch",
-    "lint": "semistandard 'src/**/*.js'",
-    "test": "jest --rootDir ./src --passWithNoTests --no-cache",
-    "start": "CONFIG_FILE=${CONFIG_FILE=./config.yml} BABEL_DISABLE_CACHE=1 nodemon --exec babel-node src/server/main.js -- --verbose"
-  },
-  "author": "",
-  "license": "GPL-3.0",
-  "browserslist": [
-    "> 5%"
-  ],
-  "jest": {
-    "testEnvironment": "node"
-  },
-  "dependencies": {
-    "@babel/polyfill": "^7.8.7",
-    "@babel/runtime": "^7.8.7",
-    "@cerc-io/console-app": "^1.2.9",
-    "apollo-boost": "^0.4.9",
-    "apollo-server-express": "^2.13.1",
-    "body-parser": "^1.19.0",
-    "compression": "^1.7.4",
-    "debug": "^4.1.1",
-    "express": "^4.17.1",
-    "express-graphql": "^0.9.0",
-    "graphql": "^15.0.0",
-    "graphql-tag": "^2.10.3",
-    "graphql-tools": "^6.0.3",
-    "ipfs-http-client": "^44.1.0",
-    "js-yaml": "^3.14.0",
-    "lodash.defaultsdeep": "^4.6.1",
-    "lodash.pick": "^4.4.0",
-    "mustache-express": "^1.3.0",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
-    "source-map-support": "^0.5.12",
-    "systeminformation": "^4.26.5",
-    "tree-kill": "^1.2.2",
-    "yargs": "^15.3.1"
-  },
-  "devDependencies": {
-    "@babel/cli": "7.4.4",
-    "@babel/core": "^7.4.5",
-    "@babel/node": "^7.8.7",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-export-default-from": "^7.5.2",
-    "@babel/preset-env": "^7.4.5",
-    "babel-eslint": "^10.0.3",
-    "babel-jest": "^24.8.0",
-    "babel-loader": "^8.1.0",
-    "babel-plugin-add-module-exports": "^1.0.2",
-    "babel-plugin-import-graphql": "^2.7.0",
-    "babel-plugin-inline-import": "^3.0.0",
-    "babel-plugin-inline-json-import": "^0.3.2",
-    "dotenv-webpack": "^1.8.0",
-    "eslint": "^6.7.2",
-    "eslint-config-semistandard": "^15.0.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-loader": "^3.0.3",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^23.13.1",
-    "eslint-plugin-jsdoc": "^21.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^4.0.1",
-    "jest": "^24.8.0",
-    "nodemon": "^2.0.4",
-    "semistandard": "^14.2.0",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "^4.2.2"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "eslintConfig": {
-    "parser": "babel-eslint",
-    "extends": [
-      "plugin:jest/recommended",
-      "semistandard"
-    ],
-    "plugins": [
-      "babel"
-    ],
-    "rules": {
-      "babel/semi": 1
-    }
-  },
-  "semistandard": {
-    "parser": "babel-eslint",
-    "env": [
-      "jest",
-      "node",
-      "browser"
-    ]
-  }
-}

packages/console-server/public/index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title><%= title %></title>
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>

packages/console-server/src/client/main.js

@@ -1,16 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import debug from 'debug';
-import React from 'react';
-import { render } from 'react-dom';
-
-import { Main } from '@cerc-io/console-app';
-
-// Load from global printed into HTML page via template.
-const { config } = window.__Laconic__;
-
-debug.enable(config.system.debug);
-
-render(<Main config={config} />, document.getElementById('root'));

packages/console-server/src/gql/api.graphql

@@ -1,35 +0,0 @@
-#
-# Copyright 2020 DXOS.org
-#
-
-# TODO(burdon): Replace generic results with schema.
-type JSONResult {
-  timestamp: String!
-  json: String!
-}
-
-#
-# Schema
-#
-
-type Query {
-  logs(service: String!, incremental: Boolean): JSONResult!
-  app_status: JSONResult!
-  ipfs_status: JSONResult!
-  ipfs_swarm_status: JSONResult!
-  service_status: JSONResult!
-  signal_status: JSONResult!
-  system_status: JSONResult!
-  wns_status: JSONResult!
-  bot_list: JSONResult!
-  extensions: JSONResult!
-}
-
-type Mutation {
-  bot_kill(botId: String!): JSONResult!
-}
-
-schema {
-  query: Query
-  mutation: Mutation
-}

packages/console-server/src/resolvers/bots.js

@@ -1,105 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import { spawn } from 'child_process';
-import debug from 'debug';
-import fs from 'fs';
-import yaml from 'js-yaml';
-import path from 'path';
-import os from 'os';
-import kill from 'tree-kill';
-
-const DEFAULT_BOT_FACTORY_CWD = '.wire/bots';
-const SERVICE_CONFIG_FILENAME = 'service.yml';
-
-const log = debug('laconic:console:server:resolvers');
-
-let topic;
-const getBotFactoryTopic = (botFactoryCwd) => {
-  if (!topic) {
-    // TODO(egorgripasov): Get topic from config or registry.
-    const serviceFilePath = path.join(os.homedir(), botFactoryCwd || DEFAULT_BOT_FACTORY_CWD, SERVICE_CONFIG_FILENAME);
-    if (fs.existsSync(serviceFilePath)) {
-      const botFactoryInfo = yaml.safeLoad(fs.readFileSync(serviceFilePath));
-      topic = botFactoryInfo.topic;
-    }
-  }
-  return topic;
-};
-
-const executeCommand = async (command, args, timeout = 10000) => {
-  return new Promise((resolve) => {
-    const child = spawn(command, args, { encoding: 'utf8' });
-
-    const stdout = [];
-    const stderr = [];
-    const timer = setTimeout(() => {
-      try {
-        kill(child.pid, 'SIGKILL');
-      } catch (err) {
-        log(`Can not kill ${command} process: ${err}`);
-      }
-      stderr.push('Timeout.');
-    }, timeout);
-
-    child.stdout.on('data', (data) => stdout.push(data));
-
-    child.stderr.on('data', (data) => stderr.push(data));
-
-    child.on('exit', (code) => {
-      clearTimeout(timer);
-      resolve({
-        code: code === null ? 1 : code,
-        stdout: stdout.join('').trim(),
-        stderr: stderr.join('').trim()
-      });
-    });
-  });
-};
-
-const getRunningBots = async () => {
-  const command = 'wire';
-  const args = ['bot', 'factory', 'status', '--topic', getBotFactoryTopic()];
-
-  const { code, stdout, stderr } = await executeCommand(command, args);
-  return {
-    success: !code,
-    bots: code ? [] : JSON.parse(stdout).bots || [],
-    error: (stderr || code) ? stderr || stdout : undefined
-  };
-};
-
-const sendBotCommand = async (botId, botCommand) => {
-  const command = 'wire';
-  const args = ['bot', botCommand, '--topic', getBotFactoryTopic(), '--bot-id', botId];
-
-  const { code, stdout, stderr } = await executeCommand(command, args);
-
-  return {
-    success: !code,
-    botId: code ? undefined : botId,
-    error: (stderr || code) ? stderr || stdout : undefined
-  };
-};
-
-export const botsResolvers = {
-  Query: {
-    bot_list: async () => {
-      const result = await getRunningBots();
-      return {
-        timestamp: new Date().toUTCString(),
-        json: JSON.stringify(result)
-      };
-    }
-  },
-  Mutation: {
-    bot_kill: async (_, { botId }) => {
-      const result = await sendBotCommand(botId, 'kill');
-      return {
-        timestamp: new Date().toUTCString(),
-        json: JSON.stringify(result)
-      };
-    }
-  }
-};

packages/console-server/src/resolvers/extensions.js

@@ -1,59 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import childProcess from 'child_process';
-
-// TODO(telackey): Make pluggable.
-
-const ifBigDipper = () => {
-  try {
-    const result = childProcess.execSync('docker ps -f "ancestor=big-dipper_app" -q');
-    if (result && result.toString()) {
-      return {
-        title: 'Block Explorer',
-        url: 'http://%HOST%:3080/'
-      };
-    } else {
-      return {
-        title: 'Block Explorer',
-        url: 'http://blockexplorer.moon.laconic.network:3080/'
-      };
-    }
-  } catch (e) {}
-};
-
-const ifRadicle = () => {
-  try {
-    const result = childProcess.execSync('docker ps -f "ancestor=laconic/radicle-seed-node" -q');
-    if (result && result.toString()) {
-      return {
-        title: 'Radicle',
-        url: '/radicle/'
-      };
-    }
-  } catch (e) {}
-};
-
-// TODO(telackey): Use the local Sentry.
-const ifSentry = () => {
-  return {
-    title: 'Sentry',
-    url: 'http://sentry.kube.laconic.network:9000/'
-  };
-};
-
-export const extensionResolvers = {
-  Query: {
-    extensions: async (_, __, { config }) => {
-      return {
-        timestamp: new Date().toUTCString(),
-        json: JSON.stringify([
-          ifBigDipper(),
-          ifRadicle(),
-          ifSentry()
-        ].filter(x => x))
-      };
-    }
-  }
-};

packages/console-server/src/resolvers/index.js

@@ -1,26 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import debug from 'debug';
-import defaultsDeep from 'lodash.defaultsdeep';
-
-import { extensionResolvers } from './extensions';
-import { ipfsResolvers } from './ipfs';
-import { systemResolvers } from './system';
-import { logResolvers } from './log';
-import { botsResolvers } from './bots';
-
-// eslint-disable-next-line
-const log = debug('laconic:console:server:resolvers');
-
-/**
- * Resolvers
- * https://www.apollographql.com/docs/graphql-tools/resolvers
- */
-export const resolvers = defaultsDeep({
-
-  // TODO(burdon): Auth.
-  // https://www.apollographql.com/docs/apollo-server/data/errors/#codes
-
-}, ipfsResolvers, systemResolvers, logResolvers, botsResolvers, extensionResolvers);

packages/console-server/src/resolvers/ipfs.js

@@ -1,58 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import debug from 'debug';
-import IpfsHttpClient from 'ipfs-http-client';
-const log = debug('laconic:console:server:resolvers');
-
-export const ipfsResolvers = {
-  Query: {
-    //
-    // IPFS
-    // TODO(burdon): Call from client?
-    // https://github.com/ipfs/js-ipfs
-    // https://github.com/ipfs/js-ipfs/tree/master/packages/ipfs-http-client#api
-    //
-
-    ipfs_status: async (_, __, { config }) => {
-      log('Calling IPFS...');
-
-      // NOTE: Hangs if server not running.
-      const ipfs = new IpfsHttpClient(config.services.ipfs.server);
-
-      const id = await ipfs.id();
-      const version = await ipfs.version();
-      const peers = await ipfs.swarm.peers();
-      const stats = await ipfs.stats.repo();
-      // Do not expose the repo path.
-      delete stats.repoPath;
-
-      const refs = [];
-      for await (const ref of ipfs.refs.local()) {
-        if (ref.err) {
-          log(ref.err);
-        } else {
-          refs.push(ref.ref);
-        }
-      }
-
-      return {
-        timestamp: new Date().toUTCString(),
-        json: JSON.stringify({
-          id,
-          version,
-          repo: {
-            stats
-          },
-          refs: {
-            local: refs
-          },
-          swarm: {
-            peers
-          }
-        })
-      };
-    }
-  }
-};

packages/console-server/src/resolvers/log.js

@@ -1,64 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import { spawnSync } from 'child_process';
-
-class LogCache {
-  constructor (maxLines = 500) {
-    // Sets in JS iterate in insertion order.
-    this.buffer = new Set();
-    this.maxLines = maxLines;
-  }
-
-  append (lines) {
-    const added = [];
-    for (const line of lines) {
-      if (!this.buffer.has(line)) {
-        this.buffer.add(line);
-        added.push(line);
-      }
-    }
-
-    if (this.buffer.size > this.maxLines) {
-      this.buffer = new Set(Array.from(this.buffer).slice(parseInt(this.maxLines / 2)));
-    }
-
-    return added;
-  }
-}
-
-const _caches = new Map();
-
-const getLogCache = (name) => {
-  let cache = _caches.get(name);
-  if (!cache) {
-    cache = new LogCache();
-    _caches.set(name, cache);
-  }
-  return cache;
-};
-
-const getLogs = async (name, incremental = false, lines = 100) => {
-  const command = 'wire';
-  const args = ['service', 'logs', '--lines', lines, name];
-
-  const child = spawnSync(command, args, { encoding: 'utf8' });
-  const logLines = child.stdout.split(/\n/);
-  const cache = getLogCache(name);
-  const added = cache.append(logLines);
-
-  return incremental ? added : Array.from(cache.buffer);
-};
-
-export const logResolvers = {
-  Query: {
-    logs: async (_, { service, incremental }) => {
-      const lines = await getLogs(service, incremental);
-      return {
-        timestamp: new Date().toUTCString(),
-        json: JSON.stringify({ incremental, lines })
-      };
-    }
-  }
-};

packages/console-server/src/resolvers/system.js

@@ -1,139 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import fs from 'fs';
-import moment from 'moment';
-import pick from 'lodash.pick';
-import os from 'os';
-import si from 'systeminformation';
-import { spawnSync } from 'child_process';
-
-const num = new Intl.NumberFormat('en', { maximumSignificantDigits: 3 });
-
-const size = (n, unit) => {
-  const units = {
-    K: 3,
-    M: 6,
-    G: 9,
-    T: 12
-  };
-
-  const power = units[unit] || 0;
-
-  return num.format(Math.round(n / (10 ** power))) + (unit ? ` ${unit}` : '');
-};
-
-const getVersionInfo = () => {
-  // TODO(telackey): Get from config (or figure out a better way to do this).
-  const versionFile = '/opt/kube/VERSION';
-  if (fs.existsSync(versionFile)) {
-    return fs.readFileSync(versionFile, { encoding: 'UTF8' }).replace(/^\s+|\s+$/g, '');
-  }
-  return undefined;
-};
-
-const getCliVersionInfo = () => {
-  const command = 'wire';
-  const args = ['version'];
-
-  const child = spawnSync(command, args, { encoding: 'utf8' });
-  return child.stdout;
-};
-
-/**
- * Get system inforamtion.
- * https://www.npmjs.com/package/systeminformation
- */
-const getSystemInfo = async () => {
-  const ifaces = os.networkInterfaces();
-  const addresses = Object.entries(ifaces).reduce((result, [, values]) => {
-    values.forEach(({ family, address }) => {
-      address = address.toLowerCase();
-      // TODO(telackey): Include link-local IPv6?
-      if (!address.startsWith('127.') && !address.startsWith('fe80::') && !address.startsWith('::1')) {
-        result.push(address);
-      }
-    });
-    return result;
-  }, []);
-
-  const cpu = await si.cpu();
-  const memory = await si.mem();
-  const device = await si.system();
-
-  return {
-    cpu: pick(cpu, 'brand', 'cores', 'manufacturer', 'vendor', 'speed'),
-
-    memory: {
-      total: size(memory.total, 'M'),
-      free: size(memory.free, 'M'),
-      used: size(memory.used, 'M'),
-      swaptotal: size(memory.swaptotal, 'M')
-    },
-
-    device: pick(device, 'model', 'serial', 'version'),
-
-    network: {
-      addresses
-    },
-
-    // https://nodejs.org/api/os.html
-    os: {
-      arch: os.arch(),
-      platform: os.platform(),
-      version: os.version ? os.version() : undefined // Node > 13
-    },
-
-    time: {
-      now: moment(),
-      up: moment().subtract(os.uptime(), 'seconds')
-    },
-
-    nodejs: {
-      version: process.version
-    },
-
-    laconic: {
-      kube: {
-        version: getVersionInfo()
-      },
-      wire: {
-        version: getCliVersionInfo()
-      }
-    }
-  };
-};
-
-/**
- * Get system inforamtion.
- * https://www.npmjs.com/package/systeminformation
- */
-const getServiceInfo = async () => {
-  const command = 'wire';
-  const args = ['service', '--json'];
-
-  const child = spawnSync(command, args, { encoding: 'utf8' });
-  return JSON.parse(child.stdout);
-};
-
-export const systemResolvers = {
-  Query: {
-    system_status: async () => {
-      const system = await getSystemInfo();
-
-      return {
-        timestamp: new Date().toUTCString(),
-        json: JSON.stringify(system)
-      };
-    },
-    service_status: async () => {
-      const serviceInfo = await getServiceInfo();
-
-      return {
-        timestamp: new Date().toUTCString(),
-        json: JSON.stringify(serviceInfo)
-      };
-    }
-  }
-};

packages/console-server/src/server/main.js

@@ -1,155 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import compression from 'compression';
-import bodyParser from 'body-parser';
-import cors from 'cors';
-import debug from 'debug';
-import express from 'express';
-import mustache from 'mustache-express';
-import fs from 'fs';
-import yaml from 'js-yaml';
-import { ApolloServer, gql } from 'apollo-server-express';
-import { print } from 'graphql/language';
-import yargs from 'yargs';
-
-// TODO(burdon): Use once published by @ashwinp.
-// import { extensions as WNS_EXTENSIONS, schema as WNS_SCHEMA } from '@wirelineio/wns-schema';
-
-import SYSTEM_STATUS from '@cerc-io/console-app/src/gql/system_status.graphql';
-
-import { resolvers } from '../resolvers';
-
-import API_SCHEMA from '../gql/api.graphql';
-
-const argv = yargs
-  .option('config', {
-    alias: 'c',
-    description: 'Config file',
-    type: 'string'
-  })
-  .option('verbose', {
-    alias: 'v',
-    description: 'Verbse info',
-    type: 'boolean'
-  })
-  .help()
-  .alias('help', 'h')
-  .argv;
-
-const configFile = argv.config || process.env.CONFIG_FILE;
-if (!configFile) {
-  yargs.showHelp();
-  process.exit(1);
-}
-
-const config = yaml.safeLoad(fs.readFileSync(configFile));
-
-const log = debug('laconic:console:server');
-
-debug.enable(config.system.debug);
-
-if (argv.verbose) {
-  log(JSON.stringify(config, undefined, 2));
-}
-
-//
-// Express server.
-//
-
-const { app: { publicUrl } } = config;
-
-const app = express();
-
-app.set('views', `${__dirname}/views`);
-app.set('view engine', 'mustache');
-app.engine('mustache', mustache());
-app.use(bodyParser.urlencoded({ extended: true }));
-app.use(compression());
-
-app.get('/', (req, res) => {
-  res.redirect(publicUrl);
-});
-
-//
-// CORS
-//
-
-// import cors from 'cors'
-// https://expressjs.com/en/resources/middleware/cors.html
-// https://www.prisma.io/blog/enabling-cors-for-express-graphql-apollo-server-1ef999bfb38d
-app.use(cors({
-  origin: true,
-  credentials: true
-}));
-
-//
-// React app
-// TODO(burdon): Can we load this via WNS?
-//
-
-const bundles = [
-  'runtime', 'vendor', 'material-ui', 'cerc-io', 'main'
-];
-
-app.use(`${publicUrl}/lib`, express.static('./dist/client'));
-
-app.get(publicUrl, (req, res) => {
-  res.render('console', {
-    title: 'Console',
-    container: 'root',
-    config: JSON.stringify(config),
-    scripts: bundles.map(bundle => ({ src: `${publicUrl}/lib/${bundle}.bundle.js` }))
-  });
-});
-
-//
-// Apollo Server and middleware
-// https://www.apollographql.com/docs/apollo-server/api/apollo-server
-// https://www.apollographql.com/docs/apollo-server/api/apollo-server/#apolloserverapplymiddleware
-//
-
-const server = new ApolloServer({
-  typeDefs: [
-    API_SCHEMA
-  ],
-
-  // https://www.apollographql.com/docs/graphql-tools/resolvers
-  resolvers,
-
-  // https://www.apollographql.com/docs/apollo-server/data/resolvers/#the-context-argument
-  context: ({ req }) => ({
-    config,
-
-    // TODO(burdon): Auth.
-    authToken: req.headers.authorization
-  }),
-
-  // https://www.apollographql.com/docs/apollo-server/testing/graphql-playground
-  // https://github.com/prisma-labs/graphql-playground#usage
-  // introspection: true,
-  playground: {
-    settings: {
-      'editor.theme': config.app.theme
-    },
-    tabs: [
-      {
-        name: 'Status',
-        endpoint: config.api.path,
-        query: print(gql(SYSTEM_STATUS))
-      }
-    ]
-  }
-});
-
-server.applyMiddleware({ app, path: config.api.path });
-
-//
-// Start server
-//
-
-const { api: { port } } = config;
-app.listen({ port }, () => {
-  log(`Running: http://localhost:${port}`);
-});

packages/console-server/src/server/views/console.mustache

@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>{{ title }}</title>
-  </head>
-  <body>
-    <div id="{{ container }}"></div>
-
-    <!-- Config loaded by client. -->
-    <script charset="utf-8" type="application/javascript">
-      window.__Lacnonic__ = { config: {{{ config }}} };
-    </script>
-
-    <!-- React bundles. -->
-    {{#scripts}}
-      <script charset="utf-8" type="application/javascript" src="{{src}}"></script>
-    {{/scripts}}
-  </body>
-</html>

packages/console-server/webpack.config.js

@@ -1,110 +0,0 @@
-//
-// Copyright 2019 DXOS.org
-//
-
-const path = require('path');
-const Dotenv = require('dotenv-webpack');
-const webpack = require('webpack');
-const HtmlWebPackPlugin = require('html-webpack-plugin');
-
-const PUBLIC_URL = process.env.PUBLIC_URL || '';
-
-module.exports = {
-  devtool: 'eval-source-map',
-
-  devServer: {
-    contentBase: path.join(__dirname, 'dist'),
-    compress: true,
-    disableHostCheck: true,
-    port: 8080,
-    watchOptions: {
-      ignored: /node_modules/,
-      aggregateTimeout: 600
-    }
-  },
-
-  node: {
-    fs: 'empty'
-  },
-
-  entry: './src/client/main.js',
-
-  output: {
-    path: `${__dirname}/dist/client`,
-    filename: '[name].bundle.js',
-    publicPath: PUBLIC_URL
-  },
-
-  optimization: {
-    runtimeChunk: 'single',
-    splitChunks: {
-      chunks: 'all',
-      maxInitialRequests: Infinity,
-      minSize: 0,
-      cacheGroups: {
-        vendor: {
-          test: /[\\/]node_modules[\\/]/,
-          name (module) {
-            const packageName = module.context.match(/[\\/]node_modules[\\/](.*?)([\\/]|$)/)[1];
-
-            if (packageName.startsWith('@cerc-io')) {
-              return 'cerc-io';
-            }
-
-            if (packageName.startsWith('@material-ui')) {
-              return 'material-ui';
-            }
-
-            return 'vendor';
-          }
-        }
-      }
-    }
-  },
-
-  plugins: [
-    // https://github.com/jantimon/html-webpack-plugin#options
-    new HtmlWebPackPlugin({
-      template: './public/index.html',
-      templateParameters: {
-        title: 'Console'
-      }
-    }),
-
-    // https://www.npmjs.com/package/dotenv-webpack#properties
-    new Dotenv({
-      path: process.env.DOT_ENV || '.env'
-    }),
-
-    // NOTE: Must be defined below Dotenv (otherwise will override).
-    // https://webpack.js.org/plugins/environment-plugin
-    new webpack.EnvironmentPlugin({})
-  ],
-
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /(node_modules)/,
-        use: {
-          loader: 'babel-loader'
-        }
-      },
-
-      // https://github.com/eemeli/yaml-loader
-      {
-        test: /\.ya?ml$/,
-        type: 'json',
-        use: 'yaml-loader'
-      }
-    ]
-  },
-
-  resolve: {
-    alias: {
-      '@material-ui/styles': path.resolve(__dirname, '..', '..', 'node_modules/@material-ui/styles'),
-      'react': path.resolve(__dirname, '..', '..', 'node_modules/react'),
-      'react-dom': path.resolve(__dirname, '..', '..', 'node_modules/react-dom')
-    }
-  }
-};

scripts/update_version.sh

@@ -0,0 +1,8 @@
+#/bin/bash
+
+
+NAME=`cat package.json | jq '.name'`
+VERSION=`cat package.json | jq '.version'`
+DATE=`date --rfc-3339=seconds`
+
+echo '{"build": {}}' | jq ".build.name = $NAME" | jq ".build.version = $VERSION" | jq ".build.buildDate = \"$DATE\""

src/client.js

@@ -2,10 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { ApolloClient } from 'apollo-client';
-import { ApolloLink } from 'apollo-link';
-import { createHttpLink } from 'apollo-link-http';
-import { InMemoryCache } from 'apollo-cache-inmemory';
+import { ApolloClient, InMemoryCache, ApolloLink, HttpLink } from '@apollo/client';
 
 import { createResolvers } from './resolvers';
 import { getServiceUrl } from './util/config';
@@ -28,7 +25,7 @@ export const graphqlApi = config => {
  */
 export const clientFactory = config => {
   // https://www.apollographql.com/docs/link/
-  const defaultLink = createHttpLink({
+  const defaultLink = new HttpLink({
     uri: graphqlApi(config),
 
     // TODO(burdon): Authentication: send signed message to server (from client wallet).
@@ -39,7 +36,7 @@ export const clientFactory = config => {
   });
 
   const serviceLinks = {
-    signal: createHttpLink({
+    signal: new HttpLink({
       uri: getServiceUrl(config, 'signal.api')
     })
   };

src/components/AppBar.js

@@ -9,10 +9,10 @@ import Link from '@material-ui/core/Link';
 import Toolbar from '@material-ui/core/Toolbar';
 import Typography from '@material-ui/core/Typography';
 import blueGrey from '@material-ui/core/colors/blueGrey';
-import GraphQLIcon from '@material-ui/icons/Adb';
+// import GraphQLIcon from '@material-ui/icons/Adb';
 
 // import LaconicIcon from '../icons/Laconic';
-import { graphqlApi } from '../client';
+// import { graphqlApi } from '../client';
 
 const useStyles = makeStyles((theme) => ({
   offset: theme.mixins.denseToolbar,

src/components/Json.js

@@ -5,7 +5,7 @@
 import React from 'react';
 import { makeStyles } from '@material-ui/core';
 
-import { JsonTreeView } from '@dxos/react-ux';
+import { JsonTreeView } from '@lirewine/react-ux';
 
 import { omitDeep } from '../util/omit';
 

src/components/QueryLink.js

@@ -10,8 +10,41 @@ import LinkIcon from '@material-ui/icons/ExitToApp';
 import { getServiceUrl } from '../util/config';
 
 const QUERY = `
-  query {
-    getRecordsByIds(ids: [ "%ID%" ]) {
+  fragment ValueParts on Value {
+    ... on BooleanValue {
+      bool: value
+    }
+    ... on IntValue {
+      int: value
+    }
+    ... on FloatValue {
+      float: value
+    }
+    ... on StringValue {
+      string: value
+    }
+    ... on BytesValue {
+      bytes: value
+    }
+    ... on LinkValue {
+      link: value
+    }
+  }
+
+  fragment AttrParts on Attribute {
+    key
+    value {
+      ...ValueParts
+      ... on ArrayValue {
+        value {
+          ...ValueParts
+        }
+      }
+    }
+  }
+
+  {
+    getRecordsByIds(ids: ["%ID%"]) {
       id
       names
       bondId
@@ -19,12 +52,12 @@ const QUERY = `
       expiryTime
       owners
       attributes {
-        key
+        ...AttrParts
         value {
-          string
-          json
-          reference {
-            id
+          ... on MapValue {
+            map: value {
+              ...AttrParts
+            }
           }
         }
       }

src/containers/Layout.js

@@ -5,7 +5,7 @@
 import React, { useContext } from 'react';
 import { makeStyles } from '@material-ui/core';
 
-import { FullScreen } from '@dxos/gem-core';
+import { FullScreen } from '@lirewine/gem-core';
 
 import { ConsoleContext } from '../hooks';
 

src/containers/Main.js

@@ -8,7 +8,7 @@ import { ApolloProvider } from '@apollo/react-hooks';
 import { ThemeProvider } from '@material-ui/core/styles';
 import CssBaseline from '@material-ui/core/CssBaseline';
 
-import { ErrorHandler } from '@dxos/debug';
+import { ErrorHandler } from '@lirewine/debug';
 
 import { build } from '../version.json';