WIP to handle outside of electron build

angular.json

@@ -48,7 +48,6 @@
                             "src/assets/css/ace-overrides.css"
                         ],
                         "scripts":[
-                            "src/libs/showdown.min.js"
                         ],
                         "optimization": true
                     },

package.json

@@ -13,14 +13,14 @@
         "electron-start": "electron . --trace-warnings --start-as=build --ipc-port=4588",
         "electron-pack": "ng build --base-href ./ && electron-builder --dir",
         "electron-dist": "ng build --base-href ./ && electron-builder",
-        "electron-dist-appimage-linux": "ng build --base-href ./ && electron-builder --linux AppImage",
-        "electron-dist-deb-linux": "ng build --base-href ./ && electron-builder --linux deb",
         "electron-dist-zip-linux": "ng build --base-href ./ && electron-builder --linux zip",
+        "electron-dist-deb-linux": "ng build --base-href ./ && electron-builder --linux deb",
+        "electron-dist-appimage-linux": "ng build --base-href ./ && electron-builder --linux AppImage",
         "electron-dist-all-linux": "ng build --base-href ./ && electron-builder --linux deb zip AppImage",
         "electron-dist-all": "ng build --base-href ./ && electron-builder -mwl",
         "electron-concurrently": "concurrently 'ng serve' 'electron . --trace-warnings --start-as=ng-serve'",
         "ng-serve": "ng serve",
-        "ng-build": "ng build",
+        "ng-build": "ng build --base-href ./",
         "ng-watch-build": "ng build --watch --configuration development",
         "ng-test": "ng test",
         "test": "echo \"Error: no test specified\" && exit 1"
@@ -44,7 +44,10 @@
             "maintainer": "ITDominator"
         }
     },
