From 0f987bc481f8b9acb7dc5cab06ef511f04a1a9e0 Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Mon, 12 Apr 2021 08:03:04 -0500 Subject: [PATCH] enhancements --- gcloud.json | 12 ------------ package.json | 4 +++- session.json | 2 +- src/background.ts | 4 ++-- src/background/audio.ts | 20 ++++++++++---------- src/background/init.ts | 12 ++---------- yarn.lock | 32 ++++++++++++++++++++++++++++++++ 7 files changed, 50 insertions(+), 36 deletions(-) delete mode 100644 gcloud.json diff --git a/gcloud.json b/gcloud.json deleted file mode 100644 index 5c68549..0000000 --- a/gcloud.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "crimata", - "private_key_id": "3a324fa3fcca4cea589e4b5007f4142db4b3a84d", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxFJOjhIkYlyhn\nHjtpFC5EOwzNFZem6k6SS7zcgWbNLe9mcBsiTKCjpxItzkIo0pnT32yqw+AKsqpv\n6+LVyzzjfB7vtEUflvg6KgmYMS4ixOTCEbN3e2qj1t2RnITXZR2VGSGdoKKyqZm0\ntWrmexQvSN20cByL1vfxD3E69oYFGhVraa0zmm94WXHAzofT6DkvGdrbK1s1G9jI\nG3mdQ1jN71tghyloeHL+R/1iKQoZFYTkVe6yWvccSNAZelt/5sciCKRTCArXj89X\nLwU6jGOKIsyqx3BeUyWaSS59xpnGX3meSf5Q9U+j45ePUiqO6TTleF+kWiBwjUpp\nfeYcwEIDAgMBAAECggEAElkN9R7p75zV6F1XDYu0QYiWyncmx/o2Gu1zC6vywWa1\ni/korpSe/mX0ub9J1p3/p1balRUHlUQu6brYvYs56140fGTC1sOXQ7uQU+8glySs\niTk5TbOBeKluOsSrdP/6oTTB6Wm4AegVz4YOpgPxsvaLVkNZidnDxfvyIQhjGYsO\nsvRaw48eEmGOa1uvDhgvPOxiDp5YEdxqSue/7ylzjBdKecDyLgTSDDf/p+FwIx5B\n2d/0uRgQBaAk6D/DNOvN8GrYyakFmlDjE72nrBGAJq50UyV6THOSDk+8cK+2QiS1\nEDCFufj+7Dk1EBfBFUFY8ZBB/pphpEWyLoFl7NzGCQKBgQDaj/KOOcj6BkkTj1WM\nRW3KhOE3nhsCQEgQGCflpycEAZj6J7ktBG2/4teDt9sr+Epx8ymnQCZa9pmysdrD\nU0aWku1qUx0IUKTtZbAEbB+AnrWYDYkIWU8kRUUvNHNTBg43VyuohV9wprPih138\nHWMeNac82/XICz2A3rv+Xkx8KwKBgQDPaaEEGWVs3nIhf/p3M3/xWNKt8fhAERpG\n0YpTjgHW3FQFYjiCTTIcuLO3qsDGmfIAB9tL37s2Y3e2wKBGUj/o69Fr7sWVPdsX\nJtUc0+KiG2Bs0hsyZPdk9UQiQX8y2eq1NZW7vEoxWso1bM64WURB5N8ocWePNJJx\nL2Oe75rtiQKBgQDLfQQOiRxmNF3rOSMkAywyRr9NQgXRdbniSiszNQotP7OHDF7q\n29m2suOGfjIv4O6m4wdf8WkEfd4hsleETc9Ft6wVtyYrrLGxWWCk7WnzHVDjLY7s\n2AHIOjostf+9R8EKoz1BnFN8laibev71EQNMiBWZow1VX6m2hymurWs2mwKBgQCb\nuY3n2v14qOb92e1+U89KsEq1yMd/qpeU9jwqEaO14wS+aglNY5ItWEuuqWhFdE3q\n0ftHUzpnUnUOZD+xrI1JXsyEgegc7i0xi7lUBI3S8kUKTxGWW5IXXcKDCbPrxQtg\ndFPweSUnOyg4xnHKnVMPOjyGS+bZ8TnF+zOLoBAtKQKBgF6hAOIwF1DheXT4p8xS\nlSGhl8dBxjsJDVwbnFWQceGzGnq1e3ncy/UItt42UCDVRWTH4r7pQ9eKyd/3foUD\n6KDIcCrYo2KJh6ZNFJ67XF30U+TuEg5U/9jTbWqDOwYVXcMcnzQE4ZiGBxVHL6xr\nNc8FRW5+7xh4zNfzhGUGt5kt\n-----END PRIVATE KEY-----\n", - "client_email": "crimata-service-account@crimata.iam.gserviceaccount.com", - "client_id": "102914612880037864172", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://oauth2.googleapis.com/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/crimata-service-account%40crimata.iam.gserviceaccount.com" -} diff --git a/package.json b/package.json index 44dda64..7117a2c 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "author": { "name": "Enrique Hernandez" }, + "main": "background.js", "scripts": { "dev": "yarn electron:serve", "serve": "vue-cli-service serve", @@ -18,7 +19,6 @@ "postinstall": "electron-builder install-app-deps", "postuninstal": "electron-builder install-app-deps" }, - "main": "background.js", "dependencies": { "@google-cloud/speech": "^4.2.0", "@types/animejs": "^3.1.2", @@ -29,9 +29,11 @@ "@types/ws": "^7.2.7", "animejs": "^3.2.0", "core-js": "^3.6.5", + "electron-is-dev": "^2.0.0", "mitt": "^2.1.0", "naudiodon": "^2.3.2", "node-record-lpcm16": "^1.0.1", + "update-electron-app": "^2.0.1", "uuid": "^8.3.2", "vue": "^3.0.0-0", "vue-router": "^4.0.0-0", diff --git a/session.json b/session.json index 38a2767..51f9e53 100644 --- a/session.json +++ b/session.json @@ -1 +1 @@ -{"key":"755b1c3c-ee2c-4811-b3bc-32b55502d978","newMessages":[]} \ No newline at end of file +{"key":"fbc080f3-7bab-4cad-a548-97bcc9800e4b","newMessages":[]} \ No newline at end of file diff --git a/src/background.ts b/src/background.ts index 065b4ec..d905881 100644 --- a/src/background.ts +++ b/src/background.ts @@ -14,12 +14,12 @@ protocol.registerSchemesAsPrivileged([ ]); // Load environment variable -const isDevelopment = process.env.NODE_ENV !== "production"; +const isDev = require('electron-is-dev'); // NOTE Program Begins Here (async () => { console.log('Starting Crimata electron app.'); - initApp(isDevelopment); + initApp(isDev); })(); diff --git a/src/background/audio.ts b/src/background/audio.ts index 89677de..6dd3bdd 100644 --- a/src/background/audio.ts +++ b/src/background/audio.ts @@ -165,15 +165,15 @@ export function play(input: string): void { // ------------------------------------------------------------- // Get's called on window close. -export function stopStream() { - console.log("AUDIO:Stopping audio stream.") - if (ai) { - ai.quit() - } - if (ao) { - ao.quit() - } - console.log("AUDIO:Audio closed.") -} +// export function stopStream() { +// console.log("AUDIO:Stopping audio stream.") +// if (ai) { +// ai.quit() +// } +// if (ao) { +// ao.quit() +// } +// console.log("AUDIO:Audio closed.") +// } diff --git a/src/background/init.ts b/src/background/init.ts index 5b16e8f..c302580 100644 --- a/src/background/init.ts +++ b/src/background/init.ts @@ -56,17 +56,9 @@ export function initApp(dev: boolean): void { // Exit cleanly on request from parent process in development mode. if (dev) { - if (process.platform === "win32") { - process.on("message", data => { - if (data === "graceful-exit") { - app.quit(); - } - }); - } else { process.on("SIGTERM", () => { - app.quit(); - }); - } + app.quit(); + }); } } diff --git a/yarn.lock b/yarn.lock index 619e71a..29d9910 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5086,6 +5086,16 @@ electron-devtools-installer@^3.1.0: semver "^7.2.1" unzip-crx-3 "^0.2.0" +electron-is-dev@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe" + integrity sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4= + +electron-is-dev@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd" + integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA== + electron-publish@22.9.1: version "22.9.1" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz#7cc76ac4cc53efd29ee31c1e5facb9724329068e" @@ -6258,6 +6268,13 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +github-url-to-object@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/github-url-to-object/-/github-url-to-object-4.0.4.tgz#a9797b7026e18d53b50b07f45b7e169b55fd90ee" + integrity sha512-1Ri1pR8XTfzLpbtPz5MlW/amGNdNReuExPsbF9rxLsBfO1GH9RtDBamhJikd0knMWq3RTTQDbTtw0GGvvEAJEA== + dependencies: + is-url "^1.1.0" + glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" @@ -7426,6 +7443,11 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-url@^1.1.0, is-url@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52" + integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww== + is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" @@ -12703,6 +12725,16 @@ upath@^1.1.1: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== +update-electron-app@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/update-electron-app/-/update-electron-app-2.0.1.tgz#229dbeb4534f51ec949e6a46ae1ac32f68a17eed" + integrity sha512-e4xEner89UZZaBGYJbYlMdL1uUrC0VjOsTAL2N4opPjzFtn+j7mdsJJsnyXZzUVeLY+8tuCX4XEsUM98oBHmZg== + dependencies: + electron-is-dev "^0.3.0" + github-url-to-object "^4.0.4" + is-url "^1.2.4" + ms "^2.1.1" + update-notifier@^4.1.1: version "4.1.3" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" -- 2.43.0