renamed npm projects (where -> where-ui)

Fixing broken packaged electron app

Author: ddd-mtl

electron/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "where-app",
+  "name": "where",
   "version": "0.0.8",
   "description": "A playground for group self-awareness",
   "repository": {
@@ -31,6 +31,8 @@
       "dist/**/*",
       "web/**/*",
       "where.dna",
+      "where.happ",
+      "binaries/**/*",
       "node_modules/**/*",
       "package.json"
     ],
@@ -52,13 +54,13 @@
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
     "electron": "12.0.6",
-    "electron-builder": "22.14.13",
+    "electron-builder": "22.11.7",
     "eslint": "^7.25.0",
     "eslint-plugin-import": "^2.22.1",
     "typescript": "^4.5.4"
   },
   "dependencies": {
-    "electron-holochain": "^0.0.32",
+    "electron-holochain": "^0.0.34",
     "electron-prompt": "^1.6.0",
     "electron-log": "^4.3.5",
     "electron-notarize": "^1.0.0",

electron/src/index.ts

@@ -16,9 +16,9 @@ import initAgent, {
   StateSignal,
   STATUS_EVENT,
   APP_PORT_EVENT,
-  //ERROR_EVENT,
-  //HOLOCHAIN_RUNNER_QUIT,
-  //LAIR_KEYSTORE_QUIT
+  ERROR_EVENT,
+  HOLOCHAIN_RUNNER_QUIT,
+  LAIR_KEYSTORE_QUIT
 } from 'electron-holochain'
 
 import {
@@ -282,15 +282,19 @@ async function startMainWindow(splashWindow: BrowserWindow) {
     //log('debug', "APP_PORT_EVENT: " + appPort)
     g_appPort = appPort
   })
-  statusEmitter.on('error'/* ERROR_EVENT */, (error: Error) => {
-    log('error', "HOLOCHAIN ERROR_EVENT: " + error)
+  statusEmitter.on(ERROR_EVENT, (error: Error) => {
+    const error_msg = "HOLOCHAIN ERROR_EVENT: " + error;
+    log('error', error_msg)
+    splashWindow.webContents.send('status', error_msg)
   })
-  statusEmitter.on('holochain_runner_quit' /*HOLOCHAIN_RUNNER_QUIT*/, () => {
+  statusEmitter.on(HOLOCHAIN_RUNNER_QUIT, () => {
     log('debug', "HOLOCHAIN_RUNNER_QUIT event received")
+    splashWindow.webContents.send('status', "HOLOCHAIN_RUNNER_QUIT event received")
     //app.quit()
   })
-  statusEmitter.on('lair_keystore_quit'/*LAIR_KEYSTORE_QUIT*/, (e) => {
+  statusEmitter.on(LAIR_KEYSTORE_QUIT, (e) => {
     log('debug', "LAIR_KEYSTORE_QUIT event received")
+    splashWindow.webContents.send('status', "LAIR_KEYSTORE_QUIT event received")
     //app.quit()
   })
 }

electron/web/splashscreen.html

@@ -12,7 +12,7 @@
       <div class="splash-content-wrapper">
         <div>
           <div class="splash-logo">where</div>
-          <div class="splash-version">version 0.0.7</div>
+          <div class="splash-version">version 0.0.8</div>
         </div>
         <div class="splash-loading-message" id="activity">
           Setting up Holochain...

package.json

@@ -12,18 +12,18 @@
     "network"               : "npm run build:happ && concurrently-repeat \"npm run start:agent\"",
     "network-playground"    : "npm run build:happ && concurrently-repeat \"npm run start:agent:playground\"",
     "network-proxied"       : "npm run build:happ && concurrently-repeat \"npm run start:agent-proxied\"",
-    "start:agent-proxied"   : "cross-env HC_PORT=$(port) concurrently \"npm run dev:libs\" \"npm run start:happ-proxied\" \"sleep 5 && npm run start -w where\"",
-    "start:agent"           : "cross-env HC_PORT=$(port) concurrently \"npm run dev:libs\" \"npm run start:happ\" \"sleep 5 && npm run start -w where\"",
+    "start:agent-proxied"   : "cross-env HC_PORT=$(port) concurrently \"npm run dev:libs\" \"npm run start:happ-proxied\" \"sleep 5 && npm run start -w where-ui\"",
+    "start:agent"           : "cross-env HC_PORT=$(port) concurrently \"npm run dev:libs\" \"npm run start:happ\" \"sleep 5 && npm run start -w where-ui\"",
     "start:agent:playground": "cross-env HC_PORT=$(port) concurrently \"npm run playground\" \"npm run dev:libs\" \"npm run start:happ\" \"sleep 5 && npm run start -w where\"",
     "dev:libs"              : "npm run build:watch -w @where/elements",
     "start-proxied"         : "npm run build:happ && npm run build -w @where/elements && cross-env HC_PORT=$(port) concurrently -k \"npm run start:happ-proxied\" \"npm run start -w where\"",
-    "start-rerun"           : "cross-env HC_PORT=8888 concurrently -k \"npm run build:watch -w @where/elements\" \"hc s run 0 -p 8888\" \"npm run start -w where\"",
-    "prepare"               : "npm run build -w @where/elements && npm run build -w where",
+    "start-rerun"           : "cross-env HC_PORT=8888 concurrently -k \"npm run build:watch -w @where/elements\" \"hc s run 0 -p 8888\" \"npm run start -w where-ui\"",
+    "prepare"               : "npm run build -w @where/elements && npm run build -w where-ui",
     "test"                  : "npm run build:happ && npm run build -w @where/elements && npm t -w tests",
-    "start:happ"            : "RUST_LOG=warn hc s generate ./dna/workdir/happ/where.happ --run=$HC_PORT -a where network mdns",
-    "start:happ-proxied"    : "RUST_LOG=warn hc s generate ./dna/workdir/happ/where.happ --run=$HC_PORT -a where network --bootstrap https://bootstrap-staging.holo.host/ quic -p=kitsune-proxy://SYVd4CF3BdJ4DS7KwLLgeU3_DbHoZ34Y-qroZ79DOs8/kitsune-quic/h/165.22.32.11/p/5779/--",
+    "start:happ"            : "RUST_LOG=warn hc s generate ./dna/workdir/happ/where.happ --run=$HC_PORT -a where-ui network mdns",
+    "start:happ-proxied"    : "RUST_LOG=warn hc s generate ./dna/workdir/happ/where.happ --run=$HC_PORT -a where-ui network --bootstrap https://bootstrap-staging.holo.host/ quic -p=kitsune-proxy://SYVd4CF3BdJ4DS7KwLLgeU3_DbHoZ34Y-qroZ79DOs8/kitsune-quic/h/165.22.32.11/p/5779/--",
     "package"               : "npm run build:happ && npm run build:ui && npm run build:webapp",
-    "build:ui"              : "npm run build -w @where/elements && npm run package -w where",
+    "build:ui"              : "npm run build -w @where/elements && npm run package -w where-ui",
     "build:webapp"          : "hc web-app pack workdir",
     "build:happ"            : "npm run build:dna && hc app pack ./dna/workdir/happ",
     "build:dna"             : "npm run build:zome && hc dna pack ./dna/workdir/dna",
@@ -36,7 +36,7 @@
     "ci:ui-install"         : "cd ui/lib && npm install --ignore-scripts",
     "ci:app-install"        : "cd ui/apps/where && npm install --ignore-scripts",
     "dist"                  : "cd electron && npm run tsc && npm run dist",
-    "electron"              : "npm run package && npm run start -w where-app"
+    "electron"              : "npm run package && npm run start -w where"
   },
   "devDependencies": {
     "@holochain-playground/cli": "^0.0.8",

ui/apps/where/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "where",
+  "name": "where-ui",
   "version": "0.0.8",
   "scripts": {
     "build": "tsc",