fix hmac implementation/typo. read WaveAuthKey and store in scbase instead of main-server

.github/workflows/build-helper.yml

@@ -41,7 +41,6 @@ jobs:
                   cd scripthaus;
                   go get ./...;
                   CGO_ENABLED=1 go build -o scripthaus cmd/main.go
-                  echo $PWD >> $GITHUB_PATH
             - uses: actions/setup-node@v4
               with:
                   node-version: ${{env.NODE_VERSION}}
@@ -54,7 +53,7 @@ jobs:
             - name: Install Yarn Dependencies
               run: yarn --frozen-lockfile
             - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
-              run: scripthaus run ${{ matrix.scripthaus }}
+              run: ./scripthaus/scripthaus run ${{ matrix.scripthaus }}
               env:
                   GOARCH: ${{ matrix.arch }}
                   CSC_LINK: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE}}

.github/workflows/codeql.yml

@@ -47,32 +47,6 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@v4
 
-            - name: Checkout Scripthaus (Go only)
-              if: matrix.language == 'go'
-              uses: actions/checkout@v4
-              with:
-                  repository: scripthaus-dev/scripthaus
-                  path: scripthaus
-
-            - name: Setup Go (Go only)
-              uses: actions/setup-go@v5
-              if: matrix.language == 'go'
-              with:
-                  go-version: stable
-                  cache-dependency-path: |
-                      wavesrv/go.sum
-                      waveshell/go.sum
-                      scripthaus/go.sum
-
-            - name: Install Scripthaus (Go only)
-              if: matrix.language == 'go'
-              run: |
-                  go work use ./scripthaus;
-                  cd scripthaus;
-                  go get ./...;
-                  CGO_ENABLED=1 go build -o scripthaus cmd/main.go
-                  echo $PWD >> $GITHUB_PATH
-
             # Initializes the CodeQL tools for scanning.
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v3
@@ -87,14 +61,9 @@ jobs:
 
             # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
             # If this step fails, then you should remove it and run the build manually (see below)
-            - name: Autobuild (not Go)
-              if: matrix.language != 'go'
+            - name: Autobuild
               uses: github/codeql-action/autobuild@v3
 
-            - name: Build (Go only)
-              if: matrix.language == 'go'
-              run: scripthaus run build-backend
-
             # ℹ️ Command-line programs to run using the OS shell.
             # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 

.github/workflows/publish.yml

@@ -1,30 +0,0 @@
-name: Publish a new release
-on:
-    release:
-        types: [published]
-env:
-    NODE_VERSION: "21.5.0"
-jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-            - uses: actions/setup-node@v4
-              with:
-                  node-version: ${{env.NODE_VERSION}}
-                  cache: "yarn"
-            - name: Get the version
-              id: get_version
-              run: |
-                  VERSION=$(node -e 'console.log(require("./version.js"))')
-                  echo "WAVETERM_VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
-            - name: Download staged artifacts
-              run: |
-                  . ./buildres/download-staged-artifacts.sh
-              env:
-                  AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
-                  AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"
-                  AWS_DEFAULT_REGION: us-west-2
-            - name: Generate Flatpak manifest
-              run: node buildres/flatpak/generate-flatpak-manifest.js

buildres/flatpak/dev.commandline.waveterm.yml

