Merge branch 'development' of github.com:Proskomma/scribe-scripture-e…

…ditor into development

.github/workflows/node.js.yml

@@ -12,6 +12,7 @@ jobs:
         runs-on: ubuntu-latest
         env:
             CI: false
+            NODE_OPTIONS: --max-old-space-size=4096
         strategy:
             matrix:
                 node-version: [18.20.3]
@@ -31,28 +32,26 @@ jobs:
             - name: yarn install
               run: yarn install
 
-            - name: set max memory allocation
-              run: export NODE_OPTIONS=-max_old_space_size=4096
-
             - name: package
               id: package
               run: |
                   yarn dist
 
             - name: Cleanup artifacts
               run: |
-                  npx rimraf "dist/!(*.deb|*.AppImage|*.dmg)"
+                  npx rimraf "dist/!(*.deb|*.AppImage|*.dmg|*.exe)"
             - name: Upload artifacts
               uses: actions/upload-artifact@v4
               with:
-                name: Scribe
-                path: Scribe-${{ github.run_id }}-${{ github.sha }}
+                name: Scribe-${{ github.run_id }}-${{ github.sha }}
+                path: dist
                 overwrite: true
 
     build-windows:
         runs-on: ubuntu-latest
         env:
             CI: false
+            NODE_OPTIONS: --max-old-space-size=4096
         strategy:
             matrix:
                 node-version: [18.20.3]
@@ -70,9 +69,6 @@ jobs:
             - name: set @bitregistry translation-help
               run: yarn config set '@bit:registry' https://node.bit.dev
 
-            - name: set max memory allocation
-              run: export NODE_OPTIONS=-max_old_space_size=4096
-
             - name: install dependencies
               run: yarn install
 
@@ -92,70 +88,67 @@ jobs:
             - name: Upload artifacts
               uses: actions/upload-artifact@v4
               with:
-                name: Scribe-${{ github.run_id }}-${{ github.sha }}
+                name: Scribe
                 path: artifacts
                 overwrite: true
     # Commented the below code for getting the binaries build for windows and Ubuntu
