check for updates in own module.

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -48,7 +48,6 @@ import { FileSystemFrontendContribution } from '@theia/filesystem/lib/browser/fi
 import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu';
 import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution';
 import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
-import { IDEUpdater } from '../common/protocol/ide-updater';
 import {
   CurrentSketch,
   SketchesServiceClientImpl,
@@ -60,13 +59,11 @@ import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
 import { OpenSketchFiles } from './contributions/open-sketch-files';
 import { SaveAsSketch } from './contributions/save-as-sketch';
-import { IDEUpdaterDialog } from './dialogs/ide-updater/ide-updater-dialog';
 import { ArduinoMenus } from './menu/arduino-menus';
 import { MonitorViewContribution } from './serial/monitor/monitor-view-contribution';
 import { ArduinoToolbar } from './toolbar/arduino-toolbar';
 
 const INIT_LIBS_AND_PACKAGES = 'initializedLibsAndPackages';
-export const SKIP_IDE_VERSION = 'skipIDEVersion';
 
 @injectable()
 export class ArduinoFrontendContribution
@@ -116,12 +113,6 @@ export class ArduinoFrontendContribution
   @inject(FileSystemFrontendContribution)
   private readonly fileSystemFrontendContribution: FileSystemFrontendContribution;
 
-  @inject(IDEUpdater)
-  private readonly updater: IDEUpdater;
-
-  @inject(IDEUpdaterDialog)
-  private readonly updaterDialog: IDEUpdaterDialog;
-
   protected toDisposeOnStop = new DisposableCollection();
 
   @postConstruct()
@@ -192,30 +183,6 @@ export class ArduinoFrontendContribution
   }
 
   async onStart(app: FrontendApplication): Promise<void> {
-    this.updater
-      .init(
-        this.arduinoPreferences.get('arduino.ide.updateChannel'),
-        this.arduinoPreferences.get('arduino.ide.updateBaseUrl')
-      )
-      .then(() => this.updater.checkForUpdates(true))
-      .then(async (updateInfo) => {
-        if (!updateInfo) return;
-        const versionToSkip = await this.localStorageService.getData<string>(
-          SKIP_IDE_VERSION
-        );
-        if (versionToSkip === updateInfo.version) return;
-        this.updaterDialog.open(updateInfo);
-      })
-      .catch((e) => {
-        this.messageService.error(
-          nls.localize(
-            'arduino/ide-updater/errorCheckingForUpdates',
-            'Error while checking for Arduino IDE updates.\n{0}',
-            e.message
-          )
-        );
-      });
-
     this.arduinoPreferences.onPreferenceChanged((event) => {
       if (event.newValue !== event.oldValue) {
         switch (event.preferenceName) {
@@ -225,13 +192,6 @@ export class ArduinoFrontendContribution
               webContents.setZoomLevel(event.newValue || 0);
             }
             break;
-          case 'arduino.ide.updateChannel':
-          case 'arduino.ide.updateBaseUrl':
-            this.updater.init(
-              this.arduinoPreferences.get('arduino.ide.updateChannel'),
-              this.arduinoPreferences.get('arduino.ide.updateBaseUrl')
-            );
-            break;
         }
       }
     });

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -307,6 +307,7 @@ import { Notifications } from './contributions/notifications';
 import { OpenSketchFiles } from './contributions/open-sketch-files';
 import { InoLanguage } from './contributions/ino-language';
 import { SelectedBoard } from './contributions/selected-board';