@@ -1,116 +0,0 @@
-app-id: com.visualstudio.code
-default-branch: stable
-runtime: org.freedesktop.Sdk
-runtime-version: '23.08'
-sdk: org.freedesktop.Sdk
-base: org.electronjs.Electron2.BaseApp
-base-version: '23.08'
-command: code
-tags: [proprietary]
-separate-locales: false
-finish-args:
-  - --require-version=0.10.3
-  - --share=network
-  - --share=ipc
-  - --socket=x11
-  - --socket=pulseaudio
-  - --socket=ssh-auth
-  - --device=all
-  - --allow=devel
-  - --filesystem=host
-  - --env=NPM_CONFIG_GLOBALCONFIG=/app/etc/npmrc
-  - --env=LD_LIBRARY_PATH=/app/lib
-  # required to fix cursor scaling on wayland
-  - --env=XCURSOR_PATH=/run/host/user-share/icons:/run/host/share/icons
-  - --system-talk-name=org.freedesktop.login1
-  - --talk-name=org.freedesktop.Notifications
-  - --talk-name=org.freedesktop.secrets
-  - --talk-name=org.freedesktop.Flatpak
-  - --talk-name=com.canonical.AppMenu.Registrar
-  - --talk-name=com.canonical.AppMenu.Registrar.*
-add-extensions:
-  com.visualstudio.code.tool:
-    directory: tools
-    subdirectories: true
-    version: '23.08'
-    add-ld-path: lib
-    no-autodownload: true
-cleanup:
-  - /include
-  - /lib/pkgconfig
-  - /share/gtk-doc
-  - '*.la'
-modules:
-  - shared-modules/libusb/libusb.json
-
-  - name: vscode
-    buildsystem: simple
-    build-commands:
-      - install -D code.sh /app/bin/code
-      - install -Dm644 vscode_64.png /app/share/icons/hicolor/64x64/apps/com.visualstudio.code.png
-      - install -Dm644 vscode_128.png /app/share/icons/hicolor/128x128/apps/com.visualstudio.code.png
-      - install -Dm644 vscode_256.png /app/share/icons/hicolor/256x256/apps/com.visualstudio.code.png
-      - install -Dm644 vscode_512.png /app/share/icons/hicolor/512x512/apps/com.visualstudio.code.png
-      - install -Dm644 com.visualstudio.code.metainfo.xml -t /app/share/metainfo
-      - install -Dm644 com.visualstudio.code.desktop -t /app/share/applications
-      - install -Dm644 com.visualstudio.code-url-handler.desktop -t /app/share/applications
-      - install -Dm644 com.visualstudio.code-workspace.xml -t /app/share/mime/packages
-      - install -Dm644 npmrc -t /app/etc
-      - install -Dm644 flatpak-warning.txt -t /app/share/vscode
-      - install -D apply_extra -t /app/bin
-      - cp /usr/bin/ar /app/bin
-      - ARCH_TRIPLE=$(gcc --print-multiarch) && cp /usr/lib/${ARCH_TRIPLE}/libbfd-*.so
-        /app/lib
-      - ARCH_TRIPLE=$(gcc --print-multiarch) && ln -s /usr/lib/${ARCH_TRIPLE}/libtinfo.so/app/lib/libtinfo.so.5
-      - mkdir /app/tools
-    sources:
-      - type: script
-        dest-filename: apply_extra
-        commands:
-          - ar x code.deb
-          - tar xf data.tar.xz
-          - mv usr/share/code vscode
-          - rm -r code.deb control.tar.* data.tar.xz debian-binary usr
-      - type: file
-        path: code.sh
-      - type: file
-        path: flatpak-warning.txt
-      - type: file
-        path: npmrc
-      - type: file
-        path: com.visualstudio.code.metainfo.xml
-      - type: file
-        path: com.visualstudio.code.desktop
-      - type: file
-        path: com.visualstudio.code-url-handler.desktop
-      - type: file
-        path: com.visualstudio.code-workspace.xml
-      - type: file
-        path: icons/vscode_64.png
-      - type: file
-        path: icons/vscode_128.png
-      - type: file
-        path: icons/vscode_256.png
-      - type: file
-        path: icons/vscode_512.png
-      - type: extra-data
-        filename: code.deb
-        only-arches: [x86_64]
-        url: <to-replace>
-        sha256: <to-replace>
-        size: <to-replace>
-        x-checker-data:
-          type: electron-updater
-          url: https://dl.waveterm.dev/releases/latest-linux.yml
-          is-main-source: true
-
-  - name: host-spawn
-    buildsystem: simple
-    build-commands:
-      - install -Dm755 host-spawn /app/bin/host-spawn
-    sources:
-      - type: file
-        url: https://github.com/1player/host-spawn/releases/download/1.5.0/host-spawn-x86_64
-        sha256: dbf67e7e111c4fe1edb0c642cbb4193064ca5b384aeb1054fc2befba6ed88b83
-        dest-filename: host-spawn
-        only-arches: [x86_64]

buildres/flatpak/generate-flatpak-manifest.js

