refactor: switch to preload script

18alantom · 18alantom · commit e2b9ea1f49c5 · 2023-07-10T13:33:52.000+05:30
- delete ipcCalls
diff --git a/reports/commonExporter.ts b/reports/commonExporter.ts
@@ -1,12 +1,11 @@
 import { t } from 'fyo';
 import { Action } from 'fyo/model/types';
 import { Verb } from 'fyo/telemetry/types';
-import { saveData } from 'src/utils/ipcCalls';
+import { getSavePath, showExportInFolder } from 'src/utils/ui';
 import { getIsNullOrUndef } from 'utils';
 import { generateCSV } from 'utils/csvParser';
 import { Report } from './Report';
 import { ExportExtention, ReportCell } from './types';
-import { getSavePath, showExportInFolder } from 'src/utils/ui';
 
 interface JSONExport {
   columns: { fieldname: string; label: string }[];
@@ -184,7 +183,7 @@ export async function saveExportData(
   filePath: string,
   message?: string
 ) {
-  await saveData(data, filePath);
+  await ipc.saveData(data, filePath);
   message ??= t`Export Successful`;
   showExportInFolder(message, filePath);
 }
diff --git a/src/App.vue b/src/App.vue
@@ -53,7 +53,6 @@ import { connectToDatabase, dbErrorActionSymbols } from './utils/db';
 import { initializeInstance } from './utils/initialization';
 import * as injectionKeys from './utils/injectionKeys';
 import { showDialog } from './utils/interactive';
-import { checkDbAccess, checkForUpdates } from './utils/ipcCalls';
 import { setLanguageMap } from './utils/language';
 import { updateConfigFiles } from './utils/misc';
 import { updatePrintTemplates } from './utils/printTemplates';
@@ -147,7 +146,7 @@ export default defineComponent({
       this.activeScreen = Screen.Desk;
       await this.setDeskRoute();
       await fyo.telemetry.start(true);
-      await checkForUpdates();
+      await ipc.checkForUpdates();
       await setLanguageMap();
       this.dbPath = filePath;
       this.companyName = (await fyo.getValue(
@@ -164,7 +163,7 @@ export default defineComponent({
         return;
       }
 
-      if (filePath !== ':memory:' && !(await checkDbAccess(filePath))) {
+      if (filePath !== ':memory:' && !(await ipc.checkDbAccess(filePath))) {
         await showDialog({
           title: this.t`Cannot open file`,
           type: 'error',
diff --git a/src/components/Controls/AttachImage.vue b/src/components/Controls/AttachImage.vue
@@ -57,7 +57,6 @@
 <script lang="ts">
 import { Field } from 'schemas/types';
 import { fyo } from 'src/initFyo';
-import { selectFile } from 'src/utils/ipcCalls';
 import { getDataURL } from 'src/utils/misc';
 import { defineComponent, PropType } from 'vue';
 import FeatherIcon from '../FeatherIcon.vue';
@@ -105,7 +104,7 @@ export default defineComponent({
         ],
       };
 
-      const { name, success, data } = await selectFile(options);
+      const { name, success, data } = await ipc.selectFile(options);
 
       if (!success) {
         return;
diff --git a/src/components/ExportWizard.vue b/src/components/ExportWizard.vue
@@ -87,6 +87,7 @@
 </template>
 <script lang="ts">
 import { t } from 'fyo';
+import { Verb } from 'fyo/telemetry/types';
 import { Field, FieldTypeEnum } from 'schemas/types';
 import { fyo } from 'src/initFyo';
 import {
@@ -95,17 +96,15 @@ import {
   getExportTableFields,
   getJsonExportData,
 } from 'src/utils/export';
-import { saveData } from 'src/utils/ipcCalls';
 import { ExportField, ExportFormat, ExportTableField } from 'src/utils/types';
+import { getSavePath, showExportInFolder } from 'src/utils/ui';
 import { QueryFilter } from 'utils/db/types';
-import { defineComponent, PropType } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import Button from './Button.vue';
 import Check from './Controls/Check.vue';
 import Int from './Controls/Int.vue';
 import Select from './Controls/Select.vue';
 import FormHeader from './FormHeader.vue';
-import { Verb } from 'fyo/telemetry/types';
-import { getSavePath, showExportInFolder } from 'src/utils/ui';
 
 interface ExportWizardData {
   useListFilters: boolean;
@@ -258,7 +257,7 @@ export default defineComponent({
         return;
       }
 
-      await saveData(data, filePath);
+      await ipc.saveData(data, filePath);
       this.fyo.telemetry.log(Verb.Exported, this.schemaName, {
         extension: this.exportFormat,
       });
diff --git a/src/components/HowTo.vue b/src/components/HowTo.vue
@@ -9,7 +9,6 @@
   </button>
 </template>
 <script>
-import { openLink } from 'src/utils/ipcCalls';
 import FeatherIcon from './FeatherIcon.vue';
 
 export default {
@@ -23,7 +22,7 @@ export default {
   },
   methods: {
     openHelpLink() {
-      openLink(this.link);
+      ipc.openLink(this.link);
     },
   },
 };
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
@@ -197,13 +197,12 @@
 import { fyo } from 'src/initFyo';
 import { getBgTextColorClass } from 'src/utils/colors';
 import { searcherKey, shortcutsKey } from 'src/utils/injectionKeys';
-import { openLink } from 'src/utils/ipcCalls';
 import { docsPathMap } from 'src/utils/misc';
 import {
-  getGroupLabelMap,
   SearchGroup,
-  searchGroups,
   SearchItems,
+  getGroupLabelMap,
+  searchGroups,
 } from 'src/utils/search';
 import { defineComponent, inject, nextTick } from 'vue';
 import Button from './Button.vue';
@@ -305,7 +304,7 @@ export default defineComponent({
   },
   methods: {
     openDocs() {
-      openLink('https://docs.frappebooks.com/' + docsPathMap.Search);
+      ipc.openLink('https://docs.frappebooks.com/' + docsPathMap.Search);
     },
     getShortcuts() {
       const ifOpen = (cb: Function) => () => this.openModal && cb();
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
@@ -182,7 +182,6 @@
 import { reportIssue } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
 import { languageDirectionKey, shortcutsKey } from 'src/utils/injectionKeys';
-import { openLink } from 'src/utils/ipcCalls';
 import { docsPathRef } from 'src/utils/refs';
 import { getSidebarConfig } from 'src/utils/sidebarConfig';
 import { SidebarConfig, SidebarItem, SidebarRoot } from 'src/utils/types';
@@ -255,7 +254,7 @@ export default defineComponent({
     reportIssue,
     toggleSidebar,
     openDocumentation() {
-      openLink('https://docs.frappebooks.com/' + docsPathRef.value);
+      ipc.openLink('https://docs.frappebooks.com/' + docsPathRef.value);
     },
     setActiveGroup() {
       const { fullPath } = this.$router.currentRoute.value;
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
@@ -7,11 +7,6 @@ import { showDialog } from 'src/utils/interactive';
 import { fyo } from './initFyo';
 import router from './router';
 import { getErrorMessage, stringifyCircular } from './utils';
-import {
-  sendError as ipcSendError,
-  openExternalUrl,
-  showError,
-} from './utils/ipcCalls';
 import type { DialogOptions, ToastOptions } from './utils/types';
 
 function shouldNotStore(error: Error) {
@@ -46,7 +41,7 @@ export async function sendError(errorLogObj: ErrorLog) {
     console.log('sendError', body);
   }
 
-  await ipcSendError(JSON.stringify(body));
+  await ipc.sendError(JSON.stringify(body));
 }
 
 function getToastProps(errorLogObj: ErrorLog) {
@@ -157,7 +152,7 @@ export async function showErrorDialog(title?: string, content?: string) {
   // To be used for  show stopper errors
   title ??= t`Error`;
   content ??= t`Something has gone terribly wrong. Please check the console and raise an issue.`;
-  await showError(title, content);
+  await ipc.showError(title, content);
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -234,7 +229,7 @@ function getIssueUrlQuery(errorLogObj?: ErrorLog): string {
 
 export function reportIssue(errorLogObj?: ErrorLog) {
   const urlQuery = getIssueUrlQuery(errorLogObj);
-  openExternalUrl(urlQuery);
+  ipc.openExternalUrl(urlQuery);
 }
 
 function getErrorLabel(error: Error) {
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
@@ -246,7 +246,6 @@ import Loading from 'src/components/Loading.vue';
 import Modal from 'src/components/Modal.vue';
 import { fyo } from 'src/initFyo';
 import { showDialog } from 'src/utils/interactive';
-import { getDbList } from 'src/utils/ipcCalls';
 import { updateConfigFiles } from 'src/utils/misc';
 import { deleteDb, getSavePath, getSelectedFilePath } from 'src/utils/ui';
 import type { ConfigFilesWithModified } from 'utils/types';
@@ -359,7 +358,7 @@ export default defineComponent({
       this.creatingDemo = false;
     },
     async setFiles() {
-      const dbList = await getDbList();
+      const dbList = await ipc.getDbList();
       this.files = dbList?.sort(
         (a, b) => Date.parse(b.modified) - Date.parse(a.modified)
       );
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
@@ -76,10 +76,8 @@ import Icon from 'src/components/Icon.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import { fyo } from 'src/initFyo';
 import { getGetStartedConfig } from 'src/utils/getStartedConfig';
-import { openLink } from 'src/utils/ipcCalls';
 import { GetStartedConfigItem } from 'src/utils/types';
-import { Component } from 'vue';
-import { defineComponent, h } from 'vue';
+import { Component, defineComponent, h } from 'vue';
 
 type ListItem = GetStartedConfigItem['items'][number];
 
@@ -106,7 +104,7 @@ export default defineComponent({
   methods: {
     async handleDocumentation({ key, documentation }: ListItem) {
       if (documentation) {
-        openLink(documentation);
+        ipc.openLink(documentation);
       }
 
       switch (key) {
diff --git a/src/pages/ImportWizard.vue b/src/pages/ImportWizard.vue
@@ -388,7 +388,6 @@ import PageHeader from 'src/components/PageHeader.vue';
 import { Importer, TemplateField, getColumnLabel } from 'src/importer';
 import { fyo } from 'src/initFyo';
 import { showDialog } from 'src/utils/interactive';
-import { saveData } from 'src/utils/ipcCalls';
 import { docsPathMap } from 'src/utils/misc';
 import { docsPathRef } from 'src/utils/refs';
 import { getSavePath, selectTextFile } from 'src/utils/ui';
@@ -795,7 +794,7 @@ export default defineComponent({
         return;
       }
 
-      await saveData(template, filePath);
+      await ipc.saveData(template, filePath);
     },
     async preImportValidations(): Promise<boolean> {
       const title = this.t`Cannot Import`;
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
@@ -80,7 +80,6 @@ import { getErrorMessage } from 'src/utils';
 import { evaluateHidden } from 'src/utils/doc';
 import { shortcutsKey } from 'src/utils/injectionKeys';
 import { showDialog } from 'src/utils/interactive';
-import { reloadWindow } from 'src/utils/ipcCalls';
 import { docsPathMap } from 'src/utils/misc';
 import { docsPathRef } from 'src/utils/refs';
 import { UIGroupedFields } from 'src/utils/types';
@@ -222,7 +221,7 @@ export default defineComponent({
           {
             label: this.t`Yes`,
             isPrimary: true,
-            action: reloadWindow,
+            action: ipc.reloadWindow.bind(ipc),
           },
           {
             label: this.t`No`,
diff --git a/src/renderer.ts b/src/renderer.ts
@@ -10,7 +10,6 @@ import { outsideClickDirective } from './renderer/helpers';
 import registerIpcRendererListeners from './renderer/registerIpcRendererListeners';
 import router from './router';
 import { stringifyCircular } from './utils';
-import { getEnv } from './utils/ipcCalls';
 import { setLanguageMap } from './utils/language';
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -22,7 +21,7 @@ import { setLanguageMap } from './utils/language';
   fyo.store.language = language || 'English';
 
   registerIpcRendererListeners();
-  const { isDevelopment, platform, version } = await getEnv();
+  const { isDevelopment, platform, version } = await ipc.getEnv();
 
   fyo.store.isDevelopment = isDevelopment;
   fyo.store.appVersion = version;
diff --git a/src/renderer/registerIpcRendererListeners.ts b/src/renderer/registerIpcRendererListeners.ts
@@ -1,12 +1,8 @@
 import { handleError } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
-import {
-  registerConsoleLogListener,
-  registerMainProcessErrorListener,
-} from 'src/utils/ipcCalls';
 
 export default function registerIpcRendererListeners() {
-  registerMainProcessErrorListener(
+  ipc.registerMainProcessErrorListener(
     (_, error: unknown, more?: Record<string, unknown>) => {
       if (!(error instanceof Error)) {
         throw error;
@@ -28,7 +24,7 @@ export default function registerIpcRendererListeners() {
     }
   );
 
-  registerConsoleLogListener((_, ...stuff: unknown[]) => {
+  ipc.registerConsoleLogListener((_, ...stuff: unknown[]) => {
     if (!fyo.store.isDevelopment) {
       return;
     }
diff --git a/src/shims-tsx.d.ts b/src/shims-tsx.d.ts
@@ -1,8 +1,8 @@
 import type { IPC } from 'main/preload';
 import Vue, { VNode } from 'vue';
 
-declare const ipc: IPC;
 declare global {
+  const ipc: IPC;
   namespace JSX {
     type Element = VNode;
     type ElementClass = Vue;
diff --git a/src/utils/ipcCalls.ts b/src/utils/ipcCalls.ts
diff --git a/src/utils/language.ts b/src/utils/language.ts
diff --git a/src/utils/printTemplates.ts b/src/utils/printTemplates.ts
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
