Merge pull request #703 from nature-heart-software/dev

release

Author: Wurielle

.github/workflows/release.yml

@@ -68,6 +68,7 @@ jobs:
           NODE_OPTIONS: '--max_old_space_size=4096'
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           VUE_APP_ENCRYPTION_KEY: ${{ secrets.APP_ENCRYPTION_KEY }}
+          VITE_APP_ENCRYPTION_KEY: ${{ secrets.APP_ENCRYPTION_KEY }}
         with:
           cmd: build
 

.gitignore

@@ -3,6 +3,8 @@ node_modules
 /dist
 temp
 .parcel-cache
+playground
+*.timestamp*
 
 # local env files
 .env.local

.syncpackrc.js

@@ -0,0 +1,6 @@
+// @ts-check
+
+/** @type {import("syncpack").RcFile} */
+const config = {}
+
+module.exports = config

.yarnrc

@@ -1,2 +1,11 @@
 httpTimeout 600000
 network-timeout 600000
+--add.ignore-workspace-root-check true
+--add.ignore-engines true
+--add.prefer-offline true
+--upgrade.ignore-workspace-root-check true
+--upgrade.ignore-engines true
+--upgrade.prefer-offline true
+--install.ignore-workspace-root-check true
+--install.ignore-engines true
+--install.prefer-offline true

Dockerfile

@@ -30,4 +30,8 @@ COPY ./ ./
 
 COPY ./lerna.json.prod ./lerna.json
 
-RUN npm run build
+RUN yarn install
+
+RUN yarn build:deps
+
+RUN yarn build:app

apps/app-server/package.json

@@ -1,28 +1,13 @@
 {
   "name": "@apps/app-server",
-  "private": true,
   "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "start": "node bin/generate-exports && nodemon ./dist/main.js --start-server",
-    "build": "node bin/generate-exports && microbundle --target=node --format=cjs --sourcemap=false",
-    "dev": "node bin/generate-exports && microbundle --target=node --format=cjs --sourcemap=false watch"
-  },
-  "source": "src/main.ts",
-  "main": "./dist/main.cjs",
-  "module": "./dist/main.cjs",
-  "unpkg": "./dist/main.umd.js",
-  "types": "./dist/main.d.ts",
-  "files": [
-    "./dist"
-  ],
   "dependencies": {
     "@aws-sdk/client-cognito-identity": "^3.87.0",
     "@aws-sdk/client-polly": "^3.87.0",
     "@aws-sdk/credential-provider-cognito-identity": "^3.87.0",
     "@google-cloud/text-to-speech": "^3.4.0",
     "@types/object-hash": "^3.0.2",
-    "axios": "^0.26.1",
+    "axios": "^0.27.2",
     "body-parser": "^1.20.0",
     "cors": "^2.8.5",
     "express": "^4.17.3",
@@ -34,19 +19,33 @@
     "object-hash": "^3.0.0",
     "say": "^0.16.0",
     "socket.io": "^4.5.4",
-    "uuid": "^8.3.2"
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@packages/generate-exports": "^0.0.0",
+    "@packages/generate-exports": "0.0.0",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
-    "@types/lodash": "^4.14.182",
+    "@types/lodash": "^4.14.184",
     "@types/morgan": "^1.9.3",
     "@types/uuid": "^8.3.4",
     "microbundle": "^0.15.1",
     "nodemon": "^2.0.15",
-    "typescript": "^4.6.4",
-    "vite": "^3.0.0"
-  }
+    "typescript": "^5.4.5",
+    "vite": "^5.2.0"
+  },
+  "files": [
+    "./dist"
+  ],
+  "main": "./dist/main.cjs",
+  "module": "./dist/main.cjs",
+  "private": true,
+  "scripts": {
+    "build": "node bin/generate-exports && microbundle --target=node --format=cjs --sourcemap=false",
+    "dev": "node bin/generate-exports && microbundle --target=node --format=cjs --sourcemap=false watch",
+    "start": "node bin/generate-exports && nodemon ./dist/main.js --start-server"
+  },
+  "source": "src/main.ts",
+  "type": "module",
+  "types": "./dist/main.d.ts"
 }