@@ -1,16 +0,0 @@
-// Updates the Flatpak manifest with the latest values for the staged artifact
-// Usage: node generate-flatpak-manifest.js <path-to-staging-directory>
-
-const path = require("path");
-const fs = require("fs");
-const yaml = require("yaml");
-
-async function generateFlatpakManifest(stagingDir) {
-    const latestYmlPath = path.join(stagingDir, "latest-linux.yml");
-    const latestYml = yaml.parse(fs.readFileSync(latestYmlPath, "utf8"));
-    const manifestPath = path.join(stagingDir, "dev.commandline.waveterm.yml");
-    const manifestYml = yaml.parse(fs.readFileSync(manifestPath, "utf8"));
-    const latestDeb = latestYml.files.find((file) => file.url.endsWith(".deb"));
-    const latestDebUrl = `https://dl.waveterm.dev/releases/${latestDeb.url}`;
-    const latestDebSha512 = latestDeb.sha512;
-    

src/app/line/line.less

@@ -126,7 +126,6 @@
 
     &:hover .line-actions {
         background-color: var(--line-actions-bg-color);
-        backdrop-filter: blur(8px);
         .line-icon {
             visibility: visible;
         }

src/plugins/image/image.tsx

@@ -48,15 +48,12 @@ class SimpleImageRenderer extends React.Component<
             return (
                 <div className="image-renderer" style={{ fontSize: this.props.opts.termFontSize }}>
                     <div className="load-error-text">
-                        ERROR: file {dataBlob?.name ? JSON.stringify(dataBlob.name) : ""} not found
+                        ERROR: file {dataBlob && dataBlob.name ? JSON.stringify(dataBlob.name) : ""} not found
                     </div>
                 </div>
             );
         }
         if (this.objUrl == null) {
-            if (dataBlob.name?.endsWith(".svg")) {
-                dataBlob = new Blob([dataBlob], { type: "image/svg+xml" }) as ExtBlob;
-            }
             this.objUrl = URL.createObjectURL(dataBlob);
         }
         let opts = this.props.opts;

src/plugins/media/media.less

@@ -1,14 +0,0 @@
-.media-renderer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    padding-top: var(--termpad);
-
-    video {
-        object-fit: contain;
-        object-position: center;
-        height: 100%;
-        width: auto;
-    }
-}

src/plugins/media/media.tsx

@@ -1,60 +0,0 @@
-// Copyright 2024, Command Line Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-import * as React from "react";
-import * as mobx from "mobx";
-import * as mobxReact from "mobx-react";
-import * as util from "@/util/util";
-import { GlobalModel } from "@/models";
-
-import "./media.less";
-
-@mobxReact.observer
-class SimpleMediaRenderer extends React.Component<
-    { data: ExtBlob; context: RendererContext; opts: RendererOpts; savedHeight: number; lineState: LineStateType },
-    {}
-> {
-    objUrl: string = null;
-
-    componentWillUnmount() {
-        if (this.objUrl != null) {
-            URL.revokeObjectURL(this.objUrl);
-        }
-    }
-
-    render() {
-        let dataBlob = this.props.data;
-        if (dataBlob == null || dataBlob.notFound) {
-            return (
-                <div className="media-renderer" style={{ fontSize: this.props.opts.termFontSize }}>
-                    <div className="load-error-text">
-                        ERROR: file {dataBlob && dataBlob.name ? JSON.stringify(dataBlob.name) : ""} not found
-                    </div>
-                </div>
-            );
-        }
-        let fileUrl = this.props.lineState["wave:fileurl"];
-        if (util.isBlank(fileUrl)) {
-            return (
-                <div className="media-renderer" style={{ fontSize: this.props.opts.termFontSize }}>
-                    <div className="load-error-text">
-                        ERROR: no fileurl found (please use `mediaview` to view media files)
-                    </div>
-                </div>
-            );
-        }
-        let fullVideoUrl = GlobalModel.getBaseHostPort() + fileUrl;
-        const opts = this.props.opts;
-        const height = opts.idealSize.height - 10;
-        const width = opts.maxSize.width - 10;
-        return (
-            <div className="media-renderer" style={{ height: height, width: width }}>
-                <video controls>
-                    <source src={fullVideoUrl} />
-                </video>
-            </div>
-        );
-    }
-}
-
-export { SimpleMediaRenderer };

src/plugins/pdf/pdf.tsx

@@ -32,7 +32,7 @@ class SimplePdfRenderer extends React.Component<
             );
         }
         if (this.objUrl == null) {
-            const pdfBlob = new File([dataBlob], dataBlob.name ?? "file.pdf", { type: "application/pdf" });
+            const pdfBlob = new File([dataBlob], "test.pdf", { type: "application/pdf" });
             this.objUrl = URL.createObjectURL(pdfBlob);
         }
         const opts = this.props.opts;

src/plugins/plugins.ts

@@ -8,7 +8,6 @@ import { SimpleMustacheRenderer } from "./mustache/mustache";
 import { CSVRenderer } from "./csv/csv";
 import { OpenAIRenderer, OpenAIRendererModel } from "./openai/openai";
 import { SimplePdfRenderer } from "./pdf/pdf";
-import { SimpleMediaRenderer } from "./media/media";
 import { isBlank } from "@/util/util";
 import { sprintf } from "sprintf-js";
 
@@ -90,16 +89,6 @@ const PluginConfigs: RendererPluginType[] = [
         mimeTypes: ["application/pdf"],
         simpleComponent: SimplePdfRenderer,
     },