-    # build-mac:
-    #     runs-on: macos-latest
-    #     env:
-    #         CI: false
-    #     strategy:
-    #         matrix:
-    #             node-version: [18.20.3]
-
-    #     steps:
-    #         - uses: actions/checkout@v2
-    #         - name: Use Node.js 18.20.3
-    #           uses: actions/setup-node@v1
-    #           with:
-    #               node-version: 18.20.3
-    #         - run: |
-    #               node --version
-    #               yarn --version
-    #         - name: Increase file descriptor limit
-    #           run: sudo sysctl -w kern.maxfiles=10485760 && sudo sysctl -w kern.maxfilesperproc=1048576
-    #         - name: set @bitregistry translation-help
-    #           run: yarn config set '@bit:registry' https://node.bit.dev
-
-    #         - name: Install Homebrew
-    #           run: |
-    #               /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-    #               echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> $HOME/.zprofile
-    #               eval "$(/opt/homebrew/bin/brew shellenv)"
-
-    #         - name: Install canvas dependencies
-    #           run: |
-    #               brew install pkg-config cairo pango libpng jpeg giflib librsvg [email protected]
-    #               brew reinstall jpeg
-    #               echo 'export PATH="/opt/homebrew/opt/jpeg/bin:$PATH"' >> $HOME/.zprofile
-    #               echo 'export LDFLAGS="-L/opt/homebrew/opt/jpeg/lib"' >> $HOME/.zprofile
-    #               echo 'export CPPFLAGS="-I/opt/homebrew/opt/jpeg/include"' >> $HOME/.zprofile
-    #               echo 'export PKG_CONFIG_PATH="/opt/homebrew/opt/jpeg/lib/pkgconfig"' >> $HOME/.zprofile
-    #               eval "$(/opt/homebrew/bin/brew shellenv)"
-    #               brew install python-setuptools
-
-
-    #         - name: set max memory allocation
-    #           run: export NODE_OPTIONS=-max_old_space_size=4096
-
-    #         - name: yarn install
-    #           run: yarn install --verbose
-
-    #         - name: install dmg-license
-    #           run: yarn add dmg-license
-
-    #         - name: package
-    #           id: package
-    #           run: |
-    #               yarn dist
-
-    #         - name: Cleanup artifacts
-    #           run: |
-    #               npx rimraf "dist/!(*.deb|*.AppImage|*.dmg)"
-    #         - name: Upload artifacts
-    #           uses: actions/upload-artifact@v4
-    #           with:
-    #             name: Scribe-${{ github.run_id }}-${{ github.sha }}
-    #             path: dist
-    #             overwrite: true
+    build-mac:
+        runs-on: macos-latest
+        env:
+            CI: false
+            NODE_OPTIONS: --max-old-space-size=4096
+        strategy:
+            matrix:
+                node-version: [18.20.3]
+
+        steps:
+            - uses: actions/checkout@v2
+            - name: Use Node.js 18.20.3
+              uses: actions/setup-node@v1
+              with:
+                  node-version: 18.20.3
+            - run: |
+                  node --version
+                  yarn --version
+            - name: Increase file descriptor limit
+              run: sudo sysctl -w kern.maxfiles=10485760 && sudo sysctl -w kern.maxfilesperproc=1048576
+            - name: set @bitregistry translation-help
+              run: yarn config set '@bit:registry' https://node.bit.dev
+
+            - name: Install Homebrew
+              run: |
+                  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+                  echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> $HOME/.zprofile
+                  eval "$(/opt/homebrew/bin/brew shellenv)"
+
+            - name: Install canvas dependencies
+              run: |
+                  brew install pkg-config cairo pango libpng jpeg giflib librsvg [email protected]
+                  brew reinstall jpeg
+                  echo 'export PATH="/opt/homebrew/opt/jpeg/bin:$PATH"' >> $HOME/.zprofile
+                  echo 'export LDFLAGS="-L/opt/homebrew/opt/jpeg/lib"' >> $HOME/.zprofile
+                  echo 'export CPPFLAGS="-I/opt/homebrew/opt/jpeg/include"' >> $HOME/.zprofile
+                  echo 'export PKG_CONFIG_PATH="/opt/homebrew/opt/jpeg/lib/pkgconfig"' >> $HOME/.zprofile
+                  eval "$(/opt/homebrew/bin/brew shellenv)"
+                  brew install python-setuptools
+
+            - name: yarn install
+              run: yarn install
+
+            - name: install dmg-license
+              run: yarn add dmg-license
+
+            - name: package
+              id: package
+              run: |
+                  yarn dist
+
+            - name: Cleanup artifacts
+              run: |
+                  npx rimraf "dist/!(*.deb|*.AppImage|*.dmg|*.exe)"
+            - name: Upload artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                name: Scribe-Mac-${{ github.run_id }}-${{ github.sha }}
+                path: dist
+                overwrite: true

.gitignore

@@ -5,6 +5,7 @@
 /.pnp
 .pnp.js
 bower_components
+/.expo
 
 # next-on-netlify build output
 out_functions/

main/index.js

@@ -1,7 +1,9 @@
 // Native
 require('@electron/remote/main').initialize();
-const { join } = require('path');
+const path = require('path');
+const fs = require('fs');
 const { format } = require('url');
+const { install } = require('@puppeteer/browsers');
 const config = require("dotenv");
 config.config();
 
@@ -12,11 +14,71 @@ const prepareNext = require('electron-next');
 const { autoUpdater } = require('electron-updater');
 
 let mainWindow;
+let browserPath;
 function isDev() {
   return process.argv[2] == '--dev';
 }
