Merge pull request #3344 from Thorium-Sim/develop

Release

.nvmrc

@@ -0,0 +1 @@
+14

.yarnrc

@@ -0,0 +1,5 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+yarn-path ".yarn/releases/yarn-1.22.1.js"

package.json

@@ -64,7 +64,9 @@
   },
   "proxy": "http://localhost:3001",
   "nodemonConfig": {
-    "watch": ["server/"],
+    "watch": [
+      "server/"
+    ],
     "ignore": [
       ".git",
       "./src/*",
@@ -80,8 +82,12 @@
     "last 1 safari version"
   ],
   "lint-staged": {
-    "*.{js,jsx,ts,tsx}": ["eslint"],
-    "*.{css,scss}": ["stylelint"],
+    "*.{js,jsx,ts,tsx}": [
+      "eslint"
+    ],
+    "*.{css,scss}": [
+      "stylelint"
+    ],
     "**/*.+(js|jsx|json|yml|yaml|css|less|scss|ts|tsx|md|mdx|graphql|vue)": [
       "prettier --write"
     ]
@@ -98,7 +104,9 @@
     "directories": {
       "output": "./packages"
     },
-    "publish": { "provider": "github" },
+    "publish": {
+      "provider": "github"
+    },
     "files": [
       "electron/**/*",
       "!**/node_modules/**/*",
@@ -127,10 +135,15 @@
       ]
     },
     "win": {
-      "target": ["zip", "portable"],
+      "target": [
+        "zip",
+        "portable"
+      ],
       "icon": "./public/icon.ico"
     },
-    "linux": { "category": "Utility" }
+    "linux": {
+      "category": "Utility"
+    }
   },
   "bin": "./server/index.js",
   "pkg": {
@@ -150,7 +163,9 @@
     ]
   },
   "release": {
-    "branches": ["main"],
+    "branches": [
+      "main"
+    ],
     "tagFormat": "${version}",
     "plugins": [
       "@semantic-release/commit-analyzer",
@@ -204,6 +219,7 @@
     "errorhandler": "^1.5.1",
     "escape-string-regexp": "^4.0.0",
     "express": "^4.17.1",
+    "firebase-admin": "^12.1.0",
     "fuse.js": "^6.0.0",
     "gl-matrix": "^3.2.1",
     "googleapis": "^51.0.0",
@@ -373,7 +389,7 @@
     "ts-jest": "^26.0.0",
     "ts-node-dev": "^1.0.0-pre.44",
     "tsconfig-paths-webpack-plugin": "^3.2.0",
-    "typescript": "^3.6.4",
+    "typescript": "^5.4.0",
     "typescript-plugin-tw-template": "^2.0.1",
     "wait-on": "^5.0.0",
     "webgl-mock-threejs": "^0.0.1",
@@ -384,5 +400,8 @@
     "param-case": "3.0.3",
     "@babel/preset-env": "^7.8.7"
   },
-  "volta": { "node": "14.21.3" }
+  "volta": {
+    "node": "14.21.3"
+  },
+  "packageManager": "[email protected]"
 }

server/app.ts

@@ -8,6 +8,7 @@ import heap from "./helpers/heap";
 import handleTrigger from "./helpers/handleTrigger";
 import Motu from "motu-control";
 import {setAutoFreeze} from "immer";
+import fs from 'fs';
 
 setAutoFreeze(false);
 
@@ -101,6 +102,7 @@ class Events extends EventEmitter {
   snapshotVersion = 0;
   version = 0;
   timestamp: Date = new Date();
+  firebaseManager?: ClassesImport.FirebaseManager;
   [index: string]: any;
 
   init() {
@@ -110,6 +112,14 @@ class Events extends EventEmitter {
     if (process.env.PORT && !isNaN(parseInt(process.env.PORT, 10)))
       this.port = parseInt(process.env.PORT, 10);
     this.httpOnly = process.env.HTTP_ONLY === "true";
+    fs.readFile(paths.userData + "/firebase.json", (err, data) => {
+      if (err) {
+        return;
+      }
+      else {
+        this.firebaseManager = new ClassesImport.FirebaseManager({ firebaseServiceConfig: JSON.parse(data.toString()) });
+      }
+    })
   }
   merge(snapshot: any) {
     // Initialize the snapshot with the object constructors

server/bootstrap/apollo.ts

@@ -104,7 +104,7 @@ function responseForOperation(requestContext) {
     // the built-in mutation resolver
     return null;
   }
-  return new Promise(resolve => {
+  return new Promise<any>(resolve => {
     // Execute the old legacy event handler system.
     let timeout = null;
     App.handleEvent(
@@ -118,7 +118,7 @@ function responseForOperation(requestContext) {
       opName,
       requestContext.context,
     );
-    timeout = setTimeout(() => resolve(), 500);
+    timeout = setTimeout(() => resolve({error: "fail"}), 500);
   });
 }