apps/app-server/src/plugins/speech-apis/el.ts

@@ -18,6 +18,9 @@ const plugin: Izabela.Server.Plugin = ({ app }) => {
       const {
         data: { voices },
       } = await api.get('/voices', {
+        params: {
+          show_legacy: true,
+        },
         headers: {
           'xi-api-key': apiKey,
         },

apps/app-server/src/plugins/speech-apis/gc.ts

@@ -2,12 +2,11 @@ import { RequestHandler } from 'express'
 import axios from 'axios'
 import { handleError } from '../../utils/requests'
 import path from 'path'
-import izabelaServer from '../../server'
 import { v4 as uuid } from 'uuid'
 import fs from 'fs'
 import util from 'util'
 
-const plugin: Izabela.Server.Plugin = ({ app }) => {
+const plugin: Izabela.Server.Plugin = ({ app, config }) => {
   const listVoicesHandler: RequestHandler = async (
     {
       body: {
@@ -37,10 +36,7 @@ const plugin: Izabela.Server.Plugin = ({ app }) => {
     },
     res,
   ) => {
-    const outputFile = path.join(
-      izabelaServer.getConfig().tempPath,
-      uuid() + '.mp3',
-    )
+    const outputFile = path.join(config?.tempPath || '', uuid() + '.wav')
     try {
       fs.mkdirSync(path.parse(outputFile).dir, { recursive: true })
       fs.writeFileSync(outputFile, '')
@@ -58,7 +54,7 @@ const plugin: Izabela.Server.Plugin = ({ app }) => {
 
       res.writeHead(200, {
         'Content-Length': total,
-        'Content-Type': 'audio/mp3',
+        'Content-Type': 'audio/wav',
       })
       const stream = fs.createReadStream(outputFile).pipe(res)
       stream.on('finish', () => {

apps/app-server/src/plugins/speech-apis/ma.ts

@@ -2,7 +2,6 @@ import { RequestHandler } from 'express'
 import axios from 'axios'
 import { handleError } from '../../utils/requests'
 import path from 'path'
-import izabelaServer from '../../server'
 import { v4 as uuid } from 'uuid'
 import fs from 'fs'
 import {
@@ -13,7 +12,7 @@ import {
 } from 'microsoft-cognitiveservices-speech-sdk'
 import util from 'util'
 
-const plugin: Izabela.Server.Plugin = ({ app }) => {
+const plugin: Izabela.Server.Plugin = ({ app, config }) => {
   const listVoicesHandler: RequestHandler = async (
     {
       body: {
@@ -46,10 +45,7 @@ const plugin: Izabela.Server.Plugin = ({ app }) => {
     },
     res,
   ) => {
-    const outputFile = path.join(
-      izabelaServer.getConfig().tempPath,
-      uuid() + '.mp3',
-    )
+    const outputFile = path.join(config?.tempPath || '', uuid() + '.mp3')
     try {
       fs.mkdirSync(path.parse(outputFile).dir, { recursive: true })
       fs.writeFileSync(outputFile, '')

apps/app-server/src/plugins/speech-apis/say.ts

@@ -2,11 +2,10 @@ import { RequestHandler } from 'express'
 import say from 'say'
 import { handleError } from '../../utils/requests'
 import path from 'path'
-import izabelaServer from '../../server'
 import { v4 as uuid } from 'uuid'
 import fs from 'fs'
 
-const plugin: Izabela.Server.Plugin = ({ app }) => {
+const plugin: Izabela.Server.Plugin = ({ app, config }) => {
   const listVoicesHandler: RequestHandler = async (_, res) => {
     // @ts-ignore
     try {
@@ -32,10 +31,7 @@ const plugin: Izabela.Server.Plugin = ({ app }) => {
     },
     res,
   ) => {
-    const outputFile = path.join(
-      izabelaServer.getConfig().tempPath,
-      uuid() + '.mp3',
-    )
+    const outputFile = path.join(config?.tempPath || '', uuid() + '.mp3')
     try {
       fs.mkdirSync(path.parse(outputFile).dir, { recursive: true })
       fs.writeFileSync(outputFile, '')

apps/app-server/src/plugins/speech-apis/ud.ts

@@ -1,13 +1,12 @@
 import { RequestHandler } from 'express'
 import { handleError } from '../../utils/requests'
-import izabelaServer from '../../server'
 import { v4 as uuid } from 'uuid'
 import fs from 'fs'
 import util from 'util'
 import path from 'path'
 import axios, { AxiosResponse } from 'axios'
 
-const plugin: Izabela.Server.Plugin = ({ app }) => {
+const plugin: Izabela.Server.Plugin = ({ app, config }) => {
   const listVoicesHandler: RequestHandler = async (
     { body: { payload: { mode } = { mode: 'tts-all' } } },
     res,
@@ -35,10 +34,7 @@ const plugin: Izabela.Server.Plugin = ({ app }) => {
     },
     res,
   ) => {
-    const outputFile = path.join(
-      izabelaServer.getConfig().tempPath,
-      uuid() + '.mp3',
-    )
+    const outputFile = path.join(config?.tempPath || '', uuid() + '.mp3')
     try {
       fs.mkdirSync(path.parse(outputFile).dir, { recursive: true })
       fs.writeFileSync(outputFile, '')

apps/app-server/src/server.ts

@@ -3,7 +3,7 @@ import bodyParser from 'body-parser'
 import cors from 'cors'
 import logger from 'morgan'
 import path from 'path'
-import { defaultsDeep } from 'lodash'
+import defaultsDeep from 'lodash/defaultsDeep'
 import * as plugins from './plugins'
 import websocket from './websocket'
 

apps/app-server/tsconfig.json

@@ -1,20 +1,4 @@
 {
-  "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Node",
-    "strict": true,
-    "sourceMap": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "skipLibCheck": true
-  },
+  "extends": "../../tsconfig.base.json",
   "include": ["src"]
 }

apps/app/.browserslistrc

@@ -1,3 +1,4 @@
-VUE_APP_ENCRYPTION_KEY=
-VUE_APP_SERVER_PORT=7070
-VUE_APP_SERVER_WS_PORT=7071
+VITE_ENCRYPTION_KEY=
+VITE_SERVER_PORT=7070
+VITE_SERVER_WS_PORT=7071
+VITE_ELECTRON_NODE_INTEGRATION=0

apps/app/.editorconfig

@@ -25,4 +25,5 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-/dist_electron/
+dist_electron
+dist-electron

apps/app/.env

@@ -0,0 +1,42 @@
+/**
+ * @see https://www.electron.build/configuration/configuration
+ */
+const path = require('path')
+const fs = require('fs')
+const pkg = require('./package.json')
+
+function getElectronVersion() {
+  const electronPath = require.resolve('electron')
+
+  const data = fs.readFileSync(path.join(electronPath, '..', 'package.json'))
+  const version = JSON.parse(data.toString())?.version
+  return version
+}
+
+/**
+ * @type {import('electron-builder').Configuration}
+ * @see https://www.electron.build/configuration/configuration
+ */
+module.exports = {
+  $schema:
+    'https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json',
+  asar: true,
+  productName: pkg.productName,
+  directories: {
+    output: 'dist_electron',
+  },
+  files: ['dist', 'dist-electron'],
+  nsis: {
+    oneClick: true,
+    perMachine: false,
+    allowToChangeInstallationDirectory: false,
+    deleteAppDataOnUninstall: false,
+  },
+  appId: 'com.nhs.izabela',
+  generateUpdatesFilesForAllChannels: true,
+  // eslint-disable-next-line no-template-curly-in-string
+  artifactName: '${name}-setup-${version}-${os}.${ext}',
+  publish: ['github'],
+  electronVersion: getElectronVersion(),
+  extraFiles: ['./resources/**'],
+}