move everything

app/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "pluto",
-  "module": "src/server.tsx",
-  "type": "module",
-  "private": true,
-  "scripts": {
-    "start": "bun src/server.tsx",
-    "runner": "env NODE_ENV=production bun run src/runner.ts",
-    "prod": "env NODE_ENV=production bun src/server.tsx",
-    "dev": "env BUN_HOT=1 bun --hot src/server.tsx",
-    "deploy": "./scripts/deploy.sh",
-    "push": "./scripts/deploy.sh",
-    "remote:install": "./scripts/remote-install.sh",
-    "remote:start": "./scripts/remote-start.sh",
-    "remote:stop": "./scripts/remote-stop.sh",
-    "remote:restart": "./scripts/remote-restart.sh"
-  },
-  "peerDependencies": {
-    "typescript": "^5"
-  },
-  "dependencies": {
-    "kleur": "^4.1.5"
-  }
-}

app/tsconfig.json

@@ -1,4 +0,0 @@
-{
-    "extends": "../tsconfig.json",
-    "include": ["./**/*"]
-  }

bin/apps.tsx

@@ -1,7 +1,7 @@
 // Show the webapps hosted on this NOSEputer.
 
 import { $ } from "bun"
-import { apps } from "app/src/webapp"
+import { apps } from "@/webapp"
 
 const devMode = process.env.NODE_ENV !== "production"
 

bin/cat.ts

@@ -4,12 +4,12 @@ import { escapeHTML } from "bun"
 import { readdirSync } from "fs"
 import { join, extname } from "path"
 
-import type { CommandOutput } from "app/src/shared/types"
+import type { CommandOutput } from "@/shared/types"
-import { NOSE_WWW } from "app/src/config"
+import { NOSE_WWW } from "@/config"
-import { isBinaryFile } from "app/src/utils"
+import { isBinaryFile } from "@/utils"
-import { highlight } from "../lib/highlight"
 import { projectName, projectDir } from "@/project"
 import { sessionGet } from "@/session"
