diff --git a/.github/workflows/build-helper.yml b/.github/workflows/build-helper.yml index 742722285..a1e3f7543 100644 --- a/.github/workflows/build-helper.yml +++ b/.github/workflows/build-helper.yml @@ -1,7 +1,7 @@ name: "Build Helper" on: workflow_dispatch env: - GO_VERSION: "1.22.0" + GO_VERSION: "1.22.5" NODE_VERSION: "21.5.0" jobs: runbuild: @@ -11,22 +11,15 @@ jobs: - platform: "darwin" arch: "universal" runner: "macos-latest-xlarge" - task: "build-package" - platform: "linux" arch: "amd64" runner: "ubuntu-latest" - scripthaus: "build-package-linux" - - platform: "linux" - arch: "arm64" - runner: "ubuntu-latest" - scripthaus: "build-package-linux" + # - platform: "windows" + # arch: "amd64" + # runner: "windows-latest" runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v4 - - uses: actions/checkout@v4 - with: - repository: scripthaus-dev/scripthaus - path: scripthaus - name: Install Linux Build Dependencies (Linux only) if: matrix.platform == 'linux' run: | @@ -36,16 +29,7 @@ jobs: with: go-version: ${{env.GO_VERSION}} cache-dependency-path: | - wavesrv/go.sum - waveshell/go.sum - scripthaus/go.sum - - name: Install Scripthaus - run: | - go work use ./scripthaus; - cd scripthaus; - go get ./...; - CGO_ENABLED=1 go build -o scripthaus cmd/main.go - echo $PWD >> $GITHUB_PATH + go.sum - uses: actions/setup-node@v4 with: node-version: ${{env.NODE_VERSION}} @@ -53,23 +37,25 @@ jobs: run: | corepack enable yarn install + - name: Install Task + uses: arduino/setup-task@v2 + with: + version: 3.x + repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Set Version id: set-version - run: | - VERSION=$(node -e 'console.log(require("./version.js"))') - echo "WAVETERM_VERSION=${VERSION}" >> "$GITHUB_OUTPUT" + run: echo "WAVETERM_VERSION=$(node "./version.cjs")" >> "$GITHUB_OUTPUT" - name: Build ${{ matrix.platform }}/${{ matrix.arch }} - run: scripthaus run ${{ matrix.scripthaus }} + run: task package env: - GOARCH: ${{ matrix.arch }} CSC_LINK: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE}} CSC_KEY_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE_PWD }} APPLE_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }} APPLE_APP_SPECIFIC_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_PWD }} APPLE_TEAM_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }} - name: Upload to S3 staging - run: aws s3 cp make/ s3://waveterm-github-artifacts/staging/${{ steps.set-version.outputs.WAVETERM_VERSION }}/ --recursive --exclude "*/*" --exclude "builder-*.yml" + run: aws s3 cp make/ s3://waveterm-github-artifacts/staging-w2/${{ steps.set-version.outputs.WAVETERM_VERSION }}/ --recursive --exclude "*/*" --exclude "builder-*.yml" env: - AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}" - AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}" + AWS_ACCESS_KEY_ID: "${{ secrets.S3_KEY_ID }}" + AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_KEY_SECRET }}" AWS_DEFAULT_REGION: us-west-2 diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..b207beb17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2024 Command Line Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/Taskfile.yml b/Taskfile.yml index e162f0fb3..b37d35c76 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -4,30 +4,14 @@ version: "3" vars: - APP_NAME: "NextWave" + APP_NAME: "TheNextWave" BIN_DIR: "bin" VERSION: sh: node version.cjs tasks: - - package:dev: - cmds: - - yarn build:dev && yarn electron-builder -c electron-builder.config.cjs -p never - deps: - - generate - - build:server - - build:wsh - - package:prod: - cmds: - - yarn build:prod && yarn electron-builder -c electron-builder.config.cjs -p never - deps: - - generate - - build:server - - build:wsh - electron:dev: + desc: Run the Electron application directly. cmds: - WAVETERM_DEV=1 yarn dev deps: @@ -36,6 +20,7 @@ tasks: - build:wsh electron:start: + desc: Run the Electron application via the Vite dev server (enables hot reloading). cmds: - WAVETERM_DEV=1 yarn start deps: @@ -43,7 +28,17 @@ tasks: - build:server - build:wsh + package: + desc: Package the application for the current platform. + cmds: + - yarn build:prod && yarn electron-builder -c electron-builder.config.cjs -p never + deps: + - generate + - build:server + - build:wsh + generate: + desc: Generate Typescript bindings for the Go backend. cmds: - go run cmd/generate/main-generate.go - go run cmd/generatewshclient/main-generatewshclient.go @@ -52,22 +47,46 @@ tasks: - "pkg/service/**/*.go" - "pkg/wstore/*.go" - "pkg/wshrpc/**/*.go" + generates: + - frontend/types/gotypes.d.ts + - pkg/wshrpc/wshclient/wshclient.go build:server: + desc: Build the wavesrv component. deps: + - build:server:darwin + - build:server:other + + build:server:darwin: + desc: Build the wavesrv component for Darwin platforms (generates artifacts for both arm64 and amd64). + status: + - exit {{if eq OS "darwin"}}1{{else}}0{{end}} + cmds: - task: build:server:internal vars: GOARCH: arm64 - task: build:server:internal vars: GOARCH: amd64 + + build:server:other: + desc: Build the wavesrv component for non-Darwin platforms (only generates artifacts for the current architecture). + status: + - exit {{if eq OS "darwin"}}0{{else}}1{{end}} + cmds: + - task: build:server:internal + vars: + GOARCH: + sh: echo {{if eq "arm" ARCH}}arm64{{else}}{{ARCH}}{{end}} + GO_LDFLAGS: -linkmode 'external' -extldflags=-static + build:server:internal: requires: vars: - GOARCH cmds: - - CGO_ENABLED=1 GOARCH={{.GOARCH}} go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M') -X main.WaveVersion={{.VERSION}}" -o dist/bin/wavesrv.{{.GOARCH}}{{exeExt}} cmd/server/main-server.go + - CGO_ENABLED=1 GOARCH={{.GOARCH}} go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "{{.GO_LDFLAGS}} -X main.BuildTime=$(date +'%Y%m%d%H%M') -X main.WaveVersion={{.VERSION}}" -o dist/bin/wavesrv.{{.GOARCH}}{{exeExt}} cmd/server/main-server.go sources: - "cmd/server/*.go" - "pkg/**/*.go" @@ -78,6 +97,7 @@ tasks: internal: true build:wsh: + desc: Build the wsh component for all possible targets. deps: - task: build:wsh:internal vars: @@ -106,8 +126,6 @@ tasks: build:wsh:internal: vars: - GO_LDFLAGS: - sh: echo "-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')" EXT: sh: echo {{if eq .GOOS "windows"}}.exe{{end}} requires: @@ -121,13 +139,13 @@ tasks: generates: - dist/bin/wsh-{{.VERSION}}-{{.GOOS}}.{{.GOARCH}}{{.EXT}} cmds: - - (CGO_ENABLED=0 GOOS={{.GOOS}} GOARCH={{.GOARCH}} go build -ldflags="{{.GO_LDFLAGS}}" -o dist/bin/wsh-{{.VERSION}}-{{.GOOS}}.{{.GOARCH}}{{.EXT}} cmd/wsh/main-wsh.go) + - (CGO_ENABLED=0 GOOS={{.GOOS}} GOARCH={{.GOARCH}} go build -ldflags="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')" -o dist/bin/wsh-{{.VERSION}}-{{.GOOS}}.{{.GOARCH}}{{.EXT}} cmd/wsh/main-wsh.go) deps: - go:mod:tidy internal: true go:mod:tidy: - summary: Runs `go mod tidy` + desc: Runs `go mod tidy` internal: true generates: - go.sum