1.0.3

Author: robertpatrick

build/notarize.js

@@ -1,18 +1,77 @@
-require('dotenv').config();
 const { notarize } = require('electron-notarize');
 const path = require('path');
+const fs = require('fs');
+const jsYaml = require('js-yaml');
+
+function findPackageJsonPath() {
+  let dirName = process.cwd();
+
+  while(dirName) {
+    const packageJsonFilePath = path.join(dirName, 'package.json');
+    if (fs.existsSync(packageJsonFilePath)) {
+      return packageJsonFilePath;
+    } else if (dirName === '/') {
+      break;
+    }
+    dirName = path.dirname(dirName);
+  }
+  return undefined;
+}
+
+function getAppId(context) {
+  // Try to get the appId from the packager
+  const config = context.packager.info._configuration;
+  if (config && config.appId) {
+    console.log('Found appId in packager');
+    return config.appId;
+  }
+
+  // Try to get the appId from the builder-effective-config.yml file
+  const builderEffectiveConfigPath = path.join(context.outDir, 'builder-effective-config.yaml');
+  if (fs.existsSync(builderEffectiveConfigPath)) {
+    const builderEffectiveConfigText = fs.readFileSync(builderEffectiveConfigPath);
+    const builderEffectiveConfig = jsYaml.load(builderEffectiveConfigText);
+    if (builderEffectiveConfig['appId']) {
+      console.log('Found appId in %s', builderEffectiveConfigPath);
+      return builderEffectiveConfig['appId'];
+    }
+  }
+
+  // Try to get the appId from the package.json file
+  const packageJsonFilePath = findPackageJsonPath();
+  if (packageJsonFilePath) {
+    try {
+      const packageJson = require(packageJsonFilePath);
+      if (packageJson['build'] && packageJson['build']['appId']) {
+        console.log('Found appId in %s', packageJsonFilePath);
+        return packageJson['build']['appId'];
+      }
+    } catch (err) {
+      // swallow the error
+      console.log('Failed to read %s: %s', packageJsonFilePath, err);
+    }
+  }
+
+  // finally, check the APP_ID environment variable
+  if (process.env.APP_ID) {
+    console.log('Found appId in APP_ID environment variable');
+    return process.env.APP_ID;
+  }
+  throw new Error('Unable to find the application ID');
+}
 
 exports.default = async function notarizing(context) {
   const { electronPlatformName, appOutDir } = context;
-  if (electronPlatformName !== 'darwin') {
+  if (electronPlatformName !== 'darwin' || process.env.CSC_IDENTITY_AUTO_DISCOVERY === 'false') {
     return;
   }
 
+  const appId = getAppId(context);
   const appName = context.packager.appInfo.productFilename;
-  const appPath = path.normalize(path.join(process.cwd(), 'dist', 'mac', `${appName}.app`));
-  console.log('calling notarize with appPath = %s', appPath);
-  return await notarize({
-    appBundleId: 'com.github.robertpatrick.electronupdaterexample',
+  const appPath = path.normalize(path.join(context.outDir, 'mac', `${appName}.app`));
+  console.log('calling notarize for appId = %s with appPath = %s', appId, appPath);
+  return notarize({
+    appBundleId: appId,
     appPath: appPath,
     appleId: process.env.APPLEID,
     appleIdPassword: process.env.APPLEIDPASS,

main.js

@@ -1,7 +1,7 @@
 // This is free and unencumbered software released into the public domain.
 // See LICENSE for details
 
-const {app, BrowserWindow, Menu, protocol, ipcMain} = require('electron');
+const {app, BrowserWindow, dialog, Menu, protocol, ipcMain} = require('electron');
 if (process.platform === 'linux') {
   let proxy;
   if (process.env.HTTPS_PROXY) {
@@ -96,6 +96,7 @@ function createDefaultWindow() {
   win.loadURL(`file://${__dirname}/version.html#v${app.getVersion()}`);
   return win;
 }
+
 autoUpdater.on('checking-for-update', () => {
   sendStatusToWindow('Checking for update...');
 })
@@ -138,9 +139,9 @@ app.on('window-all-closed', () => {
 // This will immediately download an update, then install when the
 // app quits.
 //-------------------------------------------------------------------
-app.on('ready', function()  {
-  autoUpdater.checkForUpdatesAndNotify();
-});
+// app.on('ready', function()  {
+//   autoUpdater.checkForUpdatesAndNotify();
+// });
 
 //-------------------------------------------------------------------
 // Auto updates - Option 2 - More control
@@ -153,19 +154,29 @@ app.on('ready', function()  {
 // Uncomment any of the below events to listen for them.  Also,
 // look in the previous section to see them being used.
 //-------------------------------------------------------------------
-// app.on('ready', function()  {
-//   autoUpdater.checkForUpdates();
-// });
-// autoUpdater.on('checking-for-update', () => {
-// })
-// autoUpdater.on('update-available', (info) => {
-// })
-// autoUpdater.on('update-not-available', (info) => {
-// })
-// autoUpdater.on('error', (err) => {
-// })
-// autoUpdater.on('download-progress', (progressObj) => {
-// })
-// autoUpdater.on('update-downloaded', (info) => {
-//   autoUpdater.quitAndInstall();  
-// })
+autoUpdater.autoDownload = false;
+autoUpdater.autoInstallOnAppQuit = false;
+
+app.on('ready', function()  {
+  autoUpdater.checkForUpdates().then();
+});
+
+autoUpdater.on('checking-for-update', (foo) => {
+  log.info('got checking-for-update event: %s', JSON.stringify(foo));
+});
+autoUpdater.on('update-available', (info) => {
+  log.info('got update-available event: %s', JSON.stringify(info));
+})
+autoUpdater.on('update-not-available', (info) => {
+  log.info('got update-not-available event: %s', JSON.stringify(info));
+})
+autoUpdater.on('error', (err) => {
+  log.info('got error event: %s', JSON.stringify(err));
+})
+autoUpdater.on('download-progress', (progressObj) => {
+  log.info('got download-progress event: %s', JSON.stringify(progressObj));
+})
+autoUpdater.on('update-downloaded', (info) => {
+  log.info('got update-downloaded event: %s', JSON.stringify(info));
+  autoUpdater.autoInstallOnAppQuit = true;
+})

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-updater-example",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "main": "main.js",
   "description": "electron-updater example project",
   "author": {
@@ -12,10 +12,10 @@
     "publish": "electron-builder --config electron-builder.yaml -p always"
   },
   "devDependencies": {
-    "dotenv": "^9.0.2",
     "electron": "^14.0.1",
     "electron-builder": "^22.11.7",
-    "electron-notarize": "^1.1.1"
+    "electron-notarize": "^1.1.1",
+    "js-yaml": "^4.1.0"
   },
   "dependencies": {
     "electron-log": "^4.4.1",