+import { highlight } from "../lib/highlight"
 
 export default async function (path: string) {
     const project = projectName()

bin/edit.tsx

@@ -3,10 +3,10 @@
 import { readdirSync } from "fs"
 import { join, extname } from "path"
 
-import type { CommandOutput } from "app/src/shared/types"
+import type { CommandOutput } from "@/shared/types"
-import { NOSE_WWW } from "app/src/config"
+import { NOSE_WWW } from "@/config"
-import { isBinaryFile } from "app/src/utils"
+import { isBinaryFile } from "@/utils"
-import { countChar } from "app/src/shared/utils"
+import { countChar } from "@/shared/utils"
 import { projectName, projectDir } from "@/project"
 import { sessionGet } from "@/session"
 

bin/env.ts

@@ -2,7 +2,7 @@
 //
 // Show some debugging information.
 
-import { NOSE_STARTED, NOSE_SYS, NOSE_DIR, GIT_SHA } from "@/config"
+import { NOSE_STARTED, NOSE_SYS_BIN, NOSE_DIR, GIT_SHA } from "@/config"
 
 export default function () {
     return [
@@ -12,7 +12,7 @@ export default function () {
         `USER=${process.env.USER || "(none)"}`,
         `PWD=${process.env.PWD || "(none)"}`,
         `NOSE_STARTED=${NOSE_STARTED}`,
-        `NOSE_SYS=${NOSE_SYS}`,
+        `NOSE_SYS_BIN=${NOSE_SYS_BIN}`,
         `NOSE_DIR=${NOSE_DIR}`,
         `GIT_SHA=${GIT_SHA.slice(0, 8)}`,
     ].join("\n")

bin/load.ts

@@ -1,6 +1,6 @@
 // Load a project so you can work on it.
 
-import { apps } from "app/src/webapp"
+import { apps } from "@/webapp"
 import { sessionGet } from "@/session"
 
 export default function (project: string) {

bin/ls.tsx

@@ -1,7 +1,7 @@
 // Look around.
 
 import { readdirSync } from "fs"
-import { NOSE_WWW } from "app/src/config"
+import { NOSE_WWW } from "@/config"
 import { projectName, projectDir } from "@/project"
 import { sessionGet } from "@/session"
 

bin/mkdir.ts

@@ -2,10 +2,9 @@
 //
 // Essentially `mkdir -p`.
 
-import { mkdirSync } from "fs"
+import { mkdirSync, readdirSync } from "fs"
 import { join } from "path"
 import { projectDir } from "@/project"
-import { readdirSync } from "fs"
 import { sessionGet } from "@/session"
 
 export default async function (path: string) {

bin/new.ts

@@ -4,10 +4,9 @@
 
 import { mkdirSync, writeFileSync } from "fs"
 import { join } from "path"
-
+import { apps } from "@/webapp"
-import { apps } from "app/src/webapp"
+import { NOSE_WWW } from "@/config"
-import { NOSE_WWW } from "app/src/config"
+import { isDir } from "@/utils"
-import { isDir } from "app/src/utils"
 
 import load from "./load"
 

bin/projects.tsx

@@ -1,6 +1,6 @@
 // Show the projects on this NOSEputer.
 
-import { apps } from "app/src/webapp"
+import { apps } from "@/webapp"
 import { sessionGet } from "@/session"
 
 export default function () {

bin/share.ts

@@ -1,7 +1,7 @@
 // Share a webapp with the public internet.
 
-import { apps } from "app/src/webapp"
+import { apps } from "@/webapp"
-import { connectSneaker, sneakers, sneakerUrl } from "app/src/sneaker"
+import { connectSneaker, sneakers, sneakerUrl } from "@/sneaker"
 
 export default async function (app: string) {
   if (!app) {

bin/unshare.ts

@@ -1,7 +1,7 @@
 // Stop sharing a webapp with the public internet.
 
-import { apps } from "app/src/webapp"
+import { apps } from "@/webapp"
-import { disconnectSneaker, sneakers } from "app/src/sneaker"
+import { disconnectSneaker, sneakers } from "@/sneaker"
 
 export default async function (app: string) {
   if (!app) {

nose/tsconfig.json

@@ -0,0 +1,39 @@
+{
+  "compilerOptions": {
+    // Environment setup & latest features
+    "lib": [
+      "ESNext",
+      "DOM"
+    ],
+    "target": "ESNext",
+    "module": "Preserve",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "jsxImportSource": "hono/jsx",
+    "allowJs": true,
+    // Bundler mode
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+    // Best practices
+    "strict": true,
+    "skipLibCheck": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedIndexedAccess": true,
+    "noImplicitOverride": true,
+    // Some stricter flags (disabled by default)
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noPropertyAccessFromIndexSignature": false,
+    "baseUrl": ".",
+    "paths": {
+      "@utils": [
+        "../src/utils.tsx"
+      ],
+      "@/*": [
+        "../src/*"
+      ]
+    },
+  }
+}

nose/www/chris/pub/index.html

@@ -0,0 +1,24 @@
+<html lang="en">
+
+<head>
+  <title>chris!</title>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <link href="/main.css" rel="stylesheet" />
+</head>
+
+<body>
+  <div class="container">
+    <div class="tile text">
+      <div class="text-content">
+        <h1>@defunkt</h1>
+        <p>This is my website. I am Chris.</p>
+      </div>
+    </div>
+    <div class="tile burger">
+      <img src="burger.png" alt="Burger" />
+    </div>
+  </div>
+</body>
+
+</html>

nose/www/chris/pub/main.css

@@ -0,0 +1,27 @@
+body {
+  margin: 0;
+  height: 100vh;
+}
+
+.container {
+  display: flex;
+  height: 100%;
+}
+
+.tile {
+  flex: 1;
+  /* equal width columns */
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.text-content {
+  text-align: center;
+}
+
+.burger img {
+  max-width: 90%;
+  max-height: 90%;
+  height: auto;
+}

nose/www/corey/pub/index.html

@@ -0,0 +1,15 @@
+<html lang="en">
+
+<head>
+  <title>corey</title>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+</head>
+
+<body>
+  <h1>@probablycorey</h1>
+  <p>This is my website. I am Corey.</p>
+  <img src="/hotdog.png" />
+</body>
+
+</html>

nose/www/hello/index.ts

@@ -0,0 +1,2 @@
+export default () =>
+  "hiya"

nose/www/hello/pub/index.html

@@ -0,0 +1,14 @@
+<html lang="en">
+
+<head>
+  <title>Hello</title>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+</head>
+
+<body>
+  <h1>Wolfie Man</h1>
+  <p>Toy Rivian Truck</p>
+</body>
+
+</html>

package.json

@@ -1,29 +1,24 @@
 {
-    "name": "nose-pluto",
+  "name": "pluto",
-    "private": true,
+  "module": "src/server.tsx",
   "type": "module",
-    "workspaces": [
+  "private": true,
-      "app"
-    ],
   "scripts": {
-      "runner": "bun run --cwd ./app runner",
+    "start": "bun src/server.tsx",
-      "dev": "bun run --cwd ./app dev",
+    "runner": "env NODE_ENV=production bun run src/runner.ts",
-      "start": "bun run --cwd ./app start",
+    "prod": "env NODE_ENV=production bun src/server.tsx",
-      "push": "bun run --cwd ./app push",
+    "dev": "env BUN_HOT=1 bun --hot src/server.tsx",
-      "remote:install": "bun run --cwd ./app remote:install",
+    "deploy": "./scripts/deploy.sh",
-      "remote:start": "bun run --cwd ./app remote:start",
+    "push": "./scripts/deploy.sh",
-      "remote:stop": "bun run --cwd ./app remote:stop",
+    "remote:install": "./scripts/remote-install.sh",
-      "remote:restart": "bun run --cwd ./app remote:restart"
+    "remote:start": "./scripts/remote-start.sh",
+    "remote:stop": "./scripts/remote-stop.sh",
+    "remote:restart": "./scripts/remote-restart.sh"
+  },
+  "peerDependencies": {
+    "typescript": "^5"
   },
   "dependencies": {
-        "hono": "^4.9.7"
+    "kleur": "^4.1.5"
-    },
-    "devDependencies": {
-        "@types/bun": "latest"
-    },
-    "alias": {
-        "@nose": "./app/src/helpers.tsx",
-        "@config": "./app/src/config.ts",
-        "@/*": "./app/src/*"
   }
 }

scripts/config.sh

@@ -3,5 +3,5 @@
 # It isn't enough to modify this yet.
 # You also need to manually update the nose-pluto.service file.
 HOST="${HOST:-nose@nose-pluto.local}"
-DEST="${DEST:-~/nose}"
+DEST="${DEST:-~/.nose}"
 REPO="${REPO:-https://git.nose.space/defunkt/nose-pluto}"

scripts/deploy.sh

@@ -3,10 +3,10 @@ set -e
 
 # Get absolute path of this script’s directory
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-ROOT_DIR="$SCRIPT_DIR/../.."
+ROOT_DIR="$SCRIPT_DIR/.."
 
 # Run deploy + config with absolute paths
-source "$ROOT_DIR/app/scripts/config.sh"
+source "$ROOT_DIR/scripts/config.sh"
 
 # Make sure we're up-to-date
 git push origin main

scripts/nose-pluto.service

@@ -5,7 +5,7 @@ Wants=network-online.target
 
 [Service]
 User=nose
-WorkingDirectory=/home/nose/nose/app
+WorkingDirectory=/home/nose/.nose/
 Environment=PORT=80
 Environment=NODE_ENV=production
 ExecStart=/home/nose/.bun/bin/bun start

scripts/remote-install.sh

@@ -3,10 +3,10 @@ set -e
 
 # Get absolute path of this script’s directory
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-ROOT_DIR="$SCRIPT_DIR/../.."
+ROOT_DIR="$SCRIPT_DIR/.."
 
 # Run deploy + config with absolute paths
-source "$ROOT_DIR/app/scripts/config.sh"
+source "$ROOT_DIR/scripts/config.sh"
 
 # Run remote install on the target
-ssh "$HOST" "git clone $REPO $DEST && cd $DEST && ./app/scripts/install.sh && sudo systemctl start nose-pluto.service"
+ssh "$HOST" "git clone $REPO $DEST && cd $DEST && ./scripts/install.sh && sudo systemctl start nose-pluto.service"

scripts/remote-restart.sh

@@ -2,8 +2,8 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-ROOT_DIR="$SCRIPT_DIR/../.."
+ROOT_DIR="$SCRIPT_DIR/.."
 
-source "$ROOT_DIR/app/scripts/config.sh"
+source "$ROOT_DIR/scripts/config.sh"
 
 ssh "$HOST" "sudo systemctl restart nose-pluto.service"

scripts/remote-start.sh

@@ -2,8 +2,8 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-ROOT_DIR="$SCRIPT_DIR/../.."
+ROOT_DIR="$SCRIPT_DIR/.."
 
-source "$ROOT_DIR/app/scripts/config.sh"
+source "$ROOT_DIR/scripts/config.sh"
 
 ssh "$HOST" "sudo systemctl start nose-pluto.service"

scripts/remote-stop.sh

@@ -2,8 +2,8 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-ROOT_DIR="$SCRIPT_DIR/../.."
+ROOT_DIR="$SCRIPT_DIR/.."
 
-source "$ROOT_DIR/app/scripts/config.sh"
+source "$ROOT_DIR/scripts/config.sh"
 
 ssh "$HOST" "sudo systemctl stop nose-pluto.service"

src/config.ts

@@ -3,10 +3,9 @@ import { $ } from "bun"
 
 export const NOSE_ICON = ` ͡° ͜ʖ ͡°`
 
-export const NOSE_SYS = resolve("./nose")
+export const NOSE_SYS_BIN = resolve("./bin")
-export const NOSE_SYS_BIN = join(NOSE_SYS, "bin")
 
-export const NOSE_DIR = resolve("..")
+export const NOSE_DIR = resolve(process.env.NOSE_DIR || "./nose")
 export const NOSE_BIN = join(NOSE_DIR, "bin")
 export const NOSE_WWW = join(NOSE_DIR, "www")
 

src/nosedir.ts

@@ -0,0 +1,2 @@
+import { NOSE_DIR } from "./config";
+

src/server.tsx

@@ -7,7 +7,7 @@ import { prettyJSON } from "hono/pretty-json"
 import color from "kleur"
 
 import type { Message } from "./shared/types"
-import { NOSE_ICON, NOSE_BIN, NOSE_WWW, NOSE_DATA } from "./config"
+import { NOSE_ICON, NOSE_BIN, NOSE_WWW, NOSE_DATA, NOSE_DIR } from "./config"
 import { transpile, isFile, tilde } from "./utils"
 import { serveApp } from "./webapp"
 import { initDNS } from "./dns"
@@ -155,6 +155,7 @@ if (process.env.NODE_ENV === "production") {
 
 console.log(color.cyan(NOSE_ICON))
 console.log(color.blue("NOSE_DATA:"), color.yellow(tilde(NOSE_DATA)))
+console.log(color.blue("NOSE_DIR:"), color.yellow(tilde(NOSE_DIR)))
 console.log(color.blue("NOSE_BIN:"), color.yellow(tilde(NOSE_BIN)))
 console.log(color.blue("NOSE_WWW:"), color.yellow(tilde(NOSE_WWW)))
 

src/sneaker.ts

@@ -3,7 +3,7 @@
 // with the public internet. It requires a sneaker server, usually hosted by us.
 
 import nose from "./server"
-import { clearState, setState, getState } from "app/src/state"
+import { clearState, setState, getState } from "./state"
 
 const SNEAKER_URL = "nose.space"
 const SNEAKER_TLS = true