-    {
-        name: "media",
-        rendererType: "simple",
-        heightType: "pixels",
-        dataType: "blob",
-        collapseType: "hide",
-        globalCss: null,
-        mimeTypes: ["video/*", "audio/*"],
-        simpleComponent: SimpleMediaRenderer,
-    },
 ];
 
 class PluginModelClass {

wavesrv/pkg/cmdrunner/cmdrunner.go

@@ -37,7 +37,6 @@ import (
 	"github.com/wavetermdev/waveterm/wavesrv/pkg/comp"
 	"github.com/wavetermdev/waveterm/wavesrv/pkg/dbutil"
 	"github.com/wavetermdev/waveterm/wavesrv/pkg/pcloud"
-	"github.com/wavetermdev/waveterm/wavesrv/pkg/promptenc"
 	"github.com/wavetermdev/waveterm/wavesrv/pkg/releasechecker"
 	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote"
 	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote/openai"
@@ -281,7 +280,6 @@ func init() {
 	registerCmdFn("mdview", MarkdownViewCommand)
 	registerCmdFn("markdownview", MarkdownViewCommand)
 	registerCmdFn("pdfview", PdfViewCommand)
-	registerCmdFn("mediaview", MediaViewCommand)
 
 	registerCmdFn("csvview", CSVViewCommand)
 }
@@ -4918,58 +4916,6 @@ func PdfViewCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (scbu
 	return update, nil
 }
 
-func MakeReadFileUrl(screenId string, lineId string, filePath string) (string, error) {
-	qvals := make(url.Values)
-	qvals.Set("screenid", screenId)
-	qvals.Set("lineid", lineId)
-	qvals.Set("path", filePath)
-	qvals.Set("nonce", uuid.New().String())
-	hmacStr, err := promptenc.ComputeUrlHmac([]byte(scbase.WaveAuthKey), "/api/read-file", qvals)
-	if err != nil {
-		return "", fmt.Errorf("error computing hmac-url: %v", err)
-	}
-	qvals.Set("hmac", hmacStr)
-	return "/api/read-file?" + qvals.Encode(), nil
-}
-
-func MediaViewCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (scbus.UpdatePacket, error) {
-	if len(pk.Args) == 0 {
-		return nil, fmt.Errorf("%s requires an argument (file name)", GetCmdStr(pk))
-	}
-	// TODO more error checking on filename format?
-	if pk.Args[0] == "" {
-		return nil, fmt.Errorf("%s argument cannot be empty", GetCmdStr(pk))
-	}
-	fileName := pk.Args[0]
-	ids, err := resolveUiIds(ctx, pk, R_Session|R_Screen|R_RemoteConnected)
-	if err != nil {
-		return nil, err
-	}
-	outputStr := fmt.Sprintf("%s %q", GetCmdStr(pk), fileName)
-	cmd, err := makeStaticCmd(ctx, GetCmdStr(pk), ids, pk.GetRawStr(), []byte(outputStr))
-	if err != nil {
-		// TODO tricky error since the command was a success, but we can't show the output
-		return nil, err
-	}
-	// compute hmac read-file URL
-	readFileUrl, err := MakeReadFileUrl(ids.ScreenId, cmd.LineId, fileName)
-	if err != nil {
-		// TODO tricky error since the command was a success, but we can't show the output
-		return nil, fmt.Errorf("error making read-file url: %v", err)
-	}
-	// set the line state
-	lineState := make(map[string]any)
-	lineState[sstore.LineState_FileUrl] = readFileUrl
-	lineState[sstore.LineState_File] = fileName
-	update, err := addLineForCmd(ctx, "/"+GetCmdStr(pk), false, ids, cmd, "media", lineState)
-	if err != nil {
-		// TODO tricky error since the command was a success, but we can't show the output
-		return nil, err
-	}
-	update.AddUpdate(sstore.InteractiveUpdate(pk.Interactive))
-	return update, nil
-}
-
 func MarkdownViewCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (scbus.UpdatePacket, error) {
 	if len(pk.Args) == 0 {
 		return nil, fmt.Errorf("%s requires an argument (file name)", GetCmdStr(pk))

wavesrv/pkg/cmdrunner/shparse.go

@@ -36,7 +36,6 @@ var BareMetaCmds = []BareMetaCmdDecl{
 	{"mdview", "markdownview"},
 	{"csvview", "csvview"},
 	{"pdfview", "pdfview"},
-	{"mediaview", "mediaview"},
 }
 
 const (

wavesrv/pkg/sstore/sstore.go

@@ -63,7 +63,6 @@ const (
 const (
 	LineState_Source   = "prompt:source"
 	LineState_File     = "prompt:file"
-	LineState_FileUrl  = "wave:fileurl"
 	LineState_Min      = "wave:min"
 	LineState_Template = "template"
 	LineState_Mode     = "mode"

yarn.lock

@@ -4016,9 +4016,9 @@ fn.name@1.x.x:
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
 follow-redirects@^1.0.0:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 foreground-child@^3.1.0:
   version "3.1.1"