-    "postinstall": "electron-builder install-app-deps",
+    "overrides": {
+      "glob": "9.0.0",
+      "rimraf": "4.3.1"
+    },
     "dependencies": {
         "ace-diff": "3.0.3",
         "ace-layout": "1.5.0",
@@ -75,7 +78,7 @@
         "concurrently": "9.1.2",
         "electron": "36.2.0",
         "@electron/remote": "2.1.2",
-        "electron-builder": "26.0.12",
+        "electron-builder": "22.7.0",
         "jasmine-core": "5.6.0",
         "jimp": "1.6.0",
         "karma": "6.4.0",

src/app/app.component.ts

@@ -1,4 +1,6 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
+
+import { WebsocketService } from './common/services/websocket.service';
 
 import { InfoBarComponent } from './editor/info-bar/info-bar.component';
 import { TabsComponent } from './editor/tabs/tabs.component';
@@ -28,6 +30,69 @@ import { LspManagerComponent } from "./editor/lsp-manager/lsp-manager.component"
 export class AppComponent {
     title = 'Newton';
 
-    constructor() {}
+    protected ws: WebsocketService = inject(WebsocketService);
+
+
+    constructor() {
+        this.checkIfNotElectronMode();
+    }
+
+
+    ngOnInit() {}
+
+    checkIfNotElectronMode() {
+        if (
+            window.electron ||
+            window.main     ||
+            window.fs
+        ) { return; }
+
+        this.setupWebsocket();
+        this.setupWindowBindings();
+    }
+
+    setupWindowBindings() {
+        window.electron ??= {
+            node: () => { return "" },
+            chrome: () => { return "" },
+            electron: () => { return "" },
+        };
+
+        window.main ??= {
+            onMenuActions: () => {},
+            onTerminalActions: () => {},
+            quit: () => {},
+            toggleFullScreen: () => {},
+        };
+
+        window.fs ??= {
+            getLspConfigData: () => {
+                return new Promise((resolve, reject) => {
+                    resolve("{}");
+                });
+            },
+            getFileContents: () => {},
+            openFiles: () => {},
+            saveFile: () => {},
+            saveFileAs: () => {},
+            chooseFolder: () => {},
+            closeFile: () => {},
+            getPathForFile: () => {},
+            onLoadFiles: () => {},
+            onUpdateFilePath: () => {},
+            onSavedFile: () => {},
+            onChangedFile: () => {},
+            onDeletedFile: () => {},
+        };
+    }
+
+    setupWebsocket() {
+        // TODO: Set with dynamic address and port
+        this.ws.connect('ws://localhost:7272').subscribe(msg => {
+            console.log(msg);
+            console.log(window.fs);
+            // this.ws.send("{ 'text': 'Hello server!' }");
+        });
+    }
 
 }

src/app/common/services/editor/lsp-manager/lsp-manager.service.ts

@@ -42,7 +42,7 @@ export class LspManagerService {
     }
 
     private getLspConfigData(): Promise<string> {
-        return window.fs.getLspConfigData();
+        return window?.fs.getLspConfigData();
     }
 
     private parseAndReturnLSPConfigData(): {} {

src/app/common/services/files.service.ts

@@ -55,7 +55,7 @@ export class FilesService {
 
     public unset(file: NewtonFile) {
         file.session.destroy();
-        window.fs.closeFile(file.path);
+        window?.fs.closeFile(file.path);
         this.files.delete(file.path);
     }
 
@@ -76,7 +76,7 @@ export class FilesService {
     ): Promise<NewtonFile | undefined | null> {
 	    for (let i = 0; i < files.length; i++) {
 		    const file = files[i];
-		    const path = window.fs.getPathForFile(file);
+		    const path = window?.fs.getPathForFile(file);
 
 		    if (!file || !path) continue;
 		    if ( this.files.get(path) ) continue;
@@ -101,7 +101,7 @@ export class FilesService {
 	        file.hash     = btoa(file.path);
 
 	        if (loadFileContents)
-	            data = await window.fs.getFileContents(file.path);
+	            data = await window?.fs.getFileContents(file.path);
 
             file.session       = new EditSession(data);
             file.session["id"] = path;

src/app/common/services/websocket.service.ts

@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { webSocket, WebSocketSubject } from 'rxjs/webSocket';
+import { Observable } from 'rxjs';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class WebsocketService {
+
+    private socket$!: WebSocketSubject<any>;
+
+    connect(url: string): Observable<any> {
+        if (!this.socket$ || this.socket$.closed) {
+            this.socket$ = webSocket(
+                {
+                    url,
+                    deserializer: msg => msg.data
+                }
+            );
+        }
+        return this.socket$.asObservable();
+    }
+
+    send(message: any) {
+        if (this.socket$) {
+            this.socket$.next(message);
+        }
+    }
+
+    close() {
+        if (this.socket$) {
+            this.socket$.complete();
+        }
+    }
+}

src/app/editor/code-view/view.base.ts

@@ -187,7 +187,7 @@ export class CodeViewBase {
     }
 
     public toggleFullScreen() {
-        window.main.toggleFullScreen();
+        window?.main.toggleFullScreen();
     }
 
     public setAsReadOnly() {
@@ -300,7 +300,7 @@ export class CodeViewBase {
             startDir = pathParts.join( '/' );
         }
 
-        window.fs.openFiles(startDir);
+        window?.fs.openFiles(startDir);
     }
 
     protected saveFile() {
@@ -312,18 +312,18 @@ export class CodeViewBase {
         }
 
         const text = this.activeFile.session.getValue();
-        window.fs.saveFile(this.activeFile.path, text);
+        window?.fs.saveFile(this.activeFile.path, text);
         this.activeFile.session.getUndoManager().markClean();
     }
 
     protected saveFileAs() {
-        window.fs.saveFileAs().then((path: string) => {
+        window?.fs.saveFileAs().then((path: string) => {
             if (!path) return;
 
             let file: NewtonFile = new File([""], path, {});
             const text           = this.editor.session.getValue();
 
-            window.fs.saveFile(path, text);
+            window?.fs.saveFile(path, text);
             this.filesService.addFile(
                 path,
                 file,
@@ -364,6 +364,6 @@ export class CodeViewBase {
     }
 
     private quit() {
-        window.main.quit();
+        window?.main.quit();
     }
 }

src/app/editor/editors.component.ts

@@ -76,7 +76,7 @@ export class EditorsComponent {
     }
 
     private loadMainSubscribers() {
-        window.main.onMenuActions(async (action: string) => {
+        window?.main.onMenuActions(async (action: string) => {
             let editorComponent = this.editorsService.getActiveEditorComponent();
             let editor          = editorComponent.editor;
 
@@ -112,7 +112,7 @@ export class EditorsComponent {
                 case "show-about":
                     break;
                 case "quit":
-                    window.main.quit();
+                    window?.main.quit();
                     break;
                 default:
                     editor.execCommand(action);
@@ -120,7 +120,7 @@ export class EditorsComponent {
             }
         });
 
-        window.fs.onLoadFiles(async (paths: []) => {
+        window?.fs.onLoadFiles(async (paths: []) => {
             for (let i = 0; i < paths.length; i++) {
                 let file = new File([], "") as NewtonFile;
 
@@ -135,7 +135,7 @@ export class EditorsComponent {
             this.editorsService.setSession(file);
         });
 
-        window.fs.onChangedFile(async (path: string, data: string) => {
+        window?.fs.onChangedFile(async (path: string, data: string) => {
             let file = this.filesService.get(path);
             file.session.setValue(data);
 
@@ -147,7 +147,7 @@ export class EditorsComponent {
             this.tabsService.sendMessage(message);
         });
 
-        window.fs.onDeletedFile(async (path: string) => {
+        window?.fs.onDeletedFile(async (path: string) => {
             let message      = new ServiceMessage();
             message.action   = "file-deleted";
             message.filePath = path;
@@ -156,7 +156,7 @@ export class EditorsComponent {
             this.filesService.sendMessage(message);
         });
 
-        window.fs.onSavedFile(async (path: string) => {
+        window?.fs.onSavedFile(async (path: string) => {
             let message      = new ServiceMessage();
             message.action   = "file-saved";
             message.filePath = path;
@@ -164,7 +164,7 @@ export class EditorsComponent {
             this.tabsService.sendMessage(message);
         });
 
-        window.fs.onUpdateFilePath(async (path: string) => {
+        window?.fs.onUpdateFilePath(async (path: string) => {
             console.log("TODO (onUpdateFilePath) :", path);
             // this.tabsService.sendMessage(message);
             // this.filesService.sendMessage(message);

src/app/editor/lsp-manager/lsp-manager.component.ts

@@ -134,7 +134,7 @@ export class LspManagerComponent {
     }
 
     public setWorkspaceFolder() {
-        window.fs.chooseFolder().then((folder: string) => {
+        window?.fs.chooseFolder().then((folder: string) => {
             if (!folder) return;
 
             this.lspManagerService.workspaceFolder = folder;

src/assets/css/overrides.css

@@ -1,31 +1,4 @@
-/* FONTS */
-@font-face {
-  font-family: "JetBrainsMono-Regular";
-  src: url("../fonts/JetBrainsMono-Regular.woff2") format('woff');
-}
-
-@font-face {
-  font-family: "JetBrainsMono-Light";
-  src: url("../fonts/JetBrainsMono-Light.woff2") format('woff');
-  font-weight: bold;
-}
-
-@font-face {
-  font-family: "SourceCodePro-Regular";
-  src: url("../fonts/SourceCodePro-Regular.ttf");
-}
-
-@font-face {
-  font-family: "SourceCodePro-Light";
-  src: url("../fonts/SourceCodePro-Light.ttf");
-  font-weight: bold;
-}
-
-
 /* TAGS */
-* {
-    font-family: "SourceCodePro-Light" !important;
-}
 
 html {
     background-color: rgba(40, 44, 52, 0.64);

src/assets/fonts/JetBrainsMono-2.304-OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

src/assets/fonts/Source_Code_Pro-OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

src/polyfills.ts

@@ -11,33 +11,35 @@
 import 'zone.js';  // Included with Angular CLI.
 
 
+// Note: Is set to 'any' b/c of desire to set 'render'
+// side if running outside of electron mode.
 declare global {
     interface Window {
         electron: {
-            node: () => Promise<string>,
-            chrome: () => Promise<string>,
-            electron: () => Promise<string>,
+            node: any,
+            chrome: any,
+            electron: any,
         },
         main: {
-            onMenuActions: (arg0: any) => Promise<string>,
-            onTerminalActions: (arg0: any) => Promise<string>,
+            onMenuActions: any,
+            onTerminalActions: any,
             quit: any,
             toggleFullScreen: any,
         },
         fs: {
-            getLspConfigData: () => Promise<string>,
-            getFileContents: (arg0: any) => Promise<string>,
-            openFiles: (arg0) => Promise<string>,
-            saveFile: (arg0: any, arg1: any) => Promise<string>,
-            saveFileAs: () => Promise<string>,
-            chooseFolder: () => Promise<string>,
-            closeFile: (arg0: any) => Promise<string>,
+            getLspConfigData: any,
+            getFileContents: any,
+            openFiles: any,
+            saveFile: any,
+            saveFileAs: any,
+            chooseFolder: any,
+            closeFile: any,
             getPathForFile: any,
-            onLoadFiles: (arg0: any) => Promise<string>,
-            onUpdateFilePath: (arg0: any) => Promise<string>,
-            onSavedFile: (arg0: any) => Promise<string>,
-            onChangedFile: (arg0: any) => Promise<string>,
-            onDeletedFile: (arg0: any) => Promise<string>,
+            onLoadFiles: any,
+            onUpdateFilePath: any,
+            onSavedFile: any,
+            onChangedFile: any,
+            onDeletedFile: any,
         }
     }
 }

src/typings.d.ts

@@ -1 +0,0 @@
-// declare var showdown: any;

tsconfig.json

@@ -16,50 +16,6 @@
         "declaration": false,
         "skipLibCheck": true,
         "strict": false,
-        "forceConsistentCasingInFileNames": true,
-    },
-    "includes": [
-        "src/typings.d.ts"
-    ]
+        "forceConsistentCasingInFileNames": true
+    }
 }
-
-
-
-/*
-
-{
-    "compileOnSave": false,
-    "compilerOptions": {
-        "outDir": "./build/app",
-        "strict": true,
-        "noImplicitOverride": true,
-        "noPropertyAccessFromIndexSignature": true,
-        "noImplicitReturns": true,
-        "noFallthroughCasesInSwitch": true,
-        "skipLibCheck": true,
-        "esModuleInterop": true,
-        "sourceMap": true,
-        "declaration": false,
-        "experimentalDecorators": true,
-        "moduleResolution": "bundler",
-        "importHelpers": true,
-        "target": "ES2022",
-        "module": "ES2022",
-        "useDefineForClassFields": false,
-        "lib": [
-            "ES2022",
-            "dom"
-        ]
-    },
-    "angularCompilerOptions": {
-        "enableI18nLegacyMessageIdFormat": false,
-        "strictInjectionParameters": true,
-        "strictInputAccessModifiers": true,
-        "strictTemplates": true
-    },
-    "includes": [
-        "src/typings.d.ts"
-    ]
-}
-
-*/