merge from local

.github/workflows/codeql-analysis.yml

@@ -1,68 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-name: "CodeQL"
-
-on:
-  pull_request:
-    branches: [master]
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['javascript']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

api-ports.md

@@ -0,0 +1,18 @@
+# API SERVICES PORT TABLE
+
+3000 -> main
+3001 -> posts
+3002 -> files
+3003 -> music
+3004 -> chats
+3005 -> marketplace
+3006 -> sync
+3007 -> mail
+3008 -> unallocated
+3009 -> unallocated
+3010 -> unallocated
+3011 -> unallocated
+3012 -> unallocated
+3013 -> unallocated
+3014 -> unallocated
+3015 -> unallocated

linebridge

@@ -1 +1 @@
-Subproject commit 13b01b21d6b63ecddd8625781a69355861d38db5
+Subproject commit c011f2353f8db14a2ed287015d108c2620098a84

package.json

@@ -5,12 +5,7 @@
     "private": true,
     "scripts": {
         "wrapper:dev": "node ./packages/wrapper/src/index.js --dev",
-        "dev": "concurrently -k -n Client,Server,Marketplace,Chat,File,Music,Sync -c bgCyan,auto \"yarn dev:client\" \"yarn dev:server\" \"yarn dev:marketplace_server\" \"yarn dev:chat_server\"  \"yarn dev:file_server\" \"yarn dev:music_server\" \"yarn dev:sync_server\"",
-        "dev:file_server": "cd packages/file_server && yarn dev",
-        "dev:music_server": "cd packages/music_server && yarn dev",
-        "dev:chat_server": "cd packages/chat_server && yarn dev",
-        "dev:marketplace_server": "cd packages/marketplace_server && yarn dev",
-        "dev:sync_server": "cd packages/sync_server && yarn dev",
+        "dev": "concurrently -k \"yarn dev:client\" \"yarn dev:server\"",
         "dev:server": "cd packages/server && yarn dev",
         "dev:client": "cd packages/app && yarn dev",
         "release": "node ./scripts/release.js",
@@ -23,7 +18,7 @@
     "dependencies": {
         "7zip-min": "1.4.3",
         "axios": "^1.4.0",
-        "corenode": "^0.28.26",
+        "@ragestudio/hermes": "^0.1.1",
         "dotenv": "16.0.3",
         "octokit": "^2.0.14"
     },