+import { CheckForUpdates } from './contributions/check-for-updates';
 
 MonacoThemingService.register({
   id: 'arduino-theme',
@@ -702,6 +703,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, OpenSketchFiles);
   Contribution.configure(bind, InoLanguage);
   Contribution.configure(bind, SelectedBoard);
+  Contribution.configure(bind, CheckForUpdates);
 
   // Disabled the quick-pick customization from Theia when multiple formatters are available.
   // Use the default VS Code behavior, and pick the first one. In the IDE2, clang-format has `exclusive` selectors.

arduino-ide-extension/src/browser/contributions/check-for-updates.ts

@@ -0,0 +1,64 @@
+import { nls } from '@theia/core/lib/common/nls';
+import { LocalStorageService } from '@theia/core/lib/browser/storage-service';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import {
+  IDEUpdater,
+  SKIP_IDE_VERSION,
+} from '../../common/protocol/ide-updater';
+import { IDEUpdaterDialog } from '../dialogs/ide-updater/ide-updater-dialog';
+import { Contribution } from './contribution';
+
+@injectable()
+export class CheckForUpdates extends Contribution {
+  @inject(IDEUpdater)
+  private readonly updater: IDEUpdater;
+
+  @inject(IDEUpdaterDialog)
+  private readonly updaterDialog: IDEUpdaterDialog;
+
+  @inject(LocalStorageService)
+  private readonly localStorage: LocalStorageService;
+
+  override onStart(): void {
+    this.preferences.onPreferenceChanged(
+      ({ preferenceName, newValue, oldValue }) => {
+        if (newValue !== oldValue) {
+          switch (preferenceName) {
+            case 'arduino.ide.updateChannel':
+            case 'arduino.ide.updateBaseUrl':
+              this.updater.init(
+                this.preferences.get('arduino.ide.updateChannel'),
+                this.preferences.get('arduino.ide.updateBaseUrl')
+              );
+          }
+        }
+      }
+    );
+  }
+
+  override onReady(): void {
+    this.updater
+      .init(
+        this.preferences.get('arduino.ide.updateChannel'),
+        this.preferences.get('arduino.ide.updateBaseUrl')
+      )
+      .then(() => this.updater.checkForUpdates(true))
+      .then(async (updateInfo) => {
+        if (!updateInfo) return;
+        const versionToSkip = await this.localStorage.getData<string>(
+          SKIP_IDE_VERSION
+        );
+        if (versionToSkip === updateInfo.version) return;
+        this.updaterDialog.open(updateInfo);
+      })
+      .catch((e) => {
+        this.messageService.error(
+          nls.localize(
+            'arduino/ide-updater/errorCheckingForUpdates',
+            'Error while checking for Arduino IDE updates.\n{0}',
+            e.message
+          )
+        );
+      });
+  }
+}

arduino-ide-extension/src/browser/contributions/compiler-errors.ts

@@ -29,10 +29,7 @@ import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { MonacoToProtocolConverter } from '@theia/monaco/lib/browser/monaco-to-protocol-converter';
 import { ProtocolToMonacoConverter } from '@theia/monaco/lib/browser/protocol-to-monaco-converter';
 import { CoreError } from '../../common/protocol/core-service';
-import {
-  ArduinoPreferences,
-  ErrorRevealStrategy,
-} from '../arduino-preferences';
+import { ErrorRevealStrategy } from '../arduino-preferences';
 import { InoSelector } from '../ino-selectors';
 import { fullRange } from '../utils/monaco';
 import { Contribution } from './contribution';
@@ -127,9 +124,6 @@ export class CompilerErrors
   @inject(CoreErrorHandler)
   private readonly coreErrorHandler: CoreErrorHandler;
 
-  @inject(ArduinoPreferences)
-  private readonly preferences: ArduinoPreferences;
-
   private readonly errors: ErrorDecoration[] = [];
   private readonly onDidChangeEmitter = new monaco.Emitter<this>();
   private readonly currentErrorDidChangEmitter = new Emitter<ErrorDecoration>();

arduino-ide-extension/src/browser/contributions/contribution.ts

@@ -95,6 +95,9 @@ export abstract class Contribution
   @inject(SettingsService)
   protected readonly settingsService: SettingsService;
 
+  @inject(ArduinoPreferences)
+  protected readonly preferences: ArduinoPreferences;
+
   @inject(FrontendApplicationStateService)
   protected readonly appStateService: FrontendApplicationStateService;
 
@@ -142,9 +145,6 @@ export abstract class SketchContribution extends Contribution {
   @inject(SketchesServiceClientImpl)
   protected readonly sketchServiceClient: SketchesServiceClientImpl;
 
-  @inject(ArduinoPreferences)
-  protected readonly preferences: ArduinoPreferences;
-
   @inject(EditorManager)
   protected readonly editorManager: EditorManager;
 

arduino-ide-extension/src/browser/contributions/edit-contributions.ts

@@ -1,7 +1,6 @@
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
 import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
-import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
 import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
 import {
   Contribution,
@@ -20,13 +19,10 @@ import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/edit
 @injectable()
 export class EditContributions extends Contribution {
   @inject(MonacoEditorService)
-  protected readonly codeEditorService: MonacoEditorService;
+  private readonly codeEditorService: MonacoEditorService;
 
   @inject(ClipboardService)
-  protected readonly clipboardService: ClipboardService;
-
-  @inject(PreferenceService)
-  protected readonly preferences: PreferenceService;
+  private readonly clipboardService: ClipboardService;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(EditContributions.Commands.GO_TO_LINE, {

arduino-ide-extension/src/browser/dialogs/ide-updater/ide-updater-dialog.tsx

@@ -12,10 +12,10 @@ import {
   IDEUpdater,
   IDEUpdaterClient,
   ProgressInfo,
+  SKIP_IDE_VERSION,
   UpdateInfo,
 } from '../../../common/protocol/ide-updater';
 import { LocalStorageService } from '@theia/core/lib/browser';
-import { SKIP_IDE_VERSION } from '../../arduino-frontend-contribution';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
 
 @injectable()

arduino-ide-extension/src/common/protocol/ide-updater.ts

@@ -69,3 +69,5 @@ export interface IDEUpdaterClient {
   notifyDownloadProgressChanged(message: ProgressInfo): void;
   notifyDownloadFinished(message: UpdateInfo): void;
 }
+
+export const SKIP_IDE_VERSION = 'skipIDEVersion';