+
+async function setPermissions(chromePath) {
+  try {
+    fs.chmodSync(chromePath, '755');
+  } catch (err) {
+    console.error(`Failed to set permissions for ${chromePath}: `, err);
+  }
+}
+
+function getChromeCacheDir() {
+  const dataDir = app.getPath('appData');
+
+  const chromeDataDir = path.join(dataDir, 'chrome-cache');
+  const chromeDataDirFilePath = path.join(chromeDataDir, 'executablePath');
+
+  // Create the folder if it doesn't exist
+  try {
+    fs.accessSync(chromeDataDir);
+  } catch (err) {
+    // If the directory doesn't exist, create it
+    fs.mkdirSync(chromeDataDir, { recursive: true });
+    fs.appendFileSync(chromeDataDirFilePath, '', 'utf8');
+    console.log(`Created persistent Chrome data directory at: ${chromeDataDir}`);
+  }
+
+  return chromeDataDir;
+}
+
+async function verifyAndInstallChrome(version) {
+  // Get the persistent directory
+  const cacheDir = getChromeCacheDir();
+  const cacheDirFilePath = path.join(cacheDir, 'executablePath');
+
+  // Check if the browser is already installed
+
+  // fs.accessSync(cacheDirFilePath);
+  const data = fs.readFileSync(cacheDirFilePath, 'utf8');
+  if(data.trim() !== '') {
+    console.log(`Chrome version ${version} is already installed at '${data}'`);
+    browserPath = data;
+    return browserPath;
+  }
+  console.log(`Chrome version ${version} is not installed. Installing now...`);
+  await install({
+    cacheDir,
+    browser: 'chrome',
+    buildId: version,
+  }).then((res) => {
+    if (fs.existsSync(res.executablePath)) {
+      browserPath = res.executablePath;
+      fs.appendFileSync(cacheDirFilePath, res.executablePath, 'utf8');
+      console.log(`Chrome version ${version} has been installed to ${browserPath}.`);
+    }
+    setPermissions(browserPath);
+  }).catch((err) => {
+    throw new Error(`Failed to install Chrome version ${version} : ${err}`);
+  });
+}
+
 // Prepare the renderer once the app is ready
-function createWindow() {
+async function createWindow() {
  mainWindow = new BrowserWindow({
     width: 900,
     height: 600,
@@ -26,22 +88,37 @@ function createWindow() {
       webSecurity: false,
       enableRemoteModule: true,
       contextIsolation: false,
-      preload: join(__dirname, 'preload.js'),
+      preload: path.join(__dirname, 'preload.js'),
     },
   });
   require('@electron/remote/main').enable(mainWindow.webContents);
   const url = isDev()
     ? 'http://localhost:8000'
     : format({
-        pathname: join(__dirname, '../renderer/out/index.html'),
+        pathname: path.join(__dirname, '../renderer/out/index.html'),
         protocol: 'file:',
         slashes: true,
       });
 
+  // useful line of code to debug puppet with the console in the app
+  // app.commandLine.appendSwitch('remote-debugging-port', '8000');
+
+  verifyAndInstallChrome('121.0.6167.85')
+  .catch(err => {
+    console.error(`Failed to verify or install Chrome: ${err.message}`);
+  });
+
   mainWindow.loadURL(url);
   autoUpdater.checkForUpdatesAndNotify();
 }
 
+ipcMain.handle('get-browser-path', async (event) => {
+  await verifyAndInstallChrome('121.0.6167.85').catch(err => {
+    console.error(`Failed to verify or install Chrome: ${err.message}`);
+  });
+  return browserPath;
+});
+
 // prevent multiple app window opening
 const gotTheLock = app.requestSingleInstanceLock();
 if (!gotTheLock) {
@@ -71,6 +148,7 @@ app.on('window-all-closed', () => {
 
 app.on('activate', async () => {
   if (mainWindow === null) {
+    await pie.initialize(app);
     createWindow();
   }
 });

main/preload.js

@@ -2,6 +2,7 @@ const { ipcRenderer } = require('electron');
 const log = require('electron-log');
 const fontList = require('font-list');
 const { PdfGen } = require('jxl-pdf');
+const puppeteer = require('puppeteer-core');
 
 const _fonts = [];
 const fetchFonts = async () => {
@@ -17,12 +18,10 @@ const fetchFonts = async () => {
 };
 fetchFonts();
 
-// Since we disabled nodeIntegration we can reintroduce
-// needed node functionality here
 process.once('loaded', () => {
-
   global.ipcRenderer = ipcRenderer;
+  global.puppeteer = puppeteer;
   global.log = log;
-  global.PdfGenStatic = PdfGen
+  global.PdfGenStatic = PdfGen;
   global.fonts = _fonts;
-});
+});

next.config.js

@@ -1,6 +1,7 @@
 // const nodeExternals = require('webpack-node-externals');
 const path = require('path');
 const colors = require('tailwindcss/colors');
+const TerserPlugin = require("terser-webpack-plugin");
 
 const nextConfig = {
   webpack: (config, { isServer }) => {
@@ -9,6 +10,7 @@ const nextConfig = {
       config.resolve.fallback.fs = false;
       config.resolve.alias.canvas = false;
     }
+
     config.module.rules.push({
       test: /\.md$/,
       use: 'raw-loader',