Merge pull request #332 from HeyPuter/release-please--branches--main--components--puter.com

chore(main): release 1.0.0

.commit

@@ -0,0 +1,6 @@
+# === FOR EMPTY COMMITS ===
+# Select reason for empty commit:
+- [ ] Add conventional commit message for changelog
+- [x] Forgot to use conventional commit style
+# Increment this value if nothing above was changed
+0

.dockerignore

@@ -1,3 +1,4 @@
 .dockerignore
 Dockerfile
 node_modules
+/puter

.env.example

@@ -1 +1 @@
-PORT=4000
+PORT=4000

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Issue Description**
+
+**Steps to Reproduce**
+
+**Expected & Actual Behavior**
+
+**Addition Information or Screenshots (if applicable)**
+
+**Deployment**
+- [ ] Production (puter.com)
+- [ ] Development (`npm run start`)
+- [ ] Docker (via `docker run`)
+- [ ] Docker (via `docker-compose`)
+
+**Puter version (if accessible)**
+> Click the profile button on the top-right, then "Settings". The version number will be printed at the bottom

.github/ISSUE_TEMPLATE/driver-request.md

@@ -0,0 +1,10 @@
+---
+name: Driver Request
+about: Request a driver on Puter
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+> Drivers are services that apps on Puter can use. For example, drivers support many of the features in the [Puter SDK](https://docs.puter.com/). If you're not sure if what you're suggesting is a driver, you should use the "Feature Request" template instead.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,10 @@
+---
+name: Feature request
+about: Suggest an idea for Puter
+title: ''
+labels: idea
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/idea-for-improvement.md

@@ -0,0 +1,10 @@
+---
+name: Idea for Improvement
+about: An enhancement for an existing feature on Puter
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+

.github/workflows/build-and-test.yml

@@ -0,0 +1,31 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x, 18.x, 20.x, 21.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test

.github/workflows/docker-image.yaml

@@ -5,8 +5,10 @@ name: Docker Image CI
 # branch called `main`.
 on:
   push:
-    branches: ['main']
-  
+    tags:
+      - '*.*.*'
+    # branches:
+    #   - 'release'
 
 # Defines two custom environment variables for the workflow. These are used
 # for the Container registry domain, and a name for the Docker image that
@@ -41,6 +43,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about)
       # to extract tags and labels that will be applied to the specified image.
       # The `id` "meta" allows the output of this step to be referenced in
@@ -50,16 +58,10 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
           tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
-            type=sha
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
 
       # This step uses the `docker/build-push-action` action to build the
       # image, based on your repository's `Dockerfile`. If the build succeeds,
@@ -73,7 +75,10 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/lint.yml

@@ -1,6 +1,6 @@
-# This workflow runs the tools/check-translations.js script to make sure that the translation data is valid.
+# Lint PRs and pushes to the main branch
 
-name: Check Translations
+name: Lint
 
 env:
   NODE_VERSION: 21.x
@@ -13,7 +13,7 @@ on:
     branches: [ "main" ]
 
 jobs:
-  test:
+  build:
     runs-on: ubuntu-latest
 
     steps:
@@ -24,5 +24,10 @@ jobs:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'npm'
         cache-dependency-path: ./package-lock.json
-    - run: npm ci
-    - run: npm run check-translations
+    - name: Install dependencies
+      run: npm ci
+    - name: Run ESLint
+      run: npx eslint
+    - name: Check translations
+      if: '!cancelled()'
+      run: npm run check-translations

.github/workflows/main.yml

@@ -0,0 +1,40 @@
+name: Maintain Release Merge PR
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  update-release-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Git
+        run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+      - name: Check for existing PR
+        id: find-pr
+        uses: juliangruber/find-pull-request-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          branch: release
+      - uses: actions/checkout@v4
+        if: steps.find-pr.outputs.number == ''
+        with:
+          ref: release
+      - name: Reset release branch
+        if: steps.find-pr.outputs.number == ''
+        run: |
+          git fetch origin main:main
+          git reset --hard main
+      - name: Create/Update PR
+        if: steps.find-pr.outputs.number == ''
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update release branch
+          title: Merge Release Auto-PR
+          body: Merging this PR will invoke release actions          
+          branch: auto-update/release

.github/workflows/release-please.yml

@@ -0,0 +1,18 @@
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+  pull-requests: write
+
+name: release-please
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v4
+        with:
+          release-type: node

.gitignore

@@ -1,11 +1,28 @@
+# Misc
 .DS_Store
+
+# Dependencies
 node_modules/
+
 *.zip
 *.tgz
 license.config.json
 license-header.txt
+
+# Build Outputs
 dist/
-.vscode/
+
+# VS Code IDE
+.vscode/**/*
+!.vscode/extensions.json
+!.vscode/launch.json
+!.vscode/settings.json
+!.vscode/tasks.json
+
+# Local env files
 .env
+!.env.example
+
 # this is for jetbrain IDEs
-.idea/
+.idea/
+/puter

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "cSpell.words": [
+        "dnsmasq",
+        "heyputer",
+        "Puter"
+    ]
+}

CHANGELOG.md

