Merge branch 'develop'

CHANGELOG.md

@@ -1,3 +1,7 @@
+# [1.0.0-beta.8](https://github.com/leon-ai/leon/compare/v1.0.0-beta.7...v1.0.0-beta.8) (2023-05-01) / Binaries and TypeScript Rewrite
+
+_Please refer to [our latest blog post](https://blog.getleon.ai/binaries-and-typescript-rewrite-1-0-0-beta-8/) for more information on the new release of our dear Leon._
+
 # [1.0.0-beta.7](https://github.com/leon-ai/leon/compare/v1.0.0-beta.6...v1.0.0-beta.7) (2022-08-24) / A Much Better NLP
 
 _Please [read this blog post](https://blog.getleon.ai/a-much-better-nlp-and-future-1-0-0-beta-7/) to know more about all the new features and the exciting future of Leon._

README.md

@@ -56,18 +56,19 @@ Here is how LLMs may help Leon in the future:
 
 ### What's Next?
 
-Once the new core released, we'll work on the community aspect of Leon. For example, better organize our [Discord](https://discord.gg/MNQqqKg), planify regular calls, work on skills together, etc. It is very important for Leon to have a real community. At that moment, the skills platform will already be online, so it'll be easier to sync our progress and publish new skills.
+Once the new core released, we'll work on the community aspect of Leon. For example, better organize [our Discord](https://discord.gg/MNQqqKg), planify regular calls, work on skills together, etc. It is very important for Leon to have a real community. At that moment, the skills platform will already be online, so it'll be easier to sync our progress and publish new skills.
 
 - Feel free to check out the Git development branches and our [next major milestones](https://blog.getleon.ai/a-much-better-nlp-and-future-1-0-0-beta-7/#whats-next).
 - And the [detailed roadmap](http://roadmap.getleon.ai).
+- Many exciting things are coming up, hence no new documentation and test are going to be written until the official release of Leon.
 
-<h2 align="center">📢 Notice 📢</h2>
-<p align="center">
-  <a href="https://blog.getleon.ai/a-much-better-nlp-and-future-1-0-0-beta-7/"><img width="400" src="https://blog.getleon.ai/static/a62ac28a01cb6898e299dced40875a68/c1b63/beta-7.png" /></a>
-  <br>
-  Many exciting things are coming up, hence no new documentation and test are going to be written until the official release of Leon. Feel free to <a href="https://discord.gg/MNQqqKg"><b>join us on Discord</b></a> to know more and to read the <a href="https://blog.getleon.ai/a-much-better-nlp-and-future-1-0-0-beta-7/"><b>"A Much Better NLP and Future" blog post</b></a>.
-</p>
-<br><br>
+---
+
+## Latest Release
+
+Check out the [latest release blog post](https://blog.getleon.ai/binaries-and-typescript-rewrite-1-0-0-beta-8/).
+
+<a href="https://blog.getleon.ai/binaries-and-typescript-rewrite-1-0-0-beta-8/"><img width="400" src="https://blog.getleon.ai/static/a0d1cbafd1968e7531dc17e229f8cc61/aa440/beta-8.png" /></a>
 
 ---
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "leon",
-  "version": "1.0.0-beta.8+dev",
+  "version": "1.0.0-beta.8",
   "description": "Server, skills and web app of the Leon personal assistant",
   "author": {
     "name": "Louis Grenard",

scripts/release/update-version.js

@@ -10,7 +10,8 @@ export default (version) =>
     LogHelper.info('Updating version...')
 
     const promises = []
-    const files = ['package.json', 'package-lock.json']
+    // const files = ['package.json', 'package-lock.json']
+    const files = ['package.json']
 
     for (let i = 0; i < files.length; i += 1) {
       promises.push(

scripts/setup/setup-binaries.js

@@ -88,7 +88,7 @@ const setupBinaries = async (key) => {
   if (!manifest || manifest.version !== version) {
     const buildPath = isPlatformDependent
       ? path.join(distPath, BINARIES_FOLDER_NAME)
-      : distPath
+      : path.join(distPath, 'bin')
     const archivePath = path.join(distPath, archiveName)
 
     await Promise.all([
@@ -130,7 +130,9 @@ const setupBinaries = async (key) => {
       LogHelper.success(`${name} downloaded`)
       LogHelper.info(`Extracting ${name}...`)
 
-      const absoluteDistPath = path.resolve(distPath)
+      const absoluteDistPath = isPlatformDependent
+        ? path.resolve(distPath)
+        : path.resolve(distPath, 'bin')
       await extractZip(archivePath, { dir: absoluteDistPath })
 
       LogHelper.success(`${name} extracted`)
@@ -151,7 +153,7 @@ const setupBinaries = async (key) => {
 }
 
 export default async () => {
-  // await setupBinaries('nodejs-bridge')
+  await setupBinaries('nodejs-bridge')
   await setupBinaries('python-bridge')
   await setupBinaries('tcp-server')
 }

server/src/constants.ts

@@ -74,6 +74,7 @@ export const PYTHON_BRIDGE_BIN_PATH = path.join(
 )
 export const NODEJS_BRIDGE_BIN_PATH = `${process.execPath} ${path.join(
   NODEJS_BRIDGE_DIST_PATH,
+  'bin',
   NODEJS_BRIDGE_BIN_NAME
 )}`
 

server/src/telemetry.ts

@@ -19,6 +19,7 @@ import {
   IS_PRODUCTION_ENV,
   LANG,
   LEON_VERSION,
+  NODEJS_BRIDGE_VERSION,
   PYTHON_BRIDGE_VERSION,
   STT_PROVIDER,
   TCP_SERVER_VERSION,
@@ -47,13 +48,17 @@ export class Telemetry {
     timeout: 7_000
   })
 
-  public static async postInstall(): Promise<PostIntallResponse> {
-    const { data } = await this.axios.post('/on-post-install', {
-      instanceID: this.instanceID,
-      isGitpod: IS_GITPOD
-    })
+  public static async postInstall(): Promise<PostIntallResponse | unknown> {
+    try {
+      const { data } = await this.axios.post('/on-post-install', {
+        instanceID: this.instanceID,
+        isGitpod: IS_GITPOD
+      })
 
-    return data
+      return data
+    } catch (e) {
+      return {}
+    }
   }
 
   public static async start(): Promise<void> {
@@ -68,6 +73,7 @@ export class Telemetry {
           sttProvider: STT_PROVIDER,
           ttsProvider: TTS_PROVIDER,
           coreVersion: LEON_VERSION,
+          nodeJSBridgeVersion: NODEJS_BRIDGE_VERSION,
           pythonBridgeVersion: PYTHON_BRIDGE_VERSION,
           tcpServerVersion: TCP_SERVER_VERSION,
           environment: {
@@ -93,10 +99,19 @@ export class Telemetry {
             }
             data.environment.osDetails.distro = os
 
-            await this.axios.post('/on-start', {
-              instanceID: this.instanceID,
-              data
-            })
+            try {
+              await this.axios.post('/on-start', {
+                instanceID: this.instanceID,
+                data
+              })
+            } catch (e) {
+              if (IS_DEVELOPMENT_ENV) {
+                LogHelper.title('Telemetry')
+                LogHelper.warning(
+                  `Failed to send start data to telemetry service: ${e}`
+                )
+              }
+            }
           })
         } else {
           await this.axios.post('/on-start', {