Merge branch 'develop' into plugin-api-stage1

Author: velzie

.github/workflows/main.yml

@@ -18,6 +18,9 @@ on:
     paths-ignore: *ci_ignore_paths
   workflow_dispatch:
 
+env:
+  WASM_BINDGEN_VERSION: "0.2.105"
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -74,39 +77,12 @@ jobs:
       - name: Install pnpm dependencies
         run: pnpm install
 
-      - name: Cache rewriter build artifacts
-        uses: actions/cache@v4
-        id: rewriter-cache
-        with:
-          path: |
-            packages/scramjet/packages/core/rewriter/wasm/out
-            packages/scramjet/packages/core/dist/scramjet.wasm
-          key: rewriter-release-${{ hashFiles('packages/scramjet/packages/core/rewriter/**/Cargo.toml', 'packages/scramjet/packages/core/rewriter/**/*.rs', 'packages/scramjet/packages/core/rewriter/**/src/**/*.toml', 'packages/scramjet/packages/core/rewriter/**/src/**/*.json', 'packages/scramjet/packages/core/rewriter/**/src/**/*.md', 'packages/scramjet/packages/core/rewriter/**/*.sh') }}
-          restore-keys: |
-            rewriter-release-
-
-      - name: Cache Rust dependencies
-        if: steps.rewriter-cache.outputs.cache-hit != 'true'
-        uses: Swatinem/rust-cache@v2
+      - name: Setup Rewriter Toolchain
+        uses: ./packages/scramjet/.github/actions/setup-rewriter-toolchain
         with:
-          workspaces: "rewriter"
-          cache-all-crates: true
-
-      - name: Install wbg
-        if: steps.rewriter-cache.outputs.cache-hit != 'true'
-        uses: jetli/wasm-bindgen-action@v0.2.0
-        with:
-          version: "0.2.105"
-
-      - name: Setup Binaryen
-        if: steps.rewriter-cache.outputs.cache-hit != 'true'
-        uses: Aandreba/setup-binaryen@v1.0.0
-        with:
-          token: ${{ github.token }}
-
-      - name: Setup wasm-snip
-        if: steps.rewriter-cache.outputs.cache-hit != 'true'
-        run: "cargo install --git https://github.com/r58playz/wasm-snip"
+          wasm-bindgen-version: ${{ env.WASM_BINDGEN_VERSION }}
+          rewriter-path: packages/scramjet/packages/core/rewriter
+          github-token: ${{ github.token }}
 
       - name: Pack Scramjet
         run: pnpm pack
@@ -197,15 +173,6 @@ jobs:
           name: scramjet
           path: packages/scramjet/packages/core/dist
 
-      - name: Get cached rewriter build
-        uses: actions/cache/restore@v4
-        id: rewriter-cache
-        with:
-          path: |
-            packages/scramjet/packages/core/rewriter/wasm/out
-            packages/scramjet/packages/core/dist/scramjet.wasm
-          key: rewriter-release-${{ hashFiles('packages/scramjet/packages/core/rewriter/**/Cargo.toml', 'packages/scramjet/packages/core/rewriter/**/*.rs', 'packages/scramjet/packages/core/rewriter/**/src/**/*.toml', 'packages/scramjet/packages/core/rewriter/**/src/**/*.json', 'packages/scramjet/packages/core/rewriter/**/src/**/*.md', 'packages/scramjet/packages/core/rewriter/**/*.sh') }}
-
       - name: Get artifacts (scramjet/controller)
         uses: actions/download-artifact@v4
         with:
@@ -224,19 +191,11 @@ jobs:
       - name: Install Playwright Chromium
         if: steps.pw-browsers-cache.outputs.cache-hit != 'true'
         run: npx playwright install --with-deps chromium
-        working-directory: packages/scramjet/packages/core
+        working-directory: packages/scramjet/packages/runway
 
-      - name: Run Playwright tests
-        run: pnpm test:integration
-        working-directory: packages/scramjet/packages/core
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: playwright-test-results
-          path: packages/scramjet/packages/core/blob-report/*
-          if-no-files-found: error
+      - name: Run Runway tests
+        run: pnpm test --parallel 4
+        working-directory: packages/scramjet/packages/runway
 
   rewritertests:
     name: Run Rewriter Tests
@@ -249,22 +208,12 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Cache rewriter build artifacts
-        uses: actions/cache@v4
-        id: rewriter-cache
-        with:
-          path: |
-            packages/scramjet/packages/core/rewriter/wasm/out
-            packages/scramjet/packages/core/dist/scramjet.wasm
-          key: rewriter-release-${{ hashFiles('packages/scramjet/packages/core/rewriter/**/Cargo.toml', 'packages/scramjet/packages/core/rewriter/**/*.rs', 'packages/scramjet/packages/core/rewriter/**/src/**/*.toml', 'packages/scramjet/packages/core/rewriter/**/src/**/*.json', 'packages/scramjet/packages/core/rewriter/**/src/**/*.md', 'packages/scramjet/packages/core/rewriter/**/*.sh') }}
-          restore-keys: |
-            rewriter-release-
-
-      - name: Cache Rust dependencies
+      - name: Cache Rust compilation
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: "rewriter"
+          workspaces: "packages/scramjet/packages/core/rewriter -> target"
           cache-all-crates: true
+          shared-key: "rewriter"
 
       - name: Run Tests
         run: cargo test
@@ -335,7 +284,7 @@ jobs:
       - name: Build Frontend
         run: |
           SKIP_CORE=1 pnpm build