@@ -0,0 +1,66 @@
+# Changelog
+
+## 2.3.0 (2024-05-22)
+
+
+### Features
+
+* add /healthcheck endpoint ([c166560](https://github.com/HeyPuter/puter/commit/c166560ff4ab5a453d3ec4f97326c995deb7f522))
+* Add command names to phoenix tab-completion ([cf0eee1](https://github.com/HeyPuter/puter/commit/cf0eee1fa35328e05aefc8a425b5977efe5f4ec9))
+* add option to change desktop background to default ([03f05f3](https://github.com/HeyPuter/puter/commit/03f05f316f11e8afe5fcee40b2b80a0de5e6826f))
+* allow apps to add a menubar via puter.js ([331d9e7](https://github.com/HeyPuter/puter/commit/331d9e75428ec7609394f59b1755374c7340f83e))
+* Allow querying puter-apps driver by partial app names ([dc5b010](https://github.com/HeyPuter/puter/commit/dc5b010d0913d2151b4851f8da5df72d2c8f42e7))
+* Display upload errors in UIWindowProgress dialog ([edebbee](https://github.com/HeyPuter/puter/commit/edebbee9e7e9efbb33bf709b637c103be40d15a8))
+* Implement 'Like' predicate in entity storage ([a854a0d](https://github.com/HeyPuter/puter/commit/a854a0dc0aa79a31695db833184c5ca3698632a9))
+* improve password recovery experience ([04432df](https://github.com/HeyPuter/puter/commit/04432df5540811710ce1cc47ce6c136e5453bccb))
+* **security:** add ip rate limiting ([ccf1afc](https://github.com/HeyPuter/puter/commit/ccf1afc93c24ee7f9a126216209a185d6b4d9fe4))
+* Show "Deleting /foo" in progress window when deleting files ([f07c13a](https://github.com/HeyPuter/puter/commit/f07c13a50cee790eec44bce2f6e56fbcbf73f9b0))
+
+
+### Bug Fixes
+
+* Add missing file extension to 0009_app-prefix-fix.sql in DB init ([a8160a8](https://github.com/HeyPuter/puter/commit/a8160a8cdcdd6aff98728a6f1643d93386e6bb5a))
+* Add missing TextEncoder to PTT ([8d4a1e0](https://github.com/HeyPuter/puter/commit/8d4a1e0ed3872e2c82b9e4be9b6d8b359e9cea09))
+* Correct APIError imports ([062e23b](https://github.com/HeyPuter/puter/commit/062e23b5c9673db1f8b0ff0469289d52dd1e3f99))
+* Correct grep output when asking for line numbers ([c8a20ca](https://github.com/HeyPuter/puter/commit/c8a20cadbfd539d185d32f4558916825fcf265ba))
+* Correct inverted instanceof check in SignalReader.read() ([d4c2b49](https://github.com/HeyPuter/puter/commit/d4c2b492ef4864804776d3cb7d24797fdc536886))
+* Correct variables used in errors in sign.js ([fa7c6be](https://github.com/HeyPuter/puter/commit/fa7c6bee9699527028be0ae9759155bc67c52324))
+* Eliminates duplicate translation keys ([5800350](https://github.com/HeyPuter/puter/commit/5800350b253994dea410afff64e3df2a171e7775))
+* fix error handling for outdated node versions ([4c1d5a4](https://github.com/HeyPuter/puter/commit/4c1d5a4b6d009ce075897d499d3517219bd745a4))
+* Fix phoenix app prefix and TokenService test ([afb9d86](https://github.com/HeyPuter/puter/commit/afb9d866b5091058711db931cde904947e661c15))
+* increase QR code size ([d2de46e](https://github.com/HeyPuter/puter/commit/d2de46edfbc05d132d5c929f6935b82515fbbda0))
+* Make PathCommandProvider reject queries with path separators ([d733119](https://github.com/HeyPuter/puter/commit/d73311945610417a1ebc7bb0723ced0a599594b4))
+* Make url variable accessible to all users of it ([2f30ae7](https://github.com/HeyPuter/puter/commit/2f30ae7a825adcd8da95888c38fe39c34acee0ff))
+* Only run Component initialization functions once ([5b43358](https://github.com/HeyPuter/puter/commit/5b43358219402bee3eadf4a0f184a4b924d3293b))
+* Parse octal echo escapes ([6ad8f5e](https://github.com/HeyPuter/puter/commit/6ad8f5e06abd050d319271f818d72debf5bc8e44))
+* reduce token lengths ([5a76bad](https://github.com/HeyPuter/puter/commit/5a76bad28dfd8ec89a309941e410a54927fae22d))
+* reliability issue :bug: ([1d546d9](https://github.com/HeyPuter/puter/commit/1d546d9ef70ef9066ad5838e9782ae330d289f29))
+* Remove null or duplicate app entries from suggest_app_for_fsentry() ([6900233](https://github.com/HeyPuter/puter/commit/6900233c5aaa2d1a49f495e9f9a060796757a91e))
+* **security:** always use application/octet-stream ([74e213a](https://github.com/HeyPuter/puter/commit/74e213a534dbf2844c8cebeee7eb59ec70de306e))
+* **security:** Fix session revocation ([eb166a6](https://github.com/HeyPuter/puter/commit/eb166a67a9f0caf4fd77f9e27dc8209c2fc51f4c))
+* **security:** Move token for socket.io to request body ([49b257e](https://github.com/HeyPuter/puter/commit/49b257ecffbb1e12090b86a67528a5ad09da69db))
+* **security:** Prevent email enumeration ([ed70314](https://github.com/HeyPuter/puter/commit/ed703146863f896df76c98fad7127c6748c0ef9b))
+* **security:** skip cache when checking old passwd ([7800ef6](https://github.com/HeyPuter/puter/commit/7800ef61029c8d1ba47491b4028a0cb972298725))
+* **Terminal:** Accept input from Chrome on Android ([4ef3e53](https://github.com/HeyPuter/puter/commit/4ef3e53de34f0097950a7e707ca2483863beafb5))
+* test release-please action [#3](https://github.com/HeyPuter/puter/issues/3) ([8fb0a66](https://github.com/HeyPuter/puter/commit/8fb0a66ef21921990e564e5f61c0e80e7f929dc7))
+* test release-please action [#4](https://github.com/HeyPuter/puter/issues/4) ([f392de7](https://github.com/HeyPuter/puter/commit/f392de722a5232b622ed91b656a31cdc443c2e84))
+* typographical error :bug: ([2949f71](https://github.com/HeyPuter/puter/commit/2949f71691eb0a258888c5d2a5bb496d2fe64a23))
+* typographical errors :bug: ([4d30740](https://github.com/HeyPuter/puter/commit/4d30740198402cd1cc61b9ea4c45e006b69ec87e))
+* Use correct variable for version number ([52d5299](https://github.com/HeyPuter/puter/commit/52d52993744dffa9f7f59a232da5df9077560731))
+* use primary read in signup ([30f17ad](https://github.com/HeyPuter/puter/commit/30f17ade3a893d2283316e581836607e2029f9b9))
+
+## [2.2.0](https://github.com/HeyPuter/puter/compare/v2.1.1...v2.2.0) (2024-04-23)
+
+
+### Features
+
+* add /healthcheck endpoint ([c166560](https://github.com/HeyPuter/puter/commit/c166560ff4ab5a453d3ec4f97326c995deb7f522))
+* allow apps to add a menubar via puter.js ([331d9e7](https://github.com/HeyPuter/puter/commit/331d9e75428ec7609394f59b1755374c7340f83e))
+
+## [2.1.1](https://github.com/HeyPuter/puter/compare/v2.1.0...v2.1.1) (2024-04-22)
+
+
+### Bug Fixes
+
+* test release-please action [#3](https://github.com/HeyPuter/puter/issues/3) ([8fb0a66](https://github.com/HeyPuter/puter/commit/8fb0a66ef21921990e564e5f61c0e80e7f929dc7))
+* test release-please action [#4](https://github.com/HeyPuter/puter/issues/4) ([f392de7](https://github.com/HeyPuter/puter/commit/f392de722a5232b622ed91b656a31cdc443c2e84))

CONTRIBUTING.md

@@ -57,6 +57,28 @@ See [doc/contributors/index.md](./doc/contributors/index.md) for more informatio
 
 <br>
 
+## Commit Messages
+
+Use the imperative, as is the convention in the Linux kernel:
+
+- correct: `Improve performance of readdir`
+- incorrect: `Improved readdir`
+- incorrect: `Improving readdir`
+
+We have the following exceptions to this rule:
+- If the commit message is in _past tense_, it's a shorthand for the following:
+  - `Apply changes that would be applied after one had <past tense message>`
+- If the commit message is in _present tense_, it's shorthand for the following:
+  - `Apply changes that would be applied after <present-tense message>`
+
+For example, the following are correct:
+- `Improved readdir`
+  - interpret this as: `Apply changes that would be applied after one had improved readdir`
+- `Improving readdir`
+  - interpret this as: `Apply changes that would be applied after improving readdir`
+
+<br>
+
 ## Code Review
 
 Once you've submitted your pull request, the project maintainers will review your changes. We may suggest some changes or improvements. This is a normal part of the process, and your contributions are greatly appreciated!

Dockerfile

@@ -1,30 +1,64 @@
+# /!\ NOTICE /!\
+
+# Many of the developers DO NOT USE the Dockerfile or image.
+# While we do test new changes to Docker configuration, it's
+# possible that future changes to the repo might break it.
+# When changing this file, please try to make it as resiliant
+# to such changes as possible; developers shouldn't need to
+# worry about Docker unless the build/run process changes.
+
+# Build stage
+FROM node:21-alpine AS build
+
+# Install build dependencies
+RUN apk add --no-cache git python3 make g++ \
+    && ln -sf /usr/bin/python3 /usr/bin/python
+
+# Set up working directory
+WORKDIR /app
+
+# Copy package.json and package-lock.json
+COPY package*.json ./
+
+# Copy the source files
+COPY . .
+
+# Install node modules
+RUN npm cache clean --force \
+    && npm ci
+
+# Run the build command if necessary
+RUN npm run build
+
+# Production stage
 FROM node:21-alpine
 
 # Set labels
 LABEL repo="https://github.com/HeyPuter/puter"
 LABEL license="AGPL-3.0,https://github.com/HeyPuter/puter/blob/master/LICENSE.txt"
-LABEL version="v1.2.40-beta"
+LABEL version="1.2.46-beta-1"
 
-# Debugging
-RUN apk add --no-cache bash # useful for debugging
+# Install git (required by Puter to check version)
+RUN apk add --no-cache git
 
-# Setup working directory
+# Set up working directory
 RUN mkdir -p /opt/puter/app
 WORKDIR /opt/puter/app
 
-# Add source files
-# NOTE: This might change (https://github.com/HeyPuter/puter/discussions/32)
+# Copy built artifacts and necessary files from the build stage
+COPY --from=build /app/dist ./dist
+COPY --from=build /app/node_modules ./node_modules
 COPY . .
 
 # Set permissions
 RUN chown -R node:node /opt/puter/app
 USER node
 
-# Install node modules
-RUN npm cache clean --force \
-    && npm install
+EXPOSE 4100
 
-EXPOSE 4000
+HEALTHCHECK --interval=30s --timeout=3s \
+    CMD wget --no-verbose --tries=1 --spider http://puter.localhost:4100/test || exit 1
 
+ENV NO_VAR_RUNTUME=1
 
-CMD [ "npm", "start" ]
+CMD ["npm", "start"]

README.md

@@ -1,6 +1,6 @@
 <h3 align="center"><img width="80" alt="Puter.com, The Personal Cloud Computer: All your files, apps, and games in one place accessible from anywhere at any time." src="https://assets.puter.site/puter-logo.png"></h3>
 
-<h3 align="center">The Internet OS! Free, Open-Source, and Self-Hostable!</h3>
+<h3 align="center">The Internet OS! Free, Open-Source, and Self-Hostable.</h3>
 
 <p align="center">
     <a href="https://puter.com/"><strong>« LIVE DEMO »</strong></a>
@@ -15,6 +15,8 @@
     <a href="https://reddit.com/r/puter">Reddit</a>
     ·
     <a href="https://twitter.com/HeyPuter">X (Twitter)</a>
+    ·
+    <a href="https://hackerone.com/puter_h1b">Bug Bounty</a>
 </p>
 
 <h3 align="center"><img width="700" style="border-radius:5px;" alt="screenshot" src="https://assets.puter.site/puter.com-screenshot-2.webp"></h3>
@@ -29,11 +31,16 @@ Puter is an advanced, open-source internet operating system designed to be featu
 
 ## Getting Started
 
+After reading this section, please proceed to [**Self-Hosting**](#%EF%B8%8F-self-hosting-%EF%B8%8F) and [**Configuration**](#configuration) below.
+Read these instructions carefully or you may see errors due to
+an invalid setup.
+
 ### Local Development
 
 ```bash
 git clone https://github.com/HeyPuter/puter
 cd puter
+cp .env.example .env
 npm install
 npm start
 ```
@@ -44,17 +51,90 @@ This will launch Puter at http://localhost:4000 (or the next available port).
 
 ### Using Docker
 
+**note:** it is **not** necessary to run this within a clone of this repository. For contributors, it is recommended to use the [Local Development](#local-development) instructions.
+
 ```bash
-git clone https://github.com/HeyPuter/puter
-cd puter
+mkdir puter && cd puter && mkdir -p puter/config puter/data && sudo chown -R 1000:1000 puter && docker run --rm -p 4100:4100 -v `pwd`/puter/config:/etc/puter -v `pwd`/puter/data:/var/puter  ghcr.io/heyputer/puter
+```
+
+### Using Docker Compose
+
+**note:** it is **not** necessary to run this within a clone of this repository. For contributors, it is recommended to use the [Local Development](#local-development) instructions.
+
+```bash
+mkdir -p puter/config puter/data
+sudo chown -R 1000:1000 puter
+wget https://raw.githubusercontent.com/HeyPuter/puter/main/docker-compose.yml
 docker compose up
 ```
 
 <br/>
 
+See [Configuration](#configuration) for next steps.
+
+<br/>
+
 ## ⚠️ Self-Hosting ⚠️
 The self-hosted version of Puter is currently in alpha stage and should not be used in production yet. It is under active development and may contain bugs, other issues. Please exercise caution and use it for testing and evaluation purposes only.
 
+### Self-Hosting Differences
+Currently, the self-hosted version of Puter is different in a few ways from [Puter.com](https://puter.com):
+- There is no built-in way to install or create other apps (see below)
+- Several "core" apps are missing, such as **Code** or **Draw**, because we can't include them in this repository
+- Some icons are different
+
+Work is ongoing to improve the **App Center** and make it available on self-hosted.
+Until then, it's possible to add other apps by manually editing the database file.
+This process is not recommended unless you know what you are doing.
+The file will appear after you first launch Puter, and should be found in `puter/data/puter-database.sqlite` for Docker,
+or `volatile/runtime/puter-database.sqlite` otherwise.
+You will need a database tool that can understand SQLite databases.
+
+<br/>
+
+## Configuration
+
+Running the server will generate a configuration file in one of these locations:
+- `config/config.json` when [Using Docker](#using-docker)
+- `volatile/config/config.json` in [Local Development](#local-development)
+- `/etc/puter/config.json` on a server (or within a Docker container)
+
+### Domain Name
+
+To access Puter on your device, you can simply go to the address printed in
+the server console (usually `puter.localhost:4100`).
+
+To access Puter from another device, a domain name must be configured, as well as
+an `api` subdomain. For example, `example.local` might be the domain name pointing
+to the IP address of the server running puter, and `api.example.com` must point to
+this address as well. This domain must be specified in the configuration file
+(usually `volatile/config/config.json`) as well.
+
+See [domain configuration](./doc/self-hosters/domains.md) for more information.
+
+### Configure the Port
+
+- You can specify a custom port by setting `http_port` to a desired value
+- If you're using a reverse-proxy such as nginx or cloudflare, you should
+  also set `pub_port` to the public (external) port (usually `443`)
+- If you have HTTPS enabled on your reverse-proxy, ensure that
+  `protocol` in config.json is set accordingly
+
+### Default User
+
+By default, Puter will create a user called `default_user`.
+This user will have a randomly generated password, which will be printed
+in the development console.
+A warning will persist in the dev console until this user's
+password is changed. Please login to this user and change the password as
+your first step.
+
+<br/>
+
+##  License
+
+This repository is licensed under AGPL-3.0; However, our SDK (puter.js) is also available under Apache 2.0, as indicated by the license file in that section (packages/puter-js) of this repository.
+
 <br/>
 
 ## FAQ
@@ -88,12 +168,16 @@ Puter interacts directly with the DOM and jQuery provides an elegant yet powerfu
 ## #DoesItRunPuter
 
 - [Minecraft](https://twitter.com/HeyPuter/status/1771957571496092036) | [video](https://www.youtube.com/watch?v=GIowZUXkg5g)
+- [Samsung Watch](https://twitter.com/CharmunkDev/status/1781501714543030554)
 - [PlayStation 4](https://twitter.com/HeyPuter/status/1767978053014270059)
 - [Skyworth TV](https://twitter.com/ericalexdube/status/1767983049277411564)
+- [A Fridge!](https://twitter.com/HeyPuter/status/1778890003797745842)
 - [Oculus Quest 2](https://twitter.com/HeyPuter/status/1768664081756754012)
+- [Tesla Model 3](https://twitter.com/EricLighthall/status/1781479732997214501)
 - [Tesla Model S](https://twitter.com/HeyPuter/status/1767971178864587057)
 - [Tesla Model Y](https://twitter.com/HeyPuter/status/1772858333751636310)
-- Tesla Model 3
+- [Nintendo Switch](https://twitter.com/HeyPuter/status/1780645795240538518)
+- [Steam Deck](https://twitter.com/everythingSung/status/1782162352403828793)
 
 <br/>
 

doc/contributors/extensions.md

@@ -0,0 +1,2 @@
+### `vscode`
+- `es6-string-html`

doc/self-hosters/domains.md

@@ -0,0 +1,72 @@
+# Configuring Domains for Self-Hosted Puter
+
+## Local Network Configuration
+
+### Prerequisite Conditions
+
+Ensure the hosting device has a static IP address to prevent potential connectivity issues due to IP changes. This setup will enable seamless access to Puter and its services across your local network.
+
+### Using Hosts Files
+
+The hosts file is a straightforward way to map domain names to IP addresses on individual devices. It's simple to set up but requires manual changes on each device that needs access to the domains.
+
+#### Windows
+1. Open Notepad as an administrator.
+2. Open the file located at `C:\Windows\System32\drivers\etc\hosts`.
+3. Add lines for your domain and subdomain with the server's IP address, in the
+   following format:
+   ```
+   192.168.1.10 puter.local
+   192.168.1.10 api.puter.local
+   ```
+
+#### For macOS and Linux:
+1. Open a terminal.
+2. Edit the hosts file with a text editor, e.g., `sudo nano /etc/hosts`.
+3. Add lines for your domain and subdomain with the server's IP address, in the
+   following format:
+   ```
+   192.168.1.10 puter.local
+   192.168.1.10 api.puter.local
+   ```
+4. Save and exit the editor.
+
+
+### Using Router Configuration
+
+Some routers allow you to add custom DNS rules, letting you configure domain names network-wide without touching each device.
+
+1. Access your router’s admin interface (usually through a web browser).
+2. Look for DNS or DHCP settings.
+3. Add custom DNS mappings for `puter.local` and `api.puter.local` to the hosting device's IP address.
+4. Save the changes and reboot the router if necessary.
+
+This method's availability and steps may vary depending on your router's model and firmware.
+
+### Using Local DNS
+
+Setting up a local DNS server on your network allows for flexible and scalable domain name resolution. This method works across all devices automatically once they're configured to use the DNS server.
+
+#### Options for DNS Software:
+
+- **Pi-hole**: Acts as both an ad-blocker and a DNS server. Ideal for easy setup and maintenance.
+- **BIND9**: Offers comprehensive DNS server capabilities for complex setups.
+- **dnsmasq**: Lightweight and suitable for smaller networks or those new to running a DNS server.
+
+**contributors note:** feel free to add any software you're aware of
+which might help with this to the list. Also, feel free to add instructions here for specific software; our goal is for Puter to be easy to setup with tools you're already familiar with.
+
+#### General Steps:
+
+1. Choose and install DNS server software on a device within your network.
+2. Configure the DNS server to resolve `puter.local` and `api.puter.local` to the IP address of your Puter hosting device.
+3. Update your router's DHCP settings to distribute the DNS server's IP address to all devices on the network.
+
+By setting up a local DNS server, you gain the most flexibility and control over your network's domain name resolution, ensuring that all devices can access Puter and its API without manual configuration.
+
+## Production Configuration
+
+Please note the self-hosting feature is still in alpha and a public production
+deployment is not recommended at this time. However, if you wish to host
+publicly you can do so following the same steps you normally would to configure
+a domain name and ensuring the `api` subdomain points to the server as well.

doc/self-hosters/support.md

@@ -0,0 +1,39 @@
+## Puter Support Levels for Repository Updates
+
+This document describes issues requiring repository changes;
+which issues will be fixed by Puter's core team, and which ones
+will be fixed if the community makes a contribution.
+
+This document is not "law". It is provided only as a helpful guide
+on what to expect.
+
+### Level Glossary
+
+| Name | Description |
+| ---- | ----------- |
+| Core | Core developers will fix this |
+| Community | We will accept contributions to fix this |
+| Mixed | Core developers will fix this if it's currently a priority |
+
+### Issues and their Levels
+
+| Issue | Priority |
+| ----- | -------- |
+| Security vulnerability | Core |
+| Breaking change to SDK or API | Core |
+| Bug in service in CoreModule | Core |
+| Bug in a built-in app | Core |
+| Login/init failure in Docker on `release` branch | Core |
+| Login/init failure in Linux or OSX | Core |
+| Login/init failure in Docker on `main` branch | Mixed |
+| Login/init failure with specific configuration | Mixed |
+| Login/init failure in Windows | Community |
+
+
+## Puter Support for a Particular Deployment
+
+If you experience issues on a self-hosted deployment we're here to
+help. Some issues are related to configuration or environment, so
+we may only be able to help in a limited capacity. Issues related
+to data loss, data corruption, or security will have higher priority
+over other issues with particular deployments.

docker-compose.yml

@@ -1,7 +1,25 @@
-version: '3'
-
+---
+version: "3.8"
 services:
-  app:
-    build: ./
+  puter:
+    container_name: puter
+    image: ghcr.io/heyputer/puter:latest
+    pull_policy: always
+    # build: ./
+    restart: unless-stopped
     ports:
-      - 4000:4000    
+      - '4100:4100'
+    environment:
+      # TZ: Europe/Paris
+      # CONFIG_PATH: /etc/puter
+      PUID: 1000
+      PGID: 1000
+    volumes:
+      - ./puter/config:/etc/puter
+      - ./puter/data:/var/puter
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://puter.localhost:4100/test || exit 1
+      interval: 30s
+      timeout: 3s
+      retries: 3
+      start_period: 30s

eslint.config.js

@@ -0,0 +1,106 @@
+import js from "@eslint/js";
+import globals from "globals";
+
+export default [
+    js.configs.recommended,
+
+    {
+        // Global ignores
+        ignores: [
+            "**/*.min.js",
+            "**/src/lib/**",
+            "**/dist/",
+            "packages/backend/src/public/assets/**",
+        ],
+    },
+    {
+        // Top-level and tools use Node
+        files: [
+            "tools/**/*.js",
+        ],
+        languageOptions: {
+            globals: {
+                ...globals.node,
+            }
+        }
+    },
+    {
+        // Back end
+        files: [
+            "packages/backend/**/*.js",
+            "dev-server.js",
+            "utils.js",
+        ],
+        languageOptions: {
+            globals: {
+                ...globals.node,
+                "kv": true,
+            }
+        }
+    },
+    {
+        // Front end
+        files: [
+            "index.js",
+            "initgui.js",
+            "src/**/*.js",
+            "packages/**/*.js",
+        ],
+        ignores: [
+            "packages/backend/**/*.js",
+        ],
+        languageOptions: {
+            globals: {
+                ...globals.browser,
+                ...globals.commonjs,
+                "puter": true,
+                "i18n": true,
+                "html_encode": true,
+                "html_decode": true,
+                "isMobile": true,
+                // Libraries
+                "saveAs": true,         // FileSaver
+                "iro": true,            // iro.js color picker
+                "$": true,              // jQuery
+                "jQuery": true,         // jQuery
+                "JSZip": true,          // JSZip
+                "_": true,              // lodash
+                "QRCode": true,         // qrcode
+                "io": true,             // socket.io
+                "timeago": true,        // timeago
+                "SelectionArea": true,  // viselect
+            }
+        }
+    },
+    {
+        // Tests
+        files: [
+            "**/test/**/*.js",
+        ],
+        languageOptions: {
+            globals: {
+                ...globals.mocha,
+            }
+        }
+    },
+    {
+        // Phoenix
+        files: [
+            "packages/phoenix/**/*.js",
+        ],
+        languageOptions: {
+            globals: {
+                ...globals.node,
+            }
+        }
+    },
+    {
+        // Global rule settings
+        rules: {
+            "no-prototype-builtins": "off", // Complains about any use of hasOwnProperty()
+            "no-unused-vars": "off", // Temporary, we just have a lot of these
+            "no-debugger": "warn",
+            "no-async-promise-executor": "off",  // We do this quite often and it's fine
+        }
+    },
+];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "puter.com",
-  "version": "1.0.0",
+  "version": "2.3.0",
   "author": "Puter Technologies Inc.",
   "license": "AGPL-3.0-only",
   "description": "Desktop environment in the browser!",
@@ -11,10 +11,13 @@
     "lib": "lib"
   },
   "devDependencies": {
+    "@eslint/js": "^9.1.1",
     "chalk": "^4.1.0",
     "clean-css": "^5.3.2",
     "dotenv": "^16.4.5",
+    "eslint": "^9.1.1",
     "express": "^4.18.2",
+    "globals": "^15.0.0",
     "html-entities": "^2.3.3",
     "nodemon": "^3.1.0",
     "uglify-js": "^3.17.4",
@@ -22,11 +25,12 @@
     "webpack-cli": "^5.1.1"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "mocha ./packages/phoenix/test ./packages/phoenix/packages/contextlink/test",
     "start=gui": "nodemon --exec \"node dev-server.js\" ",
     "start": "node run-selfhosted.js",
     "build": "node ./build.js",
-    "check-translations": "node tools/check-translations.js"
+    "check-translations": "node tools/check-translations.js",
+    "postinstall": "cd packages/phoenix && cd packages/contextlink && npm install && cd - && cd packages/strataparse && npm install && cd - && cd packages/pty && npm install"
   },
   "workspaces": [
     "packages/*"

packages/backend/doc/contributors/boot-sequence.md

@@ -0,0 +1,87 @@
+# Puter Backend Boot Sequence
+
+This document describes the boot sequence of Puter's backend.
+
+**Constriction**
+  - Data structures are created
+
+**Initialization**
+  - Registries are populated
+  - Services prepare for next phase
+
+**Consolidation**
+  - Service event bus receives first event (`boot.consolidation`)
+  - Services perform coordinated setup behaviors
+  - Services prepare for next phase
+
+**Activation**
+  - Blocking listeners of `boot.consolidation` have resolved
+  - HTTP servers start listening
+
+**Ready**
+  - Services are informed that Puter is providing service
+
+## Boot Phases
+
+### Construction
+
+Services implement a method called `construct` which initializes members
+of an instance. Services do not override the class constructor of
+**BaseService**. This makes it possible to use the `new` operator without
+invoking a service's constructor behavior during debugging.
+
+The first phase of the boot sequence, "construction", is simply a loop to
+call `construct` on all registered services.
+
+The `_construct` override should not:
+- call other services
+- emit events
+
+### Initialization
+
+At initialization, the `init()` method is called on all services.
+The `_init` override can be used to:
+- register information with other services, when services don't
+  need to register this information in a specific sequence.
+  An example of this is registering commands with CommandService.
+- perform setup that is required before the consolidation phase starts.
+
+### Consolidation
+
+Consolidation is a phase where services should emit events that
+are related to bringing up the system. For example, WebServerService
+('web-server') emits an event telling services to install middlewares,
+and later emits an event telling services to install routes.
+
+Consolidation starts when Kernel emits `boot.consolidation` to the
+services event bus, which happens after `init()` resolves for all
+services.
+
+### Activation
+
+Activation is a phase where services begin listening on external
+interfaces. For example, this is when the web server starts listening.
+
+Activation starts when Kernel emits `boot.activation`.
+
+### Ready
+
+Ready is a phase where services are informed that everything is up.
+
+Ready starts when Kernel emits `boot.ready`.
+
+## Events and Asynchronous Execution
+
+The services event bus is implemented so you can `await` a call to `.emit()`.
+Event listeners can choose to have blocking behavior by returning a promise.
+
+During emission of a particular event, listeners of this event will not
+block each other, but all listeners must resolve before the call to
+`.emit()` is resolved. (i.e. `emit` uses `Promise.all`)
+
+## Legacy Services
+
+Some services were implemented before the `BaseService` class - which
+implements the `init` method - was created. These services are called
+"legacy services" and they are instantiated _after_ initialization but
+_before_ consolidation.

packages/backend/doc/contributors/index.md

@@ -55,8 +55,8 @@ If your answer is the second, you should find a way to
 In my experience, the harder I think about the correct way to implement
 something, the bigger a mistake I'm going to make; ***unless*** a big part
 of the reason I'm thinking so hard is because I want to find a solution
-that reduces complexity and has the right maintanence trade-off.
+that reduces complexity and has the right maintenance trade-off.
 There's no easy solution for this so just keep it in mind; there are some
 things we might write 2 times, 3 times, even more times over before we
 really get it right and *that's okay*; sometimes part of doing useful work is
-doing the useless work that reveals what the useful work is.
+doing the useless work that reveals what the useful work is.

packages/backend/exports.js

@@ -18,8 +18,9 @@
  */
 const CoreModule = require("./src/CoreModule.js");
 const { Kernel } = require("./src/Kernel.js");
-const LocalDiskStorageModule = require("./src/LocalDiskStorageModule.js");
 const DatabaseModule = require("./src/DatabaseModule.js");
+const LocalDiskStorageModule = require("./src/LocalDiskStorageModule.js");
+const SelfHostedModule = require("./src/SelfHostedModule.js");
 const PuterDriversModule = require("./src/PuterDriversModule.js");
 const { testlaunch } = require("./src/index.js");
 const BaseService = require("./src/services/BaseService.js");
@@ -44,4 +45,5 @@ module.exports = {
     DatabaseModule,
     PuterDriversModule,
     LocalDiskStorageModule,
+    SelfHostedModule,
 };

packages/backend/package.json

@@ -1,17 +1,15 @@
 {
   "name": "@heyputer/backend",
-  "version": "1.0.0",
+  "version": "2.1.0",
   "description": "Backend/Kernel for Puter",
   "main": "exports.js",
   "scripts": {
     "test": "npx mocha"
   },
-  "workspaces": [
-    "packages/*"
-  ],
   "dependencies": {
     "@heyputer/kv.js": "^0.1.3",
     "@heyputer/multest": "^0.0.2",
+    "@heyputer/puter-js-common": "^1.0.0",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/auto-instrumentations-node": "^0.43.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.40.0",
@@ -30,11 +28,13 @@
     "composite-error": "^1.0.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
+    "dedent": "^1.5.3",
     "express": "^4.18.2",
     "file-type": "^18.5.0",
     "form-data": "^4.0.0",
     "handlebars": "^4.7.8",
     "helmet": "^7.0.0",
+    "hi-base32": "^0.5.1",
     "html-entities": "^2.3.3",
     "is-glob": "^4.0.3",
     "isbot": "^3.7.1",
@@ -54,6 +54,7 @@
     "nodemailer": "^6.9.3",
     "on-finished": "^2.4.1",
     "openai": "^4.20.1",
+    "otpauth": "9.2.4",
     "prompt-sync": "^4.2.0",
     "recursive-readdir": "^2.2.3",
     "response-time": "^2.3.2",

packages/backend/packages/puter-js-common/README.md

@@ -1,7 +1,7 @@
 # Puter - Common Javascript Module
 
 This is a small module for javascript which you might call a
-"langauge tool"; it adds some behavior to make javascript classes
+"language tool"; it adds some behavior to make javascript classes
 more flexible, with an aim to avoid any significant complexity.
 
 Each class in this module is best described as an _idea_:
@@ -9,7 +9,7 @@ Each class in this module is best described as an _idea_:
 ### BasicBase
 
 **BasicBase** is the idea that there should be a common way to
-see the inheretence chain of the current instance, and obtain
+see the inheritance chain of the current instance, and obtain
 merged objects and arrays from static members of these classes.
 
 ### TraitBase

packages/backend/packages/puter-js-common/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "puter-js-common",
+  "name": "@heyputer/puter-js-common",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/backend/src/CoreModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { Context } = require('./util/context');
 
 
@@ -43,6 +43,11 @@ module.exports = CoreModule;
 const install = async ({ services, app }) => {
     const config = require('./config');
 
+    // /!\ IMPORTANT /!\
+    // For new services, put the import immediate above the
+    // call to services.registerService. We'll clean this up
+    // in a future PR.
+
     const { LogService } = require('./services/runtime-analysis/LogService');
     const { PagerService } = require('./services/runtime-analysis/PagerService');
     const { AlarmService } = require('./services/runtime-analysis/AlarmService');
@@ -182,9 +187,32 @@ const install = async ({ services, app }) => {
     const { EventService } = require('./services/EventService');
     services.registerService('event', EventService);
 
-    const DefaultUserService = require('./services/DefaultUserService');
-    services.registerService('__default-user', DefaultUserService);
+    const { PuterVersionService } = require('./services/PuterVersionService');
+    services.registerService('puter-version', PuterVersionService);
 
+    const { SessionService } = require('./services/SessionService');
+    services.registerService('session', SessionService);
+
+    const { EdgeRateLimitService } = require('./services/abuse-prevention/EdgeRateLimitService');
+    services.registerService('edge-rate-limit', EdgeRateLimitService);
+
+    const { Emailservice } = require('./services/EmailService');
+    services.registerService('email', Emailservice);
+
+    const { TokenService } = require('./services/auth/TokenService');
+    services.registerService('token', TokenService);
+
+    const { OTPService } = require('./services/auth/OTPService');
+    services.registerService('otp', OTPService);
+
+    const { UserProtectedEndpointsService } = require("./services/web/UserProtectedEndpointsService");
+    services.registerService('__user-protected-endpoints', UserProtectedEndpointsService);
+
+    const { AntiCSRFService } = require('./services/auth/AntiCSRFService');
+    services.registerService('anti-csrf', AntiCSRFService);
+
+    const { LockService } = require('./services/LockService');
+    services.registerService('lock', LockService);
 }
 
 const install_legacy = async ({ services }) => {
@@ -195,9 +223,7 @@ const install_legacy = async ({ services }) => {
     const PerformanceMonitor = require('./monitor/PerformanceMonitor');
     const { OperationTraceService } = require('./services/OperationTraceService');
     const { WSPushService } = require('./services/WSPushService');
-    const { PuterVersionService } = require('./services/PuterVersionService');
     const { ReferralCodeService } = require('./services/ReferralCodeService');
-    const { Emailservice } = require('./services/EmailService');
     const { ClientOperationService } = require('./services/ClientOperationService');
     const { EngPortalService } = require('./services/EngPortalService');
     const { AppInformationService } = require('./services/AppInformationService');
@@ -210,9 +236,7 @@ const install_legacy = async ({ services }) => {
     services.registerService('filesystem', FilesystemService);
     services.registerService('operationTrace', OperationTraceService);
     services.registerService('__event-push-ws', WSPushService);
-    services.registerService('puter-version', PuterVersionService);
     services.registerService('referral-code', ReferralCodeService);
-    services.registerService('email', Emailservice);
     services.registerService('file-cache', FileCacheService);
     services.registerService('client-operation', ClientOperationService);
     services.registerService('app-information', AppInformationService);

packages/backend/src/DatabaseModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 
 class DatabaseModule extends AdvancedBase {
     async install (context) {

packages/backend/src/Kernel.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { Context } = require('./util/context');
 
 class Kernel extends AdvancedBase {
@@ -95,11 +95,8 @@ class Kernel extends AdvancedBase {
 
         root_context.arun(async () => {
             await this._install_modules();
-        });
-
-        (async () => {
             await this._boot_services();
-        })();
+        });
 
 
         // Error.stackTraceLimit = Infinity;
@@ -155,17 +152,7 @@ class Kernel extends AdvancedBase {
         const { services } = this;
 
         await services.ready;
-        {
-            const app = services.get('web-server').app;
-            app.use(async (req, res, next) => {
-                req.services = services;
-                next();
-            });
-            await services.emit('boot.services-initialized');
-            await services.emit('install.middlewares.context-aware', { app });
-            await services.emit('install.routes', { app });
-            await services.emit('install.routes-gui', { app });
-        }
+        await services.emit('boot.consolidation');
 
         // === END: Initialize Service Registry ===
 
@@ -181,9 +168,8 @@ class Kernel extends AdvancedBase {
             });
         })();
 
-
-        await services.emit('start.webserver');
-        await services.emit('ready.webserver');
+        await services.emit('boot.activation');
+        await services.emit('boot.ready');
     }
 }
 

packages/backend/src/LocalDiskStorageModule.js

@@ -16,13 +16,16 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 
 class LocalDiskStorageModule extends AdvancedBase {
     async install (context) {
         const services = context.get('services');
         const LocalDiskStorageService = require("./services/LocalDiskStorageService");
         services.registerService('local-disk-storage', LocalDiskStorageService);
+
+        const HostDiskUsageService = require('./services/HostDiskUsageService');
+        services.registerService('host-disk-usage', HostDiskUsageService);
     }
 }
 

packages/backend/src/PuterDriversModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 
 class PuterDriversModule extends AdvancedBase {
     async install () {}

packages/backend/src/SelfHostedModule.js

@@ -0,0 +1,66 @@
+const { AdvancedBase } = require("@heyputer/puter-js-common");
+const config = require("./config");
+
+class SelfHostedModule extends AdvancedBase {
+    async install (context) {
+        const services = context.get('services');
+
+        const DefaultUserService = require('./services/DefaultUserService');
+        services.registerService('__default-user', DefaultUserService);
+
+        const ComplainAboutVersionsService = require('./services/ComplainAboutVersionsService');
+        services.registerService('complain-about-versions', ComplainAboutVersionsService);
+
+        const DevWatcherService = require('./services/DevWatcherService');
+        const path_ = require('path');
+        services.registerService('__dev-watcher', DevWatcherService, {
+            root: path_.resolve(__dirname, '../../../'),
+            commands: [
+                {
+                    name: 'puter.js:webpack-watch',
+                    directory: 'packages/puter-js',
+                    command: 'npm',
+                    args: ['run', 'start-webpack'],
+                },
+                {
+                    name: 'terminal:rollup-watch',
+                    directory: 'packages/terminal',
+                    command: 'npx',
+                    args: ['rollup', '-c', 'rollup.config.js', '--watch'],
+                    env: {
+                        PUTER_JS_URL: ({ global_config: config }) => config.origin + '/sdk/puter.dev.js',
+                    }
+                },
+                {
+                    name: 'phoenix:rollup-watch',
+                    directory: 'packages/phoenix',
+                    command: 'npx',
+                    args: ['rollup', '-c', 'rollup.config.js', '--watch'],
+                    env: {
+                        PUTER_JS_URL: ({ global_config: config }) => config.origin + '/sdk/puter.dev.js',
+                    }
+                },
+            ],
+        });
+
+        const ServeStaticFilesService = require("./services/ServceStaticFilesService");
+        services.registerService('__serve-puterjs', ServeStaticFilesService, {
+            directories: [
+                {
+                    prefix: '/sdk',
+                    path: path_.resolve(__dirname, '../../../packages/puter-js/dist'),
+                },
+                {
+                    prefix: '/builtin/terminal',
+                    path: path_.resolve(__dirname, '../../../packages/terminal/dist'),
+                },
+                {
+                    prefix: '/builtin/phoenix',
+                    path: path_.resolve(__dirname, '../../../packages/phoenix/dist'),
+                },
+            ],
+        });
+    }
+}
+
+module.exports = SelfHostedModule;

packages/backend/src/ThirdPartyDriversModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 
 class ThirdPartyDriversModule extends AdvancedBase {
     // constructor () {

packages/backend/src/api/APIError.js

@@ -128,6 +128,10 @@ module.exports = class APIError {
                 return `Invalid id`;
             }
         },
+        'invalid_operation': {
+            status: 400,
+            message: ({ operation }) => `Invalid operation: ${quot(operation)}.`,
+        },
         'field_invalid': {
             status: 400,
             message: ({ key, expected, got }) => {
@@ -216,6 +220,10 @@ module.exports = class APIError {
             status: 400,
             message: 'Missing fileinfo entry or BLOB for operation.',
         },
+        'invalid_file_metadata': {
+            status: 400,
+            message: 'Invalid file metadata.',
+        },
 
         // Open
         'no_suitable_app': {
@@ -315,6 +323,10 @@ module.exports = class APIError {
             status: 401,
             message: 'This authentication token is not supported here.',
         },
+        'token_expired': {
+            status: 401,
+            message: 'Authentication token has expired.',
+        },
         'account_suspended': {
             status: 403,
             message: 'Account suspended.',
@@ -327,6 +339,40 @@ module.exports = class APIError {
             status: 403,
             message: 'Attempted to create an access token with no permissions.',
         },
+        'invalid_action': {
+            status: 400,
+            message: ({ action }) => `Invalid action: ${quot(action)}.`,
+        },
+        '2fa_already_enabled': {
+            status: 409,
+            message: '2FA is already enabled.',
+        },
+        '2fa_not_configured': {
+            status: 409,
+            message: '2FA is not configured.',
+        },
+
+        // protected endpoints
+        'too_many_requests': {
+            status: 429,
+            message: 'Too many requests.',
+        },
+        'user_tokens_only': {
+            status: 403,
+            message: 'This endpoint must be requested with a user session',
+        },
+        'temporary_accounts_not_allowed': {
+            status: 403,
+            message: 'Temporary accounts cannot perform this action',
+        },
+        'password_required': {
+            status: 400,
+            message: 'Password is required.',
+        },
+        'password_mismatch': {
+            status: 403,
+            message: 'Password does not match.',
+        },
 
         // Object Mapping
         'field_not_allowed_for_create': {

packages/backend/src/api/filesystem/FlagParam.js

@@ -16,6 +16,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+const APIError = require('../../api/APIError');
+
 module.exports = class FlagParam {
     constructor (srckey, options) {
         this.srckey = srckey;

packages/backend/src/api/filesystem/StringParam.js

@@ -16,6 +16,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+const APIError = require('../../api/APIError');
+
 module.exports = class StringParam {
     constructor (srckey, options) {
         this.srckey = srckey;

packages/backend/src/boot/RuntimeEnvironment.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { quot } = require("../util/strutil");
 const { TechnicalError } = require("../errors/TechnicalError");
 const { print_error_help } = require("../errors/error_help_details");

packages/backend/src/codex/Sequence.js

@@ -109,7 +109,7 @@ class Sequence {
         async run (values) {
             // Initialize scope
             values = values || this.thisArg?.values || {};
-            Object.assign(this.scope_, values);
+            Object.assign(this.scope_, values); // TODO: can this be __proto__?
 
             // Run sequence
             for ( ; this.i < this.steps.length ; this.i++ ) {

packages/backend/src/config.js

@@ -53,10 +53,17 @@ config.max_subdomains_per_user = 2000;
 config.storage_capacity = 1*1024*1024*1024;
 config.static_hosting_domain = '-static.puter.local';
 
+// Storage limiting is set to false by default
+// Storage available on the mountpoint/drive puter is running is the storage available
+config.is_storage_limited = false;
+config.available_device_storage = null;
+
 config.thumb_width = 80;
 config.thumb_height = 80;
 config.app_max_icon_size = 5*1024*1024;
 
+config.defaultjs_asset_path = '../../';
+
 // config.origin = config.protocol + '://' + config.domain;
 // config.api_base_url = config.protocol + '://api.' + config.domain;
 // config.social_card = `${config.origin}/assets/img/screenshot.png`;
@@ -92,6 +99,10 @@ if (config.server_id) {
 
 config.contact_email = 'hey@' + config.domain;
 
+// TODO: default value will be changed to false in a future release;
+//       details to follow in a future announcement.
+config.legacy_token_migrate = true;
+
 module.exports = config;
 
 // NEW_CONFIG_LOADING
@@ -100,7 +111,9 @@ const computed_defaults = {
     pub_port: config => config.http_port,
     origin: config => config.protocol + '://' + config.domain +
         (config.pub_port !== 80 && config.pub_port !== 443 ? ':' + config.pub_port : ''),
-    api_base_url: config => config.protocol + '://api.' + config.domain +
+    api_base_url: config => config.experimental_no_subdomain
+        ? config.origin
+        : config.protocol + '://api.' + config.domain +
         (config.pub_port !== 80 && config.pub_port !== 443 ? ':' + config.pub_port : ''),
     social_card: config => `${config.origin}/assets/img/screenshot.png`,
 };

packages/backend/src/config/ConfigLoader.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { quot } = require("../util/strutil");
 
 class ConfigLoader extends AdvancedBase {

packages/backend/src/filesystem/FSNodeContext.js

@@ -387,21 +387,9 @@ module.exports = class FSNodeContext {
      * @deprecated sharing will use user-to-user permissions
      */
     async fetchShares (force) {
-        if ( this.entry.permissions && ! force ) return;
-
-        const db = this.services.get('database').get(DB_READ, 'filesystem');
-
-        let shares = await db.read(
-            `SELECT share.id as share_id, user.* FROM share
-                INNER JOIN user ON share.recipient_user_id = user.id
-                WHERE share.fsentry_id = ?`,
-            [this.entry.id]
-        );
-        const shares_tidy = [];
-        for ( const share of shares ) {
-            shares_tidy.push({uid: share.share_id, username: share.username, email: share.email});
-        }
-        this.entry.permissions = shares_tidy;
+        // NOOP: this was for legacy sharing functionality;
+        // this is being re-implemented with permissions
+        return;
     }
 
     /**

packages/backend/src/filesystem/FilesystemService.js

@@ -27,15 +27,17 @@ const SystemFSEntryService = require('./storage/SystemFSEntryService.js');
 const PerformanceMonitor = require('../monitor/PerformanceMonitor.js');
 const { NodePathSelector, NodeUIDSelector, NodeInternalIDSelector } = require('./node/selectors.js');
 const FSNodeContext = require('./FSNodeContext.js');
-const { AdvancedBase } = require('puter-js-common');
+const { AdvancedBase } = require('@heyputer/puter-js-common');
 const { Context } = require('../util/context.js');
 const { simple_retry } = require('../util/retryutil.js');
 const APIError = require('../api/APIError.js');
 const { LLMkdir } = require('./ll_operations/ll_mkdir.js');
 const { LLCWrite, LLOWrite } = require('./ll_operations/ll_write.js');
 const { LLCopy } = require('./ll_operations/ll_copy.js');
-const { PermissionUtil, PermissionRewriter } = require('../services/auth/PermissionService.js');
+const { PermissionUtil, PermissionRewriter, PermissionImplicator } = require('../services/auth/PermissionService.js');
 const { DB_WRITE } = require("../services/database/consts");
+const { UserActorType } = require('../services/auth/Actor');
+const { get_user } = require('../helpers');
 
 class FilesystemService extends AdvancedBase {
     static MODULES = {
@@ -131,6 +133,38 @@ class FilesystemService extends AdvancedBase {
                 return `fs:${uid}:${rest.join(':')}`;
             },
         }));
+        svc_permission.register_implicator(PermissionImplicator.create({
+            matcher: permission => {
+                return permission.startsWith('fs:');
+            },
+            checker: async (actor, permission) => {
+                if ( !(actor.type instanceof UserActorType) ) {
+                    return undefined;
+                }
+
+                const [_, uid] = PermissionUtil.split(permission);
+                const node = await this.node(new NodeUIDSelector(uid));
+
+                if ( ! await node.exists() ) {
+                    return undefined;
+                }
+
+                const owner_id = await node.get('user_id');
+                
+                // These conditions should never happen
+                if ( ! owner_id || ! actor.type.user.id ) {
+                    throw new Error(
+                        'something unexpected happened'
+                    );
+                }
+
+                if ( owner_id === actor.type.user.id ) {
+                    return {};
+                }
+
+                return undefined;
+            },
+        }));
     }
 
     /**
@@ -328,7 +362,7 @@ class FilesystemService extends AdvancedBase {
             [new_path, old_path.length + 1, old_path + '%', user_id]
         );
 
-        const log = services.get('log-service').create('update_child_paths');
+        const log = this.services.get('log-service').create('update_child_paths');
         log.info(`updated ${old_path} -> ${new_path}`);
 
         monitor.end();

packages/backend/src/filesystem/batch/BatchExecutor.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require('puter-js-common');
+const { AdvancedBase } = require('@heyputer/puter-js-common');
 const PathResolver = require('../../routers/filesystem_api/batch/PathResolver');
 const commands = require('./commands').commands;
 const { WorkUnit } = require('../../services/runtime-analysis/ExpectationService');
@@ -85,6 +85,12 @@ class BatchExecutor extends AdvancedBase {
             if ( ! x ) throw new Error('no context');
 
             try {
+                if ( ! command_cls ) {
+                    throw APIError.create('invalid_operation', null, {
+                        operation: op.op,
+                    });
+                }
+
                 if ( file ) workUnit.checkpoint(
                     'about to run << ' +
                     (file.originalname ?? file.name) +
@@ -112,7 +118,7 @@ class BatchExecutor extends AdvancedBase {
                         alarm: true,
                     });
 
-                    e = APIError.adapt(e);
+                    e = APIError.adapt(e); // eslint-disable-line no-ex-assign
                 }
 
                 // Consume stream if there's a file

packages/backend/src/filesystem/batch/commands.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { AsyncProviderTrait } = require("../../traits/AsyncProviderTrait");
 const { HLMkdir, QuickMkdir } = require("../hl_operations/hl_mkdir");
 const { Context } = require("../../util/context");

packages/backend/src/filesystem/hl_operations/hl_copy.js

@@ -23,6 +23,7 @@ const { NodePathSelector, RootNodeSelector } = require("../node/selectors");
 const { HLFilesystemOperation } = require("./definitions");
 const { MkTree } = require("./hl_mkdir");
 const { HLRemove } = require("./hl_remove");
+const config = require("../../config");
 
 class HLCopy extends HLFilesystemOperation {
     static DESCRIPTION = `
@@ -141,7 +142,7 @@ class HLCopy extends HLFilesystemOperation {
             let deset_usage = await sizeService.get_usage(dest_user.id);
 
             const size = await source.fetchSize(values.user);
-            let capacity = (dest_user.free_storage === undefined || dest_user.free_storage === null) ? config.storage_capacity : dest_user.free_storage
+            let capacity = config.is_storage_limited ? (dest_user.free_storage === undefined || dest_user.free_storage === null) ? config.storage_capacity : dest_user.free_storage : config.available_device_storage
             if(capacity - deset_usage - size < 0){
                 throw APIError.create('storage_limit_reached');
             }
@@ -162,6 +163,7 @@ class HLCopy extends HLFilesystemOperation {
             throw APIError('cannot_copy_item_into_itself');
         }
 
+        let overwritten;
         if ( await dest.exists() ) {
             // condition: no overwrite behaviour specified
             if ( ! values.overwrite && ! values.dedupe_name ) {
@@ -188,12 +190,13 @@ class HLCopy extends HLFilesystemOperation {
                 dest = await parent.getChild(target_name);
             }
             else if ( values.overwrite ) {
-                if ( ! await chkperm(dest.entry, options.user.id, 'rm') ) {
+                if ( ! await chkperm(dest.entry, values.user.id, 'rm') ) {
                     throw APIError.create('forbidden');
                 }
 
                 // TODO: This will be LLRemove
                 // TODO: what to do with parent_operation?
+                overwritten = await dest.getSafeEntry();
                 const hl_remove = new HLRemove();
                 await hl_remove.run({
                     target: dest,
@@ -212,7 +215,10 @@ class HLCopy extends HLFilesystemOperation {
 
         await this.copied.awaitStableEntry();
         const response = await this.copied.getSafeEntry({ thumbnail: true });
-        return response;
+        return {
+            copied : response,
+            overwritten
+        };
     }
 }
 

packages/backend/src/filesystem/hl_operations/hl_data_read.js

@@ -18,6 +18,9 @@
  */
 const { stream_to_buffer } = require("../../util/streamutil");
 const { HLFilesystemOperation } = require("./definitions");
+const { chkperm } = require('../../helpers');
+const { LLRead } = require('../ll_operations/ll_read');
+const APIError = require('../../api/APIError');
 
 /**
  * HLDataRead reads a stream of objects from a file containing structured data.
@@ -38,6 +41,7 @@ class HLDataRead extends HLFilesystemOperation {
 
         const {
             fsNode,
+            version_id,
         } = this.values;
 
         if ( ! await fsNode.exists() ) {
@@ -85,6 +89,7 @@ class HLDataRead extends HLFilesystemOperation {
     }
 
     _stream_jsonl_lines_to_objects (stream) {
+        const { PassThrough } = this.modules.stream;
         const output_stream = new PassThrough();
         (async () => {
             for await (const line of stream) {

packages/backend/src/filesystem/hl_operations/hl_mkdir.js

@@ -63,6 +63,7 @@ class MkTree extends HLFilesystemOperation {
 
     async _run () {
         const { values, context } = this;
+        const fs = context.get('services').get('filesystem');
 
         await this.create_branch_({
             parent_node: values.parent || await fs.node(new RootNodeSelector()),

packages/backend/src/filesystem/hl_operations/hl_move.js

@@ -17,13 +17,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const APIError = require("../../api/APIError");
-const { chkperm, validate_fsentry_name, is_ancestor_of } = require("../../helpers");
+const { chkperm, validate_fsentry_name, is_ancestor_of, df, get_user } = require("../../helpers");
 const { LLMove } = require("../ll_operations/ll_move");
 const { RootNodeSelector } = require("../node/selectors");
 const { HLFilesystemOperation } = require("./definitions");
 const { MkTree } = require("./hl_mkdir");
 const { HLRemove } = require("./hl_remove");
 const { TYPE_DIRECTORY } = require("../FSNodeContext");
+const config = require("../../config");
 
 class HLMove extends HLFilesystemOperation {
     static MODULES = {
@@ -105,7 +106,7 @@ class HLMove extends HLFilesystemOperation {
                 dest_user = source_user;
             await source.fetchSize();
             const item_size = source.entry.size;
-            let capacity = (dest_user.free_storage === undefined || dest_user.free_storage === null) ? config.storage_capacity : dest_user.free_storage
+            let capacity = config.is_storage_limited ? (dest_user.free_storage === undefined || dest_user.free_storage === null) ? config.storage_capacity : dest_user.free_storage : config.available_device_storage;
             if(capacity - await df(dest_user.id) - item_size < 0){
                 throw APIError.create('storage_limit_reached');
             }

packages/backend/src/filesystem/hl_operations/hl_read.js

@@ -41,7 +41,7 @@ class HLRead extends HLFilesystemOperation {
         }
 
         const ll_read = new LLRead();
-        const stream = await ll_read.run({
+        let stream = await ll_read.run({
             fsNode, actor,
             version_id,
             ...(byte_count !== undefined ? {

packages/backend/src/filesystem/hl_operations/hl_readdir.js

@@ -24,7 +24,7 @@ const { HLFilesystemOperation } = require("./definitions");
 
 class HLReadDir extends HLFilesystemOperation {
     async _run () {
-        const { subject, user, no_thumbs, no_assocs } = this.values;
+        const { subject, user, no_thumbs, no_assocs, actor } = this.values;
 
         if ( ! await subject.exists() ) {
             throw APIError.create('subject_does_not_exist');
@@ -49,12 +49,12 @@ class HLReadDir extends HLFilesystemOperation {
                 await child.fetchSubdomains(user);
             }
             const fs = require('fs');
-            fs.appendFileSync('/tmp/children.log',
-                JSON.stringify({
-                    no_thumbs,
-                    no_assocs,
-                    entry: child.entry,
-                }) + '\n');
+            // fs.appendFileSync('/tmp/children.log',
+            //     JSON.stringify({
+            //         no_thumbs,
+            //         no_assocs,
+            //         entry: child.entry,
+            //     }) + '\n');
             return await child.getSafeEntry({ thumbnail: ! no_thumbs });
         }));
     }

packages/backend/src/filesystem/hl_operations/hl_stat.js

@@ -19,6 +19,7 @@
 const { chkperm } = require("../../helpers");
 const { Context } = require("../../util/context");
 const { HLFilesystemOperation } = require("./definitions");
+const APIError = require('../../api/APIError');
 
 class HLStat extends HLFilesystemOperation {
     static MODULES = {
@@ -45,7 +46,7 @@ class HLStat extends HLFilesystemOperation {
         const svc_acl = context.get('services').get('acl');
         const actor = context.get('actor');
         if ( ! await svc_acl.check(actor, subject, 'read') ) {
-            throw await svc_acl.get_safe_acl_error(actor, subject.entry, 'read');
+            throw await svc_acl.get_safe_acl_error(actor, subject, 'read');
         }
 
         // check permission

packages/backend/src/filesystem/hl_operations/hl_write.js

@@ -61,8 +61,8 @@ class WriteCommonTrait {
             const { file, user } = this.values;
 
             const usage = await sizeService.get_usage(user.id);
-            let capacity = user.free_storage == undefined
-                ? config.storage_capacity : user.free_storage;
+            let capacity = config.is_storage_limited ? user.free_storage == undefined
+                ? config.storage_capacity : user.free_storage : config.available_device_storage;
             if( capacity - usage - file.size < 0 ) {
                 throw APIError.create('storage_limit_reached');
             }

packages/backend/src/filesystem/lib/PuterPath.js

@@ -64,10 +64,6 @@ class PuterPath {
         return ! this.isAbsolute();
     }
 
-    get hasRelativePortion () {
-
-    }
-
     get reference () {
         if ( this.isAbsolute ) return this.constructor.NULL_UUID;
 

packages/backend/src/filesystem/ll_operations/ll_copy_idea.js

@@ -30,6 +30,7 @@
     - easier to diagnose stuck operations
 
 */
+/* eslint-disable */
 
 const STEPS_COPY_CONTENTS = [
     {

packages/backend/src/filesystem/ll_operations/ll_read.js

@@ -91,7 +91,7 @@ class LLRead extends LLFilesystemOperation {
                 const context = a.iget('context');
                 const svc_fileCache = context.get('services').get('file-cache');
 
-                const { fsNode } = a.values();
+                const { fsNode, offset, length } = a.values();
 
                 const maybe_buffer = await svc_fileCache.try_get(fsNode, a.log);
                 if ( maybe_buffer ) {

packages/backend/src/filesystem/ll_operations/ll_readdir.js

@@ -17,9 +17,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const APIError = require("../../api/APIError");
-const { chkperm, get_descendants } = require("../../helpers");
-const { TYPE_DIRECTORY } = require("../FSNodeContext");
-const { NodeUIDSelector, NodeRawEntrySelector } = require("../node/selectors");
+const { RootNodeSelector } = require("../node/selectors");
+const { NodeUIDSelector, NodeChildSelector } = require("../node/selectors");
 const { LLFilesystemOperation } = require("./definitions");
 
 class LLReadDir extends LLFilesystemOperation {
@@ -42,27 +41,14 @@ class LLReadDir extends LLFilesystemOperation {
         const svc_fsentry = svc.get('fsEntryService');
         const svc_fs = svc.get('filesystem');
 
-        if (
-            subject.isRoot ||
-            (await subject.isUserDirectory() && subject.name !== user.username)
-        ) {
-            this.checkpoint('before call to get_descendants')
-            const entries = await get_descendants(
-                await subject.get('path'),
-                user,
-                1, true,
-            )
-            this.checkpoint('after call to get_descendants')
-
-            const children = await Promise.all(entries.map(async entry => {
-                const node = await svc_fs.node(new NodeRawEntrySelector(entry));
-                node.found_thumbnail = false;
-                return node;
-            }))
-
-            this.checkpoint('after get children (2)');
-
-            return children;
+        if ( subject.isRoot ) {
+            if ( ! actor.type.user ) return [];
+            return [
+                await svc_fs.node(new NodeChildSelector(
+                    new RootNodeSelector(),
+                    actor.type.user.username,
+                ))
+            ];
         }
 
         this.checkpoint('before get direct descendants')

packages/backend/src/filesystem/ll_operations/ll_rmnode.js

@@ -19,6 +19,7 @@
 const { Context } = require("../../util/context");
 const { ParallelTasks } = require("../../util/otelutil");
 const { LLFilesystemOperation } = require("./definitions");
+const APIError = require("../../api/APIError");
 
 class LLRmNode extends LLFilesystemOperation {
     async _run () {

packages/backend/src/filesystem/storage/DatabaseFSEntryService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { id2path } = require("../../helpers");
 
 const { PuterPath } = require("../lib/PuterPath");

packages/backend/src/filesystem/storage/SystemFSEntryService.js

@@ -17,6 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const { PuterPath } = require("../lib/PuterPath");
+const _path = require('path');
 
 // Redis keys:
 // <env>:<service>:<class>:<type>:<property>:<id>

packages/backend/src/filesystem/validation.js

@@ -22,10 +22,12 @@ This module contains functions that validate filesystem operations.
 
 */
 
+/* eslint-disable no-control-regex */
+
 const config = require("../config");
 
 const path_excludes = () => /[\x00-\x1F]/g;
-const node_excludes = () => /[\/\x00-\x1F]/g;
+const node_excludes = () => /[/\x00-\x1F]/g;
 
 // this characters are not allowed in path names because
 // they might be used to trick the user into thinking

packages/backend/src/helpers.js

@@ -184,7 +184,7 @@ async function id2uuid(id){
 
     const cached = options.cached ?? true;
 
-    if ( cached ) {
+    if ( cached && ! options.force ) {
         if (options.username) user = kv.get('users:username:' + options.username);
         else if (options.email) user = kv.get('users:email:' + options.email);
         else if (options.uuid) user = kv.get('users:uuid:' + options.uuid);
@@ -194,16 +194,18 @@ async function id2uuid(id){
         if ( user ) return user;
     }
 
-    if(options.username)
-        user = await db.read("SELECT * FROM `user` WHERE `username` = ? LIMIT 1", [options.username]);
-    else if(options.email)
-        user = await db.read("SELECT * FROM `user` WHERE `email` = ? LIMIT 1", [options.email]);
-    else if(options.uuid)
-        user = await db.read("SELECT * FROM `user` WHERE `uuid` = ? LIMIT 1", [options.uuid]);
-    else if(options.id)
-        user = await db.read("SELECT * FROM `user` WHERE `id` = ? LIMIT 1", [options.id]);
-    else if(options.referral_code)
-        user = await db.read("SELECT * FROM `user` WHERE `referral_code` = ? LIMIT 1", [options.referral_code]);
+    if ( ! options.force ) {
+        if(options.username)
+            user = await db.read("SELECT * FROM `user` WHERE `username` = ? LIMIT 1", [options.username]);
+        else if(options.email)
+            user = await db.read("SELECT * FROM `user` WHERE `email` = ? LIMIT 1", [options.email]);
+        else if(options.uuid)
+            user = await db.read("SELECT * FROM `user` WHERE `uuid` = ? LIMIT 1", [options.uuid]);
+        else if(options.id)
+            user = await db.read("SELECT * FROM `user` WHERE `id` = ? LIMIT 1", [options.id]);
+        else if(options.referral_code)
+            user = await db.read("SELECT * FROM `user` WHERE `referral_code` = ? LIMIT 1", [options.referral_code]);
+    }
 
     if(!user || !user[0]){
         if(options.username)
@@ -679,7 +681,7 @@ const get_descendants_0 = async (path, user, depth, return_thumbnail = false) =>
             [user.id]
         );
         // users that have shared files/dirs with this user
-        sharing_users = await db.read(
+        const sharing_users = await db.read(
             `SELECT DISTINCT(owner_user_id), user.username
                 FROM share
                 INNER JOIN user ON user.id = share.owner_user_id
@@ -717,7 +719,7 @@ const get_descendants_0 = async (path, user, depth, return_thumbnail = false) =>
             return [];
 
         // shared files/dirs with this user
-        shared_fsentries = await db.read(
+        const shared_fsentries = await db.read(
             `SELECT
                 fsentries.id, fsentries.user_id, fsentries.uuid, fsentries.parent_uid, fsentries.bucket, fsentries.bucket_region,
                 fsentries.name, fsentries.shortcut_to, fsentries.is_shortcut, fsentries.metadata, fsentries.is_dir, fsentries.modified,
@@ -897,7 +899,7 @@ const get_descendants = async (...args) => {
         if ( ! result || ! result[0] ) {
             errors.report('id2path.select', {
                 alarm: true,
-                message: `no result for ${entry_uid}: ${e.message}`,
+                message: `no result for ${entry_uid}`,
                 extra: {
                     entry_uid,
                 }
@@ -951,12 +953,12 @@ function cp(source_path, dest_path, user, overwrite, change_name, check_perms =
     throw new Error(`legacy copy function called`);
 }
 
-isString =  function (variable) {
+function isString(variable) {
     return typeof variable === 'string' || variable instanceof String;
 }
 
 // checks to see if given variable is an object
-isObject = function (variable) {
+function isObject(variable) {
     return variable !== null && typeof variable === 'object';
 }
 
@@ -1128,6 +1130,7 @@ async function deleteUser(user_id){
 }
 
 function subdomain(req){
+    if ( config.experimental_no_subdomain ) return 'api';
     return req.hostname.slice(0, -1 * (config.domain.length + 1));
 }
 
@@ -1143,10 +1146,10 @@ async function jwt_auth(req){
     else if(req.query && req.query.auth_token)
         token = req.query.auth_token;
     // Socket
-    else if(req.handshake && req.handshake.query && req.handshake.query.auth_token)
-        token = req.handshake.query.auth_token;
+    else if(req.handshake && req.handshake.auth && req.handshake.auth.auth_token)
+        token = req.handshake.auth.auth_token;
 
-    if(!token)
+    if(!token || token === 'null')
         throw('No auth token found');
     else if (typeof token !== 'string')
         throw('token must be a string.')
@@ -1154,34 +1157,22 @@ async function jwt_auth(req){
         token = token.replace('Bearer ', '')
 
     try{
-        const jwt = require('jsonwebtoken');
-        const decoded = jwt.verify(token, config.jwt_secret)
+        const svc_auth = Context.get('services').get('auth');
+        const actor = await svc_auth.authenticate_from_token(token);
 
-        if ( decoded.type ) {
-            // This is usually not the correct way to throw an APIError;
-            // this is a workaround for the existing error handling in auth,
-            // which is well tested, stable, and legacy (no sense in refactoring)
+        if ( ! actor.type?.constructor?.name === 'UserActorType' ) {
             throw({
                 message: APIError.create('token_unsupported')
                     .serialize(),
             });
         }
 
-        /** @type BaseDatabaseAccessService */
-        const db = services.get('database').get(DB_READ, 'filesystem');
-
-        // in the vast majority of cases looking up a user should succeed unless the request is invalid (rare case),
-        // that's why we first hit up the read replica and if not successful we try the master DB
-        let user = await db.requireRead('SELECT * FROM `user` WHERE `uuid` = ? LIMIT 1', [decoded.uuid]);
-
-        // unsuccessful
-        if(!user[0])
-            throw('');
-        // successful
-        else {
-            return {user: user[0], token: token};
-        }
+        return {
+            user: actor.type.user,
+            token: token,
+        };
     }catch(e){
+        console.log('ERROR', e);
         throw(e.message);
     }
 }
@@ -1556,56 +1547,16 @@ async function generate_system_fsentries(user){
 }
 
 function send_email_verification_code(email_confirm_code, email){
-    const nodemailer = require("nodemailer");
-
-    // send email notif
-    let transporter = nodemailer.createTransport({
-        host: config.smtp_server,
-        port: config.smpt_port,
-        secure: true, // STARTTLS
-        auth: {
-            user: config.smtp_username,
-            pass: config.smtp_password,
-        },
-    });
-
-    transporter.sendMail({
-        from: '"Puter" [email protected]', // sender address
-        to: email, // list of receivers
-        subject: `${hyphenize_confirm_code(email_confirm_code)} is your confirmation code`, // Subject line
-        html: `<p>Hi there,</p>
-            <p><strong>${hyphenize_confirm_code(email_confirm_code)}</strong> is your email confirmation code.</p>
-            <p>Sincerely,</p>
-            <p>Puter</p>
-        `,
-    });
+    const svc_email = Context.get('services').get('email');
+    svc_email.send_email({ email }, 'email_verification_code', {
+        code: hyphenize_confirm_code(email_confirm_code),
+    })
 }
 
 function send_email_verification_token(email_confirm_token, email, user_uuid){
-    const nodemailer = require("nodemailer");
-
-    // send email notif
-    let transporter = nodemailer.createTransport({
-        host: config.smtp_server,
-        port: config.smpt_port,
-        secure: true, // STARTTLS
-        auth: {
-            user: config.smtp_username,
-            pass: config.smtp_password,
-        },
-    });
-
-    let link = `${config.origin}/confirm-email-by-token?user_uuid=${user_uuid}&token=${email_confirm_token}`;
-    transporter.sendMail({
-        from: '"Puter" [email protected]', // sender address
-        to: email, // list of receivers
-        subject: `Please confirm your email`, // Subject line
-        html: `<p>Hi there,</p>
-            <p>Please confirm your email address using this link: <strong><a href="${link}">${link}</a></strong>.</p>
-            <p>Sincerely,</p>
-            <p>Puter</p>
-        `,
-    });
+    const svc_email = Context.get('services').get('email');
+    const link = `${config.origin}/confirm-email-by-token?user_uuid=${user_uuid}&token=${email_confirm_token}`;
+    svc_email.send_email({ email }, 'email_verification_link', { link });
 }
 
 async function generate_random_username(){
@@ -1819,7 +1770,15 @@ async function suggest_app_for_fsentry(fsentry, options){
     monitor.end();
 
     // return list
-    return suggested_apps;
+    return suggested_apps.filter((suggested_app, pos, self) => {
+        // Remove any null values caused by calling `get_app()` for apps that don't exist.
+        // This happens on self-host because we don't include `code`, among others.
+        if (!suggested_app)
+            return false;
+
+        // Remove any duplicate entries
+        return self.indexOf(suggested_app) === pos;
+    });
 }
 
 function build_item_object(item){
@@ -1858,7 +1817,7 @@ async function get_taskbar_items(user) {
         try {
             taskbar_items_from_db = JSON.parse(user.taskbar_items);
         }catch(e){
-
+            // ignore errors
         }
     }
 

packages/backend/src/middleware/auth.js

@@ -17,35 +17,26 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 "use strict"
+const APIError = require('../api/APIError');
 const {jwt_auth} = require('../helpers');
+const { UserActorType } = require('../services/auth/Actor');
 const { DB_WRITE } = require('../services/database/consts');
 const { Context } = require('../util/context');
+const auth2 = require('./auth2');
 
 const auth = async (req, res, next)=>{
+    let auth2_ok = false;
     try{
-        let auth_res = await jwt_auth(req);
+        // Delegate to new middleware
+        await auth2(req, res, () => { auth2_ok = true; });
+        if ( ! auth2_ok ) return;
 
-        // is account suspended?
-        if(auth_res.user.suspended)
-            return res.status(401).send({error: 'Account suspended'});
-
-        // successful auth
-        req.user = auth_res.user;
-        req.token = auth_res.token;
-
-        // let's add it to the context too
-        try {
-        const x = Context.get();
-        x.set('user', req.user);
-        } catch (e) {
-        console.error(e);
+        // Everything using the old reference to the auth middleware
+        // should only allow session tokens
+        if ( ! (req.actor.type instanceof UserActorType) ) {
+            throw APIError.create('forbidden');
         }
 
-        // record as daily active users
-        const db = req.services.get('database').get(DB_WRITE, 'auth');
-        db.write('UPDATE `user` SET `last_activity_ts` = now() WHERE id=? LIMIT 1', [req.user.id]);
-
-        // go to next
         next();
     }
     // auth failed

packages/backend/src/middleware/auth2.js

@@ -18,8 +18,24 @@
  */
 const APIError = require("../api/APIError");
 const config = require("../config");
+const { UserActorType } = require("../services/auth/Actor");
+const { LegacyTokenError } = require("../services/auth/AuthService");
 const { Context } = require("../util/context");
 
+// The "/whoami" endpoint is a special case where we want to allow
+// a legacy token to be used for authentication. The "/whoami"
+// endpoint will then return a new token for further requests.
+//
+const is_whoami = (req) => {
+    if ( ! config.legacy_token_migrate ) return;
+
+    if ( req.path !== '/whoami' ) return;
+
+    // const subdomain = req.subdomains[res.subdomains.length - 1];
+    // if ( subdomain !== 'api' ) return;
+    return true;
+}
+
 // TODO: Allow auth middleware to be used without requiring
 // authentication. This will allow us to use the auth middleware
 // in endpoints that do not require authentication, but can
@@ -47,8 +63,10 @@ const auth2 = async (req, res, next) => {
 
     if(!token) {
         APIError.create('token_missing').write(res);
+        return;
     } else if (typeof token !== 'string') {
         APIError.create('token_auth_failed').write(res);
+        return;
     } else {
         token = token.replace('Bearer ', '')
     }
@@ -70,6 +88,26 @@ const auth2 = async (req, res, next) => {
             e.write(res);
             return;
         }
+        if ( e instanceof LegacyTokenError && is_whoami(req) ) {
+            const new_info = await svc_auth.check_session(token, {
+                req,
+                from_upgrade: true,
+            })
+            context.set('actor', new_info.actor);
+            context.set('user', new_info.user);
+            req.new_token = new_info.token;
+            req.token = new_info.token;
+            req.user = new_info.user;
+            req.actor = new_info.actor;
+
+            res.cookie(config.cookie_name, new_info.token, {
+                sameSite: 'none',
+                secure: true,
+                httpOnly: true,
+            });
+            next();
+            return;
+        }
         const re = APIError.create('token_auth_failed');
         re.write(res);
         return;

packages/backend/src/om/IdentifierUtil.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { WeakConstructorTrait } = require("../traits/WeakConstructorTrait");
 const { Eq, And } = require("./query/query");
 const { Entity } = require("./entitystorage/Entity");

packages/backend/src/om/definitions/Mapping.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { instance_ } = require("../../monitor/PerformanceMonitor");
 const { WeakConstructorTrait } = require("../../traits/WeakConstructorTrait");
 const { Property } = require("./Property");

packages/backend/src/om/definitions/PropType.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { WeakConstructorTrait } = require("../../traits/WeakConstructorTrait");
 
 class PropType extends AdvancedBase {

packages/backend/src/om/definitions/Property.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { WeakConstructorTrait } = require("../../traits/WeakConstructorTrait");
 
 class Property extends AdvancedBase {

packages/backend/src/om/entitystorage/AppES.js

@@ -23,7 +23,7 @@ const { AppUnderUserActorType } = require("../../services/auth/Actor");
 const { DB_WRITE } = require("../../services/database/consts");
 const { Context } = require("../../util/context");
 const { origin_from_url } = require("../../util/urlutil");
-const { Eq, Or } = require("../query/query");
+const { Eq, Like, Or } = require("../query/query");
 const { BaseES } = require("./BaseES");
 
 const uuidv4 = require('uuid').v4;
@@ -34,13 +34,19 @@ class AppES extends BaseES {
             const services = this.context.get('services');
             this.db = services.get('database').get(DB_WRITE, 'apps');
         },
-        async create_predicate (id) {
+        async create_predicate (id, ...args) {
             if ( id === 'user-can-edit' ) {
                 return new Eq({
                     key: 'owner',
                     value: Context.get('user').id,
                 });
             }
+            if ( id === 'name-like' ) {
+                return new Like({
+                    key: 'name',
+                    value: args[0],
+                });
+            }
         },
         async delete (uid, extra) {
             const svc_appInformation = this.context.get('services').get('app-information');
@@ -187,7 +193,10 @@ class AppES extends BaseES {
                 const subdomain = await entity.get('subdomain');
                 const user = Context.get('user');
                 let subdomain_res = await this.db.write(
-                    `INSERT IGNORE INTO subdomains
+                    `INSERT ${this.db.case({
+                        mysql: 'IGNORE',
+                        sqlite: 'OR IGNORE',
+                    })} INTO subdomains
                     (subdomain, user_id, root_dir_id,   uuid) VALUES
                     (        ?,       ?,           ?,      ?)`,
                     [

packages/backend/src/om/entitystorage/BaseES.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { WeakConstructorTrait } = require("../../traits/WeakConstructorTrait");
 const { Context } = require("../../util/context");
 

packages/backend/src/om/entitystorage/Entity.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { WeakConstructorTrait } = require("../../traits/WeakConstructorTrait");
 
 class Entity extends AdvancedBase {

packages/backend/src/om/entitystorage/SQLES.js

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { BaseES } = require("./BaseES");
 
 const APIError = require("../../api/APIError");
 const { Entity } = require("./Entity");
 const { WeakConstructorTrait } = require("../../traits/WeakConstructorTrait");
-const { And, Or, Eq, Predicate, Null, PredicateUtil } = require("../query/query");
+const { And, Or, Eq, Like, Null, Predicate, PredicateUtil } = require("../query/query");
 const { DB_WRITE } = require("../../services/database/consts");
 
 class RawCondition extends AdvancedBase {
@@ -94,7 +94,7 @@ class SQLES extends BaseES {
             }
 
             const values = [];
-            if ( predicate ) values.push(...predicate.values);
+            if ( predicate ) values.push(...(predicate.values || []));
 
             if ( this.debug ) {
                 this.log.info('-> SQL STMT', { stmt, values });
@@ -219,7 +219,7 @@ class SQLES extends BaseES {
             console.log('SQL STMT', stmt);
             console.log('SQL VALS', execute_vals);
 
-            const res = await db.write(
+            const res = await this.db.write(
                 stmt, execute_vals
             );
 
@@ -355,6 +355,22 @@ class SQLES extends BaseES {
 
                 return new RawCondition({ sql, values });
             }
+
+            if ( om_query instanceof Like ) {
+                const key = om_query.key;
+                let value = om_query.value;
+                const prop = this.om.properties[key];
+
+                value = await prop.sql_reference(value);
+
+                const options = prop.descriptor.sql ?? {};
+                const col_name = options.column_name ?? prop.name;
+
+                const sql = `${col_name} LIKE ?`;
+                const values = [value];
+
+                return new RawCondition({ sql, values });
+            }
         }
     }
 }

packages/backend/src/om/entitystorage/ValidationES.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { BaseES } = require("./BaseES");
 
 const APIError = require("../../api/APIError");
@@ -86,6 +86,7 @@ class ValidationES extends BaseES {
                 } catch ( e ) {
                     if ( ! (e instanceof APIError) ) {
                         console.log('THIS IS HAPPENING', e);
+                        // eslint-disable-next-line no-ex-assign
                         e = APIError.create('field_invalid', null, {
                             key: prop.name,
                             converted_from_another_error: true,

packages/backend/src/om/mappings/app.js

@@ -51,6 +51,7 @@ module.exports = {
             maxlen: 7000,
         },
         maximize_on_start: 'flag',
+        background: 'flag',
         subdomain: {
             type: 'string',
             transient: true,

packages/backend/src/om/proptypes/__all__.js

@@ -163,7 +163,7 @@ module.exports = {
         },
         async adapt (value, { descriptor }) {
             if ( descriptor.debug ) {
-                debugger;
+                debugger; // eslint-disable-line no-debugger
             }
             if ( ! descriptor.service ) return value;
             if ( ! value ) return null;

packages/backend/src/om/query/query.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("puter-js-common");
+const { AdvancedBase } = require("@heyputer/puter-js-common");
 const { WeakConstructorTrait } = require("../../traits/WeakConstructorTrait");
 
 class Predicate extends AdvancedBase {
@@ -50,6 +50,15 @@ class Eq extends Predicate {
     }
 }
 
+class Like extends Predicate {
+    async check (entity) {
+        // Convert SQL LIKE pattern to RegExp
+        // TODO: Support escaping the pattern characters
+        const regex = new RegExp(this.value.replaceAll('%', '.*').replaceAll('_', '.'), 'i');
+        return regex.test(await entity.get(this.key));
+    }
+}
+
 Predicate.prototype.and = function (other) {
     return new And({ children: [this, other] });
 }
@@ -105,4 +114,5 @@ module.exports = {
     And,
     Or,
     Eq,
+    Like,
 };

packages/backend/src/routers/_default.js

@@ -26,6 +26,7 @@ const auth = require('../middleware/auth.js');
 const { generate_puter_page_html } = require('../temp/puter_page_loader');
 const { Context } = require('../util/context');
 const { DB_READ } = require('../services/database/consts');
+const { PathBuilder } = require('../util/pathutil.js');
 
 let auth_user;
 
@@ -46,7 +47,7 @@ router.all('*', async function(req, res, next) {
     // cloud.js must be accessible globally regardless of subdomain
     // --------------------------------------
     else if (path === '/cloud.js') {
-        return res.sendFile(_path.join(__dirname, '../../puter.js/alpha.js'), function (err) {
+        return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/alpha.js'), function (err) {
             if (err && err.statusCode) {
                 return res.status(err.statusCode).send('Error /cloud.js')
             }
@@ -56,14 +57,14 @@ router.all('*', async function(req, res, next) {
     // /puter.js/v1 must be accessible globally regardless of subdomain
     // --------------------------------------
     else if (path === '/puter.js/v1' || path === '/puter.js/v1/') {
-        return res.sendFile(_path.join(__dirname, '../../puter.js/v1.js'), function (err) {
+        return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/v1.js'), function (err) {
             if (err && err.statusCode) {
                 return res.status(err.statusCode).send('Error /puter.js')
             }
         });
     }
     else if (path === '/puter.js/v2' || path === '/puter.js/v2/') {
-        return res.sendFile(_path.join(__dirname, '../../puter.js/v2.js'), function (err) {
+        return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/v2.js'), function (err) {
             if (err && err.statusCode) {
                 return res.status(err.statusCode).send('Error /puter.js')
             }
@@ -74,14 +75,14 @@ router.all('*', async function(req, res, next) {
     // --------------------------------------
     else if( subdomain === 'js'){
         if (path === '/v1' || path === '/v1/') {
-            return res.sendFile(_path.join(__dirname, '../../puter.js/v1.js'), function (err) {
+            return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/v1.js'), function (err) {
                 if (err && err.statusCode) {
                     return res.status(err.statusCode).send('Error /puter.js')
                 }
             });
         }
         if (path === '/v2' || path === '/v2/') {
-            return res.sendFile(_path.join(__dirname, '../../puter.js/v2.js'), function (err) {
+            return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/v2.js'), function (err) {
                 if (err && err.statusCode) {
                     return res.status(err.statusCode).send('Error /puter.js')
                 }
@@ -176,7 +177,7 @@ router.all('*', async function(req, res, next) {
                 const user = await get_user({uuid: req.query.user_uuid})
 
                 // more validation
-                if(user === undefined || user === null || user === false)
+                if(!user)
                     h += '<p style="text-align:center; color:red;">User not found.</p>';
                 else if(user.unsubscribed === 1)
                     h += '<p style="text-align:center; color:green;">You are already unsubscribed.</p>';
@@ -208,7 +209,7 @@ router.all('*', async function(req, res, next) {
                 const {get_user} = require('../helpers')
 
                 // get user
-                const user = await get_user({uuid: req.query.user_uuid})
+                const user = await get_user({uuid: req.query.user_uuid, force: true})
 
                 // more validation
                 if(user === undefined || user === null || user === false)
@@ -219,6 +220,13 @@ router.all('*', async function(req, res, next) {
                     h += '<p style="text-align:center; color:red;">invalid token.</p>';
                 // mark user as confirmed
                 else{
+                    // If other users have the same unconfirmed email, revoke it
+                    await db.write(
+                        'UPDATE `user` SET `unconfirmed_change_email` = NULL, `change_email_confirm_token` = NULL WHERE `unconfirmed_change_email` = ?',
+                        [user.email],
+                    );
+
+                    // update user
                     await db.write(
                         "UPDATE `user` SET `email_confirmed` = 1, `requires_email_confirmation` = 0 WHERE id = ?",
                         [user.id]
@@ -246,6 +254,7 @@ router.all('*', async function(req, res, next) {
         // /assets/
         // ------------------------
         else if (path.startsWith('/assets/')) {
+            path = PathBuilder.resolve(path);
             return res.sendFile(path, { root: __dirname + '../../public' }, function (err) {
                 if (err && err.statusCode) {
                     return res.status(err.statusCode).send('Error /public/')
@@ -296,8 +305,11 @@ router.all('*', async function(req, res, next) {
                 const APP_ORIGIN = config.origin;
                 const API_ORIGIN = config.api_base_url;
                 return res.send(generate_puter_page_html({
+                    env: config.env,
+
                     app_origin: APP_ORIGIN,
                     api_origin: API_ORIGIN,
+                    use_bundled_gui: config.use_bundled_gui,
 
                     manifest,
                     gui_path: config.assets.gui,
@@ -335,7 +347,7 @@ router.all('*', async function(req, res, next) {
 
             // /dist/...
             else if(path.startsWith('/dist/') || path.startsWith('/src/')){
-                path = _path.resolve(path);
+                path = PathBuilder.resolve(path);
                 return res.sendFile(path, {root: config.assets.gui}, function(err){
                     if(err && err.statusCode){
                         return res.status(err.statusCode).send('Error /gui/dist/')
@@ -345,6 +357,7 @@ router.all('*', async function(req, res, next) {
 
             // All other paths
             else{
+                path = PathBuilder.resolve(path);
                 return res.sendFile(path, {root: _path.join(config.assets.gui, 'src')}, function(err){
                     if(err && err.statusCode){
                         return res.status(err.statusCode).send('Error /gui/')
@@ -361,7 +374,11 @@ router.all('*', async function(req, res, next) {
             subdomain === 'draw' || subdomain === 'camera' || subdomain === 'recorder' ||
             subdomain === 'dev-center' || subdomain === 'terminal'){
 
-        let root = _path.join(__dirname, '../../apps/', subdomain);
+        let root = PathBuilder
+            .add(__dirname)
+            .add(config.defaultjs_asset_path, { allow_traversal: true })
+            .add('apps').add(subdomain)
+            .build();
         if ( subdomain === 'docs' ) root += '/dist';
         root = _path.normalize(root);
 
@@ -399,7 +416,7 @@ router.all('*', async function(req, res, next) {
             });
         } catch (e) {
             console.error('error from sendFile', e);
-            return res.status(err.statusCode).send('Error /apps/')
+            return res.status(e.statusCode).send('Error /apps/')
         }
     }
     // --------------------------------------

packages/backend/src/routers/apps.js

@@ -38,7 +38,7 @@ router.get('/apps', auth, express.json({limit: '50mb'}), async (req, res, next)=
 
     const db = req.services.get('database').get(DB_READ, 'apps');
 
-    let apps_res = await dbrr.read(
+    let apps_res = await db.read(
         `SELECT * FROM apps WHERE owner_user_id = ? ORDER BY timestamp DESC`,
         [req.user.id]
     );
@@ -72,6 +72,7 @@ router.get('/apps', auth, express.json({limit: '50mb'}), async (req, res, next)=
                 icon: apps_res[i].icon,
                 index_url: apps_res[i].index_url,
                 godmode: apps_res[i].godmode,
+                background: apps_res[i].background,
                 maximize_on_start: apps_res[i].maximize_on_start,
                 filetype_associations: filetype_associations,
                 ...stats,
@@ -111,6 +112,7 @@ router.get('/apps/:name', auth, express.json({limit: '50mb'}), async (req, res,
                     title: app.title,
                     icon: app.icon,
                     godmode: app.godmode,
+                    background: app.background,
                     maximize_on_start: app.maximize_on_start,
                     index_url: app.index_url,
                 };

packages/backend/src/routers/auth/configure-2fa.js

@@ -0,0 +1,123 @@
+const APIError = require("../../api/APIError");
+const eggspress = require("../../api/eggspress");
+const { get_user } = require("../../helpers");
+const { UserActorType } = require("../../services/auth/Actor");
+const { DB_WRITE } = require("../../services/database/consts");
+const { Context } = require("../../util/context");
+
+module.exports = eggspress('/auth/configure-2fa/:action', {
+    subdomain: 'api',
+    auth2: true,
+    allowedMethods: ['POST'],
+}, async (req, res, next) => {
+    const action = req.params.action;
+    const x = Context.get();
+
+    // Only users can configure 2FA
+    const actor = Context.get('actor');
+    if ( ! (actor.type instanceof UserActorType) ) {
+        throw APIError.create('forbidden');
+    }
+
+    const user = actor.type.user;
+
+    const actions = {};
+
+    const db = await x.get('services').get('database').get(DB_WRITE, '2fa');
+
+    actions.setup = async () => {
+        const user = await get_user({ id: req.user.id, force: true });
+
+        if ( user.otp_enabled ) {
+            throw APIError.create('2fa_already_enabled');
+        }
+
+        const svc_otp = x.get('services').get('otp');
+
+        // generate secret
+        const result = svc_otp.create_secret(user.username);
+
+        // generate recovery codes
+        result.codes = [];
+        for ( let i = 0; i < 10; i++ ) {
+            result.codes.push(svc_otp.create_recovery_code());
+        }
+
+        const hashed_recovery_codes = result.codes.map(code => {
+            const crypto = require('crypto');
+            const hash = crypto
+                .createHash('sha256')
+                .update(code)
+                .digest('base64')
+                // We're truncating the hash for easier storage, so we have 128
+                // bits of entropy instead of 256. This is plenty for recovery
+                // codes, which have only 48 bits of entropy to begin with.
+                .slice(0, 22);
+            return hash;
+        });
+
+        // update user
+        await db.write(
+            `UPDATE user SET otp_secret = ?, otp_recovery_codes = ? WHERE uuid = ?`,
+            [result.secret, hashed_recovery_codes.join(','), user.uuid]
+        );
+        req.user.otp_secret = result.secret;
+        req.user.otp_recovery_codes = hashed_recovery_codes.join(',');
+        user.otp_secret = result.secret;
+        user.otp_recovery_codes = hashed_recovery_codes.join(',');
+
+        return result;
+    };
+
+    // IMPORTANT: only use to verify the user's 2FA setup;
+    // this should never be used to verify the user's 2FA code
+    // for authentication purposes.
+    actions.test = async () => {
+        const user = req.user;
+        const svc_otp = x.get('services').get('otp');
+        const code = req.body.code;
+        const ok = svc_otp.verify(user.username, user.otp_secret, code);
+        return { ok };
+    };
+
+    actions.enable = async () => {
+        const svc_edgeRateLimit = req.services.get('edge-rate-limit');
+        if ( ! svc_edgeRateLimit.check('enable-2fa') ) {
+            return res.status(429).send('Too many requests.');
+        }
+
+        const user = await get_user({ id: req.user.id, force: true });
+
+        // Verify that 2FA isn't already enabled
+        if ( user.otp_enabled ) {
+            throw APIError.create('2fa_already_enabled');
+        }
+
+        // Verify that TOTP secret was set (configuration step not skipped)
+        if ( ! user.otp_secret ) {
+            throw APIError.create('2fa_not_configured');
+        }
+
+        await db.write(
+            `UPDATE user SET otp_enabled = 1 WHERE uuid = ?`,
+            [user.uuid]
+        );
+        // update cached user
+        req.user.otp_enabled = 1;
+
+        const svc_email = req.services.get('email');
+        await svc_email.send_email({ email: user.email }, 'enabled_2fa', {
+            username: user.username,
+        });
+
+        return {};
+    };
+
+    if ( ! actions[action] ) {
+        throw APIError.create('invalid_action', null, { action });
+    }
+
+    const result = await actions[action]();
+
+    res.json(result);
+});

packages/backend/src/routers/auth/delete-own-user.js

@@ -0,0 +1,43 @@
+const eggspress = require("../../api/eggspress");
+const { deleteUser, invalidate_cached_user } = require("../../helpers");
+
+const config = require("../../config");
+
+module.exports = eggspress("/delete-own-user", {
+    subdomain: "api",
+    auth: true,
+    allowedMethods: ["POST"],
+}, async (req, res, next) => {
+    const bcrypt = require('bcrypt');
+
+    const validate_request = async () => {
+        const user = req.user;
+
+        // `user` should always have a value, but this is checked
+        // any way in case the auth middleware is broken.
+        if ( ! user ) return false;
+
+        // temporary users don't require password verification
+        if ( ! user.email && ! user.password ) {
+            return true;
+        }
+
+        if ( ! req.body.password ) return false;
+        if ( ! user || ! user.password ) return false;
+        if ( ! await bcrypt.compare(req.body.password, req.user.password) ) {
+            return false;
+        }
+        return true;
+    }
+
+    if ( ! await validate_request() ) {
+        return res.status(400).send({ success: false });
+    }
+
+    res.clearCookie(config.cookie_name);
+
+    await deleteUser(req.user.id);
+    invalidate_cached_user(req.user);
+
+    return res.send({ success: true });
+});

packages/backend/src/routers/auth/grant-user-user.js

@@ -0,0 +1,30 @@
+const APIError = require("../../api/APIError");
+const eggspress = require("../../api/eggspress");
+const { UserActorType } = require("../../services/auth/Actor");
+const { Context } = require("../../util/context");
+
+module.exports = eggspress('/auth/grant-user-user', {
+    subdomain: 'api',
+    auth2: true,
+    allowedMethods: ['POST'],
+}, async (req, res, next) => {
+    const x = Context.get();
+    const svc_permission = x.get('services').get('permission');
+
+    // Only users can grant user-user permissions
+    const actor = Context.get('actor');
+    if ( ! (actor.type instanceof UserActorType) ) {
+        throw APIError.create('forbidden');
+    }
+
+    if ( ! req.body.target_username ) {
+        throw APIError.create('field_missing', null, { key: 'target_username' });
+    }
+
+    await svc_permission.grant_user_user_permission(
+        actor, req.body.target_username, req.body.permission,
+        req.body.extra || {}, req.body.meta || {}
+    );
+
+    res.json({});
+});

packages/backend/src/routers/auth/list-permissions.js

@@ -17,10 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const eggspress = require("../../api/eggspress");
-const { get_app } = require("../../helpers");
+const { get_app, get_user } = require("../../helpers");
 const { UserActorType } = require("../../services/auth/Actor");
 const { DB_READ } = require("../../services/database/consts");
 const { Context } = require("../../util/context");
+const APIError = require('../../api/APIError');
 
 module.exports = eggspress('/auth/list-permissions', {
     subdomain: 'api',
@@ -38,29 +39,73 @@ module.exports = eggspress('/auth/list-permissions', {
 
     const db = x.get('services').get('database').get(DB_READ, 'permissions');
 
-    const permissions = [];
+    const permissions = {};
 
-    const rows = await db.read(
-        'SELECT * FROM `user_to_app_permissions` WHERE user_id=?',
-        [ actor.type.user.id ]
-    );
+    {
+        permissions.myself_to_app = [];
 
-    for ( const row of rows ) {
-        const app = await get_app({ id: row.app_id });
+        const rows = await db.read(
+            'SELECT * FROM `user_to_app_permissions` WHERE user_id=?',
+            [ actor.type.user.id ]
+        );
 
-        delete app.id;
-        delete app.approved_for_listing;
-        delete app.approved_for_opening_items;
-        delete app.godmode;
-        delete app.owner_user_id;
+        for ( const row of rows ) {
+            const app = await get_app({ id: row.app_id });
 
-        const permission = {
-            app,
-            permission: row.permission,
-            extra: row.extra
-        };
+            delete app.id;
+            delete app.approved_for_listing;
+            delete app.approved_for_opening_items;
+            delete app.godmode;
+            delete app.owner_user_id;
 
-        permissions.push(permission);
+            const permission = {
+                app,
+                permission: row.permission,
+                extra: row.extra
+            };
+
+            permissions.myself_to_app.push(permission);
+        }
+    }
+    {
+        permissions.myself_to_user = [];
+
+        const rows = await db.read(
+            'SELECT * FROM `user_to_user_permissions` WHERE issuer_user_id=?',
+            [ actor.type.user.id ]
+        );
+
+        for ( const row of rows ) {
+            const user = await get_user({ id: row.holder_user_id });
+
+            const permission = {
+                user: user.username,
+                permission: row.permission,
+                extra: row.extra
+            };
+
+            permissions.myself_to_user.push(permission);
+        }
+    }
+    {
+        permissions.user_to_myself = [];
+
+        const rows = await db.read(
+            'SELECT * FROM `user_to_user_permissions` WHERE holder_user_id=?',
+            [ actor.type.user.id ]
+        );
+
+        for ( const row of rows ) {
+            const user = await get_user({ id: row.issuer_user_id });
+
+            const permission = {
+                user: user.username,
+                permission: row.permission,
+                extra: row.extra
+            };
+
+            permissions.user_to_myself.push(permission);
+        }
     }
 
     res.json(permissions);

packages/backend/src/routers/auth/list-sessions.js

@@ -0,0 +1,24 @@
+const eggspress = require("../../api/eggspress");
+const { UserActorType } = require("../../services/auth/Actor");
+const { Context } = require("../../util/context");
+const APIError = require('../../api/APIError');
+
+module.exports = eggspress('/auth/list-sessions', {
+    subdomain: 'api',
+    auth2: true,
+    allowedMethods: ['GET'],
+}, async (req, res, next) => {
+    const x = Context.get();
+    const svc_auth = x.get('services').get('auth');
+
+    // Only users can list their own sessions
+    // apps, access tokens, etc should NEVER access this
+    const actor = x.get('actor');
+    if ( ! (actor.type instanceof UserActorType) ) {
+        throw APIError.create('forbidden');
+    }
+
+    const sessions = await svc_auth.list_sessions(actor);
+
+    res.json(sessions);
+});

packages/backend/src/routers/auth/revoke-session.js

@@ -0,0 +1,33 @@
+const APIError = require("../../api/APIError");
+const eggspress = require("../../api/eggspress");
+const { UserActorType } = require("../../services/auth/Actor");
+const { Context } = require("../../util/context");
+
+module.exports = eggspress('/auth/revoke-session', {
+    subdomain: 'api',
+    auth2: true,
+    allowedMethods: ['POST'],
+}, async (req, res, next) => {
+    const x = Context.get();
+    const svc_auth = x.get('services').get('auth');
+
+    // Only users can list their own sessions
+    // apps, access tokens, etc should NEVER access this
+    const actor = x.get('actor');
+    if ( ! (actor.type instanceof UserActorType) ) {
+        throw APIError.create('forbidden');
+    }
+
+    // Ensure valid UUID
+    if ( ! req.body.uuid || typeof req.body.uuid !== 'string' ) {
+        throw APIError.create('field_invalid', null, {
+            key: 'uuid',
+            expected: 'string'
+        });
+    }
+
+    const sessions = await svc_auth.revoke_session(
+        actor, req.body.uuid);
+
+    res.json({ sessions });
+});

packages/backend/src/routers/auth/revoke-user-app.js

@@ -19,6 +19,7 @@
 const eggspress = require("../../api/eggspress");
 const { UserActorType } = require("../../services/auth/Actor");
 const { Context } = require("../../util/context");
+const APIError = require('../../api/APIError');
 
 module.exports = eggspress('/auth/revoke-user-app', {
     subdomain: 'api',

packages/backend/src/routers/auth/revoke-user-user.js

@@ -0,0 +1,31 @@
+const APIError = require("../../api/APIError");
+const eggspress = require("../../api/eggspress");
+const { UserActorType } = require("../../services/auth/Actor");
+const { Context } = require("../../util/context");
+
+module.exports = eggspress('/auth/revoke-user-user', {
+    subdomain: 'api',
+    auth2: true,
+    allowedMethods: ['POST'],
+}, async (req, res, next) => {
+    const x = Context.get();
+    const svc_permission = x.get('services').get('permission');
+
+    // Only users can grant user-user permissions
+    const actor = Context.get('actor');
+    if ( ! (actor.type instanceof UserActorType) ) {
+        throw APIError.create('forbidden');
+    }
+
+    if ( ! req.body.target_username ) {
+        throw APIError.create('field_missing', null, { key: 'target_username' });
+    }
+
+    await svc_permission.revoke_user_user_permission(
+        actor, req.body.target_username, req.body.permission,
+        req.body.meta || {}
+    );
+
+    res.json({});
+});
+

packages/backend/src/routers/change_email.js

@@ -23,83 +23,68 @@ const eggspress = require('../api/eggspress.js');
 const APIError = require('../api/APIError.js');
 const { DB_READ, DB_WRITE } = require('../services/database/consts.js');
 
-const CHANGE_EMAIL_START = eggspress('/change_email/start', {
-    subdomain: 'api',
-    auth: true,
-    verified: true,
-    allowedMethods: ['POST'],
-}, async (req, res, next) => {
-    const user = req.user;
-    const new_email = req.body.new_email;
+const config = require('../config.js');
 
-    // TODO: DRY: signup.js
-    // validation
-    if( ! new_email ) {
-        throw APIError.create('field_missing', null, { key: 'new_email' });
-    }
-    if ( typeof new_email !== 'string' ) {
-        throw APIError.create('field_invalid', null, {
-            key: 'new_email', expected: 'a valid email address' });
-    }
-    if ( ! validator.isEmail(new_email) ) {
-        throw APIError.create('field_invalid', null, {
-            key: 'new_email', expected: 'a valid email address' });
-    }
-
-    // check if email is already in use
-    const svc_mysql = req.services.get('mysql');
-    const db = req.services.get('database').get(DB_WRITE, 'auth');
-    const rows = await db.read(
-        'SELECT COUNT(*) AS `count` FROM `user` WHERE `email` = ?',
-        [new_email]
-    );
-    if ( rows[0].count > 0 ) {
-        throw APIError.create('email_already_in_use', null, { email: new_email });
-    }
-
-    // generate confirmation token
-    const token = crypto.randomBytes(4).toString('hex');
-
-    // update user
-    await db.write(
-        'UPDATE `user` SET `unconfirmed_change_email` = ?, `change_email_confirm_token` = ? WHERE `id` = ?',
-        [new_email, token, user.id]
-    );
-});
+const jwt = require('jsonwebtoken');
+const { invalidate_cached_user_by_id } = require('../helpers.js');
 
 const CHANGE_EMAIL_CONFIRM = eggspress('/change_email/confirm', {
-    subdomain: 'api',
-    auth: true,
-    verified: true,
-    allowedMethods: ['POST'],
+    allowedMethods: ['GET'],
 }, async (req, res, next) => {
-    const user = req.user;
-    const token = req.body.token;
+    const jwt_token = req.query.token;
 
-    if ( ! token ) {
+    if ( ! jwt_token ) {
         throw APIError.create('field_missing', null, { key: 'token' });
     }
 
-    const svc_mysql = req.services.get('mysql');
-    const dbrr = svc_mysql.get(DB_MODE_READ, 'change-email-confirm');
-    const [rows] = await dbrr.promise().query(
+    const svc_edgeRateLimit = req.services.get('edge-rate-limit');
+    if ( ! svc_edgeRateLimit.check('change-email-confirm') ) {
+        return res.status(429).send('Too many requests.');
+    }
+
+    const { token, user_id } = jwt.verify(jwt_token, config.jwt_secret);
+
+    const db = req.services.get('database').get(DB_WRITE, 'auth');
+    const rows = await db.read(
         'SELECT `unconfirmed_change_email` FROM `user` WHERE `id` = ? AND `change_email_confirm_token` = ?',
-        [user.id, token]
+        [user_id, token]
     );
     if ( rows.length === 0 ) {
         throw APIError.create('token_invalid');
     }
 
+    // Scenario: email was confirmed on another account already
+    const rows2 = await db.read(
+        'SELECT `id` FROM `user` WHERE `email` = ?',
+        [rows[0].unconfirmed_change_email]
+    );
+    if ( rows2.length > 0 ) {
+        throw APIError.create('email_already_in_use');
+    }
+
+    // If other users have the same unconfirmed email, revoke it
+    await db.write(
+        'UPDATE `user` SET `unconfirmed_change_email` = NULL, `change_email_confirm_token` = NULL WHERE `unconfirmed_change_email` = ?',
+        [rows[0].unconfirmed_change_email]
+    );
+
     const new_email = rows[0].unconfirmed_change_email;
 
-    const db = req.services.get('database').get(DB_WRITE, 'auth');
     await db.write(
-        'UPDATE `user` SET `email` = ?, `unconfirmed_change_email` = NULL, `change_email_confirm_token` = NULL WHERE `id` = ?',
-        [new_email, user.id]
+        'UPDATE `user` SET `email` = ?, `unconfirmed_change_email` = NULL, `change_email_confirm_token` = NULL, `pass_recovery_token` = NULL WHERE `id` = ?',
+        [new_email, user_id]
     );
+
+    invalidate_cached_user_by_id(user_id);
+    let socketio = require('../socketio.js').getio();
+    if(socketio){
+        socketio.to(user_id).emit('user.email_changed', {})
+    }
+
+    const h = `<p style="text-align:center; color:green;">Your email has been successfully confirmed.</p>`;
+    return res.send(h);
 });
 
 module.exports = app => {
-    app.use(CHANGE_EMAIL_START);
     app.use(CHANGE_EMAIL_CONFIRM);
 }

packages/backend/src/routers/change_username.js

@@ -54,12 +54,21 @@ module.exports = eggspress('/change_username', {
     if(await username_exists(req.body.new_username))
         throw APIError.create('username_already_in_use', null, { username: req.body.new_username });
 
+    const svc_edgeRateLimit = req.services.get('edge-rate-limit');
+    if ( ! svc_edgeRateLimit.check('change-email-start') ) {
+        return res.status(429).send('Too many requests.');
+    }
+
     const db = Context.get('services').get('database').get(DB_WRITE, 'auth');
 
     // Has the user already changed their username twice this month?
     const rows = await db.read(
         'SELECT COUNT(*) AS `count` FROM `user_update_audit` ' +
-        'WHERE `user_id`=? AND `reason`=? AND `created_at` > DATE_SUB(NOW(), INTERVAL 1 MONTH)',
+        'WHERE `user_id`=? AND `reason`=? AND ' +
+        db.case({
+            mysql: '`created_at` > DATE_SUB(NOW(), INTERVAL 1 MONTH)',
+            sqlite: "`created_at` > datetime('now', '-1 month')",
+        }),
         [ req.user.id, 'change_username' ]
     );
 

packages/backend/src/routers/confirm-email.js

@@ -22,6 +22,7 @@ const { invalidate_cached_user } = require('../helpers');
 const router = new express.Router();
 const auth = require('../middleware/auth.js');
 const { DB_WRITE } = require('../services/database/consts');
+const APIError = require('../api/APIError.js');
 
 // -----------------------------------------------------------------------//
 // POST /confirm-email
@@ -34,6 +35,11 @@ router.post('/confirm-email', auth, express.json(), async (req, res, next)=>{
     if(!req.body.code)
         req.status(400).send('code is required');
 
+    const svc_edgeRateLimit = req.services.get('edge-rate-limit');
+    if ( ! svc_edgeRateLimit.check('confirm-email') ) {
+        return res.status(429).send('Too many requests.');
+    }
+
     // Modules
     const db = req.services.get('database').get(DB_WRITE, 'auth');
 
@@ -43,6 +49,22 @@ router.post('/confirm-email', auth, express.json(), async (req, res, next)=>{
     // Set expiry for rate limit
     kv.expire(`confirm-email|${req.ip}|${req.body.email ?? req.body.username}`, 60 * 10, 'NX')
 
+    // Scenario: email was confirmed on another account already
+    const rows = await db.read(
+        'SELECT `id` FROM `user` WHERE `email` = ? AND `email_confirmed` = 1',
+        [req.body.email],
+    );
+    if ( rows.length > 0 ) {
+        APIError.create('email_already_in_use').write(res);
+        return;
+    }
+
+    // If other users have the same unconfirmed email, revoke it
+    await db.write(
+        'UPDATE `user` SET `unconfirmed_change_email` = NULL, `change_email_confirm_token` = NULL WHERE `unconfirmed_change_email` = ?',
+        [req.user.email],
+    );
+
     if(req.body.code === req.user.email_confirm_code) {
         await db.write(
             "UPDATE `user` SET `email_confirmed` = 1, `requires_email_confirmation` = 0 WHERE id = ? LIMIT 1",

packages/backend/src/routers/contactUs.js

@@ -32,10 +32,6 @@ router.post('/contactUs', auth, express.json(), async (req, res, next)=>{
     if(require('../helpers').subdomain(req) !== 'api')
         next();
 
-    // check if user is verified
-    if((config.strict_email_verification_required || req.user.requires_email_confirmation) && !req.user.email_confirmed)
-        return res.status(400).send({code: 'account_is_not_verified', message: 'Account is not verified'});
-
     // message is required
     if(!req.body.message)
         return res.status(400).send({message: 'message is required'})
@@ -46,6 +42,11 @@ router.post('/contactUs', auth, express.json(), async (req, res, next)=>{
     else if(req.body.message.length > 100000)
         return res.status(400).send({message: 'message is too long'})
 
+    const svc_edgeRateLimit = req.services.get('edge-rate-limit');
+    if ( ! svc_edgeRateLimit.check('contact-us') ) {
+        return res.status(429).send('Too many requests.');
+    }
+
     // modules
     const db = req.services.get('database').get(DB_WRITE, 'feedback');
 
@@ -66,20 +67,8 @@ router.post('/contactUs', auth, express.json(), async (req, res, next)=>{
         let user = await get_user({id: req.user.id});
 
         // send email to support
-        const nodemailer = require("nodemailer");
-
-        // send email notif
-        let transporter = nodemailer.createTransport({
-            host: config.smtp_server,
-            port: config.smpt_port,
-            secure: true, // STARTTLS
-            auth: {
-                user: config.smtp_username,
-                pass: config.smtp_password,
-            },
-        });
-
-        transporter.sendMail({
+        const svc_email = req.services.get('email');
+        svc_email.sendMail({
             from: '"Puter" [email protected]', // sender address
             to: '[email protected]', // list of receivers
             replyTo: user.email === null ? undefined : user.email,

packages/backend/src/routers/delete-site.js

@@ -21,8 +21,9 @@ const express = require('express');
 const router = express.Router();
 const auth = require('../middleware/auth.js');
 const config = require('../config');
+const { DB_WRITE } = require('../services/database/consts.js');
 
-// -----------------------------------------------------------------------// 
+// -----------------------------------------------------------------------//
 // POST /delete-site
 // -----------------------------------------------------------------------//
 router.post('/delete-site', auth, express.json(), async (req, res, next)=>{
@@ -39,13 +40,12 @@ router.post('/delete-site', auth, express.json(), async (req, res, next)=>{
         return res.status(400).send('site_uuid is required')
 
     // modules
-    const {} = require('../helpers');
-    const db = require('../db/mysql.js')
+    const db = req.services.get('database').get(DB_WRITE, 'subdomains:legacy');
 
-    await db.promise().execute(
-        `DELETE FROM subdomains WHERE user_id = ? AND uuid = ?`, 
+    await db.write(
+        `DELETE FROM subdomains WHERE user_id = ? AND uuid = ?`,
         [req.user.id, req.body.site_uuid]
-    );  
+    );
     res.send({});
 })
 

packages/backend/src/routers/df.js

@@ -22,6 +22,8 @@ const config = require('../config.js');
 const router = new express.Router();
 const auth = require('../middleware/auth.js');
 
+// TODO: Why is this both a POST and a GET?
+
 // -----------------------------------------------------------------------// 
 // POST /df
 // -----------------------------------------------------------------------//
@@ -35,11 +37,13 @@ router.post('/df', auth, express.json(), async (req, response, next)=>{
         return response.status(400).send({code: 'account_is_not_verified', message: 'Account is not verified'});
     
     const {df} = require('../helpers');
+    const svc_hostDiskUsage = req.services.get('host-disk-usage', { optional: true });
     try{
         // auth
         response.send({
             used: parseInt(await df(req.user.id)),
-            capacity: (req.user.free_storage === undefined || req.user.free_storage === null) ? config.storage_capacity : req.user.free_storage,
+            capacity: config.is_storage_limited ? (req.user.free_storage === undefined || req.user.free_storage === null) ? config.storage_capacity : req.user.free_storage : config.available_device_storage,
+            ...(svc_hostDiskUsage ? svc_hostDiskUsage.get_extra() : {}),
         });
     }catch(e){
         console.log(e)
@@ -60,11 +64,13 @@ router.get('/df', auth, express.json(), async (req, response, next)=>{
         return response.status(400).send({code: 'account_is_not_verified', message: 'Account is not verified'});
     
     const {df} = require('../helpers');
+    const svc_hostDiskUsage = req.services.get('host-disk-usage', { optional: true });
     try{
         // auth
         response.send({
             used: parseInt(await df(req.user.id)),
-            capacity: (req.user.free_storage === undefined || req.user.free_storage === null) ? config.storage_capacity : req.user.free_storage,
+            capacity: config.is_storage_limited ? (req.user.free_storage === undefined || req.user.free_storage === null) ? config.storage_capacity : req.user.free_storage : config.available_device_storage,
+            ...(svc_hostDiskUsage ? svc_hostDiskUsage.get_extra() : {}),
         });
     }catch(e){
         console.log(e)

packages/backend/src/routers/down.js

@@ -0,0 +1,78 @@
+"use strict"
+const express = require('express');
+const router = express.Router();
+const auth = require('../middleware/auth.js');
+const config = require('../config.js');
+const fs = require('../middleware/fs.js');
+const { DB_WRITE } = require('../services/database/consts.js');
+const { NodePathSelector } = require('../filesystem/node/selectors.js');
+const { HLRead } = require('../filesystem/hl_operations/hl_read.js');
+
+// -----------------------------------------------------------------------//
+// GET /down
+// -----------------------------------------------------------------------//
+router.post('/down', auth, fs, express.json(), async (req, res, next)=>{
+    // check subdomain
+    if(require('../helpers').subdomain(req) !== 'api')
+        next();
+
+    // check if user is verified
+    if((config.strict_email_verification_required || req.user.requires_email_confirmation) && !req.user.email_confirmed)
+        return res.status(400).send({code: 'account_is_not_verified', message: 'Account is not verified'});
+
+    // check anti-csrf token
+    const svc_antiCSRF = req.services.get('anti-csrf');
+    if ( ! svc_antiCSRF.consume_token(req.user.uuid, req.body.anti_csrf) ) {
+        return res.status(400).json({ message: 'incorrect anti-CSRF token' });
+    }
+
+    // validation
+    if(!req.query.path)
+        return res.status(400).send('path is required')
+    // path must be a string
+    else if (typeof req.query.path !== 'string')
+        return res.status(400).send('path must be a string.')
+    else if(req.query.path.trim() === '')
+        return res.status(400).send('path cannot be empty')
+
+    // modules
+    const db = req.services.get('database').get(DB_WRITE, 'filesystem');
+    const _path = require('path');
+    const {chkperm} = require('../helpers')
+    const path       = _path.resolve('/', req.query.path);
+    const AWS        = require('aws-sdk');
+
+    // cannot download the root, because it's a directory!
+    if(path === '/')
+        return res.status(400).send('Cannot download a directory.');
+
+    // resolve path to its FSEntry
+    const fsnode = await req.fs.node(new NodePathSelector(path));
+
+    // not found
+    if( ! fsnode.exists() ) {
+        return res.status(404).send('File not found');
+    }
+
+    // stream data from S3
+    try{
+        const hl_read = new HLRead();
+        const stream = await hl_read.run({
+            fsNode: fsnode,
+            user: req.user,
+        });
+        // let stream = await s3.getObject({
+        //     Bucket: fsentry.bucket,
+        //     Key: fsentry.uuid, // File name you want to save as in S3
+        // }).createReadStream().on('error', error => {
+        //     console.log(error);
+        // });
+        res.attachment(await fsnode.get('name'));
+        return stream.pipe(res);
+    }catch(e){
+        console.log(e);
+        return res.type('application/json').status(500).send({message: 'There was an internal problem reading the file.'});
+    }
+})
+
+module.exports = router

packages/backend/src/routers/drivers/usage.js

@@ -143,7 +143,7 @@ module.exports = eggspress('/drivers/usage', {
         // usages.apps.push(usage);
     }
 
-    for ( k in usages.apps ) {
+    for ( const k in usages.apps ) {
         usages.apps[k] = Object.values(usages.apps[k]);
     }
 

packages/backend/src/routers/drivers/xd.js

@@ -65,8 +65,9 @@ const script = async function script () {
         return await response.json();
     };
 
+    /* global window */
     window.addEventListener('message', async event => {
-        const { id, interface, method, params } = event.data;
+        const { id, interface: interface_, method, params } = event.data;
         let has_file = false;
         for ( const k in params ) {
             if ( params[k] instanceof File ) {
@@ -75,11 +76,11 @@ const script = async function script () {
             }
         }
         const result = has_file ? await fcall({
-            interface_name: interface,
+            interface_name: interface_,
             method_name: method,
             params,
         }) : await call({
-            interface_name: interface,
+            interface_name: interface_,
             method_name: method,
             params,
         });

packages/backend/src/routers/file.js

@@ -19,9 +19,9 @@
 "use strict"
 const express = require('express');
 const router = new express.Router();
-const config = require('../config');
 const {validate_signature_auth, get_url_from_req, get_descendants, id2path, get_user, sign_file} = require('../helpers');
 const { DB_WRITE } = require('../services/database/consts');
+const { Context } = require('../util/context');
 
 // -----------------------------------------------------------------------//
 // GET /file
@@ -40,6 +40,10 @@ router.get('/file', async (req, res, next)=>{
         return res.status(403).send(e);
     }
 
+    const log = req.services.get('log-service').create('/file');
+    const errors = req.services.get('error-service').create(log);
+
+
     // modules
     const db = req.services.get('database').get(DB_WRITE, 'filesystem');
     const mime = require('mime-types')
@@ -92,7 +96,7 @@ router.get('/file', async (req, res, next)=>{
     res.resource_owner = fsentry[0].user_id;
 
     // try to deduce content-type
-    const contentType = mime.contentType(fsentry[0].name)
+    const contentType = "application/octet-stream";
 
     // update `accessed`
     db.write(
@@ -113,13 +117,17 @@ router.get('/file', async (req, res, next)=>{
 
         // stream data from S3
         try{
-            let stream = await storage.create_read_stream({
-                key: fsentry[0].uuid,
+            let stream = await storage.create_read_stream(fsentry[0].uuid, {
                 bucket: fsentry[0].bucket,
                 bucket_region: fsentry[0].bucket_region,
             });
             return stream.pipe(res);
         }catch(e){
+            errors.report('read from storage', {
+                source: e,
+                trace: true,
+                alarm: true,
+            });
             return res.type('application/json').status(500).send({message: 'There was an internal problem reading the file.'});
         }
     }
@@ -167,25 +175,22 @@ router.get('/file', async (req, res, next)=>{
         // HTTP Status 206 for Partial Content
         res.writeHead(206, headers);
 
-        // init S3
-        const s3 = new AWS.S3({
-            accessKeyId: config.s3_access_key,
-            secretAccessKey: config.s3_secret_key,
-            region: fsentry[0].bucket_region,
-        });
-
         try{
-            let stream = await storage.create_read_stream({
-                key: fsentry[0].uuid,
+            const storage = Context.get('storage');
+            let stream = await storage.create_read_stream(fsentry[0].uuid, {
                 bucket: fsentry[0].bucket,
                 bucket_region: fsentry[0].bucket_region,
             });
             return stream.pipe(res);
         }catch(e){
-            console.log(e)
+            errors.report('read from storage', {
+                source: e,
+                trace: true,
+                alarm: true,
+            });
             return res.type('application/json').status(500).send({message: 'There was an internal problem reading the file.'});
         }
     }
 })
 
-module.exports = router
+module.exports = router