-          VITE_PUTER_BRANDING=1 VITE_ISOLATION_ORIGIN="https://puter.zone" pnpm build:chrome
+          VITE_SENTRY_URL="https://js.sentry-cdn.com/89b0486bec1f3d54d07953d81a046161.min.js" VITE_PUTER_BRANDING=1 VITE_ISOLATION_ORIGIN="https://puter.zone" pnpm build:chrome
 
       - name: Upload Artifact (dist)
         uses: actions/upload-artifact@v4

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-	"editor.formatOnSave": true,
+	"editor.formatOnSave": false,
 	"editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
 	"prettier.useEditorConfig": true,
 	"typescript.preferences.includePackageJsonAutoImports": "off",
@@ -57,5 +57,9 @@
 	},
 	"[typescriptreact]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
+	},
+	"search.exclude": {
+		"external/playwright": true,
+		"external/dreamlandjs": true
 	}
 }

devserver.ts

@@ -10,10 +10,10 @@ import rspackConfig from "./rspack.config.ts";
 import { server as wisp } from "@mercuryworkshop/wisp-js/server";
 import {
 	black,
-	logSuccess,
 	printBanner,
 	resetSuccessLog,
 	runRspack,
+	normalizeWebsocketUrl,
 } from "./packages/scramjet/devlib.ts";
 
 const image = await fs.readFile("./assets/icon.png");
@@ -38,7 +38,13 @@ const puterBranding = Boolean(process.env.VITE_PUTER_BRANDING);
 if (puterBranding) {
 	process.env.VITE_ISOLATION_ORIGIN ||= `https://puter.zone`;
 } else {
-	process.env.VITE_WISP_URL ||= `ws://localhost:${WISP_PORT}/`;
+	if (process.env.VITE_WISP_URL) {
+		process.env.VITE_WISP_URL = normalizeWebsocketUrl(
+			process.env.VITE_WISP_URL
+		);
+	} else {
+		process.env.VITE_WISP_URL = `ws://localhost:${WISP_PORT}/`;
+	}
 	process.env.VITE_ISOLATION_ORIGIN ||= `http://localhost:${ISOLATION_PORT}`;
 }
 
@@ -66,6 +72,9 @@ const server = await createServer({
 
 await server.listen();
 
+wisp.options.allow_loopback_ips = true;
+wisp.options.allow_private_ips = true;
+
 const accent = (text: string) => chalk.hex("#4799f1").bold(text);
 const highlight = (text: string) => chalk.hex("#ffffff").bold(text);
 const urlColor = (text: string) => chalk.hex("#64DFDF").underline(text);

external/dreamlandjs

@@ -17,7 +17,7 @@
 		"preinstall": "npx only-allow pnpm"
 	},
 	"devDependencies": {
-		"@mercuryworkshop/wisp-js": "^0.4.0",
+		"@mercuryworkshop/wisp-js": "catalog:",
 		"@rsdoctor/rspack-plugin": "^1.4.0",
 		"@rspack/cli": "^1.5.8",
 		"@rspack/core": "^1.5.8",

package.json

@@ -11,7 +11,7 @@
 
 	<body class="light-mode">
 		<!--ssr-body-->
-		<!--<div id="app"></div>-->
-		<script type="module" src="/src/main-client.ts"></script>
+		<div id="app"></div>
+		<script type="module" src="/src/main.tsx"></script>
 	</body>
 </html>

packages/chrome/index.html

@@ -1,19 +1,26 @@
-import type { ComponentContext } from "dreamland/core";
+import type { FC } from "dreamland/core";
 import { css } from "dreamland/core";
-import { TabStrip } from "./components/TabStrip/TabStrip";
+import { TabStrip } from "@components/TabStrip/TabStrip";
 import { browser } from "./Browser";
 import { Tab } from "./Tab";
-import { BookmarksStrip } from "./components/BookmarksStrip";
-import { Omnibar } from "./components/Omnibar/Omnibar";
+import { BookmarksStrip } from "@components/BookmarksStrip";
+import { Omnibar } from "@components/Omnibar/Omnibar";
 import { getTheme } from "./themes";
 import { contexts } from "./proxy/scramjet";
+import { INTERNAL_URL_PROTOCOL } from "./consts";
 
-export function App(props: {}, cx: ComponentContext) {
+export function App(
+	this: FC<{
+		children: any;
+	}>
+) {
 	const applyTheme = () => {
 		const appearance = browser.settings.appearance;
 		const themeId = browser.settings.themeId;
 		const theme = getTheme(themeId);
 
+		console.log("applyin");
+
 		// Determine if we should use light mode
 		let isLight = false;
 		if (appearance === "system") {
@@ -51,7 +58,7 @@ export function App(props: {}, cx: ComponentContext) {
 	use(browser.settings.appearance).listen(applyTheme);
 	use(browser.settings.themeId).listen(applyTheme);
 
-	cx.mount = () => {
+	this.cx.mount = () => {
 		applyTheme();
 	};
 
@@ -61,18 +68,21 @@ export function App(props: {}, cx: ComponentContext) {
 				tabs={use(browser.tabs)}
 				activetab={use(browser.activetab)}
 				addTab={() => {
-					browser.newTab(new URL("puter://newtab"), true);
+					browser.newTab(new URL(`${INTERNAL_URL_PROTOCOL}//newtab`), true);
 				}}
 				destroyTab={(tab: Tab) => {
 					browser.destroyTab(tab);
 				}}
 			/>
 			<Omnibar tab={use(browser.activetab)} />
 			{use(browser.activetab.url, browser.settings.showBookmarksBar)
-				.map(([u, pinned]) => pinned || u.href === "puter://newtab")
-				.andThen(<BookmarksStrip />)}
+				.map(
+					([u, pinned]) =>
+						pinned || u.href === `${INTERNAL_URL_PROTOCOL}//newtab`
+				)
+				.and(<BookmarksStrip />)}
 			<div class="separator"></div>
-			{cx.children}
+			{this.children}
 		</div>
 	);
 }